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.37/, 2.6.32/
Date: Tue, 22 Mar 2011 00:25:18
Message-Id: 19ac18517efdd44b4a7e4f21d3c827e057fb6c1c.blueness@gentoo
1 commit: 19ac18517efdd44b4a7e4f21d3c827e057fb6c1c
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 22 00:22:31 2011 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 22 00:22:31 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=19ac1851
7
8 Update Grsec/PaX
9 2.2.1-2.6.32.33-201103211735
10 2.2.1-2.6.37.4-201103211735
11
12 ---
13 2.6.32/0000_README | 2 +-
14 ..._grsecurity-2.2.1-2.6.32.33-201103211735.patch} | 7926 ++++++++++----------
15 2.6.37/0000_README | 2 +-
16 ...0_grsecurity-2.2.1-2.6.37.4-201103211735.patch} | 7679 ++++++++++---------
17 4 files changed, 7962 insertions(+), 7647 deletions(-)
18
19 diff --git a/2.6.32/0000_README b/2.6.32/0000_README
20 index e8c35fa..6d017a3 100644
21 --- a/2.6.32/0000_README
22 +++ b/2.6.32/0000_README
23 @@ -3,7 +3,7 @@ README
24
25 Individual Patch Descriptions:
26 -----------------------------------------------------------------------------
27 -Patch: 4420_grsecurity-2.2.1-2.6.32.32-201103122250.patch
28 +Patch: 4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch
29 From: http://www.grsecurity.net
30 Desc: hardened-sources base patch from upstream grsecurity
31
32
33 diff --git a/2.6.32/4420_grsecurity-2.2.1-2.6.32.32-201103122250.patch b/2.6.32/4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch
34 similarity index 86%
35 rename from 2.6.32/4420_grsecurity-2.2.1-2.6.32.32-201103122250.patch
36 rename to 2.6.32/4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch
37 index 5976c48..04862b1 100644
38 --- a/2.6.32/4420_grsecurity-2.2.1-2.6.32.32-201103122250.patch
39 +++ b/2.6.32/4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch
40 @@ -1,6 +1,6 @@
41 -diff -urNp linux-2.6.32.32/arch/alpha/include/asm/elf.h linux-2.6.32.32/arch/alpha/include/asm/elf.h
42 ---- linux-2.6.32.32/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
43 -+++ linux-2.6.32.32/arch/alpha/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
44 +diff -urNp linux-2.6.32.33/arch/alpha/include/asm/elf.h linux-2.6.32.33/arch/alpha/include/asm/elf.h
45 +--- linux-2.6.32.33/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
46 ++++ linux-2.6.32.33/arch/alpha/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
47 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
48
49 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
50 @@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.32/arch/alpha/include/asm/elf.h linux-2.6.32.32/arch/alp
51 /* $0 is set by ld.so to a pointer to a function which might be
52 registered using atexit. This provides a mean for the dynamic
53 linker to call DT_FINI functions for shared libraries that have
54 -diff -urNp linux-2.6.32.32/arch/alpha/include/asm/pgtable.h linux-2.6.32.32/arch/alpha/include/asm/pgtable.h
55 ---- linux-2.6.32.32/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
56 -+++ linux-2.6.32.32/arch/alpha/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
57 +diff -urNp linux-2.6.32.33/arch/alpha/include/asm/pgtable.h linux-2.6.32.33/arch/alpha/include/asm/pgtable.h
58 +--- linux-2.6.32.33/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
59 ++++ linux-2.6.32.33/arch/alpha/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
60 @@ -101,6 +101,17 @@ struct vm_area_struct;
61 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
62 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
63 @@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.32/arch/alpha/include/asm/pgtable.h linux-2.6.32.32/arch
64 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
65
66 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
67 -diff -urNp linux-2.6.32.32/arch/alpha/kernel/module.c linux-2.6.32.32/arch/alpha/kernel/module.c
68 ---- linux-2.6.32.32/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
69 -+++ linux-2.6.32.32/arch/alpha/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
70 +diff -urNp linux-2.6.32.33/arch/alpha/kernel/module.c linux-2.6.32.33/arch/alpha/kernel/module.c
71 +--- linux-2.6.32.33/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
72 ++++ linux-2.6.32.33/arch/alpha/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
73 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
74
75 /* The small sections were sorted to the end of the segment.
76 @@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.32/arch/alpha/kernel/module.c linux-2.6.32.32/arch/alpha
77 got = sechdrs[me->arch.gotsecindex].sh_addr;
78
79 for (i = 0; i < n; i++) {
80 -diff -urNp linux-2.6.32.32/arch/alpha/kernel/osf_sys.c linux-2.6.32.32/arch/alpha/kernel/osf_sys.c
81 ---- linux-2.6.32.32/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
82 -+++ linux-2.6.32.32/arch/alpha/kernel/osf_sys.c 2010-12-31 14:46:53.000000000 -0500
83 +diff -urNp linux-2.6.32.33/arch/alpha/kernel/osf_sys.c linux-2.6.32.33/arch/alpha/kernel/osf_sys.c
84 +--- linux-2.6.32.33/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
85 ++++ linux-2.6.32.33/arch/alpha/kernel/osf_sys.c 2010-12-31 14:46:53.000000000 -0500
86 @@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a
87 /* At this point: (!vma || addr < vma->vm_end). */
88 if (limit - len < addr)
89 @@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.32/arch/alpha/kernel/osf_sys.c linux-2.6.32.32/arch/alph
90 if (addr != (unsigned long) -ENOMEM)
91 return addr;
92
93 -diff -urNp linux-2.6.32.32/arch/alpha/mm/fault.c linux-2.6.32.32/arch/alpha/mm/fault.c
94 ---- linux-2.6.32.32/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
95 -+++ linux-2.6.32.32/arch/alpha/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
96 +diff -urNp linux-2.6.32.33/arch/alpha/mm/fault.c linux-2.6.32.33/arch/alpha/mm/fault.c
97 +--- linux-2.6.32.33/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
98 ++++ linux-2.6.32.33/arch/alpha/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
99 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
100 __reload_thread(pcb);
101 }
102 @@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.32/arch/alpha/mm/fault.c linux-2.6.32.32/arch/alpha/mm/f
103 } else if (!cause) {
104 /* Allow reads even for write-only mappings */
105 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
106 -diff -urNp linux-2.6.32.32/arch/arm/include/asm/elf.h linux-2.6.32.32/arch/arm/include/asm/elf.h
107 ---- linux-2.6.32.32/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
108 -+++ linux-2.6.32.32/arch/arm/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
109 +diff -urNp linux-2.6.32.33/arch/arm/include/asm/elf.h linux-2.6.32.33/arch/arm/include/asm/elf.h
110 +--- linux-2.6.32.33/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
111 ++++ linux-2.6.32.33/arch/arm/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
112 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
113 the loader. We need to make sure that it is out of the way of the program
114 that it will "exec", and that there is sufficient room for the brk. */
115 @@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.32/arch/arm/include/asm/elf.h linux-2.6.32.32/arch/arm/i
116
117 /* When the program starts, a1 contains a pointer to a function to be
118 registered with atexit, as per the SVR4 ABI. A value of 0 means we
119 -diff -urNp linux-2.6.32.32/arch/arm/include/asm/kmap_types.h linux-2.6.32.32/arch/arm/include/asm/kmap_types.h
120 ---- linux-2.6.32.32/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
121 -+++ linux-2.6.32.32/arch/arm/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
122 +diff -urNp linux-2.6.32.33/arch/arm/include/asm/kmap_types.h linux-2.6.32.33/arch/arm/include/asm/kmap_types.h
123 +--- linux-2.6.32.33/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
124 ++++ linux-2.6.32.33/arch/arm/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
125 @@ -19,6 +19,7 @@ enum km_type {
126 KM_SOFTIRQ0,
127 KM_SOFTIRQ1,
128 @@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.32/arch/arm/include/asm/kmap_types.h linux-2.6.32.32/arc
129 KM_TYPE_NR
130 };
131
132 -diff -urNp linux-2.6.32.32/arch/arm/include/asm/uaccess.h linux-2.6.32.32/arch/arm/include/asm/uaccess.h
133 ---- linux-2.6.32.32/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
134 -+++ linux-2.6.32.32/arch/arm/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
135 +diff -urNp linux-2.6.32.33/arch/arm/include/asm/uaccess.h linux-2.6.32.33/arch/arm/include/asm/uaccess.h
136 +--- linux-2.6.32.33/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
137 ++++ linux-2.6.32.33/arch/arm/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
138 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
139
140 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
141 @@ -294,9 +294,9 @@ diff -urNp linux-2.6.32.32/arch/arm/include/asm/uaccess.h linux-2.6.32.32/arch/a
142 if (access_ok(VERIFY_WRITE, to, n))
143 n = __copy_to_user(to, from, n);
144 return n;
145 -diff -urNp linux-2.6.32.32/arch/arm/kernel/kgdb.c linux-2.6.32.32/arch/arm/kernel/kgdb.c
146 ---- linux-2.6.32.32/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
147 -+++ linux-2.6.32.32/arch/arm/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
148 +diff -urNp linux-2.6.32.33/arch/arm/kernel/kgdb.c linux-2.6.32.33/arch/arm/kernel/kgdb.c
149 +--- linux-2.6.32.33/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
150 ++++ linux-2.6.32.33/arch/arm/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
151 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
152 * and we handle the normal undef case within the do_undefinstr
153 * handler.
154 @@ -306,9 +306,9 @@ diff -urNp linux-2.6.32.32/arch/arm/kernel/kgdb.c linux-2.6.32.32/arch/arm/kerne
155 #ifndef __ARMEB__
156 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
157 #else /* ! __ARMEB__ */
158 -diff -urNp linux-2.6.32.32/arch/arm/mach-at91/pm.c linux-2.6.32.32/arch/arm/mach-at91/pm.c
159 ---- linux-2.6.32.32/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
160 -+++ linux-2.6.32.32/arch/arm/mach-at91/pm.c 2010-12-31 14:46:53.000000000 -0500
161 +diff -urNp linux-2.6.32.33/arch/arm/mach-at91/pm.c linux-2.6.32.33/arch/arm/mach-at91/pm.c
162 +--- linux-2.6.32.33/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
163 ++++ linux-2.6.32.33/arch/arm/mach-at91/pm.c 2010-12-31 14:46:53.000000000 -0500
164 @@ -348,7 +348,7 @@ static void at91_pm_end(void)
165 }
166
167 @@ -318,9 +318,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-at91/pm.c linux-2.6.32.32/arch/arm/mach
168 .valid = at91_pm_valid_state,
169 .begin = at91_pm_begin,
170 .enter = at91_pm_enter,
171 -diff -urNp linux-2.6.32.32/arch/arm/mach-omap1/pm.c linux-2.6.32.32/arch/arm/mach-omap1/pm.c
172 ---- linux-2.6.32.32/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
173 -+++ linux-2.6.32.32/arch/arm/mach-omap1/pm.c 2010-12-31 14:46:53.000000000 -0500
174 +diff -urNp linux-2.6.32.33/arch/arm/mach-omap1/pm.c linux-2.6.32.33/arch/arm/mach-omap1/pm.c
175 +--- linux-2.6.32.33/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
176 ++++ linux-2.6.32.33/arch/arm/mach-omap1/pm.c 2010-12-31 14:46:53.000000000 -0500
177 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
178
179
180 @@ -330,9 +330,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-omap1/pm.c linux-2.6.32.32/arch/arm/mac
181 .prepare = omap_pm_prepare,
182 .enter = omap_pm_enter,
183 .finish = omap_pm_finish,
184 -diff -urNp linux-2.6.32.32/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.32/arch/arm/mach-omap2/pm24xx.c
185 ---- linux-2.6.32.32/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
186 -+++ linux-2.6.32.32/arch/arm/mach-omap2/pm24xx.c 2010-12-31 14:46:53.000000000 -0500
187 +diff -urNp linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c
188 +--- linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
189 ++++ linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c 2010-12-31 14:46:53.000000000 -0500
190 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
191 enable_hlt();
192 }
193 @@ -342,9 +342,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.32/arch/arm
194 .prepare = omap2_pm_prepare,
195 .enter = omap2_pm_enter,
196 .finish = omap2_pm_finish,
197 -diff -urNp linux-2.6.32.32/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.32/arch/arm/mach-omap2/pm34xx.c
198 ---- linux-2.6.32.32/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
199 -+++ linux-2.6.32.32/arch/arm/mach-omap2/pm34xx.c 2010-12-31 14:46:53.000000000 -0500
200 +diff -urNp linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c
201 +--- linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
202 ++++ linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c 2010-12-31 14:46:53.000000000 -0500
203 @@ -401,7 +401,7 @@ static void omap3_pm_end(void)
204 return;
205 }
206 @@ -354,9 +354,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.32/arch/arm
207 .begin = omap3_pm_begin,
208 .end = omap3_pm_end,
209 .prepare = omap3_pm_prepare,
210 -diff -urNp linux-2.6.32.32/arch/arm/mach-pnx4008/pm.c linux-2.6.32.32/arch/arm/mach-pnx4008/pm.c
211 ---- linux-2.6.32.32/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
212 -+++ linux-2.6.32.32/arch/arm/mach-pnx4008/pm.c 2010-12-31 14:46:53.000000000 -0500
213 +diff -urNp linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c
214 +--- linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
215 ++++ linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c 2010-12-31 14:46:53.000000000 -0500
216 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
217 (state == PM_SUSPEND_MEM);
218 }
219 @@ -366,9 +366,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-pnx4008/pm.c linux-2.6.32.32/arch/arm/m
220 .enter = pnx4008_pm_enter,
221 .valid = pnx4008_pm_valid,
222 };
223 -diff -urNp linux-2.6.32.32/arch/arm/mach-pxa/pm.c linux-2.6.32.32/arch/arm/mach-pxa/pm.c
224 ---- linux-2.6.32.32/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
225 -+++ linux-2.6.32.32/arch/arm/mach-pxa/pm.c 2010-12-31 14:46:53.000000000 -0500
226 +diff -urNp linux-2.6.32.33/arch/arm/mach-pxa/pm.c linux-2.6.32.33/arch/arm/mach-pxa/pm.c
227 +--- linux-2.6.32.33/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
228 ++++ linux-2.6.32.33/arch/arm/mach-pxa/pm.c 2010-12-31 14:46:53.000000000 -0500
229 @@ -95,7 +95,7 @@ void pxa_pm_finish(void)
230 pxa_cpu_pm_fns->finish();
231 }
232 @@ -378,9 +378,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-pxa/pm.c linux-2.6.32.32/arch/arm/mach-
233 .valid = pxa_pm_valid,
234 .enter = pxa_pm_enter,
235 .prepare = pxa_pm_prepare,
236 -diff -urNp linux-2.6.32.32/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.32/arch/arm/mach-pxa/sharpsl_pm.c
237 ---- linux-2.6.32.32/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
238 -+++ linux-2.6.32.32/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-31 14:46:53.000000000 -0500
239 +diff -urNp linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c
240 +--- linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
241 ++++ linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-31 14:46:53.000000000 -0500
242 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
243 }
244
245 @@ -390,9 +390,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.32/arch/a
246 .prepare = pxa_pm_prepare,
247 .finish = pxa_pm_finish,
248 .enter = corgi_pxa_pm_enter,
249 -diff -urNp linux-2.6.32.32/arch/arm/mach-sa1100/pm.c linux-2.6.32.32/arch/arm/mach-sa1100/pm.c
250 ---- linux-2.6.32.32/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
251 -+++ linux-2.6.32.32/arch/arm/mach-sa1100/pm.c 2010-12-31 14:46:53.000000000 -0500
252 +diff -urNp linux-2.6.32.33/arch/arm/mach-sa1100/pm.c linux-2.6.32.33/arch/arm/mach-sa1100/pm.c
253 +--- linux-2.6.32.33/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
254 ++++ linux-2.6.32.33/arch/arm/mach-sa1100/pm.c 2010-12-31 14:46:53.000000000 -0500
255 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
256 return virt_to_phys(sp);
257 }
258 @@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mach-sa1100/pm.c linux-2.6.32.32/arch/arm/ma
259 .enter = sa11x0_pm_enter,
260 .valid = suspend_valid_only_mem,
261 };
262 -diff -urNp linux-2.6.32.32/arch/arm/mm/fault.c linux-2.6.32.32/arch/arm/mm/fault.c
263 ---- linux-2.6.32.32/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
264 -+++ linux-2.6.32.32/arch/arm/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
265 +diff -urNp linux-2.6.32.33/arch/arm/mm/fault.c linux-2.6.32.33/arch/arm/mm/fault.c
266 +--- linux-2.6.32.33/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
267 ++++ linux-2.6.32.33/arch/arm/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
268 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
269 }
270 #endif
271 @@ -453,9 +453,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mm/fault.c linux-2.6.32.32/arch/arm/mm/fault
272 /*
273 * First Level Translation Fault Handler
274 *
275 -diff -urNp linux-2.6.32.32/arch/arm/mm/mmap.c linux-2.6.32.32/arch/arm/mm/mmap.c
276 ---- linux-2.6.32.32/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
277 -+++ linux-2.6.32.32/arch/arm/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
278 +diff -urNp linux-2.6.32.33/arch/arm/mm/mmap.c linux-2.6.32.33/arch/arm/mm/mmap.c
279 +--- linux-2.6.32.33/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
280 ++++ linux-2.6.32.33/arch/arm/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
281 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
282 if (len > TASK_SIZE)
283 return -ENOMEM;
284 @@ -505,9 +505,9 @@ diff -urNp linux-2.6.32.32/arch/arm/mm/mmap.c linux-2.6.32.32/arch/arm/mm/mmap.c
285 /*
286 * Remember the place where we stopped the search:
287 */
288 -diff -urNp linux-2.6.32.32/arch/arm/plat-s3c/pm.c linux-2.6.32.32/arch/arm/plat-s3c/pm.c
289 ---- linux-2.6.32.32/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
290 -+++ linux-2.6.32.32/arch/arm/plat-s3c/pm.c 2010-12-31 14:46:53.000000000 -0500
291 +diff -urNp linux-2.6.32.33/arch/arm/plat-s3c/pm.c linux-2.6.32.33/arch/arm/plat-s3c/pm.c
292 +--- linux-2.6.32.33/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
293 ++++ linux-2.6.32.33/arch/arm/plat-s3c/pm.c 2010-12-31 14:46:53.000000000 -0500
294 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
295 s3c_pm_check_cleanup();
296 }
297 @@ -517,9 +517,9 @@ diff -urNp linux-2.6.32.32/arch/arm/plat-s3c/pm.c linux-2.6.32.32/arch/arm/plat-
298 .enter = s3c_pm_enter,
299 .prepare = s3c_pm_prepare,
300 .finish = s3c_pm_finish,
301 -diff -urNp linux-2.6.32.32/arch/avr32/include/asm/elf.h linux-2.6.32.32/arch/avr32/include/asm/elf.h
302 ---- linux-2.6.32.32/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
303 -+++ linux-2.6.32.32/arch/avr32/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
304 +diff -urNp linux-2.6.32.33/arch/avr32/include/asm/elf.h linux-2.6.32.33/arch/avr32/include/asm/elf.h
305 +--- linux-2.6.32.33/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
306 ++++ linux-2.6.32.33/arch/avr32/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
307 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
308 the loader. We need to make sure that it is out of the way of the program
309 that it will "exec", and that there is sufficient room for the brk. */
310 @@ -536,9 +536,9 @@ diff -urNp linux-2.6.32.32/arch/avr32/include/asm/elf.h linux-2.6.32.32/arch/avr
311
312 /* This yields a mask that user programs can use to figure out what
313 instruction set this CPU supports. This could be done in user space,
314 -diff -urNp linux-2.6.32.32/arch/avr32/include/asm/kmap_types.h linux-2.6.32.32/arch/avr32/include/asm/kmap_types.h
315 ---- linux-2.6.32.32/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
316 -+++ linux-2.6.32.32/arch/avr32/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
317 +diff -urNp linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h
318 +--- linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
319 ++++ linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
320 @@ -22,7 +22,8 @@ D(10) KM_IRQ0,
321 D(11) KM_IRQ1,
322 D(12) KM_SOFTIRQ0,
323 @@ -549,9 +549,9 @@ diff -urNp linux-2.6.32.32/arch/avr32/include/asm/kmap_types.h linux-2.6.32.32/a
324 };
325
326 #undef D
327 -diff -urNp linux-2.6.32.32/arch/avr32/mach-at32ap/pm.c linux-2.6.32.32/arch/avr32/mach-at32ap/pm.c
328 ---- linux-2.6.32.32/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
329 -+++ linux-2.6.32.32/arch/avr32/mach-at32ap/pm.c 2010-12-31 14:46:53.000000000 -0500
330 +diff -urNp linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c
331 +--- linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
332 ++++ linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c 2010-12-31 14:46:53.000000000 -0500
333 @@ -176,7 +176,7 @@ out:
334 return 0;
335 }
336 @@ -561,9 +561,9 @@ diff -urNp linux-2.6.32.32/arch/avr32/mach-at32ap/pm.c linux-2.6.32.32/arch/avr3
337 .valid = avr32_pm_valid_state,
338 .enter = avr32_pm_enter,
339 };
340 -diff -urNp linux-2.6.32.32/arch/avr32/mm/fault.c linux-2.6.32.32/arch/avr32/mm/fault.c
341 ---- linux-2.6.32.32/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
342 -+++ linux-2.6.32.32/arch/avr32/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
343 +diff -urNp linux-2.6.32.33/arch/avr32/mm/fault.c linux-2.6.32.33/arch/avr32/mm/fault.c
344 +--- linux-2.6.32.33/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
345 ++++ linux-2.6.32.33/arch/avr32/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
346 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
347
348 int exception_trace = 1;
349 @@ -605,9 +605,9 @@ diff -urNp linux-2.6.32.32/arch/avr32/mm/fault.c linux-2.6.32.32/arch/avr32/mm/f
350 if (exception_trace && printk_ratelimit())
351 printk("%s%s[%d]: segfault at %08lx pc %08lx "
352 "sp %08lx ecr %lu\n",
353 -diff -urNp linux-2.6.32.32/arch/blackfin/kernel/kgdb.c linux-2.6.32.32/arch/blackfin/kernel/kgdb.c
354 ---- linux-2.6.32.32/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
355 -+++ linux-2.6.32.32/arch/blackfin/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
356 +diff -urNp linux-2.6.32.33/arch/blackfin/kernel/kgdb.c linux-2.6.32.33/arch/blackfin/kernel/kgdb.c
357 +--- linux-2.6.32.33/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
358 ++++ linux-2.6.32.33/arch/blackfin/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
359 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
360 return -1; /* this means that we do not want to exit from the handler */
361 }
362 @@ -617,9 +617,9 @@ diff -urNp linux-2.6.32.32/arch/blackfin/kernel/kgdb.c linux-2.6.32.32/arch/blac
363 .gdb_bpt_instr = {0xa1},
364 #ifdef CONFIG_SMP
365 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
366 -diff -urNp linux-2.6.32.32/arch/blackfin/mach-common/pm.c linux-2.6.32.32/arch/blackfin/mach-common/pm.c
367 ---- linux-2.6.32.32/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
368 -+++ linux-2.6.32.32/arch/blackfin/mach-common/pm.c 2010-12-31 14:46:53.000000000 -0500
369 +diff -urNp linux-2.6.32.33/arch/blackfin/mach-common/pm.c linux-2.6.32.33/arch/blackfin/mach-common/pm.c
370 +--- linux-2.6.32.33/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
371 ++++ linux-2.6.32.33/arch/blackfin/mach-common/pm.c 2010-12-31 14:46:53.000000000 -0500
372 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
373 return 0;
374 }
375 @@ -629,9 +629,9 @@ diff -urNp linux-2.6.32.32/arch/blackfin/mach-common/pm.c linux-2.6.32.32/arch/b
376 .enter = bfin_pm_enter,
377 .valid = bfin_pm_valid,
378 };
379 -diff -urNp linux-2.6.32.32/arch/frv/include/asm/kmap_types.h linux-2.6.32.32/arch/frv/include/asm/kmap_types.h
380 ---- linux-2.6.32.32/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
381 -+++ linux-2.6.32.32/arch/frv/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
382 +diff -urNp linux-2.6.32.33/arch/frv/include/asm/kmap_types.h linux-2.6.32.33/arch/frv/include/asm/kmap_types.h
383 +--- linux-2.6.32.33/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
384 ++++ linux-2.6.32.33/arch/frv/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
385 @@ -23,6 +23,7 @@ enum km_type {
386 KM_IRQ1,
387 KM_SOFTIRQ0,
388 @@ -640,9 +640,9 @@ diff -urNp linux-2.6.32.32/arch/frv/include/asm/kmap_types.h linux-2.6.32.32/arc
389 KM_TYPE_NR
390 };
391
392 -diff -urNp linux-2.6.32.32/arch/frv/mm/elf-fdpic.c linux-2.6.32.32/arch/frv/mm/elf-fdpic.c
393 ---- linux-2.6.32.32/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
394 -+++ linux-2.6.32.32/arch/frv/mm/elf-fdpic.c 2010-12-31 14:46:53.000000000 -0500
395 +diff -urNp linux-2.6.32.33/arch/frv/mm/elf-fdpic.c linux-2.6.32.33/arch/frv/mm/elf-fdpic.c
396 +--- linux-2.6.32.33/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
397 ++++ linux-2.6.32.33/arch/frv/mm/elf-fdpic.c 2010-12-31 14:46:53.000000000 -0500
398 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
399 if (addr) {
400 addr = PAGE_ALIGN(addr);
401 @@ -671,9 +671,9 @@ diff -urNp linux-2.6.32.32/arch/frv/mm/elf-fdpic.c linux-2.6.32.32/arch/frv/mm/e
402 goto success;
403 addr = vma->vm_end;
404 }
405 -diff -urNp linux-2.6.32.32/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.32/arch/ia64/hp/common/hwsw_iommu.c
406 ---- linux-2.6.32.32/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
407 -+++ linux-2.6.32.32/arch/ia64/hp/common/hwsw_iommu.c 2010-12-31 14:46:53.000000000 -0500
408 +diff -urNp linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c
409 +--- linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
410 ++++ linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c 2010-12-31 14:46:53.000000000 -0500
411 @@ -17,7 +17,7 @@
412 #include <linux/swiotlb.h>
413 #include <asm/machvec.h>
414 @@ -692,9 +692,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.32/arch
415 {
416 if (use_swiotlb(dev))
417 return &swiotlb_dma_ops;
418 -diff -urNp linux-2.6.32.32/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.32/arch/ia64/hp/common/sba_iommu.c
419 ---- linux-2.6.32.32/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
420 -+++ linux-2.6.32.32/arch/ia64/hp/common/sba_iommu.c 2010-12-31 14:46:53.000000000 -0500
421 +diff -urNp linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c
422 +--- linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
423 ++++ linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c 2010-12-31 14:46:53.000000000 -0500
424 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
425 },
426 };
427 @@ -713,9 +713,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.32/arch/
428 .alloc_coherent = sba_alloc_coherent,
429 .free_coherent = sba_free_coherent,
430 .map_page = sba_map_page,
431 -diff -urNp linux-2.6.32.32/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.32/arch/ia64/ia32/binfmt_elf32.c
432 ---- linux-2.6.32.32/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
433 -+++ linux-2.6.32.32/arch/ia64/ia32/binfmt_elf32.c 2010-12-31 14:46:53.000000000 -0500
434 +diff -urNp linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c
435 +--- linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
436 ++++ linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c 2010-12-31 14:46:53.000000000 -0500
437 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
438
439 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
440 @@ -730,9 +730,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.32/arch/ia
441 /* Ugly but avoids duplication */
442 #include "../../../fs/binfmt_elf.c"
443
444 -diff -urNp linux-2.6.32.32/arch/ia64/ia32/ia32priv.h linux-2.6.32.32/arch/ia64/ia32/ia32priv.h
445 ---- linux-2.6.32.32/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
446 -+++ linux-2.6.32.32/arch/ia64/ia32/ia32priv.h 2010-12-31 14:46:53.000000000 -0500
447 +diff -urNp linux-2.6.32.33/arch/ia64/ia32/ia32priv.h linux-2.6.32.33/arch/ia64/ia32/ia32priv.h
448 +--- linux-2.6.32.33/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
449 ++++ linux-2.6.32.33/arch/ia64/ia32/ia32priv.h 2010-12-31 14:46:53.000000000 -0500
450 @@ -296,7 +296,14 @@ typedef struct compat_siginfo {
451 #define ELF_DATA ELFDATA2LSB
452 #define ELF_ARCH EM_386
453 @@ -749,9 +749,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/ia32/ia32priv.h linux-2.6.32.32/arch/ia64/i
454 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
455 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
456
457 -diff -urNp linux-2.6.32.32/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.32/arch/ia64/include/asm/dma-mapping.h
458 ---- linux-2.6.32.32/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
459 -+++ linux-2.6.32.32/arch/ia64/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
460 +diff -urNp linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h
461 +--- linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
462 ++++ linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
463 @@ -12,7 +12,7 @@
464
465 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
466 @@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.32/a
467 return ops->dma_supported(dev, mask);
468 }
469
470 -diff -urNp linux-2.6.32.32/arch/ia64/include/asm/elf.h linux-2.6.32.32/arch/ia64/include/asm/elf.h
471 ---- linux-2.6.32.32/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
472 -+++ linux-2.6.32.32/arch/ia64/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
473 +diff -urNp linux-2.6.32.33/arch/ia64/include/asm/elf.h linux-2.6.32.33/arch/ia64/include/asm/elf.h
474 +--- linux-2.6.32.33/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
475 ++++ linux-2.6.32.33/arch/ia64/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
476 @@ -43,6 +43,13 @@
477 */
478 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
479 @@ -812,9 +812,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/include/asm/elf.h linux-2.6.32.32/arch/ia64
480 #define PT_IA_64_UNWIND 0x70000001
481
482 /* IA-64 relocations: */
483 -diff -urNp linux-2.6.32.32/arch/ia64/include/asm/machvec.h linux-2.6.32.32/arch/ia64/include/asm/machvec.h
484 ---- linux-2.6.32.32/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
485 -+++ linux-2.6.32.32/arch/ia64/include/asm/machvec.h 2010-12-31 14:46:53.000000000 -0500
486 +diff -urNp linux-2.6.32.33/arch/ia64/include/asm/machvec.h linux-2.6.32.33/arch/ia64/include/asm/machvec.h
487 +--- linux-2.6.32.33/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
488 ++++ linux-2.6.32.33/arch/ia64/include/asm/machvec.h 2010-12-31 14:46:53.000000000 -0500
489 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
490 /* DMA-mapping interface: */
491 typedef void ia64_mv_dma_init (void);
492 @@ -833,9 +833,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/include/asm/machvec.h linux-2.6.32.32/arch/
493
494 /*
495 * Define default versions so we can extend machvec for new platforms without having
496 -diff -urNp linux-2.6.32.32/arch/ia64/include/asm/pgtable.h linux-2.6.32.32/arch/ia64/include/asm/pgtable.h
497 ---- linux-2.6.32.32/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
498 -+++ linux-2.6.32.32/arch/ia64/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
499 +diff -urNp linux-2.6.32.33/arch/ia64/include/asm/pgtable.h linux-2.6.32.33/arch/ia64/include/asm/pgtable.h
500 +--- linux-2.6.32.33/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
501 ++++ linux-2.6.32.33/arch/ia64/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
502 @@ -12,7 +12,7 @@
503 * David Mosberger-Tang <davidm@××××××.com>
504 */
505 @@ -863,9 +863,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/include/asm/pgtable.h linux-2.6.32.32/arch/
506 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
507 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
508 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
509 -diff -urNp linux-2.6.32.32/arch/ia64/include/asm/spinlock.h linux-2.6.32.32/arch/ia64/include/asm/spinlock.h
510 ---- linux-2.6.32.32/arch/ia64/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
511 -+++ linux-2.6.32.32/arch/ia64/include/asm/spinlock.h 2011-02-27 14:53:10.000000000 -0500
512 +diff -urNp linux-2.6.32.33/arch/ia64/include/asm/spinlock.h linux-2.6.32.33/arch/ia64/include/asm/spinlock.h
513 +--- linux-2.6.32.33/arch/ia64/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
514 ++++ linux-2.6.32.33/arch/ia64/include/asm/spinlock.h 2011-02-27 14:53:10.000000000 -0500
515 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
516 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
517
518 @@ -875,9 +875,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/include/asm/spinlock.h linux-2.6.32.32/arch
519 }
520
521 static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
522 -diff -urNp linux-2.6.32.32/arch/ia64/include/asm/uaccess.h linux-2.6.32.32/arch/ia64/include/asm/uaccess.h
523 ---- linux-2.6.32.32/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
524 -+++ linux-2.6.32.32/arch/ia64/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
525 +diff -urNp linux-2.6.32.33/arch/ia64/include/asm/uaccess.h linux-2.6.32.33/arch/ia64/include/asm/uaccess.h
526 +--- linux-2.6.32.33/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
527 ++++ linux-2.6.32.33/arch/ia64/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
528 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
529 const void *__cu_from = (from); \
530 long __cu_len = (n); \
531 @@ -896,9 +896,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/include/asm/uaccess.h linux-2.6.32.32/arch/
532 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
533 __cu_len; \
534 })
535 -diff -urNp linux-2.6.32.32/arch/ia64/kernel/dma-mapping.c linux-2.6.32.32/arch/ia64/kernel/dma-mapping.c
536 ---- linux-2.6.32.32/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
537 -+++ linux-2.6.32.32/arch/ia64/kernel/dma-mapping.c 2010-12-31 14:46:53.000000000 -0500
538 +diff -urNp linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c
539 +--- linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
540 ++++ linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c 2010-12-31 14:46:53.000000000 -0500
541 @@ -3,7 +3,7 @@
542 /* Set this to 1 if there is a HW IOMMU in the system */
543 int iommu_detected __read_mostly;
544 @@ -917,9 +917,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/kernel/dma-mapping.c linux-2.6.32.32/arch/i
545 {
546 return dma_ops;
547 }
548 -diff -urNp linux-2.6.32.32/arch/ia64/kernel/module.c linux-2.6.32.32/arch/ia64/kernel/module.c
549 ---- linux-2.6.32.32/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
550 -+++ linux-2.6.32.32/arch/ia64/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
551 +diff -urNp linux-2.6.32.33/arch/ia64/kernel/module.c linux-2.6.32.33/arch/ia64/kernel/module.c
552 +--- linux-2.6.32.33/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
553 ++++ linux-2.6.32.33/arch/ia64/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
554 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
555 void
556 module_free (struct module *mod, void *module_region)
557 @@ -1008,9 +1008,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/kernel/module.c linux-2.6.32.32/arch/ia64/k
558 mod->arch.gp = gp;
559 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
560 }
561 -diff -urNp linux-2.6.32.32/arch/ia64/kernel/pci-dma.c linux-2.6.32.32/arch/ia64/kernel/pci-dma.c
562 ---- linux-2.6.32.32/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
563 -+++ linux-2.6.32.32/arch/ia64/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
564 +diff -urNp linux-2.6.32.33/arch/ia64/kernel/pci-dma.c linux-2.6.32.33/arch/ia64/kernel/pci-dma.c
565 +--- linux-2.6.32.33/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
566 ++++ linux-2.6.32.33/arch/ia64/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
567 @@ -43,7 +43,7 @@ struct device fallback_dev = {
568 .dma_mask = &fallback_dev.coherent_dma_mask,
569 };
570 @@ -1062,9 +1062,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/kernel/pci-dma.c linux-2.6.32.32/arch/ia64/
571
572 /*
573 * The order of these functions is important for
574 -diff -urNp linux-2.6.32.32/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.32/arch/ia64/kernel/pci-swiotlb.c
575 ---- linux-2.6.32.32/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
576 -+++ linux-2.6.32.32/arch/ia64/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
577 +diff -urNp linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c
578 +--- linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
579 ++++ linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
580 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
581 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
582 }
583 @@ -1074,9 +1074,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.32/arch/i
584 .alloc_coherent = ia64_swiotlb_alloc_coherent,
585 .free_coherent = swiotlb_free_coherent,
586 .map_page = swiotlb_map_page,
587 -diff -urNp linux-2.6.32.32/arch/ia64/kernel/sys_ia64.c linux-2.6.32.32/arch/ia64/kernel/sys_ia64.c
588 ---- linux-2.6.32.32/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
589 -+++ linux-2.6.32.32/arch/ia64/kernel/sys_ia64.c 2010-12-31 14:46:53.000000000 -0500
590 +diff -urNp linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c
591 +--- linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
592 ++++ linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c 2010-12-31 14:46:53.000000000 -0500
593 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
594 if (REGION_NUMBER(addr) == RGN_HPAGE)
595 addr = 0;
596 @@ -1109,9 +1109,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/kernel/sys_ia64.c linux-2.6.32.32/arch/ia64
597 /* Remember the address where we stopped this search: */
598 mm->free_area_cache = addr + len;
599 return addr;
600 -diff -urNp linux-2.6.32.32/arch/ia64/kernel/topology.c linux-2.6.32.32/arch/ia64/kernel/topology.c
601 ---- linux-2.6.32.32/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
602 -+++ linux-2.6.32.32/arch/ia64/kernel/topology.c 2010-12-31 14:46:53.000000000 -0500
603 +diff -urNp linux-2.6.32.33/arch/ia64/kernel/topology.c linux-2.6.32.33/arch/ia64/kernel/topology.c
604 +--- linux-2.6.32.33/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
605 ++++ linux-2.6.32.33/arch/ia64/kernel/topology.c 2010-12-31 14:46:53.000000000 -0500
606 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
607 return ret;
608 }
609 @@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/kernel/topology.c linux-2.6.32.32/arch/ia64
610 .show = cache_show
611 };
612
613 -diff -urNp linux-2.6.32.32/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.32/arch/ia64/kernel/vmlinux.lds.S
614 ---- linux-2.6.32.32/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
615 -+++ linux-2.6.32.32/arch/ia64/kernel/vmlinux.lds.S 2010-12-31 14:46:53.000000000 -0500
616 +diff -urNp linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S
617 +--- linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
618 ++++ linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S 2010-12-31 14:46:53.000000000 -0500
619 @@ -190,7 +190,7 @@ SECTIONS
620 /* Per-cpu data: */
621 . = ALIGN(PERCPU_PAGE_SIZE);
622 @@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.32/arch/i
623 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
624 * into percpu page size
625 */
626 -diff -urNp linux-2.6.32.32/arch/ia64/mm/fault.c linux-2.6.32.32/arch/ia64/mm/fault.c
627 ---- linux-2.6.32.32/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
628 -+++ linux-2.6.32.32/arch/ia64/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
629 +diff -urNp linux-2.6.32.33/arch/ia64/mm/fault.c linux-2.6.32.33/arch/ia64/mm/fault.c
630 +--- linux-2.6.32.33/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
631 ++++ linux-2.6.32.33/arch/ia64/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
632 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
633 return pte_present(pte);
634 }
635 @@ -1185,9 +1185,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/mm/fault.c linux-2.6.32.32/arch/ia64/mm/fau
636 survive:
637 /*
638 * If for any reason at all we couldn't handle the fault, make
639 -diff -urNp linux-2.6.32.32/arch/ia64/mm/hugetlbpage.c linux-2.6.32.32/arch/ia64/mm/hugetlbpage.c
640 ---- linux-2.6.32.32/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
641 -+++ linux-2.6.32.32/arch/ia64/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
642 +diff -urNp linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c
643 +--- linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
644 ++++ linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
645 @@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
646 /* At this point: (!vmm || addr < vmm->vm_end). */
647 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
648 @@ -1197,9 +1197,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/mm/hugetlbpage.c linux-2.6.32.32/arch/ia64/
649 return addr;
650 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
651 }
652 -diff -urNp linux-2.6.32.32/arch/ia64/mm/init.c linux-2.6.32.32/arch/ia64/mm/init.c
653 ---- linux-2.6.32.32/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
654 -+++ linux-2.6.32.32/arch/ia64/mm/init.c 2010-12-31 14:46:53.000000000 -0500
655 +diff -urNp linux-2.6.32.33/arch/ia64/mm/init.c linux-2.6.32.33/arch/ia64/mm/init.c
656 +--- linux-2.6.32.33/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
657 ++++ linux-2.6.32.33/arch/ia64/mm/init.c 2010-12-31 14:46:53.000000000 -0500
658 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
659 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
660 vma->vm_end = vma->vm_start + PAGE_SIZE;
661 @@ -1220,9 +1220,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/mm/init.c linux-2.6.32.32/arch/ia64/mm/init
662 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
663 down_write(&current->mm->mmap_sem);
664 if (insert_vm_struct(current->mm, vma)) {
665 -diff -urNp linux-2.6.32.32/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.32/arch/ia64/sn/pci/pci_dma.c
666 ---- linux-2.6.32.32/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
667 -+++ linux-2.6.32.32/arch/ia64/sn/pci/pci_dma.c 2010-12-31 14:46:53.000000000 -0500
668 +diff -urNp linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c
669 +--- linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
670 ++++ linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c 2010-12-31 14:46:53.000000000 -0500
671 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
672 return ret;
673 }
674 @@ -1232,9 +1232,9 @@ diff -urNp linux-2.6.32.32/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.32/arch/ia64/
675 .alloc_coherent = sn_dma_alloc_coherent,
676 .free_coherent = sn_dma_free_coherent,
677 .map_page = sn_dma_map_page,
678 -diff -urNp linux-2.6.32.32/arch/m32r/lib/usercopy.c linux-2.6.32.32/arch/m32r/lib/usercopy.c
679 ---- linux-2.6.32.32/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
680 -+++ linux-2.6.32.32/arch/m32r/lib/usercopy.c 2010-12-31 14:46:53.000000000 -0500
681 +diff -urNp linux-2.6.32.33/arch/m32r/lib/usercopy.c linux-2.6.32.33/arch/m32r/lib/usercopy.c
682 +--- linux-2.6.32.33/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
683 ++++ linux-2.6.32.33/arch/m32r/lib/usercopy.c 2010-12-31 14:46:53.000000000 -0500
684 @@ -14,6 +14,9 @@
685 unsigned long
686 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
687 @@ -1255,9 +1255,9 @@ diff -urNp linux-2.6.32.32/arch/m32r/lib/usercopy.c linux-2.6.32.32/arch/m32r/li
688 prefetchw(to);
689 if (access_ok(VERIFY_READ, from, n))
690 __copy_user_zeroing(to,from,n);
691 -diff -urNp linux-2.6.32.32/arch/mips/alchemy/devboards/pm.c linux-2.6.32.32/arch/mips/alchemy/devboards/pm.c
692 ---- linux-2.6.32.32/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
693 -+++ linux-2.6.32.32/arch/mips/alchemy/devboards/pm.c 2010-12-31 14:46:53.000000000 -0500
694 +diff -urNp linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c
695 +--- linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
696 ++++ linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c 2010-12-31 14:46:53.000000000 -0500
697 @@ -78,7 +78,7 @@ static void db1x_pm_end(void)
698
699 }
700 @@ -1267,9 +1267,9 @@ diff -urNp linux-2.6.32.32/arch/mips/alchemy/devboards/pm.c linux-2.6.32.32/arch
701 .valid = suspend_valid_only_mem,
702 .begin = db1x_pm_begin,
703 .enter = db1x_pm_enter,
704 -diff -urNp linux-2.6.32.32/arch/mips/include/asm/elf.h linux-2.6.32.32/arch/mips/include/asm/elf.h
705 ---- linux-2.6.32.32/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
706 -+++ linux-2.6.32.32/arch/mips/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
707 +diff -urNp linux-2.6.32.33/arch/mips/include/asm/elf.h linux-2.6.32.33/arch/mips/include/asm/elf.h
708 +--- linux-2.6.32.33/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
709 ++++ linux-2.6.32.33/arch/mips/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
710 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
711 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
712 #endif
713 @@ -1282,9 +1282,9 @@ diff -urNp linux-2.6.32.32/arch/mips/include/asm/elf.h linux-2.6.32.32/arch/mips
714 +#endif
715 +
716 #endif /* _ASM_ELF_H */
717 -diff -urNp linux-2.6.32.32/arch/mips/include/asm/page.h linux-2.6.32.32/arch/mips/include/asm/page.h
718 ---- linux-2.6.32.32/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
719 -+++ linux-2.6.32.32/arch/mips/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
720 +diff -urNp linux-2.6.32.33/arch/mips/include/asm/page.h linux-2.6.32.33/arch/mips/include/asm/page.h
721 +--- linux-2.6.32.33/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
722 ++++ linux-2.6.32.33/arch/mips/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
723 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
724 #ifdef CONFIG_CPU_MIPS32
725 typedef struct { unsigned long pte_low, pte_high; } pte_t;
726 @@ -1294,9 +1294,9 @@ diff -urNp linux-2.6.32.32/arch/mips/include/asm/page.h linux-2.6.32.32/arch/mip
727 #else
728 typedef struct { unsigned long long pte; } pte_t;
729 #define pte_val(x) ((x).pte)
730 -diff -urNp linux-2.6.32.32/arch/mips/include/asm/system.h linux-2.6.32.32/arch/mips/include/asm/system.h
731 ---- linux-2.6.32.32/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
732 -+++ linux-2.6.32.32/arch/mips/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
733 +diff -urNp linux-2.6.32.33/arch/mips/include/asm/system.h linux-2.6.32.33/arch/mips/include/asm/system.h
734 +--- linux-2.6.32.33/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
735 ++++ linux-2.6.32.33/arch/mips/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
736 @@ -23,6 +23,7 @@
737 #include <asm/dsp.h>
738 #include <asm/watch.h>
739 @@ -1313,9 +1313,9 @@ diff -urNp linux-2.6.32.32/arch/mips/include/asm/system.h linux-2.6.32.32/arch/m
740 +#define arch_align_stack(x) ((x) & ALMASK)
741
742 #endif /* _ASM_SYSTEM_H */
743 -diff -urNp linux-2.6.32.32/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.32/arch/mips/kernel/binfmt_elfn32.c
744 ---- linux-2.6.32.32/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
745 -+++ linux-2.6.32.32/arch/mips/kernel/binfmt_elfn32.c 2010-12-31 14:46:53.000000000 -0500
746 +diff -urNp linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c
747 +--- linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
748 ++++ linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c 2010-12-31 14:46:53.000000000 -0500
749 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
750 #undef ELF_ET_DYN_BASE
751 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
752 @@ -1330,9 +1330,9 @@ diff -urNp linux-2.6.32.32/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.32/arch
753 #include <asm/processor.h>
754 #include <linux/module.h>
755 #include <linux/elfcore.h>
756 -diff -urNp linux-2.6.32.32/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.32/arch/mips/kernel/binfmt_elfo32.c
757 ---- linux-2.6.32.32/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
758 -+++ linux-2.6.32.32/arch/mips/kernel/binfmt_elfo32.c 2010-12-31 14:46:53.000000000 -0500
759 +diff -urNp linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c
760 +--- linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
761 ++++ linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c 2010-12-31 14:46:53.000000000 -0500
762 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
763 #undef ELF_ET_DYN_BASE
764 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
765 @@ -1347,9 +1347,9 @@ diff -urNp linux-2.6.32.32/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.32/arch
766 #include <asm/processor.h>
767
768 /*
769 -diff -urNp linux-2.6.32.32/arch/mips/kernel/kgdb.c linux-2.6.32.32/arch/mips/kernel/kgdb.c
770 ---- linux-2.6.32.32/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
771 -+++ linux-2.6.32.32/arch/mips/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
772 +diff -urNp linux-2.6.32.33/arch/mips/kernel/kgdb.c linux-2.6.32.33/arch/mips/kernel/kgdb.c
773 +--- linux-2.6.32.33/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
774 ++++ linux-2.6.32.33/arch/mips/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
775 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
776 return -1;
777 }
778 @@ -1358,9 +1358,9 @@ diff -urNp linux-2.6.32.32/arch/mips/kernel/kgdb.c linux-2.6.32.32/arch/mips/ker
779 struct kgdb_arch arch_kgdb_ops;
780
781 /*
782 -diff -urNp linux-2.6.32.32/arch/mips/kernel/process.c linux-2.6.32.32/arch/mips/kernel/process.c
783 ---- linux-2.6.32.32/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
784 -+++ linux-2.6.32.32/arch/mips/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
785 +diff -urNp linux-2.6.32.33/arch/mips/kernel/process.c linux-2.6.32.33/arch/mips/kernel/process.c
786 +--- linux-2.6.32.33/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
787 ++++ linux-2.6.32.33/arch/mips/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
788 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
789 out:
790 return pc;
791 @@ -1377,9 +1377,9 @@ diff -urNp linux-2.6.32.32/arch/mips/kernel/process.c linux-2.6.32.32/arch/mips/
792 -
793 - return sp & ALMASK;
794 -}
795 -diff -urNp linux-2.6.32.32/arch/mips/kernel/syscall.c linux-2.6.32.32/arch/mips/kernel/syscall.c
796 ---- linux-2.6.32.32/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
797 -+++ linux-2.6.32.32/arch/mips/kernel/syscall.c 2010-12-31 14:46:53.000000000 -0500
798 +diff -urNp linux-2.6.32.33/arch/mips/kernel/syscall.c linux-2.6.32.33/arch/mips/kernel/syscall.c
799 +--- linux-2.6.32.33/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
800 ++++ linux-2.6.32.33/arch/mips/kernel/syscall.c 2010-12-31 14:46:53.000000000 -0500
801 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
802 do_color_align = 0;
803 if (filp || (flags & MAP_SHARED))
804 @@ -1414,9 +1414,9 @@ diff -urNp linux-2.6.32.32/arch/mips/kernel/syscall.c linux-2.6.32.32/arch/mips/
805 return addr;
806 addr = vmm->vm_end;
807 if (do_color_align)
808 -diff -urNp linux-2.6.32.32/arch/mips/mm/fault.c linux-2.6.32.32/arch/mips/mm/fault.c
809 ---- linux-2.6.32.32/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
810 -+++ linux-2.6.32.32/arch/mips/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
811 +diff -urNp linux-2.6.32.33/arch/mips/mm/fault.c linux-2.6.32.33/arch/mips/mm/fault.c
812 +--- linux-2.6.32.33/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
813 ++++ linux-2.6.32.33/arch/mips/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
814 @@ -26,6 +26,23 @@
815 #include <asm/ptrace.h>
816 #include <asm/highmem.h> /* For VMALLOC_END */
817 @@ -1441,9 +1441,9 @@ diff -urNp linux-2.6.32.32/arch/mips/mm/fault.c linux-2.6.32.32/arch/mips/mm/fau
818 /*
819 * This routine handles page faults. It determines the address,
820 * and the problem, and then passes it off to one of the appropriate
821 -diff -urNp linux-2.6.32.32/arch/parisc/include/asm/elf.h linux-2.6.32.32/arch/parisc/include/asm/elf.h
822 ---- linux-2.6.32.32/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
823 -+++ linux-2.6.32.32/arch/parisc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
824 +diff -urNp linux-2.6.32.33/arch/parisc/include/asm/elf.h linux-2.6.32.33/arch/parisc/include/asm/elf.h
825 +--- linux-2.6.32.33/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
826 ++++ linux-2.6.32.33/arch/parisc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
827 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
828
829 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
830 @@ -1458,9 +1458,9 @@ diff -urNp linux-2.6.32.32/arch/parisc/include/asm/elf.h linux-2.6.32.32/arch/pa
831 /* This yields a mask that user programs can use to figure out what
832 instruction set this CPU supports. This could be done in user space,
833 but it's not easy, and we've already done it here. */
834 -diff -urNp linux-2.6.32.32/arch/parisc/include/asm/pgtable.h linux-2.6.32.32/arch/parisc/include/asm/pgtable.h
835 ---- linux-2.6.32.32/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
836 -+++ linux-2.6.32.32/arch/parisc/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
837 +diff -urNp linux-2.6.32.33/arch/parisc/include/asm/pgtable.h linux-2.6.32.33/arch/parisc/include/asm/pgtable.h
838 +--- linux-2.6.32.33/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
839 ++++ linux-2.6.32.33/arch/parisc/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
840 @@ -207,6 +207,17 @@
841 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
842 #define PAGE_COPY PAGE_EXECREAD
843 @@ -1479,9 +1479,9 @@ diff -urNp linux-2.6.32.32/arch/parisc/include/asm/pgtable.h linux-2.6.32.32/arc
844 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
845 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
846 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
847 -diff -urNp linux-2.6.32.32/arch/parisc/kernel/module.c linux-2.6.32.32/arch/parisc/kernel/module.c
848 ---- linux-2.6.32.32/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
849 -+++ linux-2.6.32.32/arch/parisc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
850 +diff -urNp linux-2.6.32.33/arch/parisc/kernel/module.c linux-2.6.32.33/arch/parisc/kernel/module.c
851 +--- linux-2.6.32.33/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
852 ++++ linux-2.6.32.33/arch/parisc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
853 @@ -95,16 +95,38 @@
854
855 /* three functions to determine where in the module core
856 @@ -1582,9 +1582,9 @@ diff -urNp linux-2.6.32.32/arch/parisc/kernel/module.c linux-2.6.32.32/arch/pari
857
858 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
859 me->arch.unwind_section, table, end, gp);
860 -diff -urNp linux-2.6.32.32/arch/parisc/kernel/sys_parisc.c linux-2.6.32.32/arch/parisc/kernel/sys_parisc.c
861 ---- linux-2.6.32.32/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
862 -+++ linux-2.6.32.32/arch/parisc/kernel/sys_parisc.c 2010-12-31 14:46:53.000000000 -0500
863 +diff -urNp linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c
864 +--- linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
865 ++++ linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c 2010-12-31 14:46:53.000000000 -0500
866 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
867 /* At this point: (!vma || addr < vma->vm_end). */
868 if (TASK_SIZE - len < addr)
869 @@ -1612,9 +1612,9 @@ diff -urNp linux-2.6.32.32/arch/parisc/kernel/sys_parisc.c linux-2.6.32.32/arch/
870
871 if (filp) {
872 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
873 -diff -urNp linux-2.6.32.32/arch/parisc/kernel/traps.c linux-2.6.32.32/arch/parisc/kernel/traps.c
874 ---- linux-2.6.32.32/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
875 -+++ linux-2.6.32.32/arch/parisc/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
876 +diff -urNp linux-2.6.32.33/arch/parisc/kernel/traps.c linux-2.6.32.33/arch/parisc/kernel/traps.c
877 +--- linux-2.6.32.33/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
878 ++++ linux-2.6.32.33/arch/parisc/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
879 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
880
881 down_read(&current->mm->mmap_sem);
882 @@ -1626,9 +1626,9 @@ diff -urNp linux-2.6.32.32/arch/parisc/kernel/traps.c linux-2.6.32.32/arch/paris
883 fault_address = regs->iaoq[0];
884 fault_space = regs->iasq[0];
885
886 -diff -urNp linux-2.6.32.32/arch/parisc/mm/fault.c linux-2.6.32.32/arch/parisc/mm/fault.c
887 ---- linux-2.6.32.32/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
888 -+++ linux-2.6.32.32/arch/parisc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
889 +diff -urNp linux-2.6.32.33/arch/parisc/mm/fault.c linux-2.6.32.33/arch/parisc/mm/fault.c
890 +--- linux-2.6.32.33/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
891 ++++ linux-2.6.32.33/arch/parisc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
892 @@ -15,6 +15,7 @@
893 #include <linux/sched.h>
894 #include <linux/interrupt.h>
895 @@ -1798,9 +1798,9 @@ diff -urNp linux-2.6.32.32/arch/parisc/mm/fault.c linux-2.6.32.32/arch/parisc/mm
896
897 /*
898 * If for any reason at all we couldn't handle the fault, make
899 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/device.h linux-2.6.32.32/arch/powerpc/include/asm/device.h
900 ---- linux-2.6.32.32/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
901 -+++ linux-2.6.32.32/arch/powerpc/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
902 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/device.h linux-2.6.32.33/arch/powerpc/include/asm/device.h
903 +--- linux-2.6.32.33/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
904 ++++ linux-2.6.32.33/arch/powerpc/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
905 @@ -14,7 +14,7 @@ struct dev_archdata {
906 struct device_node *of_node;
907
908 @@ -1810,9 +1810,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/device.h linux-2.6.32.32/arc
909
910 /*
911 * When an iommu is in use, dma_data is used as a ptr to the base of the
912 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.32/arch/powerpc/include/asm/dma-mapping.h
913 ---- linux-2.6.32.32/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
914 -+++ linux-2.6.32.32/arch/powerpc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
915 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h
916 +--- linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
917 ++++ linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
918 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
919 #ifdef CONFIG_PPC64
920 extern struct dma_map_ops dma_iommu_ops;
921 @@ -1879,9 +1879,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.3
922
923 if (dma_ops->mapping_error)
924 return dma_ops->mapping_error(dev, dma_addr);
925 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/elf.h linux-2.6.32.32/arch/powerpc/include/asm/elf.h
926 ---- linux-2.6.32.32/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
927 -+++ linux-2.6.32.32/arch/powerpc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
928 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/elf.h linux-2.6.32.33/arch/powerpc/include/asm/elf.h
929 +--- linux-2.6.32.33/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
930 ++++ linux-2.6.32.33/arch/powerpc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
931 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
932 the loader. We need to make sure that it is out of the way of the program
933 that it will "exec", and that there is sufficient room for the brk. */
934 @@ -1914,9 +1914,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/elf.h linux-2.6.32.32/arch/p
935 #endif /* __KERNEL__ */
936
937 /*
938 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/iommu.h linux-2.6.32.32/arch/powerpc/include/asm/iommu.h
939 ---- linux-2.6.32.32/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
940 -+++ linux-2.6.32.32/arch/powerpc/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
941 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/iommu.h linux-2.6.32.33/arch/powerpc/include/asm/iommu.h
942 +--- linux-2.6.32.33/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
943 ++++ linux-2.6.32.33/arch/powerpc/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
944 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
945 extern void iommu_init_early_dart(void);
946 extern void iommu_init_early_pasemi(void);
947 @@ -1927,9 +1927,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/iommu.h linux-2.6.32.32/arch
948 #ifdef CONFIG_PCI
949 extern void pci_iommu_init(void);
950 extern void pci_direct_iommu_init(void);
951 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.32/arch/powerpc/include/asm/kmap_types.h
952 ---- linux-2.6.32.32/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
953 -+++ linux-2.6.32.32/arch/powerpc/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
954 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h
955 +--- linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
956 ++++ linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
957 @@ -26,6 +26,7 @@ enum km_type {
958 KM_SOFTIRQ1,
959 KM_PPC_SYNC_PAGE,
960 @@ -1938,9 +1938,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.32
961 KM_TYPE_NR
962 };
963
964 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/page_64.h linux-2.6.32.32/arch/powerpc/include/asm/page_64.h
965 ---- linux-2.6.32.32/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
966 -+++ linux-2.6.32.32/arch/powerpc/include/asm/page_64.h 2010-12-31 14:46:53.000000000 -0500
967 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/page_64.h linux-2.6.32.33/arch/powerpc/include/asm/page_64.h
968 +--- linux-2.6.32.33/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
969 ++++ linux-2.6.32.33/arch/powerpc/include/asm/page_64.h 2010-12-31 14:46:53.000000000 -0500
970 @@ -180,15 +180,18 @@ do { \
971 * stack by default, so in the absense of a PT_GNU_STACK program header
972 * we turn execute permission off.
973 @@ -1962,9 +1962,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/page_64.h linux-2.6.32.32/ar
974
975 #include <asm-generic/getorder.h>
976
977 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/page.h linux-2.6.32.32/arch/powerpc/include/asm/page.h
978 ---- linux-2.6.32.32/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
979 -+++ linux-2.6.32.32/arch/powerpc/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
980 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/page.h linux-2.6.32.33/arch/powerpc/include/asm/page.h
981 +--- linux-2.6.32.33/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
982 ++++ linux-2.6.32.33/arch/powerpc/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
983 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
984 * and needs to be executable. This means the whole heap ends
985 * up being executable.
986 @@ -1987,9 +1987,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/page.h linux-2.6.32.32/arch/
987 #ifndef __ASSEMBLY__
988
989 #undef STRICT_MM_TYPECHECKS
990 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/pci.h linux-2.6.32.32/arch/powerpc/include/asm/pci.h
991 ---- linux-2.6.32.32/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
992 -+++ linux-2.6.32.32/arch/powerpc/include/asm/pci.h 2010-12-31 14:46:53.000000000 -0500
993 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pci.h linux-2.6.32.33/arch/powerpc/include/asm/pci.h
994 +--- linux-2.6.32.33/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
995 ++++ linux-2.6.32.33/arch/powerpc/include/asm/pci.h 2010-12-31 14:46:53.000000000 -0500
996 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
997 }
998
999 @@ -2001,9 +2001,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/pci.h linux-2.6.32.32/arch/p
1000 #else /* CONFIG_PCI */
1001 #define set_pci_dma_ops(d)
1002 #define get_pci_dma_ops() NULL
1003 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/pgtable.h linux-2.6.32.32/arch/powerpc/include/asm/pgtable.h
1004 ---- linux-2.6.32.32/arch/powerpc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
1005 -+++ linux-2.6.32.32/arch/powerpc/include/asm/pgtable.h 2011-02-27 14:53:10.000000000 -0500
1006 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h
1007 +--- linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
1008 ++++ linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h 2011-02-27 14:53:10.000000000 -0500
1009 @@ -2,6 +2,7 @@
1010 #define _ASM_POWERPC_PGTABLE_H
1011 #ifdef __KERNEL__
1012 @@ -2012,9 +2012,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/pgtable.h linux-2.6.32.32/ar
1013 #ifndef __ASSEMBLY__
1014 #include <asm/processor.h> /* For TASK_SIZE */
1015 #include <asm/mmu.h>
1016 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.32/arch/powerpc/include/asm/pte-hash32.h
1017 ---- linux-2.6.32.32/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
1018 -+++ linux-2.6.32.32/arch/powerpc/include/asm/pte-hash32.h 2010-12-31 14:46:53.000000000 -0500
1019 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h
1020 +--- linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
1021 ++++ linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h 2010-12-31 14:46:53.000000000 -0500
1022 @@ -21,6 +21,7 @@
1023 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1024 #define _PAGE_USER 0x004 /* usermode access allowed */
1025 @@ -2023,9 +2023,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.32
1026 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1027 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1028 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1029 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/reg.h linux-2.6.32.32/arch/powerpc/include/asm/reg.h
1030 ---- linux-2.6.32.32/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
1031 -+++ linux-2.6.32.32/arch/powerpc/include/asm/reg.h 2010-12-31 14:46:53.000000000 -0500
1032 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/reg.h linux-2.6.32.33/arch/powerpc/include/asm/reg.h
1033 +--- linux-2.6.32.33/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
1034 ++++ linux-2.6.32.33/arch/powerpc/include/asm/reg.h 2010-12-31 14:46:53.000000000 -0500
1035 @@ -191,6 +191,7 @@
1036 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1037 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
1038 @@ -2034,9 +2034,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/reg.h linux-2.6.32.32/arch/p
1039 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1040 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1041 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1042 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.32/arch/powerpc/include/asm/swiotlb.h
1043 ---- linux-2.6.32.32/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
1044 -+++ linux-2.6.32.32/arch/powerpc/include/asm/swiotlb.h 2010-12-31 14:46:53.000000000 -0500
1045 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h
1046 +--- linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
1047 ++++ linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h 2010-12-31 14:46:53.000000000 -0500
1048 @@ -13,7 +13,7 @@
1049
1050 #include <linux/swiotlb.h>
1051 @@ -2046,9 +2046,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.32/ar
1052
1053 static inline void dma_mark_clean(void *addr, size_t size) {}
1054
1055 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/system.h linux-2.6.32.32/arch/powerpc/include/asm/system.h
1056 ---- linux-2.6.32.32/arch/powerpc/include/asm/system.h 2011-02-22 15:56:54.000000000 -0500
1057 -+++ linux-2.6.32.32/arch/powerpc/include/asm/system.h 2011-02-22 15:57:23.000000000 -0500
1058 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/system.h linux-2.6.32.33/arch/powerpc/include/asm/system.h
1059 +--- linux-2.6.32.33/arch/powerpc/include/asm/system.h 2011-02-22 15:56:54.000000000 -0500
1060 ++++ linux-2.6.32.33/arch/powerpc/include/asm/system.h 2011-02-22 15:57:23.000000000 -0500
1061 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
1062 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
1063 #endif
1064 @@ -2058,9 +2058,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/system.h linux-2.6.32.32/arc
1065
1066 /* Used in very early kernel initialization. */
1067 extern unsigned long reloc_offset(void);
1068 -diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/uaccess.h linux-2.6.32.32/arch/powerpc/include/asm/uaccess.h
1069 ---- linux-2.6.32.32/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1070 -+++ linux-2.6.32.32/arch/powerpc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1071 +diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h
1072 +--- linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1073 ++++ linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1074 @@ -13,6 +13,8 @@
1075 #define VERIFY_READ 0
1076 #define VERIFY_WRITE 1
1077 @@ -2238,9 +2238,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/include/asm/uaccess.h linux-2.6.32.32/ar
1078 extern unsigned long __clear_user(void __user *addr, unsigned long size);
1079
1080 static inline unsigned long clear_user(void __user *addr, unsigned long size)
1081 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.32/arch/powerpc/kernel/cacheinfo.c
1082 ---- linux-2.6.32.32/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
1083 -+++ linux-2.6.32.32/arch/powerpc/kernel/cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
1084 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c
1085 +--- linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
1086 ++++ linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
1087 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
1088 &cache_assoc_attr,
1089 };
1090 @@ -2250,9 +2250,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.32/arch/
1091 .show = cache_index_show,
1092 };
1093
1094 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/dma.c linux-2.6.32.32/arch/powerpc/kernel/dma.c
1095 ---- linux-2.6.32.32/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
1096 -+++ linux-2.6.32.32/arch/powerpc/kernel/dma.c 2010-12-31 14:46:53.000000000 -0500
1097 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma.c linux-2.6.32.33/arch/powerpc/kernel/dma.c
1098 +--- linux-2.6.32.33/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
1099 ++++ linux-2.6.32.33/arch/powerpc/kernel/dma.c 2010-12-31 14:46:53.000000000 -0500
1100 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
1101 }
1102 #endif
1103 @@ -2262,9 +2262,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/dma.c linux-2.6.32.32/arch/powerp
1104 .alloc_coherent = dma_direct_alloc_coherent,
1105 .free_coherent = dma_direct_free_coherent,
1106 .map_sg = dma_direct_map_sg,
1107 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.32/arch/powerpc/kernel/dma-iommu.c
1108 ---- linux-2.6.32.32/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
1109 -+++ linux-2.6.32.32/arch/powerpc/kernel/dma-iommu.c 2010-12-31 14:46:53.000000000 -0500
1110 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c
1111 +--- linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
1112 ++++ linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c 2010-12-31 14:46:53.000000000 -0500
1113 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
1114 }
1115
1116 @@ -2274,9 +2274,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.32/arch/
1117 {
1118 struct iommu_table *tbl = get_iommu_table_base(dev);
1119
1120 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.32/arch/powerpc/kernel/dma-swiotlb.c
1121 ---- linux-2.6.32.32/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
1122 -+++ linux-2.6.32.32/arch/powerpc/kernel/dma-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
1123 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c
1124 +--- linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
1125 ++++ linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
1126 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
1127 * map_page, and unmap_page on highmem, use normal dma_ops
1128 * for everything else.
1129 @@ -2286,9 +2286,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.32/arc
1130 .alloc_coherent = dma_direct_alloc_coherent,
1131 .free_coherent = dma_direct_free_coherent,
1132 .map_sg = swiotlb_map_sg_attrs,
1133 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.32/arch/powerpc/kernel/exceptions-64e.S
1134 ---- linux-2.6.32.32/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
1135 -+++ linux-2.6.32.32/arch/powerpc/kernel/exceptions-64e.S 2010-12-31 14:46:53.000000000 -0500
1136 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S
1137 +--- linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
1138 ++++ linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S 2010-12-31 14:46:53.000000000 -0500
1139 @@ -455,6 +455,7 @@ storage_fault_common:
1140 std r14,_DAR(r1)
1141 std r15,_DSISR(r1)
1142 @@ -2307,9 +2307,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.32/
1143 addi r3,r1,STACK_FRAME_OVERHEAD
1144 ld r4,_DAR(r1)
1145 bl .bad_page_fault
1146 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.32/arch/powerpc/kernel/exceptions-64s.S
1147 ---- linux-2.6.32.32/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
1148 -+++ linux-2.6.32.32/arch/powerpc/kernel/exceptions-64s.S 2010-12-31 14:46:53.000000000 -0500
1149 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S
1150 +--- linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
1151 ++++ linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S 2010-12-31 14:46:53.000000000 -0500
1152 @@ -818,10 +818,10 @@ handle_page_fault:
1153 11: ld r4,_DAR(r1)
1154 ld r5,_DSISR(r1)
1155 @@ -2322,9 +2322,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.32/
1156 mr r5,r3
1157 addi r3,r1,STACK_FRAME_OVERHEAD
1158 lwz r4,_DAR(r1)
1159 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/ibmebus.c linux-2.6.32.32/arch/powerpc/kernel/ibmebus.c
1160 ---- linux-2.6.32.32/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
1161 -+++ linux-2.6.32.32/arch/powerpc/kernel/ibmebus.c 2010-12-31 14:46:53.000000000 -0500
1162 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c
1163 +--- linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
1164 ++++ linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c 2010-12-31 14:46:53.000000000 -0500
1165 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
1166 return 1;
1167 }
1168 @@ -2334,9 +2334,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/ibmebus.c linux-2.6.32.32/arch/po
1169 .alloc_coherent = ibmebus_alloc_coherent,
1170 .free_coherent = ibmebus_free_coherent,
1171 .map_sg = ibmebus_map_sg,
1172 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/kgdb.c linux-2.6.32.32/arch/powerpc/kernel/kgdb.c
1173 ---- linux-2.6.32.32/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1174 -+++ linux-2.6.32.32/arch/powerpc/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1175 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/kgdb.c linux-2.6.32.33/arch/powerpc/kernel/kgdb.c
1176 +--- linux-2.6.32.33/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1177 ++++ linux-2.6.32.33/arch/powerpc/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1178 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
1179 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
1180 return 0;
1181 @@ -2355,9 +2355,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/kgdb.c linux-2.6.32.32/arch/power
1182 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
1183 };
1184
1185 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/module_32.c linux-2.6.32.32/arch/powerpc/kernel/module_32.c
1186 ---- linux-2.6.32.32/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
1187 -+++ linux-2.6.32.32/arch/powerpc/kernel/module_32.c 2010-12-31 14:46:53.000000000 -0500
1188 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/module_32.c linux-2.6.32.33/arch/powerpc/kernel/module_32.c
1189 +--- linux-2.6.32.33/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
1190 ++++ linux-2.6.32.33/arch/powerpc/kernel/module_32.c 2010-12-31 14:46:53.000000000 -0500
1191 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
1192 me->arch.core_plt_section = i;
1193 }
1194 @@ -2387,9 +2387,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/module_32.c linux-2.6.32.32/arch/
1195
1196 /* Find this entry, or if that fails, the next avail. entry */
1197 while (entry->jump[0]) {
1198 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/module.c linux-2.6.32.32/arch/powerpc/kernel/module.c
1199 ---- linux-2.6.32.32/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1200 -+++ linux-2.6.32.32/arch/powerpc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1201 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/module.c linux-2.6.32.33/arch/powerpc/kernel/module.c
1202 +--- linux-2.6.32.33/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1203 ++++ linux-2.6.32.33/arch/powerpc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1204 @@ -31,11 +31,24 @@
1205
1206 LIST_HEAD(module_bug_list);
1207 @@ -2429,9 +2429,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/module.c linux-2.6.32.32/arch/pow
1208 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
1209 const Elf_Shdr *sechdrs,
1210 const char *name)
1211 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/pci-common.c linux-2.6.32.32/arch/powerpc/kernel/pci-common.c
1212 ---- linux-2.6.32.32/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
1213 -+++ linux-2.6.32.32/arch/powerpc/kernel/pci-common.c 2010-12-31 14:46:53.000000000 -0500
1214 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/pci-common.c linux-2.6.32.33/arch/powerpc/kernel/pci-common.c
1215 +--- linux-2.6.32.33/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
1216 ++++ linux-2.6.32.33/arch/powerpc/kernel/pci-common.c 2010-12-31 14:46:53.000000000 -0500
1217 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
1218 unsigned int ppc_pci_flags = 0;
1219
1220 @@ -2450,9 +2450,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/pci-common.c linux-2.6.32.32/arch
1221 {
1222 return pci_dma_ops;
1223 }
1224 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/process.c linux-2.6.32.32/arch/powerpc/kernel/process.c
1225 ---- linux-2.6.32.32/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1226 -+++ linux-2.6.32.32/arch/powerpc/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1227 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/process.c linux-2.6.32.33/arch/powerpc/kernel/process.c
1228 +--- linux-2.6.32.33/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1229 ++++ linux-2.6.32.33/arch/powerpc/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1230 @@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
1231 * Lookup NIP late so we have the best change of getting the
1232 * above info out without failing
1233 @@ -2545,9 +2545,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/process.c linux-2.6.32.32/arch/po
1234 -
1235 - return ret;
1236 -}
1237 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/signal_32.c linux-2.6.32.32/arch/powerpc/kernel/signal_32.c
1238 ---- linux-2.6.32.32/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
1239 -+++ linux-2.6.32.32/arch/powerpc/kernel/signal_32.c 2010-12-31 14:46:53.000000000 -0500
1240 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/signal_32.c linux-2.6.32.33/arch/powerpc/kernel/signal_32.c
1241 +--- linux-2.6.32.33/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
1242 ++++ linux-2.6.32.33/arch/powerpc/kernel/signal_32.c 2010-12-31 14:46:53.000000000 -0500
1243 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
1244 /* Save user registers on the stack */
1245 frame = &rt_sf->uc.uc_mcontext;
1246 @@ -2557,9 +2557,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/signal_32.c linux-2.6.32.32/arch/
1247 if (save_user_regs(regs, frame, 0, 1))
1248 goto badframe;
1249 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
1250 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/signal_64.c linux-2.6.32.32/arch/powerpc/kernel/signal_64.c
1251 ---- linux-2.6.32.32/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
1252 -+++ linux-2.6.32.32/arch/powerpc/kernel/signal_64.c 2010-12-31 14:46:53.000000000 -0500
1253 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/signal_64.c linux-2.6.32.33/arch/powerpc/kernel/signal_64.c
1254 +--- linux-2.6.32.33/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
1255 ++++ linux-2.6.32.33/arch/powerpc/kernel/signal_64.c 2010-12-31 14:46:53.000000000 -0500
1256 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
1257 current->thread.fpscr.val = 0;
1258
1259 @@ -2569,9 +2569,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/signal_64.c linux-2.6.32.32/arch/
1260 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
1261 } else {
1262 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
1263 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.32/arch/powerpc/kernel/sys_ppc32.c
1264 ---- linux-2.6.32.32/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
1265 -+++ linux-2.6.32.32/arch/powerpc/kernel/sys_ppc32.c 2010-12-31 14:46:53.000000000 -0500
1266 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c
1267 +--- linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
1268 ++++ linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c 2010-12-31 14:46:53.000000000 -0500
1269 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
1270 if (oldlenp) {
1271 if (!error) {
1272 @@ -2585,9 +2585,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.32/arch/
1273 }
1274 return error;
1275 }
1276 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/vdso.c linux-2.6.32.32/arch/powerpc/kernel/vdso.c
1277 ---- linux-2.6.32.32/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
1278 -+++ linux-2.6.32.32/arch/powerpc/kernel/vdso.c 2010-12-31 14:46:53.000000000 -0500
1279 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/vdso.c linux-2.6.32.33/arch/powerpc/kernel/vdso.c
1280 +--- linux-2.6.32.33/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
1281 ++++ linux-2.6.32.33/arch/powerpc/kernel/vdso.c 2010-12-31 14:46:53.000000000 -0500
1282 @@ -36,6 +36,7 @@
1283 #include <asm/firmware.h>
1284 #include <asm/vdso.h>
1285 @@ -2614,9 +2614,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/vdso.c linux-2.6.32.32/arch/power
1286 if (IS_ERR_VALUE(vdso_base)) {
1287 rc = vdso_base;
1288 goto fail_mmapsem;
1289 -diff -urNp linux-2.6.32.32/arch/powerpc/kernel/vio.c linux-2.6.32.32/arch/powerpc/kernel/vio.c
1290 ---- linux-2.6.32.32/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
1291 -+++ linux-2.6.32.32/arch/powerpc/kernel/vio.c 2010-12-31 14:46:53.000000000 -0500
1292 +diff -urNp linux-2.6.32.33/arch/powerpc/kernel/vio.c linux-2.6.32.33/arch/powerpc/kernel/vio.c
1293 +--- linux-2.6.32.33/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
1294 ++++ linux-2.6.32.33/arch/powerpc/kernel/vio.c 2010-12-31 14:46:53.000000000 -0500
1295 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
1296 vio_cmo_dealloc(viodev, alloc_size);
1297 }
1298 @@ -2639,9 +2639,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/kernel/vio.c linux-2.6.32.32/arch/powerp
1299 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
1300 }
1301
1302 -diff -urNp linux-2.6.32.32/arch/powerpc/lib/usercopy_64.c linux-2.6.32.32/arch/powerpc/lib/usercopy_64.c
1303 ---- linux-2.6.32.32/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
1304 -+++ linux-2.6.32.32/arch/powerpc/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
1305 +diff -urNp linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c
1306 +--- linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
1307 ++++ linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
1308 @@ -9,22 +9,6 @@
1309 #include <linux/module.h>
1310 #include <asm/uaccess.h>
1311 @@ -2673,9 +2673,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/lib/usercopy_64.c linux-2.6.32.32/arch/p
1312 -EXPORT_SYMBOL(copy_to_user);
1313 EXPORT_SYMBOL(copy_in_user);
1314
1315 -diff -urNp linux-2.6.32.32/arch/powerpc/mm/fault.c linux-2.6.32.32/arch/powerpc/mm/fault.c
1316 ---- linux-2.6.32.32/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
1317 -+++ linux-2.6.32.32/arch/powerpc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
1318 +diff -urNp linux-2.6.32.33/arch/powerpc/mm/fault.c linux-2.6.32.33/arch/powerpc/mm/fault.c
1319 +--- linux-2.6.32.33/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
1320 ++++ linux-2.6.32.33/arch/powerpc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
1321 @@ -30,6 +30,10 @@
1322 #include <linux/kprobes.h>
1323 #include <linux/kdebug.h>
1324 @@ -2780,9 +2780,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/mm/fault.c linux-2.6.32.32/arch/powerpc/
1325 _exception(SIGSEGV, regs, code, address);
1326 return 0;
1327 }
1328 -diff -urNp linux-2.6.32.32/arch/powerpc/mm/mmap_64.c linux-2.6.32.32/arch/powerpc/mm/mmap_64.c
1329 ---- linux-2.6.32.32/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
1330 -+++ linux-2.6.32.32/arch/powerpc/mm/mmap_64.c 2010-12-31 14:46:53.000000000 -0500
1331 +diff -urNp linux-2.6.32.33/arch/powerpc/mm/mmap_64.c linux-2.6.32.33/arch/powerpc/mm/mmap_64.c
1332 +--- linux-2.6.32.33/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
1333 ++++ linux-2.6.32.33/arch/powerpc/mm/mmap_64.c 2010-12-31 14:46:53.000000000 -0500
1334 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
1335 */
1336 if (mmap_is_legacy()) {
1337 @@ -2806,9 +2806,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/mm/mmap_64.c linux-2.6.32.32/arch/powerp
1338 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
1339 mm->unmap_area = arch_unmap_area_topdown;
1340 }
1341 -diff -urNp linux-2.6.32.32/arch/powerpc/mm/slice.c linux-2.6.32.32/arch/powerpc/mm/slice.c
1342 ---- linux-2.6.32.32/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
1343 -+++ linux-2.6.32.32/arch/powerpc/mm/slice.c 2010-12-31 14:46:53.000000000 -0500
1344 +diff -urNp linux-2.6.32.33/arch/powerpc/mm/slice.c linux-2.6.32.33/arch/powerpc/mm/slice.c
1345 +--- linux-2.6.32.33/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
1346 ++++ linux-2.6.32.33/arch/powerpc/mm/slice.c 2011-03-21 17:34:54.000000000 -0400
1347 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
1348 if ((mm->task_size - len) < addr)
1349 return 0;
1350 @@ -2827,7 +2827,25 @@ diff -urNp linux-2.6.32.32/arch/powerpc/mm/slice.c linux-2.6.32.32/arch/powerpc/
1351 /*
1352 * Remember the place where we stopped the search:
1353 */
1354 -@@ -336,7 +336,7 @@ static unsigned long slice_find_area_top
1355 +@@ -313,10 +313,14 @@ static unsigned long slice_find_area_top
1356 + }
1357 + }
1358 +
1359 +- addr = mm->mmap_base;
1360 +- while (addr > len) {
1361 ++ if (mm->mmap_base < len)
1362 ++ addr = -ENOMEM;
1363 ++ else
1364 ++ addr = mm->mmap_base - len;
1365 ++
1366 ++ while (!IS_ERR_VALUE(addr)) {
1367 + /* Go down by chunk size */
1368 +- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
1369 ++ addr = _ALIGN_DOWN(addr, 1ul << pshift);
1370 +
1371 + /* Check for hit with different page size */
1372 + mask = slice_range_to_mask(addr, len);
1373 +@@ -336,7 +340,7 @@ static unsigned long slice_find_area_top
1374 * return with success:
1375 */
1376 vma = find_vma(mm, addr);
1377 @@ -2836,7 +2854,16 @@ diff -urNp linux-2.6.32.32/arch/powerpc/mm/slice.c linux-2.6.32.32/arch/powerpc/
1378 /* remember the address as a hint for next time */
1379 if (use_cache)
1380 mm->free_area_cache = addr;
1381 -@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
1382 +@@ -348,7 +352,7 @@ static unsigned long slice_find_area_top
1383 + mm->cached_hole_size = vma->vm_start - addr;
1384 +
1385 + /* try just below the current vma->vm_start */
1386 +- addr = vma->vm_start;
1387 ++ addr = skip_heap_stack_gap(vma, len);
1388 + }
1389 +
1390 + /*
1391 +@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(un
1392 if (fixed && addr > (mm->task_size - len))
1393 return -EINVAL;
1394
1395 @@ -2848,9 +2875,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/mm/slice.c linux-2.6.32.32/arch/powerpc/
1396 /* If hint, make sure it matches our alignment restrictions */
1397 if (!fixed && addr) {
1398 addr = _ALIGN_UP(addr, 1ul << pshift);
1399 -diff -urNp linux-2.6.32.32/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.32/arch/powerpc/platforms/52xx/lite5200_pm.c
1400 ---- linux-2.6.32.32/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
1401 -+++ linux-2.6.32.32/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-31 14:46:53.000000000 -0500
1402 +diff -urNp linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c
1403 +--- linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
1404 ++++ linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-31 14:46:53.000000000 -0500
1405 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
1406 lite5200_pm_target_state = PM_SUSPEND_ON;
1407 }
1408 @@ -2860,9 +2887,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
1409 .valid = lite5200_pm_valid,
1410 .begin = lite5200_pm_begin,
1411 .prepare = lite5200_pm_prepare,
1412 -diff -urNp linux-2.6.32.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c
1413 ---- linux-2.6.32.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
1414 -+++ linux-2.6.32.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-31 14:46:53.000000000 -0500
1415 +diff -urNp linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c
1416 +--- linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
1417 ++++ linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-31 14:46:53.000000000 -0500
1418 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
1419 iounmap(mbar);
1420 }
1421 @@ -2872,9 +2899,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
1422 .valid = mpc52xx_pm_valid,
1423 .prepare = mpc52xx_pm_prepare,
1424 .enter = mpc52xx_pm_enter,
1425 -diff -urNp linux-2.6.32.32/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.32/arch/powerpc/platforms/83xx/suspend.c
1426 ---- linux-2.6.32.32/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
1427 -+++ linux-2.6.32.32/arch/powerpc/platforms/83xx/suspend.c 2010-12-31 14:46:53.000000000 -0500
1428 +diff -urNp linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c
1429 +--- linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
1430 ++++ linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c 2010-12-31 14:46:53.000000000 -0500
1431 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
1432 return ret;
1433 }
1434 @@ -2884,9 +2911,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.32
1435 .valid = mpc83xx_suspend_valid,
1436 .begin = mpc83xx_suspend_begin,
1437 .enter = mpc83xx_suspend_enter,
1438 -diff -urNp linux-2.6.32.32/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.32/arch/powerpc/platforms/cell/iommu.c
1439 ---- linux-2.6.32.32/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
1440 -+++ linux-2.6.32.32/arch/powerpc/platforms/cell/iommu.c 2010-12-31 14:46:53.000000000 -0500
1441 +diff -urNp linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c
1442 +--- linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
1443 ++++ linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c 2010-12-31 14:46:53.000000000 -0500
1444 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
1445
1446 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
1447 @@ -2896,9 +2923,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.32/a
1448 .alloc_coherent = dma_fixed_alloc_coherent,
1449 .free_coherent = dma_fixed_free_coherent,
1450 .map_sg = dma_fixed_map_sg,
1451 -diff -urNp linux-2.6.32.32/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.32/arch/powerpc/platforms/ps3/system-bus.c
1452 ---- linux-2.6.32.32/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
1453 -+++ linux-2.6.32.32/arch/powerpc/platforms/ps3/system-bus.c 2010-12-31 14:46:53.000000000 -0500
1454 +diff -urNp linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c
1455 +--- linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
1456 ++++ linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c 2010-12-31 14:46:53.000000000 -0500
1457 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
1458 return mask >= DMA_BIT_MASK(32);
1459 }
1460 @@ -2917,9 +2944,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
1461 .alloc_coherent = ps3_alloc_coherent,
1462 .free_coherent = ps3_free_coherent,
1463 .map_sg = ps3_ioc0_map_sg,
1464 -diff -urNp linux-2.6.32.32/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.32/arch/powerpc/platforms/pseries/Kconfig
1465 ---- linux-2.6.32.32/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
1466 -+++ linux-2.6.32.32/arch/powerpc/platforms/pseries/Kconfig 2010-12-31 14:46:53.000000000 -0500
1467 +diff -urNp linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig
1468 +--- linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
1469 ++++ linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig 2010-12-31 14:46:53.000000000 -0500
1470 @@ -2,6 +2,8 @@ config PPC_PSERIES
1471 depends on PPC64 && PPC_BOOK3S
1472 bool "IBM pSeries & new (POWER5-based) iSeries"
1473 @@ -2929,9 +2956,9 @@ diff -urNp linux-2.6.32.32/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.3
1474 select PPC_I8259
1475 select PPC_RTAS
1476 select RTAS_ERROR_LOGGING
1477 -diff -urNp linux-2.6.32.32/arch/s390/include/asm/elf.h linux-2.6.32.32/arch/s390/include/asm/elf.h
1478 ---- linux-2.6.32.32/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
1479 -+++ linux-2.6.32.32/arch/s390/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
1480 +diff -urNp linux-2.6.32.33/arch/s390/include/asm/elf.h linux-2.6.32.33/arch/s390/include/asm/elf.h
1481 +--- linux-2.6.32.33/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
1482 ++++ linux-2.6.32.33/arch/s390/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
1483 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
1484 that it will "exec", and that there is sufficient room for the brk. */
1485 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
1486 @@ -2946,9 +2973,9 @@ diff -urNp linux-2.6.32.32/arch/s390/include/asm/elf.h linux-2.6.32.32/arch/s390
1487 /* This yields a mask that user programs can use to figure out what
1488 instruction set this CPU supports. */
1489
1490 -diff -urNp linux-2.6.32.32/arch/s390/include/asm/setup.h linux-2.6.32.32/arch/s390/include/asm/setup.h
1491 ---- linux-2.6.32.32/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
1492 -+++ linux-2.6.32.32/arch/s390/include/asm/setup.h 2010-12-31 14:46:53.000000000 -0500
1493 +diff -urNp linux-2.6.32.33/arch/s390/include/asm/setup.h linux-2.6.32.33/arch/s390/include/asm/setup.h
1494 +--- linux-2.6.32.33/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
1495 ++++ linux-2.6.32.33/arch/s390/include/asm/setup.h 2010-12-31 14:46:53.000000000 -0500
1496 @@ -50,13 +50,13 @@ extern unsigned long memory_end;
1497 void detect_memory_layout(struct mem_chunk chunk[]);
1498
1499 @@ -2965,9 +2992,9 @@ diff -urNp linux-2.6.32.32/arch/s390/include/asm/setup.h linux-2.6.32.32/arch/s3
1500 #else
1501 #define s390_noexec (0)
1502 #endif
1503 -diff -urNp linux-2.6.32.32/arch/s390/include/asm/uaccess.h linux-2.6.32.32/arch/s390/include/asm/uaccess.h
1504 ---- linux-2.6.32.32/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1505 -+++ linux-2.6.32.32/arch/s390/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1506 +diff -urNp linux-2.6.32.33/arch/s390/include/asm/uaccess.h linux-2.6.32.33/arch/s390/include/asm/uaccess.h
1507 +--- linux-2.6.32.33/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1508 ++++ linux-2.6.32.33/arch/s390/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1509 @@ -232,6 +232,10 @@ static inline unsigned long __must_check
1510 copy_to_user(void __user *to, const void *from, unsigned long n)
1511 {
1512 @@ -3000,9 +3027,9 @@ diff -urNp linux-2.6.32.32/arch/s390/include/asm/uaccess.h linux-2.6.32.32/arch/
1513 if (access_ok(VERIFY_READ, from, n))
1514 n = __copy_from_user(to, from, n);
1515 else
1516 -diff -urNp linux-2.6.32.32/arch/s390/Kconfig linux-2.6.32.32/arch/s390/Kconfig
1517 ---- linux-2.6.32.32/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
1518 -+++ linux-2.6.32.32/arch/s390/Kconfig 2010-12-31 14:46:53.000000000 -0500
1519 +diff -urNp linux-2.6.32.33/arch/s390/Kconfig linux-2.6.32.33/arch/s390/Kconfig
1520 +--- linux-2.6.32.33/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
1521 ++++ linux-2.6.32.33/arch/s390/Kconfig 2010-12-31 14:46:53.000000000 -0500
1522 @@ -194,28 +194,26 @@ config AUDIT_ARCH
1523
1524 config S390_SWITCH_AMODE
1525 @@ -3040,9 +3067,9 @@ diff -urNp linux-2.6.32.32/arch/s390/Kconfig linux-2.6.32.32/arch/s390/Kconfig
1526
1527 comment "Code generation options"
1528
1529 -diff -urNp linux-2.6.32.32/arch/s390/kernel/module.c linux-2.6.32.32/arch/s390/kernel/module.c
1530 ---- linux-2.6.32.32/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1531 -+++ linux-2.6.32.32/arch/s390/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1532 +diff -urNp linux-2.6.32.33/arch/s390/kernel/module.c linux-2.6.32.33/arch/s390/kernel/module.c
1533 +--- linux-2.6.32.33/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1534 ++++ linux-2.6.32.33/arch/s390/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1535 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
1536
1537 /* Increase core size by size of got & plt and set start
1538 @@ -3114,9 +3141,9 @@ diff -urNp linux-2.6.32.32/arch/s390/kernel/module.c linux-2.6.32.32/arch/s390/k
1539 rela->r_addend - loc;
1540 if (r_type == R_390_GOTPC)
1541 *(unsigned int *) loc = val;
1542 -diff -urNp linux-2.6.32.32/arch/s390/kernel/setup.c linux-2.6.32.32/arch/s390/kernel/setup.c
1543 ---- linux-2.6.32.32/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
1544 -+++ linux-2.6.32.32/arch/s390/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
1545 +diff -urNp linux-2.6.32.33/arch/s390/kernel/setup.c linux-2.6.32.33/arch/s390/kernel/setup.c
1546 +--- linux-2.6.32.33/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
1547 ++++ linux-2.6.32.33/arch/s390/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
1548 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
1549 early_param("mem", early_parse_mem);
1550
1551 @@ -3170,9 +3197,9 @@ diff -urNp linux-2.6.32.32/arch/s390/kernel/setup.c linux-2.6.32.32/arch/s390/ke
1552 static void setup_addressing_mode(void)
1553 {
1554 if (s390_noexec) {
1555 -diff -urNp linux-2.6.32.32/arch/s390/mm/mmap.c linux-2.6.32.32/arch/s390/mm/mmap.c
1556 ---- linux-2.6.32.32/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1557 -+++ linux-2.6.32.32/arch/s390/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
1558 +diff -urNp linux-2.6.32.33/arch/s390/mm/mmap.c linux-2.6.32.33/arch/s390/mm/mmap.c
1559 +--- linux-2.6.32.33/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1560 ++++ linux-2.6.32.33/arch/s390/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
1561 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
1562 */
1563 if (mmap_is_legacy()) {
1564 @@ -3219,9 +3246,9 @@ diff -urNp linux-2.6.32.32/arch/s390/mm/mmap.c linux-2.6.32.32/arch/s390/mm/mmap
1565 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
1566 mm->unmap_area = arch_unmap_area_topdown;
1567 }
1568 -diff -urNp linux-2.6.32.32/arch/score/include/asm/system.h linux-2.6.32.32/arch/score/include/asm/system.h
1569 ---- linux-2.6.32.32/arch/score/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
1570 -+++ linux-2.6.32.32/arch/score/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
1571 +diff -urNp linux-2.6.32.33/arch/score/include/asm/system.h linux-2.6.32.33/arch/score/include/asm/system.h
1572 +--- linux-2.6.32.33/arch/score/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
1573 ++++ linux-2.6.32.33/arch/score/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
1574 @@ -17,7 +17,7 @@ do { \
1575 #define finish_arch_switch(prev) do {} while (0)
1576
1577 @@ -3231,9 +3258,9 @@ diff -urNp linux-2.6.32.32/arch/score/include/asm/system.h linux-2.6.32.32/arch/
1578
1579 #define mb() barrier()
1580 #define rmb() barrier()
1581 -diff -urNp linux-2.6.32.32/arch/score/kernel/process.c linux-2.6.32.32/arch/score/kernel/process.c
1582 ---- linux-2.6.32.32/arch/score/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1583 -+++ linux-2.6.32.32/arch/score/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1584 +diff -urNp linux-2.6.32.33/arch/score/kernel/process.c linux-2.6.32.33/arch/score/kernel/process.c
1585 +--- linux-2.6.32.33/arch/score/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1586 ++++ linux-2.6.32.33/arch/score/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1587 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
1588
1589 return task_pt_regs(task)->cp0_epc;
1590 @@ -3243,9 +3270,9 @@ diff -urNp linux-2.6.32.32/arch/score/kernel/process.c linux-2.6.32.32/arch/scor
1591 -{
1592 - return sp;
1593 -}
1594 -diff -urNp linux-2.6.32.32/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.32/arch/sh/boards/mach-hp6xx/pm.c
1595 ---- linux-2.6.32.32/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
1596 -+++ linux-2.6.32.32/arch/sh/boards/mach-hp6xx/pm.c 2010-12-31 14:46:53.000000000 -0500
1597 +diff -urNp linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c
1598 +--- linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
1599 ++++ linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c 2010-12-31 14:46:53.000000000 -0500
1600 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
1601 return 0;
1602 }
1603 @@ -3255,9 +3282,9 @@ diff -urNp linux-2.6.32.32/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.32/arch/s
1604 .enter = hp6x0_pm_enter,
1605 .valid = suspend_valid_only_mem,
1606 };
1607 -diff -urNp linux-2.6.32.32/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.32/arch/sh/kernel/cpu/sh4/sq.c
1608 ---- linux-2.6.32.32/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
1609 -+++ linux-2.6.32.32/arch/sh/kernel/cpu/sh4/sq.c 2010-12-31 14:46:53.000000000 -0500
1610 +diff -urNp linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c
1611 +--- linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
1612 ++++ linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c 2010-12-31 14:46:53.000000000 -0500
1613 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
1614 NULL,
1615 };
1616 @@ -3267,9 +3294,9 @@ diff -urNp linux-2.6.32.32/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.32/arch/sh/k
1617 .show = sq_sysfs_show,
1618 .store = sq_sysfs_store,
1619 };
1620 -diff -urNp linux-2.6.32.32/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.32/arch/sh/kernel/cpu/shmobile/pm.c
1621 ---- linux-2.6.32.32/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
1622 -+++ linux-2.6.32.32/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-31 14:46:53.000000000 -0500
1623 +diff -urNp linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c
1624 +--- linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
1625 ++++ linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-31 14:46:53.000000000 -0500
1626 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
1627 return 0;
1628 }
1629 @@ -3279,9 +3306,9 @@ diff -urNp linux-2.6.32.32/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.32/arch
1630 .enter = sh_pm_enter,
1631 .valid = suspend_valid_only_mem,
1632 };
1633 -diff -urNp linux-2.6.32.32/arch/sh/kernel/kgdb.c linux-2.6.32.32/arch/sh/kernel/kgdb.c
1634 ---- linux-2.6.32.32/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1635 -+++ linux-2.6.32.32/arch/sh/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1636 +diff -urNp linux-2.6.32.33/arch/sh/kernel/kgdb.c linux-2.6.32.33/arch/sh/kernel/kgdb.c
1637 +--- linux-2.6.32.33/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1638 ++++ linux-2.6.32.33/arch/sh/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1639 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
1640 {
1641 }
1642 @@ -3291,9 +3318,9 @@ diff -urNp linux-2.6.32.32/arch/sh/kernel/kgdb.c linux-2.6.32.32/arch/sh/kernel/
1643 /* Breakpoint instruction: trapa #0x3c */
1644 #ifdef CONFIG_CPU_LITTLE_ENDIAN
1645 .gdb_bpt_instr = { 0x3c, 0xc3 },
1646 -diff -urNp linux-2.6.32.32/arch/sh/mm/mmap.c linux-2.6.32.32/arch/sh/mm/mmap.c
1647 ---- linux-2.6.32.32/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1648 -+++ linux-2.6.32.32/arch/sh/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
1649 +diff -urNp linux-2.6.32.33/arch/sh/mm/mmap.c linux-2.6.32.33/arch/sh/mm/mmap.c
1650 +--- linux-2.6.32.33/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1651 ++++ linux-2.6.32.33/arch/sh/mm/mmap.c 2011-03-21 17:34:54.000000000 -0400
1652 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
1653 addr = PAGE_ALIGN(addr);
1654
1655 @@ -3332,7 +3359,21 @@ diff -urNp linux-2.6.32.32/arch/sh/mm/mmap.c linux-2.6.32.32/arch/sh/mm/mmap.c
1656 /* remember the address as a hint for next time */
1657 return (mm->free_area_cache = addr-len);
1658 }
1659 -@@ -199,7 +197,7 @@ arch_get_unmapped_area_topdown(struct fi
1660 +@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct fi
1661 + if (unlikely(mm->mmap_base < len))
1662 + goto bottomup;
1663 +
1664 +- addr = mm->mmap_base-len;
1665 +- if (do_colour_align)
1666 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
1667 ++ addr = mm->mmap_base - len;
1668 +
1669 + do {
1670 ++ if (do_colour_align)
1671 ++ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
1672 + /*
1673 + * Lookup failure means no vma is above this address,
1674 + * else if new region fits below vma->vm_start,
1675 * return with success:
1676 */
1677 vma = find_vma(mm, addr);
1678 @@ -3341,9 +3382,22 @@ diff -urNp linux-2.6.32.32/arch/sh/mm/mmap.c linux-2.6.32.32/arch/sh/mm/mmap.c
1679 /* remember the address as a hint for next time */
1680 return (mm->free_area_cache = addr);
1681 }
1682 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/atomic_64.h linux-2.6.32.32/arch/sparc/include/asm/atomic_64.h
1683 ---- linux-2.6.32.32/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
1684 -+++ linux-2.6.32.32/arch/sparc/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
1685 +@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct fi
1686 + mm->cached_hole_size = vma->vm_start - addr;
1687 +
1688 + /* try just below the current vma->vm_start */
1689 +- addr = vma->vm_start-len;
1690 +- if (do_colour_align)
1691 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
1692 +- } while (likely(len < vma->vm_start));
1693 ++ addr = skip_heap_stack_gap(vma, len);
1694 ++ } while (!IS_ERR_VALUE(addr));
1695 +
1696 + bottomup:
1697 + /*
1698 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h
1699 +--- linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
1700 ++++ linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
1701 @@ -14,18 +14,40 @@
1702 #define ATOMIC64_INIT(i) { (i) }
1703
1704 @@ -3494,9 +3548,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/atomic_64.h linux-2.6.32.32/ar
1705 }
1706
1707 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
1708 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.32/arch/sparc/include/asm/dma-mapping.h
1709 ---- linux-2.6.32.32/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
1710 -+++ linux-2.6.32.32/arch/sparc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
1711 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h
1712 +--- linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
1713 ++++ linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
1714 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
1715 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
1716 #define dma_is_consistent(d, h) (1)
1717 @@ -3528,9 +3582,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.32/
1718
1719 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
1720 ops->free_coherent(dev, size, cpu_addr, dma_handle);
1721 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/elf_32.h linux-2.6.32.32/arch/sparc/include/asm/elf_32.h
1722 ---- linux-2.6.32.32/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
1723 -+++ linux-2.6.32.32/arch/sparc/include/asm/elf_32.h 2010-12-31 14:46:53.000000000 -0500
1724 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/elf_32.h linux-2.6.32.33/arch/sparc/include/asm/elf_32.h
1725 +--- linux-2.6.32.33/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
1726 ++++ linux-2.6.32.33/arch/sparc/include/asm/elf_32.h 2010-12-31 14:46:53.000000000 -0500
1727 @@ -116,6 +116,13 @@ typedef struct {
1728
1729 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
1730 @@ -3545,9 +3599,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/elf_32.h linux-2.6.32.32/arch/
1731 /* This yields a mask that user programs can use to figure out what
1732 instruction set this cpu supports. This can NOT be done in userspace
1733 on Sparc. */
1734 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/elf_64.h linux-2.6.32.32/arch/sparc/include/asm/elf_64.h
1735 ---- linux-2.6.32.32/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
1736 -+++ linux-2.6.32.32/arch/sparc/include/asm/elf_64.h 2010-12-31 14:46:53.000000000 -0500
1737 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/elf_64.h linux-2.6.32.33/arch/sparc/include/asm/elf_64.h
1738 +--- linux-2.6.32.33/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
1739 ++++ linux-2.6.32.33/arch/sparc/include/asm/elf_64.h 2010-12-31 14:46:53.000000000 -0500
1740 @@ -163,6 +163,12 @@ typedef struct {
1741 #define ELF_ET_DYN_BASE 0x0000010000000000UL
1742 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
1743 @@ -3561,9 +3615,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/elf_64.h linux-2.6.32.32/arch/
1744
1745 /* This yields a mask that user programs can use to figure out what
1746 instruction set this cpu supports. */
1747 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.32/arch/sparc/include/asm/pgtable_32.h
1748 ---- linux-2.6.32.32/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
1749 -+++ linux-2.6.32.32/arch/sparc/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
1750 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h
1751 +--- linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
1752 ++++ linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
1753 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
1754 BTFIXUPDEF_INT(page_none)
1755 BTFIXUPDEF_INT(page_copy)
1756 @@ -3595,9 +3649,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.32/a
1757 extern unsigned long page_kernel;
1758
1759 #ifdef MODULE
1760 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.32/arch/sparc/include/asm/pgtsrmmu.h
1761 ---- linux-2.6.32.32/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
1762 -+++ linux-2.6.32.32/arch/sparc/include/asm/pgtsrmmu.h 2010-12-31 14:46:53.000000000 -0500
1763 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h
1764 +--- linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
1765 ++++ linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h 2010-12-31 14:46:53.000000000 -0500
1766 @@ -115,6 +115,13 @@
1767 SRMMU_EXEC | SRMMU_REF)
1768 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
1769 @@ -3612,9 +3666,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.32/arc
1770 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
1771 SRMMU_DIRTY | SRMMU_REF)
1772
1773 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.32/arch/sparc/include/asm/spinlock_64.h
1774 ---- linux-2.6.32.32/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
1775 -+++ linux-2.6.32.32/arch/sparc/include/asm/spinlock_64.h 2010-12-31 14:46:53.000000000 -0500
1776 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h
1777 +--- linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
1778 ++++ linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h 2010-12-31 14:46:53.000000000 -0500
1779 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
1780 __asm__ __volatile__ (
1781 "1: ldsw [%2], %0\n"
1782 @@ -3666,9 +3720,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.32/
1783 " cas [%2], %0, %1\n"
1784 " cmp %0, %1\n"
1785 " bne,pn %%xcc, 1b\n"
1786 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.32/arch/sparc/include/asm/uaccess_32.h
1787 ---- linux-2.6.32.32/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
1788 -+++ linux-2.6.32.32/arch/sparc/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
1789 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h
1790 +--- linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
1791 ++++ linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
1792 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
1793
1794 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
1795 @@ -3720,9 +3774,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.32/a
1796 return __copy_user((__force void __user *) to, from, n);
1797 }
1798
1799 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.32/arch/sparc/include/asm/uaccess_64.h
1800 ---- linux-2.6.32.32/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
1801 -+++ linux-2.6.32.32/arch/sparc/include/asm/uaccess_64.h 2010-12-31 14:46:53.000000000 -0500
1802 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h
1803 +--- linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
1804 ++++ linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h 2010-12-31 14:46:53.000000000 -0500
1805 @@ -9,6 +9,7 @@
1806 #include <linux/compiler.h>
1807 #include <linux/string.h>
1808 @@ -3765,9 +3819,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.32/a
1809 if (unlikely(ret))
1810 ret = copy_to_user_fixup(to, from, size);
1811 return ret;
1812 -diff -urNp linux-2.6.32.32/arch/sparc/include/asm/uaccess.h linux-2.6.32.32/arch/sparc/include/asm/uaccess.h
1813 ---- linux-2.6.32.32/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1814 -+++ linux-2.6.32.32/arch/sparc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1815 +diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess.h linux-2.6.32.33/arch/sparc/include/asm/uaccess.h
1816 +--- linux-2.6.32.33/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1817 ++++ linux-2.6.32.33/arch/sparc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1818 @@ -1,5 +1,13 @@
1819 #ifndef ___ASM_SPARC_UACCESS_H
1820 #define ___ASM_SPARC_UACCESS_H
1821 @@ -3782,9 +3836,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/include/asm/uaccess.h linux-2.6.32.32/arch
1822 #if defined(__sparc__) && defined(__arch64__)
1823 #include <asm/uaccess_64.h>
1824 #else
1825 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/iommu.c linux-2.6.32.32/arch/sparc/kernel/iommu.c
1826 ---- linux-2.6.32.32/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
1827 -+++ linux-2.6.32.32/arch/sparc/kernel/iommu.c 2010-12-31 14:46:53.000000000 -0500
1828 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/iommu.c linux-2.6.32.33/arch/sparc/kernel/iommu.c
1829 +--- linux-2.6.32.33/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
1830 ++++ linux-2.6.32.33/arch/sparc/kernel/iommu.c 2010-12-31 14:46:53.000000000 -0500
1831 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
1832 spin_unlock_irqrestore(&iommu->lock, flags);
1833 }
1834 @@ -3803,9 +3857,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/iommu.c linux-2.6.32.32/arch/sparc/
1835 EXPORT_SYMBOL(dma_ops);
1836
1837 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
1838 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/ioport.c linux-2.6.32.32/arch/sparc/kernel/ioport.c
1839 ---- linux-2.6.32.32/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
1840 -+++ linux-2.6.32.32/arch/sparc/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
1841 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/ioport.c linux-2.6.32.33/arch/sparc/kernel/ioport.c
1842 +--- linux-2.6.32.33/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
1843 ++++ linux-2.6.32.33/arch/sparc/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
1844 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
1845 BUG();
1846 }
1847 @@ -3833,9 +3887,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/ioport.c linux-2.6.32.32/arch/sparc
1848 .alloc_coherent = pci32_alloc_coherent,
1849 .free_coherent = pci32_free_coherent,
1850 .map_page = pci32_map_page,
1851 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/kgdb_32.c linux-2.6.32.32/arch/sparc/kernel/kgdb_32.c
1852 ---- linux-2.6.32.32/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
1853 -+++ linux-2.6.32.32/arch/sparc/kernel/kgdb_32.c 2010-12-31 14:46:53.000000000 -0500
1854 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c
1855 +--- linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
1856 ++++ linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c 2010-12-31 14:46:53.000000000 -0500
1857 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
1858 {
1859 }
1860 @@ -3845,9 +3899,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/kgdb_32.c linux-2.6.32.32/arch/spar
1861 /* Breakpoint instruction: ta 0x7d */
1862 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
1863 };
1864 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/kgdb_64.c linux-2.6.32.32/arch/sparc/kernel/kgdb_64.c
1865 ---- linux-2.6.32.32/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
1866 -+++ linux-2.6.32.32/arch/sparc/kernel/kgdb_64.c 2010-12-31 14:46:53.000000000 -0500
1867 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c
1868 +--- linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
1869 ++++ linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c 2010-12-31 14:46:53.000000000 -0500
1870 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
1871 {
1872 }
1873 @@ -3857,9 +3911,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/kgdb_64.c linux-2.6.32.32/arch/spar
1874 /* Breakpoint instruction: ta 0x72 */
1875 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
1876 };
1877 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/Makefile linux-2.6.32.32/arch/sparc/kernel/Makefile
1878 ---- linux-2.6.32.32/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
1879 -+++ linux-2.6.32.32/arch/sparc/kernel/Makefile 2010-12-31 14:46:53.000000000 -0500
1880 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/Makefile linux-2.6.32.33/arch/sparc/kernel/Makefile
1881 +--- linux-2.6.32.33/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
1882 ++++ linux-2.6.32.33/arch/sparc/kernel/Makefile 2010-12-31 14:46:53.000000000 -0500
1883 @@ -3,7 +3,7 @@
1884 #
1885
1886 @@ -3869,9 +3923,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/Makefile linux-2.6.32.32/arch/sparc
1887
1888 extra-y := head_$(BITS).o
1889 extra-y += init_task.o
1890 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.32/arch/sparc/kernel/pci_sun4v.c
1891 ---- linux-2.6.32.32/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
1892 -+++ linux-2.6.32.32/arch/sparc/kernel/pci_sun4v.c 2010-12-31 14:46:53.000000000 -0500
1893 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c
1894 +--- linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
1895 ++++ linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c 2010-12-31 14:46:53.000000000 -0500
1896 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
1897 spin_unlock_irqrestore(&iommu->lock, flags);
1898 }
1899 @@ -3881,9 +3935,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.32/arch/sp
1900 .alloc_coherent = dma_4v_alloc_coherent,
1901 .free_coherent = dma_4v_free_coherent,
1902 .map_page = dma_4v_map_page,
1903 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/process_32.c linux-2.6.32.32/arch/sparc/kernel/process_32.c
1904 ---- linux-2.6.32.32/arch/sparc/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
1905 -+++ linux-2.6.32.32/arch/sparc/kernel/process_32.c 2010-12-31 14:46:53.000000000 -0500
1906 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/process_32.c linux-2.6.32.33/arch/sparc/kernel/process_32.c
1907 +--- linux-2.6.32.33/arch/sparc/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
1908 ++++ linux-2.6.32.33/arch/sparc/kernel/process_32.c 2010-12-31 14:46:53.000000000 -0500
1909 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
1910 rw->ins[4], rw->ins[5],
1911 rw->ins[6],
1912 @@ -3919,9 +3973,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/process_32.c linux-2.6.32.32/arch/s
1913 fp = rw->ins[6];
1914 } while (++count < 16);
1915 printk("\n");
1916 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/process_64.c linux-2.6.32.32/arch/sparc/kernel/process_64.c
1917 ---- linux-2.6.32.32/arch/sparc/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
1918 -+++ linux-2.6.32.32/arch/sparc/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
1919 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/process_64.c linux-2.6.32.33/arch/sparc/kernel/process_64.c
1920 +--- linux-2.6.32.33/arch/sparc/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
1921 ++++ linux-2.6.32.33/arch/sparc/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
1922 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
1923 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
1924 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
1925 @@ -3957,9 +4011,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/process_64.c linux-2.6.32.32/arch/s
1926 (void *) gp->tpc,
1927 (void *) gp->o7,
1928 (void *) gp->i7,
1929 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.32/arch/sparc/kernel/sys_sparc_32.c
1930 ---- linux-2.6.32.32/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
1931 -+++ linux-2.6.32.32/arch/sparc/kernel/sys_sparc_32.c 2010-12-31 14:46:53.000000000 -0500
1932 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c
1933 +--- linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
1934 ++++ linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c 2010-12-31 14:46:53.000000000 -0500
1935 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
1936 if (ARCH_SUN4C && len > 0x20000000)
1937 return -ENOMEM;
1938 @@ -3978,9 +4032,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.32/arch
1939 return addr;
1940 addr = vmm->vm_end;
1941 if (flags & MAP_SHARED)
1942 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c
1943 ---- linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
1944 -+++ linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c 2010-12-31 14:46:53.000000000 -0500
1945 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c
1946 +--- linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
1947 ++++ linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c 2011-03-21 17:34:54.000000000 -0400
1948 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
1949 /* We do not accept a shared mapping if it would violate
1950 * cache aliasing constraints.
1951 @@ -4066,7 +4120,21 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.32/arch
1952 /* remember the address as a hint for next time */
1953 return (mm->free_area_cache = addr-len);
1954 }
1955 -@@ -279,7 +281,7 @@ arch_get_unmapped_area_topdown(struct fi
1956 +@@ -268,18 +270,18 @@ arch_get_unmapped_area_topdown(struct fi
1957 + if (unlikely(mm->mmap_base < len))
1958 + goto bottomup;
1959 +
1960 +- addr = mm->mmap_base-len;
1961 +- if (do_color_align)
1962 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
1963 ++ addr = mm->mmap_base - len;
1964 +
1965 + do {
1966 ++ if (do_color_align)
1967 ++ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
1968 + /*
1969 + * Lookup failure means no vma is above this address,
1970 + * else if new region fits below vma->vm_start,
1971 * return with success:
1972 */
1973 vma = find_vma(mm, addr);
1974 @@ -4075,7 +4143,20 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.32/arch
1975 /* remember the address as a hint for next time */
1976 return (mm->free_area_cache = addr);
1977 }
1978 -@@ -384,6 +386,12 @@ void arch_pick_mmap_layout(struct mm_str
1979 +@@ -289,10 +291,8 @@ arch_get_unmapped_area_topdown(struct fi
1980 + mm->cached_hole_size = vma->vm_start - addr;
1981 +
1982 + /* try just below the current vma->vm_start */
1983 +- addr = vma->vm_start-len;
1984 +- if (do_color_align)
1985 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
1986 +- } while (likely(len < vma->vm_start));
1987 ++ addr = skip_heap_stack_gap(vma, len);
1988 ++ } while (!IS_ERR_VALUE(addr));
1989 +
1990 + bottomup:
1991 + /*
1992 +@@ -384,6 +384,12 @@ void arch_pick_mmap_layout(struct mm_str
1993 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY ||
1994 sysctl_legacy_va_layout) {
1995 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
1996 @@ -4088,7 +4169,7 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.32/arch
1997 mm->get_unmapped_area = arch_get_unmapped_area;
1998 mm->unmap_area = arch_unmap_area;
1999 } else {
2000 -@@ -398,6 +406,12 @@ void arch_pick_mmap_layout(struct mm_str
2001 +@@ -398,6 +404,12 @@ void arch_pick_mmap_layout(struct mm_str
2002 gap = (task_size / 6 * 5);
2003
2004 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
2005 @@ -4101,9 +4182,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.32/arch
2006 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2007 mm->unmap_area = arch_unmap_area_topdown;
2008 }
2009 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/traps_32.c linux-2.6.32.32/arch/sparc/kernel/traps_32.c
2010 ---- linux-2.6.32.32/arch/sparc/kernel/traps_32.c 2010-08-13 16:24:37.000000000 -0400
2011 -+++ linux-2.6.32.32/arch/sparc/kernel/traps_32.c 2010-12-31 14:46:53.000000000 -0500
2012 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/traps_32.c linux-2.6.32.33/arch/sparc/kernel/traps_32.c
2013 +--- linux-2.6.32.33/arch/sparc/kernel/traps_32.c 2010-08-13 16:24:37.000000000 -0400
2014 ++++ linux-2.6.32.33/arch/sparc/kernel/traps_32.c 2010-12-31 14:46:53.000000000 -0500
2015 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
2016 count++ < 30 &&
2017 (((unsigned long) rw) >= PAGE_OFFSET) &&
2018 @@ -4113,9 +4194,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/traps_32.c linux-2.6.32.32/arch/spa
2019 (void *) rw->ins[7]);
2020 rw = (struct reg_window32 *)rw->ins[6];
2021 }
2022 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/traps_64.c linux-2.6.32.32/arch/sparc/kernel/traps_64.c
2023 ---- linux-2.6.32.32/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
2024 -+++ linux-2.6.32.32/arch/sparc/kernel/traps_64.c 2010-12-31 14:46:53.000000000 -0500
2025 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/traps_64.c linux-2.6.32.33/arch/sparc/kernel/traps_64.c
2026 +--- linux-2.6.32.33/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
2027 ++++ linux-2.6.32.33/arch/sparc/kernel/traps_64.c 2010-12-31 14:46:53.000000000 -0500
2028 @@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
2029 i + 1,
2030 p->trapstack[i].tstate, p->trapstack[i].tpc,
2031 @@ -4225,9 +4306,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/traps_64.c linux-2.6.32.32/arch/spa
2032 (void *) rw->ins[7]);
2033
2034 rw = kernel_stack_up(rw);
2035 -diff -urNp linux-2.6.32.32/arch/sparc/kernel/unaligned_64.c linux-2.6.32.32/arch/sparc/kernel/unaligned_64.c
2036 ---- linux-2.6.32.32/arch/sparc/kernel/unaligned_64.c 2010-08-13 16:24:37.000000000 -0400
2037 -+++ linux-2.6.32.32/arch/sparc/kernel/unaligned_64.c 2010-12-31 14:46:53.000000000 -0500
2038 +diff -urNp linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c
2039 +--- linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c 2010-08-13 16:24:37.000000000 -0400
2040 ++++ linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c 2010-12-31 14:46:53.000000000 -0500
2041 @@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
2042 if (count < 5) {
2043 last_time = jiffies;
2044 @@ -4237,9 +4318,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/kernel/unaligned_64.c linux-2.6.32.32/arch
2045 regs->tpc, (void *) regs->tpc);
2046 }
2047 }
2048 -diff -urNp linux-2.6.32.32/arch/sparc/lib/atomic_64.S linux-2.6.32.32/arch/sparc/lib/atomic_64.S
2049 ---- linux-2.6.32.32/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
2050 -+++ linux-2.6.32.32/arch/sparc/lib/atomic_64.S 2010-12-31 14:46:53.000000000 -0500
2051 +diff -urNp linux-2.6.32.33/arch/sparc/lib/atomic_64.S linux-2.6.32.33/arch/sparc/lib/atomic_64.S
2052 +--- linux-2.6.32.33/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
2053 ++++ linux-2.6.32.33/arch/sparc/lib/atomic_64.S 2010-12-31 14:46:53.000000000 -0500
2054 @@ -18,7 +18,12 @@
2055 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
2056 BACKOFF_SETUP(%o2)
2057 @@ -4474,9 +4555,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/lib/atomic_64.S linux-2.6.32.32/arch/sparc
2058 casx [%o1], %g1, %g7
2059 cmp %g1, %g7
2060 bne,pn %xcc, 2f
2061 -diff -urNp linux-2.6.32.32/arch/sparc/lib/ksyms.c linux-2.6.32.32/arch/sparc/lib/ksyms.c
2062 ---- linux-2.6.32.32/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
2063 -+++ linux-2.6.32.32/arch/sparc/lib/ksyms.c 2010-12-31 14:46:53.000000000 -0500
2064 +diff -urNp linux-2.6.32.33/arch/sparc/lib/ksyms.c linux-2.6.32.33/arch/sparc/lib/ksyms.c
2065 +--- linux-2.6.32.33/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
2066 ++++ linux-2.6.32.33/arch/sparc/lib/ksyms.c 2010-12-31 14:46:53.000000000 -0500
2067 @@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write);
2068
2069 /* Atomic counter implementation. */
2070 @@ -4495,9 +4576,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/lib/ksyms.c linux-2.6.32.32/arch/sparc/lib
2071 EXPORT_SYMBOL(atomic64_sub_ret);
2072
2073 /* Atomic bit operations. */
2074 -diff -urNp linux-2.6.32.32/arch/sparc/lib/rwsem_64.S linux-2.6.32.32/arch/sparc/lib/rwsem_64.S
2075 ---- linux-2.6.32.32/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
2076 -+++ linux-2.6.32.32/arch/sparc/lib/rwsem_64.S 2010-12-31 14:46:53.000000000 -0500
2077 +diff -urNp linux-2.6.32.33/arch/sparc/lib/rwsem_64.S linux-2.6.32.33/arch/sparc/lib/rwsem_64.S
2078 +--- linux-2.6.32.33/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
2079 ++++ linux-2.6.32.33/arch/sparc/lib/rwsem_64.S 2010-12-31 14:46:53.000000000 -0500
2080 @@ -11,7 +11,12 @@
2081 .globl __down_read
2082 __down_read:
2083 @@ -4596,9 +4677,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/lib/rwsem_64.S linux-2.6.32.32/arch/sparc/
2084 cas [%o0], %g3, %g7
2085 cmp %g3, %g7
2086 bne,pn %icc, 1b
2087 -diff -urNp linux-2.6.32.32/arch/sparc/Makefile linux-2.6.32.32/arch/sparc/Makefile
2088 ---- linux-2.6.32.32/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
2089 -+++ linux-2.6.32.32/arch/sparc/Makefile 2010-12-31 14:46:53.000000000 -0500
2090 +diff -urNp linux-2.6.32.33/arch/sparc/Makefile linux-2.6.32.33/arch/sparc/Makefile
2091 +--- linux-2.6.32.33/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
2092 ++++ linux-2.6.32.33/arch/sparc/Makefile 2010-12-31 14:46:53.000000000 -0500
2093 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
2094 # Export what is needed by arch/sparc/boot/Makefile
2095 export VMLINUX_INIT VMLINUX_MAIN
2096 @@ -4608,9 +4689,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/Makefile linux-2.6.32.32/arch/sparc/Makefi
2097 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
2098 VMLINUX_MAIN += $(drivers-y) $(net-y)
2099
2100 -diff -urNp linux-2.6.32.32/arch/sparc/mm/fault_32.c linux-2.6.32.32/arch/sparc/mm/fault_32.c
2101 ---- linux-2.6.32.32/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
2102 -+++ linux-2.6.32.32/arch/sparc/mm/fault_32.c 2010-12-31 14:46:53.000000000 -0500
2103 +diff -urNp linux-2.6.32.33/arch/sparc/mm/fault_32.c linux-2.6.32.33/arch/sparc/mm/fault_32.c
2104 +--- linux-2.6.32.33/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
2105 ++++ linux-2.6.32.33/arch/sparc/mm/fault_32.c 2010-12-31 14:46:53.000000000 -0500
2106 @@ -21,6 +21,9 @@
2107 #include <linux/interrupt.h>
2108 #include <linux/module.h>
2109 @@ -4914,9 +4995,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/fault_32.c linux-2.6.32.32/arch/sparc/m
2110 /* Allow reads even for write-only mappings */
2111 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
2112 goto bad_area;
2113 -diff -urNp linux-2.6.32.32/arch/sparc/mm/fault_64.c linux-2.6.32.32/arch/sparc/mm/fault_64.c
2114 ---- linux-2.6.32.32/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
2115 -+++ linux-2.6.32.32/arch/sparc/mm/fault_64.c 2010-12-31 14:46:53.000000000 -0500
2116 +diff -urNp linux-2.6.32.33/arch/sparc/mm/fault_64.c linux-2.6.32.33/arch/sparc/mm/fault_64.c
2117 +--- linux-2.6.32.33/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
2118 ++++ linux-2.6.32.33/arch/sparc/mm/fault_64.c 2010-12-31 14:46:53.000000000 -0500
2119 @@ -20,6 +20,9 @@
2120 #include <linux/kprobes.h>
2121 #include <linux/kdebug.h>
2122 @@ -5423,9 +5504,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/fault_64.c linux-2.6.32.32/arch/sparc/m
2123 /* Pure DTLB misses do not tell us whether the fault causing
2124 * load/store/atomic was a write or not, it only says that there
2125 * was no match. So in such a case we (carefully) read the
2126 -diff -urNp linux-2.6.32.32/arch/sparc/mm/hugetlbpage.c linux-2.6.32.32/arch/sparc/mm/hugetlbpage.c
2127 ---- linux-2.6.32.32/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
2128 -+++ linux-2.6.32.32/arch/sparc/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
2129 +diff -urNp linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c
2130 +--- linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
2131 ++++ linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c 2011-03-21 17:34:54.000000000 -0400
2132 @@ -69,7 +69,7 @@ full_search:
2133 }
2134 return -ENOMEM;
2135 @@ -5444,7 +5525,18 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/hugetlbpage.c linux-2.6.32.32/arch/spar
2136 /* remember the address as a hint for next time */
2137 return (mm->free_area_cache = addr-len);
2138 }
2139 -@@ -126,7 +126,7 @@ hugetlb_get_unmapped_area_topdown(struct
2140 +@@ -117,16 +117,17 @@ hugetlb_get_unmapped_area_topdown(struct
2141 + if (unlikely(mm->mmap_base < len))
2142 + goto bottomup;
2143 +
2144 +- addr = (mm->mmap_base-len) & HPAGE_MASK;
2145 ++ addr = mm->mmap_base - len;
2146 +
2147 + do {
2148 ++ addr &= HPAGE_MASK;
2149 + /*
2150 + * Lookup failure means no vma is above this address,
2151 + * else if new region fits below vma->vm_start,
2152 * return with success:
2153 */
2154 vma = find_vma(mm, addr);
2155 @@ -5453,7 +5545,18 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/hugetlbpage.c linux-2.6.32.32/arch/spar
2156 /* remember the address as a hint for next time */
2157 return (mm->free_area_cache = addr);
2158 }
2159 -@@ -183,8 +183,7 @@ hugetlb_get_unmapped_area(struct file *f
2160 +@@ -136,8 +137,8 @@ hugetlb_get_unmapped_area_topdown(struct
2161 + mm->cached_hole_size = vma->vm_start - addr;
2162 +
2163 + /* try just below the current vma->vm_start */
2164 +- addr = (vma->vm_start-len) & HPAGE_MASK;
2165 +- } while (likely(len < vma->vm_start));
2166 ++ addr = skip_heap_stack_gap(vma, len);
2167 ++ } while (!IS_ERR_VALUE(addr));
2168 +
2169 + bottomup:
2170 + /*
2171 +@@ -183,8 +184,7 @@ hugetlb_get_unmapped_area(struct file *f
2172 if (addr) {
2173 addr = ALIGN(addr, HPAGE_SIZE);
2174 vma = find_vma(mm, addr);
2175 @@ -5463,9 +5566,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/hugetlbpage.c linux-2.6.32.32/arch/spar
2176 return addr;
2177 }
2178 if (mm->get_unmapped_area == arch_get_unmapped_area)
2179 -diff -urNp linux-2.6.32.32/arch/sparc/mm/init_32.c linux-2.6.32.32/arch/sparc/mm/init_32.c
2180 ---- linux-2.6.32.32/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
2181 -+++ linux-2.6.32.32/arch/sparc/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
2182 +diff -urNp linux-2.6.32.33/arch/sparc/mm/init_32.c linux-2.6.32.33/arch/sparc/mm/init_32.c
2183 +--- linux-2.6.32.33/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
2184 ++++ linux-2.6.32.33/arch/sparc/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
2185 @@ -317,6 +317,9 @@ extern void device_scan(void);
2186 pgprot_t PAGE_SHARED __read_mostly;
2187 EXPORT_SYMBOL(PAGE_SHARED);
2188 @@ -5500,9 +5603,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/init_32.c linux-2.6.32.32/arch/sparc/mm
2189 protection_map[12] = PAGE_READONLY;
2190 protection_map[13] = PAGE_READONLY;
2191 protection_map[14] = PAGE_SHARED;
2192 -diff -urNp linux-2.6.32.32/arch/sparc/mm/Makefile linux-2.6.32.32/arch/sparc/mm/Makefile
2193 ---- linux-2.6.32.32/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
2194 -+++ linux-2.6.32.32/arch/sparc/mm/Makefile 2010-12-31 14:46:53.000000000 -0500
2195 +diff -urNp linux-2.6.32.33/arch/sparc/mm/Makefile linux-2.6.32.33/arch/sparc/mm/Makefile
2196 +--- linux-2.6.32.33/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
2197 ++++ linux-2.6.32.33/arch/sparc/mm/Makefile 2010-12-31 14:46:53.000000000 -0500
2198 @@ -2,7 +2,7 @@
2199 #
2200
2201 @@ -5512,9 +5615,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/Makefile linux-2.6.32.32/arch/sparc/mm/
2202
2203 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
2204 obj-y += fault_$(BITS).o
2205 -diff -urNp linux-2.6.32.32/arch/sparc/mm/srmmu.c linux-2.6.32.32/arch/sparc/mm/srmmu.c
2206 ---- linux-2.6.32.32/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
2207 -+++ linux-2.6.32.32/arch/sparc/mm/srmmu.c 2010-12-31 14:46:53.000000000 -0500
2208 +diff -urNp linux-2.6.32.33/arch/sparc/mm/srmmu.c linux-2.6.32.33/arch/sparc/mm/srmmu.c
2209 +--- linux-2.6.32.33/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
2210 ++++ linux-2.6.32.33/arch/sparc/mm/srmmu.c 2010-12-31 14:46:53.000000000 -0500
2211 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
2212 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
2213 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
2214 @@ -5529,9 +5632,9 @@ diff -urNp linux-2.6.32.32/arch/sparc/mm/srmmu.c linux-2.6.32.32/arch/sparc/mm/s
2215 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
2216 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
2217
2218 -diff -urNp linux-2.6.32.32/arch/um/include/asm/kmap_types.h linux-2.6.32.32/arch/um/include/asm/kmap_types.h
2219 ---- linux-2.6.32.32/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
2220 -+++ linux-2.6.32.32/arch/um/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
2221 +diff -urNp linux-2.6.32.33/arch/um/include/asm/kmap_types.h linux-2.6.32.33/arch/um/include/asm/kmap_types.h
2222 +--- linux-2.6.32.33/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
2223 ++++ linux-2.6.32.33/arch/um/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
2224 @@ -23,6 +23,7 @@ enum km_type {
2225 KM_IRQ1,
2226 KM_SOFTIRQ0,
2227 @@ -5540,9 +5643,9 @@ diff -urNp linux-2.6.32.32/arch/um/include/asm/kmap_types.h linux-2.6.32.32/arch
2228 KM_TYPE_NR
2229 };
2230
2231 -diff -urNp linux-2.6.32.32/arch/um/include/asm/page.h linux-2.6.32.32/arch/um/include/asm/page.h
2232 ---- linux-2.6.32.32/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
2233 -+++ linux-2.6.32.32/arch/um/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
2234 +diff -urNp linux-2.6.32.33/arch/um/include/asm/page.h linux-2.6.32.33/arch/um/include/asm/page.h
2235 +--- linux-2.6.32.33/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
2236 ++++ linux-2.6.32.33/arch/um/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
2237 @@ -14,6 +14,9 @@
2238 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
2239 #define PAGE_MASK (~(PAGE_SIZE-1))
2240 @@ -5553,9 +5656,9 @@ diff -urNp linux-2.6.32.32/arch/um/include/asm/page.h linux-2.6.32.32/arch/um/in
2241 #ifndef __ASSEMBLY__
2242
2243 struct page;
2244 -diff -urNp linux-2.6.32.32/arch/um/kernel/process.c linux-2.6.32.32/arch/um/kernel/process.c
2245 ---- linux-2.6.32.32/arch/um/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
2246 -+++ linux-2.6.32.32/arch/um/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
2247 +diff -urNp linux-2.6.32.33/arch/um/kernel/process.c linux-2.6.32.33/arch/um/kernel/process.c
2248 +--- linux-2.6.32.33/arch/um/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
2249 ++++ linux-2.6.32.33/arch/um/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
2250 @@ -393,22 +393,6 @@ int singlestepping(void * t)
2251 return 2;
2252 }
2253 @@ -5579,9 +5682,9 @@ diff -urNp linux-2.6.32.32/arch/um/kernel/process.c linux-2.6.32.32/arch/um/kern
2254 unsigned long get_wchan(struct task_struct *p)
2255 {
2256 unsigned long stack_page, sp, ip;
2257 -diff -urNp linux-2.6.32.32/arch/um/sys-i386/syscalls.c linux-2.6.32.32/arch/um/sys-i386/syscalls.c
2258 ---- linux-2.6.32.32/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
2259 -+++ linux-2.6.32.32/arch/um/sys-i386/syscalls.c 2010-12-31 14:46:53.000000000 -0500
2260 +diff -urNp linux-2.6.32.33/arch/um/sys-i386/syscalls.c linux-2.6.32.33/arch/um/sys-i386/syscalls.c
2261 +--- linux-2.6.32.33/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
2262 ++++ linux-2.6.32.33/arch/um/sys-i386/syscalls.c 2010-12-31 14:46:53.000000000 -0500
2263 @@ -11,6 +11,21 @@
2264 #include "asm/uaccess.h"
2265 #include "asm/unistd.h"
2266 @@ -5604,9 +5707,9 @@ diff -urNp linux-2.6.32.32/arch/um/sys-i386/syscalls.c linux-2.6.32.32/arch/um/s
2267 /*
2268 * Perform the select(nd, in, out, ex, tv) and mmap() system
2269 * calls. Linux/i386 didn't use to be able to handle more than
2270 -diff -urNp linux-2.6.32.32/arch/x86/boot/bitops.h linux-2.6.32.32/arch/x86/boot/bitops.h
2271 ---- linux-2.6.32.32/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
2272 -+++ linux-2.6.32.32/arch/x86/boot/bitops.h 2010-12-31 14:46:53.000000000 -0500
2273 +diff -urNp linux-2.6.32.33/arch/x86/boot/bitops.h linux-2.6.32.33/arch/x86/boot/bitops.h
2274 +--- linux-2.6.32.33/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
2275 ++++ linux-2.6.32.33/arch/x86/boot/bitops.h 2010-12-31 14:46:53.000000000 -0500
2276 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int
2277 u8 v;
2278 const u32 *p = (const u32 *)addr;
2279 @@ -5625,9 +5728,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/bitops.h linux-2.6.32.32/arch/x86/boot/
2280 }
2281
2282 #endif /* BOOT_BITOPS_H */
2283 -diff -urNp linux-2.6.32.32/arch/x86/boot/boot.h linux-2.6.32.32/arch/x86/boot/boot.h
2284 ---- linux-2.6.32.32/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
2285 -+++ linux-2.6.32.32/arch/x86/boot/boot.h 2010-12-31 14:46:53.000000000 -0500
2286 +diff -urNp linux-2.6.32.33/arch/x86/boot/boot.h linux-2.6.32.33/arch/x86/boot/boot.h
2287 +--- linux-2.6.32.33/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
2288 ++++ linux-2.6.32.33/arch/x86/boot/boot.h 2010-12-31 14:46:53.000000000 -0500
2289 @@ -82,7 +82,7 @@ static inline void io_delay(void)
2290 static inline u16 ds(void)
2291 {
2292 @@ -5646,9 +5749,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/boot.h linux-2.6.32.32/arch/x86/boot/bo
2293 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
2294 return diff;
2295 }
2296 -diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/head_32.S linux-2.6.32.32/arch/x86/boot/compressed/head_32.S
2297 ---- linux-2.6.32.32/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
2298 -+++ linux-2.6.32.32/arch/x86/boot/compressed/head_32.S 2010-12-31 14:46:53.000000000 -0500
2299 +diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/head_32.S linux-2.6.32.33/arch/x86/boot/compressed/head_32.S
2300 +--- linux-2.6.32.33/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
2301 ++++ linux-2.6.32.33/arch/x86/boot/compressed/head_32.S 2010-12-31 14:46:53.000000000 -0500
2302 @@ -76,7 +76,7 @@ ENTRY(startup_32)
2303 notl %eax
2304 andl %eax, %ebx
2305 @@ -5677,9 +5780,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/head_32.S linux-2.6.32.32/ar
2306 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
2307 jmp 1b
2308 2:
2309 -diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/head_64.S linux-2.6.32.32/arch/x86/boot/compressed/head_64.S
2310 ---- linux-2.6.32.32/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
2311 -+++ linux-2.6.32.32/arch/x86/boot/compressed/head_64.S 2010-12-31 14:46:53.000000000 -0500
2312 +diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/head_64.S linux-2.6.32.33/arch/x86/boot/compressed/head_64.S
2313 +--- linux-2.6.32.33/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
2314 ++++ linux-2.6.32.33/arch/x86/boot/compressed/head_64.S 2010-12-31 14:46:53.000000000 -0500
2315 @@ -91,7 +91,7 @@ ENTRY(startup_32)
2316 notl %eax
2317 andl %eax, %ebx
2318 @@ -5698,9 +5801,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/head_64.S linux-2.6.32.32/ar
2319 #endif
2320
2321 /* Target address to relocate to for decompression */
2322 -diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/misc.c linux-2.6.32.32/arch/x86/boot/compressed/misc.c
2323 ---- linux-2.6.32.32/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
2324 -+++ linux-2.6.32.32/arch/x86/boot/compressed/misc.c 2010-12-31 14:46:53.000000000 -0500
2325 +diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/misc.c linux-2.6.32.33/arch/x86/boot/compressed/misc.c
2326 +--- linux-2.6.32.33/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
2327 ++++ linux-2.6.32.33/arch/x86/boot/compressed/misc.c 2010-12-31 14:46:53.000000000 -0500
2328 @@ -288,7 +288,7 @@ static void parse_elf(void *output)
2329 case PT_LOAD:
2330 #ifdef CONFIG_RELOCATABLE
2331 @@ -5719,9 +5822,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/misc.c linux-2.6.32.32/arch/
2332 error("Wrong destination address");
2333 #endif
2334
2335 -diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.32/arch/x86/boot/compressed/mkpiggy.c
2336 ---- linux-2.6.32.32/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
2337 -+++ linux-2.6.32.32/arch/x86/boot/compressed/mkpiggy.c 2010-12-31 14:46:53.000000000 -0500
2338 +diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c
2339 +--- linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
2340 ++++ linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c 2010-12-31 14:46:53.000000000 -0500
2341 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
2342
2343 offs = (olen > ilen) ? olen - ilen : 0;
2344 @@ -5731,9 +5834,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.32/ar
2345 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
2346
2347 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
2348 -diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/relocs.c linux-2.6.32.32/arch/x86/boot/compressed/relocs.c
2349 ---- linux-2.6.32.32/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
2350 -+++ linux-2.6.32.32/arch/x86/boot/compressed/relocs.c 2010-12-31 14:46:53.000000000 -0500
2351 +diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/relocs.c linux-2.6.32.33/arch/x86/boot/compressed/relocs.c
2352 +--- linux-2.6.32.33/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
2353 ++++ linux-2.6.32.33/arch/x86/boot/compressed/relocs.c 2010-12-31 14:46:53.000000000 -0500
2354 @@ -10,8 +10,11 @@
2355 #define USE_BSD
2356 #include <endian.h>
2357 @@ -5934,9 +6037,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/compressed/relocs.c linux-2.6.32.32/arc
2358 read_shdrs(fp);
2359 read_strtabs(fp);
2360 read_symtabs(fp);
2361 -diff -urNp linux-2.6.32.32/arch/x86/boot/cpucheck.c linux-2.6.32.32/arch/x86/boot/cpucheck.c
2362 ---- linux-2.6.32.32/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
2363 -+++ linux-2.6.32.32/arch/x86/boot/cpucheck.c 2010-12-31 14:46:53.000000000 -0500
2364 +diff -urNp linux-2.6.32.33/arch/x86/boot/cpucheck.c linux-2.6.32.33/arch/x86/boot/cpucheck.c
2365 +--- linux-2.6.32.33/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
2366 ++++ linux-2.6.32.33/arch/x86/boot/cpucheck.c 2010-12-31 14:46:53.000000000 -0500
2367 @@ -74,7 +74,7 @@ static int has_fpu(void)
2368 u16 fcw = -1, fsw = -1;
2369 u32 cr0;
2370 @@ -6032,9 +6135,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/cpucheck.c linux-2.6.32.32/arch/x86/boo
2371
2372 err = check_flags();
2373 }
2374 -diff -urNp linux-2.6.32.32/arch/x86/boot/header.S linux-2.6.32.32/arch/x86/boot/header.S
2375 ---- linux-2.6.32.32/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
2376 -+++ linux-2.6.32.32/arch/x86/boot/header.S 2010-12-31 14:46:53.000000000 -0500
2377 +diff -urNp linux-2.6.32.33/arch/x86/boot/header.S linux-2.6.32.33/arch/x86/boot/header.S
2378 +--- linux-2.6.32.33/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
2379 ++++ linux-2.6.32.33/arch/x86/boot/header.S 2010-12-31 14:46:53.000000000 -0500
2380 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
2381 # single linked list of
2382 # struct setup_data
2383 @@ -6044,9 +6147,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/header.S linux-2.6.32.32/arch/x86/boot/
2384
2385 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
2386 #define VO_INIT_SIZE (VO__end - VO__text)
2387 -diff -urNp linux-2.6.32.32/arch/x86/boot/memory.c linux-2.6.32.32/arch/x86/boot/memory.c
2388 ---- linux-2.6.32.32/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
2389 -+++ linux-2.6.32.32/arch/x86/boot/memory.c 2010-12-31 14:46:53.000000000 -0500
2390 +diff -urNp linux-2.6.32.33/arch/x86/boot/memory.c linux-2.6.32.33/arch/x86/boot/memory.c
2391 +--- linux-2.6.32.33/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
2392 ++++ linux-2.6.32.33/arch/x86/boot/memory.c 2010-12-31 14:46:53.000000000 -0500
2393 @@ -19,7 +19,7 @@
2394
2395 static int detect_memory_e820(void)
2396 @@ -6056,9 +6159,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/memory.c linux-2.6.32.32/arch/x86/boot/
2397 struct biosregs ireg, oreg;
2398 struct e820entry *desc = boot_params.e820_map;
2399 static struct e820entry buf; /* static so it is zeroed */
2400 -diff -urNp linux-2.6.32.32/arch/x86/boot/video.c linux-2.6.32.32/arch/x86/boot/video.c
2401 ---- linux-2.6.32.32/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
2402 -+++ linux-2.6.32.32/arch/x86/boot/video.c 2010-12-31 14:46:53.000000000 -0500
2403 +diff -urNp linux-2.6.32.33/arch/x86/boot/video.c linux-2.6.32.33/arch/x86/boot/video.c
2404 +--- linux-2.6.32.33/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
2405 ++++ linux-2.6.32.33/arch/x86/boot/video.c 2010-12-31 14:46:53.000000000 -0500
2406 @@ -90,7 +90,7 @@ static void store_mode_params(void)
2407 static unsigned int get_entry(void)
2408 {
2409 @@ -6068,9 +6171,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/video.c linux-2.6.32.32/arch/x86/boot/v
2410 int key;
2411 unsigned int v;
2412
2413 -diff -urNp linux-2.6.32.32/arch/x86/boot/video-vesa.c linux-2.6.32.32/arch/x86/boot/video-vesa.c
2414 ---- linux-2.6.32.32/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
2415 -+++ linux-2.6.32.32/arch/x86/boot/video-vesa.c 2010-12-31 14:46:53.000000000 -0500
2416 +diff -urNp linux-2.6.32.33/arch/x86/boot/video-vesa.c linux-2.6.32.33/arch/x86/boot/video-vesa.c
2417 +--- linux-2.6.32.33/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
2418 ++++ linux-2.6.32.33/arch/x86/boot/video-vesa.c 2010-12-31 14:46:53.000000000 -0500
2419 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
2420
2421 boot_params.screen_info.vesapm_seg = oreg.es;
2422 @@ -6079,9 +6182,9 @@ diff -urNp linux-2.6.32.32/arch/x86/boot/video-vesa.c linux-2.6.32.32/arch/x86/b
2423 }
2424
2425 /*
2426 -diff -urNp linux-2.6.32.32/arch/x86/ia32/ia32_aout.c linux-2.6.32.32/arch/x86/ia32/ia32_aout.c
2427 ---- linux-2.6.32.32/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
2428 -+++ linux-2.6.32.32/arch/x86/ia32/ia32_aout.c 2010-12-31 14:46:53.000000000 -0500
2429 +diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32_aout.c linux-2.6.32.33/arch/x86/ia32/ia32_aout.c
2430 +--- linux-2.6.32.33/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
2431 ++++ linux-2.6.32.33/arch/x86/ia32/ia32_aout.c 2010-12-31 14:46:53.000000000 -0500
2432 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
2433 unsigned long dump_start, dump_size;
2434 struct user32 dump;
2435 @@ -6104,9 +6207,9 @@ diff -urNp linux-2.6.32.32/arch/x86/ia32/ia32_aout.c linux-2.6.32.32/arch/x86/ia
2436 end_coredump:
2437 set_fs(fs);
2438 return has_dumped;
2439 -diff -urNp linux-2.6.32.32/arch/x86/ia32/ia32entry.S linux-2.6.32.32/arch/x86/ia32/ia32entry.S
2440 ---- linux-2.6.32.32/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
2441 -+++ linux-2.6.32.32/arch/x86/ia32/ia32entry.S 2011-02-27 14:53:10.000000000 -0500
2442 +diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32entry.S linux-2.6.32.33/arch/x86/ia32/ia32entry.S
2443 +--- linux-2.6.32.33/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
2444 ++++ linux-2.6.32.33/arch/x86/ia32/ia32entry.S 2011-02-27 14:53:10.000000000 -0500
2445 @@ -13,6 +13,7 @@
2446 #include <asm/thread_info.h>
2447 #include <asm/segment.h>
2448 @@ -6204,9 +6307,9 @@ diff -urNp linux-2.6.32.32/arch/x86/ia32/ia32entry.S linux-2.6.32.32/arch/x86/ia
2449 /*
2450 * No need to follow this irqs on/off section: the syscall
2451 * disabled irqs and here we enable it straight after entry:
2452 -diff -urNp linux-2.6.32.32/arch/x86/ia32/ia32_signal.c linux-2.6.32.32/arch/x86/ia32/ia32_signal.c
2453 ---- linux-2.6.32.32/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
2454 -+++ linux-2.6.32.32/arch/x86/ia32/ia32_signal.c 2010-12-31 14:46:53.000000000 -0500
2455 +diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32_signal.c linux-2.6.32.33/arch/x86/ia32/ia32_signal.c
2456 +--- linux-2.6.32.33/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
2457 ++++ linux-2.6.32.33/arch/x86/ia32/ia32_signal.c 2010-12-31 14:46:53.000000000 -0500
2458 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
2459 sp -= frame_size;
2460 /* Align the stack pointer according to the i386 ABI,
2461 @@ -6256,9 +6359,9 @@ diff -urNp linux-2.6.32.32/arch/x86/ia32/ia32_signal.c linux-2.6.32.32/arch/x86/
2462 } put_user_catch(err);
2463
2464 if (err)
2465 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/alternative.h linux-2.6.32.32/arch/x86/include/asm/alternative.h
2466 ---- linux-2.6.32.32/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
2467 -+++ linux-2.6.32.32/arch/x86/include/asm/alternative.h 2010-12-31 14:46:53.000000000 -0500
2468 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/alternative.h linux-2.6.32.33/arch/x86/include/asm/alternative.h
2469 +--- linux-2.6.32.33/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
2470 ++++ linux-2.6.32.33/arch/x86/include/asm/alternative.h 2010-12-31 14:46:53.000000000 -0500
2471 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
2472 " .byte 662b-661b\n" /* sourcelen */ \
2473 " .byte 664f-663f\n" /* replacementlen */ \
2474 @@ -6268,9 +6371,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/alternative.h linux-2.6.32.32/ar
2475 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
2476 ".previous"
2477
2478 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/apm.h linux-2.6.32.32/arch/x86/include/asm/apm.h
2479 ---- linux-2.6.32.32/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
2480 -+++ linux-2.6.32.32/arch/x86/include/asm/apm.h 2010-12-31 14:46:53.000000000 -0500
2481 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/apm.h linux-2.6.32.33/arch/x86/include/asm/apm.h
2482 +--- linux-2.6.32.33/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
2483 ++++ linux-2.6.32.33/arch/x86/include/asm/apm.h 2010-12-31 14:46:53.000000000 -0500
2484 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
2485 __asm__ __volatile__(APM_DO_ZERO_SEGS
2486 "pushl %%edi\n\t"
2487 @@ -6289,9 +6392,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/apm.h linux-2.6.32.32/arch/x86/i
2488 "setc %%bl\n\t"
2489 "popl %%ebp\n\t"
2490 "popl %%edi\n\t"
2491 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/atomic_32.h linux-2.6.32.32/arch/x86/include/asm/atomic_32.h
2492 ---- linux-2.6.32.32/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
2493 -+++ linux-2.6.32.32/arch/x86/include/asm/atomic_32.h 2010-12-31 14:46:58.000000000 -0500
2494 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/atomic_32.h linux-2.6.32.33/arch/x86/include/asm/atomic_32.h
2495 +--- linux-2.6.32.33/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
2496 ++++ linux-2.6.32.33/arch/x86/include/asm/atomic_32.h 2010-12-31 14:46:58.000000000 -0500
2497 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom
2498 }
2499
2500 @@ -6627,9 +6730,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/atomic_32.h linux-2.6.32.32/arch
2501 #define ATOMIC64_INIT(val) { (val) }
2502
2503 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
2504 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/atomic_64.h linux-2.6.32.32/arch/x86/include/asm/atomic_64.h
2505 ---- linux-2.6.32.32/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
2506 -+++ linux-2.6.32.32/arch/x86/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
2507 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/atomic_64.h linux-2.6.32.33/arch/x86/include/asm/atomic_64.h
2508 +--- linux-2.6.32.33/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
2509 ++++ linux-2.6.32.33/arch/x86/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
2510 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom
2511 }
2512
2513 @@ -7233,9 +7336,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/atomic_64.h linux-2.6.32.32/arch
2514 }
2515
2516 /**
2517 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/bitops.h linux-2.6.32.32/arch/x86/include/asm/bitops.h
2518 ---- linux-2.6.32.32/arch/x86/include/asm/bitops.h 2010-08-13 16:24:37.000000000 -0400
2519 -+++ linux-2.6.32.32/arch/x86/include/asm/bitops.h 2010-12-31 14:46:53.000000000 -0500
2520 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/bitops.h linux-2.6.32.33/arch/x86/include/asm/bitops.h
2521 +--- linux-2.6.32.33/arch/x86/include/asm/bitops.h 2010-08-13 16:24:37.000000000 -0400
2522 ++++ linux-2.6.32.33/arch/x86/include/asm/bitops.h 2010-12-31 14:46:53.000000000 -0500
2523 @@ -38,7 +38,7 @@
2524 * a mask operation on a byte.
2525 */
2526 @@ -7245,9 +7348,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/bitops.h linux-2.6.32.32/arch/x8
2527 #define CONST_MASK(nr) (1 << ((nr) & 7))
2528
2529 /**
2530 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/boot.h linux-2.6.32.32/arch/x86/include/asm/boot.h
2531 ---- linux-2.6.32.32/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
2532 -+++ linux-2.6.32.32/arch/x86/include/asm/boot.h 2010-12-31 14:46:53.000000000 -0500
2533 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/boot.h linux-2.6.32.33/arch/x86/include/asm/boot.h
2534 +--- linux-2.6.32.33/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
2535 ++++ linux-2.6.32.33/arch/x86/include/asm/boot.h 2010-12-31 14:46:53.000000000 -0500
2536 @@ -11,10 +11,15 @@
2537 #include <asm/pgtable_types.h>
2538
2539 @@ -7265,9 +7368,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/boot.h linux-2.6.32.32/arch/x86/
2540 /* Minimum kernel alignment, as a power of two */
2541 #ifdef CONFIG_X86_64
2542 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
2543 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/cacheflush.h linux-2.6.32.32/arch/x86/include/asm/cacheflush.h
2544 ---- linux-2.6.32.32/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
2545 -+++ linux-2.6.32.32/arch/x86/include/asm/cacheflush.h 2010-12-31 14:46:53.000000000 -0500
2546 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/cacheflush.h linux-2.6.32.33/arch/x86/include/asm/cacheflush.h
2547 +--- linux-2.6.32.33/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
2548 ++++ linux-2.6.32.33/arch/x86/include/asm/cacheflush.h 2010-12-31 14:46:53.000000000 -0500
2549 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
2550 static inline unsigned long get_page_memtype(struct page *pg)
2551 {
2552 @@ -7286,9 +7389,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/cacheflush.h linux-2.6.32.32/arc
2553 ClearPageUncached(pg);
2554 ClearPageWC(pg);
2555 break;
2556 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/cache.h linux-2.6.32.32/arch/x86/include/asm/cache.h
2557 ---- linux-2.6.32.32/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
2558 -+++ linux-2.6.32.32/arch/x86/include/asm/cache.h 2010-12-31 14:46:53.000000000 -0500
2559 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/cache.h linux-2.6.32.33/arch/x86/include/asm/cache.h
2560 +--- linux-2.6.32.33/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
2561 ++++ linux-2.6.32.33/arch/x86/include/asm/cache.h 2010-12-31 14:46:53.000000000 -0500
2562 @@ -8,6 +8,7 @@
2563 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2564
2565 @@ -7297,9 +7400,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/cache.h linux-2.6.32.32/arch/x86
2566
2567 #ifdef CONFIG_X86_VSMP
2568 /* vSMP Internode cacheline shift */
2569 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/checksum_32.h linux-2.6.32.32/arch/x86/include/asm/checksum_32.h
2570 ---- linux-2.6.32.32/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
2571 -+++ linux-2.6.32.32/arch/x86/include/asm/checksum_32.h 2010-12-31 14:46:53.000000000 -0500
2572 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/checksum_32.h linux-2.6.32.33/arch/x86/include/asm/checksum_32.h
2573 +--- linux-2.6.32.33/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
2574 ++++ linux-2.6.32.33/arch/x86/include/asm/checksum_32.h 2010-12-31 14:46:53.000000000 -0500
2575 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
2576 int len, __wsum sum,
2577 int *src_err_ptr, int *dst_err_ptr);
2578 @@ -7333,9 +7436,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/checksum_32.h linux-2.6.32.32/ar
2579 len, sum, NULL, err_ptr);
2580
2581 if (len)
2582 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/desc_defs.h linux-2.6.32.32/arch/x86/include/asm/desc_defs.h
2583 ---- linux-2.6.32.32/arch/x86/include/asm/desc_defs.h 2010-08-13 16:24:37.000000000 -0400
2584 -+++ linux-2.6.32.32/arch/x86/include/asm/desc_defs.h 2011-02-27 14:53:10.000000000 -0500
2585 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/desc_defs.h linux-2.6.32.33/arch/x86/include/asm/desc_defs.h
2586 +--- linux-2.6.32.33/arch/x86/include/asm/desc_defs.h 2010-08-13 16:24:37.000000000 -0400
2587 ++++ linux-2.6.32.33/arch/x86/include/asm/desc_defs.h 2011-02-27 14:53:10.000000000 -0500
2588 @@ -31,6 +31,12 @@ struct desc_struct {
2589 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
2590 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
2591 @@ -7349,9 +7452,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/desc_defs.h linux-2.6.32.32/arch
2592 };
2593 } __attribute__((packed));
2594
2595 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/desc.h linux-2.6.32.32/arch/x86/include/asm/desc.h
2596 ---- linux-2.6.32.32/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
2597 -+++ linux-2.6.32.32/arch/x86/include/asm/desc.h 2011-02-27 14:53:10.000000000 -0500
2598 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/desc.h linux-2.6.32.33/arch/x86/include/asm/desc.h
2599 +--- linux-2.6.32.33/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
2600 ++++ linux-2.6.32.33/arch/x86/include/asm/desc.h 2011-02-27 14:53:10.000000000 -0500
2601 @@ -4,6 +4,7 @@
2602 #include <asm/desc_defs.h>
2603 #include <asm/ldt.h>
2604 @@ -7539,9 +7642,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/desc.h linux-2.6.32.32/arch/x86/
2605 +#endif
2606 +
2607 #endif /* _ASM_X86_DESC_H */
2608 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/device.h linux-2.6.32.32/arch/x86/include/asm/device.h
2609 ---- linux-2.6.32.32/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
2610 -+++ linux-2.6.32.32/arch/x86/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
2611 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/device.h linux-2.6.32.33/arch/x86/include/asm/device.h
2612 +--- linux-2.6.32.33/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
2613 ++++ linux-2.6.32.33/arch/x86/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
2614 @@ -6,7 +6,7 @@ struct dev_archdata {
2615 void *acpi_handle;
2616 #endif
2617 @@ -7551,9 +7654,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/device.h linux-2.6.32.32/arch/x8
2618 #endif
2619 #ifdef CONFIG_DMAR
2620 void *iommu; /* hook for IOMMU specific extension */
2621 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/dma-mapping.h linux-2.6.32.32/arch/x86/include/asm/dma-mapping.h
2622 ---- linux-2.6.32.32/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
2623 -+++ linux-2.6.32.32/arch/x86/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
2624 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h
2625 +--- linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
2626 ++++ linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
2627 @@ -25,9 +25,9 @@ extern int iommu_merge;
2628 extern struct device x86_dma_fallback_dev;
2629 extern int panic_on_overflow;
2630 @@ -7593,9 +7696,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/dma-mapping.h linux-2.6.32.32/ar
2631
2632 WARN_ON(irqs_disabled()); /* for portability */
2633
2634 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/e820.h linux-2.6.32.32/arch/x86/include/asm/e820.h
2635 ---- linux-2.6.32.32/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
2636 -+++ linux-2.6.32.32/arch/x86/include/asm/e820.h 2010-12-31 14:46:53.000000000 -0500
2637 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/e820.h linux-2.6.32.33/arch/x86/include/asm/e820.h
2638 +--- linux-2.6.32.33/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
2639 ++++ linux-2.6.32.33/arch/x86/include/asm/e820.h 2010-12-31 14:46:53.000000000 -0500
2640 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me
2641 #define ISA_END_ADDRESS 0x100000
2642 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
2643 @@ -7605,9 +7708,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/e820.h linux-2.6.32.32/arch/x86/
2644 #define BIOS_END 0x00100000
2645
2646 #ifdef __KERNEL__
2647 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/elf.h linux-2.6.32.32/arch/x86/include/asm/elf.h
2648 ---- linux-2.6.32.32/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
2649 -+++ linux-2.6.32.32/arch/x86/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
2650 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/elf.h linux-2.6.32.33/arch/x86/include/asm/elf.h
2651 +--- linux-2.6.32.33/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
2652 ++++ linux-2.6.32.33/arch/x86/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
2653 @@ -257,7 +257,25 @@ extern int force_personality32;
2654 the loader. We need to make sure that it is out of the way of the program
2655 that it will "exec", and that there is sufficient room for the brk. */
2656 @@ -7661,9 +7764,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/elf.h linux-2.6.32.32/arch/x86/i
2657 -#define arch_randomize_brk arch_randomize_brk
2658 -
2659 #endif /* _ASM_X86_ELF_H */
2660 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/futex.h linux-2.6.32.32/arch/x86/include/asm/futex.h
2661 ---- linux-2.6.32.32/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
2662 -+++ linux-2.6.32.32/arch/x86/include/asm/futex.h 2011-03-12 22:50:36.000000000 -0500
2663 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/futex.h linux-2.6.32.33/arch/x86/include/asm/futex.h
2664 +--- linux-2.6.32.33/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
2665 ++++ linux-2.6.32.33/arch/x86/include/asm/futex.h 2011-03-12 22:50:36.000000000 -0500
2666 @@ -12,16 +12,18 @@
2667 #include <asm/system.h>
2668
2669 @@ -7739,9 +7842,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/futex.h linux-2.6.32.32/arch/x86
2670 : "i" (-EFAULT), "r" (newval), "0" (oldval)
2671 : "memory"
2672 );
2673 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/i387.h linux-2.6.32.32/arch/x86/include/asm/i387.h
2674 ---- linux-2.6.32.32/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
2675 -+++ linux-2.6.32.32/arch/x86/include/asm/i387.h 2010-12-31 14:46:53.000000000 -0500
2676 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/i387.h linux-2.6.32.33/arch/x86/include/asm/i387.h
2677 +--- linux-2.6.32.33/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
2678 ++++ linux-2.6.32.33/arch/x86/include/asm/i387.h 2010-12-31 14:46:53.000000000 -0500
2679 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
2680 {
2681 int err;
2682 @@ -7782,9 +7885,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/i387.h linux-2.6.32.32/arch/x86/
2683
2684 /*
2685 * These must be called with preempt disabled
2686 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/io_32.h linux-2.6.32.32/arch/x86/include/asm/io_32.h
2687 ---- linux-2.6.32.32/arch/x86/include/asm/io_32.h 2010-08-13 16:24:37.000000000 -0400
2688 -+++ linux-2.6.32.32/arch/x86/include/asm/io_32.h 2011-01-27 22:39:52.000000000 -0500
2689 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/io_32.h linux-2.6.32.33/arch/x86/include/asm/io_32.h
2690 +--- linux-2.6.32.33/arch/x86/include/asm/io_32.h 2010-08-13 16:24:37.000000000 -0400
2691 ++++ linux-2.6.32.33/arch/x86/include/asm/io_32.h 2011-01-27 22:39:52.000000000 -0500
2692 @@ -3,6 +3,7 @@
2693
2694 #include <linux/string.h>
2695 @@ -7811,9 +7914,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/io_32.h linux-2.6.32.32/arch/x86
2696 #include <asm-generic/iomap.h>
2697
2698 #include <linux/vmalloc.h>
2699 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/io_64.h linux-2.6.32.32/arch/x86/include/asm/io_64.h
2700 ---- linux-2.6.32.32/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
2701 -+++ linux-2.6.32.32/arch/x86/include/asm/io_64.h 2011-01-27 22:39:52.000000000 -0500
2702 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/io_64.h linux-2.6.32.33/arch/x86/include/asm/io_64.h
2703 +--- linux-2.6.32.33/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
2704 ++++ linux-2.6.32.33/arch/x86/include/asm/io_64.h 2011-01-27 22:39:52.000000000 -0500
2705 @@ -140,6 +140,17 @@ __OUTS(l)
2706
2707 #include <linux/vmalloc.h>
2708 @@ -7832,9 +7935,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/io_64.h linux-2.6.32.32/arch/x86
2709 #include <asm-generic/iomap.h>
2710
2711 void __memcpy_fromio(void *, unsigned long, unsigned);
2712 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/iommu.h linux-2.6.32.32/arch/x86/include/asm/iommu.h
2713 ---- linux-2.6.32.32/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
2714 -+++ linux-2.6.32.32/arch/x86/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
2715 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/iommu.h linux-2.6.32.33/arch/x86/include/asm/iommu.h
2716 +--- linux-2.6.32.33/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
2717 ++++ linux-2.6.32.33/arch/x86/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
2718 @@ -3,7 +3,7 @@
2719
2720 extern void pci_iommu_shutdown(void);
2721 @@ -7844,9 +7947,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/iommu.h linux-2.6.32.32/arch/x86
2722 extern int force_iommu, no_iommu;
2723 extern int iommu_detected;
2724 extern int iommu_pass_through;
2725 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/irqflags.h linux-2.6.32.32/arch/x86/include/asm/irqflags.h
2726 ---- linux-2.6.32.32/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
2727 -+++ linux-2.6.32.32/arch/x86/include/asm/irqflags.h 2010-12-31 14:46:53.000000000 -0500
2728 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/irqflags.h linux-2.6.32.33/arch/x86/include/asm/irqflags.h
2729 +--- linux-2.6.32.33/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
2730 ++++ linux-2.6.32.33/arch/x86/include/asm/irqflags.h 2010-12-31 14:46:53.000000000 -0500
2731 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
2732 sti; \
2733 sysexit
2734 @@ -7859,9 +7962,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/irqflags.h linux-2.6.32.32/arch/
2735 #else
2736 #define INTERRUPT_RETURN iret
2737 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
2738 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/kvm_host.h linux-2.6.32.32/arch/x86/include/asm/kvm_host.h
2739 ---- linux-2.6.32.32/arch/x86/include/asm/kvm_host.h 2010-11-26 18:22:29.000000000 -0500
2740 -+++ linux-2.6.32.32/arch/x86/include/asm/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
2741 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/kvm_host.h linux-2.6.32.33/arch/x86/include/asm/kvm_host.h
2742 +--- linux-2.6.32.33/arch/x86/include/asm/kvm_host.h 2010-11-26 18:22:29.000000000 -0500
2743 ++++ linux-2.6.32.33/arch/x86/include/asm/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
2744 @@ -533,7 +533,7 @@ struct kvm_x86_ops {
2745 const struct trace_print_flags *exit_reasons_str;
2746 };
2747 @@ -7871,9 +7974,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/kvm_host.h linux-2.6.32.32/arch/
2748
2749 int kvm_mmu_module_init(void);
2750 void kvm_mmu_module_exit(void);
2751 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/local.h linux-2.6.32.32/arch/x86/include/asm/local.h
2752 ---- linux-2.6.32.32/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
2753 -+++ linux-2.6.32.32/arch/x86/include/asm/local.h 2010-12-31 14:47:00.000000000 -0500
2754 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/local.h linux-2.6.32.33/arch/x86/include/asm/local.h
2755 +--- linux-2.6.32.33/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
2756 ++++ linux-2.6.32.33/arch/x86/include/asm/local.h 2010-12-31 14:47:00.000000000 -0500
2757 @@ -18,26 +18,58 @@ typedef struct {
2758
2759 static inline void local_inc(local_t *l)
2760 @@ -8026,9 +8129,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/local.h linux-2.6.32.32/arch/x86
2761 : "+r" (i), "+m" (l->a.counter)
2762 : : "memory");
2763 return i + __i;
2764 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.32/arch/x86/include/asm/mc146818rtc.h
2765 ---- linux-2.6.32.32/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
2766 -+++ linux-2.6.32.32/arch/x86/include/asm/mc146818rtc.h 2010-12-31 14:46:53.000000000 -0500
2767 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h
2768 +--- linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
2769 ++++ linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h 2010-12-31 14:46:53.000000000 -0500
2770 @@ -81,8 +81,8 @@ static inline unsigned char current_lock
2771 #else
2772 #define lock_cmos_prefix(reg) do {} while (0)
2773 @@ -8040,9 +8143,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.32/ar
2774 #define do_i_have_lock_cmos() 0
2775 #define current_lock_cmos_reg() 0
2776 #endif
2777 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/microcode.h linux-2.6.32.32/arch/x86/include/asm/microcode.h
2778 ---- linux-2.6.32.32/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
2779 -+++ linux-2.6.32.32/arch/x86/include/asm/microcode.h 2010-12-31 14:46:53.000000000 -0500
2780 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/microcode.h linux-2.6.32.33/arch/x86/include/asm/microcode.h
2781 +--- linux-2.6.32.33/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
2782 ++++ linux-2.6.32.33/arch/x86/include/asm/microcode.h 2010-12-31 14:46:53.000000000 -0500
2783 @@ -12,13 +12,13 @@ struct device;
2784 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
2785
2786 @@ -8083,9 +8186,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/microcode.h linux-2.6.32.32/arch
2787 {
2788 return NULL;
2789 }
2790 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/mman.h linux-2.6.32.32/arch/x86/include/asm/mman.h
2791 ---- linux-2.6.32.32/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
2792 -+++ linux-2.6.32.32/arch/x86/include/asm/mman.h 2010-12-31 14:46:53.000000000 -0500
2793 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/mman.h linux-2.6.32.33/arch/x86/include/asm/mman.h
2794 +--- linux-2.6.32.33/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
2795 ++++ linux-2.6.32.33/arch/x86/include/asm/mman.h 2010-12-31 14:46:53.000000000 -0500
2796 @@ -5,4 +5,14 @@
2797
2798 #include <asm-generic/mman.h>
2799 @@ -8101,9 +8204,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/mman.h linux-2.6.32.32/arch/x86/
2800 +#endif
2801 +
2802 #endif /* _ASM_X86_MMAN_H */
2803 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/mmu_context.h linux-2.6.32.32/arch/x86/include/asm/mmu_context.h
2804 ---- linux-2.6.32.32/arch/x86/include/asm/mmu_context.h 2011-02-22 15:56:54.000000000 -0500
2805 -+++ linux-2.6.32.32/arch/x86/include/asm/mmu_context.h 2011-02-22 15:57:23.000000000 -0500
2806 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/mmu_context.h linux-2.6.32.33/arch/x86/include/asm/mmu_context.h
2807 +--- linux-2.6.32.33/arch/x86/include/asm/mmu_context.h 2011-02-22 15:56:54.000000000 -0500
2808 ++++ linux-2.6.32.33/arch/x86/include/asm/mmu_context.h 2011-02-22 15:57:23.000000000 -0500
2809 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
2810
2811 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
2812 @@ -8228,9 +8331,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/mmu_context.h linux-2.6.32.32/ar
2813 }
2814
2815 #define activate_mm(prev, next) \
2816 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/mmu.h linux-2.6.32.32/arch/x86/include/asm/mmu.h
2817 ---- linux-2.6.32.32/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
2818 -+++ linux-2.6.32.32/arch/x86/include/asm/mmu.h 2010-12-31 14:46:53.000000000 -0500
2819 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/mmu.h linux-2.6.32.33/arch/x86/include/asm/mmu.h
2820 +--- linux-2.6.32.33/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
2821 ++++ linux-2.6.32.33/arch/x86/include/asm/mmu.h 2010-12-31 14:46:53.000000000 -0500
2822 @@ -9,10 +9,23 @@
2823 * we put the segment information here.
2824 */
2825 @@ -8257,9 +8360,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/mmu.h linux-2.6.32.32/arch/x86/i
2826 } mm_context_t;
2827
2828 #ifdef CONFIG_SMP
2829 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/module.h linux-2.6.32.32/arch/x86/include/asm/module.h
2830 ---- linux-2.6.32.32/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
2831 -+++ linux-2.6.32.32/arch/x86/include/asm/module.h 2010-12-31 14:46:53.000000000 -0500
2832 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/module.h linux-2.6.32.33/arch/x86/include/asm/module.h
2833 +--- linux-2.6.32.33/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
2834 ++++ linux-2.6.32.33/arch/x86/include/asm/module.h 2010-12-31 14:46:53.000000000 -0500
2835 @@ -59,13 +59,31 @@
2836 #error unknown processor family
2837 #endif
2838 @@ -8293,9 +8396,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/module.h linux-2.6.32.32/arch/x8
2839 #endif
2840
2841 #endif /* _ASM_X86_MODULE_H */
2842 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/page_64_types.h linux-2.6.32.32/arch/x86/include/asm/page_64_types.h
2843 ---- linux-2.6.32.32/arch/x86/include/asm/page_64_types.h 2010-08-13 16:24:37.000000000 -0400
2844 -+++ linux-2.6.32.32/arch/x86/include/asm/page_64_types.h 2010-12-31 14:46:53.000000000 -0500
2845 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/page_64_types.h linux-2.6.32.33/arch/x86/include/asm/page_64_types.h
2846 +--- linux-2.6.32.33/arch/x86/include/asm/page_64_types.h 2010-08-13 16:24:37.000000000 -0400
2847 ++++ linux-2.6.32.33/arch/x86/include/asm/page_64_types.h 2010-12-31 14:46:53.000000000 -0500
2848 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
2849
2850 /* duplicated to the one in bootmem.h */
2851 @@ -8305,9 +8408,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/page_64_types.h linux-2.6.32.32/
2852
2853 extern unsigned long __phys_addr(unsigned long);
2854 #define __phys_reloc_hide(x) (x)
2855 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/paravirt.h linux-2.6.32.32/arch/x86/include/asm/paravirt.h
2856 ---- linux-2.6.32.32/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
2857 -+++ linux-2.6.32.32/arch/x86/include/asm/paravirt.h 2010-12-31 14:46:53.000000000 -0500
2858 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/paravirt.h linux-2.6.32.33/arch/x86/include/asm/paravirt.h
2859 +--- linux-2.6.32.33/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
2860 ++++ linux-2.6.32.33/arch/x86/include/asm/paravirt.h 2010-12-31 14:46:53.000000000 -0500
2861 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
2862 pv_mmu_ops.set_fixmap(idx, phys, flags);
2863 }
2864 @@ -8361,9 +8464,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/paravirt.h linux-2.6.32.32/arch/
2865 #endif /* CONFIG_X86_32 */
2866
2867 #endif /* __ASSEMBLY__ */
2868 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/paravirt_types.h linux-2.6.32.32/arch/x86/include/asm/paravirt_types.h
2869 ---- linux-2.6.32.32/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
2870 -+++ linux-2.6.32.32/arch/x86/include/asm/paravirt_types.h 2010-12-31 14:46:53.000000000 -0500
2871 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h
2872 +--- linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
2873 ++++ linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h 2010-12-31 14:46:53.000000000 -0500
2874 @@ -316,6 +316,12 @@ struct pv_mmu_ops {
2875 an mfn. We can tell which is which from the index. */
2876 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
2877 @@ -8377,9 +8480,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/paravirt_types.h linux-2.6.32.32
2878 };
2879
2880 struct raw_spinlock;
2881 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pci_x86.h linux-2.6.32.32/arch/x86/include/asm/pci_x86.h
2882 ---- linux-2.6.32.32/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
2883 -+++ linux-2.6.32.32/arch/x86/include/asm/pci_x86.h 2010-12-31 14:46:53.000000000 -0500
2884 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pci_x86.h linux-2.6.32.33/arch/x86/include/asm/pci_x86.h
2885 +--- linux-2.6.32.33/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
2886 ++++ linux-2.6.32.33/arch/x86/include/asm/pci_x86.h 2010-12-31 14:46:53.000000000 -0500
2887 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
2888 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
2889
2890 @@ -8402,9 +8505,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pci_x86.h linux-2.6.32.32/arch/x
2891 extern bool port_cf9_safe;
2892
2893 /* arch_initcall level */
2894 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgalloc.h linux-2.6.32.32/arch/x86/include/asm/pgalloc.h
2895 ---- linux-2.6.32.32/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
2896 -+++ linux-2.6.32.32/arch/x86/include/asm/pgalloc.h 2010-12-31 14:46:53.000000000 -0500
2897 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgalloc.h linux-2.6.32.33/arch/x86/include/asm/pgalloc.h
2898 +--- linux-2.6.32.33/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
2899 ++++ linux-2.6.32.33/arch/x86/include/asm/pgalloc.h 2010-12-31 14:46:53.000000000 -0500
2900 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
2901 pmd_t *pmd, pte_t *pte)
2902 {
2903 @@ -8419,9 +8522,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgalloc.h linux-2.6.32.32/arch/x
2904 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
2905 }
2906
2907 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.32/arch/x86/include/asm/pgtable-2level.h
2908 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
2909 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable-2level.h 2010-12-31 14:46:53.000000000 -0500
2910 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h
2911 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
2912 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h 2010-12-31 14:46:53.000000000 -0500
2913 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
2914
2915 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
2916 @@ -8432,9 +8535,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.32
2917 }
2918
2919 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
2920 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_32.h linux-2.6.32.32/arch/x86/include/asm/pgtable_32.h
2921 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:13:03.000000000 -0500
2922 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
2923 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h
2924 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:13:03.000000000 -0500
2925 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
2926 @@ -26,9 +26,6 @@
2927 struct mm_struct;
2928 struct vm_area_struct;
2929 @@ -8478,9 +8581,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_32.h linux-2.6.32.32/arc
2930 /*
2931 * kern_addr_valid() is (1) for FLATMEM and (0) for
2932 * SPARSEMEM and DISCONTIGMEM
2933 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.32/arch/x86/include/asm/pgtable_32_types.h
2934 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
2935 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable_32_types.h 2010-12-31 14:46:53.000000000 -0500
2936 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h
2937 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
2938 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h 2010-12-31 14:46:53.000000000 -0500
2939 @@ -8,7 +8,7 @@
2940 */
2941 #ifdef CONFIG_X86_PAE
2942 @@ -8510,9 +8613,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
2943 #define MODULES_VADDR VMALLOC_START
2944 #define MODULES_END VMALLOC_END
2945 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
2946 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.32/arch/x86/include/asm/pgtable-3level.h
2947 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
2948 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable-3level.h 2010-12-31 14:46:53.000000000 -0500
2949 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h
2950 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
2951 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h 2010-12-31 14:46:53.000000000 -0500
2952 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
2953
2954 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
2955 @@ -8530,9 +8633,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.32
2956 }
2957
2958 /*
2959 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_64.h linux-2.6.32.32/arch/x86/include/asm/pgtable_64.h
2960 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
2961 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable_64.h 2010-12-31 14:46:53.000000000 -0500
2962 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h
2963 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
2964 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h 2010-12-31 14:46:53.000000000 -0500
2965 @@ -16,10 +16,13 @@
2966
2967 extern pud_t level3_kernel_pgt[512];
2968 @@ -8569,9 +8672,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_64.h linux-2.6.32.32/arc
2969 }
2970
2971 static inline void native_pgd_clear(pgd_t *pgd)
2972 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.32/arch/x86/include/asm/pgtable_64_types.h
2973 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
2974 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable_64_types.h 2010-12-31 14:46:53.000000000 -0500
2975 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h
2976 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
2977 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h 2010-12-31 14:46:53.000000000 -0500
2978 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
2979 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
2980 #define MODULES_END _AC(0xffffffffff000000, UL)
2981 @@ -8583,9 +8686,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
2982 +#define ktva_ktla(addr) (addr)
2983
2984 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
2985 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable.h linux-2.6.32.32/arch/x86/include/asm/pgtable.h
2986 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
2987 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
2988 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable.h linux-2.6.32.33/arch/x86/include/asm/pgtable.h
2989 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
2990 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
2991 @@ -74,12 +74,51 @@ extern struct list_head pgd_list;
2992
2993 #define arch_end_context_switch(prev) do {} while(0)
2994 @@ -8755,9 +8858,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable.h linux-2.6.32.32/arch/x
2995
2996 #include <asm-generic/pgtable.h>
2997 #endif /* __ASSEMBLY__ */
2998 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_types.h linux-2.6.32.32/arch/x86/include/asm/pgtable_types.h
2999 ---- linux-2.6.32.32/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
3000 -+++ linux-2.6.32.32/arch/x86/include/asm/pgtable_types.h 2010-12-31 14:46:53.000000000 -0500
3001 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h
3002 +--- linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
3003 ++++ linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h 2010-12-31 14:46:53.000000000 -0500
3004 @@ -16,12 +16,11 @@
3005 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
3006 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
3007 @@ -8878,9 +8981,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/pgtable_types.h linux-2.6.32.32/
3008
3009 #define pgprot_writecombine pgprot_writecombine
3010 extern pgprot_t pgprot_writecombine(pgprot_t prot);
3011 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/processor.h linux-2.6.32.32/arch/x86/include/asm/processor.h
3012 ---- linux-2.6.32.32/arch/x86/include/asm/processor.h 2011-01-11 23:55:34.000000000 -0500
3013 -+++ linux-2.6.32.32/arch/x86/include/asm/processor.h 2011-01-11 23:56:03.000000000 -0500
3014 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/processor.h linux-2.6.32.33/arch/x86/include/asm/processor.h
3015 +--- linux-2.6.32.33/arch/x86/include/asm/processor.h 2011-01-11 23:55:34.000000000 -0500
3016 ++++ linux-2.6.32.33/arch/x86/include/asm/processor.h 2011-01-11 23:56:03.000000000 -0500
3017 @@ -272,7 +272,7 @@ struct tss_struct {
3018
3019 } ____cacheline_aligned;
3020 @@ -8965,9 +9068,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/processor.h linux-2.6.32.32/arch
3021 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
3022
3023 /* Get/set a process' ability to use the timestamp counter instruction */
3024 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/ptrace.h linux-2.6.32.32/arch/x86/include/asm/ptrace.h
3025 ---- linux-2.6.32.32/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
3026 -+++ linux-2.6.32.32/arch/x86/include/asm/ptrace.h 2010-12-31 14:46:53.000000000 -0500
3027 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/ptrace.h linux-2.6.32.33/arch/x86/include/asm/ptrace.h
3028 +--- linux-2.6.32.33/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
3029 ++++ linux-2.6.32.33/arch/x86/include/asm/ptrace.h 2010-12-31 14:46:53.000000000 -0500
3030 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_
3031 }
3032
3033 @@ -9004,9 +9107,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/ptrace.h linux-2.6.32.32/arch/x8
3034 #endif
3035 }
3036
3037 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/reboot.h linux-2.6.32.32/arch/x86/include/asm/reboot.h
3038 ---- linux-2.6.32.32/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
3039 -+++ linux-2.6.32.32/arch/x86/include/asm/reboot.h 2010-12-31 14:46:53.000000000 -0500
3040 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/reboot.h linux-2.6.32.33/arch/x86/include/asm/reboot.h
3041 +--- linux-2.6.32.33/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
3042 ++++ linux-2.6.32.33/arch/x86/include/asm/reboot.h 2010-12-31 14:46:53.000000000 -0500
3043 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
3044
3045 void native_machine_crash_shutdown(struct pt_regs *regs);
3046 @@ -9016,9 +9119,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/reboot.h linux-2.6.32.32/arch/x8
3047
3048 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
3049 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
3050 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/rwsem.h linux-2.6.32.32/arch/x86/include/asm/rwsem.h
3051 ---- linux-2.6.32.32/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
3052 -+++ linux-2.6.32.32/arch/x86/include/asm/rwsem.h 2010-12-31 14:47:01.000000000 -0500
3053 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/rwsem.h linux-2.6.32.33/arch/x86/include/asm/rwsem.h
3054 +--- linux-2.6.32.33/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
3055 ++++ linux-2.6.32.33/arch/x86/include/asm/rwsem.h 2010-12-31 14:47:01.000000000 -0500
3056 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw
3057 {
3058 asm volatile("# beginning down_read\n\t"
3059 @@ -9143,9 +9246,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/rwsem.h linux-2.6.32.32/arch/x86
3060 : "+r" (tmp), "+m" (sem->count)
3061 : : "memory");
3062
3063 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/segment.h linux-2.6.32.32/arch/x86/include/asm/segment.h
3064 ---- linux-2.6.32.32/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
3065 -+++ linux-2.6.32.32/arch/x86/include/asm/segment.h 2010-12-31 14:46:53.000000000 -0500
3066 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/segment.h linux-2.6.32.33/arch/x86/include/asm/segment.h
3067 +--- linux-2.6.32.33/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
3068 ++++ linux-2.6.32.33/arch/x86/include/asm/segment.h 2010-12-31 14:46:53.000000000 -0500
3069 @@ -62,8 +62,8 @@
3070 * 26 - ESPFIX small SS
3071 * 27 - per-cpu [ offset to per-cpu data area ]
3072 @@ -9214,9 +9317,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/segment.h linux-2.6.32.32/arch/x
3073 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
3074 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
3075 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
3076 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/smp.h linux-2.6.32.32/arch/x86/include/asm/smp.h
3077 ---- linux-2.6.32.32/arch/x86/include/asm/smp.h 2010-11-26 18:22:29.000000000 -0500
3078 -+++ linux-2.6.32.32/arch/x86/include/asm/smp.h 2010-12-31 14:46:53.000000000 -0500
3079 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/smp.h linux-2.6.32.33/arch/x86/include/asm/smp.h
3080 +--- linux-2.6.32.33/arch/x86/include/asm/smp.h 2010-11-26 18:22:29.000000000 -0500
3081 ++++ linux-2.6.32.33/arch/x86/include/asm/smp.h 2010-12-31 14:46:53.000000000 -0500
3082 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
3083 DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
3084 DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
3085 @@ -9226,9 +9329,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/smp.h linux-2.6.32.32/arch/x86/i
3086
3087 static inline struct cpumask *cpu_sibling_mask(int cpu)
3088 {
3089 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/spinlock.h linux-2.6.32.32/arch/x86/include/asm/spinlock.h
3090 ---- linux-2.6.32.32/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
3091 -+++ linux-2.6.32.32/arch/x86/include/asm/spinlock.h 2010-12-31 14:47:01.000000000 -0500
3092 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/spinlock.h linux-2.6.32.33/arch/x86/include/asm/spinlock.h
3093 +--- linux-2.6.32.33/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
3094 ++++ linux-2.6.32.33/arch/x86/include/asm/spinlock.h 2010-12-31 14:47:01.000000000 -0500
3095 @@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
3096 static inline void __raw_read_lock(raw_rwlock_t *rw)
3097 {
3098 @@ -9291,9 +9394,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/spinlock.h linux-2.6.32.32/arch/
3099 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
3100 }
3101
3102 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/stackprotector.h linux-2.6.32.32/arch/x86/include/asm/stackprotector.h
3103 ---- linux-2.6.32.32/arch/x86/include/asm/stackprotector.h 2010-08-13 16:24:37.000000000 -0400
3104 -+++ linux-2.6.32.32/arch/x86/include/asm/stackprotector.h 2010-12-31 14:47:01.000000000 -0500
3105 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/stackprotector.h linux-2.6.32.33/arch/x86/include/asm/stackprotector.h
3106 +--- linux-2.6.32.33/arch/x86/include/asm/stackprotector.h 2010-08-13 16:24:37.000000000 -0400
3107 ++++ linux-2.6.32.33/arch/x86/include/asm/stackprotector.h 2010-12-31 14:47:01.000000000 -0500
3108 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
3109
3110 static inline void load_stack_canary_segment(void)
3111 @@ -9303,9 +9406,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/stackprotector.h linux-2.6.32.32
3112 asm volatile ("mov %0, %%gs" : : "r" (0));
3113 #endif
3114 }
3115 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/system.h linux-2.6.32.32/arch/x86/include/asm/system.h
3116 ---- linux-2.6.32.32/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
3117 -+++ linux-2.6.32.32/arch/x86/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
3118 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/system.h linux-2.6.32.33/arch/x86/include/asm/system.h
3119 +--- linux-2.6.32.33/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
3120 ++++ linux-2.6.32.33/arch/x86/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
3121 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
3122 {
3123 unsigned long __limit;
3124 @@ -9324,9 +9427,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/system.h linux-2.6.32.32/arch/x8
3125 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
3126
3127 void default_idle(void);
3128 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/uaccess_32.h linux-2.6.32.32/arch/x86/include/asm/uaccess_32.h
3129 ---- linux-2.6.32.32/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
3130 -+++ linux-2.6.32.32/arch/x86/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
3131 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h
3132 +--- linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
3133 ++++ linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
3134 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
3135 static __always_inline unsigned long __must_check
3136 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
3137 @@ -9456,9 +9559,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/uaccess_32.h linux-2.6.32.32/arc
3138 long __must_check strncpy_from_user(char *dst, const char __user *src,
3139 long count);
3140 long __must_check __strncpy_from_user(char *dst,
3141 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/uaccess_64.h linux-2.6.32.32/arch/x86/include/asm/uaccess_64.h
3142 ---- linux-2.6.32.32/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
3143 -+++ linux-2.6.32.32/arch/x86/include/asm/uaccess_64.h 2010-12-31 14:47:01.000000000 -0500
3144 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h
3145 +--- linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
3146 ++++ linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h 2010-12-31 14:47:01.000000000 -0500
3147 @@ -9,6 +9,9 @@
3148 #include <linux/prefetch.h>
3149 #include <linux/lockdep.h>
3150 @@ -9804,9 +9907,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/uaccess_64.h linux-2.6.32.32/arc
3151 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
3152
3153 #endif /* _ASM_X86_UACCESS_64_H */
3154 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/uaccess.h linux-2.6.32.32/arch/x86/include/asm/uaccess.h
3155 ---- linux-2.6.32.32/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
3156 -+++ linux-2.6.32.32/arch/x86/include/asm/uaccess.h 2011-03-12 22:50:36.000000000 -0500
3157 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess.h linux-2.6.32.33/arch/x86/include/asm/uaccess.h
3158 +--- linux-2.6.32.33/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
3159 ++++ linux-2.6.32.33/arch/x86/include/asm/uaccess.h 2011-03-12 22:50:36.000000000 -0500
3160 @@ -8,12 +8,15 @@
3161 #include <linux/thread_info.h>
3162 #include <linux/prefetch.h>
3163 @@ -10025,9 +10128,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/uaccess.h linux-2.6.32.32/arch/x
3164 #ifdef CONFIG_X86_32
3165 # include "uaccess_32.h"
3166 #else
3167 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/vgtod.h linux-2.6.32.32/arch/x86/include/asm/vgtod.h
3168 ---- linux-2.6.32.32/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
3169 -+++ linux-2.6.32.32/arch/x86/include/asm/vgtod.h 2010-12-31 14:46:53.000000000 -0500
3170 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/vgtod.h linux-2.6.32.33/arch/x86/include/asm/vgtod.h
3171 +--- linux-2.6.32.33/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
3172 ++++ linux-2.6.32.33/arch/x86/include/asm/vgtod.h 2010-12-31 14:46:53.000000000 -0500
3173 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
3174 int sysctl_enabled;
3175 struct timezone sys_tz;
3176 @@ -10036,9 +10139,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/vgtod.h linux-2.6.32.32/arch/x86
3177 cycle_t (*vread)(void);
3178 cycle_t cycle_last;
3179 cycle_t mask;
3180 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/vmi.h linux-2.6.32.32/arch/x86/include/asm/vmi.h
3181 ---- linux-2.6.32.32/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
3182 -+++ linux-2.6.32.32/arch/x86/include/asm/vmi.h 2010-12-31 14:46:53.000000000 -0500
3183 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/vmi.h linux-2.6.32.33/arch/x86/include/asm/vmi.h
3184 +--- linux-2.6.32.33/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
3185 ++++ linux-2.6.32.33/arch/x86/include/asm/vmi.h 2010-12-31 14:46:53.000000000 -0500
3186 @@ -191,6 +191,7 @@ struct vrom_header {
3187 u8 reserved[96]; /* Reserved for headers */
3188 char vmi_init[8]; /* VMI_Init jump point */
3189 @@ -10047,9 +10150,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/vmi.h linux-2.6.32.32/arch/x86/i
3190 } __attribute__((packed));
3191
3192 struct pnp_header {
3193 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/vsyscall.h linux-2.6.32.32/arch/x86/include/asm/vsyscall.h
3194 ---- linux-2.6.32.32/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
3195 -+++ linux-2.6.32.32/arch/x86/include/asm/vsyscall.h 2010-12-31 14:46:53.000000000 -0500
3196 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/vsyscall.h linux-2.6.32.33/arch/x86/include/asm/vsyscall.h
3197 +--- linux-2.6.32.33/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
3198 ++++ linux-2.6.32.33/arch/x86/include/asm/vsyscall.h 2010-12-31 14:46:53.000000000 -0500
3199 @@ -15,9 +15,10 @@ enum vsyscall_num {
3200
3201 #ifdef __KERNEL__
3202 @@ -10080,9 +10183,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/vsyscall.h linux-2.6.32.32/arch/
3203 #endif /* __KERNEL__ */
3204
3205 #endif /* _ASM_X86_VSYSCALL_H */
3206 -diff -urNp linux-2.6.32.32/arch/x86/include/asm/xsave.h linux-2.6.32.32/arch/x86/include/asm/xsave.h
3207 ---- linux-2.6.32.32/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
3208 -+++ linux-2.6.32.32/arch/x86/include/asm/xsave.h 2010-12-31 14:46:53.000000000 -0500
3209 +diff -urNp linux-2.6.32.33/arch/x86/include/asm/xsave.h linux-2.6.32.33/arch/x86/include/asm/xsave.h
3210 +--- linux-2.6.32.33/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
3211 ++++ linux-2.6.32.33/arch/x86/include/asm/xsave.h 2010-12-31 14:46:53.000000000 -0500
3212 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
3213 static inline int xsave_user(struct xsave_struct __user *buf)
3214 {
3215 @@ -10108,9 +10211,9 @@ diff -urNp linux-2.6.32.32/arch/x86/include/asm/xsave.h linux-2.6.32.32/arch/x86
3216 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
3217 "2:\n"
3218 ".section .fixup,\"ax\"\n"
3219 -diff -urNp linux-2.6.32.32/arch/x86/Kconfig linux-2.6.32.32/arch/x86/Kconfig
3220 ---- linux-2.6.32.32/arch/x86/Kconfig 2011-02-22 15:56:54.000000000 -0500
3221 -+++ linux-2.6.32.32/arch/x86/Kconfig 2011-02-22 15:57:23.000000000 -0500
3222 +diff -urNp linux-2.6.32.33/arch/x86/Kconfig linux-2.6.32.33/arch/x86/Kconfig
3223 +--- linux-2.6.32.33/arch/x86/Kconfig 2011-02-22 15:56:54.000000000 -0500
3224 ++++ linux-2.6.32.33/arch/x86/Kconfig 2011-02-22 15:57:23.000000000 -0500
3225 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE
3226
3227 config X86_32_LAZY_GS
3228 @@ -10192,9 +10295,9 @@ diff -urNp linux-2.6.32.32/arch/x86/Kconfig linux-2.6.32.32/arch/x86/Kconfig
3229 ---help---
3230 Map the 32-bit VDSO to the predictable old-style address too.
3231 ---help---
3232 -diff -urNp linux-2.6.32.32/arch/x86/Kconfig.cpu linux-2.6.32.32/arch/x86/Kconfig.cpu
3233 ---- linux-2.6.32.32/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
3234 -+++ linux-2.6.32.32/arch/x86/Kconfig.cpu 2010-12-31 14:46:53.000000000 -0500
3235 +diff -urNp linux-2.6.32.33/arch/x86/Kconfig.cpu linux-2.6.32.33/arch/x86/Kconfig.cpu
3236 +--- linux-2.6.32.33/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
3237 ++++ linux-2.6.32.33/arch/x86/Kconfig.cpu 2010-12-31 14:46:53.000000000 -0500
3238 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE
3239
3240 config X86_F00F_BUG
3241 @@ -10222,9 +10325,9 @@ diff -urNp linux-2.6.32.32/arch/x86/Kconfig.cpu linux-2.6.32.32/arch/x86/Kconfig
3242
3243 config X86_MINIMUM_CPU_FAMILY
3244 int
3245 -diff -urNp linux-2.6.32.32/arch/x86/Kconfig.debug linux-2.6.32.32/arch/x86/Kconfig.debug
3246 ---- linux-2.6.32.32/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
3247 -+++ linux-2.6.32.32/arch/x86/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
3248 +diff -urNp linux-2.6.32.33/arch/x86/Kconfig.debug linux-2.6.32.33/arch/x86/Kconfig.debug
3249 +--- linux-2.6.32.33/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
3250 ++++ linux-2.6.32.33/arch/x86/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
3251 @@ -99,7 +99,7 @@ config X86_PTDUMP
3252 config DEBUG_RODATA
3253 bool "Write protect kernel read-only data structures"
3254 @@ -10234,9 +10337,9 @@ diff -urNp linux-2.6.32.32/arch/x86/Kconfig.debug linux-2.6.32.32/arch/x86/Kconf
3255 ---help---
3256 Mark the kernel read-only data as write-protected in the pagetables,
3257 in order to catch accidental (and incorrect) writes to such const
3258 -diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/boot.c linux-2.6.32.32/arch/x86/kernel/acpi/boot.c
3259 ---- linux-2.6.32.32/arch/x86/kernel/acpi/boot.c 2011-03-02 17:24:54.000000000 -0500
3260 -+++ linux-2.6.32.32/arch/x86/kernel/acpi/boot.c 2011-03-02 17:25:17.000000000 -0500
3261 +diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/boot.c linux-2.6.32.33/arch/x86/kernel/acpi/boot.c
3262 +--- linux-2.6.32.33/arch/x86/kernel/acpi/boot.c 2011-03-02 17:24:54.000000000 -0500
3263 ++++ linux-2.6.32.33/arch/x86/kernel/acpi/boot.c 2011-03-02 17:25:17.000000000 -0500
3264 @@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a
3265 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
3266 },
3267 @@ -10246,9 +10349,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/boot.c linux-2.6.32.32/arch/x86/
3268 };
3269
3270 /*
3271 -diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.32/arch/x86/kernel/acpi/realmode/wakeup.S
3272 ---- linux-2.6.32.32/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
3273 -+++ linux-2.6.32.32/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-31 14:46:53.000000000 -0500
3274 +diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S
3275 +--- linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
3276 ++++ linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-31 14:46:53.000000000 -0500
3277 @@ -104,7 +104,7 @@ _start:
3278 movl %eax, %ecx
3279 orl %edx, %ecx
3280 @@ -10258,9 +10361,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.3
3281 wrmsr
3282 1:
3283
3284 -diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/sleep.c linux-2.6.32.32/arch/x86/kernel/acpi/sleep.c
3285 ---- linux-2.6.32.32/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
3286 -+++ linux-2.6.32.32/arch/x86/kernel/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
3287 +diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c
3288 +--- linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
3289 ++++ linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
3290 @@ -11,11 +11,12 @@
3291 #include <linux/cpumask.h>
3292 #include <asm/segment.h>
3293 @@ -10305,9 +10408,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/sleep.c linux-2.6.32.32/arch/x86
3294 }
3295
3296
3297 -diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.32/arch/x86/kernel/acpi/wakeup_32.S
3298 ---- linux-2.6.32.32/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
3299 -+++ linux-2.6.32.32/arch/x86/kernel/acpi/wakeup_32.S 2010-12-31 14:46:53.000000000 -0500
3300 +diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S
3301 +--- linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
3302 ++++ linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S 2010-12-31 14:46:53.000000000 -0500
3303 @@ -30,13 +30,11 @@ wakeup_pmode_return:
3304 # and restore the stack ... but you need gdt for this to work
3305 movl saved_context_esp, %esp
3306 @@ -10324,9 +10427,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.32/arch
3307
3308 bogus_magic:
3309 jmp bogus_magic
3310 -diff -urNp linux-2.6.32.32/arch/x86/kernel/alternative.c linux-2.6.32.32/arch/x86/kernel/alternative.c
3311 ---- linux-2.6.32.32/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
3312 -+++ linux-2.6.32.32/arch/x86/kernel/alternative.c 2010-12-31 14:46:53.000000000 -0500
3313 +diff -urNp linux-2.6.32.33/arch/x86/kernel/alternative.c linux-2.6.32.33/arch/x86/kernel/alternative.c
3314 +--- linux-2.6.32.33/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
3315 ++++ linux-2.6.32.33/arch/x86/kernel/alternative.c 2010-12-31 14:46:53.000000000 -0500
3316 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
3317
3318 BUG_ON(p->len > MAX_PATCH_LEN);
3319 @@ -10409,9 +10512,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/alternative.c linux-2.6.32.32/arch/x8
3320 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
3321 return addr;
3322 }
3323 -diff -urNp linux-2.6.32.32/arch/x86/kernel/amd_iommu.c linux-2.6.32.32/arch/x86/kernel/amd_iommu.c
3324 ---- linux-2.6.32.32/arch/x86/kernel/amd_iommu.c 2010-10-31 16:44:11.000000000 -0400
3325 -+++ linux-2.6.32.32/arch/x86/kernel/amd_iommu.c 2010-12-31 14:46:53.000000000 -0500
3326 +diff -urNp linux-2.6.32.33/arch/x86/kernel/amd_iommu.c linux-2.6.32.33/arch/x86/kernel/amd_iommu.c
3327 +--- linux-2.6.32.33/arch/x86/kernel/amd_iommu.c 2010-10-31 16:44:11.000000000 -0400
3328 ++++ linux-2.6.32.33/arch/x86/kernel/amd_iommu.c 2010-12-31 14:46:53.000000000 -0500
3329 @@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
3330 }
3331 }
3332 @@ -10421,9 +10524,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/amd_iommu.c linux-2.6.32.32/arch/x86/
3333 .alloc_coherent = alloc_coherent,
3334 .free_coherent = free_coherent,
3335 .map_page = map_page,
3336 -diff -urNp linux-2.6.32.32/arch/x86/kernel/apic/io_apic.c linux-2.6.32.32/arch/x86/kernel/apic/io_apic.c
3337 ---- linux-2.6.32.32/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:55:35.000000000 -0500
3338 -+++ linux-2.6.32.32/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:56:03.000000000 -0500
3339 +diff -urNp linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c
3340 +--- linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:55:35.000000000 -0500
3341 ++++ linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:56:03.000000000 -0500
3342 @@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
3343 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
3344 GFP_ATOMIC);
3345 @@ -10460,9 +10563,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/apic/io_apic.c linux-2.6.32.32/arch/x
3346 {
3347 spin_unlock(&vector_lock);
3348 }
3349 -diff -urNp linux-2.6.32.32/arch/x86/kernel/apm_32.c linux-2.6.32.32/arch/x86/kernel/apm_32.c
3350 ---- linux-2.6.32.32/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
3351 -+++ linux-2.6.32.32/arch/x86/kernel/apm_32.c 2010-12-31 14:46:53.000000000 -0500
3352 +diff -urNp linux-2.6.32.33/arch/x86/kernel/apm_32.c linux-2.6.32.33/arch/x86/kernel/apm_32.c
3353 +--- linux-2.6.32.33/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
3354 ++++ linux-2.6.32.33/arch/x86/kernel/apm_32.c 2010-12-31 14:46:53.000000000 -0500
3355 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
3356 * This is for buggy BIOS's that refer to (real mode) segment 0x40
3357 * even though they are called in protected mode.
3358 @@ -10564,9 +10667,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/apm_32.c linux-2.6.32.32/arch/x86/ker
3359
3360 proc_create("apm", 0, NULL, &apm_file_ops);
3361
3362 -diff -urNp linux-2.6.32.32/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.32/arch/x86/kernel/asm-offsets_32.c
3363 ---- linux-2.6.32.32/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
3364 -+++ linux-2.6.32.32/arch/x86/kernel/asm-offsets_32.c 2010-12-31 14:46:53.000000000 -0500
3365 +diff -urNp linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c
3366 +--- linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
3367 ++++ linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c 2010-12-31 14:46:53.000000000 -0500
3368 @@ -115,6 +115,11 @@ void foo(void)
3369 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
3370 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
3371 @@ -10579,9 +10682,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.32/arch
3372 #endif
3373
3374 #ifdef CONFIG_XEN
3375 -diff -urNp linux-2.6.32.32/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.32/arch/x86/kernel/asm-offsets_64.c
3376 ---- linux-2.6.32.32/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
3377 -+++ linux-2.6.32.32/arch/x86/kernel/asm-offsets_64.c 2010-12-31 14:46:53.000000000 -0500
3378 +diff -urNp linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c
3379 +--- linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
3380 ++++ linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c 2010-12-31 14:46:53.000000000 -0500
3381 @@ -63,6 +63,18 @@ int main(void)
3382 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
3383 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
3384 @@ -10609,9 +10712,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.32/arch
3385 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
3386 BLANK();
3387 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
3388 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/amd.c linux-2.6.32.32/arch/x86/kernel/cpu/amd.c
3389 ---- linux-2.6.32.32/arch/x86/kernel/cpu/amd.c 2011-01-11 23:55:35.000000000 -0500
3390 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/amd.c 2011-02-27 14:53:10.000000000 -0500
3391 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/amd.c linux-2.6.32.33/arch/x86/kernel/cpu/amd.c
3392 +--- linux-2.6.32.33/arch/x86/kernel/cpu/amd.c 2011-01-11 23:55:35.000000000 -0500
3393 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/amd.c 2011-02-27 14:53:10.000000000 -0500
3394 @@ -573,7 +573,7 @@ static unsigned int __cpuinit amd_size_c
3395 unsigned int size)
3396 {
3397 @@ -10621,9 +10724,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/amd.c linux-2.6.32.32/arch/x86/ke
3398 /* Duron Rev A0 */
3399 if (c->x86_model == 3 && c->x86_mask == 0)
3400 size = 64;
3401 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/common.c linux-2.6.32.32/arch/x86/kernel/cpu/common.c
3402 ---- linux-2.6.32.32/arch/x86/kernel/cpu/common.c 2010-10-31 16:44:11.000000000 -0400
3403 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/common.c 2010-12-31 14:47:01.000000000 -0500
3404 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/common.c linux-2.6.32.33/arch/x86/kernel/cpu/common.c
3405 +--- linux-2.6.32.33/arch/x86/kernel/cpu/common.c 2010-10-31 16:44:11.000000000 -0400
3406 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/common.c 2010-12-31 14:47:01.000000000 -0500
3407 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
3408
3409 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
3410 @@ -10749,9 +10852,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/common.c linux-2.6.32.32/arch/x86
3411 struct thread_struct *thread = &curr->thread;
3412
3413 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
3414 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
3415 ---- linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:13:03.000000000 -0500
3416 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-31 14:46:53.000000000 -0500
3417 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
3418 +--- linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:13:03.000000000 -0500
3419 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-31 14:46:53.000000000 -0500
3420 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
3421 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
3422 },
3423 @@ -10761,9 +10864,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
3424 };
3425
3426 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
3427 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
3428 ---- linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
3429 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-31 14:46:53.000000000 -0500
3430 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
3431 +--- linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
3432 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-31 14:46:53.000000000 -0500
3433 @@ -225,7 +225,7 @@ static struct cpu_model models[] =
3434 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
3435 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
3436 @@ -10773,9 +10876,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
3437 };
3438 #undef _BANIAS
3439 #undef BANIAS
3440 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/intel.c linux-2.6.32.32/arch/x86/kernel/cpu/intel.c
3441 ---- linux-2.6.32.32/arch/x86/kernel/cpu/intel.c 2010-10-31 16:44:11.000000000 -0400
3442 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/intel.c 2010-12-31 14:46:53.000000000 -0500
3443 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/intel.c linux-2.6.32.33/arch/x86/kernel/cpu/intel.c
3444 +--- linux-2.6.32.33/arch/x86/kernel/cpu/intel.c 2010-10-31 16:44:11.000000000 -0400
3445 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/intel.c 2010-12-31 14:46:53.000000000 -0500
3446 @@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug
3447 * Update the IDT descriptor and reload the IDT so that
3448 * it uses the read-only mapped virtual address.
3449 @@ -10785,9 +10888,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/intel.c linux-2.6.32.32/arch/x86/
3450 load_idt(&idt_descr);
3451 }
3452 #endif
3453 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.32/arch/x86/kernel/cpu/intel_cacheinfo.c
3454 ---- linux-2.6.32.32/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
3455 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
3456 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c
3457 +--- linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
3458 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
3459 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
3460 return ret;
3461 }
3462 @@ -10797,9 +10900,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.32
3463 .show = show,
3464 .store = store,
3465 };
3466 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/Makefile linux-2.6.32.32/arch/x86/kernel/cpu/Makefile
3467 ---- linux-2.6.32.32/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
3468 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/Makefile 2010-12-31 14:46:53.000000000 -0500
3469 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/Makefile linux-2.6.32.33/arch/x86/kernel/cpu/Makefile
3470 +--- linux-2.6.32.33/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
3471 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/Makefile 2010-12-31 14:46:53.000000000 -0500
3472 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
3473 CFLAGS_REMOVE_common.o = -pg
3474 endif
3475 @@ -10811,9 +10914,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/Makefile linux-2.6.32.32/arch/x86
3476 obj-y := intel_cacheinfo.o addon_cpuid_features.o
3477 obj-y += proc.o capflags.o powerflags.o common.o
3478 obj-y += vmware.o hypervisor.o sched.o
3479 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce_amd.c
3480 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-31 16:44:11.000000000 -0400
3481 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-31 14:46:53.000000000 -0500
3482 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c
3483 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-31 16:44:11.000000000 -0400
3484 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-31 14:46:53.000000000 -0500
3485 @@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
3486 return ret;
3487 }
3488 @@ -10823,9 +10926,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.32/
3489 .show = show,
3490 .store = store,
3491 };
3492 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce.c
3493 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
3494 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:47.000000000 -0500
3495 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c
3496 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
3497 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:47.000000000 -0500
3498 @@ -43,6 +43,7 @@
3499 #include <asm/ipi.h>
3500 #include <asm/mce.h>
3501 @@ -10886,9 +10989,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.32/arch
3502 };
3503
3504 /*
3505 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/amd.c
3506 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
3507 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-31 14:46:53.000000000 -0500
3508 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c
3509 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
3510 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-31 14:46:53.000000000 -0500
3511 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
3512 return 0;
3513 }
3514 @@ -10898,9 +11001,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.32/arch/x
3515 .vendor = X86_VENDOR_AMD,
3516 .set = amd_set_mtrr,
3517 .get = amd_get_mtrr,
3518 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/centaur.c
3519 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
3520 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-31 14:46:53.000000000 -0500
3521 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c
3522 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
3523 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-31 14:46:53.000000000 -0500
3524 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
3525 return 0;
3526 }
3527 @@ -10910,9 +11013,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.32/ar
3528 .vendor = X86_VENDOR_CENTAUR,
3529 .set = centaur_set_mcr,
3530 .get = centaur_get_mcr,
3531 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/cyrix.c
3532 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
3533 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-31 14:46:53.000000000 -0500
3534 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c
3535 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
3536 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-31 14:46:53.000000000 -0500
3537 @@ -265,7 +265,7 @@ static void cyrix_set_all(void)
3538 post_set();
3539 }
3540 @@ -10922,9 +11025,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.32/arch
3541 .vendor = X86_VENDOR_CYRIX,
3542 .set_all = cyrix_set_all,
3543 .set = cyrix_set_arr,
3544 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/generic.c
3545 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
3546 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-31 14:46:53.000000000 -0500
3547 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c
3548 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
3549 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-31 14:46:53.000000000 -0500
3550 @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
3551 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
3552 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
3553 @@ -10943,9 +11046,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.32/ar
3554 .use_intel_if = 1,
3555 .set_all = generic_set_all,
3556 .get = generic_get_mtrr,
3557 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/main.c
3558 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:56:54.000000000 -0500
3559 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:57:23.000000000 -0500
3560 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c
3561 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:56:54.000000000 -0500
3562 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:57:23.000000000 -0500
3563 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
3564 u64 size_or_mask, size_and_mask;
3565 static bool mtrr_aps_delayed_init;
3566 @@ -10964,9 +11067,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.32/arch/
3567 {
3568 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
3569 mtrr_ops[ops->vendor] = ops;
3570 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/mtrr.h
3571 ---- linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
3572 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-31 14:46:53.000000000 -0500
3573 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h
3574 +--- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
3575 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-31 14:46:53.000000000 -0500
3576 @@ -12,19 +12,19 @@
3577 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
3578
3579 @@ -11017,9 +11120,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.32/arch/
3580
3581 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
3582 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
3583 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.32/arch/x86/kernel/cpu/perfctr-watchdog.c
3584 ---- linux-2.6.32.32/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
3585 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-31 14:46:53.000000000 -0500
3586 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c
3587 +--- linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
3588 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-31 14:46:53.000000000 -0500
3589 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
3590
3591 /* Interface defining a CPU specific perfctr watchdog */
3592 @@ -11053,9 +11156,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.3
3593 static struct wd_ops intel_arch_wd_ops __read_mostly = {
3594 .reserve = single_msr_reserve,
3595 .unreserve = single_msr_unreserve,
3596 -diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.32/arch/x86/kernel/cpu/perf_event.c
3597 ---- linux-2.6.32.32/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
3598 -+++ linux-2.6.32.32/arch/x86/kernel/cpu/perf_event.c 2010-12-31 14:46:53.000000000 -0500
3599 +diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c
3600 +--- linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
3601 ++++ linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c 2010-12-31 14:46:53.000000000 -0500
3602 @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
3603 break;
3604
3605 @@ -11065,9 +11168,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.32/arch
3606 }
3607 }
3608
3609 -diff -urNp linux-2.6.32.32/arch/x86/kernel/crash.c linux-2.6.32.32/arch/x86/kernel/crash.c
3610 ---- linux-2.6.32.32/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
3611 -+++ linux-2.6.32.32/arch/x86/kernel/crash.c 2010-12-31 14:46:53.000000000 -0500
3612 +diff -urNp linux-2.6.32.33/arch/x86/kernel/crash.c linux-2.6.32.33/arch/x86/kernel/crash.c
3613 +--- linux-2.6.32.33/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
3614 ++++ linux-2.6.32.33/arch/x86/kernel/crash.c 2010-12-31 14:46:53.000000000 -0500
3615 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
3616 regs = args->regs;
3617
3618 @@ -11077,9 +11180,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/crash.c linux-2.6.32.32/arch/x86/kern
3619 crash_fixup_ss_esp(&fixed_regs, regs);
3620 regs = &fixed_regs;
3621 }
3622 -diff -urNp linux-2.6.32.32/arch/x86/kernel/doublefault_32.c linux-2.6.32.32/arch/x86/kernel/doublefault_32.c
3623 ---- linux-2.6.32.32/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
3624 -+++ linux-2.6.32.32/arch/x86/kernel/doublefault_32.c 2010-12-31 14:46:53.000000000 -0500
3625 +diff -urNp linux-2.6.32.33/arch/x86/kernel/doublefault_32.c linux-2.6.32.33/arch/x86/kernel/doublefault_32.c
3626 +--- linux-2.6.32.33/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
3627 ++++ linux-2.6.32.33/arch/x86/kernel/doublefault_32.c 2010-12-31 14:46:53.000000000 -0500
3628 @@ -11,7 +11,7 @@
3629
3630 #define DOUBLEFAULT_STACKSIZE (1024)
3631 @@ -11111,9 +11214,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/doublefault_32.c linux-2.6.32.32/arch
3632 .fs = __KERNEL_PERCPU,
3633
3634 .__cr3 = __pa_nodebug(swapper_pg_dir),
3635 -diff -urNp linux-2.6.32.32/arch/x86/kernel/dumpstack_32.c linux-2.6.32.32/arch/x86/kernel/dumpstack_32.c
3636 ---- linux-2.6.32.32/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
3637 -+++ linux-2.6.32.32/arch/x86/kernel/dumpstack_32.c 2010-12-31 14:46:53.000000000 -0500
3638 +diff -urNp linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c
3639 +--- linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
3640 ++++ linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c 2010-12-31 14:46:53.000000000 -0500
3641 @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
3642 * When in-kernel, we also print out the stack and code at the
3643 * time of the fault..
3644 @@ -11158,9 +11261,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/dumpstack_32.c linux-2.6.32.32/arch/x
3645 if (ip < PAGE_OFFSET)
3646 return 0;
3647 if (probe_kernel_address((unsigned short *)ip, ud2))
3648 -diff -urNp linux-2.6.32.32/arch/x86/kernel/dumpstack.c linux-2.6.32.32/arch/x86/kernel/dumpstack.c
3649 ---- linux-2.6.32.32/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
3650 -+++ linux-2.6.32.32/arch/x86/kernel/dumpstack.c 2010-12-31 14:52:58.000000000 -0500
3651 +diff -urNp linux-2.6.32.33/arch/x86/kernel/dumpstack.c linux-2.6.32.33/arch/x86/kernel/dumpstack.c
3652 +--- linux-2.6.32.33/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
3653 ++++ linux-2.6.32.33/arch/x86/kernel/dumpstack.c 2010-12-31 14:52:58.000000000 -0500
3654 @@ -2,6 +2,9 @@
3655 * Copyright (C) 1991, 1992 Linus Torvalds
3656 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
3657 @@ -11207,9 +11310,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/dumpstack.c linux-2.6.32.32/arch/x86/
3658 report_bug(regs->ip, regs);
3659
3660 if (__die(str, regs, err))
3661 -diff -urNp linux-2.6.32.32/arch/x86/kernel/e820.c linux-2.6.32.32/arch/x86/kernel/e820.c
3662 ---- linux-2.6.32.32/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
3663 -+++ linux-2.6.32.32/arch/x86/kernel/e820.c 2010-12-31 14:46:53.000000000 -0500
3664 +diff -urNp linux-2.6.32.33/arch/x86/kernel/e820.c linux-2.6.32.33/arch/x86/kernel/e820.c
3665 +--- linux-2.6.32.33/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
3666 ++++ linux-2.6.32.33/arch/x86/kernel/e820.c 2010-12-31 14:46:53.000000000 -0500
3667 @@ -733,7 +733,7 @@ struct early_res {
3668 };
3669 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
3670 @@ -11219,9 +11322,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/e820.c linux-2.6.32.32/arch/x86/kerne
3671 };
3672
3673 static int __init find_overlapped_early(u64 start, u64 end)
3674 -diff -urNp linux-2.6.32.32/arch/x86/kernel/efi_32.c linux-2.6.32.32/arch/x86/kernel/efi_32.c
3675 ---- linux-2.6.32.32/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
3676 -+++ linux-2.6.32.32/arch/x86/kernel/efi_32.c 2010-12-31 14:46:53.000000000 -0500
3677 +diff -urNp linux-2.6.32.33/arch/x86/kernel/efi_32.c linux-2.6.32.33/arch/x86/kernel/efi_32.c
3678 +--- linux-2.6.32.33/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
3679 ++++ linux-2.6.32.33/arch/x86/kernel/efi_32.c 2010-12-31 14:46:53.000000000 -0500
3680 @@ -38,70 +38,38 @@
3681 */
3682
3683 @@ -11302,9 +11405,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/efi_32.c linux-2.6.32.32/arch/x86/ker
3684
3685 /*
3686 * After the lock is released, the original page table is restored.
3687 -diff -urNp linux-2.6.32.32/arch/x86/kernel/efi_stub_32.S linux-2.6.32.32/arch/x86/kernel/efi_stub_32.S
3688 ---- linux-2.6.32.32/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
3689 -+++ linux-2.6.32.32/arch/x86/kernel/efi_stub_32.S 2010-12-31 14:46:53.000000000 -0500
3690 +diff -urNp linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S
3691 +--- linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
3692 ++++ linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S 2010-12-31 14:46:53.000000000 -0500
3693 @@ -6,6 +6,7 @@
3694 */
3695
3696 @@ -11403,9 +11506,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/efi_stub_32.S linux-2.6.32.32/arch/x8
3697 saved_return_addr:
3698 .long 0
3699 efi_rt_function_ptr:
3700 -diff -urNp linux-2.6.32.32/arch/x86/kernel/entry_32.S linux-2.6.32.32/arch/x86/kernel/entry_32.S
3701 ---- linux-2.6.32.32/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
3702 -+++ linux-2.6.32.32/arch/x86/kernel/entry_32.S 2011-01-04 17:42:43.000000000 -0500
3703 +diff -urNp linux-2.6.32.33/arch/x86/kernel/entry_32.S linux-2.6.32.33/arch/x86/kernel/entry_32.S
3704 +--- linux-2.6.32.33/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
3705 ++++ linux-2.6.32.33/arch/x86/kernel/entry_32.S 2011-01-04 17:42:43.000000000 -0500
3706 @@ -185,13 +185,81 @@
3707 /*CFI_REL_OFFSET gs, PT_GS*/
3708 .endm
3709 @@ -11764,9 +11867,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/entry_32.S linux-2.6.32.32/arch/x86/k
3710 RESTORE_REGS
3711 lss 12+4(%esp), %esp # back to espfix stack
3712 CFI_ADJUST_CFA_OFFSET -24
3713 -diff -urNp linux-2.6.32.32/arch/x86/kernel/entry_64.S linux-2.6.32.32/arch/x86/kernel/entry_64.S
3714 ---- linux-2.6.32.32/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
3715 -+++ linux-2.6.32.32/arch/x86/kernel/entry_64.S 2011-02-27 14:53:10.000000000 -0500
3716 +diff -urNp linux-2.6.32.33/arch/x86/kernel/entry_64.S linux-2.6.32.33/arch/x86/kernel/entry_64.S
3717 +--- linux-2.6.32.33/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
3718 ++++ linux-2.6.32.33/arch/x86/kernel/entry_64.S 2011-02-27 14:53:10.000000000 -0500
3719 @@ -53,6 +53,7 @@
3720 #include <asm/paravirt.h>
3721 #include <asm/ftrace.h>
3722 @@ -12237,9 +12340,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/entry_64.S linux-2.6.32.32/arch/x86/k
3723 RESTORE_ALL 8
3724 jmp irq_return
3725 nmi_userspace:
3726 -diff -urNp linux-2.6.32.32/arch/x86/kernel/ftrace.c linux-2.6.32.32/arch/x86/kernel/ftrace.c
3727 ---- linux-2.6.32.32/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
3728 -+++ linux-2.6.32.32/arch/x86/kernel/ftrace.c 2010-12-31 14:46:53.000000000 -0500
3729 +diff -urNp linux-2.6.32.33/arch/x86/kernel/ftrace.c linux-2.6.32.33/arch/x86/kernel/ftrace.c
3730 +--- linux-2.6.32.33/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
3731 ++++ linux-2.6.32.33/arch/x86/kernel/ftrace.c 2010-12-31 14:46:53.000000000 -0500
3732 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
3733 {
3734 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
3735 @@ -12305,9 +12408,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/ftrace.c linux-2.6.32.32/arch/x86/ker
3736 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
3737 return -EFAULT;
3738
3739 -diff -urNp linux-2.6.32.32/arch/x86/kernel/head32.c linux-2.6.32.32/arch/x86/kernel/head32.c
3740 ---- linux-2.6.32.32/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
3741 -+++ linux-2.6.32.32/arch/x86/kernel/head32.c 2010-12-31 14:46:53.000000000 -0500
3742 +diff -urNp linux-2.6.32.33/arch/x86/kernel/head32.c linux-2.6.32.33/arch/x86/kernel/head32.c
3743 +--- linux-2.6.32.33/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
3744 ++++ linux-2.6.32.33/arch/x86/kernel/head32.c 2010-12-31 14:46:53.000000000 -0500
3745 @@ -16,6 +16,7 @@
3746 #include <asm/apic.h>
3747 #include <asm/io_apic.h>
3748 @@ -12325,9 +12428,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/head32.c linux-2.6.32.32/arch/x86/ker
3749
3750 #ifdef CONFIG_BLK_DEV_INITRD
3751 /* Reserve INITRD */
3752 -diff -urNp linux-2.6.32.32/arch/x86/kernel/head_32.S linux-2.6.32.32/arch/x86/kernel/head_32.S
3753 ---- linux-2.6.32.32/arch/x86/kernel/head_32.S 2010-12-09 18:13:03.000000000 -0500
3754 -+++ linux-2.6.32.32/arch/x86/kernel/head_32.S 2010-12-31 14:47:01.000000000 -0500
3755 +diff -urNp linux-2.6.32.33/arch/x86/kernel/head_32.S linux-2.6.32.33/arch/x86/kernel/head_32.S
3756 +--- linux-2.6.32.33/arch/x86/kernel/head_32.S 2010-12-09 18:13:03.000000000 -0500
3757 ++++ linux-2.6.32.33/arch/x86/kernel/head_32.S 2010-12-31 14:47:01.000000000 -0500
3758 @@ -19,10 +19,17 @@
3759 #include <asm/setup.h>
3760 #include <asm/processor-flags.h>
3761 @@ -12797,9 +12900,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/head_32.S linux-2.6.32.32/arch/x86/ke
3762 + /* Be sure this is zeroed to avoid false validations in Xen */
3763 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
3764 + .endr
3765 -diff -urNp linux-2.6.32.32/arch/x86/kernel/head_64.S linux-2.6.32.32/arch/x86/kernel/head_64.S
3766 ---- linux-2.6.32.32/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
3767 -+++ linux-2.6.32.32/arch/x86/kernel/head_64.S 2010-12-31 14:46:53.000000000 -0500
3768 +diff -urNp linux-2.6.32.33/arch/x86/kernel/head_64.S linux-2.6.32.33/arch/x86/kernel/head_64.S
3769 +--- linux-2.6.32.33/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
3770 ++++ linux-2.6.32.33/arch/x86/kernel/head_64.S 2010-12-31 14:46:53.000000000 -0500
3771 @@ -19,6 +19,7 @@
3772 #include <asm/cache.h>
3773 #include <asm/processor-flags.h>
3774 @@ -13070,9 +13173,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/head_64.S linux-2.6.32.32/arch/x86/ke
3775
3776 __PAGE_ALIGNED_BSS
3777 .align PAGE_SIZE
3778 -diff -urNp linux-2.6.32.32/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.32/arch/x86/kernel/i386_ksyms_32.c
3779 ---- linux-2.6.32.32/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
3780 -+++ linux-2.6.32.32/arch/x86/kernel/i386_ksyms_32.c 2010-12-31 14:46:53.000000000 -0500
3781 +diff -urNp linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c
3782 +--- linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
3783 ++++ linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c 2010-12-31 14:46:53.000000000 -0500
3784 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
3785 EXPORT_SYMBOL(cmpxchg8b_emu);
3786 #endif
3787 @@ -13094,9 +13197,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.32/arch/
3788 +#ifdef CONFIG_PAX_KERNEXEC
3789 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
3790 +#endif
3791 -diff -urNp linux-2.6.32.32/arch/x86/kernel/init_task.c linux-2.6.32.32/arch/x86/kernel/init_task.c
3792 ---- linux-2.6.32.32/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
3793 -+++ linux-2.6.32.32/arch/x86/kernel/init_task.c 2010-12-31 14:46:53.000000000 -0500
3794 +diff -urNp linux-2.6.32.33/arch/x86/kernel/init_task.c linux-2.6.32.33/arch/x86/kernel/init_task.c
3795 +--- linux-2.6.32.33/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
3796 ++++ linux-2.6.32.33/arch/x86/kernel/init_task.c 2010-12-31 14:46:53.000000000 -0500
3797 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
3798 * section. Since TSS's are completely CPU-local, we want them
3799 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
3800 @@ -13105,9 +13208,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/init_task.c linux-2.6.32.32/arch/x86/
3801 -
3802 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
3803 +EXPORT_SYMBOL(init_tss);
3804 -diff -urNp linux-2.6.32.32/arch/x86/kernel/ioport.c linux-2.6.32.32/arch/x86/kernel/ioport.c
3805 ---- linux-2.6.32.32/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
3806 -+++ linux-2.6.32.32/arch/x86/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
3807 +diff -urNp linux-2.6.32.33/arch/x86/kernel/ioport.c linux-2.6.32.33/arch/x86/kernel/ioport.c
3808 +--- linux-2.6.32.33/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
3809 ++++ linux-2.6.32.33/arch/x86/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
3810 @@ -6,6 +6,7 @@
3811 #include <linux/sched.h>
3812 #include <linux/kernel.h>
3813 @@ -13151,9 +13254,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/ioport.c linux-2.6.32.32/arch/x86/ker
3814 if (!capable(CAP_SYS_RAWIO))
3815 return -EPERM;
3816 }
3817 -diff -urNp linux-2.6.32.32/arch/x86/kernel/irq_32.c linux-2.6.32.32/arch/x86/kernel/irq_32.c
3818 ---- linux-2.6.32.32/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
3819 -+++ linux-2.6.32.32/arch/x86/kernel/irq_32.c 2010-12-31 14:58:57.000000000 -0500
3820 +diff -urNp linux-2.6.32.33/arch/x86/kernel/irq_32.c linux-2.6.32.33/arch/x86/kernel/irq_32.c
3821 +--- linux-2.6.32.33/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
3822 ++++ linux-2.6.32.33/arch/x86/kernel/irq_32.c 2010-12-31 14:58:57.000000000 -0500
3823 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
3824 return 0;
3825
3826 @@ -13206,9 +13309,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/irq_32.c linux-2.6.32.32/arch/x86/ker
3827 /*
3828 * Shouldnt happen, we returned above if in_interrupt():
3829 */
3830 -diff -urNp linux-2.6.32.32/arch/x86/kernel/kgdb.c linux-2.6.32.32/arch/x86/kernel/kgdb.c
3831 ---- linux-2.6.32.32/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
3832 -+++ linux-2.6.32.32/arch/x86/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
3833 +diff -urNp linux-2.6.32.33/arch/x86/kernel/kgdb.c linux-2.6.32.33/arch/x86/kernel/kgdb.c
3834 +--- linux-2.6.32.33/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
3835 ++++ linux-2.6.32.33/arch/x86/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
3836 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
3837 return instruction_pointer(regs);
3838 }
3839 @@ -13218,9 +13321,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/kgdb.c linux-2.6.32.32/arch/x86/kerne
3840 /* Breakpoint instruction: */
3841 .gdb_bpt_instr = { 0xcc },
3842 .flags = KGDB_HW_BREAKPOINT,
3843 -diff -urNp linux-2.6.32.32/arch/x86/kernel/kprobes.c linux-2.6.32.32/arch/x86/kernel/kprobes.c
3844 ---- linux-2.6.32.32/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
3845 -+++ linux-2.6.32.32/arch/x86/kernel/kprobes.c 2010-12-31 14:47:01.000000000 -0500
3846 +diff -urNp linux-2.6.32.33/arch/x86/kernel/kprobes.c linux-2.6.32.33/arch/x86/kernel/kprobes.c
3847 +--- linux-2.6.32.33/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
3848 ++++ linux-2.6.32.33/arch/x86/kernel/kprobes.c 2010-12-31 14:47:01.000000000 -0500
3849 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
3850 char op;
3851 s32 raddr;
3852 @@ -13322,9 +13425,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/kprobes.c linux-2.6.32.32/arch/x86/ke
3853 return ret;
3854
3855 switch (val) {
3856 -diff -urNp linux-2.6.32.32/arch/x86/kernel/ldt.c linux-2.6.32.32/arch/x86/kernel/ldt.c
3857 ---- linux-2.6.32.32/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
3858 -+++ linux-2.6.32.32/arch/x86/kernel/ldt.c 2010-12-31 14:46:53.000000000 -0500
3859 +diff -urNp linux-2.6.32.33/arch/x86/kernel/ldt.c linux-2.6.32.33/arch/x86/kernel/ldt.c
3860 +--- linux-2.6.32.33/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
3861 ++++ linux-2.6.32.33/arch/x86/kernel/ldt.c 2010-12-31 14:46:53.000000000 -0500
3862 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
3863 if (reload) {
3864 #ifdef CONFIG_SMP
3865 @@ -13389,9 +13492,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/ldt.c linux-2.6.32.32/arch/x86/kernel
3866 fill_ldt(&ldt, &ldt_info);
3867 if (oldmode)
3868 ldt.avl = 0;
3869 -diff -urNp linux-2.6.32.32/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.32/arch/x86/kernel/machine_kexec_32.c
3870 ---- linux-2.6.32.32/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
3871 -+++ linux-2.6.32.32/arch/x86/kernel/machine_kexec_32.c 2010-12-31 14:46:53.000000000 -0500
3872 +diff -urNp linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c
3873 +--- linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
3874 ++++ linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c 2010-12-31 14:46:53.000000000 -0500
3875 @@ -26,7 +26,7 @@
3876 #include <asm/system.h>
3877 #include <asm/cacheflush.h>
3878 @@ -13419,9 +13522,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.32/ar
3879
3880 relocate_kernel_ptr = control_page;
3881 page_list[PA_CONTROL_PAGE] = __pa(control_page);
3882 -diff -urNp linux-2.6.32.32/arch/x86/kernel/microcode_amd.c linux-2.6.32.32/arch/x86/kernel/microcode_amd.c
3883 ---- linux-2.6.32.32/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
3884 -+++ linux-2.6.32.32/arch/x86/kernel/microcode_amd.c 2010-12-31 14:46:53.000000000 -0500
3885 +diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_amd.c linux-2.6.32.33/arch/x86/kernel/microcode_amd.c
3886 +--- linux-2.6.32.33/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
3887 ++++ linux-2.6.32.33/arch/x86/kernel/microcode_amd.c 2010-12-31 14:46:53.000000000 -0500
3888 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
3889 uci->mc = NULL;
3890 }
3891 @@ -13440,9 +13543,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/microcode_amd.c linux-2.6.32.32/arch/
3892 {
3893 return &microcode_amd_ops;
3894 }
3895 -diff -urNp linux-2.6.32.32/arch/x86/kernel/microcode_core.c linux-2.6.32.32/arch/x86/kernel/microcode_core.c
3896 ---- linux-2.6.32.32/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
3897 -+++ linux-2.6.32.32/arch/x86/kernel/microcode_core.c 2010-12-31 14:46:53.000000000 -0500
3898 +diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_core.c linux-2.6.32.33/arch/x86/kernel/microcode_core.c
3899 +--- linux-2.6.32.33/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
3900 ++++ linux-2.6.32.33/arch/x86/kernel/microcode_core.c 2010-12-31 14:46:53.000000000 -0500
3901 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
3902
3903 #define MICROCODE_VERSION "2.00"
3904 @@ -13452,9 +13555,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/microcode_core.c linux-2.6.32.32/arch
3905
3906 /*
3907 * Synchronization.
3908 -diff -urNp linux-2.6.32.32/arch/x86/kernel/microcode_intel.c linux-2.6.32.32/arch/x86/kernel/microcode_intel.c
3909 ---- linux-2.6.32.32/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
3910 -+++ linux-2.6.32.32/arch/x86/kernel/microcode_intel.c 2010-12-31 14:46:53.000000000 -0500
3911 +diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_intel.c linux-2.6.32.33/arch/x86/kernel/microcode_intel.c
3912 +--- linux-2.6.32.33/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
3913 ++++ linux-2.6.32.33/arch/x86/kernel/microcode_intel.c 2010-12-31 14:46:53.000000000 -0500
3914 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod
3915
3916 static int get_ucode_user(void *to, const void *from, size_t n)
3917 @@ -13489,9 +13592,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/microcode_intel.c linux-2.6.32.32/arc
3918 {
3919 return &microcode_intel_ops;
3920 }
3921 -diff -urNp linux-2.6.32.32/arch/x86/kernel/module.c linux-2.6.32.32/arch/x86/kernel/module.c
3922 ---- linux-2.6.32.32/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
3923 -+++ linux-2.6.32.32/arch/x86/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
3924 +diff -urNp linux-2.6.32.33/arch/x86/kernel/module.c linux-2.6.32.33/arch/x86/kernel/module.c
3925 +--- linux-2.6.32.33/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
3926 ++++ linux-2.6.32.33/arch/x86/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
3927 @@ -34,7 +34,7 @@
3928 #define DEBUGP(fmt...)
3929 #endif
3930 @@ -13632,9 +13735,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/module.c linux-2.6.32.32/arch/x86/ker
3931 #if 0
3932 if ((s64)val != *(s32 *)loc)
3933 goto overflow;
3934 -diff -urNp linux-2.6.32.32/arch/x86/kernel/paravirt.c linux-2.6.32.32/arch/x86/kernel/paravirt.c
3935 ---- linux-2.6.32.32/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
3936 -+++ linux-2.6.32.32/arch/x86/kernel/paravirt.c 2010-12-31 14:46:53.000000000 -0500
3937 +diff -urNp linux-2.6.32.33/arch/x86/kernel/paravirt.c linux-2.6.32.33/arch/x86/kernel/paravirt.c
3938 +--- linux-2.6.32.33/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
3939 ++++ linux-2.6.32.33/arch/x86/kernel/paravirt.c 2010-12-31 14:46:53.000000000 -0500
3940 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
3941 * corresponding structure. */
3942 static void *get_call_destination(u8 type)
3943 @@ -13738,9 +13841,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/paravirt.c linux-2.6.32.32/arch/x86/k
3944 };
3945
3946 EXPORT_SYMBOL_GPL(pv_time_ops);
3947 -diff -urNp linux-2.6.32.32/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.32/arch/x86/kernel/paravirt-spinlocks.c
3948 ---- linux-2.6.32.32/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
3949 -+++ linux-2.6.32.32/arch/x86/kernel/paravirt-spinlocks.c 2010-12-31 14:46:53.000000000 -0500
3950 +diff -urNp linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c
3951 +--- linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
3952 ++++ linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c 2010-12-31 14:46:53.000000000 -0500
3953 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
3954 __raw_spin_lock(lock);
3955 }
3956 @@ -13750,9 +13853,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.32/
3957 #ifdef CONFIG_SMP
3958 .spin_is_locked = __ticket_spin_is_locked,
3959 .spin_is_contended = __ticket_spin_is_contended,
3960 -diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.32/arch/x86/kernel/pci-calgary_64.c
3961 ---- linux-2.6.32.32/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
3962 -+++ linux-2.6.32.32/arch/x86/kernel/pci-calgary_64.c 2010-12-31 14:46:53.000000000 -0500
3963 +diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c
3964 +--- linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
3965 ++++ linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c 2010-12-31 14:46:53.000000000 -0500
3966 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
3967 free_pages((unsigned long)vaddr, get_order(size));
3968 }
3969 @@ -13762,9 +13865,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.32/arch
3970 .alloc_coherent = calgary_alloc_coherent,
3971 .free_coherent = calgary_free_coherent,
3972 .map_sg = calgary_map_sg,
3973 -diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-dma.c linux-2.6.32.32/arch/x86/kernel/pci-dma.c
3974 ---- linux-2.6.32.32/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
3975 -+++ linux-2.6.32.32/arch/x86/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
3976 +diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-dma.c linux-2.6.32.33/arch/x86/kernel/pci-dma.c
3977 +--- linux-2.6.32.33/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
3978 ++++ linux-2.6.32.33/arch/x86/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
3979 @@ -14,7 +14,7 @@
3980
3981 static int forbid_dac __read_mostly;
3982 @@ -13783,9 +13886,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-dma.c linux-2.6.32.32/arch/x86/ke
3983
3984 #ifdef CONFIG_PCI
3985 if (mask > 0xffffffff && forbid_dac > 0) {
3986 -diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-gart_64.c linux-2.6.32.32/arch/x86/kernel/pci-gart_64.c
3987 ---- linux-2.6.32.32/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
3988 -+++ linux-2.6.32.32/arch/x86/kernel/pci-gart_64.c 2010-12-31 14:46:53.000000000 -0500
3989 +diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c
3990 +--- linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
3991 ++++ linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c 2010-12-31 14:46:53.000000000 -0500
3992 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
3993 return -1;
3994 }
3995 @@ -13795,9 +13898,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-gart_64.c linux-2.6.32.32/arch/x8
3996 .map_sg = gart_map_sg,
3997 .unmap_sg = gart_unmap_sg,
3998 .map_page = gart_map_page,
3999 -diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-nommu.c linux-2.6.32.32/arch/x86/kernel/pci-nommu.c
4000 ---- linux-2.6.32.32/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
4001 -+++ linux-2.6.32.32/arch/x86/kernel/pci-nommu.c 2010-12-31 14:46:53.000000000 -0500
4002 +diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-nommu.c linux-2.6.32.33/arch/x86/kernel/pci-nommu.c
4003 +--- linux-2.6.32.33/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
4004 ++++ linux-2.6.32.33/arch/x86/kernel/pci-nommu.c 2010-12-31 14:46:53.000000000 -0500
4005 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
4006 flush_write_buffers();
4007 }
4008 @@ -13807,9 +13910,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-nommu.c linux-2.6.32.32/arch/x86/
4009 .alloc_coherent = dma_generic_alloc_coherent,
4010 .free_coherent = nommu_free_coherent,
4011 .map_sg = nommu_map_sg,
4012 -diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.32/arch/x86/kernel/pci-swiotlb.c
4013 ---- linux-2.6.32.32/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
4014 -+++ linux-2.6.32.32/arch/x86/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
4015 +diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c
4016 +--- linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
4017 ++++ linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
4018 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
4019 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
4020 }
4021 @@ -13819,9 +13922,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.32/arch/x8
4022 .mapping_error = swiotlb_dma_mapping_error,
4023 .alloc_coherent = x86_swiotlb_alloc_coherent,
4024 .free_coherent = swiotlb_free_coherent,
4025 -diff -urNp linux-2.6.32.32/arch/x86/kernel/process_32.c linux-2.6.32.32/arch/x86/kernel/process_32.c
4026 ---- linux-2.6.32.32/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
4027 -+++ linux-2.6.32.32/arch/x86/kernel/process_32.c 2010-12-31 14:47:01.000000000 -0500
4028 +diff -urNp linux-2.6.32.33/arch/x86/kernel/process_32.c linux-2.6.32.33/arch/x86/kernel/process_32.c
4029 +--- linux-2.6.32.33/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
4030 ++++ linux-2.6.32.33/arch/x86/kernel/process_32.c 2010-12-31 14:47:01.000000000 -0500
4031 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
4032 unsigned long thread_saved_pc(struct task_struct *tsk)
4033 {
4034 @@ -13919,9 +14022,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/process_32.c linux-2.6.32.32/arch/x86
4035 + load_sp0(init_tss + smp_processor_id(), thread);
4036 +}
4037 +#endif
4038 -diff -urNp linux-2.6.32.32/arch/x86/kernel/process_64.c linux-2.6.32.32/arch/x86/kernel/process_64.c
4039 ---- linux-2.6.32.32/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
4040 -+++ linux-2.6.32.32/arch/x86/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
4041 +diff -urNp linux-2.6.32.33/arch/x86/kernel/process_64.c linux-2.6.32.33/arch/x86/kernel/process_64.c
4042 +--- linux-2.6.32.33/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
4043 ++++ linux-2.6.32.33/arch/x86/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
4044 @@ -91,7 +91,7 @@ static void __exit_idle(void)
4045 void exit_idle(void)
4046 {
4047 @@ -13964,9 +14067,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/process_64.c linux-2.6.32.32/arch/x86
4048 return 0;
4049 ip = *(u64 *)(fp+8);
4050 if (!in_sched_functions(ip))
4051 -diff -urNp linux-2.6.32.32/arch/x86/kernel/process.c linux-2.6.32.32/arch/x86/kernel/process.c
4052 ---- linux-2.6.32.32/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
4053 -+++ linux-2.6.32.32/arch/x86/kernel/process.c 2010-12-31 14:47:01.000000000 -0500
4054 +diff -urNp linux-2.6.32.33/arch/x86/kernel/process.c linux-2.6.32.33/arch/x86/kernel/process.c
4055 +--- linux-2.6.32.33/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
4056 ++++ linux-2.6.32.33/arch/x86/kernel/process.c 2010-12-31 14:47:01.000000000 -0500
4057 @@ -73,7 +73,7 @@ void exit_thread(void)
4058 unsigned long *bp = t->io_bitmap_ptr;
4059
4060 @@ -14004,9 +14107,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/process.c linux-2.6.32.32/arch/x86/ke
4061 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
4062 -}
4063 -
4064 -diff -urNp linux-2.6.32.32/arch/x86/kernel/ptrace.c linux-2.6.32.32/arch/x86/kernel/ptrace.c
4065 ---- linux-2.6.32.32/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
4066 -+++ linux-2.6.32.32/arch/x86/kernel/ptrace.c 2011-02-27 14:53:10.000000000 -0500
4067 +diff -urNp linux-2.6.32.33/arch/x86/kernel/ptrace.c linux-2.6.32.33/arch/x86/kernel/ptrace.c
4068 +--- linux-2.6.32.33/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
4069 ++++ linux-2.6.32.33/arch/x86/kernel/ptrace.c 2011-02-27 14:53:10.000000000 -0500
4070 @@ -925,7 +925,7 @@ static const struct user_regset_view use
4071 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
4072 {
4073 @@ -14093,9 +14196,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/ptrace.c linux-2.6.32.32/arch/x86/ker
4074 {
4075 if (unlikely(current->audit_context))
4076 audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
4077 -diff -urNp linux-2.6.32.32/arch/x86/kernel/reboot.c linux-2.6.32.32/arch/x86/kernel/reboot.c
4078 ---- linux-2.6.32.32/arch/x86/kernel/reboot.c 2010-11-26 18:22:29.000000000 -0500
4079 -+++ linux-2.6.32.32/arch/x86/kernel/reboot.c 2010-12-31 14:46:53.000000000 -0500
4080 +diff -urNp linux-2.6.32.33/arch/x86/kernel/reboot.c linux-2.6.32.33/arch/x86/kernel/reboot.c
4081 +--- linux-2.6.32.33/arch/x86/kernel/reboot.c 2010-11-26 18:22:29.000000000 -0500
4082 ++++ linux-2.6.32.33/arch/x86/kernel/reboot.c 2010-12-31 14:46:53.000000000 -0500
4083 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
4084 EXPORT_SYMBOL(pm_power_off);
4085
4086 @@ -14172,9 +14275,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/reboot.c linux-2.6.32.32/arch/x86/ker
4087
4088 /* Set up the IDT for real mode. */
4089 load_idt(&real_mode_idt);
4090 -diff -urNp linux-2.6.32.32/arch/x86/kernel/setup.c linux-2.6.32.32/arch/x86/kernel/setup.c
4091 ---- linux-2.6.32.32/arch/x86/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
4092 -+++ linux-2.6.32.32/arch/x86/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
4093 +diff -urNp linux-2.6.32.33/arch/x86/kernel/setup.c linux-2.6.32.33/arch/x86/kernel/setup.c
4094 +--- linux-2.6.32.33/arch/x86/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
4095 ++++ linux-2.6.32.33/arch/x86/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
4096 @@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
4097
4098 if (!boot_params.hdr.root_flags)
4099 @@ -14195,9 +14298,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/setup.c linux-2.6.32.32/arch/x86/kern
4100 data_resource.end = virt_to_phys(_edata)-1;
4101 bss_resource.start = virt_to_phys(&__bss_start);
4102 bss_resource.end = virt_to_phys(&__bss_stop)-1;
4103 -diff -urNp linux-2.6.32.32/arch/x86/kernel/setup_percpu.c linux-2.6.32.32/arch/x86/kernel/setup_percpu.c
4104 ---- linux-2.6.32.32/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
4105 -+++ linux-2.6.32.32/arch/x86/kernel/setup_percpu.c 2010-12-31 14:46:53.000000000 -0500
4106 +diff -urNp linux-2.6.32.33/arch/x86/kernel/setup_percpu.c linux-2.6.32.33/arch/x86/kernel/setup_percpu.c
4107 +--- linux-2.6.32.33/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
4108 ++++ linux-2.6.32.33/arch/x86/kernel/setup_percpu.c 2010-12-31 14:46:53.000000000 -0500
4109 @@ -25,19 +25,17 @@
4110 # define DBG(x...)
4111 #endif
4112 @@ -14261,9 +14364,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/setup_percpu.c linux-2.6.32.32/arch/x
4113 /*
4114 * Up to this point, the boot CPU has been using .data.init
4115 * area. Reload any changed state for the boot CPU.
4116 -diff -urNp linux-2.6.32.32/arch/x86/kernel/signal.c linux-2.6.32.32/arch/x86/kernel/signal.c
4117 ---- linux-2.6.32.32/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
4118 -+++ linux-2.6.32.32/arch/x86/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
4119 +diff -urNp linux-2.6.32.33/arch/x86/kernel/signal.c linux-2.6.32.33/arch/x86/kernel/signal.c
4120 +--- linux-2.6.32.33/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
4121 ++++ linux-2.6.32.33/arch/x86/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
4122 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
4123 * Align the stack pointer according to the i386 ABI,
4124 * i.e. so that on function entry ((sp + 4) & 15) == 0.
4125 @@ -14338,9 +14441,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/signal.c linux-2.6.32.32/arch/x86/ker
4126 return;
4127
4128 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
4129 -diff -urNp linux-2.6.32.32/arch/x86/kernel/smpboot.c linux-2.6.32.32/arch/x86/kernel/smpboot.c
4130 ---- linux-2.6.32.32/arch/x86/kernel/smpboot.c 2011-01-11 23:55:35.000000000 -0500
4131 -+++ linux-2.6.32.32/arch/x86/kernel/smpboot.c 2011-01-11 23:56:03.000000000 -0500
4132 +diff -urNp linux-2.6.32.33/arch/x86/kernel/smpboot.c linux-2.6.32.33/arch/x86/kernel/smpboot.c
4133 +--- linux-2.6.32.33/arch/x86/kernel/smpboot.c 2011-01-11 23:55:35.000000000 -0500
4134 ++++ linux-2.6.32.33/arch/x86/kernel/smpboot.c 2011-01-11 23:56:03.000000000 -0500
4135 @@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
4136 */
4137 static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
4138 @@ -14385,9 +14488,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/smpboot.c linux-2.6.32.32/arch/x86/ke
4139 err = do_boot_cpu(apicid, cpu);
4140
4141 if (err) {
4142 -diff -urNp linux-2.6.32.32/arch/x86/kernel/step.c linux-2.6.32.32/arch/x86/kernel/step.c
4143 ---- linux-2.6.32.32/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
4144 -+++ linux-2.6.32.32/arch/x86/kernel/step.c 2010-12-31 14:47:01.000000000 -0500
4145 +diff -urNp linux-2.6.32.33/arch/x86/kernel/step.c linux-2.6.32.33/arch/x86/kernel/step.c
4146 +--- linux-2.6.32.33/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
4147 ++++ linux-2.6.32.33/arch/x86/kernel/step.c 2010-12-31 14:47:01.000000000 -0500
4148 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
4149 struct desc_struct *desc;
4150 unsigned long base;
4151 @@ -14430,17 +14533,17 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/step.c linux-2.6.32.32/arch/x86/kerne
4152 /* 32-bit mode: register increment */
4153 return 0;
4154 /* 64-bit mode: REX prefix */
4155 -diff -urNp linux-2.6.32.32/arch/x86/kernel/syscall_table_32.S linux-2.6.32.32/arch/x86/kernel/syscall_table_32.S
4156 ---- linux-2.6.32.32/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
4157 -+++ linux-2.6.32.32/arch/x86/kernel/syscall_table_32.S 2010-12-31 14:46:53.000000000 -0500
4158 +diff -urNp linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S
4159 +--- linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
4160 ++++ linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S 2010-12-31 14:46:53.000000000 -0500
4161 @@ -1,3 +1,4 @@
4162 +.section .rodata,"a",@progbits
4163 ENTRY(sys_call_table)
4164 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
4165 .long sys_exit
4166 -diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_i386_32.c linux-2.6.32.32/arch/x86/kernel/sys_i386_32.c
4167 ---- linux-2.6.32.32/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
4168 -+++ linux-2.6.32.32/arch/x86/kernel/sys_i386_32.c 2010-12-31 14:47:01.000000000 -0500
4169 +diff -urNp linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c
4170 +--- linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
4171 ++++ linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c 2011-03-21 17:34:54.000000000 -0400
4172 @@ -24,6 +24,21 @@
4173
4174 #include <asm/syscalls.h>
4175 @@ -14637,8 +14740,8 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_i386_32.c linux-2.6.32.32/arch/x8
4176 + mm->cached_hole_size = vma->vm_start - addr;
4177 +
4178 + /* try just below the current vma->vm_start */
4179 -+ addr = vma->vm_start-len;
4180 -+ } while (len < vma->vm_start);
4181 ++ addr = skip_heap_stack_gap(vma, len);
4182 ++ } while (!IS_ERR_VALUE(addr));
4183 +
4184 +bottomup:
4185 + /*
4186 @@ -14712,9 +14815,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_i386_32.c linux-2.6.32.32/arch/x8
4187 - : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
4188 - return __res;
4189 -}
4190 -diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c
4191 ---- linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
4192 -+++ linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c 2010-12-31 14:46:53.000000000 -0500
4193 +diff -urNp linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c
4194 +--- linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
4195 ++++ linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c 2011-03-21 17:34:54.000000000 -0400
4196 @@ -32,8 +32,8 @@ out:
4197 return error;
4198 }
4199 @@ -14776,7 +14879,7 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c linux-2.6.32.32/arch/x86
4200
4201 /* requested length too big for entire address space */
4202 if (len > TASK_SIZE)
4203 -@@ -141,12 +144,15 @@ arch_get_unmapped_area_topdown(struct fi
4204 +@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct fi
4205 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
4206 goto bottomup;
4207
4208 @@ -14787,14 +14890,19 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c linux-2.6.32.32/arch/x86
4209 /* requesting a specific address */
4210 if (addr) {
4211 addr = PAGE_ALIGN(addr);
4212 - vma = find_vma(mm, addr);
4213 +- vma = find_vma(mm, addr);
4214 - if (TASK_SIZE - len >= addr &&
4215 - (!vma || addr + len <= vma->vm_start))
4216 -+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4217 - return addr;
4218 +- return addr;
4219 ++ if (TASK_SIZE - len >= addr) {
4220 ++ vma = find_vma(mm, addr);
4221 ++ if (check_heap_stack_gap(vma, addr, len))
4222 ++ return addr;
4223 ++ }
4224 }
4225
4226 -@@ -162,7 +168,7 @@ arch_get_unmapped_area_topdown(struct fi
4227 + /* check if free_area_cache is useful for us */
4228 +@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct fi
4229 /* make sure it can fit in the remaining address space */
4230 if (addr > len) {
4231 vma = find_vma(mm, addr-len);
4232 @@ -14803,7 +14911,7 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c linux-2.6.32.32/arch/x86
4233 /* remember the address as a hint for next time */
4234 return mm->free_area_cache = addr-len;
4235 }
4236 -@@ -179,7 +185,7 @@ arch_get_unmapped_area_topdown(struct fi
4237 +@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct fi
4238 * return with success:
4239 */
4240 vma = find_vma(mm, addr);
4241 @@ -14812,7 +14920,18 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c linux-2.6.32.32/arch/x86
4242 /* remember the address as a hint for next time */
4243 return mm->free_area_cache = addr;
4244
4245 -@@ -198,13 +204,21 @@ bottomup:
4246 +@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct fi
4247 + mm->cached_hole_size = vma->vm_start - addr;
4248 +
4249 + /* try just below the current vma->vm_start */
4250 +- addr = vma->vm_start-len;
4251 +- } while (len < vma->vm_start);
4252 ++ addr = skip_heap_stack_gap(vma, len);
4253 ++ } while (!IS_ERR_VALUE(addr));
4254 +
4255 + bottomup:
4256 + /*
4257 +@@ -198,13 +206,21 @@ bottomup:
4258 * can happen with large stack limits and large mmap()
4259 * allocations.
4260 */
4261 @@ -14836,9 +14955,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/sys_x86_64.c linux-2.6.32.32/arch/x86
4262 mm->cached_hole_size = ~0UL;
4263
4264 return addr;
4265 -diff -urNp linux-2.6.32.32/arch/x86/kernel/time.c linux-2.6.32.32/arch/x86/kernel/time.c
4266 ---- linux-2.6.32.32/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
4267 -+++ linux-2.6.32.32/arch/x86/kernel/time.c 2010-12-31 14:46:53.000000000 -0500
4268 +diff -urNp linux-2.6.32.33/arch/x86/kernel/time.c linux-2.6.32.33/arch/x86/kernel/time.c
4269 +--- linux-2.6.32.33/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
4270 ++++ linux-2.6.32.33/arch/x86/kernel/time.c 2010-12-31 14:46:53.000000000 -0500
4271 @@ -26,17 +26,13 @@
4272 int timer_ack;
4273 #endif
4274 @@ -14877,9 +14996,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/time.c linux-2.6.32.32/arch/x86/kerne
4275 }
4276 return pc;
4277 }
4278 -diff -urNp linux-2.6.32.32/arch/x86/kernel/tls.c linux-2.6.32.32/arch/x86/kernel/tls.c
4279 ---- linux-2.6.32.32/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
4280 -+++ linux-2.6.32.32/arch/x86/kernel/tls.c 2010-12-31 14:46:53.000000000 -0500
4281 +diff -urNp linux-2.6.32.33/arch/x86/kernel/tls.c linux-2.6.32.33/arch/x86/kernel/tls.c
4282 +--- linux-2.6.32.33/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
4283 ++++ linux-2.6.32.33/arch/x86/kernel/tls.c 2010-12-31 14:46:53.000000000 -0500
4284 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
4285 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
4286 return -EINVAL;
4287 @@ -14892,9 +15011,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/tls.c linux-2.6.32.32/arch/x86/kernel
4288 set_tls_desc(p, idx, &info, 1);
4289
4290 return 0;
4291 -diff -urNp linux-2.6.32.32/arch/x86/kernel/trampoline_32.S linux-2.6.32.32/arch/x86/kernel/trampoline_32.S
4292 ---- linux-2.6.32.32/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
4293 -+++ linux-2.6.32.32/arch/x86/kernel/trampoline_32.S 2010-12-31 14:46:53.000000000 -0500
4294 +diff -urNp linux-2.6.32.33/arch/x86/kernel/trampoline_32.S linux-2.6.32.33/arch/x86/kernel/trampoline_32.S
4295 +--- linux-2.6.32.33/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
4296 ++++ linux-2.6.32.33/arch/x86/kernel/trampoline_32.S 2010-12-31 14:46:53.000000000 -0500
4297 @@ -32,6 +32,12 @@
4298 #include <asm/segment.h>
4299 #include <asm/page_types.h>
4300 @@ -14917,9 +15036,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/trampoline_32.S linux-2.6.32.32/arch/
4301
4302 # These need to be in the same 64K segment as the above;
4303 # hence we don't use the boot_gdt_descr defined in head.S
4304 -diff -urNp linux-2.6.32.32/arch/x86/kernel/trampoline_64.S linux-2.6.32.32/arch/x86/kernel/trampoline_64.S
4305 ---- linux-2.6.32.32/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400
4306 -+++ linux-2.6.32.32/arch/x86/kernel/trampoline_64.S 2010-12-31 14:46:53.000000000 -0500
4307 +diff -urNp linux-2.6.32.33/arch/x86/kernel/trampoline_64.S linux-2.6.32.33/arch/x86/kernel/trampoline_64.S
4308 +--- linux-2.6.32.33/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400
4309 ++++ linux-2.6.32.33/arch/x86/kernel/trampoline_64.S 2010-12-31 14:46:53.000000000 -0500
4310 @@ -91,7 +91,7 @@ startup_32:
4311 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
4312 movl %eax, %ds
4313 @@ -14938,9 +15057,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/trampoline_64.S linux-2.6.32.32/arch/
4314 .long tgdt - r_base
4315 .short 0
4316 .quad 0x00cf9b000000ffff # __KERNEL32_CS
4317 -diff -urNp linux-2.6.32.32/arch/x86/kernel/traps.c linux-2.6.32.32/arch/x86/kernel/traps.c
4318 ---- linux-2.6.32.32/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
4319 -+++ linux-2.6.32.32/arch/x86/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
4320 +diff -urNp linux-2.6.32.33/arch/x86/kernel/traps.c linux-2.6.32.33/arch/x86/kernel/traps.c
4321 +--- linux-2.6.32.33/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
4322 ++++ linux-2.6.32.33/arch/x86/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
4323 @@ -69,12 +69,6 @@ asmlinkage int system_call(void);
4324
4325 /* Do we ignore FPU interrupts ? */
4326 @@ -15090,9 +15209,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/traps.c linux-2.6.32.32/arch/x86/kern
4327 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
4328 return;
4329 }
4330 -diff -urNp linux-2.6.32.32/arch/x86/kernel/tsc.c linux-2.6.32.32/arch/x86/kernel/tsc.c
4331 ---- linux-2.6.32.32/arch/x86/kernel/tsc.c 2011-02-22 15:56:54.000000000 -0500
4332 -+++ linux-2.6.32.32/arch/x86/kernel/tsc.c 2011-02-22 15:57:23.000000000 -0500
4333 +diff -urNp linux-2.6.32.33/arch/x86/kernel/tsc.c linux-2.6.32.33/arch/x86/kernel/tsc.c
4334 +--- linux-2.6.32.33/arch/x86/kernel/tsc.c 2011-02-22 15:56:54.000000000 -0500
4335 ++++ linux-2.6.32.33/arch/x86/kernel/tsc.c 2011-02-22 15:57:23.000000000 -0500
4336 @@ -838,7 +838,7 @@ static struct dmi_system_id __initdata b
4337 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
4338 },
4339 @@ -15102,9 +15221,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/tsc.c linux-2.6.32.32/arch/x86/kernel
4340 };
4341
4342 static void __init check_system_tsc_reliable(void)
4343 -diff -urNp linux-2.6.32.32/arch/x86/kernel/vm86_32.c linux-2.6.32.32/arch/x86/kernel/vm86_32.c
4344 ---- linux-2.6.32.32/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
4345 -+++ linux-2.6.32.32/arch/x86/kernel/vm86_32.c 2010-12-31 14:46:53.000000000 -0500
4346 +diff -urNp linux-2.6.32.33/arch/x86/kernel/vm86_32.c linux-2.6.32.33/arch/x86/kernel/vm86_32.c
4347 +--- linux-2.6.32.33/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
4348 ++++ linux-2.6.32.33/arch/x86/kernel/vm86_32.c 2010-12-31 14:46:53.000000000 -0500
4349 @@ -41,6 +41,7 @@
4350 #include <linux/ptrace.h>
4351 #include <linux/audit.h>
4352 @@ -15169,9 +15288,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/vm86_32.c linux-2.6.32.32/arch/x86/ke
4353 if (get_user(segoffs, intr_ptr))
4354 goto cannot_handle;
4355 if ((segoffs >> 16) == BIOSSEG)
4356 -diff -urNp linux-2.6.32.32/arch/x86/kernel/vmi_32.c linux-2.6.32.32/arch/x86/kernel/vmi_32.c
4357 ---- linux-2.6.32.32/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
4358 -+++ linux-2.6.32.32/arch/x86/kernel/vmi_32.c 2010-12-31 14:47:01.000000000 -0500
4359 +diff -urNp linux-2.6.32.33/arch/x86/kernel/vmi_32.c linux-2.6.32.33/arch/x86/kernel/vmi_32.c
4360 +--- linux-2.6.32.33/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
4361 ++++ linux-2.6.32.33/arch/x86/kernel/vmi_32.c 2010-12-31 14:47:01.000000000 -0500
4362 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
4363 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
4364
4365 @@ -15334,9 +15453,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/vmi_32.c linux-2.6.32.32/arch/x86/ker
4366 return;
4367
4368 local_irq_save(flags);
4369 -diff -urNp linux-2.6.32.32/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.32/arch/x86/kernel/vmlinux.lds.S
4370 ---- linux-2.6.32.32/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
4371 -+++ linux-2.6.32.32/arch/x86/kernel/vmlinux.lds.S 2010-12-31 14:47:01.000000000 -0500
4372 +diff -urNp linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S
4373 +--- linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
4374 ++++ linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S 2010-12-31 14:47:01.000000000 -0500
4375 @@ -26,6 +26,13 @@
4376 #include <asm/page_types.h>
4377 #include <asm/cache.h>
4378 @@ -15629,9 +15748,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.32/arch/x8
4379 "kernel image bigger than KERNEL_IMAGE_SIZE");
4380
4381 #ifdef CONFIG_SMP
4382 -diff -urNp linux-2.6.32.32/arch/x86/kernel/vsyscall_64.c linux-2.6.32.32/arch/x86/kernel/vsyscall_64.c
4383 ---- linux-2.6.32.32/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
4384 -+++ linux-2.6.32.32/arch/x86/kernel/vsyscall_64.c 2010-12-31 14:46:53.000000000 -0500
4385 +diff -urNp linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c
4386 +--- linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
4387 ++++ linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c 2010-12-31 14:46:53.000000000 -0500
4388 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
4389
4390 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
4391 @@ -15665,9 +15784,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/vsyscall_64.c linux-2.6.32.32/arch/x8
4392 };
4393 #endif
4394
4395 -diff -urNp linux-2.6.32.32/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.32/arch/x86/kernel/x8664_ksyms_64.c
4396 ---- linux-2.6.32.32/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
4397 -+++ linux-2.6.32.32/arch/x86/kernel/x8664_ksyms_64.c 2010-12-31 14:46:53.000000000 -0500
4398 +diff -urNp linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c
4399 +--- linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
4400 ++++ linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c 2010-12-31 14:46:53.000000000 -0500
4401 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
4402
4403 EXPORT_SYMBOL(copy_user_generic);
4404 @@ -15677,9 +15796,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.32/arch
4405 EXPORT_SYMBOL(__copy_from_user_inatomic);
4406
4407 EXPORT_SYMBOL(copy_page);
4408 -diff -urNp linux-2.6.32.32/arch/x86/kernel/xsave.c linux-2.6.32.32/arch/x86/kernel/xsave.c
4409 ---- linux-2.6.32.32/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
4410 -+++ linux-2.6.32.32/arch/x86/kernel/xsave.c 2010-12-31 14:46:53.000000000 -0500
4411 +diff -urNp linux-2.6.32.33/arch/x86/kernel/xsave.c linux-2.6.32.33/arch/x86/kernel/xsave.c
4412 +--- linux-2.6.32.33/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
4413 ++++ linux-2.6.32.33/arch/x86/kernel/xsave.c 2010-12-31 14:46:53.000000000 -0500
4414 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
4415 fx_sw_user->xstate_size > fx_sw_user->extended_size)
4416 return -1;
4417 @@ -15707,9 +15826,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kernel/xsave.c linux-2.6.32.32/arch/x86/kern
4418 buf);
4419 if (unlikely(err)) {
4420 /*
4421 -diff -urNp linux-2.6.32.32/arch/x86/kvm/emulate.c linux-2.6.32.32/arch/x86/kvm/emulate.c
4422 ---- linux-2.6.32.32/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
4423 -+++ linux-2.6.32.32/arch/x86/kvm/emulate.c 2010-12-31 14:46:53.000000000 -0500
4424 +diff -urNp linux-2.6.32.33/arch/x86/kvm/emulate.c linux-2.6.32.33/arch/x86/kvm/emulate.c
4425 +--- linux-2.6.32.33/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
4426 ++++ linux-2.6.32.33/arch/x86/kvm/emulate.c 2010-12-31 14:46:53.000000000 -0500
4427 @@ -81,8 +81,8 @@
4428 #define Src2CL (1<<29)
4429 #define Src2ImmByte (2<<29)
4430 @@ -15746,9 +15865,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kvm/emulate.c linux-2.6.32.32/arch/x86/kvm/e
4431 switch ((_dst).bytes) { \
4432 case 1: \
4433 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
4434 -diff -urNp linux-2.6.32.32/arch/x86/kvm/lapic.c linux-2.6.32.32/arch/x86/kvm/lapic.c
4435 ---- linux-2.6.32.32/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
4436 -+++ linux-2.6.32.32/arch/x86/kvm/lapic.c 2010-12-31 14:46:53.000000000 -0500
4437 +diff -urNp linux-2.6.32.33/arch/x86/kvm/lapic.c linux-2.6.32.33/arch/x86/kvm/lapic.c
4438 +--- linux-2.6.32.33/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
4439 ++++ linux-2.6.32.33/arch/x86/kvm/lapic.c 2010-12-31 14:46:53.000000000 -0500
4440 @@ -52,7 +52,7 @@
4441 #define APIC_BUS_CYCLE_NS 1
4442
4443 @@ -15758,9 +15877,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kvm/lapic.c linux-2.6.32.32/arch/x86/kvm/lap
4444
4445 #define APIC_LVT_NUM 6
4446 /* 14 is the version for Xeon and Pentium 8.4.8*/
4447 -diff -urNp linux-2.6.32.32/arch/x86/kvm/svm.c linux-2.6.32.32/arch/x86/kvm/svm.c
4448 ---- linux-2.6.32.32/arch/x86/kvm/svm.c 2010-11-26 18:22:29.000000000 -0500
4449 -+++ linux-2.6.32.32/arch/x86/kvm/svm.c 2010-12-31 14:46:53.000000000 -0500
4450 +diff -urNp linux-2.6.32.33/arch/x86/kvm/svm.c linux-2.6.32.33/arch/x86/kvm/svm.c
4451 +--- linux-2.6.32.33/arch/x86/kvm/svm.c 2010-11-26 18:22:29.000000000 -0500
4452 ++++ linux-2.6.32.33/arch/x86/kvm/svm.c 2010-12-31 14:46:53.000000000 -0500
4453 @@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k
4454 static void reload_tss(struct kvm_vcpu *vcpu)
4455 {
4456 @@ -15784,9 +15903,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kvm/svm.c linux-2.6.32.32/arch/x86/kvm/svm.c
4457 .cpu_has_kvm_support = has_svm,
4458 .disabled_by_bios = is_disabled,
4459 .hardware_setup = svm_hardware_setup,
4460 -diff -urNp linux-2.6.32.32/arch/x86/kvm/vmx.c linux-2.6.32.32/arch/x86/kvm/vmx.c
4461 ---- linux-2.6.32.32/arch/x86/kvm/vmx.c 2010-12-09 18:13:03.000000000 -0500
4462 -+++ linux-2.6.32.32/arch/x86/kvm/vmx.c 2010-12-31 14:46:53.000000000 -0500
4463 +diff -urNp linux-2.6.32.33/arch/x86/kvm/vmx.c linux-2.6.32.33/arch/x86/kvm/vmx.c
4464 +--- linux-2.6.32.33/arch/x86/kvm/vmx.c 2010-12-09 18:13:03.000000000 -0500
4465 ++++ linux-2.6.32.33/arch/x86/kvm/vmx.c 2010-12-31 14:46:53.000000000 -0500
4466 @@ -570,7 +570,11 @@ static void reload_tss(void)
4467
4468 kvm_get_gdt(&gdt);
4469 @@ -15868,9 +15987,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kvm/vmx.c linux-2.6.32.32/arch/x86/kvm/vmx.c
4470 .cpu_has_kvm_support = cpu_has_kvm_support,
4471 .disabled_by_bios = vmx_disabled_by_bios,
4472 .hardware_setup = hardware_setup,
4473 -diff -urNp linux-2.6.32.32/arch/x86/kvm/x86.c linux-2.6.32.32/arch/x86/kvm/x86.c
4474 ---- linux-2.6.32.32/arch/x86/kvm/x86.c 2010-12-09 18:13:03.000000000 -0500
4475 -+++ linux-2.6.32.32/arch/x86/kvm/x86.c 2010-12-31 14:46:53.000000000 -0500
4476 +diff -urNp linux-2.6.32.33/arch/x86/kvm/x86.c linux-2.6.32.33/arch/x86/kvm/x86.c
4477 +--- linux-2.6.32.33/arch/x86/kvm/x86.c 2010-12-09 18:13:03.000000000 -0500
4478 ++++ linux-2.6.32.33/arch/x86/kvm/x86.c 2010-12-31 14:46:53.000000000 -0500
4479 @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
4480 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
4481 struct kvm_cpuid_entry2 __user *entries);
4482 @@ -15972,9 +16091,9 @@ diff -urNp linux-2.6.32.32/arch/x86/kvm/x86.c linux-2.6.32.32/arch/x86/kvm/x86.c
4483
4484 if (kvm_x86_ops) {
4485 printk(KERN_ERR "kvm: already loaded the other module\n");
4486 -diff -urNp linux-2.6.32.32/arch/x86/lib/checksum_32.S linux-2.6.32.32/arch/x86/lib/checksum_32.S
4487 ---- linux-2.6.32.32/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
4488 -+++ linux-2.6.32.32/arch/x86/lib/checksum_32.S 2011-01-16 20:53:41.000000000 -0500
4489 +diff -urNp linux-2.6.32.33/arch/x86/lib/checksum_32.S linux-2.6.32.33/arch/x86/lib/checksum_32.S
4490 +--- linux-2.6.32.33/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
4491 ++++ linux-2.6.32.33/arch/x86/lib/checksum_32.S 2011-01-16 20:53:41.000000000 -0500
4492 @@ -28,7 +28,8 @@
4493 #include <linux/linkage.h>
4494 #include <asm/dwarf2.h>
4495 @@ -16235,9 +16354,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/checksum_32.S linux-2.6.32.32/arch/x86/l
4496
4497 #undef ROUND
4498 #undef ROUND1
4499 -diff -urNp linux-2.6.32.32/arch/x86/lib/clear_page_64.S linux-2.6.32.32/arch/x86/lib/clear_page_64.S
4500 ---- linux-2.6.32.32/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
4501 -+++ linux-2.6.32.32/arch/x86/lib/clear_page_64.S 2010-12-31 14:46:53.000000000 -0500
4502 +diff -urNp linux-2.6.32.33/arch/x86/lib/clear_page_64.S linux-2.6.32.33/arch/x86/lib/clear_page_64.S
4503 +--- linux-2.6.32.33/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
4504 ++++ linux-2.6.32.33/arch/x86/lib/clear_page_64.S 2010-12-31 14:46:53.000000000 -0500
4505 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
4506
4507 #include <asm/cpufeature.h>
4508 @@ -16247,9 +16366,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/clear_page_64.S linux-2.6.32.32/arch/x86
4509 1: .byte 0xeb /* jmp <disp8> */
4510 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
4511 2:
4512 -diff -urNp linux-2.6.32.32/arch/x86/lib/copy_page_64.S linux-2.6.32.32/arch/x86/lib/copy_page_64.S
4513 ---- linux-2.6.32.32/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
4514 -+++ linux-2.6.32.32/arch/x86/lib/copy_page_64.S 2010-12-31 14:46:53.000000000 -0500
4515 +diff -urNp linux-2.6.32.33/arch/x86/lib/copy_page_64.S linux-2.6.32.33/arch/x86/lib/copy_page_64.S
4516 +--- linux-2.6.32.33/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
4517 ++++ linux-2.6.32.33/arch/x86/lib/copy_page_64.S 2010-12-31 14:46:53.000000000 -0500
4518 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
4519
4520 #include <asm/cpufeature.h>
4521 @@ -16259,9 +16378,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/copy_page_64.S linux-2.6.32.32/arch/x86/
4522 1: .byte 0xeb /* jmp <disp8> */
4523 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
4524 2:
4525 -diff -urNp linux-2.6.32.32/arch/x86/lib/copy_user_64.S linux-2.6.32.32/arch/x86/lib/copy_user_64.S
4526 ---- linux-2.6.32.32/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
4527 -+++ linux-2.6.32.32/arch/x86/lib/copy_user_64.S 2010-12-31 14:47:01.000000000 -0500
4528 +diff -urNp linux-2.6.32.33/arch/x86/lib/copy_user_64.S linux-2.6.32.33/arch/x86/lib/copy_user_64.S
4529 +--- linux-2.6.32.33/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
4530 ++++ linux-2.6.32.33/arch/x86/lib/copy_user_64.S 2010-12-31 14:47:01.000000000 -0500
4531 @@ -15,13 +15,14 @@
4532 #include <asm/asm-offsets.h>
4533 #include <asm/thread_info.h>
4534 @@ -16330,9 +16449,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/copy_user_64.S linux-2.6.32.32/arch/x86/
4535 movl %edx,%ecx
4536 xorl %eax,%eax
4537 rep
4538 -diff -urNp linux-2.6.32.32/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.32/arch/x86/lib/copy_user_nocache_64.S
4539 ---- linux-2.6.32.32/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
4540 -+++ linux-2.6.32.32/arch/x86/lib/copy_user_nocache_64.S 2010-12-31 14:46:53.000000000 -0500
4541 +diff -urNp linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S
4542 +--- linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
4543 ++++ linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S 2010-12-31 14:46:53.000000000 -0500
4544 @@ -14,6 +14,7 @@
4545 #include <asm/current.h>
4546 #include <asm/asm-offsets.h>
4547 @@ -16357,9 +16476,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.32/a
4548 cmpl $8,%edx
4549 jb 20f /* less then 8 bytes, go to byte copy loop */
4550 ALIGN_DESTINATION
4551 -diff -urNp linux-2.6.32.32/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.32/arch/x86/lib/csum-wrappers_64.c
4552 ---- linux-2.6.32.32/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
4553 -+++ linux-2.6.32.32/arch/x86/lib/csum-wrappers_64.c 2010-12-31 14:46:53.000000000 -0500
4554 +diff -urNp linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c
4555 +--- linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
4556 ++++ linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c 2010-12-31 14:46:53.000000000 -0500
4557 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
4558 len -= 2;
4559 }
4560 @@ -16378,9 +16497,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.32/arch/
4561 return csum_partial_copy_generic(src, (void __force *)dst,
4562 len, isum, NULL, errp);
4563 }
4564 -diff -urNp linux-2.6.32.32/arch/x86/lib/getuser.S linux-2.6.32.32/arch/x86/lib/getuser.S
4565 ---- linux-2.6.32.32/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
4566 -+++ linux-2.6.32.32/arch/x86/lib/getuser.S 2011-03-12 22:50:36.000000000 -0500
4567 +diff -urNp linux-2.6.32.33/arch/x86/lib/getuser.S linux-2.6.32.33/arch/x86/lib/getuser.S
4568 +--- linux-2.6.32.33/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
4569 ++++ linux-2.6.32.33/arch/x86/lib/getuser.S 2011-03-12 22:50:36.000000000 -0500
4570 @@ -33,14 +33,35 @@
4571 #include <asm/asm-offsets.h>
4572 #include <asm/thread_info.h>
4573 @@ -16486,9 +16605,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/getuser.S linux-2.6.32.32/arch/x86/lib/g
4574 4: movq -7(%_ASM_AX),%_ASM_DX
4575 xor %eax,%eax
4576 ret
4577 -diff -urNp linux-2.6.32.32/arch/x86/lib/memcpy_64.S linux-2.6.32.32/arch/x86/lib/memcpy_64.S
4578 ---- linux-2.6.32.32/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
4579 -+++ linux-2.6.32.32/arch/x86/lib/memcpy_64.S 2010-12-31 14:46:53.000000000 -0500
4580 +diff -urNp linux-2.6.32.33/arch/x86/lib/memcpy_64.S linux-2.6.32.33/arch/x86/lib/memcpy_64.S
4581 +--- linux-2.6.32.33/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
4582 ++++ linux-2.6.32.33/arch/x86/lib/memcpy_64.S 2010-12-31 14:46:53.000000000 -0500
4583 @@ -128,7 +128,7 @@ ENDPROC(__memcpy)
4584 * It is also a lot simpler. Use this when possible:
4585 */
4586 @@ -16498,9 +16617,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/memcpy_64.S linux-2.6.32.32/arch/x86/lib
4587 1: .byte 0xeb /* jmp <disp8> */
4588 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
4589 2:
4590 -diff -urNp linux-2.6.32.32/arch/x86/lib/memset_64.S linux-2.6.32.32/arch/x86/lib/memset_64.S
4591 ---- linux-2.6.32.32/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
4592 -+++ linux-2.6.32.32/arch/x86/lib/memset_64.S 2010-12-31 14:46:53.000000000 -0500
4593 +diff -urNp linux-2.6.32.33/arch/x86/lib/memset_64.S linux-2.6.32.33/arch/x86/lib/memset_64.S
4594 +--- linux-2.6.32.33/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
4595 ++++ linux-2.6.32.33/arch/x86/lib/memset_64.S 2010-12-31 14:46:53.000000000 -0500
4596 @@ -118,7 +118,7 @@ ENDPROC(__memset)
4597
4598 #include <asm/cpufeature.h>
4599 @@ -16510,9 +16629,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/memset_64.S linux-2.6.32.32/arch/x86/lib
4600 1: .byte 0xeb /* jmp <disp8> */
4601 .byte (memset_c - memset) - (2f - 1b) /* offset */
4602 2:
4603 -diff -urNp linux-2.6.32.32/arch/x86/lib/mmx_32.c linux-2.6.32.32/arch/x86/lib/mmx_32.c
4604 ---- linux-2.6.32.32/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
4605 -+++ linux-2.6.32.32/arch/x86/lib/mmx_32.c 2010-12-31 14:46:53.000000000 -0500
4606 +diff -urNp linux-2.6.32.33/arch/x86/lib/mmx_32.c linux-2.6.32.33/arch/x86/lib/mmx_32.c
4607 +--- linux-2.6.32.33/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
4608 ++++ linux-2.6.32.33/arch/x86/lib/mmx_32.c 2010-12-31 14:46:53.000000000 -0500
4609 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
4610 {
4611 void *p;
4612 @@ -16828,9 +16947,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/mmx_32.c linux-2.6.32.32/arch/x86/lib/mm
4613
4614 from += 64;
4615 to += 64;
4616 -diff -urNp linux-2.6.32.32/arch/x86/lib/putuser.S linux-2.6.32.32/arch/x86/lib/putuser.S
4617 ---- linux-2.6.32.32/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
4618 -+++ linux-2.6.32.32/arch/x86/lib/putuser.S 2011-03-12 22:50:36.000000000 -0500
4619 +diff -urNp linux-2.6.32.33/arch/x86/lib/putuser.S linux-2.6.32.33/arch/x86/lib/putuser.S
4620 +--- linux-2.6.32.33/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
4621 ++++ linux-2.6.32.33/arch/x86/lib/putuser.S 2011-03-12 22:50:36.000000000 -0500
4622 @@ -15,7 +15,8 @@
4623 #include <asm/thread_info.h>
4624 #include <asm/errno.h>
4625 @@ -16968,9 +17087,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/putuser.S linux-2.6.32.32/arch/x86/lib/p
4626 #endif
4627 xor %eax,%eax
4628 EXIT
4629 -diff -urNp linux-2.6.32.32/arch/x86/lib/usercopy_32.c linux-2.6.32.32/arch/x86/lib/usercopy_32.c
4630 ---- linux-2.6.32.32/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
4631 -+++ linux-2.6.32.32/arch/x86/lib/usercopy_32.c 2011-03-12 22:50:36.000000000 -0500
4632 +diff -urNp linux-2.6.32.33/arch/x86/lib/usercopy_32.c linux-2.6.32.33/arch/x86/lib/usercopy_32.c
4633 +--- linux-2.6.32.33/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
4634 ++++ linux-2.6.32.33/arch/x86/lib/usercopy_32.c 2011-03-12 22:50:36.000000000 -0500
4635 @@ -43,7 +43,7 @@ do { \
4636 __asm__ __volatile__( \
4637 " testl %1,%1\n" \
4638 @@ -17575,9 +17694,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/usercopy_32.c linux-2.6.32.32/arch/x86/l
4639 -EXPORT_SYMBOL(copy_from_user);
4640 +EXPORT_SYMBOL(set_fs);
4641 +#endif
4642 -diff -urNp linux-2.6.32.32/arch/x86/lib/usercopy_64.c linux-2.6.32.32/arch/x86/lib/usercopy_64.c
4643 ---- linux-2.6.32.32/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
4644 -+++ linux-2.6.32.32/arch/x86/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
4645 +diff -urNp linux-2.6.32.33/arch/x86/lib/usercopy_64.c linux-2.6.32.33/arch/x86/lib/usercopy_64.c
4646 +--- linux-2.6.32.33/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
4647 ++++ linux-2.6.32.33/arch/x86/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
4648 @@ -42,6 +42,8 @@ long
4649 __strncpy_from_user(char *dst, const char __user *src, long count)
4650 {
4651 @@ -17614,9 +17733,9 @@ diff -urNp linux-2.6.32.32/arch/x86/lib/usercopy_64.c linux-2.6.32.32/arch/x86/l
4652 }
4653 EXPORT_SYMBOL(copy_in_user);
4654
4655 -diff -urNp linux-2.6.32.32/arch/x86/Makefile linux-2.6.32.32/arch/x86/Makefile
4656 ---- linux-2.6.32.32/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
4657 -+++ linux-2.6.32.32/arch/x86/Makefile 2010-12-31 14:46:53.000000000 -0500
4658 +diff -urNp linux-2.6.32.33/arch/x86/Makefile linux-2.6.32.33/arch/x86/Makefile
4659 +--- linux-2.6.32.33/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
4660 ++++ linux-2.6.32.33/arch/x86/Makefile 2010-12-31 14:46:53.000000000 -0500
4661 @@ -189,3 +189,12 @@ define archhelp
4662 echo ' FDARGS="..." arguments for the booted kernel'
4663 echo ' FDINITRD=file initrd for the booted kernel'
4664 @@ -17630,9 +17749,9 @@ diff -urNp linux-2.6.32.32/arch/x86/Makefile linux-2.6.32.32/arch/x86/Makefile
4665 +
4666 +archprepare:
4667 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
4668 -diff -urNp linux-2.6.32.32/arch/x86/mm/extable.c linux-2.6.32.32/arch/x86/mm/extable.c
4669 ---- linux-2.6.32.32/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
4670 -+++ linux-2.6.32.32/arch/x86/mm/extable.c 2010-12-31 14:46:53.000000000 -0500
4671 +diff -urNp linux-2.6.32.33/arch/x86/mm/extable.c linux-2.6.32.33/arch/x86/mm/extable.c
4672 +--- linux-2.6.32.33/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
4673 ++++ linux-2.6.32.33/arch/x86/mm/extable.c 2010-12-31 14:46:53.000000000 -0500
4674 @@ -1,14 +1,71 @@
4675 #include <linux/module.h>
4676 #include <linux/spinlock.h>
4677 @@ -17706,9 +17825,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/extable.c linux-2.6.32.32/arch/x86/mm/ext
4678 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
4679 extern u32 pnp_bios_is_utter_crap;
4680 pnp_bios_is_utter_crap = 1;
4681 -diff -urNp linux-2.6.32.32/arch/x86/mm/fault.c linux-2.6.32.32/arch/x86/mm/fault.c
4682 ---- linux-2.6.32.32/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
4683 -+++ linux-2.6.32.32/arch/x86/mm/fault.c 2011-03-12 22:50:36.000000000 -0500
4684 +diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault.c
4685 +--- linux-2.6.32.33/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
4686 ++++ linux-2.6.32.33/arch/x86/mm/fault.c 2011-03-12 22:50:36.000000000 -0500
4687 @@ -11,10 +11,19 @@
4688 #include <linux/kprobes.h> /* __kprobes, ... */
4689 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
4690 @@ -18393,9 +18512,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/fault.c linux-2.6.32.32/arch/x86/mm/fault
4691 +
4692 + return ret ? -EFAULT : 0;
4693 +}
4694 -diff -urNp linux-2.6.32.32/arch/x86/mm/gup.c linux-2.6.32.32/arch/x86/mm/gup.c
4695 ---- linux-2.6.32.32/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
4696 -+++ linux-2.6.32.32/arch/x86/mm/gup.c 2010-12-31 14:46:53.000000000 -0500
4697 +diff -urNp linux-2.6.32.33/arch/x86/mm/gup.c linux-2.6.32.33/arch/x86/mm/gup.c
4698 +--- linux-2.6.32.33/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
4699 ++++ linux-2.6.32.33/arch/x86/mm/gup.c 2010-12-31 14:46:53.000000000 -0500
4700 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
4701 addr = start;
4702 len = (unsigned long) nr_pages << PAGE_SHIFT;
4703 @@ -18405,9 +18524,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/gup.c linux-2.6.32.32/arch/x86/mm/gup.c
4704 (void __user *)start, len)))
4705 return 0;
4706
4707 -diff -urNp linux-2.6.32.32/arch/x86/mm/highmem_32.c linux-2.6.32.32/arch/x86/mm/highmem_32.c
4708 ---- linux-2.6.32.32/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
4709 -+++ linux-2.6.32.32/arch/x86/mm/highmem_32.c 2010-12-31 14:46:53.000000000 -0500
4710 +diff -urNp linux-2.6.32.33/arch/x86/mm/highmem_32.c linux-2.6.32.33/arch/x86/mm/highmem_32.c
4711 +--- linux-2.6.32.33/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
4712 ++++ linux-2.6.32.33/arch/x86/mm/highmem_32.c 2010-12-31 14:46:53.000000000 -0500
4713 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
4714 idx = type + KM_TYPE_NR*smp_processor_id();
4715 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
4716 @@ -18419,9 +18538,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/highmem_32.c linux-2.6.32.32/arch/x86/mm/
4717
4718 return (void *)vaddr;
4719 }
4720 -diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm/hugetlbpage.c
4721 ---- linux-2.6.32.32/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
4722 -+++ linux-2.6.32.32/arch/x86/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
4723 +diff -urNp linux-2.6.32.33/arch/x86/mm/hugetlbpage.c linux-2.6.32.33/arch/x86/mm/hugetlbpage.c
4724 +--- linux-2.6.32.33/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
4725 ++++ linux-2.6.32.33/arch/x86/mm/hugetlbpage.c 2011-03-21 17:34:54.000000000 -0400
4726 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
4727 struct hstate *h = hstate_file(file);
4728 struct mm_struct *mm = current->mm;
4729 @@ -18495,7 +18614,7 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm
4730
4731 /* don't allow allocations above current base */
4732 if (mm->free_area_cache > base)
4733 -@@ -322,7 +329,7 @@ static unsigned long hugetlb_get_unmappe
4734 +@@ -322,64 +329,63 @@ static unsigned long hugetlb_get_unmappe
4735 largest_hole = 0;
4736 mm->free_area_cache = base;
4737 }
4738 @@ -18504,10 +18623,12 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm
4739 /* make sure it can fit in the remaining address space */
4740 if (mm->free_area_cache < len)
4741 goto fail;
4742 -@@ -330,33 +337,27 @@ try_again:
4743 +
4744 /* either no address requested or cant fit in requested address hole */
4745 - addr = (mm->free_area_cache - len) & huge_page_mask(h);
4746 +- addr = (mm->free_area_cache - len) & huge_page_mask(h);
4747 ++ addr = (mm->free_area_cache - len);
4748 do {
4749 ++ addr &= huge_page_mask(h);
4750 + vma = find_vma(mm, addr);
4751 /*
4752 * Lookup failure means no vma is above this address,
4753 @@ -18547,8 +18668,10 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm
4754 + largest_hole = vma->vm_start - addr;
4755
4756 /* try just below the current vma->vm_start */
4757 - addr = (vma->vm_start - len) & huge_page_mask(h);
4758 -@@ -364,22 +365,26 @@ try_again:
4759 +- addr = (vma->vm_start - len) & huge_page_mask(h);
4760 +- } while (len <= vma->vm_start);
4761 ++ addr = skip_heap_stack_gap(vma, len);
4762 ++ } while (!IS_ERR_VALUE(addr));
4763
4764 fail:
4765 /*
4766 @@ -18586,7 +18709,7 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm
4767 mm->cached_hole_size = ~0UL;
4768 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
4769 len, pgoff, flags);
4770 -@@ -387,6 +392,7 @@ fail:
4771 +@@ -387,6 +393,7 @@ fail:
4772 /*
4773 * Restore the topdown base:
4774 */
4775 @@ -18594,7 +18717,7 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm
4776 mm->free_area_cache = base;
4777 mm->cached_hole_size = ~0UL;
4778
4779 -@@ -400,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *f
4780 +@@ -400,10 +407,19 @@ hugetlb_get_unmapped_area(struct file *f
4781 struct hstate *h = hstate_file(file);
4782 struct mm_struct *mm = current->mm;
4783 struct vm_area_struct *vma;
4784 @@ -18615,7 +18738,7 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm
4785 return -ENOMEM;
4786
4787 if (flags & MAP_FIXED) {
4788 -@@ -415,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *f
4789 +@@ -415,8 +431,7 @@ hugetlb_get_unmapped_area(struct file *f
4790 if (addr) {
4791 addr = ALIGN(addr, huge_page_size(h));
4792 vma = find_vma(mm, addr);
4793 @@ -18625,9 +18748,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/hugetlbpage.c linux-2.6.32.32/arch/x86/mm
4794 return addr;
4795 }
4796 if (mm->get_unmapped_area == arch_get_unmapped_area)
4797 -diff -urNp linux-2.6.32.32/arch/x86/mm/init_32.c linux-2.6.32.32/arch/x86/mm/init_32.c
4798 ---- linux-2.6.32.32/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
4799 -+++ linux-2.6.32.32/arch/x86/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
4800 +diff -urNp linux-2.6.32.33/arch/x86/mm/init_32.c linux-2.6.32.33/arch/x86/mm/init_32.c
4801 +--- linux-2.6.32.33/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
4802 ++++ linux-2.6.32.33/arch/x86/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
4803 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
4804 }
4805
4806 @@ -18931,9 +19054,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/init_32.c linux-2.6.32.32/arch/x86/mm/ini
4807 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
4808 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
4809 size >> 10);
4810 -diff -urNp linux-2.6.32.32/arch/x86/mm/init_64.c linux-2.6.32.32/arch/x86/mm/init_64.c
4811 ---- linux-2.6.32.32/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
4812 -+++ linux-2.6.32.32/arch/x86/mm/init_64.c 2010-12-31 14:46:53.000000000 -0500
4813 +diff -urNp linux-2.6.32.33/arch/x86/mm/init_64.c linux-2.6.32.33/arch/x86/mm/init_64.c
4814 +--- linux-2.6.32.33/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
4815 ++++ linux-2.6.32.33/arch/x86/mm/init_64.c 2010-12-31 14:46:53.000000000 -0500
4816 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
4817 pmd = fill_pmd(pud, vaddr);
4818 pte = fill_pte(pmd, vaddr);
4819 @@ -18994,9 +19117,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/init_64.c linux-2.6.32.32/arch/x86/mm/ini
4820 return "[vdso]";
4821 if (vma == &gate_vma)
4822 return "[vsyscall]";
4823 -diff -urNp linux-2.6.32.32/arch/x86/mm/init.c linux-2.6.32.32/arch/x86/mm/init.c
4824 ---- linux-2.6.32.32/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
4825 -+++ linux-2.6.32.32/arch/x86/mm/init.c 2010-12-31 14:46:53.000000000 -0500
4826 +diff -urNp linux-2.6.32.33/arch/x86/mm/init.c linux-2.6.32.33/arch/x86/mm/init.c
4827 +--- linux-2.6.32.33/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
4828 ++++ linux-2.6.32.33/arch/x86/mm/init.c 2010-12-31 14:46:53.000000000 -0500
4829 @@ -69,11 +69,7 @@ static void __init find_early_table_spac
4830 * cause a hotspot and fill up ZONE_DMA. The page tables
4831 * need roughly 0.5KB per GB.
4832 @@ -19121,9 +19244,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/init.c linux-2.6.32.32/arch/x86/mm/init.c
4833 free_init_pages("unused kernel memory",
4834 (unsigned long)(&__init_begin),
4835 (unsigned long)(&__init_end));
4836 -diff -urNp linux-2.6.32.32/arch/x86/mm/iomap_32.c linux-2.6.32.32/arch/x86/mm/iomap_32.c
4837 ---- linux-2.6.32.32/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
4838 -+++ linux-2.6.32.32/arch/x86/mm/iomap_32.c 2010-12-31 14:46:53.000000000 -0500
4839 +diff -urNp linux-2.6.32.33/arch/x86/mm/iomap_32.c linux-2.6.32.33/arch/x86/mm/iomap_32.c
4840 +--- linux-2.6.32.33/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
4841 ++++ linux-2.6.32.33/arch/x86/mm/iomap_32.c 2010-12-31 14:46:53.000000000 -0500
4842 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
4843 debug_kmap_atomic(type);
4844 idx = type + KM_TYPE_NR * smp_processor_id();
4845 @@ -19136,9 +19259,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/iomap_32.c linux-2.6.32.32/arch/x86/mm/io
4846 arch_flush_lazy_mmu_mode();
4847
4848 return (void *)vaddr;
4849 -diff -urNp linux-2.6.32.32/arch/x86/mm/ioremap.c linux-2.6.32.32/arch/x86/mm/ioremap.c
4850 ---- linux-2.6.32.32/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
4851 -+++ linux-2.6.32.32/arch/x86/mm/ioremap.c 2010-12-31 14:46:53.000000000 -0500
4852 +diff -urNp linux-2.6.32.33/arch/x86/mm/ioremap.c linux-2.6.32.33/arch/x86/mm/ioremap.c
4853 +--- linux-2.6.32.33/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
4854 ++++ linux-2.6.32.33/arch/x86/mm/ioremap.c 2010-12-31 14:46:53.000000000 -0500
4855 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
4856 * Second special case: Some BIOSen report the PC BIOS
4857 * area (640->1Mb) as ram even though it is not.
4858 @@ -19185,9 +19308,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/ioremap.c linux-2.6.32.32/arch/x86/mm/ior
4859
4860 /*
4861 * The boot-ioremap range spans multiple pmds, for which
4862 -diff -urNp linux-2.6.32.32/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.32/arch/x86/mm/kmemcheck/kmemcheck.c
4863 ---- linux-2.6.32.32/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
4864 -+++ linux-2.6.32.32/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-31 14:46:53.000000000 -0500
4865 +diff -urNp linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c
4866 +--- linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
4867 ++++ linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-31 14:46:53.000000000 -0500
4868 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
4869 * memory (e.g. tracked pages)? For now, we need this to avoid
4870 * invoking kmemcheck for PnP BIOS calls.
4871 @@ -19200,9 +19323,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.32/arc
4872 return false;
4873
4874 pte = kmemcheck_pte_lookup(address);
4875 -diff -urNp linux-2.6.32.32/arch/x86/mm/mmap.c linux-2.6.32.32/arch/x86/mm/mmap.c
4876 ---- linux-2.6.32.32/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
4877 -+++ linux-2.6.32.32/arch/x86/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
4878 +diff -urNp linux-2.6.32.33/arch/x86/mm/mmap.c linux-2.6.32.33/arch/x86/mm/mmap.c
4879 +--- linux-2.6.32.33/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
4880 ++++ linux-2.6.32.33/arch/x86/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
4881 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
4882 * Leave an at least ~128 MB hole with possible stack randomization.
4883 */
4884 @@ -19284,9 +19407,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/mmap.c linux-2.6.32.32/arch/x86/mm/mmap.c
4885 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4886 mm->unmap_area = arch_unmap_area_topdown;
4887 }
4888 -diff -urNp linux-2.6.32.32/arch/x86/mm/numa_32.c linux-2.6.32.32/arch/x86/mm/numa_32.c
4889 ---- linux-2.6.32.32/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
4890 -+++ linux-2.6.32.32/arch/x86/mm/numa_32.c 2010-12-31 14:46:53.000000000 -0500
4891 +diff -urNp linux-2.6.32.33/arch/x86/mm/numa_32.c linux-2.6.32.33/arch/x86/mm/numa_32.c
4892 +--- linux-2.6.32.33/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
4893 ++++ linux-2.6.32.33/arch/x86/mm/numa_32.c 2010-12-31 14:46:53.000000000 -0500
4894 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
4895 }
4896 #endif
4897 @@ -19295,9 +19418,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/numa_32.c linux-2.6.32.32/arch/x86/mm/num
4898 extern unsigned long highend_pfn, highstart_pfn;
4899
4900 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
4901 -diff -urNp linux-2.6.32.32/arch/x86/mm/pageattr.c linux-2.6.32.32/arch/x86/mm/pageattr.c
4902 ---- linux-2.6.32.32/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
4903 -+++ linux-2.6.32.32/arch/x86/mm/pageattr.c 2010-12-31 14:46:53.000000000 -0500
4904 +diff -urNp linux-2.6.32.33/arch/x86/mm/pageattr.c linux-2.6.32.33/arch/x86/mm/pageattr.c
4905 +--- linux-2.6.32.33/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
4906 ++++ linux-2.6.32.33/arch/x86/mm/pageattr.c 2010-12-31 14:46:53.000000000 -0500
4907 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection
4908 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
4909 */
4910 @@ -19374,9 +19497,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/pageattr.c linux-2.6.32.32/arch/x86/mm/pa
4911 }
4912
4913 static int
4914 -diff -urNp linux-2.6.32.32/arch/x86/mm/pageattr-test.c linux-2.6.32.32/arch/x86/mm/pageattr-test.c
4915 ---- linux-2.6.32.32/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
4916 -+++ linux-2.6.32.32/arch/x86/mm/pageattr-test.c 2010-12-31 14:46:53.000000000 -0500
4917 +diff -urNp linux-2.6.32.33/arch/x86/mm/pageattr-test.c linux-2.6.32.33/arch/x86/mm/pageattr-test.c
4918 +--- linux-2.6.32.33/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
4919 ++++ linux-2.6.32.33/arch/x86/mm/pageattr-test.c 2010-12-31 14:46:53.000000000 -0500
4920 @@ -36,7 +36,7 @@ enum {
4921
4922 static int pte_testbit(pte_t pte)
4923 @@ -19386,9 +19509,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/pageattr-test.c linux-2.6.32.32/arch/x86/
4924 }
4925
4926 struct split_state {
4927 -diff -urNp linux-2.6.32.32/arch/x86/mm/pat.c linux-2.6.32.32/arch/x86/mm/pat.c
4928 ---- linux-2.6.32.32/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
4929 -+++ linux-2.6.32.32/arch/x86/mm/pat.c 2010-12-31 14:46:53.000000000 -0500
4930 +diff -urNp linux-2.6.32.33/arch/x86/mm/pat.c linux-2.6.32.33/arch/x86/mm/pat.c
4931 +--- linux-2.6.32.33/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
4932 ++++ linux-2.6.32.33/arch/x86/mm/pat.c 2010-12-31 14:46:53.000000000 -0500
4933 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
4934
4935 conflict:
4936 @@ -19436,9 +19559,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/pat.c linux-2.6.32.32/arch/x86/mm/pat.c
4937 cattr_name(want_flags),
4938 (unsigned long long)paddr,
4939 (unsigned long long)(paddr + size),
4940 -diff -urNp linux-2.6.32.32/arch/x86/mm/pgtable_32.c linux-2.6.32.32/arch/x86/mm/pgtable_32.c
4941 ---- linux-2.6.32.32/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
4942 -+++ linux-2.6.32.32/arch/x86/mm/pgtable_32.c 2010-12-31 14:46:53.000000000 -0500
4943 +diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable_32.c linux-2.6.32.33/arch/x86/mm/pgtable_32.c
4944 +--- linux-2.6.32.33/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
4945 ++++ linux-2.6.32.33/arch/x86/mm/pgtable_32.c 2010-12-31 14:46:53.000000000 -0500
4946 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
4947 return;
4948 }
4949 @@ -19453,9 +19576,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/pgtable_32.c linux-2.6.32.32/arch/x86/mm/
4950
4951 /*
4952 * It's enough to flush this one mapping.
4953 -diff -urNp linux-2.6.32.32/arch/x86/mm/pgtable.c linux-2.6.32.32/arch/x86/mm/pgtable.c
4954 ---- linux-2.6.32.32/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
4955 -+++ linux-2.6.32.32/arch/x86/mm/pgtable.c 2010-12-31 14:46:53.000000000 -0500
4956 +diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgtable.c
4957 +--- linux-2.6.32.33/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
4958 ++++ linux-2.6.32.33/arch/x86/mm/pgtable.c 2010-12-31 14:46:53.000000000 -0500
4959 @@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p
4960 list_del(&page->lru);
4961 }
4962 @@ -19708,9 +19831,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/pgtable.c linux-2.6.32.32/arch/x86/mm/pgt
4963 pgd_dtor(pgd);
4964 paravirt_pgd_free(mm, pgd);
4965 free_page((unsigned long)pgd);
4966 -diff -urNp linux-2.6.32.32/arch/x86/mm/setup_nx.c linux-2.6.32.32/arch/x86/mm/setup_nx.c
4967 ---- linux-2.6.32.32/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
4968 -+++ linux-2.6.32.32/arch/x86/mm/setup_nx.c 2010-12-31 14:46:53.000000000 -0500
4969 +diff -urNp linux-2.6.32.33/arch/x86/mm/setup_nx.c linux-2.6.32.33/arch/x86/mm/setup_nx.c
4970 +--- linux-2.6.32.33/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
4971 ++++ linux-2.6.32.33/arch/x86/mm/setup_nx.c 2010-12-31 14:46:53.000000000 -0500
4972 @@ -4,11 +4,10 @@
4973
4974 #include <asm/pgtable.h>
4975 @@ -19776,9 +19899,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/setup_nx.c linux-2.6.32.32/arch/x86/mm/se
4976 __supported_pte_mask &= ~_PAGE_NX;
4977 }
4978 #endif
4979 -diff -urNp linux-2.6.32.32/arch/x86/mm/tlb.c linux-2.6.32.32/arch/x86/mm/tlb.c
4980 ---- linux-2.6.32.32/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
4981 -+++ linux-2.6.32.32/arch/x86/mm/tlb.c 2010-12-31 14:46:53.000000000 -0500
4982 +diff -urNp linux-2.6.32.33/arch/x86/mm/tlb.c linux-2.6.32.33/arch/x86/mm/tlb.c
4983 +--- linux-2.6.32.33/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
4984 ++++ linux-2.6.32.33/arch/x86/mm/tlb.c 2010-12-31 14:46:53.000000000 -0500
4985 @@ -12,7 +12,7 @@
4986 #include <asm/uv/uv.h>
4987
4988 @@ -19800,9 +19923,9 @@ diff -urNp linux-2.6.32.32/arch/x86/mm/tlb.c linux-2.6.32.32/arch/x86/mm/tlb.c
4989 }
4990 EXPORT_SYMBOL_GPL(leave_mm);
4991
4992 -diff -urNp linux-2.6.32.32/arch/x86/oprofile/backtrace.c linux-2.6.32.32/arch/x86/oprofile/backtrace.c
4993 ---- linux-2.6.32.32/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
4994 -+++ linux-2.6.32.32/arch/x86/oprofile/backtrace.c 2010-12-31 14:46:53.000000000 -0500
4995 +diff -urNp linux-2.6.32.33/arch/x86/oprofile/backtrace.c linux-2.6.32.33/arch/x86/oprofile/backtrace.c
4996 +--- linux-2.6.32.33/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
4997 ++++ linux-2.6.32.33/arch/x86/oprofile/backtrace.c 2010-12-31 14:46:53.000000000 -0500
4998 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
4999 struct frame_head bufhead[2];
5000
5001 @@ -19821,9 +19944,9 @@ diff -urNp linux-2.6.32.32/arch/x86/oprofile/backtrace.c linux-2.6.32.32/arch/x8
5002 unsigned long stack = kernel_stack_pointer(regs);
5003 if (depth)
5004 dump_trace(NULL, regs, (unsigned long *)stack, 0,
5005 -diff -urNp linux-2.6.32.32/arch/x86/oprofile/op_model_p4.c linux-2.6.32.32/arch/x86/oprofile/op_model_p4.c
5006 ---- linux-2.6.32.32/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
5007 -+++ linux-2.6.32.32/arch/x86/oprofile/op_model_p4.c 2010-12-31 14:46:53.000000000 -0500
5008 +diff -urNp linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c
5009 +--- linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
5010 ++++ linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c 2010-12-31 14:46:53.000000000 -0500
5011 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
5012 #endif
5013 }
5014 @@ -19833,9 +19956,9 @@ diff -urNp linux-2.6.32.32/arch/x86/oprofile/op_model_p4.c linux-2.6.32.32/arch/
5015 {
5016 #ifdef CONFIG_SMP
5017 return smp_num_siblings == 2 ? 2 : 1;
5018 -diff -urNp linux-2.6.32.32/arch/x86/pci/common.c linux-2.6.32.32/arch/x86/pci/common.c
5019 ---- linux-2.6.32.32/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
5020 -+++ linux-2.6.32.32/arch/x86/pci/common.c 2010-12-31 14:46:53.000000000 -0500
5021 +diff -urNp linux-2.6.32.33/arch/x86/pci/common.c linux-2.6.32.33/arch/x86/pci/common.c
5022 +--- linux-2.6.32.33/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
5023 ++++ linux-2.6.32.33/arch/x86/pci/common.c 2010-12-31 14:46:53.000000000 -0500
5024 @@ -31,8 +31,8 @@ int noioapicreroute = 1;
5025 int pcibios_last_bus = -1;
5026 unsigned long pirq_table_addr;
5027 @@ -19856,9 +19979,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/common.c linux-2.6.32.32/arch/x86/pci/co
5028 };
5029
5030 void __init dmi_check_pciprobe(void)
5031 -diff -urNp linux-2.6.32.32/arch/x86/pci/direct.c linux-2.6.32.32/arch/x86/pci/direct.c
5032 ---- linux-2.6.32.32/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
5033 -+++ linux-2.6.32.32/arch/x86/pci/direct.c 2010-12-31 14:46:53.000000000 -0500
5034 +diff -urNp linux-2.6.32.33/arch/x86/pci/direct.c linux-2.6.32.33/arch/x86/pci/direct.c
5035 +--- linux-2.6.32.33/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
5036 ++++ linux-2.6.32.33/arch/x86/pci/direct.c 2010-12-31 14:46:53.000000000 -0500
5037 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
5038
5039 #undef PCI_CONF1_ADDRESS
5040 @@ -19886,9 +20009,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/direct.c linux-2.6.32.32/arch/x86/pci/di
5041 {
5042 u32 x = 0;
5043 int year, devfn;
5044 -diff -urNp linux-2.6.32.32/arch/x86/pci/fixup.c linux-2.6.32.32/arch/x86/pci/fixup.c
5045 ---- linux-2.6.32.32/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
5046 -+++ linux-2.6.32.32/arch/x86/pci/fixup.c 2010-12-31 14:46:53.000000000 -0500
5047 +diff -urNp linux-2.6.32.33/arch/x86/pci/fixup.c linux-2.6.32.33/arch/x86/pci/fixup.c
5048 +--- linux-2.6.32.33/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
5049 ++++ linux-2.6.32.33/arch/x86/pci/fixup.c 2010-12-31 14:46:53.000000000 -0500
5050 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
5051 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
5052 },
5053 @@ -19907,9 +20030,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/fixup.c linux-2.6.32.32/arch/x86/pci/fix
5054 };
5055
5056 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
5057 -diff -urNp linux-2.6.32.32/arch/x86/pci/irq.c linux-2.6.32.32/arch/x86/pci/irq.c
5058 ---- linux-2.6.32.32/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
5059 -+++ linux-2.6.32.32/arch/x86/pci/irq.c 2010-12-31 14:46:53.000000000 -0500
5060 +diff -urNp linux-2.6.32.33/arch/x86/pci/irq.c linux-2.6.32.33/arch/x86/pci/irq.c
5061 +--- linux-2.6.32.33/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
5062 ++++ linux-2.6.32.33/arch/x86/pci/irq.c 2010-12-31 14:46:53.000000000 -0500
5063 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str
5064 static struct pci_device_id __initdata pirq_440gx[] = {
5065 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
5066 @@ -19928,9 +20051,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/irq.c linux-2.6.32.32/arch/x86/pci/irq.c
5067 };
5068
5069 int __init pcibios_irq_init(void)
5070 -diff -urNp linux-2.6.32.32/arch/x86/pci/mmconfig_32.c linux-2.6.32.32/arch/x86/pci/mmconfig_32.c
5071 ---- linux-2.6.32.32/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
5072 -+++ linux-2.6.32.32/arch/x86/pci/mmconfig_32.c 2010-12-31 14:46:53.000000000 -0500
5073 +diff -urNp linux-2.6.32.33/arch/x86/pci/mmconfig_32.c linux-2.6.32.33/arch/x86/pci/mmconfig_32.c
5074 +--- linux-2.6.32.33/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
5075 ++++ linux-2.6.32.33/arch/x86/pci/mmconfig_32.c 2010-12-31 14:46:53.000000000 -0500
5076 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
5077 return 0;
5078 }
5079 @@ -19940,9 +20063,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/mmconfig_32.c linux-2.6.32.32/arch/x86/p
5080 .read = pci_mmcfg_read,
5081 .write = pci_mmcfg_write,
5082 };
5083 -diff -urNp linux-2.6.32.32/arch/x86/pci/mmconfig_64.c linux-2.6.32.32/arch/x86/pci/mmconfig_64.c
5084 ---- linux-2.6.32.32/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
5085 -+++ linux-2.6.32.32/arch/x86/pci/mmconfig_64.c 2010-12-31 14:46:53.000000000 -0500
5086 +diff -urNp linux-2.6.32.33/arch/x86/pci/mmconfig_64.c linux-2.6.32.33/arch/x86/pci/mmconfig_64.c
5087 +--- linux-2.6.32.33/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
5088 ++++ linux-2.6.32.33/arch/x86/pci/mmconfig_64.c 2010-12-31 14:46:53.000000000 -0500
5089 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
5090 return 0;
5091 }
5092 @@ -19952,9 +20075,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/mmconfig_64.c linux-2.6.32.32/arch/x86/p
5093 .read = pci_mmcfg_read,
5094 .write = pci_mmcfg_write,
5095 };
5096 -diff -urNp linux-2.6.32.32/arch/x86/pci/numaq_32.c linux-2.6.32.32/arch/x86/pci/numaq_32.c
5097 ---- linux-2.6.32.32/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
5098 -+++ linux-2.6.32.32/arch/x86/pci/numaq_32.c 2010-12-31 14:46:53.000000000 -0500
5099 +diff -urNp linux-2.6.32.33/arch/x86/pci/numaq_32.c linux-2.6.32.33/arch/x86/pci/numaq_32.c
5100 +--- linux-2.6.32.33/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
5101 ++++ linux-2.6.32.33/arch/x86/pci/numaq_32.c 2010-12-31 14:46:53.000000000 -0500
5102 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
5103
5104 #undef PCI_CONF1_MQ_ADDRESS
5105 @@ -19964,9 +20087,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/numaq_32.c linux-2.6.32.32/arch/x86/pci/
5106 .read = pci_conf1_mq_read,
5107 .write = pci_conf1_mq_write
5108 };
5109 -diff -urNp linux-2.6.32.32/arch/x86/pci/olpc.c linux-2.6.32.32/arch/x86/pci/olpc.c
5110 ---- linux-2.6.32.32/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
5111 -+++ linux-2.6.32.32/arch/x86/pci/olpc.c 2010-12-31 14:46:53.000000000 -0500
5112 +diff -urNp linux-2.6.32.33/arch/x86/pci/olpc.c linux-2.6.32.33/arch/x86/pci/olpc.c
5113 +--- linux-2.6.32.33/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
5114 ++++ linux-2.6.32.33/arch/x86/pci/olpc.c 2010-12-31 14:46:53.000000000 -0500
5115 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
5116 return 0;
5117 }
5118 @@ -19976,9 +20099,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/olpc.c linux-2.6.32.32/arch/x86/pci/olpc
5119 .read = pci_olpc_read,
5120 .write = pci_olpc_write,
5121 };
5122 -diff -urNp linux-2.6.32.32/arch/x86/pci/pcbios.c linux-2.6.32.32/arch/x86/pci/pcbios.c
5123 ---- linux-2.6.32.32/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
5124 -+++ linux-2.6.32.32/arch/x86/pci/pcbios.c 2010-12-31 14:46:53.000000000 -0500
5125 +diff -urNp linux-2.6.32.33/arch/x86/pci/pcbios.c linux-2.6.32.33/arch/x86/pci/pcbios.c
5126 +--- linux-2.6.32.33/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
5127 ++++ linux-2.6.32.33/arch/x86/pci/pcbios.c 2010-12-31 14:46:53.000000000 -0500
5128 @@ -56,50 +56,93 @@ union bios32 {
5129 static struct {
5130 unsigned long address;
5131 @@ -20301,9 +20424,9 @@ diff -urNp linux-2.6.32.32/arch/x86/pci/pcbios.c linux-2.6.32.32/arch/x86/pci/pc
5132 return !(ret & 0xff00);
5133 }
5134 EXPORT_SYMBOL(pcibios_set_irq_routing);
5135 -diff -urNp linux-2.6.32.32/arch/x86/power/cpu.c linux-2.6.32.32/arch/x86/power/cpu.c
5136 ---- linux-2.6.32.32/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
5137 -+++ linux-2.6.32.32/arch/x86/power/cpu.c 2010-12-31 14:46:53.000000000 -0500
5138 +diff -urNp linux-2.6.32.33/arch/x86/power/cpu.c linux-2.6.32.33/arch/x86/power/cpu.c
5139 +--- linux-2.6.32.33/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
5140 ++++ linux-2.6.32.33/arch/x86/power/cpu.c 2010-12-31 14:46:53.000000000 -0500
5141 @@ -129,7 +129,7 @@ static void do_fpu_end(void)
5142 static void fix_processor_context(void)
5143 {
5144 @@ -20323,9 +20446,9 @@ diff -urNp linux-2.6.32.32/arch/x86/power/cpu.c linux-2.6.32.32/arch/x86/power/c
5145
5146 syscall_init(); /* This sets MSR_*STAR and related */
5147 #endif
5148 -diff -urNp linux-2.6.32.32/arch/x86/vdso/Makefile linux-2.6.32.32/arch/x86/vdso/Makefile
5149 ---- linux-2.6.32.32/arch/x86/vdso/Makefile 2011-01-11 23:55:35.000000000 -0500
5150 -+++ linux-2.6.32.32/arch/x86/vdso/Makefile 2011-01-11 23:56:03.000000000 -0500
5151 +diff -urNp linux-2.6.32.33/arch/x86/vdso/Makefile linux-2.6.32.33/arch/x86/vdso/Makefile
5152 +--- linux-2.6.32.33/arch/x86/vdso/Makefile 2011-01-11 23:55:35.000000000 -0500
5153 ++++ linux-2.6.32.33/arch/x86/vdso/Makefile 2011-01-11 23:56:03.000000000 -0500
5154 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
5155 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
5156 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
5157 @@ -20335,9 +20458,9 @@ diff -urNp linux-2.6.32.32/arch/x86/vdso/Makefile linux-2.6.32.32/arch/x86/vdso/
5158 GCOV_PROFILE := n
5159
5160 #
5161 -diff -urNp linux-2.6.32.32/arch/x86/vdso/vclock_gettime.c linux-2.6.32.32/arch/x86/vdso/vclock_gettime.c
5162 ---- linux-2.6.32.32/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
5163 -+++ linux-2.6.32.32/arch/x86/vdso/vclock_gettime.c 2010-12-31 14:46:53.000000000 -0500
5164 +diff -urNp linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c
5165 +--- linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
5166 ++++ linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c 2010-12-31 14:46:53.000000000 -0500
5167 @@ -22,24 +22,48 @@
5168 #include <asm/hpet.h>
5169 #include <asm/unistd.h>
5170 @@ -20436,9 +20559,9 @@ diff -urNp linux-2.6.32.32/arch/x86/vdso/vclock_gettime.c linux-2.6.32.32/arch/x
5171 }
5172 int gettimeofday(struct timeval *, struct timezone *)
5173 __attribute__((weak, alias("__vdso_gettimeofday")));
5174 -diff -urNp linux-2.6.32.32/arch/x86/vdso/vdso32-setup.c linux-2.6.32.32/arch/x86/vdso/vdso32-setup.c
5175 ---- linux-2.6.32.32/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
5176 -+++ linux-2.6.32.32/arch/x86/vdso/vdso32-setup.c 2010-12-31 14:46:53.000000000 -0500
5177 +diff -urNp linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c
5178 +--- linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
5179 ++++ linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c 2010-12-31 14:46:53.000000000 -0500
5180 @@ -25,6 +25,7 @@
5181 #include <asm/tlbflush.h>
5182 #include <asm/vdso.h>
5183 @@ -20539,9 +20662,9 @@ diff -urNp linux-2.6.32.32/arch/x86/vdso/vdso32-setup.c linux-2.6.32.32/arch/x86
5184 return &gate_vma;
5185 return NULL;
5186 }
5187 -diff -urNp linux-2.6.32.32/arch/x86/vdso/vdso.lds.S linux-2.6.32.32/arch/x86/vdso/vdso.lds.S
5188 ---- linux-2.6.32.32/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
5189 -+++ linux-2.6.32.32/arch/x86/vdso/vdso.lds.S 2010-12-31 14:46:53.000000000 -0500
5190 +diff -urNp linux-2.6.32.33/arch/x86/vdso/vdso.lds.S linux-2.6.32.33/arch/x86/vdso/vdso.lds.S
5191 +--- linux-2.6.32.33/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
5192 ++++ linux-2.6.32.33/arch/x86/vdso/vdso.lds.S 2010-12-31 14:46:53.000000000 -0500
5193 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
5194 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
5195 #include "vextern.h"
5196 @@ -20552,9 +20675,9 @@ diff -urNp linux-2.6.32.32/arch/x86/vdso/vdso.lds.S linux-2.6.32.32/arch/x86/vds
5197 +VEXTERN(fallback_time)
5198 +VEXTERN(getcpu)
5199 +#undef VEXTERN
5200 -diff -urNp linux-2.6.32.32/arch/x86/vdso/vextern.h linux-2.6.32.32/arch/x86/vdso/vextern.h
5201 ---- linux-2.6.32.32/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
5202 -+++ linux-2.6.32.32/arch/x86/vdso/vextern.h 2010-12-31 14:46:53.000000000 -0500
5203 +diff -urNp linux-2.6.32.33/arch/x86/vdso/vextern.h linux-2.6.32.33/arch/x86/vdso/vextern.h
5204 +--- linux-2.6.32.33/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
5205 ++++ linux-2.6.32.33/arch/x86/vdso/vextern.h 2010-12-31 14:46:53.000000000 -0500
5206 @@ -11,6 +11,5 @@
5207 put into vextern.h and be referenced as a pointer with vdso prefix.
5208 The main kernel later fills in the values. */
5209 @@ -20562,9 +20685,9 @@ diff -urNp linux-2.6.32.32/arch/x86/vdso/vextern.h linux-2.6.32.32/arch/x86/vdso
5210 -VEXTERN(jiffies)
5211 VEXTERN(vgetcpu_mode)
5212 VEXTERN(vsyscall_gtod_data)
5213 -diff -urNp linux-2.6.32.32/arch/x86/vdso/vma.c linux-2.6.32.32/arch/x86/vdso/vma.c
5214 ---- linux-2.6.32.32/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
5215 -+++ linux-2.6.32.32/arch/x86/vdso/vma.c 2010-12-31 14:46:53.000000000 -0500
5216 +diff -urNp linux-2.6.32.33/arch/x86/vdso/vma.c linux-2.6.32.33/arch/x86/vdso/vma.c
5217 +--- linux-2.6.32.33/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
5218 ++++ linux-2.6.32.33/arch/x86/vdso/vma.c 2010-12-31 14:46:53.000000000 -0500
5219 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
5220 if (!vbase)
5221 goto oom;
5222 @@ -20611,9 +20734,9 @@ diff -urNp linux-2.6.32.32/arch/x86/vdso/vma.c linux-2.6.32.32/arch/x86/vdso/vma
5223 - return 0;
5224 -}
5225 -__setup("vdso=", vdso_setup);
5226 -diff -urNp linux-2.6.32.32/arch/x86/xen/enlighten.c linux-2.6.32.32/arch/x86/xen/enlighten.c
5227 ---- linux-2.6.32.32/arch/x86/xen/enlighten.c 2010-12-09 18:13:03.000000000 -0500
5228 -+++ linux-2.6.32.32/arch/x86/xen/enlighten.c 2010-12-31 14:46:53.000000000 -0500
5229 +diff -urNp linux-2.6.32.33/arch/x86/xen/enlighten.c linux-2.6.32.33/arch/x86/xen/enlighten.c
5230 +--- linux-2.6.32.33/arch/x86/xen/enlighten.c 2010-12-09 18:13:03.000000000 -0500
5231 ++++ linux-2.6.32.33/arch/x86/xen/enlighten.c 2010-12-31 14:46:53.000000000 -0500
5232 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
5233
5234 struct shared_info xen_dummy_shared_info;
5235 @@ -20669,9 +20792,9 @@ diff -urNp linux-2.6.32.32/arch/x86/xen/enlighten.c linux-2.6.32.32/arch/x86/xen
5236 xen_smp_init();
5237
5238 pgd = (pgd_t *)xen_start_info->pt_base;
5239 -diff -urNp linux-2.6.32.32/arch/x86/xen/mmu.c linux-2.6.32.32/arch/x86/xen/mmu.c
5240 ---- linux-2.6.32.32/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
5241 -+++ linux-2.6.32.32/arch/x86/xen/mmu.c 2010-12-31 14:46:53.000000000 -0500
5242 +diff -urNp linux-2.6.32.33/arch/x86/xen/mmu.c linux-2.6.32.33/arch/x86/xen/mmu.c
5243 +--- linux-2.6.32.33/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
5244 ++++ linux-2.6.32.33/arch/x86/xen/mmu.c 2010-12-31 14:46:53.000000000 -0500
5245 @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
5246 convert_pfn_mfn(init_level4_pgt);
5247 convert_pfn_mfn(level3_ident_pgt);
5248 @@ -20692,9 +20815,9 @@ diff -urNp linux-2.6.32.32/arch/x86/xen/mmu.c linux-2.6.32.32/arch/x86/xen/mmu.c
5249 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
5250 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
5251
5252 -diff -urNp linux-2.6.32.32/arch/x86/xen/smp.c linux-2.6.32.32/arch/x86/xen/smp.c
5253 ---- linux-2.6.32.32/arch/x86/xen/smp.c 2010-11-26 18:22:29.000000000 -0500
5254 -+++ linux-2.6.32.32/arch/x86/xen/smp.c 2010-12-31 14:47:01.000000000 -0500
5255 +diff -urNp linux-2.6.32.33/arch/x86/xen/smp.c linux-2.6.32.33/arch/x86/xen/smp.c
5256 +--- linux-2.6.32.33/arch/x86/xen/smp.c 2010-11-26 18:22:29.000000000 -0500
5257 ++++ linux-2.6.32.33/arch/x86/xen/smp.c 2010-12-31 14:47:01.000000000 -0500
5258 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
5259 {
5260 BUG_ON(smp_processor_id() != 0);
5261 @@ -20723,9 +20846,9 @@ diff -urNp linux-2.6.32.32/arch/x86/xen/smp.c linux-2.6.32.32/arch/x86/xen/smp.c
5262 #else
5263 ctxt->gs_base_kernel = per_cpu_offset(cpu);
5264 #endif
5265 -diff -urNp linux-2.6.32.32/arch/x86/xen/xen-head.S linux-2.6.32.32/arch/x86/xen/xen-head.S
5266 ---- linux-2.6.32.32/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
5267 -+++ linux-2.6.32.32/arch/x86/xen/xen-head.S 2010-12-31 14:46:53.000000000 -0500
5268 +diff -urNp linux-2.6.32.33/arch/x86/xen/xen-head.S linux-2.6.32.33/arch/x86/xen/xen-head.S
5269 +--- linux-2.6.32.33/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
5270 ++++ linux-2.6.32.33/arch/x86/xen/xen-head.S 2010-12-31 14:46:53.000000000 -0500
5271 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
5272 #ifdef CONFIG_X86_32
5273 mov %esi,xen_start_info
5274 @@ -20744,9 +20867,9 @@ diff -urNp linux-2.6.32.32/arch/x86/xen/xen-head.S linux-2.6.32.32/arch/x86/xen/
5275 #else
5276 mov %rsi,xen_start_info
5277 mov $init_thread_union+THREAD_SIZE,%rsp
5278 -diff -urNp linux-2.6.32.32/arch/x86/xen/xen-ops.h linux-2.6.32.32/arch/x86/xen/xen-ops.h
5279 ---- linux-2.6.32.32/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
5280 -+++ linux-2.6.32.32/arch/x86/xen/xen-ops.h 2010-12-31 14:46:53.000000000 -0500
5281 +diff -urNp linux-2.6.32.33/arch/x86/xen/xen-ops.h linux-2.6.32.33/arch/x86/xen/xen-ops.h
5282 +--- linux-2.6.32.33/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
5283 ++++ linux-2.6.32.33/arch/x86/xen/xen-ops.h 2010-12-31 14:46:53.000000000 -0500
5284 @@ -10,8 +10,6 @@
5285 extern const char xen_hypervisor_callback[];
5286 extern const char xen_failsafe_callback[];
5287 @@ -20756,9 +20879,9 @@ diff -urNp linux-2.6.32.32/arch/x86/xen/xen-ops.h linux-2.6.32.32/arch/x86/xen/x
5288 struct trap_info;
5289 void xen_copy_trap_info(struct trap_info *traps);
5290
5291 -diff -urNp linux-2.6.32.32/block/blk-integrity.c linux-2.6.32.32/block/blk-integrity.c
5292 ---- linux-2.6.32.32/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
5293 -+++ linux-2.6.32.32/block/blk-integrity.c 2010-12-31 14:46:53.000000000 -0500
5294 +diff -urNp linux-2.6.32.33/block/blk-integrity.c linux-2.6.32.33/block/blk-integrity.c
5295 +--- linux-2.6.32.33/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
5296 ++++ linux-2.6.32.33/block/blk-integrity.c 2010-12-31 14:46:53.000000000 -0500
5297 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
5298 NULL,
5299 };
5300 @@ -20768,9 +20891,9 @@ diff -urNp linux-2.6.32.32/block/blk-integrity.c linux-2.6.32.32/block/blk-integ
5301 .show = &integrity_attr_show,
5302 .store = &integrity_attr_store,
5303 };
5304 -diff -urNp linux-2.6.32.32/block/blk-iopoll.c linux-2.6.32.32/block/blk-iopoll.c
5305 ---- linux-2.6.32.32/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
5306 -+++ linux-2.6.32.32/block/blk-iopoll.c 2010-12-31 14:46:53.000000000 -0500
5307 +diff -urNp linux-2.6.32.33/block/blk-iopoll.c linux-2.6.32.33/block/blk-iopoll.c
5308 +--- linux-2.6.32.33/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
5309 ++++ linux-2.6.32.33/block/blk-iopoll.c 2010-12-31 14:46:53.000000000 -0500
5310 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
5311 }
5312 EXPORT_SYMBOL(blk_iopoll_complete);
5313 @@ -20780,9 +20903,9 @@ diff -urNp linux-2.6.32.32/block/blk-iopoll.c linux-2.6.32.32/block/blk-iopoll.c
5314 {
5315 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
5316 int rearm = 0, budget = blk_iopoll_budget;
5317 -diff -urNp linux-2.6.32.32/block/blk-map.c linux-2.6.32.32/block/blk-map.c
5318 ---- linux-2.6.32.32/block/blk-map.c 2010-12-09 18:13:03.000000000 -0500
5319 -+++ linux-2.6.32.32/block/blk-map.c 2010-12-31 14:46:53.000000000 -0500
5320 +diff -urNp linux-2.6.32.33/block/blk-map.c linux-2.6.32.33/block/blk-map.c
5321 +--- linux-2.6.32.33/block/blk-map.c 2010-12-09 18:13:03.000000000 -0500
5322 ++++ linux-2.6.32.33/block/blk-map.c 2010-12-31 14:46:53.000000000 -0500
5323 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
5324 * direct dma. else, set up kernel bounce buffers
5325 */
5326 @@ -20811,9 +20934,9 @@ diff -urNp linux-2.6.32.32/block/blk-map.c linux-2.6.32.32/block/blk-map.c
5327 if (do_copy)
5328 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
5329 else
5330 -diff -urNp linux-2.6.32.32/block/blk-softirq.c linux-2.6.32.32/block/blk-softirq.c
5331 ---- linux-2.6.32.32/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
5332 -+++ linux-2.6.32.32/block/blk-softirq.c 2010-12-31 14:46:53.000000000 -0500
5333 +diff -urNp linux-2.6.32.33/block/blk-softirq.c linux-2.6.32.33/block/blk-softirq.c
5334 +--- linux-2.6.32.33/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
5335 ++++ linux-2.6.32.33/block/blk-softirq.c 2010-12-31 14:46:53.000000000 -0500
5336 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
5337 * Softirq action handler - move entries to local list and loop over them
5338 * while passing them to the queue registered handler.
5339 @@ -20823,9 +20946,9 @@ diff -urNp linux-2.6.32.32/block/blk-softirq.c linux-2.6.32.32/block/blk-softirq
5340 {
5341 struct list_head *cpu_list, local_list;
5342
5343 -diff -urNp linux-2.6.32.32/block/blk-sysfs.c linux-2.6.32.32/block/blk-sysfs.c
5344 ---- linux-2.6.32.32/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
5345 -+++ linux-2.6.32.32/block/blk-sysfs.c 2010-12-31 14:46:53.000000000 -0500
5346 +diff -urNp linux-2.6.32.33/block/blk-sysfs.c linux-2.6.32.33/block/blk-sysfs.c
5347 +--- linux-2.6.32.33/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
5348 ++++ linux-2.6.32.33/block/blk-sysfs.c 2010-12-31 14:46:53.000000000 -0500
5349 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
5350 kmem_cache_free(blk_requestq_cachep, q);
5351 }
5352 @@ -20835,9 +20958,9 @@ diff -urNp linux-2.6.32.32/block/blk-sysfs.c linux-2.6.32.32/block/blk-sysfs.c
5353 .show = queue_attr_show,
5354 .store = queue_attr_store,
5355 };
5356 -diff -urNp linux-2.6.32.32/block/elevator.c linux-2.6.32.32/block/elevator.c
5357 ---- linux-2.6.32.32/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
5358 -+++ linux-2.6.32.32/block/elevator.c 2010-12-31 14:46:53.000000000 -0500
5359 +diff -urNp linux-2.6.32.33/block/elevator.c linux-2.6.32.33/block/elevator.c
5360 +--- linux-2.6.32.33/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
5361 ++++ linux-2.6.32.33/block/elevator.c 2010-12-31 14:46:53.000000000 -0500
5362 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
5363 return error;
5364 }
5365 @@ -20847,9 +20970,9 @@ diff -urNp linux-2.6.32.32/block/elevator.c linux-2.6.32.32/block/elevator.c
5366 .show = elv_attr_show,
5367 .store = elv_attr_store,
5368 };
5369 -diff -urNp linux-2.6.32.32/crypto/lrw.c linux-2.6.32.32/crypto/lrw.c
5370 ---- linux-2.6.32.32/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
5371 -+++ linux-2.6.32.32/crypto/lrw.c 2010-12-31 14:46:53.000000000 -0500
5372 +diff -urNp linux-2.6.32.33/crypto/lrw.c linux-2.6.32.33/crypto/lrw.c
5373 +--- linux-2.6.32.33/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
5374 ++++ linux-2.6.32.33/crypto/lrw.c 2010-12-31 14:46:53.000000000 -0500
5375 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
5376 struct priv *ctx = crypto_tfm_ctx(parent);
5377 struct crypto_cipher *child = ctx->child;
5378 @@ -20859,9 +20982,9 @@ diff -urNp linux-2.6.32.32/crypto/lrw.c linux-2.6.32.32/crypto/lrw.c
5379 int bsize = crypto_cipher_blocksize(child);
5380
5381 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
5382 -diff -urNp linux-2.6.32.32/Documentation/dontdiff linux-2.6.32.32/Documentation/dontdiff
5383 ---- linux-2.6.32.32/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
5384 -+++ linux-2.6.32.32/Documentation/dontdiff 2010-12-31 14:46:53.000000000 -0500
5385 +diff -urNp linux-2.6.32.33/Documentation/dontdiff linux-2.6.32.33/Documentation/dontdiff
5386 +--- linux-2.6.32.33/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
5387 ++++ linux-2.6.32.33/Documentation/dontdiff 2010-12-31 14:46:53.000000000 -0500
5388 @@ -3,6 +3,7 @@
5389 *.bin
5390 *.cpio
5391 @@ -20979,9 +21102,9 @@ diff -urNp linux-2.6.32.32/Documentation/dontdiff linux-2.6.32.32/Documentation/
5392 zImage*
5393 zconf.hash.c
5394 +zoffset.h
5395 -diff -urNp linux-2.6.32.32/Documentation/kernel-parameters.txt linux-2.6.32.32/Documentation/kernel-parameters.txt
5396 ---- linux-2.6.32.32/Documentation/kernel-parameters.txt 2011-02-22 15:56:54.000000000 -0500
5397 -+++ linux-2.6.32.32/Documentation/kernel-parameters.txt 2011-02-22 15:57:23.000000000 -0500
5398 +diff -urNp linux-2.6.32.33/Documentation/kernel-parameters.txt linux-2.6.32.33/Documentation/kernel-parameters.txt
5399 +--- linux-2.6.32.33/Documentation/kernel-parameters.txt 2011-02-22 15:56:54.000000000 -0500
5400 ++++ linux-2.6.32.33/Documentation/kernel-parameters.txt 2011-03-21 17:17:19.000000000 -0400
5401 @@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters.
5402 the specified number of seconds. This is to be used if
5403 your oopses keep scrolling off the screen.
5404 @@ -20991,14 +21114,14 @@ diff -urNp linux-2.6.32.32/Documentation/kernel-parameters.txt linux-2.6.32.32/D
5405 + expand down segment used by UDEREF on X86-32 or the frequent
5406 + page table updates on X86-64.
5407 +
5408 -+ pax_softmode= [X86-32] 0/1 to disable/enable PaX softmode on boot already.
5409 ++ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
5410 +
5411 pcbit= [HW,ISDN]
5412
5413 pcd. [PARIDE]
5414 -diff -urNp linux-2.6.32.32/drivers/acpi/acpi_pad.c linux-2.6.32.32/drivers/acpi/acpi_pad.c
5415 ---- linux-2.6.32.32/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
5416 -+++ linux-2.6.32.32/drivers/acpi/acpi_pad.c 2010-12-31 14:46:53.000000000 -0500
5417 +diff -urNp linux-2.6.32.33/drivers/acpi/acpi_pad.c linux-2.6.32.33/drivers/acpi/acpi_pad.c
5418 +--- linux-2.6.32.33/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
5419 ++++ linux-2.6.32.33/drivers/acpi/acpi_pad.c 2010-12-31 14:46:53.000000000 -0500
5420 @@ -30,7 +30,7 @@
5421 #include <acpi/acpi_bus.h>
5422 #include <acpi/acpi_drivers.h>
5423 @@ -21008,9 +21131,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/acpi_pad.c linux-2.6.32.32/drivers/acpi/
5424 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
5425 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
5426 static DEFINE_MUTEX(isolated_cpus_lock);
5427 -diff -urNp linux-2.6.32.32/drivers/acpi/battery.c linux-2.6.32.32/drivers/acpi/battery.c
5428 ---- linux-2.6.32.32/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
5429 -+++ linux-2.6.32.32/drivers/acpi/battery.c 2010-12-31 14:46:53.000000000 -0500
5430 +diff -urNp linux-2.6.32.33/drivers/acpi/battery.c linux-2.6.32.33/drivers/acpi/battery.c
5431 +--- linux-2.6.32.33/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
5432 ++++ linux-2.6.32.33/drivers/acpi/battery.c 2010-12-31 14:46:53.000000000 -0500
5433 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
5434 }
5435
5436 @@ -21020,9 +21143,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/battery.c linux-2.6.32.32/drivers/acpi/b
5437 mode_t mode;
5438 const char *name;
5439 } acpi_battery_file[] = {
5440 -diff -urNp linux-2.6.32.32/drivers/acpi/blacklist.c linux-2.6.32.32/drivers/acpi/blacklist.c
5441 ---- linux-2.6.32.32/drivers/acpi/blacklist.c 2010-12-09 18:13:03.000000000 -0500
5442 -+++ linux-2.6.32.32/drivers/acpi/blacklist.c 2010-12-31 14:46:53.000000000 -0500
5443 +diff -urNp linux-2.6.32.33/drivers/acpi/blacklist.c linux-2.6.32.33/drivers/acpi/blacklist.c
5444 +--- linux-2.6.32.33/drivers/acpi/blacklist.c 2010-12-09 18:13:03.000000000 -0500
5445 ++++ linux-2.6.32.33/drivers/acpi/blacklist.c 2010-12-31 14:46:53.000000000 -0500
5446 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
5447 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
5448 "Incorrect _ADR", 1},
5449 @@ -21032,9 +21155,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/blacklist.c linux-2.6.32.32/drivers/acpi
5450 };
5451
5452 #if CONFIG_ACPI_BLACKLIST_YEAR
5453 -diff -urNp linux-2.6.32.32/drivers/acpi/dock.c linux-2.6.32.32/drivers/acpi/dock.c
5454 ---- linux-2.6.32.32/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
5455 -+++ linux-2.6.32.32/drivers/acpi/dock.c 2010-12-31 14:46:53.000000000 -0500
5456 +diff -urNp linux-2.6.32.33/drivers/acpi/dock.c linux-2.6.32.33/drivers/acpi/dock.c
5457 +--- linux-2.6.32.33/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
5458 ++++ linux-2.6.32.33/drivers/acpi/dock.c 2010-12-31 14:46:53.000000000 -0500
5459 @@ -77,7 +77,7 @@ struct dock_dependent_device {
5460 struct list_head list;
5461 struct list_head hotplug_list;
5462 @@ -21053,9 +21176,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/dock.c linux-2.6.32.32/drivers/acpi/dock
5463 void *context)
5464 {
5465 struct dock_dependent_device *dd;
5466 -diff -urNp linux-2.6.32.32/drivers/acpi/osl.c linux-2.6.32.32/drivers/acpi/osl.c
5467 ---- linux-2.6.32.32/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
5468 -+++ linux-2.6.32.32/drivers/acpi/osl.c 2010-12-31 14:46:53.000000000 -0500
5469 +diff -urNp linux-2.6.32.33/drivers/acpi/osl.c linux-2.6.32.33/drivers/acpi/osl.c
5470 +--- linux-2.6.32.33/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
5471 ++++ linux-2.6.32.33/drivers/acpi/osl.c 2010-12-31 14:46:53.000000000 -0500
5472 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
5473 void __iomem *virt_addr;
5474
5475 @@ -21074,9 +21197,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/osl.c linux-2.6.32.32/drivers/acpi/osl.c
5476
5477 switch (width) {
5478 case 8:
5479 -diff -urNp linux-2.6.32.32/drivers/acpi/power_meter.c linux-2.6.32.32/drivers/acpi/power_meter.c
5480 ---- linux-2.6.32.32/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
5481 -+++ linux-2.6.32.32/drivers/acpi/power_meter.c 2010-12-31 14:46:53.000000000 -0500
5482 +diff -urNp linux-2.6.32.33/drivers/acpi/power_meter.c linux-2.6.32.33/drivers/acpi/power_meter.c
5483 +--- linux-2.6.32.33/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
5484 ++++ linux-2.6.32.33/drivers/acpi/power_meter.c 2010-12-31 14:46:53.000000000 -0500
5485 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
5486 return res;
5487
5488 @@ -21086,9 +21209,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/power_meter.c linux-2.6.32.32/drivers/ac
5489
5490 mutex_lock(&resource->lock);
5491 resource->trip[attr->index - 7] = temp;
5492 -diff -urNp linux-2.6.32.32/drivers/acpi/proc.c linux-2.6.32.32/drivers/acpi/proc.c
5493 ---- linux-2.6.32.32/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
5494 -+++ linux-2.6.32.32/drivers/acpi/proc.c 2010-12-31 14:46:53.000000000 -0500
5495 +diff -urNp linux-2.6.32.33/drivers/acpi/proc.c linux-2.6.32.33/drivers/acpi/proc.c
5496 +--- linux-2.6.32.33/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
5497 ++++ linux-2.6.32.33/drivers/acpi/proc.c 2010-12-31 14:46:53.000000000 -0500
5498 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
5499 size_t count, loff_t * ppos)
5500 {
5501 @@ -21124,9 +21247,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/proc.c linux-2.6.32.32/drivers/acpi/proc
5502 dev->wakeup.state.enabled =
5503 dev->wakeup.state.enabled ? 0 : 1;
5504 found_dev = dev;
5505 -diff -urNp linux-2.6.32.32/drivers/acpi/processor_core.c linux-2.6.32.32/drivers/acpi/processor_core.c
5506 ---- linux-2.6.32.32/drivers/acpi/processor_core.c 2010-10-31 16:44:11.000000000 -0400
5507 -+++ linux-2.6.32.32/drivers/acpi/processor_core.c 2010-12-31 14:46:53.000000000 -0500
5508 +diff -urNp linux-2.6.32.33/drivers/acpi/processor_core.c linux-2.6.32.33/drivers/acpi/processor_core.c
5509 +--- linux-2.6.32.33/drivers/acpi/processor_core.c 2010-10-31 16:44:11.000000000 -0400
5510 ++++ linux-2.6.32.33/drivers/acpi/processor_core.c 2010-12-31 14:46:53.000000000 -0500
5511 @@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
5512 return 0;
5513 }
5514 @@ -21136,9 +21259,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/processor_core.c linux-2.6.32.32/drivers
5515
5516 /*
5517 * Buggy BIOS check
5518 -diff -urNp linux-2.6.32.32/drivers/acpi/processor_idle.c linux-2.6.32.32/drivers/acpi/processor_idle.c
5519 ---- linux-2.6.32.32/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
5520 -+++ linux-2.6.32.32/drivers/acpi/processor_idle.c 2010-12-31 14:46:53.000000000 -0500
5521 +diff -urNp linux-2.6.32.33/drivers/acpi/processor_idle.c linux-2.6.32.33/drivers/acpi/processor_idle.c
5522 +--- linux-2.6.32.33/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
5523 ++++ linux-2.6.32.33/drivers/acpi/processor_idle.c 2010-12-31 14:46:53.000000000 -0500
5524 @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
5525 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
5526 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
5527 @@ -21148,9 +21271,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/processor_idle.c linux-2.6.32.32/drivers
5528 };
5529
5530
5531 -diff -urNp linux-2.6.32.32/drivers/acpi/sbshc.c linux-2.6.32.32/drivers/acpi/sbshc.c
5532 ---- linux-2.6.32.32/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
5533 -+++ linux-2.6.32.32/drivers/acpi/sbshc.c 2010-12-31 14:46:53.000000000 -0500
5534 +diff -urNp linux-2.6.32.33/drivers/acpi/sbshc.c linux-2.6.32.33/drivers/acpi/sbshc.c
5535 +--- linux-2.6.32.33/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
5536 ++++ linux-2.6.32.33/drivers/acpi/sbshc.c 2010-12-31 14:46:53.000000000 -0500
5537 @@ -17,7 +17,7 @@
5538
5539 #define PREFIX "ACPI: "
5540 @@ -21160,9 +21283,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/sbshc.c linux-2.6.32.32/drivers/acpi/sbs
5541 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
5542
5543 struct acpi_smb_hc {
5544 -diff -urNp linux-2.6.32.32/drivers/acpi/sleep.c linux-2.6.32.32/drivers/acpi/sleep.c
5545 ---- linux-2.6.32.32/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
5546 -+++ linux-2.6.32.32/drivers/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
5547 +diff -urNp linux-2.6.32.33/drivers/acpi/sleep.c linux-2.6.32.33/drivers/acpi/sleep.c
5548 +--- linux-2.6.32.33/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
5549 ++++ linux-2.6.32.33/drivers/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
5550 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
5551 }
5552 }
5553 @@ -21199,9 +21322,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/sleep.c linux-2.6.32.32/drivers/acpi/sle
5554 .begin = acpi_hibernation_begin_old,
5555 .end = acpi_pm_end,
5556 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
5557 -diff -urNp linux-2.6.32.32/drivers/acpi/video.c linux-2.6.32.32/drivers/acpi/video.c
5558 ---- linux-2.6.32.32/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
5559 -+++ linux-2.6.32.32/drivers/acpi/video.c 2010-12-31 14:46:53.000000000 -0500
5560 +diff -urNp linux-2.6.32.33/drivers/acpi/video.c linux-2.6.32.33/drivers/acpi/video.c
5561 +--- linux-2.6.32.33/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
5562 ++++ linux-2.6.32.33/drivers/acpi/video.c 2010-12-31 14:46:53.000000000 -0500
5563 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
5564 vd->brightness->levels[request_level]);
5565 }
5566 @@ -21211,9 +21334,9 @@ diff -urNp linux-2.6.32.32/drivers/acpi/video.c linux-2.6.32.32/drivers/acpi/vid
5567 .get_brightness = acpi_video_get_brightness,
5568 .update_status = acpi_video_set_brightness,
5569 };
5570 -diff -urNp linux-2.6.32.32/drivers/ata/ahci.c linux-2.6.32.32/drivers/ata/ahci.c
5571 ---- linux-2.6.32.32/drivers/ata/ahci.c 2010-12-09 18:13:03.000000000 -0500
5572 -+++ linux-2.6.32.32/drivers/ata/ahci.c 2010-12-31 14:46:53.000000000 -0500
5573 +diff -urNp linux-2.6.32.33/drivers/ata/ahci.c linux-2.6.32.33/drivers/ata/ahci.c
5574 +--- linux-2.6.32.33/drivers/ata/ahci.c 2010-12-09 18:13:03.000000000 -0500
5575 ++++ linux-2.6.32.33/drivers/ata/ahci.c 2010-12-31 14:46:53.000000000 -0500
5576 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
5577 .sdev_attrs = ahci_sdev_attrs,
5578 };
5579 @@ -21253,9 +21376,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/ahci.c linux-2.6.32.32/drivers/ata/ahci.c
5580 };
5581
5582
5583 -diff -urNp linux-2.6.32.32/drivers/ata/ata_generic.c linux-2.6.32.32/drivers/ata/ata_generic.c
5584 ---- linux-2.6.32.32/drivers/ata/ata_generic.c 2010-12-09 18:13:03.000000000 -0500
5585 -+++ linux-2.6.32.32/drivers/ata/ata_generic.c 2010-12-31 14:46:53.000000000 -0500
5586 +diff -urNp linux-2.6.32.33/drivers/ata/ata_generic.c linux-2.6.32.33/drivers/ata/ata_generic.c
5587 +--- linux-2.6.32.33/drivers/ata/ata_generic.c 2010-12-09 18:13:03.000000000 -0500
5588 ++++ linux-2.6.32.33/drivers/ata/ata_generic.c 2010-12-31 14:46:53.000000000 -0500
5589 @@ -104,7 +104,7 @@ static struct scsi_host_template generic
5590 ATA_BMDMA_SHT(DRV_NAME),
5591 };
5592 @@ -21265,9 +21388,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/ata_generic.c linux-2.6.32.32/drivers/ata
5593 .inherits = &ata_bmdma_port_ops,
5594 .cable_detect = ata_cable_unknown,
5595 .set_mode = generic_set_mode,
5596 -diff -urNp linux-2.6.32.32/drivers/ata/ata_piix.c linux-2.6.32.32/drivers/ata/ata_piix.c
5597 ---- linux-2.6.32.32/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
5598 -+++ linux-2.6.32.32/drivers/ata/ata_piix.c 2010-12-31 14:46:53.000000000 -0500
5599 +diff -urNp linux-2.6.32.33/drivers/ata/ata_piix.c linux-2.6.32.33/drivers/ata/ata_piix.c
5600 +--- linux-2.6.32.33/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
5601 ++++ linux-2.6.32.33/drivers/ata/ata_piix.c 2010-12-31 14:46:53.000000000 -0500
5602 @@ -300,7 +300,7 @@ static const struct pci_device_id piix_p
5603 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
5604 /* SATA Controller IDE (CPT) */
5605 @@ -21331,9 +21454,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/ata_piix.c linux-2.6.32.32/drivers/ata/at
5606 };
5607 static const char *oemstrs[] = {
5608 "Tecra M3,",
5609 -diff -urNp linux-2.6.32.32/drivers/ata/libata-acpi.c linux-2.6.32.32/drivers/ata/libata-acpi.c
5610 ---- linux-2.6.32.32/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
5611 -+++ linux-2.6.32.32/drivers/ata/libata-acpi.c 2010-12-31 14:46:53.000000000 -0500
5612 +diff -urNp linux-2.6.32.33/drivers/ata/libata-acpi.c linux-2.6.32.33/drivers/ata/libata-acpi.c
5613 +--- linux-2.6.32.33/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
5614 ++++ linux-2.6.32.33/drivers/ata/libata-acpi.c 2010-12-31 14:46:53.000000000 -0500
5615 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
5616 ata_acpi_uevent(dev->link->ap, dev, event);
5617 }
5618 @@ -21349,9 +21472,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/libata-acpi.c linux-2.6.32.32/drivers/ata
5619 .handler = ata_acpi_ap_notify_dock,
5620 .uevent = ata_acpi_ap_uevent,
5621 };
5622 -diff -urNp linux-2.6.32.32/drivers/ata/libata-core.c linux-2.6.32.32/drivers/ata/libata-core.c
5623 ---- linux-2.6.32.32/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
5624 -+++ linux-2.6.32.32/drivers/ata/libata-core.c 2010-12-31 14:46:53.000000000 -0500
5625 +diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata/libata-core.c
5626 +--- linux-2.6.32.33/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
5627 ++++ linux-2.6.32.33/drivers/ata/libata-core.c 2010-12-31 14:46:53.000000000 -0500
5628 @@ -900,7 +900,7 @@ static const struct ata_xfer_ent {
5629 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
5630 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
5631 @@ -21443,9 +21566,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/libata-core.c linux-2.6.32.32/drivers/ata
5632 .qc_prep = ata_noop_qc_prep,
5633 .qc_issue = ata_dummy_qc_issue,
5634 .error_handler = ata_dummy_error_handler,
5635 -diff -urNp linux-2.6.32.32/drivers/ata/libata-eh.c linux-2.6.32.32/drivers/ata/libata-eh.c
5636 ---- linux-2.6.32.32/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
5637 -+++ linux-2.6.32.32/drivers/ata/libata-eh.c 2010-12-31 14:46:53.000000000 -0500
5638 +diff -urNp linux-2.6.32.33/drivers/ata/libata-eh.c linux-2.6.32.33/drivers/ata/libata-eh.c
5639 +--- linux-2.6.32.33/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
5640 ++++ linux-2.6.32.33/drivers/ata/libata-eh.c 2010-12-31 14:46:53.000000000 -0500
5641 @@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_
5642 */
5643 void ata_std_error_handler(struct ata_port *ap)
5644 @@ -21455,9 +21578,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/libata-eh.c linux-2.6.32.32/drivers/ata/l
5645 ata_reset_fn_t hardreset = ops->hardreset;
5646
5647 /* ignore built-in hardreset if SCR access is not available */
5648 -diff -urNp linux-2.6.32.32/drivers/ata/libata-pmp.c linux-2.6.32.32/drivers/ata/libata-pmp.c
5649 ---- linux-2.6.32.32/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
5650 -+++ linux-2.6.32.32/drivers/ata/libata-pmp.c 2010-12-31 14:46:53.000000000 -0500
5651 +diff -urNp linux-2.6.32.33/drivers/ata/libata-pmp.c linux-2.6.32.33/drivers/ata/libata-pmp.c
5652 +--- linux-2.6.32.33/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
5653 ++++ linux-2.6.32.33/drivers/ata/libata-pmp.c 2010-12-31 14:46:53.000000000 -0500
5654 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
5655 */
5656 static int sata_pmp_eh_recover(struct ata_port *ap)
5657 @@ -21467,9 +21590,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/libata-pmp.c linux-2.6.32.32/drivers/ata/
5658 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
5659 struct ata_link *pmp_link = &ap->link;
5660 struct ata_device *pmp_dev = pmp_link->device;
5661 -diff -urNp linux-2.6.32.32/drivers/ata/pata_acpi.c linux-2.6.32.32/drivers/ata/pata_acpi.c
5662 ---- linux-2.6.32.32/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
5663 -+++ linux-2.6.32.32/drivers/ata/pata_acpi.c 2010-12-31 14:46:53.000000000 -0500
5664 +diff -urNp linux-2.6.32.33/drivers/ata/pata_acpi.c linux-2.6.32.33/drivers/ata/pata_acpi.c
5665 +--- linux-2.6.32.33/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
5666 ++++ linux-2.6.32.33/drivers/ata/pata_acpi.c 2010-12-31 14:46:53.000000000 -0500
5667 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
5668 ATA_BMDMA_SHT(DRV_NAME),
5669 };
5670 @@ -21479,9 +21602,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_acpi.c linux-2.6.32.32/drivers/ata/p
5671 .inherits = &ata_bmdma_port_ops,
5672 .qc_issue = pacpi_qc_issue,
5673 .cable_detect = pacpi_cable_detect,
5674 -diff -urNp linux-2.6.32.32/drivers/ata/pata_ali.c linux-2.6.32.32/drivers/ata/pata_ali.c
5675 ---- linux-2.6.32.32/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
5676 -+++ linux-2.6.32.32/drivers/ata/pata_ali.c 2010-12-31 14:46:53.000000000 -0500
5677 +diff -urNp linux-2.6.32.33/drivers/ata/pata_ali.c linux-2.6.32.33/drivers/ata/pata_ali.c
5678 +--- linux-2.6.32.33/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
5679 ++++ linux-2.6.32.33/drivers/ata/pata_ali.c 2010-12-31 14:46:53.000000000 -0500
5680 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
5681 * Port operations for PIO only ALi
5682 */
5683 @@ -21527,9 +21650,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_ali.c linux-2.6.32.32/drivers/ata/pa
5684 .inherits = &ali_dma_base_ops,
5685 .check_atapi_dma = ali_check_atapi_dma,
5686 .dev_config = ali_warn_atapi_dma,
5687 -diff -urNp linux-2.6.32.32/drivers/ata/pata_amd.c linux-2.6.32.32/drivers/ata/pata_amd.c
5688 ---- linux-2.6.32.32/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
5689 -+++ linux-2.6.32.32/drivers/ata/pata_amd.c 2010-12-31 14:46:53.000000000 -0500
5690 +diff -urNp linux-2.6.32.33/drivers/ata/pata_amd.c linux-2.6.32.33/drivers/ata/pata_amd.c
5691 +--- linux-2.6.32.33/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
5692 ++++ linux-2.6.32.33/drivers/ata/pata_amd.c 2010-12-31 14:46:53.000000000 -0500
5693 @@ -397,28 +397,28 @@ static const struct ata_port_operations
5694 .prereset = amd_pre_reset,
5695 };
5696 @@ -21579,9 +21702,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_amd.c linux-2.6.32.32/drivers/ata/pa
5697 .inherits = &nv_base_port_ops,
5698 .set_piomode = nv133_set_piomode,
5699 .set_dmamode = nv133_set_dmamode,
5700 -diff -urNp linux-2.6.32.32/drivers/ata/pata_artop.c linux-2.6.32.32/drivers/ata/pata_artop.c
5701 ---- linux-2.6.32.32/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
5702 -+++ linux-2.6.32.32/drivers/ata/pata_artop.c 2010-12-31 14:46:53.000000000 -0500
5703 +diff -urNp linux-2.6.32.33/drivers/ata/pata_artop.c linux-2.6.32.33/drivers/ata/pata_artop.c
5704 +--- linux-2.6.32.33/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
5705 ++++ linux-2.6.32.33/drivers/ata/pata_artop.c 2010-12-31 14:46:53.000000000 -0500
5706 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
5707 ATA_BMDMA_SHT(DRV_NAME),
5708 };
5709 @@ -21600,9 +21723,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_artop.c linux-2.6.32.32/drivers/ata/
5710 .inherits = &ata_bmdma_port_ops,
5711 .cable_detect = artop6260_cable_detect,
5712 .set_piomode = artop6260_set_piomode,
5713 -diff -urNp linux-2.6.32.32/drivers/ata/pata_at32.c linux-2.6.32.32/drivers/ata/pata_at32.c
5714 ---- linux-2.6.32.32/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
5715 -+++ linux-2.6.32.32/drivers/ata/pata_at32.c 2010-12-31 14:46:53.000000000 -0500
5716 +diff -urNp linux-2.6.32.33/drivers/ata/pata_at32.c linux-2.6.32.33/drivers/ata/pata_at32.c
5717 +--- linux-2.6.32.33/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
5718 ++++ linux-2.6.32.33/drivers/ata/pata_at32.c 2010-12-31 14:46:53.000000000 -0500
5719 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
5720 ATA_PIO_SHT(DRV_NAME),
5721 };
5722 @@ -21612,9 +21735,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_at32.c linux-2.6.32.32/drivers/ata/p
5723 .inherits = &ata_sff_port_ops,
5724 .cable_detect = ata_cable_40wire,
5725 .set_piomode = pata_at32_set_piomode,
5726 -diff -urNp linux-2.6.32.32/drivers/ata/pata_at91.c linux-2.6.32.32/drivers/ata/pata_at91.c
5727 ---- linux-2.6.32.32/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
5728 -+++ linux-2.6.32.32/drivers/ata/pata_at91.c 2010-12-31 14:46:53.000000000 -0500
5729 +diff -urNp linux-2.6.32.33/drivers/ata/pata_at91.c linux-2.6.32.33/drivers/ata/pata_at91.c
5730 +--- linux-2.6.32.33/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
5731 ++++ linux-2.6.32.33/drivers/ata/pata_at91.c 2010-12-31 14:46:53.000000000 -0500
5732 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
5733 ATA_PIO_SHT(DRV_NAME),
5734 };
5735 @@ -21624,9 +21747,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_at91.c linux-2.6.32.32/drivers/ata/p
5736 .inherits = &ata_sff_port_ops,
5737
5738 .sff_data_xfer = pata_at91_data_xfer_noirq,
5739 -diff -urNp linux-2.6.32.32/drivers/ata/pata_atiixp.c linux-2.6.32.32/drivers/ata/pata_atiixp.c
5740 ---- linux-2.6.32.32/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
5741 -+++ linux-2.6.32.32/drivers/ata/pata_atiixp.c 2010-12-31 14:46:53.000000000 -0500
5742 +diff -urNp linux-2.6.32.33/drivers/ata/pata_atiixp.c linux-2.6.32.33/drivers/ata/pata_atiixp.c
5743 +--- linux-2.6.32.33/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
5744 ++++ linux-2.6.32.33/drivers/ata/pata_atiixp.c 2010-12-31 14:46:53.000000000 -0500
5745 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
5746 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
5747 };
5748 @@ -21636,9 +21759,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_atiixp.c linux-2.6.32.32/drivers/ata
5749 .inherits = &ata_bmdma_port_ops,
5750
5751 .qc_prep = ata_sff_dumb_qc_prep,
5752 -diff -urNp linux-2.6.32.32/drivers/ata/pata_atp867x.c linux-2.6.32.32/drivers/ata/pata_atp867x.c
5753 ---- linux-2.6.32.32/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
5754 -+++ linux-2.6.32.32/drivers/ata/pata_atp867x.c 2010-12-31 14:46:53.000000000 -0500
5755 +diff -urNp linux-2.6.32.33/drivers/ata/pata_atp867x.c linux-2.6.32.33/drivers/ata/pata_atp867x.c
5756 +--- linux-2.6.32.33/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
5757 ++++ linux-2.6.32.33/drivers/ata/pata_atp867x.c 2010-12-31 14:46:53.000000000 -0500
5758 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
5759 ATA_BMDMA_SHT(DRV_NAME),
5760 };
5761 @@ -21648,9 +21771,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_atp867x.c linux-2.6.32.32/drivers/at
5762 .inherits = &ata_bmdma_port_ops,
5763 .cable_detect = atp867x_cable_detect,
5764 .set_piomode = atp867x_set_piomode,
5765 -diff -urNp linux-2.6.32.32/drivers/ata/pata_bf54x.c linux-2.6.32.32/drivers/ata/pata_bf54x.c
5766 ---- linux-2.6.32.32/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
5767 -+++ linux-2.6.32.32/drivers/ata/pata_bf54x.c 2010-12-31 14:46:53.000000000 -0500
5768 +diff -urNp linux-2.6.32.33/drivers/ata/pata_bf54x.c linux-2.6.32.33/drivers/ata/pata_bf54x.c
5769 +--- linux-2.6.32.33/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
5770 ++++ linux-2.6.32.33/drivers/ata/pata_bf54x.c 2010-12-31 14:46:53.000000000 -0500
5771 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
5772 .dma_boundary = ATA_DMA_BOUNDARY,
5773 };
5774 @@ -21660,9 +21783,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_bf54x.c linux-2.6.32.32/drivers/ata/
5775 .inherits = &ata_sff_port_ops,
5776
5777 .set_piomode = bfin_set_piomode,
5778 -diff -urNp linux-2.6.32.32/drivers/ata/pata_cmd640.c linux-2.6.32.32/drivers/ata/pata_cmd640.c
5779 ---- linux-2.6.32.32/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
5780 -+++ linux-2.6.32.32/drivers/ata/pata_cmd640.c 2010-12-31 14:46:53.000000000 -0500
5781 +diff -urNp linux-2.6.32.33/drivers/ata/pata_cmd640.c linux-2.6.32.33/drivers/ata/pata_cmd640.c
5782 +--- linux-2.6.32.33/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
5783 ++++ linux-2.6.32.33/drivers/ata/pata_cmd640.c 2010-12-31 14:46:53.000000000 -0500
5784 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
5785 ATA_BMDMA_SHT(DRV_NAME),
5786 };
5787 @@ -21672,9 +21795,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_cmd640.c linux-2.6.32.32/drivers/ata
5788 .inherits = &ata_bmdma_port_ops,
5789 /* In theory xfer_noirq is not needed once we kill the prefetcher */
5790 .sff_data_xfer = ata_sff_data_xfer_noirq,
5791 -diff -urNp linux-2.6.32.32/drivers/ata/pata_cmd64x.c linux-2.6.32.32/drivers/ata/pata_cmd64x.c
5792 ---- linux-2.6.32.32/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
5793 -+++ linux-2.6.32.32/drivers/ata/pata_cmd64x.c 2010-12-31 14:46:53.000000000 -0500
5794 +diff -urNp linux-2.6.32.33/drivers/ata/pata_cmd64x.c linux-2.6.32.33/drivers/ata/pata_cmd64x.c
5795 +--- linux-2.6.32.33/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
5796 ++++ linux-2.6.32.33/drivers/ata/pata_cmd64x.c 2010-12-31 14:46:53.000000000 -0500
5797 @@ -275,18 +275,18 @@ static const struct ata_port_operations
5798 .set_dmamode = cmd64x_set_dmamode,
5799 };
5800 @@ -21697,9 +21820,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_cmd64x.c linux-2.6.32.32/drivers/ata
5801 .inherits = &cmd64x_base_ops,
5802 .bmdma_stop = cmd648_bmdma_stop,
5803 .cable_detect = cmd648_cable_detect,
5804 -diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5520.c linux-2.6.32.32/drivers/ata/pata_cs5520.c
5805 ---- linux-2.6.32.32/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
5806 -+++ linux-2.6.32.32/drivers/ata/pata_cs5520.c 2010-12-31 14:46:53.000000000 -0500
5807 +diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5520.c linux-2.6.32.33/drivers/ata/pata_cs5520.c
5808 +--- linux-2.6.32.33/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
5809 ++++ linux-2.6.32.33/drivers/ata/pata_cs5520.c 2010-12-31 14:46:53.000000000 -0500
5810 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
5811 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
5812 };
5813 @@ -21709,9 +21832,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5520.c linux-2.6.32.32/drivers/ata
5814 .inherits = &ata_bmdma_port_ops,
5815 .qc_prep = ata_sff_dumb_qc_prep,
5816 .cable_detect = ata_cable_40wire,
5817 -diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5530.c linux-2.6.32.32/drivers/ata/pata_cs5530.c
5818 ---- linux-2.6.32.32/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
5819 -+++ linux-2.6.32.32/drivers/ata/pata_cs5530.c 2010-12-31 14:46:53.000000000 -0500
5820 +diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5530.c linux-2.6.32.33/drivers/ata/pata_cs5530.c
5821 +--- linux-2.6.32.33/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
5822 ++++ linux-2.6.32.33/drivers/ata/pata_cs5530.c 2010-12-31 14:46:53.000000000 -0500
5823 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
5824 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
5825 };
5826 @@ -21721,9 +21844,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5530.c linux-2.6.32.32/drivers/ata
5827 .inherits = &ata_bmdma_port_ops,
5828
5829 .qc_prep = ata_sff_dumb_qc_prep,
5830 -diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5535.c linux-2.6.32.32/drivers/ata/pata_cs5535.c
5831 ---- linux-2.6.32.32/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
5832 -+++ linux-2.6.32.32/drivers/ata/pata_cs5535.c 2010-12-31 14:46:53.000000000 -0500
5833 +diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5535.c linux-2.6.32.33/drivers/ata/pata_cs5535.c
5834 +--- linux-2.6.32.33/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
5835 ++++ linux-2.6.32.33/drivers/ata/pata_cs5535.c 2010-12-31 14:46:53.000000000 -0500
5836 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
5837 ATA_BMDMA_SHT(DRV_NAME),
5838 };
5839 @@ -21733,9 +21856,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5535.c linux-2.6.32.32/drivers/ata
5840 .inherits = &ata_bmdma_port_ops,
5841 .cable_detect = cs5535_cable_detect,
5842 .set_piomode = cs5535_set_piomode,
5843 -diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5536.c linux-2.6.32.32/drivers/ata/pata_cs5536.c
5844 ---- linux-2.6.32.32/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
5845 -+++ linux-2.6.32.32/drivers/ata/pata_cs5536.c 2010-12-31 14:46:53.000000000 -0500
5846 +diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5536.c linux-2.6.32.33/drivers/ata/pata_cs5536.c
5847 +--- linux-2.6.32.33/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
5848 ++++ linux-2.6.32.33/drivers/ata/pata_cs5536.c 2010-12-31 14:46:53.000000000 -0500
5849 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
5850 ATA_BMDMA_SHT(DRV_NAME),
5851 };
5852 @@ -21745,9 +21868,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_cs5536.c linux-2.6.32.32/drivers/ata
5853 .inherits = &ata_bmdma_port_ops,
5854 .cable_detect = cs5536_cable_detect,
5855 .set_piomode = cs5536_set_piomode,
5856 -diff -urNp linux-2.6.32.32/drivers/ata/pata_cypress.c linux-2.6.32.32/drivers/ata/pata_cypress.c
5857 ---- linux-2.6.32.32/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
5858 -+++ linux-2.6.32.32/drivers/ata/pata_cypress.c 2010-12-31 14:46:53.000000000 -0500
5859 +diff -urNp linux-2.6.32.33/drivers/ata/pata_cypress.c linux-2.6.32.33/drivers/ata/pata_cypress.c
5860 +--- linux-2.6.32.33/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
5861 ++++ linux-2.6.32.33/drivers/ata/pata_cypress.c 2010-12-31 14:46:53.000000000 -0500
5862 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
5863 ATA_BMDMA_SHT(DRV_NAME),
5864 };
5865 @@ -21757,9 +21880,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_cypress.c linux-2.6.32.32/drivers/at
5866 .inherits = &ata_bmdma_port_ops,
5867 .cable_detect = ata_cable_40wire,
5868 .set_piomode = cy82c693_set_piomode,
5869 -diff -urNp linux-2.6.32.32/drivers/ata/pata_efar.c linux-2.6.32.32/drivers/ata/pata_efar.c
5870 ---- linux-2.6.32.32/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
5871 -+++ linux-2.6.32.32/drivers/ata/pata_efar.c 2010-12-31 14:46:53.000000000 -0500
5872 +diff -urNp linux-2.6.32.33/drivers/ata/pata_efar.c linux-2.6.32.33/drivers/ata/pata_efar.c
5873 +--- linux-2.6.32.33/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
5874 ++++ linux-2.6.32.33/drivers/ata/pata_efar.c 2010-12-31 14:46:53.000000000 -0500
5875 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
5876 ATA_BMDMA_SHT(DRV_NAME),
5877 };
5878 @@ -21769,9 +21892,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_efar.c linux-2.6.32.32/drivers/ata/p
5879 .inherits = &ata_bmdma_port_ops,
5880 .cable_detect = efar_cable_detect,
5881 .set_piomode = efar_set_piomode,
5882 -diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt366.c linux-2.6.32.32/drivers/ata/pata_hpt366.c
5883 ---- linux-2.6.32.32/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
5884 -+++ linux-2.6.32.32/drivers/ata/pata_hpt366.c 2010-12-31 14:46:53.000000000 -0500
5885 +diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt366.c linux-2.6.32.33/drivers/ata/pata_hpt366.c
5886 +--- linux-2.6.32.33/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
5887 ++++ linux-2.6.32.33/drivers/ata/pata_hpt366.c 2010-12-31 14:46:53.000000000 -0500
5888 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
5889 * Configuration for HPT366/68
5890 */
5891 @@ -21781,9 +21904,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt366.c linux-2.6.32.32/drivers/ata
5892 .inherits = &ata_bmdma_port_ops,
5893 .cable_detect = hpt36x_cable_detect,
5894 .mode_filter = hpt366_filter,
5895 -diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt37x.c linux-2.6.32.32/drivers/ata/pata_hpt37x.c
5896 ---- linux-2.6.32.32/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
5897 -+++ linux-2.6.32.32/drivers/ata/pata_hpt37x.c 2010-12-31 14:46:53.000000000 -0500
5898 +diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt37x.c linux-2.6.32.33/drivers/ata/pata_hpt37x.c
5899 +--- linux-2.6.32.33/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
5900 ++++ linux-2.6.32.33/drivers/ata/pata_hpt37x.c 2010-12-31 14:46:53.000000000 -0500
5901 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
5902 * Configuration for HPT370
5903 */
5904 @@ -21820,9 +21943,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt37x.c linux-2.6.32.32/drivers/ata
5905 .inherits = &hpt372_port_ops,
5906 .prereset = hpt374_fn1_pre_reset,
5907 };
5908 -diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt3x2n.c linux-2.6.32.32/drivers/ata/pata_hpt3x2n.c
5909 ---- linux-2.6.32.32/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
5910 -+++ linux-2.6.32.32/drivers/ata/pata_hpt3x2n.c 2010-12-31 14:46:53.000000000 -0500
5911 +diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c
5912 +--- linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
5913 ++++ linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c 2010-12-31 14:46:53.000000000 -0500
5914 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
5915 * Configuration for HPT3x2n.
5916 */
5917 @@ -21832,9 +21955,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt3x2n.c linux-2.6.32.32/drivers/at
5918 .inherits = &ata_bmdma_port_ops,
5919
5920 .bmdma_stop = hpt3x2n_bmdma_stop,
5921 -diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt3x3.c linux-2.6.32.32/drivers/ata/pata_hpt3x3.c
5922 ---- linux-2.6.32.32/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
5923 -+++ linux-2.6.32.32/drivers/ata/pata_hpt3x3.c 2010-12-31 14:46:53.000000000 -0500
5924 +diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt3x3.c linux-2.6.32.33/drivers/ata/pata_hpt3x3.c
5925 +--- linux-2.6.32.33/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
5926 ++++ linux-2.6.32.33/drivers/ata/pata_hpt3x3.c 2010-12-31 14:46:53.000000000 -0500
5927 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
5928 ATA_BMDMA_SHT(DRV_NAME),
5929 };
5930 @@ -21844,9 +21967,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_hpt3x3.c linux-2.6.32.32/drivers/ata
5931 .inherits = &ata_bmdma_port_ops,
5932 .cable_detect = ata_cable_40wire,
5933 .set_piomode = hpt3x3_set_piomode,
5934 -diff -urNp linux-2.6.32.32/drivers/ata/pata_icside.c linux-2.6.32.32/drivers/ata/pata_icside.c
5935 ---- linux-2.6.32.32/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
5936 -+++ linux-2.6.32.32/drivers/ata/pata_icside.c 2010-12-31 14:46:53.000000000 -0500
5937 +diff -urNp linux-2.6.32.33/drivers/ata/pata_icside.c linux-2.6.32.33/drivers/ata/pata_icside.c
5938 +--- linux-2.6.32.33/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
5939 ++++ linux-2.6.32.33/drivers/ata/pata_icside.c 2010-12-31 14:46:53.000000000 -0500
5940 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
5941 }
5942 }
5943 @@ -21856,9 +21979,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_icside.c linux-2.6.32.32/drivers/ata
5944 .inherits = &ata_sff_port_ops,
5945 /* no need to build any PRD tables for DMA */
5946 .qc_prep = ata_noop_qc_prep,
5947 -diff -urNp linux-2.6.32.32/drivers/ata/pata_isapnp.c linux-2.6.32.32/drivers/ata/pata_isapnp.c
5948 ---- linux-2.6.32.32/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
5949 -+++ linux-2.6.32.32/drivers/ata/pata_isapnp.c 2010-12-31 14:46:53.000000000 -0500
5950 +diff -urNp linux-2.6.32.33/drivers/ata/pata_isapnp.c linux-2.6.32.33/drivers/ata/pata_isapnp.c
5951 +--- linux-2.6.32.33/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
5952 ++++ linux-2.6.32.33/drivers/ata/pata_isapnp.c 2010-12-31 14:46:53.000000000 -0500
5953 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
5954 ATA_PIO_SHT(DRV_NAME),
5955 };
5956 @@ -21874,9 +21997,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_isapnp.c linux-2.6.32.32/drivers/ata
5957 .inherits = &ata_sff_port_ops,
5958 .cable_detect = ata_cable_40wire,
5959 /* No altstatus so we don't want to use the lost interrupt poll */
5960 -diff -urNp linux-2.6.32.32/drivers/ata/pata_it8213.c linux-2.6.32.32/drivers/ata/pata_it8213.c
5961 ---- linux-2.6.32.32/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
5962 -+++ linux-2.6.32.32/drivers/ata/pata_it8213.c 2010-12-31 14:46:53.000000000 -0500
5963 +diff -urNp linux-2.6.32.33/drivers/ata/pata_it8213.c linux-2.6.32.33/drivers/ata/pata_it8213.c
5964 +--- linux-2.6.32.33/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
5965 ++++ linux-2.6.32.33/drivers/ata/pata_it8213.c 2010-12-31 14:46:53.000000000 -0500
5966 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
5967 };
5968
5969 @@ -21886,9 +22009,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_it8213.c linux-2.6.32.32/drivers/ata
5970 .inherits = &ata_bmdma_port_ops,
5971 .cable_detect = it8213_cable_detect,
5972 .set_piomode = it8213_set_piomode,
5973 -diff -urNp linux-2.6.32.32/drivers/ata/pata_it821x.c linux-2.6.32.32/drivers/ata/pata_it821x.c
5974 ---- linux-2.6.32.32/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
5975 -+++ linux-2.6.32.32/drivers/ata/pata_it821x.c 2010-12-31 14:46:53.000000000 -0500
5976 +diff -urNp linux-2.6.32.33/drivers/ata/pata_it821x.c linux-2.6.32.33/drivers/ata/pata_it821x.c
5977 +--- linux-2.6.32.33/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
5978 ++++ linux-2.6.32.33/drivers/ata/pata_it821x.c 2010-12-31 14:46:53.000000000 -0500
5979 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
5980 ATA_BMDMA_SHT(DRV_NAME),
5981 };
5982 @@ -21916,9 +22039,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_it821x.c linux-2.6.32.32/drivers/ata
5983 .inherits = &ata_bmdma_port_ops,
5984
5985 .check_atapi_dma= it821x_check_atapi_dma,
5986 -diff -urNp linux-2.6.32.32/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.32/drivers/ata/pata_ixp4xx_cf.c
5987 ---- linux-2.6.32.32/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
5988 -+++ linux-2.6.32.32/drivers/ata/pata_ixp4xx_cf.c 2010-12-31 14:46:53.000000000 -0500
5989 +diff -urNp linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c
5990 +--- linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
5991 ++++ linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c 2010-12-31 14:46:53.000000000 -0500
5992 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
5993 ATA_PIO_SHT(DRV_NAME),
5994 };
5995 @@ -21928,9 +22051,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.32/drivers/
5996 .inherits = &ata_sff_port_ops,
5997 .sff_data_xfer = ixp4xx_mmio_data_xfer,
5998 .cable_detect = ata_cable_40wire,
5999 -diff -urNp linux-2.6.32.32/drivers/ata/pata_jmicron.c linux-2.6.32.32/drivers/ata/pata_jmicron.c
6000 ---- linux-2.6.32.32/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
6001 -+++ linux-2.6.32.32/drivers/ata/pata_jmicron.c 2010-12-31 14:46:53.000000000 -0500
6002 +diff -urNp linux-2.6.32.33/drivers/ata/pata_jmicron.c linux-2.6.32.33/drivers/ata/pata_jmicron.c
6003 +--- linux-2.6.32.33/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
6004 ++++ linux-2.6.32.33/drivers/ata/pata_jmicron.c 2010-12-31 14:46:53.000000000 -0500
6005 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
6006 ATA_BMDMA_SHT(DRV_NAME),
6007 };
6008 @@ -21940,9 +22063,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_jmicron.c linux-2.6.32.32/drivers/at
6009 .inherits = &ata_bmdma_port_ops,
6010 .prereset = jmicron_pre_reset,
6011 };
6012 -diff -urNp linux-2.6.32.32/drivers/ata/pata_legacy.c linux-2.6.32.32/drivers/ata/pata_legacy.c
6013 ---- linux-2.6.32.32/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
6014 -+++ linux-2.6.32.32/drivers/ata/pata_legacy.c 2010-12-31 14:46:53.000000000 -0500
6015 +diff -urNp linux-2.6.32.33/drivers/ata/pata_legacy.c linux-2.6.32.33/drivers/ata/pata_legacy.c
6016 +--- linux-2.6.32.33/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
6017 ++++ linux-2.6.32.33/drivers/ata/pata_legacy.c 2010-12-31 14:46:53.000000000 -0500
6018 @@ -106,7 +106,7 @@ struct legacy_probe {
6019
6020 struct legacy_controller {
6021 @@ -22054,9 +22177,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_legacy.c linux-2.6.32.32/drivers/ata
6022 struct legacy_data *ld = &legacy_data[probe->slot];
6023 struct ata_host *host = NULL;
6024 struct ata_port *ap;
6025 -diff -urNp linux-2.6.32.32/drivers/ata/pata_marvell.c linux-2.6.32.32/drivers/ata/pata_marvell.c
6026 ---- linux-2.6.32.32/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
6027 -+++ linux-2.6.32.32/drivers/ata/pata_marvell.c 2010-12-31 14:46:53.000000000 -0500
6028 +diff -urNp linux-2.6.32.33/drivers/ata/pata_marvell.c linux-2.6.32.33/drivers/ata/pata_marvell.c
6029 +--- linux-2.6.32.33/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
6030 ++++ linux-2.6.32.33/drivers/ata/pata_marvell.c 2010-12-31 14:46:53.000000000 -0500
6031 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
6032 ATA_BMDMA_SHT(DRV_NAME),
6033 };
6034 @@ -22066,9 +22189,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_marvell.c linux-2.6.32.32/drivers/at
6035 .inherits = &ata_bmdma_port_ops,
6036 .cable_detect = marvell_cable_detect,
6037 .prereset = marvell_pre_reset,
6038 -diff -urNp linux-2.6.32.32/drivers/ata/pata_mpc52xx.c linux-2.6.32.32/drivers/ata/pata_mpc52xx.c
6039 ---- linux-2.6.32.32/drivers/ata/pata_mpc52xx.c 2011-02-22 15:56:54.000000000 -0500
6040 -+++ linux-2.6.32.32/drivers/ata/pata_mpc52xx.c 2011-02-22 16:03:07.000000000 -0500
6041 +diff -urNp linux-2.6.32.33/drivers/ata/pata_mpc52xx.c linux-2.6.32.33/drivers/ata/pata_mpc52xx.c
6042 +--- linux-2.6.32.33/drivers/ata/pata_mpc52xx.c 2011-02-22 15:56:54.000000000 -0500
6043 ++++ linux-2.6.32.33/drivers/ata/pata_mpc52xx.c 2011-02-22 16:03:07.000000000 -0500
6044 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
6045 ATA_PIO_SHT(DRV_NAME),
6046 };
6047 @@ -22078,9 +22201,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_mpc52xx.c linux-2.6.32.32/drivers/at
6048 .inherits = &ata_bmdma_port_ops,
6049 .sff_dev_select = mpc52xx_ata_dev_select,
6050 .set_piomode = mpc52xx_ata_set_piomode,
6051 -diff -urNp linux-2.6.32.32/drivers/ata/pata_mpiix.c linux-2.6.32.32/drivers/ata/pata_mpiix.c
6052 ---- linux-2.6.32.32/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
6053 -+++ linux-2.6.32.32/drivers/ata/pata_mpiix.c 2010-12-31 14:46:53.000000000 -0500
6054 +diff -urNp linux-2.6.32.33/drivers/ata/pata_mpiix.c linux-2.6.32.33/drivers/ata/pata_mpiix.c
6055 +--- linux-2.6.32.33/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
6056 ++++ linux-2.6.32.33/drivers/ata/pata_mpiix.c 2010-12-31 14:46:53.000000000 -0500
6057 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
6058 ATA_PIO_SHT(DRV_NAME),
6059 };
6060 @@ -22090,9 +22213,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_mpiix.c linux-2.6.32.32/drivers/ata/
6061 .inherits = &ata_sff_port_ops,
6062 .qc_issue = mpiix_qc_issue,
6063 .cable_detect = ata_cable_40wire,
6064 -diff -urNp linux-2.6.32.32/drivers/ata/pata_netcell.c linux-2.6.32.32/drivers/ata/pata_netcell.c
6065 ---- linux-2.6.32.32/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
6066 -+++ linux-2.6.32.32/drivers/ata/pata_netcell.c 2010-12-31 14:46:53.000000000 -0500
6067 +diff -urNp linux-2.6.32.33/drivers/ata/pata_netcell.c linux-2.6.32.33/drivers/ata/pata_netcell.c
6068 +--- linux-2.6.32.33/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
6069 ++++ linux-2.6.32.33/drivers/ata/pata_netcell.c 2010-12-31 14:46:53.000000000 -0500
6070 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
6071 ATA_BMDMA_SHT(DRV_NAME),
6072 };
6073 @@ -22102,9 +22225,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_netcell.c linux-2.6.32.32/drivers/at
6074 .inherits = &ata_bmdma_port_ops,
6075 .cable_detect = ata_cable_80wire,
6076 .read_id = netcell_read_id,
6077 -diff -urNp linux-2.6.32.32/drivers/ata/pata_ninja32.c linux-2.6.32.32/drivers/ata/pata_ninja32.c
6078 ---- linux-2.6.32.32/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
6079 -+++ linux-2.6.32.32/drivers/ata/pata_ninja32.c 2010-12-31 14:46:53.000000000 -0500
6080 +diff -urNp linux-2.6.32.33/drivers/ata/pata_ninja32.c linux-2.6.32.33/drivers/ata/pata_ninja32.c
6081 +--- linux-2.6.32.33/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
6082 ++++ linux-2.6.32.33/drivers/ata/pata_ninja32.c 2010-12-31 14:46:53.000000000 -0500
6083 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
6084 ATA_BMDMA_SHT(DRV_NAME),
6085 };
6086 @@ -22114,9 +22237,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_ninja32.c linux-2.6.32.32/drivers/at
6087 .inherits = &ata_bmdma_port_ops,
6088 .sff_dev_select = ninja32_dev_select,
6089 .cable_detect = ata_cable_40wire,
6090 -diff -urNp linux-2.6.32.32/drivers/ata/pata_ns87410.c linux-2.6.32.32/drivers/ata/pata_ns87410.c
6091 ---- linux-2.6.32.32/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
6092 -+++ linux-2.6.32.32/drivers/ata/pata_ns87410.c 2010-12-31 14:46:53.000000000 -0500
6093 +diff -urNp linux-2.6.32.33/drivers/ata/pata_ns87410.c linux-2.6.32.33/drivers/ata/pata_ns87410.c
6094 +--- linux-2.6.32.33/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
6095 ++++ linux-2.6.32.33/drivers/ata/pata_ns87410.c 2010-12-31 14:46:53.000000000 -0500
6096 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
6097 ATA_PIO_SHT(DRV_NAME),
6098 };
6099 @@ -22126,9 +22249,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_ns87410.c linux-2.6.32.32/drivers/at
6100 .inherits = &ata_sff_port_ops,
6101 .qc_issue = ns87410_qc_issue,
6102 .cable_detect = ata_cable_40wire,
6103 -diff -urNp linux-2.6.32.32/drivers/ata/pata_ns87415.c linux-2.6.32.32/drivers/ata/pata_ns87415.c
6104 ---- linux-2.6.32.32/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
6105 -+++ linux-2.6.32.32/drivers/ata/pata_ns87415.c 2010-12-31 14:46:53.000000000 -0500
6106 +diff -urNp linux-2.6.32.33/drivers/ata/pata_ns87415.c linux-2.6.32.33/drivers/ata/pata_ns87415.c
6107 +--- linux-2.6.32.33/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
6108 ++++ linux-2.6.32.33/drivers/ata/pata_ns87415.c 2010-12-31 14:46:53.000000000 -0500
6109 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
6110 }
6111 #endif /* 87560 SuperIO Support */
6112 @@ -22147,9 +22270,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_ns87415.c linux-2.6.32.32/drivers/at
6113 .inherits = &ns87415_pata_ops,
6114 .sff_tf_read = ns87560_tf_read,
6115 .sff_check_status = ns87560_check_status,
6116 -diff -urNp linux-2.6.32.32/drivers/ata/pata_octeon_cf.c linux-2.6.32.32/drivers/ata/pata_octeon_cf.c
6117 ---- linux-2.6.32.32/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
6118 -+++ linux-2.6.32.32/drivers/ata/pata_octeon_cf.c 2010-12-31 14:46:53.000000000 -0500
6119 +diff -urNp linux-2.6.32.33/drivers/ata/pata_octeon_cf.c linux-2.6.32.33/drivers/ata/pata_octeon_cf.c
6120 +--- linux-2.6.32.33/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
6121 ++++ linux-2.6.32.33/drivers/ata/pata_octeon_cf.c 2010-12-31 14:46:53.000000000 -0500
6122 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
6123 return 0;
6124 }
6125 @@ -22158,9 +22281,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_octeon_cf.c linux-2.6.32.32/drivers/
6126 static struct ata_port_operations octeon_cf_ops = {
6127 .inherits = &ata_sff_port_ops,
6128 .check_atapi_dma = octeon_cf_check_atapi_dma,
6129 -diff -urNp linux-2.6.32.32/drivers/ata/pata_oldpiix.c linux-2.6.32.32/drivers/ata/pata_oldpiix.c
6130 ---- linux-2.6.32.32/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
6131 -+++ linux-2.6.32.32/drivers/ata/pata_oldpiix.c 2010-12-31 14:46:53.000000000 -0500
6132 +diff -urNp linux-2.6.32.33/drivers/ata/pata_oldpiix.c linux-2.6.32.33/drivers/ata/pata_oldpiix.c
6133 +--- linux-2.6.32.33/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
6134 ++++ linux-2.6.32.33/drivers/ata/pata_oldpiix.c 2010-12-31 14:46:53.000000000 -0500
6135 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
6136 ATA_BMDMA_SHT(DRV_NAME),
6137 };
6138 @@ -22170,9 +22293,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_oldpiix.c linux-2.6.32.32/drivers/at
6139 .inherits = &ata_bmdma_port_ops,
6140 .qc_issue = oldpiix_qc_issue,
6141 .cable_detect = ata_cable_40wire,
6142 -diff -urNp linux-2.6.32.32/drivers/ata/pata_opti.c linux-2.6.32.32/drivers/ata/pata_opti.c
6143 ---- linux-2.6.32.32/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
6144 -+++ linux-2.6.32.32/drivers/ata/pata_opti.c 2010-12-31 14:46:53.000000000 -0500
6145 +diff -urNp linux-2.6.32.33/drivers/ata/pata_opti.c linux-2.6.32.33/drivers/ata/pata_opti.c
6146 +--- linux-2.6.32.33/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
6147 ++++ linux-2.6.32.33/drivers/ata/pata_opti.c 2010-12-31 14:46:53.000000000 -0500
6148 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
6149 ATA_PIO_SHT(DRV_NAME),
6150 };
6151 @@ -22182,9 +22305,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_opti.c linux-2.6.32.32/drivers/ata/p
6152 .inherits = &ata_sff_port_ops,
6153 .cable_detect = ata_cable_40wire,
6154 .set_piomode = opti_set_piomode,
6155 -diff -urNp linux-2.6.32.32/drivers/ata/pata_optidma.c linux-2.6.32.32/drivers/ata/pata_optidma.c
6156 ---- linux-2.6.32.32/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
6157 -+++ linux-2.6.32.32/drivers/ata/pata_optidma.c 2010-12-31 14:46:53.000000000 -0500
6158 +diff -urNp linux-2.6.32.33/drivers/ata/pata_optidma.c linux-2.6.32.33/drivers/ata/pata_optidma.c
6159 +--- linux-2.6.32.33/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
6160 ++++ linux-2.6.32.33/drivers/ata/pata_optidma.c 2010-12-31 14:46:53.000000000 -0500
6161 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
6162 ATA_BMDMA_SHT(DRV_NAME),
6163 };
6164 @@ -22203,9 +22326,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_optidma.c linux-2.6.32.32/drivers/at
6165 .inherits = &optidma_port_ops,
6166 .set_piomode = optiplus_set_pio_mode,
6167 .set_dmamode = optiplus_set_dma_mode,
6168 -diff -urNp linux-2.6.32.32/drivers/ata/pata_palmld.c linux-2.6.32.32/drivers/ata/pata_palmld.c
6169 ---- linux-2.6.32.32/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
6170 -+++ linux-2.6.32.32/drivers/ata/pata_palmld.c 2010-12-31 14:46:53.000000000 -0500
6171 +diff -urNp linux-2.6.32.33/drivers/ata/pata_palmld.c linux-2.6.32.33/drivers/ata/pata_palmld.c
6172 +--- linux-2.6.32.33/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
6173 ++++ linux-2.6.32.33/drivers/ata/pata_palmld.c 2010-12-31 14:46:53.000000000 -0500
6174 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
6175 ATA_PIO_SHT(DRV_NAME),
6176 };
6177 @@ -22215,9 +22338,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_palmld.c linux-2.6.32.32/drivers/ata
6178 .inherits = &ata_sff_port_ops,
6179 .sff_data_xfer = ata_sff_data_xfer_noirq,
6180 .cable_detect = ata_cable_40wire,
6181 -diff -urNp linux-2.6.32.32/drivers/ata/pata_pcmcia.c linux-2.6.32.32/drivers/ata/pata_pcmcia.c
6182 ---- linux-2.6.32.32/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
6183 -+++ linux-2.6.32.32/drivers/ata/pata_pcmcia.c 2010-12-31 14:46:53.000000000 -0500
6184 +diff -urNp linux-2.6.32.33/drivers/ata/pata_pcmcia.c linux-2.6.32.33/drivers/ata/pata_pcmcia.c
6185 +--- linux-2.6.32.33/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
6186 ++++ linux-2.6.32.33/drivers/ata/pata_pcmcia.c 2010-12-31 14:46:53.000000000 -0500
6187 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
6188 ATA_PIO_SHT(DRV_NAME),
6189 };
6190 @@ -22244,9 +22367,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_pcmcia.c linux-2.6.32.32/drivers/ata
6191
6192 info = kzalloc(sizeof(*info), GFP_KERNEL);
6193 if (info == NULL)
6194 -diff -urNp linux-2.6.32.32/drivers/ata/pata_pdc2027x.c linux-2.6.32.32/drivers/ata/pata_pdc2027x.c
6195 ---- linux-2.6.32.32/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
6196 -+++ linux-2.6.32.32/drivers/ata/pata_pdc2027x.c 2010-12-31 14:46:53.000000000 -0500
6197 +diff -urNp linux-2.6.32.33/drivers/ata/pata_pdc2027x.c linux-2.6.32.33/drivers/ata/pata_pdc2027x.c
6198 +--- linux-2.6.32.33/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
6199 ++++ linux-2.6.32.33/drivers/ata/pata_pdc2027x.c 2010-12-31 14:46:53.000000000 -0500
6200 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
6201 ATA_BMDMA_SHT(DRV_NAME),
6202 };
6203 @@ -22264,9 +22387,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_pdc2027x.c linux-2.6.32.32/drivers/a
6204 .inherits = &pdc2027x_pata100_ops,
6205 .mode_filter = pdc2027x_mode_filter,
6206 .set_piomode = pdc2027x_set_piomode,
6207 -diff -urNp linux-2.6.32.32/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.32/drivers/ata/pata_pdc202xx_old.c
6208 ---- linux-2.6.32.32/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
6209 -+++ linux-2.6.32.32/drivers/ata/pata_pdc202xx_old.c 2010-12-31 14:46:53.000000000 -0500
6210 +diff -urNp linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c
6211 +--- linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
6212 ++++ linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c 2010-12-31 14:46:53.000000000 -0500
6213 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
6214 ATA_BMDMA_SHT(DRV_NAME),
6215 };
6216 @@ -22285,9 +22408,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.32/drive
6217 .inherits = &pdc2024x_port_ops,
6218
6219 .check_atapi_dma = pdc2026x_check_atapi_dma,
6220 -diff -urNp linux-2.6.32.32/drivers/ata/pata_platform.c linux-2.6.32.32/drivers/ata/pata_platform.c
6221 ---- linux-2.6.32.32/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
6222 -+++ linux-2.6.32.32/drivers/ata/pata_platform.c 2010-12-31 14:46:53.000000000 -0500
6223 +diff -urNp linux-2.6.32.33/drivers/ata/pata_platform.c linux-2.6.32.33/drivers/ata/pata_platform.c
6224 +--- linux-2.6.32.33/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
6225 ++++ linux-2.6.32.33/drivers/ata/pata_platform.c 2010-12-31 14:46:53.000000000 -0500
6226 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
6227 ATA_PIO_SHT(DRV_NAME),
6228 };
6229 @@ -22297,9 +22420,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_platform.c linux-2.6.32.32/drivers/a
6230 .inherits = &ata_sff_port_ops,
6231 .sff_data_xfer = ata_sff_data_xfer_noirq,
6232 .cable_detect = ata_cable_unknown,
6233 -diff -urNp linux-2.6.32.32/drivers/ata/pata_qdi.c linux-2.6.32.32/drivers/ata/pata_qdi.c
6234 ---- linux-2.6.32.32/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
6235 -+++ linux-2.6.32.32/drivers/ata/pata_qdi.c 2010-12-31 14:46:53.000000000 -0500
6236 +diff -urNp linux-2.6.32.33/drivers/ata/pata_qdi.c linux-2.6.32.33/drivers/ata/pata_qdi.c
6237 +--- linux-2.6.32.33/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
6238 ++++ linux-2.6.32.33/drivers/ata/pata_qdi.c 2010-12-31 14:46:53.000000000 -0500
6239 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
6240 ATA_PIO_SHT(DRV_NAME),
6241 };
6242 @@ -22318,9 +22441,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_qdi.c linux-2.6.32.32/drivers/ata/pa
6243 .inherits = &qdi6500_port_ops,
6244 .set_piomode = qdi6580_set_piomode,
6245 };
6246 -diff -urNp linux-2.6.32.32/drivers/ata/pata_radisys.c linux-2.6.32.32/drivers/ata/pata_radisys.c
6247 ---- linux-2.6.32.32/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
6248 -+++ linux-2.6.32.32/drivers/ata/pata_radisys.c 2010-12-31 14:46:53.000000000 -0500
6249 +diff -urNp linux-2.6.32.33/drivers/ata/pata_radisys.c linux-2.6.32.33/drivers/ata/pata_radisys.c
6250 +--- linux-2.6.32.33/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
6251 ++++ linux-2.6.32.33/drivers/ata/pata_radisys.c 2010-12-31 14:46:53.000000000 -0500
6252 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
6253 ATA_BMDMA_SHT(DRV_NAME),
6254 };
6255 @@ -22330,9 +22453,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_radisys.c linux-2.6.32.32/drivers/at
6256 .inherits = &ata_bmdma_port_ops,
6257 .qc_issue = radisys_qc_issue,
6258 .cable_detect = ata_cable_unknown,
6259 -diff -urNp linux-2.6.32.32/drivers/ata/pata_rb532_cf.c linux-2.6.32.32/drivers/ata/pata_rb532_cf.c
6260 ---- linux-2.6.32.32/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
6261 -+++ linux-2.6.32.32/drivers/ata/pata_rb532_cf.c 2010-12-31 14:46:53.000000000 -0500
6262 +diff -urNp linux-2.6.32.33/drivers/ata/pata_rb532_cf.c linux-2.6.32.33/drivers/ata/pata_rb532_cf.c
6263 +--- linux-2.6.32.33/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
6264 ++++ linux-2.6.32.33/drivers/ata/pata_rb532_cf.c 2010-12-31 14:46:53.000000000 -0500
6265 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
6266 return IRQ_HANDLED;
6267 }
6268 @@ -22342,9 +22465,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_rb532_cf.c linux-2.6.32.32/drivers/a
6269 .inherits = &ata_sff_port_ops,
6270 .sff_data_xfer = ata_sff_data_xfer32,
6271 };
6272 -diff -urNp linux-2.6.32.32/drivers/ata/pata_rdc.c linux-2.6.32.32/drivers/ata/pata_rdc.c
6273 ---- linux-2.6.32.32/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
6274 -+++ linux-2.6.32.32/drivers/ata/pata_rdc.c 2010-12-31 14:46:53.000000000 -0500
6275 +diff -urNp linux-2.6.32.33/drivers/ata/pata_rdc.c linux-2.6.32.33/drivers/ata/pata_rdc.c
6276 +--- linux-2.6.32.33/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
6277 ++++ linux-2.6.32.33/drivers/ata/pata_rdc.c 2010-12-31 14:46:53.000000000 -0500
6278 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
6279 pci_write_config_byte(dev, 0x48, udma_enable);
6280 }
6281 @@ -22354,9 +22477,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_rdc.c linux-2.6.32.32/drivers/ata/pa
6282 .inherits = &ata_bmdma32_port_ops,
6283 .cable_detect = rdc_pata_cable_detect,
6284 .set_piomode = rdc_set_piomode,
6285 -diff -urNp linux-2.6.32.32/drivers/ata/pata_rz1000.c linux-2.6.32.32/drivers/ata/pata_rz1000.c
6286 ---- linux-2.6.32.32/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
6287 -+++ linux-2.6.32.32/drivers/ata/pata_rz1000.c 2010-12-31 14:46:53.000000000 -0500
6288 +diff -urNp linux-2.6.32.33/drivers/ata/pata_rz1000.c linux-2.6.32.33/drivers/ata/pata_rz1000.c
6289 +--- linux-2.6.32.33/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
6290 ++++ linux-2.6.32.33/drivers/ata/pata_rz1000.c 2010-12-31 14:46:53.000000000 -0500
6291 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
6292 ATA_PIO_SHT(DRV_NAME),
6293 };
6294 @@ -22366,9 +22489,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_rz1000.c linux-2.6.32.32/drivers/ata
6295 .inherits = &ata_sff_port_ops,
6296 .cable_detect = ata_cable_40wire,
6297 .set_mode = rz1000_set_mode,
6298 -diff -urNp linux-2.6.32.32/drivers/ata/pata_sc1200.c linux-2.6.32.32/drivers/ata/pata_sc1200.c
6299 ---- linux-2.6.32.32/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
6300 -+++ linux-2.6.32.32/drivers/ata/pata_sc1200.c 2010-12-31 14:46:53.000000000 -0500
6301 +diff -urNp linux-2.6.32.33/drivers/ata/pata_sc1200.c linux-2.6.32.33/drivers/ata/pata_sc1200.c
6302 +--- linux-2.6.32.33/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
6303 ++++ linux-2.6.32.33/drivers/ata/pata_sc1200.c 2010-12-31 14:46:53.000000000 -0500
6304 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
6305 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
6306 };
6307 @@ -22378,9 +22501,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_sc1200.c linux-2.6.32.32/drivers/ata
6308 .inherits = &ata_bmdma_port_ops,
6309 .qc_prep = ata_sff_dumb_qc_prep,
6310 .qc_issue = sc1200_qc_issue,
6311 -diff -urNp linux-2.6.32.32/drivers/ata/pata_scc.c linux-2.6.32.32/drivers/ata/pata_scc.c
6312 ---- linux-2.6.32.32/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
6313 -+++ linux-2.6.32.32/drivers/ata/pata_scc.c 2010-12-31 14:46:53.000000000 -0500
6314 +diff -urNp linux-2.6.32.33/drivers/ata/pata_scc.c linux-2.6.32.33/drivers/ata/pata_scc.c
6315 +--- linux-2.6.32.33/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
6316 ++++ linux-2.6.32.33/drivers/ata/pata_scc.c 2010-12-31 14:46:53.000000000 -0500
6317 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
6318 ATA_BMDMA_SHT(DRV_NAME),
6319 };
6320 @@ -22390,9 +22513,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_scc.c linux-2.6.32.32/drivers/ata/pa
6321 .inherits = &ata_bmdma_port_ops,
6322
6323 .set_piomode = scc_set_piomode,
6324 -diff -urNp linux-2.6.32.32/drivers/ata/pata_sch.c linux-2.6.32.32/drivers/ata/pata_sch.c
6325 ---- linux-2.6.32.32/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
6326 -+++ linux-2.6.32.32/drivers/ata/pata_sch.c 2010-12-31 14:46:53.000000000 -0500
6327 +diff -urNp linux-2.6.32.33/drivers/ata/pata_sch.c linux-2.6.32.33/drivers/ata/pata_sch.c
6328 +--- linux-2.6.32.33/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
6329 ++++ linux-2.6.32.33/drivers/ata/pata_sch.c 2010-12-31 14:46:53.000000000 -0500
6330 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
6331 ATA_BMDMA_SHT(DRV_NAME),
6332 };
6333 @@ -22402,9 +22525,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_sch.c linux-2.6.32.32/drivers/ata/pa
6334 .inherits = &ata_bmdma_port_ops,
6335 .cable_detect = ata_cable_unknown,
6336 .set_piomode = sch_set_piomode,
6337 -diff -urNp linux-2.6.32.32/drivers/ata/pata_serverworks.c linux-2.6.32.32/drivers/ata/pata_serverworks.c
6338 ---- linux-2.6.32.32/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
6339 -+++ linux-2.6.32.32/drivers/ata/pata_serverworks.c 2010-12-31 14:46:53.000000000 -0500
6340 +diff -urNp linux-2.6.32.33/drivers/ata/pata_serverworks.c linux-2.6.32.33/drivers/ata/pata_serverworks.c
6341 +--- linux-2.6.32.33/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
6342 ++++ linux-2.6.32.33/drivers/ata/pata_serverworks.c 2010-12-31 14:46:53.000000000 -0500
6343 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw
6344 ATA_BMDMA_SHT(DRV_NAME),
6345 };
6346 @@ -22423,9 +22546,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_serverworks.c linux-2.6.32.32/driver
6347 .inherits = &serverworks_osb4_port_ops,
6348 .mode_filter = serverworks_csb_filter,
6349 };
6350 -diff -urNp linux-2.6.32.32/drivers/ata/pata_sil680.c linux-2.6.32.32/drivers/ata/pata_sil680.c
6351 ---- linux-2.6.32.32/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
6352 -+++ linux-2.6.32.32/drivers/ata/pata_sil680.c 2010-12-31 14:46:53.000000000 -0500
6353 +diff -urNp linux-2.6.32.33/drivers/ata/pata_sil680.c linux-2.6.32.33/drivers/ata/pata_sil680.c
6354 +--- linux-2.6.32.33/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
6355 ++++ linux-2.6.32.33/drivers/ata/pata_sil680.c 2010-12-31 14:46:53.000000000 -0500
6356 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
6357 ATA_BMDMA_SHT(DRV_NAME),
6358 };
6359 @@ -22435,9 +22558,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_sil680.c linux-2.6.32.32/drivers/ata
6360 .inherits = &ata_bmdma32_port_ops,
6361 .cable_detect = sil680_cable_detect,
6362 .set_piomode = sil680_set_piomode,
6363 -diff -urNp linux-2.6.32.32/drivers/ata/pata_sis.c linux-2.6.32.32/drivers/ata/pata_sis.c
6364 ---- linux-2.6.32.32/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
6365 -+++ linux-2.6.32.32/drivers/ata/pata_sis.c 2010-12-31 14:46:53.000000000 -0500
6366 +diff -urNp linux-2.6.32.33/drivers/ata/pata_sis.c linux-2.6.32.33/drivers/ata/pata_sis.c
6367 +--- linux-2.6.32.33/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
6368 ++++ linux-2.6.32.33/drivers/ata/pata_sis.c 2010-12-31 14:46:53.000000000 -0500
6369 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
6370 ATA_BMDMA_SHT(DRV_NAME),
6371 };
6372 @@ -22493,9 +22616,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_sis.c linux-2.6.32.32/drivers/ata/pa
6373 .inherits = &sis_base_ops,
6374 .set_piomode = sis_old_set_piomode,
6375 .set_dmamode = sis_old_set_dmamode,
6376 -diff -urNp linux-2.6.32.32/drivers/ata/pata_sl82c105.c linux-2.6.32.32/drivers/ata/pata_sl82c105.c
6377 ---- linux-2.6.32.32/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
6378 -+++ linux-2.6.32.32/drivers/ata/pata_sl82c105.c 2010-12-31 14:46:53.000000000 -0500
6379 +diff -urNp linux-2.6.32.33/drivers/ata/pata_sl82c105.c linux-2.6.32.33/drivers/ata/pata_sl82c105.c
6380 +--- linux-2.6.32.33/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
6381 ++++ linux-2.6.32.33/drivers/ata/pata_sl82c105.c 2010-12-31 14:46:53.000000000 -0500
6382 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
6383 ATA_BMDMA_SHT(DRV_NAME),
6384 };
6385 @@ -22505,9 +22628,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_sl82c105.c linux-2.6.32.32/drivers/a
6386 .inherits = &ata_bmdma_port_ops,
6387 .qc_defer = sl82c105_qc_defer,
6388 .bmdma_start = sl82c105_bmdma_start,
6389 -diff -urNp linux-2.6.32.32/drivers/ata/pata_triflex.c linux-2.6.32.32/drivers/ata/pata_triflex.c
6390 ---- linux-2.6.32.32/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
6391 -+++ linux-2.6.32.32/drivers/ata/pata_triflex.c 2010-12-31 14:46:53.000000000 -0500
6392 +diff -urNp linux-2.6.32.33/drivers/ata/pata_triflex.c linux-2.6.32.33/drivers/ata/pata_triflex.c
6393 +--- linux-2.6.32.33/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
6394 ++++ linux-2.6.32.33/drivers/ata/pata_triflex.c 2010-12-31 14:46:53.000000000 -0500
6395 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
6396 ATA_BMDMA_SHT(DRV_NAME),
6397 };
6398 @@ -22517,9 +22640,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_triflex.c linux-2.6.32.32/drivers/at
6399 .inherits = &ata_bmdma_port_ops,
6400 .bmdma_start = triflex_bmdma_start,
6401 .bmdma_stop = triflex_bmdma_stop,
6402 -diff -urNp linux-2.6.32.32/drivers/ata/pata_via.c linux-2.6.32.32/drivers/ata/pata_via.c
6403 ---- linux-2.6.32.32/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
6404 -+++ linux-2.6.32.32/drivers/ata/pata_via.c 2010-12-31 14:46:53.000000000 -0500
6405 +diff -urNp linux-2.6.32.33/drivers/ata/pata_via.c linux-2.6.32.33/drivers/ata/pata_via.c
6406 +--- linux-2.6.32.33/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
6407 ++++ linux-2.6.32.33/drivers/ata/pata_via.c 2010-12-31 14:46:53.000000000 -0500
6408 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
6409 ATA_BMDMA_SHT(DRV_NAME),
6410 };
6411 @@ -22538,9 +22661,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_via.c linux-2.6.32.32/drivers/ata/pa
6412 .inherits = &via_port_ops,
6413 .sff_data_xfer = ata_sff_data_xfer_noirq,
6414 };
6415 -diff -urNp linux-2.6.32.32/drivers/ata/pata_winbond.c linux-2.6.32.32/drivers/ata/pata_winbond.c
6416 ---- linux-2.6.32.32/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
6417 -+++ linux-2.6.32.32/drivers/ata/pata_winbond.c 2010-12-31 14:46:53.000000000 -0500
6418 +diff -urNp linux-2.6.32.33/drivers/ata/pata_winbond.c linux-2.6.32.33/drivers/ata/pata_winbond.c
6419 +--- linux-2.6.32.33/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
6420 ++++ linux-2.6.32.33/drivers/ata/pata_winbond.c 2010-12-31 14:46:53.000000000 -0500
6421 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond
6422 ATA_PIO_SHT(DRV_NAME),
6423 };
6424 @@ -22550,9 +22673,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pata_winbond.c linux-2.6.32.32/drivers/at
6425 .inherits = &ata_sff_port_ops,
6426 .sff_data_xfer = winbond_data_xfer,
6427 .cable_detect = ata_cable_40wire,
6428 -diff -urNp linux-2.6.32.32/drivers/ata/pdc_adma.c linux-2.6.32.32/drivers/ata/pdc_adma.c
6429 ---- linux-2.6.32.32/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
6430 -+++ linux-2.6.32.32/drivers/ata/pdc_adma.c 2010-12-31 14:46:53.000000000 -0500
6431 +diff -urNp linux-2.6.32.33/drivers/ata/pdc_adma.c linux-2.6.32.33/drivers/ata/pdc_adma.c
6432 +--- linux-2.6.32.33/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
6433 ++++ linux-2.6.32.33/drivers/ata/pdc_adma.c 2010-12-31 14:46:53.000000000 -0500
6434 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
6435 .dma_boundary = ADMA_DMA_BOUNDARY,
6436 };
6437 @@ -22562,9 +22685,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/pdc_adma.c linux-2.6.32.32/drivers/ata/pd
6438 .inherits = &ata_sff_port_ops,
6439
6440 .lost_interrupt = ATA_OP_NULL,
6441 -diff -urNp linux-2.6.32.32/drivers/ata/sata_fsl.c linux-2.6.32.32/drivers/ata/sata_fsl.c
6442 ---- linux-2.6.32.32/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
6443 -+++ linux-2.6.32.32/drivers/ata/sata_fsl.c 2010-12-31 14:46:53.000000000 -0500
6444 +diff -urNp linux-2.6.32.33/drivers/ata/sata_fsl.c linux-2.6.32.33/drivers/ata/sata_fsl.c
6445 +--- linux-2.6.32.33/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
6446 ++++ linux-2.6.32.33/drivers/ata/sata_fsl.c 2010-12-31 14:46:53.000000000 -0500
6447 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
6448 .dma_boundary = ATA_DMA_BOUNDARY,
6449 };
6450 @@ -22574,9 +22697,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_fsl.c linux-2.6.32.32/drivers/ata/sa
6451 .inherits = &sata_pmp_port_ops,
6452
6453 .qc_defer = ata_std_qc_defer,
6454 -diff -urNp linux-2.6.32.32/drivers/ata/sata_inic162x.c linux-2.6.32.32/drivers/ata/sata_inic162x.c
6455 ---- linux-2.6.32.32/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
6456 -+++ linux-2.6.32.32/drivers/ata/sata_inic162x.c 2010-12-31 14:46:53.000000000 -0500
6457 +diff -urNp linux-2.6.32.33/drivers/ata/sata_inic162x.c linux-2.6.32.33/drivers/ata/sata_inic162x.c
6458 +--- linux-2.6.32.33/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
6459 ++++ linux-2.6.32.33/drivers/ata/sata_inic162x.c 2010-12-31 14:46:53.000000000 -0500
6460 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
6461 return 0;
6462 }
6463 @@ -22586,9 +22709,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_inic162x.c linux-2.6.32.32/drivers/a
6464 .inherits = &sata_port_ops,
6465
6466 .check_atapi_dma = inic_check_atapi_dma,
6467 -diff -urNp linux-2.6.32.32/drivers/ata/sata_mv.c linux-2.6.32.32/drivers/ata/sata_mv.c
6468 ---- linux-2.6.32.32/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
6469 -+++ linux-2.6.32.32/drivers/ata/sata_mv.c 2010-12-31 14:46:53.000000000 -0500
6470 +diff -urNp linux-2.6.32.33/drivers/ata/sata_mv.c linux-2.6.32.33/drivers/ata/sata_mv.c
6471 +--- linux-2.6.32.33/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
6472 ++++ linux-2.6.32.33/drivers/ata/sata_mv.c 2010-12-31 14:46:53.000000000 -0500
6473 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
6474 .dma_boundary = MV_DMA_BOUNDARY,
6475 };
6476 @@ -22616,9 +22739,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_mv.c linux-2.6.32.32/drivers/ata/sat
6477 .inherits = &mv6_ops,
6478 .dev_config = ATA_OP_NULL,
6479 .qc_prep = mv_qc_prep_iie,
6480 -diff -urNp linux-2.6.32.32/drivers/ata/sata_nv.c linux-2.6.32.32/drivers/ata/sata_nv.c
6481 ---- linux-2.6.32.32/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
6482 -+++ linux-2.6.32.32/drivers/ata/sata_nv.c 2010-12-31 14:46:53.000000000 -0500
6483 +diff -urNp linux-2.6.32.33/drivers/ata/sata_nv.c linux-2.6.32.33/drivers/ata/sata_nv.c
6484 +--- linux-2.6.32.33/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
6485 ++++ linux-2.6.32.33/drivers/ata/sata_nv.c 2010-12-31 14:46:53.000000000 -0500
6486 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
6487 * cases. Define nv_hardreset() which only kicks in for post-boot
6488 * probing and use it for all variants.
6489 @@ -22661,9 +22784,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_nv.c linux-2.6.32.32/drivers/ata/sat
6490 .inherits = &nv_generic_ops,
6491
6492 .qc_defer = ata_std_qc_defer,
6493 -diff -urNp linux-2.6.32.32/drivers/ata/sata_promise.c linux-2.6.32.32/drivers/ata/sata_promise.c
6494 ---- linux-2.6.32.32/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
6495 -+++ linux-2.6.32.32/drivers/ata/sata_promise.c 2010-12-31 14:46:53.000000000 -0500
6496 +diff -urNp linux-2.6.32.33/drivers/ata/sata_promise.c linux-2.6.32.33/drivers/ata/sata_promise.c
6497 +--- linux-2.6.32.33/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
6498 ++++ linux-2.6.32.33/drivers/ata/sata_promise.c 2010-12-31 14:46:53.000000000 -0500
6499 @@ -195,7 +195,7 @@ static const struct ata_port_operations
6500 .error_handler = pdc_error_handler,
6501 };
6502 @@ -22690,9 +22813,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_promise.c linux-2.6.32.32/drivers/at
6503 .inherits = &pdc_common_ops,
6504 .cable_detect = pdc_pata_cable_detect,
6505 .freeze = pdc_freeze,
6506 -diff -urNp linux-2.6.32.32/drivers/ata/sata_qstor.c linux-2.6.32.32/drivers/ata/sata_qstor.c
6507 ---- linux-2.6.32.32/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
6508 -+++ linux-2.6.32.32/drivers/ata/sata_qstor.c 2010-12-31 14:46:53.000000000 -0500
6509 +diff -urNp linux-2.6.32.33/drivers/ata/sata_qstor.c linux-2.6.32.33/drivers/ata/sata_qstor.c
6510 +--- linux-2.6.32.33/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
6511 ++++ linux-2.6.32.33/drivers/ata/sata_qstor.c 2010-12-31 14:46:53.000000000 -0500
6512 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
6513 .dma_boundary = QS_DMA_BOUNDARY,
6514 };
6515 @@ -22702,9 +22825,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_qstor.c linux-2.6.32.32/drivers/ata/
6516 .inherits = &ata_sff_port_ops,
6517
6518 .check_atapi_dma = qs_check_atapi_dma,
6519 -diff -urNp linux-2.6.32.32/drivers/ata/sata_sil24.c linux-2.6.32.32/drivers/ata/sata_sil24.c
6520 ---- linux-2.6.32.32/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
6521 -+++ linux-2.6.32.32/drivers/ata/sata_sil24.c 2010-12-31 14:46:53.000000000 -0500
6522 +diff -urNp linux-2.6.32.33/drivers/ata/sata_sil24.c linux-2.6.32.33/drivers/ata/sata_sil24.c
6523 +--- linux-2.6.32.33/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
6524 ++++ linux-2.6.32.33/drivers/ata/sata_sil24.c 2010-12-31 14:46:53.000000000 -0500
6525 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
6526 .dma_boundary = ATA_DMA_BOUNDARY,
6527 };
6528 @@ -22714,9 +22837,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_sil24.c linux-2.6.32.32/drivers/ata/
6529 .inherits = &sata_pmp_port_ops,
6530
6531 .qc_defer = sil24_qc_defer,
6532 -diff -urNp linux-2.6.32.32/drivers/ata/sata_sil.c linux-2.6.32.32/drivers/ata/sata_sil.c
6533 ---- linux-2.6.32.32/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
6534 -+++ linux-2.6.32.32/drivers/ata/sata_sil.c 2010-12-31 14:46:53.000000000 -0500
6535 +diff -urNp linux-2.6.32.33/drivers/ata/sata_sil.c linux-2.6.32.33/drivers/ata/sata_sil.c
6536 +--- linux-2.6.32.33/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
6537 ++++ linux-2.6.32.33/drivers/ata/sata_sil.c 2010-12-31 14:46:53.000000000 -0500
6538 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
6539 .sg_tablesize = ATA_MAX_PRD
6540 };
6541 @@ -22726,9 +22849,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_sil.c linux-2.6.32.32/drivers/ata/sa
6542 .inherits = &ata_bmdma32_port_ops,
6543 .dev_config = sil_dev_config,
6544 .set_mode = sil_set_mode,
6545 -diff -urNp linux-2.6.32.32/drivers/ata/sata_sis.c linux-2.6.32.32/drivers/ata/sata_sis.c
6546 ---- linux-2.6.32.32/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
6547 -+++ linux-2.6.32.32/drivers/ata/sata_sis.c 2010-12-31 14:46:53.000000000 -0500
6548 +diff -urNp linux-2.6.32.33/drivers/ata/sata_sis.c linux-2.6.32.33/drivers/ata/sata_sis.c
6549 +--- linux-2.6.32.33/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
6550 ++++ linux-2.6.32.33/drivers/ata/sata_sis.c 2010-12-31 14:46:53.000000000 -0500
6551 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
6552 ATA_BMDMA_SHT(DRV_NAME),
6553 };
6554 @@ -22738,9 +22861,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_sis.c linux-2.6.32.32/drivers/ata/sa
6555 .inherits = &ata_bmdma_port_ops,
6556 .scr_read = sis_scr_read,
6557 .scr_write = sis_scr_write,
6558 -diff -urNp linux-2.6.32.32/drivers/ata/sata_svw.c linux-2.6.32.32/drivers/ata/sata_svw.c
6559 ---- linux-2.6.32.32/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
6560 -+++ linux-2.6.32.32/drivers/ata/sata_svw.c 2010-12-31 14:46:53.000000000 -0500
6561 +diff -urNp linux-2.6.32.33/drivers/ata/sata_svw.c linux-2.6.32.33/drivers/ata/sata_svw.c
6562 +--- linux-2.6.32.33/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
6563 ++++ linux-2.6.32.33/drivers/ata/sata_svw.c 2010-12-31 14:46:53.000000000 -0500
6564 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
6565 };
6566
6567 @@ -22750,9 +22873,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_svw.c linux-2.6.32.32/drivers/ata/sa
6568 .inherits = &ata_bmdma_port_ops,
6569 .sff_tf_load = k2_sata_tf_load,
6570 .sff_tf_read = k2_sata_tf_read,
6571 -diff -urNp linux-2.6.32.32/drivers/ata/sata_sx4.c linux-2.6.32.32/drivers/ata/sata_sx4.c
6572 ---- linux-2.6.32.32/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
6573 -+++ linux-2.6.32.32/drivers/ata/sata_sx4.c 2010-12-31 14:46:53.000000000 -0500
6574 +diff -urNp linux-2.6.32.33/drivers/ata/sata_sx4.c linux-2.6.32.33/drivers/ata/sata_sx4.c
6575 +--- linux-2.6.32.33/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
6576 ++++ linux-2.6.32.33/drivers/ata/sata_sx4.c 2010-12-31 14:46:53.000000000 -0500
6577 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
6578 };
6579
6580 @@ -22762,9 +22885,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_sx4.c linux-2.6.32.32/drivers/ata/sa
6581 .inherits = &ata_sff_port_ops,
6582
6583 .check_atapi_dma = pdc_check_atapi_dma,
6584 -diff -urNp linux-2.6.32.32/drivers/ata/sata_uli.c linux-2.6.32.32/drivers/ata/sata_uli.c
6585 ---- linux-2.6.32.32/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
6586 -+++ linux-2.6.32.32/drivers/ata/sata_uli.c 2010-12-31 14:46:53.000000000 -0500
6587 +diff -urNp linux-2.6.32.33/drivers/ata/sata_uli.c linux-2.6.32.33/drivers/ata/sata_uli.c
6588 +--- linux-2.6.32.33/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
6589 ++++ linux-2.6.32.33/drivers/ata/sata_uli.c 2010-12-31 14:46:53.000000000 -0500
6590 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
6591 ATA_BMDMA_SHT(DRV_NAME),
6592 };
6593 @@ -22774,9 +22897,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_uli.c linux-2.6.32.32/drivers/ata/sa
6594 .inherits = &ata_bmdma_port_ops,
6595 .scr_read = uli_scr_read,
6596 .scr_write = uli_scr_write,
6597 -diff -urNp linux-2.6.32.32/drivers/ata/sata_via.c linux-2.6.32.32/drivers/ata/sata_via.c
6598 ---- linux-2.6.32.32/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
6599 -+++ linux-2.6.32.32/drivers/ata/sata_via.c 2010-12-31 14:46:53.000000000 -0500
6600 +diff -urNp linux-2.6.32.33/drivers/ata/sata_via.c linux-2.6.32.33/drivers/ata/sata_via.c
6601 +--- linux-2.6.32.33/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
6602 ++++ linux-2.6.32.33/drivers/ata/sata_via.c 2010-12-31 14:46:53.000000000 -0500
6603 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
6604 ATA_BMDMA_SHT(DRV_NAME),
6605 };
6606 @@ -22814,9 +22937,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_via.c linux-2.6.32.32/drivers/ata/sa
6607 .inherits = &svia_base_ops,
6608 .hardreset = sata_std_hardreset,
6609 .scr_read = vt8251_scr_read,
6610 -diff -urNp linux-2.6.32.32/drivers/ata/sata_vsc.c linux-2.6.32.32/drivers/ata/sata_vsc.c
6611 ---- linux-2.6.32.32/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
6612 -+++ linux-2.6.32.32/drivers/ata/sata_vsc.c 2010-12-31 14:46:53.000000000 -0500
6613 +diff -urNp linux-2.6.32.33/drivers/ata/sata_vsc.c linux-2.6.32.33/drivers/ata/sata_vsc.c
6614 +--- linux-2.6.32.33/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
6615 ++++ linux-2.6.32.33/drivers/ata/sata_vsc.c 2010-12-31 14:46:53.000000000 -0500
6616 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
6617 };
6618
6619 @@ -22826,9 +22949,9 @@ diff -urNp linux-2.6.32.32/drivers/ata/sata_vsc.c linux-2.6.32.32/drivers/ata/sa
6620 .inherits = &ata_bmdma_port_ops,
6621 /* The IRQ handling is not quite standard SFF behaviour so we
6622 cannot use the default lost interrupt handler */
6623 -diff -urNp linux-2.6.32.32/drivers/atm/adummy.c linux-2.6.32.32/drivers/atm/adummy.c
6624 ---- linux-2.6.32.32/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
6625 -+++ linux-2.6.32.32/drivers/atm/adummy.c 2010-12-31 14:46:53.000000000 -0500
6626 +diff -urNp linux-2.6.32.33/drivers/atm/adummy.c linux-2.6.32.33/drivers/atm/adummy.c
6627 +--- linux-2.6.32.33/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
6628 ++++ linux-2.6.32.33/drivers/atm/adummy.c 2010-12-31 14:46:53.000000000 -0500
6629 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
6630 vcc->pop(vcc, skb);
6631 else
6632 @@ -22838,9 +22961,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/adummy.c linux-2.6.32.32/drivers/atm/adum
6633
6634 return 0;
6635 }
6636 -diff -urNp linux-2.6.32.32/drivers/atm/ambassador.c linux-2.6.32.32/drivers/atm/ambassador.c
6637 ---- linux-2.6.32.32/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
6638 -+++ linux-2.6.32.32/drivers/atm/ambassador.c 2010-12-31 14:46:53.000000000 -0500
6639 +diff -urNp linux-2.6.32.33/drivers/atm/ambassador.c linux-2.6.32.33/drivers/atm/ambassador.c
6640 +--- linux-2.6.32.33/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
6641 ++++ linux-2.6.32.33/drivers/atm/ambassador.c 2010-12-31 14:46:53.000000000 -0500
6642 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
6643 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
6644
6645 @@ -22877,9 +23000,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/ambassador.c linux-2.6.32.32/drivers/atm/
6646 return -ENOMEM; // ?
6647 }
6648
6649 -diff -urNp linux-2.6.32.32/drivers/atm/atmtcp.c linux-2.6.32.32/drivers/atm/atmtcp.c
6650 ---- linux-2.6.32.32/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
6651 -+++ linux-2.6.32.32/drivers/atm/atmtcp.c 2010-12-31 14:46:53.000000000 -0500
6652 +diff -urNp linux-2.6.32.33/drivers/atm/atmtcp.c linux-2.6.32.33/drivers/atm/atmtcp.c
6653 +--- linux-2.6.32.33/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
6654 ++++ linux-2.6.32.33/drivers/atm/atmtcp.c 2010-12-31 14:46:53.000000000 -0500
6655 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
6656 if (vcc->pop) vcc->pop(vcc,skb);
6657 else dev_kfree_skb(skb);
6658 @@ -22929,9 +23052,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/atmtcp.c linux-2.6.32.32/drivers/atm/atmt
6659 done:
6660 if (vcc->pop) vcc->pop(vcc,skb);
6661 else dev_kfree_skb(skb);
6662 -diff -urNp linux-2.6.32.32/drivers/atm/eni.c linux-2.6.32.32/drivers/atm/eni.c
6663 ---- linux-2.6.32.32/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
6664 -+++ linux-2.6.32.32/drivers/atm/eni.c 2010-12-31 14:46:53.000000000 -0500
6665 +diff -urNp linux-2.6.32.33/drivers/atm/eni.c linux-2.6.32.33/drivers/atm/eni.c
6666 +--- linux-2.6.32.33/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
6667 ++++ linux-2.6.32.33/drivers/atm/eni.c 2010-12-31 14:46:53.000000000 -0500
6668 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
6669 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
6670 vcc->dev->number);
6671 @@ -22977,9 +23100,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/eni.c linux-2.6.32.32/drivers/atm/eni.c
6672 wake_up(&eni_dev->tx_wait);
6673 dma_complete++;
6674 }
6675 -diff -urNp linux-2.6.32.32/drivers/atm/firestream.c linux-2.6.32.32/drivers/atm/firestream.c
6676 ---- linux-2.6.32.32/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
6677 -+++ linux-2.6.32.32/drivers/atm/firestream.c 2010-12-31 14:46:53.000000000 -0500
6678 +diff -urNp linux-2.6.32.33/drivers/atm/firestream.c linux-2.6.32.33/drivers/atm/firestream.c
6679 +--- linux-2.6.32.33/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
6680 ++++ linux-2.6.32.33/drivers/atm/firestream.c 2010-12-31 14:46:53.000000000 -0500
6681 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct
6682 }
6683 }
6684 @@ -23013,9 +23136,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/firestream.c linux-2.6.32.32/drivers/atm/
6685 break;
6686 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
6687 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
6688 -diff -urNp linux-2.6.32.32/drivers/atm/fore200e.c linux-2.6.32.32/drivers/atm/fore200e.c
6689 ---- linux-2.6.32.32/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
6690 -+++ linux-2.6.32.32/drivers/atm/fore200e.c 2010-12-31 14:46:53.000000000 -0500
6691 +diff -urNp linux-2.6.32.33/drivers/atm/fore200e.c linux-2.6.32.33/drivers/atm/fore200e.c
6692 +--- linux-2.6.32.33/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
6693 ++++ linux-2.6.32.33/drivers/atm/fore200e.c 2010-12-31 14:46:53.000000000 -0500
6694 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
6695 #endif
6696 /* check error condition */
6697 @@ -23072,9 +23195,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/fore200e.c linux-2.6.32.32/drivers/atm/fo
6698
6699 fore200e->tx_sat++;
6700 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
6701 -diff -urNp linux-2.6.32.32/drivers/atm/he.c linux-2.6.32.32/drivers/atm/he.c
6702 ---- linux-2.6.32.32/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
6703 -+++ linux-2.6.32.32/drivers/atm/he.c 2010-12-31 14:46:53.000000000 -0500
6704 +diff -urNp linux-2.6.32.33/drivers/atm/he.c linux-2.6.32.33/drivers/atm/he.c
6705 +--- linux-2.6.32.33/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
6706 ++++ linux-2.6.32.33/drivers/atm/he.c 2010-12-31 14:46:53.000000000 -0500
6707 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
6708
6709 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
6710 @@ -23156,9 +23279,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/he.c linux-2.6.32.32/drivers/atm/he.c
6711
6712 return 0;
6713 }
6714 -diff -urNp linux-2.6.32.32/drivers/atm/horizon.c linux-2.6.32.32/drivers/atm/horizon.c
6715 ---- linux-2.6.32.32/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
6716 -+++ linux-2.6.32.32/drivers/atm/horizon.c 2010-12-31 14:46:53.000000000 -0500
6717 +diff -urNp linux-2.6.32.33/drivers/atm/horizon.c linux-2.6.32.33/drivers/atm/horizon.c
6718 +--- linux-2.6.32.33/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
6719 ++++ linux-2.6.32.33/drivers/atm/horizon.c 2010-12-31 14:46:53.000000000 -0500
6720 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
6721 {
6722 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
6723 @@ -23177,9 +23300,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/horizon.c linux-2.6.32.32/drivers/atm/hor
6724
6725 // free the skb
6726 hrz_kfree_skb (skb);
6727 -diff -urNp linux-2.6.32.32/drivers/atm/idt77252.c linux-2.6.32.32/drivers/atm/idt77252.c
6728 ---- linux-2.6.32.32/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
6729 -+++ linux-2.6.32.32/drivers/atm/idt77252.c 2010-12-31 14:46:53.000000000 -0500
6730 +diff -urNp linux-2.6.32.33/drivers/atm/idt77252.c linux-2.6.32.33/drivers/atm/idt77252.c
6731 +--- linux-2.6.32.33/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
6732 ++++ linux-2.6.32.33/drivers/atm/idt77252.c 2010-12-31 14:46:53.000000000 -0500
6733 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
6734 else
6735 dev_kfree_skb(skb);
6736 @@ -23334,9 +23457,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/idt77252.c linux-2.6.32.32/drivers/atm/id
6737 return -ENOMEM;
6738 }
6739 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
6740 -diff -urNp linux-2.6.32.32/drivers/atm/iphase.c linux-2.6.32.32/drivers/atm/iphase.c
6741 ---- linux-2.6.32.32/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
6742 -+++ linux-2.6.32.32/drivers/atm/iphase.c 2010-12-31 14:46:53.000000000 -0500
6743 +diff -urNp linux-2.6.32.33/drivers/atm/iphase.c linux-2.6.32.33/drivers/atm/iphase.c
6744 +--- linux-2.6.32.33/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
6745 ++++ linux-2.6.32.33/drivers/atm/iphase.c 2010-12-31 14:46:53.000000000 -0500
6746 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
6747 status = (u_short) (buf_desc_ptr->desc_mode);
6748 if (status & (RX_CER | RX_PTE | RX_OFL))
6749 @@ -23433,9 +23556,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/iphase.c linux-2.6.32.32/drivers/atm/ipha
6750 if (iavcc->vc_desc_cnt > 10) {
6751 vcc->tx_quota = vcc->tx_quota * 3 / 4;
6752 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
6753 -diff -urNp linux-2.6.32.32/drivers/atm/lanai.c linux-2.6.32.32/drivers/atm/lanai.c
6754 ---- linux-2.6.32.32/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
6755 -+++ linux-2.6.32.32/drivers/atm/lanai.c 2010-12-31 14:46:53.000000000 -0500
6756 +diff -urNp linux-2.6.32.33/drivers/atm/lanai.c linux-2.6.32.33/drivers/atm/lanai.c
6757 +--- linux-2.6.32.33/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
6758 ++++ linux-2.6.32.33/drivers/atm/lanai.c 2010-12-31 14:46:53.000000000 -0500
6759 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
6760 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
6761 lanai_endtx(lanai, lvcc);
6762 @@ -23490,9 +23613,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/lanai.c linux-2.6.32.32/drivers/atm/lanai
6763 lvcc->stats.x.aal5.service_rxcrc++;
6764 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
6765 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
6766 -diff -urNp linux-2.6.32.32/drivers/atm/nicstar.c linux-2.6.32.32/drivers/atm/nicstar.c
6767 ---- linux-2.6.32.32/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
6768 -+++ linux-2.6.32.32/drivers/atm/nicstar.c 2010-12-31 14:46:53.000000000 -0500
6769 +diff -urNp linux-2.6.32.33/drivers/atm/nicstar.c linux-2.6.32.33/drivers/atm/nicstar.c
6770 +--- linux-2.6.32.33/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
6771 ++++ linux-2.6.32.33/drivers/atm/nicstar.c 2010-12-31 14:46:53.000000000 -0500
6772 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
6773 if ((vc = (vc_map *) vcc->dev_data) == NULL)
6774 {
6775 @@ -23695,9 +23818,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/nicstar.c linux-2.6.32.32/drivers/atm/nic
6776 }
6777 }
6778
6779 -diff -urNp linux-2.6.32.32/drivers/atm/solos-pci.c linux-2.6.32.32/drivers/atm/solos-pci.c
6780 ---- linux-2.6.32.32/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
6781 -+++ linux-2.6.32.32/drivers/atm/solos-pci.c 2010-12-31 14:46:53.000000000 -0500
6782 +diff -urNp linux-2.6.32.33/drivers/atm/solos-pci.c linux-2.6.32.33/drivers/atm/solos-pci.c
6783 +--- linux-2.6.32.33/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
6784 ++++ linux-2.6.32.33/drivers/atm/solos-pci.c 2010-12-31 14:46:53.000000000 -0500
6785 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
6786 }
6787 atm_charge(vcc, skb->truesize);
6788 @@ -23716,9 +23839,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/solos-pci.c linux-2.6.32.32/drivers/atm/s
6789 solos_pop(vcc, oldskb);
6790 } else
6791 dev_kfree_skb_irq(oldskb);
6792 -diff -urNp linux-2.6.32.32/drivers/atm/suni.c linux-2.6.32.32/drivers/atm/suni.c
6793 ---- linux-2.6.32.32/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
6794 -+++ linux-2.6.32.32/drivers/atm/suni.c 2010-12-31 14:46:53.000000000 -0500
6795 +diff -urNp linux-2.6.32.33/drivers/atm/suni.c linux-2.6.32.33/drivers/atm/suni.c
6796 +--- linux-2.6.32.33/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
6797 ++++ linux-2.6.32.33/drivers/atm/suni.c 2010-12-31 14:46:53.000000000 -0500
6798 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
6799
6800
6801 @@ -23730,9 +23853,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/suni.c linux-2.6.32.32/drivers/atm/suni.c
6802
6803
6804 static void suni_hz(unsigned long from_timer)
6805 -diff -urNp linux-2.6.32.32/drivers/atm/uPD98402.c linux-2.6.32.32/drivers/atm/uPD98402.c
6806 ---- linux-2.6.32.32/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
6807 -+++ linux-2.6.32.32/drivers/atm/uPD98402.c 2010-12-31 14:46:53.000000000 -0500
6808 +diff -urNp linux-2.6.32.33/drivers/atm/uPD98402.c linux-2.6.32.33/drivers/atm/uPD98402.c
6809 +--- linux-2.6.32.33/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
6810 ++++ linux-2.6.32.33/drivers/atm/uPD98402.c 2010-12-31 14:46:53.000000000 -0500
6811 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
6812 struct sonet_stats tmp;
6813 int error = 0;
6814 @@ -23777,9 +23900,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/uPD98402.c linux-2.6.32.32/drivers/atm/uP
6815 return 0;
6816 }
6817
6818 -diff -urNp linux-2.6.32.32/drivers/atm/zatm.c linux-2.6.32.32/drivers/atm/zatm.c
6819 ---- linux-2.6.32.32/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
6820 -+++ linux-2.6.32.32/drivers/atm/zatm.c 2010-12-31 14:46:53.000000000 -0500
6821 +diff -urNp linux-2.6.32.33/drivers/atm/zatm.c linux-2.6.32.33/drivers/atm/zatm.c
6822 +--- linux-2.6.32.33/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
6823 ++++ linux-2.6.32.33/drivers/atm/zatm.c 2010-12-31 14:46:53.000000000 -0500
6824 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
6825 }
6826 if (!size) {
6827 @@ -23807,9 +23930,9 @@ diff -urNp linux-2.6.32.32/drivers/atm/zatm.c linux-2.6.32.32/drivers/atm/zatm.c
6828 wake_up(&zatm_vcc->tx_wait);
6829 }
6830
6831 -diff -urNp linux-2.6.32.32/drivers/base/bus.c linux-2.6.32.32/drivers/base/bus.c
6832 ---- linux-2.6.32.32/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
6833 -+++ linux-2.6.32.32/drivers/base/bus.c 2010-12-31 14:46:53.000000000 -0500
6834 +diff -urNp linux-2.6.32.33/drivers/base/bus.c linux-2.6.32.33/drivers/base/bus.c
6835 +--- linux-2.6.32.33/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
6836 ++++ linux-2.6.32.33/drivers/base/bus.c 2010-12-31 14:46:53.000000000 -0500
6837 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
6838 return ret;
6839 }
6840 @@ -23837,9 +23960,9 @@ diff -urNp linux-2.6.32.32/drivers/base/bus.c linux-2.6.32.32/drivers/base/bus.c
6841 .filter = bus_uevent_filter,
6842 };
6843
6844 -diff -urNp linux-2.6.32.32/drivers/base/class.c linux-2.6.32.32/drivers/base/class.c
6845 ---- linux-2.6.32.32/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
6846 -+++ linux-2.6.32.32/drivers/base/class.c 2010-12-31 14:46:53.000000000 -0500
6847 +diff -urNp linux-2.6.32.33/drivers/base/class.c linux-2.6.32.33/drivers/base/class.c
6848 +--- linux-2.6.32.33/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
6849 ++++ linux-2.6.32.33/drivers/base/class.c 2010-12-31 14:46:53.000000000 -0500
6850 @@ -63,7 +63,7 @@ static void class_release(struct kobject
6851 kfree(cp);
6852 }
6853 @@ -23849,9 +23972,9 @@ diff -urNp linux-2.6.32.32/drivers/base/class.c linux-2.6.32.32/drivers/base/cla
6854 .show = class_attr_show,
6855 .store = class_attr_store,
6856 };
6857 -diff -urNp linux-2.6.32.32/drivers/base/core.c linux-2.6.32.32/drivers/base/core.c
6858 ---- linux-2.6.32.32/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
6859 -+++ linux-2.6.32.32/drivers/base/core.c 2010-12-31 14:46:53.000000000 -0500
6860 +diff -urNp linux-2.6.32.33/drivers/base/core.c linux-2.6.32.33/drivers/base/core.c
6861 +--- linux-2.6.32.33/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
6862 ++++ linux-2.6.32.33/drivers/base/core.c 2010-12-31 14:46:53.000000000 -0500
6863 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
6864 return ret;
6865 }
6866 @@ -23870,9 +23993,9 @@ diff -urNp linux-2.6.32.32/drivers/base/core.c linux-2.6.32.32/drivers/base/core
6867 .filter = dev_uevent_filter,
6868 .name = dev_uevent_name,
6869 .uevent = dev_uevent,
6870 -diff -urNp linux-2.6.32.32/drivers/base/memory.c linux-2.6.32.32/drivers/base/memory.c
6871 ---- linux-2.6.32.32/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
6872 -+++ linux-2.6.32.32/drivers/base/memory.c 2010-12-31 14:46:53.000000000 -0500
6873 +diff -urNp linux-2.6.32.33/drivers/base/memory.c linux-2.6.32.33/drivers/base/memory.c
6874 +--- linux-2.6.32.33/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
6875 ++++ linux-2.6.32.33/drivers/base/memory.c 2010-12-31 14:46:53.000000000 -0500
6876 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
6877 return retval;
6878 }
6879 @@ -23882,9 +24005,9 @@ diff -urNp linux-2.6.32.32/drivers/base/memory.c linux-2.6.32.32/drivers/base/me
6880 .name = memory_uevent_name,
6881 .uevent = memory_uevent,
6882 };
6883 -diff -urNp linux-2.6.32.32/drivers/base/sys.c linux-2.6.32.32/drivers/base/sys.c
6884 ---- linux-2.6.32.32/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
6885 -+++ linux-2.6.32.32/drivers/base/sys.c 2010-12-31 14:46:53.000000000 -0500
6886 +diff -urNp linux-2.6.32.33/drivers/base/sys.c linux-2.6.32.33/drivers/base/sys.c
6887 +--- linux-2.6.32.33/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
6888 ++++ linux-2.6.32.33/drivers/base/sys.c 2010-12-31 14:46:53.000000000 -0500
6889 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
6890 return -EIO;
6891 }
6892 @@ -23903,9 +24026,9 @@ diff -urNp linux-2.6.32.32/drivers/base/sys.c linux-2.6.32.32/drivers/base/sys.c
6893 .show = sysdev_class_show,
6894 .store = sysdev_class_store,
6895 };
6896 -diff -urNp linux-2.6.32.32/drivers/block/cciss.c linux-2.6.32.32/drivers/block/cciss.c
6897 ---- linux-2.6.32.32/drivers/block/cciss.c 2010-08-13 16:24:37.000000000 -0400
6898 -+++ linux-2.6.32.32/drivers/block/cciss.c 2010-12-31 14:46:53.000000000 -0500
6899 +diff -urNp linux-2.6.32.33/drivers/block/cciss.c linux-2.6.32.33/drivers/block/cciss.c
6900 +--- linux-2.6.32.33/drivers/block/cciss.c 2010-08-13 16:24:37.000000000 -0400
6901 ++++ linux-2.6.32.33/drivers/block/cciss.c 2010-12-31 14:46:53.000000000 -0500
6902 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
6903 int err;
6904 u32 cp;
6905 @@ -23915,9 +24038,9 @@ diff -urNp linux-2.6.32.32/drivers/block/cciss.c linux-2.6.32.32/drivers/block/c
6906 err = 0;
6907 err |=
6908 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
6909 -diff -urNp linux-2.6.32.32/drivers/block/pktcdvd.c linux-2.6.32.32/drivers/block/pktcdvd.c
6910 ---- linux-2.6.32.32/drivers/block/pktcdvd.c 2011-03-02 17:24:54.000000000 -0500
6911 -+++ linux-2.6.32.32/drivers/block/pktcdvd.c 2010-12-31 14:46:53.000000000 -0500
6912 +diff -urNp linux-2.6.32.33/drivers/block/pktcdvd.c linux-2.6.32.33/drivers/block/pktcdvd.c
6913 +--- linux-2.6.32.33/drivers/block/pktcdvd.c 2011-03-02 17:24:54.000000000 -0500
6914 ++++ linux-2.6.32.33/drivers/block/pktcdvd.c 2010-12-31 14:46:53.000000000 -0500
6915 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
6916 return len;
6917 }
6918 @@ -23927,9 +24050,9 @@ diff -urNp linux-2.6.32.32/drivers/block/pktcdvd.c linux-2.6.32.32/drivers/block
6919 .show = kobj_pkt_show,
6920 .store = kobj_pkt_store
6921 };
6922 -diff -urNp linux-2.6.32.32/drivers/char/agp/frontend.c linux-2.6.32.32/drivers/char/agp/frontend.c
6923 ---- linux-2.6.32.32/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
6924 -+++ linux-2.6.32.32/drivers/char/agp/frontend.c 2010-12-31 14:46:53.000000000 -0500
6925 +diff -urNp linux-2.6.32.33/drivers/char/agp/frontend.c linux-2.6.32.33/drivers/char/agp/frontend.c
6926 +--- linux-2.6.32.33/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
6927 ++++ linux-2.6.32.33/drivers/char/agp/frontend.c 2010-12-31 14:46:53.000000000 -0500
6928 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
6929 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
6930 return -EFAULT;
6931 @@ -23939,9 +24062,9 @@ diff -urNp linux-2.6.32.32/drivers/char/agp/frontend.c linux-2.6.32.32/drivers/c
6932 return -EFAULT;
6933
6934 client = agp_find_client_by_pid(reserve.pid);
6935 -diff -urNp linux-2.6.32.32/drivers/char/agp/intel-agp.c linux-2.6.32.32/drivers/char/agp/intel-agp.c
6936 ---- linux-2.6.32.32/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
6937 -+++ linux-2.6.32.32/drivers/char/agp/intel-agp.c 2010-12-31 14:46:53.000000000 -0500
6938 +diff -urNp linux-2.6.32.33/drivers/char/agp/intel-agp.c linux-2.6.32.33/drivers/char/agp/intel-agp.c
6939 +--- linux-2.6.32.33/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
6940 ++++ linux-2.6.32.33/drivers/char/agp/intel-agp.c 2010-12-31 14:46:53.000000000 -0500
6941 @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
6942 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
6943 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
6944 @@ -23951,9 +24074,9 @@ diff -urNp linux-2.6.32.32/drivers/char/agp/intel-agp.c linux-2.6.32.32/drivers/
6945 };
6946
6947 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
6948 -diff -urNp linux-2.6.32.32/drivers/char/hpet.c linux-2.6.32.32/drivers/char/hpet.c
6949 ---- linux-2.6.32.32/drivers/char/hpet.c 2010-12-09 18:13:03.000000000 -0500
6950 -+++ linux-2.6.32.32/drivers/char/hpet.c 2010-12-31 14:46:53.000000000 -0500
6951 +diff -urNp linux-2.6.32.33/drivers/char/hpet.c linux-2.6.32.33/drivers/char/hpet.c
6952 +--- linux-2.6.32.33/drivers/char/hpet.c 2010-12-09 18:13:03.000000000 -0500
6953 ++++ linux-2.6.32.33/drivers/char/hpet.c 2010-12-31 14:46:53.000000000 -0500
6954 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
6955 return 0;
6956 }
6957 @@ -23995,9 +24118,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hpet.c linux-2.6.32.32/drivers/char/hpet
6958
6959 static int __init hpet_init(void)
6960 {
6961 -diff -urNp linux-2.6.32.32/drivers/char/hvc_beat.c linux-2.6.32.32/drivers/char/hvc_beat.c
6962 ---- linux-2.6.32.32/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
6963 -+++ linux-2.6.32.32/drivers/char/hvc_beat.c 2010-12-31 14:46:53.000000000 -0500
6964 +diff -urNp linux-2.6.32.33/drivers/char/hvc_beat.c linux-2.6.32.33/drivers/char/hvc_beat.c
6965 +--- linux-2.6.32.33/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
6966 ++++ linux-2.6.32.33/drivers/char/hvc_beat.c 2010-12-31 14:46:53.000000000 -0500
6967 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
6968 return cnt;
6969 }
6970 @@ -24007,9 +24130,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_beat.c linux-2.6.32.32/drivers/char/
6971 .get_chars = hvc_beat_get_chars,
6972 .put_chars = hvc_beat_put_chars,
6973 };
6974 -diff -urNp linux-2.6.32.32/drivers/char/hvc_console.c linux-2.6.32.32/drivers/char/hvc_console.c
6975 ---- linux-2.6.32.32/drivers/char/hvc_console.c 2011-01-11 23:55:35.000000000 -0500
6976 -+++ linux-2.6.32.32/drivers/char/hvc_console.c 2011-01-11 23:56:03.000000000 -0500
6977 +diff -urNp linux-2.6.32.33/drivers/char/hvc_console.c linux-2.6.32.33/drivers/char/hvc_console.c
6978 +--- linux-2.6.32.33/drivers/char/hvc_console.c 2011-01-11 23:55:35.000000000 -0500
6979 ++++ linux-2.6.32.33/drivers/char/hvc_console.c 2011-01-11 23:56:03.000000000 -0500
6980 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
6981 * console interfaces but can still be used as a tty device. This has to be
6982 * static because kmalloc will not work during early console init.
6983 @@ -24037,9 +24160,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_console.c linux-2.6.32.32/drivers/ch
6984 {
6985 struct hvc_struct *hp;
6986 int i;
6987 -diff -urNp linux-2.6.32.32/drivers/char/hvc_console.h linux-2.6.32.32/drivers/char/hvc_console.h
6988 ---- linux-2.6.32.32/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
6989 -+++ linux-2.6.32.32/drivers/char/hvc_console.h 2010-12-31 14:46:53.000000000 -0500
6990 +diff -urNp linux-2.6.32.33/drivers/char/hvc_console.h linux-2.6.32.33/drivers/char/hvc_console.h
6991 +--- linux-2.6.32.33/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
6992 ++++ linux-2.6.32.33/drivers/char/hvc_console.h 2010-12-31 14:46:53.000000000 -0500
6993 @@ -55,7 +55,7 @@ struct hvc_struct {
6994 int outbuf_size;
6995 int n_outbuf;
6996 @@ -24063,9 +24186,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_console.h linux-2.6.32.32/drivers/ch
6997 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
6998 extern int hvc_remove(struct hvc_struct *hp);
6999
7000 -diff -urNp linux-2.6.32.32/drivers/char/hvc_iseries.c linux-2.6.32.32/drivers/char/hvc_iseries.c
7001 ---- linux-2.6.32.32/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
7002 -+++ linux-2.6.32.32/drivers/char/hvc_iseries.c 2010-12-31 14:46:53.000000000 -0500
7003 +diff -urNp linux-2.6.32.33/drivers/char/hvc_iseries.c linux-2.6.32.33/drivers/char/hvc_iseries.c
7004 +--- linux-2.6.32.33/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
7005 ++++ linux-2.6.32.33/drivers/char/hvc_iseries.c 2010-12-31 14:46:53.000000000 -0500
7006 @@ -197,7 +197,7 @@ done:
7007 return sent;
7008 }
7009 @@ -24075,9 +24198,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_iseries.c linux-2.6.32.32/drivers/ch
7010 .get_chars = get_chars,
7011 .put_chars = put_chars,
7012 .notifier_add = notifier_add_irq,
7013 -diff -urNp linux-2.6.32.32/drivers/char/hvc_iucv.c linux-2.6.32.32/drivers/char/hvc_iucv.c
7014 ---- linux-2.6.32.32/drivers/char/hvc_iucv.c 2011-02-22 15:56:54.000000000 -0500
7015 -+++ linux-2.6.32.32/drivers/char/hvc_iucv.c 2011-02-22 15:57:23.000000000 -0500
7016 +diff -urNp linux-2.6.32.33/drivers/char/hvc_iucv.c linux-2.6.32.33/drivers/char/hvc_iucv.c
7017 +--- linux-2.6.32.33/drivers/char/hvc_iucv.c 2011-02-22 15:56:54.000000000 -0500
7018 ++++ linux-2.6.32.33/drivers/char/hvc_iucv.c 2011-02-22 15:57:23.000000000 -0500
7019 @@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru
7020
7021
7022 @@ -24087,9 +24210,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_iucv.c linux-2.6.32.32/drivers/char/
7023 .get_chars = hvc_iucv_get_chars,
7024 .put_chars = hvc_iucv_put_chars,
7025 .notifier_add = hvc_iucv_notifier_add,
7026 -diff -urNp linux-2.6.32.32/drivers/char/hvc_rtas.c linux-2.6.32.32/drivers/char/hvc_rtas.c
7027 ---- linux-2.6.32.32/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
7028 -+++ linux-2.6.32.32/drivers/char/hvc_rtas.c 2010-12-31 14:46:53.000000000 -0500
7029 +diff -urNp linux-2.6.32.33/drivers/char/hvc_rtas.c linux-2.6.32.33/drivers/char/hvc_rtas.c
7030 +--- linux-2.6.32.33/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
7031 ++++ linux-2.6.32.33/drivers/char/hvc_rtas.c 2010-12-31 14:46:53.000000000 -0500
7032 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
7033 return i;
7034 }
7035 @@ -24099,9 +24222,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_rtas.c linux-2.6.32.32/drivers/char/
7036 .get_chars = hvc_rtas_read_console,
7037 .put_chars = hvc_rtas_write_console,
7038 };
7039 -diff -urNp linux-2.6.32.32/drivers/char/hvcs.c linux-2.6.32.32/drivers/char/hvcs.c
7040 ---- linux-2.6.32.32/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
7041 -+++ linux-2.6.32.32/drivers/char/hvcs.c 2011-01-25 20:24:47.000000000 -0500
7042 +diff -urNp linux-2.6.32.33/drivers/char/hvcs.c linux-2.6.32.33/drivers/char/hvcs.c
7043 +--- linux-2.6.32.33/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
7044 ++++ linux-2.6.32.33/drivers/char/hvcs.c 2011-01-25 20:24:47.000000000 -0500
7045 @@ -82,6 +82,7 @@
7046 #include <asm/hvcserver.h>
7047 #include <asm/uaccess.h>
7048 @@ -24204,9 +24327,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvcs.c linux-2.6.32.32/drivers/char/hvcs
7049 return 0;
7050
7051 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
7052 -diff -urNp linux-2.6.32.32/drivers/char/hvc_udbg.c linux-2.6.32.32/drivers/char/hvc_udbg.c
7053 ---- linux-2.6.32.32/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
7054 -+++ linux-2.6.32.32/drivers/char/hvc_udbg.c 2010-12-31 14:46:53.000000000 -0500
7055 +diff -urNp linux-2.6.32.33/drivers/char/hvc_udbg.c linux-2.6.32.33/drivers/char/hvc_udbg.c
7056 +--- linux-2.6.32.33/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
7057 ++++ linux-2.6.32.33/drivers/char/hvc_udbg.c 2010-12-31 14:46:53.000000000 -0500
7058 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
7059 return i;
7060 }
7061 @@ -24216,9 +24339,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_udbg.c linux-2.6.32.32/drivers/char/
7062 .get_chars = hvc_udbg_get,
7063 .put_chars = hvc_udbg_put,
7064 };
7065 -diff -urNp linux-2.6.32.32/drivers/char/hvc_vio.c linux-2.6.32.32/drivers/char/hvc_vio.c
7066 ---- linux-2.6.32.32/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
7067 -+++ linux-2.6.32.32/drivers/char/hvc_vio.c 2010-12-31 14:46:53.000000000 -0500
7068 +diff -urNp linux-2.6.32.33/drivers/char/hvc_vio.c linux-2.6.32.33/drivers/char/hvc_vio.c
7069 +--- linux-2.6.32.33/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
7070 ++++ linux-2.6.32.33/drivers/char/hvc_vio.c 2010-12-31 14:46:53.000000000 -0500
7071 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
7072 return got;
7073 }
7074 @@ -24228,9 +24351,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_vio.c linux-2.6.32.32/drivers/char/h
7075 .get_chars = filtered_get_chars,
7076 .put_chars = hvc_put_chars,
7077 .notifier_add = notifier_add_irq,
7078 -diff -urNp linux-2.6.32.32/drivers/char/hvc_xen.c linux-2.6.32.32/drivers/char/hvc_xen.c
7079 ---- linux-2.6.32.32/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
7080 -+++ linux-2.6.32.32/drivers/char/hvc_xen.c 2010-12-31 14:46:53.000000000 -0500
7081 +diff -urNp linux-2.6.32.33/drivers/char/hvc_xen.c linux-2.6.32.33/drivers/char/hvc_xen.c
7082 +--- linux-2.6.32.33/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
7083 ++++ linux-2.6.32.33/drivers/char/hvc_xen.c 2010-12-31 14:46:53.000000000 -0500
7084 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
7085 return recv;
7086 }
7087 @@ -24240,9 +24363,9 @@ diff -urNp linux-2.6.32.32/drivers/char/hvc_xen.c linux-2.6.32.32/drivers/char/h
7088 .get_chars = read_console,
7089 .put_chars = write_console,
7090 .notifier_add = notifier_add_irq,
7091 -diff -urNp linux-2.6.32.32/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.32/drivers/char/ipmi/ipmi_msghandler.c
7092 ---- linux-2.6.32.32/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
7093 -+++ linux-2.6.32.32/drivers/char/ipmi/ipmi_msghandler.c 2010-12-31 14:46:53.000000000 -0500
7094 +diff -urNp linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c
7095 +--- linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
7096 ++++ linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c 2010-12-31 14:46:53.000000000 -0500
7097 @@ -414,7 +414,7 @@ struct ipmi_smi {
7098 struct proc_dir_entry *proc_dir;
7099 char proc_dir_name[10];
7100 @@ -24273,9 +24396,9 @@ diff -urNp linux-2.6.32.32/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.32/d
7101
7102 intf->proc_dir = NULL;
7103
7104 -diff -urNp linux-2.6.32.32/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.32/drivers/char/ipmi/ipmi_si_intf.c
7105 ---- linux-2.6.32.32/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
7106 -+++ linux-2.6.32.32/drivers/char/ipmi/ipmi_si_intf.c 2010-12-31 14:46:53.000000000 -0500
7107 +diff -urNp linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c
7108 +--- linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
7109 ++++ linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c 2010-12-31 14:46:53.000000000 -0500
7110 @@ -277,7 +277,7 @@ struct smi_info {
7111 unsigned char slave_addr;
7112
7113 @@ -24306,9 +24429,9 @@ diff -urNp linux-2.6.32.32/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.32/driv
7114
7115 new_smi->interrupt_disabled = 0;
7116 atomic_set(&new_smi->stop_operation, 0);
7117 -diff -urNp linux-2.6.32.32/drivers/char/keyboard.c linux-2.6.32.32/drivers/char/keyboard.c
7118 ---- linux-2.6.32.32/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
7119 -+++ linux-2.6.32.32/drivers/char/keyboard.c 2010-12-31 14:46:53.000000000 -0500
7120 +diff -urNp linux-2.6.32.33/drivers/char/keyboard.c linux-2.6.32.33/drivers/char/keyboard.c
7121 +--- linux-2.6.32.33/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
7122 ++++ linux-2.6.32.33/drivers/char/keyboard.c 2010-12-31 14:46:53.000000000 -0500
7123 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
7124 kbd->kbdmode == VC_MEDIUMRAW) &&
7125 value != KVAL(K_SAK))
7126 @@ -24335,9 +24458,9 @@ diff -urNp linux-2.6.32.32/drivers/char/keyboard.c linux-2.6.32.32/drivers/char/
7127 };
7128
7129 MODULE_DEVICE_TABLE(input, kbd_ids);
7130 -diff -urNp linux-2.6.32.32/drivers/char/mem.c linux-2.6.32.32/drivers/char/mem.c
7131 ---- linux-2.6.32.32/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
7132 -+++ linux-2.6.32.32/drivers/char/mem.c 2010-12-31 14:46:53.000000000 -0500
7133 +diff -urNp linux-2.6.32.33/drivers/char/mem.c linux-2.6.32.33/drivers/char/mem.c
7134 +--- linux-2.6.32.33/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
7135 ++++ linux-2.6.32.33/drivers/char/mem.c 2010-12-31 14:46:53.000000000 -0500
7136 @@ -18,6 +18,7 @@
7137 #include <linux/raw.h>
7138 #include <linux/tty.h>
7139 @@ -24514,9 +24637,9 @@ diff -urNp linux-2.6.32.32/drivers/char/mem.c linux-2.6.32.32/drivers/char/mem.c
7140 };
7141
7142 static int memory_open(struct inode *inode, struct file *filp)
7143 -diff -urNp linux-2.6.32.32/drivers/char/nvram.c linux-2.6.32.32/drivers/char/nvram.c
7144 ---- linux-2.6.32.32/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
7145 -+++ linux-2.6.32.32/drivers/char/nvram.c 2010-12-31 14:46:53.000000000 -0500
7146 +diff -urNp linux-2.6.32.33/drivers/char/nvram.c linux-2.6.32.33/drivers/char/nvram.c
7147 +--- linux-2.6.32.33/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
7148 ++++ linux-2.6.32.33/drivers/char/nvram.c 2010-12-31 14:46:53.000000000 -0500
7149 @@ -435,7 +435,10 @@ static const struct file_operations nvra
7150 static struct miscdevice nvram_dev = {
7151 NVRAM_MINOR,
7152 @@ -24529,9 +24652,9 @@ diff -urNp linux-2.6.32.32/drivers/char/nvram.c linux-2.6.32.32/drivers/char/nvr
7153 };
7154
7155 static int __init nvram_init(void)
7156 -diff -urNp linux-2.6.32.32/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.32/drivers/char/pcmcia/ipwireless/tty.c
7157 ---- linux-2.6.32.32/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
7158 -+++ linux-2.6.32.32/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:47.000000000 -0500
7159 +diff -urNp linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c
7160 +--- linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
7161 ++++ linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:47.000000000 -0500
7162 @@ -29,6 +29,7 @@
7163 #include <linux/tty_driver.h>
7164 #include <linux/tty_flip.h>
7165 @@ -24654,9 +24777,9 @@ diff -urNp linux-2.6.32.32/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.32/
7166 do_ipw_close(ttyj);
7167 ipwireless_disassociate_network_ttys(network,
7168 ttyj->channel_idx);
7169 -diff -urNp linux-2.6.32.32/drivers/char/pty.c linux-2.6.32.32/drivers/char/pty.c
7170 ---- linux-2.6.32.32/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
7171 -+++ linux-2.6.32.32/drivers/char/pty.c 2010-12-31 14:46:53.000000000 -0500
7172 +diff -urNp linux-2.6.32.33/drivers/char/pty.c linux-2.6.32.33/drivers/char/pty.c
7173 +--- linux-2.6.32.33/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
7174 ++++ linux-2.6.32.33/drivers/char/pty.c 2010-12-31 14:46:53.000000000 -0500
7175 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
7176 return ret;
7177 }
7178 @@ -24687,9 +24810,9 @@ diff -urNp linux-2.6.32.32/drivers/char/pty.c linux-2.6.32.32/drivers/char/pty.c
7179 cdev_init(&ptmx_cdev, &ptmx_fops);
7180 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
7181 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
7182 -diff -urNp linux-2.6.32.32/drivers/char/random.c linux-2.6.32.32/drivers/char/random.c
7183 ---- linux-2.6.32.32/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
7184 -+++ linux-2.6.32.32/drivers/char/random.c 2010-12-31 14:46:53.000000000 -0500
7185 +diff -urNp linux-2.6.32.33/drivers/char/random.c linux-2.6.32.33/drivers/char/random.c
7186 +--- linux-2.6.32.33/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
7187 ++++ linux-2.6.32.33/drivers/char/random.c 2010-12-31 14:46:53.000000000 -0500
7188 @@ -254,8 +254,13 @@
7189 /*
7190 * Configuration information
7191 @@ -24731,9 +24854,9 @@ diff -urNp linux-2.6.32.32/drivers/char/random.c linux-2.6.32.32/drivers/char/ra
7192 static int max_write_thresh = INPUT_POOL_WORDS * 32;
7193 static char sysctl_bootid[16];
7194
7195 -diff -urNp linux-2.6.32.32/drivers/char/sonypi.c linux-2.6.32.32/drivers/char/sonypi.c
7196 ---- linux-2.6.32.32/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
7197 -+++ linux-2.6.32.32/drivers/char/sonypi.c 2011-01-25 20:24:47.000000000 -0500
7198 +diff -urNp linux-2.6.32.33/drivers/char/sonypi.c linux-2.6.32.33/drivers/char/sonypi.c
7199 +--- linux-2.6.32.33/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
7200 ++++ linux-2.6.32.33/drivers/char/sonypi.c 2011-01-25 20:24:47.000000000 -0500
7201 @@ -55,6 +55,7 @@
7202 #include <asm/uaccess.h>
7203 #include <asm/io.h>
7204 @@ -24772,9 +24895,9 @@ diff -urNp linux-2.6.32.32/drivers/char/sonypi.c linux-2.6.32.32/drivers/char/so
7205 mutex_unlock(&sonypi_device.lock);
7206 unlock_kernel();
7207 return 0;
7208 -diff -urNp linux-2.6.32.32/drivers/char/tpm/tpm_bios.c linux-2.6.32.32/drivers/char/tpm/tpm_bios.c
7209 ---- linux-2.6.32.32/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
7210 -+++ linux-2.6.32.32/drivers/char/tpm/tpm_bios.c 2010-12-31 14:46:53.000000000 -0500
7211 +diff -urNp linux-2.6.32.33/drivers/char/tpm/tpm_bios.c linux-2.6.32.33/drivers/char/tpm/tpm_bios.c
7212 +--- linux-2.6.32.33/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
7213 ++++ linux-2.6.32.33/drivers/char/tpm/tpm_bios.c 2010-12-31 14:46:53.000000000 -0500
7214 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
7215 event = addr;
7216
7217 @@ -24815,9 +24938,9 @@ diff -urNp linux-2.6.32.32/drivers/char/tpm/tpm_bios.c linux-2.6.32.32/drivers/c
7218
7219 memcpy(log->bios_event_log, virt, len);
7220
7221 -diff -urNp linux-2.6.32.32/drivers/char/tpm/tpm.c linux-2.6.32.32/drivers/char/tpm/tpm.c
7222 ---- linux-2.6.32.32/drivers/char/tpm/tpm.c 2011-02-22 15:56:54.000000000 -0500
7223 -+++ linux-2.6.32.32/drivers/char/tpm/tpm.c 2011-02-27 14:53:10.000000000 -0500
7224 +diff -urNp linux-2.6.32.33/drivers/char/tpm/tpm.c linux-2.6.32.33/drivers/char/tpm/tpm.c
7225 +--- linux-2.6.32.33/drivers/char/tpm/tpm.c 2011-02-22 15:56:54.000000000 -0500
7226 ++++ linux-2.6.32.33/drivers/char/tpm/tpm.c 2011-02-27 14:53:10.000000000 -0500
7227 @@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c
7228 chip->vendor.req_complete_val)
7229 goto out_recv;
7230 @@ -24827,9 +24950,9 @@ diff -urNp linux-2.6.32.32/drivers/char/tpm/tpm.c linux-2.6.32.32/drivers/char/t
7231 dev_err(chip->dev, "Operation Canceled\n");
7232 rc = -ECANCELED;
7233 goto out;
7234 -diff -urNp linux-2.6.32.32/drivers/char/tty_io.c linux-2.6.32.32/drivers/char/tty_io.c
7235 ---- linux-2.6.32.32/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
7236 -+++ linux-2.6.32.32/drivers/char/tty_io.c 2010-12-31 14:46:53.000000000 -0500
7237 +diff -urNp linux-2.6.32.33/drivers/char/tty_io.c linux-2.6.32.33/drivers/char/tty_io.c
7238 +--- linux-2.6.32.33/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
7239 ++++ linux-2.6.32.33/drivers/char/tty_io.c 2010-12-31 14:46:53.000000000 -0500
7240 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
7241 DEFINE_MUTEX(tty_mutex);
7242 EXPORT_SYMBOL(tty_mutex);
7243 @@ -24968,9 +25091,9 @@ diff -urNp linux-2.6.32.32/drivers/char/tty_io.c linux-2.6.32.32/drivers/char/tt
7244 /*
7245 * Initialize the console device. This is called *early*, so
7246 * we can't necessarily depend on lots of kernel help here.
7247 -diff -urNp linux-2.6.32.32/drivers/char/tty_ldisc.c linux-2.6.32.32/drivers/char/tty_ldisc.c
7248 ---- linux-2.6.32.32/drivers/char/tty_ldisc.c 2011-01-11 23:55:35.000000000 -0500
7249 -+++ linux-2.6.32.32/drivers/char/tty_ldisc.c 2011-01-11 23:56:03.000000000 -0500
7250 +diff -urNp linux-2.6.32.33/drivers/char/tty_ldisc.c linux-2.6.32.33/drivers/char/tty_ldisc.c
7251 +--- linux-2.6.32.33/drivers/char/tty_ldisc.c 2011-01-11 23:55:35.000000000 -0500
7252 ++++ linux-2.6.32.33/drivers/char/tty_ldisc.c 2011-01-11 23:56:03.000000000 -0500
7253 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
7254 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
7255 struct tty_ldisc_ops *ldo = ld->ops;
7256 @@ -25016,9 +25139,9 @@ diff -urNp linux-2.6.32.32/drivers/char/tty_ldisc.c linux-2.6.32.32/drivers/char
7257 module_put(ldops->owner);
7258 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
7259 }
7260 -diff -urNp linux-2.6.32.32/drivers/char/virtio_console.c linux-2.6.32.32/drivers/char/virtio_console.c
7261 ---- linux-2.6.32.32/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
7262 -+++ linux-2.6.32.32/drivers/char/virtio_console.c 2010-12-31 14:46:53.000000000 -0500
7263 +diff -urNp linux-2.6.32.33/drivers/char/virtio_console.c linux-2.6.32.33/drivers/char/virtio_console.c
7264 +--- linux-2.6.32.33/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
7265 ++++ linux-2.6.32.33/drivers/char/virtio_console.c 2010-12-31 14:46:53.000000000 -0500
7266 @@ -44,6 +44,7 @@ static unsigned int in_len;
7267 static char *in, *inbuf;
7268
7269 @@ -25027,9 +25150,9 @@ diff -urNp linux-2.6.32.32/drivers/char/virtio_console.c linux-2.6.32.32/drivers
7270 static struct hv_ops virtio_cons;
7271
7272 /* The hvc device */
7273 -diff -urNp linux-2.6.32.32/drivers/char/vt.c linux-2.6.32.32/drivers/char/vt.c
7274 ---- linux-2.6.32.32/drivers/char/vt.c 2010-08-13 16:24:37.000000000 -0400
7275 -+++ linux-2.6.32.32/drivers/char/vt.c 2011-02-27 14:53:10.000000000 -0500
7276 +diff -urNp linux-2.6.32.33/drivers/char/vt.c linux-2.6.32.33/drivers/char/vt.c
7277 +--- linux-2.6.32.33/drivers/char/vt.c 2010-08-13 16:24:37.000000000 -0400
7278 ++++ linux-2.6.32.33/drivers/char/vt.c 2011-02-27 14:53:10.000000000 -0500
7279 @@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
7280
7281 static void notify_write(struct vc_data *vc, unsigned int unicode)
7282 @@ -25039,9 +25162,9 @@ diff -urNp linux-2.6.32.32/drivers/char/vt.c linux-2.6.32.32/drivers/char/vt.c
7283 atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
7284 }
7285
7286 -diff -urNp linux-2.6.32.32/drivers/char/vt_ioctl.c linux-2.6.32.32/drivers/char/vt_ioctl.c
7287 ---- linux-2.6.32.32/drivers/char/vt_ioctl.c 2010-12-09 18:13:03.000000000 -0500
7288 -+++ linux-2.6.32.32/drivers/char/vt_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7289 +diff -urNp linux-2.6.32.33/drivers/char/vt_ioctl.c linux-2.6.32.33/drivers/char/vt_ioctl.c
7290 +--- linux-2.6.32.33/drivers/char/vt_ioctl.c 2010-12-09 18:13:03.000000000 -0500
7291 ++++ linux-2.6.32.33/drivers/char/vt_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7292 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
7293 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
7294 return -EFAULT;
7295 @@ -25085,9 +25208,9 @@ diff -urNp linux-2.6.32.32/drivers/char/vt_ioctl.c linux-2.6.32.32/drivers/char/
7296 if (!perm) {
7297 ret = -EPERM;
7298 goto reterr;
7299 -diff -urNp linux-2.6.32.32/drivers/cpufreq/cpufreq.c linux-2.6.32.32/drivers/cpufreq/cpufreq.c
7300 ---- linux-2.6.32.32/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
7301 -+++ linux-2.6.32.32/drivers/cpufreq/cpufreq.c 2010-12-31 14:46:53.000000000 -0500
7302 +diff -urNp linux-2.6.32.33/drivers/cpufreq/cpufreq.c linux-2.6.32.33/drivers/cpufreq/cpufreq.c
7303 +--- linux-2.6.32.33/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
7304 ++++ linux-2.6.32.33/drivers/cpufreq/cpufreq.c 2010-12-31 14:46:53.000000000 -0500
7305 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
7306 complete(&policy->kobj_unregister);
7307 }
7308 @@ -25097,9 +25220,9 @@ diff -urNp linux-2.6.32.32/drivers/cpufreq/cpufreq.c linux-2.6.32.32/drivers/cpu
7309 .show = show,
7310 .store = store,
7311 };
7312 -diff -urNp linux-2.6.32.32/drivers/cpuidle/sysfs.c linux-2.6.32.32/drivers/cpuidle/sysfs.c
7313 ---- linux-2.6.32.32/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
7314 -+++ linux-2.6.32.32/drivers/cpuidle/sysfs.c 2010-12-31 14:46:53.000000000 -0500
7315 +diff -urNp linux-2.6.32.33/drivers/cpuidle/sysfs.c linux-2.6.32.33/drivers/cpuidle/sysfs.c
7316 +--- linux-2.6.32.33/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
7317 ++++ linux-2.6.32.33/drivers/cpuidle/sysfs.c 2010-12-31 14:46:53.000000000 -0500
7318 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
7319 return ret;
7320 }
7321 @@ -25127,9 +25250,9 @@ diff -urNp linux-2.6.32.32/drivers/cpuidle/sysfs.c linux-2.6.32.32/drivers/cpuid
7322 {
7323 kobject_put(&device->kobjs[i]->kobj);
7324 wait_for_completion(&device->kobjs[i]->kobj_unregister);
7325 -diff -urNp linux-2.6.32.32/drivers/dma/ioat/dma.c linux-2.6.32.32/drivers/dma/ioat/dma.c
7326 ---- linux-2.6.32.32/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
7327 -+++ linux-2.6.32.32/drivers/dma/ioat/dma.c 2010-12-31 14:46:53.000000000 -0500
7328 +diff -urNp linux-2.6.32.33/drivers/dma/ioat/dma.c linux-2.6.32.33/drivers/dma/ioat/dma.c
7329 +--- linux-2.6.32.33/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
7330 ++++ linux-2.6.32.33/drivers/dma/ioat/dma.c 2010-12-31 14:46:53.000000000 -0500
7331 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
7332 return entry->show(&chan->common, page);
7333 }
7334 @@ -25139,9 +25262,9 @@ diff -urNp linux-2.6.32.32/drivers/dma/ioat/dma.c linux-2.6.32.32/drivers/dma/io
7335 .show = ioat_attr_show,
7336 };
7337
7338 -diff -urNp linux-2.6.32.32/drivers/dma/ioat/dma.h linux-2.6.32.32/drivers/dma/ioat/dma.h
7339 ---- linux-2.6.32.32/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
7340 -+++ linux-2.6.32.32/drivers/dma/ioat/dma.h 2010-12-31 14:46:53.000000000 -0500
7341 +diff -urNp linux-2.6.32.33/drivers/dma/ioat/dma.h linux-2.6.32.33/drivers/dma/ioat/dma.h
7342 +--- linux-2.6.32.33/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
7343 ++++ linux-2.6.32.33/drivers/dma/ioat/dma.h 2010-12-31 14:46:53.000000000 -0500
7344 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
7345 unsigned long *phys_complete);
7346 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
7347 @@ -25151,9 +25274,9 @@ diff -urNp linux-2.6.32.32/drivers/dma/ioat/dma.h linux-2.6.32.32/drivers/dma/io
7348 extern struct ioat_sysfs_entry ioat_version_attr;
7349 extern struct ioat_sysfs_entry ioat_cap_attr;
7350 #endif /* IOATDMA_H */
7351 -diff -urNp linux-2.6.32.32/drivers/edac/edac_core.h linux-2.6.32.32/drivers/edac/edac_core.h
7352 ---- linux-2.6.32.32/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
7353 -+++ linux-2.6.32.32/drivers/edac/edac_core.h 2010-12-31 14:46:53.000000000 -0500
7354 +diff -urNp linux-2.6.32.33/drivers/edac/edac_core.h linux-2.6.32.33/drivers/edac/edac_core.h
7355 +--- linux-2.6.32.33/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
7356 ++++ linux-2.6.32.33/drivers/edac/edac_core.h 2010-12-31 14:46:53.000000000 -0500
7357 @@ -99,11 +99,11 @@ extern int edac_debug_level;
7358
7359 #else /* !CONFIG_EDAC_DEBUG */
7360 @@ -25171,9 +25294,9 @@ diff -urNp linux-2.6.32.32/drivers/edac/edac_core.h linux-2.6.32.32/drivers/edac
7361
7362 #endif /* !CONFIG_EDAC_DEBUG */
7363
7364 -diff -urNp linux-2.6.32.32/drivers/edac/edac_device_sysfs.c linux-2.6.32.32/drivers/edac/edac_device_sysfs.c
7365 ---- linux-2.6.32.32/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7366 -+++ linux-2.6.32.32/drivers/edac/edac_device_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7367 +diff -urNp linux-2.6.32.33/drivers/edac/edac_device_sysfs.c linux-2.6.32.33/drivers/edac/edac_device_sysfs.c
7368 +--- linux-2.6.32.33/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7369 ++++ linux-2.6.32.33/drivers/edac/edac_device_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7370 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
7371 }
7372
7373 @@ -25201,9 +25324,9 @@ diff -urNp linux-2.6.32.32/drivers/edac/edac_device_sysfs.c linux-2.6.32.32/driv
7374 .show = edac_dev_block_show,
7375 .store = edac_dev_block_store
7376 };
7377 -diff -urNp linux-2.6.32.32/drivers/edac/edac_mc_sysfs.c linux-2.6.32.32/drivers/edac/edac_mc_sysfs.c
7378 ---- linux-2.6.32.32/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7379 -+++ linux-2.6.32.32/drivers/edac/edac_mc_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7380 +diff -urNp linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c
7381 +--- linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7382 ++++ linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7383 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
7384 return -EIO;
7385 }
7386 @@ -25222,9 +25345,9 @@ diff -urNp linux-2.6.32.32/drivers/edac/edac_mc_sysfs.c linux-2.6.32.32/drivers/
7387 .show = mcidev_show,
7388 .store = mcidev_store
7389 };
7390 -diff -urNp linux-2.6.32.32/drivers/edac/edac_pci_sysfs.c linux-2.6.32.32/drivers/edac/edac_pci_sysfs.c
7391 ---- linux-2.6.32.32/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7392 -+++ linux-2.6.32.32/drivers/edac/edac_pci_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7393 +diff -urNp linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c
7394 +--- linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7395 ++++ linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7396 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
7397 }
7398
7399 @@ -25243,9 +25366,9 @@ diff -urNp linux-2.6.32.32/drivers/edac/edac_pci_sysfs.c linux-2.6.32.32/drivers
7400 .show = edac_pci_dev_show,
7401 .store = edac_pci_dev_store
7402 };
7403 -diff -urNp linux-2.6.32.32/drivers/firewire/core-cdev.c linux-2.6.32.32/drivers/firewire/core-cdev.c
7404 ---- linux-2.6.32.32/drivers/firewire/core-cdev.c 2010-12-09 18:13:03.000000000 -0500
7405 -+++ linux-2.6.32.32/drivers/firewire/core-cdev.c 2010-12-31 14:46:53.000000000 -0500
7406 +diff -urNp linux-2.6.32.33/drivers/firewire/core-cdev.c linux-2.6.32.33/drivers/firewire/core-cdev.c
7407 +--- linux-2.6.32.33/drivers/firewire/core-cdev.c 2010-12-09 18:13:03.000000000 -0500
7408 ++++ linux-2.6.32.33/drivers/firewire/core-cdev.c 2010-12-31 14:46:53.000000000 -0500
7409 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
7410 int ret;
7411
7412 @@ -25256,9 +25379,9 @@ diff -urNp linux-2.6.32.32/drivers/firewire/core-cdev.c linux-2.6.32.32/drivers/
7413 return -EINVAL;
7414
7415 r = kmalloc(sizeof(*r), GFP_KERNEL);
7416 -diff -urNp linux-2.6.32.32/drivers/firmware/dmi_scan.c linux-2.6.32.32/drivers/firmware/dmi_scan.c
7417 ---- linux-2.6.32.32/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
7418 -+++ linux-2.6.32.32/drivers/firmware/dmi_scan.c 2010-12-31 14:46:53.000000000 -0500
7419 +diff -urNp linux-2.6.32.33/drivers/firmware/dmi_scan.c linux-2.6.32.33/drivers/firmware/dmi_scan.c
7420 +--- linux-2.6.32.33/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
7421 ++++ linux-2.6.32.33/drivers/firmware/dmi_scan.c 2010-12-31 14:46:53.000000000 -0500
7422 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
7423 }
7424 }
7425 @@ -25271,9 +25394,9 @@ diff -urNp linux-2.6.32.32/drivers/firmware/dmi_scan.c linux-2.6.32.32/drivers/f
7426 p = dmi_ioremap(0xF0000, 0x10000);
7427 if (p == NULL)
7428 goto error;
7429 -diff -urNp linux-2.6.32.32/drivers/firmware/edd.c linux-2.6.32.32/drivers/firmware/edd.c
7430 ---- linux-2.6.32.32/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
7431 -+++ linux-2.6.32.32/drivers/firmware/edd.c 2010-12-31 14:46:53.000000000 -0500
7432 +diff -urNp linux-2.6.32.33/drivers/firmware/edd.c linux-2.6.32.33/drivers/firmware/edd.c
7433 +--- linux-2.6.32.33/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
7434 ++++ linux-2.6.32.33/drivers/firmware/edd.c 2010-12-31 14:46:53.000000000 -0500
7435 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
7436 return ret;
7437 }
7438 @@ -25283,9 +25406,9 @@ diff -urNp linux-2.6.32.32/drivers/firmware/edd.c linux-2.6.32.32/drivers/firmwa
7439 .show = edd_attr_show,
7440 };
7441
7442 -diff -urNp linux-2.6.32.32/drivers/firmware/efivars.c linux-2.6.32.32/drivers/firmware/efivars.c
7443 ---- linux-2.6.32.32/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
7444 -+++ linux-2.6.32.32/drivers/firmware/efivars.c 2010-12-31 14:46:53.000000000 -0500
7445 +diff -urNp linux-2.6.32.33/drivers/firmware/efivars.c linux-2.6.32.33/drivers/firmware/efivars.c
7446 +--- linux-2.6.32.33/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
7447 ++++ linux-2.6.32.33/drivers/firmware/efivars.c 2010-12-31 14:46:53.000000000 -0500
7448 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
7449 return ret;
7450 }
7451 @@ -25295,9 +25418,9 @@ diff -urNp linux-2.6.32.32/drivers/firmware/efivars.c linux-2.6.32.32/drivers/fi
7452 .show = efivar_attr_show,
7453 .store = efivar_attr_store,
7454 };
7455 -diff -urNp linux-2.6.32.32/drivers/firmware/iscsi_ibft.c linux-2.6.32.32/drivers/firmware/iscsi_ibft.c
7456 ---- linux-2.6.32.32/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
7457 -+++ linux-2.6.32.32/drivers/firmware/iscsi_ibft.c 2010-12-31 14:46:53.000000000 -0500
7458 +diff -urNp linux-2.6.32.33/drivers/firmware/iscsi_ibft.c linux-2.6.32.33/drivers/firmware/iscsi_ibft.c
7459 +--- linux-2.6.32.33/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
7460 ++++ linux-2.6.32.33/drivers/firmware/iscsi_ibft.c 2010-12-31 14:46:53.000000000 -0500
7461 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
7462 return ret;
7463 }
7464 @@ -25307,9 +25430,9 @@ diff -urNp linux-2.6.32.32/drivers/firmware/iscsi_ibft.c linux-2.6.32.32/drivers
7465 .show = ibft_show_attribute,
7466 };
7467
7468 -diff -urNp linux-2.6.32.32/drivers/firmware/memmap.c linux-2.6.32.32/drivers/firmware/memmap.c
7469 ---- linux-2.6.32.32/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
7470 -+++ linux-2.6.32.32/drivers/firmware/memmap.c 2010-12-31 14:46:53.000000000 -0500
7471 +diff -urNp linux-2.6.32.33/drivers/firmware/memmap.c linux-2.6.32.33/drivers/firmware/memmap.c
7472 +--- linux-2.6.32.33/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
7473 ++++ linux-2.6.32.33/drivers/firmware/memmap.c 2010-12-31 14:46:53.000000000 -0500
7474 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
7475 NULL
7476 };
7477 @@ -25319,9 +25442,9 @@ diff -urNp linux-2.6.32.32/drivers/firmware/memmap.c linux-2.6.32.32/drivers/fir
7478 .show = memmap_attr_show,
7479 };
7480
7481 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.32/drivers/gpu/drm/drm_crtc_helper.c
7482 ---- linux-2.6.32.32/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400
7483 -+++ linux-2.6.32.32/drivers/gpu/drm/drm_crtc_helper.c 2010-12-31 14:46:53.000000000 -0500
7484 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c
7485 +--- linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400
7486 ++++ linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c 2010-12-31 14:46:53.000000000 -0500
7487 @@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
7488 struct drm_crtc *tmp;
7489 int crtc_mask = 1;
7490 @@ -25331,9 +25454,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.32/dri
7491
7492 dev = crtc->dev;
7493
7494 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_drv.c linux-2.6.32.32/drivers/gpu/drm/drm_drv.c
7495 ---- linux-2.6.32.32/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
7496 -+++ linux-2.6.32.32/drivers/gpu/drm/drm_drv.c 2010-12-31 14:46:53.000000000 -0500
7497 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_drv.c linux-2.6.32.33/drivers/gpu/drm/drm_drv.c
7498 +--- linux-2.6.32.33/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
7499 ++++ linux-2.6.32.33/drivers/gpu/drm/drm_drv.c 2010-12-31 14:46:53.000000000 -0500
7500 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
7501 char *kdata = NULL;
7502
7503 @@ -25343,9 +25466,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_drv.c linux-2.6.32.32/drivers/gpu
7504 ++file_priv->ioctl_count;
7505
7506 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
7507 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_fops.c linux-2.6.32.32/drivers/gpu/drm/drm_fops.c
7508 ---- linux-2.6.32.32/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
7509 -+++ linux-2.6.32.32/drivers/gpu/drm/drm_fops.c 2011-01-24 18:05:30.000000000 -0500
7510 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_fops.c linux-2.6.32.33/drivers/gpu/drm/drm_fops.c
7511 +--- linux-2.6.32.33/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
7512 ++++ linux-2.6.32.33/drivers/gpu/drm/drm_fops.c 2011-01-24 18:05:30.000000000 -0500
7513 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
7514 }
7515
7516 @@ -25397,9 +25520,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_fops.c linux-2.6.32.32/drivers/gp
7517 if (atomic_read(&dev->ioctl_count)) {
7518 DRM_ERROR("Device busy: %d\n",
7519 atomic_read(&dev->ioctl_count));
7520 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_gem.c linux-2.6.32.32/drivers/gpu/drm/drm_gem.c
7521 ---- linux-2.6.32.32/drivers/gpu/drm/drm_gem.c 2010-08-13 16:24:37.000000000 -0400
7522 -+++ linux-2.6.32.32/drivers/gpu/drm/drm_gem.c 2011-01-24 18:05:37.000000000 -0500
7523 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_gem.c linux-2.6.32.33/drivers/gpu/drm/drm_gem.c
7524 +--- linux-2.6.32.33/drivers/gpu/drm/drm_gem.c 2010-08-13 16:24:37.000000000 -0400
7525 ++++ linux-2.6.32.33/drivers/gpu/drm/drm_gem.c 2011-01-24 18:05:37.000000000 -0500
7526 @@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
7527 spin_lock_init(&dev->object_name_lock);
7528 idr_init(&dev->object_name_idr);
7529 @@ -25433,9 +25556,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_gem.c linux-2.6.32.32/drivers/gpu
7530 kfree(obj);
7531 }
7532 EXPORT_SYMBOL(drm_gem_object_free);
7533 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_info.c linux-2.6.32.32/drivers/gpu/drm/drm_info.c
7534 ---- linux-2.6.32.32/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400
7535 -+++ linux-2.6.32.32/drivers/gpu/drm/drm_info.c 2011-03-12 19:51:06.000000000 -0500
7536 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_info.c linux-2.6.32.33/drivers/gpu/drm/drm_info.c
7537 +--- linux-2.6.32.33/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400
7538 ++++ linux-2.6.32.33/drivers/gpu/drm/drm_info.c 2011-03-12 19:51:06.000000000 -0500
7539 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
7540 struct drm_local_map *map;
7541 struct drm_map_list *r_list;
7542 @@ -25515,9 +25638,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_info.c linux-2.6.32.32/drivers/gp
7543
7544 #if defined(__i386__)
7545 pgprot = pgprot_val(vma->vm_page_prot);
7546 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.32/drivers/gpu/drm/drm_ioctl.c
7547 ---- linux-2.6.32.32/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
7548 -+++ linux-2.6.32.32/drivers/gpu/drm/drm_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7549 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c
7550 +--- linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
7551 ++++ linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7552 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
7553 stats->data[i].value =
7554 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
7555 @@ -25527,9 +25650,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.32/drivers/g
7556 stats->data[i].type = dev->types[i];
7557 }
7558
7559 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_lock.c linux-2.6.32.32/drivers/gpu/drm/drm_lock.c
7560 ---- linux-2.6.32.32/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
7561 -+++ linux-2.6.32.32/drivers/gpu/drm/drm_lock.c 2010-12-31 14:46:53.000000000 -0500
7562 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_lock.c linux-2.6.32.33/drivers/gpu/drm/drm_lock.c
7563 +--- linux-2.6.32.33/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
7564 ++++ linux-2.6.32.33/drivers/gpu/drm/drm_lock.c 2010-12-31 14:46:53.000000000 -0500
7565 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
7566 if (drm_lock_take(&master->lock, lock->context)) {
7567 master->lock.file_priv = file_priv;
7568 @@ -25548,9 +25671,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/drm_lock.c linux-2.6.32.32/drivers/gp
7569
7570 /* kernel_context_switch isn't used by any of the x86 drm
7571 * modules but is required by the Sparc driver.
7572 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.32/drivers/gpu/drm/i810/i810_dma.c
7573 ---- linux-2.6.32.32/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
7574 -+++ linux-2.6.32.32/drivers/gpu/drm/i810/i810_dma.c 2010-12-31 14:46:53.000000000 -0500
7575 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c
7576 +--- linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
7577 ++++ linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c 2010-12-31 14:46:53.000000000 -0500
7578 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
7579 dma->buflist[vertex->idx],
7580 vertex->discard, vertex->used);
7581 @@ -25573,9 +25696,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.32/drive
7582 sarea_priv->last_enqueue = dev_priv->counter - 1;
7583 sarea_priv->last_dispatch = (int)hw_status[5];
7584
7585 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7017.c
7586 ---- linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
7587 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-31 14:46:53.000000000 -0500
7588 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c
7589 +--- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
7590 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-31 14:46:53.000000000 -0500
7591 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
7592 }
7593 }
7594 @@ -25585,9 +25708,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.32/dri
7595 .init = ch7017_init,
7596 .detect = ch7017_detect,
7597 .mode_valid = ch7017_mode_valid,
7598 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7xxx.c
7599 ---- linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
7600 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-31 14:46:53.000000000 -0500
7601 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c
7602 +--- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
7603 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-31 14:46:53.000000000 -0500
7604 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
7605 }
7606 }
7607 @@ -25597,9 +25720,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.32/dri
7608 .init = ch7xxx_init,
7609 .detect = ch7xxx_detect,
7610 .mode_valid = ch7xxx_mode_valid,
7611 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo.h linux-2.6.32.32/drivers/gpu/drm/i915/dvo.h
7612 ---- linux-2.6.32.32/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
7613 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/dvo.h 2010-12-31 14:46:53.000000000 -0500
7614 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h
7615 +--- linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
7616 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h 2010-12-31 14:46:53.000000000 -0500
7617 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
7618 *
7619 * \return singly-linked list of modes or NULL if no modes found.
7620 @@ -25632,9 +25755,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo.h linux-2.6.32.32/drivers/gp
7621 +extern const struct intel_dvo_dev_ops ch7017_ops;
7622
7623 #endif /* _INTEL_DVO_H */
7624 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ivch.c
7625 ---- linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
7626 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-31 14:46:53.000000000 -0500
7627 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c
7628 +--- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
7629 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-31 14:46:53.000000000 -0500
7630 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
7631 }
7632 }
7633 @@ -25644,9 +25767,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.32/drive
7634 .init = ivch_init,
7635 .dpms = ivch_dpms,
7636 .save = ivch_save,
7637 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.32/drivers/gpu/drm/i915/dvo_sil164.c
7638 ---- linux-2.6.32.32/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
7639 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-31 14:46:53.000000000 -0500
7640 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c
7641 +--- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
7642 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-31 14:46:53.000000000 -0500
7643 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
7644 }
7645 }
7646 @@ -25656,9 +25779,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.32/dri
7647 .init = sil164_init,
7648 .detect = sil164_detect,
7649 .mode_valid = sil164_mode_valid,
7650 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.32/drivers/gpu/drm/i915/dvo_tfp410.c
7651 ---- linux-2.6.32.32/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
7652 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-31 14:46:53.000000000 -0500
7653 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c
7654 +--- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
7655 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-31 14:46:53.000000000 -0500
7656 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
7657 }
7658 }
7659 @@ -25668,9 +25791,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.32/dri
7660 .init = tfp410_init,
7661 .detect = tfp410_detect,
7662 .mode_valid = tfp410_mode_valid,
7663 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.32/drivers/gpu/drm/i915/i915_drv.c
7664 ---- linux-2.6.32.32/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
7665 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/i915_drv.c 2010-12-31 14:46:53.000000000 -0500
7666 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c
7667 +--- linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
7668 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c 2010-12-31 14:46:53.000000000 -0500
7669 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
7670 return i915_resume(dev);
7671 }
7672 @@ -25680,9 +25803,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.32/drive
7673 .fault = i915_gem_fault,
7674 .open = drm_gem_vm_open,
7675 .close = drm_gem_vm_close,
7676 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.32/drivers/gpu/drm/i915/i915_gem.c
7677 ---- linux-2.6.32.32/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
7678 -+++ linux-2.6.32.32/drivers/gpu/drm/i915/i915_gem.c 2011-01-24 18:05:30.000000000 -0500
7679 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c
7680 +--- linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
7681 ++++ linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c 2011-01-24 18:05:30.000000000 -0500
7682 @@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d
7683
7684 args->aper_size = dev->gtt_total;
7685 @@ -25765,9 +25888,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.32/drive
7686 }
7687 i915_verify_inactive(dev, __FILE__, __LINE__);
7688 }
7689 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.32/drivers/gpu/drm/radeon/mkregtable.c
7690 ---- linux-2.6.32.32/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
7691 -+++ linux-2.6.32.32/drivers/gpu/drm/radeon/mkregtable.c 2010-12-31 14:46:53.000000000 -0500
7692 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c
7693 +--- linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
7694 ++++ linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c 2010-12-31 14:46:53.000000000 -0500
7695 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
7696 regex_t mask_rex;
7697 regmatch_t match[4];
7698 @@ -25785,9 +25908,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.32/d
7699
7700 if (regcomp
7701 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
7702 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_atombios.c
7703 ---- linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:56:54.000000000 -0500
7704 -+++ linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:57:23.000000000 -0500
7705 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c
7706 +--- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:56:54.000000000 -0500
7707 ++++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:57:23.000000000 -0500
7708 @@ -520,13 +520,13 @@ static uint16_t atombios_get_connector_o
7709 }
7710 }
7711 @@ -25812,9 +25935,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
7712
7713 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
7714
7715 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_display.c
7716 ---- linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:56:54.000000000 -0500
7717 -+++ linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:57:23.000000000 -0500
7718 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c
7719 +--- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:56:54.000000000 -0500
7720 ++++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:57:23.000000000 -0500
7721 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
7722
7723 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
7724 @@ -25824,9 +25947,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
7725 } else
7726 error = abs(current_freq - freq);
7727 vco_diff = abs(vco - best_vco);
7728 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_state.c
7729 ---- linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
7730 -+++ linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_state.c 2010-12-31 14:46:53.000000000 -0500
7731 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c
7732 +--- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
7733 ++++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c 2010-12-31 14:46:53.000000000 -0500
7734 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
7735 {
7736 drm_radeon_private_t *dev_priv = dev->dev_private;
7737 @@ -25836,9 +25959,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.32
7738
7739 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
7740
7741 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_ttm.c
7742 ---- linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
7743 -+++ linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-31 14:46:53.000000000 -0500
7744 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c
7745 +--- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
7746 ++++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-31 14:46:53.000000000 -0500
7747 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
7748 DRM_INFO("radeon: ttm finalized\n");
7749 }
7750 @@ -25890,9 +26013,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.32/d
7751 }
7752
7753
7754 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo.c
7755 ---- linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
7756 -+++ linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-31 14:46:53.000000000 -0500
7757 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c
7758 +--- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
7759 ++++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-31 14:46:53.000000000 -0500
7760 @@ -39,7 +39,7 @@
7761 #include <linux/module.h>
7762
7763 @@ -25911,9 +26034,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.32/drivers/
7764 .show = &ttm_bo_global_show
7765 };
7766
7767 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo_vm.c
7768 ---- linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
7769 -+++ linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-31 14:46:53.000000000 -0500
7770 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c
7771 +--- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
7772 ++++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-31 14:46:53.000000000 -0500
7773 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
7774 {
7775 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
7776 @@ -25934,9 +26057,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.32/drive
7777 /*
7778 * Work around locking order reversal in fault / nopfn
7779 * between mmap_sem and bo_reserve: Perform a trylock operation
7780 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_global.c
7781 ---- linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
7782 -+++ linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_global.c 2010-12-31 14:46:53.000000000 -0500
7783 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c
7784 +--- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
7785 ++++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c 2010-12-31 14:46:53.000000000 -0500
7786 @@ -36,7 +36,7 @@
7787 struct ttm_global_item {
7788 struct mutex mutex;
7789 @@ -25994,9 +26117,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.32/driv
7790 ref->release(ref);
7791 item->object = NULL;
7792 }
7793 -diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_memory.c
7794 ---- linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
7795 -+++ linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-31 14:46:53.000000000 -0500
7796 +diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c
7797 +--- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
7798 ++++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-31 14:46:53.000000000 -0500
7799 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
7800 NULL
7801 };
7802 @@ -26006,9 +26129,9 @@ diff -urNp linux-2.6.32.32/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.32/driv
7803 .show = &ttm_mem_zone_show,
7804 .store = &ttm_mem_zone_store
7805 };
7806 -diff -urNp linux-2.6.32.32/drivers/hid/usbhid/hiddev.c linux-2.6.32.32/drivers/hid/usbhid/hiddev.c
7807 ---- linux-2.6.32.32/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
7808 -+++ linux-2.6.32.32/drivers/hid/usbhid/hiddev.c 2010-12-31 14:46:53.000000000 -0500
7809 +diff -urNp linux-2.6.32.33/drivers/hid/usbhid/hiddev.c linux-2.6.32.33/drivers/hid/usbhid/hiddev.c
7810 +--- linux-2.6.32.33/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
7811 ++++ linux-2.6.32.33/drivers/hid/usbhid/hiddev.c 2010-12-31 14:46:53.000000000 -0500
7812 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
7813 return put_user(HID_VERSION, (int __user *)arg);
7814
7815 @@ -26018,9 +26141,9 @@ diff -urNp linux-2.6.32.32/drivers/hid/usbhid/hiddev.c linux-2.6.32.32/drivers/h
7816 return -EINVAL;
7817
7818 for (i = 0; i < hid->maxcollection; i++)
7819 -diff -urNp linux-2.6.32.32/drivers/hwmon/k8temp.c linux-2.6.32.32/drivers/hwmon/k8temp.c
7820 ---- linux-2.6.32.32/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
7821 -+++ linux-2.6.32.32/drivers/hwmon/k8temp.c 2010-12-31 14:46:53.000000000 -0500
7822 +diff -urNp linux-2.6.32.33/drivers/hwmon/k8temp.c linux-2.6.32.33/drivers/hwmon/k8temp.c
7823 +--- linux-2.6.32.33/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
7824 ++++ linux-2.6.32.33/drivers/hwmon/k8temp.c 2010-12-31 14:46:53.000000000 -0500
7825 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
7826
7827 static struct pci_device_id k8temp_ids[] = {
7828 @@ -26030,9 +26153,9 @@ diff -urNp linux-2.6.32.32/drivers/hwmon/k8temp.c linux-2.6.32.32/drivers/hwmon/
7829 };
7830
7831 MODULE_DEVICE_TABLE(pci, k8temp_ids);
7832 -diff -urNp linux-2.6.32.32/drivers/hwmon/sis5595.c linux-2.6.32.32/drivers/hwmon/sis5595.c
7833 ---- linux-2.6.32.32/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
7834 -+++ linux-2.6.32.32/drivers/hwmon/sis5595.c 2010-12-31 14:46:53.000000000 -0500
7835 +diff -urNp linux-2.6.32.33/drivers/hwmon/sis5595.c linux-2.6.32.33/drivers/hwmon/sis5595.c
7836 +--- linux-2.6.32.33/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
7837 ++++ linux-2.6.32.33/drivers/hwmon/sis5595.c 2010-12-31 14:46:53.000000000 -0500
7838 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
7839
7840 static struct pci_device_id sis5595_pci_ids[] = {
7841 @@ -26042,9 +26165,9 @@ diff -urNp linux-2.6.32.32/drivers/hwmon/sis5595.c linux-2.6.32.32/drivers/hwmon
7842 };
7843
7844 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
7845 -diff -urNp linux-2.6.32.32/drivers/hwmon/via686a.c linux-2.6.32.32/drivers/hwmon/via686a.c
7846 ---- linux-2.6.32.32/drivers/hwmon/via686a.c 2011-02-22 15:56:54.000000000 -0500
7847 -+++ linux-2.6.32.32/drivers/hwmon/via686a.c 2011-02-22 15:57:23.000000000 -0500
7848 +diff -urNp linux-2.6.32.33/drivers/hwmon/via686a.c linux-2.6.32.33/drivers/hwmon/via686a.c
7849 +--- linux-2.6.32.33/drivers/hwmon/via686a.c 2011-02-22 15:56:54.000000000 -0500
7850 ++++ linux-2.6.32.33/drivers/hwmon/via686a.c 2011-02-22 15:57:23.000000000 -0500
7851 @@ -777,7 +777,7 @@ static struct via686a_data *via686a_upda
7852
7853 static struct pci_device_id via686a_pci_ids[] = {
7854 @@ -26054,9 +26177,9 @@ diff -urNp linux-2.6.32.32/drivers/hwmon/via686a.c linux-2.6.32.32/drivers/hwmon
7855 };
7856
7857 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
7858 -diff -urNp linux-2.6.32.32/drivers/hwmon/vt8231.c linux-2.6.32.32/drivers/hwmon/vt8231.c
7859 ---- linux-2.6.32.32/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
7860 -+++ linux-2.6.32.32/drivers/hwmon/vt8231.c 2010-12-31 14:46:53.000000000 -0500
7861 +diff -urNp linux-2.6.32.33/drivers/hwmon/vt8231.c linux-2.6.32.33/drivers/hwmon/vt8231.c
7862 +--- linux-2.6.32.33/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
7863 ++++ linux-2.6.32.33/drivers/hwmon/vt8231.c 2010-12-31 14:46:53.000000000 -0500
7864 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
7865
7866 static struct pci_device_id vt8231_pci_ids[] = {
7867 @@ -26066,9 +26189,9 @@ diff -urNp linux-2.6.32.32/drivers/hwmon/vt8231.c linux-2.6.32.32/drivers/hwmon/
7868 };
7869
7870 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
7871 -diff -urNp linux-2.6.32.32/drivers/hwmon/w83791d.c linux-2.6.32.32/drivers/hwmon/w83791d.c
7872 ---- linux-2.6.32.32/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
7873 -+++ linux-2.6.32.32/drivers/hwmon/w83791d.c 2010-12-31 14:46:53.000000000 -0500
7874 +diff -urNp linux-2.6.32.33/drivers/hwmon/w83791d.c linux-2.6.32.33/drivers/hwmon/w83791d.c
7875 +--- linux-2.6.32.33/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
7876 ++++ linux-2.6.32.33/drivers/hwmon/w83791d.c 2010-12-31 14:46:53.000000000 -0500
7877 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
7878 struct i2c_board_info *info);
7879 static int w83791d_remove(struct i2c_client *client);
7880 @@ -26080,9 +26203,9 @@ diff -urNp linux-2.6.32.32/drivers/hwmon/w83791d.c linux-2.6.32.32/drivers/hwmon
7881 static struct w83791d_data *w83791d_update_device(struct device *dev);
7882
7883 #ifdef DEBUG
7884 -diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-i801.c linux-2.6.32.32/drivers/i2c/busses/i2c-i801.c
7885 ---- linux-2.6.32.32/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
7886 -+++ linux-2.6.32.32/drivers/i2c/busses/i2c-i801.c 2010-12-31 14:46:53.000000000 -0500
7887 +diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c
7888 +--- linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
7889 ++++ linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c 2010-12-31 14:46:53.000000000 -0500
7890 @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
7891 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
7892 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
7893 @@ -26092,9 +26215,9 @@ diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-i801.c linux-2.6.32.32/drivers
7894 };
7895
7896 MODULE_DEVICE_TABLE (pci, i801_ids);
7897 -diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.32/drivers/i2c/busses/i2c-piix4.c
7898 ---- linux-2.6.32.32/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
7899 -+++ linux-2.6.32.32/drivers/i2c/busses/i2c-piix4.c 2010-12-31 14:46:53.000000000 -0500
7900 +diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c
7901 +--- linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
7902 ++++ linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c 2010-12-31 14:46:53.000000000 -0500
7903 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
7904 .ident = "IBM",
7905 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
7906 @@ -26113,9 +26236,9 @@ diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.32/driver
7907 };
7908
7909 MODULE_DEVICE_TABLE (pci, piix4_ids);
7910 -diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.32/drivers/i2c/busses/i2c-sis630.c
7911 ---- linux-2.6.32.32/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
7912 -+++ linux-2.6.32.32/drivers/i2c/busses/i2c-sis630.c 2010-12-31 14:46:53.000000000 -0500
7913 +diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c
7914 +--- linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
7915 ++++ linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c 2010-12-31 14:46:53.000000000 -0500
7916 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
7917 static struct pci_device_id sis630_ids[] __devinitdata = {
7918 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
7919 @@ -26125,9 +26248,9 @@ diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.32/drive
7920 };
7921
7922 MODULE_DEVICE_TABLE (pci, sis630_ids);
7923 -diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.32/drivers/i2c/busses/i2c-sis96x.c
7924 ---- linux-2.6.32.32/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
7925 -+++ linux-2.6.32.32/drivers/i2c/busses/i2c-sis96x.c 2010-12-31 14:46:53.000000000 -0500
7926 +diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c
7927 +--- linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
7928 ++++ linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c 2010-12-31 14:46:53.000000000 -0500
7929 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
7930
7931 static struct pci_device_id sis96x_ids[] = {
7932 @@ -26137,9 +26260,9 @@ diff -urNp linux-2.6.32.32/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.32/drive
7933 };
7934
7935 MODULE_DEVICE_TABLE (pci, sis96x_ids);
7936 -diff -urNp linux-2.6.32.32/drivers/ide/ide-cd.c linux-2.6.32.32/drivers/ide/ide-cd.c
7937 ---- linux-2.6.32.32/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
7938 -+++ linux-2.6.32.32/drivers/ide/ide-cd.c 2010-12-31 14:46:53.000000000 -0500
7939 +diff -urNp linux-2.6.32.33/drivers/ide/ide-cd.c linux-2.6.32.33/drivers/ide/ide-cd.c
7940 +--- linux-2.6.32.33/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
7941 ++++ linux-2.6.32.33/drivers/ide/ide-cd.c 2010-12-31 14:46:53.000000000 -0500
7942 @@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
7943 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
7944 if ((unsigned long)buf & alignment
7945 @@ -26149,9 +26272,9 @@ diff -urNp linux-2.6.32.32/drivers/ide/ide-cd.c linux-2.6.32.32/drivers/ide/ide-
7946 drive->dma = 0;
7947 }
7948 }
7949 -diff -urNp linux-2.6.32.32/drivers/ieee1394/dv1394.c linux-2.6.32.32/drivers/ieee1394/dv1394.c
7950 ---- linux-2.6.32.32/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
7951 -+++ linux-2.6.32.32/drivers/ieee1394/dv1394.c 2010-12-31 14:46:53.000000000 -0500
7952 +diff -urNp linux-2.6.32.33/drivers/ieee1394/dv1394.c linux-2.6.32.33/drivers/ieee1394/dv1394.c
7953 +--- linux-2.6.32.33/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
7954 ++++ linux-2.6.32.33/drivers/ieee1394/dv1394.c 2010-12-31 14:46:53.000000000 -0500
7955 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
7956 based upon DIF section and sequence
7957 */
7958 @@ -26170,9 +26293,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/dv1394.c linux-2.6.32.32/drivers/iee
7959 };
7960
7961 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
7962 -diff -urNp linux-2.6.32.32/drivers/ieee1394/eth1394.c linux-2.6.32.32/drivers/ieee1394/eth1394.c
7963 ---- linux-2.6.32.32/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
7964 -+++ linux-2.6.32.32/drivers/ieee1394/eth1394.c 2010-12-31 14:46:53.000000000 -0500
7965 +diff -urNp linux-2.6.32.33/drivers/ieee1394/eth1394.c linux-2.6.32.33/drivers/ieee1394/eth1394.c
7966 +--- linux-2.6.32.33/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
7967 ++++ linux-2.6.32.33/drivers/ieee1394/eth1394.c 2010-12-31 14:46:53.000000000 -0500
7968 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
7969 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
7970 .version = ETHER1394_GASP_VERSION,
7971 @@ -26182,9 +26305,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/eth1394.c linux-2.6.32.32/drivers/ie
7972 };
7973
7974 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
7975 -diff -urNp linux-2.6.32.32/drivers/ieee1394/hosts.c linux-2.6.32.32/drivers/ieee1394/hosts.c
7976 ---- linux-2.6.32.32/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
7977 -+++ linux-2.6.32.32/drivers/ieee1394/hosts.c 2010-12-31 14:46:53.000000000 -0500
7978 +diff -urNp linux-2.6.32.33/drivers/ieee1394/hosts.c linux-2.6.32.33/drivers/ieee1394/hosts.c
7979 +--- linux-2.6.32.33/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
7980 ++++ linux-2.6.32.33/drivers/ieee1394/hosts.c 2010-12-31 14:46:53.000000000 -0500
7981 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
7982 }
7983
7984 @@ -26193,9 +26316,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/hosts.c linux-2.6.32.32/drivers/ieee
7985 .transmit_packet = dummy_transmit_packet,
7986 .devctl = dummy_devctl,
7987 .isoctl = dummy_isoctl
7988 -diff -urNp linux-2.6.32.32/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.32/drivers/ieee1394/init_ohci1394_dma.c
7989 ---- linux-2.6.32.32/drivers/ieee1394/init_ohci1394_dma.c 2010-08-13 16:24:37.000000000 -0400
7990 -+++ linux-2.6.32.32/drivers/ieee1394/init_ohci1394_dma.c 2011-02-27 14:53:10.000000000 -0500
7991 +diff -urNp linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c
7992 +--- linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c 2010-08-13 16:24:37.000000000 -0400
7993 ++++ linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c 2011-02-27 14:53:10.000000000 -0500
7994 @@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con
7995 for (func = 0; func < 8; func++) {
7996 u32 class = read_pci_config(num,slot,func,
7997 @@ -26205,9 +26328,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.32/
7998 continue; /* No device at this func */
7999
8000 if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
8001 -diff -urNp linux-2.6.32.32/drivers/ieee1394/ohci1394.c linux-2.6.32.32/drivers/ieee1394/ohci1394.c
8002 ---- linux-2.6.32.32/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
8003 -+++ linux-2.6.32.32/drivers/ieee1394/ohci1394.c 2010-12-31 14:46:53.000000000 -0500
8004 +diff -urNp linux-2.6.32.33/drivers/ieee1394/ohci1394.c linux-2.6.32.33/drivers/ieee1394/ohci1394.c
8005 +--- linux-2.6.32.33/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
8006 ++++ linux-2.6.32.33/drivers/ieee1394/ohci1394.c 2010-12-31 14:46:53.000000000 -0500
8007 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
8008 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
8009
8010 @@ -26229,9 +26352,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/ohci1394.c linux-2.6.32.32/drivers/i
8011 };
8012
8013 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
8014 -diff -urNp linux-2.6.32.32/drivers/ieee1394/raw1394.c linux-2.6.32.32/drivers/ieee1394/raw1394.c
8015 ---- linux-2.6.32.32/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
8016 -+++ linux-2.6.32.32/drivers/ieee1394/raw1394.c 2010-12-31 14:46:53.000000000 -0500
8017 +diff -urNp linux-2.6.32.33/drivers/ieee1394/raw1394.c linux-2.6.32.33/drivers/ieee1394/raw1394.c
8018 +--- linux-2.6.32.33/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
8019 ++++ linux-2.6.32.33/drivers/ieee1394/raw1394.c 2010-12-31 14:46:53.000000000 -0500
8020 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
8021 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
8022 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
8023 @@ -26241,9 +26364,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/raw1394.c linux-2.6.32.32/drivers/ie
8024 };
8025
8026 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
8027 -diff -urNp linux-2.6.32.32/drivers/ieee1394/sbp2.c linux-2.6.32.32/drivers/ieee1394/sbp2.c
8028 ---- linux-2.6.32.32/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
8029 -+++ linux-2.6.32.32/drivers/ieee1394/sbp2.c 2010-12-31 14:46:53.000000000 -0500
8030 +diff -urNp linux-2.6.32.33/drivers/ieee1394/sbp2.c linux-2.6.32.33/drivers/ieee1394/sbp2.c
8031 +--- linux-2.6.32.33/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
8032 ++++ linux-2.6.32.33/drivers/ieee1394/sbp2.c 2010-12-31 14:46:53.000000000 -0500
8033 @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
8034 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
8035 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
8036 @@ -26262,9 +26385,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/sbp2.c linux-2.6.32.32/drivers/ieee1
8037 {
8038 int ret;
8039
8040 -diff -urNp linux-2.6.32.32/drivers/ieee1394/video1394.c linux-2.6.32.32/drivers/ieee1394/video1394.c
8041 ---- linux-2.6.32.32/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
8042 -+++ linux-2.6.32.32/drivers/ieee1394/video1394.c 2010-12-31 14:46:53.000000000 -0500
8043 +diff -urNp linux-2.6.32.33/drivers/ieee1394/video1394.c linux-2.6.32.33/drivers/ieee1394/video1394.c
8044 +--- linux-2.6.32.33/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
8045 ++++ linux-2.6.32.33/drivers/ieee1394/video1394.c 2010-12-31 14:46:53.000000000 -0500
8046 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
8047 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
8048 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
8049 @@ -26274,9 +26397,9 @@ diff -urNp linux-2.6.32.32/drivers/ieee1394/video1394.c linux-2.6.32.32/drivers/
8050 };
8051
8052 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
8053 -diff -urNp linux-2.6.32.32/drivers/infiniband/core/cm.c linux-2.6.32.32/drivers/infiniband/core/cm.c
8054 ---- linux-2.6.32.32/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
8055 -+++ linux-2.6.32.32/drivers/infiniband/core/cm.c 2010-12-31 14:46:53.000000000 -0500
8056 +diff -urNp linux-2.6.32.33/drivers/infiniband/core/cm.c linux-2.6.32.33/drivers/infiniband/core/cm.c
8057 +--- linux-2.6.32.33/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
8058 ++++ linux-2.6.32.33/drivers/infiniband/core/cm.c 2010-12-31 14:46:53.000000000 -0500
8059 @@ -112,7 +112,7 @@ static char const counter_group_names[CM
8060
8061 struct cm_counter_group {
8062 @@ -26420,9 +26543,9 @@ diff -urNp linux-2.6.32.32/drivers/infiniband/core/cm.c linux-2.6.32.32/drivers/
8063 .show = cm_show_counter
8064 };
8065
8066 -diff -urNp linux-2.6.32.32/drivers/infiniband/core/sysfs.c linux-2.6.32.32/drivers/infiniband/core/sysfs.c
8067 ---- linux-2.6.32.32/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
8068 -+++ linux-2.6.32.32/drivers/infiniband/core/sysfs.c 2010-12-31 14:46:53.000000000 -0500
8069 +diff -urNp linux-2.6.32.33/drivers/infiniband/core/sysfs.c linux-2.6.32.33/drivers/infiniband/core/sysfs.c
8070 +--- linux-2.6.32.33/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
8071 ++++ linux-2.6.32.33/drivers/infiniband/core/sysfs.c 2010-12-31 14:46:53.000000000 -0500
8072 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
8073 return port_attr->show(p, port_attr, buf);
8074 }
8075 @@ -26432,9 +26555,9 @@ diff -urNp linux-2.6.32.32/drivers/infiniband/core/sysfs.c linux-2.6.32.32/drive
8076 .show = port_attr_show
8077 };
8078
8079 -diff -urNp linux-2.6.32.32/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.32/drivers/infiniband/core/uverbs_marshall.c
8080 ---- linux-2.6.32.32/drivers/infiniband/core/uverbs_marshall.c 2010-08-13 16:24:37.000000000 -0400
8081 -+++ linux-2.6.32.32/drivers/infiniband/core/uverbs_marshall.c 2010-12-31 14:46:53.000000000 -0500
8082 +diff -urNp linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c
8083 +--- linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c 2010-08-13 16:24:37.000000000 -0400
8084 ++++ linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c 2010-12-31 14:46:53.000000000 -0500
8085 @@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u
8086 dst->grh.sgid_index = src->grh.sgid_index;
8087 dst->grh.hop_limit = src->grh.hop_limit;
8088 @@ -26465,9 +26588,9 @@ diff -urNp linux-2.6.32.32/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3
8089 }
8090 EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
8091
8092 -diff -urNp linux-2.6.32.32/drivers/input/keyboard/atkbd.c linux-2.6.32.32/drivers/input/keyboard/atkbd.c
8093 ---- linux-2.6.32.32/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
8094 -+++ linux-2.6.32.32/drivers/input/keyboard/atkbd.c 2010-12-31 14:46:53.000000000 -0500
8095 +diff -urNp linux-2.6.32.33/drivers/input/keyboard/atkbd.c linux-2.6.32.33/drivers/input/keyboard/atkbd.c
8096 +--- linux-2.6.32.33/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
8097 ++++ linux-2.6.32.33/drivers/input/keyboard/atkbd.c 2010-12-31 14:46:53.000000000 -0500
8098 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
8099 .id = SERIO_ANY,
8100 .extra = SERIO_ANY,
8101 @@ -26477,9 +26600,9 @@ diff -urNp linux-2.6.32.32/drivers/input/keyboard/atkbd.c linux-2.6.32.32/driver
8102 };
8103
8104 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
8105 -diff -urNp linux-2.6.32.32/drivers/input/mouse/lifebook.c linux-2.6.32.32/drivers/input/mouse/lifebook.c
8106 ---- linux-2.6.32.32/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
8107 -+++ linux-2.6.32.32/drivers/input/mouse/lifebook.c 2010-12-31 14:46:53.000000000 -0500
8108 +diff -urNp linux-2.6.32.33/drivers/input/mouse/lifebook.c linux-2.6.32.33/drivers/input/mouse/lifebook.c
8109 +--- linux-2.6.32.33/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
8110 ++++ linux-2.6.32.33/drivers/input/mouse/lifebook.c 2010-12-31 14:46:53.000000000 -0500
8111 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
8112 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
8113 },
8114 @@ -26489,9 +26612,9 @@ diff -urNp linux-2.6.32.32/drivers/input/mouse/lifebook.c linux-2.6.32.32/driver
8115 };
8116
8117 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
8118 -diff -urNp linux-2.6.32.32/drivers/input/mouse/psmouse-base.c linux-2.6.32.32/drivers/input/mouse/psmouse-base.c
8119 ---- linux-2.6.32.32/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
8120 -+++ linux-2.6.32.32/drivers/input/mouse/psmouse-base.c 2010-12-31 14:46:53.000000000 -0500
8121 +diff -urNp linux-2.6.32.33/drivers/input/mouse/psmouse-base.c linux-2.6.32.33/drivers/input/mouse/psmouse-base.c
8122 +--- linux-2.6.32.33/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
8123 ++++ linux-2.6.32.33/drivers/input/mouse/psmouse-base.c 2010-12-31 14:46:53.000000000 -0500
8124 @@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
8125 .id = SERIO_ANY,
8126 .extra = SERIO_ANY,
8127 @@ -26501,9 +26624,9 @@ diff -urNp linux-2.6.32.32/drivers/input/mouse/psmouse-base.c linux-2.6.32.32/dr
8128 };
8129
8130 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
8131 -diff -urNp linux-2.6.32.32/drivers/input/mouse/synaptics.c linux-2.6.32.32/drivers/input/mouse/synaptics.c
8132 ---- linux-2.6.32.32/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
8133 -+++ linux-2.6.32.32/drivers/input/mouse/synaptics.c 2010-12-31 14:46:53.000000000 -0500
8134 +diff -urNp linux-2.6.32.33/drivers/input/mouse/synaptics.c linux-2.6.32.33/drivers/input/mouse/synaptics.c
8135 +--- linux-2.6.32.33/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
8136 ++++ linux-2.6.32.33/drivers/input/mouse/synaptics.c 2010-12-31 14:46:53.000000000 -0500
8137 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str
8138 break;
8139 case 2:
8140 @@ -26532,9 +26655,9 @@ diff -urNp linux-2.6.32.32/drivers/input/mouse/synaptics.c linux-2.6.32.32/drive
8141 };
8142 #endif
8143
8144 -diff -urNp linux-2.6.32.32/drivers/input/mousedev.c linux-2.6.32.32/drivers/input/mousedev.c
8145 ---- linux-2.6.32.32/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
8146 -+++ linux-2.6.32.32/drivers/input/mousedev.c 2010-12-31 14:46:53.000000000 -0500
8147 +diff -urNp linux-2.6.32.33/drivers/input/mousedev.c linux-2.6.32.33/drivers/input/mousedev.c
8148 +--- linux-2.6.32.33/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
8149 ++++ linux-2.6.32.33/drivers/input/mousedev.c 2010-12-31 14:46:53.000000000 -0500
8150 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
8151
8152 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
8153 @@ -26544,9 +26667,9 @@ diff -urNp linux-2.6.32.32/drivers/input/mousedev.c linux-2.6.32.32/drivers/inpu
8154 };
8155 static int psaux_registered;
8156 #endif
8157 -diff -urNp linux-2.6.32.32/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.32/drivers/input/serio/i8042-x86ia64io.h
8158 ---- linux-2.6.32.32/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 15:56:54.000000000 -0500
8159 -+++ linux-2.6.32.32/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:04:30.000000000 -0500
8160 +diff -urNp linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h
8161 +--- linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 15:56:54.000000000 -0500
8162 ++++ linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:04:30.000000000 -0500
8163 @@ -179,7 +179,7 @@ static const struct dmi_system_id __init
8164 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
8165 },
8166 @@ -26601,9 +26724,9 @@ diff -urNp linux-2.6.32.32/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.32
8167 };
8168
8169 #endif /* CONFIG_X86 */
8170 -diff -urNp linux-2.6.32.32/drivers/input/serio/serio_raw.c linux-2.6.32.32/drivers/input/serio/serio_raw.c
8171 ---- linux-2.6.32.32/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
8172 -+++ linux-2.6.32.32/drivers/input/serio/serio_raw.c 2010-12-31 14:46:53.000000000 -0500
8173 +diff -urNp linux-2.6.32.33/drivers/input/serio/serio_raw.c linux-2.6.32.33/drivers/input/serio/serio_raw.c
8174 +--- linux-2.6.32.33/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
8175 ++++ linux-2.6.32.33/drivers/input/serio/serio_raw.c 2010-12-31 14:46:53.000000000 -0500
8176 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
8177 .id = SERIO_ANY,
8178 .extra = SERIO_ANY,
8179 @@ -26613,9 +26736,9 @@ diff -urNp linux-2.6.32.32/drivers/input/serio/serio_raw.c linux-2.6.32.32/drive
8180 };
8181
8182 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
8183 -diff -urNp linux-2.6.32.32/drivers/isdn/gigaset/common.c linux-2.6.32.32/drivers/isdn/gigaset/common.c
8184 ---- linux-2.6.32.32/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
8185 -+++ linux-2.6.32.32/drivers/isdn/gigaset/common.c 2011-01-24 18:05:30.000000000 -0500
8186 +diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/common.c linux-2.6.32.33/drivers/isdn/gigaset/common.c
8187 +--- linux-2.6.32.33/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
8188 ++++ linux-2.6.32.33/drivers/isdn/gigaset/common.c 2011-01-24 18:05:30.000000000 -0500
8189 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
8190 cs->commands_pending = 0;
8191 cs->cur_at_seq = 0;
8192 @@ -26625,9 +26748,9 @@ diff -urNp linux-2.6.32.32/drivers/isdn/gigaset/common.c linux-2.6.32.32/drivers
8193 cs->dev = NULL;
8194 cs->tty = NULL;
8195 cs->tty_dev = NULL;
8196 -diff -urNp linux-2.6.32.32/drivers/isdn/gigaset/gigaset.h linux-2.6.32.32/drivers/isdn/gigaset/gigaset.h
8197 ---- linux-2.6.32.32/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
8198 -+++ linux-2.6.32.32/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:47.000000000 -0500
8199 +diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h
8200 +--- linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
8201 ++++ linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:47.000000000 -0500
8202 @@ -34,6 +34,7 @@
8203 #include <linux/tty_driver.h>
8204 #include <linux/list.h>
8205 @@ -26645,9 +26768,9 @@ diff -urNp linux-2.6.32.32/drivers/isdn/gigaset/gigaset.h linux-2.6.32.32/driver
8206 struct tty_struct *tty;
8207 struct tasklet_struct if_wake_tasklet;
8208 unsigned control_state;
8209 -diff -urNp linux-2.6.32.32/drivers/isdn/gigaset/interface.c linux-2.6.32.32/drivers/isdn/gigaset/interface.c
8210 ---- linux-2.6.32.32/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
8211 -+++ linux-2.6.32.32/drivers/isdn/gigaset/interface.c 2011-01-24 18:05:30.000000000 -0500
8212 +diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/interface.c linux-2.6.32.33/drivers/isdn/gigaset/interface.c
8213 +--- linux-2.6.32.33/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
8214 ++++ linux-2.6.32.33/drivers/isdn/gigaset/interface.c 2011-01-24 18:05:30.000000000 -0500
8215 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
8216 return -ERESTARTSYS; // FIXME -EINTR?
8217 tty->driver_data = cs;
8218 @@ -26735,9 +26858,9 @@ diff -urNp linux-2.6.32.32/drivers/isdn/gigaset/interface.c linux-2.6.32.32/driv
8219 dev_warn(cs->dev, "%s: device not opened\n", __func__);
8220 goto out;
8221 }
8222 -diff -urNp linux-2.6.32.32/drivers/isdn/hardware/avm/b1.c linux-2.6.32.32/drivers/isdn/hardware/avm/b1.c
8223 ---- linux-2.6.32.32/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
8224 -+++ linux-2.6.32.32/drivers/isdn/hardware/avm/b1.c 2010-12-31 14:46:53.000000000 -0500
8225 +diff -urNp linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c
8226 +--- linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
8227 ++++ linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c 2010-12-31 14:46:53.000000000 -0500
8228 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
8229 }
8230 if (left) {
8231 @@ -26756,9 +26879,9 @@ diff -urNp linux-2.6.32.32/drivers/isdn/hardware/avm/b1.c linux-2.6.32.32/driver
8232 return -EFAULT;
8233 } else {
8234 memcpy(buf, dp, left);
8235 -diff -urNp linux-2.6.32.32/drivers/isdn/icn/icn.c linux-2.6.32.32/drivers/isdn/icn/icn.c
8236 ---- linux-2.6.32.32/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
8237 -+++ linux-2.6.32.32/drivers/isdn/icn/icn.c 2010-12-31 14:46:53.000000000 -0500
8238 +diff -urNp linux-2.6.32.33/drivers/isdn/icn/icn.c linux-2.6.32.33/drivers/isdn/icn/icn.c
8239 +--- linux-2.6.32.33/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
8240 ++++ linux-2.6.32.33/drivers/isdn/icn/icn.c 2010-12-31 14:46:53.000000000 -0500
8241 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
8242 if (count > len)
8243 count = len;
8244 @@ -26768,9 +26891,9 @@ diff -urNp linux-2.6.32.32/drivers/isdn/icn/icn.c linux-2.6.32.32/drivers/isdn/i
8245 return -EFAULT;
8246 } else
8247 memcpy(msg, buf, count);
8248 -diff -urNp linux-2.6.32.32/drivers/isdn/mISDN/socket.c linux-2.6.32.32/drivers/isdn/mISDN/socket.c
8249 ---- linux-2.6.32.32/drivers/isdn/mISDN/socket.c 2010-08-13 16:24:37.000000000 -0400
8250 -+++ linux-2.6.32.32/drivers/isdn/mISDN/socket.c 2010-12-31 14:46:53.000000000 -0500
8251 +diff -urNp linux-2.6.32.33/drivers/isdn/mISDN/socket.c linux-2.6.32.33/drivers/isdn/mISDN/socket.c
8252 +--- linux-2.6.32.33/drivers/isdn/mISDN/socket.c 2010-08-13 16:24:37.000000000 -0400
8253 ++++ linux-2.6.32.33/drivers/isdn/mISDN/socket.c 2010-12-31 14:46:53.000000000 -0500
8254 @@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
8255 if (dev) {
8256 struct mISDN_devinfo di;
8257 @@ -26787,9 +26910,9 @@ diff -urNp linux-2.6.32.32/drivers/isdn/mISDN/socket.c linux-2.6.32.32/drivers/i
8258 di.id = dev->id;
8259 di.Dprotocols = dev->Dprotocols;
8260 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
8261 -diff -urNp linux-2.6.32.32/drivers/isdn/sc/interrupt.c linux-2.6.32.32/drivers/isdn/sc/interrupt.c
8262 ---- linux-2.6.32.32/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400
8263 -+++ linux-2.6.32.32/drivers/isdn/sc/interrupt.c 2010-12-31 14:46:53.000000000 -0500
8264 +diff -urNp linux-2.6.32.33/drivers/isdn/sc/interrupt.c linux-2.6.32.33/drivers/isdn/sc/interrupt.c
8265 +--- linux-2.6.32.33/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400
8266 ++++ linux-2.6.32.33/drivers/isdn/sc/interrupt.c 2010-12-31 14:46:53.000000000 -0500
8267 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
8268 }
8269 else if(callid>=0x0000 && callid<=0x7FFF)
8270 @@ -26824,9 +26947,9 @@ diff -urNp linux-2.6.32.32/drivers/isdn/sc/interrupt.c linux-2.6.32.32/drivers/i
8271 continue;
8272 }
8273
8274 -diff -urNp linux-2.6.32.32/drivers/lguest/core.c linux-2.6.32.32/drivers/lguest/core.c
8275 ---- linux-2.6.32.32/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
8276 -+++ linux-2.6.32.32/drivers/lguest/core.c 2010-12-31 14:46:53.000000000 -0500
8277 +diff -urNp linux-2.6.32.33/drivers/lguest/core.c linux-2.6.32.33/drivers/lguest/core.c
8278 +--- linux-2.6.32.33/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
8279 ++++ linux-2.6.32.33/drivers/lguest/core.c 2010-12-31 14:46:53.000000000 -0500
8280 @@ -91,9 +91,17 @@ static __init int map_switcher(void)
8281 * it's worked so far. The end address needs +1 because __get_vm_area
8282 * allocates an extra guard page, so we need space for that.
8283 @@ -26854,9 +26977,9 @@ diff -urNp linux-2.6.32.32/drivers/lguest/core.c linux-2.6.32.32/drivers/lguest/
8284 end_switcher_text - start_switcher_text);
8285
8286 printk(KERN_INFO "lguest: mapped switcher at %p\n",
8287 -diff -urNp linux-2.6.32.32/drivers/lguest/x86/core.c linux-2.6.32.32/drivers/lguest/x86/core.c
8288 ---- linux-2.6.32.32/drivers/lguest/x86/core.c 2010-08-13 16:24:37.000000000 -0400
8289 -+++ linux-2.6.32.32/drivers/lguest/x86/core.c 2010-12-31 14:47:01.000000000 -0500
8290 +diff -urNp linux-2.6.32.33/drivers/lguest/x86/core.c linux-2.6.32.33/drivers/lguest/x86/core.c
8291 +--- linux-2.6.32.33/drivers/lguest/x86/core.c 2010-08-13 16:24:37.000000000 -0400
8292 ++++ linux-2.6.32.33/drivers/lguest/x86/core.c 2010-12-31 14:47:01.000000000 -0500
8293 @@ -59,7 +59,7 @@ static struct {
8294 /* Offset from where switcher.S was compiled to where we've copied it */
8295 static unsigned long switcher_offset(void)
8296 @@ -26898,9 +27021,9 @@ diff -urNp linux-2.6.32.32/drivers/lguest/x86/core.c linux-2.6.32.32/drivers/lgu
8297 lguest_entry.segment = LGUEST_CS;
8298
8299 /*
8300 -diff -urNp linux-2.6.32.32/drivers/lguest/x86/switcher_32.S linux-2.6.32.32/drivers/lguest/x86/switcher_32.S
8301 ---- linux-2.6.32.32/drivers/lguest/x86/switcher_32.S 2010-08-13 16:24:37.000000000 -0400
8302 -+++ linux-2.6.32.32/drivers/lguest/x86/switcher_32.S 2010-12-31 14:47:01.000000000 -0500
8303 +diff -urNp linux-2.6.32.33/drivers/lguest/x86/switcher_32.S linux-2.6.32.33/drivers/lguest/x86/switcher_32.S
8304 +--- linux-2.6.32.33/drivers/lguest/x86/switcher_32.S 2010-08-13 16:24:37.000000000 -0400
8305 ++++ linux-2.6.32.33/drivers/lguest/x86/switcher_32.S 2010-12-31 14:47:01.000000000 -0500
8306 @@ -87,6 +87,7 @@
8307 #include <asm/page.h>
8308 #include <asm/segment.h>
8309 @@ -26959,9 +27082,9 @@ diff -urNp linux-2.6.32.32/drivers/lguest/x86/switcher_32.S linux-2.6.32.32/driv
8310
8311 // Every interrupt can come to us here
8312 // But we must truly tell each apart.
8313 -diff -urNp linux-2.6.32.32/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.32/drivers/macintosh/via-pmu-backlight.c
8314 ---- linux-2.6.32.32/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
8315 -+++ linux-2.6.32.32/drivers/macintosh/via-pmu-backlight.c 2010-12-31 14:46:53.000000000 -0500
8316 +diff -urNp linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c
8317 +--- linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
8318 ++++ linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c 2010-12-31 14:46:53.000000000 -0500
8319 @@ -15,7 +15,7 @@
8320
8321 #define MAX_PMU_LEVEL 0xFF
8322 @@ -26980,9 +27103,9 @@ diff -urNp linux-2.6.32.32/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.32
8323 .get_brightness = pmu_backlight_get_brightness,
8324 .update_status = pmu_backlight_update_status,
8325
8326 -diff -urNp linux-2.6.32.32/drivers/macintosh/via-pmu.c linux-2.6.32.32/drivers/macintosh/via-pmu.c
8327 ---- linux-2.6.32.32/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
8328 -+++ linux-2.6.32.32/drivers/macintosh/via-pmu.c 2010-12-31 14:46:53.000000000 -0500
8329 +diff -urNp linux-2.6.32.33/drivers/macintosh/via-pmu.c linux-2.6.32.33/drivers/macintosh/via-pmu.c
8330 +--- linux-2.6.32.33/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
8331 ++++ linux-2.6.32.33/drivers/macintosh/via-pmu.c 2010-12-31 14:46:53.000000000 -0500
8332 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
8333 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
8334 }
8335 @@ -26992,9 +27115,9 @@ diff -urNp linux-2.6.32.32/drivers/macintosh/via-pmu.c linux-2.6.32.32/drivers/m
8336 .enter = powerbook_sleep,
8337 .valid = pmu_sleep_valid,
8338 };
8339 -diff -urNp linux-2.6.32.32/drivers/md/bitmap.c linux-2.6.32.32/drivers/md/bitmap.c
8340 ---- linux-2.6.32.32/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
8341 -+++ linux-2.6.32.32/drivers/md/bitmap.c 2010-12-31 14:46:53.000000000 -0500
8342 +diff -urNp linux-2.6.32.33/drivers/md/bitmap.c linux-2.6.32.33/drivers/md/bitmap.c
8343 +--- linux-2.6.32.33/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
8344 ++++ linux-2.6.32.33/drivers/md/bitmap.c 2010-12-31 14:46:53.000000000 -0500
8345 @@ -58,7 +58,7 @@
8346 # if DEBUG > 0
8347 # define PRINTK(x...) printk(KERN_DEBUG x)
8348 @@ -27004,9 +27127,9 @@ diff -urNp linux-2.6.32.32/drivers/md/bitmap.c linux-2.6.32.32/drivers/md/bitmap
8349 # endif
8350 #endif
8351
8352 -diff -urNp linux-2.6.32.32/drivers/md/dm-ioctl.c linux-2.6.32.32/drivers/md/dm-ioctl.c
8353 ---- linux-2.6.32.32/drivers/md/dm-ioctl.c 2010-08-29 21:08:20.000000000 -0400
8354 -+++ linux-2.6.32.32/drivers/md/dm-ioctl.c 2011-02-27 14:53:10.000000000 -0500
8355 +diff -urNp linux-2.6.32.33/drivers/md/dm-ioctl.c linux-2.6.32.33/drivers/md/dm-ioctl.c
8356 +--- linux-2.6.32.33/drivers/md/dm-ioctl.c 2010-08-29 21:08:20.000000000 -0400
8357 ++++ linux-2.6.32.33/drivers/md/dm-ioctl.c 2011-02-27 14:53:10.000000000 -0500
8358 @@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str
8359 cmd == DM_LIST_VERSIONS_CMD)
8360 return 0;
8361 @@ -27016,9 +27139,9 @@ diff -urNp linux-2.6.32.32/drivers/md/dm-ioctl.c linux-2.6.32.32/drivers/md/dm-i
8362 if (!*param->name) {
8363 DMWARN("name not supplied when creating device");
8364 return -EINVAL;
8365 -diff -urNp linux-2.6.32.32/drivers/md/dm-sysfs.c linux-2.6.32.32/drivers/md/dm-sysfs.c
8366 ---- linux-2.6.32.32/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
8367 -+++ linux-2.6.32.32/drivers/md/dm-sysfs.c 2010-12-31 14:46:53.000000000 -0500
8368 +diff -urNp linux-2.6.32.33/drivers/md/dm-sysfs.c linux-2.6.32.33/drivers/md/dm-sysfs.c
8369 +--- linux-2.6.32.33/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
8370 ++++ linux-2.6.32.33/drivers/md/dm-sysfs.c 2010-12-31 14:46:53.000000000 -0500
8371 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
8372 NULL,
8373 };
8374 @@ -27028,9 +27151,9 @@ diff -urNp linux-2.6.32.32/drivers/md/dm-sysfs.c linux-2.6.32.32/drivers/md/dm-s
8375 .show = dm_attr_show,
8376 };
8377
8378 -diff -urNp linux-2.6.32.32/drivers/md/dm-table.c linux-2.6.32.32/drivers/md/dm-table.c
8379 ---- linux-2.6.32.32/drivers/md/dm-table.c 2011-01-11 23:55:35.000000000 -0500
8380 -+++ linux-2.6.32.32/drivers/md/dm-table.c 2011-01-11 23:56:03.000000000 -0500
8381 +diff -urNp linux-2.6.32.33/drivers/md/dm-table.c linux-2.6.32.33/drivers/md/dm-table.c
8382 +--- linux-2.6.32.33/drivers/md/dm-table.c 2011-01-11 23:55:35.000000000 -0500
8383 ++++ linux-2.6.32.33/drivers/md/dm-table.c 2011-01-11 23:56:03.000000000 -0500
8384 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
8385 if (!dev_size)
8386 return 0;
8387 @@ -27040,9 +27163,9 @@ diff -urNp linux-2.6.32.32/drivers/md/dm-table.c linux-2.6.32.32/drivers/md/dm-t
8388 DMWARN("%s: %s too small for target: "
8389 "start=%llu, len=%llu, dev_size=%llu",
8390 dm_device_name(ti->table->md), bdevname(bdev, b),
8391 -diff -urNp linux-2.6.32.32/drivers/md/md.c linux-2.6.32.32/drivers/md/md.c
8392 ---- linux-2.6.32.32/drivers/md/md.c 2011-03-02 17:24:54.000000000 -0500
8393 -+++ linux-2.6.32.32/drivers/md/md.c 2011-03-02 17:25:19.000000000 -0500
8394 +diff -urNp linux-2.6.32.33/drivers/md/md.c linux-2.6.32.33/drivers/md/md.c
8395 +--- linux-2.6.32.33/drivers/md/md.c 2011-03-02 17:24:54.000000000 -0500
8396 ++++ linux-2.6.32.33/drivers/md/md.c 2011-03-02 17:25:19.000000000 -0500
8397 @@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko
8398 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
8399 kfree(rdev);
8400 @@ -27089,9 +27212,9 @@ diff -urNp linux-2.6.32.32/drivers/md/md.c linux-2.6.32.32/drivers/md/md.c
8401 /* sync IO will cause sync_io to increase before the disk_stats
8402 * as sync_io is counted when a request starts, and
8403 * disk_stats is counted when it completes.
8404 -diff -urNp linux-2.6.32.32/drivers/md/md.h linux-2.6.32.32/drivers/md/md.h
8405 ---- linux-2.6.32.32/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
8406 -+++ linux-2.6.32.32/drivers/md/md.h 2010-12-31 14:46:53.000000000 -0500
8407 +diff -urNp linux-2.6.32.33/drivers/md/md.h linux-2.6.32.33/drivers/md/md.h
8408 +--- linux-2.6.32.33/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
8409 ++++ linux-2.6.32.33/drivers/md/md.h 2010-12-31 14:46:53.000000000 -0500
8410 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
8411
8412 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
8413 @@ -27101,9 +27224,9 @@ diff -urNp linux-2.6.32.32/drivers/md/md.h linux-2.6.32.32/drivers/md/md.h
8414 }
8415
8416 struct mdk_personality
8417 -diff -urNp linux-2.6.32.32/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.32/drivers/media/dvb/dvb-core/dvbdev.c
8418 ---- linux-2.6.32.32/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
8419 -+++ linux-2.6.32.32/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-31 14:46:53.000000000 -0500
8420 +diff -urNp linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c
8421 +--- linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
8422 ++++ linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-31 14:46:53.000000000 -0500
8423 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
8424 const struct dvb_device *template, void *priv, int type)
8425 {
8426 @@ -27112,9 +27235,9 @@ diff -urNp linux-2.6.32.32/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.32/d
8427 struct file_operations *dvbdevfops;
8428 struct device *clsdev;
8429 int minor;
8430 -diff -urNp linux-2.6.32.32/drivers/media/radio/radio-cadet.c linux-2.6.32.32/drivers/media/radio/radio-cadet.c
8431 ---- linux-2.6.32.32/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
8432 -+++ linux-2.6.32.32/drivers/media/radio/radio-cadet.c 2010-12-31 14:46:53.000000000 -0500
8433 +diff -urNp linux-2.6.32.33/drivers/media/radio/radio-cadet.c linux-2.6.32.33/drivers/media/radio/radio-cadet.c
8434 +--- linux-2.6.32.33/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
8435 ++++ linux-2.6.32.33/drivers/media/radio/radio-cadet.c 2010-12-31 14:46:53.000000000 -0500
8436 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
8437 while (i < count && dev->rdsin != dev->rdsout)
8438 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
8439 @@ -27124,9 +27247,9 @@ diff -urNp linux-2.6.32.32/drivers/media/radio/radio-cadet.c linux-2.6.32.32/dri
8440 return -EFAULT;
8441 return i;
8442 }
8443 -diff -urNp linux-2.6.32.32/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.32.32/drivers/media/video/sn9c102/sn9c102_core.c
8444 ---- linux-2.6.32.32/drivers/media/video/sn9c102/sn9c102_core.c 2010-08-13 16:24:37.000000000 -0400
8445 -+++ linux-2.6.32.32/drivers/media/video/sn9c102/sn9c102_core.c 2011-02-27 15:19:00.000000000 -0500
8446 +diff -urNp linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c
8447 +--- linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c 2010-08-13 16:24:37.000000000 -0400
8448 ++++ linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c 2011-02-27 15:19:00.000000000 -0500
8449 @@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_
8450 sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
8451 static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
8452 @@ -27140,9 +27263,9 @@ diff -urNp linux-2.6.32.32/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.
8453 static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL);
8454
8455
8456 -diff -urNp linux-2.6.32.32/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.32/drivers/media/video/usbvideo/konicawc.c
8457 ---- linux-2.6.32.32/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
8458 -+++ linux-2.6.32.32/drivers/media/video/usbvideo/konicawc.c 2010-12-31 14:46:53.000000000 -0500
8459 +diff -urNp linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c
8460 +--- linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
8461 ++++ linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c 2010-12-31 14:46:53.000000000 -0500
8462 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru
8463 int error;
8464
8465 @@ -27152,9 +27275,9 @@ diff -urNp linux-2.6.32.32/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
8466
8467 cam->input = input_dev = input_allocate_device();
8468 if (!input_dev) {
8469 -diff -urNp linux-2.6.32.32/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.32/drivers/media/video/usbvideo/quickcam_messenger.c
8470 ---- linux-2.6.32.32/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
8471 -+++ linux-2.6.32.32/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-31 14:46:53.000000000 -0500
8472 +diff -urNp linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c
8473 +--- linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
8474 ++++ linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-31 14:46:53.000000000 -0500
8475 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
8476 int error;
8477
8478 @@ -27164,9 +27287,9 @@ diff -urNp linux-2.6.32.32/drivers/media/video/usbvideo/quickcam_messenger.c lin
8479
8480 cam->input = input_dev = input_allocate_device();
8481 if (!input_dev) {
8482 -diff -urNp linux-2.6.32.32/drivers/message/fusion/mptbase.c linux-2.6.32.32/drivers/message/fusion/mptbase.c
8483 ---- linux-2.6.32.32/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
8484 -+++ linux-2.6.32.32/drivers/message/fusion/mptbase.c 2010-12-31 14:46:53.000000000 -0500
8485 +diff -urNp linux-2.6.32.33/drivers/message/fusion/mptbase.c linux-2.6.32.33/drivers/message/fusion/mptbase.c
8486 +--- linux-2.6.32.33/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
8487 ++++ linux-2.6.32.33/drivers/message/fusion/mptbase.c 2010-12-31 14:46:53.000000000 -0500
8488 @@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
8489 len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
8490 len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
8491 @@ -27182,9 +27305,9 @@ diff -urNp linux-2.6.32.32/drivers/message/fusion/mptbase.c linux-2.6.32.32/driv
8492 /*
8493 * Rounding UP to nearest 4-kB boundary here...
8494 */
8495 -diff -urNp linux-2.6.32.32/drivers/message/fusion/mptdebug.h linux-2.6.32.32/drivers/message/fusion/mptdebug.h
8496 ---- linux-2.6.32.32/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
8497 -+++ linux-2.6.32.32/drivers/message/fusion/mptdebug.h 2010-12-31 14:46:53.000000000 -0500
8498 +diff -urNp linux-2.6.32.33/drivers/message/fusion/mptdebug.h linux-2.6.32.33/drivers/message/fusion/mptdebug.h
8499 +--- linux-2.6.32.33/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
8500 ++++ linux-2.6.32.33/drivers/message/fusion/mptdebug.h 2010-12-31 14:46:53.000000000 -0500
8501 @@ -71,7 +71,7 @@
8502 CMD; \
8503 }
8504 @@ -27194,9 +27317,9 @@ diff -urNp linux-2.6.32.32/drivers/message/fusion/mptdebug.h linux-2.6.32.32/dri
8505 #endif
8506
8507
8508 -diff -urNp linux-2.6.32.32/drivers/message/fusion/mptsas.c linux-2.6.32.32/drivers/message/fusion/mptsas.c
8509 ---- linux-2.6.32.32/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
8510 -+++ linux-2.6.32.32/drivers/message/fusion/mptsas.c 2010-12-31 14:46:53.000000000 -0500
8511 +diff -urNp linux-2.6.32.33/drivers/message/fusion/mptsas.c linux-2.6.32.33/drivers/message/fusion/mptsas.c
8512 +--- linux-2.6.32.33/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
8513 ++++ linux-2.6.32.33/drivers/message/fusion/mptsas.c 2010-12-31 14:46:53.000000000 -0500
8514 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
8515 return 0;
8516 }
8517 @@ -27245,9 +27368,9 @@ diff -urNp linux-2.6.32.32/drivers/message/fusion/mptsas.c linux-2.6.32.32/drive
8518 static inline struct sas_port *
8519 mptsas_get_port(struct mptsas_phyinfo *phy_info)
8520 {
8521 -diff -urNp linux-2.6.32.32/drivers/message/fusion/mptscsih.c linux-2.6.32.32/drivers/message/fusion/mptscsih.c
8522 ---- linux-2.6.32.32/drivers/message/fusion/mptscsih.c 2011-03-02 17:24:54.000000000 -0500
8523 -+++ linux-2.6.32.32/drivers/message/fusion/mptscsih.c 2011-03-02 17:25:24.000000000 -0500
8524 +diff -urNp linux-2.6.32.33/drivers/message/fusion/mptscsih.c linux-2.6.32.33/drivers/message/fusion/mptscsih.c
8525 +--- linux-2.6.32.33/drivers/message/fusion/mptscsih.c 2011-03-02 17:24:54.000000000 -0500
8526 ++++ linux-2.6.32.33/drivers/message/fusion/mptscsih.c 2011-03-02 17:25:24.000000000 -0500
8527 @@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
8528
8529 h = shost_priv(SChost);
8530 @@ -27273,9 +27396,9 @@ diff -urNp linux-2.6.32.32/drivers/message/fusion/mptscsih.c linux-2.6.32.32/dri
8531
8532 return h->info_kbuf;
8533 }
8534 -diff -urNp linux-2.6.32.32/drivers/message/i2o/i2o_proc.c linux-2.6.32.32/drivers/message/i2o/i2o_proc.c
8535 ---- linux-2.6.32.32/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
8536 -+++ linux-2.6.32.32/drivers/message/i2o/i2o_proc.c 2010-12-31 14:46:53.000000000 -0500
8537 +diff -urNp linux-2.6.32.33/drivers/message/i2o/i2o_proc.c linux-2.6.32.33/drivers/message/i2o/i2o_proc.c
8538 +--- linux-2.6.32.33/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
8539 ++++ linux-2.6.32.33/drivers/message/i2o/i2o_proc.c 2010-12-31 14:46:53.000000000 -0500
8540 @@ -259,13 +259,6 @@ static char *scsi_devices[] = {
8541 "Array Controller Device"
8542 };
8543 @@ -27362,9 +27485,9 @@ diff -urNp linux-2.6.32.32/drivers/message/i2o/i2o_proc.c linux-2.6.32.32/driver
8544
8545 return 0;
8546 }
8547 -diff -urNp linux-2.6.32.32/drivers/mfd/ab3100-core.c linux-2.6.32.32/drivers/mfd/ab3100-core.c
8548 ---- linux-2.6.32.32/drivers/mfd/ab3100-core.c 2010-08-13 16:24:37.000000000 -0400
8549 -+++ linux-2.6.32.32/drivers/mfd/ab3100-core.c 2011-02-27 15:32:18.000000000 -0500
8550 +diff -urNp linux-2.6.32.33/drivers/mfd/ab3100-core.c linux-2.6.32.33/drivers/mfd/ab3100-core.c
8551 +--- linux-2.6.32.33/drivers/mfd/ab3100-core.c 2010-08-13 16:24:37.000000000 -0400
8552 ++++ linux-2.6.32.33/drivers/mfd/ab3100-core.c 2011-02-27 15:32:18.000000000 -0500
8553 @@ -591,7 +591,7 @@ static void ab3100_setup_debugfs(struct
8554 ab3100_get_priv.ab3100 = ab3100;
8555 ab3100_get_priv.mode = false;
8556 @@ -27383,9 +27506,9 @@ diff -urNp linux-2.6.32.32/drivers/mfd/ab3100-core.c linux-2.6.32.32/drivers/mfd
8557 &ab3100_get_set_reg_fops);
8558 if (!ab3100_set_reg_file) {
8559 err = -ENOMEM;
8560 -diff -urNp linux-2.6.32.32/drivers/misc/ep93xx_pwm.c linux-2.6.32.32/drivers/misc/ep93xx_pwm.c
8561 ---- linux-2.6.32.32/drivers/misc/ep93xx_pwm.c 2010-08-13 16:24:37.000000000 -0400
8562 -+++ linux-2.6.32.32/drivers/misc/ep93xx_pwm.c 2011-02-27 15:23:39.000000000 -0500
8563 +diff -urNp linux-2.6.32.33/drivers/misc/ep93xx_pwm.c linux-2.6.32.33/drivers/misc/ep93xx_pwm.c
8564 +--- linux-2.6.32.33/drivers/misc/ep93xx_pwm.c 2010-08-13 16:24:37.000000000 -0400
8565 ++++ linux-2.6.32.33/drivers/misc/ep93xx_pwm.c 2011-02-27 15:23:39.000000000 -0500
8566 @@ -248,11 +248,11 @@ static ssize_t ep93xx_pwm_set_invert(str
8567
8568 static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL);
8569 @@ -27401,9 +27524,9 @@ diff -urNp linux-2.6.32.32/drivers/misc/ep93xx_pwm.c linux-2.6.32.32/drivers/mis
8570 ep93xx_pwm_get_invert, ep93xx_pwm_set_invert);
8571
8572 static struct attribute *ep93xx_pwm_attrs[] = {
8573 -diff -urNp linux-2.6.32.32/drivers/misc/kgdbts.c linux-2.6.32.32/drivers/misc/kgdbts.c
8574 ---- linux-2.6.32.32/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
8575 -+++ linux-2.6.32.32/drivers/misc/kgdbts.c 2010-12-31 14:46:53.000000000 -0500
8576 +diff -urNp linux-2.6.32.33/drivers/misc/kgdbts.c linux-2.6.32.33/drivers/misc/kgdbts.c
8577 +--- linux-2.6.32.33/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
8578 ++++ linux-2.6.32.33/drivers/misc/kgdbts.c 2010-12-31 14:46:53.000000000 -0500
8579 @@ -118,7 +118,7 @@
8580 } while (0)
8581 #define MAX_CONFIG_LEN 40
8582 @@ -27422,9 +27545,9 @@ diff -urNp linux-2.6.32.32/drivers/misc/kgdbts.c linux-2.6.32.32/drivers/misc/kg
8583 .name = "kgdbts",
8584 .read_char = kgdbts_get_char,
8585 .write_char = kgdbts_put_char,
8586 -diff -urNp linux-2.6.32.32/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.32/drivers/misc/sgi-gru/gruhandles.c
8587 ---- linux-2.6.32.32/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
8588 -+++ linux-2.6.32.32/drivers/misc/sgi-gru/gruhandles.c 2010-12-31 14:46:53.000000000 -0500
8589 +diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c
8590 +--- linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
8591 ++++ linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c 2010-12-31 14:46:53.000000000 -0500
8592 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
8593
8594 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
8595 @@ -27436,9 +27559,9 @@ diff -urNp linux-2.6.32.32/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.32/dri
8596 if (mcs_op_statistics[op].max < clks)
8597 mcs_op_statistics[op].max = clks;
8598 }
8599 -diff -urNp linux-2.6.32.32/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.32/drivers/misc/sgi-gru/gruprocfs.c
8600 ---- linux-2.6.32.32/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
8601 -+++ linux-2.6.32.32/drivers/misc/sgi-gru/gruprocfs.c 2010-12-31 14:46:53.000000000 -0500
8602 +diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c
8603 +--- linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
8604 ++++ linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c 2010-12-31 14:46:53.000000000 -0500
8605 @@ -32,9 +32,9 @@
8606
8607 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
8608 @@ -27462,9 +27585,9 @@ diff -urNp linux-2.6.32.32/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.32/driv
8609 max = mcs_op_statistics[op].max;
8610 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
8611 count ? total / count : 0, max);
8612 -diff -urNp linux-2.6.32.32/drivers/misc/sgi-gru/grutables.h linux-2.6.32.32/drivers/misc/sgi-gru/grutables.h
8613 ---- linux-2.6.32.32/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
8614 -+++ linux-2.6.32.32/drivers/misc/sgi-gru/grutables.h 2010-12-31 14:46:53.000000000 -0500
8615 +diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h
8616 +--- linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
8617 ++++ linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h 2010-12-31 14:46:53.000000000 -0500
8618 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
8619 * GRU statistics.
8620 */
8621 @@ -27648,9 +27771,9 @@ diff -urNp linux-2.6.32.32/drivers/misc/sgi-gru/grutables.h linux-2.6.32.32/driv
8622 } while (0)
8623
8624 #ifdef CONFIG_SGI_GRU_DEBUG
8625 -diff -urNp linux-2.6.32.32/drivers/mtd/devices/doc2000.c linux-2.6.32.32/drivers/mtd/devices/doc2000.c
8626 ---- linux-2.6.32.32/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
8627 -+++ linux-2.6.32.32/drivers/mtd/devices/doc2000.c 2010-12-31 14:46:53.000000000 -0500
8628 +diff -urNp linux-2.6.32.33/drivers/mtd/devices/doc2000.c linux-2.6.32.33/drivers/mtd/devices/doc2000.c
8629 +--- linux-2.6.32.33/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
8630 ++++ linux-2.6.32.33/drivers/mtd/devices/doc2000.c 2010-12-31 14:46:53.000000000 -0500
8631 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
8632
8633 /* The ECC will not be calculated correctly if less than 512 is written */
8634 @@ -27660,9 +27783,9 @@ diff -urNp linux-2.6.32.32/drivers/mtd/devices/doc2000.c linux-2.6.32.32/drivers
8635 printk(KERN_WARNING
8636 "ECC needs a full sector write (adr: %lx size %lx)\n",
8637 (long) to, (long) len);
8638 -diff -urNp linux-2.6.32.32/drivers/mtd/devices/doc2001.c linux-2.6.32.32/drivers/mtd/devices/doc2001.c
8639 ---- linux-2.6.32.32/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
8640 -+++ linux-2.6.32.32/drivers/mtd/devices/doc2001.c 2010-12-31 14:46:53.000000000 -0500
8641 +diff -urNp linux-2.6.32.33/drivers/mtd/devices/doc2001.c linux-2.6.32.33/drivers/mtd/devices/doc2001.c
8642 +--- linux-2.6.32.33/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
8643 ++++ linux-2.6.32.33/drivers/mtd/devices/doc2001.c 2010-12-31 14:46:53.000000000 -0500
8644 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
8645 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
8646
8647 @@ -27672,9 +27795,9 @@ diff -urNp linux-2.6.32.32/drivers/mtd/devices/doc2001.c linux-2.6.32.32/drivers
8648 return -EINVAL;
8649
8650 /* Don't allow a single read to cross a 512-byte block boundary */
8651 -diff -urNp linux-2.6.32.32/drivers/mtd/ubi/build.c linux-2.6.32.32/drivers/mtd/ubi/build.c
8652 ---- linux-2.6.32.32/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
8653 -+++ linux-2.6.32.32/drivers/mtd/ubi/build.c 2010-12-31 14:46:53.000000000 -0500
8654 +diff -urNp linux-2.6.32.33/drivers/mtd/ubi/build.c linux-2.6.32.33/drivers/mtd/ubi/build.c
8655 +--- linux-2.6.32.33/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
8656 ++++ linux-2.6.32.33/drivers/mtd/ubi/build.c 2010-12-31 14:46:53.000000000 -0500
8657 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
8658 static int __init bytes_str_to_int(const char *str)
8659 {
8660 @@ -27714,9 +27837,9 @@ diff -urNp linux-2.6.32.32/drivers/mtd/ubi/build.c linux-2.6.32.32/drivers/mtd/u
8661 }
8662
8663 /**
8664 -diff -urNp linux-2.6.32.32/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.32/drivers/net/cxgb3/cxgb3_main.c
8665 ---- linux-2.6.32.32/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
8666 -+++ linux-2.6.32.32/drivers/net/cxgb3/cxgb3_main.c 2010-12-31 14:46:53.000000000 -0500
8667 +diff -urNp linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c
8668 +--- linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
8669 ++++ linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c 2010-12-31 14:46:53.000000000 -0500
8670 @@ -2275,7 +2275,7 @@ static int cxgb_extension_ioctl(struct n
8671 case CHELSIO_GET_QSET_NUM:{
8672 struct ch_reg edata;
8673 @@ -27726,9 +27849,9 @@ diff -urNp linux-2.6.32.32/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.32/driver
8674
8675 edata.cmd = CHELSIO_GET_QSET_NUM;
8676 edata.val = pi->nqsets;
8677 -diff -urNp linux-2.6.32.32/drivers/net/e1000e/82571.c linux-2.6.32.32/drivers/net/e1000e/82571.c
8678 ---- linux-2.6.32.32/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
8679 -+++ linux-2.6.32.32/drivers/net/e1000e/82571.c 2010-12-31 14:46:53.000000000 -0500
8680 +diff -urNp linux-2.6.32.33/drivers/net/e1000e/82571.c linux-2.6.32.33/drivers/net/e1000e/82571.c
8681 +--- linux-2.6.32.33/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
8682 ++++ linux-2.6.32.33/drivers/net/e1000e/82571.c 2010-12-31 14:46:53.000000000 -0500
8683 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
8684 {
8685 struct e1000_hw *hw = &adapter->hw;
8686 @@ -27782,9 +27905,9 @@ diff -urNp linux-2.6.32.32/drivers/net/e1000e/82571.c linux-2.6.32.32/drivers/ne
8687 .acquire_nvm = e1000_acquire_nvm_82571,
8688 .read_nvm = e1000e_read_nvm_eerd,
8689 .release_nvm = e1000_release_nvm_82571,
8690 -diff -urNp linux-2.6.32.32/drivers/net/e1000e/e1000.h linux-2.6.32.32/drivers/net/e1000e/e1000.h
8691 ---- linux-2.6.32.32/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
8692 -+++ linux-2.6.32.32/drivers/net/e1000e/e1000.h 2010-12-31 14:46:53.000000000 -0500
8693 +diff -urNp linux-2.6.32.33/drivers/net/e1000e/e1000.h linux-2.6.32.33/drivers/net/e1000e/e1000.h
8694 +--- linux-2.6.32.33/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
8695 ++++ linux-2.6.32.33/drivers/net/e1000e/e1000.h 2010-12-31 14:46:53.000000000 -0500
8696 @@ -375,9 +375,9 @@ struct e1000_info {
8697 u32 pba;
8698 u32 max_hw_frame_size;
8699 @@ -27798,9 +27921,9 @@ diff -urNp linux-2.6.32.32/drivers/net/e1000e/e1000.h linux-2.6.32.32/drivers/ne
8700 };
8701
8702 /* hardware capability, feature, and workaround flags */
8703 -diff -urNp linux-2.6.32.32/drivers/net/e1000e/es2lan.c linux-2.6.32.32/drivers/net/e1000e/es2lan.c
8704 ---- linux-2.6.32.32/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
8705 -+++ linux-2.6.32.32/drivers/net/e1000e/es2lan.c 2010-12-31 14:46:53.000000000 -0500
8706 +diff -urNp linux-2.6.32.33/drivers/net/e1000e/es2lan.c linux-2.6.32.33/drivers/net/e1000e/es2lan.c
8707 +--- linux-2.6.32.33/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
8708 ++++ linux-2.6.32.33/drivers/net/e1000e/es2lan.c 2010-12-31 14:46:53.000000000 -0500
8709 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
8710 {
8711 struct e1000_hw *hw = &adapter->hw;
8712 @@ -27836,9 +27959,9 @@ diff -urNp linux-2.6.32.32/drivers/net/e1000e/es2lan.c linux-2.6.32.32/drivers/n
8713 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
8714 .read_nvm = e1000e_read_nvm_eerd,
8715 .release_nvm = e1000_release_nvm_80003es2lan,
8716 -diff -urNp linux-2.6.32.32/drivers/net/e1000e/hw.h linux-2.6.32.32/drivers/net/e1000e/hw.h
8717 ---- linux-2.6.32.32/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
8718 -+++ linux-2.6.32.32/drivers/net/e1000e/hw.h 2010-12-31 14:46:53.000000000 -0500
8719 +diff -urNp linux-2.6.32.33/drivers/net/e1000e/hw.h linux-2.6.32.33/drivers/net/e1000e/hw.h
8720 +--- linux-2.6.32.33/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
8721 ++++ linux-2.6.32.33/drivers/net/e1000e/hw.h 2010-12-31 14:46:53.000000000 -0500
8722 @@ -756,34 +756,34 @@ struct e1000_mac_operations {
8723
8724 /* Function pointers for the PHY. */
8725 @@ -27898,9 +28021,9 @@ diff -urNp linux-2.6.32.32/drivers/net/e1000e/hw.h linux-2.6.32.32/drivers/net/e
8726 };
8727
8728 struct e1000_mac_info {
8729 -diff -urNp linux-2.6.32.32/drivers/net/e1000e/ich8lan.c linux-2.6.32.32/drivers/net/e1000e/ich8lan.c
8730 ---- linux-2.6.32.32/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
8731 -+++ linux-2.6.32.32/drivers/net/e1000e/ich8lan.c 2010-12-31 14:46:53.000000000 -0500
8732 +diff -urNp linux-2.6.32.33/drivers/net/e1000e/ich8lan.c linux-2.6.32.33/drivers/net/e1000e/ich8lan.c
8733 +--- linux-2.6.32.33/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
8734 ++++ linux-2.6.32.33/drivers/net/e1000e/ich8lan.c 2010-12-31 14:46:53.000000000 -0500
8735 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
8736 }
8737 }
8738 @@ -27928,9 +28051,9 @@ diff -urNp linux-2.6.32.32/drivers/net/e1000e/ich8lan.c linux-2.6.32.32/drivers/
8739 .acquire_nvm = e1000_acquire_nvm_ich8lan,
8740 .read_nvm = e1000_read_nvm_ich8lan,
8741 .release_nvm = e1000_release_nvm_ich8lan,
8742 -diff -urNp linux-2.6.32.32/drivers/net/eql.c linux-2.6.32.32/drivers/net/eql.c
8743 ---- linux-2.6.32.32/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
8744 -+++ linux-2.6.32.32/drivers/net/eql.c 2010-12-31 14:46:53.000000000 -0500
8745 +diff -urNp linux-2.6.32.33/drivers/net/eql.c linux-2.6.32.33/drivers/net/eql.c
8746 +--- linux-2.6.32.33/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
8747 ++++ linux-2.6.32.33/drivers/net/eql.c 2010-12-31 14:46:53.000000000 -0500
8748 @@ -554,7 +554,7 @@ static int eql_g_master_cfg(struct net_d
8749 equalizer_t *eql;
8750 master_config_t mc;
8751 @@ -27940,9 +28063,9 @@ diff -urNp linux-2.6.32.32/drivers/net/eql.c linux-2.6.32.32/drivers/net/eql.c
8752
8753 if (eql_is_master(dev)) {
8754 eql = netdev_priv(dev);
8755 -diff -urNp linux-2.6.32.32/drivers/net/ibmveth.c linux-2.6.32.32/drivers/net/ibmveth.c
8756 ---- linux-2.6.32.32/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
8757 -+++ linux-2.6.32.32/drivers/net/ibmveth.c 2010-12-31 14:46:53.000000000 -0500
8758 +diff -urNp linux-2.6.32.33/drivers/net/ibmveth.c linux-2.6.32.33/drivers/net/ibmveth.c
8759 +--- linux-2.6.32.33/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
8760 ++++ linux-2.6.32.33/drivers/net/ibmveth.c 2010-12-31 14:46:53.000000000 -0500
8761 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
8762 NULL,
8763 };
8764 @@ -27952,9 +28075,9 @@ diff -urNp linux-2.6.32.32/drivers/net/ibmveth.c linux-2.6.32.32/drivers/net/ibm
8765 .show = veth_pool_show,
8766 .store = veth_pool_store,
8767 };
8768 -diff -urNp linux-2.6.32.32/drivers/net/igb/e1000_82575.c linux-2.6.32.32/drivers/net/igb/e1000_82575.c
8769 ---- linux-2.6.32.32/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
8770 -+++ linux-2.6.32.32/drivers/net/igb/e1000_82575.c 2010-12-31 14:46:53.000000000 -0500
8771 +diff -urNp linux-2.6.32.33/drivers/net/igb/e1000_82575.c linux-2.6.32.33/drivers/net/igb/e1000_82575.c
8772 +--- linux-2.6.32.33/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
8773 ++++ linux-2.6.32.33/drivers/net/igb/e1000_82575.c 2010-12-31 14:46:53.000000000 -0500
8774 @@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
8775 wr32(E1000_VT_CTL, vt_ctl);
8776 }
8777 @@ -27980,9 +28103,9 @@ diff -urNp linux-2.6.32.32/drivers/net/igb/e1000_82575.c linux-2.6.32.32/drivers
8778 .acquire = igb_acquire_nvm_82575,
8779 .read = igb_read_nvm_eerd,
8780 .release = igb_release_nvm_82575,
8781 -diff -urNp linux-2.6.32.32/drivers/net/igb/e1000_hw.h linux-2.6.32.32/drivers/net/igb/e1000_hw.h
8782 ---- linux-2.6.32.32/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
8783 -+++ linux-2.6.32.32/drivers/net/igb/e1000_hw.h 2010-12-31 14:46:53.000000000 -0500
8784 +diff -urNp linux-2.6.32.33/drivers/net/igb/e1000_hw.h linux-2.6.32.33/drivers/net/igb/e1000_hw.h
8785 +--- linux-2.6.32.33/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
8786 ++++ linux-2.6.32.33/drivers/net/igb/e1000_hw.h 2010-12-31 14:46:53.000000000 -0500
8787 @@ -305,17 +305,17 @@ struct e1000_phy_operations {
8788 };
8789
8790 @@ -28008,9 +28131,9 @@ diff -urNp linux-2.6.32.32/drivers/net/igb/e1000_hw.h linux-2.6.32.32/drivers/ne
8791 };
8792
8793 extern const struct e1000_info e1000_82575_info;
8794 -diff -urNp linux-2.6.32.32/drivers/net/irda/vlsi_ir.c linux-2.6.32.32/drivers/net/irda/vlsi_ir.c
8795 ---- linux-2.6.32.32/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
8796 -+++ linux-2.6.32.32/drivers/net/irda/vlsi_ir.c 2010-12-31 14:46:53.000000000 -0500
8797 +diff -urNp linux-2.6.32.33/drivers/net/irda/vlsi_ir.c linux-2.6.32.33/drivers/net/irda/vlsi_ir.c
8798 +--- linux-2.6.32.33/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
8799 ++++ linux-2.6.32.33/drivers/net/irda/vlsi_ir.c 2010-12-31 14:46:53.000000000 -0500
8800 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
8801 /* no race - tx-ring already empty */
8802 vlsi_set_baud(idev, iobase);
8803 @@ -28027,9 +28150,9 @@ diff -urNp linux-2.6.32.32/drivers/net/irda/vlsi_ir.c linux-2.6.32.32/drivers/ne
8804 spin_unlock_irqrestore(&idev->lock, flags);
8805 dev_kfree_skb_any(skb);
8806 return NETDEV_TX_OK;
8807 -diff -urNp linux-2.6.32.32/drivers/net/iseries_veth.c linux-2.6.32.32/drivers/net/iseries_veth.c
8808 ---- linux-2.6.32.32/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
8809 -+++ linux-2.6.32.32/drivers/net/iseries_veth.c 2010-12-31 14:46:53.000000000 -0500
8810 +diff -urNp linux-2.6.32.33/drivers/net/iseries_veth.c linux-2.6.32.33/drivers/net/iseries_veth.c
8811 +--- linux-2.6.32.33/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
8812 ++++ linux-2.6.32.33/drivers/net/iseries_veth.c 2010-12-31 14:46:53.000000000 -0500
8813 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
8814 NULL
8815 };
8816 @@ -28048,9 +28171,9 @@ diff -urNp linux-2.6.32.32/drivers/net/iseries_veth.c linux-2.6.32.32/drivers/ne
8817 .show = veth_port_attribute_show
8818 };
8819
8820 -diff -urNp linux-2.6.32.32/drivers/net/pcnet32.c linux-2.6.32.32/drivers/net/pcnet32.c
8821 ---- linux-2.6.32.32/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
8822 -+++ linux-2.6.32.32/drivers/net/pcnet32.c 2010-12-31 14:46:53.000000000 -0500
8823 +diff -urNp linux-2.6.32.33/drivers/net/pcnet32.c linux-2.6.32.33/drivers/net/pcnet32.c
8824 +--- linux-2.6.32.33/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
8825 ++++ linux-2.6.32.33/drivers/net/pcnet32.c 2010-12-31 14:46:53.000000000 -0500
8826 @@ -79,7 +79,7 @@ static int cards_found;
8827 /*
8828 * VLB I/O addresses
8829 @@ -28060,9 +28183,9 @@ diff -urNp linux-2.6.32.32/drivers/net/pcnet32.c linux-2.6.32.32/drivers/net/pcn
8830 { 0x300, 0x320, 0x340, 0x360, 0 };
8831
8832 static int pcnet32_debug = 0;
8833 -diff -urNp linux-2.6.32.32/drivers/net/tg3.h linux-2.6.32.32/drivers/net/tg3.h
8834 ---- linux-2.6.32.32/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
8835 -+++ linux-2.6.32.32/drivers/net/tg3.h 2010-12-31 14:46:53.000000000 -0500
8836 +diff -urNp linux-2.6.32.33/drivers/net/tg3.h linux-2.6.32.33/drivers/net/tg3.h
8837 +--- linux-2.6.32.33/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
8838 ++++ linux-2.6.32.33/drivers/net/tg3.h 2010-12-31 14:46:53.000000000 -0500
8839 @@ -95,6 +95,7 @@
8840 #define CHIPREV_ID_5750_A0 0x4000
8841 #define CHIPREV_ID_5750_A1 0x4001
8842 @@ -28071,9 +28194,9 @@ diff -urNp linux-2.6.32.32/drivers/net/tg3.h linux-2.6.32.32/drivers/net/tg3.h
8843 #define CHIPREV_ID_5750_C2 0x4202
8844 #define CHIPREV_ID_5752_A0_HW 0x5000
8845 #define CHIPREV_ID_5752_A0 0x6000
8846 -diff -urNp linux-2.6.32.32/drivers/net/tulip/de4x5.c linux-2.6.32.32/drivers/net/tulip/de4x5.c
8847 ---- linux-2.6.32.32/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
8848 -+++ linux-2.6.32.32/drivers/net/tulip/de4x5.c 2010-12-31 14:46:53.000000000 -0500
8849 +diff -urNp linux-2.6.32.33/drivers/net/tulip/de4x5.c linux-2.6.32.33/drivers/net/tulip/de4x5.c
8850 +--- linux-2.6.32.33/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
8851 ++++ linux-2.6.32.33/drivers/net/tulip/de4x5.c 2010-12-31 14:46:53.000000000 -0500
8852 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
8853 for (i=0; i<ETH_ALEN; i++) {
8854 tmp.addr[i] = dev->dev_addr[i];
8855 @@ -28101,9 +28224,9 @@ diff -urNp linux-2.6.32.32/drivers/net/tulip/de4x5.c linux-2.6.32.32/drivers/net
8856 break;
8857
8858 #define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
8859 -diff -urNp linux-2.6.32.32/drivers/net/usb/hso.c linux-2.6.32.32/drivers/net/usb/hso.c
8860 ---- linux-2.6.32.32/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
8861 -+++ linux-2.6.32.32/drivers/net/usb/hso.c 2011-01-24 18:05:30.000000000 -0500
8862 +diff -urNp linux-2.6.32.33/drivers/net/usb/hso.c linux-2.6.32.33/drivers/net/usb/hso.c
8863 +--- linux-2.6.32.33/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
8864 ++++ linux-2.6.32.33/drivers/net/usb/hso.c 2011-01-24 18:05:30.000000000 -0500
8865 @@ -71,7 +71,7 @@
8866 #include <asm/byteorder.h>
8867 #include <linux/serial_core.h>
8868 @@ -28205,9 +28328,9 @@ diff -urNp linux-2.6.32.32/drivers/net/usb/hso.c linux-2.6.32.32/drivers/net/usb
8869 result =
8870 hso_start_serial_device(serial_table[i], GFP_NOIO);
8871 hso_kick_transmit(dev2ser(serial_table[i]));
8872 -diff -urNp linux-2.6.32.32/drivers/net/wireless/b43/debugfs.c linux-2.6.32.32/drivers/net/wireless/b43/debugfs.c
8873 ---- linux-2.6.32.32/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8874 -+++ linux-2.6.32.32/drivers/net/wireless/b43/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8875 +diff -urNp linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c
8876 +--- linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8877 ++++ linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8878 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
8879 struct b43_debugfs_fops {
8880 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
8881 @@ -28217,9 +28340,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/b43/debugfs.c linux-2.6.32.32/dr
8882 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
8883 size_t file_struct_offset;
8884 };
8885 -diff -urNp linux-2.6.32.32/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.32/drivers/net/wireless/b43legacy/debugfs.c
8886 ---- linux-2.6.32.32/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8887 -+++ linux-2.6.32.32/drivers/net/wireless/b43legacy/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8888 +diff -urNp linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c
8889 +--- linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8890 ++++ linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8891 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
8892 struct b43legacy_debugfs_fops {
8893 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
8894 @@ -28229,9 +28352,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
8895 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
8896 size_t file_struct_offset;
8897 /* Take wl->irq_lock before calling read/write? */
8898 -diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-1000.c
8899 ---- linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
8900 -+++ linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-31 14:46:53.000000000 -0500
8901 +diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c
8902 +--- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
8903 ++++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-31 14:46:53.000000000 -0500
8904 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
8905 },
8906 };
8907 @@ -28241,9 +28364,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
8908 .ucode = &iwl5000_ucode,
8909 .lib = &iwl1000_lib,
8910 .hcmd = &iwl5000_hcmd,
8911 -diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-3945.c
8912 ---- linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
8913 -+++ linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-31 14:46:53.000000000 -0500
8914 +diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c
8915 +--- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
8916 ++++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-31 14:46:53.000000000 -0500
8917 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
8918 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
8919 };
8920 @@ -28253,9 +28376,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
8921 .ucode = &iwl3945_ucode,
8922 .lib = &iwl3945_lib,
8923 .hcmd = &iwl3945_hcmd,
8924 -diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-4965.c
8925 ---- linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
8926 -+++ linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-31 14:46:53.000000000 -0500
8927 +diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c
8928 +--- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
8929 ++++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-31 14:46:53.000000000 -0500
8930 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
8931 },
8932 };
8933 @@ -28265,9 +28388,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
8934 .ucode = &iwl4965_ucode,
8935 .lib = &iwl4965_lib,
8936 .hcmd = &iwl4965_hcmd,
8937 -diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-5000.c
8938 ---- linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
8939 -+++ linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-31 14:46:53.000000000 -0500
8940 +diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c
8941 +--- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
8942 ++++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-31 14:46:53.000000000 -0500
8943 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
8944 },
8945 };
8946 @@ -28285,9 +28408,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
8947 .ucode = &iwl5000_ucode,
8948 .lib = &iwl5150_lib,
8949 .hcmd = &iwl5000_hcmd,
8950 -diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-6000.c
8951 ---- linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
8952 -+++ linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-31 14:46:53.000000000 -0500
8953 +diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c
8954 +--- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
8955 ++++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-31 14:46:53.000000000 -0500
8956 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
8957 .calc_rssi = iwl5000_calc_rssi,
8958 };
8959 @@ -28297,9 +28420,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
8960 .ucode = &iwl5000_ucode,
8961 .lib = &iwl6000_lib,
8962 .hcmd = &iwl5000_hcmd,
8963 -diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-debug.h
8964 ---- linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
8965 -+++ linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-31 14:46:53.000000000 -0500
8966 +diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h
8967 +--- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
8968 ++++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-31 14:46:53.000000000 -0500
8969 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
8970 #endif
8971
8972 @@ -28311,9 +28434,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
8973 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
8974 void *p, u32 len)
8975 {}
8976 -diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-dev.h
8977 ---- linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
8978 -+++ linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-31 14:46:53.000000000 -0500
8979 +diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h
8980 +--- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
8981 ++++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-31 14:46:53.000000000 -0500
8982 @@ -68,7 +68,7 @@ struct iwl_tx_queue;
8983
8984 /* shared structures from iwl-5000.c */
8985 @@ -28323,9 +28446,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.3
8986 extern struct iwl_ucode_ops iwl5000_ucode;
8987 extern struct iwl_lib_ops iwl5000_lib;
8988 extern struct iwl_hcmd_ops iwl5000_hcmd;
8989 -diff -urNp linux-2.6.32.32/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.32/drivers/net/wireless/libertas/debugfs.c
8990 ---- linux-2.6.32.32/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8991 -+++ linux-2.6.32.32/drivers/net/wireless/libertas/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8992 +diff -urNp linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c
8993 +--- linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8994 ++++ linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8995 @@ -708,7 +708,7 @@ out_unlock:
8996 struct lbs_debugfs_files {
8997 const char *name;
8998 @@ -28335,9 +28458,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
8999 };
9000
9001 static const struct lbs_debugfs_files debugfs_files[] = {
9002 -diff -urNp linux-2.6.32.32/drivers/net/wireless/rndis_wlan.c linux-2.6.32.32/drivers/net/wireless/rndis_wlan.c
9003 ---- linux-2.6.32.32/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
9004 -+++ linux-2.6.32.32/drivers/net/wireless/rndis_wlan.c 2010-12-31 14:46:53.000000000 -0500
9005 +diff -urNp linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c
9006 +--- linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
9007 ++++ linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c 2010-12-31 14:46:53.000000000 -0500
9008 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
9009
9010 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
9011 @@ -28347,9 +28470,9 @@ diff -urNp linux-2.6.32.32/drivers/net/wireless/rndis_wlan.c linux-2.6.32.32/dri
9012 rts_threshold = 2347;
9013
9014 tmp = cpu_to_le32(rts_threshold);
9015 -diff -urNp linux-2.6.32.32/drivers/oprofile/buffer_sync.c linux-2.6.32.32/drivers/oprofile/buffer_sync.c
9016 ---- linux-2.6.32.32/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
9017 -+++ linux-2.6.32.32/drivers/oprofile/buffer_sync.c 2010-12-31 14:46:53.000000000 -0500
9018 +diff -urNp linux-2.6.32.33/drivers/oprofile/buffer_sync.c linux-2.6.32.33/drivers/oprofile/buffer_sync.c
9019 +--- linux-2.6.32.33/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
9020 ++++ linux-2.6.32.33/drivers/oprofile/buffer_sync.c 2010-12-31 14:46:53.000000000 -0500
9021 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
9022 if (cookie == NO_COOKIE)
9023 offset = pc;
9024 @@ -28385,9 +28508,9 @@ diff -urNp linux-2.6.32.32/drivers/oprofile/buffer_sync.c linux-2.6.32.32/driver
9025 }
9026 }
9027 release_mm(mm);
9028 -diff -urNp linux-2.6.32.32/drivers/oprofile/event_buffer.c linux-2.6.32.32/drivers/oprofile/event_buffer.c
9029 ---- linux-2.6.32.32/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
9030 -+++ linux-2.6.32.32/drivers/oprofile/event_buffer.c 2010-12-31 14:46:53.000000000 -0500
9031 +diff -urNp linux-2.6.32.33/drivers/oprofile/event_buffer.c linux-2.6.32.33/drivers/oprofile/event_buffer.c
9032 +--- linux-2.6.32.33/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
9033 ++++ linux-2.6.32.33/drivers/oprofile/event_buffer.c 2010-12-31 14:46:53.000000000 -0500
9034 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
9035 }
9036
9037 @@ -28397,9 +28520,9 @@ diff -urNp linux-2.6.32.32/drivers/oprofile/event_buffer.c linux-2.6.32.32/drive
9038 return;
9039 }
9040
9041 -diff -urNp linux-2.6.32.32/drivers/oprofile/oprof.c linux-2.6.32.32/drivers/oprofile/oprof.c
9042 ---- linux-2.6.32.32/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
9043 -+++ linux-2.6.32.32/drivers/oprofile/oprof.c 2010-12-31 14:46:53.000000000 -0500
9044 +diff -urNp linux-2.6.32.33/drivers/oprofile/oprof.c linux-2.6.32.33/drivers/oprofile/oprof.c
9045 +--- linux-2.6.32.33/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
9046 ++++ linux-2.6.32.33/drivers/oprofile/oprof.c 2010-12-31 14:46:53.000000000 -0500
9047 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
9048 if (oprofile_ops.switch_events())
9049 return;
9050 @@ -28409,9 +28532,9 @@ diff -urNp linux-2.6.32.32/drivers/oprofile/oprof.c linux-2.6.32.32/drivers/opro
9051 start_switch_worker();
9052 }
9053
9054 -diff -urNp linux-2.6.32.32/drivers/oprofile/oprofilefs.c linux-2.6.32.32/drivers/oprofile/oprofilefs.c
9055 ---- linux-2.6.32.32/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
9056 -+++ linux-2.6.32.32/drivers/oprofile/oprofilefs.c 2010-12-31 14:46:53.000000000 -0500
9057 +diff -urNp linux-2.6.32.33/drivers/oprofile/oprofilefs.c linux-2.6.32.33/drivers/oprofile/oprofilefs.c
9058 +--- linux-2.6.32.33/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
9059 ++++ linux-2.6.32.33/drivers/oprofile/oprofilefs.c 2010-12-31 14:46:53.000000000 -0500
9060 @@ -187,7 +187,7 @@ static const struct file_operations atom
9061
9062
9063 @@ -28421,9 +28544,9 @@ diff -urNp linux-2.6.32.32/drivers/oprofile/oprofilefs.c linux-2.6.32.32/drivers
9064 {
9065 struct dentry *d = __oprofilefs_create_file(sb, root, name,
9066 &atomic_ro_fops, 0444);
9067 -diff -urNp linux-2.6.32.32/drivers/oprofile/oprofile_stats.c linux-2.6.32.32/drivers/oprofile/oprofile_stats.c
9068 ---- linux-2.6.32.32/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
9069 -+++ linux-2.6.32.32/drivers/oprofile/oprofile_stats.c 2010-12-31 14:46:53.000000000 -0500
9070 +diff -urNp linux-2.6.32.33/drivers/oprofile/oprofile_stats.c linux-2.6.32.33/drivers/oprofile/oprofile_stats.c
9071 +--- linux-2.6.32.33/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
9072 ++++ linux-2.6.32.33/drivers/oprofile/oprofile_stats.c 2010-12-31 14:46:53.000000000 -0500
9073 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
9074 cpu_buf->sample_invalid_eip = 0;
9075 }
9076 @@ -28441,9 +28564,9 @@ diff -urNp linux-2.6.32.32/drivers/oprofile/oprofile_stats.c linux-2.6.32.32/dri
9077 }
9078
9079
9080 -diff -urNp linux-2.6.32.32/drivers/oprofile/oprofile_stats.h linux-2.6.32.32/drivers/oprofile/oprofile_stats.h
9081 ---- linux-2.6.32.32/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
9082 -+++ linux-2.6.32.32/drivers/oprofile/oprofile_stats.h 2010-12-31 14:46:53.000000000 -0500
9083 +diff -urNp linux-2.6.32.33/drivers/oprofile/oprofile_stats.h linux-2.6.32.33/drivers/oprofile/oprofile_stats.h
9084 +--- linux-2.6.32.33/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
9085 ++++ linux-2.6.32.33/drivers/oprofile/oprofile_stats.h 2010-12-31 14:46:53.000000000 -0500
9086 @@ -13,11 +13,11 @@
9087 #include <asm/atomic.h>
9088
9089 @@ -28461,9 +28584,9 @@ diff -urNp linux-2.6.32.32/drivers/oprofile/oprofile_stats.h linux-2.6.32.32/dri
9090 };
9091
9092 extern struct oprofile_stat_struct oprofile_stats;
9093 -diff -urNp linux-2.6.32.32/drivers/parisc/pdc_stable.c linux-2.6.32.32/drivers/parisc/pdc_stable.c
9094 ---- linux-2.6.32.32/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
9095 -+++ linux-2.6.32.32/drivers/parisc/pdc_stable.c 2010-12-31 14:46:53.000000000 -0500
9096 +diff -urNp linux-2.6.32.33/drivers/parisc/pdc_stable.c linux-2.6.32.33/drivers/parisc/pdc_stable.c
9097 +--- linux-2.6.32.33/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
9098 ++++ linux-2.6.32.33/drivers/parisc/pdc_stable.c 2010-12-31 14:46:53.000000000 -0500
9099 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
9100 return ret;
9101 }
9102 @@ -28473,9 +28596,9 @@ diff -urNp linux-2.6.32.32/drivers/parisc/pdc_stable.c linux-2.6.32.32/drivers/p
9103 .show = pdcspath_attr_show,
9104 .store = pdcspath_attr_store,
9105 };
9106 -diff -urNp linux-2.6.32.32/drivers/parport/procfs.c linux-2.6.32.32/drivers/parport/procfs.c
9107 ---- linux-2.6.32.32/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
9108 -+++ linux-2.6.32.32/drivers/parport/procfs.c 2010-12-31 14:46:53.000000000 -0500
9109 +diff -urNp linux-2.6.32.33/drivers/parport/procfs.c linux-2.6.32.33/drivers/parport/procfs.c
9110 +--- linux-2.6.32.33/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
9111 ++++ linux-2.6.32.33/drivers/parport/procfs.c 2010-12-31 14:46:53.000000000 -0500
9112 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
9113
9114 *ppos += len;
9115 @@ -28494,9 +28617,9 @@ diff -urNp linux-2.6.32.32/drivers/parport/procfs.c linux-2.6.32.32/drivers/parp
9116 }
9117 #endif /* IEEE1284.3 support. */
9118
9119 -diff -urNp linux-2.6.32.32/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.32/drivers/pci/hotplug/acpiphp_glue.c
9120 ---- linux-2.6.32.32/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
9121 -+++ linux-2.6.32.32/drivers/pci/hotplug/acpiphp_glue.c 2010-12-31 14:46:53.000000000 -0500
9122 +diff -urNp linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c
9123 +--- linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
9124 ++++ linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c 2010-12-31 14:46:53.000000000 -0500
9125 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
9126 }
9127
9128 @@ -28506,9 +28629,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.32/dr
9129 .handler = handle_hotplug_event_func,
9130 };
9131
9132 -diff -urNp linux-2.6.32.32/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.32/drivers/pci/hotplug/cpqphp_nvram.c
9133 ---- linux-2.6.32.32/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
9134 -+++ linux-2.6.32.32/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-31 14:46:53.000000000 -0500
9135 +diff -urNp linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c
9136 +--- linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
9137 ++++ linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-31 14:46:53.000000000 -0500
9138 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
9139
9140 void compaq_nvram_init (void __iomem *rom_start)
9141 @@ -28523,9 +28646,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.32/dr
9142 dbg("int15 entry = %p\n", compaq_int15_entry_point);
9143
9144 /* initialize our int15 lock */
9145 -diff -urNp linux-2.6.32.32/drivers/pci/hotplug/fakephp.c linux-2.6.32.32/drivers/pci/hotplug/fakephp.c
9146 ---- linux-2.6.32.32/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
9147 -+++ linux-2.6.32.32/drivers/pci/hotplug/fakephp.c 2010-12-31 14:46:53.000000000 -0500
9148 +diff -urNp linux-2.6.32.33/drivers/pci/hotplug/fakephp.c linux-2.6.32.33/drivers/pci/hotplug/fakephp.c
9149 +--- linux-2.6.32.33/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
9150 ++++ linux-2.6.32.33/drivers/pci/hotplug/fakephp.c 2010-12-31 14:46:53.000000000 -0500
9151 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
9152 }
9153
9154 @@ -28535,9 +28658,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/hotplug/fakephp.c linux-2.6.32.32/drivers
9155 .store = legacy_store, .show = legacy_show
9156 },
9157 .release = &legacy_release,
9158 -diff -urNp linux-2.6.32.32/drivers/pci/intel-iommu.c linux-2.6.32.32/drivers/pci/intel-iommu.c
9159 ---- linux-2.6.32.32/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
9160 -+++ linux-2.6.32.32/drivers/pci/intel-iommu.c 2010-12-31 14:46:53.000000000 -0500
9161 +diff -urNp linux-2.6.32.33/drivers/pci/intel-iommu.c linux-2.6.32.33/drivers/pci/intel-iommu.c
9162 +--- linux-2.6.32.33/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
9163 ++++ linux-2.6.32.33/drivers/pci/intel-iommu.c 2010-12-31 14:46:53.000000000 -0500
9164 @@ -2643,7 +2643,7 @@ error:
9165 return 0;
9166 }
9167 @@ -28607,9 +28730,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/intel-iommu.c linux-2.6.32.32/drivers/pci
9168 .alloc_coherent = intel_alloc_coherent,
9169 .free_coherent = intel_free_coherent,
9170 .map_sg = intel_map_sg,
9171 -diff -urNp linux-2.6.32.32/drivers/pci/pcie/aspm.c linux-2.6.32.32/drivers/pci/pcie/aspm.c
9172 ---- linux-2.6.32.32/drivers/pci/pcie/aspm.c 2010-08-13 16:24:37.000000000 -0400
9173 -+++ linux-2.6.32.32/drivers/pci/pcie/aspm.c 2011-02-27 14:53:10.000000000 -0500
9174 +diff -urNp linux-2.6.32.33/drivers/pci/pcie/aspm.c linux-2.6.32.33/drivers/pci/pcie/aspm.c
9175 +--- linux-2.6.32.33/drivers/pci/pcie/aspm.c 2010-08-13 16:24:37.000000000 -0400
9176 ++++ linux-2.6.32.33/drivers/pci/pcie/aspm.c 2011-02-27 14:53:10.000000000 -0500
9177 @@ -27,9 +27,9 @@
9178 #define MODULE_PARAM_PREFIX "pcie_aspm."
9179
9180 @@ -28623,9 +28746,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/pcie/aspm.c linux-2.6.32.32/drivers/pci/p
9181 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
9182 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
9183
9184 -diff -urNp linux-2.6.32.32/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.32/drivers/pci/pcie/portdrv_pci.c
9185 ---- linux-2.6.32.32/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
9186 -+++ linux-2.6.32.32/drivers/pci/pcie/portdrv_pci.c 2010-12-31 14:46:53.000000000 -0500
9187 +diff -urNp linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c
9188 +--- linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
9189 ++++ linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c 2010-12-31 14:46:53.000000000 -0500
9190 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
9191 static const struct pci_device_id port_pci_ids[] = { {
9192 /* handle any PCI-Express port */
9193 @@ -28635,9 +28758,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.32/driver
9194 };
9195 MODULE_DEVICE_TABLE(pci, port_pci_ids);
9196
9197 -diff -urNp linux-2.6.32.32/drivers/pci/probe.c linux-2.6.32.32/drivers/pci/probe.c
9198 ---- linux-2.6.32.32/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
9199 -+++ linux-2.6.32.32/drivers/pci/probe.c 2010-12-31 14:46:53.000000000 -0500
9200 +diff -urNp linux-2.6.32.33/drivers/pci/probe.c linux-2.6.32.33/drivers/pci/probe.c
9201 +--- linux-2.6.32.33/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
9202 ++++ linux-2.6.32.33/drivers/pci/probe.c 2010-12-31 14:46:53.000000000 -0500
9203 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
9204 return ret;
9205 }
9206 @@ -28655,9 +28778,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/probe.c linux-2.6.32.32/drivers/pci/probe
9207 struct device_attribute *attr,
9208 char *buf)
9209 {
9210 -diff -urNp linux-2.6.32.32/drivers/pci/proc.c linux-2.6.32.32/drivers/pci/proc.c
9211 ---- linux-2.6.32.32/drivers/pci/proc.c 2010-12-09 18:13:03.000000000 -0500
9212 -+++ linux-2.6.32.32/drivers/pci/proc.c 2010-12-31 14:46:53.000000000 -0500
9213 +diff -urNp linux-2.6.32.33/drivers/pci/proc.c linux-2.6.32.33/drivers/pci/proc.c
9214 +--- linux-2.6.32.33/drivers/pci/proc.c 2010-12-09 18:13:03.000000000 -0500
9215 ++++ linux-2.6.32.33/drivers/pci/proc.c 2010-12-31 14:46:53.000000000 -0500
9216 @@ -480,7 +480,16 @@ static const struct file_operations proc
9217 static int __init pci_proc_init(void)
9218 {
9219 @@ -28675,9 +28798,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/proc.c linux-2.6.32.32/drivers/pci/proc.c
9220 proc_create("devices", 0, proc_bus_pci_dir,
9221 &proc_bus_pci_dev_operations);
9222 proc_initialized = 1;
9223 -diff -urNp linux-2.6.32.32/drivers/pci/slot.c linux-2.6.32.32/drivers/pci/slot.c
9224 ---- linux-2.6.32.32/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
9225 -+++ linux-2.6.32.32/drivers/pci/slot.c 2010-12-31 14:46:53.000000000 -0500
9226 +diff -urNp linux-2.6.32.33/drivers/pci/slot.c linux-2.6.32.33/drivers/pci/slot.c
9227 +--- linux-2.6.32.33/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
9228 ++++ linux-2.6.32.33/drivers/pci/slot.c 2010-12-31 14:46:53.000000000 -0500
9229 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
9230 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
9231 }
9232 @@ -28687,9 +28810,9 @@ diff -urNp linux-2.6.32.32/drivers/pci/slot.c linux-2.6.32.32/drivers/pci/slot.c
9233 .show = pci_slot_attr_show,
9234 .store = pci_slot_attr_store,
9235 };
9236 -diff -urNp linux-2.6.32.32/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.32/drivers/pcmcia/pcmcia_ioctl.c
9237 ---- linux-2.6.32.32/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
9238 -+++ linux-2.6.32.32/drivers/pcmcia/pcmcia_ioctl.c 2010-12-31 14:46:53.000000000 -0500
9239 +diff -urNp linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c
9240 +--- linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
9241 ++++ linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c 2010-12-31 14:46:53.000000000 -0500
9242 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
9243 return -EFAULT;
9244 }
9245 @@ -28699,9 +28822,9 @@ diff -urNp linux-2.6.32.32/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.32/drivers
9246 if (!buf)
9247 return -ENOMEM;
9248
9249 -diff -urNp linux-2.6.32.32/drivers/pcmcia/ti113x.h linux-2.6.32.32/drivers/pcmcia/ti113x.h
9250 ---- linux-2.6.32.32/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
9251 -+++ linux-2.6.32.32/drivers/pcmcia/ti113x.h 2010-12-31 14:46:53.000000000 -0500
9252 +diff -urNp linux-2.6.32.33/drivers/pcmcia/ti113x.h linux-2.6.32.33/drivers/pcmcia/ti113x.h
9253 +--- linux-2.6.32.33/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
9254 ++++ linux-2.6.32.33/drivers/pcmcia/ti113x.h 2010-12-31 14:46:53.000000000 -0500
9255 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
9256 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
9257 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
9258 @@ -28711,9 +28834,9 @@ diff -urNp linux-2.6.32.32/drivers/pcmcia/ti113x.h linux-2.6.32.32/drivers/pcmci
9259 };
9260
9261 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
9262 -diff -urNp linux-2.6.32.32/drivers/pcmcia/yenta_socket.c linux-2.6.32.32/drivers/pcmcia/yenta_socket.c
9263 ---- linux-2.6.32.32/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
9264 -+++ linux-2.6.32.32/drivers/pcmcia/yenta_socket.c 2010-12-31 14:46:53.000000000 -0500
9265 +diff -urNp linux-2.6.32.33/drivers/pcmcia/yenta_socket.c linux-2.6.32.33/drivers/pcmcia/yenta_socket.c
9266 +--- linux-2.6.32.33/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
9267 ++++ linux-2.6.32.33/drivers/pcmcia/yenta_socket.c 2010-12-31 14:46:53.000000000 -0500
9268 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
9269
9270 /* match any cardbus bridge */
9271 @@ -28723,9 +28846,9 @@ diff -urNp linux-2.6.32.32/drivers/pcmcia/yenta_socket.c linux-2.6.32.32/drivers
9272 };
9273 MODULE_DEVICE_TABLE(pci, yenta_table);
9274
9275 -diff -urNp linux-2.6.32.32/drivers/platform/x86/acer-wmi.c linux-2.6.32.32/drivers/platform/x86/acer-wmi.c
9276 ---- linux-2.6.32.32/drivers/platform/x86/acer-wmi.c 2011-03-02 17:24:54.000000000 -0500
9277 -+++ linux-2.6.32.32/drivers/platform/x86/acer-wmi.c 2011-03-02 17:25:24.000000000 -0500
9278 +diff -urNp linux-2.6.32.33/drivers/platform/x86/acer-wmi.c linux-2.6.32.33/drivers/platform/x86/acer-wmi.c
9279 +--- linux-2.6.32.33/drivers/platform/x86/acer-wmi.c 2011-03-02 17:24:54.000000000 -0500
9280 ++++ linux-2.6.32.33/drivers/platform/x86/acer-wmi.c 2011-03-02 17:25:24.000000000 -0500
9281 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl
9282 return 0;
9283 }
9284 @@ -28735,9 +28858,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/acer-wmi.c linux-2.6.32.32/drive
9285 .get_brightness = read_brightness,
9286 .update_status = update_bl_status,
9287 };
9288 -diff -urNp linux-2.6.32.32/drivers/platform/x86/asus_acpi.c linux-2.6.32.32/drivers/platform/x86/asus_acpi.c
9289 ---- linux-2.6.32.32/drivers/platform/x86/asus_acpi.c 2011-03-02 17:24:54.000000000 -0500
9290 -+++ linux-2.6.32.32/drivers/platform/x86/asus_acpi.c 2011-02-27 15:16:00.000000000 -0500
9291 +diff -urNp linux-2.6.32.33/drivers/platform/x86/asus_acpi.c linux-2.6.32.33/drivers/platform/x86/asus_acpi.c
9292 +--- linux-2.6.32.33/drivers/platform/x86/asus_acpi.c 2011-03-02 17:24:54.000000000 -0500
9293 ++++ linux-2.6.32.33/drivers/platform/x86/asus_acpi.c 2011-02-27 15:16:00.000000000 -0500
9294 @@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
9295 return 0;
9296 }
9297 @@ -28747,9 +28870,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/asus_acpi.c linux-2.6.32.32/driv
9298 .get_brightness = read_brightness,
9299 .update_status = set_brightness_status,
9300 };
9301 -diff -urNp linux-2.6.32.32/drivers/platform/x86/asus-laptop.c linux-2.6.32.32/drivers/platform/x86/asus-laptop.c
9302 ---- linux-2.6.32.32/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
9303 -+++ linux-2.6.32.32/drivers/platform/x86/asus-laptop.c 2010-12-31 14:46:53.000000000 -0500
9304 +diff -urNp linux-2.6.32.33/drivers/platform/x86/asus-laptop.c linux-2.6.32.33/drivers/platform/x86/asus-laptop.c
9305 +--- linux-2.6.32.33/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
9306 ++++ linux-2.6.32.33/drivers/platform/x86/asus-laptop.c 2010-12-31 14:46:53.000000000 -0500
9307 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
9308 */
9309 static int read_brightness(struct backlight_device *bd);
9310 @@ -28759,9 +28882,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/asus-laptop.c linux-2.6.32.32/dr
9311 .get_brightness = read_brightness,
9312 .update_status = update_bl_status,
9313 };
9314 -diff -urNp linux-2.6.32.32/drivers/platform/x86/compal-laptop.c linux-2.6.32.32/drivers/platform/x86/compal-laptop.c
9315 ---- linux-2.6.32.32/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
9316 -+++ linux-2.6.32.32/drivers/platform/x86/compal-laptop.c 2010-12-31 14:46:53.000000000 -0500
9317 +diff -urNp linux-2.6.32.33/drivers/platform/x86/compal-laptop.c linux-2.6.32.33/drivers/platform/x86/compal-laptop.c
9318 +--- linux-2.6.32.33/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
9319 ++++ linux-2.6.32.33/drivers/platform/x86/compal-laptop.c 2010-12-31 14:46:53.000000000 -0500
9320 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl
9321 return set_lcd_level(b->props.brightness);
9322 }
9323 @@ -28771,9 +28894,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/compal-laptop.c linux-2.6.32.32/
9324 .get_brightness = bl_get_brightness,
9325 .update_status = bl_update_status,
9326 };
9327 -diff -urNp linux-2.6.32.32/drivers/platform/x86/dell-laptop.c linux-2.6.32.32/drivers/platform/x86/dell-laptop.c
9328 ---- linux-2.6.32.32/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
9329 -+++ linux-2.6.32.32/drivers/platform/x86/dell-laptop.c 2010-12-31 14:46:53.000000000 -0500
9330 +diff -urNp linux-2.6.32.33/drivers/platform/x86/dell-laptop.c linux-2.6.32.33/drivers/platform/x86/dell-laptop.c
9331 +--- linux-2.6.32.33/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
9332 ++++ linux-2.6.32.33/drivers/platform/x86/dell-laptop.c 2010-12-31 14:46:53.000000000 -0500
9333 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
9334 return buffer.output[1];
9335 }
9336 @@ -28783,9 +28906,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/dell-laptop.c linux-2.6.32.32/dr
9337 .get_brightness = dell_get_intensity,
9338 .update_status = dell_send_intensity,
9339 };
9340 -diff -urNp linux-2.6.32.32/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.32/drivers/platform/x86/eeepc-laptop.c
9341 ---- linux-2.6.32.32/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
9342 -+++ linux-2.6.32.32/drivers/platform/x86/eeepc-laptop.c 2010-12-31 14:46:53.000000000 -0500
9343 +diff -urNp linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c
9344 +--- linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
9345 ++++ linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c 2010-12-31 14:46:53.000000000 -0500
9346 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
9347 */
9348 static int read_brightness(struct backlight_device *bd);
9349 @@ -28795,9 +28918,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.32/d
9350 .get_brightness = read_brightness,
9351 .update_status = update_bl_status,
9352 };
9353 -diff -urNp linux-2.6.32.32/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.32/drivers/platform/x86/fujitsu-laptop.c
9354 ---- linux-2.6.32.32/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
9355 -+++ linux-2.6.32.32/drivers/platform/x86/fujitsu-laptop.c 2010-12-31 14:46:53.000000000 -0500
9356 +diff -urNp linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c
9357 +--- linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
9358 ++++ linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c 2010-12-31 14:46:53.000000000 -0500
9359 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl
9360 return ret;
9361 }
9362 @@ -28807,9 +28930,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.32
9363 .get_brightness = bl_get_brightness,
9364 .update_status = bl_update_status,
9365 };
9366 -diff -urNp linux-2.6.32.32/drivers/platform/x86/msi-laptop.c linux-2.6.32.32/drivers/platform/x86/msi-laptop.c
9367 ---- linux-2.6.32.32/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
9368 -+++ linux-2.6.32.32/drivers/platform/x86/msi-laptop.c 2010-12-31 14:46:53.000000000 -0500
9369 +diff -urNp linux-2.6.32.33/drivers/platform/x86/msi-laptop.c linux-2.6.32.33/drivers/platform/x86/msi-laptop.c
9370 +--- linux-2.6.32.33/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
9371 ++++ linux-2.6.32.33/drivers/platform/x86/msi-laptop.c 2010-12-31 14:46:53.000000000 -0500
9372 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl
9373 return set_lcd_level(b->props.brightness);
9374 }
9375 @@ -28819,9 +28942,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/msi-laptop.c linux-2.6.32.32/dri
9376 .get_brightness = bl_get_brightness,
9377 .update_status = bl_update_status,
9378 };
9379 -diff -urNp linux-2.6.32.32/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.32/drivers/platform/x86/panasonic-laptop.c
9380 ---- linux-2.6.32.32/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
9381 -+++ linux-2.6.32.32/drivers/platform/x86/panasonic-laptop.c 2010-12-31 14:46:53.000000000 -0500
9382 +diff -urNp linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c
9383 +--- linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
9384 ++++ linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c 2010-12-31 14:46:53.000000000 -0500
9385 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
9386 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
9387 }
9388 @@ -28831,9 +28954,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
9389 .get_brightness = bl_get,
9390 .update_status = bl_set_status,
9391 };
9392 -diff -urNp linux-2.6.32.32/drivers/platform/x86/sony-laptop.c linux-2.6.32.32/drivers/platform/x86/sony-laptop.c
9393 ---- linux-2.6.32.32/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
9394 -+++ linux-2.6.32.32/drivers/platform/x86/sony-laptop.c 2010-12-31 14:46:53.000000000 -0500
9395 +diff -urNp linux-2.6.32.33/drivers/platform/x86/sony-laptop.c linux-2.6.32.33/drivers/platform/x86/sony-laptop.c
9396 +--- linux-2.6.32.33/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
9397 ++++ linux-2.6.32.33/drivers/platform/x86/sony-laptop.c 2010-12-31 14:46:53.000000000 -0500
9398 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
9399 }
9400
9401 @@ -28843,9 +28966,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/sony-laptop.c linux-2.6.32.32/dr
9402 .update_status = sony_backlight_update_status,
9403 .get_brightness = sony_backlight_get_brightness,
9404 };
9405 -diff -urNp linux-2.6.32.32/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.32/drivers/platform/x86/thinkpad_acpi.c
9406 ---- linux-2.6.32.32/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
9407 -+++ linux-2.6.32.32/drivers/platform/x86/thinkpad_acpi.c 2010-12-31 14:46:53.000000000 -0500
9408 +diff -urNp linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c
9409 +--- linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
9410 ++++ linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c 2010-12-31 14:46:53.000000000 -0500
9411 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
9412 BACKLIGHT_UPDATE_HOTKEY);
9413 }
9414 @@ -28855,9 +28978,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.32/
9415 .get_brightness = brightness_get,
9416 .update_status = brightness_update_status,
9417 };
9418 -diff -urNp linux-2.6.32.32/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.32/drivers/platform/x86/toshiba_acpi.c
9419 ---- linux-2.6.32.32/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
9420 -+++ linux-2.6.32.32/drivers/platform/x86/toshiba_acpi.c 2010-12-31 14:46:53.000000000 -0500
9421 +diff -urNp linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c
9422 +--- linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
9423 ++++ linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c 2010-12-31 14:46:53.000000000 -0500
9424 @@ -671,7 +671,7 @@ static acpi_status remove_device(void)
9425 return AE_OK;
9426 }
9427 @@ -28867,9 +28990,9 @@ diff -urNp linux-2.6.32.32/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.32/d
9428 .get_brightness = get_lcd,
9429 .update_status = set_lcd_status,
9430 };
9431 -diff -urNp linux-2.6.32.32/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.32/drivers/pnp/pnpbios/bioscalls.c
9432 ---- linux-2.6.32.32/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
9433 -+++ linux-2.6.32.32/drivers/pnp/pnpbios/bioscalls.c 2010-12-31 14:46:53.000000000 -0500
9434 +diff -urNp linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c
9435 +--- linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
9436 ++++ linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c 2010-12-31 14:46:53.000000000 -0500
9437 @@ -60,7 +60,7 @@ do { \
9438 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
9439 } while(0)
9440 @@ -28926,9 +29049,9 @@ diff -urNp linux-2.6.32.32/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.32/drive
9441 +
9442 + pax_close_kernel();
9443 }
9444 -diff -urNp linux-2.6.32.32/drivers/pnp/quirks.c linux-2.6.32.32/drivers/pnp/quirks.c
9445 ---- linux-2.6.32.32/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
9446 -+++ linux-2.6.32.32/drivers/pnp/quirks.c 2010-12-31 14:46:53.000000000 -0500
9447 +diff -urNp linux-2.6.32.33/drivers/pnp/quirks.c linux-2.6.32.33/drivers/pnp/quirks.c
9448 +--- linux-2.6.32.33/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
9449 ++++ linux-2.6.32.33/drivers/pnp/quirks.c 2010-12-31 14:46:53.000000000 -0500
9450 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
9451 /* PnP resources that might overlap PCI BARs */
9452 {"PNP0c01", quirk_system_pci_resources},
9453 @@ -28938,9 +29061,9 @@ diff -urNp linux-2.6.32.32/drivers/pnp/quirks.c linux-2.6.32.32/drivers/pnp/quir
9454 };
9455
9456 void pnp_fixup_device(struct pnp_dev *dev)
9457 -diff -urNp linux-2.6.32.32/drivers/pnp/resource.c linux-2.6.32.32/drivers/pnp/resource.c
9458 ---- linux-2.6.32.32/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
9459 -+++ linux-2.6.32.32/drivers/pnp/resource.c 2010-12-31 14:46:53.000000000 -0500
9460 +diff -urNp linux-2.6.32.33/drivers/pnp/resource.c linux-2.6.32.33/drivers/pnp/resource.c
9461 +--- linux-2.6.32.33/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
9462 ++++ linux-2.6.32.33/drivers/pnp/resource.c 2010-12-31 14:46:53.000000000 -0500
9463 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
9464 return 1;
9465
9466 @@ -28959,9 +29082,9 @@ diff -urNp linux-2.6.32.32/drivers/pnp/resource.c linux-2.6.32.32/drivers/pnp/re
9467 return 0;
9468
9469 /* check if the resource is reserved */
9470 -diff -urNp linux-2.6.32.32/drivers/rtc/rtc-dev.c linux-2.6.32.32/drivers/rtc/rtc-dev.c
9471 ---- linux-2.6.32.32/drivers/rtc/rtc-dev.c 2010-08-13 16:24:37.000000000 -0400
9472 -+++ linux-2.6.32.32/drivers/rtc/rtc-dev.c 2011-01-01 19:02:12.000000000 -0500
9473 +diff -urNp linux-2.6.32.33/drivers/rtc/rtc-dev.c linux-2.6.32.33/drivers/rtc/rtc-dev.c
9474 +--- linux-2.6.32.33/drivers/rtc/rtc-dev.c 2010-08-13 16:24:37.000000000 -0400
9475 ++++ linux-2.6.32.33/drivers/rtc/rtc-dev.c 2011-01-01 19:02:12.000000000 -0500
9476 @@ -14,6 +14,7 @@
9477 #include <linux/module.h>
9478 #include <linux/rtc.h>
9479 @@ -28979,9 +29102,9 @@ diff -urNp linux-2.6.32.32/drivers/rtc/rtc-dev.c linux-2.6.32.32/drivers/rtc/rtc
9480 return rtc_set_time(rtc, &tm);
9481
9482 case RTC_PIE_ON:
9483 -diff -urNp linux-2.6.32.32/drivers/rtc/rtc-ds1511.c linux-2.6.32.32/drivers/rtc/rtc-ds1511.c
9484 ---- linux-2.6.32.32/drivers/rtc/rtc-ds1511.c 2010-08-13 16:24:37.000000000 -0400
9485 -+++ linux-2.6.32.32/drivers/rtc/rtc-ds1511.c 2011-02-27 15:20:55.000000000 -0500
9486 +diff -urNp linux-2.6.32.33/drivers/rtc/rtc-ds1511.c linux-2.6.32.33/drivers/rtc/rtc-ds1511.c
9487 +--- linux-2.6.32.33/drivers/rtc/rtc-ds1511.c 2010-08-13 16:24:37.000000000 -0400
9488 ++++ linux-2.6.32.33/drivers/rtc/rtc-ds1511.c 2011-02-27 15:20:55.000000000 -0500
9489 @@ -480,7 +480,7 @@ ds1511_nvram_write(struct kobject *kobj,
9490 static struct bin_attribute ds1511_nvram_attr = {
9491 .attr = {
9492 @@ -28991,9 +29114,9 @@ diff -urNp linux-2.6.32.32/drivers/rtc/rtc-ds1511.c linux-2.6.32.32/drivers/rtc/
9493 },
9494 .size = DS1511_RAM_MAX,
9495 .read = ds1511_nvram_read,
9496 -diff -urNp linux-2.6.32.32/drivers/s390/cio/qdio_perf.c linux-2.6.32.32/drivers/s390/cio/qdio_perf.c
9497 ---- linux-2.6.32.32/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
9498 -+++ linux-2.6.32.32/drivers/s390/cio/qdio_perf.c 2010-12-31 14:46:53.000000000 -0500
9499 +diff -urNp linux-2.6.32.33/drivers/s390/cio/qdio_perf.c linux-2.6.32.33/drivers/s390/cio/qdio_perf.c
9500 +--- linux-2.6.32.33/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
9501 ++++ linux-2.6.32.33/drivers/s390/cio/qdio_perf.c 2010-12-31 14:46:53.000000000 -0500
9502 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
9503 static int qdio_perf_proc_show(struct seq_file *m, void *v)
9504 {
9505 @@ -29069,9 +29192,9 @@ diff -urNp linux-2.6.32.32/drivers/s390/cio/qdio_perf.c linux-2.6.32.32/drivers/
9506 seq_printf(m, "\n");
9507 return 0;
9508 }
9509 -diff -urNp linux-2.6.32.32/drivers/s390/cio/qdio_perf.h linux-2.6.32.32/drivers/s390/cio/qdio_perf.h
9510 ---- linux-2.6.32.32/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
9511 -+++ linux-2.6.32.32/drivers/s390/cio/qdio_perf.h 2010-12-31 14:46:53.000000000 -0500
9512 +diff -urNp linux-2.6.32.33/drivers/s390/cio/qdio_perf.h linux-2.6.32.33/drivers/s390/cio/qdio_perf.h
9513 +--- linux-2.6.32.33/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
9514 ++++ linux-2.6.32.33/drivers/s390/cio/qdio_perf.h 2010-12-31 14:46:53.000000000 -0500
9515 @@ -13,46 +13,46 @@
9516
9517 struct qdio_perf_stats {
9518 @@ -29144,9 +29267,9 @@ diff -urNp linux-2.6.32.32/drivers/s390/cio/qdio_perf.h linux-2.6.32.32/drivers/
9519 }
9520
9521 int qdio_setup_perf_stats(void);
9522 -diff -urNp linux-2.6.32.32/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.32/drivers/scsi/aic94xx/aic94xx_init.c
9523 ---- linux-2.6.32.32/drivers/scsi/aic94xx/aic94xx_init.c 2010-08-13 16:24:37.000000000 -0400
9524 -+++ linux-2.6.32.32/drivers/scsi/aic94xx/aic94xx_init.c 2011-02-27 15:21:24.000000000 -0500
9525 +diff -urNp linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c
9526 +--- linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c 2010-08-13 16:24:37.000000000 -0400
9527 ++++ linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c 2011-02-27 15:21:24.000000000 -0500
9528 @@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru
9529 flash_error_table[i].reason);
9530 }
9531 @@ -29156,9 +29279,9 @@ diff -urNp linux-2.6.32.32/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.32/d
9532 asd_show_update_bios, asd_store_update_bios);
9533
9534 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
9535 -diff -urNp linux-2.6.32.32/drivers/scsi/ipr.c linux-2.6.32.32/drivers/scsi/ipr.c
9536 ---- linux-2.6.32.32/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
9537 -+++ linux-2.6.32.32/drivers/scsi/ipr.c 2010-12-31 14:46:53.000000000 -0500
9538 +diff -urNp linux-2.6.32.33/drivers/scsi/ipr.c linux-2.6.32.33/drivers/scsi/ipr.c
9539 +--- linux-2.6.32.33/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
9540 ++++ linux-2.6.32.33/drivers/scsi/ipr.c 2010-12-31 14:46:53.000000000 -0500
9541 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
9542 return true;
9543 }
9544 @@ -29168,9 +29291,9 @@ diff -urNp linux-2.6.32.32/drivers/scsi/ipr.c linux-2.6.32.32/drivers/scsi/ipr.c
9545 .phy_reset = ipr_ata_phy_reset,
9546 .hardreset = ipr_sata_reset,
9547 .post_internal_cmd = ipr_ata_post_internal,
9548 -diff -urNp linux-2.6.32.32/drivers/scsi/libfc/fc_exch.c linux-2.6.32.32/drivers/scsi/libfc/fc_exch.c
9549 ---- linux-2.6.32.32/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
9550 -+++ linux-2.6.32.32/drivers/scsi/libfc/fc_exch.c 2010-12-31 14:46:53.000000000 -0500
9551 +diff -urNp linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c
9552 +--- linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
9553 ++++ linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c 2010-12-31 14:46:53.000000000 -0500
9554 @@ -86,12 +86,12 @@ struct fc_exch_mgr {
9555 * all together if not used XXX
9556 */
9557 @@ -29292,9 +29415,9 @@ diff -urNp linux-2.6.32.32/drivers/scsi/libfc/fc_exch.c linux-2.6.32.32/drivers/
9558
9559 fc_frame_free(fp);
9560 }
9561 -diff -urNp linux-2.6.32.32/drivers/scsi/libsas/sas_ata.c linux-2.6.32.32/drivers/scsi/libsas/sas_ata.c
9562 ---- linux-2.6.32.32/drivers/scsi/libsas/sas_ata.c 2010-11-26 18:22:29.000000000 -0500
9563 -+++ linux-2.6.32.32/drivers/scsi/libsas/sas_ata.c 2010-12-31 14:46:53.000000000 -0500
9564 +diff -urNp linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c
9565 +--- linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c 2010-11-26 18:22:29.000000000 -0500
9566 ++++ linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c 2010-12-31 14:46:53.000000000 -0500
9567 @@ -343,10 +343,10 @@ static int sas_ata_scr_read(struct ata_l
9568 }
9569 }
9570 @@ -29308,9 +29431,9 @@ diff -urNp linux-2.6.32.32/drivers/scsi/libsas/sas_ata.c linux-2.6.32.32/drivers
9571 .qc_prep = ata_noop_qc_prep,
9572 .qc_issue = sas_ata_qc_issue,
9573 .qc_fill_rtf = sas_ata_qc_fill_rtf,
9574 -diff -urNp linux-2.6.32.32/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.32/drivers/scsi/mpt2sas/mpt2sas_debug.h
9575 ---- linux-2.6.32.32/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
9576 -+++ linux-2.6.32.32/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-31 14:46:53.000000000 -0500
9577 +diff -urNp linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h
9578 +--- linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
9579 ++++ linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-31 14:46:53.000000000 -0500
9580 @@ -79,7 +79,7 @@
9581 CMD; \
9582 }
9583 @@ -29320,9 +29443,9 @@ diff -urNp linux-2.6.32.32/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.32/
9584 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
9585
9586
9587 -diff -urNp linux-2.6.32.32/drivers/scsi/scsi_logging.h linux-2.6.32.32/drivers/scsi/scsi_logging.h
9588 ---- linux-2.6.32.32/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
9589 -+++ linux-2.6.32.32/drivers/scsi/scsi_logging.h 2010-12-31 14:46:53.000000000 -0500
9590 +diff -urNp linux-2.6.32.33/drivers/scsi/scsi_logging.h linux-2.6.32.33/drivers/scsi/scsi_logging.h
9591 +--- linux-2.6.32.33/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
9592 ++++ linux-2.6.32.33/drivers/scsi/scsi_logging.h 2010-12-31 14:46:53.000000000 -0500
9593 @@ -51,7 +51,7 @@ do { \
9594 } while (0); \
9595 } while (0)
9596 @@ -29332,9 +29455,9 @@ diff -urNp linux-2.6.32.32/drivers/scsi/scsi_logging.h linux-2.6.32.32/drivers/s
9597 #endif /* CONFIG_SCSI_LOGGING */
9598
9599 /*
9600 -diff -urNp linux-2.6.32.32/drivers/scsi/sg.c linux-2.6.32.32/drivers/scsi/sg.c
9601 ---- linux-2.6.32.32/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
9602 -+++ linux-2.6.32.32/drivers/scsi/sg.c 2010-12-31 14:46:53.000000000 -0500
9603 +diff -urNp linux-2.6.32.33/drivers/scsi/sg.c linux-2.6.32.33/drivers/scsi/sg.c
9604 +--- linux-2.6.32.33/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
9605 ++++ linux-2.6.32.33/drivers/scsi/sg.c 2010-12-31 14:46:53.000000000 -0500
9606 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
9607 const struct file_operations * fops;
9608 };
9609 @@ -29353,9 +29476,9 @@ diff -urNp linux-2.6.32.32/drivers/scsi/sg.c linux-2.6.32.32/drivers/scsi/sg.c
9610
9611 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
9612 if (!sg_proc_sgp)
9613 -diff -urNp linux-2.6.32.32/drivers/serial/8250_pci.c linux-2.6.32.32/drivers/serial/8250_pci.c
9614 ---- linux-2.6.32.32/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
9615 -+++ linux-2.6.32.32/drivers/serial/8250_pci.c 2010-12-31 14:46:53.000000000 -0500
9616 +diff -urNp linux-2.6.32.33/drivers/serial/8250_pci.c linux-2.6.32.33/drivers/serial/8250_pci.c
9617 +--- linux-2.6.32.33/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
9618 ++++ linux-2.6.32.33/drivers/serial/8250_pci.c 2010-12-31 14:46:53.000000000 -0500
9619 @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
9620 PCI_ANY_ID, PCI_ANY_ID,
9621 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
9622 @@ -29365,9 +29488,9 @@ diff -urNp linux-2.6.32.32/drivers/serial/8250_pci.c linux-2.6.32.32/drivers/ser
9623 };
9624
9625 static struct pci_driver serial_pci_driver = {
9626 -diff -urNp linux-2.6.32.32/drivers/serial/kgdboc.c linux-2.6.32.32/drivers/serial/kgdboc.c
9627 ---- linux-2.6.32.32/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
9628 -+++ linux-2.6.32.32/drivers/serial/kgdboc.c 2010-12-31 14:46:53.000000000 -0500
9629 +diff -urNp linux-2.6.32.33/drivers/serial/kgdboc.c linux-2.6.32.33/drivers/serial/kgdboc.c
9630 +--- linux-2.6.32.33/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
9631 ++++ linux-2.6.32.33/drivers/serial/kgdboc.c 2010-12-31 14:46:53.000000000 -0500
9632 @@ -18,7 +18,7 @@
9633
9634 #define MAX_CONFIG_LEN 40
9635 @@ -29386,9 +29509,9 @@ diff -urNp linux-2.6.32.32/drivers/serial/kgdboc.c linux-2.6.32.32/drivers/seria
9636 .name = "kgdboc",
9637 .read_char = kgdboc_get_char,
9638 .write_char = kgdboc_put_char,
9639 -diff -urNp linux-2.6.32.32/drivers/staging/android/binder.c linux-2.6.32.32/drivers/staging/android/binder.c
9640 ---- linux-2.6.32.32/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
9641 -+++ linux-2.6.32.32/drivers/staging/android/binder.c 2010-12-31 14:46:53.000000000 -0500
9642 +diff -urNp linux-2.6.32.33/drivers/staging/android/binder.c linux-2.6.32.33/drivers/staging/android/binder.c
9643 +--- linux-2.6.32.33/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
9644 ++++ linux-2.6.32.33/drivers/staging/android/binder.c 2010-12-31 14:46:53.000000000 -0500
9645 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
9646 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
9647 }
9648 @@ -29398,9 +29521,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/android/binder.c linux-2.6.32.32/driv
9649 .open = binder_vma_open,
9650 .close = binder_vma_close,
9651 };
9652 -diff -urNp linux-2.6.32.32/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.32/drivers/staging/b3dfg/b3dfg.c
9653 ---- linux-2.6.32.32/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
9654 -+++ linux-2.6.32.32/drivers/staging/b3dfg/b3dfg.c 2010-12-31 14:46:53.000000000 -0500
9655 +diff -urNp linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c
9656 +--- linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
9657 ++++ linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c 2010-12-31 14:46:53.000000000 -0500
9658 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
9659 return VM_FAULT_NOPAGE;
9660 }
9661 @@ -29419,9 +29542,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.32/drivers
9662 .owner = THIS_MODULE,
9663 .open = b3dfg_open,
9664 .release = b3dfg_release,
9665 -diff -urNp linux-2.6.32.32/drivers/staging/comedi/comedi_fops.c linux-2.6.32.32/drivers/staging/comedi/comedi_fops.c
9666 ---- linux-2.6.32.32/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
9667 -+++ linux-2.6.32.32/drivers/staging/comedi/comedi_fops.c 2010-12-31 14:46:53.000000000 -0500
9668 +diff -urNp linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c
9669 +--- linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
9670 ++++ linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c 2010-12-31 14:46:53.000000000 -0500
9671 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
9672 mutex_unlock(&dev->mutex);
9673 }
9674 @@ -29431,9 +29554,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/comedi/comedi_fops.c linux-2.6.32.32/
9675 .close = comedi_unmap,
9676 };
9677
9678 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.32/drivers/staging/dream/qdsp5/adsp_driver.c
9679 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
9680 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-31 14:46:53.000000000 -0500
9681 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c
9682 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
9683 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-31 14:46:53.000000000 -0500
9684 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
9685 static dev_t adsp_devno;
9686 static struct class *adsp_class;
9687 @@ -29443,9 +29566,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
9688 .owner = THIS_MODULE,
9689 .open = adsp_open,
9690 .unlocked_ioctl = adsp_ioctl,
9691 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_aac.c
9692 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
9693 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-31 14:46:53.000000000 -0500
9694 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c
9695 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
9696 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-31 14:46:53.000000000 -0500
9697 @@ -1022,7 +1022,7 @@ done:
9698 return rc;
9699 }
9700 @@ -29455,9 +29578,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
9701 .owner = THIS_MODULE,
9702 .open = audio_open,
9703 .release = audio_release,
9704 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_amrnb.c
9705 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
9706 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-31 14:46:53.000000000 -0500
9707 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c
9708 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
9709 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-31 14:46:53.000000000 -0500
9710 @@ -833,7 +833,7 @@ done:
9711 return rc;
9712 }
9713 @@ -29467,9 +29590,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
9714 .owner = THIS_MODULE,
9715 .open = audamrnb_open,
9716 .release = audamrnb_release,
9717 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_evrc.c
9718 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
9719 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-31 14:46:53.000000000 -0500
9720 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c
9721 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
9722 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-31 14:46:53.000000000 -0500
9723 @@ -805,7 +805,7 @@ dma_fail:
9724 return rc;
9725 }
9726 @@ -29479,9 +29602,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
9727 .owner = THIS_MODULE,
9728 .open = audevrc_open,
9729 .release = audevrc_release,
9730 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_in.c
9731 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
9732 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_in.c 2010-12-31 14:46:53.000000000 -0500
9733 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c
9734 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
9735 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c 2010-12-31 14:46:53.000000000 -0500
9736 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
9737 return 0;
9738 }
9739 @@ -29500,9 +29623,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.3
9740 .owner = THIS_MODULE,
9741 .open = audpre_open,
9742 .unlocked_ioctl = audpre_ioctl,
9743 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_mp3.c
9744 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
9745 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-31 14:46:53.000000000 -0500
9746 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c
9747 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
9748 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-31 14:46:53.000000000 -0500
9749 @@ -941,7 +941,7 @@ done:
9750 return rc;
9751 }
9752 @@ -29512,9 +29635,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
9753 .owner = THIS_MODULE,
9754 .open = audio_open,
9755 .release = audio_release,
9756 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_out.c
9757 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
9758 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_out.c 2010-12-31 14:46:53.000000000 -0500
9759 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c
9760 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
9761 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c 2010-12-31 14:46:53.000000000 -0500
9762 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
9763 return 0;
9764 }
9765 @@ -29533,9 +29656,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
9766 .owner = THIS_MODULE,
9767 .open = audpp_open,
9768 .unlocked_ioctl = audpp_ioctl,
9769 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_qcelp.c
9770 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
9771 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-31 14:46:53.000000000 -0500
9772 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c
9773 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
9774 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-31 14:46:53.000000000 -0500
9775 @@ -816,7 +816,7 @@ err:
9776 return rc;
9777 }
9778 @@ -29545,9 +29668,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
9779 .owner = THIS_MODULE,
9780 .open = audqcelp_open,
9781 .release = audqcelp_release,
9782 -diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.32/drivers/staging/dream/qdsp5/snd.c
9783 ---- linux-2.6.32.32/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
9784 -+++ linux-2.6.32.32/drivers/staging/dream/qdsp5/snd.c 2010-12-31 14:46:53.000000000 -0500
9785 +diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c
9786 +--- linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
9787 ++++ linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c 2010-12-31 14:46:53.000000000 -0500
9788 @@ -242,7 +242,7 @@ err:
9789 return rc;
9790 }
9791 @@ -29557,9 +29680,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.32/dri
9792 .owner = THIS_MODULE,
9793 .open = snd_open,
9794 .release = snd_release,
9795 -diff -urNp linux-2.6.32.32/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.32/drivers/staging/dream/smd/smd_qmi.c
9796 ---- linux-2.6.32.32/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
9797 -+++ linux-2.6.32.32/drivers/staging/dream/smd/smd_qmi.c 2010-12-31 14:46:53.000000000 -0500
9798 +diff -urNp linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c
9799 +--- linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
9800 ++++ linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c 2010-12-31 14:46:53.000000000 -0500
9801 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
9802 return 0;
9803 }
9804 @@ -29569,9 +29692,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.32/d
9805 .owner = THIS_MODULE,
9806 .read = qmi_read,
9807 .write = qmi_write,
9808 -diff -urNp linux-2.6.32.32/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.32/drivers/staging/dream/smd/smd_rpcrouter_device.c
9809 ---- linux-2.6.32.32/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
9810 -+++ linux-2.6.32.32/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-31 14:46:53.000000000 -0500
9811 +diff -urNp linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c
9812 +--- linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
9813 ++++ linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-31 14:46:53.000000000 -0500
9814 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
9815 return rc;
9816 }
9817 @@ -29590,9 +29713,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
9818 .owner = THIS_MODULE,
9819 .open = rpcrouter_open,
9820 .release = rpcrouter_release,
9821 -diff -urNp linux-2.6.32.32/drivers/staging/dst/dcore.c linux-2.6.32.32/drivers/staging/dst/dcore.c
9822 ---- linux-2.6.32.32/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
9823 -+++ linux-2.6.32.32/drivers/staging/dst/dcore.c 2010-12-31 14:46:53.000000000 -0500
9824 +diff -urNp linux-2.6.32.33/drivers/staging/dst/dcore.c linux-2.6.32.33/drivers/staging/dst/dcore.c
9825 +--- linux-2.6.32.33/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
9826 ++++ linux-2.6.32.33/drivers/staging/dst/dcore.c 2010-12-31 14:46:53.000000000 -0500
9827 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
9828 return 0;
9829 }
9830 @@ -29611,9 +29734,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dst/dcore.c linux-2.6.32.32/drivers/s
9831 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
9832
9833 err = dst_node_sysfs_init(n);
9834 -diff -urNp linux-2.6.32.32/drivers/staging/dst/trans.c linux-2.6.32.32/drivers/staging/dst/trans.c
9835 ---- linux-2.6.32.32/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
9836 -+++ linux-2.6.32.32/drivers/staging/dst/trans.c 2010-12-31 14:46:53.000000000 -0500
9837 +diff -urNp linux-2.6.32.33/drivers/staging/dst/trans.c linux-2.6.32.33/drivers/staging/dst/trans.c
9838 +--- linux-2.6.32.33/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
9839 ++++ linux-2.6.32.33/drivers/staging/dst/trans.c 2010-12-31 14:46:53.000000000 -0500
9840 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
9841 t->error = 0;
9842 t->retries = 0;
9843 @@ -29623,9 +29746,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/dst/trans.c linux-2.6.32.32/drivers/s
9844
9845 t->enc = bio_data_dir(bio);
9846 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
9847 -diff -urNp linux-2.6.32.32/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.32/drivers/staging/go7007/go7007-v4l2.c
9848 ---- linux-2.6.32.32/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
9849 -+++ linux-2.6.32.32/drivers/staging/go7007/go7007-v4l2.c 2010-12-31 14:46:53.000000000 -0500
9850 +diff -urNp linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c
9851 +--- linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
9852 ++++ linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c 2010-12-31 14:46:53.000000000 -0500
9853 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
9854 return 0;
9855 }
9856 @@ -29635,9 +29758,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.32/
9857 .open = go7007_vm_open,
9858 .close = go7007_vm_close,
9859 .fault = go7007_vm_fault,
9860 -diff -urNp linux-2.6.32.32/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.32/drivers/staging/hv/blkvsc_drv.c
9861 ---- linux-2.6.32.32/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:56:54.000000000 -0500
9862 -+++ linux-2.6.32.32/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:57:23.000000000 -0500
9863 +diff -urNp linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c
9864 +--- linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:56:54.000000000 -0500
9865 ++++ linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:57:23.000000000 -0500
9866 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
9867 /* The one and only one */
9868 static struct blkvsc_driver_context g_blkvsc_drv;
9869 @@ -29647,9 +29770,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.32/drive
9870 .owner = THIS_MODULE,
9871 .open = blkvsc_open,
9872 .release = blkvsc_release,
9873 -diff -urNp linux-2.6.32.32/drivers/staging/hv/Hv.c linux-2.6.32.32/drivers/staging/hv/Hv.c
9874 ---- linux-2.6.32.32/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
9875 -+++ linux-2.6.32.32/drivers/staging/hv/Hv.c 2010-12-31 14:46:53.000000000 -0500
9876 +diff -urNp linux-2.6.32.33/drivers/staging/hv/Hv.c linux-2.6.32.33/drivers/staging/hv/Hv.c
9877 +--- linux-2.6.32.33/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
9878 ++++ linux-2.6.32.33/drivers/staging/hv/Hv.c 2010-12-31 14:46:53.000000000 -0500
9879 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
9880 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
9881 u32 outputAddressHi = outputAddress >> 32;
9882 @@ -29659,9 +29782,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/hv/Hv.c linux-2.6.32.32/drivers/stagi
9883
9884 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
9885 Control, Input, Output);
9886 -diff -urNp linux-2.6.32.32/drivers/staging/panel/panel.c linux-2.6.32.32/drivers/staging/panel/panel.c
9887 ---- linux-2.6.32.32/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
9888 -+++ linux-2.6.32.32/drivers/staging/panel/panel.c 2010-12-31 14:46:53.000000000 -0500
9889 +diff -urNp linux-2.6.32.33/drivers/staging/panel/panel.c linux-2.6.32.33/drivers/staging/panel/panel.c
9890 +--- linux-2.6.32.33/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
9891 ++++ linux-2.6.32.33/drivers/staging/panel/panel.c 2010-12-31 14:46:53.000000000 -0500
9892 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
9893 return 0;
9894 }
9895 @@ -29680,9 +29803,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/panel/panel.c linux-2.6.32.32/drivers
9896 .read = keypad_read, /* read */
9897 .open = keypad_open, /* open */
9898 .release = keypad_release, /* close */
9899 -diff -urNp linux-2.6.32.32/drivers/staging/phison/phison.c linux-2.6.32.32/drivers/staging/phison/phison.c
9900 ---- linux-2.6.32.32/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
9901 -+++ linux-2.6.32.32/drivers/staging/phison/phison.c 2010-12-31 14:46:53.000000000 -0500
9902 +diff -urNp linux-2.6.32.33/drivers/staging/phison/phison.c linux-2.6.32.33/drivers/staging/phison/phison.c
9903 +--- linux-2.6.32.33/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
9904 ++++ linux-2.6.32.33/drivers/staging/phison/phison.c 2010-12-31 14:46:53.000000000 -0500
9905 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
9906 ATA_BMDMA_SHT(DRV_NAME),
9907 };
9908 @@ -29692,9 +29815,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/phison/phison.c linux-2.6.32.32/drive
9909 .inherits = &ata_bmdma_port_ops,
9910 .prereset = phison_pre_reset,
9911 };
9912 -diff -urNp linux-2.6.32.32/drivers/staging/poch/poch.c linux-2.6.32.32/drivers/staging/poch/poch.c
9913 ---- linux-2.6.32.32/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
9914 -+++ linux-2.6.32.32/drivers/staging/poch/poch.c 2010-12-31 14:46:53.000000000 -0500
9915 +diff -urNp linux-2.6.32.33/drivers/staging/poch/poch.c linux-2.6.32.33/drivers/staging/poch/poch.c
9916 +--- linux-2.6.32.33/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
9917 ++++ linux-2.6.32.33/drivers/staging/poch/poch.c 2010-12-31 14:46:53.000000000 -0500
9918 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
9919 return 0;
9920 }
9921 @@ -29704,9 +29827,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/poch/poch.c linux-2.6.32.32/drivers/s
9922 .owner = THIS_MODULE,
9923 .open = poch_open,
9924 .release = poch_release,
9925 -diff -urNp linux-2.6.32.32/drivers/staging/pohmelfs/inode.c linux-2.6.32.32/drivers/staging/pohmelfs/inode.c
9926 ---- linux-2.6.32.32/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
9927 -+++ linux-2.6.32.32/drivers/staging/pohmelfs/inode.c 2010-12-31 14:46:53.000000000 -0500
9928 +diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/inode.c linux-2.6.32.33/drivers/staging/pohmelfs/inode.c
9929 +--- linux-2.6.32.33/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
9930 ++++ linux-2.6.32.33/drivers/staging/pohmelfs/inode.c 2010-12-31 14:46:53.000000000 -0500
9931 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
9932 mutex_init(&psb->mcache_lock);
9933 psb->mcache_root = RB_ROOT;
9934 @@ -29716,9 +29839,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/pohmelfs/inode.c linux-2.6.32.32/driv
9935
9936 psb->trans_max_pages = 100;
9937
9938 -diff -urNp linux-2.6.32.32/drivers/staging/pohmelfs/mcache.c linux-2.6.32.32/drivers/staging/pohmelfs/mcache.c
9939 ---- linux-2.6.32.32/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
9940 -+++ linux-2.6.32.32/drivers/staging/pohmelfs/mcache.c 2010-12-31 14:46:53.000000000 -0500
9941 +diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c
9942 +--- linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
9943 ++++ linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c 2010-12-31 14:46:53.000000000 -0500
9944 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
9945 m->data = data;
9946 m->start = start;
9947 @@ -29728,9 +29851,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/pohmelfs/mcache.c linux-2.6.32.32/dri
9948
9949 mutex_lock(&psb->mcache_lock);
9950 err = pohmelfs_mcache_insert(psb, m);
9951 -diff -urNp linux-2.6.32.32/drivers/staging/pohmelfs/netfs.h linux-2.6.32.32/drivers/staging/pohmelfs/netfs.h
9952 ---- linux-2.6.32.32/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
9953 -+++ linux-2.6.32.32/drivers/staging/pohmelfs/netfs.h 2010-12-31 14:46:53.000000000 -0500
9954 +diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h
9955 +--- linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
9956 ++++ linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h 2010-12-31 14:46:53.000000000 -0500
9957 @@ -570,7 +570,7 @@ struct pohmelfs_config;
9958 struct pohmelfs_sb {
9959 struct rb_root mcache_root;
9960 @@ -29740,9 +29863,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/pohmelfs/netfs.h linux-2.6.32.32/driv
9961 unsigned long mcache_timeout;
9962
9963 unsigned int idx;
9964 -diff -urNp linux-2.6.32.32/drivers/staging/sep/sep_driver.c linux-2.6.32.32/drivers/staging/sep/sep_driver.c
9965 ---- linux-2.6.32.32/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
9966 -+++ linux-2.6.32.32/drivers/staging/sep/sep_driver.c 2010-12-31 14:46:53.000000000 -0500
9967 +diff -urNp linux-2.6.32.33/drivers/staging/sep/sep_driver.c linux-2.6.32.33/drivers/staging/sep/sep_driver.c
9968 +--- linux-2.6.32.33/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
9969 ++++ linux-2.6.32.33/drivers/staging/sep/sep_driver.c 2010-12-31 14:46:53.000000000 -0500
9970 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
9971 static dev_t sep_devno;
9972
9973 @@ -29752,9 +29875,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/sep/sep_driver.c linux-2.6.32.32/driv
9974 .owner = THIS_MODULE,
9975 .ioctl = sep_ioctl,
9976 .poll = sep_poll,
9977 -diff -urNp linux-2.6.32.32/drivers/staging/vme/devices/vme_user.c linux-2.6.32.32/drivers/staging/vme/devices/vme_user.c
9978 ---- linux-2.6.32.32/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
9979 -+++ linux-2.6.32.32/drivers/staging/vme/devices/vme_user.c 2010-12-31 14:46:53.000000000 -0500
9980 +diff -urNp linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c
9981 +--- linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
9982 ++++ linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c 2010-12-31 14:46:53.000000000 -0500
9983 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
9984 static int __init vme_user_probe(struct device *, int, int);
9985 static int __exit vme_user_remove(struct device *, int, int);
9986 @@ -29764,9 +29887,9 @@ diff -urNp linux-2.6.32.32/drivers/staging/vme/devices/vme_user.c linux-2.6.32.3
9987 .open = vme_user_open,
9988 .release = vme_user_release,
9989 .read = vme_user_read,
9990 -diff -urNp linux-2.6.32.32/drivers/uio/uio.c linux-2.6.32.32/drivers/uio/uio.c
9991 ---- linux-2.6.32.32/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
9992 -+++ linux-2.6.32.32/drivers/uio/uio.c 2011-01-24 18:05:34.000000000 -0500
9993 +diff -urNp linux-2.6.32.33/drivers/uio/uio.c linux-2.6.32.33/drivers/uio/uio.c
9994 +--- linux-2.6.32.33/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
9995 ++++ linux-2.6.32.33/drivers/uio/uio.c 2011-01-24 18:05:34.000000000 -0500
9996 @@ -23,6 +23,7 @@
9997 #include <linux/string.h>
9998 #include <linux/kobject.h>
9999 @@ -29818,9 +29941,9 @@ diff -urNp linux-2.6.32.32/drivers/uio/uio.c linux-2.6.32.32/drivers/uio/uio.c
10000 }
10001
10002 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
10003 -diff -urNp linux-2.6.32.32/drivers/usb/atm/usbatm.c linux-2.6.32.32/drivers/usb/atm/usbatm.c
10004 ---- linux-2.6.32.32/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
10005 -+++ linux-2.6.32.32/drivers/usb/atm/usbatm.c 2010-12-31 14:46:53.000000000 -0500
10006 +diff -urNp linux-2.6.32.33/drivers/usb/atm/usbatm.c linux-2.6.32.33/drivers/usb/atm/usbatm.c
10007 +--- linux-2.6.32.33/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
10008 ++++ linux-2.6.32.33/drivers/usb/atm/usbatm.c 2010-12-31 14:46:53.000000000 -0500
10009 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
10010 if (printk_ratelimit())
10011 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
10012 @@ -29900,9 +30023,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/atm/usbatm.c linux-2.6.32.32/drivers/usb/
10013
10014 if (!left--) {
10015 if (instance->disconnected)
10016 -diff -urNp linux-2.6.32.32/drivers/usb/class/cdc-acm.c linux-2.6.32.32/drivers/usb/class/cdc-acm.c
10017 ---- linux-2.6.32.32/drivers/usb/class/cdc-acm.c 2011-02-22 15:56:54.000000000 -0500
10018 -+++ linux-2.6.32.32/drivers/usb/class/cdc-acm.c 2011-02-22 15:57:23.000000000 -0500
10019 +diff -urNp linux-2.6.32.33/drivers/usb/class/cdc-acm.c linux-2.6.32.33/drivers/usb/class/cdc-acm.c
10020 +--- linux-2.6.32.33/drivers/usb/class/cdc-acm.c 2011-02-22 15:56:54.000000000 -0500
10021 ++++ linux-2.6.32.33/drivers/usb/class/cdc-acm.c 2011-02-22 15:57:23.000000000 -0500
10022 @@ -1619,7 +1619,7 @@ static struct usb_device_id acm_ids[] =
10023 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
10024 USB_CDC_ACM_PROTO_AT_CDMA) },
10025 @@ -29912,9 +30035,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/class/cdc-acm.c linux-2.6.32.32/drivers/u
10026 };
10027
10028 MODULE_DEVICE_TABLE(usb, acm_ids);
10029 -diff -urNp linux-2.6.32.32/drivers/usb/class/cdc-wdm.c linux-2.6.32.32/drivers/usb/class/cdc-wdm.c
10030 ---- linux-2.6.32.32/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
10031 -+++ linux-2.6.32.32/drivers/usb/class/cdc-wdm.c 2010-12-31 14:46:53.000000000 -0500
10032 +diff -urNp linux-2.6.32.33/drivers/usb/class/cdc-wdm.c linux-2.6.32.33/drivers/usb/class/cdc-wdm.c
10033 +--- linux-2.6.32.33/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
10034 ++++ linux-2.6.32.33/drivers/usb/class/cdc-wdm.c 2010-12-31 14:46:53.000000000 -0500
10035 @@ -314,7 +314,7 @@ static ssize_t wdm_write
10036 if (r < 0)
10037 goto outnp;
10038 @@ -29924,9 +30047,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/class/cdc-wdm.c linux-2.6.32.32/drivers/u
10039 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
10040 &desc->flags));
10041 else
10042 -diff -urNp linux-2.6.32.32/drivers/usb/class/usblp.c linux-2.6.32.32/drivers/usb/class/usblp.c
10043 ---- linux-2.6.32.32/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
10044 -+++ linux-2.6.32.32/drivers/usb/class/usblp.c 2010-12-31 14:46:53.000000000 -0500
10045 +diff -urNp linux-2.6.32.33/drivers/usb/class/usblp.c linux-2.6.32.33/drivers/usb/class/usblp.c
10046 +--- linux-2.6.32.33/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
10047 ++++ linux-2.6.32.33/drivers/usb/class/usblp.c 2010-12-31 14:46:53.000000000 -0500
10048 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct
10049 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@×××.de> */
10050 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
10051 @@ -29945,9 +30068,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/class/usblp.c linux-2.6.32.32/drivers/usb
10052 };
10053
10054 MODULE_DEVICE_TABLE (usb, usblp_ids);
10055 -diff -urNp linux-2.6.32.32/drivers/usb/core/hcd.c linux-2.6.32.32/drivers/usb/core/hcd.c
10056 ---- linux-2.6.32.32/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
10057 -+++ linux-2.6.32.32/drivers/usb/core/hcd.c 2010-12-31 14:46:53.000000000 -0500
10058 +diff -urNp linux-2.6.32.33/drivers/usb/core/hcd.c linux-2.6.32.33/drivers/usb/core/hcd.c
10059 +--- linux-2.6.32.33/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
10060 ++++ linux-2.6.32.33/drivers/usb/core/hcd.c 2010-12-31 14:46:53.000000000 -0500
10061 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
10062
10063 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
10064 @@ -29966,9 +30089,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/core/hcd.c linux-2.6.32.32/drivers/usb/co
10065 {
10066
10067 if (mon_ops)
10068 -diff -urNp linux-2.6.32.32/drivers/usb/core/hcd.h linux-2.6.32.32/drivers/usb/core/hcd.h
10069 ---- linux-2.6.32.32/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
10070 -+++ linux-2.6.32.32/drivers/usb/core/hcd.h 2010-12-31 14:46:53.000000000 -0500
10071 +diff -urNp linux-2.6.32.33/drivers/usb/core/hcd.h linux-2.6.32.33/drivers/usb/core/hcd.h
10072 +--- linux-2.6.32.33/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
10073 ++++ linux-2.6.32.33/drivers/usb/core/hcd.h 2010-12-31 14:46:53.000000000 -0500
10074 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
10075 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
10076
10077 @@ -29996,9 +30119,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/core/hcd.h linux-2.6.32.32/drivers/usb/co
10078 void usb_mon_deregister(void);
10079
10080 #else
10081 -diff -urNp linux-2.6.32.32/drivers/usb/core/hub.c linux-2.6.32.32/drivers/usb/core/hub.c
10082 ---- linux-2.6.32.32/drivers/usb/core/hub.c 2011-02-22 15:56:54.000000000 -0500
10083 -+++ linux-2.6.32.32/drivers/usb/core/hub.c 2011-02-22 15:57:23.000000000 -0500
10084 +diff -urNp linux-2.6.32.33/drivers/usb/core/hub.c linux-2.6.32.33/drivers/usb/core/hub.c
10085 +--- linux-2.6.32.33/drivers/usb/core/hub.c 2011-02-22 15:56:54.000000000 -0500
10086 ++++ linux-2.6.32.33/drivers/usb/core/hub.c 2011-02-22 15:57:23.000000000 -0500
10087 @@ -3430,7 +3430,7 @@ static struct usb_device_id hub_id_table
10088 .bDeviceClass = USB_CLASS_HUB},
10089 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
10090 @@ -30008,9 +30131,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/core/hub.c linux-2.6.32.32/drivers/usb/co
10091 };
10092
10093 MODULE_DEVICE_TABLE (usb, hub_id_table);
10094 -diff -urNp linux-2.6.32.32/drivers/usb/core/message.c linux-2.6.32.32/drivers/usb/core/message.c
10095 ---- linux-2.6.32.32/drivers/usb/core/message.c 2010-11-26 18:22:29.000000000 -0500
10096 -+++ linux-2.6.32.32/drivers/usb/core/message.c 2010-12-31 14:46:53.000000000 -0500
10097 +diff -urNp linux-2.6.32.33/drivers/usb/core/message.c linux-2.6.32.33/drivers/usb/core/message.c
10098 +--- linux-2.6.32.33/drivers/usb/core/message.c 2010-11-26 18:22:29.000000000 -0500
10099 ++++ linux-2.6.32.33/drivers/usb/core/message.c 2010-12-31 14:46:53.000000000 -0500
10100 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
10101 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
10102 if (buf) {
10103 @@ -30022,9 +30145,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/core/message.c linux-2.6.32.32/drivers/us
10104 if (!smallbuf)
10105 return buf;
10106 memcpy(smallbuf, buf, len);
10107 -diff -urNp linux-2.6.32.32/drivers/usb/host/ehci-pci.c linux-2.6.32.32/drivers/usb/host/ehci-pci.c
10108 ---- linux-2.6.32.32/drivers/usb/host/ehci-pci.c 2011-02-22 15:56:54.000000000 -0500
10109 -+++ linux-2.6.32.32/drivers/usb/host/ehci-pci.c 2011-02-22 15:57:23.000000000 -0500
10110 +diff -urNp linux-2.6.32.33/drivers/usb/host/ehci-pci.c linux-2.6.32.33/drivers/usb/host/ehci-pci.c
10111 +--- linux-2.6.32.33/drivers/usb/host/ehci-pci.c 2011-02-22 15:56:54.000000000 -0500
10112 ++++ linux-2.6.32.33/drivers/usb/host/ehci-pci.c 2011-02-22 15:57:23.000000000 -0500
10113 @@ -461,7 +461,7 @@ static const struct pci_device_id pci_id
10114 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
10115 .driver_data = (unsigned long) &ehci_pci_hc_driver,
10116 @@ -30034,9 +30157,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/host/ehci-pci.c linux-2.6.32.32/drivers/u
10117 };
10118 MODULE_DEVICE_TABLE(pci, pci_ids);
10119
10120 -diff -urNp linux-2.6.32.32/drivers/usb/host/uhci-hcd.c linux-2.6.32.32/drivers/usb/host/uhci-hcd.c
10121 ---- linux-2.6.32.32/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
10122 -+++ linux-2.6.32.32/drivers/usb/host/uhci-hcd.c 2010-12-31 14:46:53.000000000 -0500
10123 +diff -urNp linux-2.6.32.33/drivers/usb/host/uhci-hcd.c linux-2.6.32.33/drivers/usb/host/uhci-hcd.c
10124 +--- linux-2.6.32.33/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
10125 ++++ linux-2.6.32.33/drivers/usb/host/uhci-hcd.c 2010-12-31 14:46:53.000000000 -0500
10126 @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
10127 /* handle any USB UHCI controller */
10128 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
10129 @@ -30046,9 +30169,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/host/uhci-hcd.c linux-2.6.32.32/drivers/u
10130 };
10131
10132 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
10133 -diff -urNp linux-2.6.32.32/drivers/usb/misc/appledisplay.c linux-2.6.32.32/drivers/usb/misc/appledisplay.c
10134 ---- linux-2.6.32.32/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
10135 -+++ linux-2.6.32.32/drivers/usb/misc/appledisplay.c 2010-12-31 14:46:53.000000000 -0500
10136 +diff -urNp linux-2.6.32.33/drivers/usb/misc/appledisplay.c linux-2.6.32.33/drivers/usb/misc/appledisplay.c
10137 +--- linux-2.6.32.33/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
10138 ++++ linux-2.6.32.33/drivers/usb/misc/appledisplay.c 2010-12-31 14:46:53.000000000 -0500
10139 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
10140 return pdata->msgdata[1];
10141 }
10142 @@ -30058,9 +30181,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/misc/appledisplay.c linux-2.6.32.32/drive
10143 .get_brightness = appledisplay_bl_get_brightness,
10144 .update_status = appledisplay_bl_update_status,
10145 };
10146 -diff -urNp linux-2.6.32.32/drivers/usb/mon/mon_main.c linux-2.6.32.32/drivers/usb/mon/mon_main.c
10147 ---- linux-2.6.32.32/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
10148 -+++ linux-2.6.32.32/drivers/usb/mon/mon_main.c 2010-12-31 14:46:53.000000000 -0500
10149 +diff -urNp linux-2.6.32.33/drivers/usb/mon/mon_main.c linux-2.6.32.33/drivers/usb/mon/mon_main.c
10150 +--- linux-2.6.32.33/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
10151 ++++ linux-2.6.32.33/drivers/usb/mon/mon_main.c 2010-12-31 14:46:53.000000000 -0500
10152 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
10153 /*
10154 * Ops
10155 @@ -30070,9 +30193,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/mon/mon_main.c linux-2.6.32.32/drivers/us
10156 .urb_submit = mon_submit,
10157 .urb_submit_error = mon_submit_error,
10158 .urb_complete = mon_complete,
10159 -diff -urNp linux-2.6.32.32/drivers/usb/storage/debug.h linux-2.6.32.32/drivers/usb/storage/debug.h
10160 ---- linux-2.6.32.32/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
10161 -+++ linux-2.6.32.32/drivers/usb/storage/debug.h 2010-12-31 14:46:53.000000000 -0500
10162 +diff -urNp linux-2.6.32.33/drivers/usb/storage/debug.h linux-2.6.32.33/drivers/usb/storage/debug.h
10163 +--- linux-2.6.32.33/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
10164 ++++ linux-2.6.32.33/drivers/usb/storage/debug.h 2010-12-31 14:46:53.000000000 -0500
10165 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
10166 #define US_DEBUGPX(x...) printk( x )
10167 #define US_DEBUG(x) x
10168 @@ -30086,9 +30209,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/storage/debug.h linux-2.6.32.32/drivers/u
10169 #endif
10170
10171 #endif
10172 -diff -urNp linux-2.6.32.32/drivers/usb/storage/usb.c linux-2.6.32.32/drivers/usb/storage/usb.c
10173 ---- linux-2.6.32.32/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
10174 -+++ linux-2.6.32.32/drivers/usb/storage/usb.c 2010-12-31 14:46:53.000000000 -0500
10175 +diff -urNp linux-2.6.32.33/drivers/usb/storage/usb.c linux-2.6.32.33/drivers/usb/storage/usb.c
10176 +--- linux-2.6.32.33/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
10177 ++++ linux-2.6.32.33/drivers/usb/storage/usb.c 2010-12-31 14:46:53.000000000 -0500
10178 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
10179
10180 static struct us_unusual_dev us_unusual_dev_list[] = {
10181 @@ -30098,9 +30221,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/storage/usb.c linux-2.6.32.32/drivers/usb
10182 };
10183
10184 #undef UNUSUAL_DEV
10185 -diff -urNp linux-2.6.32.32/drivers/usb/storage/usual-tables.c linux-2.6.32.32/drivers/usb/storage/usual-tables.c
10186 ---- linux-2.6.32.32/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
10187 -+++ linux-2.6.32.32/drivers/usb/storage/usual-tables.c 2010-12-31 14:46:53.000000000 -0500
10188 +diff -urNp linux-2.6.32.33/drivers/usb/storage/usual-tables.c linux-2.6.32.33/drivers/usb/storage/usual-tables.c
10189 +--- linux-2.6.32.33/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
10190 ++++ linux-2.6.32.33/drivers/usb/storage/usual-tables.c 2010-12-31 14:46:53.000000000 -0500
10191 @@ -48,7 +48,7 @@
10192
10193 struct usb_device_id usb_storage_usb_ids[] = {
10194 @@ -30110,9 +30233,9 @@ diff -urNp linux-2.6.32.32/drivers/usb/storage/usual-tables.c linux-2.6.32.32/dr
10195 };
10196 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
10197
10198 -diff -urNp linux-2.6.32.32/drivers/uwb/wlp/messages.c linux-2.6.32.32/drivers/uwb/wlp/messages.c
10199 ---- linux-2.6.32.32/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
10200 -+++ linux-2.6.32.32/drivers/uwb/wlp/messages.c 2010-12-31 14:46:53.000000000 -0500
10201 +diff -urNp linux-2.6.32.33/drivers/uwb/wlp/messages.c linux-2.6.32.33/drivers/uwb/wlp/messages.c
10202 +--- linux-2.6.32.33/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
10203 ++++ linux-2.6.32.33/drivers/uwb/wlp/messages.c 2010-12-31 14:46:53.000000000 -0500
10204 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
10205 size_t len = skb->len;
10206 size_t used;
10207 @@ -30122,9 +30245,9 @@ diff -urNp linux-2.6.32.32/drivers/uwb/wlp/messages.c linux-2.6.32.32/drivers/uw
10208 enum wlp_assc_error assc_err;
10209 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
10210 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
10211 -diff -urNp linux-2.6.32.32/drivers/uwb/wlp/sysfs.c linux-2.6.32.32/drivers/uwb/wlp/sysfs.c
10212 ---- linux-2.6.32.32/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10213 -+++ linux-2.6.32.32/drivers/uwb/wlp/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10214 +diff -urNp linux-2.6.32.33/drivers/uwb/wlp/sysfs.c linux-2.6.32.33/drivers/uwb/wlp/sysfs.c
10215 +--- linux-2.6.32.33/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10216 ++++ linux-2.6.32.33/drivers/uwb/wlp/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10217 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
10218 return ret;
10219 }
10220 @@ -30135,9 +30258,9 @@ diff -urNp linux-2.6.32.32/drivers/uwb/wlp/sysfs.c linux-2.6.32.32/drivers/uwb/w
10221 .show = wlp_wss_attr_show,
10222 .store = wlp_wss_attr_store,
10223 };
10224 -diff -urNp linux-2.6.32.32/drivers/video/atmel_lcdfb.c linux-2.6.32.32/drivers/video/atmel_lcdfb.c
10225 ---- linux-2.6.32.32/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
10226 -+++ linux-2.6.32.32/drivers/video/atmel_lcdfb.c 2010-12-31 14:46:53.000000000 -0500
10227 +diff -urNp linux-2.6.32.33/drivers/video/atmel_lcdfb.c linux-2.6.32.33/drivers/video/atmel_lcdfb.c
10228 +--- linux-2.6.32.33/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
10229 ++++ linux-2.6.32.33/drivers/video/atmel_lcdfb.c 2010-12-31 14:46:53.000000000 -0500
10230 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
10231 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
10232 }
10233 @@ -30147,9 +30270,9 @@ diff -urNp linux-2.6.32.32/drivers/video/atmel_lcdfb.c linux-2.6.32.32/drivers/v
10234 .update_status = atmel_bl_update_status,
10235 .get_brightness = atmel_bl_get_brightness,
10236 };
10237 -diff -urNp linux-2.6.32.32/drivers/video/aty/aty128fb.c linux-2.6.32.32/drivers/video/aty/aty128fb.c
10238 ---- linux-2.6.32.32/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
10239 -+++ linux-2.6.32.32/drivers/video/aty/aty128fb.c 2010-12-31 14:46:53.000000000 -0500
10240 +diff -urNp linux-2.6.32.33/drivers/video/aty/aty128fb.c linux-2.6.32.33/drivers/video/aty/aty128fb.c
10241 +--- linux-2.6.32.33/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
10242 ++++ linux-2.6.32.33/drivers/video/aty/aty128fb.c 2010-12-31 14:46:53.000000000 -0500
10243 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
10244 return bd->props.brightness;
10245 }
10246 @@ -30159,9 +30282,9 @@ diff -urNp linux-2.6.32.32/drivers/video/aty/aty128fb.c linux-2.6.32.32/drivers/
10247 .get_brightness = aty128_bl_get_brightness,
10248 .update_status = aty128_bl_update_status,
10249 };
10250 -diff -urNp linux-2.6.32.32/drivers/video/aty/atyfb_base.c linux-2.6.32.32/drivers/video/aty/atyfb_base.c
10251 ---- linux-2.6.32.32/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
10252 -+++ linux-2.6.32.32/drivers/video/aty/atyfb_base.c 2010-12-31 14:46:53.000000000 -0500
10253 +diff -urNp linux-2.6.32.33/drivers/video/aty/atyfb_base.c linux-2.6.32.33/drivers/video/aty/atyfb_base.c
10254 +--- linux-2.6.32.33/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
10255 ++++ linux-2.6.32.33/drivers/video/aty/atyfb_base.c 2010-12-31 14:46:53.000000000 -0500
10256 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
10257 return bd->props.brightness;
10258 }
10259 @@ -30171,9 +30294,9 @@ diff -urNp linux-2.6.32.32/drivers/video/aty/atyfb_base.c linux-2.6.32.32/driver
10260 .get_brightness = aty_bl_get_brightness,
10261 .update_status = aty_bl_update_status,
10262 };
10263 -diff -urNp linux-2.6.32.32/drivers/video/aty/radeon_backlight.c linux-2.6.32.32/drivers/video/aty/radeon_backlight.c
10264 ---- linux-2.6.32.32/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
10265 -+++ linux-2.6.32.32/drivers/video/aty/radeon_backlight.c 2010-12-31 14:46:53.000000000 -0500
10266 +diff -urNp linux-2.6.32.33/drivers/video/aty/radeon_backlight.c linux-2.6.32.33/drivers/video/aty/radeon_backlight.c
10267 +--- linux-2.6.32.33/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
10268 ++++ linux-2.6.32.33/drivers/video/aty/radeon_backlight.c 2010-12-31 14:46:53.000000000 -0500
10269 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
10270 return bd->props.brightness;
10271 }
10272 @@ -30183,9 +30306,9 @@ diff -urNp linux-2.6.32.32/drivers/video/aty/radeon_backlight.c linux-2.6.32.32/
10273 .get_brightness = radeon_bl_get_brightness,
10274 .update_status = radeon_bl_update_status,
10275 };
10276 -diff -urNp linux-2.6.32.32/drivers/video/backlight/adp5520_bl.c linux-2.6.32.32/drivers/video/backlight/adp5520_bl.c
10277 ---- linux-2.6.32.32/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
10278 -+++ linux-2.6.32.32/drivers/video/backlight/adp5520_bl.c 2010-12-31 14:46:53.000000000 -0500
10279 +diff -urNp linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c
10280 +--- linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
10281 ++++ linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c 2010-12-31 14:46:53.000000000 -0500
10282 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
10283 return error ? data->current_brightness : reg_val;
10284 }
10285 @@ -30195,9 +30318,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/adp5520_bl.c linux-2.6.32.32/
10286 .update_status = adp5520_bl_update_status,
10287 .get_brightness = adp5520_bl_get_brightness,
10288 };
10289 -diff -urNp linux-2.6.32.32/drivers/video/backlight/adx_bl.c linux-2.6.32.32/drivers/video/backlight/adx_bl.c
10290 ---- linux-2.6.32.32/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
10291 -+++ linux-2.6.32.32/drivers/video/backlight/adx_bl.c 2010-12-31 14:46:53.000000000 -0500
10292 +diff -urNp linux-2.6.32.33/drivers/video/backlight/adx_bl.c linux-2.6.32.33/drivers/video/backlight/adx_bl.c
10293 +--- linux-2.6.32.33/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
10294 ++++ linux-2.6.32.33/drivers/video/backlight/adx_bl.c 2010-12-31 14:46:53.000000000 -0500
10295 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
10296 return 1;
10297 }
10298 @@ -30207,9 +30330,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/adx_bl.c linux-2.6.32.32/driv
10299 .options = 0,
10300 .update_status = adx_backlight_update_status,
10301 .get_brightness = adx_backlight_get_brightness,
10302 -diff -urNp linux-2.6.32.32/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.32/drivers/video/backlight/atmel-pwm-bl.c
10303 ---- linux-2.6.32.32/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
10304 -+++ linux-2.6.32.32/drivers/video/backlight/atmel-pwm-bl.c 2010-12-31 14:46:53.000000000 -0500
10305 +diff -urNp linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c
10306 +--- linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
10307 ++++ linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c 2010-12-31 14:46:53.000000000 -0500
10308 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
10309 return pwm_channel_enable(&pwmbl->pwmc);
10310 }
10311 @@ -30219,9 +30342,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.3
10312 .get_brightness = atmel_pwm_bl_get_intensity,
10313 .update_status = atmel_pwm_bl_set_intensity,
10314 };
10315 -diff -urNp linux-2.6.32.32/drivers/video/backlight/backlight.c linux-2.6.32.32/drivers/video/backlight/backlight.c
10316 ---- linux-2.6.32.32/drivers/video/backlight/backlight.c 2010-12-09 18:13:03.000000000 -0500
10317 -+++ linux-2.6.32.32/drivers/video/backlight/backlight.c 2010-12-31 14:46:53.000000000 -0500
10318 +diff -urNp linux-2.6.32.33/drivers/video/backlight/backlight.c linux-2.6.32.33/drivers/video/backlight/backlight.c
10319 +--- linux-2.6.32.33/drivers/video/backlight/backlight.c 2010-12-09 18:13:03.000000000 -0500
10320 ++++ linux-2.6.32.33/drivers/video/backlight/backlight.c 2010-12-31 14:46:53.000000000 -0500
10321 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
10322 * ERR_PTR() or a pointer to the newly allocated device.
10323 */
10324 @@ -30231,9 +30354,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/backlight.c linux-2.6.32.32/d
10325 {
10326 struct backlight_device *new_bd;
10327 int rc;
10328 -diff -urNp linux-2.6.32.32/drivers/video/backlight/corgi_lcd.c linux-2.6.32.32/drivers/video/backlight/corgi_lcd.c
10329 ---- linux-2.6.32.32/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
10330 -+++ linux-2.6.32.32/drivers/video/backlight/corgi_lcd.c 2010-12-31 14:46:53.000000000 -0500
10331 +diff -urNp linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c
10332 +--- linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
10333 ++++ linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c 2010-12-31 14:46:53.000000000 -0500
10334 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
10335 }
10336 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
10337 @@ -30243,9 +30366,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/corgi_lcd.c linux-2.6.32.32/d
10338 .get_brightness = corgi_bl_get_intensity,
10339 .update_status = corgi_bl_update_status,
10340 };
10341 -diff -urNp linux-2.6.32.32/drivers/video/backlight/cr_bllcd.c linux-2.6.32.32/drivers/video/backlight/cr_bllcd.c
10342 ---- linux-2.6.32.32/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
10343 -+++ linux-2.6.32.32/drivers/video/backlight/cr_bllcd.c 2010-12-31 14:46:53.000000000 -0500
10344 +diff -urNp linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c
10345 +--- linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
10346 ++++ linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c 2010-12-31 14:46:53.000000000 -0500
10347 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
10348 return intensity;
10349 }
10350 @@ -30255,9 +30378,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/cr_bllcd.c linux-2.6.32.32/dr
10351 .get_brightness = cr_backlight_get_intensity,
10352 .update_status = cr_backlight_set_intensity,
10353 };
10354 -diff -urNp linux-2.6.32.32/drivers/video/backlight/da903x_bl.c linux-2.6.32.32/drivers/video/backlight/da903x_bl.c
10355 ---- linux-2.6.32.32/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
10356 -+++ linux-2.6.32.32/drivers/video/backlight/da903x_bl.c 2010-12-31 14:46:53.000000000 -0500
10357 +diff -urNp linux-2.6.32.33/drivers/video/backlight/da903x_bl.c linux-2.6.32.33/drivers/video/backlight/da903x_bl.c
10358 +--- linux-2.6.32.33/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
10359 ++++ linux-2.6.32.33/drivers/video/backlight/da903x_bl.c 2010-12-31 14:46:53.000000000 -0500
10360 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
10361 return data->current_brightness;
10362 }
10363 @@ -30267,9 +30390,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/da903x_bl.c linux-2.6.32.32/d
10364 .update_status = da903x_backlight_update_status,
10365 .get_brightness = da903x_backlight_get_brightness,
10366 };
10367 -diff -urNp linux-2.6.32.32/drivers/video/backlight/generic_bl.c linux-2.6.32.32/drivers/video/backlight/generic_bl.c
10368 ---- linux-2.6.32.32/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
10369 -+++ linux-2.6.32.32/drivers/video/backlight/generic_bl.c 2010-12-31 14:46:53.000000000 -0500
10370 +diff -urNp linux-2.6.32.33/drivers/video/backlight/generic_bl.c linux-2.6.32.33/drivers/video/backlight/generic_bl.c
10371 +--- linux-2.6.32.33/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
10372 ++++ linux-2.6.32.33/drivers/video/backlight/generic_bl.c 2010-12-31 14:46:53.000000000 -0500
10373 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
10374 }
10375 EXPORT_SYMBOL(corgibl_limit_intensity);
10376 @@ -30279,9 +30402,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/generic_bl.c linux-2.6.32.32/
10377 .options = BL_CORE_SUSPENDRESUME,
10378 .get_brightness = genericbl_get_intensity,
10379 .update_status = genericbl_send_intensity,
10380 -diff -urNp linux-2.6.32.32/drivers/video/backlight/hp680_bl.c linux-2.6.32.32/drivers/video/backlight/hp680_bl.c
10381 ---- linux-2.6.32.32/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
10382 -+++ linux-2.6.32.32/drivers/video/backlight/hp680_bl.c 2010-12-31 14:46:53.000000000 -0500
10383 +diff -urNp linux-2.6.32.33/drivers/video/backlight/hp680_bl.c linux-2.6.32.33/drivers/video/backlight/hp680_bl.c
10384 +--- linux-2.6.32.33/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
10385 ++++ linux-2.6.32.33/drivers/video/backlight/hp680_bl.c 2010-12-31 14:46:53.000000000 -0500
10386 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
10387 return current_intensity;
10388 }
10389 @@ -30291,9 +30414,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/hp680_bl.c linux-2.6.32.32/dr
10390 .get_brightness = hp680bl_get_intensity,
10391 .update_status = hp680bl_set_intensity,
10392 };
10393 -diff -urNp linux-2.6.32.32/drivers/video/backlight/jornada720_bl.c linux-2.6.32.32/drivers/video/backlight/jornada720_bl.c
10394 ---- linux-2.6.32.32/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
10395 -+++ linux-2.6.32.32/drivers/video/backlight/jornada720_bl.c 2010-12-31 14:46:53.000000000 -0500
10396 +diff -urNp linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c
10397 +--- linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
10398 ++++ linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c 2010-12-31 14:46:53.000000000 -0500
10399 @@ -93,7 +93,7 @@ out:
10400 return ret;
10401 }
10402 @@ -30303,9 +30426,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
10403 .get_brightness = jornada_bl_get_brightness,
10404 .update_status = jornada_bl_update_status,
10405 .options = BL_CORE_SUSPENDRESUME,
10406 -diff -urNp linux-2.6.32.32/drivers/video/backlight/kb3886_bl.c linux-2.6.32.32/drivers/video/backlight/kb3886_bl.c
10407 ---- linux-2.6.32.32/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
10408 -+++ linux-2.6.32.32/drivers/video/backlight/kb3886_bl.c 2010-12-31 14:46:53.000000000 -0500
10409 +diff -urNp linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c
10410 +--- linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
10411 ++++ linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c 2010-12-31 14:46:53.000000000 -0500
10412 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
10413 return kb3886bl_intensity;
10414 }
10415 @@ -30315,9 +30438,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/kb3886_bl.c linux-2.6.32.32/d
10416 .get_brightness = kb3886bl_get_intensity,
10417 .update_status = kb3886bl_send_intensity,
10418 };
10419 -diff -urNp linux-2.6.32.32/drivers/video/backlight/locomolcd.c linux-2.6.32.32/drivers/video/backlight/locomolcd.c
10420 ---- linux-2.6.32.32/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
10421 -+++ linux-2.6.32.32/drivers/video/backlight/locomolcd.c 2010-12-31 14:46:53.000000000 -0500
10422 +diff -urNp linux-2.6.32.33/drivers/video/backlight/locomolcd.c linux-2.6.32.33/drivers/video/backlight/locomolcd.c
10423 +--- linux-2.6.32.33/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
10424 ++++ linux-2.6.32.33/drivers/video/backlight/locomolcd.c 2010-12-31 14:46:53.000000000 -0500
10425 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
10426 return current_intensity;
10427 }
10428 @@ -30327,9 +30450,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/locomolcd.c linux-2.6.32.32/d
10429 .get_brightness = locomolcd_get_intensity,
10430 .update_status = locomolcd_set_intensity,
10431 };
10432 -diff -urNp linux-2.6.32.32/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.32/drivers/video/backlight/mbp_nvidia_bl.c
10433 ---- linux-2.6.32.32/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
10434 -+++ linux-2.6.32.32/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-31 14:46:53.000000000 -0500
10435 +diff -urNp linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c
10436 +--- linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
10437 ++++ linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-31 14:46:53.000000000 -0500
10438 @@ -33,7 +33,7 @@ struct dmi_match_data {
10439 unsigned long iostart;
10440 unsigned long iolen;
10441 @@ -30339,9 +30462,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
10442 };
10443
10444 /* Module parameters. */
10445 -diff -urNp linux-2.6.32.32/drivers/video/backlight/omap1_bl.c linux-2.6.32.32/drivers/video/backlight/omap1_bl.c
10446 ---- linux-2.6.32.32/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
10447 -+++ linux-2.6.32.32/drivers/video/backlight/omap1_bl.c 2010-12-31 14:46:53.000000000 -0500
10448 +diff -urNp linux-2.6.32.33/drivers/video/backlight/omap1_bl.c linux-2.6.32.33/drivers/video/backlight/omap1_bl.c
10449 +--- linux-2.6.32.33/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
10450 ++++ linux-2.6.32.33/drivers/video/backlight/omap1_bl.c 2010-12-31 14:46:53.000000000 -0500
10451 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
10452 return bl->current_intensity;
10453 }
10454 @@ -30351,9 +30474,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/omap1_bl.c linux-2.6.32.32/dr
10455 .get_brightness = omapbl_get_intensity,
10456 .update_status = omapbl_update_status,
10457 };
10458 -diff -urNp linux-2.6.32.32/drivers/video/backlight/progear_bl.c linux-2.6.32.32/drivers/video/backlight/progear_bl.c
10459 ---- linux-2.6.32.32/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
10460 -+++ linux-2.6.32.32/drivers/video/backlight/progear_bl.c 2010-12-31 14:46:53.000000000 -0500
10461 +diff -urNp linux-2.6.32.33/drivers/video/backlight/progear_bl.c linux-2.6.32.33/drivers/video/backlight/progear_bl.c
10462 +--- linux-2.6.32.33/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
10463 ++++ linux-2.6.32.33/drivers/video/backlight/progear_bl.c 2010-12-31 14:46:53.000000000 -0500
10464 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
10465 return intensity - HW_LEVEL_MIN;
10466 }
10467 @@ -30363,9 +30486,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/progear_bl.c linux-2.6.32.32/
10468 .get_brightness = progearbl_get_intensity,
10469 .update_status = progearbl_set_intensity,
10470 };
10471 -diff -urNp linux-2.6.32.32/drivers/video/backlight/pwm_bl.c linux-2.6.32.32/drivers/video/backlight/pwm_bl.c
10472 ---- linux-2.6.32.32/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
10473 -+++ linux-2.6.32.32/drivers/video/backlight/pwm_bl.c 2010-12-31 14:46:53.000000000 -0500
10474 +diff -urNp linux-2.6.32.33/drivers/video/backlight/pwm_bl.c linux-2.6.32.33/drivers/video/backlight/pwm_bl.c
10475 +--- linux-2.6.32.33/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
10476 ++++ linux-2.6.32.33/drivers/video/backlight/pwm_bl.c 2010-12-31 14:46:53.000000000 -0500
10477 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
10478 return bl->props.brightness;
10479 }
10480 @@ -30375,9 +30498,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/pwm_bl.c linux-2.6.32.32/driv
10481 .update_status = pwm_backlight_update_status,
10482 .get_brightness = pwm_backlight_get_brightness,
10483 };
10484 -diff -urNp linux-2.6.32.32/drivers/video/backlight/tosa_bl.c linux-2.6.32.32/drivers/video/backlight/tosa_bl.c
10485 ---- linux-2.6.32.32/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
10486 -+++ linux-2.6.32.32/drivers/video/backlight/tosa_bl.c 2010-12-31 14:46:53.000000000 -0500
10487 +diff -urNp linux-2.6.32.33/drivers/video/backlight/tosa_bl.c linux-2.6.32.33/drivers/video/backlight/tosa_bl.c
10488 +--- linux-2.6.32.33/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
10489 ++++ linux-2.6.32.33/drivers/video/backlight/tosa_bl.c 2010-12-31 14:46:53.000000000 -0500
10490 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
10491 return props->brightness;
10492 }
10493 @@ -30387,9 +30510,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/tosa_bl.c linux-2.6.32.32/dri
10494 .get_brightness = tosa_bl_get_brightness,
10495 .update_status = tosa_bl_update_status,
10496 };
10497 -diff -urNp linux-2.6.32.32/drivers/video/backlight/wm831x_bl.c linux-2.6.32.32/drivers/video/backlight/wm831x_bl.c
10498 ---- linux-2.6.32.32/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
10499 -+++ linux-2.6.32.32/drivers/video/backlight/wm831x_bl.c 2010-12-31 14:46:53.000000000 -0500
10500 +diff -urNp linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c
10501 +--- linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
10502 ++++ linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c 2010-12-31 14:46:53.000000000 -0500
10503 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
10504 return data->current_brightness;
10505 }
10506 @@ -30399,9 +30522,9 @@ diff -urNp linux-2.6.32.32/drivers/video/backlight/wm831x_bl.c linux-2.6.32.32/d
10507 .options = BL_CORE_SUSPENDRESUME,
10508 .update_status = wm831x_backlight_update_status,
10509 .get_brightness = wm831x_backlight_get_brightness,
10510 -diff -urNp linux-2.6.32.32/drivers/video/bf54x-lq043fb.c linux-2.6.32.32/drivers/video/bf54x-lq043fb.c
10511 ---- linux-2.6.32.32/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
10512 -+++ linux-2.6.32.32/drivers/video/bf54x-lq043fb.c 2010-12-31 14:46:53.000000000 -0500
10513 +diff -urNp linux-2.6.32.33/drivers/video/bf54x-lq043fb.c linux-2.6.32.33/drivers/video/bf54x-lq043fb.c
10514 +--- linux-2.6.32.33/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
10515 ++++ linux-2.6.32.33/drivers/video/bf54x-lq043fb.c 2010-12-31 14:46:53.000000000 -0500
10516 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
10517 return 0;
10518 }
10519 @@ -30411,9 +30534,9 @@ diff -urNp linux-2.6.32.32/drivers/video/bf54x-lq043fb.c linux-2.6.32.32/drivers
10520 .get_brightness = bl_get_brightness,
10521 };
10522
10523 -diff -urNp linux-2.6.32.32/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.32/drivers/video/bfin-t350mcqb-fb.c
10524 ---- linux-2.6.32.32/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
10525 -+++ linux-2.6.32.32/drivers/video/bfin-t350mcqb-fb.c 2010-12-31 14:46:53.000000000 -0500
10526 +diff -urNp linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c
10527 +--- linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
10528 ++++ linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c 2010-12-31 14:46:53.000000000 -0500
10529 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
10530 return 0;
10531 }
10532 @@ -30423,9 +30546,9 @@ diff -urNp linux-2.6.32.32/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.32/driv
10533 .get_brightness = bl_get_brightness,
10534 };
10535
10536 -diff -urNp linux-2.6.32.32/drivers/video/fbcmap.c linux-2.6.32.32/drivers/video/fbcmap.c
10537 ---- linux-2.6.32.32/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
10538 -+++ linux-2.6.32.32/drivers/video/fbcmap.c 2010-12-31 14:46:53.000000000 -0500
10539 +diff -urNp linux-2.6.32.33/drivers/video/fbcmap.c linux-2.6.32.33/drivers/video/fbcmap.c
10540 +--- linux-2.6.32.33/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
10541 ++++ linux-2.6.32.33/drivers/video/fbcmap.c 2010-12-31 14:46:53.000000000 -0500
10542 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
10543 rc = -ENODEV;
10544 goto out;
10545 @@ -30436,9 +30559,9 @@ diff -urNp linux-2.6.32.32/drivers/video/fbcmap.c linux-2.6.32.32/drivers/video/
10546 rc = -EINVAL;
10547 goto out1;
10548 }
10549 -diff -urNp linux-2.6.32.32/drivers/video/fbmem.c linux-2.6.32.32/drivers/video/fbmem.c
10550 ---- linux-2.6.32.32/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
10551 -+++ linux-2.6.32.32/drivers/video/fbmem.c 2010-12-31 14:46:53.000000000 -0500
10552 +diff -urNp linux-2.6.32.33/drivers/video/fbmem.c linux-2.6.32.33/drivers/video/fbmem.c
10553 +--- linux-2.6.32.33/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
10554 ++++ linux-2.6.32.33/drivers/video/fbmem.c 2010-12-31 14:46:53.000000000 -0500
10555 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
10556 image->dx += image->width + 8;
10557 }
10558 @@ -30466,9 +30589,9 @@ diff -urNp linux-2.6.32.32/drivers/video/fbmem.c linux-2.6.32.32/drivers/video/f
10559 return -EINVAL;
10560 if (!registered_fb[con2fb.framebuffer])
10561 request_module("fb%d", con2fb.framebuffer);
10562 -diff -urNp linux-2.6.32.32/drivers/video/fbmon.c linux-2.6.32.32/drivers/video/fbmon.c
10563 ---- linux-2.6.32.32/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
10564 -+++ linux-2.6.32.32/drivers/video/fbmon.c 2010-12-31 14:46:53.000000000 -0500
10565 +diff -urNp linux-2.6.32.33/drivers/video/fbmon.c linux-2.6.32.33/drivers/video/fbmon.c
10566 +--- linux-2.6.32.33/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
10567 ++++ linux-2.6.32.33/drivers/video/fbmon.c 2010-12-31 14:46:53.000000000 -0500
10568 @@ -45,7 +45,7 @@
10569 #ifdef DEBUG
10570 #define DPRINTK(fmt, args...) printk(fmt,## args)
10571 @@ -30478,9 +30601,9 @@ diff -urNp linux-2.6.32.32/drivers/video/fbmon.c linux-2.6.32.32/drivers/video/f
10572 #endif
10573
10574 #define FBMON_FIX_HEADER 1
10575 -diff -urNp linux-2.6.32.32/drivers/video/i810/i810_accel.c linux-2.6.32.32/drivers/video/i810/i810_accel.c
10576 ---- linux-2.6.32.32/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
10577 -+++ linux-2.6.32.32/drivers/video/i810/i810_accel.c 2010-12-31 14:46:53.000000000 -0500
10578 +diff -urNp linux-2.6.32.33/drivers/video/i810/i810_accel.c linux-2.6.32.33/drivers/video/i810/i810_accel.c
10579 +--- linux-2.6.32.33/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
10580 ++++ linux-2.6.32.33/drivers/video/i810/i810_accel.c 2010-12-31 14:46:53.000000000 -0500
10581 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct
10582 }
10583 }
10584 @@ -30489,9 +30612,9 @@ diff -urNp linux-2.6.32.32/drivers/video/i810/i810_accel.c linux-2.6.32.32/drive
10585 i810_report_error(mmio);
10586 par->dev_flags |= LOCKUP;
10587 info->pixmap.scan_align = 1;
10588 -diff -urNp linux-2.6.32.32/drivers/video/i810/i810_main.c linux-2.6.32.32/drivers/video/i810/i810_main.c
10589 ---- linux-2.6.32.32/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
10590 -+++ linux-2.6.32.32/drivers/video/i810/i810_main.c 2010-12-31 14:46:53.000000000 -0500
10591 +diff -urNp linux-2.6.32.33/drivers/video/i810/i810_main.c linux-2.6.32.33/drivers/video/i810/i810_main.c
10592 +--- linux-2.6.32.33/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
10593 ++++ linux-2.6.32.33/drivers/video/i810/i810_main.c 2010-12-31 14:46:53.000000000 -0500
10594 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
10595 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
10596 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
10597 @@ -30501,9 +30624,9 @@ diff -urNp linux-2.6.32.32/drivers/video/i810/i810_main.c linux-2.6.32.32/driver
10598 };
10599
10600 static struct pci_driver i810fb_driver = {
10601 -diff -urNp linux-2.6.32.32/drivers/video/modedb.c linux-2.6.32.32/drivers/video/modedb.c
10602 ---- linux-2.6.32.32/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
10603 -+++ linux-2.6.32.32/drivers/video/modedb.c 2010-12-31 14:46:53.000000000 -0500
10604 +diff -urNp linux-2.6.32.33/drivers/video/modedb.c linux-2.6.32.33/drivers/video/modedb.c
10605 +--- linux-2.6.32.33/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
10606 ++++ linux-2.6.32.33/drivers/video/modedb.c 2010-12-31 14:46:53.000000000 -0500
10607 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
10608 {
10609 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
10610 @@ -30804,9 +30927,9 @@ diff -urNp linux-2.6.32.32/drivers/video/modedb.c linux-2.6.32.32/drivers/video/
10611 },
10612 };
10613
10614 -diff -urNp linux-2.6.32.32/drivers/video/nvidia/nv_backlight.c linux-2.6.32.32/drivers/video/nvidia/nv_backlight.c
10615 ---- linux-2.6.32.32/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
10616 -+++ linux-2.6.32.32/drivers/video/nvidia/nv_backlight.c 2010-12-31 14:46:53.000000000 -0500
10617 +diff -urNp linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c
10618 +--- linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
10619 ++++ linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c 2010-12-31 14:46:53.000000000 -0500
10620 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
10621 return bd->props.brightness;
10622 }
10623 @@ -30816,9 +30939,9 @@ diff -urNp linux-2.6.32.32/drivers/video/nvidia/nv_backlight.c linux-2.6.32.32/d
10624 .get_brightness = nvidia_bl_get_brightness,
10625 .update_status = nvidia_bl_update_status,
10626 };
10627 -diff -urNp linux-2.6.32.32/drivers/video/riva/fbdev.c linux-2.6.32.32/drivers/video/riva/fbdev.c
10628 ---- linux-2.6.32.32/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
10629 -+++ linux-2.6.32.32/drivers/video/riva/fbdev.c 2010-12-31 14:46:53.000000000 -0500
10630 +diff -urNp linux-2.6.32.33/drivers/video/riva/fbdev.c linux-2.6.32.33/drivers/video/riva/fbdev.c
10631 +--- linux-2.6.32.33/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
10632 ++++ linux-2.6.32.33/drivers/video/riva/fbdev.c 2010-12-31 14:46:53.000000000 -0500
10633 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
10634 return bd->props.brightness;
10635 }
10636 @@ -30828,9 +30951,9 @@ diff -urNp linux-2.6.32.32/drivers/video/riva/fbdev.c linux-2.6.32.32/drivers/vi
10637 .get_brightness = riva_bl_get_brightness,
10638 .update_status = riva_bl_update_status,
10639 };
10640 -diff -urNp linux-2.6.32.32/drivers/video/uvesafb.c linux-2.6.32.32/drivers/video/uvesafb.c
10641 ---- linux-2.6.32.32/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
10642 -+++ linux-2.6.32.32/drivers/video/uvesafb.c 2010-12-31 14:46:53.000000000 -0500
10643 +diff -urNp linux-2.6.32.33/drivers/video/uvesafb.c linux-2.6.32.33/drivers/video/uvesafb.c
10644 +--- linux-2.6.32.33/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
10645 ++++ linux-2.6.32.33/drivers/video/uvesafb.c 2010-12-31 14:46:53.000000000 -0500
10646 @@ -18,6 +18,7 @@
10647 #include <linux/fb.h>
10648 #include <linux/io.h>
10649 @@ -30906,9 +31029,9 @@ diff -urNp linux-2.6.32.32/drivers/video/uvesafb.c linux-2.6.32.32/drivers/video
10650 }
10651
10652 framebuffer_release(info);
10653 -diff -urNp linux-2.6.32.32/drivers/video/vesafb.c linux-2.6.32.32/drivers/video/vesafb.c
10654 ---- linux-2.6.32.32/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
10655 -+++ linux-2.6.32.32/drivers/video/vesafb.c 2010-12-31 14:46:53.000000000 -0500
10656 +diff -urNp linux-2.6.32.33/drivers/video/vesafb.c linux-2.6.32.33/drivers/video/vesafb.c
10657 +--- linux-2.6.32.33/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
10658 ++++ linux-2.6.32.33/drivers/video/vesafb.c 2010-12-31 14:46:53.000000000 -0500
10659 @@ -9,6 +9,7 @@
10660 */
10661
10662 @@ -31012,9 +31135,9 @@ diff -urNp linux-2.6.32.32/drivers/video/vesafb.c linux-2.6.32.32/drivers/video/
10663 if (info->screen_base)
10664 iounmap(info->screen_base);
10665 framebuffer_release(info);
10666 -diff -urNp linux-2.6.32.32/drivers/xen/sys-hypervisor.c linux-2.6.32.32/drivers/xen/sys-hypervisor.c
10667 ---- linux-2.6.32.32/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
10668 -+++ linux-2.6.32.32/drivers/xen/sys-hypervisor.c 2010-12-31 14:46:53.000000000 -0500
10669 +diff -urNp linux-2.6.32.33/drivers/xen/sys-hypervisor.c linux-2.6.32.33/drivers/xen/sys-hypervisor.c
10670 +--- linux-2.6.32.33/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
10671 ++++ linux-2.6.32.33/drivers/xen/sys-hypervisor.c 2010-12-31 14:46:53.000000000 -0500
10672 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
10673 return 0;
10674 }
10675 @@ -31024,9 +31147,9 @@ diff -urNp linux-2.6.32.32/drivers/xen/sys-hypervisor.c linux-2.6.32.32/drivers/
10676 .show = hyp_sysfs_show,
10677 .store = hyp_sysfs_store,
10678 };
10679 -diff -urNp linux-2.6.32.32/fs/9p/vfs_inode.c linux-2.6.32.32/fs/9p/vfs_inode.c
10680 ---- linux-2.6.32.32/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
10681 -+++ linux-2.6.32.32/fs/9p/vfs_inode.c 2010-12-31 14:46:53.000000000 -0500
10682 +diff -urNp linux-2.6.32.33/fs/9p/vfs_inode.c linux-2.6.32.33/fs/9p/vfs_inode.c
10683 +--- linux-2.6.32.33/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
10684 ++++ linux-2.6.32.33/fs/9p/vfs_inode.c 2010-12-31 14:46:53.000000000 -0500
10685 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
10686 static void
10687 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
10688 @@ -31036,9 +31159,9 @@ diff -urNp linux-2.6.32.32/fs/9p/vfs_inode.c linux-2.6.32.32/fs/9p/vfs_inode.c
10689
10690 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
10691 IS_ERR(s) ? "<error>" : s);
10692 -diff -urNp linux-2.6.32.32/fs/aio.c linux-2.6.32.32/fs/aio.c
10693 ---- linux-2.6.32.32/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
10694 -+++ linux-2.6.32.32/fs/aio.c 2010-12-31 14:46:53.000000000 -0500
10695 +diff -urNp linux-2.6.32.33/fs/aio.c linux-2.6.32.33/fs/aio.c
10696 +--- linux-2.6.32.33/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
10697 ++++ linux-2.6.32.33/fs/aio.c 2010-12-31 14:46:53.000000000 -0500
10698 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
10699 size += sizeof(struct io_event) * nr_events;
10700 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
10701 @@ -31048,9 +31171,9 @@ diff -urNp linux-2.6.32.32/fs/aio.c linux-2.6.32.32/fs/aio.c
10702 return -EINVAL;
10703
10704 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
10705 -diff -urNp linux-2.6.32.32/fs/attr.c linux-2.6.32.32/fs/attr.c
10706 ---- linux-2.6.32.32/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
10707 -+++ linux-2.6.32.32/fs/attr.c 2010-12-31 14:46:53.000000000 -0500
10708 +diff -urNp linux-2.6.32.33/fs/attr.c linux-2.6.32.33/fs/attr.c
10709 +--- linux-2.6.32.33/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
10710 ++++ linux-2.6.32.33/fs/attr.c 2010-12-31 14:46:53.000000000 -0500
10711 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
10712 unsigned long limit;
10713
10714 @@ -31059,9 +31182,9 @@ diff -urNp linux-2.6.32.32/fs/attr.c linux-2.6.32.32/fs/attr.c
10715 if (limit != RLIM_INFINITY && offset > limit)
10716 goto out_sig;
10717 if (offset > inode->i_sb->s_maxbytes)
10718 -diff -urNp linux-2.6.32.32/fs/autofs/root.c linux-2.6.32.32/fs/autofs/root.c
10719 ---- linux-2.6.32.32/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
10720 -+++ linux-2.6.32.32/fs/autofs/root.c 2010-12-31 14:46:53.000000000 -0500
10721 +diff -urNp linux-2.6.32.33/fs/autofs/root.c linux-2.6.32.33/fs/autofs/root.c
10722 +--- linux-2.6.32.33/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
10723 ++++ linux-2.6.32.33/fs/autofs/root.c 2010-12-31 14:46:53.000000000 -0500
10724 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
10725 set_bit(n,sbi->symlink_bitmap);
10726 sl = &sbi->symlink[n];
10727 @@ -31072,9 +31195,9 @@ diff -urNp linux-2.6.32.32/fs/autofs/root.c linux-2.6.32.32/fs/autofs/root.c
10728 if (!sl->data) {
10729 clear_bit(n,sbi->symlink_bitmap);
10730 unlock_kernel();
10731 -diff -urNp linux-2.6.32.32/fs/autofs4/symlink.c linux-2.6.32.32/fs/autofs4/symlink.c
10732 ---- linux-2.6.32.32/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
10733 -+++ linux-2.6.32.32/fs/autofs4/symlink.c 2010-12-31 14:46:53.000000000 -0500
10734 +diff -urNp linux-2.6.32.33/fs/autofs4/symlink.c linux-2.6.32.33/fs/autofs4/symlink.c
10735 +--- linux-2.6.32.33/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
10736 ++++ linux-2.6.32.33/fs/autofs4/symlink.c 2010-12-31 14:46:53.000000000 -0500
10737 @@ -15,7 +15,7 @@
10738 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
10739 {
10740 @@ -31084,9 +31207,9 @@ diff -urNp linux-2.6.32.32/fs/autofs4/symlink.c linux-2.6.32.32/fs/autofs4/symli
10741 return NULL;
10742 }
10743
10744 -diff -urNp linux-2.6.32.32/fs/befs/linuxvfs.c linux-2.6.32.32/fs/befs/linuxvfs.c
10745 ---- linux-2.6.32.32/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
10746 -+++ linux-2.6.32.32/fs/befs/linuxvfs.c 2010-12-31 14:46:53.000000000 -0500
10747 +diff -urNp linux-2.6.32.33/fs/befs/linuxvfs.c linux-2.6.32.33/fs/befs/linuxvfs.c
10748 +--- linux-2.6.32.33/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
10749 ++++ linux-2.6.32.33/fs/befs/linuxvfs.c 2010-12-31 14:46:53.000000000 -0500
10750 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
10751 {
10752 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
10753 @@ -31096,9 +31219,9 @@ diff -urNp linux-2.6.32.32/fs/befs/linuxvfs.c linux-2.6.32.32/fs/befs/linuxvfs.c
10754 if (!IS_ERR(link))
10755 kfree(link);
10756 }
10757 -diff -urNp linux-2.6.32.32/fs/binfmt_aout.c linux-2.6.32.32/fs/binfmt_aout.c
10758 ---- linux-2.6.32.32/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
10759 -+++ linux-2.6.32.32/fs/binfmt_aout.c 2010-12-31 14:46:53.000000000 -0500
10760 +diff -urNp linux-2.6.32.33/fs/binfmt_aout.c linux-2.6.32.33/fs/binfmt_aout.c
10761 +--- linux-2.6.32.33/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
10762 ++++ linux-2.6.32.33/fs/binfmt_aout.c 2010-12-31 14:46:53.000000000 -0500
10763 @@ -16,6 +16,7 @@
10764 #include <linux/string.h>
10765 #include <linux/fs.h>
10766 @@ -31186,9 +31309,9 @@ diff -urNp linux-2.6.32.32/fs/binfmt_aout.c linux-2.6.32.32/fs/binfmt_aout.c
10767 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
10768 fd_offset + ex.a_text);
10769 up_write(&current->mm->mmap_sem);
10770 -diff -urNp linux-2.6.32.32/fs/binfmt_elf.c linux-2.6.32.32/fs/binfmt_elf.c
10771 ---- linux-2.6.32.32/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
10772 -+++ linux-2.6.32.32/fs/binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
10773 +diff -urNp linux-2.6.32.33/fs/binfmt_elf.c linux-2.6.32.33/fs/binfmt_elf.c
10774 +--- linux-2.6.32.33/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
10775 ++++ linux-2.6.32.33/fs/binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
10776 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
10777 #define elf_core_dump NULL
10778 #endif
10779 @@ -31824,9 +31947,9 @@ diff -urNp linux-2.6.32.32/fs/binfmt_elf.c linux-2.6.32.32/fs/binfmt_elf.c
10780 static int __init init_elf_binfmt(void)
10781 {
10782 return register_binfmt(&elf_format);
10783 -diff -urNp linux-2.6.32.32/fs/binfmt_flat.c linux-2.6.32.32/fs/binfmt_flat.c
10784 ---- linux-2.6.32.32/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
10785 -+++ linux-2.6.32.32/fs/binfmt_flat.c 2010-12-31 14:46:53.000000000 -0500
10786 +diff -urNp linux-2.6.32.33/fs/binfmt_flat.c linux-2.6.32.33/fs/binfmt_flat.c
10787 +--- linux-2.6.32.33/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
10788 ++++ linux-2.6.32.33/fs/binfmt_flat.c 2010-12-31 14:46:53.000000000 -0500
10789 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
10790 realdatastart = (unsigned long) -ENOMEM;
10791 printk("Unable to allocate RAM for process data, errno %d\n",
10792 @@ -31859,9 +31982,9 @@ diff -urNp linux-2.6.32.32/fs/binfmt_flat.c linux-2.6.32.32/fs/binfmt_flat.c
10793 ret = result;
10794 goto err;
10795 }
10796 -diff -urNp linux-2.6.32.32/fs/binfmt_misc.c linux-2.6.32.32/fs/binfmt_misc.c
10797 ---- linux-2.6.32.32/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
10798 -+++ linux-2.6.32.32/fs/binfmt_misc.c 2010-12-31 14:46:53.000000000 -0500
10799 +diff -urNp linux-2.6.32.33/fs/binfmt_misc.c linux-2.6.32.33/fs/binfmt_misc.c
10800 +--- linux-2.6.32.33/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
10801 ++++ linux-2.6.32.33/fs/binfmt_misc.c 2010-12-31 14:46:53.000000000 -0500
10802 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
10803 static struct tree_descr bm_files[] = {
10804 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
10805 @@ -31871,9 +31994,9 @@ diff -urNp linux-2.6.32.32/fs/binfmt_misc.c linux-2.6.32.32/fs/binfmt_misc.c
10806 };
10807 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
10808 if (!err)
10809 -diff -urNp linux-2.6.32.32/fs/bio.c linux-2.6.32.32/fs/bio.c
10810 ---- linux-2.6.32.32/fs/bio.c 2010-12-09 18:13:03.000000000 -0500
10811 -+++ linux-2.6.32.32/fs/bio.c 2010-12-31 14:46:53.000000000 -0500
10812 +diff -urNp linux-2.6.32.33/fs/bio.c linux-2.6.32.33/fs/bio.c
10813 +--- linux-2.6.32.33/fs/bio.c 2010-12-09 18:13:03.000000000 -0500
10814 ++++ linux-2.6.32.33/fs/bio.c 2010-12-31 14:46:53.000000000 -0500
10815 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
10816
10817 i = 0;
10818 @@ -31892,9 +32015,9 @@ diff -urNp linux-2.6.32.32/fs/bio.c linux-2.6.32.32/fs/bio.c
10819
10820 __bio_for_each_segment(bvec, bio, i, 0) {
10821 char *addr = page_address(bvec->bv_page);
10822 -diff -urNp linux-2.6.32.32/fs/block_dev.c linux-2.6.32.32/fs/block_dev.c
10823 ---- linux-2.6.32.32/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
10824 -+++ linux-2.6.32.32/fs/block_dev.c 2010-12-31 14:46:53.000000000 -0500
10825 +diff -urNp linux-2.6.32.33/fs/block_dev.c linux-2.6.32.33/fs/block_dev.c
10826 +--- linux-2.6.32.33/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
10827 ++++ linux-2.6.32.33/fs/block_dev.c 2010-12-31 14:46:53.000000000 -0500
10828 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
10829 else if (bdev->bd_contains == bdev)
10830 res = 0; /* is a whole device which isn't held */
10831 @@ -31904,9 +32027,9 @@ diff -urNp linux-2.6.32.32/fs/block_dev.c linux-2.6.32.32/fs/block_dev.c
10832 res = 0; /* is a partition of a device that is being partitioned */
10833 else if (bdev->bd_contains->bd_holder != NULL)
10834 res = -EBUSY; /* is a partition of a held device */
10835 -diff -urNp linux-2.6.32.32/fs/btrfs/ctree.c linux-2.6.32.32/fs/btrfs/ctree.c
10836 ---- linux-2.6.32.32/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
10837 -+++ linux-2.6.32.32/fs/btrfs/ctree.c 2010-12-31 14:46:53.000000000 -0500
10838 +diff -urNp linux-2.6.32.33/fs/btrfs/ctree.c linux-2.6.32.33/fs/btrfs/ctree.c
10839 +--- linux-2.6.32.33/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
10840 ++++ linux-2.6.32.33/fs/btrfs/ctree.c 2010-12-31 14:46:53.000000000 -0500
10841 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
10842 free_extent_buffer(buf);
10843 add_root_to_dirty_list(root);
10844 @@ -31931,9 +32054,9 @@ diff -urNp linux-2.6.32.32/fs/btrfs/ctree.c linux-2.6.32.32/fs/btrfs/ctree.c
10845 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
10846 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
10847 }
10848 -diff -urNp linux-2.6.32.32/fs/btrfs/disk-io.c linux-2.6.32.32/fs/btrfs/disk-io.c
10849 ---- linux-2.6.32.32/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
10850 -+++ linux-2.6.32.32/fs/btrfs/disk-io.c 2010-12-31 14:46:53.000000000 -0500
10851 +diff -urNp linux-2.6.32.33/fs/btrfs/disk-io.c linux-2.6.32.33/fs/btrfs/disk-io.c
10852 +--- linux-2.6.32.33/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
10853 ++++ linux-2.6.32.33/fs/btrfs/disk-io.c 2010-12-31 14:46:53.000000000 -0500
10854 @@ -39,7 +39,7 @@
10855 #include "tree-log.h"
10856 #include "free-space-cache.h"
10857 @@ -31952,9 +32075,9 @@ diff -urNp linux-2.6.32.32/fs/btrfs/disk-io.c linux-2.6.32.32/fs/btrfs/disk-io.c
10858 .write_cache_pages_lock_hook = btree_lock_page_hook,
10859 .readpage_end_io_hook = btree_readpage_end_io_hook,
10860 .submit_bio_hook = btree_submit_bio_hook,
10861 -diff -urNp linux-2.6.32.32/fs/btrfs/extent_io.h linux-2.6.32.32/fs/btrfs/extent_io.h
10862 ---- linux-2.6.32.32/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
10863 -+++ linux-2.6.32.32/fs/btrfs/extent_io.h 2010-12-31 14:46:53.000000000 -0500
10864 +diff -urNp linux-2.6.32.33/fs/btrfs/extent_io.h linux-2.6.32.33/fs/btrfs/extent_io.h
10865 +--- linux-2.6.32.33/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
10866 ++++ linux-2.6.32.33/fs/btrfs/extent_io.h 2010-12-31 14:46:53.000000000 -0500
10867 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
10868 struct bio *bio, int mirror_num,
10869 unsigned long bio_flags);
10870 @@ -32015,9 +32138,9 @@ diff -urNp linux-2.6.32.32/fs/btrfs/extent_io.h linux-2.6.32.32/fs/btrfs/extent_
10871 };
10872
10873 struct extent_state {
10874 -diff -urNp linux-2.6.32.32/fs/btrfs/free-space-cache.c linux-2.6.32.32/fs/btrfs/free-space-cache.c
10875 ---- linux-2.6.32.32/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
10876 -+++ linux-2.6.32.32/fs/btrfs/free-space-cache.c 2010-12-31 14:46:53.000000000 -0500
10877 +diff -urNp linux-2.6.32.33/fs/btrfs/free-space-cache.c linux-2.6.32.33/fs/btrfs/free-space-cache.c
10878 +--- linux-2.6.32.33/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
10879 ++++ linux-2.6.32.33/fs/btrfs/free-space-cache.c 2010-12-31 14:46:53.000000000 -0500
10880 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
10881
10882 while(1) {
10883 @@ -32036,9 +32159,9 @@ diff -urNp linux-2.6.32.32/fs/btrfs/free-space-cache.c linux-2.6.32.32/fs/btrfs/
10884
10885 if (entry->bitmap && entry->bytes > bytes + empty_size) {
10886 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
10887 -diff -urNp linux-2.6.32.32/fs/btrfs/inode.c linux-2.6.32.32/fs/btrfs/inode.c
10888 ---- linux-2.6.32.32/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
10889 -+++ linux-2.6.32.32/fs/btrfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10890 +diff -urNp linux-2.6.32.33/fs/btrfs/inode.c linux-2.6.32.33/fs/btrfs/inode.c
10891 +--- linux-2.6.32.33/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
10892 ++++ linux-2.6.32.33/fs/btrfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10893 @@ -63,7 +63,7 @@ static const struct inode_operations btr
10894 static const struct address_space_operations btrfs_aops;
10895 static const struct address_space_operations btrfs_symlink_aops;
10896 @@ -32057,9 +32180,9 @@ diff -urNp linux-2.6.32.32/fs/btrfs/inode.c linux-2.6.32.32/fs/btrfs/inode.c
10897 .fill_delalloc = run_delalloc_range,
10898 .submit_bio_hook = btrfs_submit_bio_hook,
10899 .merge_bio_hook = btrfs_merge_bio_hook,
10900 -diff -urNp linux-2.6.32.32/fs/btrfs/relocation.c linux-2.6.32.32/fs/btrfs/relocation.c
10901 ---- linux-2.6.32.32/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400
10902 -+++ linux-2.6.32.32/fs/btrfs/relocation.c 2010-12-31 14:46:53.000000000 -0500
10903 +diff -urNp linux-2.6.32.33/fs/btrfs/relocation.c linux-2.6.32.33/fs/btrfs/relocation.c
10904 +--- linux-2.6.32.33/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400
10905 ++++ linux-2.6.32.33/fs/btrfs/relocation.c 2010-12-31 14:46:53.000000000 -0500
10906 @@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
10907 }
10908 spin_unlock(&rc->reloc_root_tree.lock);
10909 @@ -32069,9 +32192,9 @@ diff -urNp linux-2.6.32.32/fs/btrfs/relocation.c linux-2.6.32.32/fs/btrfs/reloca
10910
10911 if (!del) {
10912 spin_lock(&rc->reloc_root_tree.lock);
10913 -diff -urNp linux-2.6.32.32/fs/btrfs/sysfs.c linux-2.6.32.32/fs/btrfs/sysfs.c
10914 ---- linux-2.6.32.32/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10915 -+++ linux-2.6.32.32/fs/btrfs/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10916 +diff -urNp linux-2.6.32.33/fs/btrfs/sysfs.c linux-2.6.32.33/fs/btrfs/sysfs.c
10917 +--- linux-2.6.32.33/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10918 ++++ linux-2.6.32.33/fs/btrfs/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10919 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
10920 complete(&root->kobj_unregister);
10921 }
10922 @@ -32087,9 +32210,9 @@ diff -urNp linux-2.6.32.32/fs/btrfs/sysfs.c linux-2.6.32.32/fs/btrfs/sysfs.c
10923 .show = btrfs_root_attr_show,
10924 .store = btrfs_root_attr_store,
10925 };
10926 -diff -urNp linux-2.6.32.32/fs/buffer.c linux-2.6.32.32/fs/buffer.c
10927 ---- linux-2.6.32.32/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
10928 -+++ linux-2.6.32.32/fs/buffer.c 2010-12-31 14:46:53.000000000 -0500
10929 +diff -urNp linux-2.6.32.33/fs/buffer.c linux-2.6.32.33/fs/buffer.c
10930 +--- linux-2.6.32.33/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
10931 ++++ linux-2.6.32.33/fs/buffer.c 2010-12-31 14:46:53.000000000 -0500
10932 @@ -25,6 +25,7 @@
10933 #include <linux/percpu.h>
10934 #include <linux/slab.h>
10935 @@ -32098,9 +32221,9 @@ diff -urNp linux-2.6.32.32/fs/buffer.c linux-2.6.32.32/fs/buffer.c
10936 #include <linux/blkdev.h>
10937 #include <linux/file.h>
10938 #include <linux/quotaops.h>
10939 -diff -urNp linux-2.6.32.32/fs/cachefiles/bind.c linux-2.6.32.32/fs/cachefiles/bind.c
10940 ---- linux-2.6.32.32/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
10941 -+++ linux-2.6.32.32/fs/cachefiles/bind.c 2010-12-31 14:46:53.000000000 -0500
10942 +diff -urNp linux-2.6.32.33/fs/cachefiles/bind.c linux-2.6.32.33/fs/cachefiles/bind.c
10943 +--- linux-2.6.32.33/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
10944 ++++ linux-2.6.32.33/fs/cachefiles/bind.c 2010-12-31 14:46:53.000000000 -0500
10945 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
10946 args);
10947
10948 @@ -32117,9 +32240,9 @@ diff -urNp linux-2.6.32.32/fs/cachefiles/bind.c linux-2.6.32.32/fs/cachefiles/bi
10949 cache->bcull_percent < cache->brun_percent &&
10950 cache->brun_percent < 100);
10951
10952 -diff -urNp linux-2.6.32.32/fs/cachefiles/daemon.c linux-2.6.32.32/fs/cachefiles/daemon.c
10953 ---- linux-2.6.32.32/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
10954 -+++ linux-2.6.32.32/fs/cachefiles/daemon.c 2010-12-31 14:46:53.000000000 -0500
10955 +diff -urNp linux-2.6.32.33/fs/cachefiles/daemon.c linux-2.6.32.33/fs/cachefiles/daemon.c
10956 +--- linux-2.6.32.33/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
10957 ++++ linux-2.6.32.33/fs/cachefiles/daemon.c 2010-12-31 14:46:53.000000000 -0500
10958 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
10959 if (test_bit(CACHEFILES_DEAD, &cache->flags))
10960 return -EIO;
10961 @@ -32147,9 +32270,9 @@ diff -urNp linux-2.6.32.32/fs/cachefiles/daemon.c linux-2.6.32.32/fs/cachefiles/
10962 return cachefiles_daemon_range_error(cache, args);
10963
10964 cache->bstop_percent = bstop;
10965 -diff -urNp linux-2.6.32.32/fs/cachefiles/rdwr.c linux-2.6.32.32/fs/cachefiles/rdwr.c
10966 ---- linux-2.6.32.32/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
10967 -+++ linux-2.6.32.32/fs/cachefiles/rdwr.c 2010-12-31 14:46:53.000000000 -0500
10968 +diff -urNp linux-2.6.32.33/fs/cachefiles/rdwr.c linux-2.6.32.33/fs/cachefiles/rdwr.c
10969 +--- linux-2.6.32.33/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
10970 ++++ linux-2.6.32.33/fs/cachefiles/rdwr.c 2010-12-31 14:46:53.000000000 -0500
10971 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
10972 old_fs = get_fs();
10973 set_fs(KERNEL_DS);
10974 @@ -32159,9 +32282,9 @@ diff -urNp linux-2.6.32.32/fs/cachefiles/rdwr.c linux-2.6.32.32/fs/cachefiles/rd
10975 set_fs(old_fs);
10976 kunmap(page);
10977 if (ret != len)
10978 -diff -urNp linux-2.6.32.32/fs/cifs/cifs_uniupr.h linux-2.6.32.32/fs/cifs/cifs_uniupr.h
10979 ---- linux-2.6.32.32/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
10980 -+++ linux-2.6.32.32/fs/cifs/cifs_uniupr.h 2010-12-31 14:46:53.000000000 -0500
10981 +diff -urNp linux-2.6.32.33/fs/cifs/cifs_uniupr.h linux-2.6.32.33/fs/cifs/cifs_uniupr.h
10982 +--- linux-2.6.32.33/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
10983 ++++ linux-2.6.32.33/fs/cifs/cifs_uniupr.h 2010-12-31 14:46:53.000000000 -0500
10984 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
10985 {0x0490, 0x04cc, UniCaseRangeU0490},
10986 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
10987 @@ -32171,9 +32294,9 @@ diff -urNp linux-2.6.32.32/fs/cifs/cifs_uniupr.h linux-2.6.32.32/fs/cifs/cifs_un
10988 };
10989 #endif
10990
10991 -diff -urNp linux-2.6.32.32/fs/cifs/link.c linux-2.6.32.32/fs/cifs/link.c
10992 ---- linux-2.6.32.32/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
10993 -+++ linux-2.6.32.32/fs/cifs/link.c 2010-12-31 14:46:53.000000000 -0500
10994 +diff -urNp linux-2.6.32.33/fs/cifs/link.c linux-2.6.32.33/fs/cifs/link.c
10995 +--- linux-2.6.32.33/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
10996 ++++ linux-2.6.32.33/fs/cifs/link.c 2010-12-31 14:46:53.000000000 -0500
10997 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
10998
10999 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
11000 @@ -32183,9 +32306,9 @@ diff -urNp linux-2.6.32.32/fs/cifs/link.c linux-2.6.32.32/fs/cifs/link.c
11001 if (!IS_ERR(p))
11002 kfree(p);
11003 }
11004 -diff -urNp linux-2.6.32.32/fs/compat_binfmt_elf.c linux-2.6.32.32/fs/compat_binfmt_elf.c
11005 ---- linux-2.6.32.32/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
11006 -+++ linux-2.6.32.32/fs/compat_binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
11007 +diff -urNp linux-2.6.32.33/fs/compat_binfmt_elf.c linux-2.6.32.33/fs/compat_binfmt_elf.c
11008 +--- linux-2.6.32.33/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
11009 ++++ linux-2.6.32.33/fs/compat_binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
11010 @@ -29,10 +29,12 @@
11011 #undef elfhdr
11012 #undef elf_phdr
11013 @@ -32199,9 +32322,9 @@ diff -urNp linux-2.6.32.32/fs/compat_binfmt_elf.c linux-2.6.32.32/fs/compat_binf
11014 #define elf_addr_t Elf32_Addr
11015
11016 /*
11017 -diff -urNp linux-2.6.32.32/fs/compat.c linux-2.6.32.32/fs/compat.c
11018 ---- linux-2.6.32.32/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
11019 -+++ linux-2.6.32.32/fs/compat.c 2011-01-11 23:29:37.000000000 -0500
11020 +diff -urNp linux-2.6.32.33/fs/compat.c linux-2.6.32.33/fs/compat.c
11021 +--- linux-2.6.32.33/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
11022 ++++ linux-2.6.32.33/fs/compat.c 2011-01-11 23:29:37.000000000 -0500
11023 @@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
11024
11025 struct compat_readdir_callback {
11026 @@ -32426,9 +32549,9 @@ diff -urNp linux-2.6.32.32/fs/compat.c linux-2.6.32.32/fs/compat.c
11027
11028 out_file:
11029 if (bprm->file) {
11030 -diff -urNp linux-2.6.32.32/fs/compat_ioctl.c linux-2.6.32.32/fs/compat_ioctl.c
11031 ---- linux-2.6.32.32/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
11032 -+++ linux-2.6.32.32/fs/compat_ioctl.c 2010-12-31 14:46:53.000000000 -0500
11033 +diff -urNp linux-2.6.32.33/fs/compat_ioctl.c linux-2.6.32.33/fs/compat_ioctl.c
11034 +--- linux-2.6.32.33/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
11035 ++++ linux-2.6.32.33/fs/compat_ioctl.c 2010-12-31 14:46:53.000000000 -0500
11036 @@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi
11037 up = (struct compat_video_spu_palette __user *) arg;
11038 err = get_user(palp, &up->palette);
11039 @@ -32457,9 +32580,9 @@ diff -urNp linux-2.6.32.32/fs/compat_ioctl.c linux-2.6.32.32/fs/compat_ioctl.c
11040
11041 /* ioctl should not be warned about even if it's not implemented.
11042 Valid reasons to use this:
11043 -diff -urNp linux-2.6.32.32/fs/debugfs/inode.c linux-2.6.32.32/fs/debugfs/inode.c
11044 ---- linux-2.6.32.32/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11045 -+++ linux-2.6.32.32/fs/debugfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11046 +diff -urNp linux-2.6.32.33/fs/debugfs/inode.c linux-2.6.32.33/fs/debugfs/inode.c
11047 +--- linux-2.6.32.33/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11048 ++++ linux-2.6.32.33/fs/debugfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11049 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
11050
11051 static int debug_fill_super(struct super_block *sb, void *data, int silent)
11052 @@ -32469,9 +32592,9 @@ diff -urNp linux-2.6.32.32/fs/debugfs/inode.c linux-2.6.32.32/fs/debugfs/inode.c
11053
11054 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
11055 }
11056 -diff -urNp linux-2.6.32.32/fs/dlm/lockspace.c linux-2.6.32.32/fs/dlm/lockspace.c
11057 ---- linux-2.6.32.32/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
11058 -+++ linux-2.6.32.32/fs/dlm/lockspace.c 2010-12-31 14:46:53.000000000 -0500
11059 +diff -urNp linux-2.6.32.33/fs/dlm/lockspace.c linux-2.6.32.33/fs/dlm/lockspace.c
11060 +--- linux-2.6.32.33/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
11061 ++++ linux-2.6.32.33/fs/dlm/lockspace.c 2010-12-31 14:46:53.000000000 -0500
11062 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
11063 kfree(ls);
11064 }
11065 @@ -32481,9 +32604,9 @@ diff -urNp linux-2.6.32.32/fs/dlm/lockspace.c linux-2.6.32.32/fs/dlm/lockspace.c
11066 .show = dlm_attr_show,
11067 .store = dlm_attr_store,
11068 };
11069 -diff -urNp linux-2.6.32.32/fs/ecryptfs/inode.c linux-2.6.32.32/fs/ecryptfs/inode.c
11070 ---- linux-2.6.32.32/fs/ecryptfs/inode.c 2011-03-02 17:24:54.000000000 -0500
11071 -+++ linux-2.6.32.32/fs/ecryptfs/inode.c 2011-03-02 17:25:31.000000000 -0500
11072 +diff -urNp linux-2.6.32.33/fs/ecryptfs/inode.c linux-2.6.32.33/fs/ecryptfs/inode.c
11073 +--- linux-2.6.32.33/fs/ecryptfs/inode.c 2011-03-02 17:24:54.000000000 -0500
11074 ++++ linux-2.6.32.33/fs/ecryptfs/inode.c 2011-03-02 17:25:31.000000000 -0500
11075 @@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
11076 old_fs = get_fs();
11077 set_fs(get_ds());
11078 @@ -32502,9 +32625,9 @@ diff -urNp linux-2.6.32.32/fs/ecryptfs/inode.c linux-2.6.32.32/fs/ecryptfs/inode
11079 set_fs(old_fs);
11080 if (rc < 0)
11081 goto out_free;
11082 -diff -urNp linux-2.6.32.32/fs/exec.c linux-2.6.32.32/fs/exec.c
11083 ---- linux-2.6.32.32/fs/exec.c 2011-01-11 23:55:35.000000000 -0500
11084 -+++ linux-2.6.32.32/fs/exec.c 2011-02-12 11:21:23.000000000 -0500
11085 +diff -urNp linux-2.6.32.33/fs/exec.c linux-2.6.32.33/fs/exec.c
11086 +--- linux-2.6.32.33/fs/exec.c 2011-01-11 23:55:35.000000000 -0500
11087 ++++ linux-2.6.32.33/fs/exec.c 2011-02-12 11:21:23.000000000 -0500
11088 @@ -56,12 +56,24 @@
11089 #include <linux/fsnotify.h>
11090 #include <linux/fs_struct.h>
11091 @@ -33096,9 +33219,9 @@ diff -urNp linux-2.6.32.32/fs/exec.c linux-2.6.32.32/fs/exec.c
11092 /*
11093 * lock_kernel() because format_corename() is controlled by sysctl, which
11094 * uses lock_kernel()
11095 -diff -urNp linux-2.6.32.32/fs/ext2/balloc.c linux-2.6.32.32/fs/ext2/balloc.c
11096 ---- linux-2.6.32.32/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
11097 -+++ linux-2.6.32.32/fs/ext2/balloc.c 2010-12-31 14:46:53.000000000 -0500
11098 +diff -urNp linux-2.6.32.33/fs/ext2/balloc.c linux-2.6.32.33/fs/ext2/balloc.c
11099 +--- linux-2.6.32.33/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
11100 ++++ linux-2.6.32.33/fs/ext2/balloc.c 2010-12-31 14:46:53.000000000 -0500
11101 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
11102
11103 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
11104 @@ -33108,9 +33231,9 @@ diff -urNp linux-2.6.32.32/fs/ext2/balloc.c linux-2.6.32.32/fs/ext2/balloc.c
11105 sbi->s_resuid != current_fsuid() &&
11106 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
11107 return 0;
11108 -diff -urNp linux-2.6.32.32/fs/ext2/xattr.c linux-2.6.32.32/fs/ext2/xattr.c
11109 ---- linux-2.6.32.32/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
11110 -+++ linux-2.6.32.32/fs/ext2/xattr.c 2010-12-31 14:46:53.000000000 -0500
11111 +diff -urNp linux-2.6.32.33/fs/ext2/xattr.c linux-2.6.32.33/fs/ext2/xattr.c
11112 +--- linux-2.6.32.33/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
11113 ++++ linux-2.6.32.33/fs/ext2/xattr.c 2010-12-31 14:46:53.000000000 -0500
11114 @@ -85,8 +85,8 @@
11115 printk("\n"); \
11116 } while (0)
11117 @@ -33122,9 +33245,9 @@ diff -urNp linux-2.6.32.32/fs/ext2/xattr.c linux-2.6.32.32/fs/ext2/xattr.c
11118 #endif
11119
11120 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
11121 -diff -urNp linux-2.6.32.32/fs/ext3/balloc.c linux-2.6.32.32/fs/ext3/balloc.c
11122 ---- linux-2.6.32.32/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
11123 -+++ linux-2.6.32.32/fs/ext3/balloc.c 2010-12-31 14:46:53.000000000 -0500
11124 +diff -urNp linux-2.6.32.33/fs/ext3/balloc.c linux-2.6.32.33/fs/ext3/balloc.c
11125 +--- linux-2.6.32.33/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
11126 ++++ linux-2.6.32.33/fs/ext3/balloc.c 2010-12-31 14:46:53.000000000 -0500
11127 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
11128
11129 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
11130 @@ -33134,9 +33257,9 @@ diff -urNp linux-2.6.32.32/fs/ext3/balloc.c linux-2.6.32.32/fs/ext3/balloc.c
11131 sbi->s_resuid != current_fsuid() &&
11132 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
11133 return 0;
11134 -diff -urNp linux-2.6.32.32/fs/ext3/namei.c linux-2.6.32.32/fs/ext3/namei.c
11135 ---- linux-2.6.32.32/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
11136 -+++ linux-2.6.32.32/fs/ext3/namei.c 2010-12-31 14:46:53.000000000 -0500
11137 +diff -urNp linux-2.6.32.33/fs/ext3/namei.c linux-2.6.32.33/fs/ext3/namei.c
11138 +--- linux-2.6.32.33/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
11139 ++++ linux-2.6.32.33/fs/ext3/namei.c 2010-12-31 14:46:53.000000000 -0500
11140 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
11141 char *data1 = (*bh)->b_data, *data2;
11142 unsigned split, move, size;
11143 @@ -33146,9 +33269,9 @@ diff -urNp linux-2.6.32.32/fs/ext3/namei.c linux-2.6.32.32/fs/ext3/namei.c
11144
11145 bh2 = ext3_append (handle, dir, &newblock, &err);
11146 if (!(bh2)) {
11147 -diff -urNp linux-2.6.32.32/fs/ext3/xattr.c linux-2.6.32.32/fs/ext3/xattr.c
11148 ---- linux-2.6.32.32/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
11149 -+++ linux-2.6.32.32/fs/ext3/xattr.c 2010-12-31 14:46:53.000000000 -0500
11150 +diff -urNp linux-2.6.32.33/fs/ext3/xattr.c linux-2.6.32.33/fs/ext3/xattr.c
11151 +--- linux-2.6.32.33/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
11152 ++++ linux-2.6.32.33/fs/ext3/xattr.c 2010-12-31 14:46:53.000000000 -0500
11153 @@ -89,8 +89,8 @@
11154 printk("\n"); \
11155 } while (0)
11156 @@ -33160,9 +33283,9 @@ diff -urNp linux-2.6.32.32/fs/ext3/xattr.c linux-2.6.32.32/fs/ext3/xattr.c
11157 #endif
11158
11159 static void ext3_xattr_cache_insert(struct buffer_head *);
11160 -diff -urNp linux-2.6.32.32/fs/ext4/balloc.c linux-2.6.32.32/fs/ext4/balloc.c
11161 ---- linux-2.6.32.32/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
11162 -+++ linux-2.6.32.32/fs/ext4/balloc.c 2010-12-31 14:46:53.000000000 -0500
11163 +diff -urNp linux-2.6.32.33/fs/ext4/balloc.c linux-2.6.32.33/fs/ext4/balloc.c
11164 +--- linux-2.6.32.33/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
11165 ++++ linux-2.6.32.33/fs/ext4/balloc.c 2010-12-31 14:46:53.000000000 -0500
11166 @@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
11167 /* Hm, nope. Are (enough) root reserved blocks available? */
11168 if (sbi->s_resuid == current_fsuid() ||
11169 @@ -33172,9 +33295,9 @@ diff -urNp linux-2.6.32.32/fs/ext4/balloc.c linux-2.6.32.32/fs/ext4/balloc.c
11170 if (free_blocks >= (nblocks + dirty_blocks))
11171 return 1;
11172 }
11173 -diff -urNp linux-2.6.32.32/fs/ext4/ext4.h linux-2.6.32.32/fs/ext4/ext4.h
11174 ---- linux-2.6.32.32/fs/ext4/ext4.h 2010-08-29 21:08:20.000000000 -0400
11175 -+++ linux-2.6.32.32/fs/ext4/ext4.h 2011-01-04 17:42:43.000000000 -0500
11176 +diff -urNp linux-2.6.32.33/fs/ext4/ext4.h linux-2.6.32.33/fs/ext4/ext4.h
11177 +--- linux-2.6.32.33/fs/ext4/ext4.h 2010-08-29 21:08:20.000000000 -0400
11178 ++++ linux-2.6.32.33/fs/ext4/ext4.h 2011-01-04 17:42:43.000000000 -0500
11179 @@ -1078,19 +1078,19 @@ struct ext4_sb_info {
11180
11181 /* stats for buddy allocator */
11182 @@ -33205,9 +33328,9 @@ diff -urNp linux-2.6.32.32/fs/ext4/ext4.h linux-2.6.32.32/fs/ext4/ext4.h
11183 atomic_t s_lock_busy;
11184
11185 /* locality groups */
11186 -diff -urNp linux-2.6.32.32/fs/ext4/mballoc.c linux-2.6.32.32/fs/ext4/mballoc.c
11187 ---- linux-2.6.32.32/fs/ext4/mballoc.c 2010-08-13 16:24:37.000000000 -0400
11188 -+++ linux-2.6.32.32/fs/ext4/mballoc.c 2011-01-04 17:42:43.000000000 -0500
11189 +diff -urNp linux-2.6.32.33/fs/ext4/mballoc.c linux-2.6.32.33/fs/ext4/mballoc.c
11190 +--- linux-2.6.32.33/fs/ext4/mballoc.c 2010-08-13 16:24:37.000000000 -0400
11191 ++++ linux-2.6.32.33/fs/ext4/mballoc.c 2011-01-04 17:42:43.000000000 -0500
11192 @@ -1753,7 +1753,7 @@ void ext4_mb_simple_scan_group(struct ex
11193 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
11194
11195 @@ -33321,9 +33444,9 @@ diff -urNp linux-2.6.32.32/fs/ext4/mballoc.c linux-2.6.32.32/fs/ext4/mballoc.c
11196
11197 if (ac) {
11198 ac->ac_sb = sb;
11199 -diff -urNp linux-2.6.32.32/fs/ext4/namei.c linux-2.6.32.32/fs/ext4/namei.c
11200 ---- linux-2.6.32.32/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
11201 -+++ linux-2.6.32.32/fs/ext4/namei.c 2010-12-31 14:46:53.000000000 -0500
11202 +diff -urNp linux-2.6.32.33/fs/ext4/namei.c linux-2.6.32.33/fs/ext4/namei.c
11203 +--- linux-2.6.32.33/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
11204 ++++ linux-2.6.32.33/fs/ext4/namei.c 2010-12-31 14:46:53.000000000 -0500
11205 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
11206 char *data1 = (*bh)->b_data, *data2;
11207 unsigned split, move, size;
11208 @@ -33333,9 +33456,9 @@ diff -urNp linux-2.6.32.32/fs/ext4/namei.c linux-2.6.32.32/fs/ext4/namei.c
11209
11210 bh2 = ext4_append (handle, dir, &newblock, &err);
11211 if (!(bh2)) {
11212 -diff -urNp linux-2.6.32.32/fs/ext4/super.c linux-2.6.32.32/fs/ext4/super.c
11213 ---- linux-2.6.32.32/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
11214 -+++ linux-2.6.32.32/fs/ext4/super.c 2010-12-31 14:46:53.000000000 -0500
11215 +diff -urNp linux-2.6.32.33/fs/ext4/super.c linux-2.6.32.33/fs/ext4/super.c
11216 +--- linux-2.6.32.33/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
11217 ++++ linux-2.6.32.33/fs/ext4/super.c 2010-12-31 14:46:53.000000000 -0500
11218 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
11219 }
11220
11221 @@ -33345,9 +33468,9 @@ diff -urNp linux-2.6.32.32/fs/ext4/super.c linux-2.6.32.32/fs/ext4/super.c
11222 .show = ext4_attr_show,
11223 .store = ext4_attr_store,
11224 };
11225 -diff -urNp linux-2.6.32.32/fs/ext4/xattr.c linux-2.6.32.32/fs/ext4/xattr.c
11226 ---- linux-2.6.32.32/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
11227 -+++ linux-2.6.32.32/fs/ext4/xattr.c 2010-12-31 14:46:53.000000000 -0500
11228 +diff -urNp linux-2.6.32.33/fs/ext4/xattr.c linux-2.6.32.33/fs/ext4/xattr.c
11229 +--- linux-2.6.32.33/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
11230 ++++ linux-2.6.32.33/fs/ext4/xattr.c 2010-12-31 14:46:53.000000000 -0500
11231 @@ -82,8 +82,8 @@
11232 printk("\n"); \
11233 } while (0)
11234 @@ -33359,9 +33482,9 @@ diff -urNp linux-2.6.32.32/fs/ext4/xattr.c linux-2.6.32.32/fs/ext4/xattr.c
11235 #endif
11236
11237 static void ext4_xattr_cache_insert(struct buffer_head *);
11238 -diff -urNp linux-2.6.32.32/fs/fcntl.c linux-2.6.32.32/fs/fcntl.c
11239 ---- linux-2.6.32.32/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
11240 -+++ linux-2.6.32.32/fs/fcntl.c 2010-12-31 14:46:53.000000000 -0500
11241 +diff -urNp linux-2.6.32.33/fs/fcntl.c linux-2.6.32.33/fs/fcntl.c
11242 +--- linux-2.6.32.33/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
11243 ++++ linux-2.6.32.33/fs/fcntl.c 2010-12-31 14:46:53.000000000 -0500
11244 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
11245 if (err)
11246 return err;
11247 @@ -33382,9 +33505,9 @@ diff -urNp linux-2.6.32.32/fs/fcntl.c linux-2.6.32.32/fs/fcntl.c
11248 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
11249 break;
11250 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
11251 -diff -urNp linux-2.6.32.32/fs/fifo.c linux-2.6.32.32/fs/fifo.c
11252 ---- linux-2.6.32.32/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
11253 -+++ linux-2.6.32.32/fs/fifo.c 2010-12-31 14:46:53.000000000 -0500
11254 +diff -urNp linux-2.6.32.33/fs/fifo.c linux-2.6.32.33/fs/fifo.c
11255 +--- linux-2.6.32.33/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
11256 ++++ linux-2.6.32.33/fs/fifo.c 2010-12-31 14:46:53.000000000 -0500
11257 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
11258 */
11259 filp->f_op = &read_pipefifo_fops;
11260 @@ -33455,9 +33578,9 @@ diff -urNp linux-2.6.32.32/fs/fifo.c linux-2.6.32.32/fs/fifo.c
11261 free_pipe_info(inode);
11262
11263 err_nocleanup:
11264 -diff -urNp linux-2.6.32.32/fs/file.c linux-2.6.32.32/fs/file.c
11265 ---- linux-2.6.32.32/fs/file.c 2010-08-13 16:24:37.000000000 -0400
11266 -+++ linux-2.6.32.32/fs/file.c 2010-12-31 14:46:53.000000000 -0500
11267 +diff -urNp linux-2.6.32.33/fs/file.c linux-2.6.32.33/fs/file.c
11268 +--- linux-2.6.32.33/fs/file.c 2010-08-13 16:24:37.000000000 -0400
11269 ++++ linux-2.6.32.33/fs/file.c 2010-12-31 14:46:53.000000000 -0500
11270 @@ -14,6 +14,7 @@
11271 #include <linux/slab.h>
11272 #include <linux/vmalloc.h>
11273 @@ -33475,9 +33598,9 @@ diff -urNp linux-2.6.32.32/fs/file.c linux-2.6.32.32/fs/file.c
11274 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
11275 return -EMFILE;
11276
11277 -diff -urNp linux-2.6.32.32/fs/fs_struct.c linux-2.6.32.32/fs/fs_struct.c
11278 ---- linux-2.6.32.32/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
11279 -+++ linux-2.6.32.32/fs/fs_struct.c 2010-12-31 14:46:53.000000000 -0500
11280 +diff -urNp linux-2.6.32.33/fs/fs_struct.c linux-2.6.32.33/fs/fs_struct.c
11281 +--- linux-2.6.32.33/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
11282 ++++ linux-2.6.32.33/fs/fs_struct.c 2010-12-31 14:46:53.000000000 -0500
11283 @@ -4,6 +4,7 @@
11284 #include <linux/path.h>
11285 #include <linux/slab.h>
11286 @@ -33557,9 +33680,9 @@ diff -urNp linux-2.6.32.32/fs/fs_struct.c linux-2.6.32.32/fs/fs_struct.c
11287 write_unlock(&fs->lock);
11288
11289 task_unlock(current);
11290 -diff -urNp linux-2.6.32.32/fs/fuse/control.c linux-2.6.32.32/fs/fuse/control.c
11291 ---- linux-2.6.32.32/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
11292 -+++ linux-2.6.32.32/fs/fuse/control.c 2010-12-31 14:46:53.000000000 -0500
11293 +diff -urNp linux-2.6.32.33/fs/fuse/control.c linux-2.6.32.33/fs/fuse/control.c
11294 +--- linux-2.6.32.33/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
11295 ++++ linux-2.6.32.33/fs/fuse/control.c 2010-12-31 14:46:53.000000000 -0500
11296 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
11297
11298 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
11299 @@ -33569,9 +33692,9 @@ diff -urNp linux-2.6.32.32/fs/fuse/control.c linux-2.6.32.32/fs/fuse/control.c
11300 struct fuse_conn *fc;
11301 int err;
11302
11303 -diff -urNp linux-2.6.32.32/fs/fuse/cuse.c linux-2.6.32.32/fs/fuse/cuse.c
11304 ---- linux-2.6.32.32/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
11305 -+++ linux-2.6.32.32/fs/fuse/cuse.c 2010-12-31 14:46:53.000000000 -0500
11306 +diff -urNp linux-2.6.32.33/fs/fuse/cuse.c linux-2.6.32.33/fs/fuse/cuse.c
11307 +--- linux-2.6.32.33/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
11308 ++++ linux-2.6.32.33/fs/fuse/cuse.c 2010-12-31 14:46:53.000000000 -0500
11309 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
11310 return rc;
11311 }
11312 @@ -33606,9 +33729,9 @@ diff -urNp linux-2.6.32.32/fs/fuse/cuse.c linux-2.6.32.32/fs/fuse/cuse.c
11313 cuse_class = class_create(THIS_MODULE, "cuse");
11314 if (IS_ERR(cuse_class))
11315 return PTR_ERR(cuse_class);
11316 -diff -urNp linux-2.6.32.32/fs/fuse/dev.c linux-2.6.32.32/fs/fuse/dev.c
11317 ---- linux-2.6.32.32/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
11318 -+++ linux-2.6.32.32/fs/fuse/dev.c 2010-12-31 14:46:53.000000000 -0500
11319 +diff -urNp linux-2.6.32.33/fs/fuse/dev.c linux-2.6.32.33/fs/fuse/dev.c
11320 +--- linux-2.6.32.33/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
11321 ++++ linux-2.6.32.33/fs/fuse/dev.c 2010-12-31 14:46:53.000000000 -0500
11322 @@ -745,7 +745,7 @@ __releases(&fc->lock)
11323 * request_end(). Otherwise add it to the processing list, and set
11324 * the 'sent' flag.
11325 @@ -33714,9 +33837,9 @@ diff -urNp linux-2.6.32.32/fs/fuse/dev.c linux-2.6.32.32/fs/fuse/dev.c
11326
11327 const struct file_operations fuse_dev_operations = {
11328 .owner = THIS_MODULE,
11329 -diff -urNp linux-2.6.32.32/fs/fuse/dir.c linux-2.6.32.32/fs/fuse/dir.c
11330 ---- linux-2.6.32.32/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
11331 -+++ linux-2.6.32.32/fs/fuse/dir.c 2010-12-31 14:46:53.000000000 -0500
11332 +diff -urNp linux-2.6.32.33/fs/fuse/dir.c linux-2.6.32.33/fs/fuse/dir.c
11333 +--- linux-2.6.32.33/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
11334 ++++ linux-2.6.32.33/fs/fuse/dir.c 2010-12-31 14:46:53.000000000 -0500
11335 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
11336 return link;
11337 }
11338 @@ -33726,9 +33849,9 @@ diff -urNp linux-2.6.32.32/fs/fuse/dir.c linux-2.6.32.32/fs/fuse/dir.c
11339 {
11340 if (!IS_ERR(link))
11341 free_page((unsigned long) link);
11342 -diff -urNp linux-2.6.32.32/fs/fuse/fuse_i.h linux-2.6.32.32/fs/fuse/fuse_i.h
11343 ---- linux-2.6.32.32/fs/fuse/fuse_i.h 2011-03-11 17:56:47.000000000 -0500
11344 -+++ linux-2.6.32.32/fs/fuse/fuse_i.h 2011-03-11 18:01:11.000000000 -0500
11345 +diff -urNp linux-2.6.32.33/fs/fuse/fuse_i.h linux-2.6.32.33/fs/fuse/fuse_i.h
11346 +--- linux-2.6.32.33/fs/fuse/fuse_i.h 2011-03-11 17:56:47.000000000 -0500
11347 ++++ linux-2.6.32.33/fs/fuse/fuse_i.h 2011-03-11 18:01:11.000000000 -0500
11348 @@ -525,6 +525,16 @@ extern const struct file_operations fuse
11349
11350 extern const struct dentry_operations fuse_dentry_operations;
11351 @@ -33746,9 +33869,9 @@ diff -urNp linux-2.6.32.32/fs/fuse/fuse_i.h linux-2.6.32.32/fs/fuse/fuse_i.h
11352 /**
11353 * Inode to nodeid comparison.
11354 */
11355 -diff -urNp linux-2.6.32.32/fs/gfs2/sys.c linux-2.6.32.32/fs/gfs2/sys.c
11356 ---- linux-2.6.32.32/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
11357 -+++ linux-2.6.32.32/fs/gfs2/sys.c 2010-12-31 14:46:53.000000000 -0500
11358 +diff -urNp linux-2.6.32.33/fs/gfs2/sys.c linux-2.6.32.33/fs/gfs2/sys.c
11359 +--- linux-2.6.32.33/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
11360 ++++ linux-2.6.32.33/fs/gfs2/sys.c 2010-12-31 14:46:53.000000000 -0500
11361 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
11362 return a->store ? a->store(sdp, buf, len) : len;
11363 }
11364 @@ -33767,9 +33890,9 @@ diff -urNp linux-2.6.32.32/fs/gfs2/sys.c linux-2.6.32.32/fs/gfs2/sys.c
11365 .uevent = gfs2_uevent,
11366 };
11367
11368 -diff -urNp linux-2.6.32.32/fs/hfs/inode.c linux-2.6.32.32/fs/hfs/inode.c
11369 ---- linux-2.6.32.32/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11370 -+++ linux-2.6.32.32/fs/hfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11371 +diff -urNp linux-2.6.32.33/fs/hfs/inode.c linux-2.6.32.33/fs/hfs/inode.c
11372 +--- linux-2.6.32.33/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11373 ++++ linux-2.6.32.33/fs/hfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11374 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
11375
11376 if (S_ISDIR(main_inode->i_mode)) {
11377 @@ -33788,9 +33911,9 @@ diff -urNp linux-2.6.32.32/fs/hfs/inode.c linux-2.6.32.32/fs/hfs/inode.c
11378 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
11379 sizeof(struct hfs_cat_file));
11380 if (rec.type != HFS_CDR_FIL ||
11381 -diff -urNp linux-2.6.32.32/fs/hfsplus/inode.c linux-2.6.32.32/fs/hfsplus/inode.c
11382 ---- linux-2.6.32.32/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
11383 -+++ linux-2.6.32.32/fs/hfsplus/inode.c 2010-12-31 14:46:53.000000000 -0500
11384 +diff -urNp linux-2.6.32.33/fs/hfsplus/inode.c linux-2.6.32.33/fs/hfsplus/inode.c
11385 +--- linux-2.6.32.33/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
11386 ++++ linux-2.6.32.33/fs/hfsplus/inode.c 2010-12-31 14:46:53.000000000 -0500
11387 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
11388 struct hfsplus_cat_folder *folder = &entry.folder;
11389
11390 @@ -33827,9 +33950,9 @@ diff -urNp linux-2.6.32.32/fs/hfsplus/inode.c linux-2.6.32.32/fs/hfsplus/inode.c
11391 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
11392 sizeof(struct hfsplus_cat_file));
11393 hfsplus_inode_write_fork(inode, &file->data_fork);
11394 -diff -urNp linux-2.6.32.32/fs/hugetlbfs/inode.c linux-2.6.32.32/fs/hugetlbfs/inode.c
11395 ---- linux-2.6.32.32/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11396 -+++ linux-2.6.32.32/fs/hugetlbfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11397 +diff -urNp linux-2.6.32.33/fs/hugetlbfs/inode.c linux-2.6.32.33/fs/hugetlbfs/inode.c
11398 +--- linux-2.6.32.33/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11399 ++++ linux-2.6.32.33/fs/hugetlbfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11400 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
11401 .kill_sb = kill_litter_super,
11402 };
11403 @@ -33839,9 +33962,9 @@ diff -urNp linux-2.6.32.32/fs/hugetlbfs/inode.c linux-2.6.32.32/fs/hugetlbfs/ino
11404
11405 static int can_do_hugetlb_shm(void)
11406 {
11407 -diff -urNp linux-2.6.32.32/fs/ioctl.c linux-2.6.32.32/fs/ioctl.c
11408 ---- linux-2.6.32.32/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
11409 -+++ linux-2.6.32.32/fs/ioctl.c 2010-12-31 14:46:53.000000000 -0500
11410 +diff -urNp linux-2.6.32.33/fs/ioctl.c linux-2.6.32.33/fs/ioctl.c
11411 +--- linux-2.6.32.33/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
11412 ++++ linux-2.6.32.33/fs/ioctl.c 2010-12-31 14:46:53.000000000 -0500
11413 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
11414 u64 phys, u64 len, u32 flags)
11415 {
11416 @@ -33869,9 +33992,9 @@ diff -urNp linux-2.6.32.32/fs/ioctl.c linux-2.6.32.32/fs/ioctl.c
11417 error = -EFAULT;
11418
11419 return error;
11420 -diff -urNp linux-2.6.32.32/fs/jffs2/debug.h linux-2.6.32.32/fs/jffs2/debug.h
11421 ---- linux-2.6.32.32/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
11422 -+++ linux-2.6.32.32/fs/jffs2/debug.h 2010-12-31 14:46:53.000000000 -0500
11423 +diff -urNp linux-2.6.32.33/fs/jffs2/debug.h linux-2.6.32.33/fs/jffs2/debug.h
11424 +--- linux-2.6.32.33/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
11425 ++++ linux-2.6.32.33/fs/jffs2/debug.h 2010-12-31 14:46:53.000000000 -0500
11426 @@ -52,13 +52,13 @@
11427 #if CONFIG_JFFS2_FS_DEBUG > 0
11428 #define D1(x) x
11429 @@ -33973,9 +34096,9 @@ diff -urNp linux-2.6.32.32/fs/jffs2/debug.h linux-2.6.32.32/fs/jffs2/debug.h
11430 #endif
11431
11432 /* "Sanity" checks */
11433 -diff -urNp linux-2.6.32.32/fs/jffs2/erase.c linux-2.6.32.32/fs/jffs2/erase.c
11434 ---- linux-2.6.32.32/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
11435 -+++ linux-2.6.32.32/fs/jffs2/erase.c 2010-12-31 14:46:53.000000000 -0500
11436 +diff -urNp linux-2.6.32.33/fs/jffs2/erase.c linux-2.6.32.33/fs/jffs2/erase.c
11437 +--- linux-2.6.32.33/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
11438 ++++ linux-2.6.32.33/fs/jffs2/erase.c 2010-12-31 14:46:53.000000000 -0500
11439 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
11440 struct jffs2_unknown_node marker = {
11441 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
11442 @@ -33986,9 +34109,9 @@ diff -urNp linux-2.6.32.32/fs/jffs2/erase.c linux-2.6.32.32/fs/jffs2/erase.c
11443 };
11444
11445 jffs2_prealloc_raw_node_refs(c, jeb, 1);
11446 -diff -urNp linux-2.6.32.32/fs/jffs2/summary.h linux-2.6.32.32/fs/jffs2/summary.h
11447 ---- linux-2.6.32.32/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
11448 -+++ linux-2.6.32.32/fs/jffs2/summary.h 2010-12-31 14:46:53.000000000 -0500
11449 +diff -urNp linux-2.6.32.33/fs/jffs2/summary.h linux-2.6.32.33/fs/jffs2/summary.h
11450 +--- linux-2.6.32.33/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
11451 ++++ linux-2.6.32.33/fs/jffs2/summary.h 2010-12-31 14:46:53.000000000 -0500
11452 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
11453
11454 #define jffs2_sum_active() (0)
11455 @@ -34017,9 +34140,9 @@ diff -urNp linux-2.6.32.32/fs/jffs2/summary.h linux-2.6.32.32/fs/jffs2/summary.h
11456 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
11457
11458 #endif /* CONFIG_JFFS2_SUMMARY */
11459 -diff -urNp linux-2.6.32.32/fs/jffs2/wbuf.c linux-2.6.32.32/fs/jffs2/wbuf.c
11460 ---- linux-2.6.32.32/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
11461 -+++ linux-2.6.32.32/fs/jffs2/wbuf.c 2010-12-31 14:46:53.000000000 -0500
11462 +diff -urNp linux-2.6.32.33/fs/jffs2/wbuf.c linux-2.6.32.33/fs/jffs2/wbuf.c
11463 +--- linux-2.6.32.33/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
11464 ++++ linux-2.6.32.33/fs/jffs2/wbuf.c 2010-12-31 14:46:53.000000000 -0500
11465 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
11466 {
11467 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
11468 @@ -34030,9 +34153,9 @@ diff -urNp linux-2.6.32.32/fs/jffs2/wbuf.c linux-2.6.32.32/fs/jffs2/wbuf.c
11469 };
11470
11471 /*
11472 -diff -urNp linux-2.6.32.32/fs/Kconfig.binfmt linux-2.6.32.32/fs/Kconfig.binfmt
11473 ---- linux-2.6.32.32/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
11474 -+++ linux-2.6.32.32/fs/Kconfig.binfmt 2010-12-31 14:46:53.000000000 -0500
11475 +diff -urNp linux-2.6.32.33/fs/Kconfig.binfmt linux-2.6.32.33/fs/Kconfig.binfmt
11476 +--- linux-2.6.32.33/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
11477 ++++ linux-2.6.32.33/fs/Kconfig.binfmt 2010-12-31 14:46:53.000000000 -0500
11478 @@ -86,7 +86,7 @@ config HAVE_AOUT
11479
11480 config BINFMT_AOUT
11481 @@ -34042,9 +34165,9 @@ diff -urNp linux-2.6.32.32/fs/Kconfig.binfmt linux-2.6.32.32/fs/Kconfig.binfmt
11482 ---help---
11483 A.out (Assembler.OUTput) is a set of formats for libraries and
11484 executables used in the earliest versions of UNIX. Linux used
11485 -diff -urNp linux-2.6.32.32/fs/lockd/svc.c linux-2.6.32.32/fs/lockd/svc.c
11486 ---- linux-2.6.32.32/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
11487 -+++ linux-2.6.32.32/fs/lockd/svc.c 2010-12-31 14:46:53.000000000 -0500
11488 +diff -urNp linux-2.6.32.33/fs/lockd/svc.c linux-2.6.32.33/fs/lockd/svc.c
11489 +--- linux-2.6.32.33/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
11490 ++++ linux-2.6.32.33/fs/lockd/svc.c 2010-12-31 14:46:53.000000000 -0500
11491 @@ -43,7 +43,7 @@
11492
11493 static struct svc_program nlmsvc_program;
11494 @@ -34054,9 +34177,9 @@ diff -urNp linux-2.6.32.32/fs/lockd/svc.c linux-2.6.32.32/fs/lockd/svc.c
11495 EXPORT_SYMBOL_GPL(nlmsvc_ops);
11496
11497 static DEFINE_MUTEX(nlmsvc_mutex);
11498 -diff -urNp linux-2.6.32.32/fs/locks.c linux-2.6.32.32/fs/locks.c
11499 ---- linux-2.6.32.32/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
11500 -+++ linux-2.6.32.32/fs/locks.c 2010-12-31 14:46:53.000000000 -0500
11501 +diff -urNp linux-2.6.32.33/fs/locks.c linux-2.6.32.33/fs/locks.c
11502 +--- linux-2.6.32.33/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
11503 ++++ linux-2.6.32.33/fs/locks.c 2010-12-31 14:46:53.000000000 -0500
11504 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
11505 return;
11506
11507 @@ -34078,9 +34201,9 @@ diff -urNp linux-2.6.32.32/fs/locks.c linux-2.6.32.32/fs/locks.c
11508 }
11509
11510 lock_kernel();
11511 -diff -urNp linux-2.6.32.32/fs/namei.c linux-2.6.32.32/fs/namei.c
11512 ---- linux-2.6.32.32/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
11513 -+++ linux-2.6.32.32/fs/namei.c 2010-12-31 14:46:53.000000000 -0500
11514 +diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
11515 +--- linux-2.6.32.33/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
11516 ++++ linux-2.6.32.33/fs/namei.c 2010-12-31 14:46:53.000000000 -0500
11517 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
11518 return ret;
11519
11520 @@ -34458,9 +34581,9 @@ diff -urNp linux-2.6.32.32/fs/namei.c linux-2.6.32.32/fs/namei.c
11521 exit6:
11522 mnt_drop_write(oldnd.path.mnt);
11523 exit5:
11524 -diff -urNp linux-2.6.32.32/fs/namespace.c linux-2.6.32.32/fs/namespace.c
11525 ---- linux-2.6.32.32/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
11526 -+++ linux-2.6.32.32/fs/namespace.c 2010-12-31 14:46:53.000000000 -0500
11527 +diff -urNp linux-2.6.32.33/fs/namespace.c linux-2.6.32.33/fs/namespace.c
11528 +--- linux-2.6.32.33/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
11529 ++++ linux-2.6.32.33/fs/namespace.c 2010-12-31 14:46:53.000000000 -0500
11530 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
11531 if (!(sb->s_flags & MS_RDONLY))
11532 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
11533 @@ -34521,9 +34644,9 @@ diff -urNp linux-2.6.32.32/fs/namespace.c linux-2.6.32.32/fs/namespace.c
11534 read_lock(&current->fs->lock);
11535 root = current->fs->root;
11536 path_get(&current->fs->root);
11537 -diff -urNp linux-2.6.32.32/fs/nfs/inode.c linux-2.6.32.32/fs/nfs/inode.c
11538 ---- linux-2.6.32.32/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11539 -+++ linux-2.6.32.32/fs/nfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11540 +diff -urNp linux-2.6.32.33/fs/nfs/inode.c linux-2.6.32.33/fs/nfs/inode.c
11541 +--- linux-2.6.32.33/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11542 ++++ linux-2.6.32.33/fs/nfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11543 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
11544 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
11545 }
11546 @@ -34544,9 +34667,9 @@ diff -urNp linux-2.6.32.32/fs/nfs/inode.c linux-2.6.32.32/fs/nfs/inode.c
11547 }
11548
11549 void nfs_fattr_init(struct nfs_fattr *fattr)
11550 -diff -urNp linux-2.6.32.32/fs/nfs/nfs4proc.c linux-2.6.32.32/fs/nfs/nfs4proc.c
11551 ---- linux-2.6.32.32/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
11552 -+++ linux-2.6.32.32/fs/nfs/nfs4proc.c 2010-12-31 14:46:53.000000000 -0500
11553 +diff -urNp linux-2.6.32.33/fs/nfs/nfs4proc.c linux-2.6.32.33/fs/nfs/nfs4proc.c
11554 +--- linux-2.6.32.33/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
11555 ++++ linux-2.6.32.33/fs/nfs/nfs4proc.c 2010-12-31 14:46:53.000000000 -0500
11556 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
11557 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
11558 {
11559 @@ -34817,9 +34940,9 @@ diff -urNp linux-2.6.32.32/fs/nfs/nfs4proc.c linux-2.6.32.32/fs/nfs/nfs4proc.c
11560 int err;
11561
11562 err = nfs4_set_lock_state(state, fl);
11563 -diff -urNp linux-2.6.32.32/fs/nfsd/lockd.c linux-2.6.32.32/fs/nfsd/lockd.c
11564 ---- linux-2.6.32.32/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
11565 -+++ linux-2.6.32.32/fs/nfsd/lockd.c 2010-12-31 14:46:53.000000000 -0500
11566 +diff -urNp linux-2.6.32.33/fs/nfsd/lockd.c linux-2.6.32.33/fs/nfsd/lockd.c
11567 +--- linux-2.6.32.33/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
11568 ++++ linux-2.6.32.33/fs/nfsd/lockd.c 2010-12-31 14:46:53.000000000 -0500
11569 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
11570 fput(filp);
11571 }
11572 @@ -34829,9 +34952,9 @@ diff -urNp linux-2.6.32.32/fs/nfsd/lockd.c linux-2.6.32.32/fs/nfsd/lockd.c
11573 .fopen = nlm_fopen, /* open file for locking */
11574 .fclose = nlm_fclose, /* close file */
11575 };
11576 -diff -urNp linux-2.6.32.32/fs/nfsd/vfs.c linux-2.6.32.32/fs/nfsd/vfs.c
11577 ---- linux-2.6.32.32/fs/nfsd/vfs.c 2011-03-02 17:24:54.000000000 -0500
11578 -+++ linux-2.6.32.32/fs/nfsd/vfs.c 2011-03-02 17:25:31.000000000 -0500
11579 +diff -urNp linux-2.6.32.33/fs/nfsd/vfs.c linux-2.6.32.33/fs/nfsd/vfs.c
11580 +--- linux-2.6.32.33/fs/nfsd/vfs.c 2011-03-02 17:24:54.000000000 -0500
11581 ++++ linux-2.6.32.33/fs/nfsd/vfs.c 2011-03-02 17:25:31.000000000 -0500
11582 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
11583 } else {
11584 oldfs = get_fs();
11585 @@ -34859,9 +34982,9 @@ diff -urNp linux-2.6.32.32/fs/nfsd/vfs.c linux-2.6.32.32/fs/nfsd/vfs.c
11586 set_fs(oldfs);
11587
11588 if (host_err < 0)
11589 -diff -urNp linux-2.6.32.32/fs/nls/nls_base.c linux-2.6.32.32/fs/nls/nls_base.c
11590 ---- linux-2.6.32.32/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
11591 -+++ linux-2.6.32.32/fs/nls/nls_base.c 2010-12-31 14:46:53.000000000 -0500
11592 +diff -urNp linux-2.6.32.33/fs/nls/nls_base.c linux-2.6.32.33/fs/nls/nls_base.c
11593 +--- linux-2.6.32.33/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
11594 ++++ linux-2.6.32.33/fs/nls/nls_base.c 2010-12-31 14:46:53.000000000 -0500
11595 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
11596 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
11597 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
11598 @@ -34871,9 +34994,9 @@ diff -urNp linux-2.6.32.32/fs/nls/nls_base.c linux-2.6.32.32/fs/nls/nls_base.c
11599 };
11600
11601 #define UNICODE_MAX 0x0010ffff
11602 -diff -urNp linux-2.6.32.32/fs/ntfs/dir.c linux-2.6.32.32/fs/ntfs/dir.c
11603 ---- linux-2.6.32.32/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400
11604 -+++ linux-2.6.32.32/fs/ntfs/dir.c 2010-12-31 14:46:53.000000000 -0500
11605 +diff -urNp linux-2.6.32.33/fs/ntfs/dir.c linux-2.6.32.33/fs/ntfs/dir.c
11606 +--- linux-2.6.32.33/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400
11607 ++++ linux-2.6.32.33/fs/ntfs/dir.c 2010-12-31 14:46:53.000000000 -0500
11608 @@ -1328,7 +1328,7 @@ find_next_index_buffer:
11609 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
11610 ~(s64)(ndir->itype.index.block_size - 1)));
11611 @@ -34883,9 +35006,9 @@ diff -urNp linux-2.6.32.32/fs/ntfs/dir.c linux-2.6.32.32/fs/ntfs/dir.c
11612 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
11613 "inode 0x%lx or driver bug.", vdir->i_ino);
11614 goto err_out;
11615 -diff -urNp linux-2.6.32.32/fs/ntfs/file.c linux-2.6.32.32/fs/ntfs/file.c
11616 ---- linux-2.6.32.32/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
11617 -+++ linux-2.6.32.32/fs/ntfs/file.c 2010-12-31 14:46:53.000000000 -0500
11618 +diff -urNp linux-2.6.32.33/fs/ntfs/file.c linux-2.6.32.33/fs/ntfs/file.c
11619 +--- linux-2.6.32.33/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
11620 ++++ linux-2.6.32.33/fs/ntfs/file.c 2010-12-31 14:46:53.000000000 -0500
11621 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
11622 #endif /* NTFS_RW */
11623 };
11624 @@ -34895,9 +35018,9 @@ diff -urNp linux-2.6.32.32/fs/ntfs/file.c linux-2.6.32.32/fs/ntfs/file.c
11625
11626 -const struct inode_operations ntfs_empty_inode_ops = {};
11627 +const struct inode_operations ntfs_empty_inode_ops __read_only;
11628 -diff -urNp linux-2.6.32.32/fs/ocfs2/cluster/masklog.c linux-2.6.32.32/fs/ocfs2/cluster/masklog.c
11629 ---- linux-2.6.32.32/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
11630 -+++ linux-2.6.32.32/fs/ocfs2/cluster/masklog.c 2010-12-31 14:46:53.000000000 -0500
11631 +diff -urNp linux-2.6.32.33/fs/ocfs2/cluster/masklog.c linux-2.6.32.33/fs/ocfs2/cluster/masklog.c
11632 +--- linux-2.6.32.33/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
11633 ++++ linux-2.6.32.33/fs/ocfs2/cluster/masklog.c 2010-12-31 14:46:53.000000000 -0500
11634 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
11635 return mlog_mask_store(mlog_attr->mask, buf, count);
11636 }
11637 @@ -34907,9 +35030,9 @@ diff -urNp linux-2.6.32.32/fs/ocfs2/cluster/masklog.c linux-2.6.32.32/fs/ocfs2/c
11638 .show = mlog_show,
11639 .store = mlog_store,
11640 };
11641 -diff -urNp linux-2.6.32.32/fs/ocfs2/localalloc.c linux-2.6.32.32/fs/ocfs2/localalloc.c
11642 ---- linux-2.6.32.32/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
11643 -+++ linux-2.6.32.32/fs/ocfs2/localalloc.c 2010-12-31 14:46:53.000000000 -0500
11644 +diff -urNp linux-2.6.32.33/fs/ocfs2/localalloc.c linux-2.6.32.33/fs/ocfs2/localalloc.c
11645 +--- linux-2.6.32.33/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
11646 ++++ linux-2.6.32.33/fs/ocfs2/localalloc.c 2010-12-31 14:46:53.000000000 -0500
11647 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
11648 goto bail;
11649 }
11650 @@ -34919,9 +35042,9 @@ diff -urNp linux-2.6.32.32/fs/ocfs2/localalloc.c linux-2.6.32.32/fs/ocfs2/locala
11651
11652 status = 0;
11653 bail:
11654 -diff -urNp linux-2.6.32.32/fs/ocfs2/ocfs2.h linux-2.6.32.32/fs/ocfs2/ocfs2.h
11655 ---- linux-2.6.32.32/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
11656 -+++ linux-2.6.32.32/fs/ocfs2/ocfs2.h 2010-12-31 14:46:53.000000000 -0500
11657 +diff -urNp linux-2.6.32.33/fs/ocfs2/ocfs2.h linux-2.6.32.33/fs/ocfs2/ocfs2.h
11658 +--- linux-2.6.32.33/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
11659 ++++ linux-2.6.32.33/fs/ocfs2/ocfs2.h 2010-12-31 14:46:53.000000000 -0500
11660 @@ -217,11 +217,11 @@ enum ocfs2_vol_state
11661
11662 struct ocfs2_alloc_stats
11663 @@ -34939,9 +35062,9 @@ diff -urNp linux-2.6.32.32/fs/ocfs2/ocfs2.h linux-2.6.32.32/fs/ocfs2/ocfs2.h
11664 };
11665
11666 enum ocfs2_local_alloc_state
11667 -diff -urNp linux-2.6.32.32/fs/ocfs2/suballoc.c linux-2.6.32.32/fs/ocfs2/suballoc.c
11668 ---- linux-2.6.32.32/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
11669 -+++ linux-2.6.32.32/fs/ocfs2/suballoc.c 2010-12-31 14:46:53.000000000 -0500
11670 +diff -urNp linux-2.6.32.33/fs/ocfs2/suballoc.c linux-2.6.32.33/fs/ocfs2/suballoc.c
11671 +--- linux-2.6.32.33/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
11672 ++++ linux-2.6.32.33/fs/ocfs2/suballoc.c 2010-12-31 14:46:53.000000000 -0500
11673 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
11674 mlog_errno(status);
11675 goto bail;
11676 @@ -34987,9 +35110,9 @@ diff -urNp linux-2.6.32.32/fs/ocfs2/suballoc.c linux-2.6.32.32/fs/ocfs2/suballoc
11677 }
11678 }
11679 if (status < 0) {
11680 -diff -urNp linux-2.6.32.32/fs/ocfs2/super.c linux-2.6.32.32/fs/ocfs2/super.c
11681 ---- linux-2.6.32.32/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
11682 -+++ linux-2.6.32.32/fs/ocfs2/super.c 2010-12-31 14:46:53.000000000 -0500
11683 +diff -urNp linux-2.6.32.33/fs/ocfs2/super.c linux-2.6.32.33/fs/ocfs2/super.c
11684 +--- linux-2.6.32.33/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
11685 ++++ linux-2.6.32.33/fs/ocfs2/super.c 2010-12-31 14:46:53.000000000 -0500
11686 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
11687 "%10s => GlobalAllocs: %d LocalAllocs: %d "
11688 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
11689 @@ -35024,9 +35147,9 @@ diff -urNp linux-2.6.32.32/fs/ocfs2/super.c linux-2.6.32.32/fs/ocfs2/super.c
11690
11691 /* Copy the blockcheck stats from the superblock probe */
11692 osb->osb_ecc_stats = *stats;
11693 -diff -urNp linux-2.6.32.32/fs/open.c linux-2.6.32.32/fs/open.c
11694 ---- linux-2.6.32.32/fs/open.c 2010-08-13 16:24:37.000000000 -0400
11695 -+++ linux-2.6.32.32/fs/open.c 2011-01-17 02:49:34.000000000 -0500
11696 +diff -urNp linux-2.6.32.33/fs/open.c linux-2.6.32.33/fs/open.c
11697 +--- linux-2.6.32.33/fs/open.c 2010-08-13 16:24:37.000000000 -0400
11698 ++++ linux-2.6.32.33/fs/open.c 2011-01-17 02:49:34.000000000 -0500
11699 @@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
11700 error = locks_verify_truncate(inode, NULL, length);
11701 if (!error)
11702 @@ -35211,9 +35334,9 @@ diff -urNp linux-2.6.32.32/fs/open.c linux-2.6.32.32/fs/open.c
11703 if (IS_ERR(f)) {
11704 put_unused_fd(fd);
11705 fd = PTR_ERR(f);
11706 -diff -urNp linux-2.6.32.32/fs/partitions/ldm.c linux-2.6.32.32/fs/partitions/ldm.c
11707 ---- linux-2.6.32.32/fs/partitions/ldm.c 2011-03-02 17:24:54.000000000 -0500
11708 -+++ linux-2.6.32.32/fs/partitions/ldm.c 2011-02-27 15:46:41.000000000 -0500
11709 +diff -urNp linux-2.6.32.33/fs/partitions/ldm.c linux-2.6.32.33/fs/partitions/ldm.c
11710 +--- linux-2.6.32.33/fs/partitions/ldm.c 2011-03-02 17:24:54.000000000 -0500
11711 ++++ linux-2.6.32.33/fs/partitions/ldm.c 2011-02-27 15:46:41.000000000 -0500
11712 @@ -1313,7 +1313,7 @@ static bool ldm_frag_add (const u8 *data
11713 goto found;
11714 }
11715 @@ -35223,9 +35346,9 @@ diff -urNp linux-2.6.32.32/fs/partitions/ldm.c linux-2.6.32.32/fs/partitions/ldm
11716 if (!f) {
11717 ldm_crit ("Out of memory.");
11718 return false;
11719 -diff -urNp linux-2.6.32.32/fs/partitions/mac.c linux-2.6.32.32/fs/partitions/mac.c
11720 ---- linux-2.6.32.32/fs/partitions/mac.c 2011-03-02 17:24:54.000000000 -0500
11721 -+++ linux-2.6.32.32/fs/partitions/mac.c 2011-02-22 16:30:44.000000000 -0500
11722 +diff -urNp linux-2.6.32.33/fs/partitions/mac.c linux-2.6.32.33/fs/partitions/mac.c
11723 +--- linux-2.6.32.33/fs/partitions/mac.c 2011-03-02 17:24:54.000000000 -0500
11724 ++++ linux-2.6.32.33/fs/partitions/mac.c 2011-02-22 16:30:44.000000000 -0500
11725 @@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio
11726 return 0; /* not a MacOS disk */
11727 }
11728 @@ -35239,9 +35362,9 @@ diff -urNp linux-2.6.32.32/fs/partitions/mac.c linux-2.6.32.32/fs/partitions/mac
11729 for (slot = 1; slot <= blocks_in_map; ++slot) {
11730 int pos = slot * secsize;
11731 put_dev_sector(sect);
11732 -diff -urNp linux-2.6.32.32/fs/pipe.c linux-2.6.32.32/fs/pipe.c
11733 ---- linux-2.6.32.32/fs/pipe.c 2010-11-26 18:22:29.000000000 -0500
11734 -+++ linux-2.6.32.32/fs/pipe.c 2010-12-31 14:46:53.000000000 -0500
11735 +diff -urNp linux-2.6.32.33/fs/pipe.c linux-2.6.32.33/fs/pipe.c
11736 +--- linux-2.6.32.33/fs/pipe.c 2010-11-26 18:22:29.000000000 -0500
11737 ++++ linux-2.6.32.33/fs/pipe.c 2010-12-31 14:46:53.000000000 -0500
11738 @@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const stru
11739 error = ops->confirm(pipe, buf);
11740 if (error) {
11741 @@ -35374,9 +35497,9 @@ diff -urNp linux-2.6.32.32/fs/pipe.c linux-2.6.32.32/fs/pipe.c
11742 inode->i_fop = &rdwr_pipefifo_fops;
11743
11744 /*
11745 -diff -urNp linux-2.6.32.32/fs/proc/array.c linux-2.6.32.32/fs/proc/array.c
11746 ---- linux-2.6.32.32/fs/proc/array.c 2011-03-02 17:24:54.000000000 -0500
11747 -+++ linux-2.6.32.32/fs/proc/array.c 2011-03-02 17:25:35.000000000 -0500
11748 +diff -urNp linux-2.6.32.33/fs/proc/array.c linux-2.6.32.33/fs/proc/array.c
11749 +--- linux-2.6.32.33/fs/proc/array.c 2011-03-02 17:24:54.000000000 -0500
11750 ++++ linux-2.6.32.33/fs/proc/array.c 2011-03-02 17:25:35.000000000 -0500
11751 @@ -60,6 +60,7 @@
11752 #include <linux/tty.h>
11753 #include <linux/string.h>
11754 @@ -35479,9 +35602,9 @@ diff -urNp linux-2.6.32.32/fs/proc/array.c linux-2.6.32.32/fs/proc/array.c
11755 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
11756 +}
11757 +#endif
11758 -diff -urNp linux-2.6.32.32/fs/proc/base.c linux-2.6.32.32/fs/proc/base.c
11759 ---- linux-2.6.32.32/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
11760 -+++ linux-2.6.32.32/fs/proc/base.c 2010-12-31 14:46:53.000000000 -0500
11761 +diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
11762 +--- linux-2.6.32.33/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
11763 ++++ linux-2.6.32.33/fs/proc/base.c 2010-12-31 14:46:53.000000000 -0500
11764 @@ -102,6 +102,22 @@ struct pid_entry {
11765 union proc_op op;
11766 };
11767 @@ -35856,9 +35979,9 @@ diff -urNp linux-2.6.32.32/fs/proc/base.c linux-2.6.32.32/fs/proc/base.c
11768 ONE("stack", S_IRUSR, proc_pid_stack),
11769 #endif
11770 #ifdef CONFIG_SCHEDSTATS
11771 -diff -urNp linux-2.6.32.32/fs/proc/cmdline.c linux-2.6.32.32/fs/proc/cmdline.c
11772 ---- linux-2.6.32.32/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
11773 -+++ linux-2.6.32.32/fs/proc/cmdline.c 2010-12-31 14:46:53.000000000 -0500
11774 +diff -urNp linux-2.6.32.33/fs/proc/cmdline.c linux-2.6.32.33/fs/proc/cmdline.c
11775 +--- linux-2.6.32.33/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
11776 ++++ linux-2.6.32.33/fs/proc/cmdline.c 2010-12-31 14:46:53.000000000 -0500
11777 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
11778
11779 static int __init proc_cmdline_init(void)
11780 @@ -35871,9 +35994,9 @@ diff -urNp linux-2.6.32.32/fs/proc/cmdline.c linux-2.6.32.32/fs/proc/cmdline.c
11781 return 0;
11782 }
11783 module_init(proc_cmdline_init);
11784 -diff -urNp linux-2.6.32.32/fs/proc/devices.c linux-2.6.32.32/fs/proc/devices.c
11785 ---- linux-2.6.32.32/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
11786 -+++ linux-2.6.32.32/fs/proc/devices.c 2010-12-31 14:46:53.000000000 -0500
11787 +diff -urNp linux-2.6.32.33/fs/proc/devices.c linux-2.6.32.33/fs/proc/devices.c
11788 +--- linux-2.6.32.33/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
11789 ++++ linux-2.6.32.33/fs/proc/devices.c 2010-12-31 14:46:53.000000000 -0500
11790 @@ -64,7 +64,11 @@ static const struct file_operations proc
11791
11792 static int __init proc_devices_init(void)
11793 @@ -35886,9 +36009,9 @@ diff -urNp linux-2.6.32.32/fs/proc/devices.c linux-2.6.32.32/fs/proc/devices.c
11794 return 0;
11795 }
11796 module_init(proc_devices_init);
11797 -diff -urNp linux-2.6.32.32/fs/proc/inode.c linux-2.6.32.32/fs/proc/inode.c
11798 ---- linux-2.6.32.32/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
11799 -+++ linux-2.6.32.32/fs/proc/inode.c 2010-12-31 14:46:53.000000000 -0500
11800 +diff -urNp linux-2.6.32.33/fs/proc/inode.c linux-2.6.32.33/fs/proc/inode.c
11801 +--- linux-2.6.32.33/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
11802 ++++ linux-2.6.32.33/fs/proc/inode.c 2010-12-31 14:46:53.000000000 -0500
11803 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
11804 if (de->mode) {
11805 inode->i_mode = de->mode;
11806 @@ -35901,9 +36024,9 @@ diff -urNp linux-2.6.32.32/fs/proc/inode.c linux-2.6.32.32/fs/proc/inode.c
11807 }
11808 if (de->size)
11809 inode->i_size = de->size;
11810 -diff -urNp linux-2.6.32.32/fs/proc/internal.h linux-2.6.32.32/fs/proc/internal.h
11811 ---- linux-2.6.32.32/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
11812 -+++ linux-2.6.32.32/fs/proc/internal.h 2010-12-31 14:46:53.000000000 -0500
11813 +diff -urNp linux-2.6.32.33/fs/proc/internal.h linux-2.6.32.33/fs/proc/internal.h
11814 +--- linux-2.6.32.33/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
11815 ++++ linux-2.6.32.33/fs/proc/internal.h 2010-12-31 14:46:53.000000000 -0500
11816 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
11817 struct pid *pid, struct task_struct *task);
11818 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
11819 @@ -35914,9 +36037,9 @@ diff -urNp linux-2.6.32.32/fs/proc/internal.h linux-2.6.32.32/fs/proc/internal.h
11820 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
11821
11822 extern const struct file_operations proc_maps_operations;
11823 -diff -urNp linux-2.6.32.32/fs/proc/Kconfig linux-2.6.32.32/fs/proc/Kconfig
11824 ---- linux-2.6.32.32/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
11825 -+++ linux-2.6.32.32/fs/proc/Kconfig 2010-12-31 14:46:53.000000000 -0500
11826 +diff -urNp linux-2.6.32.33/fs/proc/Kconfig linux-2.6.32.33/fs/proc/Kconfig
11827 +--- linux-2.6.32.33/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
11828 ++++ linux-2.6.32.33/fs/proc/Kconfig 2010-12-31 14:46:53.000000000 -0500
11829 @@ -30,12 +30,12 @@ config PROC_FS
11830
11831 config PROC_KCORE
11832 @@ -35944,9 +36067,9 @@ diff -urNp linux-2.6.32.32/fs/proc/Kconfig linux-2.6.32.32/fs/proc/Kconfig
11833 bool "Enable /proc page monitoring" if EMBEDDED
11834 help
11835 Various /proc files exist to monitor process memory utilization:
11836 -diff -urNp linux-2.6.32.32/fs/proc/kcore.c linux-2.6.32.32/fs/proc/kcore.c
11837 ---- linux-2.6.32.32/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
11838 -+++ linux-2.6.32.32/fs/proc/kcore.c 2010-12-31 14:47:01.000000000 -0500
11839 +diff -urNp linux-2.6.32.33/fs/proc/kcore.c linux-2.6.32.33/fs/proc/kcore.c
11840 +--- linux-2.6.32.33/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
11841 ++++ linux-2.6.32.33/fs/proc/kcore.c 2010-12-31 14:47:01.000000000 -0500
11842 @@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use
11843 * the addresses in the elf_phdr on our list.
11844 */
11845 @@ -36005,9 +36128,9 @@ diff -urNp linux-2.6.32.32/fs/proc/kcore.c linux-2.6.32.32/fs/proc/kcore.c
11846 if (!capable(CAP_SYS_RAWIO))
11847 return -EPERM;
11848 if (kcore_need_update)
11849 -diff -urNp linux-2.6.32.32/fs/proc/meminfo.c linux-2.6.32.32/fs/proc/meminfo.c
11850 ---- linux-2.6.32.32/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
11851 -+++ linux-2.6.32.32/fs/proc/meminfo.c 2010-12-31 14:46:53.000000000 -0500
11852 +diff -urNp linux-2.6.32.33/fs/proc/meminfo.c linux-2.6.32.33/fs/proc/meminfo.c
11853 +--- linux-2.6.32.33/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
11854 ++++ linux-2.6.32.33/fs/proc/meminfo.c 2010-12-31 14:46:53.000000000 -0500
11855 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
11856 vmi.used >> 10,
11857 vmi.largest_chunk >> 10
11858 @@ -36017,9 +36140,9 @@ diff -urNp linux-2.6.32.32/fs/proc/meminfo.c linux-2.6.32.32/fs/proc/meminfo.c
11859 #endif
11860 );
11861
11862 -diff -urNp linux-2.6.32.32/fs/proc/nommu.c linux-2.6.32.32/fs/proc/nommu.c
11863 ---- linux-2.6.32.32/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
11864 -+++ linux-2.6.32.32/fs/proc/nommu.c 2010-12-31 14:46:53.000000000 -0500
11865 +diff -urNp linux-2.6.32.33/fs/proc/nommu.c linux-2.6.32.33/fs/proc/nommu.c
11866 +--- linux-2.6.32.33/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
11867 ++++ linux-2.6.32.33/fs/proc/nommu.c 2010-12-31 14:46:53.000000000 -0500
11868 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
11869 if (len < 1)
11870 len = 1;
11871 @@ -36029,9 +36152,9 @@ diff -urNp linux-2.6.32.32/fs/proc/nommu.c linux-2.6.32.32/fs/proc/nommu.c
11872 }
11873
11874 seq_putc(m, '\n');
11875 -diff -urNp linux-2.6.32.32/fs/proc/proc_net.c linux-2.6.32.32/fs/proc/proc_net.c
11876 ---- linux-2.6.32.32/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
11877 -+++ linux-2.6.32.32/fs/proc/proc_net.c 2010-12-31 14:46:53.000000000 -0500
11878 +diff -urNp linux-2.6.32.33/fs/proc/proc_net.c linux-2.6.32.33/fs/proc/proc_net.c
11879 +--- linux-2.6.32.33/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
11880 ++++ linux-2.6.32.33/fs/proc/proc_net.c 2010-12-31 14:46:53.000000000 -0500
11881 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
11882 struct task_struct *task;
11883 struct nsproxy *ns;
11884 @@ -36050,9 +36173,9 @@ diff -urNp linux-2.6.32.32/fs/proc/proc_net.c linux-2.6.32.32/fs/proc/proc_net.c
11885
11886 rcu_read_lock();
11887 task = pid_task(proc_pid(dir), PIDTYPE_PID);
11888 -diff -urNp linux-2.6.32.32/fs/proc/proc_sysctl.c linux-2.6.32.32/fs/proc/proc_sysctl.c
11889 ---- linux-2.6.32.32/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
11890 -+++ linux-2.6.32.32/fs/proc/proc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
11891 +diff -urNp linux-2.6.32.33/fs/proc/proc_sysctl.c linux-2.6.32.33/fs/proc/proc_sysctl.c
11892 +--- linux-2.6.32.33/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
11893 ++++ linux-2.6.32.33/fs/proc/proc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
11894 @@ -7,6 +7,8 @@
11895 #include <linux/security.h>
11896 #include "internal.h"
11897 @@ -36092,9 +36215,9 @@ diff -urNp linux-2.6.32.32/fs/proc/proc_sysctl.c linux-2.6.32.32/fs/proc/proc_sy
11898 generic_fillattr(inode, stat);
11899 if (table)
11900 stat->mode = (stat->mode & S_IFMT) | table->mode;
11901 -diff -urNp linux-2.6.32.32/fs/proc/root.c linux-2.6.32.32/fs/proc/root.c
11902 ---- linux-2.6.32.32/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
11903 -+++ linux-2.6.32.32/fs/proc/root.c 2010-12-31 14:46:53.000000000 -0500
11904 +diff -urNp linux-2.6.32.33/fs/proc/root.c linux-2.6.32.33/fs/proc/root.c
11905 +--- linux-2.6.32.33/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
11906 ++++ linux-2.6.32.33/fs/proc/root.c 2010-12-31 14:46:53.000000000 -0500
11907 @@ -134,7 +134,15 @@ void __init proc_root_init(void)
11908 #ifdef CONFIG_PROC_DEVICETREE
11909 proc_device_tree_init();
11910 @@ -36111,9 +36234,9 @@ diff -urNp linux-2.6.32.32/fs/proc/root.c linux-2.6.32.32/fs/proc/root.c
11911 proc_sys_init();
11912 }
11913
11914 -diff -urNp linux-2.6.32.32/fs/proc/task_mmu.c linux-2.6.32.32/fs/proc/task_mmu.c
11915 ---- linux-2.6.32.32/fs/proc/task_mmu.c 2010-10-31 16:44:11.000000000 -0400
11916 -+++ linux-2.6.32.32/fs/proc/task_mmu.c 2010-12-31 14:46:53.000000000 -0500
11917 +diff -urNp linux-2.6.32.33/fs/proc/task_mmu.c linux-2.6.32.33/fs/proc/task_mmu.c
11918 +--- linux-2.6.32.33/fs/proc/task_mmu.c 2010-10-31 16:44:11.000000000 -0400
11919 ++++ linux-2.6.32.33/fs/proc/task_mmu.c 2010-12-31 14:46:53.000000000 -0500
11920 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
11921 "VmStk:\t%8lu kB\n"
11922 "VmExe:\t%8lu kB\n"
11923 @@ -36250,9 +36373,9 @@ diff -urNp linux-2.6.32.32/fs/proc/task_mmu.c linux-2.6.32.32/fs/proc/task_mmu.c
11924 mss.resident >> 10,
11925 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
11926 mss.shared_clean >> 10,
11927 -diff -urNp linux-2.6.32.32/fs/proc/task_nommu.c linux-2.6.32.32/fs/proc/task_nommu.c
11928 ---- linux-2.6.32.32/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
11929 -+++ linux-2.6.32.32/fs/proc/task_nommu.c 2010-12-31 14:46:53.000000000 -0500
11930 +diff -urNp linux-2.6.32.33/fs/proc/task_nommu.c linux-2.6.32.33/fs/proc/task_nommu.c
11931 +--- linux-2.6.32.33/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
11932 ++++ linux-2.6.32.33/fs/proc/task_nommu.c 2010-12-31 14:46:53.000000000 -0500
11933 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
11934 else
11935 bytes += kobjsize(mm);
11936 @@ -36271,9 +36394,9 @@ diff -urNp linux-2.6.32.32/fs/proc/task_nommu.c linux-2.6.32.32/fs/proc/task_nom
11937 }
11938
11939 seq_putc(m, '\n');
11940 -diff -urNp linux-2.6.32.32/fs/readdir.c linux-2.6.32.32/fs/readdir.c
11941 ---- linux-2.6.32.32/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
11942 -+++ linux-2.6.32.32/fs/readdir.c 2010-12-31 14:46:53.000000000 -0500
11943 +diff -urNp linux-2.6.32.33/fs/readdir.c linux-2.6.32.33/fs/readdir.c
11944 +--- linux-2.6.32.33/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
11945 ++++ linux-2.6.32.33/fs/readdir.c 2010-12-31 14:46:53.000000000 -0500
11946 @@ -16,6 +16,7 @@
11947 #include <linux/security.h>
11948 #include <linux/syscalls.h>
11949 @@ -36363,9 +36486,9 @@ diff -urNp linux-2.6.32.32/fs/readdir.c linux-2.6.32.32/fs/readdir.c
11950 buf.count = count;
11951 buf.error = 0;
11952
11953 -diff -urNp linux-2.6.32.32/fs/reiserfs/do_balan.c linux-2.6.32.32/fs/reiserfs/do_balan.c
11954 ---- linux-2.6.32.32/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
11955 -+++ linux-2.6.32.32/fs/reiserfs/do_balan.c 2010-12-31 14:46:53.000000000 -0500
11956 +diff -urNp linux-2.6.32.33/fs/reiserfs/do_balan.c linux-2.6.32.33/fs/reiserfs/do_balan.c
11957 +--- linux-2.6.32.33/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
11958 ++++ linux-2.6.32.33/fs/reiserfs/do_balan.c 2010-12-31 14:46:53.000000000 -0500
11959 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
11960 return;
11961 }
11962 @@ -36375,9 +36498,9 @@ diff -urNp linux-2.6.32.32/fs/reiserfs/do_balan.c linux-2.6.32.32/fs/reiserfs/do
11963 do_balance_starts(tb);
11964
11965 /* balance leaf returns 0 except if combining L R and S into
11966 -diff -urNp linux-2.6.32.32/fs/reiserfs/item_ops.c linux-2.6.32.32/fs/reiserfs/item_ops.c
11967 ---- linux-2.6.32.32/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
11968 -+++ linux-2.6.32.32/fs/reiserfs/item_ops.c 2010-12-31 14:46:53.000000000 -0500
11969 +diff -urNp linux-2.6.32.33/fs/reiserfs/item_ops.c linux-2.6.32.33/fs/reiserfs/item_ops.c
11970 +--- linux-2.6.32.33/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
11971 ++++ linux-2.6.32.33/fs/reiserfs/item_ops.c 2010-12-31 14:46:53.000000000 -0500
11972 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
11973 vi->vi_index, vi->vi_type, vi->vi_ih);
11974 }
11975 @@ -36432,9 +36555,9 @@ diff -urNp linux-2.6.32.32/fs/reiserfs/item_ops.c linux-2.6.32.32/fs/reiserfs/it
11976 &stat_data_ops,
11977 &indirect_ops,
11978 &direct_ops,
11979 -diff -urNp linux-2.6.32.32/fs/reiserfs/procfs.c linux-2.6.32.32/fs/reiserfs/procfs.c
11980 ---- linux-2.6.32.32/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
11981 -+++ linux-2.6.32.32/fs/reiserfs/procfs.c 2010-12-31 14:46:53.000000000 -0500
11982 +diff -urNp linux-2.6.32.33/fs/reiserfs/procfs.c linux-2.6.32.33/fs/reiserfs/procfs.c
11983 +--- linux-2.6.32.33/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
11984 ++++ linux-2.6.32.33/fs/reiserfs/procfs.c 2010-12-31 14:46:53.000000000 -0500
11985 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
11986 "SMALL_TAILS " : "NO_TAILS ",
11987 replay_only(sb) ? "REPLAY_ONLY " : "",
11988 @@ -36444,9 +36567,9 @@ diff -urNp linux-2.6.32.32/fs/reiserfs/procfs.c linux-2.6.32.32/fs/reiserfs/proc
11989 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
11990 SF(s_do_balance), SF(s_unneeded_left_neighbor),
11991 SF(s_good_search_by_key_reada), SF(s_bmaps),
11992 -diff -urNp linux-2.6.32.32/fs/select.c linux-2.6.32.32/fs/select.c
11993 ---- linux-2.6.32.32/fs/select.c 2010-08-13 16:24:37.000000000 -0400
11994 -+++ linux-2.6.32.32/fs/select.c 2010-12-31 14:46:53.000000000 -0500
11995 +diff -urNp linux-2.6.32.33/fs/select.c linux-2.6.32.33/fs/select.c
11996 +--- linux-2.6.32.33/fs/select.c 2010-08-13 16:24:37.000000000 -0400
11997 ++++ linux-2.6.32.33/fs/select.c 2010-12-31 14:46:53.000000000 -0500
11998 @@ -20,6 +20,7 @@
11999 #include <linux/module.h>
12000 #include <linux/slab.h>
12001 @@ -36463,9 +36586,9 @@ diff -urNp linux-2.6.32.32/fs/select.c linux-2.6.32.32/fs/select.c
12002 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
12003 return -EINVAL;
12004
12005 -diff -urNp linux-2.6.32.32/fs/seq_file.c linux-2.6.32.32/fs/seq_file.c
12006 ---- linux-2.6.32.32/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
12007 -+++ linux-2.6.32.32/fs/seq_file.c 2010-12-31 14:46:53.000000000 -0500
12008 +diff -urNp linux-2.6.32.33/fs/seq_file.c linux-2.6.32.33/fs/seq_file.c
12009 +--- linux-2.6.32.33/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
12010 ++++ linux-2.6.32.33/fs/seq_file.c 2010-12-31 14:46:53.000000000 -0500
12011 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
12012 return 0;
12013 }
12014 @@ -36506,9 +36629,9 @@ diff -urNp linux-2.6.32.32/fs/seq_file.c linux-2.6.32.32/fs/seq_file.c
12015 if (!m->buf)
12016 goto Enomem;
12017 m->count = 0;
12018 -diff -urNp linux-2.6.32.32/fs/smbfs/symlink.c linux-2.6.32.32/fs/smbfs/symlink.c
12019 ---- linux-2.6.32.32/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
12020 -+++ linux-2.6.32.32/fs/smbfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
12021 +diff -urNp linux-2.6.32.33/fs/smbfs/symlink.c linux-2.6.32.33/fs/smbfs/symlink.c
12022 +--- linux-2.6.32.33/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
12023 ++++ linux-2.6.32.33/fs/smbfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
12024 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
12025
12026 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
12027 @@ -36518,9 +36641,9 @@ diff -urNp linux-2.6.32.32/fs/smbfs/symlink.c linux-2.6.32.32/fs/smbfs/symlink.c
12028 if (!IS_ERR(s))
12029 __putname(s);
12030 }
12031 -diff -urNp linux-2.6.32.32/fs/splice.c linux-2.6.32.32/fs/splice.c
12032 ---- linux-2.6.32.32/fs/splice.c 2011-03-02 17:24:54.000000000 -0500
12033 -+++ linux-2.6.32.32/fs/splice.c 2011-03-02 17:25:35.000000000 -0500
12034 +diff -urNp linux-2.6.32.33/fs/splice.c linux-2.6.32.33/fs/splice.c
12035 +--- linux-2.6.32.33/fs/splice.c 2011-03-02 17:24:54.000000000 -0500
12036 ++++ linux-2.6.32.33/fs/splice.c 2011-03-02 17:25:35.000000000 -0500
12037 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
12038 pipe_lock(pipe);
12039
12040 @@ -36659,9 +36782,9 @@ diff -urNp linux-2.6.32.32/fs/splice.c linux-2.6.32.32/fs/splice.c
12041 ret = -EAGAIN;
12042
12043 pipe_unlock(ipipe);
12044 -diff -urNp linux-2.6.32.32/fs/sysfs/file.c linux-2.6.32.32/fs/sysfs/file.c
12045 ---- linux-2.6.32.32/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
12046 -+++ linux-2.6.32.32/fs/sysfs/file.c 2010-12-31 14:46:53.000000000 -0500
12047 +diff -urNp linux-2.6.32.33/fs/sysfs/file.c linux-2.6.32.33/fs/sysfs/file.c
12048 +--- linux-2.6.32.33/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
12049 ++++ linux-2.6.32.33/fs/sysfs/file.c 2010-12-31 14:46:53.000000000 -0500
12050 @@ -53,7 +53,7 @@ struct sysfs_buffer {
12051 size_t count;
12052 loff_t pos;
12053 @@ -36698,9 +36821,9 @@ diff -urNp linux-2.6.32.32/fs/sysfs/file.c linux-2.6.32.32/fs/sysfs/file.c
12054 int error = -EACCES;
12055 char *p;
12056
12057 -diff -urNp linux-2.6.32.32/fs/sysfs/mount.c linux-2.6.32.32/fs/sysfs/mount.c
12058 ---- linux-2.6.32.32/fs/sysfs/mount.c 2010-08-13 16:24:37.000000000 -0400
12059 -+++ linux-2.6.32.32/fs/sysfs/mount.c 2011-03-11 18:54:20.000000000 -0500
12060 +diff -urNp linux-2.6.32.33/fs/sysfs/mount.c linux-2.6.32.33/fs/sysfs/mount.c
12061 +--- linux-2.6.32.33/fs/sysfs/mount.c 2010-08-13 16:24:37.000000000 -0400
12062 ++++ linux-2.6.32.33/fs/sysfs/mount.c 2011-03-11 18:54:20.000000000 -0500
12063 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
12064 .s_name = "",
12065 .s_count = ATOMIC_INIT(1),
12066 @@ -36713,9 +36836,9 @@ diff -urNp linux-2.6.32.32/fs/sysfs/mount.c linux-2.6.32.32/fs/sysfs/mount.c
12067 .s_ino = 1,
12068 };
12069
12070 -diff -urNp linux-2.6.32.32/fs/sysfs/symlink.c linux-2.6.32.32/fs/sysfs/symlink.c
12071 ---- linux-2.6.32.32/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
12072 -+++ linux-2.6.32.32/fs/sysfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
12073 +diff -urNp linux-2.6.32.33/fs/sysfs/symlink.c linux-2.6.32.33/fs/sysfs/symlink.c
12074 +--- linux-2.6.32.33/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
12075 ++++ linux-2.6.32.33/fs/sysfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
12076 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
12077
12078 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
12079 @@ -36725,9 +36848,9 @@ diff -urNp linux-2.6.32.32/fs/sysfs/symlink.c linux-2.6.32.32/fs/sysfs/symlink.c
12080 if (!IS_ERR(page))
12081 free_page((unsigned long)page);
12082 }
12083 -diff -urNp linux-2.6.32.32/fs/ubifs/debug.c linux-2.6.32.32/fs/ubifs/debug.c
12084 ---- linux-2.6.32.32/fs/ubifs/debug.c 2010-08-13 16:24:37.000000000 -0400
12085 -+++ linux-2.6.32.32/fs/ubifs/debug.c 2011-02-27 15:31:34.000000000 -0500
12086 +diff -urNp linux-2.6.32.33/fs/ubifs/debug.c linux-2.6.32.33/fs/ubifs/debug.c
12087 +--- linux-2.6.32.33/fs/ubifs/debug.c 2010-08-13 16:24:37.000000000 -0400
12088 ++++ linux-2.6.32.33/fs/ubifs/debug.c 2011-02-27 15:31:34.000000000 -0500
12089 @@ -2660,19 +2660,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf
12090 }
12091
12092 @@ -36751,9 +36874,9 @@ diff -urNp linux-2.6.32.32/fs/ubifs/debug.c linux-2.6.32.32/fs/ubifs/debug.c
12093 if (IS_ERR(dent))
12094 goto out_remove;
12095 d->dfs_dump_tnc = dent;
12096 -diff -urNp linux-2.6.32.32/fs/udf/balloc.c linux-2.6.32.32/fs/udf/balloc.c
12097 ---- linux-2.6.32.32/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
12098 -+++ linux-2.6.32.32/fs/udf/balloc.c 2010-12-31 14:46:53.000000000 -0500
12099 +diff -urNp linux-2.6.32.33/fs/udf/balloc.c linux-2.6.32.33/fs/udf/balloc.c
12100 +--- linux-2.6.32.33/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
12101 ++++ linux-2.6.32.33/fs/udf/balloc.c 2010-12-31 14:46:53.000000000 -0500
12102 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
12103
12104 mutex_lock(&sbi->s_alloc_mutex);
12105 @@ -36776,9 +36899,9 @@ diff -urNp linux-2.6.32.32/fs/udf/balloc.c linux-2.6.32.32/fs/udf/balloc.c
12106 udf_debug("%d < %d || %d + %d > %d\n",
12107 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
12108 partmap->s_partition_len);
12109 -diff -urNp linux-2.6.32.32/fs/udf/misc.c linux-2.6.32.32/fs/udf/misc.c
12110 ---- linux-2.6.32.32/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
12111 -+++ linux-2.6.32.32/fs/udf/misc.c 2010-12-31 14:46:53.000000000 -0500
12112 +diff -urNp linux-2.6.32.33/fs/udf/misc.c linux-2.6.32.33/fs/udf/misc.c
12113 +--- linux-2.6.32.33/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
12114 ++++ linux-2.6.32.33/fs/udf/misc.c 2010-12-31 14:46:53.000000000 -0500
12115 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
12116 iinfo->i_lenEAttr += size;
12117 return (struct genericFormat *)&ea[offset];
12118 @@ -36799,9 +36922,9 @@ diff -urNp linux-2.6.32.32/fs/udf/misc.c linux-2.6.32.32/fs/udf/misc.c
12119 u8 checksum = 0;
12120 int i;
12121 for (i = 0; i < sizeof(struct tag); ++i)
12122 -diff -urNp linux-2.6.32.32/fs/udf/udfdecl.h linux-2.6.32.32/fs/udf/udfdecl.h
12123 ---- linux-2.6.32.32/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
12124 -+++ linux-2.6.32.32/fs/udf/udfdecl.h 2010-12-31 14:46:53.000000000 -0500
12125 +diff -urNp linux-2.6.32.33/fs/udf/udfdecl.h linux-2.6.32.33/fs/udf/udfdecl.h
12126 +--- linux-2.6.32.33/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
12127 ++++ linux-2.6.32.33/fs/udf/udfdecl.h 2010-12-31 14:46:53.000000000 -0500
12128 @@ -26,7 +26,7 @@ do { \
12129 printk(f, ##a); \
12130 } while (0)
12131 @@ -36811,9 +36934,9 @@ diff -urNp linux-2.6.32.32/fs/udf/udfdecl.h linux-2.6.32.32/fs/udf/udfdecl.h
12132 #endif
12133
12134 #define udf_info(f, a...) \
12135 -diff -urNp linux-2.6.32.32/fs/utimes.c linux-2.6.32.32/fs/utimes.c
12136 ---- linux-2.6.32.32/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
12137 -+++ linux-2.6.32.32/fs/utimes.c 2010-12-31 14:46:53.000000000 -0500
12138 +diff -urNp linux-2.6.32.33/fs/utimes.c linux-2.6.32.33/fs/utimes.c
12139 +--- linux-2.6.32.33/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
12140 ++++ linux-2.6.32.33/fs/utimes.c 2010-12-31 14:46:53.000000000 -0500
12141 @@ -1,6 +1,7 @@
12142 #include <linux/compiler.h>
12143 #include <linux/file.h>
12144 @@ -36835,9 +36958,9 @@ diff -urNp linux-2.6.32.32/fs/utimes.c linux-2.6.32.32/fs/utimes.c
12145 mutex_lock(&inode->i_mutex);
12146 error = notify_change(path->dentry, &newattrs);
12147 mutex_unlock(&inode->i_mutex);
12148 -diff -urNp linux-2.6.32.32/fs/xattr_acl.c linux-2.6.32.32/fs/xattr_acl.c
12149 ---- linux-2.6.32.32/fs/xattr_acl.c 2010-08-13 16:24:37.000000000 -0400
12150 -+++ linux-2.6.32.32/fs/xattr_acl.c 2010-12-31 14:46:53.000000000 -0500
12151 +diff -urNp linux-2.6.32.33/fs/xattr_acl.c linux-2.6.32.33/fs/xattr_acl.c
12152 +--- linux-2.6.32.33/fs/xattr_acl.c 2010-08-13 16:24:37.000000000 -0400
12153 ++++ linux-2.6.32.33/fs/xattr_acl.c 2010-12-31 14:46:53.000000000 -0500
12154 @@ -17,8 +17,8 @@
12155 struct posix_acl *
12156 posix_acl_from_xattr(const void *value, size_t size)
12157 @@ -36849,9 +36972,9 @@ diff -urNp linux-2.6.32.32/fs/xattr_acl.c linux-2.6.32.32/fs/xattr_acl.c
12158 int count;
12159 struct posix_acl *acl;
12160 struct posix_acl_entry *acl_e;
12161 -diff -urNp linux-2.6.32.32/fs/xattr.c linux-2.6.32.32/fs/xattr.c
12162 ---- linux-2.6.32.32/fs/xattr.c 2010-08-13 16:24:37.000000000 -0400
12163 -+++ linux-2.6.32.32/fs/xattr.c 2010-12-31 14:46:53.000000000 -0500
12164 +diff -urNp linux-2.6.32.33/fs/xattr.c linux-2.6.32.33/fs/xattr.c
12165 +--- linux-2.6.32.33/fs/xattr.c 2010-08-13 16:24:37.000000000 -0400
12166 ++++ linux-2.6.32.33/fs/xattr.c 2010-12-31 14:46:53.000000000 -0500
12167 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
12168 * Extended attribute SET operations
12169 */
12170 @@ -36914,9 +37037,9 @@ diff -urNp linux-2.6.32.32/fs/xattr.c linux-2.6.32.32/fs/xattr.c
12171 mnt_drop_write(f->f_path.mnt);
12172 }
12173 fput(f);
12174 -diff -urNp linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl32.c
12175 ---- linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:24:54.000000000 -0500
12176 -+++ linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:25:35.000000000 -0500
12177 +diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c
12178 +--- linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:24:54.000000000 -0500
12179 ++++ linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:25:35.000000000 -0500
12180 @@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
12181 xfs_fsop_geom_t fsgeo;
12182 int error;
12183 @@ -36925,9 +37048,9 @@ diff -urNp linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.32/fs/xfs
12184 error = xfs_fs_geometry(mp, &fsgeo, 3);
12185 if (error)
12186 return -error;
12187 -diff -urNp linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl.c
12188 ---- linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:24:54.000000000 -0500
12189 -+++ linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:25:35.000000000 -0500
12190 +diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c
12191 +--- linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:24:54.000000000 -0500
12192 ++++ linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:25:35.000000000 -0500
12193 @@ -134,7 +134,7 @@ xfs_find_handle(
12194 }
12195
12196 @@ -36962,9 +37085,9 @@ diff -urNp linux-2.6.32.32/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.32/fs/xfs/l
12197 error = xfs_fs_geometry(mp, &fsgeo, 4);
12198 if (error)
12199 return -error;
12200 -diff -urNp linux-2.6.32.32/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.32/fs/xfs/linux-2.6/xfs_iops.c
12201 ---- linux-2.6.32.32/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
12202 -+++ linux-2.6.32.32/fs/xfs/linux-2.6/xfs_iops.c 2010-12-31 14:46:53.000000000 -0500
12203 +diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c
12204 +--- linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
12205 ++++ linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c 2010-12-31 14:46:53.000000000 -0500
12206 @@ -468,7 +468,7 @@ xfs_vn_put_link(
12207 struct nameidata *nd,
12208 void *p)
12209 @@ -36974,9 +37097,9 @@ diff -urNp linux-2.6.32.32/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.32/fs/xfs/li
12210
12211 if (!IS_ERR(s))
12212 kfree(s);
12213 -diff -urNp linux-2.6.32.32/fs/xfs/xfs_bmap.c linux-2.6.32.32/fs/xfs/xfs_bmap.c
12214 ---- linux-2.6.32.32/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
12215 -+++ linux-2.6.32.32/fs/xfs/xfs_bmap.c 2010-12-31 14:46:53.000000000 -0500
12216 +diff -urNp linux-2.6.32.33/fs/xfs/xfs_bmap.c linux-2.6.32.33/fs/xfs/xfs_bmap.c
12217 +--- linux-2.6.32.33/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
12218 ++++ linux-2.6.32.33/fs/xfs/xfs_bmap.c 2010-12-31 14:46:53.000000000 -0500
12219 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
12220 int nmap,
12221 int ret_nmap);
12222 @@ -36986,9 +37109,9 @@ diff -urNp linux-2.6.32.32/fs/xfs/xfs_bmap.c linux-2.6.32.32/fs/xfs/xfs_bmap.c
12223 #endif /* DEBUG */
12224
12225 #if defined(XFS_RW_TRACE)
12226 -diff -urNp linux-2.6.32.32/grsecurity/gracl_alloc.c linux-2.6.32.32/grsecurity/gracl_alloc.c
12227 ---- linux-2.6.32.32/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
12228 -+++ linux-2.6.32.32/grsecurity/gracl_alloc.c 2010-12-31 14:46:53.000000000 -0500
12229 +diff -urNp linux-2.6.32.33/grsecurity/gracl_alloc.c linux-2.6.32.33/grsecurity/gracl_alloc.c
12230 +--- linux-2.6.32.33/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
12231 ++++ linux-2.6.32.33/grsecurity/gracl_alloc.c 2010-12-31 14:46:53.000000000 -0500
12232 @@ -0,0 +1,105 @@
12233 +#include <linux/kernel.h>
12234 +#include <linux/mm.h>
12235 @@ -37095,10 +37218,10 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_alloc.c linux-2.6.32.32/grsecurity/g
12236 + else
12237 + return 1;
12238 +}
12239 -diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12240 ---- linux-2.6.32.32/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
12241 -+++ linux-2.6.32.32/grsecurity/gracl.c 2011-01-16 22:45:08.000000000 -0500
12242 -@@ -0,0 +1,3986 @@
12243 +diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
12244 +--- linux-2.6.32.33/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
12245 ++++ linux-2.6.32.33/grsecurity/gracl.c 2011-03-18 17:54:25.000000000 -0400
12246 +@@ -0,0 +1,3990 @@
12247 +#include <linux/kernel.h>
12248 +#include <linux/module.h>
12249 +#include <linux/sched.h>
12250 @@ -37889,6 +38012,10 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12251 + real_root = dget(reaper->fs->root.dentry);
12252 + read_unlock(&reaper->fs->lock);
12253 +
12254 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
12255 ++ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", real_root->d_inode->i_sb->s_dev, real_root->d_inode->i_ino);
12256 ++#endif
12257 ++
12258 + fakefs_obj = acl_alloc(sizeof(struct acl_object_label));
12259 + if (fakefs_obj == NULL)
12260 + return 1;
12261 @@ -38529,7 +38656,7 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12262 + goto cleanup;
12263 + }
12264 + tmp[len-1] = '\0';
12265 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
12266 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
12267 + printk(KERN_ALERT "Copying special role %s\n", tmp);
12268 +#endif
12269 + sptmp->rolename = tmp;
12270 @@ -39494,7 +39621,7 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12271 + if (unlikely(obj->mode & GR_WRITE))
12272 + task->is_writable = 1;
12273 +
12274 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
12275 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
12276 + printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
12277 +#endif
12278 +
12279 @@ -39557,7 +39684,7 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12280 +
12281 + gr_set_proc_res(task);
12282 +
12283 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
12284 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
12285 + printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
12286 +#endif
12287 + return 0;
12288 @@ -39938,7 +40065,7 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12289 + if (unlikely(obj->mode & GR_WRITE))
12290 + tsk->is_writable = 1;
12291 +
12292 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
12293 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
12294 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
12295 +#endif
12296 +
12297 @@ -40340,7 +40467,7 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12298 +
12299 + gr_set_proc_res(task);
12300 +
12301 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
12302 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
12303 + printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
12304 +#endif
12305 + } else {
12306 @@ -41085,9 +41212,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl.c linux-2.6.32.32/grsecurity/gracl.c
12307 +EXPORT_SYMBOL(gr_check_group_change);
12308 +#endif
12309 +
12310 -diff -urNp linux-2.6.32.32/grsecurity/gracl_cap.c linux-2.6.32.32/grsecurity/gracl_cap.c
12311 ---- linux-2.6.32.32/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
12312 -+++ linux-2.6.32.32/grsecurity/gracl_cap.c 2010-12-31 14:46:53.000000000 -0500
12313 +diff -urNp linux-2.6.32.33/grsecurity/gracl_cap.c linux-2.6.32.33/grsecurity/gracl_cap.c
12314 +--- linux-2.6.32.33/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
12315 ++++ linux-2.6.32.33/grsecurity/gracl_cap.c 2010-12-31 14:46:53.000000000 -0500
12316 @@ -0,0 +1,138 @@
12317 +#include <linux/kernel.h>
12318 +#include <linux/module.h>
12319 @@ -41227,9 +41354,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_cap.c linux-2.6.32.32/grsecurity/gra
12320 + return 0;
12321 +}
12322 +
12323 -diff -urNp linux-2.6.32.32/grsecurity/gracl_fs.c linux-2.6.32.32/grsecurity/gracl_fs.c
12324 ---- linux-2.6.32.32/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
12325 -+++ linux-2.6.32.32/grsecurity/gracl_fs.c 2010-12-31 14:46:53.000000000 -0500
12326 +diff -urNp linux-2.6.32.33/grsecurity/gracl_fs.c linux-2.6.32.33/grsecurity/gracl_fs.c
12327 +--- linux-2.6.32.33/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
12328 ++++ linux-2.6.32.33/grsecurity/gracl_fs.c 2010-12-31 14:46:53.000000000 -0500
12329 @@ -0,0 +1,430 @@
12330 +#include <linux/kernel.h>
12331 +#include <linux/sched.h>
12332 @@ -41661,9 +41788,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_fs.c linux-2.6.32.32/grsecurity/grac
12333 +
12334 + return 0;
12335 +}
12336 -diff -urNp linux-2.6.32.32/grsecurity/gracl_ip.c linux-2.6.32.32/grsecurity/gracl_ip.c
12337 ---- linux-2.6.32.32/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
12338 -+++ linux-2.6.32.32/grsecurity/gracl_ip.c 2011-02-15 19:42:10.000000000 -0500
12339 +diff -urNp linux-2.6.32.33/grsecurity/gracl_ip.c linux-2.6.32.33/grsecurity/gracl_ip.c
12340 +--- linux-2.6.32.33/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
12341 ++++ linux-2.6.32.33/grsecurity/gracl_ip.c 2011-02-15 19:42:10.000000000 -0500
12342 @@ -0,0 +1,382 @@
12343 +#include <linux/kernel.h>
12344 +#include <asm/uaccess.h>
12345 @@ -42047,9 +42174,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_ip.c linux-2.6.32.32/grsecurity/grac
12346 +
12347 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
12348 +}
12349 -diff -urNp linux-2.6.32.32/grsecurity/gracl_learn.c linux-2.6.32.32/grsecurity/gracl_learn.c
12350 ---- linux-2.6.32.32/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
12351 -+++ linux-2.6.32.32/grsecurity/gracl_learn.c 2011-01-16 22:44:26.000000000 -0500
12352 +diff -urNp linux-2.6.32.33/grsecurity/gracl_learn.c linux-2.6.32.33/grsecurity/gracl_learn.c
12353 +--- linux-2.6.32.33/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
12354 ++++ linux-2.6.32.33/grsecurity/gracl_learn.c 2011-01-16 22:44:26.000000000 -0500
12355 @@ -0,0 +1,211 @@
12356 +#include <linux/kernel.h>
12357 +#include <linux/mm.h>
12358 @@ -42262,9 +42389,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_learn.c linux-2.6.32.32/grsecurity/g
12359 + .release = close_learn,
12360 + .poll = poll_learn,
12361 +};
12362 -diff -urNp linux-2.6.32.32/grsecurity/gracl_res.c linux-2.6.32.32/grsecurity/gracl_res.c
12363 ---- linux-2.6.32.32/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
12364 -+++ linux-2.6.32.32/grsecurity/gracl_res.c 2010-12-31 14:46:53.000000000 -0500
12365 +diff -urNp linux-2.6.32.33/grsecurity/gracl_res.c linux-2.6.32.33/grsecurity/gracl_res.c
12366 +--- linux-2.6.32.33/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
12367 ++++ linux-2.6.32.33/grsecurity/gracl_res.c 2010-12-31 14:46:53.000000000 -0500
12368 @@ -0,0 +1,67 @@
12369 +#include <linux/kernel.h>
12370 +#include <linux/sched.h>
12371 @@ -42333,9 +42460,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_res.c linux-2.6.32.32/grsecurity/gra
12372 + rcu_read_unlock();
12373 + return;
12374 +}
12375 -diff -urNp linux-2.6.32.32/grsecurity/gracl_segv.c linux-2.6.32.32/grsecurity/gracl_segv.c
12376 ---- linux-2.6.32.32/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
12377 -+++ linux-2.6.32.32/grsecurity/gracl_segv.c 2010-12-31 14:46:53.000000000 -0500
12378 +diff -urNp linux-2.6.32.33/grsecurity/gracl_segv.c linux-2.6.32.33/grsecurity/gracl_segv.c
12379 +--- linux-2.6.32.33/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
12380 ++++ linux-2.6.32.33/grsecurity/gracl_segv.c 2010-12-31 14:46:53.000000000 -0500
12381 @@ -0,0 +1,310 @@
12382 +#include <linux/kernel.h>
12383 +#include <linux/mm.h>
12384 @@ -42647,9 +42774,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_segv.c linux-2.6.32.32/grsecurity/gr
12385 +
12386 + return;
12387 +}
12388 -diff -urNp linux-2.6.32.32/grsecurity/gracl_shm.c linux-2.6.32.32/grsecurity/gracl_shm.c
12389 ---- linux-2.6.32.32/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
12390 -+++ linux-2.6.32.32/grsecurity/gracl_shm.c 2010-12-31 14:46:53.000000000 -0500
12391 +diff -urNp linux-2.6.32.33/grsecurity/gracl_shm.c linux-2.6.32.33/grsecurity/gracl_shm.c
12392 +--- linux-2.6.32.33/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
12393 ++++ linux-2.6.32.33/grsecurity/gracl_shm.c 2010-12-31 14:46:53.000000000 -0500
12394 @@ -0,0 +1,40 @@
12395 +#include <linux/kernel.h>
12396 +#include <linux/mm.h>
12397 @@ -42691,9 +42818,9 @@ diff -urNp linux-2.6.32.32/grsecurity/gracl_shm.c linux-2.6.32.32/grsecurity/gra
12398 +
12399 + return 1;
12400 +}
12401 -diff -urNp linux-2.6.32.32/grsecurity/grsec_chdir.c linux-2.6.32.32/grsecurity/grsec_chdir.c
12402 ---- linux-2.6.32.32/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
12403 -+++ linux-2.6.32.32/grsecurity/grsec_chdir.c 2010-12-31 14:46:53.000000000 -0500
12404 +diff -urNp linux-2.6.32.33/grsecurity/grsec_chdir.c linux-2.6.32.33/grsecurity/grsec_chdir.c
12405 +--- linux-2.6.32.33/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
12406 ++++ linux-2.6.32.33/grsecurity/grsec_chdir.c 2010-12-31 14:46:53.000000000 -0500
12407 @@ -0,0 +1,19 @@
12408 +#include <linux/kernel.h>
12409 +#include <linux/sched.h>
12410 @@ -42714,9 +42841,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_chdir.c linux-2.6.32.32/grsecurity/g
12411 +#endif
12412 + return;
12413 +}
12414 -diff -urNp linux-2.6.32.32/grsecurity/grsec_chroot.c linux-2.6.32.32/grsecurity/grsec_chroot.c
12415 ---- linux-2.6.32.32/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
12416 -+++ linux-2.6.32.32/grsecurity/grsec_chroot.c 2011-01-11 22:46:12.000000000 -0500
12417 +diff -urNp linux-2.6.32.33/grsecurity/grsec_chroot.c linux-2.6.32.33/grsecurity/grsec_chroot.c
12418 +--- linux-2.6.32.33/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
12419 ++++ linux-2.6.32.33/grsecurity/grsec_chroot.c 2011-01-11 22:46:12.000000000 -0500
12420 @@ -0,0 +1,390 @@
12421 +#include <linux/kernel.h>
12422 +#include <linux/module.h>
12423 @@ -43108,9 +43235,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_chroot.c linux-2.6.32.32/grsecurity/
12424 +#ifdef CONFIG_SECURITY
12425 +EXPORT_SYMBOL(gr_handle_chroot_caps);
12426 +#endif
12427 -diff -urNp linux-2.6.32.32/grsecurity/grsec_disabled.c linux-2.6.32.32/grsecurity/grsec_disabled.c
12428 ---- linux-2.6.32.32/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
12429 -+++ linux-2.6.32.32/grsecurity/grsec_disabled.c 2010-12-31 14:46:53.000000000 -0500
12430 +diff -urNp linux-2.6.32.33/grsecurity/grsec_disabled.c linux-2.6.32.33/grsecurity/grsec_disabled.c
12431 +--- linux-2.6.32.33/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
12432 ++++ linux-2.6.32.33/grsecurity/grsec_disabled.c 2010-12-31 14:46:53.000000000 -0500
12433 @@ -0,0 +1,442 @@
12434 +#include <linux/kernel.h>
12435 +#include <linux/module.h>
12436 @@ -43554,9 +43681,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_disabled.c linux-2.6.32.32/grsecurit
12437 +EXPORT_SYMBOL(gr_check_user_change);
12438 +EXPORT_SYMBOL(gr_check_group_change);
12439 +#endif
12440 -diff -urNp linux-2.6.32.32/grsecurity/grsec_exec.c linux-2.6.32.32/grsecurity/grsec_exec.c
12441 ---- linux-2.6.32.32/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
12442 -+++ linux-2.6.32.32/grsecurity/grsec_exec.c 2011-01-16 22:46:10.000000000 -0500
12443 +diff -urNp linux-2.6.32.33/grsecurity/grsec_exec.c linux-2.6.32.33/grsecurity/grsec_exec.c
12444 +--- linux-2.6.32.33/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
12445 ++++ linux-2.6.32.33/grsecurity/grsec_exec.c 2011-01-16 22:46:10.000000000 -0500
12446 @@ -0,0 +1,148 @@
12447 +#include <linux/kernel.h>
12448 +#include <linux/sched.h>
12449 @@ -43706,9 +43833,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_exec.c linux-2.6.32.32/grsecurity/gr
12450 + return;
12451 +}
12452 +#endif
12453 -diff -urNp linux-2.6.32.32/grsecurity/grsec_fifo.c linux-2.6.32.32/grsecurity/grsec_fifo.c
12454 ---- linux-2.6.32.32/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
12455 -+++ linux-2.6.32.32/grsecurity/grsec_fifo.c 2010-12-31 14:46:53.000000000 -0500
12456 +diff -urNp linux-2.6.32.33/grsecurity/grsec_fifo.c linux-2.6.32.33/grsecurity/grsec_fifo.c
12457 +--- linux-2.6.32.33/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
12458 ++++ linux-2.6.32.33/grsecurity/grsec_fifo.c 2010-12-31 14:46:53.000000000 -0500
12459 @@ -0,0 +1,24 @@
12460 +#include <linux/kernel.h>
12461 +#include <linux/sched.h>
12462 @@ -43734,9 +43861,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_fifo.c linux-2.6.32.32/grsecurity/gr
12463 +#endif
12464 + return 0;
12465 +}
12466 -diff -urNp linux-2.6.32.32/grsecurity/grsec_fork.c linux-2.6.32.32/grsecurity/grsec_fork.c
12467 ---- linux-2.6.32.32/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
12468 -+++ linux-2.6.32.32/grsecurity/grsec_fork.c 2010-12-31 14:46:53.000000000 -0500
12469 +diff -urNp linux-2.6.32.33/grsecurity/grsec_fork.c linux-2.6.32.33/grsecurity/grsec_fork.c
12470 +--- linux-2.6.32.33/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
12471 ++++ linux-2.6.32.33/grsecurity/grsec_fork.c 2010-12-31 14:46:53.000000000 -0500
12472 @@ -0,0 +1,23 @@
12473 +#include <linux/kernel.h>
12474 +#include <linux/sched.h>
12475 @@ -43761,9 +43888,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_fork.c linux-2.6.32.32/grsecurity/gr
12476 +#endif
12477 + return;
12478 +}
12479 -diff -urNp linux-2.6.32.32/grsecurity/grsec_init.c linux-2.6.32.32/grsecurity/grsec_init.c
12480 ---- linux-2.6.32.32/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
12481 -+++ linux-2.6.32.32/grsecurity/grsec_init.c 2010-12-31 14:46:53.000000000 -0500
12482 +diff -urNp linux-2.6.32.33/grsecurity/grsec_init.c linux-2.6.32.33/grsecurity/grsec_init.c
12483 +--- linux-2.6.32.33/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
12484 ++++ linux-2.6.32.33/grsecurity/grsec_init.c 2010-12-31 14:46:53.000000000 -0500
12485 @@ -0,0 +1,270 @@
12486 +#include <linux/kernel.h>
12487 +#include <linux/sched.h>
12488 @@ -44035,9 +44162,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_init.c linux-2.6.32.32/grsecurity/gr
12489 +
12490 + return;
12491 +}
12492 -diff -urNp linux-2.6.32.32/grsecurity/grsec_link.c linux-2.6.32.32/grsecurity/grsec_link.c
12493 ---- linux-2.6.32.32/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
12494 -+++ linux-2.6.32.32/grsecurity/grsec_link.c 2010-12-31 14:46:53.000000000 -0500
12495 +diff -urNp linux-2.6.32.33/grsecurity/grsec_link.c linux-2.6.32.33/grsecurity/grsec_link.c
12496 +--- linux-2.6.32.33/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
12497 ++++ linux-2.6.32.33/grsecurity/grsec_link.c 2010-12-31 14:46:53.000000000 -0500
12498 @@ -0,0 +1,43 @@
12499 +#include <linux/kernel.h>
12500 +#include <linux/sched.h>
12501 @@ -44082,9 +44209,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_link.c linux-2.6.32.32/grsecurity/gr
12502 +#endif
12503 + return 0;
12504 +}
12505 -diff -urNp linux-2.6.32.32/grsecurity/grsec_log.c linux-2.6.32.32/grsecurity/grsec_log.c
12506 ---- linux-2.6.32.32/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
12507 -+++ linux-2.6.32.32/grsecurity/grsec_log.c 2010-12-31 14:46:53.000000000 -0500
12508 +diff -urNp linux-2.6.32.33/grsecurity/grsec_log.c linux-2.6.32.33/grsecurity/grsec_log.c
12509 +--- linux-2.6.32.33/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
12510 ++++ linux-2.6.32.33/grsecurity/grsec_log.c 2010-12-31 14:46:53.000000000 -0500
12511 @@ -0,0 +1,310 @@
12512 +#include <linux/kernel.h>
12513 +#include <linux/sched.h>
12514 @@ -44396,9 +44523,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_log.c linux-2.6.32.32/grsecurity/grs
12515 + gr_log_end(audit);
12516 + END_LOCKS(audit);
12517 +}
12518 -diff -urNp linux-2.6.32.32/grsecurity/grsec_mem.c linux-2.6.32.32/grsecurity/grsec_mem.c
12519 ---- linux-2.6.32.32/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
12520 -+++ linux-2.6.32.32/grsecurity/grsec_mem.c 2010-12-31 14:46:53.000000000 -0500
12521 +diff -urNp linux-2.6.32.33/grsecurity/grsec_mem.c linux-2.6.32.33/grsecurity/grsec_mem.c
12522 +--- linux-2.6.32.33/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
12523 ++++ linux-2.6.32.33/grsecurity/grsec_mem.c 2010-12-31 14:46:53.000000000 -0500
12524 @@ -0,0 +1,85 @@
12525 +#include <linux/kernel.h>
12526 +#include <linux/sched.h>
12527 @@ -44485,9 +44612,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_mem.c linux-2.6.32.32/grsecurity/grs
12528 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
12529 + return;
12530 +}
12531 -diff -urNp linux-2.6.32.32/grsecurity/grsec_mount.c linux-2.6.32.32/grsecurity/grsec_mount.c
12532 ---- linux-2.6.32.32/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
12533 -+++ linux-2.6.32.32/grsecurity/grsec_mount.c 2010-12-31 14:46:53.000000000 -0500
12534 +diff -urNp linux-2.6.32.33/grsecurity/grsec_mount.c linux-2.6.32.33/grsecurity/grsec_mount.c
12535 +--- linux-2.6.32.33/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
12536 ++++ linux-2.6.32.33/grsecurity/grsec_mount.c 2010-12-31 14:46:53.000000000 -0500
12537 @@ -0,0 +1,62 @@
12538 +#include <linux/kernel.h>
12539 +#include <linux/sched.h>
12540 @@ -44551,9 +44678,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_mount.c linux-2.6.32.32/grsecurity/g
12541 +#endif
12542 + return 0;
12543 +}
12544 -diff -urNp linux-2.6.32.32/grsecurity/grsec_pax.c linux-2.6.32.32/grsecurity/grsec_pax.c
12545 ---- linux-2.6.32.32/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
12546 -+++ linux-2.6.32.32/grsecurity/grsec_pax.c 2010-12-31 14:46:53.000000000 -0500
12547 +diff -urNp linux-2.6.32.33/grsecurity/grsec_pax.c linux-2.6.32.33/grsecurity/grsec_pax.c
12548 +--- linux-2.6.32.33/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
12549 ++++ linux-2.6.32.33/grsecurity/grsec_pax.c 2010-12-31 14:46:53.000000000 -0500
12550 @@ -0,0 +1,36 @@
12551 +#include <linux/kernel.h>
12552 +#include <linux/sched.h>
12553 @@ -44591,9 +44718,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_pax.c linux-2.6.32.32/grsecurity/grs
12554 +#endif
12555 + return;
12556 +}
12557 -diff -urNp linux-2.6.32.32/grsecurity/grsec_ptrace.c linux-2.6.32.32/grsecurity/grsec_ptrace.c
12558 ---- linux-2.6.32.32/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
12559 -+++ linux-2.6.32.32/grsecurity/grsec_ptrace.c 2010-12-31 14:46:53.000000000 -0500
12560 +diff -urNp linux-2.6.32.33/grsecurity/grsec_ptrace.c linux-2.6.32.33/grsecurity/grsec_ptrace.c
12561 +--- linux-2.6.32.33/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
12562 ++++ linux-2.6.32.33/grsecurity/grsec_ptrace.c 2010-12-31 14:46:53.000000000 -0500
12563 @@ -0,0 +1,14 @@
12564 +#include <linux/kernel.h>
12565 +#include <linux/sched.h>
12566 @@ -44609,9 +44736,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_ptrace.c linux-2.6.32.32/grsecurity/
12567 +#endif
12568 + return;
12569 +}
12570 -diff -urNp linux-2.6.32.32/grsecurity/grsec_sig.c linux-2.6.32.32/grsecurity/grsec_sig.c
12571 ---- linux-2.6.32.32/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
12572 -+++ linux-2.6.32.32/grsecurity/grsec_sig.c 2010-12-31 14:46:53.000000000 -0500
12573 +diff -urNp linux-2.6.32.33/grsecurity/grsec_sig.c linux-2.6.32.33/grsecurity/grsec_sig.c
12574 +--- linux-2.6.32.33/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
12575 ++++ linux-2.6.32.33/grsecurity/grsec_sig.c 2010-12-31 14:46:53.000000000 -0500
12576 @@ -0,0 +1,65 @@
12577 +#include <linux/kernel.h>
12578 +#include <linux/sched.h>
12579 @@ -44678,9 +44805,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_sig.c linux-2.6.32.32/grsecurity/grs
12580 + return;
12581 +}
12582 +
12583 -diff -urNp linux-2.6.32.32/grsecurity/grsec_sock.c linux-2.6.32.32/grsecurity/grsec_sock.c
12584 ---- linux-2.6.32.32/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
12585 -+++ linux-2.6.32.32/grsecurity/grsec_sock.c 2010-12-31 14:46:53.000000000 -0500
12586 +diff -urNp linux-2.6.32.33/grsecurity/grsec_sock.c linux-2.6.32.33/grsecurity/grsec_sock.c
12587 +--- linux-2.6.32.33/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
12588 ++++ linux-2.6.32.33/grsecurity/grsec_sock.c 2010-12-31 14:46:53.000000000 -0500
12589 @@ -0,0 +1,275 @@
12590 +#include <linux/kernel.h>
12591 +#include <linux/module.h>
12592 @@ -44957,9 +45084,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_sock.c linux-2.6.32.32/grsecurity/gr
12593 + return current_cap();
12594 +#endif
12595 +}
12596 -diff -urNp linux-2.6.32.32/grsecurity/grsec_sysctl.c linux-2.6.32.32/grsecurity/grsec_sysctl.c
12597 ---- linux-2.6.32.32/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
12598 -+++ linux-2.6.32.32/grsecurity/grsec_sysctl.c 2010-12-31 14:46:53.000000000 -0500
12599 +diff -urNp linux-2.6.32.33/grsecurity/grsec_sysctl.c linux-2.6.32.33/grsecurity/grsec_sysctl.c
12600 +--- linux-2.6.32.33/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
12601 ++++ linux-2.6.32.33/grsecurity/grsec_sysctl.c 2010-12-31 14:46:53.000000000 -0500
12602 @@ -0,0 +1,479 @@
12603 +#include <linux/kernel.h>
12604 +#include <linux/sched.h>
12605 @@ -45440,9 +45567,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_sysctl.c linux-2.6.32.32/grsecurity/
12606 + { .ctl_name = 0 }
12607 +};
12608 +#endif
12609 -diff -urNp linux-2.6.32.32/grsecurity/grsec_time.c linux-2.6.32.32/grsecurity/grsec_time.c
12610 ---- linux-2.6.32.32/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
12611 -+++ linux-2.6.32.32/grsecurity/grsec_time.c 2011-01-05 19:57:32.000000000 -0500
12612 +diff -urNp linux-2.6.32.33/grsecurity/grsec_time.c linux-2.6.32.33/grsecurity/grsec_time.c
12613 +--- linux-2.6.32.33/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
12614 ++++ linux-2.6.32.33/grsecurity/grsec_time.c 2011-01-05 19:57:32.000000000 -0500
12615 @@ -0,0 +1,16 @@
12616 +#include <linux/kernel.h>
12617 +#include <linux/sched.h>
12618 @@ -45460,9 +45587,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_time.c linux-2.6.32.32/grsecurity/gr
12619 +}
12620 +
12621 +EXPORT_SYMBOL(gr_log_timechange);
12622 -diff -urNp linux-2.6.32.32/grsecurity/grsec_tpe.c linux-2.6.32.32/grsecurity/grsec_tpe.c
12623 ---- linux-2.6.32.32/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
12624 -+++ linux-2.6.32.32/grsecurity/grsec_tpe.c 2010-12-31 14:46:53.000000000 -0500
12625 +diff -urNp linux-2.6.32.33/grsecurity/grsec_tpe.c linux-2.6.32.33/grsecurity/grsec_tpe.c
12626 +--- linux-2.6.32.33/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
12627 ++++ linux-2.6.32.33/grsecurity/grsec_tpe.c 2010-12-31 14:46:53.000000000 -0500
12628 @@ -0,0 +1,39 @@
12629 +#include <linux/kernel.h>
12630 +#include <linux/sched.h>
12631 @@ -45503,9 +45630,9 @@ diff -urNp linux-2.6.32.32/grsecurity/grsec_tpe.c linux-2.6.32.32/grsecurity/grs
12632 +#endif
12633 + return 1;
12634 +}
12635 -diff -urNp linux-2.6.32.32/grsecurity/grsum.c linux-2.6.32.32/grsecurity/grsum.c
12636 ---- linux-2.6.32.32/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
12637 -+++ linux-2.6.32.32/grsecurity/grsum.c 2010-12-31 14:46:53.000000000 -0500
12638 +diff -urNp linux-2.6.32.33/grsecurity/grsum.c linux-2.6.32.33/grsecurity/grsum.c
12639 +--- linux-2.6.32.33/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
12640 ++++ linux-2.6.32.33/grsecurity/grsum.c 2010-12-31 14:46:53.000000000 -0500
12641 @@ -0,0 +1,61 @@
12642 +#include <linux/err.h>
12643 +#include <linux/kernel.h>
12644 @@ -45568,10 +45695,10 @@ diff -urNp linux-2.6.32.32/grsecurity/grsum.c linux-2.6.32.32/grsecurity/grsum.c
12645 +
12646 + return retval;
12647 +}
12648 -diff -urNp linux-2.6.32.32/grsecurity/Kconfig linux-2.6.32.32/grsecurity/Kconfig
12649 ---- linux-2.6.32.32/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
12650 -+++ linux-2.6.32.32/grsecurity/Kconfig 2011-03-11 19:17:05.000000000 -0500
12651 -@@ -0,0 +1,1017 @@
12652 +diff -urNp linux-2.6.32.33/grsecurity/Kconfig linux-2.6.32.33/grsecurity/Kconfig
12653 +--- linux-2.6.32.33/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
12654 ++++ linux-2.6.32.33/grsecurity/Kconfig 2011-03-21 17:09:41.000000000 -0400
12655 +@@ -0,0 +1,1021 @@
12656 +#
12657 +# grecurity configuration
12658 +#
12659 @@ -45908,6 +46035,10 @@ diff -urNp linux-2.6.32.32/grsecurity/Kconfig linux-2.6.32.32/grsecurity/Kconfig
12660 +menu "Role Based Access Control Options"
12661 +depends on GRKERNSEC
12662 +
12663 ++config GRKERNSEC_RBAC_DEBUG
12664 ++ bool
12665 ++ default n
12666 ++
12667 +config GRKERNSEC_NO_RBAC
12668 + bool "Disable RBAC system"
12669 + help
12670 @@ -46589,9 +46720,9 @@ diff -urNp linux-2.6.32.32/grsecurity/Kconfig linux-2.6.32.32/grsecurity/Kconfig
12671 +endmenu
12672 +
12673 +endmenu
12674 -diff -urNp linux-2.6.32.32/grsecurity/Makefile linux-2.6.32.32/grsecurity/Makefile
12675 ---- linux-2.6.32.32/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
12676 -+++ linux-2.6.32.32/grsecurity/Makefile 2010-12-31 14:46:53.000000000 -0500
12677 +diff -urNp linux-2.6.32.33/grsecurity/Makefile linux-2.6.32.33/grsecurity/Makefile
12678 +--- linux-2.6.32.33/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
12679 ++++ linux-2.6.32.33/grsecurity/Makefile 2010-12-31 14:46:53.000000000 -0500
12680 @@ -0,0 +1,29 @@
12681 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
12682 +# during 2001-2009 it has been completely redesigned by Brad Spengler
12683 @@ -46622,9 +46753,9 @@ diff -urNp linux-2.6.32.32/grsecurity/Makefile linux-2.6.32.32/grsecurity/Makefi
12684 + @-chmod -f 700 .
12685 + @echo ' grsec: protected kernel image paths'
12686 +endif
12687 -diff -urNp linux-2.6.32.32/include/acpi/acoutput.h linux-2.6.32.32/include/acpi/acoutput.h
12688 ---- linux-2.6.32.32/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
12689 -+++ linux-2.6.32.32/include/acpi/acoutput.h 2010-12-31 14:46:53.000000000 -0500
12690 +diff -urNp linux-2.6.32.33/include/acpi/acoutput.h linux-2.6.32.33/include/acpi/acoutput.h
12691 +--- linux-2.6.32.33/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
12692 ++++ linux-2.6.32.33/include/acpi/acoutput.h 2010-12-31 14:46:53.000000000 -0500
12693 @@ -264,8 +264,8 @@
12694 * leaving no executable debug code!
12695 */
12696 @@ -46636,9 +46767,9 @@ diff -urNp linux-2.6.32.32/include/acpi/acoutput.h linux-2.6.32.32/include/acpi/
12697
12698 #endif /* ACPI_DEBUG_OUTPUT */
12699
12700 -diff -urNp linux-2.6.32.32/include/acpi/acpi_drivers.h linux-2.6.32.32/include/acpi/acpi_drivers.h
12701 ---- linux-2.6.32.32/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
12702 -+++ linux-2.6.32.32/include/acpi/acpi_drivers.h 2010-12-31 14:46:53.000000000 -0500
12703 +diff -urNp linux-2.6.32.33/include/acpi/acpi_drivers.h linux-2.6.32.33/include/acpi/acpi_drivers.h
12704 +--- linux-2.6.32.33/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
12705 ++++ linux-2.6.32.33/include/acpi/acpi_drivers.h 2010-12-31 14:46:53.000000000 -0500
12706 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
12707 Dock Station
12708 -------------------------------------------------------------------------- */
12709 @@ -46668,9 +46799,9 @@ diff -urNp linux-2.6.32.32/include/acpi/acpi_drivers.h linux-2.6.32.32/include/a
12710 void *context)
12711 {
12712 return -ENODEV;
12713 -diff -urNp linux-2.6.32.32/include/asm-generic/atomic-long.h linux-2.6.32.32/include/asm-generic/atomic-long.h
12714 ---- linux-2.6.32.32/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
12715 -+++ linux-2.6.32.32/include/asm-generic/atomic-long.h 2010-12-31 14:46:53.000000000 -0500
12716 +diff -urNp linux-2.6.32.33/include/asm-generic/atomic-long.h linux-2.6.32.33/include/asm-generic/atomic-long.h
12717 +--- linux-2.6.32.33/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
12718 ++++ linux-2.6.32.33/include/asm-generic/atomic-long.h 2010-12-31 14:46:53.000000000 -0500
12719 @@ -22,6 +22,12 @@
12720
12721 typedef atomic64_t atomic_long_t;
12722 @@ -46927,9 +47058,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/atomic-long.h linux-2.6.32.32/inc
12723 +#endif
12724 +
12725 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
12726 -diff -urNp linux-2.6.32.32/include/asm-generic/dma-mapping-common.h linux-2.6.32.32/include/asm-generic/dma-mapping-common.h
12727 ---- linux-2.6.32.32/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
12728 -+++ linux-2.6.32.32/include/asm-generic/dma-mapping-common.h 2010-12-31 14:46:53.000000000 -0500
12729 +diff -urNp linux-2.6.32.33/include/asm-generic/dma-mapping-common.h linux-2.6.32.33/include/asm-generic/dma-mapping-common.h
12730 +--- linux-2.6.32.33/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
12731 ++++ linux-2.6.32.33/include/asm-generic/dma-mapping-common.h 2010-12-31 14:46:53.000000000 -0500
12732 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
12733 enum dma_data_direction dir,
12734 struct dma_attrs *attrs)
12735 @@ -47038,9 +47169,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/dma-mapping-common.h linux-2.6.32
12736
12737 BUG_ON(!valid_dma_direction(dir));
12738 if (ops->sync_sg_for_device)
12739 -diff -urNp linux-2.6.32.32/include/asm-generic/futex.h linux-2.6.32.32/include/asm-generic/futex.h
12740 ---- linux-2.6.32.32/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
12741 -+++ linux-2.6.32.32/include/asm-generic/futex.h 2010-12-31 14:46:53.000000000 -0500
12742 +diff -urNp linux-2.6.32.33/include/asm-generic/futex.h linux-2.6.32.33/include/asm-generic/futex.h
12743 +--- linux-2.6.32.33/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
12744 ++++ linux-2.6.32.33/include/asm-generic/futex.h 2010-12-31 14:46:53.000000000 -0500
12745 @@ -6,7 +6,7 @@
12746 #include <asm/errno.h>
12747
12748 @@ -47059,9 +47190,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/futex.h linux-2.6.32.32/include/a
12749 {
12750 return -ENOSYS;
12751 }
12752 -diff -urNp linux-2.6.32.32/include/asm-generic/int-l64.h linux-2.6.32.32/include/asm-generic/int-l64.h
12753 ---- linux-2.6.32.32/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
12754 -+++ linux-2.6.32.32/include/asm-generic/int-l64.h 2010-12-31 14:46:53.000000000 -0500
12755 +diff -urNp linux-2.6.32.33/include/asm-generic/int-l64.h linux-2.6.32.33/include/asm-generic/int-l64.h
12756 +--- linux-2.6.32.33/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
12757 ++++ linux-2.6.32.33/include/asm-generic/int-l64.h 2010-12-31 14:46:53.000000000 -0500
12758 @@ -46,6 +46,8 @@ typedef unsigned int u32;
12759 typedef signed long s64;
12760 typedef unsigned long u64;
12761 @@ -47071,9 +47202,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/int-l64.h linux-2.6.32.32/include
12762 #define S8_C(x) x
12763 #define U8_C(x) x ## U
12764 #define S16_C(x) x
12765 -diff -urNp linux-2.6.32.32/include/asm-generic/int-ll64.h linux-2.6.32.32/include/asm-generic/int-ll64.h
12766 ---- linux-2.6.32.32/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
12767 -+++ linux-2.6.32.32/include/asm-generic/int-ll64.h 2010-12-31 14:46:53.000000000 -0500
12768 +diff -urNp linux-2.6.32.33/include/asm-generic/int-ll64.h linux-2.6.32.33/include/asm-generic/int-ll64.h
12769 +--- linux-2.6.32.33/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
12770 ++++ linux-2.6.32.33/include/asm-generic/int-ll64.h 2010-12-31 14:46:53.000000000 -0500
12771 @@ -51,6 +51,8 @@ typedef unsigned int u32;
12772 typedef signed long long s64;
12773 typedef unsigned long long u64;
12774 @@ -47083,9 +47214,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/int-ll64.h linux-2.6.32.32/includ
12775 #define S8_C(x) x
12776 #define U8_C(x) x ## U
12777 #define S16_C(x) x
12778 -diff -urNp linux-2.6.32.32/include/asm-generic/kmap_types.h linux-2.6.32.32/include/asm-generic/kmap_types.h
12779 ---- linux-2.6.32.32/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
12780 -+++ linux-2.6.32.32/include/asm-generic/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
12781 +diff -urNp linux-2.6.32.33/include/asm-generic/kmap_types.h linux-2.6.32.33/include/asm-generic/kmap_types.h
12782 +--- linux-2.6.32.33/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
12783 ++++ linux-2.6.32.33/include/asm-generic/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
12784 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
12785 KMAP_D(16) KM_IRQ_PTE,
12786 KMAP_D(17) KM_NMI,
12787 @@ -47096,9 +47227,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/kmap_types.h linux-2.6.32.32/incl
12788 };
12789
12790 #undef KMAP_D
12791 -diff -urNp linux-2.6.32.32/include/asm-generic/pgtable.h linux-2.6.32.32/include/asm-generic/pgtable.h
12792 ---- linux-2.6.32.32/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
12793 -+++ linux-2.6.32.32/include/asm-generic/pgtable.h 2010-12-31 14:46:53.000000000 -0500
12794 +diff -urNp linux-2.6.32.33/include/asm-generic/pgtable.h linux-2.6.32.33/include/asm-generic/pgtable.h
12795 +--- linux-2.6.32.33/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
12796 ++++ linux-2.6.32.33/include/asm-generic/pgtable.h 2010-12-31 14:46:53.000000000 -0500
12797 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
12798 unsigned long size);
12799 #endif
12800 @@ -47114,9 +47245,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/pgtable.h linux-2.6.32.32/include
12801 #endif /* !__ASSEMBLY__ */
12802
12803 #endif /* _ASM_GENERIC_PGTABLE_H */
12804 -diff -urNp linux-2.6.32.32/include/asm-generic/pgtable-nopmd.h linux-2.6.32.32/include/asm-generic/pgtable-nopmd.h
12805 ---- linux-2.6.32.32/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
12806 -+++ linux-2.6.32.32/include/asm-generic/pgtable-nopmd.h 2010-12-31 14:46:53.000000000 -0500
12807 +diff -urNp linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h
12808 +--- linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
12809 ++++ linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h 2010-12-31 14:46:53.000000000 -0500
12810 @@ -1,14 +1,19 @@
12811 #ifndef _PGTABLE_NOPMD_H
12812 #define _PGTABLE_NOPMD_H
12813 @@ -47153,9 +47284,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/pgtable-nopmd.h linux-2.6.32.32/i
12814 /*
12815 * The "pud_xxx()" functions here are trivial for a folded two-level
12816 * setup: the pmd is never bad, and a pmd always exists (as it's folded
12817 -diff -urNp linux-2.6.32.32/include/asm-generic/pgtable-nopud.h linux-2.6.32.32/include/asm-generic/pgtable-nopud.h
12818 ---- linux-2.6.32.32/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
12819 -+++ linux-2.6.32.32/include/asm-generic/pgtable-nopud.h 2010-12-31 14:46:53.000000000 -0500
12820 +diff -urNp linux-2.6.32.33/include/asm-generic/pgtable-nopud.h linux-2.6.32.33/include/asm-generic/pgtable-nopud.h
12821 +--- linux-2.6.32.33/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
12822 ++++ linux-2.6.32.33/include/asm-generic/pgtable-nopud.h 2010-12-31 14:46:53.000000000 -0500
12823 @@ -1,10 +1,15 @@
12824 #ifndef _PGTABLE_NOPUD_H
12825 #define _PGTABLE_NOPUD_H
12826 @@ -47186,9 +47317,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/pgtable-nopud.h linux-2.6.32.32/i
12827 /*
12828 * The "pgd_xxx()" functions here are trivial for a folded two-level
12829 * setup: the pud is never bad, and a pud always exists (as it's folded
12830 -diff -urNp linux-2.6.32.32/include/asm-generic/vmlinux.lds.h linux-2.6.32.32/include/asm-generic/vmlinux.lds.h
12831 ---- linux-2.6.32.32/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
12832 -+++ linux-2.6.32.32/include/asm-generic/vmlinux.lds.h 2010-12-31 14:46:53.000000000 -0500
12833 +diff -urNp linux-2.6.32.33/include/asm-generic/vmlinux.lds.h linux-2.6.32.33/include/asm-generic/vmlinux.lds.h
12834 +--- linux-2.6.32.33/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
12835 ++++ linux-2.6.32.33/include/asm-generic/vmlinux.lds.h 2010-12-31 14:46:53.000000000 -0500
12836 @@ -199,6 +199,7 @@
12837 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
12838 VMLINUX_SYMBOL(__start_rodata) = .; \
12839 @@ -47227,9 +47358,9 @@ diff -urNp linux-2.6.32.32/include/asm-generic/vmlinux.lds.h linux-2.6.32.32/inc
12840
12841 /**
12842 * PERCPU - define output section for percpu area, simple version
12843 -diff -urNp linux-2.6.32.32/include/drm/drm_pciids.h linux-2.6.32.32/include/drm/drm_pciids.h
12844 ---- linux-2.6.32.32/include/drm/drm_pciids.h 2011-02-22 15:56:54.000000000 -0500
12845 -+++ linux-2.6.32.32/include/drm/drm_pciids.h 2011-02-22 15:57:24.000000000 -0500
12846 +diff -urNp linux-2.6.32.33/include/drm/drm_pciids.h linux-2.6.32.33/include/drm/drm_pciids.h
12847 +--- linux-2.6.32.33/include/drm/drm_pciids.h 2011-02-22 15:56:54.000000000 -0500
12848 ++++ linux-2.6.32.33/include/drm/drm_pciids.h 2011-02-22 15:57:24.000000000 -0500
12849 @@ -376,7 +376,7 @@
12850 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
12851 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
12852 @@ -47333,9 +47464,9 @@ diff -urNp linux-2.6.32.32/include/drm/drm_pciids.h linux-2.6.32.32/include/drm/
12853 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
12854 - {0, 0, 0}
12855 + {0, 0, 0, 0, 0, 0}
12856 -diff -urNp linux-2.6.32.32/include/drm/drmP.h linux-2.6.32.32/include/drm/drmP.h
12857 ---- linux-2.6.32.32/include/drm/drmP.h 2011-03-11 17:56:47.000000000 -0500
12858 -+++ linux-2.6.32.32/include/drm/drmP.h 2011-03-11 18:01:11.000000000 -0500
12859 +diff -urNp linux-2.6.32.33/include/drm/drmP.h linux-2.6.32.33/include/drm/drmP.h
12860 +--- linux-2.6.32.33/include/drm/drmP.h 2011-03-11 17:56:47.000000000 -0500
12861 ++++ linux-2.6.32.33/include/drm/drmP.h 2011-03-11 18:01:11.000000000 -0500
12862 @@ -71,6 +71,7 @@
12863 #include <linux/workqueue.h>
12864 #include <linux/poll.h>
12865 @@ -47395,9 +47526,9 @@ diff -urNp linux-2.6.32.32/include/drm/drmP.h linux-2.6.32.32/include/drm/drmP.h
12866 uint32_t gtt_total;
12867 uint32_t invalidate_domains; /* domains pending invalidation */
12868 uint32_t flush_domains; /* domains pending flush */
12869 -diff -urNp linux-2.6.32.32/include/linux/a.out.h linux-2.6.32.32/include/linux/a.out.h
12870 ---- linux-2.6.32.32/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
12871 -+++ linux-2.6.32.32/include/linux/a.out.h 2010-12-31 14:46:53.000000000 -0500
12872 +diff -urNp linux-2.6.32.33/include/linux/a.out.h linux-2.6.32.33/include/linux/a.out.h
12873 +--- linux-2.6.32.33/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
12874 ++++ linux-2.6.32.33/include/linux/a.out.h 2010-12-31 14:46:53.000000000 -0500
12875 @@ -39,6 +39,14 @@ enum machine_type {
12876 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
12877 };
12878 @@ -47413,9 +47544,9 @@ diff -urNp linux-2.6.32.32/include/linux/a.out.h linux-2.6.32.32/include/linux/a
12879 #if !defined (N_MAGIC)
12880 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
12881 #endif
12882 -diff -urNp linux-2.6.32.32/include/linux/atmdev.h linux-2.6.32.32/include/linux/atmdev.h
12883 ---- linux-2.6.32.32/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
12884 -+++ linux-2.6.32.32/include/linux/atmdev.h 2010-12-31 14:46:53.000000000 -0500
12885 +diff -urNp linux-2.6.32.33/include/linux/atmdev.h linux-2.6.32.33/include/linux/atmdev.h
12886 +--- linux-2.6.32.33/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
12887 ++++ linux-2.6.32.33/include/linux/atmdev.h 2010-12-31 14:46:53.000000000 -0500
12888 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
12889 #endif
12890
12891 @@ -47425,9 +47556,9 @@ diff -urNp linux-2.6.32.32/include/linux/atmdev.h linux-2.6.32.32/include/linux/
12892 __AAL_STAT_ITEMS
12893 #undef __HANDLE_ITEM
12894 };
12895 -diff -urNp linux-2.6.32.32/include/linux/backlight.h linux-2.6.32.32/include/linux/backlight.h
12896 ---- linux-2.6.32.32/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
12897 -+++ linux-2.6.32.32/include/linux/backlight.h 2010-12-31 14:46:53.000000000 -0500
12898 +diff -urNp linux-2.6.32.33/include/linux/backlight.h linux-2.6.32.33/include/linux/backlight.h
12899 +--- linux-2.6.32.33/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
12900 ++++ linux-2.6.32.33/include/linux/backlight.h 2010-12-31 14:46:53.000000000 -0500
12901 @@ -36,18 +36,18 @@ struct backlight_device;
12902 struct fb_info;
12903
12904 @@ -47469,9 +47600,9 @@ diff -urNp linux-2.6.32.32/include/linux/backlight.h linux-2.6.32.32/include/lin
12905 extern void backlight_device_unregister(struct backlight_device *bd);
12906 extern void backlight_force_update(struct backlight_device *bd,
12907 enum backlight_update_reason reason);
12908 -diff -urNp linux-2.6.32.32/include/linux/binfmts.h linux-2.6.32.32/include/linux/binfmts.h
12909 ---- linux-2.6.32.32/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
12910 -+++ linux-2.6.32.32/include/linux/binfmts.h 2010-12-31 14:46:53.000000000 -0500
12911 +diff -urNp linux-2.6.32.33/include/linux/binfmts.h linux-2.6.32.33/include/linux/binfmts.h
12912 +--- linux-2.6.32.33/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
12913 ++++ linux-2.6.32.33/include/linux/binfmts.h 2010-12-31 14:46:53.000000000 -0500
12914 @@ -29,6 +29,7 @@ struct linux_binprm{
12915 char buf[BINPRM_BUF_SIZE];
12916 #ifdef CONFIG_MMU
12917 @@ -47499,9 +47630,9 @@ diff -urNp linux-2.6.32.32/include/linux/binfmts.h linux-2.6.32.32/include/linux
12918 unsigned long min_coredump; /* minimal dump size */
12919 int hasvdso;
12920 };
12921 -diff -urNp linux-2.6.32.32/include/linux/blkdev.h linux-2.6.32.32/include/linux/blkdev.h
12922 ---- linux-2.6.32.32/include/linux/blkdev.h 2011-01-11 23:55:35.000000000 -0500
12923 -+++ linux-2.6.32.32/include/linux/blkdev.h 2011-01-11 23:56:03.000000000 -0500
12924 +diff -urNp linux-2.6.32.33/include/linux/blkdev.h linux-2.6.32.33/include/linux/blkdev.h
12925 +--- linux-2.6.32.33/include/linux/blkdev.h 2011-01-11 23:55:35.000000000 -0500
12926 ++++ linux-2.6.32.33/include/linux/blkdev.h 2011-01-11 23:56:03.000000000 -0500
12927 @@ -1265,19 +1265,19 @@ static inline int blk_integrity_rq(struc
12928 #endif /* CONFIG_BLK_DEV_INTEGRITY */
12929
12930 @@ -47533,9 +47664,9 @@ diff -urNp linux-2.6.32.32/include/linux/blkdev.h linux-2.6.32.32/include/linux/
12931 };
12932
12933 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
12934 -diff -urNp linux-2.6.32.32/include/linux/byteorder/little_endian.h linux-2.6.32.32/include/linux/byteorder/little_endian.h
12935 ---- linux-2.6.32.32/include/linux/byteorder/little_endian.h 2010-08-13 16:24:37.000000000 -0400
12936 -+++ linux-2.6.32.32/include/linux/byteorder/little_endian.h 2010-12-31 14:46:53.000000000 -0500
12937 +diff -urNp linux-2.6.32.33/include/linux/byteorder/little_endian.h linux-2.6.32.33/include/linux/byteorder/little_endian.h
12938 +--- linux-2.6.32.33/include/linux/byteorder/little_endian.h 2010-08-13 16:24:37.000000000 -0400
12939 ++++ linux-2.6.32.33/include/linux/byteorder/little_endian.h 2010-12-31 14:46:53.000000000 -0500
12940 @@ -42,51 +42,51 @@
12941
12942 static inline __le64 __cpu_to_le64p(const __u64 *p)
12943 @@ -47600,9 +47731,9 @@ diff -urNp linux-2.6.32.32/include/linux/byteorder/little_endian.h linux-2.6.32.
12944 }
12945 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
12946 #define __le64_to_cpus(x) do { (void)(x); } while (0)
12947 -diff -urNp linux-2.6.32.32/include/linux/cache.h linux-2.6.32.32/include/linux/cache.h
12948 ---- linux-2.6.32.32/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
12949 -+++ linux-2.6.32.32/include/linux/cache.h 2010-12-31 14:46:53.000000000 -0500
12950 +diff -urNp linux-2.6.32.33/include/linux/cache.h linux-2.6.32.33/include/linux/cache.h
12951 +--- linux-2.6.32.33/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
12952 ++++ linux-2.6.32.33/include/linux/cache.h 2010-12-31 14:46:53.000000000 -0500
12953 @@ -16,6 +16,10 @@
12954 #define __read_mostly
12955 #endif
12956 @@ -47614,9 +47745,9 @@ diff -urNp linux-2.6.32.32/include/linux/cache.h linux-2.6.32.32/include/linux/c
12957 #ifndef ____cacheline_aligned
12958 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
12959 #endif
12960 -diff -urNp linux-2.6.32.32/include/linux/capability.h linux-2.6.32.32/include/linux/capability.h
12961 ---- linux-2.6.32.32/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
12962 -+++ linux-2.6.32.32/include/linux/capability.h 2010-12-31 14:46:53.000000000 -0500
12963 +diff -urNp linux-2.6.32.33/include/linux/capability.h linux-2.6.32.33/include/linux/capability.h
12964 +--- linux-2.6.32.33/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
12965 ++++ linux-2.6.32.33/include/linux/capability.h 2010-12-31 14:46:53.000000000 -0500
12966 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
12967 (security_real_capable_noaudit((t), (cap)) == 0)
12968
12969 @@ -47625,9 +47756,9 @@ diff -urNp linux-2.6.32.32/include/linux/capability.h linux-2.6.32.32/include/li
12970
12971 /* audit system wants to get cap info from files as well */
12972 struct dentry;
12973 -diff -urNp linux-2.6.32.32/include/linux/compiler-gcc4.h linux-2.6.32.32/include/linux/compiler-gcc4.h
12974 ---- linux-2.6.32.32/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
12975 -+++ linux-2.6.32.32/include/linux/compiler-gcc4.h 2010-12-31 14:46:53.000000000 -0500
12976 +diff -urNp linux-2.6.32.33/include/linux/compiler-gcc4.h linux-2.6.32.33/include/linux/compiler-gcc4.h
12977 +--- linux-2.6.32.33/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
12978 ++++ linux-2.6.32.33/include/linux/compiler-gcc4.h 2010-12-31 14:46:53.000000000 -0500
12979 @@ -36,4 +36,8 @@
12980 the kernel context */
12981 #define __cold __attribute__((__cold__))
12982 @@ -47637,9 +47768,9 @@ diff -urNp linux-2.6.32.32/include/linux/compiler-gcc4.h linux-2.6.32.32/include
12983 +#define __bos0(ptr) __bos((ptr), 0)
12984 +#define __bos1(ptr) __bos((ptr), 1)
12985 #endif
12986 -diff -urNp linux-2.6.32.32/include/linux/compiler.h linux-2.6.32.32/include/linux/compiler.h
12987 ---- linux-2.6.32.32/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
12988 -+++ linux-2.6.32.32/include/linux/compiler.h 2010-12-31 14:57:30.000000000 -0500
12989 +diff -urNp linux-2.6.32.33/include/linux/compiler.h linux-2.6.32.33/include/linux/compiler.h
12990 +--- linux-2.6.32.33/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
12991 ++++ linux-2.6.32.33/include/linux/compiler.h 2010-12-31 14:57:30.000000000 -0500
12992 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
12993 #define __cold
12994 #endif
12995 @@ -47672,9 +47803,9 @@ diff -urNp linux-2.6.32.32/include/linux/compiler.h linux-2.6.32.32/include/linu
12996 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
12997
12998 #endif /* __LINUX_COMPILER_H */
12999 -diff -urNp linux-2.6.32.32/include/linux/decompress/mm.h linux-2.6.32.32/include/linux/decompress/mm.h
13000 ---- linux-2.6.32.32/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
13001 -+++ linux-2.6.32.32/include/linux/decompress/mm.h 2010-12-31 14:46:53.000000000 -0500
13002 +diff -urNp linux-2.6.32.33/include/linux/decompress/mm.h linux-2.6.32.33/include/linux/decompress/mm.h
13003 +--- linux-2.6.32.33/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
13004 ++++ linux-2.6.32.33/include/linux/decompress/mm.h 2010-12-31 14:46:53.000000000 -0500
13005 @@ -78,7 +78,7 @@ static void free(void *where)
13006 * warnings when not needed (indeed large_malloc / large_free are not
13007 * needed by inflate */
13008 @@ -47684,9 +47815,9 @@ diff -urNp linux-2.6.32.32/include/linux/decompress/mm.h linux-2.6.32.32/include
13009 #define free(a) kfree(a)
13010
13011 #define large_malloc(a) vmalloc(a)
13012 -diff -urNp linux-2.6.32.32/include/linux/dma-mapping.h linux-2.6.32.32/include/linux/dma-mapping.h
13013 ---- linux-2.6.32.32/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
13014 -+++ linux-2.6.32.32/include/linux/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
13015 +diff -urNp linux-2.6.32.33/include/linux/dma-mapping.h linux-2.6.32.33/include/linux/dma-mapping.h
13016 +--- linux-2.6.32.33/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
13017 ++++ linux-2.6.32.33/include/linux/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
13018 @@ -16,50 +16,50 @@ enum dma_data_direction {
13019 };
13020
13021 @@ -47753,9 +47884,9 @@ diff -urNp linux-2.6.32.32/include/linux/dma-mapping.h linux-2.6.32.32/include/l
13022 };
13023
13024 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
13025 -diff -urNp linux-2.6.32.32/include/linux/dst.h linux-2.6.32.32/include/linux/dst.h
13026 ---- linux-2.6.32.32/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
13027 -+++ linux-2.6.32.32/include/linux/dst.h 2010-12-31 14:46:53.000000000 -0500
13028 +diff -urNp linux-2.6.32.33/include/linux/dst.h linux-2.6.32.33/include/linux/dst.h
13029 +--- linux-2.6.32.33/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
13030 ++++ linux-2.6.32.33/include/linux/dst.h 2010-12-31 14:46:53.000000000 -0500
13031 @@ -380,7 +380,7 @@ struct dst_node
13032 struct thread_pool *pool;
13033
13034 @@ -47765,9 +47896,9 @@ diff -urNp linux-2.6.32.32/include/linux/dst.h linux-2.6.32.32/include/linux/dst
13035
13036 /*
13037 * How frequently and how many times transaction
13038 -diff -urNp linux-2.6.32.32/include/linux/elf.h linux-2.6.32.32/include/linux/elf.h
13039 ---- linux-2.6.32.32/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
13040 -+++ linux-2.6.32.32/include/linux/elf.h 2010-12-31 14:46:53.000000000 -0500
13041 +diff -urNp linux-2.6.32.33/include/linux/elf.h linux-2.6.32.33/include/linux/elf.h
13042 +--- linux-2.6.32.33/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
13043 ++++ linux-2.6.32.33/include/linux/elf.h 2010-12-31 14:46:53.000000000 -0500
13044 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
13045 #define PT_GNU_EH_FRAME 0x6474e550
13046
13047 @@ -47840,9 +47971,9 @@ diff -urNp linux-2.6.32.32/include/linux/elf.h linux-2.6.32.32/include/linux/elf
13048
13049 #endif
13050
13051 -diff -urNp linux-2.6.32.32/include/linux/fs.h linux-2.6.32.32/include/linux/fs.h
13052 ---- linux-2.6.32.32/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
13053 -+++ linux-2.6.32.32/include/linux/fs.h 2011-01-17 02:51:02.000000000 -0500
13054 +diff -urNp linux-2.6.32.33/include/linux/fs.h linux-2.6.32.33/include/linux/fs.h
13055 +--- linux-2.6.32.33/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
13056 ++++ linux-2.6.32.33/include/linux/fs.h 2011-01-17 02:51:02.000000000 -0500
13057 @@ -90,6 +90,11 @@ struct inodes_stat_t {
13058 /* Expect random access pattern */
13059 #define FMODE_RANDOM ((__force fmode_t)4096)
13060 @@ -48004,9 +48135,9 @@ diff -urNp linux-2.6.32.32/include/linux/fs.h linux-2.6.32.32/include/linux/fs.h
13061 };
13062
13063 /*
13064 -diff -urNp linux-2.6.32.32/include/linux/fs_struct.h linux-2.6.32.32/include/linux/fs_struct.h
13065 ---- linux-2.6.32.32/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
13066 -+++ linux-2.6.32.32/include/linux/fs_struct.h 2010-12-31 14:46:53.000000000 -0500
13067 +diff -urNp linux-2.6.32.33/include/linux/fs_struct.h linux-2.6.32.33/include/linux/fs_struct.h
13068 +--- linux-2.6.32.33/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
13069 ++++ linux-2.6.32.33/include/linux/fs_struct.h 2010-12-31 14:46:53.000000000 -0500
13070 @@ -4,7 +4,7 @@
13071 #include <linux/path.h>
13072
13073 @@ -48016,9 +48147,9 @@ diff -urNp linux-2.6.32.32/include/linux/fs_struct.h linux-2.6.32.32/include/lin
13074 rwlock_t lock;
13075 int umask;
13076 int in_exec;
13077 -diff -urNp linux-2.6.32.32/include/linux/genhd.h linux-2.6.32.32/include/linux/genhd.h
13078 ---- linux-2.6.32.32/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
13079 -+++ linux-2.6.32.32/include/linux/genhd.h 2010-12-31 14:46:53.000000000 -0500
13080 +diff -urNp linux-2.6.32.33/include/linux/genhd.h linux-2.6.32.33/include/linux/genhd.h
13081 +--- linux-2.6.32.33/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
13082 ++++ linux-2.6.32.33/include/linux/genhd.h 2010-12-31 14:46:53.000000000 -0500
13083 @@ -161,7 +161,7 @@ struct gendisk {
13084
13085 struct timer_rand_state *random;
13086 @@ -48028,9 +48159,9 @@ diff -urNp linux-2.6.32.32/include/linux/genhd.h linux-2.6.32.32/include/linux/g
13087 struct work_struct async_notify;
13088 #ifdef CONFIG_BLK_DEV_INTEGRITY
13089 struct blk_integrity *integrity;
13090 -diff -urNp linux-2.6.32.32/include/linux/gracl.h linux-2.6.32.32/include/linux/gracl.h
13091 ---- linux-2.6.32.32/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
13092 -+++ linux-2.6.32.32/include/linux/gracl.h 2010-12-31 14:46:53.000000000 -0500
13093 +diff -urNp linux-2.6.32.33/include/linux/gracl.h linux-2.6.32.33/include/linux/gracl.h
13094 +--- linux-2.6.32.33/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
13095 ++++ linux-2.6.32.33/include/linux/gracl.h 2010-12-31 14:46:53.000000000 -0500
13096 @@ -0,0 +1,317 @@
13097 +#ifndef GR_ACL_H
13098 +#define GR_ACL_H
13099 @@ -48349,9 +48480,9 @@ diff -urNp linux-2.6.32.32/include/linux/gracl.h linux-2.6.32.32/include/linux/g
13100 +
13101 +#endif
13102 +
13103 -diff -urNp linux-2.6.32.32/include/linux/gralloc.h linux-2.6.32.32/include/linux/gralloc.h
13104 ---- linux-2.6.32.32/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
13105 -+++ linux-2.6.32.32/include/linux/gralloc.h 2010-12-31 14:46:53.000000000 -0500
13106 +diff -urNp linux-2.6.32.33/include/linux/gralloc.h linux-2.6.32.33/include/linux/gralloc.h
13107 +--- linux-2.6.32.33/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
13108 ++++ linux-2.6.32.33/include/linux/gralloc.h 2010-12-31 14:46:53.000000000 -0500
13109 @@ -0,0 +1,9 @@
13110 +#ifndef __GRALLOC_H
13111 +#define __GRALLOC_H
13112 @@ -48362,9 +48493,9 @@ diff -urNp linux-2.6.32.32/include/linux/gralloc.h linux-2.6.32.32/include/linux
13113 +void *acl_alloc_num(unsigned long num, unsigned long len);
13114 +
13115 +#endif
13116 -diff -urNp linux-2.6.32.32/include/linux/grdefs.h linux-2.6.32.32/include/linux/grdefs.h
13117 ---- linux-2.6.32.32/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
13118 -+++ linux-2.6.32.32/include/linux/grdefs.h 2010-12-31 14:46:53.000000000 -0500
13119 +diff -urNp linux-2.6.32.33/include/linux/grdefs.h linux-2.6.32.33/include/linux/grdefs.h
13120 +--- linux-2.6.32.33/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
13121 ++++ linux-2.6.32.33/include/linux/grdefs.h 2010-12-31 14:46:53.000000000 -0500
13122 @@ -0,0 +1,137 @@
13123 +#ifndef GRDEFS_H
13124 +#define GRDEFS_H
13125 @@ -48503,9 +48634,9 @@ diff -urNp linux-2.6.32.32/include/linux/grdefs.h linux-2.6.32.32/include/linux/
13126 +};
13127 +
13128 +#endif
13129 -diff -urNp linux-2.6.32.32/include/linux/grinternal.h linux-2.6.32.32/include/linux/grinternal.h
13130 ---- linux-2.6.32.32/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
13131 -+++ linux-2.6.32.32/include/linux/grinternal.h 2010-12-31 14:46:53.000000000 -0500
13132 +diff -urNp linux-2.6.32.33/include/linux/grinternal.h linux-2.6.32.33/include/linux/grinternal.h
13133 +--- linux-2.6.32.33/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
13134 ++++ linux-2.6.32.33/include/linux/grinternal.h 2010-12-31 14:46:53.000000000 -0500
13135 @@ -0,0 +1,216 @@
13136 +#ifndef __GRINTERNAL_H
13137 +#define __GRINTERNAL_H
13138 @@ -48723,9 +48854,9 @@ diff -urNp linux-2.6.32.32/include/linux/grinternal.h linux-2.6.32.32/include/li
13139 +#endif
13140 +
13141 +#endif
13142 -diff -urNp linux-2.6.32.32/include/linux/grmsg.h linux-2.6.32.32/include/linux/grmsg.h
13143 ---- linux-2.6.32.32/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
13144 -+++ linux-2.6.32.32/include/linux/grmsg.h 2010-12-31 14:46:53.000000000 -0500
13145 +diff -urNp linux-2.6.32.33/include/linux/grmsg.h linux-2.6.32.33/include/linux/grmsg.h
13146 +--- linux-2.6.32.33/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
13147 ++++ linux-2.6.32.33/include/linux/grmsg.h 2010-12-31 14:46:53.000000000 -0500
13148 @@ -0,0 +1,111 @@
13149 +#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"
13150 +#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"
13151 @@ -48838,9 +48969,9 @@ diff -urNp linux-2.6.32.32/include/linux/grmsg.h linux-2.6.32.32/include/linux/g
13152 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
13153 +#define GR_VM86_MSG "denied use of vm86 by "
13154 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
13155 -diff -urNp linux-2.6.32.32/include/linux/grsecurity.h linux-2.6.32.32/include/linux/grsecurity.h
13156 ---- linux-2.6.32.32/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
13157 -+++ linux-2.6.32.32/include/linux/grsecurity.h 2011-01-11 23:11:11.000000000 -0500
13158 +diff -urNp linux-2.6.32.33/include/linux/grsecurity.h linux-2.6.32.33/include/linux/grsecurity.h
13159 +--- linux-2.6.32.33/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
13160 ++++ linux-2.6.32.33/include/linux/grsecurity.h 2011-01-11 23:11:11.000000000 -0500
13161 @@ -0,0 +1,214 @@
13162 +#ifndef GR_SECURITY_H
13163 +#define GR_SECURITY_H
13164 @@ -49056,9 +49187,9 @@ diff -urNp linux-2.6.32.32/include/linux/grsecurity.h linux-2.6.32.32/include/li
13165 +#endif
13166 +
13167 +#endif
13168 -diff -urNp linux-2.6.32.32/include/linux/hdpu_features.h linux-2.6.32.32/include/linux/hdpu_features.h
13169 ---- linux-2.6.32.32/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
13170 -+++ linux-2.6.32.32/include/linux/hdpu_features.h 2010-12-31 14:46:53.000000000 -0500
13171 +diff -urNp linux-2.6.32.33/include/linux/hdpu_features.h linux-2.6.32.33/include/linux/hdpu_features.h
13172 +--- linux-2.6.32.33/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
13173 ++++ linux-2.6.32.33/include/linux/hdpu_features.h 2010-12-31 14:46:53.000000000 -0500
13174 @@ -3,7 +3,7 @@
13175 struct cpustate_t {
13176 spinlock_t lock;
13177 @@ -49068,9 +49199,9 @@ diff -urNp linux-2.6.32.32/include/linux/hdpu_features.h linux-2.6.32.32/include
13178 unsigned char cached_val;
13179 int inited;
13180 unsigned long *set_addr;
13181 -diff -urNp linux-2.6.32.32/include/linux/highmem.h linux-2.6.32.32/include/linux/highmem.h
13182 ---- linux-2.6.32.32/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
13183 -+++ linux-2.6.32.32/include/linux/highmem.h 2010-12-31 14:46:53.000000000 -0500
13184 +diff -urNp linux-2.6.32.33/include/linux/highmem.h linux-2.6.32.33/include/linux/highmem.h
13185 +--- linux-2.6.32.33/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
13186 ++++ linux-2.6.32.33/include/linux/highmem.h 2010-12-31 14:46:53.000000000 -0500
13187 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct
13188 kunmap_atomic(kaddr, KM_USER0);
13189 }
13190 @@ -49090,9 +49221,9 @@ diff -urNp linux-2.6.32.32/include/linux/highmem.h linux-2.6.32.32/include/linux
13191 static inline void zero_user_segments(struct page *page,
13192 unsigned start1, unsigned end1,
13193 unsigned start2, unsigned end2)
13194 -diff -urNp linux-2.6.32.32/include/linux/interrupt.h linux-2.6.32.32/include/linux/interrupt.h
13195 ---- linux-2.6.32.32/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
13196 -+++ linux-2.6.32.32/include/linux/interrupt.h 2010-12-31 14:46:53.000000000 -0500
13197 +diff -urNp linux-2.6.32.33/include/linux/interrupt.h linux-2.6.32.33/include/linux/interrupt.h
13198 +--- linux-2.6.32.33/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
13199 ++++ linux-2.6.32.33/include/linux/interrupt.h 2010-12-31 14:46:53.000000000 -0500
13200 @@ -362,7 +362,7 @@ enum
13201 /* map softirq index to softirq name. update 'softirq_to_name' in
13202 * kernel/softirq.c when adding a new softirq.
13203 @@ -49117,9 +49248,9 @@ diff -urNp linux-2.6.32.32/include/linux/interrupt.h linux-2.6.32.32/include/lin
13204 extern void softirq_init(void);
13205 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
13206 extern void raise_softirq_irqoff(unsigned int nr);
13207 -diff -urNp linux-2.6.32.32/include/linux/irq.h linux-2.6.32.32/include/linux/irq.h
13208 ---- linux-2.6.32.32/include/linux/irq.h 2010-08-13 16:24:37.000000000 -0400
13209 -+++ linux-2.6.32.32/include/linux/irq.h 2011-01-24 18:05:37.000000000 -0500
13210 +diff -urNp linux-2.6.32.33/include/linux/irq.h linux-2.6.32.33/include/linux/irq.h
13211 +--- linux-2.6.32.33/include/linux/irq.h 2010-08-13 16:24:37.000000000 -0400
13212 ++++ linux-2.6.32.33/include/linux/irq.h 2011-01-24 18:05:37.000000000 -0500
13213 @@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq,
13214 static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
13215 bool boot)
13216 @@ -49134,9 +49265,9 @@ diff -urNp linux-2.6.32.32/include/linux/irq.h linux-2.6.32.32/include/linux/irq
13217 if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
13218 return false;
13219
13220 -diff -urNp linux-2.6.32.32/include/linux/jbd2.h linux-2.6.32.32/include/linux/jbd2.h
13221 ---- linux-2.6.32.32/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
13222 -+++ linux-2.6.32.32/include/linux/jbd2.h 2010-12-31 14:46:53.000000000 -0500
13223 +diff -urNp linux-2.6.32.33/include/linux/jbd2.h linux-2.6.32.33/include/linux/jbd2.h
13224 +--- linux-2.6.32.33/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
13225 ++++ linux-2.6.32.33/include/linux/jbd2.h 2010-12-31 14:46:53.000000000 -0500
13226 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
13227 } \
13228 } while (0)
13229 @@ -49146,9 +49277,9 @@ diff -urNp linux-2.6.32.32/include/linux/jbd2.h linux-2.6.32.32/include/linux/jb
13230 #endif
13231
13232 static inline void *jbd2_alloc(size_t size, gfp_t flags)
13233 -diff -urNp linux-2.6.32.32/include/linux/jbd.h linux-2.6.32.32/include/linux/jbd.h
13234 ---- linux-2.6.32.32/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
13235 -+++ linux-2.6.32.32/include/linux/jbd.h 2010-12-31 14:46:53.000000000 -0500
13236 +diff -urNp linux-2.6.32.33/include/linux/jbd.h linux-2.6.32.33/include/linux/jbd.h
13237 +--- linux-2.6.32.33/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
13238 ++++ linux-2.6.32.33/include/linux/jbd.h 2010-12-31 14:46:53.000000000 -0500
13239 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
13240 } \
13241 } while (0)
13242 @@ -49158,9 +49289,9 @@ diff -urNp linux-2.6.32.32/include/linux/jbd.h linux-2.6.32.32/include/linux/jbd
13243 #endif
13244
13245 static inline void *jbd_alloc(size_t size, gfp_t flags)
13246 -diff -urNp linux-2.6.32.32/include/linux/kallsyms.h linux-2.6.32.32/include/linux/kallsyms.h
13247 ---- linux-2.6.32.32/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
13248 -+++ linux-2.6.32.32/include/linux/kallsyms.h 2010-12-31 14:53:51.000000000 -0500
13249 +diff -urNp linux-2.6.32.33/include/linux/kallsyms.h linux-2.6.32.33/include/linux/kallsyms.h
13250 +--- linux-2.6.32.33/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
13251 ++++ linux-2.6.32.33/include/linux/kallsyms.h 2010-12-31 14:53:51.000000000 -0500
13252 @@ -15,7 +15,8 @@
13253
13254 struct module;
13255 @@ -49187,9 +49318,9 @@ diff -urNp linux-2.6.32.32/include/linux/kallsyms.h linux-2.6.32.32/include/linu
13256
13257 /* This macro allows us to keep printk typechecking */
13258 static void __check_printsym_format(const char *fmt, ...)
13259 -diff -urNp linux-2.6.32.32/include/linux/kgdb.h linux-2.6.32.32/include/linux/kgdb.h
13260 ---- linux-2.6.32.32/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
13261 -+++ linux-2.6.32.32/include/linux/kgdb.h 2010-12-31 14:46:53.000000000 -0500
13262 +diff -urNp linux-2.6.32.33/include/linux/kgdb.h linux-2.6.32.33/include/linux/kgdb.h
13263 +--- linux-2.6.32.33/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
13264 ++++ linux-2.6.32.33/include/linux/kgdb.h 2010-12-31 14:46:53.000000000 -0500
13265 @@ -251,20 +251,20 @@ struct kgdb_arch {
13266 */
13267 struct kgdb_io {
13268 @@ -49220,9 +49351,9 @@ diff -urNp linux-2.6.32.32/include/linux/kgdb.h linux-2.6.32.32/include/linux/kg
13269
13270 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
13271 extern int kgdb_mem2hex(char *mem, char *buf, int count);
13272 -diff -urNp linux-2.6.32.32/include/linux/kobject.h linux-2.6.32.32/include/linux/kobject.h
13273 ---- linux-2.6.32.32/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
13274 -+++ linux-2.6.32.32/include/linux/kobject.h 2010-12-31 14:46:53.000000000 -0500
13275 +diff -urNp linux-2.6.32.33/include/linux/kobject.h linux-2.6.32.33/include/linux/kobject.h
13276 +--- linux-2.6.32.33/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
13277 ++++ linux-2.6.32.33/include/linux/kobject.h 2010-12-31 14:46:53.000000000 -0500
13278 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
13279
13280 struct kobj_type {
13281 @@ -49271,9 +49402,9 @@ diff -urNp linux-2.6.32.32/include/linux/kobject.h linux-2.6.32.32/include/linux
13282 struct kobject *parent_kobj);
13283
13284 static inline struct kset *to_kset(struct kobject *kobj)
13285 -diff -urNp linux-2.6.32.32/include/linux/kvm_host.h linux-2.6.32.32/include/linux/kvm_host.h
13286 ---- linux-2.6.32.32/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
13287 -+++ linux-2.6.32.32/include/linux/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
13288 +diff -urNp linux-2.6.32.33/include/linux/kvm_host.h linux-2.6.32.33/include/linux/kvm_host.h
13289 +--- linux-2.6.32.33/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
13290 ++++ linux-2.6.32.33/include/linux/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
13291 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
13292 void vcpu_load(struct kvm_vcpu *vcpu);
13293 void vcpu_put(struct kvm_vcpu *vcpu);
13294 @@ -49292,9 +49423,9 @@ diff -urNp linux-2.6.32.32/include/linux/kvm_host.h linux-2.6.32.32/include/linu
13295 void kvm_arch_exit(void);
13296
13297 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
13298 -diff -urNp linux-2.6.32.32/include/linux/libata.h linux-2.6.32.32/include/linux/libata.h
13299 ---- linux-2.6.32.32/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
13300 -+++ linux-2.6.32.32/include/linux/libata.h 2010-12-31 14:46:53.000000000 -0500
13301 +diff -urNp linux-2.6.32.33/include/linux/libata.h linux-2.6.32.33/include/linux/libata.h
13302 +--- linux-2.6.32.33/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
13303 ++++ linux-2.6.32.33/include/linux/libata.h 2010-12-31 14:46:53.000000000 -0500
13304 @@ -64,11 +64,11 @@
13305 #ifdef ATA_VERBOSE_DEBUG
13306 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
13307 @@ -49360,9 +49491,9 @@ diff -urNp linux-2.6.32.32/include/linux/libata.h linux-2.6.32.32/include/linux/
13308 extern int ata_scsi_detect(struct scsi_host_template *sht);
13309 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
13310 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
13311 -diff -urNp linux-2.6.32.32/include/linux/lockd/bind.h linux-2.6.32.32/include/linux/lockd/bind.h
13312 ---- linux-2.6.32.32/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
13313 -+++ linux-2.6.32.32/include/linux/lockd/bind.h 2010-12-31 14:46:53.000000000 -0500
13314 +diff -urNp linux-2.6.32.33/include/linux/lockd/bind.h linux-2.6.32.33/include/linux/lockd/bind.h
13315 +--- linux-2.6.32.33/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
13316 ++++ linux-2.6.32.33/include/linux/lockd/bind.h 2010-12-31 14:46:53.000000000 -0500
13317 @@ -23,13 +23,13 @@ struct svc_rqst;
13318 * This is the set of functions for lockd->nfsd communication
13319 */
13320 @@ -49380,9 +49511,9 @@ diff -urNp linux-2.6.32.32/include/linux/lockd/bind.h linux-2.6.32.32/include/li
13321
13322 /*
13323 * Similar to nfs_client_initdata, but without the NFS-specific
13324 -diff -urNp linux-2.6.32.32/include/linux/mm.h linux-2.6.32.32/include/linux/mm.h
13325 ---- linux-2.6.32.32/include/linux/mm.h 2010-10-31 16:44:11.000000000 -0400
13326 -+++ linux-2.6.32.32/include/linux/mm.h 2010-12-31 14:46:53.000000000 -0500
13327 +diff -urNp linux-2.6.32.33/include/linux/mm.h linux-2.6.32.33/include/linux/mm.h
13328 +--- linux-2.6.32.33/include/linux/mm.h 2010-10-31 16:44:11.000000000 -0400
13329 ++++ linux-2.6.32.33/include/linux/mm.h 2010-12-31 14:46:53.000000000 -0500
13330 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void
13331
13332 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
13333 @@ -49462,9 +49593,9 @@ diff -urNp linux-2.6.32.32/include/linux/mm.h linux-2.6.32.32/include/linux/mm.h
13334
13335 #endif /* __KERNEL__ */
13336 #endif /* _LINUX_MM_H */
13337 -diff -urNp linux-2.6.32.32/include/linux/mm_types.h linux-2.6.32.32/include/linux/mm_types.h
13338 ---- linux-2.6.32.32/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
13339 -+++ linux-2.6.32.32/include/linux/mm_types.h 2010-12-31 14:46:53.000000000 -0500
13340 +diff -urNp linux-2.6.32.33/include/linux/mm_types.h linux-2.6.32.33/include/linux/mm_types.h
13341 +--- linux-2.6.32.33/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
13342 ++++ linux-2.6.32.33/include/linux/mm_types.h 2010-12-31 14:46:53.000000000 -0500
13343 @@ -186,6 +186,8 @@ struct vm_area_struct {
13344 #ifdef CONFIG_NUMA
13345 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
13346 @@ -49499,9 +49630,9 @@ diff -urNp linux-2.6.32.32/include/linux/mm_types.h linux-2.6.32.32/include/linu
13347 };
13348
13349 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
13350 -diff -urNp linux-2.6.32.32/include/linux/mmu_notifier.h linux-2.6.32.32/include/linux/mmu_notifier.h
13351 ---- linux-2.6.32.32/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
13352 -+++ linux-2.6.32.32/include/linux/mmu_notifier.h 2010-12-31 14:46:53.000000000 -0500
13353 +diff -urNp linux-2.6.32.33/include/linux/mmu_notifier.h linux-2.6.32.33/include/linux/mmu_notifier.h
13354 +--- linux-2.6.32.33/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
13355 ++++ linux-2.6.32.33/include/linux/mmu_notifier.h 2010-12-31 14:46:53.000000000 -0500
13356 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
13357 */
13358 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
13359 @@ -49518,9 +49649,9 @@ diff -urNp linux-2.6.32.32/include/linux/mmu_notifier.h linux-2.6.32.32/include/
13360 })
13361
13362 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
13363 -diff -urNp linux-2.6.32.32/include/linux/mmzone.h linux-2.6.32.32/include/linux/mmzone.h
13364 ---- linux-2.6.32.32/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
13365 -+++ linux-2.6.32.32/include/linux/mmzone.h 2010-12-31 14:46:53.000000000 -0500
13366 +diff -urNp linux-2.6.32.33/include/linux/mmzone.h linux-2.6.32.33/include/linux/mmzone.h
13367 +--- linux-2.6.32.33/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
13368 ++++ linux-2.6.32.33/include/linux/mmzone.h 2010-12-31 14:46:53.000000000 -0500
13369 @@ -350,7 +350,7 @@ struct zone {
13370 unsigned long flags; /* zone flags, see below */
13371
13372 @@ -49530,9 +49661,9 @@ diff -urNp linux-2.6.32.32/include/linux/mmzone.h linux-2.6.32.32/include/linux/
13373
13374 /*
13375 * prev_priority holds the scanning priority for this zone. It is
13376 -diff -urNp linux-2.6.32.32/include/linux/mod_devicetable.h linux-2.6.32.32/include/linux/mod_devicetable.h
13377 ---- linux-2.6.32.32/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
13378 -+++ linux-2.6.32.32/include/linux/mod_devicetable.h 2010-12-31 14:46:53.000000000 -0500
13379 +diff -urNp linux-2.6.32.33/include/linux/mod_devicetable.h linux-2.6.32.33/include/linux/mod_devicetable.h
13380 +--- linux-2.6.32.33/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
13381 ++++ linux-2.6.32.33/include/linux/mod_devicetable.h 2010-12-31 14:46:53.000000000 -0500
13382 @@ -12,7 +12,7 @@
13383 typedef unsigned long kernel_ulong_t;
13384 #endif
13385 @@ -49551,9 +49682,9 @@ diff -urNp linux-2.6.32.32/include/linux/mod_devicetable.h linux-2.6.32.32/inclu
13386
13387 struct hid_device_id {
13388 __u16 bus;
13389 -diff -urNp linux-2.6.32.32/include/linux/module.h linux-2.6.32.32/include/linux/module.h
13390 ---- linux-2.6.32.32/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
13391 -+++ linux-2.6.32.32/include/linux/module.h 2010-12-31 14:46:53.000000000 -0500
13392 +diff -urNp linux-2.6.32.33/include/linux/module.h linux-2.6.32.33/include/linux/module.h
13393 +--- linux-2.6.32.33/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
13394 ++++ linux-2.6.32.33/include/linux/module.h 2010-12-31 14:46:53.000000000 -0500
13395 @@ -287,16 +287,16 @@ struct module
13396 int (*init)(void);
13397
13398 @@ -49626,9 +49757,9 @@ diff -urNp linux-2.6.32.32/include/linux/module.h linux-2.6.32.32/include/linux/
13399 }
13400
13401 /* Search for module by name: must hold module_mutex. */
13402 -diff -urNp linux-2.6.32.32/include/linux/moduleloader.h linux-2.6.32.32/include/linux/moduleloader.h
13403 ---- linux-2.6.32.32/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
13404 -+++ linux-2.6.32.32/include/linux/moduleloader.h 2010-12-31 14:46:53.000000000 -0500
13405 +diff -urNp linux-2.6.32.33/include/linux/moduleloader.h linux-2.6.32.33/include/linux/moduleloader.h
13406 +--- linux-2.6.32.33/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
13407 ++++ linux-2.6.32.33/include/linux/moduleloader.h 2010-12-31 14:46:53.000000000 -0500
13408 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
13409 sections. Returns NULL on failure. */
13410 void *module_alloc(unsigned long size);
13411 @@ -49651,9 +49782,9 @@ diff -urNp linux-2.6.32.32/include/linux/moduleloader.h linux-2.6.32.32/include/
13412 /* Apply the given relocation to the (simplified) ELF. Return -error
13413 or 0. */
13414 int apply_relocate(Elf_Shdr *sechdrs,
13415 -diff -urNp linux-2.6.32.32/include/linux/moduleparam.h linux-2.6.32.32/include/linux/moduleparam.h
13416 ---- linux-2.6.32.32/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400
13417 -+++ linux-2.6.32.32/include/linux/moduleparam.h 2010-12-31 14:46:53.000000000 -0500
13418 +diff -urNp linux-2.6.32.33/include/linux/moduleparam.h linux-2.6.32.33/include/linux/moduleparam.h
13419 +--- linux-2.6.32.33/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400
13420 ++++ linux-2.6.32.33/include/linux/moduleparam.h 2010-12-31 14:46:53.000000000 -0500
13421 @@ -132,7 +132,7 @@ struct kparam_array
13422
13423 /* Actually copy string: maxlen param is usually sizeof(string). */
13424 @@ -49672,9 +49803,9 @@ diff -urNp linux-2.6.32.32/include/linux/moduleparam.h linux-2.6.32.32/include/l
13425 = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
13426 sizeof(array[0]), array }; \
13427 __module_param_call(MODULE_PARAM_PREFIX, name, \
13428 -diff -urNp linux-2.6.32.32/include/linux/namei.h linux-2.6.32.32/include/linux/namei.h
13429 ---- linux-2.6.32.32/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
13430 -+++ linux-2.6.32.32/include/linux/namei.h 2010-12-31 14:46:53.000000000 -0500
13431 +diff -urNp linux-2.6.32.33/include/linux/namei.h linux-2.6.32.33/include/linux/namei.h
13432 +--- linux-2.6.32.33/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
13433 ++++ linux-2.6.32.33/include/linux/namei.h 2010-12-31 14:46:53.000000000 -0500
13434 @@ -22,7 +22,7 @@ struct nameidata {
13435 unsigned int flags;
13436 int last_type;
13437 @@ -49699,24 +49830,9 @@ diff -urNp linux-2.6.32.32/include/linux/namei.h linux-2.6.32.32/include/linux/n
13438 {
13439 return nd->saved_names[nd->depth];
13440 }
13441 -diff -urNp linux-2.6.32.32/include/linux/netdevice.h linux-2.6.32.32/include/linux/netdevice.h
13442 ---- linux-2.6.32.32/include/linux/netdevice.h 2010-08-13 16:24:37.000000000 -0400
13443 -+++ linux-2.6.32.32/include/linux/netdevice.h 2011-02-28 18:18:09.000000000 -0500
13444 -@@ -2015,6 +2015,11 @@ static inline u32 dev_ethtool_get_flags(
13445 - return 0;
13446 - return dev->ethtool_ops->get_flags(dev);
13447 - }
13448 -+
13449 -+#define MODULE_ALIAS_NETDEV(device) \
13450 -+ MODULE_ALIAS("netdev-" device)
13451 -+
13452 -+
13453 - #endif /* __KERNEL__ */
13454 -
13455 - #endif /* _LINUX_NETDEVICE_H */
13456 -diff -urNp linux-2.6.32.32/include/linux/netfilter/xt_gradm.h linux-2.6.32.32/include/linux/netfilter/xt_gradm.h
13457 ---- linux-2.6.32.32/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
13458 -+++ linux-2.6.32.32/include/linux/netfilter/xt_gradm.h 2010-12-31 14:46:53.000000000 -0500
13459 +diff -urNp linux-2.6.32.33/include/linux/netfilter/xt_gradm.h linux-2.6.32.33/include/linux/netfilter/xt_gradm.h
13460 +--- linux-2.6.32.33/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
13461 ++++ linux-2.6.32.33/include/linux/netfilter/xt_gradm.h 2010-12-31 14:46:53.000000000 -0500
13462 @@ -0,0 +1,9 @@
13463 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
13464 +#define _LINUX_NETFILTER_XT_GRADM_H 1
13465 @@ -49727,9 +49843,9 @@ diff -urNp linux-2.6.32.32/include/linux/netfilter/xt_gradm.h linux-2.6.32.32/in
13466 +};
13467 +
13468 +#endif
13469 -diff -urNp linux-2.6.32.32/include/linux/nodemask.h linux-2.6.32.32/include/linux/nodemask.h
13470 ---- linux-2.6.32.32/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
13471 -+++ linux-2.6.32.32/include/linux/nodemask.h 2010-12-31 14:46:53.000000000 -0500
13472 +diff -urNp linux-2.6.32.33/include/linux/nodemask.h linux-2.6.32.33/include/linux/nodemask.h
13473 +--- linux-2.6.32.33/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
13474 ++++ linux-2.6.32.33/include/linux/nodemask.h 2010-12-31 14:46:53.000000000 -0500
13475 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no
13476
13477 #define any_online_node(mask) \
13478 @@ -49746,9 +49862,9 @@ diff -urNp linux-2.6.32.32/include/linux/nodemask.h linux-2.6.32.32/include/linu
13479 })
13480
13481 #define num_online_nodes() num_node_state(N_ONLINE)
13482 -diff -urNp linux-2.6.32.32/include/linux/oprofile.h linux-2.6.32.32/include/linux/oprofile.h
13483 ---- linux-2.6.32.32/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
13484 -+++ linux-2.6.32.32/include/linux/oprofile.h 2010-12-31 14:46:53.000000000 -0500
13485 +diff -urNp linux-2.6.32.33/include/linux/oprofile.h linux-2.6.32.33/include/linux/oprofile.h
13486 +--- linux-2.6.32.33/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
13487 ++++ linux-2.6.32.33/include/linux/oprofile.h 2010-12-31 14:46:53.000000000 -0500
13488 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
13489 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
13490 char const * name, ulong * val);
13491 @@ -49761,9 +49877,9 @@ diff -urNp linux-2.6.32.32/include/linux/oprofile.h linux-2.6.32.32/include/linu
13492
13493 /** create a directory */
13494 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
13495 -diff -urNp linux-2.6.32.32/include/linux/pipe_fs_i.h linux-2.6.32.32/include/linux/pipe_fs_i.h
13496 ---- linux-2.6.32.32/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
13497 -+++ linux-2.6.32.32/include/linux/pipe_fs_i.h 2010-12-31 14:46:53.000000000 -0500
13498 +diff -urNp linux-2.6.32.33/include/linux/pipe_fs_i.h linux-2.6.32.33/include/linux/pipe_fs_i.h
13499 +--- linux-2.6.32.33/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
13500 ++++ linux-2.6.32.33/include/linux/pipe_fs_i.h 2010-12-31 14:46:53.000000000 -0500
13501 @@ -46,9 +46,9 @@ struct pipe_inode_info {
13502 wait_queue_head_t wait;
13503 unsigned int nrbufs, curbuf;
13504 @@ -49777,9 +49893,9 @@ diff -urNp linux-2.6.32.32/include/linux/pipe_fs_i.h linux-2.6.32.32/include/lin
13505 unsigned int r_counter;
13506 unsigned int w_counter;
13507 struct fasync_struct *fasync_readers;
13508 -diff -urNp linux-2.6.32.32/include/linux/poison.h linux-2.6.32.32/include/linux/poison.h
13509 ---- linux-2.6.32.32/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
13510 -+++ linux-2.6.32.32/include/linux/poison.h 2010-12-31 14:46:53.000000000 -0500
13511 +diff -urNp linux-2.6.32.33/include/linux/poison.h linux-2.6.32.33/include/linux/poison.h
13512 +--- linux-2.6.32.33/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
13513 ++++ linux-2.6.32.33/include/linux/poison.h 2010-12-31 14:46:53.000000000 -0500
13514 @@ -19,8 +19,8 @@
13515 * under normal circumstances, used to verify that nobody uses
13516 * non-initialized list entries.
13517 @@ -49791,9 +49907,9 @@ diff -urNp linux-2.6.32.32/include/linux/poison.h linux-2.6.32.32/include/linux/
13518
13519 /********** include/linux/timer.h **********/
13520 /*
13521 -diff -urNp linux-2.6.32.32/include/linux/proc_fs.h linux-2.6.32.32/include/linux/proc_fs.h
13522 ---- linux-2.6.32.32/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
13523 -+++ linux-2.6.32.32/include/linux/proc_fs.h 2010-12-31 14:46:53.000000000 -0500
13524 +diff -urNp linux-2.6.32.33/include/linux/proc_fs.h linux-2.6.32.33/include/linux/proc_fs.h
13525 +--- linux-2.6.32.33/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
13526 ++++ linux-2.6.32.33/include/linux/proc_fs.h 2010-12-31 14:46:53.000000000 -0500
13527 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
13528 return proc_create_data(name, mode, parent, proc_fops, NULL);
13529 }
13530 @@ -49814,9 +49930,9 @@ diff -urNp linux-2.6.32.32/include/linux/proc_fs.h linux-2.6.32.32/include/linux
13531 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
13532 mode_t mode, struct proc_dir_entry *base,
13533 read_proc_t *read_proc, void * data)
13534 -diff -urNp linux-2.6.32.32/include/linux/random.h linux-2.6.32.32/include/linux/random.h
13535 ---- linux-2.6.32.32/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
13536 -+++ linux-2.6.32.32/include/linux/random.h 2010-12-31 14:46:53.000000000 -0500
13537 +diff -urNp linux-2.6.32.33/include/linux/random.h linux-2.6.32.33/include/linux/random.h
13538 +--- linux-2.6.32.33/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
13539 ++++ linux-2.6.32.33/include/linux/random.h 2010-12-31 14:46:53.000000000 -0500
13540 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
13541 u32 random32(void);
13542 void srandom32(u32 seed);
13543 @@ -49829,9 +49945,9 @@ diff -urNp linux-2.6.32.32/include/linux/random.h linux-2.6.32.32/include/linux/
13544 #endif /* __KERNEL___ */
13545
13546 #endif /* _LINUX_RANDOM_H */
13547 -diff -urNp linux-2.6.32.32/include/linux/reiserfs_fs.h linux-2.6.32.32/include/linux/reiserfs_fs.h
13548 ---- linux-2.6.32.32/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
13549 -+++ linux-2.6.32.32/include/linux/reiserfs_fs.h 2010-12-31 14:46:53.000000000 -0500
13550 +diff -urNp linux-2.6.32.33/include/linux/reiserfs_fs.h linux-2.6.32.33/include/linux/reiserfs_fs.h
13551 +--- linux-2.6.32.33/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
13552 ++++ linux-2.6.32.33/include/linux/reiserfs_fs.h 2010-12-31 14:46:53.000000000 -0500
13553 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
13554 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
13555
13556 @@ -49878,9 +49994,9 @@ diff -urNp linux-2.6.32.32/include/linux/reiserfs_fs.h linux-2.6.32.32/include/l
13557
13558 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
13559 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
13560 -diff -urNp linux-2.6.32.32/include/linux/reiserfs_fs_sb.h linux-2.6.32.32/include/linux/reiserfs_fs_sb.h
13561 ---- linux-2.6.32.32/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
13562 -+++ linux-2.6.32.32/include/linux/reiserfs_fs_sb.h 2010-12-31 14:46:53.000000000 -0500
13563 +diff -urNp linux-2.6.32.33/include/linux/reiserfs_fs_sb.h linux-2.6.32.33/include/linux/reiserfs_fs_sb.h
13564 +--- linux-2.6.32.33/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
13565 ++++ linux-2.6.32.33/include/linux/reiserfs_fs_sb.h 2010-12-31 14:46:53.000000000 -0500
13566 @@ -377,7 +377,7 @@ struct reiserfs_sb_info {
13567 /* Comment? -Hans */
13568 wait_queue_head_t s_wait;
13569 @@ -49890,9 +50006,9 @@ diff -urNp linux-2.6.32.32/include/linux/reiserfs_fs_sb.h linux-2.6.32.32/includ
13570 // tree gets re-balanced
13571 unsigned long s_properties; /* File system properties. Currently holds
13572 on-disk FS format */
13573 -diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/sched.h
13574 ---- linux-2.6.32.32/include/linux/sched.h 2011-02-22 15:56:54.000000000 -0500
13575 -+++ linux-2.6.32.32/include/linux/sched.h 2011-02-22 15:57:24.000000000 -0500
13576 +diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/sched.h
13577 +--- linux-2.6.32.33/include/linux/sched.h 2011-02-22 15:56:54.000000000 -0500
13578 ++++ linux-2.6.32.33/include/linux/sched.h 2011-03-21 17:34:54.000000000 -0400
13579 @@ -101,6 +101,7 @@ struct bio;
13580 struct fs_struct;
13581 struct bts_context;
13582 @@ -49901,7 +50017,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13583
13584 /*
13585 * List of flags we want to share for kernel threads,
13586 -@@ -371,9 +372,11 @@ struct user_namespace;
13587 +@@ -371,9 +372,12 @@ struct user_namespace;
13588 #define DEFAULT_MAX_MAP_COUNT (USHORT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
13589
13590 extern int sysctl_max_map_count;
13591 @@ -49909,11 +50025,12 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13592
13593 #include <linux/aio.h>
13594
13595 -+extern bool check_heap_stack_gap(struct vm_area_struct *vma, unsigned long addr, unsigned long len);
13596 ++extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
13597 ++extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
13598 extern unsigned long
13599 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
13600 unsigned long, unsigned long);
13601 -@@ -666,6 +669,16 @@ struct signal_struct {
13602 +@@ -666,6 +670,16 @@ struct signal_struct {
13603 struct tty_audit_buf *tty_audit_buf;
13604 #endif
13605
13606 @@ -49930,7 +50047,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13607 int oom_adj; /* OOM kill score adjustment (bit shift) */
13608 };
13609
13610 -@@ -1216,7 +1229,7 @@ struct rcu_node;
13611 +@@ -1216,7 +1230,7 @@ struct rcu_node;
13612
13613 struct task_struct {
13614 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
13615 @@ -49939,7 +50056,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13616 atomic_t usage;
13617 unsigned int flags; /* per process flags, defined below */
13618 unsigned int ptrace;
13619 -@@ -1328,8 +1341,8 @@ struct task_struct {
13620 +@@ -1328,8 +1342,8 @@ struct task_struct {
13621 struct list_head thread_group;
13622
13623 struct completion *vfork_done; /* for vfork() */
13624 @@ -49950,7 +50067,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13625
13626 cputime_t utime, stime, utimescaled, stimescaled;
13627 cputime_t gtime;
13628 -@@ -1343,16 +1356,6 @@ struct task_struct {
13629 +@@ -1343,16 +1357,6 @@ struct task_struct {
13630 struct task_cputime cputime_expires;
13631 struct list_head cpu_timers[3];
13632
13633 @@ -49967,7 +50084,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13634 char comm[TASK_COMM_LEN]; /* executable name excluding path
13635 - access with [gs]et_task_comm (which lock
13636 it with task_lock())
13637 -@@ -1436,6 +1439,15 @@ struct task_struct {
13638 +@@ -1436,6 +1440,15 @@ struct task_struct {
13639 int hardirq_context;
13640 int softirq_context;
13641 #endif
13642 @@ -49983,7 +50100,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13643 #ifdef CONFIG_LOCKDEP
13644 # define MAX_LOCK_DEPTH 48UL
13645 u64 curr_chain_key;
13646 -@@ -1456,6 +1468,9 @@ struct task_struct {
13647 +@@ -1456,6 +1469,9 @@ struct task_struct {
13648
13649 struct backing_dev_info *backing_dev_info;
13650
13651 @@ -49993,7 +50110,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13652 struct io_context *io_context;
13653
13654 unsigned long ptrace_message;
13655 -@@ -1519,6 +1534,20 @@ struct task_struct {
13656 +@@ -1519,6 +1535,20 @@ struct task_struct {
13657 unsigned long default_timer_slack_ns;
13658
13659 struct list_head *scm_work_list;
13660 @@ -50014,7 +50131,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13661 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
13662 /* Index of current stored adress in ret_stack */
13663 int curr_ret_stack;
13664 -@@ -1542,6 +1571,52 @@ struct task_struct {
13665 +@@ -1542,6 +1572,52 @@ struct task_struct {
13666 #endif /* CONFIG_TRACING */
13667 };
13668
13669 @@ -50067,7 +50184,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13670 /* Future-safe accessor for struct task_struct's cpus_allowed. */
13671 #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
13672
13673 -@@ -2155,7 +2230,7 @@ extern void __cleanup_sighand(struct sig
13674 +@@ -2155,7 +2231,7 @@ extern void __cleanup_sighand(struct sig
13675 extern void exit_itimers(struct signal_struct *);
13676 extern void flush_itimer_signals(void);
13677
13678 @@ -50076,7 +50193,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13679
13680 extern void daemonize(const char *, ...);
13681 extern int allow_signal(int);
13682 -@@ -2268,8 +2343,8 @@ static inline void unlock_task_sighand(s
13683 +@@ -2268,8 +2344,8 @@ static inline void unlock_task_sighand(s
13684
13685 #ifndef __HAVE_THREAD_FUNCTIONS
13686
13687 @@ -50087,7 +50204,7 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13688
13689 static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
13690 {
13691 -@@ -2284,13 +2359,17 @@ static inline unsigned long *end_of_stac
13692 +@@ -2284,13 +2360,17 @@ static inline unsigned long *end_of_stac
13693
13694 #endif
13695
13696 @@ -50107,9 +50224,9 @@ diff -urNp linux-2.6.32.32/include/linux/sched.h linux-2.6.32.32/include/linux/s
13697 extern void thread_info_cache_init(void);
13698
13699 #ifdef CONFIG_DEBUG_STACK_USAGE
13700 -diff -urNp linux-2.6.32.32/include/linux/screen_info.h linux-2.6.32.32/include/linux/screen_info.h
13701 ---- linux-2.6.32.32/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
13702 -+++ linux-2.6.32.32/include/linux/screen_info.h 2010-12-31 14:46:53.000000000 -0500
13703 +diff -urNp linux-2.6.32.33/include/linux/screen_info.h linux-2.6.32.33/include/linux/screen_info.h
13704 +--- linux-2.6.32.33/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
13705 ++++ linux-2.6.32.33/include/linux/screen_info.h 2010-12-31 14:46:53.000000000 -0500
13706 @@ -42,7 +42,8 @@ struct screen_info {
13707 __u16 pages; /* 0x32 */
13708 __u16 vesa_attributes; /* 0x34 */
13709 @@ -50120,9 +50237,9 @@ diff -urNp linux-2.6.32.32/include/linux/screen_info.h linux-2.6.32.32/include/l
13710 } __attribute__((packed));
13711
13712 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
13713 -diff -urNp linux-2.6.32.32/include/linux/security.h linux-2.6.32.32/include/linux/security.h
13714 ---- linux-2.6.32.32/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
13715 -+++ linux-2.6.32.32/include/linux/security.h 2010-12-31 14:46:53.000000000 -0500
13716 +diff -urNp linux-2.6.32.33/include/linux/security.h linux-2.6.32.33/include/linux/security.h
13717 +--- linux-2.6.32.33/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
13718 ++++ linux-2.6.32.33/include/linux/security.h 2010-12-31 14:46:53.000000000 -0500
13719 @@ -34,6 +34,7 @@
13720 #include <linux/key.h>
13721 #include <linux/xfrm.h>
13722 @@ -50131,9 +50248,9 @@ diff -urNp linux-2.6.32.32/include/linux/security.h linux-2.6.32.32/include/linu
13723 #include <net/flow.h>
13724
13725 /* Maximum number of letters for an LSM name string */
13726 -diff -urNp linux-2.6.32.32/include/linux/shm.h linux-2.6.32.32/include/linux/shm.h
13727 ---- linux-2.6.32.32/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
13728 -+++ linux-2.6.32.32/include/linux/shm.h 2010-12-31 14:46:53.000000000 -0500
13729 +diff -urNp linux-2.6.32.33/include/linux/shm.h linux-2.6.32.33/include/linux/shm.h
13730 +--- linux-2.6.32.33/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
13731 ++++ linux-2.6.32.33/include/linux/shm.h 2010-12-31 14:46:53.000000000 -0500
13732 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
13733 pid_t shm_cprid;
13734 pid_t shm_lprid;
13735 @@ -50145,9 +50262,9 @@ diff -urNp linux-2.6.32.32/include/linux/shm.h linux-2.6.32.32/include/linux/shm
13736 };
13737
13738 /* shm_mode upper byte flags */
13739 -diff -urNp linux-2.6.32.32/include/linux/skbuff.h linux-2.6.32.32/include/linux/skbuff.h
13740 ---- linux-2.6.32.32/include/linux/skbuff.h 2010-08-13 16:24:37.000000000 -0400
13741 -+++ linux-2.6.32.32/include/linux/skbuff.h 2010-12-31 14:46:53.000000000 -0500
13742 +diff -urNp linux-2.6.32.33/include/linux/skbuff.h linux-2.6.32.33/include/linux/skbuff.h
13743 +--- linux-2.6.32.33/include/linux/skbuff.h 2010-08-13 16:24:37.000000000 -0400
13744 ++++ linux-2.6.32.33/include/linux/skbuff.h 2010-12-31 14:46:53.000000000 -0500
13745 @@ -544,7 +544,7 @@ static inline union skb_shared_tx *skb_t
13746 */
13747 static inline int skb_queue_empty(const struct sk_buff_head *list)
13748 @@ -50175,9 +50292,9 @@ diff -urNp linux-2.6.32.32/include/linux/skbuff.h linux-2.6.32.32/include/linux/
13749 }
13750
13751 /**
13752 -diff -urNp linux-2.6.32.32/include/linux/slab.h linux-2.6.32.32/include/linux/slab.h
13753 ---- linux-2.6.32.32/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
13754 -+++ linux-2.6.32.32/include/linux/slab.h 2010-12-31 14:46:53.000000000 -0500
13755 +diff -urNp linux-2.6.32.33/include/linux/slab.h linux-2.6.32.33/include/linux/slab.h
13756 +--- linux-2.6.32.33/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
13757 ++++ linux-2.6.32.33/include/linux/slab.h 2010-12-31 14:46:53.000000000 -0500
13758 @@ -11,6 +11,7 @@
13759
13760 #include <linux/gfp.h>
13761 @@ -50249,9 +50366,9 @@ diff -urNp linux-2.6.32.32/include/linux/slab.h linux-2.6.32.32/include/linux/sl
13762 +})
13763 +
13764 #endif /* _LINUX_SLAB_H */
13765 -diff -urNp linux-2.6.32.32/include/linux/slub_def.h linux-2.6.32.32/include/linux/slub_def.h
13766 ---- linux-2.6.32.32/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
13767 -+++ linux-2.6.32.32/include/linux/slub_def.h 2010-12-31 14:46:53.000000000 -0500
13768 +diff -urNp linux-2.6.32.33/include/linux/slub_def.h linux-2.6.32.33/include/linux/slub_def.h
13769 +--- linux-2.6.32.33/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
13770 ++++ linux-2.6.32.33/include/linux/slub_def.h 2010-12-31 14:46:53.000000000 -0500
13771 @@ -86,7 +86,7 @@ struct kmem_cache {
13772 struct kmem_cache_order_objects max;
13773 struct kmem_cache_order_objects min;
13774 @@ -50261,9 +50378,9 @@ diff -urNp linux-2.6.32.32/include/linux/slub_def.h linux-2.6.32.32/include/linu
13775 void (*ctor)(void *);
13776 int inuse; /* Offset to metadata */
13777 int align; /* Alignment */
13778 -diff -urNp linux-2.6.32.32/include/linux/sonet.h linux-2.6.32.32/include/linux/sonet.h
13779 ---- linux-2.6.32.32/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
13780 -+++ linux-2.6.32.32/include/linux/sonet.h 2010-12-31 14:46:53.000000000 -0500
13781 +diff -urNp linux-2.6.32.33/include/linux/sonet.h linux-2.6.32.33/include/linux/sonet.h
13782 +--- linux-2.6.32.33/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
13783 ++++ linux-2.6.32.33/include/linux/sonet.h 2010-12-31 14:46:53.000000000 -0500
13784 @@ -61,7 +61,7 @@ struct sonet_stats {
13785 #include <asm/atomic.h>
13786
13787 @@ -50273,9 +50390,9 @@ diff -urNp linux-2.6.32.32/include/linux/sonet.h linux-2.6.32.32/include/linux/s
13788 __SONET_ITEMS
13789 #undef __HANDLE_ITEM
13790 };
13791 -diff -urNp linux-2.6.32.32/include/linux/sunrpc/clnt.h linux-2.6.32.32/include/linux/sunrpc/clnt.h
13792 ---- linux-2.6.32.32/include/linux/sunrpc/clnt.h 2010-08-13 16:24:37.000000000 -0400
13793 -+++ linux-2.6.32.32/include/linux/sunrpc/clnt.h 2010-12-31 14:46:53.000000000 -0500
13794 +diff -urNp linux-2.6.32.33/include/linux/sunrpc/clnt.h linux-2.6.32.33/include/linux/sunrpc/clnt.h
13795 +--- linux-2.6.32.33/include/linux/sunrpc/clnt.h 2010-08-13 16:24:37.000000000 -0400
13796 ++++ linux-2.6.32.33/include/linux/sunrpc/clnt.h 2010-12-31 14:46:53.000000000 -0500
13797 @@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
13798 {
13799 switch (sap->sa_family) {
13800 @@ -50306,9 +50423,9 @@ diff -urNp linux-2.6.32.32/include/linux/sunrpc/clnt.h linux-2.6.32.32/include/l
13801 }
13802
13803 #endif /* __KERNEL__ */
13804 -diff -urNp linux-2.6.32.32/include/linux/suspend.h linux-2.6.32.32/include/linux/suspend.h
13805 ---- linux-2.6.32.32/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
13806 -+++ linux-2.6.32.32/include/linux/suspend.h 2010-12-31 14:46:53.000000000 -0500
13807 +diff -urNp linux-2.6.32.33/include/linux/suspend.h linux-2.6.32.33/include/linux/suspend.h
13808 +--- linux-2.6.32.33/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
13809 ++++ linux-2.6.32.33/include/linux/suspend.h 2010-12-31 14:46:53.000000000 -0500
13810 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
13811 * which require special recovery actions in that situation.
13812 */
13813 @@ -50397,9 +50514,9 @@ diff -urNp linux-2.6.32.32/include/linux/suspend.h linux-2.6.32.32/include/linux
13814 static inline int hibernate(void) { return -ENOSYS; }
13815 static inline bool system_entering_hibernation(void) { return false; }
13816 #endif /* CONFIG_HIBERNATION */
13817 -diff -urNp linux-2.6.32.32/include/linux/sysctl.h linux-2.6.32.32/include/linux/sysctl.h
13818 ---- linux-2.6.32.32/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
13819 -+++ linux-2.6.32.32/include/linux/sysctl.h 2010-12-31 14:46:53.000000000 -0500
13820 +diff -urNp linux-2.6.32.33/include/linux/sysctl.h linux-2.6.32.33/include/linux/sysctl.h
13821 +--- linux-2.6.32.33/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
13822 ++++ linux-2.6.32.33/include/linux/sysctl.h 2010-12-31 14:46:53.000000000 -0500
13823 @@ -164,7 +164,11 @@ enum
13824 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
13825 };
13826 @@ -50430,9 +50547,9 @@ diff -urNp linux-2.6.32.32/include/linux/sysctl.h linux-2.6.32.32/include/linux/
13827 extern ctl_handler sysctl_intvec;
13828 extern ctl_handler sysctl_jiffies;
13829 extern ctl_handler sysctl_ms_jiffies;
13830 -diff -urNp linux-2.6.32.32/include/linux/sysfs.h linux-2.6.32.32/include/linux/sysfs.h
13831 ---- linux-2.6.32.32/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
13832 -+++ linux-2.6.32.32/include/linux/sysfs.h 2010-12-31 14:46:53.000000000 -0500
13833 +diff -urNp linux-2.6.32.33/include/linux/sysfs.h linux-2.6.32.33/include/linux/sysfs.h
13834 +--- linux-2.6.32.33/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
13835 ++++ linux-2.6.32.33/include/linux/sysfs.h 2010-12-31 14:46:53.000000000 -0500
13836 @@ -75,8 +75,8 @@ struct bin_attribute {
13837 };
13838
13839 @@ -50444,9 +50561,9 @@ diff -urNp linux-2.6.32.32/include/linux/sysfs.h linux-2.6.32.32/include/linux/s
13840 };
13841
13842 struct sysfs_dirent;
13843 -diff -urNp linux-2.6.32.32/include/linux/thread_info.h linux-2.6.32.32/include/linux/thread_info.h
13844 ---- linux-2.6.32.32/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
13845 -+++ linux-2.6.32.32/include/linux/thread_info.h 2010-12-31 14:46:53.000000000 -0500
13846 +diff -urNp linux-2.6.32.33/include/linux/thread_info.h linux-2.6.32.33/include/linux/thread_info.h
13847 +--- linux-2.6.32.33/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
13848 ++++ linux-2.6.32.33/include/linux/thread_info.h 2010-12-31 14:46:53.000000000 -0500
13849 @@ -23,7 +23,7 @@ struct restart_block {
13850 };
13851 /* For futex_wait and futex_wait_requeue_pi */
13852 @@ -50456,9 +50573,9 @@ diff -urNp linux-2.6.32.32/include/linux/thread_info.h linux-2.6.32.32/include/l
13853 u32 val;
13854 u32 flags;
13855 u32 bitset;
13856 -diff -urNp linux-2.6.32.32/include/linux/tty.h linux-2.6.32.32/include/linux/tty.h
13857 ---- linux-2.6.32.32/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
13858 -+++ linux-2.6.32.32/include/linux/tty.h 2010-12-31 14:46:53.000000000 -0500
13859 +diff -urNp linux-2.6.32.33/include/linux/tty.h linux-2.6.32.33/include/linux/tty.h
13860 +--- linux-2.6.32.33/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
13861 ++++ linux-2.6.32.33/include/linux/tty.h 2010-12-31 14:46:53.000000000 -0500
13862 @@ -13,6 +13,7 @@
13863 #include <linux/tty_driver.h>
13864 #include <linux/tty_ldisc.h>
13865 @@ -50494,9 +50611,9 @@ diff -urNp linux-2.6.32.32/include/linux/tty.h linux-2.6.32.32/include/linux/tty
13866
13867 /* n_tty.c */
13868 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
13869 -diff -urNp linux-2.6.32.32/include/linux/tty_ldisc.h linux-2.6.32.32/include/linux/tty_ldisc.h
13870 ---- linux-2.6.32.32/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
13871 -+++ linux-2.6.32.32/include/linux/tty_ldisc.h 2010-12-31 14:46:53.000000000 -0500
13872 +diff -urNp linux-2.6.32.33/include/linux/tty_ldisc.h linux-2.6.32.33/include/linux/tty_ldisc.h
13873 +--- linux-2.6.32.33/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
13874 ++++ linux-2.6.32.33/include/linux/tty_ldisc.h 2010-12-31 14:46:53.000000000 -0500
13875 @@ -139,7 +139,7 @@ struct tty_ldisc_ops {
13876
13877 struct module *owner;
13878 @@ -50506,9 +50623,9 @@ diff -urNp linux-2.6.32.32/include/linux/tty_ldisc.h linux-2.6.32.32/include/lin
13879 };
13880
13881 struct tty_ldisc {
13882 -diff -urNp linux-2.6.32.32/include/linux/types.h linux-2.6.32.32/include/linux/types.h
13883 ---- linux-2.6.32.32/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
13884 -+++ linux-2.6.32.32/include/linux/types.h 2010-12-31 14:46:53.000000000 -0500
13885 +diff -urNp linux-2.6.32.33/include/linux/types.h linux-2.6.32.33/include/linux/types.h
13886 +--- linux-2.6.32.33/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
13887 ++++ linux-2.6.32.33/include/linux/types.h 2010-12-31 14:46:53.000000000 -0500
13888 @@ -191,10 +191,26 @@ typedef struct {
13889 volatile int counter;
13890 } atomic_t;
13891 @@ -50536,9 +50653,9 @@ diff -urNp linux-2.6.32.32/include/linux/types.h linux-2.6.32.32/include/linux/t
13892 #endif
13893
13894 struct ustat {
13895 -diff -urNp linux-2.6.32.32/include/linux/uaccess.h linux-2.6.32.32/include/linux/uaccess.h
13896 ---- linux-2.6.32.32/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
13897 -+++ linux-2.6.32.32/include/linux/uaccess.h 2010-12-31 14:46:53.000000000 -0500
13898 +diff -urNp linux-2.6.32.33/include/linux/uaccess.h linux-2.6.32.33/include/linux/uaccess.h
13899 +--- linux-2.6.32.33/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
13900 ++++ linux-2.6.32.33/include/linux/uaccess.h 2010-12-31 14:46:53.000000000 -0500
13901 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
13902 long ret; \
13903 mm_segment_t old_fs = get_fs(); \
13904 @@ -50570,9 +50687,9 @@ diff -urNp linux-2.6.32.32/include/linux/uaccess.h linux-2.6.32.32/include/linux
13905 +extern long probe_kernel_write(void *dst, const void *src, size_t size);
13906
13907 #endif /* __LINUX_UACCESS_H__ */
13908 -diff -urNp linux-2.6.32.32/include/linux/unaligned/access_ok.h linux-2.6.32.32/include/linux/unaligned/access_ok.h
13909 ---- linux-2.6.32.32/include/linux/unaligned/access_ok.h 2010-08-13 16:24:37.000000000 -0400
13910 -+++ linux-2.6.32.32/include/linux/unaligned/access_ok.h 2010-12-31 14:46:53.000000000 -0500
13911 +diff -urNp linux-2.6.32.33/include/linux/unaligned/access_ok.h linux-2.6.32.33/include/linux/unaligned/access_ok.h
13912 +--- linux-2.6.32.33/include/linux/unaligned/access_ok.h 2010-08-13 16:24:37.000000000 -0400
13913 ++++ linux-2.6.32.33/include/linux/unaligned/access_ok.h 2010-12-31 14:46:53.000000000 -0500
13914 @@ -6,32 +6,32 @@
13915
13916 static inline u16 get_unaligned_le16(const void *p)
13917 @@ -50612,9 +50729,9 @@ diff -urNp linux-2.6.32.32/include/linux/unaligned/access_ok.h linux-2.6.32.32/i
13918 }
13919
13920 static inline void put_unaligned_le16(u16 val, void *p)
13921 -diff -urNp linux-2.6.32.32/include/linux/vmalloc.h linux-2.6.32.32/include/linux/vmalloc.h
13922 ---- linux-2.6.32.32/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
13923 -+++ linux-2.6.32.32/include/linux/vmalloc.h 2010-12-31 14:46:53.000000000 -0500
13924 +diff -urNp linux-2.6.32.33/include/linux/vmalloc.h linux-2.6.32.33/include/linux/vmalloc.h
13925 +--- linux-2.6.32.33/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
13926 ++++ linux-2.6.32.33/include/linux/vmalloc.h 2010-12-31 14:46:53.000000000 -0500
13927 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
13928 #define VM_MAP 0x00000004 /* vmap()ed pages */
13929 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
13930 @@ -50709,9 +50826,9 @@ diff -urNp linux-2.6.32.32/include/linux/vmalloc.h linux-2.6.32.32/include/linux
13931 +})
13932 +
13933 #endif /* _LINUX_VMALLOC_H */
13934 -diff -urNp linux-2.6.32.32/include/linux/vmstat.h linux-2.6.32.32/include/linux/vmstat.h
13935 ---- linux-2.6.32.32/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
13936 -+++ linux-2.6.32.32/include/linux/vmstat.h 2010-12-31 14:46:53.000000000 -0500
13937 +diff -urNp linux-2.6.32.33/include/linux/vmstat.h linux-2.6.32.33/include/linux/vmstat.h
13938 +--- linux-2.6.32.33/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
13939 ++++ linux-2.6.32.33/include/linux/vmstat.h 2010-12-31 14:46:53.000000000 -0500
13940 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
13941 /*
13942 * Zone based page accounting with per cpu differentials.
13943 @@ -50775,9 +50892,9 @@ diff -urNp linux-2.6.32.32/include/linux/vmstat.h linux-2.6.32.32/include/linux/
13944 }
13945
13946 static inline void __dec_zone_page_state(struct page *page,
13947 -diff -urNp linux-2.6.32.32/include/net/inetpeer.h linux-2.6.32.32/include/net/inetpeer.h
13948 ---- linux-2.6.32.32/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400
13949 -+++ linux-2.6.32.32/include/net/inetpeer.h 2010-12-31 14:46:53.000000000 -0500
13950 +diff -urNp linux-2.6.32.33/include/net/inetpeer.h linux-2.6.32.33/include/net/inetpeer.h
13951 +--- linux-2.6.32.33/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400
13952 ++++ linux-2.6.32.33/include/net/inetpeer.h 2010-12-31 14:46:53.000000000 -0500
13953 @@ -24,7 +24,7 @@ struct inet_peer
13954 __u32 dtime; /* the time of last use of not
13955 * referenced entries */
13956 @@ -50787,9 +50904,9 @@ diff -urNp linux-2.6.32.32/include/net/inetpeer.h linux-2.6.32.32/include/net/in
13957 __u32 tcp_ts;
13958 unsigned long tcp_ts_stamp;
13959 };
13960 -diff -urNp linux-2.6.32.32/include/net/irda/ircomm_tty.h linux-2.6.32.32/include/net/irda/ircomm_tty.h
13961 ---- linux-2.6.32.32/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
13962 -+++ linux-2.6.32.32/include/net/irda/ircomm_tty.h 2011-01-25 20:24:47.000000000 -0500
13963 +diff -urNp linux-2.6.32.33/include/net/irda/ircomm_tty.h linux-2.6.32.33/include/net/irda/ircomm_tty.h
13964 +--- linux-2.6.32.33/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
13965 ++++ linux-2.6.32.33/include/net/irda/ircomm_tty.h 2011-01-25 20:24:47.000000000 -0500
13966 @@ -35,6 +35,7 @@
13967 #include <linux/termios.h>
13968 #include <linux/timer.h>
13969 @@ -50809,9 +50926,9 @@ diff -urNp linux-2.6.32.32/include/net/irda/ircomm_tty.h linux-2.6.32.32/include
13970
13971 /* Protect concurent access to :
13972 * o self->open_count
13973 -diff -urNp linux-2.6.32.32/include/net/neighbour.h linux-2.6.32.32/include/net/neighbour.h
13974 ---- linux-2.6.32.32/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
13975 -+++ linux-2.6.32.32/include/net/neighbour.h 2010-12-31 14:46:53.000000000 -0500
13976 +diff -urNp linux-2.6.32.33/include/net/neighbour.h linux-2.6.32.33/include/net/neighbour.h
13977 +--- linux-2.6.32.33/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
13978 ++++ linux-2.6.32.33/include/net/neighbour.h 2010-12-31 14:46:53.000000000 -0500
13979 @@ -125,12 +125,12 @@ struct neighbour
13980 struct neigh_ops
13981 {
13982 @@ -50831,9 +50948,9 @@ diff -urNp linux-2.6.32.32/include/net/neighbour.h linux-2.6.32.32/include/net/n
13983 };
13984
13985 struct pneigh_entry
13986 -diff -urNp linux-2.6.32.32/include/net/netlink.h linux-2.6.32.32/include/net/netlink.h
13987 ---- linux-2.6.32.32/include/net/netlink.h 2010-08-13 16:24:37.000000000 -0400
13988 -+++ linux-2.6.32.32/include/net/netlink.h 2010-12-31 14:46:53.000000000 -0500
13989 +diff -urNp linux-2.6.32.33/include/net/netlink.h linux-2.6.32.33/include/net/netlink.h
13990 +--- linux-2.6.32.33/include/net/netlink.h 2010-08-13 16:24:37.000000000 -0400
13991 ++++ linux-2.6.32.33/include/net/netlink.h 2010-12-31 14:46:53.000000000 -0500
13992 @@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
13993 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
13994 {
13995 @@ -50843,9 +50960,9 @@ diff -urNp linux-2.6.32.32/include/net/netlink.h linux-2.6.32.32/include/net/net
13996 }
13997
13998 /**
13999 -diff -urNp linux-2.6.32.32/include/net/sctp/sctp.h linux-2.6.32.32/include/net/sctp/sctp.h
14000 ---- linux-2.6.32.32/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
14001 -+++ linux-2.6.32.32/include/net/sctp/sctp.h 2010-12-31 14:46:53.000000000 -0500
14002 +diff -urNp linux-2.6.32.33/include/net/sctp/sctp.h linux-2.6.32.33/include/net/sctp/sctp.h
14003 +--- linux-2.6.32.33/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
14004 ++++ linux-2.6.32.33/include/net/sctp/sctp.h 2010-12-31 14:46:53.000000000 -0500
14005 @@ -305,8 +305,8 @@ extern int sctp_debug_flag;
14006
14007 #else /* SCTP_DEBUG */
14008 @@ -50857,9 +50974,9 @@ diff -urNp linux-2.6.32.32/include/net/sctp/sctp.h linux-2.6.32.32/include/net/s
14009 #define SCTP_ENABLE_DEBUG
14010 #define SCTP_DISABLE_DEBUG
14011 #define SCTP_ASSERT(expr, str, func)
14012 -diff -urNp linux-2.6.32.32/include/net/tcp.h linux-2.6.32.32/include/net/tcp.h
14013 ---- linux-2.6.32.32/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
14014 -+++ linux-2.6.32.32/include/net/tcp.h 2010-12-31 14:46:53.000000000 -0500
14015 +diff -urNp linux-2.6.32.33/include/net/tcp.h linux-2.6.32.33/include/net/tcp.h
14016 +--- linux-2.6.32.33/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
14017 ++++ linux-2.6.32.33/include/net/tcp.h 2010-12-31 14:46:53.000000000 -0500
14018 @@ -1444,6 +1444,7 @@ enum tcp_seq_states {
14019 struct tcp_seq_afinfo {
14020 char *name;
14021 @@ -50868,9 +50985,9 @@ diff -urNp linux-2.6.32.32/include/net/tcp.h linux-2.6.32.32/include/net/tcp.h
14022 struct file_operations seq_fops;
14023 struct seq_operations seq_ops;
14024 };
14025 -diff -urNp linux-2.6.32.32/include/net/udp.h linux-2.6.32.32/include/net/udp.h
14026 ---- linux-2.6.32.32/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
14027 -+++ linux-2.6.32.32/include/net/udp.h 2010-12-31 14:46:53.000000000 -0500
14028 +diff -urNp linux-2.6.32.33/include/net/udp.h linux-2.6.32.33/include/net/udp.h
14029 +--- linux-2.6.32.33/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
14030 ++++ linux-2.6.32.33/include/net/udp.h 2010-12-31 14:46:53.000000000 -0500
14031 @@ -187,6 +187,7 @@ struct udp_seq_afinfo {
14032 char *name;
14033 sa_family_t family;
14034 @@ -50879,9 +50996,9 @@ diff -urNp linux-2.6.32.32/include/net/udp.h linux-2.6.32.32/include/net/udp.h
14035 struct file_operations seq_fops;
14036 struct seq_operations seq_ops;
14037 };
14038 -diff -urNp linux-2.6.32.32/include/sound/ac97_codec.h linux-2.6.32.32/include/sound/ac97_codec.h
14039 ---- linux-2.6.32.32/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
14040 -+++ linux-2.6.32.32/include/sound/ac97_codec.h 2010-12-31 14:46:53.000000000 -0500
14041 +diff -urNp linux-2.6.32.33/include/sound/ac97_codec.h linux-2.6.32.33/include/sound/ac97_codec.h
14042 +--- linux-2.6.32.33/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
14043 ++++ linux-2.6.32.33/include/sound/ac97_codec.h 2010-12-31 14:46:53.000000000 -0500
14044 @@ -419,15 +419,15 @@
14045 struct snd_ac97;
14046
14047 @@ -50914,9 +51031,9 @@ diff -urNp linux-2.6.32.32/include/sound/ac97_codec.h linux-2.6.32.32/include/so
14048 void *private_data;
14049 void (*private_free) (struct snd_ac97 *ac97);
14050 /* --- */
14051 -diff -urNp linux-2.6.32.32/include/trace/events/irq.h linux-2.6.32.32/include/trace/events/irq.h
14052 ---- linux-2.6.32.32/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
14053 -+++ linux-2.6.32.32/include/trace/events/irq.h 2010-12-31 14:46:53.000000000 -0500
14054 +diff -urNp linux-2.6.32.33/include/trace/events/irq.h linux-2.6.32.33/include/trace/events/irq.h
14055 +--- linux-2.6.32.33/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
14056 ++++ linux-2.6.32.33/include/trace/events/irq.h 2010-12-31 14:46:53.000000000 -0500
14057 @@ -34,7 +34,7 @@
14058 */
14059 TRACE_EVENT(irq_handler_entry,
14060 @@ -50953,9 +51070,9 @@ diff -urNp linux-2.6.32.32/include/trace/events/irq.h linux-2.6.32.32/include/tr
14061
14062 TP_ARGS(h, vec),
14063
14064 -diff -urNp linux-2.6.32.32/include/video/uvesafb.h linux-2.6.32.32/include/video/uvesafb.h
14065 ---- linux-2.6.32.32/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
14066 -+++ linux-2.6.32.32/include/video/uvesafb.h 2010-12-31 14:46:53.000000000 -0500
14067 +diff -urNp linux-2.6.32.33/include/video/uvesafb.h linux-2.6.32.33/include/video/uvesafb.h
14068 +--- linux-2.6.32.33/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
14069 ++++ linux-2.6.32.33/include/video/uvesafb.h 2010-12-31 14:46:53.000000000 -0500
14070 @@ -177,6 +177,7 @@ struct uvesafb_par {
14071 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
14072 u8 pmi_setpal; /* PMI for palette changes */
14073 @@ -50964,9 +51081,9 @@ diff -urNp linux-2.6.32.32/include/video/uvesafb.h linux-2.6.32.32/include/video
14074 void *pmi_start;
14075 void *pmi_pal;
14076 u8 *vbe_state_orig; /*
14077 -diff -urNp linux-2.6.32.32/init/do_mounts.c linux-2.6.32.32/init/do_mounts.c
14078 ---- linux-2.6.32.32/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
14079 -+++ linux-2.6.32.32/init/do_mounts.c 2011-01-04 17:42:43.000000000 -0500
14080 +diff -urNp linux-2.6.32.33/init/do_mounts.c linux-2.6.32.33/init/do_mounts.c
14081 +--- linux-2.6.32.33/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
14082 ++++ linux-2.6.32.33/init/do_mounts.c 2011-01-04 17:42:43.000000000 -0500
14083 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
14084
14085 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
14086 @@ -51012,9 +51129,9 @@ diff -urNp linux-2.6.32.32/init/do_mounts.c linux-2.6.32.32/init/do_mounts.c
14087 + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
14088 + sys_chroot((__force char __user *)".");
14089 }
14090 -diff -urNp linux-2.6.32.32/init/do_mounts.h linux-2.6.32.32/init/do_mounts.h
14091 ---- linux-2.6.32.32/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
14092 -+++ linux-2.6.32.32/init/do_mounts.h 2010-12-31 14:46:53.000000000 -0500
14093 +diff -urNp linux-2.6.32.33/init/do_mounts.h linux-2.6.32.33/init/do_mounts.h
14094 +--- linux-2.6.32.33/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
14095 ++++ linux-2.6.32.33/init/do_mounts.h 2010-12-31 14:46:53.000000000 -0500
14096 @@ -15,15 +15,15 @@ extern int root_mountflags;
14097
14098 static inline int create_dev(char *name, dev_t dev)
14099 @@ -51034,9 +51151,9 @@ diff -urNp linux-2.6.32.32/init/do_mounts.h linux-2.6.32.32/init/do_mounts.h
14100 return 0;
14101 if (!S_ISBLK(stat.st_mode))
14102 return 0;
14103 -diff -urNp linux-2.6.32.32/init/do_mounts_initrd.c linux-2.6.32.32/init/do_mounts_initrd.c
14104 ---- linux-2.6.32.32/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
14105 -+++ linux-2.6.32.32/init/do_mounts_initrd.c 2010-12-31 14:46:53.000000000 -0500
14106 +diff -urNp linux-2.6.32.33/init/do_mounts_initrd.c linux-2.6.32.33/init/do_mounts_initrd.c
14107 +--- linux-2.6.32.33/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
14108 ++++ linux-2.6.32.33/init/do_mounts_initrd.c 2010-12-31 14:46:53.000000000 -0500
14109 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
14110 sys_close(old_fd);sys_close(root_fd);
14111 sys_close(0);sys_close(1);sys_close(2);
14112 @@ -51120,9 +51237,9 @@ diff -urNp linux-2.6.32.32/init/do_mounts_initrd.c linux-2.6.32.32/init/do_mount
14113 + sys_unlink((__force const char __user *)"/initrd.image");
14114 return 0;
14115 }
14116 -diff -urNp linux-2.6.32.32/init/do_mounts_md.c linux-2.6.32.32/init/do_mounts_md.c
14117 ---- linux-2.6.32.32/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
14118 -+++ linux-2.6.32.32/init/do_mounts_md.c 2010-12-31 14:46:53.000000000 -0500
14119 +diff -urNp linux-2.6.32.33/init/do_mounts_md.c linux-2.6.32.33/init/do_mounts_md.c
14120 +--- linux-2.6.32.33/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
14121 ++++ linux-2.6.32.33/init/do_mounts_md.c 2010-12-31 14:46:53.000000000 -0500
14122 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
14123 partitioned ? "_d" : "", minor,
14124 md_setup_args[ent].device_names);
14125 @@ -51150,9 +51267,9 @@ diff -urNp linux-2.6.32.32/init/do_mounts_md.c linux-2.6.32.32/init/do_mounts_md
14126 if (fd >= 0) {
14127 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
14128 sys_close(fd);
14129 -diff -urNp linux-2.6.32.32/init/initramfs.c linux-2.6.32.32/init/initramfs.c
14130 ---- linux-2.6.32.32/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
14131 -+++ linux-2.6.32.32/init/initramfs.c 2010-12-31 14:46:53.000000000 -0500
14132 +diff -urNp linux-2.6.32.33/init/initramfs.c linux-2.6.32.33/init/initramfs.c
14133 +--- linux-2.6.32.33/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
14134 ++++ linux-2.6.32.33/init/initramfs.c 2010-12-31 14:46:53.000000000 -0500
14135 @@ -74,7 +74,7 @@ static void __init free_hash(void)
14136 }
14137 }
14138 @@ -51261,9 +51378,9 @@ diff -urNp linux-2.6.32.32/init/initramfs.c linux-2.6.32.32/init/initramfs.c
14139 state = SkipIt;
14140 next_state = Reset;
14141 return 0;
14142 -diff -urNp linux-2.6.32.32/init/Kconfig linux-2.6.32.32/init/Kconfig
14143 ---- linux-2.6.32.32/init/Kconfig 2011-02-22 15:56:54.000000000 -0500
14144 -+++ linux-2.6.32.32/init/Kconfig 2011-02-22 15:57:24.000000000 -0500
14145 +diff -urNp linux-2.6.32.33/init/Kconfig linux-2.6.32.33/init/Kconfig
14146 +--- linux-2.6.32.33/init/Kconfig 2011-02-22 15:56:54.000000000 -0500
14147 ++++ linux-2.6.32.33/init/Kconfig 2011-02-22 15:57:24.000000000 -0500
14148 @@ -1004,7 +1004,7 @@ config SLUB_DEBUG
14149
14150 config COMPAT_BRK
14151 @@ -51273,9 +51390,9 @@ diff -urNp linux-2.6.32.32/init/Kconfig linux-2.6.32.32/init/Kconfig
14152 help
14153 Randomizing heap placement makes heap exploits harder, but it
14154 also breaks ancient binaries (including anything libc5 based).
14155 -diff -urNp linux-2.6.32.32/init/main.c linux-2.6.32.32/init/main.c
14156 ---- linux-2.6.32.32/init/main.c 2010-08-13 16:24:37.000000000 -0400
14157 -+++ linux-2.6.32.32/init/main.c 2010-12-31 14:47:01.000000000 -0500
14158 +diff -urNp linux-2.6.32.33/init/main.c linux-2.6.32.33/init/main.c
14159 +--- linux-2.6.32.33/init/main.c 2010-08-13 16:24:37.000000000 -0400
14160 ++++ linux-2.6.32.33/init/main.c 2010-12-31 14:47:01.000000000 -0500
14161 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
14162 #ifdef CONFIG_TC
14163 extern void tc_init(void);
14164 @@ -51417,9 +51534,9 @@ diff -urNp linux-2.6.32.32/init/main.c linux-2.6.32.32/init/main.c
14165 /*
14166 * Ok, we have completed the initial bootup, and
14167 * we're essentially up and running. Get rid of the
14168 -diff -urNp linux-2.6.32.32/init/noinitramfs.c linux-2.6.32.32/init/noinitramfs.c
14169 ---- linux-2.6.32.32/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
14170 -+++ linux-2.6.32.32/init/noinitramfs.c 2010-12-31 14:46:53.000000000 -0500
14171 +diff -urNp linux-2.6.32.33/init/noinitramfs.c linux-2.6.32.33/init/noinitramfs.c
14172 +--- linux-2.6.32.33/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
14173 ++++ linux-2.6.32.33/init/noinitramfs.c 2010-12-31 14:46:53.000000000 -0500
14174 @@ -29,7 +29,7 @@ static int __init default_rootfs(void)
14175 {
14176 int err;
14177 @@ -51438,9 +51555,9 @@ diff -urNp linux-2.6.32.32/init/noinitramfs.c linux-2.6.32.32/init/noinitramfs.c
14178 if (err < 0)
14179 goto out;
14180
14181 -diff -urNp linux-2.6.32.32/ipc/ipc_sysctl.c linux-2.6.32.32/ipc/ipc_sysctl.c
14182 ---- linux-2.6.32.32/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
14183 -+++ linux-2.6.32.32/ipc/ipc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
14184 +diff -urNp linux-2.6.32.33/ipc/ipc_sysctl.c linux-2.6.32.33/ipc/ipc_sysctl.c
14185 +--- linux-2.6.32.33/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
14186 ++++ linux-2.6.32.33/ipc/ipc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
14187 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
14188 .extra1 = &zero,
14189 .extra2 = &one,
14190 @@ -51459,9 +51576,9 @@ diff -urNp linux-2.6.32.32/ipc/ipc_sysctl.c linux-2.6.32.32/ipc/ipc_sysctl.c
14191 };
14192
14193 static int __init ipc_sysctl_init(void)
14194 -diff -urNp linux-2.6.32.32/ipc/mqueue.c linux-2.6.32.32/ipc/mqueue.c
14195 ---- linux-2.6.32.32/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
14196 -+++ linux-2.6.32.32/ipc/mqueue.c 2010-12-31 14:46:53.000000000 -0500
14197 +diff -urNp linux-2.6.32.33/ipc/mqueue.c linux-2.6.32.33/ipc/mqueue.c
14198 +--- linux-2.6.32.33/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
14199 ++++ linux-2.6.32.33/ipc/mqueue.c 2010-12-31 14:46:53.000000000 -0500
14200 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
14201 mq_bytes = (mq_msg_tblsz +
14202 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
14203 @@ -51470,9 +51587,9 @@ diff -urNp linux-2.6.32.32/ipc/mqueue.c linux-2.6.32.32/ipc/mqueue.c
14204 spin_lock(&mq_lock);
14205 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
14206 u->mq_bytes + mq_bytes >
14207 -diff -urNp linux-2.6.32.32/ipc/shm.c linux-2.6.32.32/ipc/shm.c
14208 ---- linux-2.6.32.32/ipc/shm.c 2010-12-09 18:13:03.000000000 -0500
14209 -+++ linux-2.6.32.32/ipc/shm.c 2010-12-31 14:46:53.000000000 -0500
14210 +diff -urNp linux-2.6.32.33/ipc/shm.c linux-2.6.32.33/ipc/shm.c
14211 +--- linux-2.6.32.33/ipc/shm.c 2010-12-09 18:13:03.000000000 -0500
14212 ++++ linux-2.6.32.33/ipc/shm.c 2010-12-31 14:46:53.000000000 -0500
14213 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
14214 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
14215 #endif
14216 @@ -51525,9 +51642,9 @@ diff -urNp linux-2.6.32.32/ipc/shm.c linux-2.6.32.32/ipc/shm.c
14217 size = i_size_read(path.dentry->d_inode);
14218 shm_unlock(shp);
14219
14220 -diff -urNp linux-2.6.32.32/kernel/acct.c linux-2.6.32.32/kernel/acct.c
14221 ---- linux-2.6.32.32/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
14222 -+++ linux-2.6.32.32/kernel/acct.c 2010-12-31 14:46:53.000000000 -0500
14223 +diff -urNp linux-2.6.32.33/kernel/acct.c linux-2.6.32.33/kernel/acct.c
14224 +--- linux-2.6.32.33/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
14225 ++++ linux-2.6.32.33/kernel/acct.c 2010-12-31 14:46:53.000000000 -0500
14226 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
14227 */
14228 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
14229 @@ -51537,9 +51654,9 @@ diff -urNp linux-2.6.32.32/kernel/acct.c linux-2.6.32.32/kernel/acct.c
14230 sizeof(acct_t), &file->f_pos);
14231 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
14232 set_fs(fs);
14233 -diff -urNp linux-2.6.32.32/kernel/audit.c linux-2.6.32.32/kernel/audit.c
14234 ---- linux-2.6.32.32/kernel/audit.c 2010-08-13 16:24:37.000000000 -0400
14235 -+++ linux-2.6.32.32/kernel/audit.c 2010-12-31 14:46:53.000000000 -0500
14236 +diff -urNp linux-2.6.32.33/kernel/audit.c linux-2.6.32.33/kernel/audit.c
14237 +--- linux-2.6.32.33/kernel/audit.c 2010-08-13 16:24:37.000000000 -0400
14238 ++++ linux-2.6.32.33/kernel/audit.c 2010-12-31 14:46:53.000000000 -0500
14239 @@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b
14240 spin_unlock_irq(&tsk->sighand->siglock);
14241 }
14242 @@ -51553,9 +51670,9 @@ diff -urNp linux-2.6.32.32/kernel/audit.c linux-2.6.32.32/kernel/audit.c
14243 break;
14244 }
14245 case AUDIT_TTY_SET: {
14246 -diff -urNp linux-2.6.32.32/kernel/capability.c linux-2.6.32.32/kernel/capability.c
14247 ---- linux-2.6.32.32/kernel/capability.c 2011-02-22 15:56:54.000000000 -0500
14248 -+++ linux-2.6.32.32/kernel/capability.c 2011-02-22 15:57:24.000000000 -0500
14249 +diff -urNp linux-2.6.32.33/kernel/capability.c linux-2.6.32.33/kernel/capability.c
14250 +--- linux-2.6.32.33/kernel/capability.c 2011-02-22 15:56:54.000000000 -0500
14251 ++++ linux-2.6.32.33/kernel/capability.c 2011-02-22 15:57:24.000000000 -0500
14252 @@ -305,10 +305,26 @@ int capable(int cap)
14253 BUG();
14254 }
14255 @@ -51584,9 +51701,9 @@ diff -urNp linux-2.6.32.32/kernel/capability.c linux-2.6.32.32/kernel/capability
14256 +
14257 EXPORT_SYMBOL(capable);
14258 +EXPORT_SYMBOL(capable_nolog);
14259 -diff -urNp linux-2.6.32.32/kernel/configs.c linux-2.6.32.32/kernel/configs.c
14260 ---- linux-2.6.32.32/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
14261 -+++ linux-2.6.32.32/kernel/configs.c 2010-12-31 14:46:53.000000000 -0500
14262 +diff -urNp linux-2.6.32.33/kernel/configs.c linux-2.6.32.33/kernel/configs.c
14263 +--- linux-2.6.32.33/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
14264 ++++ linux-2.6.32.33/kernel/configs.c 2010-12-31 14:46:53.000000000 -0500
14265 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
14266 struct proc_dir_entry *entry;
14267
14268 @@ -51607,9 +51724,9 @@ diff -urNp linux-2.6.32.32/kernel/configs.c linux-2.6.32.32/kernel/configs.c
14269 if (!entry)
14270 return -ENOMEM;
14271
14272 -diff -urNp linux-2.6.32.32/kernel/cpu.c linux-2.6.32.32/kernel/cpu.c
14273 ---- linux-2.6.32.32/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
14274 -+++ linux-2.6.32.32/kernel/cpu.c 2010-12-31 14:46:53.000000000 -0500
14275 +diff -urNp linux-2.6.32.33/kernel/cpu.c linux-2.6.32.33/kernel/cpu.c
14276 +--- linux-2.6.32.33/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
14277 ++++ linux-2.6.32.33/kernel/cpu.c 2010-12-31 14:46:53.000000000 -0500
14278 @@ -19,7 +19,7 @@
14279 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
14280 static DEFINE_MUTEX(cpu_add_remove_lock);
14281 @@ -51619,9 +51736,9 @@ diff -urNp linux-2.6.32.32/kernel/cpu.c linux-2.6.32.32/kernel/cpu.c
14282
14283 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
14284 * Should always be manipulated under cpu_add_remove_lock
14285 -diff -urNp linux-2.6.32.32/kernel/cred.c linux-2.6.32.32/kernel/cred.c
14286 ---- linux-2.6.32.32/kernel/cred.c 2011-03-02 17:24:54.000000000 -0500
14287 -+++ linux-2.6.32.32/kernel/cred.c 2011-03-02 17:25:35.000000000 -0500
14288 +diff -urNp linux-2.6.32.33/kernel/cred.c linux-2.6.32.33/kernel/cred.c
14289 +--- linux-2.6.32.33/kernel/cred.c 2011-03-02 17:24:54.000000000 -0500
14290 ++++ linux-2.6.32.33/kernel/cred.c 2011-03-02 17:25:35.000000000 -0500
14291 @@ -544,6 +544,8 @@ int commit_creds(struct cred *new)
14292
14293 get_cred(new); /* we will require a ref for the subj creds too */
14294 @@ -51631,9 +51748,9 @@ diff -urNp linux-2.6.32.32/kernel/cred.c linux-2.6.32.32/kernel/cred.c
14295 /* dumpability changes */
14296 if (old->euid != new->euid ||
14297 old->egid != new->egid ||
14298 -diff -urNp linux-2.6.32.32/kernel/exit.c linux-2.6.32.32/kernel/exit.c
14299 ---- linux-2.6.32.32/kernel/exit.c 2011-02-22 15:56:54.000000000 -0500
14300 -+++ linux-2.6.32.32/kernel/exit.c 2011-02-22 15:58:29.000000000 -0500
14301 +diff -urNp linux-2.6.32.33/kernel/exit.c linux-2.6.32.33/kernel/exit.c
14302 +--- linux-2.6.32.33/kernel/exit.c 2011-02-22 15:56:54.000000000 -0500
14303 ++++ linux-2.6.32.33/kernel/exit.c 2011-02-22 15:58:29.000000000 -0500
14304 @@ -55,6 +55,10 @@
14305 #include <asm/pgtable.h>
14306 #include <asm/mmu_context.h>
14307 @@ -51762,9 +51879,9 @@ diff -urNp linux-2.6.32.32/kernel/exit.c linux-2.6.32.32/kernel/exit.c
14308
14309 get_task_struct(p);
14310 read_unlock(&tasklist_lock);
14311 -diff -urNp linux-2.6.32.32/kernel/fork.c linux-2.6.32.32/kernel/fork.c
14312 ---- linux-2.6.32.32/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
14313 -+++ linux-2.6.32.32/kernel/fork.c 2010-12-31 14:46:53.000000000 -0500
14314 +diff -urNp linux-2.6.32.33/kernel/fork.c linux-2.6.32.33/kernel/fork.c
14315 +--- linux-2.6.32.33/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
14316 ++++ linux-2.6.32.33/kernel/fork.c 2010-12-31 14:46:53.000000000 -0500
14317 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
14318 *stackend = STACK_END_MAGIC; /* for overflow detection */
14319
14320 @@ -51903,9 +52020,9 @@ diff -urNp linux-2.6.32.32/kernel/fork.c linux-2.6.32.32/kernel/fork.c
14321 new_fs = NULL;
14322 else
14323 new_fs = fs;
14324 -diff -urNp linux-2.6.32.32/kernel/futex.c linux-2.6.32.32/kernel/futex.c
14325 ---- linux-2.6.32.32/kernel/futex.c 2010-11-26 18:22:29.000000000 -0500
14326 -+++ linux-2.6.32.32/kernel/futex.c 2010-12-31 14:47:01.000000000 -0500
14327 +diff -urNp linux-2.6.32.33/kernel/futex.c linux-2.6.32.33/kernel/futex.c
14328 +--- linux-2.6.32.33/kernel/futex.c 2010-11-26 18:22:29.000000000 -0500
14329 ++++ linux-2.6.32.33/kernel/futex.c 2010-12-31 14:47:01.000000000 -0500
14330 @@ -54,6 +54,7 @@
14331 #include <linux/mount.h>
14332 #include <linux/pagemap.h>
14333 @@ -51990,9 +52107,9 @@ diff -urNp linux-2.6.32.32/kernel/futex.c linux-2.6.32.32/kernel/futex.c
14334 if (curval == -EFAULT)
14335 futex_cmpxchg_enabled = 1;
14336
14337 -diff -urNp linux-2.6.32.32/kernel/futex_compat.c linux-2.6.32.32/kernel/futex_compat.c
14338 ---- linux-2.6.32.32/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
14339 -+++ linux-2.6.32.32/kernel/futex_compat.c 2010-12-31 14:46:53.000000000 -0500
14340 +diff -urNp linux-2.6.32.33/kernel/futex_compat.c linux-2.6.32.33/kernel/futex_compat.c
14341 +--- linux-2.6.32.33/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
14342 ++++ linux-2.6.32.33/kernel/futex_compat.c 2010-12-31 14:46:53.000000000 -0500
14343 @@ -10,6 +10,7 @@
14344 #include <linux/compat.h>
14345 #include <linux/nsproxy.h>
14346 @@ -52030,9 +52147,9 @@ diff -urNp linux-2.6.32.32/kernel/futex_compat.c linux-2.6.32.32/kernel/futex_co
14347 head = p->compat_robust_list;
14348 read_unlock(&tasklist_lock);
14349 }
14350 -diff -urNp linux-2.6.32.32/kernel/gcov/base.c linux-2.6.32.32/kernel/gcov/base.c
14351 ---- linux-2.6.32.32/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
14352 -+++ linux-2.6.32.32/kernel/gcov/base.c 2010-12-31 14:46:53.000000000 -0500
14353 +diff -urNp linux-2.6.32.33/kernel/gcov/base.c linux-2.6.32.33/kernel/gcov/base.c
14354 +--- linux-2.6.32.33/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
14355 ++++ linux-2.6.32.33/kernel/gcov/base.c 2010-12-31 14:46:53.000000000 -0500
14356 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
14357 }
14358
14359 @@ -52054,9 +52171,9 @@ diff -urNp linux-2.6.32.32/kernel/gcov/base.c linux-2.6.32.32/kernel/gcov/base.c
14360 if (prev)
14361 prev->next = info->next;
14362 else
14363 -diff -urNp linux-2.6.32.32/kernel/hrtimer.c linux-2.6.32.32/kernel/hrtimer.c
14364 ---- linux-2.6.32.32/kernel/hrtimer.c 2010-10-31 16:44:11.000000000 -0400
14365 -+++ linux-2.6.32.32/kernel/hrtimer.c 2010-12-31 14:46:53.000000000 -0500
14366 +diff -urNp linux-2.6.32.33/kernel/hrtimer.c linux-2.6.32.33/kernel/hrtimer.c
14367 +--- linux-2.6.32.33/kernel/hrtimer.c 2010-10-31 16:44:11.000000000 -0400
14368 ++++ linux-2.6.32.33/kernel/hrtimer.c 2010-12-31 14:46:53.000000000 -0500
14369 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
14370 local_irq_restore(flags);
14371 }
14372 @@ -52066,9 +52183,9 @@ diff -urNp linux-2.6.32.32/kernel/hrtimer.c linux-2.6.32.32/kernel/hrtimer.c
14373 {
14374 hrtimer_peek_ahead_timers();
14375 }
14376 -diff -urNp linux-2.6.32.32/kernel/kallsyms.c linux-2.6.32.32/kernel/kallsyms.c
14377 ---- linux-2.6.32.32/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
14378 -+++ linux-2.6.32.32/kernel/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
14379 +diff -urNp linux-2.6.32.33/kernel/kallsyms.c linux-2.6.32.33/kernel/kallsyms.c
14380 +--- linux-2.6.32.33/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
14381 ++++ linux-2.6.32.33/kernel/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
14382 @@ -11,6 +11,9 @@
14383 * Changed the compression method from stem compression to "table lookup"
14384 * compression (see scripts/kallsyms.c for a more complete description)
14385 @@ -52171,9 +52288,9 @@ diff -urNp linux-2.6.32.32/kernel/kallsyms.c linux-2.6.32.32/kernel/kallsyms.c
14386 if (!iter)
14387 return -ENOMEM;
14388 reset_iter(iter, 0);
14389 -diff -urNp linux-2.6.32.32/kernel/kgdb.c linux-2.6.32.32/kernel/kgdb.c
14390 ---- linux-2.6.32.32/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
14391 -+++ linux-2.6.32.32/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
14392 +diff -urNp linux-2.6.32.33/kernel/kgdb.c linux-2.6.32.33/kernel/kgdb.c
14393 +--- linux-2.6.32.33/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
14394 ++++ linux-2.6.32.33/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
14395 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
14396 /* Guard for recursive entry */
14397 static int exception_level;
14398 @@ -52201,9 +52318,9 @@ diff -urNp linux-2.6.32.32/kernel/kgdb.c linux-2.6.32.32/kernel/kgdb.c
14399 {
14400 BUG_ON(kgdb_connected);
14401
14402 -diff -urNp linux-2.6.32.32/kernel/kmod.c linux-2.6.32.32/kernel/kmod.c
14403 ---- linux-2.6.32.32/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
14404 -+++ linux-2.6.32.32/kernel/kmod.c 2011-02-12 10:58:19.000000000 -0500
14405 +diff -urNp linux-2.6.32.33/kernel/kmod.c linux-2.6.32.33/kernel/kmod.c
14406 +--- linux-2.6.32.33/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
14407 ++++ linux-2.6.32.33/kernel/kmod.c 2011-02-12 10:58:19.000000000 -0500
14408 @@ -90,6 +90,28 @@ int __request_module(bool wait, const ch
14409 if (ret >= MODULE_NAME_LEN)
14410 return -ENAMETOOLONG;
14411 @@ -52233,9 +52350,9 @@ diff -urNp linux-2.6.32.32/kernel/kmod.c linux-2.6.32.32/kernel/kmod.c
14412 /* If modprobe needs a service that is in a module, we get a recursive
14413 * loop. Limit the number of running kmod threads to max_threads/2 or
14414 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
14415 -diff -urNp linux-2.6.32.32/kernel/kprobes.c linux-2.6.32.32/kernel/kprobes.c
14416 ---- linux-2.6.32.32/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
14417 -+++ linux-2.6.32.32/kernel/kprobes.c 2010-12-31 14:46:53.000000000 -0500
14418 +diff -urNp linux-2.6.32.33/kernel/kprobes.c linux-2.6.32.33/kernel/kprobes.c
14419 +--- linux-2.6.32.33/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
14420 ++++ linux-2.6.32.33/kernel/kprobes.c 2010-12-31 14:46:53.000000000 -0500
14421 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
14422 * kernel image and loaded module images reside. This is required
14423 * so x86_64 can correctly handle the %rip-relative fixups.
14424 @@ -52272,9 +52389,9 @@ diff -urNp linux-2.6.32.32/kernel/kprobes.c linux-2.6.32.32/kernel/kprobes.c
14425
14426 head = &kprobe_table[i];
14427 preempt_disable();
14428 -diff -urNp linux-2.6.32.32/kernel/lockdep.c linux-2.6.32.32/kernel/lockdep.c
14429 ---- linux-2.6.32.32/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
14430 -+++ linux-2.6.32.32/kernel/lockdep.c 2010-12-31 14:46:53.000000000 -0500
14431 +diff -urNp linux-2.6.32.33/kernel/lockdep.c linux-2.6.32.33/kernel/lockdep.c
14432 +--- linux-2.6.32.33/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
14433 ++++ linux-2.6.32.33/kernel/lockdep.c 2010-12-31 14:46:53.000000000 -0500
14434 @@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
14435 /*
14436 * Various lockdep statistics:
14437 @@ -52348,9 +52465,9 @@ diff -urNp linux-2.6.32.32/kernel/lockdep.c linux-2.6.32.32/kernel/lockdep.c
14438 if (very_verbose(class)) {
14439 printk("\nacquire class [%p] %s", class->key, class->name);
14440 if (class->name_version > 1)
14441 -diff -urNp linux-2.6.32.32/kernel/lockdep_internals.h linux-2.6.32.32/kernel/lockdep_internals.h
14442 ---- linux-2.6.32.32/kernel/lockdep_internals.h 2010-08-13 16:24:37.000000000 -0400
14443 -+++ linux-2.6.32.32/kernel/lockdep_internals.h 2010-12-31 14:46:53.000000000 -0500
14444 +diff -urNp linux-2.6.32.33/kernel/lockdep_internals.h linux-2.6.32.33/kernel/lockdep_internals.h
14445 +--- linux-2.6.32.33/kernel/lockdep_internals.h 2010-08-13 16:24:37.000000000 -0400
14446 ++++ linux-2.6.32.33/kernel/lockdep_internals.h 2010-12-31 14:46:53.000000000 -0500
14447 @@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
14448 /*
14449 * Various lockdep statistics:
14450 @@ -52398,9 +52515,9 @@ diff -urNp linux-2.6.32.32/kernel/lockdep_internals.h linux-2.6.32.32/kernel/loc
14451 #else
14452 # define debug_atomic_inc(ptr) do { } while (0)
14453 # define debug_atomic_dec(ptr) do { } while (0)
14454 -diff -urNp linux-2.6.32.32/kernel/lockdep_proc.c linux-2.6.32.32/kernel/lockdep_proc.c
14455 ---- linux-2.6.32.32/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
14456 -+++ linux-2.6.32.32/kernel/lockdep_proc.c 2010-12-31 14:46:53.000000000 -0500
14457 +diff -urNp linux-2.6.32.33/kernel/lockdep_proc.c linux-2.6.32.33/kernel/lockdep_proc.c
14458 +--- linux-2.6.32.33/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
14459 ++++ linux-2.6.32.33/kernel/lockdep_proc.c 2010-12-31 14:46:53.000000000 -0500
14460 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
14461
14462 static void print_name(struct seq_file *m, struct lock_class *class)
14463 @@ -52410,9 +52527,9 @@ diff -urNp linux-2.6.32.32/kernel/lockdep_proc.c linux-2.6.32.32/kernel/lockdep_
14464 const char *name = class->name;
14465
14466 if (!name) {
14467 -diff -urNp linux-2.6.32.32/kernel/module.c linux-2.6.32.32/kernel/module.c
14468 ---- linux-2.6.32.32/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
14469 -+++ linux-2.6.32.32/kernel/module.c 2011-02-02 20:27:32.000000000 -0500
14470 +diff -urNp linux-2.6.32.33/kernel/module.c linux-2.6.32.33/kernel/module.c
14471 +--- linux-2.6.32.33/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
14472 ++++ linux-2.6.32.33/kernel/module.c 2011-02-02 20:27:32.000000000 -0500
14473 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
14474 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
14475
14476 @@ -52965,9 +53082,9 @@ diff -urNp linux-2.6.32.32/kernel/module.c linux-2.6.32.32/kernel/module.c
14477 mod = NULL;
14478 }
14479 return mod;
14480 -diff -urNp linux-2.6.32.32/kernel/panic.c linux-2.6.32.32/kernel/panic.c
14481 ---- linux-2.6.32.32/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
14482 -+++ linux-2.6.32.32/kernel/panic.c 2010-12-31 14:46:53.000000000 -0500
14483 +diff -urNp linux-2.6.32.33/kernel/panic.c linux-2.6.32.33/kernel/panic.c
14484 +--- linux-2.6.32.33/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
14485 ++++ linux-2.6.32.33/kernel/panic.c 2010-12-31 14:46:53.000000000 -0500
14486 @@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
14487 const char *board;
14488
14489 @@ -52987,9 +53104,9 @@ diff -urNp linux-2.6.32.32/kernel/panic.c linux-2.6.32.32/kernel/panic.c
14490 __builtin_return_address(0));
14491 }
14492 EXPORT_SYMBOL(__stack_chk_fail);
14493 -diff -urNp linux-2.6.32.32/kernel/params.c linux-2.6.32.32/kernel/params.c
14494 ---- linux-2.6.32.32/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
14495 -+++ linux-2.6.32.32/kernel/params.c 2010-12-31 14:46:53.000000000 -0500
14496 +diff -urNp linux-2.6.32.33/kernel/params.c linux-2.6.32.33/kernel/params.c
14497 +--- linux-2.6.32.33/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
14498 ++++ linux-2.6.32.33/kernel/params.c 2010-12-31 14:46:53.000000000 -0500
14499 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
14500 return ret;
14501 }
14502 @@ -53008,9 +53125,9 @@ diff -urNp linux-2.6.32.32/kernel/params.c linux-2.6.32.32/kernel/params.c
14503 .filter = uevent_filter,
14504 };
14505
14506 -diff -urNp linux-2.6.32.32/kernel/pid.c linux-2.6.32.32/kernel/pid.c
14507 ---- linux-2.6.32.32/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
14508 -+++ linux-2.6.32.32/kernel/pid.c 2010-12-31 14:46:53.000000000 -0500
14509 +diff -urNp linux-2.6.32.33/kernel/pid.c linux-2.6.32.33/kernel/pid.c
14510 +--- linux-2.6.32.33/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
14511 ++++ linux-2.6.32.33/kernel/pid.c 2010-12-31 14:46:53.000000000 -0500
14512 @@ -33,6 +33,7 @@
14513 #include <linux/rculist.h>
14514 #include <linux/bootmem.h>
14515 @@ -53044,9 +53161,9 @@ diff -urNp linux-2.6.32.32/kernel/pid.c linux-2.6.32.32/kernel/pid.c
14516 }
14517
14518 struct task_struct *find_task_by_vpid(pid_t vnr)
14519 -diff -urNp linux-2.6.32.32/kernel/posix-cpu-timers.c linux-2.6.32.32/kernel/posix-cpu-timers.c
14520 ---- linux-2.6.32.32/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
14521 -+++ linux-2.6.32.32/kernel/posix-cpu-timers.c 2010-12-31 14:46:53.000000000 -0500
14522 +diff -urNp linux-2.6.32.33/kernel/posix-cpu-timers.c linux-2.6.32.33/kernel/posix-cpu-timers.c
14523 +--- linux-2.6.32.33/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
14524 ++++ linux-2.6.32.33/kernel/posix-cpu-timers.c 2010-12-31 14:46:53.000000000 -0500
14525 @@ -6,6 +6,7 @@
14526 #include <linux/posix-timers.h>
14527 #include <linux/errno.h>
14528 @@ -53055,9 +53172,9 @@ diff -urNp linux-2.6.32.32/kernel/posix-cpu-timers.c linux-2.6.32.32/kernel/posi
14529 #include <asm/uaccess.h>
14530 #include <linux/kernel_stat.h>
14531 #include <trace/events/timer.h>
14532 -diff -urNp linux-2.6.32.32/kernel/posix-timers.c linux-2.6.32.32/kernel/posix-timers.c
14533 ---- linux-2.6.32.32/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400
14534 -+++ linux-2.6.32.32/kernel/posix-timers.c 2011-01-02 11:29:16.000000000 -0500
14535 +diff -urNp linux-2.6.32.33/kernel/posix-timers.c linux-2.6.32.33/kernel/posix-timers.c
14536 +--- linux-2.6.32.33/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400
14537 ++++ linux-2.6.32.33/kernel/posix-timers.c 2011-01-02 11:29:16.000000000 -0500
14538 @@ -42,6 +42,7 @@
14539 #include <linux/compiler.h>
14540 #include <linux/idr.h>
14541 @@ -53080,9 +53197,9 @@ diff -urNp linux-2.6.32.32/kernel/posix-timers.c linux-2.6.32.32/kernel/posix-ti
14542 return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
14543 }
14544
14545 -diff -urNp linux-2.6.32.32/kernel/power/hibernate.c linux-2.6.32.32/kernel/power/hibernate.c
14546 ---- linux-2.6.32.32/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
14547 -+++ linux-2.6.32.32/kernel/power/hibernate.c 2010-12-31 14:46:53.000000000 -0500
14548 +diff -urNp linux-2.6.32.33/kernel/power/hibernate.c linux-2.6.32.33/kernel/power/hibernate.c
14549 +--- linux-2.6.32.33/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
14550 ++++ linux-2.6.32.33/kernel/power/hibernate.c 2010-12-31 14:46:53.000000000 -0500
14551 @@ -48,14 +48,14 @@ enum {
14552
14553 static int hibernation_mode = HIBERNATION_SHUTDOWN;
14554 @@ -53100,9 +53217,9 @@ diff -urNp linux-2.6.32.32/kernel/power/hibernate.c linux-2.6.32.32/kernel/power
14555 {
14556 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
14557 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
14558 -diff -urNp linux-2.6.32.32/kernel/power/poweroff.c linux-2.6.32.32/kernel/power/poweroff.c
14559 ---- linux-2.6.32.32/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
14560 -+++ linux-2.6.32.32/kernel/power/poweroff.c 2010-12-31 14:46:53.000000000 -0500
14561 +diff -urNp linux-2.6.32.33/kernel/power/poweroff.c linux-2.6.32.33/kernel/power/poweroff.c
14562 +--- linux-2.6.32.33/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
14563 ++++ linux-2.6.32.33/kernel/power/poweroff.c 2010-12-31 14:46:53.000000000 -0500
14564 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
14565 .enable_mask = SYSRQ_ENABLE_BOOT,
14566 };
14567 @@ -53112,9 +53229,9 @@ diff -urNp linux-2.6.32.32/kernel/power/poweroff.c linux-2.6.32.32/kernel/power/
14568 {
14569 register_sysrq_key('o', &sysrq_poweroff_op);
14570 return 0;
14571 -diff -urNp linux-2.6.32.32/kernel/power/process.c linux-2.6.32.32/kernel/power/process.c
14572 ---- linux-2.6.32.32/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
14573 -+++ linux-2.6.32.32/kernel/power/process.c 2010-12-31 14:46:53.000000000 -0500
14574 +diff -urNp linux-2.6.32.33/kernel/power/process.c linux-2.6.32.33/kernel/power/process.c
14575 +--- linux-2.6.32.33/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
14576 ++++ linux-2.6.32.33/kernel/power/process.c 2010-12-31 14:46:53.000000000 -0500
14577 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
14578 struct timeval start, end;
14579 u64 elapsed_csecs64;
14580 @@ -53154,9 +53271,9 @@ diff -urNp linux-2.6.32.32/kernel/power/process.c linux-2.6.32.32/kernel/power/p
14581
14582 do_gettimeofday(&end);
14583 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
14584 -diff -urNp linux-2.6.32.32/kernel/power/suspend.c linux-2.6.32.32/kernel/power/suspend.c
14585 ---- linux-2.6.32.32/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
14586 -+++ linux-2.6.32.32/kernel/power/suspend.c 2010-12-31 14:46:53.000000000 -0500
14587 +diff -urNp linux-2.6.32.33/kernel/power/suspend.c linux-2.6.32.33/kernel/power/suspend.c
14588 +--- linux-2.6.32.33/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
14589 ++++ linux-2.6.32.33/kernel/power/suspend.c 2010-12-31 14:46:53.000000000 -0500
14590 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
14591 [PM_SUSPEND_MEM] = "mem",
14592 };
14593 @@ -53173,9 +53290,9 @@ diff -urNp linux-2.6.32.32/kernel/power/suspend.c linux-2.6.32.32/kernel/power/s
14594 {
14595 mutex_lock(&pm_mutex);
14596 suspend_ops = ops;
14597 -diff -urNp linux-2.6.32.32/kernel/printk.c linux-2.6.32.32/kernel/printk.c
14598 ---- linux-2.6.32.32/kernel/printk.c 2011-01-11 23:55:35.000000000 -0500
14599 -+++ linux-2.6.32.32/kernel/printk.c 2011-01-11 23:56:06.000000000 -0500
14600 +diff -urNp linux-2.6.32.33/kernel/printk.c linux-2.6.32.33/kernel/printk.c
14601 +--- linux-2.6.32.33/kernel/printk.c 2011-01-11 23:55:35.000000000 -0500
14602 ++++ linux-2.6.32.33/kernel/printk.c 2011-01-11 23:56:06.000000000 -0500
14603 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
14604 char c;
14605 int error = 0;
14606 @@ -53188,9 +53305,9 @@ diff -urNp linux-2.6.32.32/kernel/printk.c linux-2.6.32.32/kernel/printk.c
14607 error = security_syslog(type);
14608 if (error)
14609 return error;
14610 -diff -urNp linux-2.6.32.32/kernel/ptrace.c linux-2.6.32.32/kernel/ptrace.c
14611 ---- linux-2.6.32.32/kernel/ptrace.c 2011-02-22 15:56:54.000000000 -0500
14612 -+++ linux-2.6.32.32/kernel/ptrace.c 2011-02-12 10:37:47.000000000 -0500
14613 +diff -urNp linux-2.6.32.33/kernel/ptrace.c linux-2.6.32.33/kernel/ptrace.c
14614 +--- linux-2.6.32.33/kernel/ptrace.c 2011-02-22 15:56:54.000000000 -0500
14615 ++++ linux-2.6.32.33/kernel/ptrace.c 2011-02-12 10:37:47.000000000 -0500
14616 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
14617 cred->gid != tcred->egid ||
14618 cred->gid != tcred->sgid ||
14619 @@ -53295,9 +53412,9 @@ diff -urNp linux-2.6.32.32/kernel/ptrace.c linux-2.6.32.32/kernel/ptrace.c
14620 goto out_put_task_struct;
14621 }
14622
14623 -diff -urNp linux-2.6.32.32/kernel/rcutree.c linux-2.6.32.32/kernel/rcutree.c
14624 ---- linux-2.6.32.32/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
14625 -+++ linux-2.6.32.32/kernel/rcutree.c 2010-12-31 14:46:53.000000000 -0500
14626 +diff -urNp linux-2.6.32.33/kernel/rcutree.c linux-2.6.32.33/kernel/rcutree.c
14627 +--- linux-2.6.32.33/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
14628 ++++ linux-2.6.32.33/kernel/rcutree.c 2010-12-31 14:46:53.000000000 -0500
14629 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
14630 /*
14631 * Do softirq processing for the current CPU.
14632 @@ -53307,9 +53424,9 @@ diff -urNp linux-2.6.32.32/kernel/rcutree.c linux-2.6.32.32/kernel/rcutree.c
14633 {
14634 /*
14635 * Memory references from any prior RCU read-side critical sections
14636 -diff -urNp linux-2.6.32.32/kernel/rcutree_plugin.h linux-2.6.32.32/kernel/rcutree_plugin.h
14637 ---- linux-2.6.32.32/kernel/rcutree_plugin.h 2010-08-13 16:24:37.000000000 -0400
14638 -+++ linux-2.6.32.32/kernel/rcutree_plugin.h 2010-12-31 14:47:01.000000000 -0500
14639 +diff -urNp linux-2.6.32.33/kernel/rcutree_plugin.h linux-2.6.32.33/kernel/rcutree_plugin.h
14640 +--- linux-2.6.32.33/kernel/rcutree_plugin.h 2010-08-13 16:24:37.000000000 -0400
14641 ++++ linux-2.6.32.33/kernel/rcutree_plugin.h 2010-12-31 14:47:01.000000000 -0500
14642 @@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
14643 */
14644 void __rcu_read_lock(void)
14645 @@ -53328,9 +53445,9 @@ diff -urNp linux-2.6.32.32/kernel/rcutree_plugin.h linux-2.6.32.32/kernel/rcutre
14646 unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
14647 rcu_read_unlock_special(t);
14648 }
14649 -diff -urNp linux-2.6.32.32/kernel/relay.c linux-2.6.32.32/kernel/relay.c
14650 ---- linux-2.6.32.32/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
14651 -+++ linux-2.6.32.32/kernel/relay.c 2010-12-31 14:46:53.000000000 -0500
14652 +diff -urNp linux-2.6.32.33/kernel/relay.c linux-2.6.32.33/kernel/relay.c
14653 +--- linux-2.6.32.33/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
14654 ++++ linux-2.6.32.33/kernel/relay.c 2010-12-31 14:46:53.000000000 -0500
14655 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
14656 unsigned int flags,
14657 int *nonpad_ret)
14658 @@ -53348,9 +53465,9 @@ diff -urNp linux-2.6.32.32/kernel/relay.c linux-2.6.32.32/kernel/relay.c
14659
14660 if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
14661 return 0;
14662 -diff -urNp linux-2.6.32.32/kernel/resource.c linux-2.6.32.32/kernel/resource.c
14663 ---- linux-2.6.32.32/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
14664 -+++ linux-2.6.32.32/kernel/resource.c 2010-12-31 14:46:53.000000000 -0500
14665 +diff -urNp linux-2.6.32.33/kernel/resource.c linux-2.6.32.33/kernel/resource.c
14666 +--- linux-2.6.32.33/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
14667 ++++ linux-2.6.32.33/kernel/resource.c 2010-12-31 14:46:53.000000000 -0500
14668 @@ -132,8 +132,18 @@ static const struct file_operations proc
14669
14670 static int __init ioresources_init(void)
14671 @@ -53370,9 +53487,9 @@ diff -urNp linux-2.6.32.32/kernel/resource.c linux-2.6.32.32/kernel/resource.c
14672 return 0;
14673 }
14674 __initcall(ioresources_init);
14675 -diff -urNp linux-2.6.32.32/kernel/rtmutex.c linux-2.6.32.32/kernel/rtmutex.c
14676 ---- linux-2.6.32.32/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400
14677 -+++ linux-2.6.32.32/kernel/rtmutex.c 2010-12-31 14:46:53.000000000 -0500
14678 +diff -urNp linux-2.6.32.33/kernel/rtmutex.c linux-2.6.32.33/kernel/rtmutex.c
14679 +--- linux-2.6.32.33/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400
14680 ++++ linux-2.6.32.33/kernel/rtmutex.c 2010-12-31 14:46:53.000000000 -0500
14681 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
14682 */
14683 spin_lock_irqsave(&pendowner->pi_lock, flags);
14684 @@ -53382,9 +53499,9 @@ diff -urNp linux-2.6.32.32/kernel/rtmutex.c linux-2.6.32.32/kernel/rtmutex.c
14685 WARN_ON(pendowner->pi_blocked_on != waiter);
14686 WARN_ON(pendowner->pi_blocked_on->lock != lock);
14687
14688 -diff -urNp linux-2.6.32.32/kernel/sched.c linux-2.6.32.32/kernel/sched.c
14689 ---- linux-2.6.32.32/kernel/sched.c 2011-02-22 15:56:54.000000000 -0500
14690 -+++ linux-2.6.32.32/kernel/sched.c 2011-02-22 15:57:40.000000000 -0500
14691 +diff -urNp linux-2.6.32.33/kernel/sched.c linux-2.6.32.33/kernel/sched.c
14692 +--- linux-2.6.32.33/kernel/sched.c 2011-02-22 15:56:54.000000000 -0500
14693 ++++ linux-2.6.32.33/kernel/sched.c 2011-02-22 15:57:40.000000000 -0500
14694 @@ -5043,7 +5043,7 @@ out:
14695 * In CONFIG_NO_HZ case, the idle load balance owner will do the
14696 * rebalancing for all the cpus for whom scheduler ticks are stopped.
14697 @@ -53440,9 +53557,9 @@ diff -urNp linux-2.6.32.32/kernel/sched.c linux-2.6.32.32/kernel/sched.c
14698
14699 if (cpu != group_first_cpu(sd->groups))
14700 return;
14701 -diff -urNp linux-2.6.32.32/kernel/signal.c linux-2.6.32.32/kernel/signal.c
14702 ---- linux-2.6.32.32/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
14703 -+++ linux-2.6.32.32/kernel/signal.c 2011-02-12 11:22:46.000000000 -0500
14704 +diff -urNp linux-2.6.32.33/kernel/signal.c linux-2.6.32.33/kernel/signal.c
14705 +--- linux-2.6.32.33/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
14706 ++++ linux-2.6.32.33/kernel/signal.c 2011-02-12 11:22:46.000000000 -0500
14707 @@ -41,12 +41,12 @@
14708
14709 static struct kmem_cache *sigqueue_cachep;
14710 @@ -53545,9 +53662,9 @@ diff -urNp linux-2.6.32.32/kernel/signal.c linux-2.6.32.32/kernel/signal.c
14711
14712 return ret;
14713 }
14714 -diff -urNp linux-2.6.32.32/kernel/smp.c linux-2.6.32.32/kernel/smp.c
14715 ---- linux-2.6.32.32/kernel/smp.c 2011-02-22 15:56:54.000000000 -0500
14716 -+++ linux-2.6.32.32/kernel/smp.c 2011-02-22 15:57:40.000000000 -0500
14717 +diff -urNp linux-2.6.32.33/kernel/smp.c linux-2.6.32.33/kernel/smp.c
14718 +--- linux-2.6.32.33/kernel/smp.c 2011-02-22 15:56:54.000000000 -0500
14719 ++++ linux-2.6.32.33/kernel/smp.c 2011-02-22 15:57:40.000000000 -0500
14720 @@ -489,22 +489,22 @@ int smp_call_function(void (*func)(void
14721 }
14722 EXPORT_SYMBOL(smp_call_function);
14723 @@ -53575,9 +53692,9 @@ diff -urNp linux-2.6.32.32/kernel/smp.c linux-2.6.32.32/kernel/smp.c
14724 {
14725 spin_unlock_irq(&call_function.lock);
14726 }
14727 -diff -urNp linux-2.6.32.32/kernel/softirq.c linux-2.6.32.32/kernel/softirq.c
14728 ---- linux-2.6.32.32/kernel/softirq.c 2011-02-22 15:56:54.000000000 -0500
14729 -+++ linux-2.6.32.32/kernel/softirq.c 2011-02-22 15:57:40.000000000 -0500
14730 +diff -urNp linux-2.6.32.33/kernel/softirq.c linux-2.6.32.33/kernel/softirq.c
14731 +--- linux-2.6.32.33/kernel/softirq.c 2011-02-22 15:56:54.000000000 -0500
14732 ++++ linux-2.6.32.33/kernel/softirq.c 2011-02-22 15:57:40.000000000 -0500
14733 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
14734
14735 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
14736 @@ -53632,9 +53749,9 @@ diff -urNp linux-2.6.32.32/kernel/softirq.c linux-2.6.32.32/kernel/softirq.c
14737 {
14738 struct tasklet_struct *list;
14739
14740 -diff -urNp linux-2.6.32.32/kernel/sys.c linux-2.6.32.32/kernel/sys.c
14741 ---- linux-2.6.32.32/kernel/sys.c 2011-02-22 15:56:54.000000000 -0500
14742 -+++ linux-2.6.32.32/kernel/sys.c 2011-02-22 15:57:40.000000000 -0500
14743 +diff -urNp linux-2.6.32.33/kernel/sys.c linux-2.6.32.33/kernel/sys.c
14744 +--- linux-2.6.32.33/kernel/sys.c 2011-02-22 15:56:54.000000000 -0500
14745 ++++ linux-2.6.32.33/kernel/sys.c 2011-02-22 15:57:40.000000000 -0500
14746 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
14747 error = -EACCES;
14748 goto out;
14749 @@ -53770,9 +53887,9 @@ diff -urNp linux-2.6.32.32/kernel/sys.c linux-2.6.32.32/kernel/sys.c
14750 error = -EINVAL;
14751 break;
14752 }
14753 -diff -urNp linux-2.6.32.32/kernel/sysctl.c linux-2.6.32.32/kernel/sysctl.c
14754 ---- linux-2.6.32.32/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
14755 -+++ linux-2.6.32.32/kernel/sysctl.c 2010-12-31 14:46:53.000000000 -0500
14756 +diff -urNp linux-2.6.32.33/kernel/sysctl.c linux-2.6.32.33/kernel/sysctl.c
14757 +--- linux-2.6.32.33/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
14758 ++++ linux-2.6.32.33/kernel/sysctl.c 2010-12-31 14:46:53.000000000 -0500
14759 @@ -63,6 +63,13 @@
14760 static int deprecated_sysctl_warning(struct __sysctl_args *args);
14761
14762 @@ -54004,9 +54121,9 @@ diff -urNp linux-2.6.32.32/kernel/sysctl.c linux-2.6.32.32/kernel/sysctl.c
14763 +EXPORT_SYMBOL(sysctl_string_modpriv);
14764 EXPORT_SYMBOL(sysctl_data);
14765 EXPORT_SYMBOL(unregister_sysctl_table);
14766 -diff -urNp linux-2.6.32.32/kernel/sysctl_check.c linux-2.6.32.32/kernel/sysctl_check.c
14767 ---- linux-2.6.32.32/kernel/sysctl_check.c 2010-08-13 16:24:37.000000000 -0400
14768 -+++ linux-2.6.32.32/kernel/sysctl_check.c 2010-12-31 14:46:53.000000000 -0500
14769 +diff -urNp linux-2.6.32.33/kernel/sysctl_check.c linux-2.6.32.33/kernel/sysctl_check.c
14770 +--- linux-2.6.32.33/kernel/sysctl_check.c 2010-08-13 16:24:37.000000000 -0400
14771 ++++ linux-2.6.32.33/kernel/sysctl_check.c 2010-12-31 14:46:53.000000000 -0500
14772 @@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
14773 } else {
14774 if ((table->strategy == sysctl_data) ||
14775 @@ -54020,9 +54137,9 @@ diff -urNp linux-2.6.32.32/kernel/sysctl_check.c linux-2.6.32.32/kernel/sysctl_c
14776 (table->proc_handler == proc_dointvec) ||
14777 (table->proc_handler == proc_dointvec_minmax) ||
14778 (table->proc_handler == proc_dointvec_jiffies) ||
14779 -diff -urNp linux-2.6.32.32/kernel/taskstats.c linux-2.6.32.32/kernel/taskstats.c
14780 ---- linux-2.6.32.32/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
14781 -+++ linux-2.6.32.32/kernel/taskstats.c 2010-12-31 14:46:53.000000000 -0500
14782 +diff -urNp linux-2.6.32.33/kernel/taskstats.c linux-2.6.32.33/kernel/taskstats.c
14783 +--- linux-2.6.32.33/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
14784 ++++ linux-2.6.32.33/kernel/taskstats.c 2010-12-31 14:46:53.000000000 -0500
14785 @@ -26,9 +26,12 @@
14786 #include <linux/cgroup.h>
14787 #include <linux/fs.h>
14788 @@ -54046,9 +54163,9 @@ diff -urNp linux-2.6.32.32/kernel/taskstats.c linux-2.6.32.32/kernel/taskstats.c
14789 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
14790 return -ENOMEM;
14791
14792 -diff -urNp linux-2.6.32.32/kernel/time/tick-broadcast.c linux-2.6.32.32/kernel/time/tick-broadcast.c
14793 ---- linux-2.6.32.32/kernel/time/tick-broadcast.c 2011-03-11 17:56:47.000000000 -0500
14794 -+++ linux-2.6.32.32/kernel/time/tick-broadcast.c 2011-03-11 18:01:11.000000000 -0500
14795 +diff -urNp linux-2.6.32.33/kernel/time/tick-broadcast.c linux-2.6.32.33/kernel/time/tick-broadcast.c
14796 +--- linux-2.6.32.33/kernel/time/tick-broadcast.c 2011-03-11 17:56:47.000000000 -0500
14797 ++++ linux-2.6.32.33/kernel/time/tick-broadcast.c 2011-03-11 18:01:11.000000000 -0500
14798 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
14799 * then clear the broadcast bit.
14800 */
14801 @@ -54058,9 +54175,9 @@ diff -urNp linux-2.6.32.32/kernel/time/tick-broadcast.c linux-2.6.32.32/kernel/t
14802
14803 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
14804 tick_broadcast_clear_oneshot(cpu);
14805 -diff -urNp linux-2.6.32.32/kernel/time/timekeeping.c linux-2.6.32.32/kernel/time/timekeeping.c
14806 ---- linux-2.6.32.32/kernel/time/timekeeping.c 2010-08-13 16:24:37.000000000 -0400
14807 -+++ linux-2.6.32.32/kernel/time/timekeeping.c 2011-01-01 00:15:19.000000000 -0500
14808 +diff -urNp linux-2.6.32.33/kernel/time/timekeeping.c linux-2.6.32.33/kernel/time/timekeeping.c
14809 +--- linux-2.6.32.33/kernel/time/timekeeping.c 2010-08-13 16:24:37.000000000 -0400
14810 ++++ linux-2.6.32.33/kernel/time/timekeeping.c 2011-01-01 00:15:19.000000000 -0500
14811 @@ -14,6 +14,7 @@
14812 #include <linux/init.h>
14813 #include <linux/mm.h>
14814 @@ -54078,9 +54195,9 @@ diff -urNp linux-2.6.32.32/kernel/time/timekeeping.c linux-2.6.32.32/kernel/time
14815 write_seqlock_irqsave(&xtime_lock, flags);
14816
14817 timekeeping_forward_now();
14818 -diff -urNp linux-2.6.32.32/kernel/time/timer_list.c linux-2.6.32.32/kernel/time/timer_list.c
14819 ---- linux-2.6.32.32/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
14820 -+++ linux-2.6.32.32/kernel/time/timer_list.c 2010-12-31 14:46:53.000000000 -0500
14821 +diff -urNp linux-2.6.32.33/kernel/time/timer_list.c linux-2.6.32.33/kernel/time/timer_list.c
14822 +--- linux-2.6.32.33/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
14823 ++++ linux-2.6.32.33/kernel/time/timer_list.c 2010-12-31 14:46:53.000000000 -0500
14824 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
14825
14826 static void print_name_offset(struct seq_file *m, void *sym)
14827 @@ -54122,9 +54239,9 @@ diff -urNp linux-2.6.32.32/kernel/time/timer_list.c linux-2.6.32.32/kernel/time/
14828 if (!pe)
14829 return -ENOMEM;
14830 return 0;
14831 -diff -urNp linux-2.6.32.32/kernel/time/timer_stats.c linux-2.6.32.32/kernel/time/timer_stats.c
14832 ---- linux-2.6.32.32/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
14833 -+++ linux-2.6.32.32/kernel/time/timer_stats.c 2010-12-31 14:46:53.000000000 -0500
14834 +diff -urNp linux-2.6.32.33/kernel/time/timer_stats.c linux-2.6.32.33/kernel/time/timer_stats.c
14835 +--- linux-2.6.32.33/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
14836 ++++ linux-2.6.32.33/kernel/time/timer_stats.c 2010-12-31 14:46:53.000000000 -0500
14837 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
14838
14839 static void print_name_offset(struct seq_file *m, unsigned long addr)
14840 @@ -54154,9 +54271,9 @@ diff -urNp linux-2.6.32.32/kernel/time/timer_stats.c linux-2.6.32.32/kernel/time
14841 if (!pe)
14842 return -ENOMEM;
14843 return 0;
14844 -diff -urNp linux-2.6.32.32/kernel/time.c linux-2.6.32.32/kernel/time.c
14845 ---- linux-2.6.32.32/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
14846 -+++ linux-2.6.32.32/kernel/time.c 2011-01-01 18:50:34.000000000 -0500
14847 +diff -urNp linux-2.6.32.33/kernel/time.c linux-2.6.32.33/kernel/time.c
14848 +--- linux-2.6.32.33/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
14849 ++++ linux-2.6.32.33/kernel/time.c 2011-01-01 18:50:34.000000000 -0500
14850 @@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec
14851 return error;
14852
14853 @@ -54187,9 +54304,9 @@ diff -urNp linux-2.6.32.32/kernel/time.c linux-2.6.32.32/kernel/time.c
14854 {
14855 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
14856 return (USEC_PER_SEC / HZ) * j;
14857 -diff -urNp linux-2.6.32.32/kernel/timer.c linux-2.6.32.32/kernel/timer.c
14858 ---- linux-2.6.32.32/kernel/timer.c 2011-01-11 23:55:35.000000000 -0500
14859 -+++ linux-2.6.32.32/kernel/timer.c 2011-01-11 23:56:06.000000000 -0500
14860 +diff -urNp linux-2.6.32.33/kernel/timer.c linux-2.6.32.33/kernel/timer.c
14861 +--- linux-2.6.32.33/kernel/timer.c 2011-01-11 23:55:35.000000000 -0500
14862 ++++ linux-2.6.32.33/kernel/timer.c 2011-01-11 23:56:06.000000000 -0500
14863 @@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
14864 /*
14865 * This function runs timers and the timer-tq in bottom half context.
14866 @@ -54199,9 +54316,9 @@ diff -urNp linux-2.6.32.32/kernel/timer.c linux-2.6.32.32/kernel/timer.c
14867 {
14868 struct tvec_base *base = __get_cpu_var(tvec_bases);
14869
14870 -diff -urNp linux-2.6.32.32/kernel/trace/ftrace.c linux-2.6.32.32/kernel/trace/ftrace.c
14871 ---- linux-2.6.32.32/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400
14872 -+++ linux-2.6.32.32/kernel/trace/ftrace.c 2010-12-31 14:46:53.000000000 -0500
14873 +diff -urNp linux-2.6.32.33/kernel/trace/ftrace.c linux-2.6.32.33/kernel/trace/ftrace.c
14874 +--- linux-2.6.32.33/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400
14875 ++++ linux-2.6.32.33/kernel/trace/ftrace.c 2010-12-31 14:46:53.000000000 -0500
14876 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,
14877
14878 ip = rec->ip;
14879 @@ -54223,9 +54340,9 @@ diff -urNp linux-2.6.32.32/kernel/trace/ftrace.c linux-2.6.32.32/kernel/trace/ft
14880 }
14881
14882 /*
14883 -diff -urNp linux-2.6.32.32/kernel/trace/ring_buffer.c linux-2.6.32.32/kernel/trace/ring_buffer.c
14884 ---- linux-2.6.32.32/kernel/trace/ring_buffer.c 2010-10-31 16:44:11.000000000 -0400
14885 -+++ linux-2.6.32.32/kernel/trace/ring_buffer.c 2010-12-31 14:46:53.000000000 -0500
14886 +diff -urNp linux-2.6.32.33/kernel/trace/ring_buffer.c linux-2.6.32.33/kernel/trace/ring_buffer.c
14887 +--- linux-2.6.32.33/kernel/trace/ring_buffer.c 2010-10-31 16:44:11.000000000 -0400
14888 ++++ linux-2.6.32.33/kernel/trace/ring_buffer.c 2010-12-31 14:46:53.000000000 -0500
14889 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
14890 * the reader page). But if the next page is a header page,
14891 * its flags will be non zero.
14892 @@ -54235,9 +54352,9 @@ diff -urNp linux-2.6.32.32/kernel/trace/ring_buffer.c linux-2.6.32.32/kernel/tra
14893 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
14894 struct buffer_page *page, struct list_head *list)
14895 {
14896 -diff -urNp linux-2.6.32.32/kernel/trace/trace.c linux-2.6.32.32/kernel/trace/trace.c
14897 ---- linux-2.6.32.32/kernel/trace/trace.c 2011-01-11 23:55:35.000000000 -0500
14898 -+++ linux-2.6.32.32/kernel/trace/trace.c 2011-01-11 23:56:06.000000000 -0500
14899 +diff -urNp linux-2.6.32.33/kernel/trace/trace.c linux-2.6.32.33/kernel/trace/trace.c
14900 +--- linux-2.6.32.33/kernel/trace/trace.c 2011-01-11 23:55:35.000000000 -0500
14901 ++++ linux-2.6.32.33/kernel/trace/trace.c 2011-01-11 23:56:06.000000000 -0500
14902 @@ -3816,10 +3816,9 @@ static const struct file_operations trac
14903 };
14904 #endif
14905 @@ -54262,9 +54379,9 @@ diff -urNp linux-2.6.32.32/kernel/trace/trace.c linux-2.6.32.32/kernel/trace/tra
14906 static int once;
14907 struct dentry *d_tracer;
14908
14909 -diff -urNp linux-2.6.32.32/kernel/trace/trace_events.c linux-2.6.32.32/kernel/trace/trace_events.c
14910 ---- linux-2.6.32.32/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
14911 -+++ linux-2.6.32.32/kernel/trace/trace_events.c 2010-12-31 14:46:53.000000000 -0500
14912 +diff -urNp linux-2.6.32.33/kernel/trace/trace_events.c linux-2.6.32.33/kernel/trace/trace_events.c
14913 +--- linux-2.6.32.33/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
14914 ++++ linux-2.6.32.33/kernel/trace/trace_events.c 2010-12-31 14:46:53.000000000 -0500
14915 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
14916 * Modules must own their file_operations to keep up with
14917 * reference counting.
14918 @@ -54274,9 +54391,9 @@ diff -urNp linux-2.6.32.32/kernel/trace/trace_events.c linux-2.6.32.32/kernel/tr
14919 struct ftrace_module_file_ops {
14920 struct list_head list;
14921 struct module *mod;
14922 -diff -urNp linux-2.6.32.32/kernel/trace/trace_output.c linux-2.6.32.32/kernel/trace/trace_output.c
14923 ---- linux-2.6.32.32/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
14924 -+++ linux-2.6.32.32/kernel/trace/trace_output.c 2010-12-31 14:46:53.000000000 -0500
14925 +diff -urNp linux-2.6.32.33/kernel/trace/trace_output.c linux-2.6.32.33/kernel/trace/trace_output.c
14926 +--- linux-2.6.32.33/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
14927 ++++ linux-2.6.32.33/kernel/trace/trace_output.c 2010-12-31 14:46:53.000000000 -0500
14928 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
14929 return 0;
14930 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
14931 @@ -54286,9 +54403,9 @@ diff -urNp linux-2.6.32.32/kernel/trace/trace_output.c linux-2.6.32.32/kernel/tr
14932 if (p) {
14933 s->len = p - s->buffer;
14934 return 1;
14935 -diff -urNp linux-2.6.32.32/kernel/trace/trace_stack.c linux-2.6.32.32/kernel/trace/trace_stack.c
14936 ---- linux-2.6.32.32/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
14937 -+++ linux-2.6.32.32/kernel/trace/trace_stack.c 2010-12-31 14:46:53.000000000 -0500
14938 +diff -urNp linux-2.6.32.33/kernel/trace/trace_stack.c linux-2.6.32.33/kernel/trace/trace_stack.c
14939 +--- linux-2.6.32.33/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
14940 ++++ linux-2.6.32.33/kernel/trace/trace_stack.c 2010-12-31 14:46:53.000000000 -0500
14941 @@ -50,7 +50,7 @@ static inline void check_stack(void)
14942 return;
14943
14944 @@ -54298,9 +54415,9 @@ diff -urNp linux-2.6.32.32/kernel/trace/trace_stack.c linux-2.6.32.32/kernel/tra
14945 return;
14946
14947 local_irq_save(flags);
14948 -diff -urNp linux-2.6.32.32/kernel/user.c linux-2.6.32.32/kernel/user.c
14949 ---- linux-2.6.32.32/kernel/user.c 2011-02-22 15:56:54.000000000 -0500
14950 -+++ linux-2.6.32.32/kernel/user.c 2011-02-22 16:01:02.000000000 -0500
14951 +diff -urNp linux-2.6.32.33/kernel/user.c linux-2.6.32.33/kernel/user.c
14952 +--- linux-2.6.32.33/kernel/user.c 2011-02-22 15:56:54.000000000 -0500
14953 ++++ linux-2.6.32.33/kernel/user.c 2011-02-22 16:01:02.000000000 -0500
14954 @@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use
14955 spin_lock_irq(&uidhash_lock);
14956 up = uid_hash_find(uid, hashent);
14957 @@ -54309,9 +54426,9 @@ diff -urNp linux-2.6.32.32/kernel/user.c linux-2.6.32.32/kernel/user.c
14958 key_put(new->uid_keyring);
14959 key_put(new->session_keyring);
14960 kmem_cache_free(uid_cachep, new);
14961 -diff -urNp linux-2.6.32.32/kernel/utsname_sysctl.c linux-2.6.32.32/kernel/utsname_sysctl.c
14962 ---- linux-2.6.32.32/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
14963 -+++ linux-2.6.32.32/kernel/utsname_sysctl.c 2010-12-31 14:46:53.000000000 -0500
14964 +diff -urNp linux-2.6.32.33/kernel/utsname_sysctl.c linux-2.6.32.33/kernel/utsname_sysctl.c
14965 +--- linux-2.6.32.33/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
14966 ++++ linux-2.6.32.33/kernel/utsname_sysctl.c 2010-12-31 14:46:53.000000000 -0500
14967 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
14968 .proc_handler = proc_do_uts_string,
14969 .strategy = sysctl_uts_string,
14970 @@ -54330,9 +54447,9 @@ diff -urNp linux-2.6.32.32/kernel/utsname_sysctl.c linux-2.6.32.32/kernel/utsnam
14971 };
14972
14973 static int __init utsname_sysctl_init(void)
14974 -diff -urNp linux-2.6.32.32/lib/bug.c linux-2.6.32.32/lib/bug.c
14975 ---- linux-2.6.32.32/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
14976 -+++ linux-2.6.32.32/lib/bug.c 2010-12-31 14:46:53.000000000 -0500
14977 +diff -urNp linux-2.6.32.33/lib/bug.c linux-2.6.32.33/lib/bug.c
14978 +--- linux-2.6.32.33/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
14979 ++++ linux-2.6.32.33/lib/bug.c 2010-12-31 14:46:53.000000000 -0500
14980 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
14981 return BUG_TRAP_TYPE_NONE;
14982
14983 @@ -54342,9 +54459,9 @@ diff -urNp linux-2.6.32.32/lib/bug.c linux-2.6.32.32/lib/bug.c
14984
14985 printk(KERN_EMERG "------------[ cut here ]------------\n");
14986
14987 -diff -urNp linux-2.6.32.32/lib/debugobjects.c linux-2.6.32.32/lib/debugobjects.c
14988 ---- linux-2.6.32.32/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
14989 -+++ linux-2.6.32.32/lib/debugobjects.c 2010-12-31 14:46:53.000000000 -0500
14990 +diff -urNp linux-2.6.32.33/lib/debugobjects.c linux-2.6.32.33/lib/debugobjects.c
14991 +--- linux-2.6.32.33/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
14992 ++++ linux-2.6.32.33/lib/debugobjects.c 2010-12-31 14:46:53.000000000 -0500
14993 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
14994 if (limit > 4)
14995 return;
14996 @@ -54354,9 +54471,9 @@ diff -urNp linux-2.6.32.32/lib/debugobjects.c linux-2.6.32.32/lib/debugobjects.c
14997 if (is_on_stack == onstack)
14998 return;
14999
15000 -diff -urNp linux-2.6.32.32/lib/dma-debug.c linux-2.6.32.32/lib/dma-debug.c
15001 ---- linux-2.6.32.32/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
15002 -+++ linux-2.6.32.32/lib/dma-debug.c 2010-12-31 14:46:53.000000000 -0500
15003 +diff -urNp linux-2.6.32.33/lib/dma-debug.c linux-2.6.32.33/lib/dma-debug.c
15004 +--- linux-2.6.32.33/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
15005 ++++ linux-2.6.32.33/lib/dma-debug.c 2010-12-31 14:46:53.000000000 -0500
15006 @@ -861,7 +861,7 @@ out:
15007
15008 static void check_for_stack(struct device *dev, void *addr)
15009 @@ -54366,9 +54483,9 @@ diff -urNp linux-2.6.32.32/lib/dma-debug.c linux-2.6.32.32/lib/dma-debug.c
15010 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
15011 "stack [addr=%p]\n", addr);
15012 }
15013 -diff -urNp linux-2.6.32.32/lib/idr.c linux-2.6.32.32/lib/idr.c
15014 ---- linux-2.6.32.32/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
15015 -+++ linux-2.6.32.32/lib/idr.c 2010-12-31 14:46:53.000000000 -0500
15016 +diff -urNp linux-2.6.32.33/lib/idr.c linux-2.6.32.33/lib/idr.c
15017 +--- linux-2.6.32.33/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
15018 ++++ linux-2.6.32.33/lib/idr.c 2010-12-31 14:46:53.000000000 -0500
15019 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
15020 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
15021
15022 @@ -54378,9 +54495,9 @@ diff -urNp linux-2.6.32.32/lib/idr.c linux-2.6.32.32/lib/idr.c
15023 *starting_id = id;
15024 return IDR_NEED_TO_GROW;
15025 }
15026 -diff -urNp linux-2.6.32.32/lib/inflate.c linux-2.6.32.32/lib/inflate.c
15027 ---- linux-2.6.32.32/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
15028 -+++ linux-2.6.32.32/lib/inflate.c 2010-12-31 14:46:53.000000000 -0500
15029 +diff -urNp linux-2.6.32.33/lib/inflate.c linux-2.6.32.33/lib/inflate.c
15030 +--- linux-2.6.32.33/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
15031 ++++ linux-2.6.32.33/lib/inflate.c 2010-12-31 14:46:53.000000000 -0500
15032 @@ -266,7 +266,7 @@ static void free(void *where)
15033 malloc_ptr = free_mem_ptr;
15034 }
15035 @@ -54390,9 +54507,9 @@ diff -urNp linux-2.6.32.32/lib/inflate.c linux-2.6.32.32/lib/inflate.c
15036 #define free(a) kfree(a)
15037 #endif
15038
15039 -diff -urNp linux-2.6.32.32/lib/Kconfig.debug linux-2.6.32.32/lib/Kconfig.debug
15040 ---- linux-2.6.32.32/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
15041 -+++ linux-2.6.32.32/lib/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
15042 +diff -urNp linux-2.6.32.33/lib/Kconfig.debug linux-2.6.32.33/lib/Kconfig.debug
15043 +--- linux-2.6.32.33/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
15044 ++++ linux-2.6.32.33/lib/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
15045 @@ -905,7 +905,7 @@ config LATENCYTOP
15046 select STACKTRACE
15047 select SCHEDSTATS
15048 @@ -54402,9 +54519,9 @@ diff -urNp linux-2.6.32.32/lib/Kconfig.debug linux-2.6.32.32/lib/Kconfig.debug
15049 help
15050 Enable this option if you want to use the LatencyTOP tool
15051 to find out which userspace is blocking on what kernel operations.
15052 -diff -urNp linux-2.6.32.32/lib/kobject.c linux-2.6.32.32/lib/kobject.c
15053 ---- linux-2.6.32.32/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
15054 -+++ linux-2.6.32.32/lib/kobject.c 2010-12-31 14:46:53.000000000 -0500
15055 +diff -urNp linux-2.6.32.33/lib/kobject.c linux-2.6.32.33/lib/kobject.c
15056 +--- linux-2.6.32.33/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
15057 ++++ linux-2.6.32.33/lib/kobject.c 2010-12-31 14:46:53.000000000 -0500
15058 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
15059 return ret;
15060 }
15061 @@ -54432,9 +54549,9 @@ diff -urNp linux-2.6.32.32/lib/kobject.c linux-2.6.32.32/lib/kobject.c
15062 struct kobject *parent_kobj)
15063 {
15064 struct kset *kset;
15065 -diff -urNp linux-2.6.32.32/lib/kobject_uevent.c linux-2.6.32.32/lib/kobject_uevent.c
15066 ---- linux-2.6.32.32/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
15067 -+++ linux-2.6.32.32/lib/kobject_uevent.c 2010-12-31 14:46:53.000000000 -0500
15068 +diff -urNp linux-2.6.32.33/lib/kobject_uevent.c linux-2.6.32.33/lib/kobject_uevent.c
15069 +--- linux-2.6.32.33/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
15070 ++++ linux-2.6.32.33/lib/kobject_uevent.c 2010-12-31 14:46:53.000000000 -0500
15071 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
15072 const char *subsystem;
15073 struct kobject *top_kobj;
15074 @@ -54444,9 +54561,9 @@ diff -urNp linux-2.6.32.32/lib/kobject_uevent.c linux-2.6.32.32/lib/kobject_ueve
15075 u64 seq;
15076 int i = 0;
15077 int retval = 0;
15078 -diff -urNp linux-2.6.32.32/lib/kref.c linux-2.6.32.32/lib/kref.c
15079 ---- linux-2.6.32.32/lib/kref.c 2010-08-13 16:24:37.000000000 -0400
15080 -+++ linux-2.6.32.32/lib/kref.c 2010-12-31 14:46:53.000000000 -0500
15081 +diff -urNp linux-2.6.32.33/lib/kref.c linux-2.6.32.33/lib/kref.c
15082 +--- linux-2.6.32.33/lib/kref.c 2010-08-13 16:24:37.000000000 -0400
15083 ++++ linux-2.6.32.33/lib/kref.c 2010-12-31 14:46:53.000000000 -0500
15084 @@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
15085 */
15086 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
15087 @@ -54456,9 +54573,9 @@ diff -urNp linux-2.6.32.32/lib/kref.c linux-2.6.32.32/lib/kref.c
15088 WARN_ON(release == (void (*)(struct kref *))kfree);
15089
15090 if (atomic_dec_and_test(&kref->refcount)) {
15091 -diff -urNp linux-2.6.32.32/lib/parser.c linux-2.6.32.32/lib/parser.c
15092 ---- linux-2.6.32.32/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
15093 -+++ linux-2.6.32.32/lib/parser.c 2010-12-31 14:46:53.000000000 -0500
15094 +diff -urNp linux-2.6.32.33/lib/parser.c linux-2.6.32.33/lib/parser.c
15095 +--- linux-2.6.32.33/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
15096 ++++ linux-2.6.32.33/lib/parser.c 2010-12-31 14:46:53.000000000 -0500
15097 @@ -126,7 +126,7 @@ static int match_number(substring_t *s,
15098 char *buf;
15099 int ret;
15100 @@ -54468,9 +54585,9 @@ diff -urNp linux-2.6.32.32/lib/parser.c linux-2.6.32.32/lib/parser.c
15101 if (!buf)
15102 return -ENOMEM;
15103 memcpy(buf, s->from, s->to - s->from);
15104 -diff -urNp linux-2.6.32.32/lib/radix-tree.c linux-2.6.32.32/lib/radix-tree.c
15105 ---- linux-2.6.32.32/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
15106 -+++ linux-2.6.32.32/lib/radix-tree.c 2010-12-31 14:46:53.000000000 -0500
15107 +diff -urNp linux-2.6.32.33/lib/radix-tree.c linux-2.6.32.33/lib/radix-tree.c
15108 +--- linux-2.6.32.33/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
15109 ++++ linux-2.6.32.33/lib/radix-tree.c 2010-12-31 14:46:53.000000000 -0500
15110 @@ -81,7 +81,7 @@ struct radix_tree_preload {
15111 int nr;
15112 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
15113 @@ -54480,9 +54597,9 @@ diff -urNp linux-2.6.32.32/lib/radix-tree.c linux-2.6.32.32/lib/radix-tree.c
15114
15115 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
15116 {
15117 -diff -urNp linux-2.6.32.32/lib/random32.c linux-2.6.32.32/lib/random32.c
15118 ---- linux-2.6.32.32/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
15119 -+++ linux-2.6.32.32/lib/random32.c 2010-12-31 14:46:53.000000000 -0500
15120 +diff -urNp linux-2.6.32.33/lib/random32.c linux-2.6.32.33/lib/random32.c
15121 +--- linux-2.6.32.33/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
15122 ++++ linux-2.6.32.33/lib/random32.c 2010-12-31 14:46:53.000000000 -0500
15123 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
15124 */
15125 static inline u32 __seed(u32 x, u32 m)
15126 @@ -54492,9 +54609,9 @@ diff -urNp linux-2.6.32.32/lib/random32.c linux-2.6.32.32/lib/random32.c
15127 }
15128
15129 /**
15130 -diff -urNp linux-2.6.32.32/lib/vsprintf.c linux-2.6.32.32/lib/vsprintf.c
15131 ---- linux-2.6.32.32/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
15132 -+++ linux-2.6.32.32/lib/vsprintf.c 2010-12-31 14:46:53.000000000 -0500
15133 +diff -urNp linux-2.6.32.33/lib/vsprintf.c linux-2.6.32.33/lib/vsprintf.c
15134 +--- linux-2.6.32.33/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
15135 ++++ linux-2.6.32.33/lib/vsprintf.c 2010-12-31 14:46:53.000000000 -0500
15136 @@ -16,6 +16,9 @@
15137 * - scnprintf and vscnprintf
15138 */
15139 @@ -54595,14 +54712,14 @@ diff -urNp linux-2.6.32.32/lib/vsprintf.c linux-2.6.32.32/lib/vsprintf.c
15140 break;
15141 }
15142
15143 -diff -urNp linux-2.6.32.32/localversion-grsec linux-2.6.32.32/localversion-grsec
15144 ---- linux-2.6.32.32/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
15145 -+++ linux-2.6.32.32/localversion-grsec 2010-12-31 14:46:53.000000000 -0500
15146 +diff -urNp linux-2.6.32.33/localversion-grsec linux-2.6.32.33/localversion-grsec
15147 +--- linux-2.6.32.33/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
15148 ++++ linux-2.6.32.33/localversion-grsec 2010-12-31 14:46:53.000000000 -0500
15149 @@ -0,0 +1 @@
15150 +-grsec
15151 -diff -urNp linux-2.6.32.32/Makefile linux-2.6.32.32/Makefile
15152 ---- linux-2.6.32.32/Makefile 2011-03-11 17:56:47.000000000 -0500
15153 -+++ linux-2.6.32.32/Makefile 2011-03-11 18:01:04.000000000 -0500
15154 +diff -urNp linux-2.6.32.33/Makefile linux-2.6.32.33/Makefile
15155 +--- linux-2.6.32.33/Makefile 2011-03-18 17:10:31.000000000 -0400
15156 ++++ linux-2.6.32.33/Makefile 2011-03-18 17:10:44.000000000 -0400
15157 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
15158
15159 HOSTCC = gcc
15160 @@ -54623,9 +54740,9 @@ diff -urNp linux-2.6.32.32/Makefile linux-2.6.32.32/Makefile
15161
15162 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
15163 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
15164 -diff -urNp linux-2.6.32.32/mm/filemap.c linux-2.6.32.32/mm/filemap.c
15165 ---- linux-2.6.32.32/mm/filemap.c 2010-12-09 18:13:03.000000000 -0500
15166 -+++ linux-2.6.32.32/mm/filemap.c 2010-12-31 14:46:53.000000000 -0500
15167 +diff -urNp linux-2.6.32.33/mm/filemap.c linux-2.6.32.33/mm/filemap.c
15168 +--- linux-2.6.32.33/mm/filemap.c 2010-12-09 18:13:03.000000000 -0500
15169 ++++ linux-2.6.32.33/mm/filemap.c 2010-12-31 14:46:53.000000000 -0500
15170 @@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
15171 struct address_space *mapping = file->f_mapping;
15172
15173 @@ -54643,9 +54760,9 @@ diff -urNp linux-2.6.32.32/mm/filemap.c linux-2.6.32.32/mm/filemap.c
15174 if (*pos >= limit) {
15175 send_sig(SIGXFSZ, current, 0);
15176 return -EFBIG;
15177 -diff -urNp linux-2.6.32.32/mm/fremap.c linux-2.6.32.32/mm/fremap.c
15178 ---- linux-2.6.32.32/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
15179 -+++ linux-2.6.32.32/mm/fremap.c 2010-12-31 14:46:53.000000000 -0500
15180 +diff -urNp linux-2.6.32.33/mm/fremap.c linux-2.6.32.33/mm/fremap.c
15181 +--- linux-2.6.32.33/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
15182 ++++ linux-2.6.32.33/mm/fremap.c 2010-12-31 14:46:53.000000000 -0500
15183 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
15184 retry:
15185 vma = find_vma(mm, start);
15186 @@ -54667,9 +54784,9 @@ diff -urNp linux-2.6.32.32/mm/fremap.c linux-2.6.32.32/mm/fremap.c
15187 munlock_vma_pages_range(vma, start, start + size);
15188 vma->vm_flags = saved_flags;
15189 }
15190 -diff -urNp linux-2.6.32.32/mm/highmem.c linux-2.6.32.32/mm/highmem.c
15191 ---- linux-2.6.32.32/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
15192 -+++ linux-2.6.32.32/mm/highmem.c 2010-12-31 14:46:53.000000000 -0500
15193 +diff -urNp linux-2.6.32.33/mm/highmem.c linux-2.6.32.33/mm/highmem.c
15194 +--- linux-2.6.32.33/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
15195 ++++ linux-2.6.32.33/mm/highmem.c 2010-12-31 14:46:53.000000000 -0500
15196 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
15197 * So no dangers, even with speculative execution.
15198 */
15199 @@ -54695,9 +54812,9 @@ diff -urNp linux-2.6.32.32/mm/highmem.c linux-2.6.32.32/mm/highmem.c
15200 pkmap_count[last_pkmap_nr] = 1;
15201 set_page_address(page, (void *)vaddr);
15202
15203 -diff -urNp linux-2.6.32.32/mm/hugetlb.c linux-2.6.32.32/mm/hugetlb.c
15204 ---- linux-2.6.32.32/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
15205 -+++ linux-2.6.32.32/mm/hugetlb.c 2010-12-31 14:46:53.000000000 -0500
15206 +diff -urNp linux-2.6.32.33/mm/hugetlb.c linux-2.6.32.33/mm/hugetlb.c
15207 +--- linux-2.6.32.33/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
15208 ++++ linux-2.6.32.33/mm/hugetlb.c 2010-12-31 14:46:53.000000000 -0500
15209 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
15210 return 1;
15211 }
15212 @@ -54777,9 +54894,9 @@ diff -urNp linux-2.6.32.32/mm/hugetlb.c linux-2.6.32.32/mm/hugetlb.c
15213 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
15214 if (!ptep)
15215 return VM_FAULT_OOM;
15216 -diff -urNp linux-2.6.32.32/mm/Kconfig linux-2.6.32.32/mm/Kconfig
15217 ---- linux-2.6.32.32/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
15218 -+++ linux-2.6.32.32/mm/Kconfig 2010-12-31 14:46:53.000000000 -0500
15219 +diff -urNp linux-2.6.32.33/mm/Kconfig linux-2.6.32.33/mm/Kconfig
15220 +--- linux-2.6.32.33/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
15221 ++++ linux-2.6.32.33/mm/Kconfig 2010-12-31 14:46:53.000000000 -0500
15222 @@ -228,7 +228,7 @@ config KSM
15223 config DEFAULT_MMAP_MIN_ADDR
15224 int "Low address space to protect from user allocation"
15225 @@ -54789,9 +54906,9 @@ diff -urNp linux-2.6.32.32/mm/Kconfig linux-2.6.32.32/mm/Kconfig
15226 help
15227 This is the portion of low virtual memory which should be protected
15228 from userspace allocation. Keeping a user from writing to low pages
15229 -diff -urNp linux-2.6.32.32/mm/kmemleak.c linux-2.6.32.32/mm/kmemleak.c
15230 ---- linux-2.6.32.32/mm/kmemleak.c 2010-08-13 16:24:37.000000000 -0400
15231 -+++ linux-2.6.32.32/mm/kmemleak.c 2010-12-31 14:46:53.000000000 -0500
15232 +diff -urNp linux-2.6.32.33/mm/kmemleak.c linux-2.6.32.33/mm/kmemleak.c
15233 +--- linux-2.6.32.33/mm/kmemleak.c 2010-08-13 16:24:37.000000000 -0400
15234 ++++ linux-2.6.32.33/mm/kmemleak.c 2010-12-31 14:46:53.000000000 -0500
15235 @@ -358,7 +358,7 @@ static void print_unreferenced(struct se
15236
15237 for (i = 0; i < object->trace_len; i++) {
15238 @@ -54801,9 +54918,9 @@ diff -urNp linux-2.6.32.32/mm/kmemleak.c linux-2.6.32.32/mm/kmemleak.c
15239 }
15240 }
15241
15242 -diff -urNp linux-2.6.32.32/mm/maccess.c linux-2.6.32.32/mm/maccess.c
15243 ---- linux-2.6.32.32/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
15244 -+++ linux-2.6.32.32/mm/maccess.c 2010-12-31 14:46:53.000000000 -0500
15245 +diff -urNp linux-2.6.32.33/mm/maccess.c linux-2.6.32.33/mm/maccess.c
15246 +--- linux-2.6.32.33/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
15247 ++++ linux-2.6.32.33/mm/maccess.c 2010-12-31 14:46:53.000000000 -0500
15248 @@ -14,7 +14,7 @@
15249 * Safely read from address @src to the buffer at @dst. If a kernel fault
15250 * happens, handle that and return -EFAULT.
15251 @@ -54822,9 +54939,9 @@ diff -urNp linux-2.6.32.32/mm/maccess.c linux-2.6.32.32/mm/maccess.c
15252 {
15253 long ret;
15254 mm_segment_t old_fs = get_fs();
15255 -diff -urNp linux-2.6.32.32/mm/madvise.c linux-2.6.32.32/mm/madvise.c
15256 ---- linux-2.6.32.32/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
15257 -+++ linux-2.6.32.32/mm/madvise.c 2010-12-31 14:46:53.000000000 -0500
15258 +diff -urNp linux-2.6.32.33/mm/madvise.c linux-2.6.32.33/mm/madvise.c
15259 +--- linux-2.6.32.33/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
15260 ++++ linux-2.6.32.33/mm/madvise.c 2010-12-31 14:46:53.000000000 -0500
15261 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
15262 pgoff_t pgoff;
15263 unsigned long new_flags = vma->vm_flags;
15264 @@ -54901,9 +55018,9 @@ diff -urNp linux-2.6.32.32/mm/madvise.c linux-2.6.32.32/mm/madvise.c
15265 error = 0;
15266 if (end == start)
15267 goto out;
15268 -diff -urNp linux-2.6.32.32/mm/memory.c linux-2.6.32.32/mm/memory.c
15269 ---- linux-2.6.32.32/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
15270 -+++ linux-2.6.32.32/mm/memory.c 2010-12-31 14:46:53.000000000 -0500
15271 +diff -urNp linux-2.6.32.33/mm/memory.c linux-2.6.32.33/mm/memory.c
15272 +--- linux-2.6.32.33/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
15273 ++++ linux-2.6.32.33/mm/memory.c 2010-12-31 14:46:53.000000000 -0500
15274 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
15275 return;
15276
15277 @@ -55433,9 +55550,9 @@ diff -urNp linux-2.6.32.32/mm/memory.c linux-2.6.32.32/mm/memory.c
15278 /*
15279 * Make sure the vDSO gets into every core dump.
15280 * Dumping its contents makes post-mortem fully interpretable later
15281 -diff -urNp linux-2.6.32.32/mm/memory-failure.c linux-2.6.32.32/mm/memory-failure.c
15282 ---- linux-2.6.32.32/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
15283 -+++ linux-2.6.32.32/mm/memory-failure.c 2010-12-31 14:46:53.000000000 -0500
15284 +diff -urNp linux-2.6.32.33/mm/memory-failure.c linux-2.6.32.33/mm/memory-failure.c
15285 +--- linux-2.6.32.33/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
15286 ++++ linux-2.6.32.33/mm/memory-failure.c 2010-12-31 14:46:53.000000000 -0500
15287 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
15288
15289 int sysctl_memory_failure_recovery __read_mostly = 1;
15290 @@ -55454,9 +55571,9 @@ diff -urNp linux-2.6.32.32/mm/memory-failure.c linux-2.6.32.32/mm/memory-failure
15291
15292 /*
15293 * We need/can do nothing about count=0 pages.
15294 -diff -urNp linux-2.6.32.32/mm/mempolicy.c linux-2.6.32.32/mm/mempolicy.c
15295 ---- linux-2.6.32.32/mm/mempolicy.c 2010-12-09 18:13:03.000000000 -0500
15296 -+++ linux-2.6.32.32/mm/mempolicy.c 2010-12-31 14:46:53.000000000 -0500
15297 +diff -urNp linux-2.6.32.33/mm/mempolicy.c linux-2.6.32.33/mm/mempolicy.c
15298 +--- linux-2.6.32.33/mm/mempolicy.c 2010-12-09 18:13:03.000000000 -0500
15299 ++++ linux-2.6.32.33/mm/mempolicy.c 2010-12-31 14:46:53.000000000 -0500
15300 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
15301 struct vm_area_struct *next;
15302 int err;
15303 @@ -55537,9 +55654,9 @@ diff -urNp linux-2.6.32.32/mm/mempolicy.c linux-2.6.32.32/mm/mempolicy.c
15304 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
15305 seq_printf(m, " heap");
15306 } else if (vma->vm_start <= mm->start_stack &&
15307 -diff -urNp linux-2.6.32.32/mm/migrate.c linux-2.6.32.32/mm/migrate.c
15308 ---- linux-2.6.32.32/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
15309 -+++ linux-2.6.32.32/mm/migrate.c 2010-12-31 14:46:53.000000000 -0500
15310 +diff -urNp linux-2.6.32.33/mm/migrate.c linux-2.6.32.33/mm/migrate.c
15311 +--- linux-2.6.32.33/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
15312 ++++ linux-2.6.32.33/mm/migrate.c 2010-12-31 14:46:53.000000000 -0500
15313 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
15314 if (!mm)
15315 return -EINVAL;
15316 @@ -55565,9 +55682,9 @@ diff -urNp linux-2.6.32.32/mm/migrate.c linux-2.6.32.32/mm/migrate.c
15317 rcu_read_unlock();
15318 err = -EPERM;
15319 goto out;
15320 -diff -urNp linux-2.6.32.32/mm/mlock.c linux-2.6.32.32/mm/mlock.c
15321 ---- linux-2.6.32.32/mm/mlock.c 2010-10-31 16:44:11.000000000 -0400
15322 -+++ linux-2.6.32.32/mm/mlock.c 2011-01-24 18:05:37.000000000 -0500
15323 +diff -urNp linux-2.6.32.33/mm/mlock.c linux-2.6.32.33/mm/mlock.c
15324 +--- linux-2.6.32.33/mm/mlock.c 2010-10-31 16:44:11.000000000 -0400
15325 ++++ linux-2.6.32.33/mm/mlock.c 2011-01-24 18:05:37.000000000 -0500
15326 @@ -13,6 +13,7 @@
15327 #include <linux/pagemap.h>
15328 #include <linux/mempolicy.h>
15329 @@ -55678,9 +55795,9 @@ diff -urNp linux-2.6.32.32/mm/mlock.c linux-2.6.32.32/mm/mlock.c
15330 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
15331 capable(CAP_IPC_LOCK))
15332 ret = do_mlockall(flags);
15333 -diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15334 ---- linux-2.6.32.32/mm/mmap.c 2011-01-11 23:55:35.000000000 -0500
15335 -+++ linux-2.6.32.32/mm/mmap.c 2011-02-12 11:38:46.000000000 -0500
15336 +diff -urNp linux-2.6.32.33/mm/mmap.c linux-2.6.32.33/mm/mmap.c
15337 +--- linux-2.6.32.33/mm/mmap.c 2011-01-11 23:55:35.000000000 -0500
15338 ++++ linux-2.6.32.33/mm/mmap.c 2011-03-21 17:34:54.000000000 -0400
15339 @@ -45,6 +45,16 @@
15340 #define arch_rebalance_pgtables(addr, len) (addr)
15341 #endif
15342 @@ -56067,11 +56184,11 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15343 kmem_cache_free(vm_area_cachep, vma);
15344 unacct_error:
15345 if (charged)
15346 -@@ -1255,6 +1411,33 @@ unacct_error:
15347 +@@ -1255,6 +1411,44 @@ unacct_error:
15348 return error;
15349 }
15350
15351 -+bool check_heap_stack_gap(struct vm_area_struct *vma, unsigned long addr, unsigned long len)
15352 ++bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
15353 +{
15354 + if (!vma) {
15355 +#ifdef CONFIG_STACK_GROWSUP
15356 @@ -56098,10 +56215,21 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15357 + return true;
15358 +}
15359 +
15360 ++unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
15361 ++{
15362 ++ if (vma->vm_start < len)
15363 ++ return -ENOMEM;
15364 ++ if (!(vma->vm_flags & VM_GROWSDOWN))
15365 ++ return vma->vm_start - len;
15366 ++ if (sysctl_heap_stack_gap <= vma->vm_start - len)
15367 ++ return vma->vm_start - len - sysctl_heap_stack_gap;
15368 ++ return -ENOMEM;
15369 ++}
15370 ++
15371 /* Get an address range which is currently unmapped.
15372 * For shmat() with addr=0.
15373 *
15374 -@@ -1281,18 +1464,23 @@ arch_get_unmapped_area(struct file *filp
15375 +@@ -1281,18 +1475,23 @@ arch_get_unmapped_area(struct file *filp
15376 if (flags & MAP_FIXED)
15377 return addr;
15378
15379 @@ -56132,7 +56260,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15380 }
15381
15382 full_search:
15383 -@@ -1303,34 +1491,40 @@ full_search:
15384 +@@ -1303,34 +1502,40 @@ full_search:
15385 * Start a new search - just in case we missed
15386 * some holes.
15387 */
15388 @@ -56184,7 +56312,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15389 mm->free_area_cache = addr;
15390 mm->cached_hole_size = ~0UL;
15391 }
15392 -@@ -1348,7 +1542,7 @@ arch_get_unmapped_area_topdown(struct fi
15393 +@@ -1348,7 +1553,7 @@ arch_get_unmapped_area_topdown(struct fi
15394 {
15395 struct vm_area_struct *vma;
15396 struct mm_struct *mm = current->mm;
15397 @@ -56193,7 +56321,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15398
15399 /* requested length too big for entire address space */
15400 if (len > TASK_SIZE)
15401 -@@ -1357,13 +1551,18 @@ arch_get_unmapped_area_topdown(struct fi
15402 +@@ -1357,13 +1562,18 @@ arch_get_unmapped_area_topdown(struct fi
15403 if (flags & MAP_FIXED)
15404 return addr;
15405
15406 @@ -56216,7 +56344,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15407 }
15408
15409 /* check if free_area_cache is useful for us */
15410 -@@ -1378,7 +1577,7 @@ arch_get_unmapped_area_topdown(struct fi
15411 +@@ -1378,7 +1588,7 @@ arch_get_unmapped_area_topdown(struct fi
15412 /* make sure it can fit in the remaining address space */
15413 if (addr > len) {
15414 vma = find_vma(mm, addr-len);
15415 @@ -56225,7 +56353,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15416 /* remember the address as a hint for next time */
15417 return (mm->free_area_cache = addr-len);
15418 }
15419 -@@ -1395,7 +1594,7 @@ arch_get_unmapped_area_topdown(struct fi
15420 +@@ -1395,7 +1605,7 @@ arch_get_unmapped_area_topdown(struct fi
15421 * return with success:
15422 */
15423 vma = find_vma(mm, addr);
15424 @@ -56234,7 +56362,18 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15425 /* remember the address as a hint for next time */
15426 return (mm->free_area_cache = addr);
15427
15428 -@@ -1414,13 +1613,21 @@ bottomup:
15429 +@@ -1404,8 +1614,8 @@ arch_get_unmapped_area_topdown(struct fi
15430 + mm->cached_hole_size = vma->vm_start - addr;
15431 +
15432 + /* try just below the current vma->vm_start */
15433 +- addr = vma->vm_start-len;
15434 +- } while (len < vma->vm_start);
15435 ++ addr = skip_heap_stack_gap(vma, len);
15436 ++ } while (!IS_ERR_VALUE(addr));
15437 +
15438 + bottomup:
15439 + /*
15440 +@@ -1414,13 +1624,21 @@ bottomup:
15441 * can happen with large stack limits and large mmap()
15442 * allocations.
15443 */
15444 @@ -56258,7 +56397,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15445 mm->cached_hole_size = ~0UL;
15446
15447 return addr;
15448 -@@ -1429,6 +1636,12 @@ bottomup:
15449 +@@ -1429,6 +1647,12 @@ bottomup:
15450
15451 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
15452 {
15453 @@ -56271,7 +56410,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15454 /*
15455 * Is this a new hole at the highest possible address?
15456 */
15457 -@@ -1436,8 +1649,10 @@ void arch_unmap_area_topdown(struct mm_s
15458 +@@ -1436,8 +1660,10 @@ void arch_unmap_area_topdown(struct mm_s
15459 mm->free_area_cache = addr;
15460
15461 /* dont allow allocations above current base */
15462 @@ -56283,7 +56422,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15463 }
15464
15465 unsigned long
15466 -@@ -1545,6 +1760,27 @@ out:
15467 +@@ -1545,6 +1771,27 @@ out:
15468 return prev ? prev->vm_next : vma;
15469 }
15470
15471 @@ -56311,7 +56450,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15472 /*
15473 * Verify that the stack growth is acceptable and
15474 * update accounting. This is shared with both the
15475 -@@ -1561,6 +1797,7 @@ static int acct_stack_growth(struct vm_a
15476 +@@ -1561,6 +1808,7 @@ static int acct_stack_growth(struct vm_a
15477 return -ENOMEM;
15478
15479 /* Stack limit test */
15480 @@ -56319,7 +56458,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15481 if (size > rlim[RLIMIT_STACK].rlim_cur)
15482 return -ENOMEM;
15483
15484 -@@ -1570,6 +1807,7 @@ static int acct_stack_growth(struct vm_a
15485 +@@ -1570,6 +1818,7 @@ static int acct_stack_growth(struct vm_a
15486 unsigned long limit;
15487 locked = mm->locked_vm + grow;
15488 limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
15489 @@ -56327,7 +56466,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15490 if (locked > limit && !capable(CAP_IPC_LOCK))
15491 return -ENOMEM;
15492 }
15493 -@@ -1600,37 +1838,48 @@ static int acct_stack_growth(struct vm_a
15494 +@@ -1600,37 +1849,48 @@ static int acct_stack_growth(struct vm_a
15495 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
15496 * vma is the last one with address > vma->vm_end. Have to extend vma.
15497 */
15498 @@ -56385,7 +56524,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15499 unsigned long size, grow;
15500
15501 size = address - vma->vm_start;
15502 -@@ -1640,6 +1889,8 @@ int expand_upwards(struct vm_area_struct
15503 +@@ -1640,6 +1900,8 @@ int expand_upwards(struct vm_area_struct
15504 if (!error)
15505 vma->vm_end = address;
15506 }
15507 @@ -56394,7 +56533,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15508 anon_vma_unlock(vma);
15509 return error;
15510 }
15511 -@@ -1652,6 +1903,8 @@ static int expand_downwards(struct vm_ar
15512 +@@ -1652,6 +1914,8 @@ static int expand_downwards(struct vm_ar
15513 unsigned long address)
15514 {
15515 int error;
15516 @@ -56403,7 +56542,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15517
15518 /*
15519 * We must make sure the anon_vma is allocated
15520 -@@ -1665,6 +1918,15 @@ static int expand_downwards(struct vm_ar
15521 +@@ -1665,6 +1929,15 @@ static int expand_downwards(struct vm_ar
15522 if (error)
15523 return error;
15524
15525 @@ -56419,7 +56558,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15526 anon_vma_lock(vma);
15527
15528 /*
15529 -@@ -1674,9 +1936,17 @@ static int expand_downwards(struct vm_ar
15530 +@@ -1674,9 +1947,17 @@ static int expand_downwards(struct vm_ar
15531 */
15532
15533 /* Somebody else might have raced and expanded it already */
15534 @@ -56438,7 +56577,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15535 size = vma->vm_end - address;
15536 grow = (vma->vm_start - address) >> PAGE_SHIFT;
15537
15538 -@@ -1684,9 +1954,20 @@ static int expand_downwards(struct vm_ar
15539 +@@ -1684,9 +1965,20 @@ static int expand_downwards(struct vm_ar
15540 if (!error) {
15541 vma->vm_start = address;
15542 vma->vm_pgoff -= grow;
15543 @@ -56459,7 +56598,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15544 return error;
15545 }
15546
15547 -@@ -1762,6 +2043,13 @@ static void remove_vma_list(struct mm_st
15548 +@@ -1762,6 +2054,13 @@ static void remove_vma_list(struct mm_st
15549 do {
15550 long nrpages = vma_pages(vma);
15551
15552 @@ -56473,7 +56612,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15553 mm->total_vm -= nrpages;
15554 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
15555 vma = remove_vma(vma);
15556 -@@ -1807,6 +2095,16 @@ detach_vmas_to_be_unmapped(struct mm_str
15557 +@@ -1807,6 +2106,16 @@ detach_vmas_to_be_unmapped(struct mm_str
15558 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
15559 vma->vm_prev = NULL;
15560 do {
15561 @@ -56490,7 +56629,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15562 rb_erase(&vma->vm_rb, &mm->mm_rb);
15563 mm->map_count--;
15564 tail_vma = vma;
15565 -@@ -1834,10 +2132,25 @@ int split_vma(struct mm_struct * mm, str
15566 +@@ -1834,10 +2143,25 @@ int split_vma(struct mm_struct * mm, str
15567 struct mempolicy *pol;
15568 struct vm_area_struct *new;
15569
15570 @@ -56516,7 +56655,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15571 if (mm->map_count >= sysctl_max_map_count)
15572 return -ENOMEM;
15573
15574 -@@ -1845,6 +2158,16 @@ int split_vma(struct mm_struct * mm, str
15575 +@@ -1845,6 +2169,16 @@ int split_vma(struct mm_struct * mm, str
15576 if (!new)
15577 return -ENOMEM;
15578
15579 @@ -56533,7 +56672,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15580 /* most fields are the same, copy all, and then fixup */
15581 *new = *vma;
15582
15583 -@@ -1855,8 +2178,29 @@ int split_vma(struct mm_struct * mm, str
15584 +@@ -1855,8 +2189,29 @@ int split_vma(struct mm_struct * mm, str
15585 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
15586 }
15587
15588 @@ -56563,7 +56702,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15589 kmem_cache_free(vm_area_cachep, new);
15590 return PTR_ERR(pol);
15591 }
15592 -@@ -1877,6 +2221,28 @@ int split_vma(struct mm_struct * mm, str
15593 +@@ -1877,6 +2232,28 @@ int split_vma(struct mm_struct * mm, str
15594 else
15595 vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
15596
15597 @@ -56592,7 +56731,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15598 return 0;
15599 }
15600
15601 -@@ -1885,11 +2251,30 @@ int split_vma(struct mm_struct * mm, str
15602 +@@ -1885,11 +2262,30 @@ int split_vma(struct mm_struct * mm, str
15603 * work. This now handles partial unmappings.
15604 * Jeremy Fitzhardinge <jeremy@××××.org>
15605 */
15606 @@ -56623,7 +56762,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15607 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
15608 return -EINVAL;
15609
15610 -@@ -1953,6 +2338,8 @@ int do_munmap(struct mm_struct *mm, unsi
15611 +@@ -1953,6 +2349,8 @@ int do_munmap(struct mm_struct *mm, unsi
15612 /* Fix up all other VM information */
15613 remove_vma_list(mm, vma);
15614
15615 @@ -56632,7 +56771,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15616 return 0;
15617 }
15618
15619 -@@ -1965,22 +2352,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
15620 +@@ -1965,22 +2363,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
15621
15622 profile_munmap(addr);
15623
15624 @@ -56661,7 +56800,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15625 /*
15626 * this is really a simplified "do_mmap". it only handles
15627 * anonymous maps. eventually we may be able to do some
15628 -@@ -1994,6 +2377,7 @@ unsigned long do_brk(unsigned long addr,
15629 +@@ -1994,6 +2388,7 @@ unsigned long do_brk(unsigned long addr,
15630 struct rb_node ** rb_link, * rb_parent;
15631 pgoff_t pgoff = addr >> PAGE_SHIFT;
15632 int error;
15633 @@ -56669,7 +56808,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15634
15635 len = PAGE_ALIGN(len);
15636 if (!len)
15637 -@@ -2005,16 +2389,30 @@ unsigned long do_brk(unsigned long addr,
15638 +@@ -2005,16 +2400,30 @@ unsigned long do_brk(unsigned long addr,
15639
15640 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
15641
15642 @@ -56701,7 +56840,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15643 locked += mm->locked_vm;
15644 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
15645 lock_limit >>= PAGE_SHIFT;
15646 -@@ -2031,22 +2429,22 @@ unsigned long do_brk(unsigned long addr,
15647 +@@ -2031,22 +2440,22 @@ unsigned long do_brk(unsigned long addr,
15648 /*
15649 * Clear old maps. this also does some error checking for us
15650 */
15651 @@ -56728,7 +56867,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15652 return -ENOMEM;
15653
15654 /* Can we just expand an old private anonymous mapping? */
15655 -@@ -2060,7 +2458,7 @@ unsigned long do_brk(unsigned long addr,
15656 +@@ -2060,7 +2469,7 @@ unsigned long do_brk(unsigned long addr,
15657 */
15658 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
15659 if (!vma) {
15660 @@ -56737,7 +56876,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15661 return -ENOMEM;
15662 }
15663
15664 -@@ -2072,11 +2470,12 @@ unsigned long do_brk(unsigned long addr,
15665 +@@ -2072,11 +2481,12 @@ unsigned long do_brk(unsigned long addr,
15666 vma->vm_page_prot = vm_get_page_prot(flags);
15667 vma_link(mm, vma, prev, rb_link, rb_parent);
15668 out:
15669 @@ -56752,7 +56891,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15670 return addr;
15671 }
15672
15673 -@@ -2123,8 +2522,10 @@ void exit_mmap(struct mm_struct *mm)
15674 +@@ -2123,8 +2533,10 @@ void exit_mmap(struct mm_struct *mm)
15675 * Walk the list again, actually closing and freeing it,
15676 * with preemption enabled, without holding any MM locks.
15677 */
15678 @@ -56764,7 +56903,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15679
15680 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
15681 }
15682 -@@ -2138,6 +2539,10 @@ int insert_vm_struct(struct mm_struct *
15683 +@@ -2138,6 +2550,10 @@ int insert_vm_struct(struct mm_struct *
15684 struct vm_area_struct * __vma, * prev;
15685 struct rb_node ** rb_link, * rb_parent;
15686
15687 @@ -56775,7 +56914,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15688 /*
15689 * The vm_pgoff of a purely anonymous vma should be irrelevant
15690 * until its first write fault, when page's anon_vma and index
15691 -@@ -2160,7 +2565,22 @@ int insert_vm_struct(struct mm_struct *
15692 +@@ -2160,7 +2576,22 @@ int insert_vm_struct(struct mm_struct *
15693 if ((vma->vm_flags & VM_ACCOUNT) &&
15694 security_vm_enough_memory_mm(mm, vma_pages(vma)))
15695 return -ENOMEM;
15696 @@ -56798,7 +56937,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15697 return 0;
15698 }
15699
15700 -@@ -2178,6 +2598,8 @@ struct vm_area_struct *copy_vma(struct v
15701 +@@ -2178,6 +2609,8 @@ struct vm_area_struct *copy_vma(struct v
15702 struct rb_node **rb_link, *rb_parent;
15703 struct mempolicy *pol;
15704
15705 @@ -56807,7 +56946,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15706 /*
15707 * If anonymous vma has not yet been faulted, update new pgoff
15708 * to match new location, to increase its chance of merging.
15709 -@@ -2221,6 +2643,35 @@ struct vm_area_struct *copy_vma(struct v
15710 +@@ -2221,6 +2654,35 @@ struct vm_area_struct *copy_vma(struct v
15711 return new_vma;
15712 }
15713
15714 @@ -56843,7 +56982,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15715 /*
15716 * Return true if the calling process may expand its vm space by the passed
15717 * number of pages
15718 -@@ -2231,7 +2682,7 @@ int may_expand_vm(struct mm_struct *mm,
15719 +@@ -2231,7 +2693,7 @@ int may_expand_vm(struct mm_struct *mm,
15720 unsigned long lim;
15721
15722 lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
15723 @@ -56852,7 +56991,7 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15724 if (cur + npages > lim)
15725 return 0;
15726 return 1;
15727 -@@ -2301,6 +2752,22 @@ int install_special_mapping(struct mm_st
15728 +@@ -2301,6 +2763,22 @@ int install_special_mapping(struct mm_st
15729 vma->vm_start = addr;
15730 vma->vm_end = addr + len;
15731
15732 @@ -56875,9 +57014,9 @@ diff -urNp linux-2.6.32.32/mm/mmap.c linux-2.6.32.32/mm/mmap.c
15733 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
15734 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
15735
15736 -diff -urNp linux-2.6.32.32/mm/mprotect.c linux-2.6.32.32/mm/mprotect.c
15737 ---- linux-2.6.32.32/mm/mprotect.c 2010-12-09 18:13:03.000000000 -0500
15738 -+++ linux-2.6.32.32/mm/mprotect.c 2010-12-31 14:46:53.000000000 -0500
15739 +diff -urNp linux-2.6.32.33/mm/mprotect.c linux-2.6.32.33/mm/mprotect.c
15740 +--- linux-2.6.32.33/mm/mprotect.c 2010-12-09 18:13:03.000000000 -0500
15741 ++++ linux-2.6.32.33/mm/mprotect.c 2010-12-31 14:46:53.000000000 -0500
15742 @@ -24,10 +24,16 @@
15743 #include <linux/mmu_notifier.h>
15744 #include <linux/migrate.h>
15745 @@ -57100,10 +57239,10 @@ diff -urNp linux-2.6.32.32/mm/mprotect.c linux-2.6.32.32/mm/mprotect.c
15746 nstart = tmp;
15747
15748 if (nstart < prev->vm_end)
15749 -diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15750 ---- linux-2.6.32.32/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400
15751 -+++ linux-2.6.32.32/mm/mremap.c 2010-12-31 14:46:53.000000000 -0500
15752 -@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
15753 +diff -urNp linux-2.6.32.33/mm/mremap.c linux-2.6.32.33/mm/mremap.c
15754 +--- linux-2.6.32.33/mm/mremap.c 2011-03-18 17:10:31.000000000 -0400
15755 ++++ linux-2.6.32.33/mm/mremap.c 2011-03-18 17:10:44.000000000 -0400
15756 +@@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str
15757 continue;
15758 pte = ptep_clear_flush(vma, old_addr, old_pte);
15759 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
15760 @@ -57116,7 +57255,7 @@ diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15761 set_pte_at(mm, new_addr, new_pte, pte);
15762 }
15763
15764 -@@ -273,6 +279,11 @@ static struct vm_area_struct *vma_to_res
15765 +@@ -271,6 +277,11 @@ static struct vm_area_struct *vma_to_res
15766 if (is_vm_hugetlb_page(vma))
15767 goto Einval;
15768
15769 @@ -57128,7 +57267,7 @@ diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15770 /* We can't remap across vm area boundaries */
15771 if (old_len > vma->vm_end - addr)
15772 goto Efault;
15773 -@@ -322,20 +333,25 @@ static unsigned long mremap_to(unsigned
15774 +@@ -320,20 +331,25 @@ static unsigned long mremap_to(unsigned
15775 unsigned long ret = -EINVAL;
15776 unsigned long charged = 0;
15777 unsigned long map_flags;
15778 @@ -57159,7 +57298,7 @@ diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15779 goto out;
15780
15781 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
15782 -@@ -407,6 +423,7 @@ unsigned long do_mremap(unsigned long ad
15783 +@@ -405,6 +421,7 @@ unsigned long do_mremap(unsigned long ad
15784 struct vm_area_struct *vma;
15785 unsigned long ret = -EINVAL;
15786 unsigned long charged = 0;
15787 @@ -57167,7 +57306,7 @@ diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15788
15789 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
15790 goto out;
15791 -@@ -425,6 +442,17 @@ unsigned long do_mremap(unsigned long ad
15792 +@@ -423,6 +440,17 @@ unsigned long do_mremap(unsigned long ad
15793 if (!new_len)
15794 goto out;
15795
15796 @@ -57185,7 +57324,7 @@ diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15797 if (flags & MREMAP_FIXED) {
15798 if (flags & MREMAP_MAYMOVE)
15799 ret = mremap_to(addr, old_len, new_addr, new_len);
15800 -@@ -471,6 +499,7 @@ unsigned long do_mremap(unsigned long ad
15801 +@@ -469,6 +497,7 @@ unsigned long do_mremap(unsigned long ad
15802 addr + new_len);
15803 }
15804 ret = addr;
15805 @@ -57193,7 +57332,7 @@ diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15806 goto out;
15807 }
15808 }
15809 -@@ -497,7 +526,13 @@ unsigned long do_mremap(unsigned long ad
15810 +@@ -495,7 +524,13 @@ unsigned long do_mremap(unsigned long ad
15811 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
15812 if (ret)
15813 goto out;
15814 @@ -57207,9 +57346,9 @@ diff -urNp linux-2.6.32.32/mm/mremap.c linux-2.6.32.32/mm/mremap.c
15815 }
15816 out:
15817 if (ret & ~PAGE_MASK)
15818 -diff -urNp linux-2.6.32.32/mm/nommu.c linux-2.6.32.32/mm/nommu.c
15819 ---- linux-2.6.32.32/mm/nommu.c 2010-12-09 18:13:03.000000000 -0500
15820 -+++ linux-2.6.32.32/mm/nommu.c 2010-12-31 14:46:53.000000000 -0500
15821 +diff -urNp linux-2.6.32.33/mm/nommu.c linux-2.6.32.33/mm/nommu.c
15822 +--- linux-2.6.32.33/mm/nommu.c 2010-12-09 18:13:03.000000000 -0500
15823 ++++ linux-2.6.32.33/mm/nommu.c 2010-12-31 14:46:53.000000000 -0500
15824 @@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
15825 int sysctl_overcommit_ratio = 50; /* default is 50% */
15826 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
15827 @@ -57234,9 +57373,9 @@ diff -urNp linux-2.6.32.32/mm/nommu.c linux-2.6.32.32/mm/nommu.c
15828 * expand a stack to a given address
15829 * - not supported under NOMMU conditions
15830 */
15831 -diff -urNp linux-2.6.32.32/mm/page_alloc.c linux-2.6.32.32/mm/page_alloc.c
15832 ---- linux-2.6.32.32/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
15833 -+++ linux-2.6.32.32/mm/page_alloc.c 2010-12-31 14:46:53.000000000 -0500
15834 +diff -urNp linux-2.6.32.33/mm/page_alloc.c linux-2.6.32.33/mm/page_alloc.c
15835 +--- linux-2.6.32.33/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
15836 ++++ linux-2.6.32.33/mm/page_alloc.c 2010-12-31 14:46:53.000000000 -0500
15837 @@ -587,6 +587,10 @@ static void __free_pages_ok(struct page
15838 int bad = 0;
15839 int wasMlocked = __TestClearPageMlocked(page);
15840 @@ -57293,9 +57432,9 @@ diff -urNp linux-2.6.32.32/mm/page_alloc.c linux-2.6.32.32/mm/page_alloc.c
15841 struct zone *zone, unsigned long zonesize) {}
15842 #endif /* CONFIG_SPARSEMEM */
15843
15844 -diff -urNp linux-2.6.32.32/mm/percpu.c linux-2.6.32.32/mm/percpu.c
15845 ---- linux-2.6.32.32/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
15846 -+++ linux-2.6.32.32/mm/percpu.c 2010-12-31 14:46:53.000000000 -0500
15847 +diff -urNp linux-2.6.32.33/mm/percpu.c linux-2.6.32.33/mm/percpu.c
15848 +--- linux-2.6.32.33/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
15849 ++++ linux-2.6.32.33/mm/percpu.c 2010-12-31 14:46:53.000000000 -0500
15850 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
15851 static unsigned int pcpu_last_unit_cpu __read_mostly;
15852
15853 @@ -57305,9 +57444,9 @@ diff -urNp linux-2.6.32.32/mm/percpu.c linux-2.6.32.32/mm/percpu.c
15854 EXPORT_SYMBOL_GPL(pcpu_base_addr);
15855
15856 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
15857 -diff -urNp linux-2.6.32.32/mm/rmap.c linux-2.6.32.32/mm/rmap.c
15858 ---- linux-2.6.32.32/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
15859 -+++ linux-2.6.32.32/mm/rmap.c 2010-12-31 14:46:53.000000000 -0500
15860 +diff -urNp linux-2.6.32.33/mm/rmap.c linux-2.6.32.33/mm/rmap.c
15861 +--- linux-2.6.32.33/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
15862 ++++ linux-2.6.32.33/mm/rmap.c 2010-12-31 14:46:53.000000000 -0500
15863 @@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
15864 /* page_table_lock to protect against threads */
15865 spin_lock(&mm->page_table_lock);
15866 @@ -57326,9 +57465,9 @@ diff -urNp linux-2.6.32.32/mm/rmap.c linux-2.6.32.32/mm/rmap.c
15867 vma->anon_vma = anon_vma;
15868 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
15869 allocated = NULL;
15870 -diff -urNp linux-2.6.32.32/mm/shmem.c linux-2.6.32.32/mm/shmem.c
15871 ---- linux-2.6.32.32/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
15872 -+++ linux-2.6.32.32/mm/shmem.c 2011-01-24 18:05:37.000000000 -0500
15873 +diff -urNp linux-2.6.32.33/mm/shmem.c linux-2.6.32.33/mm/shmem.c
15874 +--- linux-2.6.32.33/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
15875 ++++ linux-2.6.32.33/mm/shmem.c 2011-01-24 18:05:37.000000000 -0500
15876 @@ -31,7 +31,7 @@
15877 #include <linux/swap.h>
15878 #include <linux/ima.h>
15879 @@ -57347,9 +57486,9 @@ diff -urNp linux-2.6.32.32/mm/shmem.c linux-2.6.32.32/mm/shmem.c
15880 if (entry->val) {
15881 /*
15882 * The more uptodate page coming down from a stacked
15883 -diff -urNp linux-2.6.32.32/mm/slab.c linux-2.6.32.32/mm/slab.c
15884 ---- linux-2.6.32.32/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
15885 -+++ linux-2.6.32.32/mm/slab.c 2010-12-31 14:46:53.000000000 -0500
15886 +diff -urNp linux-2.6.32.33/mm/slab.c linux-2.6.32.33/mm/slab.c
15887 +--- linux-2.6.32.33/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
15888 ++++ linux-2.6.32.33/mm/slab.c 2010-12-31 14:46:53.000000000 -0500
15889 @@ -308,7 +308,7 @@ struct kmem_list3 {
15890 * Need this for bootstrapping a per node allocator.
15891 */
15892 @@ -57455,9 +57594,9 @@ diff -urNp linux-2.6.32.32/mm/slab.c linux-2.6.32.32/mm/slab.c
15893 /**
15894 * ksize - get the actual amount of memory allocated for a given object
15895 * @objp: Pointer to the object
15896 -diff -urNp linux-2.6.32.32/mm/slob.c linux-2.6.32.32/mm/slob.c
15897 ---- linux-2.6.32.32/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
15898 -+++ linux-2.6.32.32/mm/slob.c 2010-12-31 14:46:53.000000000 -0500
15899 +diff -urNp linux-2.6.32.33/mm/slob.c linux-2.6.32.33/mm/slob.c
15900 +--- linux-2.6.32.33/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
15901 ++++ linux-2.6.32.33/mm/slob.c 2010-12-31 14:46:53.000000000 -0500
15902 @@ -29,7 +29,7 @@
15903 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
15904 * alloc_pages() directly, allocating compound pages so the page order
15905 @@ -57778,9 +57917,9 @@ diff -urNp linux-2.6.32.32/mm/slob.c linux-2.6.32.32/mm/slob.c
15906 }
15907
15908 trace_kmem_cache_free(_RET_IP_, b);
15909 -diff -urNp linux-2.6.32.32/mm/slub.c linux-2.6.32.32/mm/slub.c
15910 ---- linux-2.6.32.32/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
15911 -+++ linux-2.6.32.32/mm/slub.c 2010-12-31 14:46:53.000000000 -0500
15912 +diff -urNp linux-2.6.32.33/mm/slub.c linux-2.6.32.33/mm/slub.c
15913 +--- linux-2.6.32.33/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
15914 ++++ linux-2.6.32.33/mm/slub.c 2010-12-31 14:46:53.000000000 -0500
15915 @@ -410,7 +410,7 @@ static void print_track(const char *s, s
15916 if (!t->addr)
15917 return;
15918 @@ -57952,9 +58091,9 @@ diff -urNp linux-2.6.32.32/mm/slub.c linux-2.6.32.32/mm/slub.c
15919 return 0;
15920 }
15921 module_init(slab_proc_init);
15922 -diff -urNp linux-2.6.32.32/mm/util.c linux-2.6.32.32/mm/util.c
15923 ---- linux-2.6.32.32/mm/util.c 2010-08-13 16:24:37.000000000 -0400
15924 -+++ linux-2.6.32.32/mm/util.c 2010-12-31 14:46:53.000000000 -0500
15925 +diff -urNp linux-2.6.32.33/mm/util.c linux-2.6.32.33/mm/util.c
15926 +--- linux-2.6.32.33/mm/util.c 2010-08-13 16:24:37.000000000 -0400
15927 ++++ linux-2.6.32.33/mm/util.c 2010-12-31 14:46:53.000000000 -0500
15928 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
15929 void arch_pick_mmap_layout(struct mm_struct *mm)
15930 {
15931 @@ -57968,9 +58107,9 @@ diff -urNp linux-2.6.32.32/mm/util.c linux-2.6.32.32/mm/util.c
15932 mm->get_unmapped_area = arch_get_unmapped_area;
15933 mm->unmap_area = arch_unmap_area;
15934 }
15935 -diff -urNp linux-2.6.32.32/mm/vmalloc.c linux-2.6.32.32/mm/vmalloc.c
15936 ---- linux-2.6.32.32/mm/vmalloc.c 2010-11-26 18:22:29.000000000 -0500
15937 -+++ linux-2.6.32.32/mm/vmalloc.c 2010-12-31 14:46:53.000000000 -0500
15938 +diff -urNp linux-2.6.32.33/mm/vmalloc.c linux-2.6.32.33/mm/vmalloc.c
15939 +--- linux-2.6.32.33/mm/vmalloc.c 2010-11-26 18:22:29.000000000 -0500
15940 ++++ linux-2.6.32.33/mm/vmalloc.c 2010-12-31 14:46:53.000000000 -0500
15941 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
15942
15943 pte = pte_offset_kernel(pmd, addr);
15944 @@ -58207,9 +58346,9 @@ diff -urNp linux-2.6.32.32/mm/vmalloc.c linux-2.6.32.32/mm/vmalloc.c
15945 if ((PAGE_SIZE-1) & (unsigned long)addr)
15946 return -EINVAL;
15947
15948 -diff -urNp linux-2.6.32.32/mm/vmstat.c linux-2.6.32.32/mm/vmstat.c
15949 ---- linux-2.6.32.32/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
15950 -+++ linux-2.6.32.32/mm/vmstat.c 2010-12-31 14:54:42.000000000 -0500
15951 +diff -urNp linux-2.6.32.33/mm/vmstat.c linux-2.6.32.33/mm/vmstat.c
15952 +--- linux-2.6.32.33/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
15953 ++++ linux-2.6.32.33/mm/vmstat.c 2010-12-31 14:54:42.000000000 -0500
15954 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
15955 *
15956 * vm_stat contains the global counters
15957 @@ -58262,9 +58401,9 @@ diff -urNp linux-2.6.32.32/mm/vmstat.c linux-2.6.32.32/mm/vmstat.c
15958 #endif
15959 return 0;
15960 }
15961 -diff -urNp linux-2.6.32.32/net/8021q/vlan.c linux-2.6.32.32/net/8021q/vlan.c
15962 ---- linux-2.6.32.32/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
15963 -+++ linux-2.6.32.32/net/8021q/vlan.c 2010-12-31 14:46:53.000000000 -0500
15964 +diff -urNp linux-2.6.32.33/net/8021q/vlan.c linux-2.6.32.33/net/8021q/vlan.c
15965 +--- linux-2.6.32.33/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
15966 ++++ linux-2.6.32.33/net/8021q/vlan.c 2010-12-31 14:46:53.000000000 -0500
15967 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
15968 err = -EPERM;
15969 if (!capable(CAP_NET_ADMIN))
15970 @@ -58275,9 +58414,9 @@ diff -urNp linux-2.6.32.32/net/8021q/vlan.c linux-2.6.32.32/net/8021q/vlan.c
15971 struct vlan_net *vn;
15972
15973 vn = net_generic(net, vlan_net_id);
15974 -diff -urNp linux-2.6.32.32/net/atm/atm_misc.c linux-2.6.32.32/net/atm/atm_misc.c
15975 ---- linux-2.6.32.32/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
15976 -+++ linux-2.6.32.32/net/atm/atm_misc.c 2010-12-31 14:46:53.000000000 -0500
15977 +diff -urNp linux-2.6.32.33/net/atm/atm_misc.c linux-2.6.32.33/net/atm/atm_misc.c
15978 +--- linux-2.6.32.33/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
15979 ++++ linux-2.6.32.33/net/atm/atm_misc.c 2010-12-31 14:46:53.000000000 -0500
15980 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
15981 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
15982 return 1;
15983 @@ -58314,9 +58453,9 @@ diff -urNp linux-2.6.32.32/net/atm/atm_misc.c linux-2.6.32.32/net/atm/atm_misc.c
15984 __SONET_ITEMS
15985 #undef __HANDLE_ITEM
15986 }
15987 -diff -urNp linux-2.6.32.32/net/atm/proc.c linux-2.6.32.32/net/atm/proc.c
15988 ---- linux-2.6.32.32/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
15989 -+++ linux-2.6.32.32/net/atm/proc.c 2011-03-12 19:46:43.000000000 -0500
15990 +diff -urNp linux-2.6.32.33/net/atm/proc.c linux-2.6.32.33/net/atm/proc.c
15991 +--- linux-2.6.32.33/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
15992 ++++ linux-2.6.32.33/net/atm/proc.c 2011-03-12 19:46:43.000000000 -0500
15993 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
15994 const struct k_atm_aal_stats *stats)
15995 {
15996 @@ -58355,9 +58494,9 @@ diff -urNp linux-2.6.32.32/net/atm/proc.c linux-2.6.32.32/net/atm/proc.c
15997 else
15998 seq_printf(seq, "%3d %3d %5d ",
15999 vcc->dev->number, vcc->vpi, vcc->vci);
16000 -diff -urNp linux-2.6.32.32/net/atm/resources.c linux-2.6.32.32/net/atm/resources.c
16001 ---- linux-2.6.32.32/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
16002 -+++ linux-2.6.32.32/net/atm/resources.c 2010-12-31 14:46:53.000000000 -0500
16003 +diff -urNp linux-2.6.32.33/net/atm/resources.c linux-2.6.32.33/net/atm/resources.c
16004 +--- linux-2.6.32.33/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
16005 ++++ linux-2.6.32.33/net/atm/resources.c 2010-12-31 14:46:53.000000000 -0500
16006 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
16007 static void copy_aal_stats(struct k_atm_aal_stats *from,
16008 struct atm_aal_stats *to)
16009 @@ -58376,9 +58515,9 @@ diff -urNp linux-2.6.32.32/net/atm/resources.c linux-2.6.32.32/net/atm/resources
16010 __AAL_STAT_ITEMS
16011 #undef __HANDLE_ITEM
16012 }
16013 -diff -urNp linux-2.6.32.32/net/ax25/af_ax25.c linux-2.6.32.32/net/ax25/af_ax25.c
16014 ---- linux-2.6.32.32/net/ax25/af_ax25.c 2010-08-13 16:24:37.000000000 -0400
16015 -+++ linux-2.6.32.32/net/ax25/af_ax25.c 2010-12-31 14:46:53.000000000 -0500
16016 +diff -urNp linux-2.6.32.33/net/ax25/af_ax25.c linux-2.6.32.33/net/ax25/af_ax25.c
16017 +--- linux-2.6.32.33/net/ax25/af_ax25.c 2010-08-13 16:24:37.000000000 -0400
16018 ++++ linux-2.6.32.33/net/ax25/af_ax25.c 2010-12-31 14:46:53.000000000 -0500
16019 @@ -1391,6 +1391,7 @@ static int ax25_getname(struct socket *s
16020 ax25_cb *ax25;
16021 int err = 0;
16022 @@ -58395,9 +58534,9 @@ diff -urNp linux-2.6.32.32/net/ax25/af_ax25.c linux-2.6.32.32/net/ax25/af_ax25.c
16023
16024 if (ax25->digipeat != NULL) {
16025 ndigi = ax25->digipeat->ndigi;
16026 -diff -urNp linux-2.6.32.32/net/bluetooth/bnep/sock.c linux-2.6.32.32/net/bluetooth/bnep/sock.c
16027 ---- linux-2.6.32.32/net/bluetooth/bnep/sock.c 2010-08-13 16:24:37.000000000 -0400
16028 -+++ linux-2.6.32.32/net/bluetooth/bnep/sock.c 2011-02-28 17:57:10.000000000 -0500
16029 +diff -urNp linux-2.6.32.33/net/bluetooth/bnep/sock.c linux-2.6.32.33/net/bluetooth/bnep/sock.c
16030 +--- linux-2.6.32.33/net/bluetooth/bnep/sock.c 2010-08-13 16:24:37.000000000 -0400
16031 ++++ linux-2.6.32.33/net/bluetooth/bnep/sock.c 2011-02-28 17:57:10.000000000 -0500
16032 @@ -88,6 +88,7 @@ static int bnep_sock_ioctl(struct socket
16033 sockfd_put(nsock);
16034 return -EBADFD;
16035 @@ -58406,9 +58545,9 @@ diff -urNp linux-2.6.32.32/net/bluetooth/bnep/sock.c linux-2.6.32.32/net/bluetoo
16036
16037 err = bnep_add_connection(&ca, nsock);
16038 if (!err) {
16039 -diff -urNp linux-2.6.32.32/net/bluetooth/sco.c linux-2.6.32.32/net/bluetooth/sco.c
16040 ---- linux-2.6.32.32/net/bluetooth/sco.c 2010-08-13 16:24:37.000000000 -0400
16041 -+++ linux-2.6.32.32/net/bluetooth/sco.c 2011-02-28 17:55:46.000000000 -0500
16042 +diff -urNp linux-2.6.32.33/net/bluetooth/sco.c linux-2.6.32.33/net/bluetooth/sco.c
16043 +--- linux-2.6.32.33/net/bluetooth/sco.c 2010-08-13 16:24:37.000000000 -0400
16044 ++++ linux-2.6.32.33/net/bluetooth/sco.c 2011-02-28 17:55:46.000000000 -0500
16045 @@ -700,6 +700,7 @@ static int sco_sock_getsockopt_old(struc
16046 break;
16047 }
16048 @@ -58417,9 +58556,9 @@ diff -urNp linux-2.6.32.32/net/bluetooth/sco.c linux-2.6.32.32/net/bluetooth/sco
16049 cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
16050 memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
16051
16052 -diff -urNp linux-2.6.32.32/net/bridge/br_private.h linux-2.6.32.32/net/bridge/br_private.h
16053 ---- linux-2.6.32.32/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
16054 -+++ linux-2.6.32.32/net/bridge/br_private.h 2010-12-31 14:46:53.000000000 -0500
16055 +diff -urNp linux-2.6.32.33/net/bridge/br_private.h linux-2.6.32.33/net/bridge/br_private.h
16056 +--- linux-2.6.32.33/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
16057 ++++ linux-2.6.32.33/net/bridge/br_private.h 2010-12-31 14:46:53.000000000 -0500
16058 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
16059
16060 #ifdef CONFIG_SYSFS
16061 @@ -58429,9 +58568,9 @@ diff -urNp linux-2.6.32.32/net/bridge/br_private.h linux-2.6.32.32/net/bridge/br
16062 extern int br_sysfs_addif(struct net_bridge_port *p);
16063
16064 /* br_sysfs_br.c */
16065 -diff -urNp linux-2.6.32.32/net/bridge/br_stp_if.c linux-2.6.32.32/net/bridge/br_stp_if.c
16066 ---- linux-2.6.32.32/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
16067 -+++ linux-2.6.32.32/net/bridge/br_stp_if.c 2010-12-31 14:46:53.000000000 -0500
16068 +diff -urNp linux-2.6.32.33/net/bridge/br_stp_if.c linux-2.6.32.33/net/bridge/br_stp_if.c
16069 +--- linux-2.6.32.33/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
16070 ++++ linux-2.6.32.33/net/bridge/br_stp_if.c 2010-12-31 14:46:53.000000000 -0500
16071 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
16072 char *envp[] = { NULL };
16073
16074 @@ -58441,9 +58580,9 @@ diff -urNp linux-2.6.32.32/net/bridge/br_stp_if.c linux-2.6.32.32/net/bridge/br_
16075 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
16076 br->dev->name, r);
16077
16078 -diff -urNp linux-2.6.32.32/net/bridge/br_sysfs_if.c linux-2.6.32.32/net/bridge/br_sysfs_if.c
16079 ---- linux-2.6.32.32/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
16080 -+++ linux-2.6.32.32/net/bridge/br_sysfs_if.c 2010-12-31 14:46:53.000000000 -0500
16081 +diff -urNp linux-2.6.32.33/net/bridge/br_sysfs_if.c linux-2.6.32.33/net/bridge/br_sysfs_if.c
16082 +--- linux-2.6.32.33/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
16083 ++++ linux-2.6.32.33/net/bridge/br_sysfs_if.c 2010-12-31 14:46:53.000000000 -0500
16084 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
16085 return ret;
16086 }
16087 @@ -58453,9 +58592,9 @@ diff -urNp linux-2.6.32.32/net/bridge/br_sysfs_if.c linux-2.6.32.32/net/bridge/b
16088 .show = brport_show,
16089 .store = brport_store,
16090 };
16091 -diff -urNp linux-2.6.32.32/net/bridge/netfilter/ebtables.c linux-2.6.32.32/net/bridge/netfilter/ebtables.c
16092 ---- linux-2.6.32.32/net/bridge/netfilter/ebtables.c 2010-08-13 16:24:37.000000000 -0400
16093 -+++ linux-2.6.32.32/net/bridge/netfilter/ebtables.c 2011-02-28 17:58:13.000000000 -0500
16094 +diff -urNp linux-2.6.32.33/net/bridge/netfilter/ebtables.c linux-2.6.32.33/net/bridge/netfilter/ebtables.c
16095 +--- linux-2.6.32.33/net/bridge/netfilter/ebtables.c 2010-08-13 16:24:37.000000000 -0400
16096 ++++ linux-2.6.32.33/net/bridge/netfilter/ebtables.c 2011-02-28 17:58:13.000000000 -0500
16097 @@ -979,6 +979,8 @@ static int do_replace(struct net *net, v
16098 if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
16099 return -ENOMEM;
16100 @@ -58465,9 +58604,9 @@ diff -urNp linux-2.6.32.32/net/bridge/netfilter/ebtables.c linux-2.6.32.32/net/b
16101 countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
16102 newinfo = vmalloc(sizeof(*newinfo) + countersize);
16103 if (!newinfo)
16104 -diff -urNp linux-2.6.32.32/net/can/bcm.c linux-2.6.32.32/net/can/bcm.c
16105 ---- linux-2.6.32.32/net/can/bcm.c 2010-12-09 18:13:03.000000000 -0500
16106 -+++ linux-2.6.32.32/net/can/bcm.c 2011-03-12 19:48:30.000000000 -0500
16107 +diff -urNp linux-2.6.32.33/net/can/bcm.c linux-2.6.32.33/net/can/bcm.c
16108 +--- linux-2.6.32.33/net/can/bcm.c 2010-12-09 18:13:03.000000000 -0500
16109 ++++ linux-2.6.32.33/net/can/bcm.c 2011-03-12 19:48:30.000000000 -0500
16110 @@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file
16111 struct bcm_sock *bo = bcm_sk(sk);
16112 struct bcm_op *op;
16113 @@ -58484,30 +58623,10 @@ diff -urNp linux-2.6.32.32/net/can/bcm.c linux-2.6.32.32/net/can/bcm.c
16114 seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
16115 seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
16116 seq_printf(m, " <<<\n");
16117 -diff -urNp linux-2.6.32.32/net/core/dev.c linux-2.6.32.32/net/core/dev.c
16118 ---- linux-2.6.32.32/net/core/dev.c 2011-01-11 23:55:35.000000000 -0500
16119 -+++ linux-2.6.32.32/net/core/dev.c 2011-02-28 18:08:33.000000000 -0500
16120 -@@ -1042,8 +1042,17 @@ void dev_load(struct net *net, const cha
16121 - dev = __dev_get_by_name(net, name);
16122 - read_unlock(&dev_base_lock);
16123 -
16124 -- if (!dev && capable(CAP_NET_ADMIN))
16125 -- request_module("%s", name);
16126 -+ if (!dev) {
16127 -+ if (capable(CAP_NET_ADMIN))
16128 -+ request_module("netdev-%s", name);
16129 -+ if (capable(CAP_SYS_MODULE)) {
16130 -+ if (!request_module("%s", name))
16131 -+ WARN_ONCE(1, "Loading kernel module for a network device"
16132 -+ " with CAP_SYS_MODULE (deprecated). Use "
16133 -+ "CAP_NET_ADMIN and alias netdev-%s instead\n",
16134 -+ name);
16135 -+ }
16136 -+ }
16137 - }
16138 - EXPORT_SYMBOL(dev_load);
16139 -
16140 -@@ -2055,7 +2064,7 @@ int netif_rx_ni(struct sk_buff *skb)
16141 +diff -urNp linux-2.6.32.33/net/core/dev.c linux-2.6.32.33/net/core/dev.c
16142 +--- linux-2.6.32.33/net/core/dev.c 2011-03-18 17:10:31.000000000 -0400
16143 ++++ linux-2.6.32.33/net/core/dev.c 2011-03-18 17:26:38.000000000 -0400
16144 +@@ -2063,7 +2063,7 @@ int netif_rx_ni(struct sk_buff *skb)
16145 }
16146 EXPORT_SYMBOL(netif_rx_ni);
16147
16148 @@ -58516,7 +58635,7 @@ diff -urNp linux-2.6.32.32/net/core/dev.c linux-2.6.32.32/net/core/dev.c
16149 {
16150 struct softnet_data *sd = &__get_cpu_var(softnet_data);
16151
16152 -@@ -2816,7 +2825,7 @@ void netif_napi_del(struct napi_struct *
16153 +@@ -2824,7 +2824,7 @@ void netif_napi_del(struct napi_struct *
16154 EXPORT_SYMBOL(netif_napi_del);
16155
16156
16157 @@ -58525,9 +58644,9 @@ diff -urNp linux-2.6.32.32/net/core/dev.c linux-2.6.32.32/net/core/dev.c
16158 {
16159 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
16160 unsigned long time_limit = jiffies + 2;
16161 -diff -urNp linux-2.6.32.32/net/core/flow.c linux-2.6.32.32/net/core/flow.c
16162 ---- linux-2.6.32.32/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
16163 -+++ linux-2.6.32.32/net/core/flow.c 2010-12-31 14:46:53.000000000 -0500
16164 +diff -urNp linux-2.6.32.33/net/core/flow.c linux-2.6.32.33/net/core/flow.c
16165 +--- linux-2.6.32.33/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
16166 ++++ linux-2.6.32.33/net/core/flow.c 2010-12-31 14:46:53.000000000 -0500
16167 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
16168
16169 static u32 flow_hash_shift;
16170 @@ -58555,9 +58674,9 @@ diff -urNp linux-2.6.32.32/net/core/flow.c linux-2.6.32.32/net/core/flow.c
16171
16172 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
16173
16174 -diff -urNp linux-2.6.32.32/net/dccp/ccids/ccid3.c linux-2.6.32.32/net/dccp/ccids/ccid3.c
16175 ---- linux-2.6.32.32/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
16176 -+++ linux-2.6.32.32/net/dccp/ccids/ccid3.c 2010-12-31 14:46:53.000000000 -0500
16177 +diff -urNp linux-2.6.32.33/net/dccp/ccids/ccid3.c linux-2.6.32.33/net/dccp/ccids/ccid3.c
16178 +--- linux-2.6.32.33/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
16179 ++++ linux-2.6.32.33/net/dccp/ccids/ccid3.c 2010-12-31 14:46:53.000000000 -0500
16180 @@ -41,7 +41,7 @@
16181 static int ccid3_debug;
16182 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
16183 @@ -58567,9 +58686,9 @@ diff -urNp linux-2.6.32.32/net/dccp/ccids/ccid3.c linux-2.6.32.32/net/dccp/ccids
16184 #endif
16185
16186 /*
16187 -diff -urNp linux-2.6.32.32/net/dccp/dccp.h linux-2.6.32.32/net/dccp/dccp.h
16188 ---- linux-2.6.32.32/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
16189 -+++ linux-2.6.32.32/net/dccp/dccp.h 2010-12-31 14:46:53.000000000 -0500
16190 +diff -urNp linux-2.6.32.33/net/dccp/dccp.h linux-2.6.32.33/net/dccp/dccp.h
16191 +--- linux-2.6.32.33/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
16192 ++++ linux-2.6.32.33/net/dccp/dccp.h 2010-12-31 14:46:53.000000000 -0500
16193 @@ -44,9 +44,9 @@ extern int dccp_debug;
16194 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
16195 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
16196 @@ -58583,9 +58702,9 @@ diff -urNp linux-2.6.32.32/net/dccp/dccp.h linux-2.6.32.32/net/dccp/dccp.h
16197 #endif
16198
16199 extern struct inet_hashinfo dccp_hashinfo;
16200 -diff -urNp linux-2.6.32.32/net/decnet/sysctl_net_decnet.c linux-2.6.32.32/net/decnet/sysctl_net_decnet.c
16201 ---- linux-2.6.32.32/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
16202 -+++ linux-2.6.32.32/net/decnet/sysctl_net_decnet.c 2010-12-31 14:46:53.000000000 -0500
16203 +diff -urNp linux-2.6.32.33/net/decnet/sysctl_net_decnet.c linux-2.6.32.33/net/decnet/sysctl_net_decnet.c
16204 +--- linux-2.6.32.33/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
16205 ++++ linux-2.6.32.33/net/decnet/sysctl_net_decnet.c 2010-12-31 14:46:53.000000000 -0500
16206 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
16207
16208 if (len > *lenp) len = *lenp;
16209 @@ -58604,9 +58723,9 @@ diff -urNp linux-2.6.32.32/net/decnet/sysctl_net_decnet.c linux-2.6.32.32/net/de
16210 return -EFAULT;
16211
16212 *lenp = len;
16213 -diff -urNp linux-2.6.32.32/net/econet/Kconfig linux-2.6.32.32/net/econet/Kconfig
16214 ---- linux-2.6.32.32/net/econet/Kconfig 2010-08-13 16:24:37.000000000 -0400
16215 -+++ linux-2.6.32.32/net/econet/Kconfig 2010-12-31 14:46:53.000000000 -0500
16216 +diff -urNp linux-2.6.32.33/net/econet/Kconfig linux-2.6.32.33/net/econet/Kconfig
16217 +--- linux-2.6.32.33/net/econet/Kconfig 2010-08-13 16:24:37.000000000 -0400
16218 ++++ linux-2.6.32.33/net/econet/Kconfig 2010-12-31 14:46:53.000000000 -0500
16219 @@ -4,7 +4,7 @@
16220
16221 config ECONET
16222 @@ -58616,9 +58735,9 @@ diff -urNp linux-2.6.32.32/net/econet/Kconfig linux-2.6.32.32/net/econet/Kconfig
16223 ---help---
16224 Econet is a fairly old and slow networking protocol mainly used by
16225 Acorn computers to access file and print servers. It uses native
16226 -diff -urNp linux-2.6.32.32/net/ipv4/inet_diag.c linux-2.6.32.32/net/ipv4/inet_diag.c
16227 ---- linux-2.6.32.32/net/ipv4/inet_diag.c 2010-08-13 16:24:37.000000000 -0400
16228 -+++ linux-2.6.32.32/net/ipv4/inet_diag.c 2010-12-31 14:46:53.000000000 -0500
16229 +diff -urNp linux-2.6.32.33/net/ipv4/inet_diag.c linux-2.6.32.33/net/ipv4/inet_diag.c
16230 +--- linux-2.6.32.33/net/ipv4/inet_diag.c 2010-08-13 16:24:37.000000000 -0400
16231 ++++ linux-2.6.32.33/net/ipv4/inet_diag.c 2010-12-31 14:46:53.000000000 -0500
16232 @@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
16233 r->idiag_retrans = 0;
16234
16235 @@ -58679,9 +58798,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/inet_diag.c linux-2.6.32.32/net/ipv4/inet_di
16236
16237 tmo = req->expires - jiffies;
16238 if (tmo < 0)
16239 -diff -urNp linux-2.6.32.32/net/ipv4/inet_hashtables.c linux-2.6.32.32/net/ipv4/inet_hashtables.c
16240 ---- linux-2.6.32.32/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
16241 -+++ linux-2.6.32.32/net/ipv4/inet_hashtables.c 2010-12-31 14:46:53.000000000 -0500
16242 +diff -urNp linux-2.6.32.33/net/ipv4/inet_hashtables.c linux-2.6.32.33/net/ipv4/inet_hashtables.c
16243 +--- linux-2.6.32.33/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
16244 ++++ linux-2.6.32.33/net/ipv4/inet_hashtables.c 2010-12-31 14:46:53.000000000 -0500
16245 @@ -18,11 +18,14 @@
16246 #include <linux/sched.h>
16247 #include <linux/slab.h>
16248 @@ -58706,9 +58825,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/inet_hashtables.c linux-2.6.32.32/net/ipv4/i
16249 if (tw) {
16250 inet_twsk_deschedule(tw, death_row);
16251 inet_twsk_put(tw);
16252 -diff -urNp linux-2.6.32.32/net/ipv4/inetpeer.c linux-2.6.32.32/net/ipv4/inetpeer.c
16253 ---- linux-2.6.32.32/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400
16254 -+++ linux-2.6.32.32/net/ipv4/inetpeer.c 2010-12-31 14:46:53.000000000 -0500
16255 +diff -urNp linux-2.6.32.33/net/ipv4/inetpeer.c linux-2.6.32.33/net/ipv4/inetpeer.c
16256 +--- linux-2.6.32.33/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400
16257 ++++ linux-2.6.32.33/net/ipv4/inetpeer.c 2010-12-31 14:46:53.000000000 -0500
16258 @@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da
16259 return NULL;
16260 n->v4daddr = daddr;
16261 @@ -58718,9 +58837,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/inetpeer.c linux-2.6.32.32/net/ipv4/inetpeer
16262 n->ip_id_count = secure_ip_id(daddr);
16263 n->tcp_ts_stamp = 0;
16264
16265 -diff -urNp linux-2.6.32.32/net/ipv4/ip_fragment.c linux-2.6.32.32/net/ipv4/ip_fragment.c
16266 ---- linux-2.6.32.32/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400
16267 -+++ linux-2.6.32.32/net/ipv4/ip_fragment.c 2010-12-31 14:46:53.000000000 -0500
16268 +diff -urNp linux-2.6.32.33/net/ipv4/ip_fragment.c linux-2.6.32.33/net/ipv4/ip_fragment.c
16269 +--- linux-2.6.32.33/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400
16270 ++++ linux-2.6.32.33/net/ipv4/ip_fragment.c 2010-12-31 14:46:53.000000000 -0500
16271 @@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
16272 return 0;
16273
16274 @@ -58730,9 +58849,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/ip_fragment.c linux-2.6.32.32/net/ipv4/ip_fr
16275 qp->rid = end;
16276
16277 rc = qp->q.fragments && (end - start) > max;
16278 -diff -urNp linux-2.6.32.32/net/ipv4/netfilter/arp_tables.c linux-2.6.32.32/net/ipv4/netfilter/arp_tables.c
16279 ---- linux-2.6.32.32/net/ipv4/netfilter/arp_tables.c 2010-08-13 16:24:37.000000000 -0400
16280 -+++ linux-2.6.32.32/net/ipv4/netfilter/arp_tables.c 2010-12-31 14:46:53.000000000 -0500
16281 +diff -urNp linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c
16282 +--- linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c 2010-08-13 16:24:37.000000000 -0400
16283 ++++ linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c 2010-12-31 14:46:53.000000000 -0500
16284 @@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
16285 private = &tmp;
16286 }
16287 @@ -58741,9 +58860,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/netfilter/arp_tables.c linux-2.6.32.32/net/i
16288 info.valid_hooks = t->valid_hooks;
16289 memcpy(info.hook_entry, private->hook_entry,
16290 sizeof(info.hook_entry));
16291 -diff -urNp linux-2.6.32.32/net/ipv4/netfilter/ip_tables.c linux-2.6.32.32/net/ipv4/netfilter/ip_tables.c
16292 ---- linux-2.6.32.32/net/ipv4/netfilter/ip_tables.c 2010-08-13 16:24:37.000000000 -0400
16293 -+++ linux-2.6.32.32/net/ipv4/netfilter/ip_tables.c 2010-12-31 14:46:53.000000000 -0500
16294 +diff -urNp linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c
16295 +--- linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c 2010-08-13 16:24:37.000000000 -0400
16296 ++++ linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c 2010-12-31 14:46:53.000000000 -0500
16297 @@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
16298 private = &tmp;
16299 }
16300 @@ -58752,9 +58871,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/netfilter/ip_tables.c linux-2.6.32.32/net/ip
16301 info.valid_hooks = t->valid_hooks;
16302 memcpy(info.hook_entry, private->hook_entry,
16303 sizeof(info.hook_entry));
16304 -diff -urNp linux-2.6.32.32/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.32/net/ipv4/netfilter/nf_nat_snmp_basic.c
16305 ---- linux-2.6.32.32/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
16306 -+++ linux-2.6.32.32/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-31 14:46:53.000000000 -0500
16307 +diff -urNp linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c
16308 +--- linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
16309 ++++ linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-31 14:46:53.000000000 -0500
16310 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
16311
16312 *len = 0;
16313 @@ -58764,9 +58883,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.3
16314 if (*octets == NULL) {
16315 if (net_ratelimit())
16316 printk("OOM in bsalg (%d)\n", __LINE__);
16317 -diff -urNp linux-2.6.32.32/net/ipv4/tcp_ipv4.c linux-2.6.32.32/net/ipv4/tcp_ipv4.c
16318 ---- linux-2.6.32.32/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
16319 -+++ linux-2.6.32.32/net/ipv4/tcp_ipv4.c 2010-12-31 14:46:53.000000000 -0500
16320 +diff -urNp linux-2.6.32.33/net/ipv4/tcp_ipv4.c linux-2.6.32.33/net/ipv4/tcp_ipv4.c
16321 +--- linux-2.6.32.33/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
16322 ++++ linux-2.6.32.33/net/ipv4/tcp_ipv4.c 2010-12-31 14:46:53.000000000 -0500
16323 @@ -84,6 +84,9 @@
16324 int sysctl_tcp_tw_reuse __read_mostly;
16325 int sysctl_tcp_low_latency __read_mostly;
16326 @@ -58862,9 +58981,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/tcp_ipv4.c linux-2.6.32.32/net/ipv4/tcp_ipv4
16327 }
16328
16329 #define TMPSZ 150
16330 -diff -urNp linux-2.6.32.32/net/ipv4/tcp_minisocks.c linux-2.6.32.32/net/ipv4/tcp_minisocks.c
16331 ---- linux-2.6.32.32/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
16332 -+++ linux-2.6.32.32/net/ipv4/tcp_minisocks.c 2010-12-31 14:46:53.000000000 -0500
16333 +diff -urNp linux-2.6.32.33/net/ipv4/tcp_minisocks.c linux-2.6.32.33/net/ipv4/tcp_minisocks.c
16334 +--- linux-2.6.32.33/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
16335 ++++ linux-2.6.32.33/net/ipv4/tcp_minisocks.c 2010-12-31 14:46:53.000000000 -0500
16336 @@ -26,6 +26,10 @@
16337 #include <net/inet_common.h>
16338 #include <net/xfrm.h>
16339 @@ -58887,9 +59006,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/tcp_minisocks.c linux-2.6.32.32/net/ipv4/tcp
16340 if (!(flg & TCP_FLAG_RST))
16341 req->rsk_ops->send_reset(sk, skb);
16342
16343 -diff -urNp linux-2.6.32.32/net/ipv4/tcp_probe.c linux-2.6.32.32/net/ipv4/tcp_probe.c
16344 ---- linux-2.6.32.32/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
16345 -+++ linux-2.6.32.32/net/ipv4/tcp_probe.c 2010-12-31 14:46:53.000000000 -0500
16346 +diff -urNp linux-2.6.32.33/net/ipv4/tcp_probe.c linux-2.6.32.33/net/ipv4/tcp_probe.c
16347 +--- linux-2.6.32.33/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
16348 ++++ linux-2.6.32.33/net/ipv4/tcp_probe.c 2010-12-31 14:46:53.000000000 -0500
16349 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
16350 if (cnt + width >= len)
16351 break;
16352 @@ -58899,9 +59018,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/tcp_probe.c linux-2.6.32.32/net/ipv4/tcp_pro
16353 return -EFAULT;
16354 cnt += width;
16355 }
16356 -diff -urNp linux-2.6.32.32/net/ipv4/tcp_timer.c linux-2.6.32.32/net/ipv4/tcp_timer.c
16357 ---- linux-2.6.32.32/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
16358 -+++ linux-2.6.32.32/net/ipv4/tcp_timer.c 2010-12-31 14:46:53.000000000 -0500
16359 +diff -urNp linux-2.6.32.33/net/ipv4/tcp_timer.c linux-2.6.32.33/net/ipv4/tcp_timer.c
16360 +--- linux-2.6.32.33/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
16361 ++++ linux-2.6.32.33/net/ipv4/tcp_timer.c 2010-12-31 14:46:53.000000000 -0500
16362 @@ -21,6 +21,10 @@
16363 #include <linux/module.h>
16364 #include <net/tcp.h>
16365 @@ -58927,9 +59046,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/tcp_timer.c linux-2.6.32.32/net/ipv4/tcp_tim
16366 if (retransmits_timed_out(sk, retry_until)) {
16367 /* Has it gone just too far? */
16368 tcp_write_err(sk);
16369 -diff -urNp linux-2.6.32.32/net/ipv4/udp.c linux-2.6.32.32/net/ipv4/udp.c
16370 ---- linux-2.6.32.32/net/ipv4/udp.c 2010-12-09 18:13:03.000000000 -0500
16371 -+++ linux-2.6.32.32/net/ipv4/udp.c 2010-12-31 14:46:53.000000000 -0500
16372 +diff -urNp linux-2.6.32.33/net/ipv4/udp.c linux-2.6.32.33/net/ipv4/udp.c
16373 +--- linux-2.6.32.33/net/ipv4/udp.c 2010-12-09 18:13:03.000000000 -0500
16374 ++++ linux-2.6.32.33/net/ipv4/udp.c 2010-12-31 14:46:53.000000000 -0500
16375 @@ -86,6 +86,7 @@
16376 #include <linux/types.h>
16377 #include <linux/fcntl.h>
16378 @@ -59013,9 +59132,9 @@ diff -urNp linux-2.6.32.32/net/ipv4/udp.c linux-2.6.32.32/net/ipv4/udp.c
16379 atomic_read(&sp->sk_drops), len);
16380 }
16381
16382 -diff -urNp linux-2.6.32.32/net/ipv6/exthdrs.c linux-2.6.32.32/net/ipv6/exthdrs.c
16383 ---- linux-2.6.32.32/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
16384 -+++ linux-2.6.32.32/net/ipv6/exthdrs.c 2010-12-31 14:46:53.000000000 -0500
16385 +diff -urNp linux-2.6.32.33/net/ipv6/exthdrs.c linux-2.6.32.33/net/ipv6/exthdrs.c
16386 +--- linux-2.6.32.33/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
16387 ++++ linux-2.6.32.33/net/ipv6/exthdrs.c 2010-12-31 14:46:53.000000000 -0500
16388 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
16389 .type = IPV6_TLV_JUMBO,
16390 .func = ipv6_hop_jumbo,
16391 @@ -59025,9 +59144,9 @@ diff -urNp linux-2.6.32.32/net/ipv6/exthdrs.c linux-2.6.32.32/net/ipv6/exthdrs.c
16392 };
16393
16394 int ipv6_parse_hopopts(struct sk_buff *skb)
16395 -diff -urNp linux-2.6.32.32/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.32/net/ipv6/netfilter/ip6_tables.c
16396 ---- linux-2.6.32.32/net/ipv6/netfilter/ip6_tables.c 2010-08-13 16:24:37.000000000 -0400
16397 -+++ linux-2.6.32.32/net/ipv6/netfilter/ip6_tables.c 2010-12-31 14:46:53.000000000 -0500
16398 +diff -urNp linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c
16399 +--- linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c 2010-08-13 16:24:37.000000000 -0400
16400 ++++ linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c 2010-12-31 14:46:53.000000000 -0500
16401 @@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
16402 private = &tmp;
16403 }
16404 @@ -59036,9 +59155,9 @@ diff -urNp linux-2.6.32.32/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.32/net/i
16405 info.valid_hooks = t->valid_hooks;
16406 memcpy(info.hook_entry, private->hook_entry,
16407 sizeof(info.hook_entry));
16408 -diff -urNp linux-2.6.32.32/net/ipv6/raw.c linux-2.6.32.32/net/ipv6/raw.c
16409 ---- linux-2.6.32.32/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
16410 -+++ linux-2.6.32.32/net/ipv6/raw.c 2010-12-31 14:46:53.000000000 -0500
16411 +diff -urNp linux-2.6.32.33/net/ipv6/raw.c linux-2.6.32.33/net/ipv6/raw.c
16412 +--- linux-2.6.32.33/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
16413 ++++ linux-2.6.32.33/net/ipv6/raw.c 2010-12-31 14:46:53.000000000 -0500
16414 @@ -600,7 +600,7 @@ out:
16415 return err;
16416 }
16417 @@ -59063,18 +59182,9 @@ diff -urNp linux-2.6.32.32/net/ipv6/raw.c linux-2.6.32.32/net/ipv6/raw.c
16418 }
16419
16420 static int raw6_seq_show(struct seq_file *seq, void *v)
16421 -diff -urNp linux-2.6.32.32/net/ipv6/sit.c linux-2.6.32.32/net/ipv6/sit.c
16422 ---- linux-2.6.32.32/net/ipv6/sit.c 2010-08-13 16:24:37.000000000 -0400
16423 -+++ linux-2.6.32.32/net/ipv6/sit.c 2011-02-28 18:21:13.000000000 -0500
16424 -@@ -1101,4 +1101,4 @@ static int __init sit_init(void)
16425 - module_init(sit_init);
16426 - module_exit(sit_cleanup);
16427 - MODULE_LICENSE("GPL");
16428 --MODULE_ALIAS("sit0");
16429 -+MODULE_ALIAS_NETDEV("sit0");
16430 -diff -urNp linux-2.6.32.32/net/ipv6/tcp_ipv6.c linux-2.6.32.32/net/ipv6/tcp_ipv6.c
16431 ---- linux-2.6.32.32/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
16432 -+++ linux-2.6.32.32/net/ipv6/tcp_ipv6.c 2010-12-31 14:46:53.000000000 -0500
16433 +diff -urNp linux-2.6.32.33/net/ipv6/tcp_ipv6.c linux-2.6.32.33/net/ipv6/tcp_ipv6.c
16434 +--- linux-2.6.32.33/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
16435 ++++ linux-2.6.32.33/net/ipv6/tcp_ipv6.c 2010-12-31 14:46:53.000000000 -0500
16436 @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
16437 }
16438 #endif
16439 @@ -59174,9 +59284,9 @@ diff -urNp linux-2.6.32.32/net/ipv6/tcp_ipv6.c linux-2.6.32.32/net/ipv6/tcp_ipv6
16440 }
16441
16442 static int tcp6_seq_show(struct seq_file *seq, void *v)
16443 -diff -urNp linux-2.6.32.32/net/ipv6/udp.c linux-2.6.32.32/net/ipv6/udp.c
16444 ---- linux-2.6.32.32/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
16445 -+++ linux-2.6.32.32/net/ipv6/udp.c 2010-12-31 14:46:53.000000000 -0500
16446 +diff -urNp linux-2.6.32.33/net/ipv6/udp.c linux-2.6.32.33/net/ipv6/udp.c
16447 +--- linux-2.6.32.33/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
16448 ++++ linux-2.6.32.33/net/ipv6/udp.c 2010-12-31 14:46:53.000000000 -0500
16449 @@ -49,6 +49,10 @@
16450 #include <linux/seq_file.h>
16451 #include "udp_impl.h"
16452 @@ -59212,9 +59322,9 @@ diff -urNp linux-2.6.32.32/net/ipv6/udp.c linux-2.6.32.32/net/ipv6/udp.c
16453 atomic_read(&sp->sk_drops));
16454 }
16455
16456 -diff -urNp linux-2.6.32.32/net/irda/af_irda.c linux-2.6.32.32/net/irda/af_irda.c
16457 ---- linux-2.6.32.32/net/irda/af_irda.c 2010-09-26 17:26:06.000000000 -0400
16458 -+++ linux-2.6.32.32/net/irda/af_irda.c 2011-01-08 13:13:09.000000000 -0500
16459 +diff -urNp linux-2.6.32.33/net/irda/af_irda.c linux-2.6.32.33/net/irda/af_irda.c
16460 +--- linux-2.6.32.33/net/irda/af_irda.c 2010-09-26 17:26:06.000000000 -0400
16461 ++++ linux-2.6.32.33/net/irda/af_irda.c 2011-01-08 13:13:09.000000000 -0500
16462 @@ -2164,6 +2164,13 @@ static int irda_getsockopt(struct socket
16463
16464 switch (optname) {
16465 @@ -59246,9 +59356,9 @@ diff -urNp linux-2.6.32.32/net/irda/af_irda.c linux-2.6.32.32/net/irda/af_irda.c
16466 /* Copy the list itself - watch for overflow */
16467 if(list.len > 2048)
16468 {
16469 -diff -urNp linux-2.6.32.32/net/irda/ircomm/ircomm_tty.c linux-2.6.32.32/net/irda/ircomm/ircomm_tty.c
16470 ---- linux-2.6.32.32/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
16471 -+++ linux-2.6.32.32/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:05:37.000000000 -0500
16472 +diff -urNp linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c
16473 +--- linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
16474 ++++ linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:05:37.000000000 -0500
16475 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
16476 add_wait_queue(&self->open_wait, &wait);
16477
16478 @@ -59371,9 +59481,9 @@ diff -urNp linux-2.6.32.32/net/irda/ircomm/ircomm_tty.c linux-2.6.32.32/net/irda
16479 seq_printf(m, "Max data size: %d\n", self->max_data_size);
16480 seq_printf(m, "Max header size: %d\n", self->max_header_size);
16481
16482 -diff -urNp linux-2.6.32.32/net/key/af_key.c linux-2.6.32.32/net/key/af_key.c
16483 ---- linux-2.6.32.32/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
16484 -+++ linux-2.6.32.32/net/key/af_key.c 2010-12-31 14:46:53.000000000 -0500
16485 +diff -urNp linux-2.6.32.33/net/key/af_key.c linux-2.6.32.33/net/key/af_key.c
16486 +--- linux-2.6.32.33/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
16487 ++++ linux-2.6.32.33/net/key/af_key.c 2010-12-31 14:46:53.000000000 -0500
16488 @@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil
16489 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
16490 else
16491 @@ -59386,9 +59496,9 @@ diff -urNp linux-2.6.32.32/net/key/af_key.c linux-2.6.32.32/net/key/af_key.c
16492 atomic_read(&s->sk_refcnt),
16493 sk_rmem_alloc_get(s),
16494 sk_wmem_alloc_get(s),
16495 -diff -urNp linux-2.6.32.32/net/mac80211/debugfs_key.c linux-2.6.32.32/net/mac80211/debugfs_key.c
16496 ---- linux-2.6.32.32/net/mac80211/debugfs_key.c 2010-08-13 16:24:37.000000000 -0400
16497 -+++ linux-2.6.32.32/net/mac80211/debugfs_key.c 2010-12-31 14:46:53.000000000 -0500
16498 +diff -urNp linux-2.6.32.33/net/mac80211/debugfs_key.c linux-2.6.32.33/net/mac80211/debugfs_key.c
16499 +--- linux-2.6.32.33/net/mac80211/debugfs_key.c 2010-08-13 16:24:37.000000000 -0400
16500 ++++ linux-2.6.32.33/net/mac80211/debugfs_key.c 2010-12-31 14:46:53.000000000 -0500
16501 @@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file
16502 size_t count, loff_t *ppos)
16503 {
16504 @@ -59404,9 +59514,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/debugfs_key.c linux-2.6.32.32/net/mac802
16505
16506 for (i = 0; i < key->conf.keylen; i++)
16507 p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
16508 -diff -urNp linux-2.6.32.32/net/mac80211/ieee80211_i.h linux-2.6.32.32/net/mac80211/ieee80211_i.h
16509 ---- linux-2.6.32.32/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
16510 -+++ linux-2.6.32.32/net/mac80211/ieee80211_i.h 2011-01-24 18:05:37.000000000 -0500
16511 +diff -urNp linux-2.6.32.33/net/mac80211/ieee80211_i.h linux-2.6.32.33/net/mac80211/ieee80211_i.h
16512 +--- linux-2.6.32.33/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
16513 ++++ linux-2.6.32.33/net/mac80211/ieee80211_i.h 2011-01-24 18:05:37.000000000 -0500
16514 @@ -25,6 +25,7 @@
16515 #include <linux/etherdevice.h>
16516 #include <net/cfg80211.h>
16517 @@ -59424,9 +59534,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/ieee80211_i.h linux-2.6.32.32/net/mac802
16518 int monitors, cooked_mntrs;
16519 /* number of interfaces with corresponding FIF_ flags */
16520 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
16521 -diff -urNp linux-2.6.32.32/net/mac80211/iface.c linux-2.6.32.32/net/mac80211/iface.c
16522 ---- linux-2.6.32.32/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
16523 -+++ linux-2.6.32.32/net/mac80211/iface.c 2011-01-24 18:05:37.000000000 -0500
16524 +diff -urNp linux-2.6.32.33/net/mac80211/iface.c linux-2.6.32.33/net/mac80211/iface.c
16525 +--- linux-2.6.32.33/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
16526 ++++ linux-2.6.32.33/net/mac80211/iface.c 2011-01-24 18:05:37.000000000 -0500
16527 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
16528 break;
16529 }
16530 @@ -59481,9 +59591,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/iface.c linux-2.6.32.32/net/mac80211/ifa
16531 ieee80211_clear_tx_pending(local);
16532 ieee80211_stop_device(local);
16533
16534 -diff -urNp linux-2.6.32.32/net/mac80211/main.c linux-2.6.32.32/net/mac80211/main.c
16535 ---- linux-2.6.32.32/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
16536 -+++ linux-2.6.32.32/net/mac80211/main.c 2011-01-24 18:05:37.000000000 -0500
16537 +diff -urNp linux-2.6.32.33/net/mac80211/main.c linux-2.6.32.33/net/mac80211/main.c
16538 +--- linux-2.6.32.33/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
16539 ++++ linux-2.6.32.33/net/mac80211/main.c 2011-01-24 18:05:37.000000000 -0500
16540 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
16541 local->hw.conf.power_level = power;
16542 }
16543 @@ -59493,9 +59603,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/main.c linux-2.6.32.32/net/mac80211/main
16544 ret = drv_config(local, changed);
16545 /*
16546 * Goal:
16547 -diff -urNp linux-2.6.32.32/net/mac80211/pm.c linux-2.6.32.32/net/mac80211/pm.c
16548 ---- linux-2.6.32.32/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
16549 -+++ linux-2.6.32.32/net/mac80211/pm.c 2011-01-24 18:05:37.000000000 -0500
16550 +diff -urNp linux-2.6.32.33/net/mac80211/pm.c linux-2.6.32.33/net/mac80211/pm.c
16551 +--- linux-2.6.32.33/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
16552 ++++ linux-2.6.32.33/net/mac80211/pm.c 2011-01-24 18:05:37.000000000 -0500
16553 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
16554 }
16555
16556 @@ -59505,9 +59615,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/pm.c linux-2.6.32.32/net/mac80211/pm.c
16557 ieee80211_stop_device(local);
16558
16559 local->suspended = true;
16560 -diff -urNp linux-2.6.32.32/net/mac80211/rate.c linux-2.6.32.32/net/mac80211/rate.c
16561 ---- linux-2.6.32.32/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
16562 -+++ linux-2.6.32.32/net/mac80211/rate.c 2011-01-24 18:05:37.000000000 -0500
16563 +diff -urNp linux-2.6.32.33/net/mac80211/rate.c linux-2.6.32.33/net/mac80211/rate.c
16564 +--- linux-2.6.32.33/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
16565 ++++ linux-2.6.32.33/net/mac80211/rate.c 2011-01-24 18:05:37.000000000 -0500
16566 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
16567 struct rate_control_ref *ref, *old;
16568
16569 @@ -59517,9 +59627,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/rate.c linux-2.6.32.32/net/mac80211/rate
16570 return -EBUSY;
16571
16572 ref = rate_control_alloc(name, local);
16573 -diff -urNp linux-2.6.32.32/net/mac80211/tx.c linux-2.6.32.32/net/mac80211/tx.c
16574 ---- linux-2.6.32.32/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
16575 -+++ linux-2.6.32.32/net/mac80211/tx.c 2010-12-31 14:46:53.000000000 -0500
16576 +diff -urNp linux-2.6.32.33/net/mac80211/tx.c linux-2.6.32.33/net/mac80211/tx.c
16577 +--- linux-2.6.32.33/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
16578 ++++ linux-2.6.32.33/net/mac80211/tx.c 2010-12-31 14:46:53.000000000 -0500
16579 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
16580 return cpu_to_le16(dur);
16581 }
16582 @@ -59529,9 +59639,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/tx.c linux-2.6.32.32/net/mac80211/tx.c
16583 struct net_device *dev)
16584 {
16585 return local == wdev_priv(dev->ieee80211_ptr);
16586 -diff -urNp linux-2.6.32.32/net/mac80211/util.c linux-2.6.32.32/net/mac80211/util.c
16587 ---- linux-2.6.32.32/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
16588 -+++ linux-2.6.32.32/net/mac80211/util.c 2011-01-24 18:05:37.000000000 -0500
16589 +diff -urNp linux-2.6.32.33/net/mac80211/util.c linux-2.6.32.33/net/mac80211/util.c
16590 +--- linux-2.6.32.33/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
16591 ++++ linux-2.6.32.33/net/mac80211/util.c 2011-01-24 18:05:37.000000000 -0500
16592 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
16593 local->resuming = true;
16594
16595 @@ -59541,9 +59651,9 @@ diff -urNp linux-2.6.32.32/net/mac80211/util.c linux-2.6.32.32/net/mac80211/util
16596 /*
16597 * Upon resume hardware can sometimes be goofy due to
16598 * various platform / driver / bus issues, so restarting
16599 -diff -urNp linux-2.6.32.32/net/netfilter/Kconfig linux-2.6.32.32/net/netfilter/Kconfig
16600 ---- linux-2.6.32.32/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
16601 -+++ linux-2.6.32.32/net/netfilter/Kconfig 2010-12-31 14:46:53.000000000 -0500
16602 +diff -urNp linux-2.6.32.33/net/netfilter/Kconfig linux-2.6.32.33/net/netfilter/Kconfig
16603 +--- linux-2.6.32.33/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
16604 ++++ linux-2.6.32.33/net/netfilter/Kconfig 2010-12-31 14:46:53.000000000 -0500
16605 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
16606
16607 To compile it as a module, choose M here. If unsure, say N.
16608 @@ -59561,9 +59671,9 @@ diff -urNp linux-2.6.32.32/net/netfilter/Kconfig linux-2.6.32.32/net/netfilter/K
16609 config NETFILTER_XT_MATCH_HASHLIMIT
16610 tristate '"hashlimit" match support'
16611 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
16612 -diff -urNp linux-2.6.32.32/net/netfilter/Makefile linux-2.6.32.32/net/netfilter/Makefile
16613 ---- linux-2.6.32.32/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
16614 -+++ linux-2.6.32.32/net/netfilter/Makefile 2010-12-31 14:46:53.000000000 -0500
16615 +diff -urNp linux-2.6.32.33/net/netfilter/Makefile linux-2.6.32.33/net/netfilter/Makefile
16616 +--- linux-2.6.32.33/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
16617 ++++ linux-2.6.32.33/net/netfilter/Makefile 2010-12-31 14:46:53.000000000 -0500
16618 @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
16619 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
16620 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
16621 @@ -59572,9 +59682,9 @@ diff -urNp linux-2.6.32.32/net/netfilter/Makefile linux-2.6.32.32/net/netfilter/
16622 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
16623 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
16624 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
16625 -diff -urNp linux-2.6.32.32/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.32/net/netfilter/nf_conntrack_netlink.c
16626 ---- linux-2.6.32.32/net/netfilter/nf_conntrack_netlink.c 2010-08-13 16:24:37.000000000 -0400
16627 -+++ linux-2.6.32.32/net/netfilter/nf_conntrack_netlink.c 2010-12-31 14:46:53.000000000 -0500
16628 +diff -urNp linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c
16629 +--- linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c 2010-08-13 16:24:37.000000000 -0400
16630 ++++ linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c 2010-12-31 14:46:53.000000000 -0500
16631 @@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
16632 static int
16633 ctnetlink_parse_tuple(const struct nlattr * const cda[],
16634 @@ -59584,9 +59694,9 @@ diff -urNp linux-2.6.32.32/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.32/
16635 {
16636 struct nlattr *tb[CTA_TUPLE_MAX+1];
16637 int err;
16638 -diff -urNp linux-2.6.32.32/net/netfilter/xt_gradm.c linux-2.6.32.32/net/netfilter/xt_gradm.c
16639 ---- linux-2.6.32.32/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
16640 -+++ linux-2.6.32.32/net/netfilter/xt_gradm.c 2010-12-31 14:46:53.000000000 -0500
16641 +diff -urNp linux-2.6.32.33/net/netfilter/xt_gradm.c linux-2.6.32.33/net/netfilter/xt_gradm.c
16642 +--- linux-2.6.32.33/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
16643 ++++ linux-2.6.32.33/net/netfilter/xt_gradm.c 2010-12-31 14:46:53.000000000 -0500
16644 @@ -0,0 +1,51 @@
16645 +/*
16646 + * gradm match for netfilter
16647 @@ -59639,9 +59749,9 @@ diff -urNp linux-2.6.32.32/net/netfilter/xt_gradm.c linux-2.6.32.32/net/netfilte
16648 +MODULE_LICENSE("GPL");
16649 +MODULE_ALIAS("ipt_gradm");
16650 +MODULE_ALIAS("ip6t_gradm");
16651 -diff -urNp linux-2.6.32.32/net/netlink/af_netlink.c linux-2.6.32.32/net/netlink/af_netlink.c
16652 ---- linux-2.6.32.32/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
16653 -+++ linux-2.6.32.32/net/netlink/af_netlink.c 2010-12-31 14:46:53.000000000 -0500
16654 +diff -urNp linux-2.6.32.33/net/netlink/af_netlink.c linux-2.6.32.33/net/netlink/af_netlink.c
16655 +--- linux-2.6.32.33/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
16656 ++++ linux-2.6.32.33/net/netlink/af_netlink.c 2010-12-31 14:46:53.000000000 -0500
16657 @@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f
16658 struct netlink_sock *nlk = nlk_sk(s);
16659
16660 @@ -59664,9 +59774,9 @@ diff -urNp linux-2.6.32.32/net/netlink/af_netlink.c linux-2.6.32.32/net/netlink/
16661 atomic_read(&s->sk_refcnt),
16662 atomic_read(&s->sk_drops)
16663 );
16664 -diff -urNp linux-2.6.32.32/net/netrom/af_netrom.c linux-2.6.32.32/net/netrom/af_netrom.c
16665 ---- linux-2.6.32.32/net/netrom/af_netrom.c 2010-08-13 16:24:37.000000000 -0400
16666 -+++ linux-2.6.32.32/net/netrom/af_netrom.c 2010-12-31 14:46:53.000000000 -0500
16667 +diff -urNp linux-2.6.32.33/net/netrom/af_netrom.c linux-2.6.32.33/net/netrom/af_netrom.c
16668 +--- linux-2.6.32.33/net/netrom/af_netrom.c 2010-08-13 16:24:37.000000000 -0400
16669 ++++ linux-2.6.32.33/net/netrom/af_netrom.c 2010-12-31 14:46:53.000000000 -0500
16670 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc
16671 struct sock *sk = sock->sk;
16672 struct nr_sock *nr = nr_sk(sk);
16673 @@ -59683,9 +59793,9 @@ diff -urNp linux-2.6.32.32/net/netrom/af_netrom.c linux-2.6.32.32/net/netrom/af_
16674 sax->fsa_ax25.sax25_call = nr->source_addr;
16675 *uaddr_len = sizeof(struct sockaddr_ax25);
16676 }
16677 -diff -urNp linux-2.6.32.32/net/packet/af_packet.c linux-2.6.32.32/net/packet/af_packet.c
16678 ---- linux-2.6.32.32/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
16679 -+++ linux-2.6.32.32/net/packet/af_packet.c 2010-12-31 14:46:53.000000000 -0500
16680 +diff -urNp linux-2.6.32.33/net/packet/af_packet.c linux-2.6.32.33/net/packet/af_packet.c
16681 +--- linux-2.6.32.33/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
16682 ++++ linux-2.6.32.33/net/packet/af_packet.c 2010-12-31 14:46:53.000000000 -0500
16683 @@ -1526,7 +1526,7 @@ static int packet_getname_spkt(struct so
16684 uaddr->sa_family = AF_PACKET;
16685 dev = dev_get_by_index(sock_net(sk), pkt_sk(sk)->ifindex);
16686 @@ -59715,9 +59825,9 @@ diff -urNp linux-2.6.32.32/net/packet/af_packet.c linux-2.6.32.32/net/packet/af_
16687 atomic_read(&s->sk_refcnt),
16688 s->sk_type,
16689 ntohs(po->num),
16690 -diff -urNp linux-2.6.32.32/net/phonet/af_phonet.c linux-2.6.32.32/net/phonet/af_phonet.c
16691 ---- linux-2.6.32.32/net/phonet/af_phonet.c 2010-10-31 16:44:11.000000000 -0400
16692 -+++ linux-2.6.32.32/net/phonet/af_phonet.c 2010-12-31 14:46:53.000000000 -0500
16693 +diff -urNp linux-2.6.32.33/net/phonet/af_phonet.c linux-2.6.32.33/net/phonet/af_phonet.c
16694 +--- linux-2.6.32.33/net/phonet/af_phonet.c 2010-10-31 16:44:11.000000000 -0400
16695 ++++ linux-2.6.32.33/net/phonet/af_phonet.c 2010-12-31 14:46:53.000000000 -0500
16696 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
16697 {
16698 struct phonet_protocol *pp;
16699 @@ -59736,9 +59846,9 @@ diff -urNp linux-2.6.32.32/net/phonet/af_phonet.c linux-2.6.32.32/net/phonet/af_
16700 return -EINVAL;
16701
16702 err = proto_register(pp->prot, 1);
16703 -diff -urNp linux-2.6.32.32/net/phonet/socket.c linux-2.6.32.32/net/phonet/socket.c
16704 ---- linux-2.6.32.32/net/phonet/socket.c 2010-08-13 16:24:37.000000000 -0400
16705 -+++ linux-2.6.32.32/net/phonet/socket.c 2010-12-31 14:46:53.000000000 -0500
16706 +diff -urNp linux-2.6.32.33/net/phonet/socket.c linux-2.6.32.33/net/phonet/socket.c
16707 +--- linux-2.6.32.33/net/phonet/socket.c 2010-08-13 16:24:37.000000000 -0400
16708 ++++ linux-2.6.32.33/net/phonet/socket.c 2010-12-31 14:46:53.000000000 -0500
16709 @@ -482,7 +482,12 @@ static int pn_sock_seq_show(struct seq_f
16710 sk->sk_state,
16711 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
16712 @@ -59753,9 +59863,9 @@ diff -urNp linux-2.6.32.32/net/phonet/socket.c linux-2.6.32.32/net/phonet/socket
16713 atomic_read(&sk->sk_drops), &len);
16714 }
16715 seq_printf(seq, "%*s\n", 127 - len, "");
16716 -diff -urNp linux-2.6.32.32/net/rds/Kconfig linux-2.6.32.32/net/rds/Kconfig
16717 ---- linux-2.6.32.32/net/rds/Kconfig 2010-08-13 16:24:37.000000000 -0400
16718 -+++ linux-2.6.32.32/net/rds/Kconfig 2010-12-31 14:46:53.000000000 -0500
16719 +diff -urNp linux-2.6.32.33/net/rds/Kconfig linux-2.6.32.33/net/rds/Kconfig
16720 +--- linux-2.6.32.33/net/rds/Kconfig 2010-08-13 16:24:37.000000000 -0400
16721 ++++ linux-2.6.32.33/net/rds/Kconfig 2010-12-31 14:46:53.000000000 -0500
16722 @@ -1,7 +1,7 @@
16723
16724 config RDS
16725 @@ -59765,9 +59875,9 @@ diff -urNp linux-2.6.32.32/net/rds/Kconfig linux-2.6.32.32/net/rds/Kconfig
16726 ---help---
16727 The RDS (Reliable Datagram Sockets) protocol provides reliable,
16728 sequenced delivery of datagrams over Infiniband, iWARP,
16729 -diff -urNp linux-2.6.32.32/net/rxrpc/ar-key.c linux-2.6.32.32/net/rxrpc/ar-key.c
16730 ---- linux-2.6.32.32/net/rxrpc/ar-key.c 2010-08-13 16:24:37.000000000 -0400
16731 -+++ linux-2.6.32.32/net/rxrpc/ar-key.c 2011-02-27 15:01:43.000000000 -0500
16732 +diff -urNp linux-2.6.32.33/net/rxrpc/ar-key.c linux-2.6.32.33/net/rxrpc/ar-key.c
16733 +--- linux-2.6.32.33/net/rxrpc/ar-key.c 2010-08-13 16:24:37.000000000 -0400
16734 ++++ linux-2.6.32.33/net/rxrpc/ar-key.c 2011-02-27 15:01:43.000000000 -0500
16735 @@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s
16736 return ret;
16737
16738 @@ -59795,9 +59905,9 @@ diff -urNp linux-2.6.32.32/net/rxrpc/ar-key.c linux-2.6.32.32/net/rxrpc/ar-key.c
16739 if (!token->kad)
16740 goto error_free;
16741
16742 -diff -urNp linux-2.6.32.32/net/sctp/proc.c linux-2.6.32.32/net/sctp/proc.c
16743 ---- linux-2.6.32.32/net/sctp/proc.c 2010-08-13 16:24:37.000000000 -0400
16744 -+++ linux-2.6.32.32/net/sctp/proc.c 2010-12-31 14:46:53.000000000 -0500
16745 +diff -urNp linux-2.6.32.33/net/sctp/proc.c linux-2.6.32.33/net/sctp/proc.c
16746 +--- linux-2.6.32.33/net/sctp/proc.c 2010-08-13 16:24:37.000000000 -0400
16747 ++++ linux-2.6.32.33/net/sctp/proc.c 2010-12-31 14:46:53.000000000 -0500
16748 @@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_
16749 sctp_for_each_hentry(epb, node, &head->chain) {
16750 ep = sctp_ep(epb);
16751 @@ -59826,9 +59936,9 @@ diff -urNp linux-2.6.32.32/net/sctp/proc.c linux-2.6.32.32/net/sctp/proc.c
16752 assoc->state, hash,
16753 assoc->assoc_id,
16754 assoc->sndbuf_used,
16755 -diff -urNp linux-2.6.32.32/net/sctp/socket.c linux-2.6.32.32/net/sctp/socket.c
16756 ---- linux-2.6.32.32/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
16757 -+++ linux-2.6.32.32/net/sctp/socket.c 2010-12-31 14:46:53.000000000 -0500
16758 +diff -urNp linux-2.6.32.33/net/sctp/socket.c linux-2.6.32.33/net/sctp/socket.c
16759 +--- linux-2.6.32.33/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
16760 ++++ linux-2.6.32.33/net/sctp/socket.c 2010-12-31 14:46:53.000000000 -0500
16761 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
16762 struct sctp_sndrcvinfo *sinfo;
16763 struct sctp_initmsg *sinit;
16764 @@ -59846,9 +59956,9 @@ diff -urNp linux-2.6.32.32/net/sctp/socket.c linux-2.6.32.32/net/sctp/socket.c
16765
16766 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
16767 if (pp->fastreuse && sk->sk_reuse &&
16768 -diff -urNp linux-2.6.32.32/net/socket.c linux-2.6.32.32/net/socket.c
16769 ---- linux-2.6.32.32/net/socket.c 2010-12-09 18:13:03.000000000 -0500
16770 -+++ linux-2.6.32.32/net/socket.c 2010-12-31 14:46:53.000000000 -0500
16771 +diff -urNp linux-2.6.32.33/net/socket.c linux-2.6.32.33/net/socket.c
16772 +--- linux-2.6.32.33/net/socket.c 2010-12-09 18:13:03.000000000 -0500
16773 ++++ linux-2.6.32.33/net/socket.c 2010-12-31 14:46:53.000000000 -0500
16774 @@ -87,6 +87,7 @@
16775 #include <linux/wireless.h>
16776 #include <linux/nsproxy.h>
16777 @@ -60012,9 +60122,9 @@ diff -urNp linux-2.6.32.32/net/socket.c linux-2.6.32.32/net/socket.c
16778 err =
16779 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
16780 if (err)
16781 -diff -urNp linux-2.6.32.32/net/sunrpc/sched.c linux-2.6.32.32/net/sunrpc/sched.c
16782 ---- linux-2.6.32.32/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
16783 -+++ linux-2.6.32.32/net/sunrpc/sched.c 2010-12-31 14:46:53.000000000 -0500
16784 +diff -urNp linux-2.6.32.33/net/sunrpc/sched.c linux-2.6.32.33/net/sunrpc/sched.c
16785 +--- linux-2.6.32.33/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
16786 ++++ linux-2.6.32.33/net/sunrpc/sched.c 2010-12-31 14:46:53.000000000 -0500
16787 @@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
16788 #ifdef RPC_DEBUG
16789 static void rpc_task_set_debuginfo(struct rpc_task *task)
16790 @@ -60028,9 +60138,9 @@ diff -urNp linux-2.6.32.32/net/sunrpc/sched.c linux-2.6.32.32/net/sunrpc/sched.c
16791 }
16792 #else
16793 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
16794 -diff -urNp linux-2.6.32.32/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.32/net/sunrpc/xprtrdma/svc_rdma.c
16795 ---- linux-2.6.32.32/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
16796 -+++ linux-2.6.32.32/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-31 14:46:53.000000000 -0500
16797 +diff -urNp linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c
16798 +--- linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
16799 ++++ linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-31 14:46:53.000000000 -0500
16800 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
16801 len -= *ppos;
16802 if (len > *lenp)
16803 @@ -60040,9 +60150,9 @@ diff -urNp linux-2.6.32.32/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.32/net/su
16804 return -EFAULT;
16805 *lenp = len;
16806 *ppos += len;
16807 -diff -urNp linux-2.6.32.32/net/sysctl_net.c linux-2.6.32.32/net/sysctl_net.c
16808 ---- linux-2.6.32.32/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
16809 -+++ linux-2.6.32.32/net/sysctl_net.c 2010-12-31 14:46:53.000000000 -0500
16810 +diff -urNp linux-2.6.32.33/net/sysctl_net.c linux-2.6.32.33/net/sysctl_net.c
16811 +--- linux-2.6.32.33/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
16812 ++++ linux-2.6.32.33/net/sysctl_net.c 2010-12-31 14:46:53.000000000 -0500
16813 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
16814 struct ctl_table *table)
16815 {
16816 @@ -60052,9 +60162,9 @@ diff -urNp linux-2.6.32.32/net/sysctl_net.c linux-2.6.32.32/net/sysctl_net.c
16817 int mode = (table->mode >> 6) & 7;
16818 return (mode << 6) | (mode << 3) | mode;
16819 }
16820 -diff -urNp linux-2.6.32.32/net/tipc/socket.c linux-2.6.32.32/net/tipc/socket.c
16821 ---- linux-2.6.32.32/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
16822 -+++ linux-2.6.32.32/net/tipc/socket.c 2010-12-31 14:46:53.000000000 -0500
16823 +diff -urNp linux-2.6.32.33/net/tipc/socket.c linux-2.6.32.33/net/tipc/socket.c
16824 +--- linux-2.6.32.33/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
16825 ++++ linux-2.6.32.33/net/tipc/socket.c 2010-12-31 14:46:53.000000000 -0500
16826 @@ -393,6 +393,7 @@ static int get_name(struct socket *sock,
16827 struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
16828 struct tipc_sock *tsock = tipc_sk(sock->sk);
16829 @@ -60075,9 +60185,9 @@ diff -urNp linux-2.6.32.32/net/tipc/socket.c linux-2.6.32.32/net/tipc/socket.c
16830 sock->state = SS_DISCONNECTING;
16831 }
16832
16833 -diff -urNp linux-2.6.32.32/net/unix/af_unix.c linux-2.6.32.32/net/unix/af_unix.c
16834 ---- linux-2.6.32.32/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
16835 -+++ linux-2.6.32.32/net/unix/af_unix.c 2010-12-31 14:46:53.000000000 -0500
16836 +diff -urNp linux-2.6.32.33/net/unix/af_unix.c linux-2.6.32.33/net/unix/af_unix.c
16837 +--- linux-2.6.32.33/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
16838 ++++ linux-2.6.32.33/net/unix/af_unix.c 2010-12-31 14:46:53.000000000 -0500
16839 @@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru
16840 err = -ECONNREFUSED;
16841 if (!S_ISSOCK(inode->i_mode))
16842 @@ -60147,9 +60257,9 @@ diff -urNp linux-2.6.32.32/net/unix/af_unix.c linux-2.6.32.32/net/unix/af_unix.c
16843 atomic_read(&s->sk_refcnt),
16844 0,
16845 s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
16846 -diff -urNp linux-2.6.32.32/net/wireless/wext.c linux-2.6.32.32/net/wireless/wext.c
16847 ---- linux-2.6.32.32/net/wireless/wext.c 2010-10-31 16:44:11.000000000 -0400
16848 -+++ linux-2.6.32.32/net/wireless/wext.c 2010-12-31 14:46:53.000000000 -0500
16849 +diff -urNp linux-2.6.32.33/net/wireless/wext.c linux-2.6.32.33/net/wireless/wext.c
16850 +--- linux-2.6.32.33/net/wireless/wext.c 2010-10-31 16:44:11.000000000 -0400
16851 ++++ linux-2.6.32.33/net/wireless/wext.c 2010-12-31 14:46:53.000000000 -0500
16852 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
16853 */
16854
16855 @@ -60183,9 +60293,9 @@ diff -urNp linux-2.6.32.32/net/wireless/wext.c linux-2.6.32.32/net/wireless/wext
16856 err = handler(dev, info, (union iwreq_data *) iwp, extra);
16857
16858 iwp->length += essid_compat;
16859 -diff -urNp linux-2.6.32.32/net/x25/x25_in.c linux-2.6.32.32/net/x25/x25_in.c
16860 ---- linux-2.6.32.32/net/x25/x25_in.c 2010-12-09 18:13:03.000000000 -0500
16861 -+++ linux-2.6.32.32/net/x25/x25_in.c 2010-12-31 14:46:53.000000000 -0500
16862 +diff -urNp linux-2.6.32.33/net/x25/x25_in.c linux-2.6.32.33/net/x25/x25_in.c
16863 +--- linux-2.6.32.33/net/x25/x25_in.c 2010-12-09 18:13:03.000000000 -0500
16864 ++++ linux-2.6.32.33/net/x25/x25_in.c 2010-12-31 14:46:53.000000000 -0500
16865 @@ -108,14 +108,13 @@ static int x25_state1_machine(struct soc
16866 */
16867 skb_pull(skb, X25_STD_MIN_LEN);
16868 @@ -60204,9 +60314,9 @@ diff -urNp linux-2.6.32.32/net/x25/x25_in.c linux-2.6.32.32/net/x25/x25_in.c
16869 if (len > 0)
16870 skb_pull(skb, len);
16871 else
16872 -diff -urNp linux-2.6.32.32/net/xfrm/xfrm_policy.c linux-2.6.32.32/net/xfrm/xfrm_policy.c
16873 ---- linux-2.6.32.32/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
16874 -+++ linux-2.6.32.32/net/xfrm/xfrm_policy.c 2010-12-31 14:46:53.000000000 -0500
16875 +diff -urNp linux-2.6.32.33/net/xfrm/xfrm_policy.c linux-2.6.32.33/net/xfrm/xfrm_policy.c
16876 +--- linux-2.6.32.33/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
16877 ++++ linux-2.6.32.33/net/xfrm/xfrm_policy.c 2010-12-31 14:46:53.000000000 -0500
16878 @@ -1477,7 +1477,7 @@ free_dst:
16879 goto out;
16880 }
16881 @@ -60234,9 +60344,9 @@ diff -urNp linux-2.6.32.32/net/xfrm/xfrm_policy.c linux-2.6.32.32/net/xfrm/xfrm_
16882 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
16883 {
16884 #ifdef CONFIG_XFRM_SUB_POLICY
16885 -diff -urNp linux-2.6.32.32/samples/kobject/kset-example.c linux-2.6.32.32/samples/kobject/kset-example.c
16886 ---- linux-2.6.32.32/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
16887 -+++ linux-2.6.32.32/samples/kobject/kset-example.c 2010-12-31 14:46:53.000000000 -0500
16888 +diff -urNp linux-2.6.32.33/samples/kobject/kset-example.c linux-2.6.32.33/samples/kobject/kset-example.c
16889 +--- linux-2.6.32.33/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
16890 ++++ linux-2.6.32.33/samples/kobject/kset-example.c 2010-12-31 14:46:53.000000000 -0500
16891 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
16892 }
16893
16894 @@ -60246,9 +60356,9 @@ diff -urNp linux-2.6.32.32/samples/kobject/kset-example.c linux-2.6.32.32/sample
16895 .show = foo_attr_show,
16896 .store = foo_attr_store,
16897 };
16898 -diff -urNp linux-2.6.32.32/scripts/basic/fixdep.c linux-2.6.32.32/scripts/basic/fixdep.c
16899 ---- linux-2.6.32.32/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
16900 -+++ linux-2.6.32.32/scripts/basic/fixdep.c 2010-12-31 14:46:53.000000000 -0500
16901 +diff -urNp linux-2.6.32.33/scripts/basic/fixdep.c linux-2.6.32.33/scripts/basic/fixdep.c
16902 +--- linux-2.6.32.33/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
16903 ++++ linux-2.6.32.33/scripts/basic/fixdep.c 2010-12-31 14:46:53.000000000 -0500
16904 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
16905
16906 static void parse_config_file(char *map, size_t len)
16907 @@ -60270,9 +60380,9 @@ diff -urNp linux-2.6.32.32/scripts/basic/fixdep.c linux-2.6.32.32/scripts/basic/
16908
16909 if (*p != INT_CONF) {
16910 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
16911 -diff -urNp linux-2.6.32.32/scripts/kallsyms.c linux-2.6.32.32/scripts/kallsyms.c
16912 ---- linux-2.6.32.32/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
16913 -+++ linux-2.6.32.32/scripts/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
16914 +diff -urNp linux-2.6.32.33/scripts/kallsyms.c linux-2.6.32.33/scripts/kallsyms.c
16915 +--- linux-2.6.32.33/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
16916 ++++ linux-2.6.32.33/scripts/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
16917 @@ -43,10 +43,10 @@ struct text_range {
16918
16919 static unsigned long long _text;
16920 @@ -60288,9 +60398,9 @@ diff -urNp linux-2.6.32.32/scripts/kallsyms.c linux-2.6.32.32/scripts/kallsyms.c
16921 };
16922 #define text_range_text (&text_ranges[0])
16923 #define text_range_inittext (&text_ranges[1])
16924 -diff -urNp linux-2.6.32.32/scripts/mod/file2alias.c linux-2.6.32.32/scripts/mod/file2alias.c
16925 ---- linux-2.6.32.32/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
16926 -+++ linux-2.6.32.32/scripts/mod/file2alias.c 2010-12-31 14:46:53.000000000 -0500
16927 +diff -urNp linux-2.6.32.33/scripts/mod/file2alias.c linux-2.6.32.33/scripts/mod/file2alias.c
16928 +--- linux-2.6.32.33/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
16929 ++++ linux-2.6.32.33/scripts/mod/file2alias.c 2010-12-31 14:46:53.000000000 -0500
16930 @@ -72,7 +72,7 @@ static void device_id_check(const char *
16931 unsigned long size, unsigned long id_size,
16932 void *symval)
16933 @@ -60345,9 +60455,9 @@ diff -urNp linux-2.6.32.32/scripts/mod/file2alias.c linux-2.6.32.32/scripts/mod/
16934
16935 sprintf(alias, "dmi*");
16936
16937 -diff -urNp linux-2.6.32.32/scripts/mod/modpost.c linux-2.6.32.32/scripts/mod/modpost.c
16938 ---- linux-2.6.32.32/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
16939 -+++ linux-2.6.32.32/scripts/mod/modpost.c 2010-12-31 14:46:53.000000000 -0500
16940 +diff -urNp linux-2.6.32.33/scripts/mod/modpost.c linux-2.6.32.33/scripts/mod/modpost.c
16941 +--- linux-2.6.32.33/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
16942 ++++ linux-2.6.32.33/scripts/mod/modpost.c 2010-12-31 14:46:53.000000000 -0500
16943 @@ -835,6 +835,7 @@ enum mismatch {
16944 INIT_TO_EXIT,
16945 EXIT_TO_INIT,
16946 @@ -60415,9 +60525,9 @@ diff -urNp linux-2.6.32.32/scripts/mod/modpost.c linux-2.6.32.32/scripts/mod/mod
16947 goto close_write;
16948
16949 tmp = NOFAIL(malloc(b->pos));
16950 -diff -urNp linux-2.6.32.32/scripts/mod/modpost.h linux-2.6.32.32/scripts/mod/modpost.h
16951 ---- linux-2.6.32.32/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
16952 -+++ linux-2.6.32.32/scripts/mod/modpost.h 2010-12-31 14:46:53.000000000 -0500
16953 +diff -urNp linux-2.6.32.33/scripts/mod/modpost.h linux-2.6.32.33/scripts/mod/modpost.h
16954 +--- linux-2.6.32.33/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
16955 ++++ linux-2.6.32.33/scripts/mod/modpost.h 2010-12-31 14:46:53.000000000 -0500
16956 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
16957
16958 struct buffer {
16959 @@ -60437,9 +60547,9 @@ diff -urNp linux-2.6.32.32/scripts/mod/modpost.h linux-2.6.32.32/scripts/mod/mod
16960
16961 struct module {
16962 struct module *next;
16963 -diff -urNp linux-2.6.32.32/scripts/mod/sumversion.c linux-2.6.32.32/scripts/mod/sumversion.c
16964 ---- linux-2.6.32.32/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
16965 -+++ linux-2.6.32.32/scripts/mod/sumversion.c 2010-12-31 14:46:53.000000000 -0500
16966 +diff -urNp linux-2.6.32.33/scripts/mod/sumversion.c linux-2.6.32.33/scripts/mod/sumversion.c
16967 +--- linux-2.6.32.33/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
16968 ++++ linux-2.6.32.33/scripts/mod/sumversion.c 2010-12-31 14:46:53.000000000 -0500
16969 @@ -455,7 +455,7 @@ static void write_version(const char *fi
16970 goto out;
16971 }
16972 @@ -60449,9 +60559,9 @@ diff -urNp linux-2.6.32.32/scripts/mod/sumversion.c linux-2.6.32.32/scripts/mod/
16973 warn("writing sum in %s failed: %s\n",
16974 filename, strerror(errno));
16975 goto out;
16976 -diff -urNp linux-2.6.32.32/scripts/pnmtologo.c linux-2.6.32.32/scripts/pnmtologo.c
16977 ---- linux-2.6.32.32/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
16978 -+++ linux-2.6.32.32/scripts/pnmtologo.c 2010-12-31 14:46:53.000000000 -0500
16979 +diff -urNp linux-2.6.32.33/scripts/pnmtologo.c linux-2.6.32.33/scripts/pnmtologo.c
16980 +--- linux-2.6.32.33/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
16981 ++++ linux-2.6.32.33/scripts/pnmtologo.c 2010-12-31 14:46:53.000000000 -0500
16982 @@ -237,14 +237,14 @@ static void write_header(void)
16983 fprintf(out, " * Linux logo %s\n", logoname);
16984 fputs(" */\n\n", out);
16985 @@ -60478,9 +60588,9 @@ diff -urNp linux-2.6.32.32/scripts/pnmtologo.c linux-2.6.32.32/scripts/pnmtologo
16986 logoname);
16987 write_hex_cnt = 0;
16988 for (i = 0; i < logo_clutsize; i++) {
16989 -diff -urNp linux-2.6.32.32/security/capability.c linux-2.6.32.32/security/capability.c
16990 ---- linux-2.6.32.32/security/capability.c 2010-08-13 16:24:37.000000000 -0400
16991 -+++ linux-2.6.32.32/security/capability.c 2010-12-31 14:46:53.000000000 -0500
16992 +diff -urNp linux-2.6.32.33/security/capability.c linux-2.6.32.33/security/capability.c
16993 +--- linux-2.6.32.33/security/capability.c 2010-08-13 16:24:37.000000000 -0400
16994 ++++ linux-2.6.32.33/security/capability.c 2010-12-31 14:46:53.000000000 -0500
16995 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
16996 }
16997 #endif /* CONFIG_AUDIT */
16998 @@ -60490,9 +60600,9 @@ diff -urNp linux-2.6.32.32/security/capability.c linux-2.6.32.32/security/capabi
16999 .name = "default",
17000 };
17001
17002 -diff -urNp linux-2.6.32.32/security/commoncap.c linux-2.6.32.32/security/commoncap.c
17003 ---- linux-2.6.32.32/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
17004 -+++ linux-2.6.32.32/security/commoncap.c 2010-12-31 14:46:53.000000000 -0500
17005 +diff -urNp linux-2.6.32.33/security/commoncap.c linux-2.6.32.33/security/commoncap.c
17006 +--- linux-2.6.32.33/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
17007 ++++ linux-2.6.32.33/security/commoncap.c 2010-12-31 14:46:53.000000000 -0500
17008 @@ -27,7 +27,7 @@
17009 #include <linux/sched.h>
17010 #include <linux/prctl.h>
17011 @@ -60525,9 +60635,9 @@ diff -urNp linux-2.6.32.32/security/commoncap.c linux-2.6.32.32/security/commonc
17012 if (cred->uid != 0) {
17013 if (bprm->cap_effective)
17014 return 1;
17015 -diff -urNp linux-2.6.32.32/security/integrity/ima/ima_api.c linux-2.6.32.32/security/integrity/ima/ima_api.c
17016 ---- linux-2.6.32.32/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
17017 -+++ linux-2.6.32.32/security/integrity/ima/ima_api.c 2010-12-31 14:46:53.000000000 -0500
17018 +diff -urNp linux-2.6.32.33/security/integrity/ima/ima_api.c linux-2.6.32.33/security/integrity/ima/ima_api.c
17019 +--- linux-2.6.32.33/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
17020 ++++ linux-2.6.32.33/security/integrity/ima/ima_api.c 2010-12-31 14:46:53.000000000 -0500
17021 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
17022 int result;
17023
17024 @@ -60537,9 +60647,9 @@ diff -urNp linux-2.6.32.32/security/integrity/ima/ima_api.c linux-2.6.32.32/secu
17025
17026 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
17027 if (!entry) {
17028 -diff -urNp linux-2.6.32.32/security/integrity/ima/ima_fs.c linux-2.6.32.32/security/integrity/ima/ima_fs.c
17029 ---- linux-2.6.32.32/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
17030 -+++ linux-2.6.32.32/security/integrity/ima/ima_fs.c 2010-12-31 14:46:53.000000000 -0500
17031 +diff -urNp linux-2.6.32.33/security/integrity/ima/ima_fs.c linux-2.6.32.33/security/integrity/ima/ima_fs.c
17032 +--- linux-2.6.32.33/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
17033 ++++ linux-2.6.32.33/security/integrity/ima/ima_fs.c 2010-12-31 14:46:53.000000000 -0500
17034 @@ -27,12 +27,12 @@
17035 static int valid_policy = 1;
17036 #define TMPBUFLEN 12
17037 @@ -60555,9 +60665,9 @@ diff -urNp linux-2.6.32.32/security/integrity/ima/ima_fs.c linux-2.6.32.32/secur
17038 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
17039 }
17040
17041 -diff -urNp linux-2.6.32.32/security/integrity/ima/ima.h linux-2.6.32.32/security/integrity/ima/ima.h
17042 ---- linux-2.6.32.32/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
17043 -+++ linux-2.6.32.32/security/integrity/ima/ima.h 2010-12-31 14:46:53.000000000 -0500
17044 +diff -urNp linux-2.6.32.33/security/integrity/ima/ima.h linux-2.6.32.33/security/integrity/ima/ima.h
17045 +--- linux-2.6.32.33/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
17046 ++++ linux-2.6.32.33/security/integrity/ima/ima.h 2010-12-31 14:46:53.000000000 -0500
17047 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
17048 extern spinlock_t ima_queue_lock;
17049
17050 @@ -60569,9 +60679,9 @@ diff -urNp linux-2.6.32.32/security/integrity/ima/ima.h linux-2.6.32.32/security
17051 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
17052 };
17053 extern struct ima_h_table ima_htable;
17054 -diff -urNp linux-2.6.32.32/security/integrity/ima/ima_queue.c linux-2.6.32.32/security/integrity/ima/ima_queue.c
17055 ---- linux-2.6.32.32/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
17056 -+++ linux-2.6.32.32/security/integrity/ima/ima_queue.c 2010-12-31 14:46:53.000000000 -0500
17057 +diff -urNp linux-2.6.32.33/security/integrity/ima/ima_queue.c linux-2.6.32.33/security/integrity/ima/ima_queue.c
17058 +--- linux-2.6.32.33/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
17059 ++++ linux-2.6.32.33/security/integrity/ima/ima_queue.c 2010-12-31 14:46:53.000000000 -0500
17060 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
17061 INIT_LIST_HEAD(&qe->later);
17062 list_add_tail_rcu(&qe->later, &ima_measurements);
17063 @@ -60581,9 +60691,9 @@ diff -urNp linux-2.6.32.32/security/integrity/ima/ima_queue.c linux-2.6.32.32/se
17064 key = ima_hash_key(entry->digest);
17065 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
17066 return 0;
17067 -diff -urNp linux-2.6.32.32/security/Kconfig linux-2.6.32.32/security/Kconfig
17068 ---- linux-2.6.32.32/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
17069 -+++ linux-2.6.32.32/security/Kconfig 2011-02-12 11:33:55.000000000 -0500
17070 +diff -urNp linux-2.6.32.33/security/Kconfig linux-2.6.32.33/security/Kconfig
17071 +--- linux-2.6.32.33/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
17072 ++++ linux-2.6.32.33/security/Kconfig 2011-02-12 11:33:55.000000000 -0500
17073 @@ -4,6 +4,527 @@
17074
17075 menu "Security options"
17076 @@ -61121,9 +61231,9 @@ diff -urNp linux-2.6.32.32/security/Kconfig linux-2.6.32.32/security/Kconfig
17077 help
17078 This is the portion of low virtual memory which should be protected
17079 from userspace allocation. Keeping a user from writing to low pages
17080 -diff -urNp linux-2.6.32.32/security/min_addr.c linux-2.6.32.32/security/min_addr.c
17081 ---- linux-2.6.32.32/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
17082 -+++ linux-2.6.32.32/security/min_addr.c 2010-12-31 14:46:53.000000000 -0500
17083 +diff -urNp linux-2.6.32.33/security/min_addr.c linux-2.6.32.33/security/min_addr.c
17084 +--- linux-2.6.32.33/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
17085 ++++ linux-2.6.32.33/security/min_addr.c 2010-12-31 14:46:53.000000000 -0500
17086 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
17087 */
17088 static void update_mmap_min_addr(void)
17089 @@ -61140,9 +61250,9 @@ diff -urNp linux-2.6.32.32/security/min_addr.c linux-2.6.32.32/security/min_addr
17090 }
17091
17092 /*
17093 -diff -urNp linux-2.6.32.32/security/root_plug.c linux-2.6.32.32/security/root_plug.c
17094 ---- linux-2.6.32.32/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
17095 -+++ linux-2.6.32.32/security/root_plug.c 2010-12-31 14:46:53.000000000 -0500
17096 +diff -urNp linux-2.6.32.33/security/root_plug.c linux-2.6.32.33/security/root_plug.c
17097 +--- linux-2.6.32.33/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
17098 ++++ linux-2.6.32.33/security/root_plug.c 2010-12-31 14:46:53.000000000 -0500
17099 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security
17100 return 0;
17101 }
17102 @@ -61152,9 +61262,9 @@ diff -urNp linux-2.6.32.32/security/root_plug.c linux-2.6.32.32/security/root_pl
17103 .bprm_check_security = rootplug_bprm_check_security,
17104 };
17105
17106 -diff -urNp linux-2.6.32.32/security/security.c linux-2.6.32.32/security/security.c
17107 ---- linux-2.6.32.32/security/security.c 2010-08-13 16:24:37.000000000 -0400
17108 -+++ linux-2.6.32.32/security/security.c 2010-12-31 14:46:53.000000000 -0500
17109 +diff -urNp linux-2.6.32.33/security/security.c linux-2.6.32.33/security/security.c
17110 +--- linux-2.6.32.33/security/security.c 2010-08-13 16:24:37.000000000 -0400
17111 ++++ linux-2.6.32.33/security/security.c 2010-12-31 14:46:53.000000000 -0500
17112 @@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI
17113 extern struct security_operations default_security_ops;
17114 extern void security_fixup_ops(struct security_operations *ops);
17115 @@ -61173,9 +61283,9 @@ diff -urNp linux-2.6.32.32/security/security.c linux-2.6.32.32/security/security
17116 {
17117 if (verify(ops)) {
17118 printk(KERN_DEBUG "%s could not verify "
17119 -diff -urNp linux-2.6.32.32/security/selinux/hooks.c linux-2.6.32.32/security/selinux/hooks.c
17120 ---- linux-2.6.32.32/security/selinux/hooks.c 2011-03-02 17:24:54.000000000 -0500
17121 -+++ linux-2.6.32.32/security/selinux/hooks.c 2011-02-22 15:57:40.000000000 -0500
17122 +diff -urNp linux-2.6.32.33/security/selinux/hooks.c linux-2.6.32.33/security/selinux/hooks.c
17123 +--- linux-2.6.32.33/security/selinux/hooks.c 2011-03-02 17:24:54.000000000 -0500
17124 ++++ linux-2.6.32.33/security/selinux/hooks.c 2011-02-22 15:57:40.000000000 -0500
17125 @@ -131,7 +131,7 @@ int selinux_enabled = 1;
17126 * Minimal support for a secondary security module,
17127 * just to allow the use of the capability module.
17128 @@ -61204,9 +61314,9 @@ diff -urNp linux-2.6.32.32/security/selinux/hooks.c linux-2.6.32.32/security/sel
17129
17130 /* Unregister netfilter hooks. */
17131 selinux_nf_ip_exit();
17132 -diff -urNp linux-2.6.32.32/security/smack/smack_lsm.c linux-2.6.32.32/security/smack/smack_lsm.c
17133 ---- linux-2.6.32.32/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
17134 -+++ linux-2.6.32.32/security/smack/smack_lsm.c 2010-12-31 14:46:53.000000000 -0500
17135 +diff -urNp linux-2.6.32.33/security/smack/smack_lsm.c linux-2.6.32.33/security/smack/smack_lsm.c
17136 +--- linux-2.6.32.33/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
17137 ++++ linux-2.6.32.33/security/smack/smack_lsm.c 2010-12-31 14:46:53.000000000 -0500
17138 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct
17139 return 0;
17140 }
17141 @@ -61216,9 +61326,9 @@ diff -urNp linux-2.6.32.32/security/smack/smack_lsm.c linux-2.6.32.32/security/s
17142 .name = "smack",
17143
17144 .ptrace_access_check = smack_ptrace_access_check,
17145 -diff -urNp linux-2.6.32.32/security/tomoyo/tomoyo.c linux-2.6.32.32/security/tomoyo/tomoyo.c
17146 ---- linux-2.6.32.32/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
17147 -+++ linux-2.6.32.32/security/tomoyo/tomoyo.c 2010-12-31 14:46:53.000000000 -0500
17148 +diff -urNp linux-2.6.32.33/security/tomoyo/tomoyo.c linux-2.6.32.33/security/tomoyo/tomoyo.c
17149 +--- linux-2.6.32.33/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
17150 ++++ linux-2.6.32.33/security/tomoyo/tomoyo.c 2010-12-31 14:46:53.000000000 -0500
17151 @@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil
17152 * tomoyo_security_ops is a "struct security_operations" which is used for
17153 * registering TOMOYO.
17154 @@ -61228,9 +61338,9 @@ diff -urNp linux-2.6.32.32/security/tomoyo/tomoyo.c linux-2.6.32.32/security/tom
17155 .name = "tomoyo",
17156 .cred_alloc_blank = tomoyo_cred_alloc_blank,
17157 .cred_prepare = tomoyo_cred_prepare,
17158 -diff -urNp linux-2.6.32.32/sound/aoa/codecs/onyx.c linux-2.6.32.32/sound/aoa/codecs/onyx.c
17159 ---- linux-2.6.32.32/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
17160 -+++ linux-2.6.32.32/sound/aoa/codecs/onyx.c 2011-01-24 18:05:37.000000000 -0500
17161 +diff -urNp linux-2.6.32.33/sound/aoa/codecs/onyx.c linux-2.6.32.33/sound/aoa/codecs/onyx.c
17162 +--- linux-2.6.32.33/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
17163 ++++ linux-2.6.32.33/sound/aoa/codecs/onyx.c 2011-01-24 18:05:37.000000000 -0500
17164 @@ -53,7 +53,7 @@ struct onyx {
17165 spdif_locked:1,
17166 analog_locked:1,
17167 @@ -61259,9 +61369,9 @@ diff -urNp linux-2.6.32.32/sound/aoa/codecs/onyx.c linux-2.6.32.32/sound/aoa/cod
17168 onyx->spdif_locked = onyx->analog_locked = 0;
17169 mutex_unlock(&onyx->mutex);
17170
17171 -diff -urNp linux-2.6.32.32/sound/aoa/codecs/onyx.h linux-2.6.32.32/sound/aoa/codecs/onyx.h
17172 ---- linux-2.6.32.32/sound/aoa/codecs/onyx.h 2010-08-13 16:24:37.000000000 -0400
17173 -+++ linux-2.6.32.32/sound/aoa/codecs/onyx.h 2011-01-25 20:24:47.000000000 -0500
17174 +diff -urNp linux-2.6.32.33/sound/aoa/codecs/onyx.h linux-2.6.32.33/sound/aoa/codecs/onyx.h
17175 +--- linux-2.6.32.33/sound/aoa/codecs/onyx.h 2010-08-13 16:24:37.000000000 -0400
17176 ++++ linux-2.6.32.33/sound/aoa/codecs/onyx.h 2011-01-25 20:24:47.000000000 -0500
17177 @@ -11,6 +11,7 @@
17178 #include <linux/i2c.h>
17179 #include <asm/pmac_low_i2c.h>
17180 @@ -61270,9 +61380,9 @@ diff -urNp linux-2.6.32.32/sound/aoa/codecs/onyx.h linux-2.6.32.32/sound/aoa/cod
17181
17182 /* PCM3052 register definitions */
17183
17184 -diff -urNp linux-2.6.32.32/sound/core/oss/pcm_oss.c linux-2.6.32.32/sound/core/oss/pcm_oss.c
17185 ---- linux-2.6.32.32/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
17186 -+++ linux-2.6.32.32/sound/core/oss/pcm_oss.c 2010-12-31 14:46:53.000000000 -0500
17187 +diff -urNp linux-2.6.32.33/sound/core/oss/pcm_oss.c linux-2.6.32.33/sound/core/oss/pcm_oss.c
17188 +--- linux-2.6.32.33/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
17189 ++++ linux-2.6.32.33/sound/core/oss/pcm_oss.c 2010-12-31 14:46:53.000000000 -0500
17190 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
17191 }
17192 }
17193 @@ -61284,9 +61394,9 @@ diff -urNp linux-2.6.32.32/sound/core/oss/pcm_oss.c linux-2.6.32.32/sound/core/o
17194 #endif /* CONFIG_SND_VERBOSE_PROCFS */
17195
17196 /*
17197 -diff -urNp linux-2.6.32.32/sound/core/seq/seq_lock.h linux-2.6.32.32/sound/core/seq/seq_lock.h
17198 ---- linux-2.6.32.32/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
17199 -+++ linux-2.6.32.32/sound/core/seq/seq_lock.h 2010-12-31 14:46:53.000000000 -0500
17200 +diff -urNp linux-2.6.32.33/sound/core/seq/seq_lock.h linux-2.6.32.33/sound/core/seq/seq_lock.h
17201 +--- linux-2.6.32.33/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
17202 ++++ linux-2.6.32.33/sound/core/seq/seq_lock.h 2010-12-31 14:46:53.000000000 -0500
17203 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
17204 #else /* SMP || CONFIG_SND_DEBUG */
17205
17206 @@ -61302,9 +61412,9 @@ diff -urNp linux-2.6.32.32/sound/core/seq/seq_lock.h linux-2.6.32.32/sound/core/
17207
17208 #endif /* SMP || CONFIG_SND_DEBUG */
17209
17210 -diff -urNp linux-2.6.32.32/sound/drivers/mts64.c linux-2.6.32.32/sound/drivers/mts64.c
17211 ---- linux-2.6.32.32/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
17212 -+++ linux-2.6.32.32/sound/drivers/mts64.c 2011-01-25 22:35:30.000000000 -0500
17213 +diff -urNp linux-2.6.32.33/sound/drivers/mts64.c linux-2.6.32.33/sound/drivers/mts64.c
17214 +--- linux-2.6.32.33/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
17215 ++++ linux-2.6.32.33/sound/drivers/mts64.c 2011-01-25 22:35:30.000000000 -0500
17216 @@ -27,6 +27,7 @@
17217 #include <sound/initval.h>
17218 #include <sound/rawmidi.h>
17219 @@ -61361,9 +61471,9 @@ diff -urNp linux-2.6.32.32/sound/drivers/mts64.c linux-2.6.32.32/sound/drivers/m
17220
17221 return 0;
17222 }
17223 -diff -urNp linux-2.6.32.32/sound/drivers/portman2x4.c linux-2.6.32.32/sound/drivers/portman2x4.c
17224 ---- linux-2.6.32.32/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
17225 -+++ linux-2.6.32.32/sound/drivers/portman2x4.c 2011-01-25 20:24:47.000000000 -0500
17226 +diff -urNp linux-2.6.32.33/sound/drivers/portman2x4.c linux-2.6.32.33/sound/drivers/portman2x4.c
17227 +--- linux-2.6.32.33/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
17228 ++++ linux-2.6.32.33/sound/drivers/portman2x4.c 2011-01-25 20:24:47.000000000 -0500
17229 @@ -46,6 +46,7 @@
17230 #include <sound/initval.h>
17231 #include <sound/rawmidi.h>
17232 @@ -61381,9 +61491,9 @@ diff -urNp linux-2.6.32.32/sound/drivers/portman2x4.c linux-2.6.32.32/sound/driv
17233 int mode[PORTMAN_NUM_INPUT_PORTS];
17234 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
17235 };
17236 -diff -urNp linux-2.6.32.32/sound/oss/sb_audio.c linux-2.6.32.32/sound/oss/sb_audio.c
17237 ---- linux-2.6.32.32/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
17238 -+++ linux-2.6.32.32/sound/oss/sb_audio.c 2010-12-31 14:46:53.000000000 -0500
17239 +diff -urNp linux-2.6.32.33/sound/oss/sb_audio.c linux-2.6.32.33/sound/oss/sb_audio.c
17240 +--- linux-2.6.32.33/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
17241 ++++ linux-2.6.32.33/sound/oss/sb_audio.c 2010-12-31 14:46:53.000000000 -0500
17242 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
17243 buf16 = (signed short *)(localbuf + localoffs);
17244 while (c)
17245 @@ -61393,9 +61503,9 @@ diff -urNp linux-2.6.32.32/sound/oss/sb_audio.c linux-2.6.32.32/sound/oss/sb_aud
17246 if (copy_from_user(lbuf8,
17247 userbuf+useroffs + p,
17248 locallen))
17249 -diff -urNp linux-2.6.32.32/sound/oss/swarm_cs4297a.c linux-2.6.32.32/sound/oss/swarm_cs4297a.c
17250 ---- linux-2.6.32.32/sound/oss/swarm_cs4297a.c 2010-08-13 16:24:37.000000000 -0400
17251 -+++ linux-2.6.32.32/sound/oss/swarm_cs4297a.c 2010-12-31 14:47:01.000000000 -0500
17252 +diff -urNp linux-2.6.32.33/sound/oss/swarm_cs4297a.c linux-2.6.32.33/sound/oss/swarm_cs4297a.c
17253 +--- linux-2.6.32.33/sound/oss/swarm_cs4297a.c 2010-08-13 16:24:37.000000000 -0400
17254 ++++ linux-2.6.32.33/sound/oss/swarm_cs4297a.c 2010-12-31 14:47:01.000000000 -0500
17255 @@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
17256 {
17257 struct cs4297a_state *s;
17258 @@ -61430,9 +61540,9 @@ diff -urNp linux-2.6.32.32/sound/oss/swarm_cs4297a.c linux-2.6.32.32/sound/oss/s
17259
17260 list_add(&s->list, &cs4297a_devs);
17261
17262 -diff -urNp linux-2.6.32.32/sound/pci/ac97/ac97_codec.c linux-2.6.32.32/sound/pci/ac97/ac97_codec.c
17263 ---- linux-2.6.32.32/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
17264 -+++ linux-2.6.32.32/sound/pci/ac97/ac97_codec.c 2010-12-31 14:46:53.000000000 -0500
17265 +diff -urNp linux-2.6.32.33/sound/pci/ac97/ac97_codec.c linux-2.6.32.33/sound/pci/ac97/ac97_codec.c
17266 +--- linux-2.6.32.33/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
17267 ++++ linux-2.6.32.33/sound/pci/ac97/ac97_codec.c 2010-12-31 14:46:53.000000000 -0500
17268 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
17269 }
17270
17271 @@ -61442,9 +61552,9 @@ diff -urNp linux-2.6.32.32/sound/pci/ac97/ac97_codec.c linux-2.6.32.32/sound/pci
17272
17273 #ifdef CONFIG_SND_AC97_POWER_SAVE
17274 static void do_update_power(struct work_struct *work)
17275 -diff -urNp linux-2.6.32.32/sound/pci/ac97/ac97_patch.c linux-2.6.32.32/sound/pci/ac97/ac97_patch.c
17276 ---- linux-2.6.32.32/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
17277 -+++ linux-2.6.32.32/sound/pci/ac97/ac97_patch.c 2010-12-31 14:46:53.000000000 -0500
17278 +diff -urNp linux-2.6.32.33/sound/pci/ac97/ac97_patch.c linux-2.6.32.33/sound/pci/ac97/ac97_patch.c
17279 +--- linux-2.6.32.33/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
17280 ++++ linux-2.6.32.33/sound/pci/ac97/ac97_patch.c 2010-12-31 14:46:53.000000000 -0500
17281 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
17282 return 0;
17283 }
17284 @@ -61751,9 +61861,9 @@ diff -urNp linux-2.6.32.32/sound/pci/ac97/ac97_patch.c linux-2.6.32.32/sound/pci
17285 .build_specific = patch_ucb1400_specific,
17286 };
17287
17288 -diff -urNp linux-2.6.32.32/sound/pci/ens1370.c linux-2.6.32.32/sound/pci/ens1370.c
17289 ---- linux-2.6.32.32/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
17290 -+++ linux-2.6.32.32/sound/pci/ens1370.c 2010-12-31 14:46:53.000000000 -0500
17291 +diff -urNp linux-2.6.32.33/sound/pci/ens1370.c linux-2.6.32.33/sound/pci/ens1370.c
17292 +--- linux-2.6.32.33/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
17293 ++++ linux-2.6.32.33/sound/pci/ens1370.c 2010-12-31 14:46:53.000000000 -0500
17294 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
17295 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
17296 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
17297 @@ -61763,9 +61873,9 @@ diff -urNp linux-2.6.32.32/sound/pci/ens1370.c linux-2.6.32.32/sound/pci/ens1370
17298 };
17299
17300 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
17301 -diff -urNp linux-2.6.32.32/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.32/sound/pci/hda/patch_intelhdmi.c
17302 ---- linux-2.6.32.32/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
17303 -+++ linux-2.6.32.32/sound/pci/hda/patch_intelhdmi.c 2010-12-31 14:46:53.000000000 -0500
17304 +diff -urNp linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c
17305 +--- linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
17306 ++++ linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c 2010-12-31 14:46:53.000000000 -0500
17307 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
17308 cp_ready);
17309
17310 @@ -61781,9 +61891,9 @@ diff -urNp linux-2.6.32.32/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.32/sound
17311 }
17312
17313
17314 -diff -urNp linux-2.6.32.32/sound/pci/intel8x0.c linux-2.6.32.32/sound/pci/intel8x0.c
17315 ---- linux-2.6.32.32/sound/pci/intel8x0.c 2010-12-09 18:13:03.000000000 -0500
17316 -+++ linux-2.6.32.32/sound/pci/intel8x0.c 2010-12-31 14:46:53.000000000 -0500
17317 +diff -urNp linux-2.6.32.33/sound/pci/intel8x0.c linux-2.6.32.33/sound/pci/intel8x0.c
17318 +--- linux-2.6.32.33/sound/pci/intel8x0.c 2010-12-09 18:13:03.000000000 -0500
17319 ++++ linux-2.6.32.33/sound/pci/intel8x0.c 2010-12-31 14:46:53.000000000 -0500
17320 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
17321 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
17322 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
17323 @@ -61802,9 +61912,9 @@ diff -urNp linux-2.6.32.32/sound/pci/intel8x0.c linux-2.6.32.32/sound/pci/intel8
17324 };
17325
17326 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
17327 -diff -urNp linux-2.6.32.32/sound/pci/intel8x0m.c linux-2.6.32.32/sound/pci/intel8x0m.c
17328 ---- linux-2.6.32.32/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
17329 -+++ linux-2.6.32.32/sound/pci/intel8x0m.c 2010-12-31 14:46:53.000000000 -0500
17330 +diff -urNp linux-2.6.32.33/sound/pci/intel8x0m.c linux-2.6.32.33/sound/pci/intel8x0m.c
17331 +--- linux-2.6.32.33/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
17332 ++++ linux-2.6.32.33/sound/pci/intel8x0m.c 2010-12-31 14:46:53.000000000 -0500
17333 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
17334 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
17335 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
17336 @@ -61823,9 +61933,9 @@ diff -urNp linux-2.6.32.32/sound/pci/intel8x0m.c linux-2.6.32.32/sound/pci/intel
17337 };
17338
17339 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
17340 -diff -urNp linux-2.6.32.32/usr/gen_init_cpio.c linux-2.6.32.32/usr/gen_init_cpio.c
17341 ---- linux-2.6.32.32/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
17342 -+++ linux-2.6.32.32/usr/gen_init_cpio.c 2010-12-31 14:46:53.000000000 -0500
17343 +diff -urNp linux-2.6.32.33/usr/gen_init_cpio.c linux-2.6.32.33/usr/gen_init_cpio.c
17344 +--- linux-2.6.32.33/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
17345 ++++ linux-2.6.32.33/usr/gen_init_cpio.c 2010-12-31 14:46:53.000000000 -0500
17346 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
17347 int retval;
17348 int rc = -1;
17349 @@ -61848,9 +61958,9 @@ diff -urNp linux-2.6.32.32/usr/gen_init_cpio.c linux-2.6.32.32/usr/gen_init_cpio
17350 } else
17351 break;
17352 }
17353 -diff -urNp linux-2.6.32.32/virt/kvm/kvm_main.c linux-2.6.32.32/virt/kvm/kvm_main.c
17354 ---- linux-2.6.32.32/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
17355 -+++ linux-2.6.32.32/virt/kvm/kvm_main.c 2010-12-31 14:46:53.000000000 -0500
17356 +diff -urNp linux-2.6.32.33/virt/kvm/kvm_main.c linux-2.6.32.33/virt/kvm/kvm_main.c
17357 +--- linux-2.6.32.33/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
17358 ++++ linux-2.6.32.33/virt/kvm/kvm_main.c 2010-12-31 14:46:53.000000000 -0500
17359 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
17360 return 0;
17361 }
17362
17363 diff --git a/2.6.37/0000_README b/2.6.37/0000_README
17364 index 7eaf92b..556e1fe 100644
17365 --- a/2.6.37/0000_README
17366 +++ b/2.6.37/0000_README
17367 @@ -3,7 +3,7 @@ README
17368
17369 Individual Patch Descriptions:
17370 -----------------------------------------------------------------------------
17371 -Patch: 4420_grsecurity-2.2.1-2.6.37.3-201103122250.patch
17372 +Patch: 4420_grsecurity-2.2.1-2.6.37.4-201103211735.patch
17373 From: http://www.grsecurity.net
17374 Desc: hardened-sources base patch from upstream grsecurity
17375
17376
17377 diff --git a/2.6.37/4420_grsecurity-2.2.1-2.6.37.3-201103122250.patch b/2.6.37/4420_grsecurity-2.2.1-2.6.37.4-201103211735.patch
17378 similarity index 87%
17379 rename from 2.6.37/4420_grsecurity-2.2.1-2.6.37.3-201103122250.patch
17380 rename to 2.6.37/4420_grsecurity-2.2.1-2.6.37.4-201103211735.patch
17381 index 0be63e5..d402c08 100644
17382 --- a/2.6.37/4420_grsecurity-2.2.1-2.6.37.3-201103122250.patch
17383 +++ b/2.6.37/4420_grsecurity-2.2.1-2.6.37.4-201103211735.patch
17384 @@ -1,6 +1,6 @@
17385 -diff -urNp linux-2.6.37.3/arch/alpha/include/asm/dma-mapping.h linux-2.6.37.3/arch/alpha/include/asm/dma-mapping.h
17386 ---- linux-2.6.37.3/arch/alpha/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17387 -+++ linux-2.6.37.3/arch/alpha/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17388 +diff -urNp linux-2.6.37.4/arch/alpha/include/asm/dma-mapping.h linux-2.6.37.4/arch/alpha/include/asm/dma-mapping.h
17389 +--- linux-2.6.37.4/arch/alpha/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17390 ++++ linux-2.6.37.4/arch/alpha/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17391 @@ -3,9 +3,9 @@
17392
17393 #include <linux/dma-attrs.h>
17394 @@ -13,9 +13,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/include/asm/dma-mapping.h linux-2.6.37.3/ar
17395 {
17396 return dma_ops;
17397 }
17398 -diff -urNp linux-2.6.37.3/arch/alpha/include/asm/elf.h linux-2.6.37.3/arch/alpha/include/asm/elf.h
17399 ---- linux-2.6.37.3/arch/alpha/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17400 -+++ linux-2.6.37.3/arch/alpha/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17401 +diff -urNp linux-2.6.37.4/arch/alpha/include/asm/elf.h linux-2.6.37.4/arch/alpha/include/asm/elf.h
17402 +--- linux-2.6.37.4/arch/alpha/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17403 ++++ linux-2.6.37.4/arch/alpha/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17404 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
17405
17406 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
17407 @@ -30,9 +30,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/include/asm/elf.h linux-2.6.37.3/arch/alpha
17408 /* $0 is set by ld.so to a pointer to a function which might be
17409 registered using atexit. This provides a mean for the dynamic
17410 linker to call DT_FINI functions for shared libraries that have
17411 -diff -urNp linux-2.6.37.3/arch/alpha/include/asm/pgtable.h linux-2.6.37.3/arch/alpha/include/asm/pgtable.h
17412 ---- linux-2.6.37.3/arch/alpha/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17413 -+++ linux-2.6.37.3/arch/alpha/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17414 +diff -urNp linux-2.6.37.4/arch/alpha/include/asm/pgtable.h linux-2.6.37.4/arch/alpha/include/asm/pgtable.h
17415 +--- linux-2.6.37.4/arch/alpha/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17416 ++++ linux-2.6.37.4/arch/alpha/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17417 @@ -101,6 +101,17 @@ struct vm_area_struct;
17418 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
17419 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
17420 @@ -51,9 +51,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/include/asm/pgtable.h linux-2.6.37.3/arch/a
17421 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
17422
17423 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
17424 -diff -urNp linux-2.6.37.3/arch/alpha/kernel/module.c linux-2.6.37.3/arch/alpha/kernel/module.c
17425 ---- linux-2.6.37.3/arch/alpha/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
17426 -+++ linux-2.6.37.3/arch/alpha/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
17427 +diff -urNp linux-2.6.37.4/arch/alpha/kernel/module.c linux-2.6.37.4/arch/alpha/kernel/module.c
17428 +--- linux-2.6.37.4/arch/alpha/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
17429 ++++ linux-2.6.37.4/arch/alpha/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
17430 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
17431
17432 /* The small sections were sorted to the end of the segment.
17433 @@ -63,9 +63,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/kernel/module.c linux-2.6.37.3/arch/alpha/k
17434 got = sechdrs[me->arch.gotsecindex].sh_addr;
17435
17436 for (i = 0; i < n; i++) {
17437 -diff -urNp linux-2.6.37.3/arch/alpha/kernel/osf_sys.c linux-2.6.37.3/arch/alpha/kernel/osf_sys.c
17438 ---- linux-2.6.37.3/arch/alpha/kernel/osf_sys.c 2011-01-04 19:50:19.000000000 -0500
17439 -+++ linux-2.6.37.3/arch/alpha/kernel/osf_sys.c 2011-01-17 02:41:00.000000000 -0500
17440 +diff -urNp linux-2.6.37.4/arch/alpha/kernel/osf_sys.c linux-2.6.37.4/arch/alpha/kernel/osf_sys.c
17441 +--- linux-2.6.37.4/arch/alpha/kernel/osf_sys.c 2011-01-04 19:50:19.000000000 -0500
17442 ++++ linux-2.6.37.4/arch/alpha/kernel/osf_sys.c 2011-01-17 02:41:00.000000000 -0500
17443 @@ -1165,7 +1165,7 @@ arch_get_unmapped_area_1(unsigned long a
17444 /* At this point: (!vma || addr < vma->vm_end). */
17445 if (limit - len < addr)
17446 @@ -97,9 +97,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/kernel/osf_sys.c linux-2.6.37.3/arch/alpha/
17447 if (addr != (unsigned long) -ENOMEM)
17448 return addr;
17449
17450 -diff -urNp linux-2.6.37.3/arch/alpha/kernel/pci_iommu.c linux-2.6.37.3/arch/alpha/kernel/pci_iommu.c
17451 ---- linux-2.6.37.3/arch/alpha/kernel/pci_iommu.c 2011-01-04 19:50:19.000000000 -0500
17452 -+++ linux-2.6.37.3/arch/alpha/kernel/pci_iommu.c 2011-01-17 02:41:00.000000000 -0500
17453 +diff -urNp linux-2.6.37.4/arch/alpha/kernel/pci_iommu.c linux-2.6.37.4/arch/alpha/kernel/pci_iommu.c
17454 +--- linux-2.6.37.4/arch/alpha/kernel/pci_iommu.c 2011-01-04 19:50:19.000000000 -0500
17455 ++++ linux-2.6.37.4/arch/alpha/kernel/pci_iommu.c 2011-01-17 02:41:00.000000000 -0500
17456 @@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
17457 return 0;
17458 }
17459 @@ -116,9 +116,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/kernel/pci_iommu.c linux-2.6.37.3/arch/alph
17460 -struct dma_map_ops *dma_ops = &alpha_pci_ops;
17461 +const struct dma_map_ops *dma_ops = &alpha_pci_ops;
17462 EXPORT_SYMBOL(dma_ops);
17463 -diff -urNp linux-2.6.37.3/arch/alpha/kernel/pci-noop.c linux-2.6.37.3/arch/alpha/kernel/pci-noop.c
17464 ---- linux-2.6.37.3/arch/alpha/kernel/pci-noop.c 2011-01-04 19:50:19.000000000 -0500
17465 -+++ linux-2.6.37.3/arch/alpha/kernel/pci-noop.c 2011-01-17 02:41:00.000000000 -0500
17466 +diff -urNp linux-2.6.37.4/arch/alpha/kernel/pci-noop.c linux-2.6.37.4/arch/alpha/kernel/pci-noop.c
17467 +--- linux-2.6.37.4/arch/alpha/kernel/pci-noop.c 2011-01-04 19:50:19.000000000 -0500
17468 ++++ linux-2.6.37.4/arch/alpha/kernel/pci-noop.c 2011-01-17 02:41:00.000000000 -0500
17469 @@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
17470 return 0;
17471 }
17472 @@ -137,9 +137,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/kernel/pci-noop.c linux-2.6.37.3/arch/alpha
17473 EXPORT_SYMBOL(dma_ops);
17474
17475 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
17476 -diff -urNp linux-2.6.37.3/arch/alpha/mm/fault.c linux-2.6.37.3/arch/alpha/mm/fault.c
17477 ---- linux-2.6.37.3/arch/alpha/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17478 -+++ linux-2.6.37.3/arch/alpha/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17479 +diff -urNp linux-2.6.37.4/arch/alpha/mm/fault.c linux-2.6.37.4/arch/alpha/mm/fault.c
17480 +--- linux-2.6.37.4/arch/alpha/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17481 ++++ linux-2.6.37.4/arch/alpha/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17482 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
17483 __reload_thread(pcb);
17484 }
17485 @@ -296,9 +296,9 @@ diff -urNp linux-2.6.37.3/arch/alpha/mm/fault.c linux-2.6.37.3/arch/alpha/mm/fau
17486 } else if (!cause) {
17487 /* Allow reads even for write-only mappings */
17488 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
17489 -diff -urNp linux-2.6.37.3/arch/arm/include/asm/elf.h linux-2.6.37.3/arch/arm/include/asm/elf.h
17490 ---- linux-2.6.37.3/arch/arm/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17491 -+++ linux-2.6.37.3/arch/arm/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17492 +diff -urNp linux-2.6.37.4/arch/arm/include/asm/elf.h linux-2.6.37.4/arch/arm/include/asm/elf.h
17493 +--- linux-2.6.37.4/arch/arm/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17494 ++++ linux-2.6.37.4/arch/arm/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17495 @@ -113,7 +113,14 @@ int dump_task_regs(struct task_struct *t
17496 the loader. We need to make sure that it is out of the way of the program
17497 that it will "exec", and that there is sufficient room for the brk. */
17498 @@ -326,9 +326,9 @@ diff -urNp linux-2.6.37.3/arch/arm/include/asm/elf.h linux-2.6.37.3/arch/arm/inc
17499 extern int vectors_user_mapping(void);
17500 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
17501 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
17502 -diff -urNp linux-2.6.37.3/arch/arm/include/asm/kmap_types.h linux-2.6.37.3/arch/arm/include/asm/kmap_types.h
17503 ---- linux-2.6.37.3/arch/arm/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17504 -+++ linux-2.6.37.3/arch/arm/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17505 +diff -urNp linux-2.6.37.4/arch/arm/include/asm/kmap_types.h linux-2.6.37.4/arch/arm/include/asm/kmap_types.h
17506 +--- linux-2.6.37.4/arch/arm/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17507 ++++ linux-2.6.37.4/arch/arm/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17508 @@ -21,6 +21,7 @@ enum km_type {
17509 KM_L1_CACHE,
17510 KM_L2_CACHE,
17511 @@ -337,9 +337,9 @@ diff -urNp linux-2.6.37.3/arch/arm/include/asm/kmap_types.h linux-2.6.37.3/arch/
17512 KM_TYPE_NR
17513 };
17514
17515 -diff -urNp linux-2.6.37.3/arch/arm/include/asm/uaccess.h linux-2.6.37.3/arch/arm/include/asm/uaccess.h
17516 ---- linux-2.6.37.3/arch/arm/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
17517 -+++ linux-2.6.37.3/arch/arm/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
17518 +diff -urNp linux-2.6.37.4/arch/arm/include/asm/uaccess.h linux-2.6.37.4/arch/arm/include/asm/uaccess.h
17519 +--- linux-2.6.37.4/arch/arm/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
17520 ++++ linux-2.6.37.4/arch/arm/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
17521 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
17522
17523 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
17524 @@ -360,9 +360,9 @@ diff -urNp linux-2.6.37.3/arch/arm/include/asm/uaccess.h linux-2.6.37.3/arch/arm
17525 if (access_ok(VERIFY_WRITE, to, n))
17526 n = __copy_to_user(to, from, n);
17527 return n;
17528 -diff -urNp linux-2.6.37.3/arch/arm/kernel/kgdb.c linux-2.6.37.3/arch/arm/kernel/kgdb.c
17529 ---- linux-2.6.37.3/arch/arm/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17530 -+++ linux-2.6.37.3/arch/arm/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17531 +diff -urNp linux-2.6.37.4/arch/arm/kernel/kgdb.c linux-2.6.37.4/arch/arm/kernel/kgdb.c
17532 +--- linux-2.6.37.4/arch/arm/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17533 ++++ linux-2.6.37.4/arch/arm/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17534 @@ -246,7 +246,7 @@ void kgdb_arch_exit(void)
17535 * and we handle the normal undef case within the do_undefinstr
17536 * handler.
17537 @@ -372,9 +372,9 @@ diff -urNp linux-2.6.37.3/arch/arm/kernel/kgdb.c linux-2.6.37.3/arch/arm/kernel/
17538 #ifndef __ARMEB__
17539 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
17540 #else /* ! __ARMEB__ */
17541 -diff -urNp linux-2.6.37.3/arch/arm/kernel/process.c linux-2.6.37.3/arch/arm/kernel/process.c
17542 ---- linux-2.6.37.3/arch/arm/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
17543 -+++ linux-2.6.37.3/arch/arm/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
17544 +diff -urNp linux-2.6.37.4/arch/arm/kernel/process.c linux-2.6.37.4/arch/arm/kernel/process.c
17545 +--- linux-2.6.37.4/arch/arm/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
17546 ++++ linux-2.6.37.4/arch/arm/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
17547 @@ -28,7 +28,6 @@
17548 #include <linux/tick.h>
17549 #include <linux/utsname.h>
17550 @@ -396,9 +396,9 @@ diff -urNp linux-2.6.37.3/arch/arm/kernel/process.c linux-2.6.37.3/arch/arm/kern
17551 /*
17552 * The vectors page is always readable from user space for the
17553 * atomic helpers and the signal restart code. Let's declare a mapping
17554 -diff -urNp linux-2.6.37.3/arch/arm/mach-at91/pm.c linux-2.6.37.3/arch/arm/mach-at91/pm.c
17555 ---- linux-2.6.37.3/arch/arm/mach-at91/pm.c 2011-01-04 19:50:19.000000000 -0500
17556 -+++ linux-2.6.37.3/arch/arm/mach-at91/pm.c 2011-01-17 02:41:00.000000000 -0500
17557 +diff -urNp linux-2.6.37.4/arch/arm/mach-at91/pm.c linux-2.6.37.4/arch/arm/mach-at91/pm.c
17558 +--- linux-2.6.37.4/arch/arm/mach-at91/pm.c 2011-01-04 19:50:19.000000000 -0500
17559 ++++ linux-2.6.37.4/arch/arm/mach-at91/pm.c 2011-01-17 02:41:00.000000000 -0500
17560 @@ -301,7 +301,7 @@ static void at91_pm_end(void)
17561 }
17562
17563 @@ -408,9 +408,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-at91/pm.c linux-2.6.37.3/arch/arm/mach-a
17564 .valid = at91_pm_valid_state,
17565 .begin = at91_pm_begin,
17566 .enter = at91_pm_enter,
17567 -diff -urNp linux-2.6.37.3/arch/arm/mach-davinci/pm.c linux-2.6.37.3/arch/arm/mach-davinci/pm.c
17568 ---- linux-2.6.37.3/arch/arm/mach-davinci/pm.c 2011-01-04 19:50:19.000000000 -0500
17569 -+++ linux-2.6.37.3/arch/arm/mach-davinci/pm.c 2011-01-17 02:41:00.000000000 -0500
17570 +diff -urNp linux-2.6.37.4/arch/arm/mach-davinci/pm.c linux-2.6.37.4/arch/arm/mach-davinci/pm.c
17571 +--- linux-2.6.37.4/arch/arm/mach-davinci/pm.c 2011-01-04 19:50:19.000000000 -0500
17572 ++++ linux-2.6.37.4/arch/arm/mach-davinci/pm.c 2011-01-17 02:41:00.000000000 -0500
17573 @@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
17574 return ret;
17575 }
17576 @@ -420,9 +420,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-davinci/pm.c linux-2.6.37.3/arch/arm/mac
17577 .enter = davinci_pm_enter,
17578 .valid = suspend_valid_only_mem,
17579 };
17580 -diff -urNp linux-2.6.37.3/arch/arm/mach-imx/pm-imx27.c linux-2.6.37.3/arch/arm/mach-imx/pm-imx27.c
17581 ---- linux-2.6.37.3/arch/arm/mach-imx/pm-imx27.c 2011-01-04 19:50:19.000000000 -0500
17582 -+++ linux-2.6.37.3/arch/arm/mach-imx/pm-imx27.c 2011-01-17 02:41:00.000000000 -0500
17583 +diff -urNp linux-2.6.37.4/arch/arm/mach-imx/pm-imx27.c linux-2.6.37.4/arch/arm/mach-imx/pm-imx27.c
17584 +--- linux-2.6.37.4/arch/arm/mach-imx/pm-imx27.c 2011-01-04 19:50:19.000000000 -0500
17585 ++++ linux-2.6.37.4/arch/arm/mach-imx/pm-imx27.c 2011-01-17 02:41:00.000000000 -0500
17586 @@ -32,7 +32,7 @@ static int mx27_suspend_enter(suspend_st
17587 return 0;
17588 }
17589 @@ -432,9 +432,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-imx/pm-imx27.c linux-2.6.37.3/arch/arm/m
17590 .enter = mx27_suspend_enter,
17591 .valid = suspend_valid_only_mem,
17592 };
17593 -diff -urNp linux-2.6.37.3/arch/arm/mach-lpc32xx/pm.c linux-2.6.37.3/arch/arm/mach-lpc32xx/pm.c
17594 ---- linux-2.6.37.3/arch/arm/mach-lpc32xx/pm.c 2011-01-04 19:50:19.000000000 -0500
17595 -+++ linux-2.6.37.3/arch/arm/mach-lpc32xx/pm.c 2011-01-17 02:41:00.000000000 -0500
17596 +diff -urNp linux-2.6.37.4/arch/arm/mach-lpc32xx/pm.c linux-2.6.37.4/arch/arm/mach-lpc32xx/pm.c
17597 +--- linux-2.6.37.4/arch/arm/mach-lpc32xx/pm.c 2011-01-04 19:50:19.000000000 -0500
17598 ++++ linux-2.6.37.4/arch/arm/mach-lpc32xx/pm.c 2011-01-17 02:41:00.000000000 -0500
17599 @@ -123,7 +123,7 @@ static int lpc32xx_pm_enter(suspend_stat
17600 return 0;
17601 }
17602 @@ -444,9 +444,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-lpc32xx/pm.c linux-2.6.37.3/arch/arm/mac
17603 .valid = suspend_valid_only_mem,
17604 .enter = lpc32xx_pm_enter,
17605 };
17606 -diff -urNp linux-2.6.37.3/arch/arm/mach-msm/last_radio_log.c linux-2.6.37.3/arch/arm/mach-msm/last_radio_log.c
17607 ---- linux-2.6.37.3/arch/arm/mach-msm/last_radio_log.c 2011-01-04 19:50:19.000000000 -0500
17608 -+++ linux-2.6.37.3/arch/arm/mach-msm/last_radio_log.c 2011-01-17 02:41:00.000000000 -0500
17609 +diff -urNp linux-2.6.37.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.37.4/arch/arm/mach-msm/last_radio_log.c
17610 +--- linux-2.6.37.4/arch/arm/mach-msm/last_radio_log.c 2011-01-04 19:50:19.000000000 -0500
17611 ++++ linux-2.6.37.4/arch/arm/mach-msm/last_radio_log.c 2011-01-17 02:41:00.000000000 -0500
17612 @@ -47,6 +47,7 @@ static ssize_t last_radio_log_read(struc
17613 return count;
17614 }
17615 @@ -455,9 +455,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-msm/last_radio_log.c linux-2.6.37.3/arch
17616 static struct file_operations last_radio_log_fops = {
17617 .read = last_radio_log_read,
17618 .llseek = default_llseek,
17619 -diff -urNp linux-2.6.37.3/arch/arm/mach-omap1/pm.c linux-2.6.37.3/arch/arm/mach-omap1/pm.c
17620 ---- linux-2.6.37.3/arch/arm/mach-omap1/pm.c 2011-01-04 19:50:19.000000000 -0500
17621 -+++ linux-2.6.37.3/arch/arm/mach-omap1/pm.c 2011-01-17 02:41:00.000000000 -0500
17622 +diff -urNp linux-2.6.37.4/arch/arm/mach-omap1/pm.c linux-2.6.37.4/arch/arm/mach-omap1/pm.c
17623 +--- linux-2.6.37.4/arch/arm/mach-omap1/pm.c 2011-01-04 19:50:19.000000000 -0500
17624 ++++ linux-2.6.37.4/arch/arm/mach-omap1/pm.c 2011-01-17 02:41:00.000000000 -0500
17625 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
17626
17627
17628 @@ -467,9 +467,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-omap1/pm.c linux-2.6.37.3/arch/arm/mach-
17629 .prepare = omap_pm_prepare,
17630 .enter = omap_pm_enter,
17631 .finish = omap_pm_finish,
17632 -diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/mux.c linux-2.6.37.3/arch/arm/mach-omap2/mux.c
17633 ---- linux-2.6.37.3/arch/arm/mach-omap2/mux.c 2011-01-04 19:50:19.000000000 -0500
17634 -+++ linux-2.6.37.3/arch/arm/mach-omap2/mux.c 2011-02-27 15:27:38.000000000 -0500
17635 +diff -urNp linux-2.6.37.4/arch/arm/mach-omap2/mux.c linux-2.6.37.4/arch/arm/mach-omap2/mux.c
17636 +--- linux-2.6.37.4/arch/arm/mach-omap2/mux.c 2011-01-04 19:50:19.000000000 -0500
17637 ++++ linux-2.6.37.4/arch/arm/mach-omap2/mux.c 2011-02-27 15:27:38.000000000 -0500
17638 @@ -393,7 +393,7 @@ static void __init omap_mux_dbg_init(voi
17639 list_for_each_entry(e, &muxmodes, node) {
17640 struct omap_mux *m = &e->mux;
17641 @@ -479,9 +479,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/mux.c linux-2.6.37.3/arch/arm/mach
17642 m, &omap_mux_dbg_signal_fops);
17643 }
17644 }
17645 -diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm24xx.c linux-2.6.37.3/arch/arm/mach-omap2/pm24xx.c
17646 ---- linux-2.6.37.3/arch/arm/mach-omap2/pm24xx.c 2011-01-04 19:50:19.000000000 -0500
17647 -+++ linux-2.6.37.3/arch/arm/mach-omap2/pm24xx.c 2011-01-17 02:41:00.000000000 -0500
17648 +diff -urNp linux-2.6.37.4/arch/arm/mach-omap2/pm24xx.c linux-2.6.37.4/arch/arm/mach-omap2/pm24xx.c
17649 +--- linux-2.6.37.4/arch/arm/mach-omap2/pm24xx.c 2011-01-04 19:50:19.000000000 -0500
17650 ++++ linux-2.6.37.4/arch/arm/mach-omap2/pm24xx.c 2011-01-17 02:41:00.000000000 -0500
17651 @@ -359,7 +359,7 @@ static void omap2_pm_end(void)
17652 suspend_state = PM_SUSPEND_ON;
17653 }
17654 @@ -491,9 +491,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm24xx.c linux-2.6.37.3/arch/arm/m
17655 .begin = omap2_pm_begin,
17656 .prepare = omap2_pm_prepare,
17657 .enter = omap2_pm_enter,
17658 -diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm34xx.c linux-2.6.37.3/arch/arm/mach-omap2/pm34xx.c
17659 ---- linux-2.6.37.3/arch/arm/mach-omap2/pm34xx.c 2011-01-04 19:50:19.000000000 -0500
17660 -+++ linux-2.6.37.3/arch/arm/mach-omap2/pm34xx.c 2011-01-17 02:41:00.000000000 -0500
17661 +diff -urNp linux-2.6.37.4/arch/arm/mach-omap2/pm34xx.c linux-2.6.37.4/arch/arm/mach-omap2/pm34xx.c
17662 +--- linux-2.6.37.4/arch/arm/mach-omap2/pm34xx.c 2011-01-04 19:50:19.000000000 -0500
17663 ++++ linux-2.6.37.4/arch/arm/mach-omap2/pm34xx.c 2011-01-17 02:41:00.000000000 -0500
17664 @@ -617,7 +617,7 @@ static void omap3_pm_end(void)
17665 return;
17666 }
17667 @@ -503,9 +503,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm34xx.c linux-2.6.37.3/arch/arm/m
17668 .begin = omap3_pm_begin,
17669 .end = omap3_pm_end,
17670 .prepare = omap3_pm_prepare,
17671 -diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm44xx.c linux-2.6.37.3/arch/arm/mach-omap2/pm44xx.c
17672 ---- linux-2.6.37.3/arch/arm/mach-omap2/pm44xx.c 2011-01-04 19:50:19.000000000 -0500
17673 -+++ linux-2.6.37.3/arch/arm/mach-omap2/pm44xx.c 2011-01-17 02:41:00.000000000 -0500
17674 +diff -urNp linux-2.6.37.4/arch/arm/mach-omap2/pm44xx.c linux-2.6.37.4/arch/arm/mach-omap2/pm44xx.c
17675 +--- linux-2.6.37.4/arch/arm/mach-omap2/pm44xx.c 2011-01-04 19:50:19.000000000 -0500
17676 ++++ linux-2.6.37.4/arch/arm/mach-omap2/pm44xx.c 2011-01-17 02:41:00.000000000 -0500
17677 @@ -75,7 +75,7 @@ static void omap4_pm_end(void)
17678 return;
17679 }
17680 @@ -515,9 +515,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm44xx.c linux-2.6.37.3/arch/arm/m
17681 .begin = omap4_pm_begin,
17682 .end = omap4_pm_end,
17683 .prepare = omap4_pm_prepare,
17684 -diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm-debug.c linux-2.6.37.3/arch/arm/mach-omap2/pm-debug.c
17685 ---- linux-2.6.37.3/arch/arm/mach-omap2/pm-debug.c 2011-01-04 19:50:19.000000000 -0500
17686 -+++ linux-2.6.37.3/arch/arm/mach-omap2/pm-debug.c 2011-02-27 15:28:01.000000000 -0500
17687 +diff -urNp linux-2.6.37.4/arch/arm/mach-omap2/pm-debug.c linux-2.6.37.4/arch/arm/mach-omap2/pm-debug.c
17688 +--- linux-2.6.37.4/arch/arm/mach-omap2/pm-debug.c 2011-01-04 19:50:19.000000000 -0500
17689 ++++ linux-2.6.37.4/arch/arm/mach-omap2/pm-debug.c 2011-02-27 15:28:01.000000000 -0500
17690 @@ -632,14 +632,14 @@ static int __init pm_dbg_init(void)
17691
17692 }
17693 @@ -537,9 +537,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-omap2/pm-debug.c linux-2.6.37.3/arch/arm
17694 &pm_dbg_option_fops);
17695 pm_dbg_init_done = 1;
17696
17697 -diff -urNp linux-2.6.37.3/arch/arm/mach-pnx4008/pm.c linux-2.6.37.3/arch/arm/mach-pnx4008/pm.c
17698 ---- linux-2.6.37.3/arch/arm/mach-pnx4008/pm.c 2011-01-04 19:50:19.000000000 -0500
17699 -+++ linux-2.6.37.3/arch/arm/mach-pnx4008/pm.c 2011-01-17 02:41:00.000000000 -0500
17700 +diff -urNp linux-2.6.37.4/arch/arm/mach-pnx4008/pm.c linux-2.6.37.4/arch/arm/mach-pnx4008/pm.c
17701 +--- linux-2.6.37.4/arch/arm/mach-pnx4008/pm.c 2011-01-04 19:50:19.000000000 -0500
17702 ++++ linux-2.6.37.4/arch/arm/mach-pnx4008/pm.c 2011-01-17 02:41:00.000000000 -0500
17703 @@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
17704 (state == PM_SUSPEND_MEM);
17705 }
17706 @@ -549,9 +549,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-pnx4008/pm.c linux-2.6.37.3/arch/arm/mac
17707 .enter = pnx4008_pm_enter,
17708 .valid = pnx4008_pm_valid,
17709 };
17710 -diff -urNp linux-2.6.37.3/arch/arm/mach-pxa/pm.c linux-2.6.37.3/arch/arm/mach-pxa/pm.c
17711 ---- linux-2.6.37.3/arch/arm/mach-pxa/pm.c 2011-01-04 19:50:19.000000000 -0500
17712 -+++ linux-2.6.37.3/arch/arm/mach-pxa/pm.c 2011-01-17 02:41:00.000000000 -0500
17713 +diff -urNp linux-2.6.37.4/arch/arm/mach-pxa/pm.c linux-2.6.37.4/arch/arm/mach-pxa/pm.c
17714 +--- linux-2.6.37.4/arch/arm/mach-pxa/pm.c 2011-01-04 19:50:19.000000000 -0500
17715 ++++ linux-2.6.37.4/arch/arm/mach-pxa/pm.c 2011-01-17 02:41:00.000000000 -0500
17716 @@ -96,7 +96,7 @@ void pxa_pm_finish(void)
17717 pxa_cpu_pm_fns->finish();
17718 }
17719 @@ -561,9 +561,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-pxa/pm.c linux-2.6.37.3/arch/arm/mach-px
17720 .valid = pxa_pm_valid,
17721 .enter = pxa_pm_enter,
17722 .prepare = pxa_pm_prepare,
17723 -diff -urNp linux-2.6.37.3/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37.3/arch/arm/mach-pxa/sharpsl_pm.c
17724 ---- linux-2.6.37.3/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-04 19:50:19.000000000 -0500
17725 -+++ linux-2.6.37.3/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-17 02:41:00.000000000 -0500
17726 +diff -urNp linux-2.6.37.4/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37.4/arch/arm/mach-pxa/sharpsl_pm.c
17727 +--- linux-2.6.37.4/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-04 19:50:19.000000000 -0500
17728 ++++ linux-2.6.37.4/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-17 02:41:00.000000000 -0500
17729 @@ -868,7 +868,7 @@ static void sharpsl_apm_get_power_status
17730 }
17731
17732 @@ -573,9 +573,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37.3/arch/arm
17733 .prepare = pxa_pm_prepare,
17734 .finish = pxa_pm_finish,
17735 .enter = corgi_pxa_pm_enter,
17736 -diff -urNp linux-2.6.37.3/arch/arm/mach-sa1100/pm.c linux-2.6.37.3/arch/arm/mach-sa1100/pm.c
17737 ---- linux-2.6.37.3/arch/arm/mach-sa1100/pm.c 2011-01-04 19:50:19.000000000 -0500
17738 -+++ linux-2.6.37.3/arch/arm/mach-sa1100/pm.c 2011-01-17 02:41:00.000000000 -0500
17739 +diff -urNp linux-2.6.37.4/arch/arm/mach-sa1100/pm.c linux-2.6.37.4/arch/arm/mach-sa1100/pm.c
17740 +--- linux-2.6.37.4/arch/arm/mach-sa1100/pm.c 2011-01-04 19:50:19.000000000 -0500
17741 ++++ linux-2.6.37.4/arch/arm/mach-sa1100/pm.c 2011-01-17 02:41:00.000000000 -0500
17742 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
17743 return virt_to_phys(sp);
17744 }
17745 @@ -585,9 +585,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-sa1100/pm.c linux-2.6.37.3/arch/arm/mach
17746 .enter = sa11x0_pm_enter,
17747 .valid = suspend_valid_only_mem,
17748 };
17749 -diff -urNp linux-2.6.37.3/arch/arm/mach-ux500/mbox.c linux-2.6.37.3/arch/arm/mach-ux500/mbox.c
17750 ---- linux-2.6.37.3/arch/arm/mach-ux500/mbox.c 2011-01-04 19:50:19.000000000 -0500
17751 -+++ linux-2.6.37.3/arch/arm/mach-ux500/mbox.c 2011-02-27 15:26:39.000000000 -0500
17752 +diff -urNp linux-2.6.37.4/arch/arm/mach-ux500/mbox.c linux-2.6.37.4/arch/arm/mach-ux500/mbox.c
17753 +--- linux-2.6.37.4/arch/arm/mach-ux500/mbox.c 2011-01-04 19:50:19.000000000 -0500
17754 ++++ linux-2.6.37.4/arch/arm/mach-ux500/mbox.c 2011-02-27 15:26:39.000000000 -0500
17755 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
17756 return sprintf(buf, "0x%X\n", mbox_value);
17757 }
17758 @@ -597,9 +597,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mach-ux500/mbox.c linux-2.6.37.3/arch/arm/mac
17759
17760 static int mbox_show(struct seq_file *s, void *data)
17761 {
17762 -diff -urNp linux-2.6.37.3/arch/arm/mm/fault.c linux-2.6.37.3/arch/arm/mm/fault.c
17763 ---- linux-2.6.37.3/arch/arm/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17764 -+++ linux-2.6.37.3/arch/arm/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17765 +diff -urNp linux-2.6.37.4/arch/arm/mm/fault.c linux-2.6.37.4/arch/arm/mm/fault.c
17766 +--- linux-2.6.37.4/arch/arm/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17767 ++++ linux-2.6.37.4/arch/arm/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17768 @@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
17769 }
17770 #endif
17771 @@ -648,9 +648,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mm/fault.c linux-2.6.37.3/arch/arm/mm/fault.c
17772 /*
17773 * First Level Translation Fault Handler
17774 *
17775 -diff -urNp linux-2.6.37.3/arch/arm/mm/mmap.c linux-2.6.37.3/arch/arm/mm/mmap.c
17776 ---- linux-2.6.37.3/arch/arm/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
17777 -+++ linux-2.6.37.3/arch/arm/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
17778 +diff -urNp linux-2.6.37.4/arch/arm/mm/mmap.c linux-2.6.37.4/arch/arm/mm/mmap.c
17779 +--- linux-2.6.37.4/arch/arm/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
17780 ++++ linux-2.6.37.4/arch/arm/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
17781 @@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
17782 if (len > TASK_SIZE)
17783 return -ENOMEM;
17784 @@ -700,9 +700,9 @@ diff -urNp linux-2.6.37.3/arch/arm/mm/mmap.c linux-2.6.37.3/arch/arm/mm/mmap.c
17785 /*
17786 * Remember the place where we stopped the search:
17787 */
17788 -diff -urNp linux-2.6.37.3/arch/arm/plat-samsung/pm.c linux-2.6.37.3/arch/arm/plat-samsung/pm.c
17789 ---- linux-2.6.37.3/arch/arm/plat-samsung/pm.c 2011-01-04 19:50:19.000000000 -0500
17790 -+++ linux-2.6.37.3/arch/arm/plat-samsung/pm.c 2011-01-17 02:41:00.000000000 -0500
17791 +diff -urNp linux-2.6.37.4/arch/arm/plat-samsung/pm.c linux-2.6.37.4/arch/arm/plat-samsung/pm.c
17792 +--- linux-2.6.37.4/arch/arm/plat-samsung/pm.c 2011-01-04 19:50:19.000000000 -0500
17793 ++++ linux-2.6.37.4/arch/arm/plat-samsung/pm.c 2011-01-17 02:41:00.000000000 -0500
17794 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
17795 s3c_pm_check_cleanup();
17796 }
17797 @@ -712,9 +712,9 @@ diff -urNp linux-2.6.37.3/arch/arm/plat-samsung/pm.c linux-2.6.37.3/arch/arm/pla
17798 .enter = s3c_pm_enter,
17799 .prepare = s3c_pm_prepare,
17800 .finish = s3c_pm_finish,
17801 -diff -urNp linux-2.6.37.3/arch/avr32/include/asm/elf.h linux-2.6.37.3/arch/avr32/include/asm/elf.h
17802 ---- linux-2.6.37.3/arch/avr32/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17803 -+++ linux-2.6.37.3/arch/avr32/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17804 +diff -urNp linux-2.6.37.4/arch/avr32/include/asm/elf.h linux-2.6.37.4/arch/avr32/include/asm/elf.h
17805 +--- linux-2.6.37.4/arch/avr32/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17806 ++++ linux-2.6.37.4/arch/avr32/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17807 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
17808 the loader. We need to make sure that it is out of the way of the program
17809 that it will "exec", and that there is sufficient room for the brk. */
17810 @@ -731,9 +731,9 @@ diff -urNp linux-2.6.37.3/arch/avr32/include/asm/elf.h linux-2.6.37.3/arch/avr32
17811
17812 /* This yields a mask that user programs can use to figure out what
17813 instruction set this CPU supports. This could be done in user space,
17814 -diff -urNp linux-2.6.37.3/arch/avr32/include/asm/kmap_types.h linux-2.6.37.3/arch/avr32/include/asm/kmap_types.h
17815 ---- linux-2.6.37.3/arch/avr32/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17816 -+++ linux-2.6.37.3/arch/avr32/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17817 +diff -urNp linux-2.6.37.4/arch/avr32/include/asm/kmap_types.h linux-2.6.37.4/arch/avr32/include/asm/kmap_types.h
17818 +--- linux-2.6.37.4/arch/avr32/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17819 ++++ linux-2.6.37.4/arch/avr32/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17820 @@ -22,7 +22,8 @@ D(10) KM_IRQ0,
17821 D(11) KM_IRQ1,
17822 D(12) KM_SOFTIRQ0,
17823 @@ -744,9 +744,9 @@ diff -urNp linux-2.6.37.3/arch/avr32/include/asm/kmap_types.h linux-2.6.37.3/arc
17824 };
17825
17826 #undef D
17827 -diff -urNp linux-2.6.37.3/arch/avr32/mach-at32ap/pm.c linux-2.6.37.3/arch/avr32/mach-at32ap/pm.c
17828 ---- linux-2.6.37.3/arch/avr32/mach-at32ap/pm.c 2011-01-04 19:50:19.000000000 -0500
17829 -+++ linux-2.6.37.3/arch/avr32/mach-at32ap/pm.c 2011-01-17 02:41:00.000000000 -0500
17830 +diff -urNp linux-2.6.37.4/arch/avr32/mach-at32ap/pm.c linux-2.6.37.4/arch/avr32/mach-at32ap/pm.c
17831 +--- linux-2.6.37.4/arch/avr32/mach-at32ap/pm.c 2011-01-04 19:50:19.000000000 -0500
17832 ++++ linux-2.6.37.4/arch/avr32/mach-at32ap/pm.c 2011-01-17 02:41:00.000000000 -0500
17833 @@ -176,7 +176,7 @@ out:
17834 return 0;
17835 }
17836 @@ -756,9 +756,9 @@ diff -urNp linux-2.6.37.3/arch/avr32/mach-at32ap/pm.c linux-2.6.37.3/arch/avr32/
17837 .valid = avr32_pm_valid_state,
17838 .enter = avr32_pm_enter,
17839 };
17840 -diff -urNp linux-2.6.37.3/arch/avr32/mm/fault.c linux-2.6.37.3/arch/avr32/mm/fault.c
17841 ---- linux-2.6.37.3/arch/avr32/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17842 -+++ linux-2.6.37.3/arch/avr32/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17843 +diff -urNp linux-2.6.37.4/arch/avr32/mm/fault.c linux-2.6.37.4/arch/avr32/mm/fault.c
17844 +--- linux-2.6.37.4/arch/avr32/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17845 ++++ linux-2.6.37.4/arch/avr32/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17846 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
17847
17848 int exception_trace = 1;
17849 @@ -800,9 +800,9 @@ diff -urNp linux-2.6.37.3/arch/avr32/mm/fault.c linux-2.6.37.3/arch/avr32/mm/fau
17850 if (exception_trace && printk_ratelimit())
17851 printk("%s%s[%d]: segfault at %08lx pc %08lx "
17852 "sp %08lx ecr %lu\n",
17853 -diff -urNp linux-2.6.37.3/arch/blackfin/kernel/kgdb.c linux-2.6.37.3/arch/blackfin/kernel/kgdb.c
17854 ---- linux-2.6.37.3/arch/blackfin/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17855 -+++ linux-2.6.37.3/arch/blackfin/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17856 +diff -urNp linux-2.6.37.4/arch/blackfin/kernel/kgdb.c linux-2.6.37.4/arch/blackfin/kernel/kgdb.c
17857 +--- linux-2.6.37.4/arch/blackfin/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17858 ++++ linux-2.6.37.4/arch/blackfin/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17859 @@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
17860 return -1; /* this means that we do not want to exit from the handler */
17861 }
17862 @@ -812,9 +812,9 @@ diff -urNp linux-2.6.37.3/arch/blackfin/kernel/kgdb.c linux-2.6.37.3/arch/blackf
17863 .gdb_bpt_instr = {0xa1},
17864 #ifdef CONFIG_SMP
17865 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
17866 -diff -urNp linux-2.6.37.3/arch/blackfin/mach-common/pm.c linux-2.6.37.3/arch/blackfin/mach-common/pm.c
17867 ---- linux-2.6.37.3/arch/blackfin/mach-common/pm.c 2011-01-04 19:50:19.000000000 -0500
17868 -+++ linux-2.6.37.3/arch/blackfin/mach-common/pm.c 2011-01-17 02:41:00.000000000 -0500
17869 +diff -urNp linux-2.6.37.4/arch/blackfin/mach-common/pm.c linux-2.6.37.4/arch/blackfin/mach-common/pm.c
17870 +--- linux-2.6.37.4/arch/blackfin/mach-common/pm.c 2011-01-04 19:50:19.000000000 -0500
17871 ++++ linux-2.6.37.4/arch/blackfin/mach-common/pm.c 2011-01-17 02:41:00.000000000 -0500
17872 @@ -233,7 +233,7 @@ static int bfin_pm_enter(suspend_state_t
17873 return 0;
17874 }
17875 @@ -824,9 +824,9 @@ diff -urNp linux-2.6.37.3/arch/blackfin/mach-common/pm.c linux-2.6.37.3/arch/bla
17876 .enter = bfin_pm_enter,
17877 .valid = bfin_pm_valid,
17878 };
17879 -diff -urNp linux-2.6.37.3/arch/blackfin/mm/maccess.c linux-2.6.37.3/arch/blackfin/mm/maccess.c
17880 ---- linux-2.6.37.3/arch/blackfin/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
17881 -+++ linux-2.6.37.3/arch/blackfin/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
17882 +diff -urNp linux-2.6.37.4/arch/blackfin/mm/maccess.c linux-2.6.37.4/arch/blackfin/mm/maccess.c
17883 +--- linux-2.6.37.4/arch/blackfin/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
17884 ++++ linux-2.6.37.4/arch/blackfin/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
17885 @@ -16,7 +16,7 @@ static int validate_memory_access_addres
17886 return bfin_mem_access_type(addr, size);
17887 }
17888 @@ -845,9 +845,9 @@ diff -urNp linux-2.6.37.3/arch/blackfin/mm/maccess.c linux-2.6.37.3/arch/blackfi
17889 {
17890 unsigned long ldst = (unsigned long)dst;
17891 int mem_type;
17892 -diff -urNp linux-2.6.37.3/arch/frv/include/asm/kmap_types.h linux-2.6.37.3/arch/frv/include/asm/kmap_types.h
17893 ---- linux-2.6.37.3/arch/frv/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17894 -+++ linux-2.6.37.3/arch/frv/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17895 +diff -urNp linux-2.6.37.4/arch/frv/include/asm/kmap_types.h linux-2.6.37.4/arch/frv/include/asm/kmap_types.h
17896 +--- linux-2.6.37.4/arch/frv/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17897 ++++ linux-2.6.37.4/arch/frv/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17898 @@ -23,6 +23,7 @@ enum km_type {
17899 KM_IRQ1,
17900 KM_SOFTIRQ0,
17901 @@ -856,9 +856,9 @@ diff -urNp linux-2.6.37.3/arch/frv/include/asm/kmap_types.h linux-2.6.37.3/arch/
17902 KM_TYPE_NR
17903 };
17904
17905 -diff -urNp linux-2.6.37.3/arch/frv/mm/elf-fdpic.c linux-2.6.37.3/arch/frv/mm/elf-fdpic.c
17906 ---- linux-2.6.37.3/arch/frv/mm/elf-fdpic.c 2011-01-04 19:50:19.000000000 -0500
17907 -+++ linux-2.6.37.3/arch/frv/mm/elf-fdpic.c 2011-01-17 02:41:00.000000000 -0500
17908 +diff -urNp linux-2.6.37.4/arch/frv/mm/elf-fdpic.c linux-2.6.37.4/arch/frv/mm/elf-fdpic.c
17909 +--- linux-2.6.37.4/arch/frv/mm/elf-fdpic.c 2011-01-04 19:50:19.000000000 -0500
17910 ++++ linux-2.6.37.4/arch/frv/mm/elf-fdpic.c 2011-01-17 02:41:00.000000000 -0500
17911 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
17912 if (addr) {
17913 addr = PAGE_ALIGN(addr);
17914 @@ -887,9 +887,9 @@ diff -urNp linux-2.6.37.3/arch/frv/mm/elf-fdpic.c linux-2.6.37.3/arch/frv/mm/elf
17915 goto success;
17916 addr = vma->vm_end;
17917 }
17918 -diff -urNp linux-2.6.37.3/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.37.3/arch/ia64/hp/common/hwsw_iommu.c
17919 ---- linux-2.6.37.3/arch/ia64/hp/common/hwsw_iommu.c 2011-01-04 19:50:19.000000000 -0500
17920 -+++ linux-2.6.37.3/arch/ia64/hp/common/hwsw_iommu.c 2011-01-17 02:41:00.000000000 -0500
17921 +diff -urNp linux-2.6.37.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.37.4/arch/ia64/hp/common/hwsw_iommu.c
17922 +--- linux-2.6.37.4/arch/ia64/hp/common/hwsw_iommu.c 2011-01-04 19:50:19.000000000 -0500
17923 ++++ linux-2.6.37.4/arch/ia64/hp/common/hwsw_iommu.c 2011-01-17 02:41:00.000000000 -0500
17924 @@ -17,7 +17,7 @@
17925 #include <linux/swiotlb.h>
17926 #include <asm/machvec.h>
17927 @@ -908,9 +908,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.37.3/arch/i
17928 {
17929 if (use_swiotlb(dev))
17930 return &swiotlb_dma_ops;
17931 -diff -urNp linux-2.6.37.3/arch/ia64/hp/common/sba_iommu.c linux-2.6.37.3/arch/ia64/hp/common/sba_iommu.c
17932 ---- linux-2.6.37.3/arch/ia64/hp/common/sba_iommu.c 2011-01-04 19:50:19.000000000 -0500
17933 -+++ linux-2.6.37.3/arch/ia64/hp/common/sba_iommu.c 2011-01-17 02:41:00.000000000 -0500
17934 +diff -urNp linux-2.6.37.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.37.4/arch/ia64/hp/common/sba_iommu.c
17935 +--- linux-2.6.37.4/arch/ia64/hp/common/sba_iommu.c 2011-01-04 19:50:19.000000000 -0500
17936 ++++ linux-2.6.37.4/arch/ia64/hp/common/sba_iommu.c 2011-01-17 02:41:00.000000000 -0500
17937 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
17938 },
17939 };
17940 @@ -929,9 +929,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/hp/common/sba_iommu.c linux-2.6.37.3/arch/ia
17941 .alloc_coherent = sba_alloc_coherent,
17942 .free_coherent = sba_free_coherent,
17943 .map_page = sba_map_page,
17944 -diff -urNp linux-2.6.37.3/arch/ia64/include/asm/dma-mapping.h linux-2.6.37.3/arch/ia64/include/asm/dma-mapping.h
17945 ---- linux-2.6.37.3/arch/ia64/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17946 -+++ linux-2.6.37.3/arch/ia64/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17947 +diff -urNp linux-2.6.37.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.37.4/arch/ia64/include/asm/dma-mapping.h
17948 +--- linux-2.6.37.4/arch/ia64/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17949 ++++ linux-2.6.37.4/arch/ia64/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17950 @@ -12,7 +12,7 @@
17951
17952 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
17953 @@ -975,9 +975,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/include/asm/dma-mapping.h linux-2.6.37.3/arc
17954 return ops->dma_supported(dev, mask);
17955 }
17956
17957 -diff -urNp linux-2.6.37.3/arch/ia64/include/asm/elf.h linux-2.6.37.3/arch/ia64/include/asm/elf.h
17958 ---- linux-2.6.37.3/arch/ia64/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17959 -+++ linux-2.6.37.3/arch/ia64/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17960 +diff -urNp linux-2.6.37.4/arch/ia64/include/asm/elf.h linux-2.6.37.4/arch/ia64/include/asm/elf.h
17961 +--- linux-2.6.37.4/arch/ia64/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17962 ++++ linux-2.6.37.4/arch/ia64/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17963 @@ -42,6 +42,13 @@
17964 */
17965 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
17966 @@ -992,9 +992,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/include/asm/elf.h linux-2.6.37.3/arch/ia64/i
17967 #define PT_IA_64_UNWIND 0x70000001
17968
17969 /* IA-64 relocations: */
17970 -diff -urNp linux-2.6.37.3/arch/ia64/include/asm/machvec.h linux-2.6.37.3/arch/ia64/include/asm/machvec.h
17971 ---- linux-2.6.37.3/arch/ia64/include/asm/machvec.h 2011-01-04 19:50:19.000000000 -0500
17972 -+++ linux-2.6.37.3/arch/ia64/include/asm/machvec.h 2011-01-17 02:41:00.000000000 -0500
17973 +diff -urNp linux-2.6.37.4/arch/ia64/include/asm/machvec.h linux-2.6.37.4/arch/ia64/include/asm/machvec.h
17974 +--- linux-2.6.37.4/arch/ia64/include/asm/machvec.h 2011-01-04 19:50:19.000000000 -0500
17975 ++++ linux-2.6.37.4/arch/ia64/include/asm/machvec.h 2011-01-17 02:41:00.000000000 -0500
17976 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
17977 /* DMA-mapping interface: */
17978 typedef void ia64_mv_dma_init (void);
17979 @@ -1013,9 +1013,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/include/asm/machvec.h linux-2.6.37.3/arch/ia
17980
17981 /*
17982 * Define default versions so we can extend machvec for new platforms without having
17983 -diff -urNp linux-2.6.37.3/arch/ia64/include/asm/pgtable.h linux-2.6.37.3/arch/ia64/include/asm/pgtable.h
17984 ---- linux-2.6.37.3/arch/ia64/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17985 -+++ linux-2.6.37.3/arch/ia64/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17986 +diff -urNp linux-2.6.37.4/arch/ia64/include/asm/pgtable.h linux-2.6.37.4/arch/ia64/include/asm/pgtable.h
17987 +--- linux-2.6.37.4/arch/ia64/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17988 ++++ linux-2.6.37.4/arch/ia64/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17989 @@ -12,7 +12,7 @@
17990 * David Mosberger-Tang <davidm@××××××.com>
17991 */
17992 @@ -1043,9 +1043,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/include/asm/pgtable.h linux-2.6.37.3/arch/ia
17993 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
17994 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
17995 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
17996 -diff -urNp linux-2.6.37.3/arch/ia64/include/asm/spinlock.h linux-2.6.37.3/arch/ia64/include/asm/spinlock.h
17997 ---- linux-2.6.37.3/arch/ia64/include/asm/spinlock.h 2011-01-04 19:50:19.000000000 -0500
17998 -+++ linux-2.6.37.3/arch/ia64/include/asm/spinlock.h 2011-02-27 14:48:10.000000000 -0500
17999 +diff -urNp linux-2.6.37.4/arch/ia64/include/asm/spinlock.h linux-2.6.37.4/arch/ia64/include/asm/spinlock.h
18000 +--- linux-2.6.37.4/arch/ia64/include/asm/spinlock.h 2011-01-04 19:50:19.000000000 -0500
18001 ++++ linux-2.6.37.4/arch/ia64/include/asm/spinlock.h 2011-02-27 14:48:10.000000000 -0500
18002 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
18003 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
18004
18005 @@ -1055,9 +1055,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/include/asm/spinlock.h linux-2.6.37.3/arch/i
18006 }
18007
18008 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
18009 -diff -urNp linux-2.6.37.3/arch/ia64/include/asm/uaccess.h linux-2.6.37.3/arch/ia64/include/asm/uaccess.h
18010 ---- linux-2.6.37.3/arch/ia64/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18011 -+++ linux-2.6.37.3/arch/ia64/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18012 +diff -urNp linux-2.6.37.4/arch/ia64/include/asm/uaccess.h linux-2.6.37.4/arch/ia64/include/asm/uaccess.h
18013 +--- linux-2.6.37.4/arch/ia64/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18014 ++++ linux-2.6.37.4/arch/ia64/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18015 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
18016 const void *__cu_from = (from); \
18017 long __cu_len = (n); \
18018 @@ -1076,9 +1076,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/include/asm/uaccess.h linux-2.6.37.3/arch/ia
18019 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
18020 __cu_len; \
18021 })
18022 -diff -urNp linux-2.6.37.3/arch/ia64/kernel/dma-mapping.c linux-2.6.37.3/arch/ia64/kernel/dma-mapping.c
18023 ---- linux-2.6.37.3/arch/ia64/kernel/dma-mapping.c 2011-01-04 19:50:19.000000000 -0500
18024 -+++ linux-2.6.37.3/arch/ia64/kernel/dma-mapping.c 2011-01-17 02:41:00.000000000 -0500
18025 +diff -urNp linux-2.6.37.4/arch/ia64/kernel/dma-mapping.c linux-2.6.37.4/arch/ia64/kernel/dma-mapping.c
18026 +--- linux-2.6.37.4/arch/ia64/kernel/dma-mapping.c 2011-01-04 19:50:19.000000000 -0500
18027 ++++ linux-2.6.37.4/arch/ia64/kernel/dma-mapping.c 2011-01-17 02:41:00.000000000 -0500
18028 @@ -3,7 +3,7 @@
18029 /* Set this to 1 if there is a HW IOMMU in the system */
18030 int iommu_detected __read_mostly;
18031 @@ -1097,9 +1097,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/kernel/dma-mapping.c linux-2.6.37.3/arch/ia6
18032 {
18033 return dma_ops;
18034 }
18035 -diff -urNp linux-2.6.37.3/arch/ia64/kernel/module.c linux-2.6.37.3/arch/ia64/kernel/module.c
18036 ---- linux-2.6.37.3/arch/ia64/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18037 -+++ linux-2.6.37.3/arch/ia64/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18038 +diff -urNp linux-2.6.37.4/arch/ia64/kernel/module.c linux-2.6.37.4/arch/ia64/kernel/module.c
18039 +--- linux-2.6.37.4/arch/ia64/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18040 ++++ linux-2.6.37.4/arch/ia64/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18041 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
18042 void
18043 module_free (struct module *mod, void *module_region)
18044 @@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/kernel/module.c linux-2.6.37.3/arch/ia64/ker
18045 mod->arch.gp = gp;
18046 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
18047 }
18048 -diff -urNp linux-2.6.37.3/arch/ia64/kernel/pci-dma.c linux-2.6.37.3/arch/ia64/kernel/pci-dma.c
18049 ---- linux-2.6.37.3/arch/ia64/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
18050 -+++ linux-2.6.37.3/arch/ia64/kernel/pci-dma.c 2011-01-17 02:41:00.000000000 -0500
18051 +diff -urNp linux-2.6.37.4/arch/ia64/kernel/pci-dma.c linux-2.6.37.4/arch/ia64/kernel/pci-dma.c
18052 +--- linux-2.6.37.4/arch/ia64/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
18053 ++++ linux-2.6.37.4/arch/ia64/kernel/pci-dma.c 2011-01-17 02:41:00.000000000 -0500
18054 @@ -43,7 +43,7 @@ struct device fallback_dev = {
18055 .dma_mask = &fallback_dev.coherent_dma_mask,
18056 };
18057 @@ -1200,9 +1200,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/kernel/pci-dma.c linux-2.6.37.3/arch/ia64/ke
18058
18059 static int __init pci_iommu_init(void)
18060 {
18061 -diff -urNp linux-2.6.37.3/arch/ia64/kernel/pci-swiotlb.c linux-2.6.37.3/arch/ia64/kernel/pci-swiotlb.c
18062 ---- linux-2.6.37.3/arch/ia64/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
18063 -+++ linux-2.6.37.3/arch/ia64/kernel/pci-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
18064 +diff -urNp linux-2.6.37.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.37.4/arch/ia64/kernel/pci-swiotlb.c
18065 +--- linux-2.6.37.4/arch/ia64/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
18066 ++++ linux-2.6.37.4/arch/ia64/kernel/pci-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
18067 @@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
18068 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
18069 }
18070 @@ -1212,9 +1212,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/kernel/pci-swiotlb.c linux-2.6.37.3/arch/ia6
18071 .alloc_coherent = ia64_swiotlb_alloc_coherent,
18072 .free_coherent = swiotlb_free_coherent,
18073 .map_page = swiotlb_map_page,
18074 -diff -urNp linux-2.6.37.3/arch/ia64/kernel/sys_ia64.c linux-2.6.37.3/arch/ia64/kernel/sys_ia64.c
18075 ---- linux-2.6.37.3/arch/ia64/kernel/sys_ia64.c 2011-01-04 19:50:19.000000000 -0500
18076 -+++ linux-2.6.37.3/arch/ia64/kernel/sys_ia64.c 2011-01-17 02:41:00.000000000 -0500
18077 +diff -urNp linux-2.6.37.4/arch/ia64/kernel/sys_ia64.c linux-2.6.37.4/arch/ia64/kernel/sys_ia64.c
18078 +--- linux-2.6.37.4/arch/ia64/kernel/sys_ia64.c 2011-01-04 19:50:19.000000000 -0500
18079 ++++ linux-2.6.37.4/arch/ia64/kernel/sys_ia64.c 2011-01-17 02:41:00.000000000 -0500
18080 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
18081 if (REGION_NUMBER(addr) == RGN_HPAGE)
18082 addr = 0;
18083 @@ -1247,9 +1247,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/kernel/sys_ia64.c linux-2.6.37.3/arch/ia64/k
18084 /* Remember the address where we stopped this search: */
18085 mm->free_area_cache = addr + len;
18086 return addr;
18087 -diff -urNp linux-2.6.37.3/arch/ia64/kernel/vmlinux.lds.S linux-2.6.37.3/arch/ia64/kernel/vmlinux.lds.S
18088 ---- linux-2.6.37.3/arch/ia64/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
18089 -+++ linux-2.6.37.3/arch/ia64/kernel/vmlinux.lds.S 2011-01-17 02:41:00.000000000 -0500
18090 +diff -urNp linux-2.6.37.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.37.4/arch/ia64/kernel/vmlinux.lds.S
18091 +--- linux-2.6.37.4/arch/ia64/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
18092 ++++ linux-2.6.37.4/arch/ia64/kernel/vmlinux.lds.S 2011-01-17 02:41:00.000000000 -0500
18093 @@ -199,7 +199,7 @@ SECTIONS {
18094 /* Per-cpu data: */
18095 . = ALIGN(PERCPU_PAGE_SIZE);
18096 @@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/kernel/vmlinux.lds.S linux-2.6.37.3/arch/ia6
18097 /*
18098 * ensure percpu data fits
18099 * into percpu page size
18100 -diff -urNp linux-2.6.37.3/arch/ia64/mm/fault.c linux-2.6.37.3/arch/ia64/mm/fault.c
18101 ---- linux-2.6.37.3/arch/ia64/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18102 -+++ linux-2.6.37.3/arch/ia64/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18103 +diff -urNp linux-2.6.37.4/arch/ia64/mm/fault.c linux-2.6.37.4/arch/ia64/mm/fault.c
18104 +--- linux-2.6.37.4/arch/ia64/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18105 ++++ linux-2.6.37.4/arch/ia64/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18106 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
18107 return pte_present(pte);
18108 }
18109 @@ -1311,9 +1311,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/mm/fault.c linux-2.6.37.3/arch/ia64/mm/fault
18110 /*
18111 * If for any reason at all we couldn't handle the fault, make
18112 * sure we exit gracefully rather than endlessly redo the
18113 -diff -urNp linux-2.6.37.3/arch/ia64/mm/hugetlbpage.c linux-2.6.37.3/arch/ia64/mm/hugetlbpage.c
18114 ---- linux-2.6.37.3/arch/ia64/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
18115 -+++ linux-2.6.37.3/arch/ia64/mm/hugetlbpage.c 2011-01-17 02:41:00.000000000 -0500
18116 +diff -urNp linux-2.6.37.4/arch/ia64/mm/hugetlbpage.c linux-2.6.37.4/arch/ia64/mm/hugetlbpage.c
18117 +--- linux-2.6.37.4/arch/ia64/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
18118 ++++ linux-2.6.37.4/arch/ia64/mm/hugetlbpage.c 2011-01-17 02:41:00.000000000 -0500
18119 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
18120 /* At this point: (!vmm || addr < vmm->vm_end). */
18121 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
18122 @@ -1323,9 +1323,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/mm/hugetlbpage.c linux-2.6.37.3/arch/ia64/mm
18123 return addr;
18124 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
18125 }
18126 -diff -urNp linux-2.6.37.3/arch/ia64/mm/init.c linux-2.6.37.3/arch/ia64/mm/init.c
18127 ---- linux-2.6.37.3/arch/ia64/mm/init.c 2011-01-04 19:50:19.000000000 -0500
18128 -+++ linux-2.6.37.3/arch/ia64/mm/init.c 2011-01-17 02:41:00.000000000 -0500
18129 +diff -urNp linux-2.6.37.4/arch/ia64/mm/init.c linux-2.6.37.4/arch/ia64/mm/init.c
18130 +--- linux-2.6.37.4/arch/ia64/mm/init.c 2011-01-04 19:50:19.000000000 -0500
18131 ++++ linux-2.6.37.4/arch/ia64/mm/init.c 2011-01-17 02:41:00.000000000 -0500
18132 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
18133 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
18134 vma->vm_end = vma->vm_start + PAGE_SIZE;
18135 @@ -1346,9 +1346,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/mm/init.c linux-2.6.37.3/arch/ia64/mm/init.c
18136 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
18137 down_write(&current->mm->mmap_sem);
18138 if (insert_vm_struct(current->mm, vma)) {
18139 -diff -urNp linux-2.6.37.3/arch/ia64/sn/pci/pci_dma.c linux-2.6.37.3/arch/ia64/sn/pci/pci_dma.c
18140 ---- linux-2.6.37.3/arch/ia64/sn/pci/pci_dma.c 2011-01-04 19:50:19.000000000 -0500
18141 -+++ linux-2.6.37.3/arch/ia64/sn/pci/pci_dma.c 2011-01-17 02:41:00.000000000 -0500
18142 +diff -urNp linux-2.6.37.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.37.4/arch/ia64/sn/pci/pci_dma.c
18143 +--- linux-2.6.37.4/arch/ia64/sn/pci/pci_dma.c 2011-01-04 19:50:19.000000000 -0500
18144 ++++ linux-2.6.37.4/arch/ia64/sn/pci/pci_dma.c 2011-01-17 02:41:00.000000000 -0500
18145 @@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
18146 return ret;
18147 }
18148 @@ -1358,9 +1358,9 @@ diff -urNp linux-2.6.37.3/arch/ia64/sn/pci/pci_dma.c linux-2.6.37.3/arch/ia64/sn
18149 .alloc_coherent = sn_dma_alloc_coherent,
18150 .free_coherent = sn_dma_free_coherent,
18151 .map_page = sn_dma_map_page,
18152 -diff -urNp linux-2.6.37.3/arch/m32r/lib/usercopy.c linux-2.6.37.3/arch/m32r/lib/usercopy.c
18153 ---- linux-2.6.37.3/arch/m32r/lib/usercopy.c 2011-01-04 19:50:19.000000000 -0500
18154 -+++ linux-2.6.37.3/arch/m32r/lib/usercopy.c 2011-01-17 02:41:00.000000000 -0500
18155 +diff -urNp linux-2.6.37.4/arch/m32r/lib/usercopy.c linux-2.6.37.4/arch/m32r/lib/usercopy.c
18156 +--- linux-2.6.37.4/arch/m32r/lib/usercopy.c 2011-01-04 19:50:19.000000000 -0500
18157 ++++ linux-2.6.37.4/arch/m32r/lib/usercopy.c 2011-01-17 02:41:00.000000000 -0500
18158 @@ -14,6 +14,9 @@
18159 unsigned long
18160 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
18161 @@ -1381,9 +1381,9 @@ diff -urNp linux-2.6.37.3/arch/m32r/lib/usercopy.c linux-2.6.37.3/arch/m32r/lib/
18162 prefetchw(to);
18163 if (access_ok(VERIFY_READ, from, n))
18164 __copy_user_zeroing(to,from,n);
18165 -diff -urNp linux-2.6.37.3/arch/microblaze/include/asm/device.h linux-2.6.37.3/arch/microblaze/include/asm/device.h
18166 ---- linux-2.6.37.3/arch/microblaze/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18167 -+++ linux-2.6.37.3/arch/microblaze/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18168 +diff -urNp linux-2.6.37.4/arch/microblaze/include/asm/device.h linux-2.6.37.4/arch/microblaze/include/asm/device.h
18169 +--- linux-2.6.37.4/arch/microblaze/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18170 ++++ linux-2.6.37.4/arch/microblaze/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18171 @@ -13,7 +13,7 @@ struct device_node;
18172
18173 struct dev_archdata {
18174 @@ -1393,9 +1393,9 @@ diff -urNp linux-2.6.37.3/arch/microblaze/include/asm/device.h linux-2.6.37.3/ar
18175 void *dma_data;
18176 };
18177
18178 -diff -urNp linux-2.6.37.3/arch/microblaze/include/asm/dma-mapping.h linux-2.6.37.3/arch/microblaze/include/asm/dma-mapping.h
18179 ---- linux-2.6.37.3/arch/microblaze/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18180 -+++ linux-2.6.37.3/arch/microblaze/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18181 +diff -urNp linux-2.6.37.4/arch/microblaze/include/asm/dma-mapping.h linux-2.6.37.4/arch/microblaze/include/asm/dma-mapping.h
18182 +--- linux-2.6.37.4/arch/microblaze/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18183 ++++ linux-2.6.37.4/arch/microblaze/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18184 @@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
18185 return 0xfffffffful;
18186 }
18187 @@ -1467,9 +1467,9 @@ diff -urNp linux-2.6.37.3/arch/microblaze/include/asm/dma-mapping.h linux-2.6.37
18188
18189 BUG_ON(!ops);
18190 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
18191 -diff -urNp linux-2.6.37.3/arch/microblaze/include/asm/pci.h linux-2.6.37.3/arch/microblaze/include/asm/pci.h
18192 ---- linux-2.6.37.3/arch/microblaze/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
18193 -+++ linux-2.6.37.3/arch/microblaze/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
18194 +diff -urNp linux-2.6.37.4/arch/microblaze/include/asm/pci.h linux-2.6.37.4/arch/microblaze/include/asm/pci.h
18195 +--- linux-2.6.37.4/arch/microblaze/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
18196 ++++ linux-2.6.37.4/arch/microblaze/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
18197 @@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
18198 }
18199
18200 @@ -1481,9 +1481,9 @@ diff -urNp linux-2.6.37.3/arch/microblaze/include/asm/pci.h linux-2.6.37.3/arch/
18201 #else /* CONFIG_PCI */
18202 #define set_pci_dma_ops(d)
18203 #define get_pci_dma_ops() NULL
18204 -diff -urNp linux-2.6.37.3/arch/microblaze/kernel/dma.c linux-2.6.37.3/arch/microblaze/kernel/dma.c
18205 ---- linux-2.6.37.3/arch/microblaze/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
18206 -+++ linux-2.6.37.3/arch/microblaze/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
18207 +diff -urNp linux-2.6.37.4/arch/microblaze/kernel/dma.c linux-2.6.37.4/arch/microblaze/kernel/dma.c
18208 +--- linux-2.6.37.4/arch/microblaze/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
18209 ++++ linux-2.6.37.4/arch/microblaze/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
18210 @@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page
18211 __dma_sync_page(dma_address, 0 , size, direction);
18212 }
18213 @@ -1493,9 +1493,9 @@ diff -urNp linux-2.6.37.3/arch/microblaze/kernel/dma.c linux-2.6.37.3/arch/micro
18214 .alloc_coherent = dma_direct_alloc_coherent,
18215 .free_coherent = dma_direct_free_coherent,
18216 .map_sg = dma_direct_map_sg,
18217 -diff -urNp linux-2.6.37.3/arch/microblaze/kernel/kgdb.c linux-2.6.37.3/arch/microblaze/kernel/kgdb.c
18218 ---- linux-2.6.37.3/arch/microblaze/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18219 -+++ linux-2.6.37.3/arch/microblaze/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18220 +diff -urNp linux-2.6.37.4/arch/microblaze/kernel/kgdb.c linux-2.6.37.4/arch/microblaze/kernel/kgdb.c
18221 +--- linux-2.6.37.4/arch/microblaze/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18222 ++++ linux-2.6.37.4/arch/microblaze/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18223 @@ -141,10 +141,11 @@ void kgdb_arch_exit(void)
18224 /*
18225 * Global data
18226 @@ -1509,9 +1509,9 @@ diff -urNp linux-2.6.37.3/arch/microblaze/kernel/kgdb.c linux-2.6.37.3/arch/micr
18227 .gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
18228 #endif
18229 };
18230 -diff -urNp linux-2.6.37.3/arch/microblaze/pci/pci-common.c linux-2.6.37.3/arch/microblaze/pci/pci-common.c
18231 ---- linux-2.6.37.3/arch/microblaze/pci/pci-common.c 2011-01-04 19:50:19.000000000 -0500
18232 -+++ linux-2.6.37.3/arch/microblaze/pci/pci-common.c 2011-01-17 02:41:00.000000000 -0500
18233 +diff -urNp linux-2.6.37.4/arch/microblaze/pci/pci-common.c linux-2.6.37.4/arch/microblaze/pci/pci-common.c
18234 +--- linux-2.6.37.4/arch/microblaze/pci/pci-common.c 2011-01-04 19:50:19.000000000 -0500
18235 ++++ linux-2.6.37.4/arch/microblaze/pci/pci-common.c 2011-01-17 02:41:00.000000000 -0500
18236 @@ -47,14 +47,14 @@ resource_size_t isa_mem_base;
18237 /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
18238 unsigned int pci_flags;
18239 @@ -1530,9 +1530,9 @@ diff -urNp linux-2.6.37.3/arch/microblaze/pci/pci-common.c linux-2.6.37.3/arch/m
18240 {
18241 return pci_dma_ops;
18242 }
18243 -diff -urNp linux-2.6.37.3/arch/mips/alchemy/devboards/pm.c linux-2.6.37.3/arch/mips/alchemy/devboards/pm.c
18244 ---- linux-2.6.37.3/arch/mips/alchemy/devboards/pm.c 2011-01-04 19:50:19.000000000 -0500
18245 -+++ linux-2.6.37.3/arch/mips/alchemy/devboards/pm.c 2011-01-17 02:41:00.000000000 -0500
18246 +diff -urNp linux-2.6.37.4/arch/mips/alchemy/devboards/pm.c linux-2.6.37.4/arch/mips/alchemy/devboards/pm.c
18247 +--- linux-2.6.37.4/arch/mips/alchemy/devboards/pm.c 2011-01-04 19:50:19.000000000 -0500
18248 ++++ linux-2.6.37.4/arch/mips/alchemy/devboards/pm.c 2011-01-17 02:41:00.000000000 -0500
18249 @@ -110,7 +110,7 @@ static void db1x_pm_end(void)
18250
18251 }
18252 @@ -1542,9 +1542,9 @@ diff -urNp linux-2.6.37.3/arch/mips/alchemy/devboards/pm.c linux-2.6.37.3/arch/m
18253 .valid = suspend_valid_only_mem,
18254 .begin = db1x_pm_begin,
18255 .enter = db1x_pm_enter,
18256 -diff -urNp linux-2.6.37.3/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.37.3/arch/mips/cavium-octeon/dma-octeon.c
18257 ---- linux-2.6.37.3/arch/mips/cavium-octeon/dma-octeon.c 2011-01-04 19:50:19.000000000 -0500
18258 -+++ linux-2.6.37.3/arch/mips/cavium-octeon/dma-octeon.c 2011-01-17 02:41:00.000000000 -0500
18259 +diff -urNp linux-2.6.37.4/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.37.4/arch/mips/cavium-octeon/dma-octeon.c
18260 +--- linux-2.6.37.4/arch/mips/cavium-octeon/dma-octeon.c 2011-01-04 19:50:19.000000000 -0500
18261 ++++ linux-2.6.37.4/arch/mips/cavium-octeon/dma-octeon.c 2011-01-17 02:41:00.000000000 -0500
18262 @@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p
18263 }
18264
18265 @@ -1563,9 +1563,9 @@ diff -urNp linux-2.6.37.3/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.37.3/ar
18266
18267 void __init octeon_pci_dma_init(void)
18268 {
18269 -diff -urNp linux-2.6.37.3/arch/mips/include/asm/device.h linux-2.6.37.3/arch/mips/include/asm/device.h
18270 ---- linux-2.6.37.3/arch/mips/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18271 -+++ linux-2.6.37.3/arch/mips/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18272 +diff -urNp linux-2.6.37.4/arch/mips/include/asm/device.h linux-2.6.37.4/arch/mips/include/asm/device.h
18273 +--- linux-2.6.37.4/arch/mips/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18274 ++++ linux-2.6.37.4/arch/mips/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18275 @@ -10,7 +10,7 @@ struct dma_map_ops;
18276
18277 struct dev_archdata {
18278 @@ -1575,9 +1575,9 @@ diff -urNp linux-2.6.37.3/arch/mips/include/asm/device.h linux-2.6.37.3/arch/mip
18279 };
18280
18281 struct pdev_archdata {
18282 -diff -urNp linux-2.6.37.3/arch/mips/include/asm/dma-mapping.h linux-2.6.37.3/arch/mips/include/asm/dma-mapping.h
18283 ---- linux-2.6.37.3/arch/mips/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18284 -+++ linux-2.6.37.3/arch/mips/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18285 +diff -urNp linux-2.6.37.4/arch/mips/include/asm/dma-mapping.h linux-2.6.37.4/arch/mips/include/asm/dma-mapping.h
18286 +--- linux-2.6.37.4/arch/mips/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18287 ++++ linux-2.6.37.4/arch/mips/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18288 @@ -7,9 +7,9 @@
18289
18290 #include <dma-coherence.h>
18291 @@ -1624,9 +1624,9 @@ diff -urNp linux-2.6.37.3/arch/mips/include/asm/dma-mapping.h linux-2.6.37.3/arc
18292
18293 ops->free_coherent(dev, size, vaddr, dma_handle);
18294
18295 -diff -urNp linux-2.6.37.3/arch/mips/include/asm/elf.h linux-2.6.37.3/arch/mips/include/asm/elf.h
18296 ---- linux-2.6.37.3/arch/mips/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18297 -+++ linux-2.6.37.3/arch/mips/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18298 +diff -urNp linux-2.6.37.4/arch/mips/include/asm/elf.h linux-2.6.37.4/arch/mips/include/asm/elf.h
18299 +--- linux-2.6.37.4/arch/mips/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18300 ++++ linux-2.6.37.4/arch/mips/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18301 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
18302 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
18303 #endif
18304 @@ -1648,9 +1648,9 @@ diff -urNp linux-2.6.37.3/arch/mips/include/asm/elf.h linux-2.6.37.3/arch/mips/i
18305 -#define arch_randomize_brk arch_randomize_brk
18306 -
18307 #endif /* _ASM_ELF_H */
18308 -diff -urNp linux-2.6.37.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.37.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
18309 ---- linux-2.6.37.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-04 19:50:19.000000000 -0500
18310 -+++ linux-2.6.37.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-17 02:41:00.000000000 -0500
18311 +diff -urNp linux-2.6.37.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.37.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
18312 +--- linux-2.6.37.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-04 19:50:19.000000000 -0500
18313 ++++ linux-2.6.37.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-17 02:41:00.000000000 -0500
18314 @@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de
18315 phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
18316
18317 @@ -1660,9 +1660,9 @@ diff -urNp linux-2.6.37.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence
18318 extern char *octeon_swiotlb;
18319
18320 #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
18321 -diff -urNp linux-2.6.37.3/arch/mips/include/asm/page.h linux-2.6.37.3/arch/mips/include/asm/page.h
18322 ---- linux-2.6.37.3/arch/mips/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
18323 -+++ linux-2.6.37.3/arch/mips/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
18324 +diff -urNp linux-2.6.37.4/arch/mips/include/asm/page.h linux-2.6.37.4/arch/mips/include/asm/page.h
18325 +--- linux-2.6.37.4/arch/mips/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
18326 ++++ linux-2.6.37.4/arch/mips/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
18327 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
18328 #ifdef CONFIG_CPU_MIPS32
18329 typedef struct { unsigned long pte_low, pte_high; } pte_t;
18330 @@ -1672,9 +1672,9 @@ diff -urNp linux-2.6.37.3/arch/mips/include/asm/page.h linux-2.6.37.3/arch/mips/
18331 #else
18332 typedef struct { unsigned long long pte; } pte_t;
18333 #define pte_val(x) ((x).pte)
18334 -diff -urNp linux-2.6.37.3/arch/mips/include/asm/system.h linux-2.6.37.3/arch/mips/include/asm/system.h
18335 ---- linux-2.6.37.3/arch/mips/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18336 -+++ linux-2.6.37.3/arch/mips/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18337 +diff -urNp linux-2.6.37.4/arch/mips/include/asm/system.h linux-2.6.37.4/arch/mips/include/asm/system.h
18338 +--- linux-2.6.37.4/arch/mips/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18339 ++++ linux-2.6.37.4/arch/mips/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18340 @@ -23,6 +23,7 @@
18341 #include <asm/dsp.h>
18342 #include <asm/watch.h>
18343 @@ -1691,9 +1691,9 @@ diff -urNp linux-2.6.37.3/arch/mips/include/asm/system.h linux-2.6.37.3/arch/mip
18344 +#define arch_align_stack(x) ((x) & ALMASK)
18345
18346 #endif /* _ASM_SYSTEM_H */
18347 -diff -urNp linux-2.6.37.3/arch/mips/jz4740/pm.c linux-2.6.37.3/arch/mips/jz4740/pm.c
18348 ---- linux-2.6.37.3/arch/mips/jz4740/pm.c 2011-01-04 19:50:19.000000000 -0500
18349 -+++ linux-2.6.37.3/arch/mips/jz4740/pm.c 2011-01-17 02:41:00.000000000 -0500
18350 +diff -urNp linux-2.6.37.4/arch/mips/jz4740/pm.c linux-2.6.37.4/arch/mips/jz4740/pm.c
18351 +--- linux-2.6.37.4/arch/mips/jz4740/pm.c 2011-01-04 19:50:19.000000000 -0500
18352 ++++ linux-2.6.37.4/arch/mips/jz4740/pm.c 2011-01-17 02:41:00.000000000 -0500
18353 @@ -42,7 +42,7 @@ static int jz4740_pm_enter(suspend_state
18354 return 0;
18355 }
18356 @@ -1703,9 +1703,9 @@ diff -urNp linux-2.6.37.3/arch/mips/jz4740/pm.c linux-2.6.37.3/arch/mips/jz4740/
18357 .valid = suspend_valid_only_mem,
18358 .enter = jz4740_pm_enter,
18359 };
18360 -diff -urNp linux-2.6.37.3/arch/mips/kernel/binfmt_elfn32.c linux-2.6.37.3/arch/mips/kernel/binfmt_elfn32.c
18361 ---- linux-2.6.37.3/arch/mips/kernel/binfmt_elfn32.c 2011-01-04 19:50:19.000000000 -0500
18362 -+++ linux-2.6.37.3/arch/mips/kernel/binfmt_elfn32.c 2011-01-17 02:41:00.000000000 -0500
18363 +diff -urNp linux-2.6.37.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.37.4/arch/mips/kernel/binfmt_elfn32.c
18364 +--- linux-2.6.37.4/arch/mips/kernel/binfmt_elfn32.c 2011-01-04 19:50:19.000000000 -0500
18365 ++++ linux-2.6.37.4/arch/mips/kernel/binfmt_elfn32.c 2011-01-17 02:41:00.000000000 -0500
18366 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
18367 #undef ELF_ET_DYN_BASE
18368 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
18369 @@ -1720,9 +1720,9 @@ diff -urNp linux-2.6.37.3/arch/mips/kernel/binfmt_elfn32.c linux-2.6.37.3/arch/m
18370 #include <asm/processor.h>
18371 #include <linux/module.h>
18372 #include <linux/elfcore.h>
18373 -diff -urNp linux-2.6.37.3/arch/mips/kernel/binfmt_elfo32.c linux-2.6.37.3/arch/mips/kernel/binfmt_elfo32.c
18374 ---- linux-2.6.37.3/arch/mips/kernel/binfmt_elfo32.c 2011-01-04 19:50:19.000000000 -0500
18375 -+++ linux-2.6.37.3/arch/mips/kernel/binfmt_elfo32.c 2011-01-17 02:41:00.000000000 -0500
18376 +diff -urNp linux-2.6.37.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.37.4/arch/mips/kernel/binfmt_elfo32.c
18377 +--- linux-2.6.37.4/arch/mips/kernel/binfmt_elfo32.c 2011-01-04 19:50:19.000000000 -0500
18378 ++++ linux-2.6.37.4/arch/mips/kernel/binfmt_elfo32.c 2011-01-17 02:41:00.000000000 -0500
18379 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
18380 #undef ELF_ET_DYN_BASE
18381 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
18382 @@ -1737,9 +1737,9 @@ diff -urNp linux-2.6.37.3/arch/mips/kernel/binfmt_elfo32.c linux-2.6.37.3/arch/m
18383 #include <asm/processor.h>
18384
18385 /*
18386 -diff -urNp linux-2.6.37.3/arch/mips/kernel/kgdb.c linux-2.6.37.3/arch/mips/kernel/kgdb.c
18387 ---- linux-2.6.37.3/arch/mips/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18388 -+++ linux-2.6.37.3/arch/mips/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18389 +diff -urNp linux-2.6.37.4/arch/mips/kernel/kgdb.c linux-2.6.37.4/arch/mips/kernel/kgdb.c
18390 +--- linux-2.6.37.4/arch/mips/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18391 ++++ linux-2.6.37.4/arch/mips/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18392 @@ -351,6 +351,7 @@ int kgdb_arch_handle_exception(int vecto
18393 return -1;
18394 }
18395 @@ -1748,9 +1748,9 @@ diff -urNp linux-2.6.37.3/arch/mips/kernel/kgdb.c linux-2.6.37.3/arch/mips/kerne
18396 struct kgdb_arch arch_kgdb_ops;
18397
18398 /*
18399 -diff -urNp linux-2.6.37.3/arch/mips/kernel/process.c linux-2.6.37.3/arch/mips/kernel/process.c
18400 ---- linux-2.6.37.3/arch/mips/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18401 -+++ linux-2.6.37.3/arch/mips/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18402 +diff -urNp linux-2.6.37.4/arch/mips/kernel/process.c linux-2.6.37.4/arch/mips/kernel/process.c
18403 +--- linux-2.6.37.4/arch/mips/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18404 ++++ linux-2.6.37.4/arch/mips/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18405 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
18406 out:
18407 return pc;
18408 @@ -1767,9 +1767,9 @@ diff -urNp linux-2.6.37.3/arch/mips/kernel/process.c linux-2.6.37.3/arch/mips/ke
18409 -
18410 - return sp & ALMASK;
18411 -}
18412 -diff -urNp linux-2.6.37.3/arch/mips/kernel/syscall.c linux-2.6.37.3/arch/mips/kernel/syscall.c
18413 ---- linux-2.6.37.3/arch/mips/kernel/syscall.c 2011-01-04 19:50:19.000000000 -0500
18414 -+++ linux-2.6.37.3/arch/mips/kernel/syscall.c 2011-01-17 02:41:00.000000000 -0500
18415 +diff -urNp linux-2.6.37.4/arch/mips/kernel/syscall.c linux-2.6.37.4/arch/mips/kernel/syscall.c
18416 +--- linux-2.6.37.4/arch/mips/kernel/syscall.c 2011-01-04 19:50:19.000000000 -0500
18417 ++++ linux-2.6.37.4/arch/mips/kernel/syscall.c 2011-01-17 02:41:00.000000000 -0500
18418 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
18419 do_color_align = 0;
18420 if (filp || (flags & MAP_SHARED))
18421 @@ -1820,9 +1820,9 @@ diff -urNp linux-2.6.37.3/arch/mips/kernel/syscall.c linux-2.6.37.3/arch/mips/ke
18422 SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
18423 unsigned long, prot, unsigned long, flags, unsigned long,
18424 fd, off_t, offset)
18425 -diff -urNp linux-2.6.37.3/arch/mips/loongson/common/pm.c linux-2.6.37.3/arch/mips/loongson/common/pm.c
18426 ---- linux-2.6.37.3/arch/mips/loongson/common/pm.c 2011-01-04 19:50:19.000000000 -0500
18427 -+++ linux-2.6.37.3/arch/mips/loongson/common/pm.c 2011-01-17 02:41:00.000000000 -0500
18428 +diff -urNp linux-2.6.37.4/arch/mips/loongson/common/pm.c linux-2.6.37.4/arch/mips/loongson/common/pm.c
18429 +--- linux-2.6.37.4/arch/mips/loongson/common/pm.c 2011-01-04 19:50:19.000000000 -0500
18430 ++++ linux-2.6.37.4/arch/mips/loongson/common/pm.c 2011-01-17 02:41:00.000000000 -0500
18431 @@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspe
18432 }
18433 }
18434 @@ -1832,9 +1832,9 @@ diff -urNp linux-2.6.37.3/arch/mips/loongson/common/pm.c linux-2.6.37.3/arch/mip
18435 .valid = loongson_pm_valid_state,
18436 .enter = loongson_pm_enter,
18437 };
18438 -diff -urNp linux-2.6.37.3/arch/mips/mm/dma-default.c linux-2.6.37.3/arch/mips/mm/dma-default.c
18439 ---- linux-2.6.37.3/arch/mips/mm/dma-default.c 2011-01-04 19:50:19.000000000 -0500
18440 -+++ linux-2.6.37.3/arch/mips/mm/dma-default.c 2011-01-17 02:41:00.000000000 -0500
18441 +diff -urNp linux-2.6.37.4/arch/mips/mm/dma-default.c linux-2.6.37.4/arch/mips/mm/dma-default.c
18442 +--- linux-2.6.37.4/arch/mips/mm/dma-default.c 2011-01-04 19:50:19.000000000 -0500
18443 ++++ linux-2.6.37.4/arch/mips/mm/dma-default.c 2011-01-17 02:41:00.000000000 -0500
18444 @@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev,
18445
18446 EXPORT_SYMBOL(dma_cache_sync);
18447 @@ -1853,9 +1853,9 @@ diff -urNp linux-2.6.37.3/arch/mips/mm/dma-default.c linux-2.6.37.3/arch/mips/mm
18448 EXPORT_SYMBOL(mips_dma_map_ops);
18449
18450 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
18451 -diff -urNp linux-2.6.37.3/arch/mips/mm/fault.c linux-2.6.37.3/arch/mips/mm/fault.c
18452 ---- linux-2.6.37.3/arch/mips/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18453 -+++ linux-2.6.37.3/arch/mips/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18454 +diff -urNp linux-2.6.37.4/arch/mips/mm/fault.c linux-2.6.37.4/arch/mips/mm/fault.c
18455 +--- linux-2.6.37.4/arch/mips/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18456 ++++ linux-2.6.37.4/arch/mips/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18457 @@ -28,6 +28,23 @@
18458 #include <asm/highmem.h> /* For VMALLOC_END */
18459 #include <linux/kdebug.h>
18460 @@ -1880,9 +1880,9 @@ diff -urNp linux-2.6.37.3/arch/mips/mm/fault.c linux-2.6.37.3/arch/mips/mm/fault
18461 /*
18462 * This routine handles page faults. It determines the address,
18463 * and the problem, and then passes it off to one of the appropriate
18464 -diff -urNp linux-2.6.37.3/arch/parisc/include/asm/elf.h linux-2.6.37.3/arch/parisc/include/asm/elf.h
18465 ---- linux-2.6.37.3/arch/parisc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18466 -+++ linux-2.6.37.3/arch/parisc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18467 +diff -urNp linux-2.6.37.4/arch/parisc/include/asm/elf.h linux-2.6.37.4/arch/parisc/include/asm/elf.h
18468 +--- linux-2.6.37.4/arch/parisc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18469 ++++ linux-2.6.37.4/arch/parisc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18470 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
18471
18472 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
18473 @@ -1897,9 +1897,9 @@ diff -urNp linux-2.6.37.3/arch/parisc/include/asm/elf.h linux-2.6.37.3/arch/pari
18474 /* This yields a mask that user programs can use to figure out what
18475 instruction set this CPU supports. This could be done in user space,
18476 but it's not easy, and we've already done it here. */
18477 -diff -urNp linux-2.6.37.3/arch/parisc/include/asm/pgtable.h linux-2.6.37.3/arch/parisc/include/asm/pgtable.h
18478 ---- linux-2.6.37.3/arch/parisc/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
18479 -+++ linux-2.6.37.3/arch/parisc/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
18480 +diff -urNp linux-2.6.37.4/arch/parisc/include/asm/pgtable.h linux-2.6.37.4/arch/parisc/include/asm/pgtable.h
18481 +--- linux-2.6.37.4/arch/parisc/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
18482 ++++ linux-2.6.37.4/arch/parisc/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
18483 @@ -207,6 +207,17 @@
18484 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
18485 #define PAGE_COPY PAGE_EXECREAD
18486 @@ -1918,9 +1918,9 @@ diff -urNp linux-2.6.37.3/arch/parisc/include/asm/pgtable.h linux-2.6.37.3/arch/
18487 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
18488 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
18489 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
18490 -diff -urNp linux-2.6.37.3/arch/parisc/kernel/module.c linux-2.6.37.3/arch/parisc/kernel/module.c
18491 ---- linux-2.6.37.3/arch/parisc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18492 -+++ linux-2.6.37.3/arch/parisc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18493 +diff -urNp linux-2.6.37.4/arch/parisc/kernel/module.c linux-2.6.37.4/arch/parisc/kernel/module.c
18494 +--- linux-2.6.37.4/arch/parisc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18495 ++++ linux-2.6.37.4/arch/parisc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18496 @@ -96,16 +96,38 @@
18497
18498 /* three functions to determine where in the module core
18499 @@ -2021,9 +2021,9 @@ diff -urNp linux-2.6.37.3/arch/parisc/kernel/module.c linux-2.6.37.3/arch/parisc
18500
18501 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
18502 me->arch.unwind_section, table, end, gp);
18503 -diff -urNp linux-2.6.37.3/arch/parisc/kernel/sys_parisc.c linux-2.6.37.3/arch/parisc/kernel/sys_parisc.c
18504 ---- linux-2.6.37.3/arch/parisc/kernel/sys_parisc.c 2011-01-04 19:50:19.000000000 -0500
18505 -+++ linux-2.6.37.3/arch/parisc/kernel/sys_parisc.c 2011-01-17 02:41:00.000000000 -0500
18506 +diff -urNp linux-2.6.37.4/arch/parisc/kernel/sys_parisc.c linux-2.6.37.4/arch/parisc/kernel/sys_parisc.c
18507 +--- linux-2.6.37.4/arch/parisc/kernel/sys_parisc.c 2011-01-04 19:50:19.000000000 -0500
18508 ++++ linux-2.6.37.4/arch/parisc/kernel/sys_parisc.c 2011-01-17 02:41:00.000000000 -0500
18509 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
18510 /* At this point: (!vma || addr < vma->vm_end). */
18511 if (TASK_SIZE - len < addr)
18512 @@ -2051,9 +2051,9 @@ diff -urNp linux-2.6.37.3/arch/parisc/kernel/sys_parisc.c linux-2.6.37.3/arch/pa
18513
18514 if (filp) {
18515 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
18516 -diff -urNp linux-2.6.37.3/arch/parisc/kernel/traps.c linux-2.6.37.3/arch/parisc/kernel/traps.c
18517 ---- linux-2.6.37.3/arch/parisc/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
18518 -+++ linux-2.6.37.3/arch/parisc/kernel/traps.c 2011-01-17 02:41:00.000000000 -0500
18519 +diff -urNp linux-2.6.37.4/arch/parisc/kernel/traps.c linux-2.6.37.4/arch/parisc/kernel/traps.c
18520 +--- linux-2.6.37.4/arch/parisc/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
18521 ++++ linux-2.6.37.4/arch/parisc/kernel/traps.c 2011-01-17 02:41:00.000000000 -0500
18522 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
18523
18524 down_read(&current->mm->mmap_sem);
18525 @@ -2065,9 +2065,9 @@ diff -urNp linux-2.6.37.3/arch/parisc/kernel/traps.c linux-2.6.37.3/arch/parisc/
18526 fault_address = regs->iaoq[0];
18527 fault_space = regs->iasq[0];
18528
18529 -diff -urNp linux-2.6.37.3/arch/parisc/mm/fault.c linux-2.6.37.3/arch/parisc/mm/fault.c
18530 ---- linux-2.6.37.3/arch/parisc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18531 -+++ linux-2.6.37.3/arch/parisc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18532 +diff -urNp linux-2.6.37.4/arch/parisc/mm/fault.c linux-2.6.37.4/arch/parisc/mm/fault.c
18533 +--- linux-2.6.37.4/arch/parisc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18534 ++++ linux-2.6.37.4/arch/parisc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18535 @@ -15,6 +15,7 @@
18536 #include <linux/sched.h>
18537 #include <linux/interrupt.h>
18538 @@ -2237,9 +2237,9 @@ diff -urNp linux-2.6.37.3/arch/parisc/mm/fault.c linux-2.6.37.3/arch/parisc/mm/f
18539
18540 /*
18541 * If for any reason at all we couldn't handle the fault, make
18542 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/device.h linux-2.6.37.3/arch/powerpc/include/asm/device.h
18543 ---- linux-2.6.37.3/arch/powerpc/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18544 -+++ linux-2.6.37.3/arch/powerpc/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18545 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/device.h linux-2.6.37.4/arch/powerpc/include/asm/device.h
18546 +--- linux-2.6.37.4/arch/powerpc/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18547 ++++ linux-2.6.37.4/arch/powerpc/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18548 @@ -11,7 +11,7 @@ struct device_node;
18549
18550 struct dev_archdata {
18551 @@ -2249,9 +2249,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/device.h linux-2.6.37.3/arch/
18552
18553 /*
18554 * When an iommu is in use, dma_data is used as a ptr to the base of the
18555 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/dma-mapping.h linux-2.6.37.3/arch/powerpc/include/asm/dma-mapping.h
18556 ---- linux-2.6.37.3/arch/powerpc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18557 -+++ linux-2.6.37.3/arch/powerpc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18558 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/dma-mapping.h linux-2.6.37.4/arch/powerpc/include/asm/dma-mapping.h
18559 +--- linux-2.6.37.4/arch/powerpc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18560 ++++ linux-2.6.37.4/arch/powerpc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18561 @@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
18562 /*
18563 * Available generic sets of operations
18564 @@ -2314,9 +2314,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/dma-mapping.h linux-2.6.37.3/
18565
18566 if (dma_ops->mapping_error)
18567 return dma_ops->mapping_error(dev, dma_addr);
18568 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/elf.h linux-2.6.37.3/arch/powerpc/include/asm/elf.h
18569 ---- linux-2.6.37.3/arch/powerpc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18570 -+++ linux-2.6.37.3/arch/powerpc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18571 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/elf.h linux-2.6.37.4/arch/powerpc/include/asm/elf.h
18572 +--- linux-2.6.37.4/arch/powerpc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18573 ++++ linux-2.6.37.4/arch/powerpc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18574 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
18575 the loader. We need to make sure that it is out of the way of the program
18576 that it will "exec", and that there is sufficient room for the brk. */
18577 @@ -2349,9 +2349,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/elf.h linux-2.6.37.3/arch/pow
18578 #endif /* __KERNEL__ */
18579
18580 /*
18581 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/iommu.h linux-2.6.37.3/arch/powerpc/include/asm/iommu.h
18582 ---- linux-2.6.37.3/arch/powerpc/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
18583 -+++ linux-2.6.37.3/arch/powerpc/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
18584 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/iommu.h linux-2.6.37.4/arch/powerpc/include/asm/iommu.h
18585 +--- linux-2.6.37.4/arch/powerpc/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
18586 ++++ linux-2.6.37.4/arch/powerpc/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
18587 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
18588 extern void iommu_init_early_dart(void);
18589 extern void iommu_init_early_pasemi(void);
18590 @@ -2362,9 +2362,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/iommu.h linux-2.6.37.3/arch/p
18591 #ifdef CONFIG_PCI
18592 extern void pci_iommu_init(void);
18593 extern void pci_direct_iommu_init(void);
18594 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/kmap_types.h linux-2.6.37.3/arch/powerpc/include/asm/kmap_types.h
18595 ---- linux-2.6.37.3/arch/powerpc/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
18596 -+++ linux-2.6.37.3/arch/powerpc/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
18597 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.37.4/arch/powerpc/include/asm/kmap_types.h
18598 +--- linux-2.6.37.4/arch/powerpc/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
18599 ++++ linux-2.6.37.4/arch/powerpc/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
18600 @@ -27,6 +27,7 @@ enum km_type {
18601 KM_PPC_SYNC_PAGE,
18602 KM_PPC_SYNC_ICACHE,
18603 @@ -2373,9 +2373,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/kmap_types.h linux-2.6.37.3/a
18604 KM_TYPE_NR
18605 };
18606
18607 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/page_64.h linux-2.6.37.3/arch/powerpc/include/asm/page_64.h
18608 ---- linux-2.6.37.3/arch/powerpc/include/asm/page_64.h 2011-01-04 19:50:19.000000000 -0500
18609 -+++ linux-2.6.37.3/arch/powerpc/include/asm/page_64.h 2011-01-17 02:41:00.000000000 -0500
18610 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/page_64.h linux-2.6.37.4/arch/powerpc/include/asm/page_64.h
18611 +--- linux-2.6.37.4/arch/powerpc/include/asm/page_64.h 2011-01-04 19:50:19.000000000 -0500
18612 ++++ linux-2.6.37.4/arch/powerpc/include/asm/page_64.h 2011-01-17 02:41:00.000000000 -0500
18613 @@ -172,15 +172,18 @@ do { \
18614 * stack by default, so in the absense of a PT_GNU_STACK program header
18615 * we turn execute permission off.
18616 @@ -2397,9 +2397,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/page_64.h linux-2.6.37.3/arch
18617
18618 #include <asm-generic/getorder.h>
18619
18620 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/page.h linux-2.6.37.3/arch/powerpc/include/asm/page.h
18621 ---- linux-2.6.37.3/arch/powerpc/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
18622 -+++ linux-2.6.37.3/arch/powerpc/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
18623 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/page.h linux-2.6.37.4/arch/powerpc/include/asm/page.h
18624 +--- linux-2.6.37.4/arch/powerpc/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
18625 ++++ linux-2.6.37.4/arch/powerpc/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
18626 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
18627 * and needs to be executable. This means the whole heap ends
18628 * up being executable.
18629 @@ -2422,9 +2422,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/page.h linux-2.6.37.3/arch/po
18630 #ifndef __ASSEMBLY__
18631
18632 #undef STRICT_MM_TYPECHECKS
18633 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/pci.h linux-2.6.37.3/arch/powerpc/include/asm/pci.h
18634 ---- linux-2.6.37.3/arch/powerpc/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
18635 -+++ linux-2.6.37.3/arch/powerpc/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
18636 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/pci.h linux-2.6.37.4/arch/powerpc/include/asm/pci.h
18637 +--- linux-2.6.37.4/arch/powerpc/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
18638 ++++ linux-2.6.37.4/arch/powerpc/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
18639 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
18640 }
18641
18642 @@ -2436,9 +2436,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/pci.h linux-2.6.37.3/arch/pow
18643 #else /* CONFIG_PCI */
18644 #define set_pci_dma_ops(d)
18645 #define get_pci_dma_ops() NULL
18646 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/pgtable.h linux-2.6.37.3/arch/powerpc/include/asm/pgtable.h
18647 ---- linux-2.6.37.3/arch/powerpc/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
18648 -+++ linux-2.6.37.3/arch/powerpc/include/asm/pgtable.h 2011-02-27 14:48:10.000000000 -0500
18649 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/pgtable.h linux-2.6.37.4/arch/powerpc/include/asm/pgtable.h
18650 +--- linux-2.6.37.4/arch/powerpc/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
18651 ++++ linux-2.6.37.4/arch/powerpc/include/asm/pgtable.h 2011-02-27 14:48:10.000000000 -0500
18652 @@ -2,6 +2,7 @@
18653 #define _ASM_POWERPC_PGTABLE_H
18654 #ifdef __KERNEL__
18655 @@ -2447,9 +2447,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/pgtable.h linux-2.6.37.3/arch
18656 #ifndef __ASSEMBLY__
18657 #include <asm/processor.h> /* For TASK_SIZE */
18658 #include <asm/mmu.h>
18659 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/pte-hash32.h linux-2.6.37.3/arch/powerpc/include/asm/pte-hash32.h
18660 ---- linux-2.6.37.3/arch/powerpc/include/asm/pte-hash32.h 2011-01-04 19:50:19.000000000 -0500
18661 -+++ linux-2.6.37.3/arch/powerpc/include/asm/pte-hash32.h 2011-01-17 02:41:00.000000000 -0500
18662 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.37.4/arch/powerpc/include/asm/pte-hash32.h
18663 +--- linux-2.6.37.4/arch/powerpc/include/asm/pte-hash32.h 2011-01-04 19:50:19.000000000 -0500
18664 ++++ linux-2.6.37.4/arch/powerpc/include/asm/pte-hash32.h 2011-01-17 02:41:00.000000000 -0500
18665 @@ -21,6 +21,7 @@
18666 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
18667 #define _PAGE_USER 0x004 /* usermode access allowed */
18668 @@ -2458,9 +2458,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/pte-hash32.h linux-2.6.37.3/a
18669 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
18670 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
18671 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
18672 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/reg.h linux-2.6.37.3/arch/powerpc/include/asm/reg.h
18673 ---- linux-2.6.37.3/arch/powerpc/include/asm/reg.h 2011-01-04 19:50:19.000000000 -0500
18674 -+++ linux-2.6.37.3/arch/powerpc/include/asm/reg.h 2011-01-17 02:41:00.000000000 -0500
18675 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/reg.h linux-2.6.37.4/arch/powerpc/include/asm/reg.h
18676 +--- linux-2.6.37.4/arch/powerpc/include/asm/reg.h 2011-01-04 19:50:19.000000000 -0500
18677 ++++ linux-2.6.37.4/arch/powerpc/include/asm/reg.h 2011-01-17 02:41:00.000000000 -0500
18678 @@ -191,6 +191,7 @@
18679 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
18680 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
18681 @@ -2469,9 +2469,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/reg.h linux-2.6.37.3/arch/pow
18682 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
18683 #define DSISR_ISSTORE 0x02000000 /* access was a store */
18684 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
18685 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/swiotlb.h linux-2.6.37.3/arch/powerpc/include/asm/swiotlb.h
18686 ---- linux-2.6.37.3/arch/powerpc/include/asm/swiotlb.h 2011-01-04 19:50:19.000000000 -0500
18687 -+++ linux-2.6.37.3/arch/powerpc/include/asm/swiotlb.h 2011-01-17 02:41:00.000000000 -0500
18688 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.37.4/arch/powerpc/include/asm/swiotlb.h
18689 +--- linux-2.6.37.4/arch/powerpc/include/asm/swiotlb.h 2011-01-04 19:50:19.000000000 -0500
18690 ++++ linux-2.6.37.4/arch/powerpc/include/asm/swiotlb.h 2011-01-17 02:41:00.000000000 -0500
18691 @@ -13,7 +13,7 @@
18692
18693 #include <linux/swiotlb.h>
18694 @@ -2481,9 +2481,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/swiotlb.h linux-2.6.37.3/arch
18695
18696 static inline void dma_mark_clean(void *addr, size_t size) {}
18697
18698 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/system.h linux-2.6.37.3/arch/powerpc/include/asm/system.h
18699 ---- linux-2.6.37.3/arch/powerpc/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18700 -+++ linux-2.6.37.3/arch/powerpc/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18701 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/system.h linux-2.6.37.4/arch/powerpc/include/asm/system.h
18702 +--- linux-2.6.37.4/arch/powerpc/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18703 ++++ linux-2.6.37.4/arch/powerpc/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18704 @@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi
18705 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
18706 #endif
18707 @@ -2493,9 +2493,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/system.h linux-2.6.37.3/arch/
18708
18709 /* Used in very early kernel initialization. */
18710 extern unsigned long reloc_offset(void);
18711 -diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/uaccess.h linux-2.6.37.3/arch/powerpc/include/asm/uaccess.h
18712 ---- linux-2.6.37.3/arch/powerpc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18713 -+++ linux-2.6.37.3/arch/powerpc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18714 +diff -urNp linux-2.6.37.4/arch/powerpc/include/asm/uaccess.h linux-2.6.37.4/arch/powerpc/include/asm/uaccess.h
18715 +--- linux-2.6.37.4/arch/powerpc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18716 ++++ linux-2.6.37.4/arch/powerpc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18717 @@ -13,6 +13,8 @@
18718 #define VERIFY_READ 0
18719 #define VERIFY_WRITE 1
18720 @@ -2673,9 +2673,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/include/asm/uaccess.h linux-2.6.37.3/arch
18721 extern unsigned long __clear_user(void __user *addr, unsigned long size);
18722
18723 static inline unsigned long clear_user(void __user *addr, unsigned long size)
18724 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/dma.c linux-2.6.37.3/arch/powerpc/kernel/dma.c
18725 ---- linux-2.6.37.3/arch/powerpc/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
18726 -+++ linux-2.6.37.3/arch/powerpc/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
18727 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/dma.c linux-2.6.37.4/arch/powerpc/kernel/dma.c
18728 +--- linux-2.6.37.4/arch/powerpc/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
18729 ++++ linux-2.6.37.4/arch/powerpc/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
18730 @@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl
18731 }
18732 #endif
18733 @@ -2694,9 +2694,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/dma.c linux-2.6.37.3/arch/powerpc/
18734
18735 if (ppc_md.dma_set_mask)
18736 return ppc_md.dma_set_mask(dev, dma_mask);
18737 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/dma-iommu.c linux-2.6.37.3/arch/powerpc/kernel/dma-iommu.c
18738 ---- linux-2.6.37.3/arch/powerpc/kernel/dma-iommu.c 2011-01-04 19:50:19.000000000 -0500
18739 -+++ linux-2.6.37.3/arch/powerpc/kernel/dma-iommu.c 2011-01-17 02:41:00.000000000 -0500
18740 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.37.4/arch/powerpc/kernel/dma-iommu.c
18741 +--- linux-2.6.37.4/arch/powerpc/kernel/dma-iommu.c 2011-01-04 19:50:19.000000000 -0500
18742 ++++ linux-2.6.37.4/arch/powerpc/kernel/dma-iommu.c 2011-01-17 02:41:00.000000000 -0500
18743 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
18744 }
18745
18746 @@ -2714,9 +2714,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/dma-iommu.c linux-2.6.37.3/arch/po
18747 struct dma_map_ops dma_iommu_ops = {
18748 .alloc_coherent = dma_iommu_alloc_coherent,
18749 .free_coherent = dma_iommu_free_coherent,
18750 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.37.3/arch/powerpc/kernel/dma-swiotlb.c
18751 ---- linux-2.6.37.3/arch/powerpc/kernel/dma-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
18752 -+++ linux-2.6.37.3/arch/powerpc/kernel/dma-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
18753 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.37.4/arch/powerpc/kernel/dma-swiotlb.c
18754 +--- linux-2.6.37.4/arch/powerpc/kernel/dma-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
18755 ++++ linux-2.6.37.4/arch/powerpc/kernel/dma-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
18756 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
18757 * map_page, and unmap_page on highmem, use normal dma_ops
18758 * for everything else.
18759 @@ -2726,9 +2726,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.37.3/arch/
18760 .alloc_coherent = dma_direct_alloc_coherent,
18761 .free_coherent = dma_direct_free_coherent,
18762 .map_sg = swiotlb_map_sg_attrs,
18763 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/exceptions-64e.S linux-2.6.37.3/arch/powerpc/kernel/exceptions-64e.S
18764 ---- linux-2.6.37.3/arch/powerpc/kernel/exceptions-64e.S 2011-01-04 19:50:19.000000000 -0500
18765 -+++ linux-2.6.37.3/arch/powerpc/kernel/exceptions-64e.S 2011-01-17 02:41:00.000000000 -0500
18766 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.37.4/arch/powerpc/kernel/exceptions-64e.S
18767 +--- linux-2.6.37.4/arch/powerpc/kernel/exceptions-64e.S 2011-01-04 19:50:19.000000000 -0500
18768 ++++ linux-2.6.37.4/arch/powerpc/kernel/exceptions-64e.S 2011-01-17 02:41:00.000000000 -0500
18769 @@ -495,6 +495,7 @@ storage_fault_common:
18770 std r14,_DAR(r1)
18771 std r15,_DSISR(r1)
18772 @@ -2747,9 +2747,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/exceptions-64e.S linux-2.6.37.3/ar
18773 addi r3,r1,STACK_FRAME_OVERHEAD
18774 ld r4,_DAR(r1)
18775 bl .bad_page_fault
18776 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/exceptions-64s.S linux-2.6.37.3/arch/powerpc/kernel/exceptions-64s.S
18777 ---- linux-2.6.37.3/arch/powerpc/kernel/exceptions-64s.S 2011-01-04 19:50:19.000000000 -0500
18778 -+++ linux-2.6.37.3/arch/powerpc/kernel/exceptions-64s.S 2011-01-17 02:41:00.000000000 -0500
18779 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.37.4/arch/powerpc/kernel/exceptions-64s.S
18780 +--- linux-2.6.37.4/arch/powerpc/kernel/exceptions-64s.S 2011-01-04 19:50:19.000000000 -0500
18781 ++++ linux-2.6.37.4/arch/powerpc/kernel/exceptions-64s.S 2011-01-17 02:41:00.000000000 -0500
18782 @@ -847,10 +847,10 @@ handle_page_fault:
18783 11: ld r4,_DAR(r1)
18784 ld r5,_DSISR(r1)
18785 @@ -2762,9 +2762,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/exceptions-64s.S linux-2.6.37.3/ar
18786 mr r5,r3
18787 addi r3,r1,STACK_FRAME_OVERHEAD
18788 lwz r4,_DAR(r1)
18789 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/ibmebus.c linux-2.6.37.3/arch/powerpc/kernel/ibmebus.c
18790 ---- linux-2.6.37.3/arch/powerpc/kernel/ibmebus.c 2011-01-04 19:50:19.000000000 -0500
18791 -+++ linux-2.6.37.3/arch/powerpc/kernel/ibmebus.c 2011-01-17 02:41:00.000000000 -0500
18792 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/ibmebus.c linux-2.6.37.4/arch/powerpc/kernel/ibmebus.c
18793 +--- linux-2.6.37.4/arch/powerpc/kernel/ibmebus.c 2011-01-04 19:50:19.000000000 -0500
18794 ++++ linux-2.6.37.4/arch/powerpc/kernel/ibmebus.c 2011-01-17 02:41:00.000000000 -0500
18795 @@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct
18796 return 1;
18797 }
18798 @@ -2774,9 +2774,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/ibmebus.c linux-2.6.37.3/arch/powe
18799 .alloc_coherent = ibmebus_alloc_coherent,
18800 .free_coherent = ibmebus_free_coherent,
18801 .map_sg = ibmebus_map_sg,
18802 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/kgdb.c linux-2.6.37.3/arch/powerpc/kernel/kgdb.c
18803 ---- linux-2.6.37.3/arch/powerpc/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18804 -+++ linux-2.6.37.3/arch/powerpc/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18805 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/kgdb.c linux-2.6.37.4/arch/powerpc/kernel/kgdb.c
18806 +--- linux-2.6.37.4/arch/powerpc/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18807 ++++ linux-2.6.37.4/arch/powerpc/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18808 @@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto
18809 /*
18810 * Global data
18811 @@ -2786,9 +2786,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/kgdb.c linux-2.6.37.3/arch/powerpc
18812 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
18813 };
18814
18815 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/module_32.c linux-2.6.37.3/arch/powerpc/kernel/module_32.c
18816 ---- linux-2.6.37.3/arch/powerpc/kernel/module_32.c 2011-01-04 19:50:19.000000000 -0500
18817 -+++ linux-2.6.37.3/arch/powerpc/kernel/module_32.c 2011-01-17 02:41:00.000000000 -0500
18818 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/module_32.c linux-2.6.37.4/arch/powerpc/kernel/module_32.c
18819 +--- linux-2.6.37.4/arch/powerpc/kernel/module_32.c 2011-01-04 19:50:19.000000000 -0500
18820 ++++ linux-2.6.37.4/arch/powerpc/kernel/module_32.c 2011-01-17 02:41:00.000000000 -0500
18821 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
18822 me->arch.core_plt_section = i;
18823 }
18824 @@ -2818,9 +2818,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/module_32.c linux-2.6.37.3/arch/po
18825
18826 /* Find this entry, or if that fails, the next avail. entry */
18827 while (entry->jump[0]) {
18828 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/module.c linux-2.6.37.3/arch/powerpc/kernel/module.c
18829 ---- linux-2.6.37.3/arch/powerpc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18830 -+++ linux-2.6.37.3/arch/powerpc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18831 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/module.c linux-2.6.37.4/arch/powerpc/kernel/module.c
18832 +--- linux-2.6.37.4/arch/powerpc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18833 ++++ linux-2.6.37.4/arch/powerpc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18834 @@ -31,11 +31,24 @@
18835
18836 LIST_HEAD(module_bug_list);
18837 @@ -2860,9 +2860,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/module.c linux-2.6.37.3/arch/power
18838 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
18839 const Elf_Shdr *sechdrs,
18840 const char *name)
18841 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/pci-common.c linux-2.6.37.3/arch/powerpc/kernel/pci-common.c
18842 ---- linux-2.6.37.3/arch/powerpc/kernel/pci-common.c 2011-01-04 19:50:19.000000000 -0500
18843 -+++ linux-2.6.37.3/arch/powerpc/kernel/pci-common.c 2011-01-17 02:41:00.000000000 -0500
18844 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/pci-common.c linux-2.6.37.4/arch/powerpc/kernel/pci-common.c
18845 +--- linux-2.6.37.4/arch/powerpc/kernel/pci-common.c 2011-01-04 19:50:19.000000000 -0500
18846 ++++ linux-2.6.37.4/arch/powerpc/kernel/pci-common.c 2011-01-17 02:41:00.000000000 -0500
18847 @@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
18848 unsigned int ppc_pci_flags = 0;
18849
18850 @@ -2881,9 +2881,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/pci-common.c linux-2.6.37.3/arch/p
18851 {
18852 return pci_dma_ops;
18853 }
18854 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/process.c linux-2.6.37.3/arch/powerpc/kernel/process.c
18855 ---- linux-2.6.37.3/arch/powerpc/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18856 -+++ linux-2.6.37.3/arch/powerpc/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18857 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/process.c linux-2.6.37.4/arch/powerpc/kernel/process.c
18858 +--- linux-2.6.37.4/arch/powerpc/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18859 ++++ linux-2.6.37.4/arch/powerpc/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18860 @@ -653,8 +653,8 @@ void show_regs(struct pt_regs * regs)
18861 * Lookup NIP late so we have the best change of getting the
18862 * above info out without failing
18863 @@ -2976,9 +2976,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/process.c linux-2.6.37.3/arch/powe
18864 -
18865 - return ret;
18866 -}
18867 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/signal_32.c linux-2.6.37.3/arch/powerpc/kernel/signal_32.c
18868 ---- linux-2.6.37.3/arch/powerpc/kernel/signal_32.c 2011-01-04 19:50:19.000000000 -0500
18869 -+++ linux-2.6.37.3/arch/powerpc/kernel/signal_32.c 2011-01-17 02:41:00.000000000 -0500
18870 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/signal_32.c linux-2.6.37.4/arch/powerpc/kernel/signal_32.c
18871 +--- linux-2.6.37.4/arch/powerpc/kernel/signal_32.c 2011-01-04 19:50:19.000000000 -0500
18872 ++++ linux-2.6.37.4/arch/powerpc/kernel/signal_32.c 2011-01-17 02:41:00.000000000 -0500
18873 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig
18874 /* Save user registers on the stack */
18875 frame = &rt_sf->uc.uc_mcontext;
18876 @@ -2988,9 +2988,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/signal_32.c linux-2.6.37.3/arch/po
18877 if (save_user_regs(regs, frame, 0, 1))
18878 goto badframe;
18879 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
18880 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/signal_64.c linux-2.6.37.3/arch/powerpc/kernel/signal_64.c
18881 ---- linux-2.6.37.3/arch/powerpc/kernel/signal_64.c 2011-01-04 19:50:19.000000000 -0500
18882 -+++ linux-2.6.37.3/arch/powerpc/kernel/signal_64.c 2011-01-17 02:41:00.000000000 -0500
18883 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/signal_64.c linux-2.6.37.4/arch/powerpc/kernel/signal_64.c
18884 +--- linux-2.6.37.4/arch/powerpc/kernel/signal_64.c 2011-01-04 19:50:19.000000000 -0500
18885 ++++ linux-2.6.37.4/arch/powerpc/kernel/signal_64.c 2011-01-17 02:41:00.000000000 -0500
18886 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
18887 current->thread.fpscr.val = 0;
18888
18889 @@ -3000,9 +3000,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/signal_64.c linux-2.6.37.3/arch/po
18890 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
18891 } else {
18892 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
18893 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/vdso.c linux-2.6.37.3/arch/powerpc/kernel/vdso.c
18894 ---- linux-2.6.37.3/arch/powerpc/kernel/vdso.c 2011-01-04 19:50:19.000000000 -0500
18895 -+++ linux-2.6.37.3/arch/powerpc/kernel/vdso.c 2011-01-17 02:41:00.000000000 -0500
18896 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/vdso.c linux-2.6.37.4/arch/powerpc/kernel/vdso.c
18897 +--- linux-2.6.37.4/arch/powerpc/kernel/vdso.c 2011-01-04 19:50:19.000000000 -0500
18898 ++++ linux-2.6.37.4/arch/powerpc/kernel/vdso.c 2011-01-17 02:41:00.000000000 -0500
18899 @@ -36,6 +36,7 @@
18900 #include <asm/firmware.h>
18901 #include <asm/vdso.h>
18902 @@ -3029,9 +3029,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/vdso.c linux-2.6.37.3/arch/powerpc
18903 if (IS_ERR_VALUE(vdso_base)) {
18904 rc = vdso_base;
18905 goto fail_mmapsem;
18906 -diff -urNp linux-2.6.37.3/arch/powerpc/kernel/vio.c linux-2.6.37.3/arch/powerpc/kernel/vio.c
18907 ---- linux-2.6.37.3/arch/powerpc/kernel/vio.c 2011-01-04 19:50:19.000000000 -0500
18908 -+++ linux-2.6.37.3/arch/powerpc/kernel/vio.c 2011-01-17 02:41:00.000000000 -0500
18909 +diff -urNp linux-2.6.37.4/arch/powerpc/kernel/vio.c linux-2.6.37.4/arch/powerpc/kernel/vio.c
18910 +--- linux-2.6.37.4/arch/powerpc/kernel/vio.c 2011-01-04 19:50:19.000000000 -0500
18911 ++++ linux-2.6.37.4/arch/powerpc/kernel/vio.c 2011-01-17 02:41:00.000000000 -0500
18912 @@ -600,11 +600,12 @@ static void vio_dma_iommu_unmap_sg(struc
18913 vio_cmo_dealloc(viodev, alloc_size);
18914 }
18915 @@ -3054,9 +3054,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/kernel/vio.c linux-2.6.37.3/arch/powerpc/
18916 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
18917 }
18918
18919 -diff -urNp linux-2.6.37.3/arch/powerpc/lib/usercopy_64.c linux-2.6.37.3/arch/powerpc/lib/usercopy_64.c
18920 ---- linux-2.6.37.3/arch/powerpc/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
18921 -+++ linux-2.6.37.3/arch/powerpc/lib/usercopy_64.c 2011-01-17 02:41:00.000000000 -0500
18922 +diff -urNp linux-2.6.37.4/arch/powerpc/lib/usercopy_64.c linux-2.6.37.4/arch/powerpc/lib/usercopy_64.c
18923 +--- linux-2.6.37.4/arch/powerpc/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
18924 ++++ linux-2.6.37.4/arch/powerpc/lib/usercopy_64.c 2011-01-17 02:41:00.000000000 -0500
18925 @@ -9,22 +9,6 @@
18926 #include <linux/module.h>
18927 #include <asm/uaccess.h>
18928 @@ -3088,9 +3088,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/lib/usercopy_64.c linux-2.6.37.3/arch/pow
18929 -EXPORT_SYMBOL(copy_to_user);
18930 EXPORT_SYMBOL(copy_in_user);
18931
18932 -diff -urNp linux-2.6.37.3/arch/powerpc/mm/fault.c linux-2.6.37.3/arch/powerpc/mm/fault.c
18933 ---- linux-2.6.37.3/arch/powerpc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18934 -+++ linux-2.6.37.3/arch/powerpc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18935 +diff -urNp linux-2.6.37.4/arch/powerpc/mm/fault.c linux-2.6.37.4/arch/powerpc/mm/fault.c
18936 +--- linux-2.6.37.4/arch/powerpc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18937 ++++ linux-2.6.37.4/arch/powerpc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18938 @@ -31,6 +31,10 @@
18939 #include <linux/kdebug.h>
18940 #include <linux/perf_event.h>
18941 @@ -3195,9 +3195,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/mm/fault.c linux-2.6.37.3/arch/powerpc/mm
18942 _exception(SIGSEGV, regs, code, address);
18943 return 0;
18944 }
18945 -diff -urNp linux-2.6.37.3/arch/powerpc/mm/mmap_64.c linux-2.6.37.3/arch/powerpc/mm/mmap_64.c
18946 ---- linux-2.6.37.3/arch/powerpc/mm/mmap_64.c 2011-01-04 19:50:19.000000000 -0500
18947 -+++ linux-2.6.37.3/arch/powerpc/mm/mmap_64.c 2011-01-17 02:41:00.000000000 -0500
18948 +diff -urNp linux-2.6.37.4/arch/powerpc/mm/mmap_64.c linux-2.6.37.4/arch/powerpc/mm/mmap_64.c
18949 +--- linux-2.6.37.4/arch/powerpc/mm/mmap_64.c 2011-01-04 19:50:19.000000000 -0500
18950 ++++ linux-2.6.37.4/arch/powerpc/mm/mmap_64.c 2011-01-17 02:41:00.000000000 -0500
18951 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
18952 */
18953 if (mmap_is_legacy()) {
18954 @@ -3221,9 +3221,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/mm/mmap_64.c linux-2.6.37.3/arch/powerpc/
18955 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
18956 mm->unmap_area = arch_unmap_area_topdown;
18957 }
18958 -diff -urNp linux-2.6.37.3/arch/powerpc/mm/slice.c linux-2.6.37.3/arch/powerpc/mm/slice.c
18959 ---- linux-2.6.37.3/arch/powerpc/mm/slice.c 2011-01-04 19:50:19.000000000 -0500
18960 -+++ linux-2.6.37.3/arch/powerpc/mm/slice.c 2011-01-17 02:41:00.000000000 -0500
18961 +diff -urNp linux-2.6.37.4/arch/powerpc/mm/slice.c linux-2.6.37.4/arch/powerpc/mm/slice.c
18962 +--- linux-2.6.37.4/arch/powerpc/mm/slice.c 2011-01-04 19:50:19.000000000 -0500
18963 ++++ linux-2.6.37.4/arch/powerpc/mm/slice.c 2011-03-21 17:35:08.000000000 -0400
18964 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
18965 if ((mm->task_size - len) < addr)
18966 return 0;
18967 @@ -3242,7 +3242,25 @@ diff -urNp linux-2.6.37.3/arch/powerpc/mm/slice.c linux-2.6.37.3/arch/powerpc/mm
18968 /*
18969 * Remember the place where we stopped the search:
18970 */
18971 -@@ -336,7 +336,7 @@ static unsigned long slice_find_area_top
18972 +@@ -313,10 +313,14 @@ static unsigned long slice_find_area_top
18973 + }
18974 + }
18975 +
18976 +- addr = mm->mmap_base;
18977 +- while (addr > len) {
18978 ++ if (mm->mmap_base < len)
18979 ++ addr = -ENOMEM;
18980 ++ else
18981 ++ addr = mm->mmap_base - len;
18982 ++
18983 ++ while (!IS_ERR_VALUE(addr)) {
18984 + /* Go down by chunk size */
18985 +- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
18986 ++ addr = _ALIGN_DOWN(addr, 1ul << pshift);
18987 +
18988 + /* Check for hit with different page size */
18989 + mask = slice_range_to_mask(addr, len);
18990 +@@ -336,7 +340,7 @@ static unsigned long slice_find_area_top
18991 * return with success:
18992 */
18993 vma = find_vma(mm, addr);
18994 @@ -3251,7 +3269,16 @@ diff -urNp linux-2.6.37.3/arch/powerpc/mm/slice.c linux-2.6.37.3/arch/powerpc/mm
18995 /* remember the address as a hint for next time */
18996 if (use_cache)
18997 mm->free_area_cache = addr;
18998 -@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
18999 +@@ -348,7 +352,7 @@ static unsigned long slice_find_area_top
19000 + mm->cached_hole_size = vma->vm_start - addr;
19001 +
19002 + /* try just below the current vma->vm_start */
19003 +- addr = vma->vm_start;
19004 ++ addr = skip_heap_stack_gap(vma, len);
19005 + }
19006 +
19007 + /*
19008 +@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(un
19009 if (fixed && addr > (mm->task_size - len))
19010 return -EINVAL;
19011
19012 @@ -3263,9 +3290,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/mm/slice.c linux-2.6.37.3/arch/powerpc/mm
19013 /* If hint, make sure it matches our alignment restrictions */
19014 if (!fixed && addr) {
19015 addr = _ALIGN_UP(addr, 1ul << pshift);
19016 -diff -urNp linux-2.6.37.3/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.37.3/arch/powerpc/platforms/52xx/lite5200_pm.c
19017 ---- linux-2.6.37.3/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-04 19:50:19.000000000 -0500
19018 -+++ linux-2.6.37.3/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-17 02:41:00.000000000 -0500
19019 +diff -urNp linux-2.6.37.4/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.37.4/arch/powerpc/platforms/52xx/lite5200_pm.c
19020 +--- linux-2.6.37.4/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-04 19:50:19.000000000 -0500
19021 ++++ linux-2.6.37.4/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-17 02:41:00.000000000 -0500
19022 @@ -232,7 +232,7 @@ static void lite5200_pm_end(void)
19023 lite5200_pm_target_state = PM_SUSPEND_ON;
19024 }
19025 @@ -3275,9 +3302,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.37
19026 .valid = lite5200_pm_valid,
19027 .begin = lite5200_pm_begin,
19028 .prepare = lite5200_pm_prepare,
19029 -diff -urNp linux-2.6.37.3/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.37.3/arch/powerpc/platforms/52xx/mpc52xx_pm.c
19030 ---- linux-2.6.37.3/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-04 19:50:19.000000000 -0500
19031 -+++ linux-2.6.37.3/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-17 02:41:00.000000000 -0500
19032 +diff -urNp linux-2.6.37.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.37.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c
19033 +--- linux-2.6.37.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-04 19:50:19.000000000 -0500
19034 ++++ linux-2.6.37.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-17 02:41:00.000000000 -0500
19035 @@ -186,7 +186,7 @@ void mpc52xx_pm_finish(void)
19036 iounmap(mbar);
19037 }
19038 @@ -3287,9 +3314,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.37.
19039 .valid = mpc52xx_pm_valid,
19040 .prepare = mpc52xx_pm_prepare,
19041 .enter = mpc52xx_pm_enter,
19042 -diff -urNp linux-2.6.37.3/arch/powerpc/platforms/83xx/suspend.c linux-2.6.37.3/arch/powerpc/platforms/83xx/suspend.c
19043 ---- linux-2.6.37.3/arch/powerpc/platforms/83xx/suspend.c 2011-01-04 19:50:19.000000000 -0500
19044 -+++ linux-2.6.37.3/arch/powerpc/platforms/83xx/suspend.c 2011-01-17 02:41:00.000000000 -0500
19045 +diff -urNp linux-2.6.37.4/arch/powerpc/platforms/83xx/suspend.c linux-2.6.37.4/arch/powerpc/platforms/83xx/suspend.c
19046 +--- linux-2.6.37.4/arch/powerpc/platforms/83xx/suspend.c 2011-01-04 19:50:19.000000000 -0500
19047 ++++ linux-2.6.37.4/arch/powerpc/platforms/83xx/suspend.c 2011-01-17 02:41:00.000000000 -0500
19048 @@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
19049 return ret;
19050 }
19051 @@ -3299,9 +3326,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/platforms/83xx/suspend.c linux-2.6.37.3/a
19052 .valid = mpc83xx_suspend_valid,
19053 .begin = mpc83xx_suspend_begin,
19054 .enter = mpc83xx_suspend_enter,
19055 -diff -urNp linux-2.6.37.3/arch/powerpc/platforms/cell/iommu.c linux-2.6.37.3/arch/powerpc/platforms/cell/iommu.c
19056 ---- linux-2.6.37.3/arch/powerpc/platforms/cell/iommu.c 2011-01-04 19:50:19.000000000 -0500
19057 -+++ linux-2.6.37.3/arch/powerpc/platforms/cell/iommu.c 2011-01-17 02:41:00.000000000 -0500
19058 +diff -urNp linux-2.6.37.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.37.4/arch/powerpc/platforms/cell/iommu.c
19059 +--- linux-2.6.37.4/arch/powerpc/platforms/cell/iommu.c 2011-01-04 19:50:19.000000000 -0500
19060 ++++ linux-2.6.37.4/arch/powerpc/platforms/cell/iommu.c 2011-01-17 02:41:00.000000000 -0500
19061 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
19062
19063 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
19064 @@ -3311,9 +3338,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/platforms/cell/iommu.c linux-2.6.37.3/arc
19065 .alloc_coherent = dma_fixed_alloc_coherent,
19066 .free_coherent = dma_fixed_free_coherent,
19067 .map_sg = dma_fixed_map_sg,
19068 -diff -urNp linux-2.6.37.3/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.37.3/arch/powerpc/platforms/ps3/system-bus.c
19069 ---- linux-2.6.37.3/arch/powerpc/platforms/ps3/system-bus.c 2011-01-04 19:50:19.000000000 -0500
19070 -+++ linux-2.6.37.3/arch/powerpc/platforms/ps3/system-bus.c 2011-01-17 02:41:00.000000000 -0500
19071 +diff -urNp linux-2.6.37.4/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.37.4/arch/powerpc/platforms/ps3/system-bus.c
19072 +--- linux-2.6.37.4/arch/powerpc/platforms/ps3/system-bus.c 2011-01-04 19:50:19.000000000 -0500
19073 ++++ linux-2.6.37.4/arch/powerpc/platforms/ps3/system-bus.c 2011-01-17 02:41:00.000000000 -0500
19074 @@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi
19075 return mask >= DMA_BIT_MASK(32);
19076 }
19077 @@ -3332,9 +3359,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.37.3
19078 .alloc_coherent = ps3_alloc_coherent,
19079 .free_coherent = ps3_free_coherent,
19080 .map_sg = ps3_ioc0_map_sg,
19081 -diff -urNp linux-2.6.37.3/arch/powerpc/platforms/pseries/suspend.c linux-2.6.37.3/arch/powerpc/platforms/pseries/suspend.c
19082 ---- linux-2.6.37.3/arch/powerpc/platforms/pseries/suspend.c 2011-01-04 19:50:19.000000000 -0500
19083 -+++ linux-2.6.37.3/arch/powerpc/platforms/pseries/suspend.c 2011-01-17 02:41:00.000000000 -0500
19084 +diff -urNp linux-2.6.37.4/arch/powerpc/platforms/pseries/suspend.c linux-2.6.37.4/arch/powerpc/platforms/pseries/suspend.c
19085 +--- linux-2.6.37.4/arch/powerpc/platforms/pseries/suspend.c 2011-01-04 19:50:19.000000000 -0500
19086 ++++ linux-2.6.37.4/arch/powerpc/platforms/pseries/suspend.c 2011-01-17 02:41:00.000000000 -0500
19087 @@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysde
19088 .name = "power",
19089 };
19090 @@ -3344,9 +3371,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/platforms/pseries/suspend.c linux-2.6.37.
19091 .valid = suspend_valid_only_mem,
19092 .begin = pseries_suspend_begin,
19093 .prepare_late = pseries_prepare_late,
19094 -diff -urNp linux-2.6.37.3/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.37.3/arch/powerpc/sysdev/fsl_pmc.c
19095 ---- linux-2.6.37.3/arch/powerpc/sysdev/fsl_pmc.c 2011-01-04 19:50:19.000000000 -0500
19096 -+++ linux-2.6.37.3/arch/powerpc/sysdev/fsl_pmc.c 2011-01-17 02:41:00.000000000 -0500
19097 +diff -urNp linux-2.6.37.4/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.37.4/arch/powerpc/sysdev/fsl_pmc.c
19098 +--- linux-2.6.37.4/arch/powerpc/sysdev/fsl_pmc.c 2011-01-04 19:50:19.000000000 -0500
19099 ++++ linux-2.6.37.4/arch/powerpc/sysdev/fsl_pmc.c 2011-01-17 02:41:00.000000000 -0500
19100 @@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_sta
19101 return 1;
19102 }
19103 @@ -3356,9 +3383,9 @@ diff -urNp linux-2.6.37.3/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.37.3/arch/powe
19104 .valid = pmc_suspend_valid,
19105 .enter = pmc_suspend_enter,
19106 };
19107 -diff -urNp linux-2.6.37.3/arch/s390/include/asm/elf.h linux-2.6.37.3/arch/s390/include/asm/elf.h
19108 ---- linux-2.6.37.3/arch/s390/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
19109 -+++ linux-2.6.37.3/arch/s390/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
19110 +diff -urNp linux-2.6.37.4/arch/s390/include/asm/elf.h linux-2.6.37.4/arch/s390/include/asm/elf.h
19111 +--- linux-2.6.37.4/arch/s390/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
19112 ++++ linux-2.6.37.4/arch/s390/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
19113 @@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
19114 that it will "exec", and that there is sufficient room for the brk. */
19115 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
19116 @@ -3373,9 +3400,9 @@ diff -urNp linux-2.6.37.3/arch/s390/include/asm/elf.h linux-2.6.37.3/arch/s390/i
19117 /* This yields a mask that user programs can use to figure out what
19118 instruction set this CPU supports. */
19119
19120 -diff -urNp linux-2.6.37.3/arch/s390/include/asm/uaccess.h linux-2.6.37.3/arch/s390/include/asm/uaccess.h
19121 ---- linux-2.6.37.3/arch/s390/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
19122 -+++ linux-2.6.37.3/arch/s390/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
19123 +diff -urNp linux-2.6.37.4/arch/s390/include/asm/uaccess.h linux-2.6.37.4/arch/s390/include/asm/uaccess.h
19124 +--- linux-2.6.37.4/arch/s390/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
19125 ++++ linux-2.6.37.4/arch/s390/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
19126 @@ -234,6 +234,10 @@ static inline unsigned long __must_check
19127 copy_to_user(void __user *to, const void *from, unsigned long n)
19128 {
19129 @@ -3408,9 +3435,9 @@ diff -urNp linux-2.6.37.3/arch/s390/include/asm/uaccess.h linux-2.6.37.3/arch/s3
19130 if (unlikely(sz != -1 && sz < n)) {
19131 copy_from_user_overflow();
19132 return n;
19133 -diff -urNp linux-2.6.37.3/arch/s390/Kconfig linux-2.6.37.3/arch/s390/Kconfig
19134 ---- linux-2.6.37.3/arch/s390/Kconfig 2011-01-04 19:50:19.000000000 -0500
19135 -+++ linux-2.6.37.3/arch/s390/Kconfig 2011-01-17 02:41:00.000000000 -0500
19136 +diff -urNp linux-2.6.37.4/arch/s390/Kconfig linux-2.6.37.4/arch/s390/Kconfig
19137 +--- linux-2.6.37.4/arch/s390/Kconfig 2011-01-04 19:50:19.000000000 -0500
19138 ++++ linux-2.6.37.4/arch/s390/Kconfig 2011-01-17 02:41:00.000000000 -0500
19139 @@ -242,13 +242,12 @@ config AUDIT_ARCH
19140
19141 config S390_EXEC_PROTECT
19142 @@ -3429,9 +3456,9 @@ diff -urNp linux-2.6.37.3/arch/s390/Kconfig linux-2.6.37.3/arch/s390/Kconfig
19143
19144 comment "Code generation options"
19145
19146 -diff -urNp linux-2.6.37.3/arch/s390/kernel/module.c linux-2.6.37.3/arch/s390/kernel/module.c
19147 ---- linux-2.6.37.3/arch/s390/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
19148 -+++ linux-2.6.37.3/arch/s390/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
19149 +diff -urNp linux-2.6.37.4/arch/s390/kernel/module.c linux-2.6.37.4/arch/s390/kernel/module.c
19150 +--- linux-2.6.37.4/arch/s390/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
19151 ++++ linux-2.6.37.4/arch/s390/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
19152 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
19153
19154 /* Increase core size by size of got & plt and set start
19155 @@ -3503,9 +3530,9 @@ diff -urNp linux-2.6.37.3/arch/s390/kernel/module.c linux-2.6.37.3/arch/s390/ker
19156 rela->r_addend - loc;
19157 if (r_type == R_390_GOTPC)
19158 *(unsigned int *) loc = val;
19159 -diff -urNp linux-2.6.37.3/arch/s390/kernel/setup.c linux-2.6.37.3/arch/s390/kernel/setup.c
19160 ---- linux-2.6.37.3/arch/s390/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
19161 -+++ linux-2.6.37.3/arch/s390/kernel/setup.c 2011-01-17 02:41:00.000000000 -0500
19162 +diff -urNp linux-2.6.37.4/arch/s390/kernel/setup.c linux-2.6.37.4/arch/s390/kernel/setup.c
19163 +--- linux-2.6.37.4/arch/s390/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
19164 ++++ linux-2.6.37.4/arch/s390/kernel/setup.c 2011-01-17 02:41:00.000000000 -0500
19165 @@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
19166 }
19167 early_param("mem", early_parse_mem);
19168 @@ -3554,9 +3581,9 @@ diff -urNp linux-2.6.37.3/arch/s390/kernel/setup.c linux-2.6.37.3/arch/s390/kern
19169 static void setup_addressing_mode(void)
19170 {
19171 if (user_mode == SECONDARY_SPACE_MODE) {
19172 -diff -urNp linux-2.6.37.3/arch/s390/mm/maccess.c linux-2.6.37.3/arch/s390/mm/maccess.c
19173 ---- linux-2.6.37.3/arch/s390/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
19174 -+++ linux-2.6.37.3/arch/s390/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
19175 +diff -urNp linux-2.6.37.4/arch/s390/mm/maccess.c linux-2.6.37.4/arch/s390/mm/maccess.c
19176 +--- linux-2.6.37.4/arch/s390/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
19177 ++++ linux-2.6.37.4/arch/s390/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
19178 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void
19179 return rc ? rc : count;
19180 }
19181 @@ -3566,9 +3593,9 @@ diff -urNp linux-2.6.37.3/arch/s390/mm/maccess.c linux-2.6.37.3/arch/s390/mm/mac
19182 {
19183 long copied = 0;
19184
19185 -diff -urNp linux-2.6.37.3/arch/s390/mm/mmap.c linux-2.6.37.3/arch/s390/mm/mmap.c
19186 ---- linux-2.6.37.3/arch/s390/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
19187 -+++ linux-2.6.37.3/arch/s390/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
19188 +diff -urNp linux-2.6.37.4/arch/s390/mm/mmap.c linux-2.6.37.4/arch/s390/mm/mmap.c
19189 +--- linux-2.6.37.4/arch/s390/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
19190 ++++ linux-2.6.37.4/arch/s390/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
19191 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
19192 */
19193 if (mmap_is_legacy()) {
19194 @@ -3615,9 +3642,9 @@ diff -urNp linux-2.6.37.3/arch/s390/mm/mmap.c linux-2.6.37.3/arch/s390/mm/mmap.c
19195 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
19196 mm->unmap_area = arch_unmap_area_topdown;
19197 }
19198 -diff -urNp linux-2.6.37.3/arch/score/include/asm/system.h linux-2.6.37.3/arch/score/include/asm/system.h
19199 ---- linux-2.6.37.3/arch/score/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
19200 -+++ linux-2.6.37.3/arch/score/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
19201 +diff -urNp linux-2.6.37.4/arch/score/include/asm/system.h linux-2.6.37.4/arch/score/include/asm/system.h
19202 +--- linux-2.6.37.4/arch/score/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
19203 ++++ linux-2.6.37.4/arch/score/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
19204 @@ -17,7 +17,7 @@ do { \
19205 #define finish_arch_switch(prev) do {} while (0)
19206
19207 @@ -3627,9 +3654,9 @@ diff -urNp linux-2.6.37.3/arch/score/include/asm/system.h linux-2.6.37.3/arch/sc
19208
19209 #define mb() barrier()
19210 #define rmb() barrier()
19211 -diff -urNp linux-2.6.37.3/arch/score/kernel/process.c linux-2.6.37.3/arch/score/kernel/process.c
19212 ---- linux-2.6.37.3/arch/score/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
19213 -+++ linux-2.6.37.3/arch/score/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
19214 +diff -urNp linux-2.6.37.4/arch/score/kernel/process.c linux-2.6.37.4/arch/score/kernel/process.c
19215 +--- linux-2.6.37.4/arch/score/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
19216 ++++ linux-2.6.37.4/arch/score/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
19217 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
19218
19219 return task_pt_regs(task)->cp0_epc;
19220 @@ -3639,9 +3666,9 @@ diff -urNp linux-2.6.37.3/arch/score/kernel/process.c linux-2.6.37.3/arch/score/
19221 -{
19222 - return sp;
19223 -}
19224 -diff -urNp linux-2.6.37.3/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.37.3/arch/sh/boards/mach-hp6xx/pm.c
19225 ---- linux-2.6.37.3/arch/sh/boards/mach-hp6xx/pm.c 2011-01-04 19:50:19.000000000 -0500
19226 -+++ linux-2.6.37.3/arch/sh/boards/mach-hp6xx/pm.c 2011-01-17 02:41:00.000000000 -0500
19227 +diff -urNp linux-2.6.37.4/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.37.4/arch/sh/boards/mach-hp6xx/pm.c
19228 +--- linux-2.6.37.4/arch/sh/boards/mach-hp6xx/pm.c 2011-01-04 19:50:19.000000000 -0500
19229 ++++ linux-2.6.37.4/arch/sh/boards/mach-hp6xx/pm.c 2011-01-17 02:41:00.000000000 -0500
19230 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
19231 return 0;
19232 }
19233 @@ -3651,9 +3678,9 @@ diff -urNp linux-2.6.37.3/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.37.3/arch/sh/
19234 .enter = hp6x0_pm_enter,
19235 .valid = suspend_valid_only_mem,
19236 };
19237 -diff -urNp linux-2.6.37.3/arch/sh/include/asm/dma-mapping.h linux-2.6.37.3/arch/sh/include/asm/dma-mapping.h
19238 ---- linux-2.6.37.3/arch/sh/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
19239 -+++ linux-2.6.37.3/arch/sh/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
19240 +diff -urNp linux-2.6.37.4/arch/sh/include/asm/dma-mapping.h linux-2.6.37.4/arch/sh/include/asm/dma-mapping.h
19241 +--- linux-2.6.37.4/arch/sh/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
19242 ++++ linux-2.6.37.4/arch/sh/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
19243 @@ -1,10 +1,10 @@
19244 #ifndef __ASM_SH_DMA_MAPPING_H
19245 #define __ASM_SH_DMA_MAPPING_H
19246 @@ -3712,9 +3739,9 @@ diff -urNp linux-2.6.37.3/arch/sh/include/asm/dma-mapping.h linux-2.6.37.3/arch/
19247
19248 if (dma_release_from_coherent(dev, get_order(size), vaddr))
19249 return;
19250 -diff -urNp linux-2.6.37.3/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.37.3/arch/sh/kernel/cpu/shmobile/pm.c
19251 ---- linux-2.6.37.3/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-04 19:50:19.000000000 -0500
19252 -+++ linux-2.6.37.3/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-17 02:41:00.000000000 -0500
19253 +diff -urNp linux-2.6.37.4/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.37.4/arch/sh/kernel/cpu/shmobile/pm.c
19254 +--- linux-2.6.37.4/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-04 19:50:19.000000000 -0500
19255 ++++ linux-2.6.37.4/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-17 02:41:00.000000000 -0500
19256 @@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t s
19257 return 0;
19258 }
19259 @@ -3724,9 +3751,9 @@ diff -urNp linux-2.6.37.3/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.37.3/arch/s
19260 .enter = sh_pm_enter,
19261 .valid = suspend_valid_only_mem,
19262 };
19263 -diff -urNp linux-2.6.37.3/arch/sh/kernel/dma-nommu.c linux-2.6.37.3/arch/sh/kernel/dma-nommu.c
19264 ---- linux-2.6.37.3/arch/sh/kernel/dma-nommu.c 2011-01-04 19:50:19.000000000 -0500
19265 -+++ linux-2.6.37.3/arch/sh/kernel/dma-nommu.c 2011-01-17 02:41:00.000000000 -0500
19266 +diff -urNp linux-2.6.37.4/arch/sh/kernel/dma-nommu.c linux-2.6.37.4/arch/sh/kernel/dma-nommu.c
19267 +--- linux-2.6.37.4/arch/sh/kernel/dma-nommu.c 2011-01-04 19:50:19.000000000 -0500
19268 ++++ linux-2.6.37.4/arch/sh/kernel/dma-nommu.c 2011-01-17 02:41:00.000000000 -0500
19269 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device
19270 }
19271 #endif
19272 @@ -3736,9 +3763,9 @@ diff -urNp linux-2.6.37.3/arch/sh/kernel/dma-nommu.c linux-2.6.37.3/arch/sh/kern
19273 .alloc_coherent = dma_generic_alloc_coherent,
19274 .free_coherent = dma_generic_free_coherent,
19275 .map_page = nommu_map_page,
19276 -diff -urNp linux-2.6.37.3/arch/sh/kernel/kgdb.c linux-2.6.37.3/arch/sh/kernel/kgdb.c
19277 ---- linux-2.6.37.3/arch/sh/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
19278 -+++ linux-2.6.37.3/arch/sh/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
19279 +diff -urNp linux-2.6.37.4/arch/sh/kernel/kgdb.c linux-2.6.37.4/arch/sh/kernel/kgdb.c
19280 +--- linux-2.6.37.4/arch/sh/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
19281 ++++ linux-2.6.37.4/arch/sh/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
19282 @@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
19283 unregister_die_notifier(&kgdb_notifier);
19284 }
19285 @@ -3748,9 +3775,9 @@ diff -urNp linux-2.6.37.3/arch/sh/kernel/kgdb.c linux-2.6.37.3/arch/sh/kernel/kg
19286 /* Breakpoint instruction: trapa #0x3c */
19287 #ifdef CONFIG_CPU_LITTLE_ENDIAN
19288 .gdb_bpt_instr = { 0x3c, 0xc3 },
19289 -diff -urNp linux-2.6.37.3/arch/sh/mm/consistent.c linux-2.6.37.3/arch/sh/mm/consistent.c
19290 ---- linux-2.6.37.3/arch/sh/mm/consistent.c 2011-01-04 19:50:19.000000000 -0500
19291 -+++ linux-2.6.37.3/arch/sh/mm/consistent.c 2011-01-17 02:41:00.000000000 -0500
19292 +diff -urNp linux-2.6.37.4/arch/sh/mm/consistent.c linux-2.6.37.4/arch/sh/mm/consistent.c
19293 +--- linux-2.6.37.4/arch/sh/mm/consistent.c 2011-01-04 19:50:19.000000000 -0500
19294 ++++ linux-2.6.37.4/arch/sh/mm/consistent.c 2011-01-17 02:41:00.000000000 -0500
19295 @@ -22,7 +22,7 @@
19296
19297 #define PREALLOC_DMA_DEBUG_ENTRIES 4096
19298 @@ -3760,9 +3787,9 @@ diff -urNp linux-2.6.37.3/arch/sh/mm/consistent.c linux-2.6.37.3/arch/sh/mm/cons
19299 EXPORT_SYMBOL(dma_ops);
19300
19301 static int __init dma_init(void)
19302 -diff -urNp linux-2.6.37.3/arch/sh/mm/mmap.c linux-2.6.37.3/arch/sh/mm/mmap.c
19303 ---- linux-2.6.37.3/arch/sh/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
19304 -+++ linux-2.6.37.3/arch/sh/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
19305 +diff -urNp linux-2.6.37.4/arch/sh/mm/mmap.c linux-2.6.37.4/arch/sh/mm/mmap.c
19306 +--- linux-2.6.37.4/arch/sh/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
19307 ++++ linux-2.6.37.4/arch/sh/mm/mmap.c 2011-03-21 17:35:08.000000000 -0400
19308 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
19309 addr = PAGE_ALIGN(addr);
19310
19311 @@ -3801,7 +3828,21 @@ diff -urNp linux-2.6.37.3/arch/sh/mm/mmap.c linux-2.6.37.3/arch/sh/mm/mmap.c
19312 /* remember the address as a hint for next time */
19313 return (mm->free_area_cache = addr-len);
19314 }
19315 -@@ -199,7 +197,7 @@ arch_get_unmapped_area_topdown(struct fi
19316 +@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct fi
19317 + if (unlikely(mm->mmap_base < len))
19318 + goto bottomup;
19319 +
19320 +- addr = mm->mmap_base-len;
19321 +- if (do_colour_align)
19322 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
19323 ++ addr = mm->mmap_base - len;
19324 +
19325 + do {
19326 ++ if (do_colour_align)
19327 ++ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
19328 + /*
19329 + * Lookup failure means no vma is above this address,
19330 + * else if new region fits below vma->vm_start,
19331 * return with success:
19332 */
19333 vma = find_vma(mm, addr);
19334 @@ -3810,9 +3851,22 @@ diff -urNp linux-2.6.37.3/arch/sh/mm/mmap.c linux-2.6.37.3/arch/sh/mm/mmap.c
19335 /* remember the address as a hint for next time */
19336 return (mm->free_area_cache = addr);
19337 }
19338 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/atomic_64.h linux-2.6.37.3/arch/sparc/include/asm/atomic_64.h
19339 ---- linux-2.6.37.3/arch/sparc/include/asm/atomic_64.h 2011-01-04 19:50:19.000000000 -0500
19340 -+++ linux-2.6.37.3/arch/sparc/include/asm/atomic_64.h 2011-01-17 02:41:00.000000000 -0500
19341 +@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct fi
19342 + mm->cached_hole_size = vma->vm_start - addr;
19343 +
19344 + /* try just below the current vma->vm_start */
19345 +- addr = vma->vm_start-len;
19346 +- if (do_colour_align)
19347 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
19348 +- } while (likely(len < vma->vm_start));
19349 ++ addr = skip_heap_stack_gap(vma, len);
19350 ++ } while (!IS_ERR_VALUE(addr));
19351 +
19352 + bottomup:
19353 + /*
19354 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/atomic_64.h linux-2.6.37.4/arch/sparc/include/asm/atomic_64.h
19355 +--- linux-2.6.37.4/arch/sparc/include/asm/atomic_64.h 2011-01-04 19:50:19.000000000 -0500
19356 ++++ linux-2.6.37.4/arch/sparc/include/asm/atomic_64.h 2011-01-17 02:41:00.000000000 -0500
19357 @@ -14,18 +14,40 @@
19358 #define ATOMIC64_INIT(i) { (i) }
19359
19360 @@ -3972,9 +4026,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/atomic_64.h linux-2.6.37.3/arch
19361 }
19362
19363 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
19364 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/dma-mapping.h linux-2.6.37.3/arch/sparc/include/asm/dma-mapping.h
19365 ---- linux-2.6.37.3/arch/sparc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
19366 -+++ linux-2.6.37.3/arch/sparc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
19367 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/dma-mapping.h linux-2.6.37.4/arch/sparc/include/asm/dma-mapping.h
19368 +--- linux-2.6.37.4/arch/sparc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
19369 ++++ linux-2.6.37.4/arch/sparc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
19370 @@ -12,10 +12,10 @@ extern int dma_supported(struct device *
19371 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
19372 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
19373 @@ -4006,9 +4060,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/dma-mapping.h linux-2.6.37.3/ar
19374
19375 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
19376 ops->free_coherent(dev, size, cpu_addr, dma_handle);
19377 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/elf_32.h linux-2.6.37.3/arch/sparc/include/asm/elf_32.h
19378 ---- linux-2.6.37.3/arch/sparc/include/asm/elf_32.h 2011-01-04 19:50:19.000000000 -0500
19379 -+++ linux-2.6.37.3/arch/sparc/include/asm/elf_32.h 2011-01-17 02:41:00.000000000 -0500
19380 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/elf_32.h linux-2.6.37.4/arch/sparc/include/asm/elf_32.h
19381 +--- linux-2.6.37.4/arch/sparc/include/asm/elf_32.h 2011-01-04 19:50:19.000000000 -0500
19382 ++++ linux-2.6.37.4/arch/sparc/include/asm/elf_32.h 2011-01-17 02:41:00.000000000 -0500
19383 @@ -114,6 +114,13 @@ typedef struct {
19384
19385 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
19386 @@ -4023,9 +4077,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/elf_32.h linux-2.6.37.3/arch/sp
19387 /* This yields a mask that user programs can use to figure out what
19388 instruction set this cpu supports. This can NOT be done in userspace
19389 on Sparc. */
19390 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/elf_64.h linux-2.6.37.3/arch/sparc/include/asm/elf_64.h
19391 ---- linux-2.6.37.3/arch/sparc/include/asm/elf_64.h 2011-01-04 19:50:19.000000000 -0500
19392 -+++ linux-2.6.37.3/arch/sparc/include/asm/elf_64.h 2011-01-17 02:41:00.000000000 -0500
19393 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/elf_64.h linux-2.6.37.4/arch/sparc/include/asm/elf_64.h
19394 +--- linux-2.6.37.4/arch/sparc/include/asm/elf_64.h 2011-01-04 19:50:19.000000000 -0500
19395 ++++ linux-2.6.37.4/arch/sparc/include/asm/elf_64.h 2011-01-17 02:41:00.000000000 -0500
19396 @@ -162,6 +162,12 @@ typedef struct {
19397 #define ELF_ET_DYN_BASE 0x0000010000000000UL
19398 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
19399 @@ -4039,9 +4093,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/elf_64.h linux-2.6.37.3/arch/sp
19400
19401 /* This yields a mask that user programs can use to figure out what
19402 instruction set this cpu supports. */
19403 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/pgtable_32.h linux-2.6.37.3/arch/sparc/include/asm/pgtable_32.h
19404 ---- linux-2.6.37.3/arch/sparc/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
19405 -+++ linux-2.6.37.3/arch/sparc/include/asm/pgtable_32.h 2011-01-17 02:41:00.000000000 -0500
19406 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.37.4/arch/sparc/include/asm/pgtable_32.h
19407 +--- linux-2.6.37.4/arch/sparc/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
19408 ++++ linux-2.6.37.4/arch/sparc/include/asm/pgtable_32.h 2011-01-17 02:41:00.000000000 -0500
19409 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
19410 BTFIXUPDEF_INT(page_none)
19411 BTFIXUPDEF_INT(page_copy)
19412 @@ -4073,9 +4127,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/pgtable_32.h linux-2.6.37.3/arc
19413 extern unsigned long page_kernel;
19414
19415 #ifdef MODULE
19416 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.37.3/arch/sparc/include/asm/pgtsrmmu.h
19417 ---- linux-2.6.37.3/arch/sparc/include/asm/pgtsrmmu.h 2011-01-04 19:50:19.000000000 -0500
19418 -+++ linux-2.6.37.3/arch/sparc/include/asm/pgtsrmmu.h 2011-01-17 02:41:00.000000000 -0500
19419 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.37.4/arch/sparc/include/asm/pgtsrmmu.h
19420 +--- linux-2.6.37.4/arch/sparc/include/asm/pgtsrmmu.h 2011-01-04 19:50:19.000000000 -0500
19421 ++++ linux-2.6.37.4/arch/sparc/include/asm/pgtsrmmu.h 2011-01-17 02:41:00.000000000 -0500
19422 @@ -115,6 +115,13 @@
19423 SRMMU_EXEC | SRMMU_REF)
19424 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
19425 @@ -4090,9 +4144,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.37.3/arch/
19426 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
19427 SRMMU_DIRTY | SRMMU_REF)
19428
19429 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/spinlock_64.h linux-2.6.37.3/arch/sparc/include/asm/spinlock_64.h
19430 ---- linux-2.6.37.3/arch/sparc/include/asm/spinlock_64.h 2011-01-04 19:50:19.000000000 -0500
19431 -+++ linux-2.6.37.3/arch/sparc/include/asm/spinlock_64.h 2011-01-17 02:41:00.000000000 -0500
19432 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.37.4/arch/sparc/include/asm/spinlock_64.h
19433 +--- linux-2.6.37.4/arch/sparc/include/asm/spinlock_64.h 2011-01-04 19:50:19.000000000 -0500
19434 ++++ linux-2.6.37.4/arch/sparc/include/asm/spinlock_64.h 2011-01-17 02:41:00.000000000 -0500
19435 @@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r
19436 __asm__ __volatile__ (
19437 "1: ldsw [%2], %0\n"
19438 @@ -4144,9 +4198,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/spinlock_64.h linux-2.6.37.3/ar
19439 " cas [%2], %0, %1\n"
19440 " cmp %0, %1\n"
19441 " bne,pn %%xcc, 1b\n"
19442 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/uaccess_32.h linux-2.6.37.3/arch/sparc/include/asm/uaccess_32.h
19443 ---- linux-2.6.37.3/arch/sparc/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
19444 -+++ linux-2.6.37.3/arch/sparc/include/asm/uaccess_32.h 2011-01-17 02:41:00.000000000 -0500
19445 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.37.4/arch/sparc/include/asm/uaccess_32.h
19446 +--- linux-2.6.37.4/arch/sparc/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
19447 ++++ linux-2.6.37.4/arch/sparc/include/asm/uaccess_32.h 2011-01-17 02:41:00.000000000 -0500
19448 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
19449
19450 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
19451 @@ -4198,9 +4252,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/uaccess_32.h linux-2.6.37.3/arc
19452 return __copy_user((__force void __user *) to, from, n);
19453 }
19454
19455 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/uaccess_64.h linux-2.6.37.3/arch/sparc/include/asm/uaccess_64.h
19456 ---- linux-2.6.37.3/arch/sparc/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
19457 -+++ linux-2.6.37.3/arch/sparc/include/asm/uaccess_64.h 2011-01-17 02:41:00.000000000 -0500
19458 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.37.4/arch/sparc/include/asm/uaccess_64.h
19459 +--- linux-2.6.37.4/arch/sparc/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
19460 ++++ linux-2.6.37.4/arch/sparc/include/asm/uaccess_64.h 2011-01-17 02:41:00.000000000 -0500
19461 @@ -10,6 +10,7 @@
19462 #include <linux/compiler.h>
19463 #include <linux/string.h>
19464 @@ -4243,9 +4297,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/uaccess_64.h linux-2.6.37.3/arc
19465 if (unlikely(ret))
19466 ret = copy_to_user_fixup(to, from, size);
19467 return ret;
19468 -diff -urNp linux-2.6.37.3/arch/sparc/include/asm/uaccess.h linux-2.6.37.3/arch/sparc/include/asm/uaccess.h
19469 ---- linux-2.6.37.3/arch/sparc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
19470 -+++ linux-2.6.37.3/arch/sparc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
19471 +diff -urNp linux-2.6.37.4/arch/sparc/include/asm/uaccess.h linux-2.6.37.4/arch/sparc/include/asm/uaccess.h
19472 +--- linux-2.6.37.4/arch/sparc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
19473 ++++ linux-2.6.37.4/arch/sparc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
19474 @@ -1,5 +1,13 @@
19475 #ifndef ___ASM_SPARC_UACCESS_H
19476 #define ___ASM_SPARC_UACCESS_H
19477 @@ -4260,9 +4314,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/include/asm/uaccess.h linux-2.6.37.3/arch/s
19478 #if defined(__sparc__) && defined(__arch64__)
19479 #include <asm/uaccess_64.h>
19480 #else
19481 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/iommu.c linux-2.6.37.3/arch/sparc/kernel/iommu.c
19482 ---- linux-2.6.37.3/arch/sparc/kernel/iommu.c 2011-01-04 19:50:19.000000000 -0500
19483 -+++ linux-2.6.37.3/arch/sparc/kernel/iommu.c 2011-01-17 02:41:00.000000000 -0500
19484 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/iommu.c linux-2.6.37.4/arch/sparc/kernel/iommu.c
19485 +--- linux-2.6.37.4/arch/sparc/kernel/iommu.c 2011-01-04 19:50:19.000000000 -0500
19486 ++++ linux-2.6.37.4/arch/sparc/kernel/iommu.c 2011-01-17 02:41:00.000000000 -0500
19487 @@ -828,7 +828,7 @@ static void dma_4u_sync_sg_for_cpu(struc
19488 spin_unlock_irqrestore(&iommu->lock, flags);
19489 }
19490 @@ -4281,9 +4335,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/iommu.c linux-2.6.37.3/arch/sparc/ke
19491 EXPORT_SYMBOL(dma_ops);
19492
19493 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
19494 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/ioport.c linux-2.6.37.3/arch/sparc/kernel/ioport.c
19495 ---- linux-2.6.37.3/arch/sparc/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
19496 -+++ linux-2.6.37.3/arch/sparc/kernel/ioport.c 2011-01-17 02:41:00.000000000 -0500
19497 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/ioport.c linux-2.6.37.4/arch/sparc/kernel/ioport.c
19498 +--- linux-2.6.37.4/arch/sparc/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
19499 ++++ linux-2.6.37.4/arch/sparc/kernel/ioport.c 2011-01-17 02:41:00.000000000 -0500
19500 @@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
19501 BUG();
19502 }
19503 @@ -4311,9 +4365,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/ioport.c linux-2.6.37.3/arch/sparc/k
19504 .alloc_coherent = pci32_alloc_coherent,
19505 .free_coherent = pci32_free_coherent,
19506 .map_page = pci32_map_page,
19507 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/kgdb_32.c linux-2.6.37.3/arch/sparc/kernel/kgdb_32.c
19508 ---- linux-2.6.37.3/arch/sparc/kernel/kgdb_32.c 2011-01-04 19:50:19.000000000 -0500
19509 -+++ linux-2.6.37.3/arch/sparc/kernel/kgdb_32.c 2011-01-17 02:41:00.000000000 -0500
19510 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/kgdb_32.c linux-2.6.37.4/arch/sparc/kernel/kgdb_32.c
19511 +--- linux-2.6.37.4/arch/sparc/kernel/kgdb_32.c 2011-01-04 19:50:19.000000000 -0500
19512 ++++ linux-2.6.37.4/arch/sparc/kernel/kgdb_32.c 2011-01-17 02:41:00.000000000 -0500
19513 @@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
19514 regs->npc = regs->pc + 4;
19515 }
19516 @@ -4323,9 +4377,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/kgdb_32.c linux-2.6.37.3/arch/sparc/
19517 /* Breakpoint instruction: ta 0x7d */
19518 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
19519 };
19520 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/kgdb_64.c linux-2.6.37.3/arch/sparc/kernel/kgdb_64.c
19521 ---- linux-2.6.37.3/arch/sparc/kernel/kgdb_64.c 2011-01-04 19:50:19.000000000 -0500
19522 -+++ linux-2.6.37.3/arch/sparc/kernel/kgdb_64.c 2011-01-17 02:41:00.000000000 -0500
19523 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/kgdb_64.c linux-2.6.37.4/arch/sparc/kernel/kgdb_64.c
19524 +--- linux-2.6.37.4/arch/sparc/kernel/kgdb_64.c 2011-01-04 19:50:19.000000000 -0500
19525 ++++ linux-2.6.37.4/arch/sparc/kernel/kgdb_64.c 2011-01-17 02:41:00.000000000 -0500
19526 @@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
19527 regs->tnpc = regs->tpc + 4;
19528 }
19529 @@ -4335,9 +4389,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/kgdb_64.c linux-2.6.37.3/arch/sparc/
19530 /* Breakpoint instruction: ta 0x72 */
19531 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
19532 };
19533 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/Makefile linux-2.6.37.3/arch/sparc/kernel/Makefile
19534 ---- linux-2.6.37.3/arch/sparc/kernel/Makefile 2011-01-04 19:50:19.000000000 -0500
19535 -+++ linux-2.6.37.3/arch/sparc/kernel/Makefile 2011-01-17 02:41:00.000000000 -0500
19536 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/Makefile linux-2.6.37.4/arch/sparc/kernel/Makefile
19537 +--- linux-2.6.37.4/arch/sparc/kernel/Makefile 2011-01-04 19:50:19.000000000 -0500
19538 ++++ linux-2.6.37.4/arch/sparc/kernel/Makefile 2011-01-17 02:41:00.000000000 -0500
19539 @@ -3,7 +3,7 @@
19540 #
19541
19542 @@ -4347,9 +4401,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/Makefile linux-2.6.37.3/arch/sparc/k
19543
19544 extra-y := head_$(BITS).o
19545 extra-y += init_task.o
19546 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/pci_sun4v.c linux-2.6.37.3/arch/sparc/kernel/pci_sun4v.c
19547 ---- linux-2.6.37.3/arch/sparc/kernel/pci_sun4v.c 2011-01-04 19:50:19.000000000 -0500
19548 -+++ linux-2.6.37.3/arch/sparc/kernel/pci_sun4v.c 2011-01-17 02:41:00.000000000 -0500
19549 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.37.4/arch/sparc/kernel/pci_sun4v.c
19550 +--- linux-2.6.37.4/arch/sparc/kernel/pci_sun4v.c 2011-01-04 19:50:19.000000000 -0500
19551 ++++ linux-2.6.37.4/arch/sparc/kernel/pci_sun4v.c 2011-01-17 02:41:00.000000000 -0500
19552 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
19553 spin_unlock_irqrestore(&iommu->lock, flags);
19554 }
19555 @@ -4359,9 +4413,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/pci_sun4v.c linux-2.6.37.3/arch/spar
19556 .alloc_coherent = dma_4v_alloc_coherent,
19557 .free_coherent = dma_4v_free_coherent,
19558 .map_page = dma_4v_map_page,
19559 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/process_32.c linux-2.6.37.3/arch/sparc/kernel/process_32.c
19560 ---- linux-2.6.37.3/arch/sparc/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
19561 -+++ linux-2.6.37.3/arch/sparc/kernel/process_32.c 2011-01-17 02:41:00.000000000 -0500
19562 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/process_32.c linux-2.6.37.4/arch/sparc/kernel/process_32.c
19563 +--- linux-2.6.37.4/arch/sparc/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
19564 ++++ linux-2.6.37.4/arch/sparc/kernel/process_32.c 2011-01-17 02:41:00.000000000 -0500
19565 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
19566 rw->ins[4], rw->ins[5],
19567 rw->ins[6],
19568 @@ -4397,9 +4451,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/process_32.c linux-2.6.37.3/arch/spa
19569 fp = rw->ins[6];
19570 } while (++count < 16);
19571 printk("\n");
19572 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/process_64.c linux-2.6.37.3/arch/sparc/kernel/process_64.c
19573 ---- linux-2.6.37.3/arch/sparc/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
19574 -+++ linux-2.6.37.3/arch/sparc/kernel/process_64.c 2011-01-17 02:41:00.000000000 -0500
19575 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/process_64.c linux-2.6.37.4/arch/sparc/kernel/process_64.c
19576 +--- linux-2.6.37.4/arch/sparc/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
19577 ++++ linux-2.6.37.4/arch/sparc/kernel/process_64.c 2011-01-17 02:41:00.000000000 -0500
19578 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
19579 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
19580 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
19581 @@ -4435,9 +4489,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/process_64.c linux-2.6.37.3/arch/spa
19582 (void *) gp->tpc,
19583 (void *) gp->o7,
19584 (void *) gp->i7,
19585 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/sys_sparc_32.c linux-2.6.37.3/arch/sparc/kernel/sys_sparc_32.c
19586 ---- linux-2.6.37.3/arch/sparc/kernel/sys_sparc_32.c 2011-01-04 19:50:19.000000000 -0500
19587 -+++ linux-2.6.37.3/arch/sparc/kernel/sys_sparc_32.c 2011-01-17 02:41:00.000000000 -0500
19588 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.37.4/arch/sparc/kernel/sys_sparc_32.c
19589 +--- linux-2.6.37.4/arch/sparc/kernel/sys_sparc_32.c 2011-01-04 19:50:19.000000000 -0500
19590 ++++ linux-2.6.37.4/arch/sparc/kernel/sys_sparc_32.c 2011-01-17 02:41:00.000000000 -0500
19591 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
19592 if (ARCH_SUN4C && len > 0x20000000)
19593 return -ENOMEM;
19594 @@ -4456,9 +4510,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/sys_sparc_32.c linux-2.6.37.3/arch/s
19595 return addr;
19596 addr = vmm->vm_end;
19597 if (flags & MAP_SHARED)
19598 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c
19599 ---- linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c 2011-01-04 19:50:19.000000000 -0500
19600 -+++ linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c 2011-01-17 02:41:00.000000000 -0500
19601 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37.4/arch/sparc/kernel/sys_sparc_64.c
19602 +--- linux-2.6.37.4/arch/sparc/kernel/sys_sparc_64.c 2011-01-04 19:50:19.000000000 -0500
19603 ++++ linux-2.6.37.4/arch/sparc/kernel/sys_sparc_64.c 2011-03-21 17:35:08.000000000 -0400
19604 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
19605 /* We do not accept a shared mapping if it would violate
19606 * cache aliasing constraints.
19607 @@ -4544,7 +4598,21 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37.3/arch/s
19608 /* remember the address as a hint for next time */
19609 return (mm->free_area_cache = addr-len);
19610 }
19611 -@@ -278,7 +280,7 @@ arch_get_unmapped_area_topdown(struct fi
19612 +@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct fi
19613 + if (unlikely(mm->mmap_base < len))
19614 + goto bottomup;
19615 +
19616 +- addr = mm->mmap_base-len;
19617 +- if (do_color_align)
19618 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
19619 ++ addr = mm->mmap_base - len;
19620 +
19621 + do {
19622 ++ if (do_color_align)
19623 ++ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
19624 + /*
19625 + * Lookup failure means no vma is above this address,
19626 + * else if new region fits below vma->vm_start,
19627 * return with success:
19628 */
19629 vma = find_vma(mm, addr);
19630 @@ -4553,7 +4621,20 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37.3/arch/s
19631 /* remember the address as a hint for next time */
19632 return (mm->free_area_cache = addr);
19633 }
19634 -@@ -385,6 +387,12 @@ void arch_pick_mmap_layout(struct mm_str
19635 +@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct fi
19636 + mm->cached_hole_size = vma->vm_start - addr;
19637 +
19638 + /* try just below the current vma->vm_start */
19639 +- addr = vma->vm_start-len;
19640 +- if (do_color_align)
19641 +- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
19642 +- } while (likely(len < vma->vm_start));
19643 ++ addr = skip_heap_stack_gap(vma, len);
19644 ++ } while (!IS_ERR_VALUE(addr));
19645 +
19646 + bottomup:
19647 + /*
19648 +@@ -385,6 +385,12 @@ void arch_pick_mmap_layout(struct mm_str
19649 gap == RLIM_INFINITY ||
19650 sysctl_legacy_va_layout) {
19651 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
19652 @@ -4566,7 +4647,7 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37.3/arch/s
19653 mm->get_unmapped_area = arch_get_unmapped_area;
19654 mm->unmap_area = arch_unmap_area;
19655 } else {
19656 -@@ -397,6 +405,12 @@ void arch_pick_mmap_layout(struct mm_str
19657 +@@ -397,6 +403,12 @@ void arch_pick_mmap_layout(struct mm_str
19658 gap = (task_size / 6 * 5);
19659
19660 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
19661 @@ -4579,9 +4660,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37.3/arch/s
19662 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
19663 mm->unmap_area = arch_unmap_area_topdown;
19664 }
19665 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/traps_32.c linux-2.6.37.3/arch/sparc/kernel/traps_32.c
19666 ---- linux-2.6.37.3/arch/sparc/kernel/traps_32.c 2011-01-04 19:50:19.000000000 -0500
19667 -+++ linux-2.6.37.3/arch/sparc/kernel/traps_32.c 2011-01-17 02:41:00.000000000 -0500
19668 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/traps_32.c linux-2.6.37.4/arch/sparc/kernel/traps_32.c
19669 +--- linux-2.6.37.4/arch/sparc/kernel/traps_32.c 2011-01-04 19:50:19.000000000 -0500
19670 ++++ linux-2.6.37.4/arch/sparc/kernel/traps_32.c 2011-01-17 02:41:00.000000000 -0500
19671 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
19672 count++ < 30 &&
19673 (((unsigned long) rw) >= PAGE_OFFSET) &&
19674 @@ -4591,9 +4672,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/traps_32.c linux-2.6.37.3/arch/sparc
19675 (void *) rw->ins[7]);
19676 rw = (struct reg_window32 *)rw->ins[6];
19677 }
19678 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/traps_64.c linux-2.6.37.3/arch/sparc/kernel/traps_64.c
19679 ---- linux-2.6.37.3/arch/sparc/kernel/traps_64.c 2011-01-04 19:50:19.000000000 -0500
19680 -+++ linux-2.6.37.3/arch/sparc/kernel/traps_64.c 2011-01-17 02:41:00.000000000 -0500
19681 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/traps_64.c linux-2.6.37.4/arch/sparc/kernel/traps_64.c
19682 +--- linux-2.6.37.4/arch/sparc/kernel/traps_64.c 2011-01-04 19:50:19.000000000 -0500
19683 ++++ linux-2.6.37.4/arch/sparc/kernel/traps_64.c 2011-01-17 02:41:00.000000000 -0500
19684 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
19685 i + 1,
19686 p->trapstack[i].tstate, p->trapstack[i].tpc,
19687 @@ -4710,9 +4791,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/traps_64.c linux-2.6.37.3/arch/sparc
19688 (void *) rw->ins[7]);
19689
19690 rw = kernel_stack_up(rw);
19691 -diff -urNp linux-2.6.37.3/arch/sparc/kernel/unaligned_64.c linux-2.6.37.3/arch/sparc/kernel/unaligned_64.c
19692 ---- linux-2.6.37.3/arch/sparc/kernel/unaligned_64.c 2011-01-04 19:50:19.000000000 -0500
19693 -+++ linux-2.6.37.3/arch/sparc/kernel/unaligned_64.c 2011-01-17 02:41:00.000000000 -0500
19694 +diff -urNp linux-2.6.37.4/arch/sparc/kernel/unaligned_64.c linux-2.6.37.4/arch/sparc/kernel/unaligned_64.c
19695 +--- linux-2.6.37.4/arch/sparc/kernel/unaligned_64.c 2011-01-04 19:50:19.000000000 -0500
19696 ++++ linux-2.6.37.4/arch/sparc/kernel/unaligned_64.c 2011-01-17 02:41:00.000000000 -0500
19697 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs
19698 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
19699
19700 @@ -4722,9 +4803,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/kernel/unaligned_64.c linux-2.6.37.3/arch/s
19701 regs->tpc, (void *) regs->tpc);
19702 }
19703 }
19704 -diff -urNp linux-2.6.37.3/arch/sparc/lib/atomic_64.S linux-2.6.37.3/arch/sparc/lib/atomic_64.S
19705 ---- linux-2.6.37.3/arch/sparc/lib/atomic_64.S 2011-01-04 19:50:19.000000000 -0500
19706 -+++ linux-2.6.37.3/arch/sparc/lib/atomic_64.S 2011-01-17 02:41:00.000000000 -0500
19707 +diff -urNp linux-2.6.37.4/arch/sparc/lib/atomic_64.S linux-2.6.37.4/arch/sparc/lib/atomic_64.S
19708 +--- linux-2.6.37.4/arch/sparc/lib/atomic_64.S 2011-01-04 19:50:19.000000000 -0500
19709 ++++ linux-2.6.37.4/arch/sparc/lib/atomic_64.S 2011-01-17 02:41:00.000000000 -0500
19710 @@ -18,7 +18,12 @@
19711 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
19712 BACKOFF_SETUP(%o2)
19713 @@ -4959,9 +5040,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/lib/atomic_64.S linux-2.6.37.3/arch/sparc/l
19714 casx [%o1], %g1, %g7
19715 cmp %g1, %g7
19716 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
19717 -diff -urNp linux-2.6.37.3/arch/sparc/lib/ksyms.c linux-2.6.37.3/arch/sparc/lib/ksyms.c
19718 ---- linux-2.6.37.3/arch/sparc/lib/ksyms.c 2011-01-04 19:50:19.000000000 -0500
19719 -+++ linux-2.6.37.3/arch/sparc/lib/ksyms.c 2011-01-17 02:41:00.000000000 -0500
19720 +diff -urNp linux-2.6.37.4/arch/sparc/lib/ksyms.c linux-2.6.37.4/arch/sparc/lib/ksyms.c
19721 +--- linux-2.6.37.4/arch/sparc/lib/ksyms.c 2011-01-04 19:50:19.000000000 -0500
19722 ++++ linux-2.6.37.4/arch/sparc/lib/ksyms.c 2011-01-17 02:41:00.000000000 -0500
19723 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
19724
19725 /* Atomic counter implementation. */
19726 @@ -4980,9 +5061,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/lib/ksyms.c linux-2.6.37.3/arch/sparc/lib/k
19727 EXPORT_SYMBOL(atomic64_sub_ret);
19728
19729 /* Atomic bit operations. */
19730 -diff -urNp linux-2.6.37.3/arch/sparc/Makefile linux-2.6.37.3/arch/sparc/Makefile
19731 ---- linux-2.6.37.3/arch/sparc/Makefile 2011-01-04 19:50:19.000000000 -0500
19732 -+++ linux-2.6.37.3/arch/sparc/Makefile 2011-01-17 02:41:00.000000000 -0500
19733 +diff -urNp linux-2.6.37.4/arch/sparc/Makefile linux-2.6.37.4/arch/sparc/Makefile
19734 +--- linux-2.6.37.4/arch/sparc/Makefile 2011-01-04 19:50:19.000000000 -0500
19735 ++++ linux-2.6.37.4/arch/sparc/Makefile 2011-01-17 02:41:00.000000000 -0500
19736 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
19737 # Export what is needed by arch/sparc/boot/Makefile
19738 export VMLINUX_INIT VMLINUX_MAIN
19739 @@ -4992,9 +5073,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/Makefile linux-2.6.37.3/arch/sparc/Makefile
19740 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
19741 VMLINUX_MAIN += $(drivers-y) $(net-y)
19742
19743 -diff -urNp linux-2.6.37.3/arch/sparc/mm/fault_32.c linux-2.6.37.3/arch/sparc/mm/fault_32.c
19744 ---- linux-2.6.37.3/arch/sparc/mm/fault_32.c 2011-01-04 19:50:19.000000000 -0500
19745 -+++ linux-2.6.37.3/arch/sparc/mm/fault_32.c 2011-01-17 02:41:00.000000000 -0500
19746 +diff -urNp linux-2.6.37.4/arch/sparc/mm/fault_32.c linux-2.6.37.4/arch/sparc/mm/fault_32.c
19747 +--- linux-2.6.37.4/arch/sparc/mm/fault_32.c 2011-01-04 19:50:19.000000000 -0500
19748 ++++ linux-2.6.37.4/arch/sparc/mm/fault_32.c 2011-01-17 02:41:00.000000000 -0500
19749 @@ -22,6 +22,9 @@
19750 #include <linux/interrupt.h>
19751 #include <linux/module.h>
19752 @@ -5299,9 +5380,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/fault_32.c linux-2.6.37.3/arch/sparc/mm/
19753 /* Allow reads even for write-only mappings */
19754 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
19755 goto bad_area;
19756 -diff -urNp linux-2.6.37.3/arch/sparc/mm/fault_64.c linux-2.6.37.3/arch/sparc/mm/fault_64.c
19757 ---- linux-2.6.37.3/arch/sparc/mm/fault_64.c 2011-01-04 19:50:19.000000000 -0500
19758 -+++ linux-2.6.37.3/arch/sparc/mm/fault_64.c 2011-01-17 02:41:00.000000000 -0500
19759 +diff -urNp linux-2.6.37.4/arch/sparc/mm/fault_64.c linux-2.6.37.4/arch/sparc/mm/fault_64.c
19760 +--- linux-2.6.37.4/arch/sparc/mm/fault_64.c 2011-01-04 19:50:19.000000000 -0500
19761 ++++ linux-2.6.37.4/arch/sparc/mm/fault_64.c 2011-01-17 02:41:00.000000000 -0500
19762 @@ -21,6 +21,9 @@
19763 #include <linux/kprobes.h>
19764 #include <linux/kdebug.h>
19765 @@ -5809,9 +5890,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/fault_64.c linux-2.6.37.3/arch/sparc/mm/
19766 /* Pure DTLB misses do not tell us whether the fault causing
19767 * load/store/atomic was a write or not, it only says that there
19768 * was no match. So in such a case we (carefully) read the
19769 -diff -urNp linux-2.6.37.3/arch/sparc/mm/hugetlbpage.c linux-2.6.37.3/arch/sparc/mm/hugetlbpage.c
19770 ---- linux-2.6.37.3/arch/sparc/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
19771 -+++ linux-2.6.37.3/arch/sparc/mm/hugetlbpage.c 2011-01-17 02:41:00.000000000 -0500
19772 +diff -urNp linux-2.6.37.4/arch/sparc/mm/hugetlbpage.c linux-2.6.37.4/arch/sparc/mm/hugetlbpage.c
19773 +--- linux-2.6.37.4/arch/sparc/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
19774 ++++ linux-2.6.37.4/arch/sparc/mm/hugetlbpage.c 2011-03-21 17:35:08.000000000 -0400
19775 @@ -68,7 +68,7 @@ full_search:
19776 }
19777 return -ENOMEM;
19778 @@ -5830,7 +5911,18 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/hugetlbpage.c linux-2.6.37.3/arch/sparc/
19779 /* remember the address as a hint for next time */
19780 return (mm->free_area_cache = addr-len);
19781 }
19782 -@@ -125,7 +125,7 @@ hugetlb_get_unmapped_area_topdown(struct
19783 +@@ -116,16 +116,17 @@ hugetlb_get_unmapped_area_topdown(struct
19784 + if (unlikely(mm->mmap_base < len))
19785 + goto bottomup;
19786 +
19787 +- addr = (mm->mmap_base-len) & HPAGE_MASK;
19788 ++ addr = mm->mmap_base - len;
19789 +
19790 + do {
19791 ++ addr &= HPAGE_MASK;
19792 + /*
19793 + * Lookup failure means no vma is above this address,
19794 + * else if new region fits below vma->vm_start,
19795 * return with success:
19796 */
19797 vma = find_vma(mm, addr);
19798 @@ -5839,7 +5931,18 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/hugetlbpage.c linux-2.6.37.3/arch/sparc/
19799 /* remember the address as a hint for next time */
19800 return (mm->free_area_cache = addr);
19801 }
19802 -@@ -182,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *f
19803 +@@ -135,8 +136,8 @@ hugetlb_get_unmapped_area_topdown(struct
19804 + mm->cached_hole_size = vma->vm_start - addr;
19805 +
19806 + /* try just below the current vma->vm_start */
19807 +- addr = (vma->vm_start-len) & HPAGE_MASK;
19808 +- } while (likely(len < vma->vm_start));
19809 ++ addr = skip_heap_stack_gap(vma, len);
19810 ++ } while (!IS_ERR_VALUE(addr));
19811 +
19812 + bottomup:
19813 + /*
19814 +@@ -182,8 +183,7 @@ hugetlb_get_unmapped_area(struct file *f
19815 if (addr) {
19816 addr = ALIGN(addr, HPAGE_SIZE);
19817 vma = find_vma(mm, addr);
19818 @@ -5849,9 +5952,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/hugetlbpage.c linux-2.6.37.3/arch/sparc/
19819 return addr;
19820 }
19821 if (mm->get_unmapped_area == arch_get_unmapped_area)
19822 -diff -urNp linux-2.6.37.3/arch/sparc/mm/init_32.c linux-2.6.37.3/arch/sparc/mm/init_32.c
19823 ---- linux-2.6.37.3/arch/sparc/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
19824 -+++ linux-2.6.37.3/arch/sparc/mm/init_32.c 2011-01-17 02:41:00.000000000 -0500
19825 +diff -urNp linux-2.6.37.4/arch/sparc/mm/init_32.c linux-2.6.37.4/arch/sparc/mm/init_32.c
19826 +--- linux-2.6.37.4/arch/sparc/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
19827 ++++ linux-2.6.37.4/arch/sparc/mm/init_32.c 2011-01-17 02:41:00.000000000 -0500
19828 @@ -318,6 +318,9 @@ extern void device_scan(void);
19829 pgprot_t PAGE_SHARED __read_mostly;
19830 EXPORT_SYMBOL(PAGE_SHARED);
19831 @@ -5886,9 +5989,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/init_32.c linux-2.6.37.3/arch/sparc/mm/i
19832 protection_map[12] = PAGE_READONLY;
19833 protection_map[13] = PAGE_READONLY;
19834 protection_map[14] = PAGE_SHARED;
19835 -diff -urNp linux-2.6.37.3/arch/sparc/mm/Makefile linux-2.6.37.3/arch/sparc/mm/Makefile
19836 ---- linux-2.6.37.3/arch/sparc/mm/Makefile 2011-01-04 19:50:19.000000000 -0500
19837 -+++ linux-2.6.37.3/arch/sparc/mm/Makefile 2011-01-17 02:41:00.000000000 -0500
19838 +diff -urNp linux-2.6.37.4/arch/sparc/mm/Makefile linux-2.6.37.4/arch/sparc/mm/Makefile
19839 +--- linux-2.6.37.4/arch/sparc/mm/Makefile 2011-01-04 19:50:19.000000000 -0500
19840 ++++ linux-2.6.37.4/arch/sparc/mm/Makefile 2011-01-17 02:41:00.000000000 -0500
19841 @@ -2,7 +2,7 @@
19842 #
19843
19844 @@ -5898,9 +6001,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/Makefile linux-2.6.37.3/arch/sparc/mm/Ma
19845
19846 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
19847 obj-y += fault_$(BITS).o
19848 -diff -urNp linux-2.6.37.3/arch/sparc/mm/srmmu.c linux-2.6.37.3/arch/sparc/mm/srmmu.c
19849 ---- linux-2.6.37.3/arch/sparc/mm/srmmu.c 2011-01-04 19:50:19.000000000 -0500
19850 -+++ linux-2.6.37.3/arch/sparc/mm/srmmu.c 2011-01-17 02:41:00.000000000 -0500
19851 +diff -urNp linux-2.6.37.4/arch/sparc/mm/srmmu.c linux-2.6.37.4/arch/sparc/mm/srmmu.c
19852 +--- linux-2.6.37.4/arch/sparc/mm/srmmu.c 2011-01-04 19:50:19.000000000 -0500
19853 ++++ linux-2.6.37.4/arch/sparc/mm/srmmu.c 2011-01-17 02:41:00.000000000 -0500
19854 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
19855 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
19856 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
19857 @@ -5915,9 +6018,9 @@ diff -urNp linux-2.6.37.3/arch/sparc/mm/srmmu.c linux-2.6.37.3/arch/sparc/mm/srm
19858 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
19859 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
19860
19861 -diff -urNp linux-2.6.37.3/arch/um/include/asm/kmap_types.h linux-2.6.37.3/arch/um/include/asm/kmap_types.h
19862 ---- linux-2.6.37.3/arch/um/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
19863 -+++ linux-2.6.37.3/arch/um/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
19864 +diff -urNp linux-2.6.37.4/arch/um/include/asm/kmap_types.h linux-2.6.37.4/arch/um/include/asm/kmap_types.h
19865 +--- linux-2.6.37.4/arch/um/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
19866 ++++ linux-2.6.37.4/arch/um/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
19867 @@ -23,6 +23,7 @@ enum km_type {
19868 KM_IRQ1,
19869 KM_SOFTIRQ0,
19870 @@ -5926,9 +6029,9 @@ diff -urNp linux-2.6.37.3/arch/um/include/asm/kmap_types.h linux-2.6.37.3/arch/u
19871 KM_TYPE_NR
19872 };
19873
19874 -diff -urNp linux-2.6.37.3/arch/um/include/asm/page.h linux-2.6.37.3/arch/um/include/asm/page.h
19875 ---- linux-2.6.37.3/arch/um/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
19876 -+++ linux-2.6.37.3/arch/um/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
19877 +diff -urNp linux-2.6.37.4/arch/um/include/asm/page.h linux-2.6.37.4/arch/um/include/asm/page.h
19878 +--- linux-2.6.37.4/arch/um/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
19879 ++++ linux-2.6.37.4/arch/um/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
19880 @@ -14,6 +14,9 @@
19881 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
19882 #define PAGE_MASK (~(PAGE_SIZE-1))
19883 @@ -5939,9 +6042,9 @@ diff -urNp linux-2.6.37.3/arch/um/include/asm/page.h linux-2.6.37.3/arch/um/incl
19884 #ifndef __ASSEMBLY__
19885
19886 struct page;
19887 -diff -urNp linux-2.6.37.3/arch/um/kernel/process.c linux-2.6.37.3/arch/um/kernel/process.c
19888 ---- linux-2.6.37.3/arch/um/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
19889 -+++ linux-2.6.37.3/arch/um/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
19890 +diff -urNp linux-2.6.37.4/arch/um/kernel/process.c linux-2.6.37.4/arch/um/kernel/process.c
19891 +--- linux-2.6.37.4/arch/um/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
19892 ++++ linux-2.6.37.4/arch/um/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
19893 @@ -404,22 +404,6 @@ int singlestepping(void * t)
19894 return 2;
19895 }
19896 @@ -5965,9 +6068,9 @@ diff -urNp linux-2.6.37.3/arch/um/kernel/process.c linux-2.6.37.3/arch/um/kernel
19897 unsigned long get_wchan(struct task_struct *p)
19898 {
19899 unsigned long stack_page, sp, ip;
19900 -diff -urNp linux-2.6.37.3/arch/um/sys-i386/syscalls.c linux-2.6.37.3/arch/um/sys-i386/syscalls.c
19901 ---- linux-2.6.37.3/arch/um/sys-i386/syscalls.c 2011-01-04 19:50:19.000000000 -0500
19902 -+++ linux-2.6.37.3/arch/um/sys-i386/syscalls.c 2011-01-17 02:41:00.000000000 -0500
19903 +diff -urNp linux-2.6.37.4/arch/um/sys-i386/syscalls.c linux-2.6.37.4/arch/um/sys-i386/syscalls.c
19904 +--- linux-2.6.37.4/arch/um/sys-i386/syscalls.c 2011-01-04 19:50:19.000000000 -0500
19905 ++++ linux-2.6.37.4/arch/um/sys-i386/syscalls.c 2011-01-17 02:41:00.000000000 -0500
19906 @@ -11,6 +11,21 @@
19907 #include "asm/uaccess.h"
19908 #include "asm/unistd.h"
19909 @@ -5990,9 +6093,9 @@ diff -urNp linux-2.6.37.3/arch/um/sys-i386/syscalls.c linux-2.6.37.3/arch/um/sys
19910 /*
19911 * The prototype on i386 is:
19912 *
19913 -diff -urNp linux-2.6.37.3/arch/x86/boot/bitops.h linux-2.6.37.3/arch/x86/boot/bitops.h
19914 ---- linux-2.6.37.3/arch/x86/boot/bitops.h 2011-01-04 19:50:19.000000000 -0500
19915 -+++ linux-2.6.37.3/arch/x86/boot/bitops.h 2011-01-17 02:41:00.000000000 -0500
19916 +diff -urNp linux-2.6.37.4/arch/x86/boot/bitops.h linux-2.6.37.4/arch/x86/boot/bitops.h
19917 +--- linux-2.6.37.4/arch/x86/boot/bitops.h 2011-01-04 19:50:19.000000000 -0500
19918 ++++ linux-2.6.37.4/arch/x86/boot/bitops.h 2011-01-17 02:41:00.000000000 -0500
19919 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int
19920 u8 v;
19921 const u32 *p = (const u32 *)addr;
19922 @@ -6011,9 +6114,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/bitops.h linux-2.6.37.3/arch/x86/boot/bi
19923 }
19924
19925 #endif /* BOOT_BITOPS_H */
19926 -diff -urNp linux-2.6.37.3/arch/x86/boot/boot.h linux-2.6.37.3/arch/x86/boot/boot.h
19927 ---- linux-2.6.37.3/arch/x86/boot/boot.h 2011-01-04 19:50:19.000000000 -0500
19928 -+++ linux-2.6.37.3/arch/x86/boot/boot.h 2011-01-17 02:41:00.000000000 -0500
19929 +diff -urNp linux-2.6.37.4/arch/x86/boot/boot.h linux-2.6.37.4/arch/x86/boot/boot.h
19930 +--- linux-2.6.37.4/arch/x86/boot/boot.h 2011-01-04 19:50:19.000000000 -0500
19931 ++++ linux-2.6.37.4/arch/x86/boot/boot.h 2011-01-17 02:41:00.000000000 -0500
19932 @@ -85,7 +85,7 @@ static inline void io_delay(void)
19933 static inline u16 ds(void)
19934 {
19935 @@ -6032,9 +6135,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/boot.h linux-2.6.37.3/arch/x86/boot/boot
19936 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
19937 return diff;
19938 }
19939 -diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/head_32.S linux-2.6.37.3/arch/x86/boot/compressed/head_32.S
19940 ---- linux-2.6.37.3/arch/x86/boot/compressed/head_32.S 2011-01-04 19:50:19.000000000 -0500
19941 -+++ linux-2.6.37.3/arch/x86/boot/compressed/head_32.S 2011-01-17 02:41:00.000000000 -0500
19942 +diff -urNp linux-2.6.37.4/arch/x86/boot/compressed/head_32.S linux-2.6.37.4/arch/x86/boot/compressed/head_32.S
19943 +--- linux-2.6.37.4/arch/x86/boot/compressed/head_32.S 2011-01-04 19:50:19.000000000 -0500
19944 ++++ linux-2.6.37.4/arch/x86/boot/compressed/head_32.S 2011-01-17 02:41:00.000000000 -0500
19945 @@ -76,7 +76,7 @@ ENTRY(startup_32)
19946 notl %eax
19947 andl %eax, %ebx
19948 @@ -6063,9 +6166,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/head_32.S linux-2.6.37.3/arch
19949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
19950 jmp 1b
19951 2:
19952 -diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/head_64.S linux-2.6.37.3/arch/x86/boot/compressed/head_64.S
19953 ---- linux-2.6.37.3/arch/x86/boot/compressed/head_64.S 2011-01-04 19:50:19.000000000 -0500
19954 -+++ linux-2.6.37.3/arch/x86/boot/compressed/head_64.S 2011-01-17 02:41:00.000000000 -0500
19955 +diff -urNp linux-2.6.37.4/arch/x86/boot/compressed/head_64.S linux-2.6.37.4/arch/x86/boot/compressed/head_64.S
19956 +--- linux-2.6.37.4/arch/x86/boot/compressed/head_64.S 2011-01-04 19:50:19.000000000 -0500
19957 ++++ linux-2.6.37.4/arch/x86/boot/compressed/head_64.S 2011-01-17 02:41:00.000000000 -0500
19958 @@ -91,7 +91,7 @@ ENTRY(startup_32)
19959 notl %eax
19960 andl %eax, %ebx
19961 @@ -6084,9 +6187,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/head_64.S linux-2.6.37.3/arch
19962 #endif
19963
19964 /* Target address to relocate to for decompression */
19965 -diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/misc.c linux-2.6.37.3/arch/x86/boot/compressed/misc.c
19966 ---- linux-2.6.37.3/arch/x86/boot/compressed/misc.c 2011-01-04 19:50:19.000000000 -0500
19967 -+++ linux-2.6.37.3/arch/x86/boot/compressed/misc.c 2011-01-17 02:41:00.000000000 -0500
19968 +diff -urNp linux-2.6.37.4/arch/x86/boot/compressed/misc.c linux-2.6.37.4/arch/x86/boot/compressed/misc.c
19969 +--- linux-2.6.37.4/arch/x86/boot/compressed/misc.c 2011-01-04 19:50:19.000000000 -0500
19970 ++++ linux-2.6.37.4/arch/x86/boot/compressed/misc.c 2011-01-17 02:41:00.000000000 -0500
19971 @@ -306,7 +306,7 @@ static void parse_elf(void *output)
19972 case PT_LOAD:
19973 #ifdef CONFIG_RELOCATABLE
19974 @@ -6105,9 +6208,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/misc.c linux-2.6.37.3/arch/x8
19975 error("Wrong destination address");
19976 #endif
19977
19978 -diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/mkpiggy.c linux-2.6.37.3/arch/x86/boot/compressed/mkpiggy.c
19979 ---- linux-2.6.37.3/arch/x86/boot/compressed/mkpiggy.c 2011-01-04 19:50:19.000000000 -0500
19980 -+++ linux-2.6.37.3/arch/x86/boot/compressed/mkpiggy.c 2011-01-17 02:41:00.000000000 -0500
19981 +diff -urNp linux-2.6.37.4/arch/x86/boot/compressed/mkpiggy.c linux-2.6.37.4/arch/x86/boot/compressed/mkpiggy.c
19982 +--- linux-2.6.37.4/arch/x86/boot/compressed/mkpiggy.c 2011-01-04 19:50:19.000000000 -0500
19983 ++++ linux-2.6.37.4/arch/x86/boot/compressed/mkpiggy.c 2011-01-17 02:41:00.000000000 -0500
19984 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
19985
19986 offs = (olen > ilen) ? olen - ilen : 0;
19987 @@ -6117,9 +6220,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/mkpiggy.c linux-2.6.37.3/arch
19988 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
19989
19990 printf(".section \".rodata..compressed\",\"a\",@progbits\n");
19991 -diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/relocs.c linux-2.6.37.3/arch/x86/boot/compressed/relocs.c
19992 ---- linux-2.6.37.3/arch/x86/boot/compressed/relocs.c 2011-01-04 19:50:19.000000000 -0500
19993 -+++ linux-2.6.37.3/arch/x86/boot/compressed/relocs.c 2011-01-17 02:41:00.000000000 -0500
19994 +diff -urNp linux-2.6.37.4/arch/x86/boot/compressed/relocs.c linux-2.6.37.4/arch/x86/boot/compressed/relocs.c
19995 +--- linux-2.6.37.4/arch/x86/boot/compressed/relocs.c 2011-01-04 19:50:19.000000000 -0500
19996 ++++ linux-2.6.37.4/arch/x86/boot/compressed/relocs.c 2011-01-17 02:41:00.000000000 -0500
19997 @@ -13,8 +13,11 @@
19998
19999 static void die(char *fmt, ...);
20000 @@ -6312,9 +6415,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/compressed/relocs.c linux-2.6.37.3/arch/
20001 read_shdrs(fp);
20002 read_strtabs(fp);
20003 read_symtabs(fp);
20004 -diff -urNp linux-2.6.37.3/arch/x86/boot/cpucheck.c linux-2.6.37.3/arch/x86/boot/cpucheck.c
20005 ---- linux-2.6.37.3/arch/x86/boot/cpucheck.c 2011-01-04 19:50:19.000000000 -0500
20006 -+++ linux-2.6.37.3/arch/x86/boot/cpucheck.c 2011-01-17 02:41:00.000000000 -0500
20007 +diff -urNp linux-2.6.37.4/arch/x86/boot/cpucheck.c linux-2.6.37.4/arch/x86/boot/cpucheck.c
20008 +--- linux-2.6.37.4/arch/x86/boot/cpucheck.c 2011-01-04 19:50:19.000000000 -0500
20009 ++++ linux-2.6.37.4/arch/x86/boot/cpucheck.c 2011-01-17 02:41:00.000000000 -0500
20010 @@ -74,7 +74,7 @@ static int has_fpu(void)
20011 u16 fcw = -1, fsw = -1;
20012 u32 cr0;
20013 @@ -6410,9 +6513,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/cpucheck.c linux-2.6.37.3/arch/x86/boot/
20014
20015 err = check_flags();
20016 }
20017 -diff -urNp linux-2.6.37.3/arch/x86/boot/header.S linux-2.6.37.3/arch/x86/boot/header.S
20018 ---- linux-2.6.37.3/arch/x86/boot/header.S 2011-01-04 19:50:19.000000000 -0500
20019 -+++ linux-2.6.37.3/arch/x86/boot/header.S 2011-01-17 02:41:00.000000000 -0500
20020 +diff -urNp linux-2.6.37.4/arch/x86/boot/header.S linux-2.6.37.4/arch/x86/boot/header.S
20021 +--- linux-2.6.37.4/arch/x86/boot/header.S 2011-01-04 19:50:19.000000000 -0500
20022 ++++ linux-2.6.37.4/arch/x86/boot/header.S 2011-01-17 02:41:00.000000000 -0500
20023 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
20024 # single linked list of
20025 # struct setup_data
20026 @@ -6422,9 +6525,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/header.S linux-2.6.37.3/arch/x86/boot/he
20027
20028 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
20029 #define VO_INIT_SIZE (VO__end - VO__text)
20030 -diff -urNp linux-2.6.37.3/arch/x86/boot/memory.c linux-2.6.37.3/arch/x86/boot/memory.c
20031 ---- linux-2.6.37.3/arch/x86/boot/memory.c 2011-01-04 19:50:19.000000000 -0500
20032 -+++ linux-2.6.37.3/arch/x86/boot/memory.c 2011-01-17 02:41:00.000000000 -0500
20033 +diff -urNp linux-2.6.37.4/arch/x86/boot/memory.c linux-2.6.37.4/arch/x86/boot/memory.c
20034 +--- linux-2.6.37.4/arch/x86/boot/memory.c 2011-01-04 19:50:19.000000000 -0500
20035 ++++ linux-2.6.37.4/arch/x86/boot/memory.c 2011-01-17 02:41:00.000000000 -0500
20036 @@ -19,7 +19,7 @@
20037
20038 static int detect_memory_e820(void)
20039 @@ -6434,9 +6537,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/memory.c linux-2.6.37.3/arch/x86/boot/me
20040 struct biosregs ireg, oreg;
20041 struct e820entry *desc = boot_params.e820_map;
20042 static struct e820entry buf; /* static so it is zeroed */
20043 -diff -urNp linux-2.6.37.3/arch/x86/boot/video.c linux-2.6.37.3/arch/x86/boot/video.c
20044 ---- linux-2.6.37.3/arch/x86/boot/video.c 2011-01-04 19:50:19.000000000 -0500
20045 -+++ linux-2.6.37.3/arch/x86/boot/video.c 2011-01-17 02:41:00.000000000 -0500
20046 +diff -urNp linux-2.6.37.4/arch/x86/boot/video.c linux-2.6.37.4/arch/x86/boot/video.c
20047 +--- linux-2.6.37.4/arch/x86/boot/video.c 2011-01-04 19:50:19.000000000 -0500
20048 ++++ linux-2.6.37.4/arch/x86/boot/video.c 2011-01-17 02:41:00.000000000 -0500
20049 @@ -96,7 +96,7 @@ static void store_mode_params(void)
20050 static unsigned int get_entry(void)
20051 {
20052 @@ -6446,9 +6549,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/video.c linux-2.6.37.3/arch/x86/boot/vid
20053 int key;
20054 unsigned int v;
20055
20056 -diff -urNp linux-2.6.37.3/arch/x86/boot/video-vesa.c linux-2.6.37.3/arch/x86/boot/video-vesa.c
20057 ---- linux-2.6.37.3/arch/x86/boot/video-vesa.c 2011-01-04 19:50:19.000000000 -0500
20058 -+++ linux-2.6.37.3/arch/x86/boot/video-vesa.c 2011-01-17 02:41:00.000000000 -0500
20059 +diff -urNp linux-2.6.37.4/arch/x86/boot/video-vesa.c linux-2.6.37.4/arch/x86/boot/video-vesa.c
20060 +--- linux-2.6.37.4/arch/x86/boot/video-vesa.c 2011-01-04 19:50:19.000000000 -0500
20061 ++++ linux-2.6.37.4/arch/x86/boot/video-vesa.c 2011-01-17 02:41:00.000000000 -0500
20062 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
20063
20064 boot_params.screen_info.vesapm_seg = oreg.es;
20065 @@ -6457,9 +6560,9 @@ diff -urNp linux-2.6.37.3/arch/x86/boot/video-vesa.c linux-2.6.37.3/arch/x86/boo
20066 }
20067
20068 /*
20069 -diff -urNp linux-2.6.37.3/arch/x86/ia32/ia32_aout.c linux-2.6.37.3/arch/x86/ia32/ia32_aout.c
20070 ---- linux-2.6.37.3/arch/x86/ia32/ia32_aout.c 2011-01-04 19:50:19.000000000 -0500
20071 -+++ linux-2.6.37.3/arch/x86/ia32/ia32_aout.c 2011-01-17 02:41:00.000000000 -0500
20072 +diff -urNp linux-2.6.37.4/arch/x86/ia32/ia32_aout.c linux-2.6.37.4/arch/x86/ia32/ia32_aout.c
20073 +--- linux-2.6.37.4/arch/x86/ia32/ia32_aout.c 2011-01-04 19:50:19.000000000 -0500
20074 ++++ linux-2.6.37.4/arch/x86/ia32/ia32_aout.c 2011-01-17 02:41:00.000000000 -0500
20075 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
20076 unsigned long dump_start, dump_size;
20077 struct user32 dump;
20078 @@ -6469,9 +6572,9 @@ diff -urNp linux-2.6.37.3/arch/x86/ia32/ia32_aout.c linux-2.6.37.3/arch/x86/ia32
20079 fs = get_fs();
20080 set_fs(KERNEL_DS);
20081 has_dumped = 1;
20082 -diff -urNp linux-2.6.37.3/arch/x86/ia32/ia32entry.S linux-2.6.37.3/arch/x86/ia32/ia32entry.S
20083 ---- linux-2.6.37.3/arch/x86/ia32/ia32entry.S 2011-01-04 19:50:19.000000000 -0500
20084 -+++ linux-2.6.37.3/arch/x86/ia32/ia32entry.S 2011-02-27 14:48:10.000000000 -0500
20085 +diff -urNp linux-2.6.37.4/arch/x86/ia32/ia32entry.S linux-2.6.37.4/arch/x86/ia32/ia32entry.S
20086 +--- linux-2.6.37.4/arch/x86/ia32/ia32entry.S 2011-01-04 19:50:19.000000000 -0500
20087 ++++ linux-2.6.37.4/arch/x86/ia32/ia32entry.S 2011-02-27 14:48:10.000000000 -0500
20088 @@ -13,6 +13,7 @@
20089 #include <asm/thread_info.h>
20090 #include <asm/segment.h>
20091 @@ -6569,9 +6672,9 @@ diff -urNp linux-2.6.37.3/arch/x86/ia32/ia32entry.S linux-2.6.37.3/arch/x86/ia32
20092 /*
20093 * No need to follow this irqs on/off section: the syscall
20094 * disabled irqs and here we enable it straight after entry:
20095 -diff -urNp linux-2.6.37.3/arch/x86/ia32/ia32_signal.c linux-2.6.37.3/arch/x86/ia32/ia32_signal.c
20096 ---- linux-2.6.37.3/arch/x86/ia32/ia32_signal.c 2011-01-04 19:50:19.000000000 -0500
20097 -+++ linux-2.6.37.3/arch/x86/ia32/ia32_signal.c 2011-01-17 02:41:00.000000000 -0500
20098 +diff -urNp linux-2.6.37.4/arch/x86/ia32/ia32_signal.c linux-2.6.37.4/arch/x86/ia32/ia32_signal.c
20099 +--- linux-2.6.37.4/arch/x86/ia32/ia32_signal.c 2011-01-04 19:50:19.000000000 -0500
20100 ++++ linux-2.6.37.4/arch/x86/ia32/ia32_signal.c 2011-01-17 02:41:00.000000000 -0500
20101 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
20102 sp -= frame_size;
20103 /* Align the stack pointer according to the i386 ABI,
20104 @@ -6621,9 +6724,9 @@ diff -urNp linux-2.6.37.3/arch/x86/ia32/ia32_signal.c linux-2.6.37.3/arch/x86/ia
20105 } put_user_catch(err);
20106
20107 if (err)
20108 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/alternative.h linux-2.6.37.3/arch/x86/include/asm/alternative.h
20109 ---- linux-2.6.37.3/arch/x86/include/asm/alternative.h 2011-01-04 19:50:19.000000000 -0500
20110 -+++ linux-2.6.37.3/arch/x86/include/asm/alternative.h 2011-01-17 02:41:00.000000000 -0500
20111 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/alternative.h linux-2.6.37.4/arch/x86/include/asm/alternative.h
20112 +--- linux-2.6.37.4/arch/x86/include/asm/alternative.h 2011-01-04 19:50:19.000000000 -0500
20113 ++++ linux-2.6.37.4/arch/x86/include/asm/alternative.h 2011-01-17 02:41:00.000000000 -0500
20114 @@ -93,7 +93,7 @@ static inline int alternatives_text_rese
20115 ".section .discard,\"aw\",@progbits\n" \
20116 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
20117 @@ -6633,9 +6736,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/alternative.h linux-2.6.37.3/arch
20118 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
20119 ".previous"
20120
20121 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/apm.h linux-2.6.37.3/arch/x86/include/asm/apm.h
20122 ---- linux-2.6.37.3/arch/x86/include/asm/apm.h 2011-01-04 19:50:19.000000000 -0500
20123 -+++ linux-2.6.37.3/arch/x86/include/asm/apm.h 2011-01-17 02:41:00.000000000 -0500
20124 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/apm.h linux-2.6.37.4/arch/x86/include/asm/apm.h
20125 +--- linux-2.6.37.4/arch/x86/include/asm/apm.h 2011-01-04 19:50:19.000000000 -0500
20126 ++++ linux-2.6.37.4/arch/x86/include/asm/apm.h 2011-01-17 02:41:00.000000000 -0500
20127 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
20128 __asm__ __volatile__(APM_DO_ZERO_SEGS
20129 "pushl %%edi\n\t"
20130 @@ -6654,9 +6757,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/apm.h linux-2.6.37.3/arch/x86/inc
20131 "setc %%bl\n\t"
20132 "popl %%ebp\n\t"
20133 "popl %%edi\n\t"
20134 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/atomic64_32.h linux-2.6.37.3/arch/x86/include/asm/atomic64_32.h
20135 ---- linux-2.6.37.3/arch/x86/include/asm/atomic64_32.h 2011-01-04 19:50:19.000000000 -0500
20136 -+++ linux-2.6.37.3/arch/x86/include/asm/atomic64_32.h 2011-01-17 02:41:00.000000000 -0500
20137 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/atomic64_32.h linux-2.6.37.4/arch/x86/include/asm/atomic64_32.h
20138 +--- linux-2.6.37.4/arch/x86/include/asm/atomic64_32.h 2011-01-04 19:50:19.000000000 -0500
20139 ++++ linux-2.6.37.4/arch/x86/include/asm/atomic64_32.h 2011-01-17 02:41:00.000000000 -0500
20140 @@ -12,6 +12,14 @@ typedef struct {
20141 u64 __aligned(8) counter;
20142 } atomic64_t;
20143 @@ -6672,9 +6775,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/atomic64_32.h linux-2.6.37.3/arch
20144 #define ATOMIC64_INIT(val) { (val) }
20145
20146 #ifdef CONFIG_X86_CMPXCHG64
20147 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/atomic64_64.h linux-2.6.37.3/arch/x86/include/asm/atomic64_64.h
20148 ---- linux-2.6.37.3/arch/x86/include/asm/atomic64_64.h 2011-01-04 19:50:19.000000000 -0500
20149 -+++ linux-2.6.37.3/arch/x86/include/asm/atomic64_64.h 2011-01-17 02:41:00.000000000 -0500
20150 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/atomic64_64.h linux-2.6.37.4/arch/x86/include/asm/atomic64_64.h
20151 +--- linux-2.6.37.4/arch/x86/include/asm/atomic64_64.h 2011-01-04 19:50:19.000000000 -0500
20152 ++++ linux-2.6.37.4/arch/x86/include/asm/atomic64_64.h 2011-01-17 02:41:00.000000000 -0500
20153 @@ -18,7 +18,19 @@
20154 */
20155 static inline long atomic64_read(const atomic64_t *v)
20156 @@ -6984,9 +7087,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/atomic64_64.h linux-2.6.37.3/arch
20157 }
20158
20159 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
20160 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/atomic.h linux-2.6.37.3/arch/x86/include/asm/atomic.h
20161 ---- linux-2.6.37.3/arch/x86/include/asm/atomic.h 2011-01-04 19:50:19.000000000 -0500
20162 -+++ linux-2.6.37.3/arch/x86/include/asm/atomic.h 2011-02-27 14:48:10.000000000 -0500
20163 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/atomic.h linux-2.6.37.4/arch/x86/include/asm/atomic.h
20164 +--- linux-2.6.37.4/arch/x86/include/asm/atomic.h 2011-01-04 19:50:19.000000000 -0500
20165 ++++ linux-2.6.37.4/arch/x86/include/asm/atomic.h 2011-02-27 14:48:10.000000000 -0500
20166 @@ -22,7 +22,18 @@
20167 */
20168 static inline int atomic_read(const atomic_t *v)
20169 @@ -7358,9 +7461,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/atomic.h linux-2.6.37.3/arch/x86/
20170 /*
20171 * atomic_dec_if_positive - decrement by 1 if old value positive
20172 * @v: pointer of type atomic_t
20173 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/bitops.h linux-2.6.37.3/arch/x86/include/asm/bitops.h
20174 ---- linux-2.6.37.3/arch/x86/include/asm/bitops.h 2011-01-04 19:50:19.000000000 -0500
20175 -+++ linux-2.6.37.3/arch/x86/include/asm/bitops.h 2011-01-17 02:41:00.000000000 -0500
20176 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/bitops.h linux-2.6.37.4/arch/x86/include/asm/bitops.h
20177 +--- linux-2.6.37.4/arch/x86/include/asm/bitops.h 2011-01-04 19:50:19.000000000 -0500
20178 ++++ linux-2.6.37.4/arch/x86/include/asm/bitops.h 2011-01-17 02:41:00.000000000 -0500
20179 @@ -38,7 +38,7 @@
20180 * a mask operation on a byte.
20181 */
20182 @@ -7370,9 +7473,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/bitops.h linux-2.6.37.3/arch/x86/
20183 #define CONST_MASK(nr) (1 << ((nr) & 7))
20184
20185 /**
20186 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/boot.h linux-2.6.37.3/arch/x86/include/asm/boot.h
20187 ---- linux-2.6.37.3/arch/x86/include/asm/boot.h 2011-01-04 19:50:19.000000000 -0500
20188 -+++ linux-2.6.37.3/arch/x86/include/asm/boot.h 2011-01-17 02:41:00.000000000 -0500
20189 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/boot.h linux-2.6.37.4/arch/x86/include/asm/boot.h
20190 +--- linux-2.6.37.4/arch/x86/include/asm/boot.h 2011-01-04 19:50:19.000000000 -0500
20191 ++++ linux-2.6.37.4/arch/x86/include/asm/boot.h 2011-01-17 02:41:00.000000000 -0500
20192 @@ -11,10 +11,15 @@
20193 #include <asm/pgtable_types.h>
20194
20195 @@ -7390,9 +7493,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/boot.h linux-2.6.37.3/arch/x86/in
20196 /* Minimum kernel alignment, as a power of two */
20197 #ifdef CONFIG_X86_64
20198 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
20199 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/cacheflush.h linux-2.6.37.3/arch/x86/include/asm/cacheflush.h
20200 ---- linux-2.6.37.3/arch/x86/include/asm/cacheflush.h 2011-01-04 19:50:19.000000000 -0500
20201 -+++ linux-2.6.37.3/arch/x86/include/asm/cacheflush.h 2011-01-17 02:41:00.000000000 -0500
20202 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/cacheflush.h linux-2.6.37.4/arch/x86/include/asm/cacheflush.h
20203 +--- linux-2.6.37.4/arch/x86/include/asm/cacheflush.h 2011-01-04 19:50:19.000000000 -0500
20204 ++++ linux-2.6.37.4/arch/x86/include/asm/cacheflush.h 2011-01-17 02:41:00.000000000 -0500
20205 @@ -66,7 +66,7 @@ static inline unsigned long get_page_mem
20206 unsigned long pg_flags = pg->flags & _PGMT_MASK;
20207
20208 @@ -7402,9 +7505,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/cacheflush.h linux-2.6.37.3/arch/
20209 else if (pg_flags == _PGMT_WC)
20210 return _PAGE_CACHE_WC;
20211 else if (pg_flags == _PGMT_UC_MINUS)
20212 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/cache.h linux-2.6.37.3/arch/x86/include/asm/cache.h
20213 ---- linux-2.6.37.3/arch/x86/include/asm/cache.h 2011-01-04 19:50:19.000000000 -0500
20214 -+++ linux-2.6.37.3/arch/x86/include/asm/cache.h 2011-01-17 02:41:00.000000000 -0500
20215 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/cache.h linux-2.6.37.4/arch/x86/include/asm/cache.h
20216 +--- linux-2.6.37.4/arch/x86/include/asm/cache.h 2011-01-04 19:50:19.000000000 -0500
20217 ++++ linux-2.6.37.4/arch/x86/include/asm/cache.h 2011-01-17 02:41:00.000000000 -0500
20218 @@ -8,6 +8,7 @@
20219 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
20220
20221 @@ -7413,9 +7516,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/cache.h linux-2.6.37.3/arch/x86/i
20222
20223 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
20224 #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
20225 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/checksum_32.h linux-2.6.37.3/arch/x86/include/asm/checksum_32.h
20226 ---- linux-2.6.37.3/arch/x86/include/asm/checksum_32.h 2011-01-04 19:50:19.000000000 -0500
20227 -+++ linux-2.6.37.3/arch/x86/include/asm/checksum_32.h 2011-01-17 02:41:00.000000000 -0500
20228 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/checksum_32.h linux-2.6.37.4/arch/x86/include/asm/checksum_32.h
20229 +--- linux-2.6.37.4/arch/x86/include/asm/checksum_32.h 2011-01-04 19:50:19.000000000 -0500
20230 ++++ linux-2.6.37.4/arch/x86/include/asm/checksum_32.h 2011-01-17 02:41:00.000000000 -0500
20231 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
20232 int len, __wsum sum,
20233 int *src_err_ptr, int *dst_err_ptr);
20234 @@ -7449,9 +7552,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/checksum_32.h linux-2.6.37.3/arch
20235 len, sum, NULL, err_ptr);
20236
20237 if (len)
20238 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/cpufeature.h linux-2.6.37.3/arch/x86/include/asm/cpufeature.h
20239 ---- linux-2.6.37.3/arch/x86/include/asm/cpufeature.h 2011-01-04 19:50:19.000000000 -0500
20240 -+++ linux-2.6.37.3/arch/x86/include/asm/cpufeature.h 2011-01-17 02:41:00.000000000 -0500
20241 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/cpufeature.h linux-2.6.37.4/arch/x86/include/asm/cpufeature.h
20242 +--- linux-2.6.37.4/arch/x86/include/asm/cpufeature.h 2011-01-04 19:50:19.000000000 -0500
20243 ++++ linux-2.6.37.4/arch/x86/include/asm/cpufeature.h 2011-01-17 02:41:00.000000000 -0500
20244 @@ -349,7 +349,7 @@ static __always_inline __pure bool __sta
20245 ".section .discard,\"aw\",@progbits\n"
20246 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
20247 @@ -7461,9 +7564,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/cpufeature.h linux-2.6.37.3/arch/
20248 "3: movb $1,%0\n"
20249 "4:\n"
20250 ".previous\n"
20251 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/desc_defs.h linux-2.6.37.3/arch/x86/include/asm/desc_defs.h
20252 ---- linux-2.6.37.3/arch/x86/include/asm/desc_defs.h 2011-01-04 19:50:19.000000000 -0500
20253 -+++ linux-2.6.37.3/arch/x86/include/asm/desc_defs.h 2011-02-27 14:48:10.000000000 -0500
20254 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/desc_defs.h linux-2.6.37.4/arch/x86/include/asm/desc_defs.h
20255 +--- linux-2.6.37.4/arch/x86/include/asm/desc_defs.h 2011-01-04 19:50:19.000000000 -0500
20256 ++++ linux-2.6.37.4/arch/x86/include/asm/desc_defs.h 2011-03-21 17:16:23.000000000 -0400
20257 @@ -31,6 +31,12 @@ struct desc_struct {
20258 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
20259 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
20260 @@ -7473,13 +7576,13 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/desc_defs.h linux-2.6.37.3/arch/x
20261 + u16 seg;
20262 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
20263 + unsigned offset_high: 16;
20264 -+ };
20265 ++ } gate;
20266 };
20267 } __attribute__((packed));
20268
20269 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/desc.h linux-2.6.37.3/arch/x86/include/asm/desc.h
20270 ---- linux-2.6.37.3/arch/x86/include/asm/desc.h 2011-01-04 19:50:19.000000000 -0500
20271 -+++ linux-2.6.37.3/arch/x86/include/asm/desc.h 2011-02-27 14:48:10.000000000 -0500
20272 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/desc.h linux-2.6.37.4/arch/x86/include/asm/desc.h
20273 +--- linux-2.6.37.4/arch/x86/include/asm/desc.h 2011-01-04 19:50:19.000000000 -0500
20274 ++++ linux-2.6.37.4/arch/x86/include/asm/desc.h 2011-03-21 17:16:23.000000000 -0400
20275 @@ -4,6 +4,7 @@
20276 #include <asm/desc_defs.h>
20277 #include <asm/ldt.h>
20278 @@ -7523,14 +7626,14 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/desc.h linux-2.6.37.3/arch/x86/in
20279 - gate->a = (seg << 16) | (base & 0xffff);
20280 - gate->b = (base & 0xffff0000) |
20281 - (((0x80 | type | (dpl << 5)) & 0xff) << 8);
20282 -+ gate->offset_low = base;
20283 -+ gate->seg = seg;
20284 -+ gate->reserved = 0;
20285 -+ gate->type = type;
20286 -+ gate->s = 0;
20287 -+ gate->dpl = dpl;
20288 -+ gate->p = 1;
20289 -+ gate->offset_high = base >> 16;
20290 ++ gate->gate.offset_low = base;
20291 ++ gate->gate.seg = seg;
20292 ++ gate->gate.reserved = 0;
20293 ++ gate->gate.type = type;
20294 ++ gate->gate.s = 0;
20295 ++ gate->gate.dpl = dpl;
20296 ++ gate->gate.p = 1;
20297 ++ gate->gate.offset_high = base >> 16;
20298 }
20299
20300 #endif
20301 @@ -7667,9 +7770,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/desc.h linux-2.6.37.3/arch/x86/in
20302 +#endif
20303 +
20304 #endif /* _ASM_X86_DESC_H */
20305 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/device.h linux-2.6.37.3/arch/x86/include/asm/device.h
20306 ---- linux-2.6.37.3/arch/x86/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
20307 -+++ linux-2.6.37.3/arch/x86/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
20308 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/device.h linux-2.6.37.4/arch/x86/include/asm/device.h
20309 +--- linux-2.6.37.4/arch/x86/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
20310 ++++ linux-2.6.37.4/arch/x86/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
20311 @@ -6,7 +6,7 @@ struct dev_archdata {
20312 void *acpi_handle;
20313 #endif
20314 @@ -7679,9 +7782,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/device.h linux-2.6.37.3/arch/x86/
20315 #endif
20316 #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
20317 void *iommu; /* hook for IOMMU specific extension */
20318 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/dma-mapping.h linux-2.6.37.3/arch/x86/include/asm/dma-mapping.h
20319 ---- linux-2.6.37.3/arch/x86/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
20320 -+++ linux-2.6.37.3/arch/x86/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
20321 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/dma-mapping.h linux-2.6.37.4/arch/x86/include/asm/dma-mapping.h
20322 +--- linux-2.6.37.4/arch/x86/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
20323 ++++ linux-2.6.37.4/arch/x86/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
20324 @@ -26,9 +26,9 @@ extern int iommu_merge;
20325 extern struct device x86_dma_fallback_dev;
20326 extern int panic_on_overflow;
20327 @@ -7721,9 +7824,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/dma-mapping.h linux-2.6.37.3/arch
20328
20329 WARN_ON(irqs_disabled()); /* for portability */
20330
20331 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/e820.h linux-2.6.37.3/arch/x86/include/asm/e820.h
20332 ---- linux-2.6.37.3/arch/x86/include/asm/e820.h 2011-01-04 19:50:19.000000000 -0500
20333 -+++ linux-2.6.37.3/arch/x86/include/asm/e820.h 2011-01-17 02:41:00.000000000 -0500
20334 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/e820.h linux-2.6.37.4/arch/x86/include/asm/e820.h
20335 +--- linux-2.6.37.4/arch/x86/include/asm/e820.h 2011-01-04 19:50:19.000000000 -0500
20336 ++++ linux-2.6.37.4/arch/x86/include/asm/e820.h 2011-01-17 02:41:00.000000000 -0500
20337 @@ -69,7 +69,7 @@ struct e820map {
20338 #define ISA_START_ADDRESS 0xa0000
20339 #define ISA_END_ADDRESS 0x100000
20340 @@ -7733,9 +7836,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/e820.h linux-2.6.37.3/arch/x86/in
20341 #define BIOS_END 0x00100000
20342
20343 #define BIOS_ROM_BASE 0xffe00000
20344 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/elf.h linux-2.6.37.3/arch/x86/include/asm/elf.h
20345 ---- linux-2.6.37.3/arch/x86/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
20346 -+++ linux-2.6.37.3/arch/x86/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
20347 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/elf.h linux-2.6.37.4/arch/x86/include/asm/elf.h
20348 +--- linux-2.6.37.4/arch/x86/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
20349 ++++ linux-2.6.37.4/arch/x86/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
20350 @@ -237,7 +237,25 @@ extern int force_personality32;
20351 the loader. We need to make sure that it is out of the way of the program
20352 that it will "exec", and that there is sufficient room for the brk. */
20353 @@ -7789,9 +7892,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/elf.h linux-2.6.37.3/arch/x86/inc
20354 -#define arch_randomize_brk arch_randomize_brk
20355 -
20356 #endif /* _ASM_X86_ELF_H */
20357 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/futex.h linux-2.6.37.3/arch/x86/include/asm/futex.h
20358 ---- linux-2.6.37.3/arch/x86/include/asm/futex.h 2011-01-04 19:50:19.000000000 -0500
20359 -+++ linux-2.6.37.3/arch/x86/include/asm/futex.h 2011-03-12 22:50:25.000000000 -0500
20360 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/futex.h linux-2.6.37.4/arch/x86/include/asm/futex.h
20361 +--- linux-2.6.37.4/arch/x86/include/asm/futex.h 2011-01-04 19:50:19.000000000 -0500
20362 ++++ linux-2.6.37.4/arch/x86/include/asm/futex.h 2011-03-12 22:50:25.000000000 -0500
20363 @@ -12,16 +12,18 @@
20364 #include <asm/system.h>
20365
20366 @@ -7867,9 +7970,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/futex.h linux-2.6.37.3/arch/x86/i
20367 : "i" (-EFAULT), "r" (newval), "0" (oldval)
20368 : "memory"
20369 );
20370 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/i387.h linux-2.6.37.3/arch/x86/include/asm/i387.h
20371 ---- linux-2.6.37.3/arch/x86/include/asm/i387.h 2011-01-04 19:50:19.000000000 -0500
20372 -+++ linux-2.6.37.3/arch/x86/include/asm/i387.h 2011-01-17 02:41:00.000000000 -0500
20373 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/i387.h linux-2.6.37.4/arch/x86/include/asm/i387.h
20374 +--- linux-2.6.37.4/arch/x86/include/asm/i387.h 2011-01-04 19:50:19.000000000 -0500
20375 ++++ linux-2.6.37.4/arch/x86/include/asm/i387.h 2011-01-17 02:41:00.000000000 -0500
20376 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
20377 {
20378 int err;
20379 @@ -7910,9 +8013,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/i387.h linux-2.6.37.3/arch/x86/in
20380
20381 /*
20382 * These must be called with preempt disabled
20383 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/io.h linux-2.6.37.3/arch/x86/include/asm/io.h
20384 ---- linux-2.6.37.3/arch/x86/include/asm/io.h 2011-01-04 19:50:19.000000000 -0500
20385 -+++ linux-2.6.37.3/arch/x86/include/asm/io.h 2011-01-27 22:37:21.000000000 -0500
20386 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/io.h linux-2.6.37.4/arch/x86/include/asm/io.h
20387 +--- linux-2.6.37.4/arch/x86/include/asm/io.h 2011-01-04 19:50:19.000000000 -0500
20388 ++++ linux-2.6.37.4/arch/x86/include/asm/io.h 2011-01-27 22:37:21.000000000 -0500
20389 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
20390
20391 #include <linux/vmalloc.h>
20392 @@ -7931,9 +8034,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/io.h linux-2.6.37.3/arch/x86/incl
20393 /*
20394 * Convert a virtual cached pointer to an uncached pointer
20395 */
20396 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/iommu.h linux-2.6.37.3/arch/x86/include/asm/iommu.h
20397 ---- linux-2.6.37.3/arch/x86/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
20398 -+++ linux-2.6.37.3/arch/x86/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
20399 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/iommu.h linux-2.6.37.4/arch/x86/include/asm/iommu.h
20400 +--- linux-2.6.37.4/arch/x86/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
20401 ++++ linux-2.6.37.4/arch/x86/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
20402 @@ -1,7 +1,7 @@
20403 #ifndef _ASM_X86_IOMMU_H
20404 #define _ASM_X86_IOMMU_H
20405 @@ -7943,9 +8046,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/iommu.h linux-2.6.37.3/arch/x86/i
20406 extern int force_iommu, no_iommu;
20407 extern int iommu_detected;
20408 extern int iommu_pass_through;
20409 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/irqflags.h linux-2.6.37.3/arch/x86/include/asm/irqflags.h
20410 ---- linux-2.6.37.3/arch/x86/include/asm/irqflags.h 2011-01-04 19:50:19.000000000 -0500
20411 -+++ linux-2.6.37.3/arch/x86/include/asm/irqflags.h 2011-01-17 02:41:00.000000000 -0500
20412 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/irqflags.h linux-2.6.37.4/arch/x86/include/asm/irqflags.h
20413 +--- linux-2.6.37.4/arch/x86/include/asm/irqflags.h 2011-01-04 19:50:19.000000000 -0500
20414 ++++ linux-2.6.37.4/arch/x86/include/asm/irqflags.h 2011-01-17 02:41:00.000000000 -0500
20415 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
20416 sti; \
20417 sysexit
20418 @@ -7958,9 +8061,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/irqflags.h linux-2.6.37.3/arch/x8
20419 #else
20420 #define INTERRUPT_RETURN iret
20421 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
20422 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/kvm_host.h linux-2.6.37.3/arch/x86/include/asm/kvm_host.h
20423 ---- linux-2.6.37.3/arch/x86/include/asm/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
20424 -+++ linux-2.6.37.3/arch/x86/include/asm/kvm_host.h 2011-01-17 02:41:00.000000000 -0500
20425 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/kvm_host.h linux-2.6.37.4/arch/x86/include/asm/kvm_host.h
20426 +--- linux-2.6.37.4/arch/x86/include/asm/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
20427 ++++ linux-2.6.37.4/arch/x86/include/asm/kvm_host.h 2011-01-17 02:41:00.000000000 -0500
20428 @@ -585,7 +585,7 @@ struct kvm_x86_ops {
20429 const struct trace_print_flags *exit_reasons_str;
20430 };
20431 @@ -7970,9 +8073,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/kvm_host.h linux-2.6.37.3/arch/x8
20432
20433 int kvm_mmu_module_init(void);
20434 void kvm_mmu_module_exit(void);
20435 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/local.h linux-2.6.37.3/arch/x86/include/asm/local.h
20436 ---- linux-2.6.37.3/arch/x86/include/asm/local.h 2011-01-04 19:50:19.000000000 -0500
20437 -+++ linux-2.6.37.3/arch/x86/include/asm/local.h 2011-01-17 02:41:00.000000000 -0500
20438 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/local.h linux-2.6.37.4/arch/x86/include/asm/local.h
20439 +--- linux-2.6.37.4/arch/x86/include/asm/local.h 2011-01-04 19:50:19.000000000 -0500
20440 ++++ linux-2.6.37.4/arch/x86/include/asm/local.h 2011-01-17 02:41:00.000000000 -0500
20441 @@ -18,26 +18,58 @@ typedef struct {
20442
20443 static inline void local_inc(local_t *l)
20444 @@ -8125,9 +8228,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/local.h linux-2.6.37.3/arch/x86/i
20445 : "+r" (i), "+m" (l->a.counter)
20446 : : "memory");
20447 return i + __i;
20448 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/mc146818rtc.h linux-2.6.37.3/arch/x86/include/asm/mc146818rtc.h
20449 ---- linux-2.6.37.3/arch/x86/include/asm/mc146818rtc.h 2011-01-04 19:50:19.000000000 -0500
20450 -+++ linux-2.6.37.3/arch/x86/include/asm/mc146818rtc.h 2011-01-17 02:41:00.000000000 -0500
20451 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/mc146818rtc.h linux-2.6.37.4/arch/x86/include/asm/mc146818rtc.h
20452 +--- linux-2.6.37.4/arch/x86/include/asm/mc146818rtc.h 2011-01-04 19:50:19.000000000 -0500
20453 ++++ linux-2.6.37.4/arch/x86/include/asm/mc146818rtc.h 2011-01-17 02:41:00.000000000 -0500
20454 @@ -81,8 +81,8 @@ static inline unsigned char current_lock
20455 #else
20456 #define lock_cmos_prefix(reg) do {} while (0)
20457 @@ -8139,9 +8242,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/mc146818rtc.h linux-2.6.37.3/arch
20458 #define do_i_have_lock_cmos() 0
20459 #define current_lock_cmos_reg() 0
20460 #endif
20461 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/microcode.h linux-2.6.37.3/arch/x86/include/asm/microcode.h
20462 ---- linux-2.6.37.3/arch/x86/include/asm/microcode.h 2011-01-04 19:50:19.000000000 -0500
20463 -+++ linux-2.6.37.3/arch/x86/include/asm/microcode.h 2011-01-17 02:41:00.000000000 -0500
20464 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/microcode.h linux-2.6.37.4/arch/x86/include/asm/microcode.h
20465 +--- linux-2.6.37.4/arch/x86/include/asm/microcode.h 2011-01-04 19:50:19.000000000 -0500
20466 ++++ linux-2.6.37.4/arch/x86/include/asm/microcode.h 2011-01-17 02:41:00.000000000 -0500
20467 @@ -12,13 +12,13 @@ struct device;
20468 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
20469
20470 @@ -8182,9 +8285,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/microcode.h linux-2.6.37.3/arch/x
20471 {
20472 return NULL;
20473 }
20474 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/mman.h linux-2.6.37.3/arch/x86/include/asm/mman.h
20475 ---- linux-2.6.37.3/arch/x86/include/asm/mman.h 2011-01-04 19:50:19.000000000 -0500
20476 -+++ linux-2.6.37.3/arch/x86/include/asm/mman.h 2011-01-17 02:41:00.000000000 -0500
20477 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/mman.h linux-2.6.37.4/arch/x86/include/asm/mman.h
20478 +--- linux-2.6.37.4/arch/x86/include/asm/mman.h 2011-01-04 19:50:19.000000000 -0500
20479 ++++ linux-2.6.37.4/arch/x86/include/asm/mman.h 2011-01-17 02:41:00.000000000 -0500
20480 @@ -5,4 +5,14 @@
20481
20482 #include <asm-generic/mman.h>
20483 @@ -8200,9 +8303,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/mman.h linux-2.6.37.3/arch/x86/in
20484 +#endif
20485 +
20486 #endif /* _ASM_X86_MMAN_H */
20487 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/mmu_context.h linux-2.6.37.3/arch/x86/include/asm/mmu_context.h
20488 ---- linux-2.6.37.3/arch/x86/include/asm/mmu_context.h 2011-02-22 16:05:30.000000000 -0500
20489 -+++ linux-2.6.37.3/arch/x86/include/asm/mmu_context.h 2011-02-22 16:05:42.000000000 -0500
20490 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/mmu_context.h linux-2.6.37.4/arch/x86/include/asm/mmu_context.h
20491 +--- linux-2.6.37.4/arch/x86/include/asm/mmu_context.h 2011-02-22 16:05:30.000000000 -0500
20492 ++++ linux-2.6.37.4/arch/x86/include/asm/mmu_context.h 2011-02-22 16:05:42.000000000 -0500
20493 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
20494
20495 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
20496 @@ -8327,9 +8430,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/mmu_context.h linux-2.6.37.3/arch
20497 }
20498
20499 #define activate_mm(prev, next) \
20500 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/mmu.h linux-2.6.37.3/arch/x86/include/asm/mmu.h
20501 ---- linux-2.6.37.3/arch/x86/include/asm/mmu.h 2011-01-04 19:50:19.000000000 -0500
20502 -+++ linux-2.6.37.3/arch/x86/include/asm/mmu.h 2011-01-17 02:41:00.000000000 -0500
20503 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/mmu.h linux-2.6.37.4/arch/x86/include/asm/mmu.h
20504 +--- linux-2.6.37.4/arch/x86/include/asm/mmu.h 2011-01-04 19:50:19.000000000 -0500
20505 ++++ linux-2.6.37.4/arch/x86/include/asm/mmu.h 2011-01-17 02:41:00.000000000 -0500
20506 @@ -9,10 +9,23 @@
20507 * we put the segment information here.
20508 */
20509 @@ -8356,9 +8459,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/mmu.h linux-2.6.37.3/arch/x86/inc
20510 } mm_context_t;
20511
20512 #ifdef CONFIG_SMP
20513 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/module.h linux-2.6.37.3/arch/x86/include/asm/module.h
20514 ---- linux-2.6.37.3/arch/x86/include/asm/module.h 2011-01-04 19:50:19.000000000 -0500
20515 -+++ linux-2.6.37.3/arch/x86/include/asm/module.h 2011-01-17 02:41:00.000000000 -0500
20516 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/module.h linux-2.6.37.4/arch/x86/include/asm/module.h
20517 +--- linux-2.6.37.4/arch/x86/include/asm/module.h 2011-01-04 19:50:19.000000000 -0500
20518 ++++ linux-2.6.37.4/arch/x86/include/asm/module.h 2011-01-17 02:41:00.000000000 -0500
20519 @@ -59,8 +59,26 @@
20520 #error unknown processor family
20521 #endif
20522 @@ -8387,9 +8490,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/module.h linux-2.6.37.3/arch/x86/
20523 #endif
20524
20525 #endif /* _ASM_X86_MODULE_H */
20526 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/page_64_types.h linux-2.6.37.3/arch/x86/include/asm/page_64_types.h
20527 ---- linux-2.6.37.3/arch/x86/include/asm/page_64_types.h 2011-01-04 19:50:19.000000000 -0500
20528 -+++ linux-2.6.37.3/arch/x86/include/asm/page_64_types.h 2011-01-17 02:41:00.000000000 -0500
20529 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/page_64_types.h linux-2.6.37.4/arch/x86/include/asm/page_64_types.h
20530 +--- linux-2.6.37.4/arch/x86/include/asm/page_64_types.h 2011-01-04 19:50:19.000000000 -0500
20531 ++++ linux-2.6.37.4/arch/x86/include/asm/page_64_types.h 2011-01-17 02:41:00.000000000 -0500
20532 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
20533
20534 /* duplicated to the one in bootmem.h */
20535 @@ -8399,9 +8502,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/page_64_types.h linux-2.6.37.3/ar
20536
20537 extern unsigned long __phys_addr(unsigned long);
20538 #define __phys_reloc_hide(x) (x)
20539 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/paravirt.h linux-2.6.37.3/arch/x86/include/asm/paravirt.h
20540 ---- linux-2.6.37.3/arch/x86/include/asm/paravirt.h 2011-01-04 19:50:19.000000000 -0500
20541 -+++ linux-2.6.37.3/arch/x86/include/asm/paravirt.h 2011-01-17 02:41:00.000000000 -0500
20542 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/paravirt.h linux-2.6.37.4/arch/x86/include/asm/paravirt.h
20543 +--- linux-2.6.37.4/arch/x86/include/asm/paravirt.h 2011-01-04 19:50:19.000000000 -0500
20544 ++++ linux-2.6.37.4/arch/x86/include/asm/paravirt.h 2011-01-17 02:41:00.000000000 -0500
20545 @@ -715,6 +715,21 @@ static inline void __set_fixmap(unsigned
20546 pv_mmu_ops.set_fixmap(idx, phys, flags);
20547 }
20548 @@ -8455,9 +8558,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/paravirt.h linux-2.6.37.3/arch/x8
20549 #endif /* CONFIG_X86_32 */
20550
20551 #endif /* __ASSEMBLY__ */
20552 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/paravirt_types.h linux-2.6.37.3/arch/x86/include/asm/paravirt_types.h
20553 ---- linux-2.6.37.3/arch/x86/include/asm/paravirt_types.h 2011-01-04 19:50:19.000000000 -0500
20554 -+++ linux-2.6.37.3/arch/x86/include/asm/paravirt_types.h 2011-01-17 02:41:00.000000000 -0500
20555 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/paravirt_types.h linux-2.6.37.4/arch/x86/include/asm/paravirt_types.h
20556 +--- linux-2.6.37.4/arch/x86/include/asm/paravirt_types.h 2011-01-04 19:50:19.000000000 -0500
20557 ++++ linux-2.6.37.4/arch/x86/include/asm/paravirt_types.h 2011-01-17 02:41:00.000000000 -0500
20558 @@ -311,6 +311,12 @@ struct pv_mmu_ops {
20559 an mfn. We can tell which is which from the index. */
20560 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
20561 @@ -8471,9 +8574,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/paravirt_types.h linux-2.6.37.3/a
20562 };
20563
20564 struct arch_spinlock;
20565 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pci_x86.h linux-2.6.37.3/arch/x86/include/asm/pci_x86.h
20566 ---- linux-2.6.37.3/arch/x86/include/asm/pci_x86.h 2011-01-04 19:50:19.000000000 -0500
20567 -+++ linux-2.6.37.3/arch/x86/include/asm/pci_x86.h 2011-01-17 02:41:01.000000000 -0500
20568 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pci_x86.h linux-2.6.37.4/arch/x86/include/asm/pci_x86.h
20569 +--- linux-2.6.37.4/arch/x86/include/asm/pci_x86.h 2011-01-04 19:50:19.000000000 -0500
20570 ++++ linux-2.6.37.4/arch/x86/include/asm/pci_x86.h 2011-01-17 02:41:01.000000000 -0500
20571 @@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct
20572 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
20573
20574 @@ -8496,9 +8599,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pci_x86.h linux-2.6.37.3/arch/x86
20575 extern bool port_cf9_safe;
20576
20577 /* arch_initcall level */
20578 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgalloc.h linux-2.6.37.3/arch/x86/include/asm/pgalloc.h
20579 ---- linux-2.6.37.3/arch/x86/include/asm/pgalloc.h 2011-01-04 19:50:19.000000000 -0500
20580 -+++ linux-2.6.37.3/arch/x86/include/asm/pgalloc.h 2011-01-17 02:41:01.000000000 -0500
20581 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgalloc.h linux-2.6.37.4/arch/x86/include/asm/pgalloc.h
20582 +--- linux-2.6.37.4/arch/x86/include/asm/pgalloc.h 2011-01-04 19:50:19.000000000 -0500
20583 ++++ linux-2.6.37.4/arch/x86/include/asm/pgalloc.h 2011-01-17 02:41:01.000000000 -0500
20584 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
20585 pmd_t *pmd, pte_t *pte)
20586 {
20587 @@ -8513,9 +8616,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgalloc.h linux-2.6.37.3/arch/x86
20588 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
20589 }
20590
20591 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable-2level.h linux-2.6.37.3/arch/x86/include/asm/pgtable-2level.h
20592 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable-2level.h 2011-01-04 19:50:19.000000000 -0500
20593 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable-2level.h 2011-01-17 02:41:01.000000000 -0500
20594 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.37.4/arch/x86/include/asm/pgtable-2level.h
20595 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable-2level.h 2011-01-04 19:50:19.000000000 -0500
20596 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable-2level.h 2011-01-17 02:41:01.000000000 -0500
20597 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
20598
20599 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
20600 @@ -8526,9 +8629,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable-2level.h linux-2.6.37.3/a
20601 }
20602
20603 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
20604 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_32.h linux-2.6.37.3/arch/x86/include/asm/pgtable_32.h
20605 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
20606 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable_32.h 2011-01-17 02:41:01.000000000 -0500
20607 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable_32.h linux-2.6.37.4/arch/x86/include/asm/pgtable_32.h
20608 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
20609 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable_32.h 2011-01-17 02:41:01.000000000 -0500
20610 @@ -25,9 +25,6 @@
20611 struct mm_struct;
20612 struct vm_area_struct;
20613 @@ -8572,9 +8675,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_32.h linux-2.6.37.3/arch/
20614 /*
20615 * kern_addr_valid() is (1) for FLATMEM and (0) for
20616 * SPARSEMEM and DISCONTIGMEM
20617 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_32_types.h linux-2.6.37.3/arch/x86/include/asm/pgtable_32_types.h
20618 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable_32_types.h 2011-01-04 19:50:19.000000000 -0500
20619 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable_32_types.h 2011-01-17 02:41:01.000000000 -0500
20620 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.37.4/arch/x86/include/asm/pgtable_32_types.h
20621 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable_32_types.h 2011-01-04 19:50:19.000000000 -0500
20622 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable_32_types.h 2011-01-17 02:41:01.000000000 -0500
20623 @@ -8,7 +8,7 @@
20624 */
20625 #ifdef CONFIG_X86_PAE
20626 @@ -8604,9 +8707,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_32_types.h linux-2.6.37.3
20627 #define MODULES_VADDR VMALLOC_START
20628 #define MODULES_END VMALLOC_END
20629 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
20630 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable-3level.h linux-2.6.37.3/arch/x86/include/asm/pgtable-3level.h
20631 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable-3level.h 2011-01-04 19:50:19.000000000 -0500
20632 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable-3level.h 2011-01-17 02:41:01.000000000 -0500
20633 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.37.4/arch/x86/include/asm/pgtable-3level.h
20634 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable-3level.h 2011-01-04 19:50:19.000000000 -0500
20635 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable-3level.h 2011-01-17 02:41:01.000000000 -0500
20636 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
20637
20638 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
20639 @@ -8624,9 +8727,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable-3level.h linux-2.6.37.3/a
20640 }
20641
20642 /*
20643 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_64.h linux-2.6.37.3/arch/x86/include/asm/pgtable_64.h
20644 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable_64.h 2011-01-04 19:50:19.000000000 -0500
20645 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable_64.h 2011-01-17 02:41:01.000000000 -0500
20646 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable_64.h linux-2.6.37.4/arch/x86/include/asm/pgtable_64.h
20647 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable_64.h 2011-01-04 19:50:19.000000000 -0500
20648 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable_64.h 2011-01-17 02:41:01.000000000 -0500
20649 @@ -16,10 +16,13 @@
20650
20651 extern pud_t level3_kernel_pgt[512];
20652 @@ -8663,9 +8766,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_64.h linux-2.6.37.3/arch/
20653 }
20654
20655 static inline void native_pgd_clear(pgd_t *pgd)
20656 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_64_types.h linux-2.6.37.3/arch/x86/include/asm/pgtable_64_types.h
20657 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable_64_types.h 2011-01-04 19:50:19.000000000 -0500
20658 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable_64_types.h 2011-01-17 02:41:01.000000000 -0500
20659 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.37.4/arch/x86/include/asm/pgtable_64_types.h
20660 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable_64_types.h 2011-01-04 19:50:19.000000000 -0500
20661 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable_64_types.h 2011-01-17 02:41:01.000000000 -0500
20662 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
20663 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
20664 #define MODULES_END _AC(0xffffffffff000000, UL)
20665 @@ -8677,9 +8780,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_64_types.h linux-2.6.37.3
20666 +#define ktva_ktla(addr) (addr)
20667
20668 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
20669 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable.h linux-2.6.37.3/arch/x86/include/asm/pgtable.h
20670 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
20671 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable.h 2011-01-17 02:41:01.000000000 -0500
20672 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable.h linux-2.6.37.4/arch/x86/include/asm/pgtable.h
20673 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
20674 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable.h 2011-01-17 02:41:01.000000000 -0500
20675 @@ -78,12 +78,51 @@ extern struct mm_struct *pgd_page_get_mm
20676
20677 #define arch_end_context_switch(prev) do {} while(0)
20678 @@ -8849,9 +8952,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable.h linux-2.6.37.3/arch/x86
20679
20680 #include <asm-generic/pgtable.h>
20681 #endif /* __ASSEMBLY__ */
20682 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_types.h linux-2.6.37.3/arch/x86/include/asm/pgtable_types.h
20683 ---- linux-2.6.37.3/arch/x86/include/asm/pgtable_types.h 2011-01-04 19:50:19.000000000 -0500
20684 -+++ linux-2.6.37.3/arch/x86/include/asm/pgtable_types.h 2011-01-17 02:41:01.000000000 -0500
20685 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/pgtable_types.h linux-2.6.37.4/arch/x86/include/asm/pgtable_types.h
20686 +--- linux-2.6.37.4/arch/x86/include/asm/pgtable_types.h 2011-01-04 19:50:19.000000000 -0500
20687 ++++ linux-2.6.37.4/arch/x86/include/asm/pgtable_types.h 2011-01-17 02:41:01.000000000 -0500
20688 @@ -16,12 +16,11 @@
20689 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
20690 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
20691 @@ -8963,9 +9066,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/pgtable_types.h linux-2.6.37.3/ar
20692
20693 #define pgprot_writecombine pgprot_writecombine
20694 extern pgprot_t pgprot_writecombine(pgprot_t prot);
20695 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/processor.h linux-2.6.37.3/arch/x86/include/asm/processor.h
20696 ---- linux-2.6.37.3/arch/x86/include/asm/processor.h 2011-01-04 19:50:19.000000000 -0500
20697 -+++ linux-2.6.37.3/arch/x86/include/asm/processor.h 2011-01-17 02:41:01.000000000 -0500
20698 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/processor.h linux-2.6.37.4/arch/x86/include/asm/processor.h
20699 +--- linux-2.6.37.4/arch/x86/include/asm/processor.h 2011-01-04 19:50:19.000000000 -0500
20700 ++++ linux-2.6.37.4/arch/x86/include/asm/processor.h 2011-01-17 02:41:01.000000000 -0500
20701 @@ -271,7 +271,7 @@ struct tss_struct {
20702
20703 } ____cacheline_aligned;
20704 @@ -9050,9 +9153,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/processor.h linux-2.6.37.3/arch/x
20705 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
20706
20707 /* Get/set a process' ability to use the timestamp counter instruction */
20708 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/ptrace.h linux-2.6.37.3/arch/x86/include/asm/ptrace.h
20709 ---- linux-2.6.37.3/arch/x86/include/asm/ptrace.h 2011-01-04 19:50:19.000000000 -0500
20710 -+++ linux-2.6.37.3/arch/x86/include/asm/ptrace.h 2011-01-17 02:41:01.000000000 -0500
20711 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/ptrace.h linux-2.6.37.4/arch/x86/include/asm/ptrace.h
20712 +--- linux-2.6.37.4/arch/x86/include/asm/ptrace.h 2011-01-04 19:50:19.000000000 -0500
20713 ++++ linux-2.6.37.4/arch/x86/include/asm/ptrace.h 2011-01-17 02:41:01.000000000 -0500
20714 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_
20715 }
20716
20717 @@ -9089,9 +9192,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/ptrace.h linux-2.6.37.3/arch/x86/
20718 #endif
20719 }
20720
20721 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/reboot.h linux-2.6.37.3/arch/x86/include/asm/reboot.h
20722 ---- linux-2.6.37.3/arch/x86/include/asm/reboot.h 2011-01-04 19:50:19.000000000 -0500
20723 -+++ linux-2.6.37.3/arch/x86/include/asm/reboot.h 2011-01-17 02:41:01.000000000 -0500
20724 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/reboot.h linux-2.6.37.4/arch/x86/include/asm/reboot.h
20725 +--- linux-2.6.37.4/arch/x86/include/asm/reboot.h 2011-01-04 19:50:19.000000000 -0500
20726 ++++ linux-2.6.37.4/arch/x86/include/asm/reboot.h 2011-01-17 02:41:01.000000000 -0500
20727 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
20728
20729 void native_machine_crash_shutdown(struct pt_regs *regs);
20730 @@ -9101,9 +9204,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/reboot.h linux-2.6.37.3/arch/x86/
20731
20732 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
20733 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
20734 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/rwsem.h linux-2.6.37.3/arch/x86/include/asm/rwsem.h
20735 ---- linux-2.6.37.3/arch/x86/include/asm/rwsem.h 2011-01-04 19:50:19.000000000 -0500
20736 -+++ linux-2.6.37.3/arch/x86/include/asm/rwsem.h 2011-01-17 02:41:01.000000000 -0500
20737 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/rwsem.h linux-2.6.37.4/arch/x86/include/asm/rwsem.h
20738 +--- linux-2.6.37.4/arch/x86/include/asm/rwsem.h 2011-01-04 19:50:19.000000000 -0500
20739 ++++ linux-2.6.37.4/arch/x86/include/asm/rwsem.h 2011-01-17 02:41:01.000000000 -0500
20740 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw
20741 {
20742 asm volatile("# beginning down_read\n\t"
20743 @@ -9228,9 +9331,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/rwsem.h linux-2.6.37.3/arch/x86/i
20744 : "+r" (tmp), "+m" (sem->count)
20745 : : "memory");
20746
20747 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/segment.h linux-2.6.37.3/arch/x86/include/asm/segment.h
20748 ---- linux-2.6.37.3/arch/x86/include/asm/segment.h 2011-01-04 19:50:19.000000000 -0500
20749 -+++ linux-2.6.37.3/arch/x86/include/asm/segment.h 2011-01-17 02:41:01.000000000 -0500
20750 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/segment.h linux-2.6.37.4/arch/x86/include/asm/segment.h
20751 +--- linux-2.6.37.4/arch/x86/include/asm/segment.h 2011-01-04 19:50:19.000000000 -0500
20752 ++++ linux-2.6.37.4/arch/x86/include/asm/segment.h 2011-01-17 02:41:01.000000000 -0500
20753 @@ -62,8 +62,8 @@
20754 * 26 - ESPFIX small SS
20755 * 27 - per-cpu [ offset to per-cpu data area ]
20756 @@ -9290,9 +9393,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/segment.h linux-2.6.37.3/arch/x86
20757 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
20758 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
20759 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
20760 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/smp.h linux-2.6.37.3/arch/x86/include/asm/smp.h
20761 ---- linux-2.6.37.3/arch/x86/include/asm/smp.h 2011-01-04 19:50:19.000000000 -0500
20762 -+++ linux-2.6.37.3/arch/x86/include/asm/smp.h 2011-01-17 02:41:01.000000000 -0500
20763 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/smp.h linux-2.6.37.4/arch/x86/include/asm/smp.h
20764 +--- linux-2.6.37.4/arch/x86/include/asm/smp.h 2011-01-04 19:50:19.000000000 -0500
20765 ++++ linux-2.6.37.4/arch/x86/include/asm/smp.h 2011-01-17 02:41:01.000000000 -0500
20766 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
20767 DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
20768 DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
20769 @@ -9302,9 +9405,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/smp.h linux-2.6.37.3/arch/x86/inc
20770
20771 static inline struct cpumask *cpu_sibling_mask(int cpu)
20772 {
20773 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/spinlock.h linux-2.6.37.3/arch/x86/include/asm/spinlock.h
20774 ---- linux-2.6.37.3/arch/x86/include/asm/spinlock.h 2011-01-04 19:50:19.000000000 -0500
20775 -+++ linux-2.6.37.3/arch/x86/include/asm/spinlock.h 2011-01-17 02:41:01.000000000 -0500
20776 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/spinlock.h linux-2.6.37.4/arch/x86/include/asm/spinlock.h
20777 +--- linux-2.6.37.4/arch/x86/include/asm/spinlock.h 2011-01-04 19:50:19.000000000 -0500
20778 ++++ linux-2.6.37.4/arch/x86/include/asm/spinlock.h 2011-01-17 02:41:01.000000000 -0500
20779 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
20780 static inline void arch_read_lock(arch_rwlock_t *rw)
20781 {
20782 @@ -9367,9 +9470,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/spinlock.h linux-2.6.37.3/arch/x8
20783 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
20784 }
20785
20786 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/stackprotector.h linux-2.6.37.3/arch/x86/include/asm/stackprotector.h
20787 ---- linux-2.6.37.3/arch/x86/include/asm/stackprotector.h 2011-01-04 19:50:19.000000000 -0500
20788 -+++ linux-2.6.37.3/arch/x86/include/asm/stackprotector.h 2011-01-17 02:41:01.000000000 -0500
20789 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/stackprotector.h linux-2.6.37.4/arch/x86/include/asm/stackprotector.h
20790 +--- linux-2.6.37.4/arch/x86/include/asm/stackprotector.h 2011-01-04 19:50:19.000000000 -0500
20791 ++++ linux-2.6.37.4/arch/x86/include/asm/stackprotector.h 2011-01-17 02:41:01.000000000 -0500
20792 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
20793
20794 static inline void load_stack_canary_segment(void)
20795 @@ -9379,9 +9482,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/stackprotector.h linux-2.6.37.3/a
20796 asm volatile ("mov %0, %%gs" : : "r" (0));
20797 #endif
20798 }
20799 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/system.h linux-2.6.37.3/arch/x86/include/asm/system.h
20800 ---- linux-2.6.37.3/arch/x86/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
20801 -+++ linux-2.6.37.3/arch/x86/include/asm/system.h 2011-01-17 02:41:01.000000000 -0500
20802 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/system.h linux-2.6.37.4/arch/x86/include/asm/system.h
20803 +--- linux-2.6.37.4/arch/x86/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
20804 ++++ linux-2.6.37.4/arch/x86/include/asm/system.h 2011-01-17 02:41:01.000000000 -0500
20805 @@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
20806 {
20807 unsigned long __limit;
20808 @@ -9400,9 +9503,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/system.h linux-2.6.37.3/arch/x86/
20809 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
20810
20811 void default_idle(void);
20812 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess_32.h linux-2.6.37.3/arch/x86/include/asm/uaccess_32.h
20813 ---- linux-2.6.37.3/arch/x86/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
20814 -+++ linux-2.6.37.3/arch/x86/include/asm/uaccess_32.h 2011-01-17 02:41:01.000000000 -0500
20815 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/uaccess_32.h linux-2.6.37.4/arch/x86/include/asm/uaccess_32.h
20816 +--- linux-2.6.37.4/arch/x86/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
20817 ++++ linux-2.6.37.4/arch/x86/include/asm/uaccess_32.h 2011-01-17 02:41:01.000000000 -0500
20818 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
20819 static __always_inline unsigned long __must_check
20820 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20821 @@ -9559,9 +9662,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess_32.h linux-2.6.37.3/arch/
20822 return n;
20823 }
20824
20825 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess_64.h linux-2.6.37.3/arch/x86/include/asm/uaccess_64.h
20826 ---- linux-2.6.37.3/arch/x86/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
20827 -+++ linux-2.6.37.3/arch/x86/include/asm/uaccess_64.h 2011-01-17 02:41:01.000000000 -0500
20828 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/uaccess_64.h linux-2.6.37.4/arch/x86/include/asm/uaccess_64.h
20829 +--- linux-2.6.37.4/arch/x86/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
20830 ++++ linux-2.6.37.4/arch/x86/include/asm/uaccess_64.h 2011-01-17 02:41:01.000000000 -0500
20831 @@ -11,6 +11,9 @@
20832 #include <asm/alternative.h>
20833 #include <asm/cpufeature.h>
20834 @@ -9934,9 +10037,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess_64.h linux-2.6.37.3/arch/
20835 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20836
20837 #endif /* _ASM_X86_UACCESS_64_H */
20838 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86/include/asm/uaccess.h
20839 ---- linux-2.6.37.3/arch/x86/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
20840 -+++ linux-2.6.37.3/arch/x86/include/asm/uaccess.h 2011-03-12 22:50:25.000000000 -0500
20841 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/uaccess.h linux-2.6.37.4/arch/x86/include/asm/uaccess.h
20842 +--- linux-2.6.37.4/arch/x86/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
20843 ++++ linux-2.6.37.4/arch/x86/include/asm/uaccess.h 2011-03-12 22:50:25.000000000 -0500
20844 @@ -8,12 +8,15 @@
20845 #include <linux/thread_info.h>
20846 #include <linux/prefetch.h>
20847 @@ -10155,9 +10258,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
20848 #ifdef CONFIG_X86_32
20849 # include "uaccess_32.h"
20850 #else
20851 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/vgtod.h linux-2.6.37.3/arch/x86/include/asm/vgtod.h
20852 ---- linux-2.6.37.3/arch/x86/include/asm/vgtod.h 2011-01-04 19:50:19.000000000 -0500
20853 -+++ linux-2.6.37.3/arch/x86/include/asm/vgtod.h 2011-01-17 02:41:01.000000000 -0500
20854 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/vgtod.h linux-2.6.37.4/arch/x86/include/asm/vgtod.h
20855 +--- linux-2.6.37.4/arch/x86/include/asm/vgtod.h 2011-01-04 19:50:19.000000000 -0500
20856 ++++ linux-2.6.37.4/arch/x86/include/asm/vgtod.h 2011-01-17 02:41:01.000000000 -0500
20857 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
20858 int sysctl_enabled;
20859 struct timezone sys_tz;
20860 @@ -10166,9 +10269,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/vgtod.h linux-2.6.37.3/arch/x86/i
20861 cycle_t (*vread)(void);
20862 cycle_t cycle_last;
20863 cycle_t mask;
20864 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/vsyscall.h linux-2.6.37.3/arch/x86/include/asm/vsyscall.h
20865 ---- linux-2.6.37.3/arch/x86/include/asm/vsyscall.h 2011-01-04 19:50:19.000000000 -0500
20866 -+++ linux-2.6.37.3/arch/x86/include/asm/vsyscall.h 2011-01-17 02:41:01.000000000 -0500
20867 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/vsyscall.h linux-2.6.37.4/arch/x86/include/asm/vsyscall.h
20868 +--- linux-2.6.37.4/arch/x86/include/asm/vsyscall.h 2011-01-04 19:50:19.000000000 -0500
20869 ++++ linux-2.6.37.4/arch/x86/include/asm/vsyscall.h 2011-01-17 02:41:01.000000000 -0500
20870 @@ -15,9 +15,10 @@ enum vsyscall_num {
20871
20872 #ifdef __KERNEL__
20873 @@ -10199,9 +10302,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/vsyscall.h linux-2.6.37.3/arch/x8
20874 #endif /* __KERNEL__ */
20875
20876 #endif /* _ASM_X86_VSYSCALL_H */
20877 -diff -urNp linux-2.6.37.3/arch/x86/include/asm/xsave.h linux-2.6.37.3/arch/x86/include/asm/xsave.h
20878 ---- linux-2.6.37.3/arch/x86/include/asm/xsave.h 2011-01-04 19:50:19.000000000 -0500
20879 -+++ linux-2.6.37.3/arch/x86/include/asm/xsave.h 2011-01-17 02:41:01.000000000 -0500
20880 +diff -urNp linux-2.6.37.4/arch/x86/include/asm/xsave.h linux-2.6.37.4/arch/x86/include/asm/xsave.h
20881 +--- linux-2.6.37.4/arch/x86/include/asm/xsave.h 2011-01-04 19:50:19.000000000 -0500
20882 ++++ linux-2.6.37.4/arch/x86/include/asm/xsave.h 2011-01-17 02:41:01.000000000 -0500
20883 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
20884 {
20885 int err;
20886 @@ -10226,9 +10329,9 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/xsave.h linux-2.6.37.3/arch/x86/i
20887 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20888 "2:\n"
20889 ".section .fixup,\"ax\"\n"
20890 -diff -urNp linux-2.6.37.3/arch/x86/Kconfig linux-2.6.37.3/arch/x86/Kconfig
20891 ---- linux-2.6.37.3/arch/x86/Kconfig 2011-02-22 16:05:30.000000000 -0500
20892 -+++ linux-2.6.37.3/arch/x86/Kconfig 2011-02-22 16:05:42.000000000 -0500
20893 +diff -urNp linux-2.6.37.4/arch/x86/Kconfig linux-2.6.37.4/arch/x86/Kconfig
20894 +--- linux-2.6.37.4/arch/x86/Kconfig 2011-02-22 16:05:30.000000000 -0500
20895 ++++ linux-2.6.37.4/arch/x86/Kconfig 2011-02-22 16:05:42.000000000 -0500
20896 @@ -225,7 +225,7 @@ config X86_TRAMPOLINE
20897
20898 config X86_32_LAZY_GS
20899 @@ -10310,9 +10413,9 @@ diff -urNp linux-2.6.37.3/arch/x86/Kconfig linux-2.6.37.3/arch/x86/Kconfig
20900 ---help---
20901 Map the 32-bit VDSO to the predictable old-style address too.
20902
20903 -diff -urNp linux-2.6.37.3/arch/x86/Kconfig.cpu linux-2.6.37.3/arch/x86/Kconfig.cpu
20904 ---- linux-2.6.37.3/arch/x86/Kconfig.cpu 2011-01-04 19:50:19.000000000 -0500
20905 -+++ linux-2.6.37.3/arch/x86/Kconfig.cpu 2011-01-17 02:41:01.000000000 -0500
20906 +diff -urNp linux-2.6.37.4/arch/x86/Kconfig.cpu linux-2.6.37.4/arch/x86/Kconfig.cpu
20907 +--- linux-2.6.37.4/arch/x86/Kconfig.cpu 2011-01-04 19:50:19.000000000 -0500
20908 ++++ linux-2.6.37.4/arch/x86/Kconfig.cpu 2011-01-17 02:41:01.000000000 -0500
20909 @@ -336,7 +336,7 @@ config X86_PPRO_FENCE
20910
20911 config X86_F00F_BUG
20912 @@ -10340,9 +10443,9 @@ diff -urNp linux-2.6.37.3/arch/x86/Kconfig.cpu linux-2.6.37.3/arch/x86/Kconfig.c
20913
20914 config X86_MINIMUM_CPU_FAMILY
20915 int
20916 -diff -urNp linux-2.6.37.3/arch/x86/Kconfig.debug linux-2.6.37.3/arch/x86/Kconfig.debug
20917 ---- linux-2.6.37.3/arch/x86/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
20918 -+++ linux-2.6.37.3/arch/x86/Kconfig.debug 2011-01-17 02:41:01.000000000 -0500
20919 +diff -urNp linux-2.6.37.4/arch/x86/Kconfig.debug linux-2.6.37.4/arch/x86/Kconfig.debug
20920 +--- linux-2.6.37.4/arch/x86/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
20921 ++++ linux-2.6.37.4/arch/x86/Kconfig.debug 2011-01-17 02:41:01.000000000 -0500
20922 @@ -101,7 +101,7 @@ config X86_PTDUMP
20923 config DEBUG_RODATA
20924 bool "Write protect kernel read-only data structures"
20925 @@ -10352,9 +10455,9 @@ diff -urNp linux-2.6.37.3/arch/x86/Kconfig.debug linux-2.6.37.3/arch/x86/Kconfig
20926 ---help---
20927 Mark the kernel read-only data as write-protected in the pagetables,
20928 in order to catch accidental (and incorrect) writes to such const
20929 -diff -urNp linux-2.6.37.3/arch/x86/kernel/acpi/boot.c linux-2.6.37.3/arch/x86/kernel/acpi/boot.c
20930 ---- linux-2.6.37.3/arch/x86/kernel/acpi/boot.c 2011-03-11 17:22:42.000000000 -0500
20931 -+++ linux-2.6.37.3/arch/x86/kernel/acpi/boot.c 2011-03-11 17:22:59.000000000 -0500
20932 +diff -urNp linux-2.6.37.4/arch/x86/kernel/acpi/boot.c linux-2.6.37.4/arch/x86/kernel/acpi/boot.c
20933 +--- linux-2.6.37.4/arch/x86/kernel/acpi/boot.c 2011-03-11 17:22:42.000000000 -0500
20934 ++++ linux-2.6.37.4/arch/x86/kernel/acpi/boot.c 2011-03-11 17:22:59.000000000 -0500
20935 @@ -1504,7 +1504,7 @@ static struct dmi_system_id __initdata a
20936 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
20937 },
20938 @@ -10364,9 +10467,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/acpi/boot.c linux-2.6.37.3/arch/x86/ke
20939 };
20940
20941 /*
20942 -diff -urNp linux-2.6.37.3/arch/x86/kernel/acpi/sleep.c linux-2.6.37.3/arch/x86/kernel/acpi/sleep.c
20943 ---- linux-2.6.37.3/arch/x86/kernel/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
20944 -+++ linux-2.6.37.3/arch/x86/kernel/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
20945 +diff -urNp linux-2.6.37.4/arch/x86/kernel/acpi/sleep.c linux-2.6.37.4/arch/x86/kernel/acpi/sleep.c
20946 +--- linux-2.6.37.4/arch/x86/kernel/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
20947 ++++ linux-2.6.37.4/arch/x86/kernel/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
20948 @@ -12,6 +12,7 @@
20949 #include <linux/cpumask.h>
20950 #include <asm/segment.h>
20951 @@ -10397,9 +10500,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/acpi/sleep.c linux-2.6.37.3/arch/x86/k
20952 initial_gs = per_cpu_offset(smp_processor_id());
20953 #endif
20954 initial_code = (unsigned long)wakeup_long64;
20955 -diff -urNp linux-2.6.37.3/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.37.3/arch/x86/kernel/acpi/wakeup_32.S
20956 ---- linux-2.6.37.3/arch/x86/kernel/acpi/wakeup_32.S 2011-01-04 19:50:19.000000000 -0500
20957 -+++ linux-2.6.37.3/arch/x86/kernel/acpi/wakeup_32.S 2011-01-17 02:41:01.000000000 -0500
20958 +diff -urNp linux-2.6.37.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.37.4/arch/x86/kernel/acpi/wakeup_32.S
20959 +--- linux-2.6.37.4/arch/x86/kernel/acpi/wakeup_32.S 2011-01-04 19:50:19.000000000 -0500
20960 ++++ linux-2.6.37.4/arch/x86/kernel/acpi/wakeup_32.S 2011-01-17 02:41:01.000000000 -0500
20961 @@ -30,13 +30,11 @@ wakeup_pmode_return:
20962 # and restore the stack ... but you need gdt for this to work
20963 movl saved_context_esp, %esp
20964 @@ -10416,9 +10519,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.37.3/arch/x
20965
20966 bogus_magic:
20967 jmp bogus_magic
20968 -diff -urNp linux-2.6.37.3/arch/x86/kernel/alternative.c linux-2.6.37.3/arch/x86/kernel/alternative.c
20969 ---- linux-2.6.37.3/arch/x86/kernel/alternative.c 2011-01-04 19:50:19.000000000 -0500
20970 -+++ linux-2.6.37.3/arch/x86/kernel/alternative.c 2011-01-17 02:41:01.000000000 -0500
20971 +diff -urNp linux-2.6.37.4/arch/x86/kernel/alternative.c linux-2.6.37.4/arch/x86/kernel/alternative.c
20972 +--- linux-2.6.37.4/arch/x86/kernel/alternative.c 2011-01-04 19:50:19.000000000 -0500
20973 ++++ linux-2.6.37.4/arch/x86/kernel/alternative.c 2011-03-21 17:35:08.000000000 -0400
20974 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const
20975 if (!*poff || ptr < text || ptr >= text_end)
20976 continue;
20977 @@ -10520,7 +10623,21 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/alternative.c linux-2.6.37.3/arch/x86/
20978 return addr;
20979 }
20980
20981 -@@ -645,9 +635,9 @@ void *__kprobes text_poke_smp(void *addr
20982 +@@ -612,6 +602,13 @@ static int __kprobes stop_machine_text_p
20983 +
20984 + flush_icache_range((unsigned long)tpp->addr,
20985 + (unsigned long)tpp->addr + tpp->len);
20986 ++
20987 ++ /*
20988 ++ * Intel Archiecture Software Developer's Manual section 7.1.3 specifies
20989 ++ * that a core serializing instruction such as "cpuid" should be
20990 ++ * executed on _each_ core before the new instruction is made visible.
20991 ++ */
20992 ++ sync_core();
20993 + return 0;
20994 + }
20995 +
20996 +@@ -645,9 +642,9 @@ void *__kprobes text_poke_smp(void *addr
20997 #if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
20998
20999 #ifdef CONFIG_X86_64
21000 @@ -10532,9 +10649,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/alternative.c linux-2.6.37.3/arch/x86/
21001 #endif
21002
21003 void __init arch_init_ideal_nop5(void)
21004 -diff -urNp linux-2.6.37.3/arch/x86/kernel/amd_iommu.c linux-2.6.37.3/arch/x86/kernel/amd_iommu.c
21005 ---- linux-2.6.37.3/arch/x86/kernel/amd_iommu.c 2011-01-04 19:50:19.000000000 -0500
21006 -+++ linux-2.6.37.3/arch/x86/kernel/amd_iommu.c 2011-01-17 02:41:01.000000000 -0500
21007 +diff -urNp linux-2.6.37.4/arch/x86/kernel/amd_iommu.c linux-2.6.37.4/arch/x86/kernel/amd_iommu.c
21008 +--- linux-2.6.37.4/arch/x86/kernel/amd_iommu.c 2011-01-04 19:50:19.000000000 -0500
21009 ++++ linux-2.6.37.4/arch/x86/kernel/amd_iommu.c 2011-01-17 02:41:01.000000000 -0500
21010 @@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(
21011 }
21012 }
21013 @@ -10544,9 +10661,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/amd_iommu.c linux-2.6.37.3/arch/x86/ke
21014 .alloc_coherent = alloc_coherent,
21015 .free_coherent = free_coherent,
21016 .map_page = map_page,
21017 -diff -urNp linux-2.6.37.3/arch/x86/kernel/apic/io_apic.c linux-2.6.37.3/arch/x86/kernel/apic/io_apic.c
21018 ---- linux-2.6.37.3/arch/x86/kernel/apic/io_apic.c 2011-01-04 19:50:19.000000000 -0500
21019 -+++ linux-2.6.37.3/arch/x86/kernel/apic/io_apic.c 2011-01-17 02:41:01.000000000 -0500
21020 +diff -urNp linux-2.6.37.4/arch/x86/kernel/apic/io_apic.c linux-2.6.37.4/arch/x86/kernel/apic/io_apic.c
21021 +--- linux-2.6.37.4/arch/x86/kernel/apic/io_apic.c 2011-01-04 19:50:19.000000000 -0500
21022 ++++ linux-2.6.37.4/arch/x86/kernel/apic/io_apic.c 2011-01-17 02:41:01.000000000 -0500
21023 @@ -597,7 +597,7 @@ struct IO_APIC_route_entry **alloc_ioapi
21024 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
21025 GFP_KERNEL);
21026 @@ -10583,9 +10700,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/apic/io_apic.c linux-2.6.37.3/arch/x86
21027 {
21028 raw_spin_unlock(&vector_lock);
21029 }
21030 -diff -urNp linux-2.6.37.3/arch/x86/kernel/apm_32.c linux-2.6.37.3/arch/x86/kernel/apm_32.c
21031 ---- linux-2.6.37.3/arch/x86/kernel/apm_32.c 2011-01-04 19:50:19.000000000 -0500
21032 -+++ linux-2.6.37.3/arch/x86/kernel/apm_32.c 2011-01-17 02:41:01.000000000 -0500
21033 +diff -urNp linux-2.6.37.4/arch/x86/kernel/apm_32.c linux-2.6.37.4/arch/x86/kernel/apm_32.c
21034 +--- linux-2.6.37.4/arch/x86/kernel/apm_32.c 2011-01-04 19:50:19.000000000 -0500
21035 ++++ linux-2.6.37.4/arch/x86/kernel/apm_32.c 2011-01-17 02:41:01.000000000 -0500
21036 @@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
21037 * This is for buggy BIOS's that refer to (real mode) segment 0x40
21038 * even though they are called in protected mode.
21039 @@ -10687,9 +10804,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/apm_32.c linux-2.6.37.3/arch/x86/kerne
21040
21041 proc_create("apm", 0, NULL, &apm_file_ops);
21042
21043 -diff -urNp linux-2.6.37.3/arch/x86/kernel/asm-offsets_32.c linux-2.6.37.3/arch/x86/kernel/asm-offsets_32.c
21044 ---- linux-2.6.37.3/arch/x86/kernel/asm-offsets_32.c 2011-01-04 19:50:19.000000000 -0500
21045 -+++ linux-2.6.37.3/arch/x86/kernel/asm-offsets_32.c 2011-01-17 02:41:01.000000000 -0500
21046 +diff -urNp linux-2.6.37.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.37.4/arch/x86/kernel/asm-offsets_32.c
21047 +--- linux-2.6.37.4/arch/x86/kernel/asm-offsets_32.c 2011-01-04 19:50:19.000000000 -0500
21048 ++++ linux-2.6.37.4/arch/x86/kernel/asm-offsets_32.c 2011-01-17 02:41:01.000000000 -0500
21049 @@ -113,6 +113,11 @@ void foo(void)
21050 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
21051 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21052 @@ -10702,9 +10819,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/asm-offsets_32.c linux-2.6.37.3/arch/x
21053 #endif
21054
21055 #ifdef CONFIG_XEN
21056 -diff -urNp linux-2.6.37.3/arch/x86/kernel/asm-offsets_64.c linux-2.6.37.3/arch/x86/kernel/asm-offsets_64.c
21057 ---- linux-2.6.37.3/arch/x86/kernel/asm-offsets_64.c 2011-01-04 19:50:19.000000000 -0500
21058 -+++ linux-2.6.37.3/arch/x86/kernel/asm-offsets_64.c 2011-01-17 02:41:01.000000000 -0500
21059 +diff -urNp linux-2.6.37.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.37.4/arch/x86/kernel/asm-offsets_64.c
21060 +--- linux-2.6.37.4/arch/x86/kernel/asm-offsets_64.c 2011-01-04 19:50:19.000000000 -0500
21061 ++++ linux-2.6.37.4/arch/x86/kernel/asm-offsets_64.c 2011-01-17 02:41:01.000000000 -0500
21062 @@ -63,6 +63,18 @@ int main(void)
21063 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21064 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
21065 @@ -10732,9 +10849,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/asm-offsets_64.c linux-2.6.37.3/arch/x
21066 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
21067 BLANK();
21068 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
21069 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/common.c linux-2.6.37.3/arch/x86/kernel/cpu/common.c
21070 ---- linux-2.6.37.3/arch/x86/kernel/cpu/common.c 2011-01-04 19:50:19.000000000 -0500
21071 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/common.c 2011-01-17 02:41:01.000000000 -0500
21072 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/common.c linux-2.6.37.4/arch/x86/kernel/cpu/common.c
21073 +--- linux-2.6.37.4/arch/x86/kernel/cpu/common.c 2011-01-04 19:50:19.000000000 -0500
21074 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/common.c 2011-01-17 02:41:01.000000000 -0500
21075 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
21076
21077 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
21078 @@ -10860,9 +10977,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/common.c linux-2.6.37.3/arch/x86/k
21079 struct thread_struct *thread = &curr->thread;
21080
21081 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
21082 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
21083 ---- linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-04 19:50:19.000000000 -0500
21084 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-17 02:41:01.000000000 -0500
21085 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
21086 +--- linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-04 19:50:19.000000000 -0500
21087 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-17 02:41:01.000000000 -0500
21088 @@ -481,7 +481,7 @@ static const struct dmi_system_id sw_any
21089 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
21090 },
21091 @@ -10872,9 +10989,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3
21092 };
21093
21094 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
21095 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
21096 ---- linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-04 19:50:19.000000000 -0500
21097 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-17 02:41:01.000000000 -0500
21098 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
21099 +--- linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-04 19:50:19.000000000 -0500
21100 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-17 02:41:01.000000000 -0500
21101 @@ -226,7 +226,7 @@ static struct cpu_model models[] =
21102 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
21103 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
21104 @@ -10884,9 +11001,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux
21105 };
21106 #undef _BANIAS
21107 #undef BANIAS
21108 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/intel.c linux-2.6.37.3/arch/x86/kernel/cpu/intel.c
21109 ---- linux-2.6.37.3/arch/x86/kernel/cpu/intel.c 2011-01-04 19:50:19.000000000 -0500
21110 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/intel.c 2011-01-17 02:41:01.000000000 -0500
21111 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/intel.c linux-2.6.37.4/arch/x86/kernel/cpu/intel.c
21112 +--- linux-2.6.37.4/arch/x86/kernel/cpu/intel.c 2011-01-04 19:50:19.000000000 -0500
21113 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/intel.c 2011-01-17 02:41:01.000000000 -0500
21114 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
21115 * Update the IDT descriptor and reload the IDT so that
21116 * it uses the read-only mapped virtual address.
21117 @@ -10896,9 +11013,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/intel.c linux-2.6.37.3/arch/x86/ke
21118 load_idt(&idt_descr);
21119 }
21120 #endif
21121 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/Makefile linux-2.6.37.3/arch/x86/kernel/cpu/Makefile
21122 ---- linux-2.6.37.3/arch/x86/kernel/cpu/Makefile 2011-01-04 19:50:19.000000000 -0500
21123 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/Makefile 2011-01-17 02:41:01.000000000 -0500
21124 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/Makefile linux-2.6.37.4/arch/x86/kernel/cpu/Makefile
21125 +--- linux-2.6.37.4/arch/x86/kernel/cpu/Makefile 2011-01-04 19:50:19.000000000 -0500
21126 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/Makefile 2011-01-17 02:41:01.000000000 -0500
21127 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21128 CFLAGS_REMOVE_perf_event.o = -pg
21129 endif
21130 @@ -10910,9 +11027,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/Makefile linux-2.6.37.3/arch/x86/k
21131 obj-y := intel_cacheinfo.o scattered.o topology.o
21132 obj-y += proc.o capflags.o powerflags.o common.o
21133 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
21134 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37.3/arch/x86/kernel/cpu/mcheck/mce.c
21135 ---- linux-2.6.37.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-04 19:50:19.000000000 -0500
21136 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:56.000000000 -0500
21137 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37.4/arch/x86/kernel/cpu/mcheck/mce.c
21138 +--- linux-2.6.37.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-04 19:50:19.000000000 -0500
21139 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:56.000000000 -0500
21140 @@ -45,6 +45,7 @@
21141 #include <asm/ipi.h>
21142 #include <asm/mce.h>
21143 @@ -10973,9 +11090,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37.3/arch/x
21144 };
21145
21146 /*
21147 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/generic.c
21148 ---- linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-04 19:50:19.000000000 -0500
21149 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-17 02:41:01.000000000 -0500
21150 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/generic.c
21151 +--- linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-04 19:50:19.000000000 -0500
21152 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-17 02:41:01.000000000 -0500
21153 @@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra
21154 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
21155 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
21156 @@ -10985,9 +11102,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.37.3/arch
21157 };
21158
21159 static unsigned long smp_changes_mask;
21160 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/main.c
21161 ---- linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 16:05:30.000000000 -0500
21162 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 16:05:42.000000000 -0500
21163 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/main.c
21164 +--- linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 16:05:30.000000000 -0500
21165 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 16:05:42.000000000 -0500
21166 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21167 u64 size_or_mask, size_and_mask;
21168 static bool mtrr_aps_delayed_init;
21169 @@ -10997,9 +11114,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.37.3/arch/x8
21170
21171 const struct mtrr_ops *mtrr_if;
21172
21173 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/mtrr.h
21174 ---- linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-04 19:50:19.000000000 -0500
21175 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-17 02:41:01.000000000 -0500
21176 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/mtrr.h
21177 +--- linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-04 19:50:19.000000000 -0500
21178 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-17 02:41:01.000000000 -0500
21179 @@ -12,19 +12,19 @@
21180 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
21181
21182 @@ -11028,9 +11145,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.37.3/arch/x8
21183 };
21184
21185 extern int generic_get_free_region(unsigned long base, unsigned long size,
21186 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.37.3/arch/x86/kernel/cpu/perfctr-watchdog.c
21187 ---- linux-2.6.37.3/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-04 19:50:19.000000000 -0500
21188 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-17 02:41:01.000000000 -0500
21189 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.37.4/arch/x86/kernel/cpu/perfctr-watchdog.c
21190 +--- linux-2.6.37.4/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-04 19:50:19.000000000 -0500
21191 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-17 02:41:01.000000000 -0500
21192 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
21193
21194 /* Interface defining a CPU specific perfctr watchdog */
21195 @@ -11064,9 +11181,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.37.3/
21196 static struct wd_ops intel_arch_wd_ops __read_mostly = {
21197 .reserve = single_msr_reserve,
21198 .unreserve = single_msr_unreserve,
21199 -diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/perf_event.c linux-2.6.37.3/arch/x86/kernel/cpu/perf_event.c
21200 ---- linux-2.6.37.3/arch/x86/kernel/cpu/perf_event.c 2011-01-04 19:50:19.000000000 -0500
21201 -+++ linux-2.6.37.3/arch/x86/kernel/cpu/perf_event.c 2011-01-17 02:41:01.000000000 -0500
21202 +diff -urNp linux-2.6.37.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.37.4/arch/x86/kernel/cpu/perf_event.c
21203 +--- linux-2.6.37.4/arch/x86/kernel/cpu/perf_event.c 2011-01-04 19:50:19.000000000 -0500
21204 ++++ linux-2.6.37.4/arch/x86/kernel/cpu/perf_event.c 2011-01-17 02:41:01.000000000 -0500
21205 @@ -1757,7 +1757,7 @@ perf_callchain_user(struct perf_callchai
21206 break;
21207
21208 @@ -11076,9 +11193,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/cpu/perf_event.c linux-2.6.37.3/arch/x
21209 }
21210 }
21211
21212 -diff -urNp linux-2.6.37.3/arch/x86/kernel/crash.c linux-2.6.37.3/arch/x86/kernel/crash.c
21213 ---- linux-2.6.37.3/arch/x86/kernel/crash.c 2011-01-04 19:50:19.000000000 -0500
21214 -+++ linux-2.6.37.3/arch/x86/kernel/crash.c 2011-01-17 02:41:01.000000000 -0500
21215 +diff -urNp linux-2.6.37.4/arch/x86/kernel/crash.c linux-2.6.37.4/arch/x86/kernel/crash.c
21216 +--- linux-2.6.37.4/arch/x86/kernel/crash.c 2011-01-04 19:50:19.000000000 -0500
21217 ++++ linux-2.6.37.4/arch/x86/kernel/crash.c 2011-01-17 02:41:01.000000000 -0500
21218 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
21219 regs = args->regs;
21220
21221 @@ -11088,9 +11205,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/crash.c linux-2.6.37.3/arch/x86/kernel
21222 crash_fixup_ss_esp(&fixed_regs, regs);
21223 regs = &fixed_regs;
21224 }
21225 -diff -urNp linux-2.6.37.3/arch/x86/kernel/doublefault_32.c linux-2.6.37.3/arch/x86/kernel/doublefault_32.c
21226 ---- linux-2.6.37.3/arch/x86/kernel/doublefault_32.c 2011-01-04 19:50:19.000000000 -0500
21227 -+++ linux-2.6.37.3/arch/x86/kernel/doublefault_32.c 2011-01-17 02:41:01.000000000 -0500
21228 +diff -urNp linux-2.6.37.4/arch/x86/kernel/doublefault_32.c linux-2.6.37.4/arch/x86/kernel/doublefault_32.c
21229 +--- linux-2.6.37.4/arch/x86/kernel/doublefault_32.c 2011-01-04 19:50:19.000000000 -0500
21230 ++++ linux-2.6.37.4/arch/x86/kernel/doublefault_32.c 2011-01-17 02:41:01.000000000 -0500
21231 @@ -11,7 +11,7 @@
21232
21233 #define DOUBLEFAULT_STACKSIZE (1024)
21234 @@ -11122,9 +11239,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/doublefault_32.c linux-2.6.37.3/arch/x
21235 .fs = __KERNEL_PERCPU,
21236
21237 .__cr3 = __pa_nodebug(swapper_pg_dir),
21238 -diff -urNp linux-2.6.37.3/arch/x86/kernel/dumpstack_32.c linux-2.6.37.3/arch/x86/kernel/dumpstack_32.c
21239 ---- linux-2.6.37.3/arch/x86/kernel/dumpstack_32.c 2011-01-04 19:50:19.000000000 -0500
21240 -+++ linux-2.6.37.3/arch/x86/kernel/dumpstack_32.c 2011-01-17 02:41:01.000000000 -0500
21241 +diff -urNp linux-2.6.37.4/arch/x86/kernel/dumpstack_32.c linux-2.6.37.4/arch/x86/kernel/dumpstack_32.c
21242 +--- linux-2.6.37.4/arch/x86/kernel/dumpstack_32.c 2011-01-04 19:50:19.000000000 -0500
21243 ++++ linux-2.6.37.4/arch/x86/kernel/dumpstack_32.c 2011-01-17 02:41:01.000000000 -0500
21244 @@ -105,11 +105,12 @@ void show_registers(struct pt_regs *regs
21245 * When in-kernel, we also print out the stack and code at the
21246 * time of the fault..
21247 @@ -11169,9 +11286,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/dumpstack_32.c linux-2.6.37.3/arch/x86
21248 if (ip < PAGE_OFFSET)
21249 return 0;
21250 if (probe_kernel_address((unsigned short *)ip, ud2))
21251 -diff -urNp linux-2.6.37.3/arch/x86/kernel/dumpstack.c linux-2.6.37.3/arch/x86/kernel/dumpstack.c
21252 ---- linux-2.6.37.3/arch/x86/kernel/dumpstack.c 2011-01-04 19:50:19.000000000 -0500
21253 -+++ linux-2.6.37.3/arch/x86/kernel/dumpstack.c 2011-01-17 02:41:01.000000000 -0500
21254 +diff -urNp linux-2.6.37.4/arch/x86/kernel/dumpstack.c linux-2.6.37.4/arch/x86/kernel/dumpstack.c
21255 +--- linux-2.6.37.4/arch/x86/kernel/dumpstack.c 2011-01-04 19:50:19.000000000 -0500
21256 ++++ linux-2.6.37.4/arch/x86/kernel/dumpstack.c 2011-01-17 02:41:01.000000000 -0500
21257 @@ -2,6 +2,9 @@
21258 * Copyright (C) 1991, 1992 Linus Torvalds
21259 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21260 @@ -11227,9 +11344,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/dumpstack.c linux-2.6.37.3/arch/x86/ke
21261 report_bug(regs->ip, regs);
21262
21263 if (__die(str, regs, err))
21264 -diff -urNp linux-2.6.37.3/arch/x86/kernel/entry_32.S linux-2.6.37.3/arch/x86/kernel/entry_32.S
21265 ---- linux-2.6.37.3/arch/x86/kernel/entry_32.S 2011-01-04 19:50:19.000000000 -0500
21266 -+++ linux-2.6.37.3/arch/x86/kernel/entry_32.S 2011-01-17 02:41:01.000000000 -0500
21267 +diff -urNp linux-2.6.37.4/arch/x86/kernel/entry_32.S linux-2.6.37.4/arch/x86/kernel/entry_32.S
21268 +--- linux-2.6.37.4/arch/x86/kernel/entry_32.S 2011-01-04 19:50:19.000000000 -0500
21269 ++++ linux-2.6.37.4/arch/x86/kernel/entry_32.S 2011-01-17 02:41:01.000000000 -0500
21270 @@ -183,13 +183,81 @@
21271 /*CFI_REL_OFFSET gs, PT_GS*/
21272 .endm
21273 @@ -11602,9 +11719,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/entry_32.S linux-2.6.37.3/arch/x86/ker
21274 RESTORE_REGS
21275 lss 12+4(%esp), %esp # back to espfix stack
21276 CFI_ADJUST_CFA_OFFSET -24
21277 -diff -urNp linux-2.6.37.3/arch/x86/kernel/entry_64.S linux-2.6.37.3/arch/x86/kernel/entry_64.S
21278 ---- linux-2.6.37.3/arch/x86/kernel/entry_64.S 2011-01-04 19:50:19.000000000 -0500
21279 -+++ linux-2.6.37.3/arch/x86/kernel/entry_64.S 2011-02-27 14:48:10.000000000 -0500
21280 +diff -urNp linux-2.6.37.4/arch/x86/kernel/entry_64.S linux-2.6.37.4/arch/x86/kernel/entry_64.S
21281 +--- linux-2.6.37.4/arch/x86/kernel/entry_64.S 2011-01-04 19:50:19.000000000 -0500
21282 ++++ linux-2.6.37.4/arch/x86/kernel/entry_64.S 2011-02-27 14:48:10.000000000 -0500
21283 @@ -53,6 +53,7 @@
21284 #include <asm/paravirt.h>
21285 #include <asm/ftrace.h>
21286 @@ -12083,9 +12200,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/entry_64.S linux-2.6.37.3/arch/x86/ker
21287 RESTORE_ALL 8
21288 jmp irq_return
21289 nmi_userspace:
21290 -diff -urNp linux-2.6.37.3/arch/x86/kernel/ftrace.c linux-2.6.37.3/arch/x86/kernel/ftrace.c
21291 ---- linux-2.6.37.3/arch/x86/kernel/ftrace.c 2011-01-04 19:50:19.000000000 -0500
21292 -+++ linux-2.6.37.3/arch/x86/kernel/ftrace.c 2011-01-17 02:41:01.000000000 -0500
21293 +diff -urNp linux-2.6.37.4/arch/x86/kernel/ftrace.c linux-2.6.37.4/arch/x86/kernel/ftrace.c
21294 +--- linux-2.6.37.4/arch/x86/kernel/ftrace.c 2011-01-04 19:50:19.000000000 -0500
21295 ++++ linux-2.6.37.4/arch/x86/kernel/ftrace.c 2011-01-17 02:41:01.000000000 -0500
21296 @@ -174,7 +174,9 @@ void ftrace_nmi_enter(void)
21297
21298 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
21299 @@ -12123,9 +12240,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/ftrace.c linux-2.6.37.3/arch/x86/kerne
21300 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
21301 return -EFAULT;
21302
21303 -diff -urNp linux-2.6.37.3/arch/x86/kernel/head32.c linux-2.6.37.3/arch/x86/kernel/head32.c
21304 ---- linux-2.6.37.3/arch/x86/kernel/head32.c 2011-01-04 19:50:19.000000000 -0500
21305 -+++ linux-2.6.37.3/arch/x86/kernel/head32.c 2011-01-17 02:41:01.000000000 -0500
21306 +diff -urNp linux-2.6.37.4/arch/x86/kernel/head32.c linux-2.6.37.4/arch/x86/kernel/head32.c
21307 +--- linux-2.6.37.4/arch/x86/kernel/head32.c 2011-01-04 19:50:19.000000000 -0500
21308 ++++ linux-2.6.37.4/arch/x86/kernel/head32.c 2011-01-17 02:41:01.000000000 -0500
21309 @@ -19,6 +19,7 @@
21310 #include <asm/io_apic.h>
21311 #include <asm/bios_ebda.h>
21312 @@ -12143,9 +12260,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/head32.c linux-2.6.37.3/arch/x86/kerne
21313
21314 #ifdef CONFIG_BLK_DEV_INITRD
21315 /* Reserve INITRD */
21316 -diff -urNp linux-2.6.37.3/arch/x86/kernel/head_32.S linux-2.6.37.3/arch/x86/kernel/head_32.S
21317 ---- linux-2.6.37.3/arch/x86/kernel/head_32.S 2011-01-04 19:50:19.000000000 -0500
21318 -+++ linux-2.6.37.3/arch/x86/kernel/head_32.S 2011-01-25 20:24:56.000000000 -0500
21319 +diff -urNp linux-2.6.37.4/arch/x86/kernel/head_32.S linux-2.6.37.4/arch/x86/kernel/head_32.S
21320 +--- linux-2.6.37.4/arch/x86/kernel/head_32.S 2011-01-04 19:50:19.000000000 -0500
21321 ++++ linux-2.6.37.4/arch/x86/kernel/head_32.S 2011-01-25 20:24:56.000000000 -0500
21322 @@ -25,6 +25,12 @@
21323 /* Physical address */
21324 #define pa(X) ((X) - __PAGE_OFFSET)
21325 @@ -12597,9 +12714,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/head_32.S linux-2.6.37.3/arch/x86/kern
21326 + /* Be sure this is zeroed to avoid false validations in Xen */
21327 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
21328 + .endr
21329 -diff -urNp linux-2.6.37.3/arch/x86/kernel/head_64.S linux-2.6.37.3/arch/x86/kernel/head_64.S
21330 ---- linux-2.6.37.3/arch/x86/kernel/head_64.S 2011-01-04 19:50:19.000000000 -0500
21331 -+++ linux-2.6.37.3/arch/x86/kernel/head_64.S 2011-01-17 02:41:01.000000000 -0500
21332 +diff -urNp linux-2.6.37.4/arch/x86/kernel/head_64.S linux-2.6.37.4/arch/x86/kernel/head_64.S
21333 +--- linux-2.6.37.4/arch/x86/kernel/head_64.S 2011-01-04 19:50:19.000000000 -0500
21334 ++++ linux-2.6.37.4/arch/x86/kernel/head_64.S 2011-01-17 02:41:01.000000000 -0500
21335 @@ -19,6 +19,7 @@
21336 #include <asm/cache.h>
21337 #include <asm/processor-flags.h>
21338 @@ -12869,9 +12986,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/head_64.S linux-2.6.37.3/arch/x86/kern
21339
21340 __PAGE_ALIGNED_BSS
21341 .align PAGE_SIZE
21342 -diff -urNp linux-2.6.37.3/arch/x86/kernel/i386_ksyms_32.c linux-2.6.37.3/arch/x86/kernel/i386_ksyms_32.c
21343 ---- linux-2.6.37.3/arch/x86/kernel/i386_ksyms_32.c 2011-01-04 19:50:19.000000000 -0500
21344 -+++ linux-2.6.37.3/arch/x86/kernel/i386_ksyms_32.c 2011-01-17 02:41:01.000000000 -0500
21345 +diff -urNp linux-2.6.37.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.37.4/arch/x86/kernel/i386_ksyms_32.c
21346 +--- linux-2.6.37.4/arch/x86/kernel/i386_ksyms_32.c 2011-01-04 19:50:19.000000000 -0500
21347 ++++ linux-2.6.37.4/arch/x86/kernel/i386_ksyms_32.c 2011-01-17 02:41:01.000000000 -0500
21348 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
21349 EXPORT_SYMBOL(cmpxchg8b_emu);
21350 #endif
21351 @@ -12893,9 +13010,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/i386_ksyms_32.c linux-2.6.37.3/arch/x8
21352 +#ifdef CONFIG_PAX_KERNEXEC
21353 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
21354 +#endif
21355 -diff -urNp linux-2.6.37.3/arch/x86/kernel/init_task.c linux-2.6.37.3/arch/x86/kernel/init_task.c
21356 ---- linux-2.6.37.3/arch/x86/kernel/init_task.c 2011-01-04 19:50:19.000000000 -0500
21357 -+++ linux-2.6.37.3/arch/x86/kernel/init_task.c 2011-01-17 02:41:01.000000000 -0500
21358 +diff -urNp linux-2.6.37.4/arch/x86/kernel/init_task.c linux-2.6.37.4/arch/x86/kernel/init_task.c
21359 +--- linux-2.6.37.4/arch/x86/kernel/init_task.c 2011-01-04 19:50:19.000000000 -0500
21360 ++++ linux-2.6.37.4/arch/x86/kernel/init_task.c 2011-01-17 02:41:01.000000000 -0500
21361 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
21362 * section. Since TSS's are completely CPU-local, we want them
21363 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
21364 @@ -12904,9 +13021,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/init_task.c linux-2.6.37.3/arch/x86/ke
21365 -
21366 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
21367 +EXPORT_SYMBOL(init_tss);
21368 -diff -urNp linux-2.6.37.3/arch/x86/kernel/ioport.c linux-2.6.37.3/arch/x86/kernel/ioport.c
21369 ---- linux-2.6.37.3/arch/x86/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
21370 -+++ linux-2.6.37.3/arch/x86/kernel/ioport.c 2011-01-17 02:41:01.000000000 -0500
21371 +diff -urNp linux-2.6.37.4/arch/x86/kernel/ioport.c linux-2.6.37.4/arch/x86/kernel/ioport.c
21372 +--- linux-2.6.37.4/arch/x86/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
21373 ++++ linux-2.6.37.4/arch/x86/kernel/ioport.c 2011-01-17 02:41:01.000000000 -0500
21374 @@ -6,6 +6,7 @@
21375 #include <linux/sched.h>
21376 #include <linux/kernel.h>
21377 @@ -12950,9 +13067,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/ioport.c linux-2.6.37.3/arch/x86/kerne
21378 if (!capable(CAP_SYS_RAWIO))
21379 return -EPERM;
21380 }
21381 -diff -urNp linux-2.6.37.3/arch/x86/kernel/irq_32.c linux-2.6.37.3/arch/x86/kernel/irq_32.c
21382 ---- linux-2.6.37.3/arch/x86/kernel/irq_32.c 2011-02-27 14:49:17.000000000 -0500
21383 -+++ linux-2.6.37.3/arch/x86/kernel/irq_32.c 2011-01-24 18:04:15.000000000 -0500
21384 +diff -urNp linux-2.6.37.4/arch/x86/kernel/irq_32.c linux-2.6.37.4/arch/x86/kernel/irq_32.c
21385 +--- linux-2.6.37.4/arch/x86/kernel/irq_32.c 2011-02-27 14:49:17.000000000 -0500
21386 ++++ linux-2.6.37.4/arch/x86/kernel/irq_32.c 2011-01-24 18:04:15.000000000 -0500
21387 @@ -91,7 +91,7 @@ execute_on_irq_stack(int overflow, struc
21388 return 0;
21389
21390 @@ -13005,9 +13122,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/irq_32.c linux-2.6.37.3/arch/x86/kerne
21391 /*
21392 * Shouldnt happen, we returned above if in_interrupt():
21393 */
21394 -diff -urNp linux-2.6.37.3/arch/x86/kernel/kgdb.c linux-2.6.37.3/arch/x86/kernel/kgdb.c
21395 ---- linux-2.6.37.3/arch/x86/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
21396 -+++ linux-2.6.37.3/arch/x86/kernel/kgdb.c 2011-01-17 02:41:01.000000000 -0500
21397 +diff -urNp linux-2.6.37.4/arch/x86/kernel/kgdb.c linux-2.6.37.4/arch/x86/kernel/kgdb.c
21398 +--- linux-2.6.37.4/arch/x86/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
21399 ++++ linux-2.6.37.4/arch/x86/kernel/kgdb.c 2011-01-17 02:41:01.000000000 -0500
21400 @@ -123,11 +123,11 @@ char *dbg_get_reg(int regno, void *mem,
21401 switch (regno) {
21402 #ifdef CONFIG_X86_32
21403 @@ -13031,9 +13148,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/kgdb.c linux-2.6.37.3/arch/x86/kernel/
21404 /* Breakpoint instruction: */
21405 .gdb_bpt_instr = { 0xcc },
21406 .flags = KGDB_HW_BREAKPOINT,
21407 -diff -urNp linux-2.6.37.3/arch/x86/kernel/kprobes.c linux-2.6.37.3/arch/x86/kernel/kprobes.c
21408 ---- linux-2.6.37.3/arch/x86/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
21409 -+++ linux-2.6.37.3/arch/x86/kernel/kprobes.c 2011-01-17 02:41:01.000000000 -0500
21410 +diff -urNp linux-2.6.37.4/arch/x86/kernel/kprobes.c linux-2.6.37.4/arch/x86/kernel/kprobes.c
21411 +--- linux-2.6.37.4/arch/x86/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
21412 ++++ linux-2.6.37.4/arch/x86/kernel/kprobes.c 2011-01-17 02:41:01.000000000 -0500
21413 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
21414 } __attribute__((packed)) *insn;
21415
21416 @@ -13167,9 +13284,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/kprobes.c linux-2.6.37.3/arch/x86/kern
21417 RELATIVE_ADDR_SIZE);
21418
21419 jmp_code[0] = RELATIVEJUMP_OPCODE;
21420 -diff -urNp linux-2.6.37.3/arch/x86/kernel/ldt.c linux-2.6.37.3/arch/x86/kernel/ldt.c
21421 ---- linux-2.6.37.3/arch/x86/kernel/ldt.c 2011-01-04 19:50:19.000000000 -0500
21422 -+++ linux-2.6.37.3/arch/x86/kernel/ldt.c 2011-01-17 02:41:01.000000000 -0500
21423 +diff -urNp linux-2.6.37.4/arch/x86/kernel/ldt.c linux-2.6.37.4/arch/x86/kernel/ldt.c
21424 +--- linux-2.6.37.4/arch/x86/kernel/ldt.c 2011-01-04 19:50:19.000000000 -0500
21425 ++++ linux-2.6.37.4/arch/x86/kernel/ldt.c 2011-01-17 02:41:01.000000000 -0500
21426 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
21427 if (reload) {
21428 #ifdef CONFIG_SMP
21429 @@ -13234,9 +13351,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/ldt.c linux-2.6.37.3/arch/x86/kernel/l
21430 fill_ldt(&ldt, &ldt_info);
21431 if (oldmode)
21432 ldt.avl = 0;
21433 -diff -urNp linux-2.6.37.3/arch/x86/kernel/machine_kexec_32.c linux-2.6.37.3/arch/x86/kernel/machine_kexec_32.c
21434 ---- linux-2.6.37.3/arch/x86/kernel/machine_kexec_32.c 2011-01-04 19:50:19.000000000 -0500
21435 -+++ linux-2.6.37.3/arch/x86/kernel/machine_kexec_32.c 2011-01-17 02:41:01.000000000 -0500
21436 +diff -urNp linux-2.6.37.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.37.4/arch/x86/kernel/machine_kexec_32.c
21437 +--- linux-2.6.37.4/arch/x86/kernel/machine_kexec_32.c 2011-01-04 19:50:19.000000000 -0500
21438 ++++ linux-2.6.37.4/arch/x86/kernel/machine_kexec_32.c 2011-01-17 02:41:01.000000000 -0500
21439 @@ -27,7 +27,7 @@
21440 #include <asm/cacheflush.h>
21441 #include <asm/debugreg.h>
21442 @@ -13264,9 +13381,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/machine_kexec_32.c linux-2.6.37.3/arch
21443
21444 relocate_kernel_ptr = control_page;
21445 page_list[PA_CONTROL_PAGE] = __pa(control_page);
21446 -diff -urNp linux-2.6.37.3/arch/x86/kernel/microcode_amd.c linux-2.6.37.3/arch/x86/kernel/microcode_amd.c
21447 ---- linux-2.6.37.3/arch/x86/kernel/microcode_amd.c 2011-01-04 19:50:19.000000000 -0500
21448 -+++ linux-2.6.37.3/arch/x86/kernel/microcode_amd.c 2011-01-17 02:41:01.000000000 -0500
21449 +diff -urNp linux-2.6.37.4/arch/x86/kernel/microcode_amd.c linux-2.6.37.4/arch/x86/kernel/microcode_amd.c
21450 +--- linux-2.6.37.4/arch/x86/kernel/microcode_amd.c 2011-01-04 19:50:19.000000000 -0500
21451 ++++ linux-2.6.37.4/arch/x86/kernel/microcode_amd.c 2011-01-17 02:41:01.000000000 -0500
21452 @@ -331,7 +331,7 @@ static void microcode_fini_cpu_amd(int c
21453 uci->mc = NULL;
21454 }
21455 @@ -13285,9 +13402,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/microcode_amd.c linux-2.6.37.3/arch/x8
21456 {
21457 return &microcode_amd_ops;
21458 }
21459 -diff -urNp linux-2.6.37.3/arch/x86/kernel/microcode_core.c linux-2.6.37.3/arch/x86/kernel/microcode_core.c
21460 ---- linux-2.6.37.3/arch/x86/kernel/microcode_core.c 2011-01-04 19:50:19.000000000 -0500
21461 -+++ linux-2.6.37.3/arch/x86/kernel/microcode_core.c 2011-01-17 02:41:01.000000000 -0500
21462 +diff -urNp linux-2.6.37.4/arch/x86/kernel/microcode_core.c linux-2.6.37.4/arch/x86/kernel/microcode_core.c
21463 +--- linux-2.6.37.4/arch/x86/kernel/microcode_core.c 2011-01-04 19:50:19.000000000 -0500
21464 ++++ linux-2.6.37.4/arch/x86/kernel/microcode_core.c 2011-01-17 02:41:01.000000000 -0500
21465 @@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
21466
21467 #define MICROCODE_VERSION "2.00"
21468 @@ -13297,9 +13414,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/microcode_core.c linux-2.6.37.3/arch/x
21469
21470 /*
21471 * Synchronization.
21472 -diff -urNp linux-2.6.37.3/arch/x86/kernel/microcode_intel.c linux-2.6.37.3/arch/x86/kernel/microcode_intel.c
21473 ---- linux-2.6.37.3/arch/x86/kernel/microcode_intel.c 2011-01-04 19:50:19.000000000 -0500
21474 -+++ linux-2.6.37.3/arch/x86/kernel/microcode_intel.c 2011-01-17 02:41:01.000000000 -0500
21475 +diff -urNp linux-2.6.37.4/arch/x86/kernel/microcode_intel.c linux-2.6.37.4/arch/x86/kernel/microcode_intel.c
21476 +--- linux-2.6.37.4/arch/x86/kernel/microcode_intel.c 2011-01-04 19:50:19.000000000 -0500
21477 ++++ linux-2.6.37.4/arch/x86/kernel/microcode_intel.c 2011-01-17 02:41:01.000000000 -0500
21478 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
21479
21480 static int get_ucode_user(void *to, const void *from, size_t n)
21481 @@ -13334,9 +13451,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/microcode_intel.c linux-2.6.37.3/arch/
21482 {
21483 return &microcode_intel_ops;
21484 }
21485 -diff -urNp linux-2.6.37.3/arch/x86/kernel/module.c linux-2.6.37.3/arch/x86/kernel/module.c
21486 ---- linux-2.6.37.3/arch/x86/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
21487 -+++ linux-2.6.37.3/arch/x86/kernel/module.c 2011-01-17 02:41:01.000000000 -0500
21488 +diff -urNp linux-2.6.37.4/arch/x86/kernel/module.c linux-2.6.37.4/arch/x86/kernel/module.c
21489 +--- linux-2.6.37.4/arch/x86/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
21490 ++++ linux-2.6.37.4/arch/x86/kernel/module.c 2011-01-17 02:41:01.000000000 -0500
21491 @@ -35,7 +35,7 @@
21492 #define DEBUGP(fmt...)
21493 #endif
21494 @@ -13477,9 +13594,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/module.c linux-2.6.37.3/arch/x86/kerne
21495 #if 0
21496 if ((s64)val != *(s32 *)loc)
21497 goto overflow;
21498 -diff -urNp linux-2.6.37.3/arch/x86/kernel/paravirt.c linux-2.6.37.3/arch/x86/kernel/paravirt.c
21499 ---- linux-2.6.37.3/arch/x86/kernel/paravirt.c 2011-01-04 19:50:19.000000000 -0500
21500 -+++ linux-2.6.37.3/arch/x86/kernel/paravirt.c 2011-01-17 02:41:01.000000000 -0500
21501 +diff -urNp linux-2.6.37.4/arch/x86/kernel/paravirt.c linux-2.6.37.4/arch/x86/kernel/paravirt.c
21502 +--- linux-2.6.37.4/arch/x86/kernel/paravirt.c 2011-01-04 19:50:19.000000000 -0500
21503 ++++ linux-2.6.37.4/arch/x86/kernel/paravirt.c 2011-01-17 02:41:01.000000000 -0500
21504 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
21505 * corresponding structure. */
21506 static void *get_call_destination(u8 type)
21507 @@ -13583,9 +13700,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/paravirt.c linux-2.6.37.3/arch/x86/ker
21508 };
21509
21510 EXPORT_SYMBOL_GPL(pv_time_ops);
21511 -diff -urNp linux-2.6.37.3/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.37.3/arch/x86/kernel/paravirt-spinlocks.c
21512 ---- linux-2.6.37.3/arch/x86/kernel/paravirt-spinlocks.c 2011-01-04 19:50:19.000000000 -0500
21513 -+++ linux-2.6.37.3/arch/x86/kernel/paravirt-spinlocks.c 2011-01-17 02:41:01.000000000 -0500
21514 +diff -urNp linux-2.6.37.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.37.4/arch/x86/kernel/paravirt-spinlocks.c
21515 +--- linux-2.6.37.4/arch/x86/kernel/paravirt-spinlocks.c 2011-01-04 19:50:19.000000000 -0500
21516 ++++ linux-2.6.37.4/arch/x86/kernel/paravirt-spinlocks.c 2011-01-17 02:41:01.000000000 -0500
21517 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
21518 arch_spin_lock(lock);
21519 }
21520 @@ -13595,9 +13712,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.37.3/ar
21521 #ifdef CONFIG_SMP
21522 .spin_is_locked = __ticket_spin_is_locked,
21523 .spin_is_contended = __ticket_spin_is_contended,
21524 -diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-calgary_64.c linux-2.6.37.3/arch/x86/kernel/pci-calgary_64.c
21525 ---- linux-2.6.37.3/arch/x86/kernel/pci-calgary_64.c 2011-01-04 19:50:19.000000000 -0500
21526 -+++ linux-2.6.37.3/arch/x86/kernel/pci-calgary_64.c 2011-01-17 02:41:01.000000000 -0500
21527 +diff -urNp linux-2.6.37.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.37.4/arch/x86/kernel/pci-calgary_64.c
21528 +--- linux-2.6.37.4/arch/x86/kernel/pci-calgary_64.c 2011-01-04 19:50:19.000000000 -0500
21529 ++++ linux-2.6.37.4/arch/x86/kernel/pci-calgary_64.c 2011-01-17 02:41:01.000000000 -0500
21530 @@ -476,7 +476,7 @@ static void calgary_free_coherent(struct
21531 free_pages((unsigned long)vaddr, get_order(size));
21532 }
21533 @@ -13607,9 +13724,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-calgary_64.c linux-2.6.37.3/arch/x
21534 .alloc_coherent = calgary_alloc_coherent,
21535 .free_coherent = calgary_free_coherent,
21536 .map_sg = calgary_map_sg,
21537 -diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-dma.c linux-2.6.37.3/arch/x86/kernel/pci-dma.c
21538 ---- linux-2.6.37.3/arch/x86/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
21539 -+++ linux-2.6.37.3/arch/x86/kernel/pci-dma.c 2011-01-17 02:41:01.000000000 -0500
21540 +diff -urNp linux-2.6.37.4/arch/x86/kernel/pci-dma.c linux-2.6.37.4/arch/x86/kernel/pci-dma.c
21541 +--- linux-2.6.37.4/arch/x86/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
21542 ++++ linux-2.6.37.4/arch/x86/kernel/pci-dma.c 2011-01-17 02:41:01.000000000 -0500
21543 @@ -16,7 +16,7 @@
21544
21545 static int forbid_dac __read_mostly;
21546 @@ -13628,9 +13745,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-dma.c linux-2.6.37.3/arch/x86/kern
21547
21548 #ifdef CONFIG_PCI
21549 if (mask > 0xffffffff && forbid_dac > 0) {
21550 -diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-gart_64.c linux-2.6.37.3/arch/x86/kernel/pci-gart_64.c
21551 ---- linux-2.6.37.3/arch/x86/kernel/pci-gart_64.c 2011-01-04 19:50:19.000000000 -0500
21552 -+++ linux-2.6.37.3/arch/x86/kernel/pci-gart_64.c 2011-01-17 02:41:01.000000000 -0500
21553 +diff -urNp linux-2.6.37.4/arch/x86/kernel/pci-gart_64.c linux-2.6.37.4/arch/x86/kernel/pci-gart_64.c
21554 +--- linux-2.6.37.4/arch/x86/kernel/pci-gart_64.c 2011-01-04 19:50:19.000000000 -0500
21555 ++++ linux-2.6.37.4/arch/x86/kernel/pci-gart_64.c 2011-01-17 02:41:01.000000000 -0500
21556 @@ -706,7 +706,7 @@ static __init int init_k8_gatt(struct ag
21557 return -1;
21558 }
21559 @@ -13640,9 +13757,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-gart_64.c linux-2.6.37.3/arch/x86/
21560 .map_sg = gart_map_sg,
21561 .unmap_sg = gart_unmap_sg,
21562 .map_page = gart_map_page,
21563 -diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-nommu.c linux-2.6.37.3/arch/x86/kernel/pci-nommu.c
21564 ---- linux-2.6.37.3/arch/x86/kernel/pci-nommu.c 2011-01-04 19:50:19.000000000 -0500
21565 -+++ linux-2.6.37.3/arch/x86/kernel/pci-nommu.c 2011-01-17 02:41:01.000000000 -0500
21566 +diff -urNp linux-2.6.37.4/arch/x86/kernel/pci-nommu.c linux-2.6.37.4/arch/x86/kernel/pci-nommu.c
21567 +--- linux-2.6.37.4/arch/x86/kernel/pci-nommu.c 2011-01-04 19:50:19.000000000 -0500
21568 ++++ linux-2.6.37.4/arch/x86/kernel/pci-nommu.c 2011-01-17 02:41:01.000000000 -0500
21569 @@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
21570 flush_write_buffers();
21571 }
21572 @@ -13652,9 +13769,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-nommu.c linux-2.6.37.3/arch/x86/ke
21573 .alloc_coherent = dma_generic_alloc_coherent,
21574 .free_coherent = nommu_free_coherent,
21575 .map_sg = nommu_map_sg,
21576 -diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-swiotlb.c linux-2.6.37.3/arch/x86/kernel/pci-swiotlb.c
21577 ---- linux-2.6.37.3/arch/x86/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
21578 -+++ linux-2.6.37.3/arch/x86/kernel/pci-swiotlb.c 2011-01-17 02:41:01.000000000 -0500
21579 +diff -urNp linux-2.6.37.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.37.4/arch/x86/kernel/pci-swiotlb.c
21580 +--- linux-2.6.37.4/arch/x86/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
21581 ++++ linux-2.6.37.4/arch/x86/kernel/pci-swiotlb.c 2011-01-17 02:41:01.000000000 -0500
21582 @@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(
21583 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
21584 }
21585 @@ -13664,9 +13781,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/pci-swiotlb.c linux-2.6.37.3/arch/x86/
21586 .mapping_error = swiotlb_dma_mapping_error,
21587 .alloc_coherent = x86_swiotlb_alloc_coherent,
21588 .free_coherent = swiotlb_free_coherent,
21589 -diff -urNp linux-2.6.37.3/arch/x86/kernel/process_32.c linux-2.6.37.3/arch/x86/kernel/process_32.c
21590 ---- linux-2.6.37.3/arch/x86/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
21591 -+++ linux-2.6.37.3/arch/x86/kernel/process_32.c 2011-01-17 02:41:01.000000000 -0500
21592 +diff -urNp linux-2.6.37.4/arch/x86/kernel/process_32.c linux-2.6.37.4/arch/x86/kernel/process_32.c
21593 +--- linux-2.6.37.4/arch/x86/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
21594 ++++ linux-2.6.37.4/arch/x86/kernel/process_32.c 2011-01-17 02:41:01.000000000 -0500
21595 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
21596 unsigned long thread_saved_pc(struct task_struct *tsk)
21597 {
21598 @@ -13750,9 +13867,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/process_32.c linux-2.6.37.3/arch/x86/k
21599 + load_sp0(init_tss + smp_processor_id(), thread);
21600 +}
21601 +#endif
21602 -diff -urNp linux-2.6.37.3/arch/x86/kernel/process_64.c linux-2.6.37.3/arch/x86/kernel/process_64.c
21603 ---- linux-2.6.37.3/arch/x86/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
21604 -+++ linux-2.6.37.3/arch/x86/kernel/process_64.c 2011-01-17 02:41:01.000000000 -0500
21605 +diff -urNp linux-2.6.37.4/arch/x86/kernel/process_64.c linux-2.6.37.4/arch/x86/kernel/process_64.c
21606 +--- linux-2.6.37.4/arch/x86/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
21607 ++++ linux-2.6.37.4/arch/x86/kernel/process_64.c 2011-01-17 02:41:01.000000000 -0500
21608 @@ -89,7 +89,7 @@ static void __exit_idle(void)
21609 void exit_idle(void)
21610 {
21611 @@ -13786,9 +13903,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/process_64.c linux-2.6.37.3/arch/x86/k
21612 return 0;
21613 ip = *(u64 *)(fp+8);
21614 if (!in_sched_functions(ip))
21615 -diff -urNp linux-2.6.37.3/arch/x86/kernel/process.c linux-2.6.37.3/arch/x86/kernel/process.c
21616 ---- linux-2.6.37.3/arch/x86/kernel/process.c 2011-02-27 14:49:17.000000000 -0500
21617 -+++ linux-2.6.37.3/arch/x86/kernel/process.c 2011-02-27 14:49:45.000000000 -0500
21618 +diff -urNp linux-2.6.37.4/arch/x86/kernel/process.c linux-2.6.37.4/arch/x86/kernel/process.c
21619 +--- linux-2.6.37.4/arch/x86/kernel/process.c 2011-02-27 14:49:17.000000000 -0500
21620 ++++ linux-2.6.37.4/arch/x86/kernel/process.c 2011-02-27 14:49:45.000000000 -0500
21621 @@ -75,7 +75,7 @@ void exit_thread(void)
21622 unsigned long *bp = t->io_bitmap_ptr;
21623
21624 @@ -13859,9 +13976,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/process.c linux-2.6.37.3/arch/x86/kern
21625 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
21626 -}
21627 -
21628 -diff -urNp linux-2.6.37.3/arch/x86/kernel/ptrace.c linux-2.6.37.3/arch/x86/kernel/ptrace.c
21629 ---- linux-2.6.37.3/arch/x86/kernel/ptrace.c 2011-01-04 19:50:19.000000000 -0500
21630 -+++ linux-2.6.37.3/arch/x86/kernel/ptrace.c 2011-01-17 02:41:01.000000000 -0500
21631 +diff -urNp linux-2.6.37.4/arch/x86/kernel/ptrace.c linux-2.6.37.4/arch/x86/kernel/ptrace.c
21632 +--- linux-2.6.37.4/arch/x86/kernel/ptrace.c 2011-01-04 19:50:19.000000000 -0500
21633 ++++ linux-2.6.37.4/arch/x86/kernel/ptrace.c 2011-03-21 17:16:23.000000000 -0400
21634 @@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi
21635 unsigned long addr, unsigned long data)
21636 {
21637 @@ -13897,9 +14014,27 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/ptrace.c linux-2.6.37.3/arch/x86/kerne
21638 }
21639
21640 void user_single_step_siginfo(struct task_struct *tsk,
21641 -diff -urNp linux-2.6.37.3/arch/x86/kernel/reboot.c linux-2.6.37.3/arch/x86/kernel/reboot.c
21642 ---- linux-2.6.37.3/arch/x86/kernel/reboot.c 2011-01-04 19:50:19.000000000 -0500
21643 -+++ linux-2.6.37.3/arch/x86/kernel/reboot.c 2011-01-17 02:41:01.000000000 -0500
21644 +@@ -1347,7 +1347,7 @@ void send_sigtrap(struct task_struct *ts
21645 + * We must return the syscall number to actually look up in the table.
21646 + * This can be -1L to skip running any syscall at all.
21647 + */
21648 +-asmregparm long syscall_trace_enter(struct pt_regs *regs)
21649 ++long syscall_trace_enter(struct pt_regs *regs)
21650 + {
21651 + long ret = 0;
21652 +
21653 +@@ -1392,7 +1392,7 @@ asmregparm long syscall_trace_enter(stru
21654 + return ret ?: regs->orig_ax;
21655 + }
21656 +
21657 +-asmregparm void syscall_trace_leave(struct pt_regs *regs)
21658 ++void syscall_trace_leave(struct pt_regs *regs)
21659 + {
21660 + bool step;
21661 +
21662 +diff -urNp linux-2.6.37.4/arch/x86/kernel/reboot.c linux-2.6.37.4/arch/x86/kernel/reboot.c
21663 +--- linux-2.6.37.4/arch/x86/kernel/reboot.c 2011-01-04 19:50:19.000000000 -0500
21664 ++++ linux-2.6.37.4/arch/x86/kernel/reboot.c 2011-01-17 02:41:01.000000000 -0500
21665 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
21666 EXPORT_SYMBOL(pm_power_off);
21667
21668 @@ -13965,9 +14100,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/reboot.c linux-2.6.37.3/arch/x86/kerne
21669
21670 /* Set up the IDT for real mode. */
21671 load_idt(&real_mode_idt);
21672 -diff -urNp linux-2.6.37.3/arch/x86/kernel/setup.c linux-2.6.37.3/arch/x86/kernel/setup.c
21673 ---- linux-2.6.37.3/arch/x86/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
21674 -+++ linux-2.6.37.3/arch/x86/kernel/setup.c 2011-01-17 02:41:01.000000000 -0500
21675 +diff -urNp linux-2.6.37.4/arch/x86/kernel/setup.c linux-2.6.37.4/arch/x86/kernel/setup.c
21676 +--- linux-2.6.37.4/arch/x86/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
21677 ++++ linux-2.6.37.4/arch/x86/kernel/setup.c 2011-01-17 02:41:01.000000000 -0500
21678 @@ -654,7 +654,7 @@ static void __init trim_bios_range(void)
21679 * area (640->1Mb) as ram even though it is not.
21680 * take them out.
21681 @@ -13997,9 +14132,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/setup.c linux-2.6.37.3/arch/x86/kernel
21682 data_resource.end = virt_to_phys(_edata)-1;
21683 bss_resource.start = virt_to_phys(&__bss_start);
21684 bss_resource.end = virt_to_phys(&__bss_stop)-1;
21685 -diff -urNp linux-2.6.37.3/arch/x86/kernel/setup_percpu.c linux-2.6.37.3/arch/x86/kernel/setup_percpu.c
21686 ---- linux-2.6.37.3/arch/x86/kernel/setup_percpu.c 2011-01-04 19:50:19.000000000 -0500
21687 -+++ linux-2.6.37.3/arch/x86/kernel/setup_percpu.c 2011-01-17 02:41:01.000000000 -0500
21688 +diff -urNp linux-2.6.37.4/arch/x86/kernel/setup_percpu.c linux-2.6.37.4/arch/x86/kernel/setup_percpu.c
21689 +--- linux-2.6.37.4/arch/x86/kernel/setup_percpu.c 2011-01-04 19:50:19.000000000 -0500
21690 ++++ linux-2.6.37.4/arch/x86/kernel/setup_percpu.c 2011-01-17 02:41:01.000000000 -0500
21691 @@ -21,19 +21,17 @@
21692 #include <asm/cpu.h>
21693 #include <asm/stackprotector.h>
21694 @@ -14063,9 +14198,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/setup_percpu.c linux-2.6.37.3/arch/x86
21695 /*
21696 * Up to this point, the boot CPU has been using .init.data
21697 * area. Reload any changed state for the boot CPU.
21698 -diff -urNp linux-2.6.37.3/arch/x86/kernel/signal.c linux-2.6.37.3/arch/x86/kernel/signal.c
21699 ---- linux-2.6.37.3/arch/x86/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
21700 -+++ linux-2.6.37.3/arch/x86/kernel/signal.c 2011-01-17 02:41:01.000000000 -0500
21701 +diff -urNp linux-2.6.37.4/arch/x86/kernel/signal.c linux-2.6.37.4/arch/x86/kernel/signal.c
21702 +--- linux-2.6.37.4/arch/x86/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
21703 ++++ linux-2.6.37.4/arch/x86/kernel/signal.c 2011-01-17 02:41:01.000000000 -0500
21704 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
21705 * Align the stack pointer according to the i386 ABI,
21706 * i.e. so that on function entry ((sp + 4) & 15) == 0.
21707 @@ -14140,9 +14275,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/signal.c linux-2.6.37.3/arch/x86/kerne
21708 return;
21709
21710 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
21711 -diff -urNp linux-2.6.37.3/arch/x86/kernel/smpboot.c linux-2.6.37.3/arch/x86/kernel/smpboot.c
21712 ---- linux-2.6.37.3/arch/x86/kernel/smpboot.c 2011-02-27 14:49:17.000000000 -0500
21713 -+++ linux-2.6.37.3/arch/x86/kernel/smpboot.c 2011-02-27 14:49:45.000000000 -0500
21714 +diff -urNp linux-2.6.37.4/arch/x86/kernel/smpboot.c linux-2.6.37.4/arch/x86/kernel/smpboot.c
21715 +--- linux-2.6.37.4/arch/x86/kernel/smpboot.c 2011-02-27 14:49:17.000000000 -0500
21716 ++++ linux-2.6.37.4/arch/x86/kernel/smpboot.c 2011-02-27 14:49:45.000000000 -0500
21717 @@ -786,7 +786,11 @@ do_rest:
21718 (unsigned long)task_stack_page(c_idle.idle) -
21719 KERNEL_STACK_OFFSET + THREAD_SIZE;
21720 @@ -14168,9 +14303,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/smpboot.c linux-2.6.37.3/arch/x86/kern
21721 err = do_boot_cpu(apicid, cpu);
21722 if (err) {
21723 pr_debug("do_boot_cpu failed %d\n", err);
21724 -diff -urNp linux-2.6.37.3/arch/x86/kernel/step.c linux-2.6.37.3/arch/x86/kernel/step.c
21725 ---- linux-2.6.37.3/arch/x86/kernel/step.c 2011-01-04 19:50:19.000000000 -0500
21726 -+++ linux-2.6.37.3/arch/x86/kernel/step.c 2011-01-17 02:41:01.000000000 -0500
21727 +diff -urNp linux-2.6.37.4/arch/x86/kernel/step.c linux-2.6.37.4/arch/x86/kernel/step.c
21728 +--- linux-2.6.37.4/arch/x86/kernel/step.c 2011-01-04 19:50:19.000000000 -0500
21729 ++++ linux-2.6.37.4/arch/x86/kernel/step.c 2011-01-17 02:41:01.000000000 -0500
21730 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
21731 struct desc_struct *desc;
21732 unsigned long base;
21733 @@ -14213,17 +14348,17 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/step.c linux-2.6.37.3/arch/x86/kernel/
21734 /* 32-bit mode: register increment */
21735 return 0;
21736 /* 64-bit mode: REX prefix */
21737 -diff -urNp linux-2.6.37.3/arch/x86/kernel/syscall_table_32.S linux-2.6.37.3/arch/x86/kernel/syscall_table_32.S
21738 ---- linux-2.6.37.3/arch/x86/kernel/syscall_table_32.S 2011-01-04 19:50:19.000000000 -0500
21739 -+++ linux-2.6.37.3/arch/x86/kernel/syscall_table_32.S 2011-01-17 02:41:01.000000000 -0500
21740 +diff -urNp linux-2.6.37.4/arch/x86/kernel/syscall_table_32.S linux-2.6.37.4/arch/x86/kernel/syscall_table_32.S
21741 +--- linux-2.6.37.4/arch/x86/kernel/syscall_table_32.S 2011-01-04 19:50:19.000000000 -0500
21742 ++++ linux-2.6.37.4/arch/x86/kernel/syscall_table_32.S 2011-01-17 02:41:01.000000000 -0500
21743 @@ -1,3 +1,4 @@
21744 +.section .rodata,"a",@progbits
21745 ENTRY(sys_call_table)
21746 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
21747 .long sys_exit
21748 -diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_i386_32.c linux-2.6.37.3/arch/x86/kernel/sys_i386_32.c
21749 ---- linux-2.6.37.3/arch/x86/kernel/sys_i386_32.c 2011-01-04 19:50:19.000000000 -0500
21750 -+++ linux-2.6.37.3/arch/x86/kernel/sys_i386_32.c 2011-01-17 02:41:01.000000000 -0500
21751 +diff -urNp linux-2.6.37.4/arch/x86/kernel/sys_i386_32.c linux-2.6.37.4/arch/x86/kernel/sys_i386_32.c
21752 +--- linux-2.6.37.4/arch/x86/kernel/sys_i386_32.c 2011-01-04 19:50:19.000000000 -0500
21753 ++++ linux-2.6.37.4/arch/x86/kernel/sys_i386_32.c 2011-03-21 17:35:08.000000000 -0400
21754 @@ -24,17 +24,224 @@
21755
21756 #include <asm/syscalls.h>
21757 @@ -14425,8 +14560,8 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_i386_32.c linux-2.6.37.3/arch/x86/
21758 + mm->cached_hole_size = vma->vm_start - addr;
21759 +
21760 + /* try just below the current vma->vm_start */
21761 -+ addr = vma->vm_start-len;
21762 -+ } while (len < vma->vm_start);
21763 ++ addr = skip_heap_stack_gap(vma, len);
21764 ++ } while (!IS_ERR_VALUE(addr));
21765 +
21766 +bottomup:
21767 + /*
21768 @@ -14461,9 +14596,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_i386_32.c linux-2.6.37.3/arch/x86/
21769 +
21770 + return addr;
21771 }
21772 -diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c
21773 ---- linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c 2011-01-04 19:50:19.000000000 -0500
21774 -+++ linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c 2011-01-17 02:41:01.000000000 -0500
21775 +diff -urNp linux-2.6.37.4/arch/x86/kernel/sys_x86_64.c linux-2.6.37.4/arch/x86/kernel/sys_x86_64.c
21776 +--- linux-2.6.37.4/arch/x86/kernel/sys_x86_64.c 2011-01-04 19:50:19.000000000 -0500
21777 ++++ linux-2.6.37.4/arch/x86/kernel/sys_x86_64.c 2011-03-21 17:35:08.000000000 -0400
21778 @@ -32,8 +32,8 @@ out:
21779 return error;
21780 }
21781 @@ -14525,7 +14660,7 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c linux-2.6.37.3/arch/x86/k
21782
21783 /* requested length too big for entire address space */
21784 if (len > TASK_SIZE)
21785 -@@ -141,12 +144,15 @@ arch_get_unmapped_area_topdown(struct fi
21786 +@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct fi
21787 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
21788 goto bottomup;
21789
21790 @@ -14536,14 +14671,19 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c linux-2.6.37.3/arch/x86/k
21791 /* requesting a specific address */
21792 if (addr) {
21793 addr = PAGE_ALIGN(addr);
21794 - vma = find_vma(mm, addr);
21795 +- vma = find_vma(mm, addr);
21796 - if (TASK_SIZE - len >= addr &&
21797 - (!vma || addr + len <= vma->vm_start))
21798 -+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
21799 - return addr;
21800 +- return addr;
21801 ++ if (TASK_SIZE - len >= addr) {
21802 ++ vma = find_vma(mm, addr);
21803 ++ if (check_heap_stack_gap(vma, addr, len))
21804 ++ return addr;
21805 ++ }
21806 }
21807
21808 -@@ -162,7 +168,7 @@ arch_get_unmapped_area_topdown(struct fi
21809 + /* check if free_area_cache is useful for us */
21810 +@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct fi
21811 /* make sure it can fit in the remaining address space */
21812 if (addr > len) {
21813 vma = find_vma(mm, addr-len);
21814 @@ -14552,7 +14692,7 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c linux-2.6.37.3/arch/x86/k
21815 /* remember the address as a hint for next time */
21816 return mm->free_area_cache = addr-len;
21817 }
21818 -@@ -179,7 +185,7 @@ arch_get_unmapped_area_topdown(struct fi
21819 +@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct fi
21820 * return with success:
21821 */
21822 vma = find_vma(mm, addr);
21823 @@ -14561,7 +14701,18 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c linux-2.6.37.3/arch/x86/k
21824 /* remember the address as a hint for next time */
21825 return mm->free_area_cache = addr;
21826
21827 -@@ -198,13 +204,21 @@ bottomup:
21828 +@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct fi
21829 + mm->cached_hole_size = vma->vm_start - addr;
21830 +
21831 + /* try just below the current vma->vm_start */
21832 +- addr = vma->vm_start-len;
21833 +- } while (len < vma->vm_start);
21834 ++ addr = skip_heap_stack_gap(vma, len);
21835 ++ } while (!IS_ERR_VALUE(addr));
21836 +
21837 + bottomup:
21838 + /*
21839 +@@ -198,13 +206,21 @@ bottomup:
21840 * can happen with large stack limits and large mmap()
21841 * allocations.
21842 */
21843 @@ -14585,9 +14736,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/sys_x86_64.c linux-2.6.37.3/arch/x86/k
21844 mm->cached_hole_size = ~0UL;
21845
21846 return addr;
21847 -diff -urNp linux-2.6.37.3/arch/x86/kernel/time.c linux-2.6.37.3/arch/x86/kernel/time.c
21848 ---- linux-2.6.37.3/arch/x86/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
21849 -+++ linux-2.6.37.3/arch/x86/kernel/time.c 2011-01-17 02:41:01.000000000 -0500
21850 +diff -urNp linux-2.6.37.4/arch/x86/kernel/time.c linux-2.6.37.4/arch/x86/kernel/time.c
21851 +--- linux-2.6.37.4/arch/x86/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
21852 ++++ linux-2.6.37.4/arch/x86/kernel/time.c 2011-01-17 02:41:01.000000000 -0500
21853 @@ -26,17 +26,13 @@
21854 int timer_ack;
21855 #endif
21856 @@ -14626,9 +14777,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/time.c linux-2.6.37.3/arch/x86/kernel/
21857 }
21858 return pc;
21859 }
21860 -diff -urNp linux-2.6.37.3/arch/x86/kernel/tls.c linux-2.6.37.3/arch/x86/kernel/tls.c
21861 ---- linux-2.6.37.3/arch/x86/kernel/tls.c 2011-01-04 19:50:19.000000000 -0500
21862 -+++ linux-2.6.37.3/arch/x86/kernel/tls.c 2011-01-17 02:41:01.000000000 -0500
21863 +diff -urNp linux-2.6.37.4/arch/x86/kernel/tls.c linux-2.6.37.4/arch/x86/kernel/tls.c
21864 +--- linux-2.6.37.4/arch/x86/kernel/tls.c 2011-01-04 19:50:19.000000000 -0500
21865 ++++ linux-2.6.37.4/arch/x86/kernel/tls.c 2011-01-17 02:41:01.000000000 -0500
21866 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
21867 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
21868 return -EINVAL;
21869 @@ -14641,9 +14792,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/tls.c linux-2.6.37.3/arch/x86/kernel/t
21870 set_tls_desc(p, idx, &info, 1);
21871
21872 return 0;
21873 -diff -urNp linux-2.6.37.3/arch/x86/kernel/trampoline_32.S linux-2.6.37.3/arch/x86/kernel/trampoline_32.S
21874 ---- linux-2.6.37.3/arch/x86/kernel/trampoline_32.S 2011-01-04 19:50:19.000000000 -0500
21875 -+++ linux-2.6.37.3/arch/x86/kernel/trampoline_32.S 2011-01-17 02:41:01.000000000 -0500
21876 +diff -urNp linux-2.6.37.4/arch/x86/kernel/trampoline_32.S linux-2.6.37.4/arch/x86/kernel/trampoline_32.S
21877 +--- linux-2.6.37.4/arch/x86/kernel/trampoline_32.S 2011-01-04 19:50:19.000000000 -0500
21878 ++++ linux-2.6.37.4/arch/x86/kernel/trampoline_32.S 2011-01-17 02:41:01.000000000 -0500
21879 @@ -32,6 +32,12 @@
21880 #include <asm/segment.h>
21881 #include <asm/page_types.h>
21882 @@ -14666,9 +14817,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/trampoline_32.S linux-2.6.37.3/arch/x8
21883
21884 # These need to be in the same 64K segment as the above;
21885 # hence we don't use the boot_gdt_descr defined in head.S
21886 -diff -urNp linux-2.6.37.3/arch/x86/kernel/trampoline_64.S linux-2.6.37.3/arch/x86/kernel/trampoline_64.S
21887 ---- linux-2.6.37.3/arch/x86/kernel/trampoline_64.S 2011-01-04 19:50:19.000000000 -0500
21888 -+++ linux-2.6.37.3/arch/x86/kernel/trampoline_64.S 2011-01-17 02:41:01.000000000 -0500
21889 +diff -urNp linux-2.6.37.4/arch/x86/kernel/trampoline_64.S linux-2.6.37.4/arch/x86/kernel/trampoline_64.S
21890 +--- linux-2.6.37.4/arch/x86/kernel/trampoline_64.S 2011-01-04 19:50:19.000000000 -0500
21891 ++++ linux-2.6.37.4/arch/x86/kernel/trampoline_64.S 2011-01-17 02:41:01.000000000 -0500
21892 @@ -91,7 +91,7 @@ startup_32:
21893 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
21894 movl %eax, %ds
21895 @@ -14687,9 +14838,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/trampoline_64.S linux-2.6.37.3/arch/x8
21896 .long tgdt - r_base
21897 .short 0
21898 .quad 0x00cf9b000000ffff # __KERNEL32_CS
21899 -diff -urNp linux-2.6.37.3/arch/x86/kernel/traps.c linux-2.6.37.3/arch/x86/kernel/traps.c
21900 ---- linux-2.6.37.3/arch/x86/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
21901 -+++ linux-2.6.37.3/arch/x86/kernel/traps.c 2011-01-17 02:41:01.000000000 -0500
21902 +diff -urNp linux-2.6.37.4/arch/x86/kernel/traps.c linux-2.6.37.4/arch/x86/kernel/traps.c
21903 +--- linux-2.6.37.4/arch/x86/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
21904 ++++ linux-2.6.37.4/arch/x86/kernel/traps.c 2011-01-17 02:41:01.000000000 -0500
21905 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
21906
21907 /* Do we ignore FPU interrupts ? */
21908 @@ -14832,9 +14983,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/traps.c linux-2.6.37.3/arch/x86/kernel
21909 {
21910 if (!fixup_exception(regs)) {
21911 task->thread.error_code = error_code;
21912 -diff -urNp linux-2.6.37.3/arch/x86/kernel/tsc.c linux-2.6.37.3/arch/x86/kernel/tsc.c
21913 ---- linux-2.6.37.3/arch/x86/kernel/tsc.c 2011-01-04 19:50:19.000000000 -0500
21914 -+++ linux-2.6.37.3/arch/x86/kernel/tsc.c 2011-01-17 02:41:01.000000000 -0500
21915 +diff -urNp linux-2.6.37.4/arch/x86/kernel/tsc.c linux-2.6.37.4/arch/x86/kernel/tsc.c
21916 +--- linux-2.6.37.4/arch/x86/kernel/tsc.c 2011-01-04 19:50:19.000000000 -0500
21917 ++++ linux-2.6.37.4/arch/x86/kernel/tsc.c 2011-01-17 02:41:01.000000000 -0500
21918 @@ -837,7 +837,7 @@ static struct dmi_system_id __initdata b
21919 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
21920 },
21921 @@ -14844,9 +14995,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/tsc.c linux-2.6.37.3/arch/x86/kernel/t
21922 };
21923
21924 static void __init check_system_tsc_reliable(void)
21925 -diff -urNp linux-2.6.37.3/arch/x86/kernel/vm86_32.c linux-2.6.37.3/arch/x86/kernel/vm86_32.c
21926 ---- linux-2.6.37.3/arch/x86/kernel/vm86_32.c 2011-01-04 19:50:19.000000000 -0500
21927 -+++ linux-2.6.37.3/arch/x86/kernel/vm86_32.c 2011-01-17 02:41:01.000000000 -0500
21928 +diff -urNp linux-2.6.37.4/arch/x86/kernel/vm86_32.c linux-2.6.37.4/arch/x86/kernel/vm86_32.c
21929 +--- linux-2.6.37.4/arch/x86/kernel/vm86_32.c 2011-01-04 19:50:19.000000000 -0500
21930 ++++ linux-2.6.37.4/arch/x86/kernel/vm86_32.c 2011-01-17 02:41:01.000000000 -0500
21931 @@ -41,6 +41,7 @@
21932 #include <linux/ptrace.h>
21933 #include <linux/audit.h>
21934 @@ -14911,9 +15062,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/vm86_32.c linux-2.6.37.3/arch/x86/kern
21935 if (get_user(segoffs, intr_ptr))
21936 goto cannot_handle;
21937 if ((segoffs >> 16) == BIOSSEG)
21938 -diff -urNp linux-2.6.37.3/arch/x86/kernel/vmlinux.lds.S linux-2.6.37.3/arch/x86/kernel/vmlinux.lds.S
21939 ---- linux-2.6.37.3/arch/x86/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
21940 -+++ linux-2.6.37.3/arch/x86/kernel/vmlinux.lds.S 2011-01-17 02:41:01.000000000 -0500
21941 +diff -urNp linux-2.6.37.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.37.4/arch/x86/kernel/vmlinux.lds.S
21942 +--- linux-2.6.37.4/arch/x86/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
21943 ++++ linux-2.6.37.4/arch/x86/kernel/vmlinux.lds.S 2011-01-17 02:41:01.000000000 -0500
21944 @@ -26,6 +26,13 @@
21945 #include <asm/page_types.h>
21946 #include <asm/cache.h>
21947 @@ -15211,9 +15362,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/vmlinux.lds.S linux-2.6.37.3/arch/x86/
21948 "kernel image bigger than KERNEL_IMAGE_SIZE");
21949
21950 #ifdef CONFIG_SMP
21951 -diff -urNp linux-2.6.37.3/arch/x86/kernel/vsyscall_64.c linux-2.6.37.3/arch/x86/kernel/vsyscall_64.c
21952 ---- linux-2.6.37.3/arch/x86/kernel/vsyscall_64.c 2011-01-04 19:50:19.000000000 -0500
21953 -+++ linux-2.6.37.3/arch/x86/kernel/vsyscall_64.c 2011-01-17 02:41:01.000000000 -0500
21954 +diff -urNp linux-2.6.37.4/arch/x86/kernel/vsyscall_64.c linux-2.6.37.4/arch/x86/kernel/vsyscall_64.c
21955 +--- linux-2.6.37.4/arch/x86/kernel/vsyscall_64.c 2011-01-04 19:50:19.000000000 -0500
21956 ++++ linux-2.6.37.4/arch/x86/kernel/vsyscall_64.c 2011-01-17 02:41:01.000000000 -0500
21957 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
21958
21959 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
21960 @@ -15231,9 +15382,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/vsyscall_64.c linux-2.6.37.3/arch/x86/
21961 p = tcache->blob[1];
21962 } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
21963 /* Load per CPU data from RDTSCP */
21964 -diff -urNp linux-2.6.37.3/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.37.3/arch/x86/kernel/x8664_ksyms_64.c
21965 ---- linux-2.6.37.3/arch/x86/kernel/x8664_ksyms_64.c 2011-01-04 19:50:19.000000000 -0500
21966 -+++ linux-2.6.37.3/arch/x86/kernel/x8664_ksyms_64.c 2011-01-17 02:41:01.000000000 -0500
21967 +diff -urNp linux-2.6.37.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.37.4/arch/x86/kernel/x8664_ksyms_64.c
21968 +--- linux-2.6.37.4/arch/x86/kernel/x8664_ksyms_64.c 2011-01-04 19:50:19.000000000 -0500
21969 ++++ linux-2.6.37.4/arch/x86/kernel/x8664_ksyms_64.c 2011-01-17 02:41:01.000000000 -0500
21970 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
21971 EXPORT_SYMBOL(copy_user_generic_string);
21972 EXPORT_SYMBOL(copy_user_generic_unrolled);
21973 @@ -15243,9 +15394,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.37.3/arch/x
21974
21975 EXPORT_SYMBOL(copy_page);
21976 EXPORT_SYMBOL(clear_page);
21977 -diff -urNp linux-2.6.37.3/arch/x86/kernel/xsave.c linux-2.6.37.3/arch/x86/kernel/xsave.c
21978 ---- linux-2.6.37.3/arch/x86/kernel/xsave.c 2011-01-04 19:50:19.000000000 -0500
21979 -+++ linux-2.6.37.3/arch/x86/kernel/xsave.c 2011-01-17 02:41:01.000000000 -0500
21980 +diff -urNp linux-2.6.37.4/arch/x86/kernel/xsave.c linux-2.6.37.4/arch/x86/kernel/xsave.c
21981 +--- linux-2.6.37.4/arch/x86/kernel/xsave.c 2011-01-04 19:50:19.000000000 -0500
21982 ++++ linux-2.6.37.4/arch/x86/kernel/xsave.c 2011-01-17 02:41:01.000000000 -0500
21983 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
21984 fx_sw_user->xstate_size > fx_sw_user->extended_size)
21985 return -EINVAL;
21986 @@ -15273,9 +15424,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kernel/xsave.c linux-2.6.37.3/arch/x86/kernel
21987 buf);
21988 if (unlikely(err)) {
21989 /*
21990 -diff -urNp linux-2.6.37.3/arch/x86/kvm/emulate.c linux-2.6.37.3/arch/x86/kvm/emulate.c
21991 ---- linux-2.6.37.3/arch/x86/kvm/emulate.c 2011-01-04 19:50:19.000000000 -0500
21992 -+++ linux-2.6.37.3/arch/x86/kvm/emulate.c 2011-01-17 02:41:01.000000000 -0500
21993 +diff -urNp linux-2.6.37.4/arch/x86/kvm/emulate.c linux-2.6.37.4/arch/x86/kvm/emulate.c
21994 +--- linux-2.6.37.4/arch/x86/kvm/emulate.c 2011-01-04 19:50:19.000000000 -0500
21995 ++++ linux-2.6.37.4/arch/x86/kvm/emulate.c 2011-01-17 02:41:01.000000000 -0500
21996 @@ -96,7 +96,7 @@
21997 #define Src2ImmByte (2<<29)
21998 #define Src2One (3<<29)
21999 @@ -15310,9 +15461,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kvm/emulate.c linux-2.6.37.3/arch/x86/kvm/emu
22000 switch ((_dst).bytes) { \
22001 case 1: \
22002 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
22003 -diff -urNp linux-2.6.37.3/arch/x86/kvm/lapic.c linux-2.6.37.3/arch/x86/kvm/lapic.c
22004 ---- linux-2.6.37.3/arch/x86/kvm/lapic.c 2011-01-04 19:50:19.000000000 -0500
22005 -+++ linux-2.6.37.3/arch/x86/kvm/lapic.c 2011-01-17 02:41:01.000000000 -0500
22006 +diff -urNp linux-2.6.37.4/arch/x86/kvm/lapic.c linux-2.6.37.4/arch/x86/kvm/lapic.c
22007 +--- linux-2.6.37.4/arch/x86/kvm/lapic.c 2011-01-04 19:50:19.000000000 -0500
22008 ++++ linux-2.6.37.4/arch/x86/kvm/lapic.c 2011-01-17 02:41:01.000000000 -0500
22009 @@ -53,7 +53,7 @@
22010 #define APIC_BUS_CYCLE_NS 1
22011
22012 @@ -15322,9 +15473,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kvm/lapic.c linux-2.6.37.3/arch/x86/kvm/lapic
22013
22014 #define APIC_LVT_NUM 6
22015 /* 14 is the version for Xeon and Pentium 8.4.8*/
22016 -diff -urNp linux-2.6.37.3/arch/x86/kvm/svm.c linux-2.6.37.3/arch/x86/kvm/svm.c
22017 ---- linux-2.6.37.3/arch/x86/kvm/svm.c 2011-01-04 19:50:19.000000000 -0500
22018 -+++ linux-2.6.37.3/arch/x86/kvm/svm.c 2011-01-17 02:41:01.000000000 -0500
22019 +diff -urNp linux-2.6.37.4/arch/x86/kvm/svm.c linux-2.6.37.4/arch/x86/kvm/svm.c
22020 +--- linux-2.6.37.4/arch/x86/kvm/svm.c 2011-01-04 19:50:19.000000000 -0500
22021 ++++ linux-2.6.37.4/arch/x86/kvm/svm.c 2011-01-17 02:41:01.000000000 -0500
22022 @@ -3023,7 +3023,11 @@ static void reload_tss(struct kvm_vcpu *
22023 int cpu = raw_smp_processor_id();
22024
22025 @@ -15346,9 +15497,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kvm/svm.c linux-2.6.37.3/arch/x86/kvm/svm.c
22026 .cpu_has_kvm_support = has_svm,
22027 .disabled_by_bios = is_disabled,
22028 .hardware_setup = svm_hardware_setup,
22029 -diff -urNp linux-2.6.37.3/arch/x86/kvm/vmx.c linux-2.6.37.3/arch/x86/kvm/vmx.c
22030 ---- linux-2.6.37.3/arch/x86/kvm/vmx.c 2011-01-04 19:50:19.000000000 -0500
22031 -+++ linux-2.6.37.3/arch/x86/kvm/vmx.c 2011-01-17 02:41:01.000000000 -0500
22032 +diff -urNp linux-2.6.37.4/arch/x86/kvm/vmx.c linux-2.6.37.4/arch/x86/kvm/vmx.c
22033 +--- linux-2.6.37.4/arch/x86/kvm/vmx.c 2011-01-04 19:50:19.000000000 -0500
22034 ++++ linux-2.6.37.4/arch/x86/kvm/vmx.c 2011-01-17 02:41:01.000000000 -0500
22035 @@ -705,7 +705,11 @@ static void reload_tss(void)
22036 struct desc_struct *descs;
22037
22038 @@ -15427,9 +15578,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kvm/vmx.c linux-2.6.37.3/arch/x86/kvm/vmx.c
22039 .cpu_has_kvm_support = cpu_has_kvm_support,
22040 .disabled_by_bios = vmx_disabled_by_bios,
22041 .hardware_setup = hardware_setup,
22042 -diff -urNp linux-2.6.37.3/arch/x86/kvm/x86.c linux-2.6.37.3/arch/x86/kvm/x86.c
22043 ---- linux-2.6.37.3/arch/x86/kvm/x86.c 2011-01-04 19:50:19.000000000 -0500
22044 -+++ linux-2.6.37.3/arch/x86/kvm/x86.c 2011-01-17 02:41:01.000000000 -0500
22045 +diff -urNp linux-2.6.37.4/arch/x86/kvm/x86.c linux-2.6.37.4/arch/x86/kvm/x86.c
22046 +--- linux-2.6.37.4/arch/x86/kvm/x86.c 2011-01-04 19:50:19.000000000 -0500
22047 ++++ linux-2.6.37.4/arch/x86/kvm/x86.c 2011-01-17 02:41:01.000000000 -0500
22048 @@ -92,7 +92,7 @@ static void update_cr8_intercept(struct
22049 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
22050 struct kvm_cpuid_entry2 __user *entries);
22051 @@ -15541,9 +15692,9 @@ diff -urNp linux-2.6.37.3/arch/x86/kvm/x86.c linux-2.6.37.3/arch/x86/kvm/x86.c
22052
22053 if (kvm_x86_ops) {
22054 printk(KERN_ERR "kvm: already loaded the other module\n");
22055 -diff -urNp linux-2.6.37.3/arch/x86/lib/atomic64_cx8_32.S linux-2.6.37.3/arch/x86/lib/atomic64_cx8_32.S
22056 ---- linux-2.6.37.3/arch/x86/lib/atomic64_cx8_32.S 2011-01-04 19:50:19.000000000 -0500
22057 -+++ linux-2.6.37.3/arch/x86/lib/atomic64_cx8_32.S 2011-01-17 02:41:01.000000000 -0500
22058 +diff -urNp linux-2.6.37.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.37.4/arch/x86/lib/atomic64_cx8_32.S
22059 +--- linux-2.6.37.4/arch/x86/lib/atomic64_cx8_32.S 2011-01-04 19:50:19.000000000 -0500
22060 ++++ linux-2.6.37.4/arch/x86/lib/atomic64_cx8_32.S 2011-01-17 02:41:01.000000000 -0500
22061 @@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8)
22062 movl %edx, %ecx
22063 \ins\()l %esi, %ebx
22064 @@ -15624,9 +15775,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/atomic64_cx8_32.S linux-2.6.37.3/arch/x86
22065 LOCK_PREFIX
22066 cmpxchg8b (%esi)
22067 jne 1b
22068 -diff -urNp linux-2.6.37.3/arch/x86/lib/checksum_32.S linux-2.6.37.3/arch/x86/lib/checksum_32.S
22069 ---- linux-2.6.37.3/arch/x86/lib/checksum_32.S 2011-01-04 19:50:19.000000000 -0500
22070 -+++ linux-2.6.37.3/arch/x86/lib/checksum_32.S 2011-01-17 02:41:01.000000000 -0500
22071 +diff -urNp linux-2.6.37.4/arch/x86/lib/checksum_32.S linux-2.6.37.4/arch/x86/lib/checksum_32.S
22072 +--- linux-2.6.37.4/arch/x86/lib/checksum_32.S 2011-01-04 19:50:19.000000000 -0500
22073 ++++ linux-2.6.37.4/arch/x86/lib/checksum_32.S 2011-01-17 02:41:01.000000000 -0500
22074 @@ -28,7 +28,8 @@
22075 #include <linux/linkage.h>
22076 #include <asm/dwarf2.h>
22077 @@ -15887,9 +16038,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/checksum_32.S linux-2.6.37.3/arch/x86/lib
22078
22079 #undef ROUND
22080 #undef ROUND1
22081 -diff -urNp linux-2.6.37.3/arch/x86/lib/clear_page_64.S linux-2.6.37.3/arch/x86/lib/clear_page_64.S
22082 ---- linux-2.6.37.3/arch/x86/lib/clear_page_64.S 2011-01-04 19:50:19.000000000 -0500
22083 -+++ linux-2.6.37.3/arch/x86/lib/clear_page_64.S 2011-01-17 02:41:01.000000000 -0500
22084 +diff -urNp linux-2.6.37.4/arch/x86/lib/clear_page_64.S linux-2.6.37.4/arch/x86/lib/clear_page_64.S
22085 +--- linux-2.6.37.4/arch/x86/lib/clear_page_64.S 2011-01-04 19:50:19.000000000 -0500
22086 ++++ linux-2.6.37.4/arch/x86/lib/clear_page_64.S 2011-01-17 02:41:01.000000000 -0500
22087 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
22088
22089 #include <asm/cpufeature.h>
22090 @@ -15899,9 +16050,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/clear_page_64.S linux-2.6.37.3/arch/x86/l
22091 1: .byte 0xeb /* jmp <disp8> */
22092 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
22093 2:
22094 -diff -urNp linux-2.6.37.3/arch/x86/lib/copy_page_64.S linux-2.6.37.3/arch/x86/lib/copy_page_64.S
22095 ---- linux-2.6.37.3/arch/x86/lib/copy_page_64.S 2011-01-04 19:50:19.000000000 -0500
22096 -+++ linux-2.6.37.3/arch/x86/lib/copy_page_64.S 2011-01-17 02:41:01.000000000 -0500
22097 +diff -urNp linux-2.6.37.4/arch/x86/lib/copy_page_64.S linux-2.6.37.4/arch/x86/lib/copy_page_64.S
22098 +--- linux-2.6.37.4/arch/x86/lib/copy_page_64.S 2011-01-04 19:50:19.000000000 -0500
22099 ++++ linux-2.6.37.4/arch/x86/lib/copy_page_64.S 2011-01-17 02:41:01.000000000 -0500
22100 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
22101
22102 #include <asm/cpufeature.h>
22103 @@ -15911,9 +16062,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/copy_page_64.S linux-2.6.37.3/arch/x86/li
22104 1: .byte 0xeb /* jmp <disp8> */
22105 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
22106 2:
22107 -diff -urNp linux-2.6.37.3/arch/x86/lib/copy_user_64.S linux-2.6.37.3/arch/x86/lib/copy_user_64.S
22108 ---- linux-2.6.37.3/arch/x86/lib/copy_user_64.S 2011-01-04 19:50:19.000000000 -0500
22109 -+++ linux-2.6.37.3/arch/x86/lib/copy_user_64.S 2011-01-17 02:41:01.000000000 -0500
22110 +diff -urNp linux-2.6.37.4/arch/x86/lib/copy_user_64.S linux-2.6.37.4/arch/x86/lib/copy_user_64.S
22111 +--- linux-2.6.37.4/arch/x86/lib/copy_user_64.S 2011-01-04 19:50:19.000000000 -0500
22112 ++++ linux-2.6.37.4/arch/x86/lib/copy_user_64.S 2011-01-17 02:41:01.000000000 -0500
22113 @@ -15,13 +15,14 @@
22114 #include <asm/asm-offsets.h>
22115 #include <asm/thread_info.h>
22116 @@ -15970,9 +16121,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/copy_user_64.S linux-2.6.37.3/arch/x86/li
22117 movl %edx,%ecx
22118 xorl %eax,%eax
22119 rep
22120 -diff -urNp linux-2.6.37.3/arch/x86/lib/copy_user_nocache_64.S linux-2.6.37.3/arch/x86/lib/copy_user_nocache_64.S
22121 ---- linux-2.6.37.3/arch/x86/lib/copy_user_nocache_64.S 2011-01-04 19:50:19.000000000 -0500
22122 -+++ linux-2.6.37.3/arch/x86/lib/copy_user_nocache_64.S 2011-01-17 02:41:01.000000000 -0500
22123 +diff -urNp linux-2.6.37.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.37.4/arch/x86/lib/copy_user_nocache_64.S
22124 +--- linux-2.6.37.4/arch/x86/lib/copy_user_nocache_64.S 2011-01-04 19:50:19.000000000 -0500
22125 ++++ linux-2.6.37.4/arch/x86/lib/copy_user_nocache_64.S 2011-01-17 02:41:01.000000000 -0500
22126 @@ -14,6 +14,7 @@
22127 #include <asm/current.h>
22128 #include <asm/asm-offsets.h>
22129 @@ -15997,9 +16148,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/copy_user_nocache_64.S linux-2.6.37.3/arc
22130 cmpl $8,%edx
22131 jb 20f /* less then 8 bytes, go to byte copy loop */
22132 ALIGN_DESTINATION
22133 -diff -urNp linux-2.6.37.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.37.3/arch/x86/lib/csum-wrappers_64.c
22134 ---- linux-2.6.37.3/arch/x86/lib/csum-wrappers_64.c 2011-01-04 19:50:19.000000000 -0500
22135 -+++ linux-2.6.37.3/arch/x86/lib/csum-wrappers_64.c 2011-01-17 02:41:01.000000000 -0500
22136 +diff -urNp linux-2.6.37.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.37.4/arch/x86/lib/csum-wrappers_64.c
22137 +--- linux-2.6.37.4/arch/x86/lib/csum-wrappers_64.c 2011-01-04 19:50:19.000000000 -0500
22138 ++++ linux-2.6.37.4/arch/x86/lib/csum-wrappers_64.c 2011-01-17 02:41:01.000000000 -0500
22139 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
22140 len -= 2;
22141 }
22142 @@ -16018,9 +16169,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.37.3/arch/x8
22143 return csum_partial_copy_generic(src, (void __force *)dst,
22144 len, isum, NULL, errp);
22145 }
22146 -diff -urNp linux-2.6.37.3/arch/x86/lib/getuser.S linux-2.6.37.3/arch/x86/lib/getuser.S
22147 ---- linux-2.6.37.3/arch/x86/lib/getuser.S 2011-01-04 19:50:19.000000000 -0500
22148 -+++ linux-2.6.37.3/arch/x86/lib/getuser.S 2011-03-12 22:50:25.000000000 -0500
22149 +diff -urNp linux-2.6.37.4/arch/x86/lib/getuser.S linux-2.6.37.4/arch/x86/lib/getuser.S
22150 +--- linux-2.6.37.4/arch/x86/lib/getuser.S 2011-01-04 19:50:19.000000000 -0500
22151 ++++ linux-2.6.37.4/arch/x86/lib/getuser.S 2011-03-12 22:50:25.000000000 -0500
22152 @@ -33,14 +33,35 @@
22153 #include <asm/asm-offsets.h>
22154 #include <asm/thread_info.h>
22155 @@ -16126,9 +16277,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/getuser.S linux-2.6.37.3/arch/x86/lib/get
22156 4: movq -7(%_ASM_AX),%_ASM_DX
22157 xor %eax,%eax
22158 ret
22159 -diff -urNp linux-2.6.37.3/arch/x86/lib/insn.c linux-2.6.37.3/arch/x86/lib/insn.c
22160 ---- linux-2.6.37.3/arch/x86/lib/insn.c 2011-01-04 19:50:19.000000000 -0500
22161 -+++ linux-2.6.37.3/arch/x86/lib/insn.c 2011-01-24 18:04:15.000000000 -0500
22162 +diff -urNp linux-2.6.37.4/arch/x86/lib/insn.c linux-2.6.37.4/arch/x86/lib/insn.c
22163 +--- linux-2.6.37.4/arch/x86/lib/insn.c 2011-01-04 19:50:19.000000000 -0500
22164 ++++ linux-2.6.37.4/arch/x86/lib/insn.c 2011-01-24 18:04:15.000000000 -0500
22165 @@ -21,6 +21,11 @@
22166 #include <linux/string.h>
22167 #include <asm/inat.h>
22168 @@ -16152,9 +16303,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/insn.c linux-2.6.37.3/arch/x86/lib/insn.c
22169 insn->x86_64 = x86_64 ? 1 : 0;
22170 insn->opnd_bytes = 4;
22171 if (x86_64)
22172 -diff -urNp linux-2.6.37.3/arch/x86/lib/mmx_32.c linux-2.6.37.3/arch/x86/lib/mmx_32.c
22173 ---- linux-2.6.37.3/arch/x86/lib/mmx_32.c 2011-01-04 19:50:19.000000000 -0500
22174 -+++ linux-2.6.37.3/arch/x86/lib/mmx_32.c 2011-01-17 02:41:01.000000000 -0500
22175 +diff -urNp linux-2.6.37.4/arch/x86/lib/mmx_32.c linux-2.6.37.4/arch/x86/lib/mmx_32.c
22176 +--- linux-2.6.37.4/arch/x86/lib/mmx_32.c 2011-01-04 19:50:19.000000000 -0500
22177 ++++ linux-2.6.37.4/arch/x86/lib/mmx_32.c 2011-01-17 02:41:01.000000000 -0500
22178 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
22179 {
22180 void *p;
22181 @@ -16470,9 +16621,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/mmx_32.c linux-2.6.37.3/arch/x86/lib/mmx_
22182
22183 from += 64;
22184 to += 64;
22185 -diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/putuser.S
22186 ---- linux-2.6.37.3/arch/x86/lib/putuser.S 2011-01-04 19:50:19.000000000 -0500
22187 -+++ linux-2.6.37.3/arch/x86/lib/putuser.S 2011-03-12 22:50:25.000000000 -0500
22188 +diff -urNp linux-2.6.37.4/arch/x86/lib/putuser.S linux-2.6.37.4/arch/x86/lib/putuser.S
22189 +--- linux-2.6.37.4/arch/x86/lib/putuser.S 2011-01-04 19:50:19.000000000 -0500
22190 ++++ linux-2.6.37.4/arch/x86/lib/putuser.S 2011-03-12 22:50:25.000000000 -0500
22191 @@ -15,7 +15,8 @@
22192 #include <asm/thread_info.h>
22193 #include <asm/errno.h>
22194 @@ -16610,9 +16761,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/put
22195 #endif
22196 xor %eax,%eax
22197 EXIT
22198 -diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib/usercopy_32.c
22199 ---- linux-2.6.37.3/arch/x86/lib/usercopy_32.c 2011-01-04 19:50:19.000000000 -0500
22200 -+++ linux-2.6.37.3/arch/x86/lib/usercopy_32.c 2011-03-12 22:50:25.000000000 -0500
22201 +diff -urNp linux-2.6.37.4/arch/x86/lib/usercopy_32.c linux-2.6.37.4/arch/x86/lib/usercopy_32.c
22202 +--- linux-2.6.37.4/arch/x86/lib/usercopy_32.c 2011-01-04 19:50:19.000000000 -0500
22203 ++++ linux-2.6.37.4/arch/x86/lib/usercopy_32.c 2011-03-12 22:50:25.000000000 -0500
22204 @@ -43,7 +43,7 @@ do { \
22205 __asm__ __volatile__( \
22206 " testl %1,%1\n" \
22207 @@ -17232,9 +17383,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
22208 +}
22209 +EXPORT_SYMBOL(set_fs);
22210 +#endif
22211 -diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_64.c linux-2.6.37.3/arch/x86/lib/usercopy_64.c
22212 ---- linux-2.6.37.3/arch/x86/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
22213 -+++ linux-2.6.37.3/arch/x86/lib/usercopy_64.c 2011-01-17 02:41:01.000000000 -0500
22214 +diff -urNp linux-2.6.37.4/arch/x86/lib/usercopy_64.c linux-2.6.37.4/arch/x86/lib/usercopy_64.c
22215 +--- linux-2.6.37.4/arch/x86/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
22216 ++++ linux-2.6.37.4/arch/x86/lib/usercopy_64.c 2011-01-17 02:41:01.000000000 -0500
22217 @@ -42,6 +42,8 @@ long
22218 __strncpy_from_user(char *dst, const char __user *src, long count)
22219 {
22220 @@ -17271,9 +17422,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_64.c linux-2.6.37.3/arch/x86/lib
22221 }
22222 EXPORT_SYMBOL(copy_in_user);
22223
22224 -diff -urNp linux-2.6.37.3/arch/x86/Makefile linux-2.6.37.3/arch/x86/Makefile
22225 ---- linux-2.6.37.3/arch/x86/Makefile 2011-01-04 19:50:19.000000000 -0500
22226 -+++ linux-2.6.37.3/arch/x86/Makefile 2011-01-17 02:41:01.000000000 -0500
22227 +diff -urNp linux-2.6.37.4/arch/x86/Makefile linux-2.6.37.4/arch/x86/Makefile
22228 +--- linux-2.6.37.4/arch/x86/Makefile 2011-01-04 19:50:19.000000000 -0500
22229 ++++ linux-2.6.37.4/arch/x86/Makefile 2011-01-17 02:41:01.000000000 -0500
22230 @@ -195,3 +195,12 @@ define archhelp
22231 echo ' FDARGS="..." arguments for the booted kernel'
22232 echo ' FDINITRD=file initrd for the booted kernel'
22233 @@ -17287,9 +17438,9 @@ diff -urNp linux-2.6.37.3/arch/x86/Makefile linux-2.6.37.3/arch/x86/Makefile
22234 +
22235 +archprepare:
22236 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
22237 -diff -urNp linux-2.6.37.3/arch/x86/mm/extable.c linux-2.6.37.3/arch/x86/mm/extable.c
22238 ---- linux-2.6.37.3/arch/x86/mm/extable.c 2011-01-04 19:50:19.000000000 -0500
22239 -+++ linux-2.6.37.3/arch/x86/mm/extable.c 2011-01-17 02:41:01.000000000 -0500
22240 +diff -urNp linux-2.6.37.4/arch/x86/mm/extable.c linux-2.6.37.4/arch/x86/mm/extable.c
22241 +--- linux-2.6.37.4/arch/x86/mm/extable.c 2011-01-04 19:50:19.000000000 -0500
22242 ++++ linux-2.6.37.4/arch/x86/mm/extable.c 2011-01-17 02:41:01.000000000 -0500
22243 @@ -1,14 +1,71 @@
22244 #include <linux/module.h>
22245 #include <linux/spinlock.h>
22246 @@ -17363,9 +17514,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/extable.c linux-2.6.37.3/arch/x86/mm/extab
22247 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
22248 extern u32 pnp_bios_is_utter_crap;
22249 pnp_bios_is_utter_crap = 1;
22250 -diff -urNp linux-2.6.37.3/arch/x86/mm/fault.c linux-2.6.37.3/arch/x86/mm/fault.c
22251 ---- linux-2.6.37.3/arch/x86/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
22252 -+++ linux-2.6.37.3/arch/x86/mm/fault.c 2011-03-12 22:50:25.000000000 -0500
22253 +diff -urNp linux-2.6.37.4/arch/x86/mm/fault.c linux-2.6.37.4/arch/x86/mm/fault.c
22254 +--- linux-2.6.37.4/arch/x86/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
22255 ++++ linux-2.6.37.4/arch/x86/mm/fault.c 2011-03-12 22:50:25.000000000 -0500
22256 @@ -12,10 +12,18 @@
22257 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
22258 #include <linux/perf_event.h> /* perf_sw_event */
22259 @@ -18034,9 +18185,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/fault.c linux-2.6.37.3/arch/x86/mm/fault.c
22260 +
22261 + return ret ? -EFAULT : 0;
22262 +}
22263 -diff -urNp linux-2.6.37.3/arch/x86/mm/gup.c linux-2.6.37.3/arch/x86/mm/gup.c
22264 ---- linux-2.6.37.3/arch/x86/mm/gup.c 2011-01-04 19:50:19.000000000 -0500
22265 -+++ linux-2.6.37.3/arch/x86/mm/gup.c 2011-01-17 02:41:01.000000000 -0500
22266 +diff -urNp linux-2.6.37.4/arch/x86/mm/gup.c linux-2.6.37.4/arch/x86/mm/gup.c
22267 +--- linux-2.6.37.4/arch/x86/mm/gup.c 2011-01-04 19:50:19.000000000 -0500
22268 ++++ linux-2.6.37.4/arch/x86/mm/gup.c 2011-01-17 02:41:01.000000000 -0500
22269 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
22270 addr = start;
22271 len = (unsigned long) nr_pages << PAGE_SHIFT;
22272 @@ -18046,9 +18197,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/gup.c linux-2.6.37.3/arch/x86/mm/gup.c
22273 (void __user *)start, len)))
22274 return 0;
22275
22276 -diff -urNp linux-2.6.37.3/arch/x86/mm/highmem_32.c linux-2.6.37.3/arch/x86/mm/highmem_32.c
22277 ---- linux-2.6.37.3/arch/x86/mm/highmem_32.c 2011-01-04 19:50:19.000000000 -0500
22278 -+++ linux-2.6.37.3/arch/x86/mm/highmem_32.c 2011-01-17 02:41:01.000000000 -0500
22279 +diff -urNp linux-2.6.37.4/arch/x86/mm/highmem_32.c linux-2.6.37.4/arch/x86/mm/highmem_32.c
22280 +--- linux-2.6.37.4/arch/x86/mm/highmem_32.c 2011-01-04 19:50:19.000000000 -0500
22281 ++++ linux-2.6.37.4/arch/x86/mm/highmem_32.c 2011-01-17 02:41:01.000000000 -0500
22282 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
22283 idx = type + KM_TYPE_NR*smp_processor_id();
22284 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
22285 @@ -18060,9 +18211,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/highmem_32.c linux-2.6.37.3/arch/x86/mm/hi
22286
22287 return (void *)vaddr;
22288 }
22289 -diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/hugetlbpage.c
22290 ---- linux-2.6.37.3/arch/x86/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
22291 -+++ linux-2.6.37.3/arch/x86/mm/hugetlbpage.c 2011-01-17 02:41:01.000000000 -0500
22292 +diff -urNp linux-2.6.37.4/arch/x86/mm/hugetlbpage.c linux-2.6.37.4/arch/x86/mm/hugetlbpage.c
22293 +--- linux-2.6.37.4/arch/x86/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
22294 ++++ linux-2.6.37.4/arch/x86/mm/hugetlbpage.c 2011-03-21 17:35:08.000000000 -0400
22295 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
22296 struct hstate *h = hstate_file(file);
22297 struct mm_struct *mm = current->mm;
22298 @@ -18136,7 +18287,7 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/h
22299
22300 /* don't allow allocations above current base */
22301 if (mm->free_area_cache > base)
22302 -@@ -321,7 +328,7 @@ static unsigned long hugetlb_get_unmappe
22303 +@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmappe
22304 largest_hole = 0;
22305 mm->free_area_cache = base;
22306 }
22307 @@ -18145,10 +18296,12 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/h
22308 /* make sure it can fit in the remaining address space */
22309 if (mm->free_area_cache < len)
22310 goto fail;
22311 -@@ -329,33 +336,27 @@ try_again:
22312 +
22313 /* either no address requested or cant fit in requested address hole */
22314 - addr = (mm->free_area_cache - len) & huge_page_mask(h);
22315 +- addr = (mm->free_area_cache - len) & huge_page_mask(h);
22316 ++ addr = (mm->free_area_cache - len);
22317 do {
22318 ++ addr &= huge_page_mask(h);
22319 + vma = find_vma(mm, addr);
22320 /*
22321 * Lookup failure means no vma is above this address,
22322 @@ -18188,8 +18341,10 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/h
22323 + largest_hole = vma->vm_start - addr;
22324
22325 /* try just below the current vma->vm_start */
22326 - addr = (vma->vm_start - len) & huge_page_mask(h);
22327 -@@ -363,22 +364,26 @@ try_again:
22328 +- addr = (vma->vm_start - len) & huge_page_mask(h);
22329 +- } while (len <= vma->vm_start);
22330 ++ addr = skip_heap_stack_gap(vma, len);
22331 ++ } while (!IS_ERR_VALUE(addr));
22332
22333 fail:
22334 /*
22335 @@ -18227,7 +18382,7 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/h
22336 mm->cached_hole_size = ~0UL;
22337 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
22338 len, pgoff, flags);
22339 -@@ -386,6 +391,7 @@ fail:
22340 +@@ -386,6 +392,7 @@ fail:
22341 /*
22342 * Restore the topdown base:
22343 */
22344 @@ -18235,7 +18390,7 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/h
22345 mm->free_area_cache = base;
22346 mm->cached_hole_size = ~0UL;
22347
22348 -@@ -399,10 +405,19 @@ hugetlb_get_unmapped_area(struct file *f
22349 +@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *f
22350 struct hstate *h = hstate_file(file);
22351 struct mm_struct *mm = current->mm;
22352 struct vm_area_struct *vma;
22353 @@ -18256,7 +18411,7 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/h
22354 return -ENOMEM;
22355
22356 if (flags & MAP_FIXED) {
22357 -@@ -414,8 +429,7 @@ hugetlb_get_unmapped_area(struct file *f
22358 +@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *f
22359 if (addr) {
22360 addr = ALIGN(addr, huge_page_size(h));
22361 vma = find_vma(mm, addr);
22362 @@ -18266,9 +18421,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/hugetlbpage.c linux-2.6.37.3/arch/x86/mm/h
22363 return addr;
22364 }
22365 if (mm->get_unmapped_area == arch_get_unmapped_area)
22366 -diff -urNp linux-2.6.37.3/arch/x86/mm/init_32.c linux-2.6.37.3/arch/x86/mm/init_32.c
22367 ---- linux-2.6.37.3/arch/x86/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
22368 -+++ linux-2.6.37.3/arch/x86/mm/init_32.c 2011-01-17 02:41:01.000000000 -0500
22369 +diff -urNp linux-2.6.37.4/arch/x86/mm/init_32.c linux-2.6.37.4/arch/x86/mm/init_32.c
22370 +--- linux-2.6.37.4/arch/x86/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
22371 ++++ linux-2.6.37.4/arch/x86/mm/init_32.c 2011-01-17 02:41:01.000000000 -0500
22372 @@ -73,36 +73,6 @@ static __init void *alloc_low_page(void)
22373 }
22374
22375 @@ -18543,9 +18698,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/init_32.c linux-2.6.37.3/arch/x86/mm/init_
22376 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
22377 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
22378 size >> 10);
22379 -diff -urNp linux-2.6.37.3/arch/x86/mm/init_64.c linux-2.6.37.3/arch/x86/mm/init_64.c
22380 ---- linux-2.6.37.3/arch/x86/mm/init_64.c 2011-01-04 19:50:19.000000000 -0500
22381 -+++ linux-2.6.37.3/arch/x86/mm/init_64.c 2011-01-17 02:41:01.000000000 -0500
22382 +diff -urNp linux-2.6.37.4/arch/x86/mm/init_64.c linux-2.6.37.4/arch/x86/mm/init_64.c
22383 +--- linux-2.6.37.4/arch/x86/mm/init_64.c 2011-01-04 19:50:19.000000000 -0500
22384 ++++ linux-2.6.37.4/arch/x86/mm/init_64.c 2011-01-17 02:41:01.000000000 -0500
22385 @@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa
22386 * around without checking the pgd every time.
22387 */
22388 @@ -18657,9 +18812,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/init_64.c linux-2.6.37.3/arch/x86/mm/init_
22389 return "[vdso]";
22390 if (vma == &gate_vma)
22391 return "[vsyscall]";
22392 -diff -urNp linux-2.6.37.3/arch/x86/mm/init.c linux-2.6.37.3/arch/x86/mm/init.c
22393 ---- linux-2.6.37.3/arch/x86/mm/init.c 2011-01-04 19:50:19.000000000 -0500
22394 -+++ linux-2.6.37.3/arch/x86/mm/init.c 2011-01-17 02:41:01.000000000 -0500
22395 +diff -urNp linux-2.6.37.4/arch/x86/mm/init.c linux-2.6.37.4/arch/x86/mm/init.c
22396 +--- linux-2.6.37.4/arch/x86/mm/init.c 2011-01-04 19:50:19.000000000 -0500
22397 ++++ linux-2.6.37.4/arch/x86/mm/init.c 2011-01-17 02:41:01.000000000 -0500
22398 @@ -72,11 +72,7 @@ static void __init find_early_table_spac
22399 * cause a hotspot and fill up ZONE_DMA. The page tables
22400 * need roughly 0.5KB per GB.
22401 @@ -18775,9 +18930,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/init.c linux-2.6.37.3/arch/x86/mm/init.c
22402 free_init_pages("unused kernel memory",
22403 (unsigned long)(&__init_begin),
22404 (unsigned long)(&__init_end));
22405 -diff -urNp linux-2.6.37.3/arch/x86/mm/iomap_32.c linux-2.6.37.3/arch/x86/mm/iomap_32.c
22406 ---- linux-2.6.37.3/arch/x86/mm/iomap_32.c 2011-01-04 19:50:19.000000000 -0500
22407 -+++ linux-2.6.37.3/arch/x86/mm/iomap_32.c 2011-01-17 02:41:01.000000000 -0500
22408 +diff -urNp linux-2.6.37.4/arch/x86/mm/iomap_32.c linux-2.6.37.4/arch/x86/mm/iomap_32.c
22409 +--- linux-2.6.37.4/arch/x86/mm/iomap_32.c 2011-01-04 19:50:19.000000000 -0500
22410 ++++ linux-2.6.37.4/arch/x86/mm/iomap_32.c 2011-01-17 02:41:01.000000000 -0500
22411 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
22412 type = kmap_atomic_idx_push();
22413 idx = type + KM_TYPE_NR * smp_processor_id();
22414 @@ -18790,9 +18945,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/iomap_32.c linux-2.6.37.3/arch/x86/mm/ioma
22415 arch_flush_lazy_mmu_mode();
22416
22417 return (void *)vaddr;
22418 -diff -urNp linux-2.6.37.3/arch/x86/mm/ioremap.c linux-2.6.37.3/arch/x86/mm/ioremap.c
22419 ---- linux-2.6.37.3/arch/x86/mm/ioremap.c 2011-01-04 19:50:19.000000000 -0500
22420 -+++ linux-2.6.37.3/arch/x86/mm/ioremap.c 2011-01-17 02:41:01.000000000 -0500
22421 +diff -urNp linux-2.6.37.4/arch/x86/mm/ioremap.c linux-2.6.37.4/arch/x86/mm/ioremap.c
22422 +--- linux-2.6.37.4/arch/x86/mm/ioremap.c 2011-01-04 19:50:19.000000000 -0500
22423 ++++ linux-2.6.37.4/arch/x86/mm/ioremap.c 2011-01-17 02:41:01.000000000 -0500
22424 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re
22425 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
22426 int is_ram = page_is_ram(pfn);
22427 @@ -18821,9 +18976,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/ioremap.c linux-2.6.37.3/arch/x86/mm/iorem
22428
22429 /*
22430 * The boot-ioremap range spans multiple pmds, for which
22431 -diff -urNp linux-2.6.37.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.37.3/arch/x86/mm/kmemcheck/kmemcheck.c
22432 ---- linux-2.6.37.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-04 19:50:19.000000000 -0500
22433 -+++ linux-2.6.37.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-17 02:41:01.000000000 -0500
22434 +diff -urNp linux-2.6.37.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.37.4/arch/x86/mm/kmemcheck/kmemcheck.c
22435 +--- linux-2.6.37.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-04 19:50:19.000000000 -0500
22436 ++++ linux-2.6.37.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-17 02:41:01.000000000 -0500
22437 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
22438 * memory (e.g. tracked pages)? For now, we need this to avoid
22439 * invoking kmemcheck for PnP BIOS calls.
22440 @@ -18836,9 +18991,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.37.3/arch/
22441 return false;
22442
22443 pte = kmemcheck_pte_lookup(address);
22444 -diff -urNp linux-2.6.37.3/arch/x86/mm/mmap.c linux-2.6.37.3/arch/x86/mm/mmap.c
22445 ---- linux-2.6.37.3/arch/x86/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
22446 -+++ linux-2.6.37.3/arch/x86/mm/mmap.c 2011-01-17 02:41:01.000000000 -0500
22447 +diff -urNp linux-2.6.37.4/arch/x86/mm/mmap.c linux-2.6.37.4/arch/x86/mm/mmap.c
22448 +--- linux-2.6.37.4/arch/x86/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
22449 ++++ linux-2.6.37.4/arch/x86/mm/mmap.c 2011-01-17 02:41:01.000000000 -0500
22450 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
22451 * Leave an at least ~128 MB hole with possible stack randomization.
22452 */
22453 @@ -18920,9 +19075,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/mmap.c linux-2.6.37.3/arch/x86/mm/mmap.c
22454 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
22455 mm->unmap_area = arch_unmap_area_topdown;
22456 }
22457 -diff -urNp linux-2.6.37.3/arch/x86/mm/numa_32.c linux-2.6.37.3/arch/x86/mm/numa_32.c
22458 ---- linux-2.6.37.3/arch/x86/mm/numa_32.c 2011-01-04 19:50:19.000000000 -0500
22459 -+++ linux-2.6.37.3/arch/x86/mm/numa_32.c 2011-01-17 02:41:01.000000000 -0500
22460 +diff -urNp linux-2.6.37.4/arch/x86/mm/numa_32.c linux-2.6.37.4/arch/x86/mm/numa_32.c
22461 +--- linux-2.6.37.4/arch/x86/mm/numa_32.c 2011-01-04 19:50:19.000000000 -0500
22462 ++++ linux-2.6.37.4/arch/x86/mm/numa_32.c 2011-01-17 02:41:01.000000000 -0500
22463 @@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int
22464 }
22465 #endif
22466 @@ -18931,9 +19086,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/numa_32.c linux-2.6.37.3/arch/x86/mm/numa_
22467 extern unsigned long highend_pfn, highstart_pfn;
22468
22469 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
22470 -diff -urNp linux-2.6.37.3/arch/x86/mm/pageattr.c linux-2.6.37.3/arch/x86/mm/pageattr.c
22471 ---- linux-2.6.37.3/arch/x86/mm/pageattr.c 2011-01-04 19:50:19.000000000 -0500
22472 -+++ linux-2.6.37.3/arch/x86/mm/pageattr.c 2011-01-17 02:41:01.000000000 -0500
22473 +diff -urNp linux-2.6.37.4/arch/x86/mm/pageattr.c linux-2.6.37.4/arch/x86/mm/pageattr.c
22474 +--- linux-2.6.37.4/arch/x86/mm/pageattr.c 2011-01-04 19:50:19.000000000 -0500
22475 ++++ linux-2.6.37.4/arch/x86/mm/pageattr.c 2011-01-17 02:41:01.000000000 -0500
22476 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection
22477 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
22478 */
22479 @@ -19017,9 +19172,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/pageattr.c linux-2.6.37.3/arch/x86/mm/page
22480 }
22481
22482 static int
22483 -diff -urNp linux-2.6.37.3/arch/x86/mm/pageattr-test.c linux-2.6.37.3/arch/x86/mm/pageattr-test.c
22484 ---- linux-2.6.37.3/arch/x86/mm/pageattr-test.c 2011-01-04 19:50:19.000000000 -0500
22485 -+++ linux-2.6.37.3/arch/x86/mm/pageattr-test.c 2011-01-17 02:41:01.000000000 -0500
22486 +diff -urNp linux-2.6.37.4/arch/x86/mm/pageattr-test.c linux-2.6.37.4/arch/x86/mm/pageattr-test.c
22487 +--- linux-2.6.37.4/arch/x86/mm/pageattr-test.c 2011-01-04 19:50:19.000000000 -0500
22488 ++++ linux-2.6.37.4/arch/x86/mm/pageattr-test.c 2011-01-17 02:41:01.000000000 -0500
22489 @@ -36,7 +36,7 @@ enum {
22490
22491 static int pte_testbit(pte_t pte)
22492 @@ -19029,9 +19184,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/pageattr-test.c linux-2.6.37.3/arch/x86/mm
22493 }
22494
22495 struct split_state {
22496 -diff -urNp linux-2.6.37.3/arch/x86/mm/pat.c linux-2.6.37.3/arch/x86/mm/pat.c
22497 ---- linux-2.6.37.3/arch/x86/mm/pat.c 2011-01-04 19:50:19.000000000 -0500
22498 -+++ linux-2.6.37.3/arch/x86/mm/pat.c 2011-01-17 02:41:01.000000000 -0500
22499 +diff -urNp linux-2.6.37.4/arch/x86/mm/pat.c linux-2.6.37.4/arch/x86/mm/pat.c
22500 +--- linux-2.6.37.4/arch/x86/mm/pat.c 2011-01-04 19:50:19.000000000 -0500
22501 ++++ linux-2.6.37.4/arch/x86/mm/pat.c 2011-01-17 02:41:01.000000000 -0500
22502 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
22503
22504 if (!entry) {
22505 @@ -19079,9 +19234,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/pat.c linux-2.6.37.3/arch/x86/mm/pat.c
22506 cattr_name(want_flags),
22507 (unsigned long long)paddr,
22508 (unsigned long long)(paddr + size),
22509 -diff -urNp linux-2.6.37.3/arch/x86/mm/pgtable_32.c linux-2.6.37.3/arch/x86/mm/pgtable_32.c
22510 ---- linux-2.6.37.3/arch/x86/mm/pgtable_32.c 2011-01-04 19:50:19.000000000 -0500
22511 -+++ linux-2.6.37.3/arch/x86/mm/pgtable_32.c 2011-01-17 02:41:01.000000000 -0500
22512 +diff -urNp linux-2.6.37.4/arch/x86/mm/pgtable_32.c linux-2.6.37.4/arch/x86/mm/pgtable_32.c
22513 +--- linux-2.6.37.4/arch/x86/mm/pgtable_32.c 2011-01-04 19:50:19.000000000 -0500
22514 ++++ linux-2.6.37.4/arch/x86/mm/pgtable_32.c 2011-01-17 02:41:01.000000000 -0500
22515 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
22516 return;
22517 }
22518 @@ -19096,9 +19251,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/pgtable_32.c linux-2.6.37.3/arch/x86/mm/pg
22519
22520 /*
22521 * It's enough to flush this one mapping.
22522 -diff -urNp linux-2.6.37.3/arch/x86/mm/pgtable.c linux-2.6.37.3/arch/x86/mm/pgtable.c
22523 ---- linux-2.6.37.3/arch/x86/mm/pgtable.c 2011-01-04 19:50:19.000000000 -0500
22524 -+++ linux-2.6.37.3/arch/x86/mm/pgtable.c 2011-01-17 02:41:01.000000000 -0500
22525 +diff -urNp linux-2.6.37.4/arch/x86/mm/pgtable.c linux-2.6.37.4/arch/x86/mm/pgtable.c
22526 +--- linux-2.6.37.4/arch/x86/mm/pgtable.c 2011-01-04 19:50:19.000000000 -0500
22527 ++++ linux-2.6.37.4/arch/x86/mm/pgtable.c 2011-01-17 02:41:01.000000000 -0500
22528 @@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p
22529 list_del(&page->lru);
22530 }
22531 @@ -19351,9 +19506,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/pgtable.c linux-2.6.37.3/arch/x86/mm/pgtab
22532 pgd_dtor(pgd);
22533 paravirt_pgd_free(mm, pgd);
22534 free_page((unsigned long)pgd);
22535 -diff -urNp linux-2.6.37.3/arch/x86/mm/setup_nx.c linux-2.6.37.3/arch/x86/mm/setup_nx.c
22536 ---- linux-2.6.37.3/arch/x86/mm/setup_nx.c 2011-01-04 19:50:19.000000000 -0500
22537 -+++ linux-2.6.37.3/arch/x86/mm/setup_nx.c 2011-01-17 02:41:01.000000000 -0500
22538 +diff -urNp linux-2.6.37.4/arch/x86/mm/setup_nx.c linux-2.6.37.4/arch/x86/mm/setup_nx.c
22539 +--- linux-2.6.37.4/arch/x86/mm/setup_nx.c 2011-01-04 19:50:19.000000000 -0500
22540 ++++ linux-2.6.37.4/arch/x86/mm/setup_nx.c 2011-01-17 02:41:01.000000000 -0500
22541 @@ -5,8 +5,10 @@
22542 #include <asm/pgtable.h>
22543 #include <asm/proto.h>
22544 @@ -19383,9 +19538,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/setup_nx.c linux-2.6.37.3/arch/x86/mm/setu
22545 __supported_pte_mask &= ~_PAGE_NX;
22546 }
22547
22548 -diff -urNp linux-2.6.37.3/arch/x86/mm/tlb.c linux-2.6.37.3/arch/x86/mm/tlb.c
22549 ---- linux-2.6.37.3/arch/x86/mm/tlb.c 2011-01-04 19:50:19.000000000 -0500
22550 -+++ linux-2.6.37.3/arch/x86/mm/tlb.c 2011-01-17 02:41:01.000000000 -0500
22551 +diff -urNp linux-2.6.37.4/arch/x86/mm/tlb.c linux-2.6.37.4/arch/x86/mm/tlb.c
22552 +--- linux-2.6.37.4/arch/x86/mm/tlb.c 2011-01-04 19:50:19.000000000 -0500
22553 ++++ linux-2.6.37.4/arch/x86/mm/tlb.c 2011-01-17 02:41:01.000000000 -0500
22554 @@ -14,7 +14,7 @@
22555 #include <asm/uv/uv.h>
22556
22557 @@ -19407,9 +19562,9 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/tlb.c linux-2.6.37.3/arch/x86/mm/tlb.c
22558 }
22559 EXPORT_SYMBOL_GPL(leave_mm);
22560
22561 -diff -urNp linux-2.6.37.3/arch/x86/oprofile/backtrace.c linux-2.6.37.3/arch/x86/oprofile/backtrace.c
22562 ---- linux-2.6.37.3/arch/x86/oprofile/backtrace.c 2011-01-04 19:50:19.000000000 -0500
22563 -+++ linux-2.6.37.3/arch/x86/oprofile/backtrace.c 2011-01-17 02:41:01.000000000 -0500
22564 +diff -urNp linux-2.6.37.4/arch/x86/oprofile/backtrace.c linux-2.6.37.4/arch/x86/oprofile/backtrace.c
22565 +--- linux-2.6.37.4/arch/x86/oprofile/backtrace.c 2011-01-04 19:50:19.000000000 -0500
22566 ++++ linux-2.6.37.4/arch/x86/oprofile/backtrace.c 2011-01-17 02:41:01.000000000 -0500
22567 @@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram
22568 struct stack_frame_ia32 *fp;
22569
22570 @@ -19428,9 +19583,9 @@ diff -urNp linux-2.6.37.3/arch/x86/oprofile/backtrace.c linux-2.6.37.3/arch/x86/
22571 unsigned long stack = kernel_stack_pointer(regs);
22572 if (depth)
22573 dump_trace(NULL, regs, (unsigned long *)stack, 0,
22574 -diff -urNp linux-2.6.37.3/arch/x86/oprofile/op_model_p4.c linux-2.6.37.3/arch/x86/oprofile/op_model_p4.c
22575 ---- linux-2.6.37.3/arch/x86/oprofile/op_model_p4.c 2011-01-04 19:50:19.000000000 -0500
22576 -+++ linux-2.6.37.3/arch/x86/oprofile/op_model_p4.c 2011-01-17 02:41:01.000000000 -0500
22577 +diff -urNp linux-2.6.37.4/arch/x86/oprofile/op_model_p4.c linux-2.6.37.4/arch/x86/oprofile/op_model_p4.c
22578 +--- linux-2.6.37.4/arch/x86/oprofile/op_model_p4.c 2011-01-04 19:50:19.000000000 -0500
22579 ++++ linux-2.6.37.4/arch/x86/oprofile/op_model_p4.c 2011-01-17 02:41:01.000000000 -0500
22580 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
22581 #endif
22582 }
22583 @@ -19440,9 +19595,9 @@ diff -urNp linux-2.6.37.3/arch/x86/oprofile/op_model_p4.c linux-2.6.37.3/arch/x8
22584 {
22585 #ifdef CONFIG_SMP
22586 return smp_num_siblings == 2 ? 2 : 1;
22587 -diff -urNp linux-2.6.37.3/arch/x86/pci/common.c linux-2.6.37.3/arch/x86/pci/common.c
22588 ---- linux-2.6.37.3/arch/x86/pci/common.c 2011-01-04 19:50:19.000000000 -0500
22589 -+++ linux-2.6.37.3/arch/x86/pci/common.c 2011-01-17 02:41:01.000000000 -0500
22590 +diff -urNp linux-2.6.37.4/arch/x86/pci/common.c linux-2.6.37.4/arch/x86/pci/common.c
22591 +--- linux-2.6.37.4/arch/x86/pci/common.c 2011-01-04 19:50:19.000000000 -0500
22592 ++++ linux-2.6.37.4/arch/x86/pci/common.c 2011-01-17 02:41:01.000000000 -0500
22593 @@ -32,8 +32,8 @@ int noioapicreroute = 1;
22594 int pcibios_last_bus = -1;
22595 unsigned long pirq_table_addr;
22596 @@ -19463,9 +19618,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/common.c linux-2.6.37.3/arch/x86/pci/comm
22597 };
22598
22599 void __init dmi_check_pciprobe(void)
22600 -diff -urNp linux-2.6.37.3/arch/x86/pci/direct.c linux-2.6.37.3/arch/x86/pci/direct.c
22601 ---- linux-2.6.37.3/arch/x86/pci/direct.c 2011-01-04 19:50:19.000000000 -0500
22602 -+++ linux-2.6.37.3/arch/x86/pci/direct.c 2011-01-17 02:41:01.000000000 -0500
22603 +diff -urNp linux-2.6.37.4/arch/x86/pci/direct.c linux-2.6.37.4/arch/x86/pci/direct.c
22604 +--- linux-2.6.37.4/arch/x86/pci/direct.c 2011-01-04 19:50:19.000000000 -0500
22605 ++++ linux-2.6.37.4/arch/x86/pci/direct.c 2011-01-17 02:41:01.000000000 -0500
22606 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
22607
22608 #undef PCI_CONF1_ADDRESS
22609 @@ -19493,9 +19648,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/direct.c linux-2.6.37.3/arch/x86/pci/dire
22610 {
22611 u32 x = 0;
22612 int year, devfn;
22613 -diff -urNp linux-2.6.37.3/arch/x86/pci/fixup.c linux-2.6.37.3/arch/x86/pci/fixup.c
22614 ---- linux-2.6.37.3/arch/x86/pci/fixup.c 2011-01-04 19:50:19.000000000 -0500
22615 -+++ linux-2.6.37.3/arch/x86/pci/fixup.c 2011-01-17 02:41:01.000000000 -0500
22616 +diff -urNp linux-2.6.37.4/arch/x86/pci/fixup.c linux-2.6.37.4/arch/x86/pci/fixup.c
22617 +--- linux-2.6.37.4/arch/x86/pci/fixup.c 2011-01-04 19:50:19.000000000 -0500
22618 ++++ linux-2.6.37.4/arch/x86/pci/fixup.c 2011-01-17 02:41:01.000000000 -0500
22619 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
22620 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
22621 },
22622 @@ -19514,9 +19669,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/fixup.c linux-2.6.37.3/arch/x86/pci/fixup
22623 };
22624
22625 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
22626 -diff -urNp linux-2.6.37.3/arch/x86/pci/irq.c linux-2.6.37.3/arch/x86/pci/irq.c
22627 ---- linux-2.6.37.3/arch/x86/pci/irq.c 2011-01-04 19:50:19.000000000 -0500
22628 -+++ linux-2.6.37.3/arch/x86/pci/irq.c 2011-01-17 02:41:01.000000000 -0500
22629 +diff -urNp linux-2.6.37.4/arch/x86/pci/irq.c linux-2.6.37.4/arch/x86/pci/irq.c
22630 +--- linux-2.6.37.4/arch/x86/pci/irq.c 2011-01-04 19:50:19.000000000 -0500
22631 ++++ linux-2.6.37.4/arch/x86/pci/irq.c 2011-01-17 02:41:01.000000000 -0500
22632 @@ -542,7 +542,7 @@ static __init int intel_router_probe(str
22633 static struct pci_device_id __initdata pirq_440gx[] = {
22634 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
22635 @@ -19535,9 +19690,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/irq.c linux-2.6.37.3/arch/x86/pci/irq.c
22636 };
22637
22638 void __init pcibios_irq_init(void)
22639 -diff -urNp linux-2.6.37.3/arch/x86/pci/mmconfig_32.c linux-2.6.37.3/arch/x86/pci/mmconfig_32.c
22640 ---- linux-2.6.37.3/arch/x86/pci/mmconfig_32.c 2011-01-04 19:50:19.000000000 -0500
22641 -+++ linux-2.6.37.3/arch/x86/pci/mmconfig_32.c 2011-01-17 02:41:01.000000000 -0500
22642 +diff -urNp linux-2.6.37.4/arch/x86/pci/mmconfig_32.c linux-2.6.37.4/arch/x86/pci/mmconfig_32.c
22643 +--- linux-2.6.37.4/arch/x86/pci/mmconfig_32.c 2011-01-04 19:50:19.000000000 -0500
22644 ++++ linux-2.6.37.4/arch/x86/pci/mmconfig_32.c 2011-01-17 02:41:01.000000000 -0500
22645 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int
22646 return 0;
22647 }
22648 @@ -19547,9 +19702,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/mmconfig_32.c linux-2.6.37.3/arch/x86/pci
22649 .read = pci_mmcfg_read,
22650 .write = pci_mmcfg_write,
22651 };
22652 -diff -urNp linux-2.6.37.3/arch/x86/pci/mmconfig_64.c linux-2.6.37.3/arch/x86/pci/mmconfig_64.c
22653 ---- linux-2.6.37.3/arch/x86/pci/mmconfig_64.c 2011-01-04 19:50:19.000000000 -0500
22654 -+++ linux-2.6.37.3/arch/x86/pci/mmconfig_64.c 2011-01-17 02:41:01.000000000 -0500
22655 +diff -urNp linux-2.6.37.4/arch/x86/pci/mmconfig_64.c linux-2.6.37.4/arch/x86/pci/mmconfig_64.c
22656 +--- linux-2.6.37.4/arch/x86/pci/mmconfig_64.c 2011-01-04 19:50:19.000000000 -0500
22657 ++++ linux-2.6.37.4/arch/x86/pci/mmconfig_64.c 2011-01-17 02:41:01.000000000 -0500
22658 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int
22659 return 0;
22660 }
22661 @@ -19559,9 +19714,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/mmconfig_64.c linux-2.6.37.3/arch/x86/pci
22662 .read = pci_mmcfg_read,
22663 .write = pci_mmcfg_write,
22664 };
22665 -diff -urNp linux-2.6.37.3/arch/x86/pci/numaq_32.c linux-2.6.37.3/arch/x86/pci/numaq_32.c
22666 ---- linux-2.6.37.3/arch/x86/pci/numaq_32.c 2011-01-04 19:50:19.000000000 -0500
22667 -+++ linux-2.6.37.3/arch/x86/pci/numaq_32.c 2011-01-17 02:41:01.000000000 -0500
22668 +diff -urNp linux-2.6.37.4/arch/x86/pci/numaq_32.c linux-2.6.37.4/arch/x86/pci/numaq_32.c
22669 +--- linux-2.6.37.4/arch/x86/pci/numaq_32.c 2011-01-04 19:50:19.000000000 -0500
22670 ++++ linux-2.6.37.4/arch/x86/pci/numaq_32.c 2011-01-17 02:41:01.000000000 -0500
22671 @@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
22672
22673 #undef PCI_CONF1_MQ_ADDRESS
22674 @@ -19571,9 +19726,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/numaq_32.c linux-2.6.37.3/arch/x86/pci/nu
22675 .read = pci_conf1_mq_read,
22676 .write = pci_conf1_mq_write
22677 };
22678 -diff -urNp linux-2.6.37.3/arch/x86/pci/olpc.c linux-2.6.37.3/arch/x86/pci/olpc.c
22679 ---- linux-2.6.37.3/arch/x86/pci/olpc.c 2011-01-04 19:50:19.000000000 -0500
22680 -+++ linux-2.6.37.3/arch/x86/pci/olpc.c 2011-01-17 02:41:01.000000000 -0500
22681 +diff -urNp linux-2.6.37.4/arch/x86/pci/olpc.c linux-2.6.37.4/arch/x86/pci/olpc.c
22682 +--- linux-2.6.37.4/arch/x86/pci/olpc.c 2011-01-04 19:50:19.000000000 -0500
22683 ++++ linux-2.6.37.4/arch/x86/pci/olpc.c 2011-01-17 02:41:01.000000000 -0500
22684 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
22685 return 0;
22686 }
22687 @@ -19583,9 +19738,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/olpc.c linux-2.6.37.3/arch/x86/pci/olpc.c
22688 .read = pci_olpc_read,
22689 .write = pci_olpc_write,
22690 };
22691 -diff -urNp linux-2.6.37.3/arch/x86/pci/pcbios.c linux-2.6.37.3/arch/x86/pci/pcbios.c
22692 ---- linux-2.6.37.3/arch/x86/pci/pcbios.c 2011-01-04 19:50:19.000000000 -0500
22693 -+++ linux-2.6.37.3/arch/x86/pci/pcbios.c 2011-01-17 02:41:01.000000000 -0500
22694 +diff -urNp linux-2.6.37.4/arch/x86/pci/pcbios.c linux-2.6.37.4/arch/x86/pci/pcbios.c
22695 +--- linux-2.6.37.4/arch/x86/pci/pcbios.c 2011-01-04 19:50:19.000000000 -0500
22696 ++++ linux-2.6.37.4/arch/x86/pci/pcbios.c 2011-01-17 02:41:01.000000000 -0500
22697 @@ -57,50 +57,93 @@ union bios32 {
22698 static struct {
22699 unsigned long address;
22700 @@ -19908,9 +20063,9 @@ diff -urNp linux-2.6.37.3/arch/x86/pci/pcbios.c linux-2.6.37.3/arch/x86/pci/pcbi
22701 return !(ret & 0xff00);
22702 }
22703 EXPORT_SYMBOL(pcibios_set_irq_routing);
22704 -diff -urNp linux-2.6.37.3/arch/x86/platform/efi/efi_32.c linux-2.6.37.3/arch/x86/platform/efi/efi_32.c
22705 ---- linux-2.6.37.3/arch/x86/platform/efi/efi_32.c 2011-01-04 19:50:19.000000000 -0500
22706 -+++ linux-2.6.37.3/arch/x86/platform/efi/efi_32.c 2011-01-17 02:41:01.000000000 -0500
22707 +diff -urNp linux-2.6.37.4/arch/x86/platform/efi/efi_32.c linux-2.6.37.4/arch/x86/platform/efi/efi_32.c
22708 +--- linux-2.6.37.4/arch/x86/platform/efi/efi_32.c 2011-01-04 19:50:19.000000000 -0500
22709 ++++ linux-2.6.37.4/arch/x86/platform/efi/efi_32.c 2011-01-17 02:41:01.000000000 -0500
22710 @@ -38,70 +38,37 @@
22711 */
22712
22713 @@ -19991,9 +20146,9 @@ diff -urNp linux-2.6.37.3/arch/x86/platform/efi/efi_32.c linux-2.6.37.3/arch/x86
22714
22715 /*
22716 * After the lock is released, the original page table is restored.
22717 -diff -urNp linux-2.6.37.3/arch/x86/platform/efi/efi_stub_32.S linux-2.6.37.3/arch/x86/platform/efi/efi_stub_32.S
22718 ---- linux-2.6.37.3/arch/x86/platform/efi/efi_stub_32.S 2011-01-04 19:50:19.000000000 -0500
22719 -+++ linux-2.6.37.3/arch/x86/platform/efi/efi_stub_32.S 2011-01-17 02:41:01.000000000 -0500
22720 +diff -urNp linux-2.6.37.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.37.4/arch/x86/platform/efi/efi_stub_32.S
22721 +--- linux-2.6.37.4/arch/x86/platform/efi/efi_stub_32.S 2011-01-04 19:50:19.000000000 -0500
22722 ++++ linux-2.6.37.4/arch/x86/platform/efi/efi_stub_32.S 2011-01-17 02:41:01.000000000 -0500
22723 @@ -6,6 +6,7 @@
22724 */
22725
22726 @@ -20092,9 +20247,9 @@ diff -urNp linux-2.6.37.3/arch/x86/platform/efi/efi_stub_32.S linux-2.6.37.3/arc
22727 saved_return_addr:
22728 .long 0
22729 efi_rt_function_ptr:
22730 -diff -urNp linux-2.6.37.3/arch/x86/power/cpu.c linux-2.6.37.3/arch/x86/power/cpu.c
22731 ---- linux-2.6.37.3/arch/x86/power/cpu.c 2011-01-04 19:50:19.000000000 -0500
22732 -+++ linux-2.6.37.3/arch/x86/power/cpu.c 2011-01-17 02:41:01.000000000 -0500
22733 +diff -urNp linux-2.6.37.4/arch/x86/power/cpu.c linux-2.6.37.4/arch/x86/power/cpu.c
22734 +--- linux-2.6.37.4/arch/x86/power/cpu.c 2011-01-04 19:50:19.000000000 -0500
22735 ++++ linux-2.6.37.4/arch/x86/power/cpu.c 2011-01-17 02:41:01.000000000 -0500
22736 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
22737 static void fix_processor_context(void)
22738 {
22739 @@ -20114,9 +20269,9 @@ diff -urNp linux-2.6.37.3/arch/x86/power/cpu.c linux-2.6.37.3/arch/x86/power/cpu
22740
22741 syscall_init(); /* This sets MSR_*STAR and related */
22742 #endif
22743 -diff -urNp linux-2.6.37.3/arch/x86/vdso/Makefile linux-2.6.37.3/arch/x86/vdso/Makefile
22744 ---- linux-2.6.37.3/arch/x86/vdso/Makefile 2011-01-04 19:50:19.000000000 -0500
22745 -+++ linux-2.6.37.3/arch/x86/vdso/Makefile 2011-01-17 02:41:01.000000000 -0500
22746 +diff -urNp linux-2.6.37.4/arch/x86/vdso/Makefile linux-2.6.37.4/arch/x86/vdso/Makefile
22747 +--- linux-2.6.37.4/arch/x86/vdso/Makefile 2011-01-04 19:50:19.000000000 -0500
22748 ++++ linux-2.6.37.4/arch/x86/vdso/Makefile 2011-01-17 02:41:01.000000000 -0500
22749 @@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@
22750 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
22751 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
22752 @@ -20126,9 +20281,9 @@ diff -urNp linux-2.6.37.3/arch/x86/vdso/Makefile linux-2.6.37.3/arch/x86/vdso/Ma
22753 GCOV_PROFILE := n
22754
22755 #
22756 -diff -urNp linux-2.6.37.3/arch/x86/vdso/vclock_gettime.c linux-2.6.37.3/arch/x86/vdso/vclock_gettime.c
22757 ---- linux-2.6.37.3/arch/x86/vdso/vclock_gettime.c 2011-01-04 19:50:19.000000000 -0500
22758 -+++ linux-2.6.37.3/arch/x86/vdso/vclock_gettime.c 2011-01-17 02:41:01.000000000 -0500
22759 +diff -urNp linux-2.6.37.4/arch/x86/vdso/vclock_gettime.c linux-2.6.37.4/arch/x86/vdso/vclock_gettime.c
22760 +--- linux-2.6.37.4/arch/x86/vdso/vclock_gettime.c 2011-01-04 19:50:19.000000000 -0500
22761 ++++ linux-2.6.37.4/arch/x86/vdso/vclock_gettime.c 2011-01-17 02:41:01.000000000 -0500
22762 @@ -22,24 +22,48 @@
22763 #include <asm/hpet.h>
22764 #include <asm/unistd.h>
22765 @@ -20227,9 +20382,9 @@ diff -urNp linux-2.6.37.3/arch/x86/vdso/vclock_gettime.c linux-2.6.37.3/arch/x86
22766 }
22767 int gettimeofday(struct timeval *, struct timezone *)
22768 __attribute__((weak, alias("__vdso_gettimeofday")));
22769 -diff -urNp linux-2.6.37.3/arch/x86/vdso/vdso32-setup.c linux-2.6.37.3/arch/x86/vdso/vdso32-setup.c
22770 ---- linux-2.6.37.3/arch/x86/vdso/vdso32-setup.c 2011-01-04 19:50:19.000000000 -0500
22771 -+++ linux-2.6.37.3/arch/x86/vdso/vdso32-setup.c 2011-01-17 02:41:01.000000000 -0500
22772 +diff -urNp linux-2.6.37.4/arch/x86/vdso/vdso32-setup.c linux-2.6.37.4/arch/x86/vdso/vdso32-setup.c
22773 +--- linux-2.6.37.4/arch/x86/vdso/vdso32-setup.c 2011-01-04 19:50:19.000000000 -0500
22774 ++++ linux-2.6.37.4/arch/x86/vdso/vdso32-setup.c 2011-01-17 02:41:01.000000000 -0500
22775 @@ -25,6 +25,7 @@
22776 #include <asm/tlbflush.h>
22777 #include <asm/vdso.h>
22778 @@ -20312,9 +20467,9 @@ diff -urNp linux-2.6.37.3/arch/x86/vdso/vdso32-setup.c linux-2.6.37.3/arch/x86/v
22779 return &gate_vma;
22780 return NULL;
22781 }
22782 -diff -urNp linux-2.6.37.3/arch/x86/vdso/vdso.lds.S linux-2.6.37.3/arch/x86/vdso/vdso.lds.S
22783 ---- linux-2.6.37.3/arch/x86/vdso/vdso.lds.S 2011-01-04 19:50:19.000000000 -0500
22784 -+++ linux-2.6.37.3/arch/x86/vdso/vdso.lds.S 2011-01-17 02:41:01.000000000 -0500
22785 +diff -urNp linux-2.6.37.4/arch/x86/vdso/vdso.lds.S linux-2.6.37.4/arch/x86/vdso/vdso.lds.S
22786 +--- linux-2.6.37.4/arch/x86/vdso/vdso.lds.S 2011-01-04 19:50:19.000000000 -0500
22787 ++++ linux-2.6.37.4/arch/x86/vdso/vdso.lds.S 2011-01-17 02:41:01.000000000 -0500
22788 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
22789 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
22790 #include "vextern.h"
22791 @@ -20325,9 +20480,9 @@ diff -urNp linux-2.6.37.3/arch/x86/vdso/vdso.lds.S linux-2.6.37.3/arch/x86/vdso/
22792 +VEXTERN(fallback_time)
22793 +VEXTERN(getcpu)
22794 +#undef VEXTERN
22795 -diff -urNp linux-2.6.37.3/arch/x86/vdso/vextern.h linux-2.6.37.3/arch/x86/vdso/vextern.h
22796 ---- linux-2.6.37.3/arch/x86/vdso/vextern.h 2011-01-04 19:50:19.000000000 -0500
22797 -+++ linux-2.6.37.3/arch/x86/vdso/vextern.h 2011-01-17 02:41:01.000000000 -0500
22798 +diff -urNp linux-2.6.37.4/arch/x86/vdso/vextern.h linux-2.6.37.4/arch/x86/vdso/vextern.h
22799 +--- linux-2.6.37.4/arch/x86/vdso/vextern.h 2011-01-04 19:50:19.000000000 -0500
22800 ++++ linux-2.6.37.4/arch/x86/vdso/vextern.h 2011-01-17 02:41:01.000000000 -0500
22801 @@ -11,6 +11,5 @@
22802 put into vextern.h and be referenced as a pointer with vdso prefix.
22803 The main kernel later fills in the values. */
22804 @@ -20335,9 +20490,9 @@ diff -urNp linux-2.6.37.3/arch/x86/vdso/vextern.h linux-2.6.37.3/arch/x86/vdso/v
22805 -VEXTERN(jiffies)
22806 VEXTERN(vgetcpu_mode)
22807 VEXTERN(vsyscall_gtod_data)
22808 -diff -urNp linux-2.6.37.3/arch/x86/vdso/vma.c linux-2.6.37.3/arch/x86/vdso/vma.c
22809 ---- linux-2.6.37.3/arch/x86/vdso/vma.c 2011-01-04 19:50:19.000000000 -0500
22810 -+++ linux-2.6.37.3/arch/x86/vdso/vma.c 2011-01-17 02:41:01.000000000 -0500
22811 +diff -urNp linux-2.6.37.4/arch/x86/vdso/vma.c linux-2.6.37.4/arch/x86/vdso/vma.c
22812 +--- linux-2.6.37.4/arch/x86/vdso/vma.c 2011-01-04 19:50:19.000000000 -0500
22813 ++++ linux-2.6.37.4/arch/x86/vdso/vma.c 2011-01-17 02:41:01.000000000 -0500
22814 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
22815 if (!vbase)
22816 goto oom;
22817 @@ -20376,9 +20531,9 @@ diff -urNp linux-2.6.37.3/arch/x86/vdso/vma.c linux-2.6.37.3/arch/x86/vdso/vma.c
22818 - return 0;
22819 -}
22820 -__setup("vdso=", vdso_setup);
22821 -diff -urNp linux-2.6.37.3/arch/x86/xen/enlighten.c linux-2.6.37.3/arch/x86/xen/enlighten.c
22822 ---- linux-2.6.37.3/arch/x86/xen/enlighten.c 2011-01-04 19:50:19.000000000 -0500
22823 -+++ linux-2.6.37.3/arch/x86/xen/enlighten.c 2011-01-17 02:41:01.000000000 -0500
22824 +diff -urNp linux-2.6.37.4/arch/x86/xen/enlighten.c linux-2.6.37.4/arch/x86/xen/enlighten.c
22825 +--- linux-2.6.37.4/arch/x86/xen/enlighten.c 2011-01-04 19:50:19.000000000 -0500
22826 ++++ linux-2.6.37.4/arch/x86/xen/enlighten.c 2011-01-17 02:41:01.000000000 -0500
22827 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
22828
22829 struct shared_info xen_dummy_shared_info;
22830 @@ -20430,9 +20585,9 @@ diff -urNp linux-2.6.37.3/arch/x86/xen/enlighten.c linux-2.6.37.3/arch/x86/xen/e
22831 xen_smp_init();
22832
22833 pgd = (pgd_t *)xen_start_info->pt_base;
22834 -diff -urNp linux-2.6.37.3/arch/x86/xen/mmu.c linux-2.6.37.3/arch/x86/xen/mmu.c
22835 ---- linux-2.6.37.3/arch/x86/xen/mmu.c 2011-02-27 14:49:17.000000000 -0500
22836 -+++ linux-2.6.37.3/arch/x86/xen/mmu.c 2011-02-27 14:49:45.000000000 -0500
22837 +diff -urNp linux-2.6.37.4/arch/x86/xen/mmu.c linux-2.6.37.4/arch/x86/xen/mmu.c
22838 +--- linux-2.6.37.4/arch/x86/xen/mmu.c 2011-02-27 14:49:17.000000000 -0500
22839 ++++ linux-2.6.37.4/arch/x86/xen/mmu.c 2011-02-27 14:49:45.000000000 -0500
22840 @@ -2096,6 +2096,8 @@ __init pgd_t *xen_setup_kernel_pagetable
22841 convert_pfn_mfn(init_level4_pgt);
22842 convert_pfn_mfn(level3_ident_pgt);
22843 @@ -20453,9 +20608,9 @@ diff -urNp linux-2.6.37.3/arch/x86/xen/mmu.c linux-2.6.37.3/arch/x86/xen/mmu.c
22844 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
22845 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
22846
22847 -diff -urNp linux-2.6.37.3/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.37.3/arch/x86/xen/pci-swiotlb-xen.c
22848 ---- linux-2.6.37.3/arch/x86/xen/pci-swiotlb-xen.c 2011-01-04 19:50:19.000000000 -0500
22849 -+++ linux-2.6.37.3/arch/x86/xen/pci-swiotlb-xen.c 2011-01-17 02:41:01.000000000 -0500
22850 +diff -urNp linux-2.6.37.4/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.37.4/arch/x86/xen/pci-swiotlb-xen.c
22851 +--- linux-2.6.37.4/arch/x86/xen/pci-swiotlb-xen.c 2011-01-04 19:50:19.000000000 -0500
22852 ++++ linux-2.6.37.4/arch/x86/xen/pci-swiotlb-xen.c 2011-01-17 02:41:01.000000000 -0500
22853 @@ -10,7 +10,7 @@
22854
22855 int xen_swiotlb __read_mostly;
22856 @@ -20465,9 +20620,9 @@ diff -urNp linux-2.6.37.3/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.37.3/arch/x86
22857 .mapping_error = xen_swiotlb_dma_mapping_error,
22858 .alloc_coherent = xen_swiotlb_alloc_coherent,
22859 .free_coherent = xen_swiotlb_free_coherent,
22860 -diff -urNp linux-2.6.37.3/arch/x86/xen/smp.c linux-2.6.37.3/arch/x86/xen/smp.c
22861 ---- linux-2.6.37.3/arch/x86/xen/smp.c 2011-01-04 19:50:19.000000000 -0500
22862 -+++ linux-2.6.37.3/arch/x86/xen/smp.c 2011-01-17 02:41:01.000000000 -0500
22863 +diff -urNp linux-2.6.37.4/arch/x86/xen/smp.c linux-2.6.37.4/arch/x86/xen/smp.c
22864 +--- linux-2.6.37.4/arch/x86/xen/smp.c 2011-01-04 19:50:19.000000000 -0500
22865 ++++ linux-2.6.37.4/arch/x86/xen/smp.c 2011-01-17 02:41:01.000000000 -0500
22866 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
22867 {
22868 BUG_ON(smp_processor_id() != 0);
22869 @@ -20496,9 +20651,9 @@ diff -urNp linux-2.6.37.3/arch/x86/xen/smp.c linux-2.6.37.3/arch/x86/xen/smp.c
22870 #else
22871 ctxt->gs_base_kernel = per_cpu_offset(cpu);
22872 #endif
22873 -diff -urNp linux-2.6.37.3/arch/x86/xen/xen-head.S linux-2.6.37.3/arch/x86/xen/xen-head.S
22874 ---- linux-2.6.37.3/arch/x86/xen/xen-head.S 2011-01-04 19:50:19.000000000 -0500
22875 -+++ linux-2.6.37.3/arch/x86/xen/xen-head.S 2011-01-17 02:41:01.000000000 -0500
22876 +diff -urNp linux-2.6.37.4/arch/x86/xen/xen-head.S linux-2.6.37.4/arch/x86/xen/xen-head.S
22877 +--- linux-2.6.37.4/arch/x86/xen/xen-head.S 2011-01-04 19:50:19.000000000 -0500
22878 ++++ linux-2.6.37.4/arch/x86/xen/xen-head.S 2011-01-17 02:41:01.000000000 -0500
22879 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
22880 #ifdef CONFIG_X86_32
22881 mov %esi,xen_start_info
22882 @@ -20517,9 +20672,9 @@ diff -urNp linux-2.6.37.3/arch/x86/xen/xen-head.S linux-2.6.37.3/arch/x86/xen/xe
22883 #else
22884 mov %rsi,xen_start_info
22885 mov $init_thread_union+THREAD_SIZE,%rsp
22886 -diff -urNp linux-2.6.37.3/arch/x86/xen/xen-ops.h linux-2.6.37.3/arch/x86/xen/xen-ops.h
22887 ---- linux-2.6.37.3/arch/x86/xen/xen-ops.h 2011-01-04 19:50:19.000000000 -0500
22888 -+++ linux-2.6.37.3/arch/x86/xen/xen-ops.h 2011-01-17 02:41:01.000000000 -0500
22889 +diff -urNp linux-2.6.37.4/arch/x86/xen/xen-ops.h linux-2.6.37.4/arch/x86/xen/xen-ops.h
22890 +--- linux-2.6.37.4/arch/x86/xen/xen-ops.h 2011-01-04 19:50:19.000000000 -0500
22891 ++++ linux-2.6.37.4/arch/x86/xen/xen-ops.h 2011-01-17 02:41:01.000000000 -0500
22892 @@ -10,8 +10,6 @@
22893 extern const char xen_hypervisor_callback[];
22894 extern const char xen_failsafe_callback[];
22895 @@ -20529,9 +20684,9 @@ diff -urNp linux-2.6.37.3/arch/x86/xen/xen-ops.h linux-2.6.37.3/arch/x86/xen/xen
22896 struct trap_info;
22897 void xen_copy_trap_info(struct trap_info *traps);
22898
22899 -diff -urNp linux-2.6.37.3/block/blk-iopoll.c linux-2.6.37.3/block/blk-iopoll.c
22900 ---- linux-2.6.37.3/block/blk-iopoll.c 2011-01-04 19:50:19.000000000 -0500
22901 -+++ linux-2.6.37.3/block/blk-iopoll.c 2011-01-17 02:41:01.000000000 -0500
22902 +diff -urNp linux-2.6.37.4/block/blk-iopoll.c linux-2.6.37.4/block/blk-iopoll.c
22903 +--- linux-2.6.37.4/block/blk-iopoll.c 2011-01-04 19:50:19.000000000 -0500
22904 ++++ linux-2.6.37.4/block/blk-iopoll.c 2011-01-17 02:41:01.000000000 -0500
22905 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
22906 }
22907 EXPORT_SYMBOL(blk_iopoll_complete);
22908 @@ -20541,9 +20696,9 @@ diff -urNp linux-2.6.37.3/block/blk-iopoll.c linux-2.6.37.3/block/blk-iopoll.c
22909 {
22910 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
22911 int rearm = 0, budget = blk_iopoll_budget;
22912 -diff -urNp linux-2.6.37.3/block/blk-map.c linux-2.6.37.3/block/blk-map.c
22913 ---- linux-2.6.37.3/block/blk-map.c 2011-01-04 19:50:19.000000000 -0500
22914 -+++ linux-2.6.37.3/block/blk-map.c 2011-01-17 02:41:01.000000000 -0500
22915 +diff -urNp linux-2.6.37.4/block/blk-map.c linux-2.6.37.4/block/blk-map.c
22916 +--- linux-2.6.37.4/block/blk-map.c 2011-01-04 19:50:19.000000000 -0500
22917 ++++ linux-2.6.37.4/block/blk-map.c 2011-01-17 02:41:01.000000000 -0500
22918 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
22919 if (!len || !kbuf)
22920 return -EINVAL;
22921 @@ -20553,9 +20708,9 @@ diff -urNp linux-2.6.37.3/block/blk-map.c linux-2.6.37.3/block/blk-map.c
22922 if (do_copy)
22923 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
22924 else
22925 -diff -urNp linux-2.6.37.3/block/blk-softirq.c linux-2.6.37.3/block/blk-softirq.c
22926 ---- linux-2.6.37.3/block/blk-softirq.c 2011-01-04 19:50:19.000000000 -0500
22927 -+++ linux-2.6.37.3/block/blk-softirq.c 2011-01-17 02:41:01.000000000 -0500
22928 +diff -urNp linux-2.6.37.4/block/blk-softirq.c linux-2.6.37.4/block/blk-softirq.c
22929 +--- linux-2.6.37.4/block/blk-softirq.c 2011-01-04 19:50:19.000000000 -0500
22930 ++++ linux-2.6.37.4/block/blk-softirq.c 2011-01-17 02:41:01.000000000 -0500
22931 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
22932 * Softirq action handler - move entries to local list and loop over them
22933 * while passing them to the queue registered handler.
22934 @@ -20565,9 +20720,9 @@ diff -urNp linux-2.6.37.3/block/blk-softirq.c linux-2.6.37.3/block/blk-softirq.c
22935 {
22936 struct list_head *cpu_list, local_list;
22937
22938 -diff -urNp linux-2.6.37.3/crypto/lrw.c linux-2.6.37.3/crypto/lrw.c
22939 ---- linux-2.6.37.3/crypto/lrw.c 2011-01-04 19:50:19.000000000 -0500
22940 -+++ linux-2.6.37.3/crypto/lrw.c 2011-01-17 02:41:01.000000000 -0500
22941 +diff -urNp linux-2.6.37.4/crypto/lrw.c linux-2.6.37.4/crypto/lrw.c
22942 +--- linux-2.6.37.4/crypto/lrw.c 2011-01-04 19:50:19.000000000 -0500
22943 ++++ linux-2.6.37.4/crypto/lrw.c 2011-01-17 02:41:01.000000000 -0500
22944 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
22945 struct priv *ctx = crypto_tfm_ctx(parent);
22946 struct crypto_cipher *child = ctx->child;
22947 @@ -20577,9 +20732,9 @@ diff -urNp linux-2.6.37.3/crypto/lrw.c linux-2.6.37.3/crypto/lrw.c
22948 int bsize = crypto_cipher_blocksize(child);
22949
22950 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
22951 -diff -urNp linux-2.6.37.3/Documentation/dontdiff linux-2.6.37.3/Documentation/dontdiff
22952 ---- linux-2.6.37.3/Documentation/dontdiff 2011-01-04 19:50:19.000000000 -0500
22953 -+++ linux-2.6.37.3/Documentation/dontdiff 2011-01-17 02:41:01.000000000 -0500
22954 +diff -urNp linux-2.6.37.4/Documentation/dontdiff linux-2.6.37.4/Documentation/dontdiff
22955 +--- linux-2.6.37.4/Documentation/dontdiff 2011-01-04 19:50:19.000000000 -0500
22956 ++++ linux-2.6.37.4/Documentation/dontdiff 2011-01-17 02:41:01.000000000 -0500
22957 @@ -3,6 +3,7 @@
22958 *.bin
22959 *.cpio
22960 @@ -20724,9 +20879,9 @@ diff -urNp linux-2.6.37.3/Documentation/dontdiff linux-2.6.37.3/Documentation/do
22961 zImage*
22962 zconf.hash.c
22963 +zoffset.h
22964 -diff -urNp linux-2.6.37.3/Documentation/filesystems/sysfs.txt linux-2.6.37.3/Documentation/filesystems/sysfs.txt
22965 ---- linux-2.6.37.3/Documentation/filesystems/sysfs.txt 2011-01-04 19:50:19.000000000 -0500
22966 -+++ linux-2.6.37.3/Documentation/filesystems/sysfs.txt 2011-01-17 02:41:01.000000000 -0500
22967 +diff -urNp linux-2.6.37.4/Documentation/filesystems/sysfs.txt linux-2.6.37.4/Documentation/filesystems/sysfs.txt
22968 +--- linux-2.6.37.4/Documentation/filesystems/sysfs.txt 2011-01-04 19:50:19.000000000 -0500
22969 ++++ linux-2.6.37.4/Documentation/filesystems/sysfs.txt 2011-01-17 02:41:01.000000000 -0500
22970 @@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
22971 show and store methods of the attribute owners.
22972
22973 @@ -20738,9 +20893,9 @@ diff -urNp linux-2.6.37.3/Documentation/filesystems/sysfs.txt linux-2.6.37.3/Doc
22974 };
22975
22976 [ Subsystems should have already defined a struct kobj_type as a
22977 -diff -urNp linux-2.6.37.3/Documentation/kernel-parameters.txt linux-2.6.37.3/Documentation/kernel-parameters.txt
22978 ---- linux-2.6.37.3/Documentation/kernel-parameters.txt 2011-02-22 16:05:30.000000000 -0500
22979 -+++ linux-2.6.37.3/Documentation/kernel-parameters.txt 2011-02-22 16:05:42.000000000 -0500
22980 +diff -urNp linux-2.6.37.4/Documentation/kernel-parameters.txt linux-2.6.37.4/Documentation/kernel-parameters.txt
22981 +--- linux-2.6.37.4/Documentation/kernel-parameters.txt 2011-02-22 16:05:30.000000000 -0500
22982 ++++ linux-2.6.37.4/Documentation/kernel-parameters.txt 2011-02-22 16:05:42.000000000 -0500
22983 @@ -1850,6 +1850,13 @@ and is between 256 and 4096 characters.
22984 the specified number of seconds. This is to be used if
22985 your oopses keep scrolling off the screen.
22986 @@ -20755,9 +20910,9 @@ diff -urNp linux-2.6.37.3/Documentation/kernel-parameters.txt linux-2.6.37.3/Doc
22987 pcbit= [HW,ISDN]
22988
22989 pcd. [PARIDE]
22990 -diff -urNp linux-2.6.37.3/drivers/acpi/battery.c linux-2.6.37.3/drivers/acpi/battery.c
22991 ---- linux-2.6.37.3/drivers/acpi/battery.c 2011-01-04 19:50:19.000000000 -0500
22992 -+++ linux-2.6.37.3/drivers/acpi/battery.c 2011-01-17 02:41:01.000000000 -0500
22993 +diff -urNp linux-2.6.37.4/drivers/acpi/battery.c linux-2.6.37.4/drivers/acpi/battery.c
22994 +--- linux-2.6.37.4/drivers/acpi/battery.c 2011-01-04 19:50:19.000000000 -0500
22995 ++++ linux-2.6.37.4/drivers/acpi/battery.c 2011-01-17 02:41:01.000000000 -0500
22996 @@ -851,7 +851,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
22997 }
22998
22999 @@ -20767,9 +20922,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/battery.c linux-2.6.37.3/drivers/acpi/bat
23000 mode_t mode;
23001 const char *name;
23002 } acpi_battery_file[] = {
23003 -diff -urNp linux-2.6.37.3/drivers/acpi/blacklist.c linux-2.6.37.3/drivers/acpi/blacklist.c
23004 ---- linux-2.6.37.3/drivers/acpi/blacklist.c 2011-01-04 19:50:19.000000000 -0500
23005 -+++ linux-2.6.37.3/drivers/acpi/blacklist.c 2011-01-17 02:41:01.000000000 -0500
23006 +diff -urNp linux-2.6.37.4/drivers/acpi/blacklist.c linux-2.6.37.4/drivers/acpi/blacklist.c
23007 +--- linux-2.6.37.4/drivers/acpi/blacklist.c 2011-01-04 19:50:19.000000000 -0500
23008 ++++ linux-2.6.37.4/drivers/acpi/blacklist.c 2011-01-17 02:41:01.000000000 -0500
23009 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
23010 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
23011 "Incorrect _ADR", 1},
23012 @@ -20779,9 +20934,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/blacklist.c linux-2.6.37.3/drivers/acpi/b
23013 };
23014
23015 #if CONFIG_ACPI_BLACKLIST_YEAR
23016 -diff -urNp linux-2.6.37.3/drivers/acpi/dock.c linux-2.6.37.3/drivers/acpi/dock.c
23017 ---- linux-2.6.37.3/drivers/acpi/dock.c 2011-01-04 19:50:19.000000000 -0500
23018 -+++ linux-2.6.37.3/drivers/acpi/dock.c 2011-01-17 02:41:01.000000000 -0500
23019 +diff -urNp linux-2.6.37.4/drivers/acpi/dock.c linux-2.6.37.4/drivers/acpi/dock.c
23020 +--- linux-2.6.37.4/drivers/acpi/dock.c 2011-01-04 19:50:19.000000000 -0500
23021 ++++ linux-2.6.37.4/drivers/acpi/dock.c 2011-01-17 02:41:01.000000000 -0500
23022 @@ -77,7 +77,7 @@ struct dock_dependent_device {
23023 struct list_head list;
23024 struct list_head hotplug_list;
23025 @@ -20800,9 +20955,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/dock.c linux-2.6.37.3/drivers/acpi/dock.c
23026 void *context)
23027 {
23028 struct dock_dependent_device *dd;
23029 -diff -urNp linux-2.6.37.3/drivers/acpi/ec_sys.c linux-2.6.37.3/drivers/acpi/ec_sys.c
23030 ---- linux-2.6.37.3/drivers/acpi/ec_sys.c 2011-01-04 19:50:19.000000000 -0500
23031 -+++ linux-2.6.37.3/drivers/acpi/ec_sys.c 2011-01-17 02:41:01.000000000 -0500
23032 +diff -urNp linux-2.6.37.4/drivers/acpi/ec_sys.c linux-2.6.37.4/drivers/acpi/ec_sys.c
23033 +--- linux-2.6.37.4/drivers/acpi/ec_sys.c 2011-01-04 19:50:19.000000000 -0500
23034 ++++ linux-2.6.37.4/drivers/acpi/ec_sys.c 2011-01-17 02:41:01.000000000 -0500
23035 @@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f
23036 return count;
23037 }
23038 @@ -20812,9 +20967,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/ec_sys.c linux-2.6.37.3/drivers/acpi/ec_s
23039 .owner = THIS_MODULE,
23040 .open = acpi_ec_open_io,
23041 .read = acpi_ec_read_io,
23042 -diff -urNp linux-2.6.37.3/drivers/acpi/osl.c linux-2.6.37.3/drivers/acpi/osl.c
23043 ---- linux-2.6.37.3/drivers/acpi/osl.c 2011-01-04 19:50:19.000000000 -0500
23044 -+++ linux-2.6.37.3/drivers/acpi/osl.c 2011-01-17 02:41:01.000000000 -0500
23045 +diff -urNp linux-2.6.37.4/drivers/acpi/osl.c linux-2.6.37.4/drivers/acpi/osl.c
23046 +--- linux-2.6.37.4/drivers/acpi/osl.c 2011-01-04 19:50:19.000000000 -0500
23047 ++++ linux-2.6.37.4/drivers/acpi/osl.c 2011-01-17 02:41:01.000000000 -0500
23048 @@ -643,6 +643,8 @@ acpi_os_read_memory(acpi_physical_addres
23049 rcu_read_unlock();
23050 if (!virt_addr) {
23051 @@ -20833,9 +20988,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/osl.c linux-2.6.37.3/drivers/acpi/osl.c
23052 unmap = 1;
23053 }
23054
23055 -diff -urNp linux-2.6.37.3/drivers/acpi/power_meter.c linux-2.6.37.3/drivers/acpi/power_meter.c
23056 ---- linux-2.6.37.3/drivers/acpi/power_meter.c 2011-01-04 19:50:19.000000000 -0500
23057 -+++ linux-2.6.37.3/drivers/acpi/power_meter.c 2011-01-17 02:41:01.000000000 -0500
23058 +diff -urNp linux-2.6.37.4/drivers/acpi/power_meter.c linux-2.6.37.4/drivers/acpi/power_meter.c
23059 +--- linux-2.6.37.4/drivers/acpi/power_meter.c 2011-01-04 19:50:19.000000000 -0500
23060 ++++ linux-2.6.37.4/drivers/acpi/power_meter.c 2011-01-17 02:41:01.000000000 -0500
23061 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
23062 return res;
23063
23064 @@ -20845,9 +21000,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/power_meter.c linux-2.6.37.3/drivers/acpi
23065
23066 mutex_lock(&resource->lock);
23067 resource->trip[attr->index - 7] = temp;
23068 -diff -urNp linux-2.6.37.3/drivers/acpi/proc.c linux-2.6.37.3/drivers/acpi/proc.c
23069 ---- linux-2.6.37.3/drivers/acpi/proc.c 2011-01-04 19:50:19.000000000 -0500
23070 -+++ linux-2.6.37.3/drivers/acpi/proc.c 2011-01-17 02:41:01.000000000 -0500
23071 +diff -urNp linux-2.6.37.4/drivers/acpi/proc.c linux-2.6.37.4/drivers/acpi/proc.c
23072 +--- linux-2.6.37.4/drivers/acpi/proc.c 2011-01-04 19:50:19.000000000 -0500
23073 ++++ linux-2.6.37.4/drivers/acpi/proc.c 2011-01-17 02:41:01.000000000 -0500
23074 @@ -338,20 +338,15 @@ acpi_system_write_wakeup_device(struct f
23075 size_t count, loff_t * ppos)
23076 {
23077 @@ -20883,9 +21038,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/proc.c linux-2.6.37.3/drivers/acpi/proc.c
23078 dev->wakeup.state.enabled =
23079 dev->wakeup.state.enabled ? 0 : 1;
23080 found_dev = dev;
23081 -diff -urNp linux-2.6.37.3/drivers/acpi/processor_driver.c linux-2.6.37.3/drivers/acpi/processor_driver.c
23082 ---- linux-2.6.37.3/drivers/acpi/processor_driver.c 2011-01-04 19:50:19.000000000 -0500
23083 -+++ linux-2.6.37.3/drivers/acpi/processor_driver.c 2011-01-17 02:41:01.000000000 -0500
23084 +diff -urNp linux-2.6.37.4/drivers/acpi/processor_driver.c linux-2.6.37.4/drivers/acpi/processor_driver.c
23085 +--- linux-2.6.37.4/drivers/acpi/processor_driver.c 2011-01-04 19:50:19.000000000 -0500
23086 ++++ linux-2.6.37.4/drivers/acpi/processor_driver.c 2011-01-17 02:41:01.000000000 -0500
23087 @@ -519,7 +519,7 @@ static int __cpuinit acpi_processor_add(
23088 return 0;
23089 #endif
23090 @@ -20895,9 +21050,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/processor_driver.c linux-2.6.37.3/drivers
23091
23092 /*
23093 * Buggy BIOS check
23094 -diff -urNp linux-2.6.37.3/drivers/acpi/processor_idle.c linux-2.6.37.3/drivers/acpi/processor_idle.c
23095 ---- linux-2.6.37.3/drivers/acpi/processor_idle.c 2011-01-04 19:50:19.000000000 -0500
23096 -+++ linux-2.6.37.3/drivers/acpi/processor_idle.c 2011-01-17 02:41:01.000000000 -0500
23097 +diff -urNp linux-2.6.37.4/drivers/acpi/processor_idle.c linux-2.6.37.4/drivers/acpi/processor_idle.c
23098 +--- linux-2.6.37.4/drivers/acpi/processor_idle.c 2011-01-04 19:50:19.000000000 -0500
23099 ++++ linux-2.6.37.4/drivers/acpi/processor_idle.c 2011-01-17 02:41:01.000000000 -0500
23100 @@ -114,7 +114,7 @@ static struct dmi_system_id __cpuinitdat
23101 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
23102 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
23103 @@ -20907,9 +21062,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/processor_idle.c linux-2.6.37.3/drivers/a
23104 };
23105
23106
23107 -diff -urNp linux-2.6.37.3/drivers/acpi/sleep.c linux-2.6.37.3/drivers/acpi/sleep.c
23108 ---- linux-2.6.37.3/drivers/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
23109 -+++ linux-2.6.37.3/drivers/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
23110 +diff -urNp linux-2.6.37.4/drivers/acpi/sleep.c linux-2.6.37.4/drivers/acpi/sleep.c
23111 +--- linux-2.6.37.4/drivers/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
23112 ++++ linux-2.6.37.4/drivers/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
23113 @@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(susp
23114 }
23115 }
23116 @@ -20946,9 +21101,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/sleep.c linux-2.6.37.3/drivers/acpi/sleep
23117 .begin = acpi_hibernation_begin_old,
23118 .end = acpi_pm_end,
23119 .pre_snapshot = acpi_pm_pre_suspend,
23120 -diff -urNp linux-2.6.37.3/drivers/acpi/video.c linux-2.6.37.3/drivers/acpi/video.c
23121 ---- linux-2.6.37.3/drivers/acpi/video.c 2011-01-04 19:50:19.000000000 -0500
23122 -+++ linux-2.6.37.3/drivers/acpi/video.c 2011-01-17 02:41:01.000000000 -0500
23123 +diff -urNp linux-2.6.37.4/drivers/acpi/video.c linux-2.6.37.4/drivers/acpi/video.c
23124 +--- linux-2.6.37.4/drivers/acpi/video.c 2011-01-04 19:50:19.000000000 -0500
23125 ++++ linux-2.6.37.4/drivers/acpi/video.c 2011-01-17 02:41:01.000000000 -0500
23126 @@ -260,7 +260,7 @@ static int acpi_video_set_brightness(str
23127 vd->brightness->levels[request_level]);
23128 }
23129 @@ -20958,9 +21113,9 @@ diff -urNp linux-2.6.37.3/drivers/acpi/video.c linux-2.6.37.3/drivers/acpi/video
23130 .get_brightness = acpi_video_get_brightness,
23131 .update_status = acpi_video_set_brightness,
23132 };
23133 -diff -urNp linux-2.6.37.3/drivers/ata/ahci.c linux-2.6.37.3/drivers/ata/ahci.c
23134 ---- linux-2.6.37.3/drivers/ata/ahci.c 2011-01-04 19:50:19.000000000 -0500
23135 -+++ linux-2.6.37.3/drivers/ata/ahci.c 2011-01-17 02:41:01.000000000 -0500
23136 +diff -urNp linux-2.6.37.4/drivers/ata/ahci.c linux-2.6.37.4/drivers/ata/ahci.c
23137 +--- linux-2.6.37.4/drivers/ata/ahci.c 2011-01-04 19:50:19.000000000 -0500
23138 ++++ linux-2.6.37.4/drivers/ata/ahci.c 2011-01-17 02:41:01.000000000 -0500
23139 @@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
23140 AHCI_SHT("ahci"),
23141 };
23142 @@ -20991,9 +21146,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/ahci.c linux-2.6.37.3/drivers/ata/ahci.c
23143 };
23144
23145
23146 -diff -urNp linux-2.6.37.3/drivers/ata/ahci.h linux-2.6.37.3/drivers/ata/ahci.h
23147 ---- linux-2.6.37.3/drivers/ata/ahci.h 2011-01-04 19:50:19.000000000 -0500
23148 -+++ linux-2.6.37.3/drivers/ata/ahci.h 2011-01-17 02:41:01.000000000 -0500
23149 +diff -urNp linux-2.6.37.4/drivers/ata/ahci.h linux-2.6.37.4/drivers/ata/ahci.h
23150 +--- linux-2.6.37.4/drivers/ata/ahci.h 2011-01-04 19:50:19.000000000 -0500
23151 ++++ linux-2.6.37.4/drivers/ata/ahci.h 2011-01-17 02:41:01.000000000 -0500
23152 @@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde
23153 .shost_attrs = ahci_shost_attrs, \
23154 .sdev_attrs = ahci_sdev_attrs
23155 @@ -21003,9 +21158,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/ahci.h linux-2.6.37.3/drivers/ata/ahci.h
23156
23157 void ahci_save_initial_config(struct device *dev,
23158 struct ahci_host_priv *hpriv,
23159 -diff -urNp linux-2.6.37.3/drivers/ata/ata_generic.c linux-2.6.37.3/drivers/ata/ata_generic.c
23160 ---- linux-2.6.37.3/drivers/ata/ata_generic.c 2011-01-04 19:50:19.000000000 -0500
23161 -+++ linux-2.6.37.3/drivers/ata/ata_generic.c 2011-01-17 02:41:01.000000000 -0500
23162 +diff -urNp linux-2.6.37.4/drivers/ata/ata_generic.c linux-2.6.37.4/drivers/ata/ata_generic.c
23163 +--- linux-2.6.37.4/drivers/ata/ata_generic.c 2011-01-04 19:50:19.000000000 -0500
23164 ++++ linux-2.6.37.4/drivers/ata/ata_generic.c 2011-01-17 02:41:01.000000000 -0500
23165 @@ -101,7 +101,7 @@ static struct scsi_host_template generic
23166 ATA_BMDMA_SHT(DRV_NAME),
23167 };
23168 @@ -21015,9 +21170,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/ata_generic.c linux-2.6.37.3/drivers/ata/a
23169 .inherits = &ata_bmdma_port_ops,
23170 .cable_detect = ata_cable_unknown,
23171 .set_mode = generic_set_mode,
23172 -diff -urNp linux-2.6.37.3/drivers/ata/ata_piix.c linux-2.6.37.3/drivers/ata/ata_piix.c
23173 ---- linux-2.6.37.3/drivers/ata/ata_piix.c 2011-01-04 19:50:19.000000000 -0500
23174 -+++ linux-2.6.37.3/drivers/ata/ata_piix.c 2011-01-17 02:41:01.000000000 -0500
23175 +diff -urNp linux-2.6.37.4/drivers/ata/ata_piix.c linux-2.6.37.4/drivers/ata/ata_piix.c
23176 +--- linux-2.6.37.4/drivers/ata/ata_piix.c 2011-01-04 19:50:19.000000000 -0500
23177 ++++ linux-2.6.37.4/drivers/ata/ata_piix.c 2011-01-17 02:41:01.000000000 -0500
23178 @@ -309,7 +309,7 @@ static const struct pci_device_id piix_p
23179 { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
23180 /* SATA Controller IDE (PBG) */
23181 @@ -21084,9 +21239,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/ata_piix.c linux-2.6.37.3/drivers/ata/ata_
23182 };
23183 static const char *oemstrs[] = {
23184 "Tecra M3,",
23185 -diff -urNp linux-2.6.37.3/drivers/ata/libahci.c linux-2.6.37.3/drivers/ata/libahci.c
23186 ---- linux-2.6.37.3/drivers/ata/libahci.c 2011-01-04 19:50:19.000000000 -0500
23187 -+++ linux-2.6.37.3/drivers/ata/libahci.c 2011-01-17 02:41:01.000000000 -0500
23188 +diff -urNp linux-2.6.37.4/drivers/ata/libahci.c linux-2.6.37.4/drivers/ata/libahci.c
23189 +--- linux-2.6.37.4/drivers/ata/libahci.c 2011-01-04 19:50:19.000000000 -0500
23190 ++++ linux-2.6.37.4/drivers/ata/libahci.c 2011-01-17 02:41:01.000000000 -0500
23191 @@ -140,7 +140,7 @@ struct device_attribute *ahci_sdev_attrs
23192 };
23193 EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
23194 @@ -21096,9 +21251,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/libahci.c linux-2.6.37.3/drivers/ata/libah
23195 .inherits = &sata_pmp_port_ops,
23196
23197 .qc_defer = ahci_pmp_qc_defer,
23198 -diff -urNp linux-2.6.37.3/drivers/ata/libata-acpi.c linux-2.6.37.3/drivers/ata/libata-acpi.c
23199 ---- linux-2.6.37.3/drivers/ata/libata-acpi.c 2011-01-04 19:50:19.000000000 -0500
23200 -+++ linux-2.6.37.3/drivers/ata/libata-acpi.c 2011-01-17 02:41:01.000000000 -0500
23201 +diff -urNp linux-2.6.37.4/drivers/ata/libata-acpi.c linux-2.6.37.4/drivers/ata/libata-acpi.c
23202 +--- linux-2.6.37.4/drivers/ata/libata-acpi.c 2011-01-04 19:50:19.000000000 -0500
23203 ++++ linux-2.6.37.4/drivers/ata/libata-acpi.c 2011-01-17 02:41:01.000000000 -0500
23204 @@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han
23205 ata_acpi_uevent(dev->link->ap, dev, event);
23206 }
23207 @@ -21114,9 +21269,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/libata-acpi.c linux-2.6.37.3/drivers/ata/l
23208 .handler = ata_acpi_ap_notify_dock,
23209 .uevent = ata_acpi_ap_uevent,
23210 };
23211 -diff -urNp linux-2.6.37.3/drivers/ata/libata-core.c linux-2.6.37.3/drivers/ata/libata-core.c
23212 ---- linux-2.6.37.3/drivers/ata/libata-core.c 2011-01-04 19:50:19.000000000 -0500
23213 -+++ linux-2.6.37.3/drivers/ata/libata-core.c 2011-01-17 02:41:01.000000000 -0500
23214 +diff -urNp linux-2.6.37.4/drivers/ata/libata-core.c linux-2.6.37.4/drivers/ata/libata-core.c
23215 +--- linux-2.6.37.4/drivers/ata/libata-core.c 2011-01-04 19:50:19.000000000 -0500
23216 ++++ linux-2.6.37.4/drivers/ata/libata-core.c 2011-01-17 02:41:01.000000000 -0500
23217 @@ -897,7 +897,7 @@ static const struct ata_xfer_ent {
23218 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
23219 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
23220 @@ -21208,9 +21363,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/libata-core.c linux-2.6.37.3/drivers/ata/l
23221 .qc_prep = ata_noop_qc_prep,
23222 .qc_issue = ata_dummy_qc_issue,
23223 .error_handler = ata_dummy_error_handler,
23224 -diff -urNp linux-2.6.37.3/drivers/ata/libata-eh.c linux-2.6.37.3/drivers/ata/libata-eh.c
23225 ---- linux-2.6.37.3/drivers/ata/libata-eh.c 2011-01-04 19:50:19.000000000 -0500
23226 -+++ linux-2.6.37.3/drivers/ata/libata-eh.c 2011-01-17 02:41:01.000000000 -0500
23227 +diff -urNp linux-2.6.37.4/drivers/ata/libata-eh.c linux-2.6.37.4/drivers/ata/libata-eh.c
23228 +--- linux-2.6.37.4/drivers/ata/libata-eh.c 2011-01-04 19:50:19.000000000 -0500
23229 ++++ linux-2.6.37.4/drivers/ata/libata-eh.c 2011-01-17 02:41:01.000000000 -0500
23230 @@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_
23231 */
23232 void ata_std_error_handler(struct ata_port *ap)
23233 @@ -21220,9 +21375,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/libata-eh.c linux-2.6.37.3/drivers/ata/lib
23234 ata_reset_fn_t hardreset = ops->hardreset;
23235
23236 /* ignore built-in hardreset if SCR access is not available */
23237 -diff -urNp linux-2.6.37.3/drivers/ata/libata-pmp.c linux-2.6.37.3/drivers/ata/libata-pmp.c
23238 ---- linux-2.6.37.3/drivers/ata/libata-pmp.c 2011-01-04 19:50:19.000000000 -0500
23239 -+++ linux-2.6.37.3/drivers/ata/libata-pmp.c 2011-01-17 02:41:01.000000000 -0500
23240 +diff -urNp linux-2.6.37.4/drivers/ata/libata-pmp.c linux-2.6.37.4/drivers/ata/libata-pmp.c
23241 +--- linux-2.6.37.4/drivers/ata/libata-pmp.c 2011-01-04 19:50:19.000000000 -0500
23242 ++++ linux-2.6.37.4/drivers/ata/libata-pmp.c 2011-01-17 02:41:01.000000000 -0500
23243 @@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str
23244 */
23245 static int sata_pmp_eh_recover(struct ata_port *ap)
23246 @@ -21232,9 +21387,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/libata-pmp.c linux-2.6.37.3/drivers/ata/li
23247 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
23248 struct ata_link *pmp_link = &ap->link;
23249 struct ata_device *pmp_dev = pmp_link->device;
23250 -diff -urNp linux-2.6.37.3/drivers/ata/pata_acpi.c linux-2.6.37.3/drivers/ata/pata_acpi.c
23251 ---- linux-2.6.37.3/drivers/ata/pata_acpi.c 2011-01-04 19:50:19.000000000 -0500
23252 -+++ linux-2.6.37.3/drivers/ata/pata_acpi.c 2011-01-17 02:41:01.000000000 -0500
23253 +diff -urNp linux-2.6.37.4/drivers/ata/pata_acpi.c linux-2.6.37.4/drivers/ata/pata_acpi.c
23254 +--- linux-2.6.37.4/drivers/ata/pata_acpi.c 2011-01-04 19:50:19.000000000 -0500
23255 ++++ linux-2.6.37.4/drivers/ata/pata_acpi.c 2011-01-17 02:41:01.000000000 -0500
23256 @@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
23257 ATA_BMDMA_SHT(DRV_NAME),
23258 };
23259 @@ -21244,9 +21399,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_acpi.c linux-2.6.37.3/drivers/ata/pat
23260 .inherits = &ata_bmdma_port_ops,
23261 .qc_issue = pacpi_qc_issue,
23262 .cable_detect = pacpi_cable_detect,
23263 -diff -urNp linux-2.6.37.3/drivers/ata/pata_ali.c linux-2.6.37.3/drivers/ata/pata_ali.c
23264 ---- linux-2.6.37.3/drivers/ata/pata_ali.c 2011-01-04 19:50:19.000000000 -0500
23265 -+++ linux-2.6.37.3/drivers/ata/pata_ali.c 2011-01-17 02:41:01.000000000 -0500
23266 +diff -urNp linux-2.6.37.4/drivers/ata/pata_ali.c linux-2.6.37.4/drivers/ata/pata_ali.c
23267 +--- linux-2.6.37.4/drivers/ata/pata_ali.c 2011-01-04 19:50:19.000000000 -0500
23268 ++++ linux-2.6.37.4/drivers/ata/pata_ali.c 2011-01-17 02:41:01.000000000 -0500
23269 @@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht
23270 * Port operations for PIO only ALi
23271 */
23272 @@ -21292,9 +21447,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_ali.c linux-2.6.37.3/drivers/ata/pata
23273 .inherits = &ali_dma_base_ops,
23274 .check_atapi_dma = ali_check_atapi_dma,
23275 .dev_config = ali_warn_atapi_dma,
23276 -diff -urNp linux-2.6.37.3/drivers/ata/pata_amd.c linux-2.6.37.3/drivers/ata/pata_amd.c
23277 ---- linux-2.6.37.3/drivers/ata/pata_amd.c 2011-01-04 19:50:19.000000000 -0500
23278 -+++ linux-2.6.37.3/drivers/ata/pata_amd.c 2011-01-17 02:41:01.000000000 -0500
23279 +diff -urNp linux-2.6.37.4/drivers/ata/pata_amd.c linux-2.6.37.4/drivers/ata/pata_amd.c
23280 +--- linux-2.6.37.4/drivers/ata/pata_amd.c 2011-01-04 19:50:19.000000000 -0500
23281 ++++ linux-2.6.37.4/drivers/ata/pata_amd.c 2011-01-17 02:41:01.000000000 -0500
23282 @@ -397,28 +397,28 @@ static const struct ata_port_operations
23283 .prereset = amd_pre_reset,
23284 };
23285 @@ -21344,9 +21499,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_amd.c linux-2.6.37.3/drivers/ata/pata
23286 .inherits = &nv_base_port_ops,
23287 .set_piomode = nv133_set_piomode,
23288 .set_dmamode = nv133_set_dmamode,
23289 -diff -urNp linux-2.6.37.3/drivers/ata/pata_artop.c linux-2.6.37.3/drivers/ata/pata_artop.c
23290 ---- linux-2.6.37.3/drivers/ata/pata_artop.c 2011-01-04 19:50:19.000000000 -0500
23291 -+++ linux-2.6.37.3/drivers/ata/pata_artop.c 2011-01-17 02:41:01.000000000 -0500
23292 +diff -urNp linux-2.6.37.4/drivers/ata/pata_artop.c linux-2.6.37.4/drivers/ata/pata_artop.c
23293 +--- linux-2.6.37.4/drivers/ata/pata_artop.c 2011-01-04 19:50:19.000000000 -0500
23294 ++++ linux-2.6.37.4/drivers/ata/pata_artop.c 2011-01-17 02:41:01.000000000 -0500
23295 @@ -312,7 +312,7 @@ static struct scsi_host_template artop_s
23296 ATA_BMDMA_SHT(DRV_NAME),
23297 };
23298 @@ -21365,9 +21520,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_artop.c linux-2.6.37.3/drivers/ata/pa
23299 .inherits = &ata_bmdma_port_ops,
23300 .cable_detect = artop6260_cable_detect,
23301 .set_piomode = artop6260_set_piomode,
23302 -diff -urNp linux-2.6.37.3/drivers/ata/pata_at32.c linux-2.6.37.3/drivers/ata/pata_at32.c
23303 ---- linux-2.6.37.3/drivers/ata/pata_at32.c 2011-01-04 19:50:19.000000000 -0500
23304 -+++ linux-2.6.37.3/drivers/ata/pata_at32.c 2011-01-17 02:41:01.000000000 -0500
23305 +diff -urNp linux-2.6.37.4/drivers/ata/pata_at32.c linux-2.6.37.4/drivers/ata/pata_at32.c
23306 +--- linux-2.6.37.4/drivers/ata/pata_at32.c 2011-01-04 19:50:19.000000000 -0500
23307 ++++ linux-2.6.37.4/drivers/ata/pata_at32.c 2011-01-17 02:41:01.000000000 -0500
23308 @@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
23309 ATA_PIO_SHT(DRV_NAME),
23310 };
23311 @@ -21377,9 +21532,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_at32.c linux-2.6.37.3/drivers/ata/pat
23312 .inherits = &ata_sff_port_ops,
23313 .cable_detect = ata_cable_40wire,
23314 .set_piomode = pata_at32_set_piomode,
23315 -diff -urNp linux-2.6.37.3/drivers/ata/pata_at91.c linux-2.6.37.3/drivers/ata/pata_at91.c
23316 ---- linux-2.6.37.3/drivers/ata/pata_at91.c 2011-01-04 19:50:19.000000000 -0500
23317 -+++ linux-2.6.37.3/drivers/ata/pata_at91.c 2011-01-17 02:41:01.000000000 -0500
23318 +diff -urNp linux-2.6.37.4/drivers/ata/pata_at91.c linux-2.6.37.4/drivers/ata/pata_at91.c
23319 +--- linux-2.6.37.4/drivers/ata/pata_at91.c 2011-01-04 19:50:19.000000000 -0500
23320 ++++ linux-2.6.37.4/drivers/ata/pata_at91.c 2011-01-17 02:41:01.000000000 -0500
23321 @@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
23322 ATA_PIO_SHT(DRV_NAME),
23323 };
23324 @@ -21389,9 +21544,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_at91.c linux-2.6.37.3/drivers/ata/pat
23325 .inherits = &ata_sff_port_ops,
23326
23327 .sff_data_xfer = pata_at91_data_xfer_noirq,
23328 -diff -urNp linux-2.6.37.3/drivers/ata/pata_atiixp.c linux-2.6.37.3/drivers/ata/pata_atiixp.c
23329 ---- linux-2.6.37.3/drivers/ata/pata_atiixp.c 2011-01-04 19:50:19.000000000 -0500
23330 -+++ linux-2.6.37.3/drivers/ata/pata_atiixp.c 2011-01-17 02:41:01.000000000 -0500
23331 +diff -urNp linux-2.6.37.4/drivers/ata/pata_atiixp.c linux-2.6.37.4/drivers/ata/pata_atiixp.c
23332 +--- linux-2.6.37.4/drivers/ata/pata_atiixp.c 2011-01-04 19:50:19.000000000 -0500
23333 ++++ linux-2.6.37.4/drivers/ata/pata_atiixp.c 2011-01-17 02:41:01.000000000 -0500
23334 @@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
23335 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
23336 };
23337 @@ -21401,9 +21556,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_atiixp.c linux-2.6.37.3/drivers/ata/p
23338 .inherits = &ata_bmdma_port_ops,
23339
23340 .qc_prep = ata_bmdma_dumb_qc_prep,
23341 -diff -urNp linux-2.6.37.3/drivers/ata/pata_atp867x.c linux-2.6.37.3/drivers/ata/pata_atp867x.c
23342 ---- linux-2.6.37.3/drivers/ata/pata_atp867x.c 2011-01-04 19:50:19.000000000 -0500
23343 -+++ linux-2.6.37.3/drivers/ata/pata_atp867x.c 2011-01-17 02:41:01.000000000 -0500
23344 +diff -urNp linux-2.6.37.4/drivers/ata/pata_atp867x.c linux-2.6.37.4/drivers/ata/pata_atp867x.c
23345 +--- linux-2.6.37.4/drivers/ata/pata_atp867x.c 2011-01-04 19:50:19.000000000 -0500
23346 ++++ linux-2.6.37.4/drivers/ata/pata_atp867x.c 2011-01-17 02:41:01.000000000 -0500
23347 @@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
23348 ATA_BMDMA_SHT(DRV_NAME),
23349 };
23350 @@ -21413,9 +21568,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_atp867x.c linux-2.6.37.3/drivers/ata/
23351 .inherits = &ata_bmdma_port_ops,
23352 .cable_detect = atp867x_cable_detect,
23353 .set_piomode = atp867x_set_piomode,
23354 -diff -urNp linux-2.6.37.3/drivers/ata/pata_bf54x.c linux-2.6.37.3/drivers/ata/pata_bf54x.c
23355 ---- linux-2.6.37.3/drivers/ata/pata_bf54x.c 2011-01-04 19:50:19.000000000 -0500
23356 -+++ linux-2.6.37.3/drivers/ata/pata_bf54x.c 2011-01-17 02:41:01.000000000 -0500
23357 +diff -urNp linux-2.6.37.4/drivers/ata/pata_bf54x.c linux-2.6.37.4/drivers/ata/pata_bf54x.c
23358 +--- linux-2.6.37.4/drivers/ata/pata_bf54x.c 2011-01-04 19:50:19.000000000 -0500
23359 ++++ linux-2.6.37.4/drivers/ata/pata_bf54x.c 2011-01-17 02:41:01.000000000 -0500
23360 @@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
23361 .dma_boundary = ATA_DMA_BOUNDARY,
23362 };
23363 @@ -21425,9 +21580,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_bf54x.c linux-2.6.37.3/drivers/ata/pa
23364 .inherits = &ata_bmdma_port_ops,
23365
23366 .set_piomode = bfin_set_piomode,
23367 -diff -urNp linux-2.6.37.3/drivers/ata/pata_cmd640.c linux-2.6.37.3/drivers/ata/pata_cmd640.c
23368 ---- linux-2.6.37.3/drivers/ata/pata_cmd640.c 2011-01-04 19:50:19.000000000 -0500
23369 -+++ linux-2.6.37.3/drivers/ata/pata_cmd640.c 2011-01-17 02:41:01.000000000 -0500
23370 +diff -urNp linux-2.6.37.4/drivers/ata/pata_cmd640.c linux-2.6.37.4/drivers/ata/pata_cmd640.c
23371 +--- linux-2.6.37.4/drivers/ata/pata_cmd640.c 2011-01-04 19:50:19.000000000 -0500
23372 ++++ linux-2.6.37.4/drivers/ata/pata_cmd640.c 2011-01-17 02:41:01.000000000 -0500
23373 @@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_
23374 ATA_PIO_SHT(DRV_NAME),
23375 };
23376 @@ -21437,9 +21592,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_cmd640.c linux-2.6.37.3/drivers/ata/p
23377 .inherits = &ata_sff_port_ops,
23378 /* In theory xfer_noirq is not needed once we kill the prefetcher */
23379 .sff_data_xfer = ata_sff_data_xfer_noirq,
23380 -diff -urNp linux-2.6.37.3/drivers/ata/pata_cmd64x.c linux-2.6.37.3/drivers/ata/pata_cmd64x.c
23381 ---- linux-2.6.37.3/drivers/ata/pata_cmd64x.c 2011-01-04 19:50:19.000000000 -0500
23382 -+++ linux-2.6.37.3/drivers/ata/pata_cmd64x.c 2011-01-17 02:41:01.000000000 -0500
23383 +diff -urNp linux-2.6.37.4/drivers/ata/pata_cmd64x.c linux-2.6.37.4/drivers/ata/pata_cmd64x.c
23384 +--- linux-2.6.37.4/drivers/ata/pata_cmd64x.c 2011-01-04 19:50:19.000000000 -0500
23385 ++++ linux-2.6.37.4/drivers/ata/pata_cmd64x.c 2011-01-17 02:41:01.000000000 -0500
23386 @@ -268,18 +268,18 @@ static const struct ata_port_operations
23387 .set_dmamode = cmd64x_set_dmamode,
23388 };
23389 @@ -21462,9 +21617,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_cmd64x.c linux-2.6.37.3/drivers/ata/p
23390 .inherits = &cmd64x_base_ops,
23391 .bmdma_stop = cmd648_bmdma_stop,
23392 .cable_detect = cmd648_cable_detect,
23393 -diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5520.c linux-2.6.37.3/drivers/ata/pata_cs5520.c
23394 ---- linux-2.6.37.3/drivers/ata/pata_cs5520.c 2011-01-04 19:50:19.000000000 -0500
23395 -+++ linux-2.6.37.3/drivers/ata/pata_cs5520.c 2011-01-17 02:41:01.000000000 -0500
23396 +diff -urNp linux-2.6.37.4/drivers/ata/pata_cs5520.c linux-2.6.37.4/drivers/ata/pata_cs5520.c
23397 +--- linux-2.6.37.4/drivers/ata/pata_cs5520.c 2011-01-04 19:50:19.000000000 -0500
23398 ++++ linux-2.6.37.4/drivers/ata/pata_cs5520.c 2011-01-17 02:41:01.000000000 -0500
23399 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
23400 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
23401 };
23402 @@ -21474,9 +21629,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5520.c linux-2.6.37.3/drivers/ata/p
23403 .inherits = &ata_bmdma_port_ops,
23404 .qc_prep = ata_bmdma_dumb_qc_prep,
23405 .cable_detect = ata_cable_40wire,
23406 -diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5530.c linux-2.6.37.3/drivers/ata/pata_cs5530.c
23407 ---- linux-2.6.37.3/drivers/ata/pata_cs5530.c 2011-01-04 19:50:19.000000000 -0500
23408 -+++ linux-2.6.37.3/drivers/ata/pata_cs5530.c 2011-01-17 02:41:01.000000000 -0500
23409 +diff -urNp linux-2.6.37.4/drivers/ata/pata_cs5530.c linux-2.6.37.4/drivers/ata/pata_cs5530.c
23410 +--- linux-2.6.37.4/drivers/ata/pata_cs5530.c 2011-01-04 19:50:19.000000000 -0500
23411 ++++ linux-2.6.37.4/drivers/ata/pata_cs5530.c 2011-01-17 02:41:01.000000000 -0500
23412 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
23413 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
23414 };
23415 @@ -21486,9 +21641,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5530.c linux-2.6.37.3/drivers/ata/p
23416 .inherits = &ata_bmdma_port_ops,
23417
23418 .qc_prep = ata_bmdma_dumb_qc_prep,
23419 -diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5535.c linux-2.6.37.3/drivers/ata/pata_cs5535.c
23420 ---- linux-2.6.37.3/drivers/ata/pata_cs5535.c 2011-01-04 19:50:19.000000000 -0500
23421 -+++ linux-2.6.37.3/drivers/ata/pata_cs5535.c 2011-01-17 02:41:01.000000000 -0500
23422 +diff -urNp linux-2.6.37.4/drivers/ata/pata_cs5535.c linux-2.6.37.4/drivers/ata/pata_cs5535.c
23423 +--- linux-2.6.37.4/drivers/ata/pata_cs5535.c 2011-01-04 19:50:19.000000000 -0500
23424 ++++ linux-2.6.37.4/drivers/ata/pata_cs5535.c 2011-01-17 02:41:01.000000000 -0500
23425 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
23426 ATA_BMDMA_SHT(DRV_NAME),
23427 };
23428 @@ -21498,9 +21653,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5535.c linux-2.6.37.3/drivers/ata/p
23429 .inherits = &ata_bmdma_port_ops,
23430 .cable_detect = cs5535_cable_detect,
23431 .set_piomode = cs5535_set_piomode,
23432 -diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5536.c linux-2.6.37.3/drivers/ata/pata_cs5536.c
23433 ---- linux-2.6.37.3/drivers/ata/pata_cs5536.c 2011-01-04 19:50:19.000000000 -0500
23434 -+++ linux-2.6.37.3/drivers/ata/pata_cs5536.c 2011-01-17 02:41:01.000000000 -0500
23435 +diff -urNp linux-2.6.37.4/drivers/ata/pata_cs5536.c linux-2.6.37.4/drivers/ata/pata_cs5536.c
23436 +--- linux-2.6.37.4/drivers/ata/pata_cs5536.c 2011-01-04 19:50:19.000000000 -0500
23437 ++++ linux-2.6.37.4/drivers/ata/pata_cs5536.c 2011-01-17 02:41:01.000000000 -0500
23438 @@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_
23439 ATA_BMDMA_SHT(DRV_NAME),
23440 };
23441 @@ -21510,9 +21665,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_cs5536.c linux-2.6.37.3/drivers/ata/p
23442 .inherits = &ata_bmdma32_port_ops,
23443 .cable_detect = cs5536_cable_detect,
23444 .set_piomode = cs5536_set_piomode,
23445 -diff -urNp linux-2.6.37.3/drivers/ata/pata_cypress.c linux-2.6.37.3/drivers/ata/pata_cypress.c
23446 ---- linux-2.6.37.3/drivers/ata/pata_cypress.c 2011-01-04 19:50:19.000000000 -0500
23447 -+++ linux-2.6.37.3/drivers/ata/pata_cypress.c 2011-01-17 02:41:01.000000000 -0500
23448 +diff -urNp linux-2.6.37.4/drivers/ata/pata_cypress.c linux-2.6.37.4/drivers/ata/pata_cypress.c
23449 +--- linux-2.6.37.4/drivers/ata/pata_cypress.c 2011-01-04 19:50:19.000000000 -0500
23450 ++++ linux-2.6.37.4/drivers/ata/pata_cypress.c 2011-01-17 02:41:01.000000000 -0500
23451 @@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
23452 ATA_BMDMA_SHT(DRV_NAME),
23453 };
23454 @@ -21522,9 +21677,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_cypress.c linux-2.6.37.3/drivers/ata/
23455 .inherits = &ata_bmdma_port_ops,
23456 .cable_detect = ata_cable_40wire,
23457 .set_piomode = cy82c693_set_piomode,
23458 -diff -urNp linux-2.6.37.3/drivers/ata/pata_efar.c linux-2.6.37.3/drivers/ata/pata_efar.c
23459 ---- linux-2.6.37.3/drivers/ata/pata_efar.c 2011-01-04 19:50:19.000000000 -0500
23460 -+++ linux-2.6.37.3/drivers/ata/pata_efar.c 2011-01-17 02:41:01.000000000 -0500
23461 +diff -urNp linux-2.6.37.4/drivers/ata/pata_efar.c linux-2.6.37.4/drivers/ata/pata_efar.c
23462 +--- linux-2.6.37.4/drivers/ata/pata_efar.c 2011-01-04 19:50:19.000000000 -0500
23463 ++++ linux-2.6.37.4/drivers/ata/pata_efar.c 2011-01-17 02:41:01.000000000 -0500
23464 @@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
23465 ATA_BMDMA_SHT(DRV_NAME),
23466 };
23467 @@ -21534,9 +21689,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_efar.c linux-2.6.37.3/drivers/ata/pat
23468 .inherits = &ata_bmdma_port_ops,
23469 .cable_detect = efar_cable_detect,
23470 .set_piomode = efar_set_piomode,
23471 -diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt366.c linux-2.6.37.3/drivers/ata/pata_hpt366.c
23472 ---- linux-2.6.37.3/drivers/ata/pata_hpt366.c 2011-01-04 19:50:19.000000000 -0500
23473 -+++ linux-2.6.37.3/drivers/ata/pata_hpt366.c 2011-01-17 02:41:01.000000000 -0500
23474 +diff -urNp linux-2.6.37.4/drivers/ata/pata_hpt366.c linux-2.6.37.4/drivers/ata/pata_hpt366.c
23475 +--- linux-2.6.37.4/drivers/ata/pata_hpt366.c 2011-01-04 19:50:19.000000000 -0500
23476 ++++ linux-2.6.37.4/drivers/ata/pata_hpt366.c 2011-01-17 02:41:01.000000000 -0500
23477 @@ -269,7 +269,7 @@ static struct scsi_host_template hpt36x_
23478 * Configuration for HPT366/68
23479 */
23480 @@ -21546,9 +21701,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt366.c linux-2.6.37.3/drivers/ata/p
23481 .inherits = &ata_bmdma_port_ops,
23482 .cable_detect = hpt36x_cable_detect,
23483 .mode_filter = hpt366_filter,
23484 -diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt37x.c linux-2.6.37.3/drivers/ata/pata_hpt37x.c
23485 ---- linux-2.6.37.3/drivers/ata/pata_hpt37x.c 2011-01-04 19:50:19.000000000 -0500
23486 -+++ linux-2.6.37.3/drivers/ata/pata_hpt37x.c 2011-01-17 02:41:01.000000000 -0500
23487 +diff -urNp linux-2.6.37.4/drivers/ata/pata_hpt37x.c linux-2.6.37.4/drivers/ata/pata_hpt37x.c
23488 +--- linux-2.6.37.4/drivers/ata/pata_hpt37x.c 2011-01-04 19:50:19.000000000 -0500
23489 ++++ linux-2.6.37.4/drivers/ata/pata_hpt37x.c 2011-01-17 02:41:01.000000000 -0500
23490 @@ -564,7 +564,7 @@ static struct scsi_host_template hpt37x_
23491 * Configuration for HPT370
23492 */
23493 @@ -21585,9 +21740,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt37x.c linux-2.6.37.3/drivers/ata/p
23494 .inherits = &hpt372_port_ops,
23495 .cable_detect = hpt374_fn1_cable_detect,
23496 .prereset = hpt37x_pre_reset,
23497 -diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt3x2n.c linux-2.6.37.3/drivers/ata/pata_hpt3x2n.c
23498 ---- linux-2.6.37.3/drivers/ata/pata_hpt3x2n.c 2011-01-04 19:50:19.000000000 -0500
23499 -+++ linux-2.6.37.3/drivers/ata/pata_hpt3x2n.c 2011-01-17 02:41:01.000000000 -0500
23500 +diff -urNp linux-2.6.37.4/drivers/ata/pata_hpt3x2n.c linux-2.6.37.4/drivers/ata/pata_hpt3x2n.c
23501 +--- linux-2.6.37.4/drivers/ata/pata_hpt3x2n.c 2011-01-04 19:50:19.000000000 -0500
23502 ++++ linux-2.6.37.4/drivers/ata/pata_hpt3x2n.c 2011-01-17 02:41:01.000000000 -0500
23503 @@ -331,7 +331,7 @@ static struct scsi_host_template hpt3x2n
23504 * Configuration for HPT3x2n.
23505 */
23506 @@ -21597,9 +21752,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt3x2n.c linux-2.6.37.3/drivers/ata/
23507 .inherits = &ata_bmdma_port_ops,
23508
23509 .bmdma_stop = hpt3x2n_bmdma_stop,
23510 -diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt3x3.c linux-2.6.37.3/drivers/ata/pata_hpt3x3.c
23511 ---- linux-2.6.37.3/drivers/ata/pata_hpt3x3.c 2011-01-04 19:50:19.000000000 -0500
23512 -+++ linux-2.6.37.3/drivers/ata/pata_hpt3x3.c 2011-01-17 02:41:01.000000000 -0500
23513 +diff -urNp linux-2.6.37.4/drivers/ata/pata_hpt3x3.c linux-2.6.37.4/drivers/ata/pata_hpt3x3.c
23514 +--- linux-2.6.37.4/drivers/ata/pata_hpt3x3.c 2011-01-04 19:50:19.000000000 -0500
23515 ++++ linux-2.6.37.4/drivers/ata/pata_hpt3x3.c 2011-01-17 02:41:01.000000000 -0500
23516 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
23517 ATA_BMDMA_SHT(DRV_NAME),
23518 };
23519 @@ -21609,9 +21764,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_hpt3x3.c linux-2.6.37.3/drivers/ata/p
23520 .inherits = &ata_bmdma_port_ops,
23521 .cable_detect = ata_cable_40wire,
23522 .set_piomode = hpt3x3_set_piomode,
23523 -diff -urNp linux-2.6.37.3/drivers/ata/pata_icside.c linux-2.6.37.3/drivers/ata/pata_icside.c
23524 ---- linux-2.6.37.3/drivers/ata/pata_icside.c 2011-01-04 19:50:19.000000000 -0500
23525 -+++ linux-2.6.37.3/drivers/ata/pata_icside.c 2011-01-17 02:41:01.000000000 -0500
23526 +diff -urNp linux-2.6.37.4/drivers/ata/pata_icside.c linux-2.6.37.4/drivers/ata/pata_icside.c
23527 +--- linux-2.6.37.4/drivers/ata/pata_icside.c 2011-01-04 19:50:19.000000000 -0500
23528 ++++ linux-2.6.37.4/drivers/ata/pata_icside.c 2011-01-17 02:41:01.000000000 -0500
23529 @@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
23530 }
23531 }
23532 @@ -21621,9 +21776,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_icside.c linux-2.6.37.3/drivers/ata/p
23533 .inherits = &ata_bmdma_port_ops,
23534 /* no need to build any PRD tables for DMA */
23535 .qc_prep = ata_noop_qc_prep,
23536 -diff -urNp linux-2.6.37.3/drivers/ata/pata_isapnp.c linux-2.6.37.3/drivers/ata/pata_isapnp.c
23537 ---- linux-2.6.37.3/drivers/ata/pata_isapnp.c 2011-01-04 19:50:19.000000000 -0500
23538 -+++ linux-2.6.37.3/drivers/ata/pata_isapnp.c 2011-01-17 02:41:01.000000000 -0500
23539 +diff -urNp linux-2.6.37.4/drivers/ata/pata_isapnp.c linux-2.6.37.4/drivers/ata/pata_isapnp.c
23540 +--- linux-2.6.37.4/drivers/ata/pata_isapnp.c 2011-01-04 19:50:19.000000000 -0500
23541 ++++ linux-2.6.37.4/drivers/ata/pata_isapnp.c 2011-01-17 02:41:01.000000000 -0500
23542 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
23543 ATA_PIO_SHT(DRV_NAME),
23544 };
23545 @@ -21639,9 +21794,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_isapnp.c linux-2.6.37.3/drivers/ata/p
23546 .inherits = &ata_sff_port_ops,
23547 .cable_detect = ata_cable_40wire,
23548 /* No altstatus so we don't want to use the lost interrupt poll */
23549 -diff -urNp linux-2.6.37.3/drivers/ata/pata_it8213.c linux-2.6.37.3/drivers/ata/pata_it8213.c
23550 ---- linux-2.6.37.3/drivers/ata/pata_it8213.c 2011-01-04 19:50:19.000000000 -0500
23551 -+++ linux-2.6.37.3/drivers/ata/pata_it8213.c 2011-01-17 02:41:01.000000000 -0500
23552 +diff -urNp linux-2.6.37.4/drivers/ata/pata_it8213.c linux-2.6.37.4/drivers/ata/pata_it8213.c
23553 +--- linux-2.6.37.4/drivers/ata/pata_it8213.c 2011-01-04 19:50:19.000000000 -0500
23554 ++++ linux-2.6.37.4/drivers/ata/pata_it8213.c 2011-01-17 02:41:01.000000000 -0500
23555 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
23556 };
23557
23558 @@ -21651,9 +21806,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_it8213.c linux-2.6.37.3/drivers/ata/p
23559 .inherits = &ata_bmdma_port_ops,
23560 .cable_detect = it8213_cable_detect,
23561 .set_piomode = it8213_set_piomode,
23562 -diff -urNp linux-2.6.37.3/drivers/ata/pata_it821x.c linux-2.6.37.3/drivers/ata/pata_it821x.c
23563 ---- linux-2.6.37.3/drivers/ata/pata_it821x.c 2011-01-04 19:50:19.000000000 -0500
23564 -+++ linux-2.6.37.3/drivers/ata/pata_it821x.c 2011-01-17 02:41:01.000000000 -0500
23565 +diff -urNp linux-2.6.37.4/drivers/ata/pata_it821x.c linux-2.6.37.4/drivers/ata/pata_it821x.c
23566 +--- linux-2.6.37.4/drivers/ata/pata_it821x.c 2011-01-04 19:50:19.000000000 -0500
23567 ++++ linux-2.6.37.4/drivers/ata/pata_it821x.c 2011-01-17 02:41:01.000000000 -0500
23568 @@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
23569 ATA_BMDMA_SHT(DRV_NAME),
23570 };
23571 @@ -21681,9 +21836,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_it821x.c linux-2.6.37.3/drivers/ata/p
23572 .inherits = &ata_bmdma_port_ops,
23573
23574 .check_atapi_dma= it821x_check_atapi_dma,
23575 -diff -urNp linux-2.6.37.3/drivers/ata/pata_ixp4xx_cf.c linux-2.6.37.3/drivers/ata/pata_ixp4xx_cf.c
23576 ---- linux-2.6.37.3/drivers/ata/pata_ixp4xx_cf.c 2011-01-04 19:50:19.000000000 -0500
23577 -+++ linux-2.6.37.3/drivers/ata/pata_ixp4xx_cf.c 2011-01-17 02:41:01.000000000 -0500
23578 +diff -urNp linux-2.6.37.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.37.4/drivers/ata/pata_ixp4xx_cf.c
23579 +--- linux-2.6.37.4/drivers/ata/pata_ixp4xx_cf.c 2011-01-04 19:50:19.000000000 -0500
23580 ++++ linux-2.6.37.4/drivers/ata/pata_ixp4xx_cf.c 2011-01-17 02:41:01.000000000 -0500
23581 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
23582 ATA_PIO_SHT(DRV_NAME),
23583 };
23584 @@ -21693,9 +21848,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_ixp4xx_cf.c linux-2.6.37.3/drivers/at
23585 .inherits = &ata_sff_port_ops,
23586 .sff_data_xfer = ixp4xx_mmio_data_xfer,
23587 .cable_detect = ata_cable_40wire,
23588 -diff -urNp linux-2.6.37.3/drivers/ata/pata_jmicron.c linux-2.6.37.3/drivers/ata/pata_jmicron.c
23589 ---- linux-2.6.37.3/drivers/ata/pata_jmicron.c 2011-01-04 19:50:19.000000000 -0500
23590 -+++ linux-2.6.37.3/drivers/ata/pata_jmicron.c 2011-01-17 02:41:01.000000000 -0500
23591 +diff -urNp linux-2.6.37.4/drivers/ata/pata_jmicron.c linux-2.6.37.4/drivers/ata/pata_jmicron.c
23592 +--- linux-2.6.37.4/drivers/ata/pata_jmicron.c 2011-01-04 19:50:19.000000000 -0500
23593 ++++ linux-2.6.37.4/drivers/ata/pata_jmicron.c 2011-01-17 02:41:01.000000000 -0500
23594 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
23595 ATA_BMDMA_SHT(DRV_NAME),
23596 };
23597 @@ -21705,9 +21860,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_jmicron.c linux-2.6.37.3/drivers/ata/
23598 .inherits = &ata_bmdma_port_ops,
23599 .prereset = jmicron_pre_reset,
23600 };
23601 -diff -urNp linux-2.6.37.3/drivers/ata/pata_legacy.c linux-2.6.37.3/drivers/ata/pata_legacy.c
23602 ---- linux-2.6.37.3/drivers/ata/pata_legacy.c 2011-01-04 19:50:19.000000000 -0500
23603 -+++ linux-2.6.37.3/drivers/ata/pata_legacy.c 2011-01-17 02:41:01.000000000 -0500
23604 +diff -urNp linux-2.6.37.4/drivers/ata/pata_legacy.c linux-2.6.37.4/drivers/ata/pata_legacy.c
23605 +--- linux-2.6.37.4/drivers/ata/pata_legacy.c 2011-01-04 19:50:19.000000000 -0500
23606 ++++ linux-2.6.37.4/drivers/ata/pata_legacy.c 2011-01-17 02:41:01.000000000 -0500
23607 @@ -116,7 +116,7 @@ struct legacy_probe {
23608
23609 struct legacy_controller {
23610 @@ -21819,9 +21974,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_legacy.c linux-2.6.37.3/drivers/ata/p
23611 struct legacy_data *ld = &legacy_data[probe->slot];
23612 struct ata_host *host = NULL;
23613 struct ata_port *ap;
23614 -diff -urNp linux-2.6.37.3/drivers/ata/pata_macio.c linux-2.6.37.3/drivers/ata/pata_macio.c
23615 ---- linux-2.6.37.3/drivers/ata/pata_macio.c 2011-01-04 19:50:19.000000000 -0500
23616 -+++ linux-2.6.37.3/drivers/ata/pata_macio.c 2011-01-17 02:41:01.000000000 -0500
23617 +diff -urNp linux-2.6.37.4/drivers/ata/pata_macio.c linux-2.6.37.4/drivers/ata/pata_macio.c
23618 +--- linux-2.6.37.4/drivers/ata/pata_macio.c 2011-01-04 19:50:19.000000000 -0500
23619 ++++ linux-2.6.37.4/drivers/ata/pata_macio.c 2011-01-17 02:41:01.000000000 -0500
23620 @@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
23621 .slave_configure = pata_macio_slave_config,
23622 };
23623 @@ -21833,9 +21988,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_macio.c linux-2.6.37.3/drivers/ata/pa
23624 .freeze = pata_macio_freeze,
23625 .set_piomode = pata_macio_set_timings,
23626 .set_dmamode = pata_macio_set_timings,
23627 -diff -urNp linux-2.6.37.3/drivers/ata/pata_marvell.c linux-2.6.37.3/drivers/ata/pata_marvell.c
23628 ---- linux-2.6.37.3/drivers/ata/pata_marvell.c 2011-01-04 19:50:19.000000000 -0500
23629 -+++ linux-2.6.37.3/drivers/ata/pata_marvell.c 2011-01-17 02:41:01.000000000 -0500
23630 +diff -urNp linux-2.6.37.4/drivers/ata/pata_marvell.c linux-2.6.37.4/drivers/ata/pata_marvell.c
23631 +--- linux-2.6.37.4/drivers/ata/pata_marvell.c 2011-01-04 19:50:19.000000000 -0500
23632 ++++ linux-2.6.37.4/drivers/ata/pata_marvell.c 2011-01-17 02:41:01.000000000 -0500
23633 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
23634 ATA_BMDMA_SHT(DRV_NAME),
23635 };
23636 @@ -21845,9 +22000,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_marvell.c linux-2.6.37.3/drivers/ata/
23637 .inherits = &ata_bmdma_port_ops,
23638 .cable_detect = marvell_cable_detect,
23639 .prereset = marvell_pre_reset,
23640 -diff -urNp linux-2.6.37.3/drivers/ata/pata_mpc52xx.c linux-2.6.37.3/drivers/ata/pata_mpc52xx.c
23641 ---- linux-2.6.37.3/drivers/ata/pata_mpc52xx.c 2011-02-22 16:05:30.000000000 -0500
23642 -+++ linux-2.6.37.3/drivers/ata/pata_mpc52xx.c 2011-02-22 16:12:20.000000000 -0500
23643 +diff -urNp linux-2.6.37.4/drivers/ata/pata_mpc52xx.c linux-2.6.37.4/drivers/ata/pata_mpc52xx.c
23644 +--- linux-2.6.37.4/drivers/ata/pata_mpc52xx.c 2011-02-22 16:05:30.000000000 -0500
23645 ++++ linux-2.6.37.4/drivers/ata/pata_mpc52xx.c 2011-02-22 16:12:20.000000000 -0500
23646 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
23647 ATA_PIO_SHT(DRV_NAME),
23648 };
23649 @@ -21857,9 +22012,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_mpc52xx.c linux-2.6.37.3/drivers/ata/
23650 .inherits = &ata_bmdma_port_ops,
23651 .sff_dev_select = mpc52xx_ata_dev_select,
23652 .set_piomode = mpc52xx_ata_set_piomode,
23653 -diff -urNp linux-2.6.37.3/drivers/ata/pata_mpiix.c linux-2.6.37.3/drivers/ata/pata_mpiix.c
23654 ---- linux-2.6.37.3/drivers/ata/pata_mpiix.c 2011-01-04 19:50:19.000000000 -0500
23655 -+++ linux-2.6.37.3/drivers/ata/pata_mpiix.c 2011-01-17 02:41:01.000000000 -0500
23656 +diff -urNp linux-2.6.37.4/drivers/ata/pata_mpiix.c linux-2.6.37.4/drivers/ata/pata_mpiix.c
23657 +--- linux-2.6.37.4/drivers/ata/pata_mpiix.c 2011-01-04 19:50:19.000000000 -0500
23658 ++++ linux-2.6.37.4/drivers/ata/pata_mpiix.c 2011-01-17 02:41:01.000000000 -0500
23659 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
23660 ATA_PIO_SHT(DRV_NAME),
23661 };
23662 @@ -21869,9 +22024,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_mpiix.c linux-2.6.37.3/drivers/ata/pa
23663 .inherits = &ata_sff_port_ops,
23664 .qc_issue = mpiix_qc_issue,
23665 .cable_detect = ata_cable_40wire,
23666 -diff -urNp linux-2.6.37.3/drivers/ata/pata_netcell.c linux-2.6.37.3/drivers/ata/pata_netcell.c
23667 ---- linux-2.6.37.3/drivers/ata/pata_netcell.c 2011-01-04 19:50:19.000000000 -0500
23668 -+++ linux-2.6.37.3/drivers/ata/pata_netcell.c 2011-01-17 02:41:01.000000000 -0500
23669 +diff -urNp linux-2.6.37.4/drivers/ata/pata_netcell.c linux-2.6.37.4/drivers/ata/pata_netcell.c
23670 +--- linux-2.6.37.4/drivers/ata/pata_netcell.c 2011-01-04 19:50:19.000000000 -0500
23671 ++++ linux-2.6.37.4/drivers/ata/pata_netcell.c 2011-01-17 02:41:01.000000000 -0500
23672 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
23673 ATA_BMDMA_SHT(DRV_NAME),
23674 };
23675 @@ -21881,9 +22036,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_netcell.c linux-2.6.37.3/drivers/ata/
23676 .inherits = &ata_bmdma_port_ops,
23677 .cable_detect = ata_cable_80wire,
23678 .read_id = netcell_read_id,
23679 -diff -urNp linux-2.6.37.3/drivers/ata/pata_ninja32.c linux-2.6.37.3/drivers/ata/pata_ninja32.c
23680 ---- linux-2.6.37.3/drivers/ata/pata_ninja32.c 2011-01-04 19:50:19.000000000 -0500
23681 -+++ linux-2.6.37.3/drivers/ata/pata_ninja32.c 2011-01-17 02:41:01.000000000 -0500
23682 +diff -urNp linux-2.6.37.4/drivers/ata/pata_ninja32.c linux-2.6.37.4/drivers/ata/pata_ninja32.c
23683 +--- linux-2.6.37.4/drivers/ata/pata_ninja32.c 2011-01-04 19:50:19.000000000 -0500
23684 ++++ linux-2.6.37.4/drivers/ata/pata_ninja32.c 2011-01-17 02:41:01.000000000 -0500
23685 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
23686 ATA_BMDMA_SHT(DRV_NAME),
23687 };
23688 @@ -21893,9 +22048,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_ninja32.c linux-2.6.37.3/drivers/ata/
23689 .inherits = &ata_bmdma_port_ops,
23690 .sff_dev_select = ninja32_dev_select,
23691 .cable_detect = ata_cable_40wire,
23692 -diff -urNp linux-2.6.37.3/drivers/ata/pata_ns87410.c linux-2.6.37.3/drivers/ata/pata_ns87410.c
23693 ---- linux-2.6.37.3/drivers/ata/pata_ns87410.c 2011-01-04 19:50:19.000000000 -0500
23694 -+++ linux-2.6.37.3/drivers/ata/pata_ns87410.c 2011-01-17 02:41:01.000000000 -0500
23695 +diff -urNp linux-2.6.37.4/drivers/ata/pata_ns87410.c linux-2.6.37.4/drivers/ata/pata_ns87410.c
23696 +--- linux-2.6.37.4/drivers/ata/pata_ns87410.c 2011-01-04 19:50:19.000000000 -0500
23697 ++++ linux-2.6.37.4/drivers/ata/pata_ns87410.c 2011-01-17 02:41:01.000000000 -0500
23698 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
23699 ATA_PIO_SHT(DRV_NAME),
23700 };
23701 @@ -21905,9 +22060,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_ns87410.c linux-2.6.37.3/drivers/ata/
23702 .inherits = &ata_sff_port_ops,
23703 .qc_issue = ns87410_qc_issue,
23704 .cable_detect = ata_cable_40wire,
23705 -diff -urNp linux-2.6.37.3/drivers/ata/pata_ns87415.c linux-2.6.37.3/drivers/ata/pata_ns87415.c
23706 ---- linux-2.6.37.3/drivers/ata/pata_ns87415.c 2011-01-04 19:50:19.000000000 -0500
23707 -+++ linux-2.6.37.3/drivers/ata/pata_ns87415.c 2011-01-17 02:41:01.000000000 -0500
23708 +diff -urNp linux-2.6.37.4/drivers/ata/pata_ns87415.c linux-2.6.37.4/drivers/ata/pata_ns87415.c
23709 +--- linux-2.6.37.4/drivers/ata/pata_ns87415.c 2011-01-04 19:50:19.000000000 -0500
23710 ++++ linux-2.6.37.4/drivers/ata/pata_ns87415.c 2011-01-17 02:41:01.000000000 -0500
23711 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
23712 }
23713 #endif /* 87560 SuperIO Support */
23714 @@ -21926,9 +22081,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_ns87415.c linux-2.6.37.3/drivers/ata/
23715 .inherits = &ns87415_pata_ops,
23716 .sff_tf_read = ns87560_tf_read,
23717 .sff_check_status = ns87560_check_status,
23718 -diff -urNp linux-2.6.37.3/drivers/ata/pata_octeon_cf.c linux-2.6.37.3/drivers/ata/pata_octeon_cf.c
23719 ---- linux-2.6.37.3/drivers/ata/pata_octeon_cf.c 2011-01-04 19:50:19.000000000 -0500
23720 -+++ linux-2.6.37.3/drivers/ata/pata_octeon_cf.c 2011-01-17 02:41:01.000000000 -0500
23721 +diff -urNp linux-2.6.37.4/drivers/ata/pata_octeon_cf.c linux-2.6.37.4/drivers/ata/pata_octeon_cf.c
23722 +--- linux-2.6.37.4/drivers/ata/pata_octeon_cf.c 2011-01-04 19:50:19.000000000 -0500
23723 ++++ linux-2.6.37.4/drivers/ata/pata_octeon_cf.c 2011-01-17 02:41:01.000000000 -0500
23724 @@ -780,6 +780,7 @@ static unsigned int octeon_cf_qc_issue(s
23725 return 0;
23726 }
23727 @@ -21937,9 +22092,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_octeon_cf.c linux-2.6.37.3/drivers/at
23728 static struct ata_port_operations octeon_cf_ops = {
23729 .inherits = &ata_sff_port_ops,
23730 .check_atapi_dma = octeon_cf_check_atapi_dma,
23731 -diff -urNp linux-2.6.37.3/drivers/ata/pata_oldpiix.c linux-2.6.37.3/drivers/ata/pata_oldpiix.c
23732 ---- linux-2.6.37.3/drivers/ata/pata_oldpiix.c 2011-01-04 19:50:19.000000000 -0500
23733 -+++ linux-2.6.37.3/drivers/ata/pata_oldpiix.c 2011-01-17 02:41:01.000000000 -0500
23734 +diff -urNp linux-2.6.37.4/drivers/ata/pata_oldpiix.c linux-2.6.37.4/drivers/ata/pata_oldpiix.c
23735 +--- linux-2.6.37.4/drivers/ata/pata_oldpiix.c 2011-01-04 19:50:19.000000000 -0500
23736 ++++ linux-2.6.37.4/drivers/ata/pata_oldpiix.c 2011-01-17 02:41:01.000000000 -0500
23737 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
23738 ATA_BMDMA_SHT(DRV_NAME),
23739 };
23740 @@ -21949,9 +22104,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_oldpiix.c linux-2.6.37.3/drivers/ata/
23741 .inherits = &ata_bmdma_port_ops,
23742 .qc_issue = oldpiix_qc_issue,
23743 .cable_detect = ata_cable_40wire,
23744 -diff -urNp linux-2.6.37.3/drivers/ata/pata_opti.c linux-2.6.37.3/drivers/ata/pata_opti.c
23745 ---- linux-2.6.37.3/drivers/ata/pata_opti.c 2011-01-04 19:50:19.000000000 -0500
23746 -+++ linux-2.6.37.3/drivers/ata/pata_opti.c 2011-01-17 02:41:01.000000000 -0500
23747 +diff -urNp linux-2.6.37.4/drivers/ata/pata_opti.c linux-2.6.37.4/drivers/ata/pata_opti.c
23748 +--- linux-2.6.37.4/drivers/ata/pata_opti.c 2011-01-04 19:50:19.000000000 -0500
23749 ++++ linux-2.6.37.4/drivers/ata/pata_opti.c 2011-01-17 02:41:01.000000000 -0500
23750 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
23751 ATA_PIO_SHT(DRV_NAME),
23752 };
23753 @@ -21961,9 +22116,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_opti.c linux-2.6.37.3/drivers/ata/pat
23754 .inherits = &ata_sff_port_ops,
23755 .cable_detect = ata_cable_40wire,
23756 .set_piomode = opti_set_piomode,
23757 -diff -urNp linux-2.6.37.3/drivers/ata/pata_optidma.c linux-2.6.37.3/drivers/ata/pata_optidma.c
23758 ---- linux-2.6.37.3/drivers/ata/pata_optidma.c 2011-01-04 19:50:19.000000000 -0500
23759 -+++ linux-2.6.37.3/drivers/ata/pata_optidma.c 2011-01-17 02:41:01.000000000 -0500
23760 +diff -urNp linux-2.6.37.4/drivers/ata/pata_optidma.c linux-2.6.37.4/drivers/ata/pata_optidma.c
23761 +--- linux-2.6.37.4/drivers/ata/pata_optidma.c 2011-01-04 19:50:19.000000000 -0500
23762 ++++ linux-2.6.37.4/drivers/ata/pata_optidma.c 2011-01-17 02:41:01.000000000 -0500
23763 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
23764 ATA_BMDMA_SHT(DRV_NAME),
23765 };
23766 @@ -21982,9 +22137,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_optidma.c linux-2.6.37.3/drivers/ata/
23767 .inherits = &optidma_port_ops,
23768 .set_piomode = optiplus_set_pio_mode,
23769 .set_dmamode = optiplus_set_dma_mode,
23770 -diff -urNp linux-2.6.37.3/drivers/ata/pata_palmld.c linux-2.6.37.3/drivers/ata/pata_palmld.c
23771 ---- linux-2.6.37.3/drivers/ata/pata_palmld.c 2011-01-04 19:50:19.000000000 -0500
23772 -+++ linux-2.6.37.3/drivers/ata/pata_palmld.c 2011-01-17 02:41:01.000000000 -0500
23773 +diff -urNp linux-2.6.37.4/drivers/ata/pata_palmld.c linux-2.6.37.4/drivers/ata/pata_palmld.c
23774 +--- linux-2.6.37.4/drivers/ata/pata_palmld.c 2011-01-04 19:50:19.000000000 -0500
23775 ++++ linux-2.6.37.4/drivers/ata/pata_palmld.c 2011-01-17 02:41:01.000000000 -0500
23776 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
23777 ATA_PIO_SHT(DRV_NAME),
23778 };
23779 @@ -21994,9 +22149,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_palmld.c linux-2.6.37.3/drivers/ata/p
23780 .inherits = &ata_sff_port_ops,
23781 .sff_data_xfer = ata_sff_data_xfer_noirq,
23782 .cable_detect = ata_cable_40wire,
23783 -diff -urNp linux-2.6.37.3/drivers/ata/pata_pcmcia.c linux-2.6.37.3/drivers/ata/pata_pcmcia.c
23784 ---- linux-2.6.37.3/drivers/ata/pata_pcmcia.c 2011-01-04 19:50:19.000000000 -0500
23785 -+++ linux-2.6.37.3/drivers/ata/pata_pcmcia.c 2011-01-17 02:41:01.000000000 -0500
23786 +diff -urNp linux-2.6.37.4/drivers/ata/pata_pcmcia.c linux-2.6.37.4/drivers/ata/pata_pcmcia.c
23787 +--- linux-2.6.37.4/drivers/ata/pata_pcmcia.c 2011-01-04 19:50:19.000000000 -0500
23788 ++++ linux-2.6.37.4/drivers/ata/pata_pcmcia.c 2011-01-17 02:41:01.000000000 -0500
23789 @@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_
23790 ATA_PIO_SHT(DRV_NAME),
23791 };
23792 @@ -22023,9 +22178,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_pcmcia.c linux-2.6.37.3/drivers/ata/p
23793
23794 /* Set up attributes in order to probe card and get resources */
23795 pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |
23796 -diff -urNp linux-2.6.37.3/drivers/ata/pata_pdc2027x.c linux-2.6.37.3/drivers/ata/pata_pdc2027x.c
23797 ---- linux-2.6.37.3/drivers/ata/pata_pdc2027x.c 2011-01-04 19:50:19.000000000 -0500
23798 -+++ linux-2.6.37.3/drivers/ata/pata_pdc2027x.c 2011-01-17 02:41:01.000000000 -0500
23799 +diff -urNp linux-2.6.37.4/drivers/ata/pata_pdc2027x.c linux-2.6.37.4/drivers/ata/pata_pdc2027x.c
23800 +--- linux-2.6.37.4/drivers/ata/pata_pdc2027x.c 2011-01-04 19:50:19.000000000 -0500
23801 ++++ linux-2.6.37.4/drivers/ata/pata_pdc2027x.c 2011-01-17 02:41:01.000000000 -0500
23802 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
23803 ATA_BMDMA_SHT(DRV_NAME),
23804 };
23805 @@ -22043,9 +22198,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_pdc2027x.c linux-2.6.37.3/drivers/ata
23806 .inherits = &pdc2027x_pata100_ops,
23807 .mode_filter = pdc2027x_mode_filter,
23808 .set_piomode = pdc2027x_set_piomode,
23809 -diff -urNp linux-2.6.37.3/drivers/ata/pata_pdc202xx_old.c linux-2.6.37.3/drivers/ata/pata_pdc202xx_old.c
23810 ---- linux-2.6.37.3/drivers/ata/pata_pdc202xx_old.c 2011-01-04 19:50:19.000000000 -0500
23811 -+++ linux-2.6.37.3/drivers/ata/pata_pdc202xx_old.c 2011-01-17 02:41:01.000000000 -0500
23812 +diff -urNp linux-2.6.37.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.37.4/drivers/ata/pata_pdc202xx_old.c
23813 +--- linux-2.6.37.4/drivers/ata/pata_pdc202xx_old.c 2011-01-04 19:50:19.000000000 -0500
23814 ++++ linux-2.6.37.4/drivers/ata/pata_pdc202xx_old.c 2011-01-17 02:41:01.000000000 -0500
23815 @@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x
23816 ATA_BMDMA_SHT(DRV_NAME),
23817 };
23818 @@ -22064,9 +22219,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_pdc202xx_old.c linux-2.6.37.3/drivers
23819 .inherits = &pdc2024x_port_ops,
23820
23821 .check_atapi_dma = pdc2026x_check_atapi_dma,
23822 -diff -urNp linux-2.6.37.3/drivers/ata/pata_piccolo.c linux-2.6.37.3/drivers/ata/pata_piccolo.c
23823 ---- linux-2.6.37.3/drivers/ata/pata_piccolo.c 2011-01-04 19:50:19.000000000 -0500
23824 -+++ linux-2.6.37.3/drivers/ata/pata_piccolo.c 2011-01-17 02:41:01.000000000 -0500
23825 +diff -urNp linux-2.6.37.4/drivers/ata/pata_piccolo.c linux-2.6.37.4/drivers/ata/pata_piccolo.c
23826 +--- linux-2.6.37.4/drivers/ata/pata_piccolo.c 2011-01-04 19:50:19.000000000 -0500
23827 ++++ linux-2.6.37.4/drivers/ata/pata_piccolo.c 2011-01-17 02:41:01.000000000 -0500
23828 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
23829 ATA_BMDMA_SHT(DRV_NAME),
23830 };
23831 @@ -22076,9 +22231,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_piccolo.c linux-2.6.37.3/drivers/ata/
23832 .inherits = &ata_bmdma_port_ops,
23833 .cable_detect = ata_cable_unknown,
23834 .set_piomode = tosh_set_piomode,
23835 -diff -urNp linux-2.6.37.3/drivers/ata/pata_platform.c linux-2.6.37.3/drivers/ata/pata_platform.c
23836 ---- linux-2.6.37.3/drivers/ata/pata_platform.c 2011-01-04 19:50:19.000000000 -0500
23837 -+++ linux-2.6.37.3/drivers/ata/pata_platform.c 2011-01-17 02:41:01.000000000 -0500
23838 +diff -urNp linux-2.6.37.4/drivers/ata/pata_platform.c linux-2.6.37.4/drivers/ata/pata_platform.c
23839 +--- linux-2.6.37.4/drivers/ata/pata_platform.c 2011-01-04 19:50:19.000000000 -0500
23840 ++++ linux-2.6.37.4/drivers/ata/pata_platform.c 2011-01-17 02:41:01.000000000 -0500
23841 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
23842 ATA_PIO_SHT(DRV_NAME),
23843 };
23844 @@ -22088,9 +22243,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_platform.c linux-2.6.37.3/drivers/ata
23845 .inherits = &ata_sff_port_ops,
23846 .sff_data_xfer = ata_sff_data_xfer_noirq,
23847 .cable_detect = ata_cable_unknown,
23848 -diff -urNp linux-2.6.37.3/drivers/ata/pata_pxa.c linux-2.6.37.3/drivers/ata/pata_pxa.c
23849 ---- linux-2.6.37.3/drivers/ata/pata_pxa.c 2011-01-04 19:50:19.000000000 -0500
23850 -+++ linux-2.6.37.3/drivers/ata/pata_pxa.c 2011-01-17 02:41:01.000000000 -0500
23851 +diff -urNp linux-2.6.37.4/drivers/ata/pata_pxa.c linux-2.6.37.4/drivers/ata/pata_pxa.c
23852 +--- linux-2.6.37.4/drivers/ata/pata_pxa.c 2011-01-04 19:50:19.000000000 -0500
23853 ++++ linux-2.6.37.4/drivers/ata/pata_pxa.c 2011-01-17 02:41:01.000000000 -0500
23854 @@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata
23855 ATA_BMDMA_SHT(DRV_NAME),
23856 };
23857 @@ -22100,9 +22255,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_pxa.c linux-2.6.37.3/drivers/ata/pata
23858 .inherits = &ata_bmdma_port_ops,
23859 .cable_detect = ata_cable_40wire,
23860
23861 -diff -urNp linux-2.6.37.3/drivers/ata/pata_qdi.c linux-2.6.37.3/drivers/ata/pata_qdi.c
23862 ---- linux-2.6.37.3/drivers/ata/pata_qdi.c 2011-01-04 19:50:19.000000000 -0500
23863 -+++ linux-2.6.37.3/drivers/ata/pata_qdi.c 2011-01-17 02:41:01.000000000 -0500
23864 +diff -urNp linux-2.6.37.4/drivers/ata/pata_qdi.c linux-2.6.37.4/drivers/ata/pata_qdi.c
23865 +--- linux-2.6.37.4/drivers/ata/pata_qdi.c 2011-01-04 19:50:19.000000000 -0500
23866 ++++ linux-2.6.37.4/drivers/ata/pata_qdi.c 2011-01-17 02:41:01.000000000 -0500
23867 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
23868 ATA_PIO_SHT(DRV_NAME),
23869 };
23870 @@ -22121,9 +22276,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_qdi.c linux-2.6.37.3/drivers/ata/pata
23871 .inherits = &qdi6500_port_ops,
23872 .set_piomode = qdi6580_set_piomode,
23873 };
23874 -diff -urNp linux-2.6.37.3/drivers/ata/pata_radisys.c linux-2.6.37.3/drivers/ata/pata_radisys.c
23875 ---- linux-2.6.37.3/drivers/ata/pata_radisys.c 2011-01-04 19:50:19.000000000 -0500
23876 -+++ linux-2.6.37.3/drivers/ata/pata_radisys.c 2011-01-17 02:41:01.000000000 -0500
23877 +diff -urNp linux-2.6.37.4/drivers/ata/pata_radisys.c linux-2.6.37.4/drivers/ata/pata_radisys.c
23878 +--- linux-2.6.37.4/drivers/ata/pata_radisys.c 2011-01-04 19:50:19.000000000 -0500
23879 ++++ linux-2.6.37.4/drivers/ata/pata_radisys.c 2011-01-17 02:41:01.000000000 -0500
23880 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
23881 ATA_BMDMA_SHT(DRV_NAME),
23882 };
23883 @@ -22133,9 +22288,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_radisys.c linux-2.6.37.3/drivers/ata/
23884 .inherits = &ata_bmdma_port_ops,
23885 .qc_issue = radisys_qc_issue,
23886 .cable_detect = ata_cable_unknown,
23887 -diff -urNp linux-2.6.37.3/drivers/ata/pata_rb532_cf.c linux-2.6.37.3/drivers/ata/pata_rb532_cf.c
23888 ---- linux-2.6.37.3/drivers/ata/pata_rb532_cf.c 2011-01-04 19:50:19.000000000 -0500
23889 -+++ linux-2.6.37.3/drivers/ata/pata_rb532_cf.c 2011-01-17 02:41:01.000000000 -0500
23890 +diff -urNp linux-2.6.37.4/drivers/ata/pata_rb532_cf.c linux-2.6.37.4/drivers/ata/pata_rb532_cf.c
23891 +--- linux-2.6.37.4/drivers/ata/pata_rb532_cf.c 2011-01-04 19:50:19.000000000 -0500
23892 ++++ linux-2.6.37.4/drivers/ata/pata_rb532_cf.c 2011-01-17 02:41:01.000000000 -0500
23893 @@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
23894 return IRQ_HANDLED;
23895 }
23896 @@ -22145,9 +22300,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_rb532_cf.c linux-2.6.37.3/drivers/ata
23897 .inherits = &ata_sff_port_ops,
23898 .sff_data_xfer = ata_sff_data_xfer32,
23899 };
23900 -diff -urNp linux-2.6.37.3/drivers/ata/pata_rdc.c linux-2.6.37.3/drivers/ata/pata_rdc.c
23901 ---- linux-2.6.37.3/drivers/ata/pata_rdc.c 2011-01-04 19:50:19.000000000 -0500
23902 -+++ linux-2.6.37.3/drivers/ata/pata_rdc.c 2011-01-17 02:41:01.000000000 -0500
23903 +diff -urNp linux-2.6.37.4/drivers/ata/pata_rdc.c linux-2.6.37.4/drivers/ata/pata_rdc.c
23904 +--- linux-2.6.37.4/drivers/ata/pata_rdc.c 2011-01-04 19:50:19.000000000 -0500
23905 ++++ linux-2.6.37.4/drivers/ata/pata_rdc.c 2011-01-17 02:41:01.000000000 -0500
23906 @@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p
23907 pci_write_config_byte(dev, 0x48, udma_enable);
23908 }
23909 @@ -22157,9 +22312,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_rdc.c linux-2.6.37.3/drivers/ata/pata
23910 .inherits = &ata_bmdma32_port_ops,
23911 .cable_detect = rdc_pata_cable_detect,
23912 .set_piomode = rdc_set_piomode,
23913 -diff -urNp linux-2.6.37.3/drivers/ata/pata_rz1000.c linux-2.6.37.3/drivers/ata/pata_rz1000.c
23914 ---- linux-2.6.37.3/drivers/ata/pata_rz1000.c 2011-01-04 19:50:19.000000000 -0500
23915 -+++ linux-2.6.37.3/drivers/ata/pata_rz1000.c 2011-01-17 02:41:01.000000000 -0500
23916 +diff -urNp linux-2.6.37.4/drivers/ata/pata_rz1000.c linux-2.6.37.4/drivers/ata/pata_rz1000.c
23917 +--- linux-2.6.37.4/drivers/ata/pata_rz1000.c 2011-01-04 19:50:19.000000000 -0500
23918 ++++ linux-2.6.37.4/drivers/ata/pata_rz1000.c 2011-01-17 02:41:01.000000000 -0500
23919 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
23920 ATA_PIO_SHT(DRV_NAME),
23921 };
23922 @@ -22169,9 +22324,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_rz1000.c linux-2.6.37.3/drivers/ata/p
23923 .inherits = &ata_sff_port_ops,
23924 .cable_detect = ata_cable_40wire,
23925 .set_mode = rz1000_set_mode,
23926 -diff -urNp linux-2.6.37.3/drivers/ata/pata_samsung_cf.c linux-2.6.37.3/drivers/ata/pata_samsung_cf.c
23927 ---- linux-2.6.37.3/drivers/ata/pata_samsung_cf.c 2011-01-04 19:50:19.000000000 -0500
23928 -+++ linux-2.6.37.3/drivers/ata/pata_samsung_cf.c 2011-01-17 02:41:01.000000000 -0500
23929 +diff -urNp linux-2.6.37.4/drivers/ata/pata_samsung_cf.c linux-2.6.37.4/drivers/ata/pata_samsung_cf.c
23930 +--- linux-2.6.37.4/drivers/ata/pata_samsung_cf.c 2011-01-04 19:50:19.000000000 -0500
23931 ++++ linux-2.6.37.4/drivers/ata/pata_samsung_cf.c 2011-01-17 02:41:01.000000000 -0500
23932 @@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3
23933 ATA_PIO_SHT(DRV_NAME),
23934 };
23935 @@ -22190,9 +22345,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_samsung_cf.c linux-2.6.37.3/drivers/a
23936 .inherits = &ata_sff_port_ops,
23937 .set_piomode = pata_s3c_set_piomode,
23938 };
23939 -diff -urNp linux-2.6.37.3/drivers/ata/pata_sc1200.c linux-2.6.37.3/drivers/ata/pata_sc1200.c
23940 ---- linux-2.6.37.3/drivers/ata/pata_sc1200.c 2011-01-04 19:50:19.000000000 -0500
23941 -+++ linux-2.6.37.3/drivers/ata/pata_sc1200.c 2011-01-17 02:41:01.000000000 -0500
23942 +diff -urNp linux-2.6.37.4/drivers/ata/pata_sc1200.c linux-2.6.37.4/drivers/ata/pata_sc1200.c
23943 +--- linux-2.6.37.4/drivers/ata/pata_sc1200.c 2011-01-04 19:50:19.000000000 -0500
23944 ++++ linux-2.6.37.4/drivers/ata/pata_sc1200.c 2011-01-17 02:41:01.000000000 -0500
23945 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
23946 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
23947 };
23948 @@ -22202,9 +22357,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_sc1200.c linux-2.6.37.3/drivers/ata/p
23949 .inherits = &ata_bmdma_port_ops,
23950 .qc_prep = ata_bmdma_dumb_qc_prep,
23951 .qc_issue = sc1200_qc_issue,
23952 -diff -urNp linux-2.6.37.3/drivers/ata/pata_scc.c linux-2.6.37.3/drivers/ata/pata_scc.c
23953 ---- linux-2.6.37.3/drivers/ata/pata_scc.c 2011-01-04 19:50:19.000000000 -0500
23954 -+++ linux-2.6.37.3/drivers/ata/pata_scc.c 2011-01-17 02:41:01.000000000 -0500
23955 +diff -urNp linux-2.6.37.4/drivers/ata/pata_scc.c linux-2.6.37.4/drivers/ata/pata_scc.c
23956 +--- linux-2.6.37.4/drivers/ata/pata_scc.c 2011-01-04 19:50:19.000000000 -0500
23957 ++++ linux-2.6.37.4/drivers/ata/pata_scc.c 2011-01-17 02:41:01.000000000 -0500
23958 @@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht
23959 ATA_BMDMA_SHT(DRV_NAME),
23960 };
23961 @@ -22214,9 +22369,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_scc.c linux-2.6.37.3/drivers/ata/pata
23962 .inherits = &ata_bmdma_port_ops,
23963
23964 .set_piomode = scc_set_piomode,
23965 -diff -urNp linux-2.6.37.3/drivers/ata/pata_sch.c linux-2.6.37.3/drivers/ata/pata_sch.c
23966 ---- linux-2.6.37.3/drivers/ata/pata_sch.c 2011-01-04 19:50:19.000000000 -0500
23967 -+++ linux-2.6.37.3/drivers/ata/pata_sch.c 2011-01-17 02:41:01.000000000 -0500
23968 +diff -urNp linux-2.6.37.4/drivers/ata/pata_sch.c linux-2.6.37.4/drivers/ata/pata_sch.c
23969 +--- linux-2.6.37.4/drivers/ata/pata_sch.c 2011-01-04 19:50:19.000000000 -0500
23970 ++++ linux-2.6.37.4/drivers/ata/pata_sch.c 2011-01-17 02:41:01.000000000 -0500
23971 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
23972 ATA_BMDMA_SHT(DRV_NAME),
23973 };
23974 @@ -22226,9 +22381,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_sch.c linux-2.6.37.3/drivers/ata/pata
23975 .inherits = &ata_bmdma_port_ops,
23976 .cable_detect = ata_cable_unknown,
23977 .set_piomode = sch_set_piomode,
23978 -diff -urNp linux-2.6.37.3/drivers/ata/pata_serverworks.c linux-2.6.37.3/drivers/ata/pata_serverworks.c
23979 ---- linux-2.6.37.3/drivers/ata/pata_serverworks.c 2011-01-04 19:50:19.000000000 -0500
23980 -+++ linux-2.6.37.3/drivers/ata/pata_serverworks.c 2011-01-17 02:41:01.000000000 -0500
23981 +diff -urNp linux-2.6.37.4/drivers/ata/pata_serverworks.c linux-2.6.37.4/drivers/ata/pata_serverworks.c
23982 +--- linux-2.6.37.4/drivers/ata/pata_serverworks.c 2011-01-04 19:50:19.000000000 -0500
23983 ++++ linux-2.6.37.4/drivers/ata/pata_serverworks.c 2011-01-17 02:41:01.000000000 -0500
23984 @@ -300,7 +300,7 @@ static struct scsi_host_template serverw
23985 ATA_BMDMA_SHT(DRV_NAME),
23986 };
23987 @@ -22247,9 +22402,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_serverworks.c linux-2.6.37.3/drivers/
23988 .inherits = &serverworks_osb4_port_ops,
23989 .mode_filter = serverworks_csb_filter,
23990 };
23991 -diff -urNp linux-2.6.37.3/drivers/ata/pata_sil680.c linux-2.6.37.3/drivers/ata/pata_sil680.c
23992 ---- linux-2.6.37.3/drivers/ata/pata_sil680.c 2011-01-04 19:50:19.000000000 -0500
23993 -+++ linux-2.6.37.3/drivers/ata/pata_sil680.c 2011-01-17 02:41:01.000000000 -0500
23994 +diff -urNp linux-2.6.37.4/drivers/ata/pata_sil680.c linux-2.6.37.4/drivers/ata/pata_sil680.c
23995 +--- linux-2.6.37.4/drivers/ata/pata_sil680.c 2011-01-04 19:50:19.000000000 -0500
23996 ++++ linux-2.6.37.4/drivers/ata/pata_sil680.c 2011-01-17 02:41:01.000000000 -0500
23997 @@ -225,8 +225,7 @@ static struct scsi_host_template sil680_
23998 ATA_BMDMA_SHT(DRV_NAME),
23999 };
24000 @@ -22260,9 +22415,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_sil680.c linux-2.6.37.3/drivers/ata/p
24001 .inherits = &ata_bmdma32_port_ops,
24002 .sff_exec_command = sil680_sff_exec_command,
24003 .sff_irq_check = sil680_sff_irq_check,
24004 -diff -urNp linux-2.6.37.3/drivers/ata/pata_sis.c linux-2.6.37.3/drivers/ata/pata_sis.c
24005 ---- linux-2.6.37.3/drivers/ata/pata_sis.c 2011-01-04 19:50:19.000000000 -0500
24006 -+++ linux-2.6.37.3/drivers/ata/pata_sis.c 2011-01-17 02:41:01.000000000 -0500
24007 +diff -urNp linux-2.6.37.4/drivers/ata/pata_sis.c linux-2.6.37.4/drivers/ata/pata_sis.c
24008 +--- linux-2.6.37.4/drivers/ata/pata_sis.c 2011-01-04 19:50:19.000000000 -0500
24009 ++++ linux-2.6.37.4/drivers/ata/pata_sis.c 2011-01-17 02:41:01.000000000 -0500
24010 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
24011 ATA_BMDMA_SHT(DRV_NAME),
24012 };
24013 @@ -22318,9 +22473,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_sis.c linux-2.6.37.3/drivers/ata/pata
24014 .inherits = &sis_base_ops,
24015 .set_piomode = sis_old_set_piomode,
24016 .set_dmamode = sis_old_set_dmamode,
24017 -diff -urNp linux-2.6.37.3/drivers/ata/pata_sl82c105.c linux-2.6.37.3/drivers/ata/pata_sl82c105.c
24018 ---- linux-2.6.37.3/drivers/ata/pata_sl82c105.c 2011-01-04 19:50:19.000000000 -0500
24019 -+++ linux-2.6.37.3/drivers/ata/pata_sl82c105.c 2011-01-17 02:41:01.000000000 -0500
24020 +diff -urNp linux-2.6.37.4/drivers/ata/pata_sl82c105.c linux-2.6.37.4/drivers/ata/pata_sl82c105.c
24021 +--- linux-2.6.37.4/drivers/ata/pata_sl82c105.c 2011-01-04 19:50:19.000000000 -0500
24022 ++++ linux-2.6.37.4/drivers/ata/pata_sl82c105.c 2011-01-17 02:41:01.000000000 -0500
24023 @@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10
24024 ATA_BMDMA_SHT(DRV_NAME),
24025 };
24026 @@ -22330,9 +22485,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_sl82c105.c linux-2.6.37.3/drivers/ata
24027 .inherits = &ata_bmdma_port_ops,
24028 .qc_defer = sl82c105_qc_defer,
24029 .bmdma_start = sl82c105_bmdma_start,
24030 -diff -urNp linux-2.6.37.3/drivers/ata/pata_triflex.c linux-2.6.37.3/drivers/ata/pata_triflex.c
24031 ---- linux-2.6.37.3/drivers/ata/pata_triflex.c 2011-01-04 19:50:19.000000000 -0500
24032 -+++ linux-2.6.37.3/drivers/ata/pata_triflex.c 2011-01-17 02:41:01.000000000 -0500
24033 +diff -urNp linux-2.6.37.4/drivers/ata/pata_triflex.c linux-2.6.37.4/drivers/ata/pata_triflex.c
24034 +--- linux-2.6.37.4/drivers/ata/pata_triflex.c 2011-01-04 19:50:19.000000000 -0500
24035 ++++ linux-2.6.37.4/drivers/ata/pata_triflex.c 2011-01-17 02:41:01.000000000 -0500
24036 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
24037 ATA_BMDMA_SHT(DRV_NAME),
24038 };
24039 @@ -22342,9 +22497,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_triflex.c linux-2.6.37.3/drivers/ata/
24040 .inherits = &ata_bmdma_port_ops,
24041 .bmdma_start = triflex_bmdma_start,
24042 .bmdma_stop = triflex_bmdma_stop,
24043 -diff -urNp linux-2.6.37.3/drivers/ata/pata_via.c linux-2.6.37.3/drivers/ata/pata_via.c
24044 ---- linux-2.6.37.3/drivers/ata/pata_via.c 2011-01-04 19:50:19.000000000 -0500
24045 -+++ linux-2.6.37.3/drivers/ata/pata_via.c 2011-01-17 02:41:01.000000000 -0500
24046 +diff -urNp linux-2.6.37.4/drivers/ata/pata_via.c linux-2.6.37.4/drivers/ata/pata_via.c
24047 +--- linux-2.6.37.4/drivers/ata/pata_via.c 2011-01-04 19:50:19.000000000 -0500
24048 ++++ linux-2.6.37.4/drivers/ata/pata_via.c 2011-01-17 02:41:01.000000000 -0500
24049 @@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
24050 ATA_BMDMA_SHT(DRV_NAME),
24051 };
24052 @@ -22363,9 +22518,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pata_via.c linux-2.6.37.3/drivers/ata/pata
24053 .inherits = &via_port_ops,
24054 .sff_data_xfer = ata_sff_data_xfer_noirq,
24055 };
24056 -diff -urNp linux-2.6.37.3/drivers/ata/pdc_adma.c linux-2.6.37.3/drivers/ata/pdc_adma.c
24057 ---- linux-2.6.37.3/drivers/ata/pdc_adma.c 2011-01-04 19:50:19.000000000 -0500
24058 -+++ linux-2.6.37.3/drivers/ata/pdc_adma.c 2011-01-17 02:41:01.000000000 -0500
24059 +diff -urNp linux-2.6.37.4/drivers/ata/pdc_adma.c linux-2.6.37.4/drivers/ata/pdc_adma.c
24060 +--- linux-2.6.37.4/drivers/ata/pdc_adma.c 2011-01-04 19:50:19.000000000 -0500
24061 ++++ linux-2.6.37.4/drivers/ata/pdc_adma.c 2011-01-17 02:41:01.000000000 -0500
24062 @@ -146,7 +146,7 @@ static struct scsi_host_template adma_at
24063 .dma_boundary = ADMA_DMA_BOUNDARY,
24064 };
24065 @@ -22375,9 +22530,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/pdc_adma.c linux-2.6.37.3/drivers/ata/pdc_
24066 .inherits = &ata_sff_port_ops,
24067
24068 .lost_interrupt = ATA_OP_NULL,
24069 -diff -urNp linux-2.6.37.3/drivers/ata/sata_dwc_460ex.c linux-2.6.37.3/drivers/ata/sata_dwc_460ex.c
24070 ---- linux-2.6.37.3/drivers/ata/sata_dwc_460ex.c 2011-01-04 19:50:19.000000000 -0500
24071 -+++ linux-2.6.37.3/drivers/ata/sata_dwc_460ex.c 2011-01-17 02:41:01.000000000 -0500
24072 +diff -urNp linux-2.6.37.4/drivers/ata/sata_dwc_460ex.c linux-2.6.37.4/drivers/ata/sata_dwc_460ex.c
24073 +--- linux-2.6.37.4/drivers/ata/sata_dwc_460ex.c 2011-01-04 19:50:19.000000000 -0500
24074 ++++ linux-2.6.37.4/drivers/ata/sata_dwc_460ex.c 2011-01-17 02:41:01.000000000 -0500
24075 @@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw
24076 .dma_boundary = ATA_DMA_BOUNDARY,
24077 };
24078 @@ -22387,9 +22542,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_dwc_460ex.c linux-2.6.37.3/drivers/at
24079 .inherits = &ata_sff_port_ops,
24080
24081 .error_handler = sata_dwc_error_handler,
24082 -diff -urNp linux-2.6.37.3/drivers/ata/sata_fsl.c linux-2.6.37.3/drivers/ata/sata_fsl.c
24083 ---- linux-2.6.37.3/drivers/ata/sata_fsl.c 2011-01-04 19:50:19.000000000 -0500
24084 -+++ linux-2.6.37.3/drivers/ata/sata_fsl.c 2011-01-17 02:41:01.000000000 -0500
24085 +diff -urNp linux-2.6.37.4/drivers/ata/sata_fsl.c linux-2.6.37.4/drivers/ata/sata_fsl.c
24086 +--- linux-2.6.37.4/drivers/ata/sata_fsl.c 2011-01-04 19:50:19.000000000 -0500
24087 ++++ linux-2.6.37.4/drivers/ata/sata_fsl.c 2011-01-17 02:41:01.000000000 -0500
24088 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
24089 .dma_boundary = ATA_DMA_BOUNDARY,
24090 };
24091 @@ -22399,9 +22554,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_fsl.c linux-2.6.37.3/drivers/ata/sata
24092 .inherits = &sata_pmp_port_ops,
24093
24094 .qc_defer = ata_std_qc_defer,
24095 -diff -urNp linux-2.6.37.3/drivers/ata/sata_inic162x.c linux-2.6.37.3/drivers/ata/sata_inic162x.c
24096 ---- linux-2.6.37.3/drivers/ata/sata_inic162x.c 2011-01-04 19:50:19.000000000 -0500
24097 -+++ linux-2.6.37.3/drivers/ata/sata_inic162x.c 2011-01-17 02:41:01.000000000 -0500
24098 +diff -urNp linux-2.6.37.4/drivers/ata/sata_inic162x.c linux-2.6.37.4/drivers/ata/sata_inic162x.c
24099 +--- linux-2.6.37.4/drivers/ata/sata_inic162x.c 2011-01-04 19:50:19.000000000 -0500
24100 ++++ linux-2.6.37.4/drivers/ata/sata_inic162x.c 2011-01-17 02:41:01.000000000 -0500
24101 @@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po
24102 return 0;
24103 }
24104 @@ -22411,9 +22566,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_inic162x.c linux-2.6.37.3/drivers/ata
24105 .inherits = &sata_port_ops,
24106
24107 .check_atapi_dma = inic_check_atapi_dma,
24108 -diff -urNp linux-2.6.37.3/drivers/ata/sata_mv.c linux-2.6.37.3/drivers/ata/sata_mv.c
24109 ---- linux-2.6.37.3/drivers/ata/sata_mv.c 2011-01-04 19:50:19.000000000 -0500
24110 -+++ linux-2.6.37.3/drivers/ata/sata_mv.c 2011-01-17 02:41:01.000000000 -0500
24111 +diff -urNp linux-2.6.37.4/drivers/ata/sata_mv.c linux-2.6.37.4/drivers/ata/sata_mv.c
24112 +--- linux-2.6.37.4/drivers/ata/sata_mv.c 2011-01-04 19:50:19.000000000 -0500
24113 ++++ linux-2.6.37.4/drivers/ata/sata_mv.c 2011-01-17 02:41:01.000000000 -0500
24114 @@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
24115 .dma_boundary = MV_DMA_BOUNDARY,
24116 };
24117 @@ -22441,9 +22596,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_mv.c linux-2.6.37.3/drivers/ata/sata_
24118 .inherits = &mv6_ops,
24119 .dev_config = ATA_OP_NULL,
24120 .qc_prep = mv_qc_prep_iie,
24121 -diff -urNp linux-2.6.37.3/drivers/ata/sata_nv.c linux-2.6.37.3/drivers/ata/sata_nv.c
24122 ---- linux-2.6.37.3/drivers/ata/sata_nv.c 2011-01-04 19:50:19.000000000 -0500
24123 -+++ linux-2.6.37.3/drivers/ata/sata_nv.c 2011-01-17 02:41:01.000000000 -0500
24124 +diff -urNp linux-2.6.37.4/drivers/ata/sata_nv.c linux-2.6.37.4/drivers/ata/sata_nv.c
24125 +--- linux-2.6.37.4/drivers/ata/sata_nv.c 2011-01-04 19:50:19.000000000 -0500
24126 ++++ linux-2.6.37.4/drivers/ata/sata_nv.c 2011-01-17 02:41:01.000000000 -0500
24127 @@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc
24128 * cases. Define nv_hardreset() which only kicks in for post-boot
24129 * probing and use it for all variants.
24130 @@ -22486,9 +22641,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_nv.c linux-2.6.37.3/drivers/ata/sata_
24131 .inherits = &nv_generic_ops,
24132
24133 .qc_defer = ata_std_qc_defer,
24134 -diff -urNp linux-2.6.37.3/drivers/ata/sata_promise.c linux-2.6.37.3/drivers/ata/sata_promise.c
24135 ---- linux-2.6.37.3/drivers/ata/sata_promise.c 2011-01-04 19:50:19.000000000 -0500
24136 -+++ linux-2.6.37.3/drivers/ata/sata_promise.c 2011-01-17 02:41:01.000000000 -0500
24137 +diff -urNp linux-2.6.37.4/drivers/ata/sata_promise.c linux-2.6.37.4/drivers/ata/sata_promise.c
24138 +--- linux-2.6.37.4/drivers/ata/sata_promise.c 2011-01-04 19:50:19.000000000 -0500
24139 ++++ linux-2.6.37.4/drivers/ata/sata_promise.c 2011-01-17 02:41:01.000000000 -0500
24140 @@ -196,7 +196,7 @@ static const struct ata_port_operations
24141 .error_handler = pdc_error_handler,
24142 };
24143 @@ -22515,9 +22670,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_promise.c linux-2.6.37.3/drivers/ata/
24144 .inherits = &pdc_common_ops,
24145 .cable_detect = pdc_pata_cable_detect,
24146 .freeze = pdc_freeze,
24147 -diff -urNp linux-2.6.37.3/drivers/ata/sata_qstor.c linux-2.6.37.3/drivers/ata/sata_qstor.c
24148 ---- linux-2.6.37.3/drivers/ata/sata_qstor.c 2011-01-04 19:50:19.000000000 -0500
24149 -+++ linux-2.6.37.3/drivers/ata/sata_qstor.c 2011-01-17 02:41:01.000000000 -0500
24150 +diff -urNp linux-2.6.37.4/drivers/ata/sata_qstor.c linux-2.6.37.4/drivers/ata/sata_qstor.c
24151 +--- linux-2.6.37.4/drivers/ata/sata_qstor.c 2011-01-04 19:50:19.000000000 -0500
24152 ++++ linux-2.6.37.4/drivers/ata/sata_qstor.c 2011-01-17 02:41:01.000000000 -0500
24153 @@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
24154 .dma_boundary = QS_DMA_BOUNDARY,
24155 };
24156 @@ -22527,9 +22682,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_qstor.c linux-2.6.37.3/drivers/ata/sa
24157 .inherits = &ata_sff_port_ops,
24158
24159 .check_atapi_dma = qs_check_atapi_dma,
24160 -diff -urNp linux-2.6.37.3/drivers/ata/sata_sil24.c linux-2.6.37.3/drivers/ata/sata_sil24.c
24161 ---- linux-2.6.37.3/drivers/ata/sata_sil24.c 2011-01-04 19:50:19.000000000 -0500
24162 -+++ linux-2.6.37.3/drivers/ata/sata_sil24.c 2011-01-17 02:41:01.000000000 -0500
24163 +diff -urNp linux-2.6.37.4/drivers/ata/sata_sil24.c linux-2.6.37.4/drivers/ata/sata_sil24.c
24164 +--- linux-2.6.37.4/drivers/ata/sata_sil24.c 2011-01-04 19:50:19.000000000 -0500
24165 ++++ linux-2.6.37.4/drivers/ata/sata_sil24.c 2011-01-17 02:41:01.000000000 -0500
24166 @@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
24167 .dma_boundary = ATA_DMA_BOUNDARY,
24168 };
24169 @@ -22539,9 +22694,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_sil24.c linux-2.6.37.3/drivers/ata/sa
24170 .inherits = &sata_pmp_port_ops,
24171
24172 .qc_defer = sil24_qc_defer,
24173 -diff -urNp linux-2.6.37.3/drivers/ata/sata_sil.c linux-2.6.37.3/drivers/ata/sata_sil.c
24174 ---- linux-2.6.37.3/drivers/ata/sata_sil.c 2011-01-04 19:50:19.000000000 -0500
24175 -+++ linux-2.6.37.3/drivers/ata/sata_sil.c 2011-01-17 02:41:01.000000000 -0500
24176 +diff -urNp linux-2.6.37.4/drivers/ata/sata_sil.c linux-2.6.37.4/drivers/ata/sata_sil.c
24177 +--- linux-2.6.37.4/drivers/ata/sata_sil.c 2011-01-04 19:50:19.000000000 -0500
24178 ++++ linux-2.6.37.4/drivers/ata/sata_sil.c 2011-01-17 02:41:01.000000000 -0500
24179 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
24180 .sg_tablesize = ATA_MAX_PRD
24181 };
24182 @@ -22551,9 +22706,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_sil.c linux-2.6.37.3/drivers/ata/sata
24183 .inherits = &ata_bmdma32_port_ops,
24184 .dev_config = sil_dev_config,
24185 .set_mode = sil_set_mode,
24186 -diff -urNp linux-2.6.37.3/drivers/ata/sata_sis.c linux-2.6.37.3/drivers/ata/sata_sis.c
24187 ---- linux-2.6.37.3/drivers/ata/sata_sis.c 2011-01-04 19:50:19.000000000 -0500
24188 -+++ linux-2.6.37.3/drivers/ata/sata_sis.c 2011-01-17 02:41:01.000000000 -0500
24189 +diff -urNp linux-2.6.37.4/drivers/ata/sata_sis.c linux-2.6.37.4/drivers/ata/sata_sis.c
24190 +--- linux-2.6.37.4/drivers/ata/sata_sis.c 2011-01-04 19:50:19.000000000 -0500
24191 ++++ linux-2.6.37.4/drivers/ata/sata_sis.c 2011-01-17 02:41:01.000000000 -0500
24192 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
24193 ATA_BMDMA_SHT(DRV_NAME),
24194 };
24195 @@ -22563,9 +22718,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_sis.c linux-2.6.37.3/drivers/ata/sata
24196 .inherits = &ata_bmdma_port_ops,
24197 .scr_read = sis_scr_read,
24198 .scr_write = sis_scr_write,
24199 -diff -urNp linux-2.6.37.3/drivers/ata/sata_svw.c linux-2.6.37.3/drivers/ata/sata_svw.c
24200 ---- linux-2.6.37.3/drivers/ata/sata_svw.c 2011-01-04 19:50:19.000000000 -0500
24201 -+++ linux-2.6.37.3/drivers/ata/sata_svw.c 2011-01-17 02:41:01.000000000 -0500
24202 +diff -urNp linux-2.6.37.4/drivers/ata/sata_svw.c linux-2.6.37.4/drivers/ata/sata_svw.c
24203 +--- linux-2.6.37.4/drivers/ata/sata_svw.c 2011-01-04 19:50:19.000000000 -0500
24204 ++++ linux-2.6.37.4/drivers/ata/sata_svw.c 2011-01-17 02:41:01.000000000 -0500
24205 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
24206 };
24207
24208 @@ -22575,9 +22730,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_svw.c linux-2.6.37.3/drivers/ata/sata
24209 .inherits = &ata_bmdma_port_ops,
24210 .sff_tf_load = k2_sata_tf_load,
24211 .sff_tf_read = k2_sata_tf_read,
24212 -diff -urNp linux-2.6.37.3/drivers/ata/sata_sx4.c linux-2.6.37.3/drivers/ata/sata_sx4.c
24213 ---- linux-2.6.37.3/drivers/ata/sata_sx4.c 2011-01-04 19:50:19.000000000 -0500
24214 -+++ linux-2.6.37.3/drivers/ata/sata_sx4.c 2011-01-17 02:41:01.000000000 -0500
24215 +diff -urNp linux-2.6.37.4/drivers/ata/sata_sx4.c linux-2.6.37.4/drivers/ata/sata_sx4.c
24216 +--- linux-2.6.37.4/drivers/ata/sata_sx4.c 2011-01-04 19:50:19.000000000 -0500
24217 ++++ linux-2.6.37.4/drivers/ata/sata_sx4.c 2011-01-17 02:41:01.000000000 -0500
24218 @@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
24219 };
24220
24221 @@ -22587,9 +22742,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_sx4.c linux-2.6.37.3/drivers/ata/sata
24222 .inherits = &ata_sff_port_ops,
24223
24224 .check_atapi_dma = pdc_check_atapi_dma,
24225 -diff -urNp linux-2.6.37.3/drivers/ata/sata_uli.c linux-2.6.37.3/drivers/ata/sata_uli.c
24226 ---- linux-2.6.37.3/drivers/ata/sata_uli.c 2011-01-04 19:50:19.000000000 -0500
24227 -+++ linux-2.6.37.3/drivers/ata/sata_uli.c 2011-01-17 02:41:01.000000000 -0500
24228 +diff -urNp linux-2.6.37.4/drivers/ata/sata_uli.c linux-2.6.37.4/drivers/ata/sata_uli.c
24229 +--- linux-2.6.37.4/drivers/ata/sata_uli.c 2011-01-04 19:50:19.000000000 -0500
24230 ++++ linux-2.6.37.4/drivers/ata/sata_uli.c 2011-01-17 02:41:01.000000000 -0500
24231 @@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht
24232 ATA_BMDMA_SHT(DRV_NAME),
24233 };
24234 @@ -22599,9 +22754,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_uli.c linux-2.6.37.3/drivers/ata/sata
24235 .inherits = &ata_bmdma_port_ops,
24236 .scr_read = uli_scr_read,
24237 .scr_write = uli_scr_write,
24238 -diff -urNp linux-2.6.37.3/drivers/ata/sata_via.c linux-2.6.37.3/drivers/ata/sata_via.c
24239 ---- linux-2.6.37.3/drivers/ata/sata_via.c 2011-01-04 19:50:19.000000000 -0500
24240 -+++ linux-2.6.37.3/drivers/ata/sata_via.c 2011-01-17 02:41:01.000000000 -0500
24241 +diff -urNp linux-2.6.37.4/drivers/ata/sata_via.c linux-2.6.37.4/drivers/ata/sata_via.c
24242 +--- linux-2.6.37.4/drivers/ata/sata_via.c 2011-01-04 19:50:19.000000000 -0500
24243 ++++ linux-2.6.37.4/drivers/ata/sata_via.c 2011-01-17 02:41:01.000000000 -0500
24244 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
24245 ATA_BMDMA_SHT(DRV_NAME),
24246 };
24247 @@ -22640,9 +22795,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_via.c linux-2.6.37.3/drivers/ata/sata
24248 .inherits = &svia_base_ops,
24249 .hardreset = sata_std_hardreset,
24250 .scr_read = vt8251_scr_read,
24251 -diff -urNp linux-2.6.37.3/drivers/ata/sata_vsc.c linux-2.6.37.3/drivers/ata/sata_vsc.c
24252 ---- linux-2.6.37.3/drivers/ata/sata_vsc.c 2011-01-04 19:50:19.000000000 -0500
24253 -+++ linux-2.6.37.3/drivers/ata/sata_vsc.c 2011-01-17 02:41:01.000000000 -0500
24254 +diff -urNp linux-2.6.37.4/drivers/ata/sata_vsc.c linux-2.6.37.4/drivers/ata/sata_vsc.c
24255 +--- linux-2.6.37.4/drivers/ata/sata_vsc.c 2011-01-04 19:50:19.000000000 -0500
24256 ++++ linux-2.6.37.4/drivers/ata/sata_vsc.c 2011-01-17 02:41:01.000000000 -0500
24257 @@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
24258 };
24259
24260 @@ -22652,9 +22807,9 @@ diff -urNp linux-2.6.37.3/drivers/ata/sata_vsc.c linux-2.6.37.3/drivers/ata/sata
24261 .inherits = &ata_bmdma_port_ops,
24262 /* The IRQ handling is not quite standard SFF behaviour so we
24263 cannot use the default lost interrupt handler */
24264 -diff -urNp linux-2.6.37.3/drivers/atm/adummy.c linux-2.6.37.3/drivers/atm/adummy.c
24265 ---- linux-2.6.37.3/drivers/atm/adummy.c 2011-01-04 19:50:19.000000000 -0500
24266 -+++ linux-2.6.37.3/drivers/atm/adummy.c 2011-01-17 02:41:01.000000000 -0500
24267 +diff -urNp linux-2.6.37.4/drivers/atm/adummy.c linux-2.6.37.4/drivers/atm/adummy.c
24268 +--- linux-2.6.37.4/drivers/atm/adummy.c 2011-01-04 19:50:19.000000000 -0500
24269 ++++ linux-2.6.37.4/drivers/atm/adummy.c 2011-01-17 02:41:01.000000000 -0500
24270 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
24271 vcc->pop(vcc, skb);
24272 else
24273 @@ -22664,9 +22819,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/adummy.c linux-2.6.37.3/drivers/atm/adummy
24274
24275 return 0;
24276 }
24277 -diff -urNp linux-2.6.37.3/drivers/atm/ambassador.c linux-2.6.37.3/drivers/atm/ambassador.c
24278 ---- linux-2.6.37.3/drivers/atm/ambassador.c 2011-01-04 19:50:19.000000000 -0500
24279 -+++ linux-2.6.37.3/drivers/atm/ambassador.c 2011-01-17 02:41:01.000000000 -0500
24280 +diff -urNp linux-2.6.37.4/drivers/atm/ambassador.c linux-2.6.37.4/drivers/atm/ambassador.c
24281 +--- linux-2.6.37.4/drivers/atm/ambassador.c 2011-01-04 19:50:19.000000000 -0500
24282 ++++ linux-2.6.37.4/drivers/atm/ambassador.c 2011-01-17 02:41:01.000000000 -0500
24283 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
24284 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
24285
24286 @@ -22703,9 +22858,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/ambassador.c linux-2.6.37.3/drivers/atm/am
24287 return -ENOMEM; // ?
24288 }
24289
24290 -diff -urNp linux-2.6.37.3/drivers/atm/atmtcp.c linux-2.6.37.3/drivers/atm/atmtcp.c
24291 ---- linux-2.6.37.3/drivers/atm/atmtcp.c 2011-01-04 19:50:19.000000000 -0500
24292 -+++ linux-2.6.37.3/drivers/atm/atmtcp.c 2011-01-17 02:41:01.000000000 -0500
24293 +diff -urNp linux-2.6.37.4/drivers/atm/atmtcp.c linux-2.6.37.4/drivers/atm/atmtcp.c
24294 +--- linux-2.6.37.4/drivers/atm/atmtcp.c 2011-01-04 19:50:19.000000000 -0500
24295 ++++ linux-2.6.37.4/drivers/atm/atmtcp.c 2011-01-17 02:41:01.000000000 -0500
24296 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc
24297 if (vcc->pop) vcc->pop(vcc,skb);
24298 else dev_kfree_skb(skb);
24299 @@ -22755,9 +22910,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/atmtcp.c linux-2.6.37.3/drivers/atm/atmtcp
24300 done:
24301 if (vcc->pop) vcc->pop(vcc,skb);
24302 else dev_kfree_skb(skb);
24303 -diff -urNp linux-2.6.37.3/drivers/atm/eni.c linux-2.6.37.3/drivers/atm/eni.c
24304 ---- linux-2.6.37.3/drivers/atm/eni.c 2011-01-04 19:50:19.000000000 -0500
24305 -+++ linux-2.6.37.3/drivers/atm/eni.c 2011-01-17 02:41:01.000000000 -0500
24306 +diff -urNp linux-2.6.37.4/drivers/atm/eni.c linux-2.6.37.4/drivers/atm/eni.c
24307 +--- linux-2.6.37.4/drivers/atm/eni.c 2011-01-04 19:50:19.000000000 -0500
24308 ++++ linux-2.6.37.4/drivers/atm/eni.c 2011-01-17 02:41:01.000000000 -0500
24309 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
24310 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
24311 vcc->dev->number);
24312 @@ -22803,9 +22958,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/eni.c linux-2.6.37.3/drivers/atm/eni.c
24313 wake_up(&eni_dev->tx_wait);
24314 dma_complete++;
24315 }
24316 -diff -urNp linux-2.6.37.3/drivers/atm/firestream.c linux-2.6.37.3/drivers/atm/firestream.c
24317 ---- linux-2.6.37.3/drivers/atm/firestream.c 2011-01-04 19:50:19.000000000 -0500
24318 -+++ linux-2.6.37.3/drivers/atm/firestream.c 2011-01-17 02:41:01.000000000 -0500
24319 +diff -urNp linux-2.6.37.4/drivers/atm/firestream.c linux-2.6.37.4/drivers/atm/firestream.c
24320 +--- linux-2.6.37.4/drivers/atm/firestream.c 2011-01-04 19:50:19.000000000 -0500
24321 ++++ linux-2.6.37.4/drivers/atm/firestream.c 2011-01-17 02:41:01.000000000 -0500
24322 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
24323 }
24324 }
24325 @@ -22839,9 +22994,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/firestream.c linux-2.6.37.3/drivers/atm/fi
24326 break;
24327 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
24328 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
24329 -diff -urNp linux-2.6.37.3/drivers/atm/fore200e.c linux-2.6.37.3/drivers/atm/fore200e.c
24330 ---- linux-2.6.37.3/drivers/atm/fore200e.c 2011-01-04 19:50:19.000000000 -0500
24331 -+++ linux-2.6.37.3/drivers/atm/fore200e.c 2011-01-17 02:41:01.000000000 -0500
24332 +diff -urNp linux-2.6.37.4/drivers/atm/fore200e.c linux-2.6.37.4/drivers/atm/fore200e.c
24333 +--- linux-2.6.37.4/drivers/atm/fore200e.c 2011-01-04 19:50:19.000000000 -0500
24334 ++++ linux-2.6.37.4/drivers/atm/fore200e.c 2011-01-17 02:41:01.000000000 -0500
24335 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
24336 #endif
24337 /* check error condition */
24338 @@ -22898,9 +23053,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/fore200e.c linux-2.6.37.3/drivers/atm/fore
24339
24340 fore200e->tx_sat++;
24341 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
24342 -diff -urNp linux-2.6.37.3/drivers/atm/he.c linux-2.6.37.3/drivers/atm/he.c
24343 ---- linux-2.6.37.3/drivers/atm/he.c 2011-01-04 19:50:19.000000000 -0500
24344 -+++ linux-2.6.37.3/drivers/atm/he.c 2011-01-17 02:41:01.000000000 -0500
24345 +diff -urNp linux-2.6.37.4/drivers/atm/he.c linux-2.6.37.4/drivers/atm/he.c
24346 +--- linux-2.6.37.4/drivers/atm/he.c 2011-01-04 19:50:19.000000000 -0500
24347 ++++ linux-2.6.37.4/drivers/atm/he.c 2011-01-17 02:41:01.000000000 -0500
24348 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
24349
24350 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
24351 @@ -22982,9 +23137,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/he.c linux-2.6.37.3/drivers/atm/he.c
24352
24353 return 0;
24354 }
24355 -diff -urNp linux-2.6.37.3/drivers/atm/horizon.c linux-2.6.37.3/drivers/atm/horizon.c
24356 ---- linux-2.6.37.3/drivers/atm/horizon.c 2011-01-04 19:50:19.000000000 -0500
24357 -+++ linux-2.6.37.3/drivers/atm/horizon.c 2011-01-17 02:41:01.000000000 -0500
24358 +diff -urNp linux-2.6.37.4/drivers/atm/horizon.c linux-2.6.37.4/drivers/atm/horizon.c
24359 +--- linux-2.6.37.4/drivers/atm/horizon.c 2011-01-04 19:50:19.000000000 -0500
24360 ++++ linux-2.6.37.4/drivers/atm/horizon.c 2011-01-17 02:41:01.000000000 -0500
24361 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,
24362 {
24363 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
24364 @@ -23003,9 +23158,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/horizon.c linux-2.6.37.3/drivers/atm/horiz
24365
24366 // free the skb
24367 hrz_kfree_skb (skb);
24368 -diff -urNp linux-2.6.37.3/drivers/atm/idt77252.c linux-2.6.37.3/drivers/atm/idt77252.c
24369 ---- linux-2.6.37.3/drivers/atm/idt77252.c 2011-01-04 19:50:19.000000000 -0500
24370 -+++ linux-2.6.37.3/drivers/atm/idt77252.c 2011-01-17 02:41:01.000000000 -0500
24371 +diff -urNp linux-2.6.37.4/drivers/atm/idt77252.c linux-2.6.37.4/drivers/atm/idt77252.c
24372 +--- linux-2.6.37.4/drivers/atm/idt77252.c 2011-01-04 19:50:19.000000000 -0500
24373 ++++ linux-2.6.37.4/drivers/atm/idt77252.c 2011-01-17 02:41:01.000000000 -0500
24374 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
24375 else
24376 dev_kfree_skb(skb);
24377 @@ -23160,9 +23315,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/idt77252.c linux-2.6.37.3/drivers/atm/idt7
24378 return -ENOMEM;
24379 }
24380 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
24381 -diff -urNp linux-2.6.37.3/drivers/atm/iphase.c linux-2.6.37.3/drivers/atm/iphase.c
24382 ---- linux-2.6.37.3/drivers/atm/iphase.c 2011-01-04 19:50:19.000000000 -0500
24383 -+++ linux-2.6.37.3/drivers/atm/iphase.c 2011-01-17 02:41:01.000000000 -0500
24384 +diff -urNp linux-2.6.37.4/drivers/atm/iphase.c linux-2.6.37.4/drivers/atm/iphase.c
24385 +--- linux-2.6.37.4/drivers/atm/iphase.c 2011-01-04 19:50:19.000000000 -0500
24386 ++++ linux-2.6.37.4/drivers/atm/iphase.c 2011-01-17 02:41:01.000000000 -0500
24387 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)
24388 status = (u_short) (buf_desc_ptr->desc_mode);
24389 if (status & (RX_CER | RX_PTE | RX_OFL))
24390 @@ -23259,9 +23414,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/iphase.c linux-2.6.37.3/drivers/atm/iphase
24391 if (iavcc->vc_desc_cnt > 10) {
24392 vcc->tx_quota = vcc->tx_quota * 3 / 4;
24393 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
24394 -diff -urNp linux-2.6.37.3/drivers/atm/lanai.c linux-2.6.37.3/drivers/atm/lanai.c
24395 ---- linux-2.6.37.3/drivers/atm/lanai.c 2011-01-04 19:50:19.000000000 -0500
24396 -+++ linux-2.6.37.3/drivers/atm/lanai.c 2011-01-17 02:41:01.000000000 -0500
24397 +diff -urNp linux-2.6.37.4/drivers/atm/lanai.c linux-2.6.37.4/drivers/atm/lanai.c
24398 +--- linux-2.6.37.4/drivers/atm/lanai.c 2011-01-04 19:50:19.000000000 -0500
24399 ++++ linux-2.6.37.4/drivers/atm/lanai.c 2011-01-17 02:41:01.000000000 -0500
24400 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
24401 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
24402 lanai_endtx(lanai, lvcc);
24403 @@ -23316,9 +23471,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/lanai.c linux-2.6.37.3/drivers/atm/lanai.c
24404 lvcc->stats.x.aal5.service_rxcrc++;
24405 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
24406 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
24407 -diff -urNp linux-2.6.37.3/drivers/atm/nicstar.c linux-2.6.37.3/drivers/atm/nicstar.c
24408 ---- linux-2.6.37.3/drivers/atm/nicstar.c 2011-01-04 19:50:19.000000000 -0500
24409 -+++ linux-2.6.37.3/drivers/atm/nicstar.c 2011-01-17 02:41:01.000000000 -0500
24410 +diff -urNp linux-2.6.37.4/drivers/atm/nicstar.c linux-2.6.37.4/drivers/atm/nicstar.c
24411 +--- linux-2.6.37.4/drivers/atm/nicstar.c 2011-01-04 19:50:19.000000000 -0500
24412 ++++ linux-2.6.37.4/drivers/atm/nicstar.c 2011-01-17 02:41:01.000000000 -0500
24413 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,
24414 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
24415 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
24416 @@ -23520,9 +23675,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/nicstar.c linux-2.6.37.3/drivers/atm/nicst
24417 }
24418 }
24419
24420 -diff -urNp linux-2.6.37.3/drivers/atm/solos-pci.c linux-2.6.37.3/drivers/atm/solos-pci.c
24421 ---- linux-2.6.37.3/drivers/atm/solos-pci.c 2011-01-04 19:50:19.000000000 -0500
24422 -+++ linux-2.6.37.3/drivers/atm/solos-pci.c 2011-01-17 02:41:01.000000000 -0500
24423 +diff -urNp linux-2.6.37.4/drivers/atm/solos-pci.c linux-2.6.37.4/drivers/atm/solos-pci.c
24424 +--- linux-2.6.37.4/drivers/atm/solos-pci.c 2011-01-04 19:50:19.000000000 -0500
24425 ++++ linux-2.6.37.4/drivers/atm/solos-pci.c 2011-01-17 02:41:01.000000000 -0500
24426 @@ -717,7 +717,7 @@ void solos_bh(unsigned long card_arg)
24427 }
24428 atm_charge(vcc, skb->truesize);
24429 @@ -23541,9 +23696,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/solos-pci.c linux-2.6.37.3/drivers/atm/sol
24430 solos_pop(vcc, oldskb);
24431 } else
24432 dev_kfree_skb_irq(oldskb);
24433 -diff -urNp linux-2.6.37.3/drivers/atm/suni.c linux-2.6.37.3/drivers/atm/suni.c
24434 ---- linux-2.6.37.3/drivers/atm/suni.c 2011-01-04 19:50:19.000000000 -0500
24435 -+++ linux-2.6.37.3/drivers/atm/suni.c 2011-01-17 02:41:01.000000000 -0500
24436 +diff -urNp linux-2.6.37.4/drivers/atm/suni.c linux-2.6.37.4/drivers/atm/suni.c
24437 +--- linux-2.6.37.4/drivers/atm/suni.c 2011-01-04 19:50:19.000000000 -0500
24438 ++++ linux-2.6.37.4/drivers/atm/suni.c 2011-01-17 02:41:01.000000000 -0500
24439 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
24440
24441
24442 @@ -23555,9 +23710,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/suni.c linux-2.6.37.3/drivers/atm/suni.c
24443
24444
24445 static void suni_hz(unsigned long from_timer)
24446 -diff -urNp linux-2.6.37.3/drivers/atm/uPD98402.c linux-2.6.37.3/drivers/atm/uPD98402.c
24447 ---- linux-2.6.37.3/drivers/atm/uPD98402.c 2011-01-04 19:50:19.000000000 -0500
24448 -+++ linux-2.6.37.3/drivers/atm/uPD98402.c 2011-01-17 02:41:01.000000000 -0500
24449 +diff -urNp linux-2.6.37.4/drivers/atm/uPD98402.c linux-2.6.37.4/drivers/atm/uPD98402.c
24450 +--- linux-2.6.37.4/drivers/atm/uPD98402.c 2011-01-04 19:50:19.000000000 -0500
24451 ++++ linux-2.6.37.4/drivers/atm/uPD98402.c 2011-01-17 02:41:01.000000000 -0500
24452 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
24453 struct sonet_stats tmp;
24454 int error = 0;
24455 @@ -23602,9 +23757,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/uPD98402.c linux-2.6.37.3/drivers/atm/uPD9
24456 return 0;
24457 }
24458
24459 -diff -urNp linux-2.6.37.3/drivers/atm/zatm.c linux-2.6.37.3/drivers/atm/zatm.c
24460 ---- linux-2.6.37.3/drivers/atm/zatm.c 2011-01-04 19:50:19.000000000 -0500
24461 -+++ linux-2.6.37.3/drivers/atm/zatm.c 2011-01-17 02:41:01.000000000 -0500
24462 +diff -urNp linux-2.6.37.4/drivers/atm/zatm.c linux-2.6.37.4/drivers/atm/zatm.c
24463 +--- linux-2.6.37.4/drivers/atm/zatm.c 2011-01-04 19:50:19.000000000 -0500
24464 ++++ linux-2.6.37.4/drivers/atm/zatm.c 2011-01-17 02:41:01.000000000 -0500
24465 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
24466 }
24467 if (!size) {
24468 @@ -23632,9 +23787,9 @@ diff -urNp linux-2.6.37.3/drivers/atm/zatm.c linux-2.6.37.3/drivers/atm/zatm.c
24469 wake_up(&zatm_vcc->tx_wait);
24470 }
24471
24472 -diff -urNp linux-2.6.37.3/drivers/block/cciss.c linux-2.6.37.3/drivers/block/cciss.c
24473 ---- linux-2.6.37.3/drivers/block/cciss.c 2011-01-04 19:50:19.000000000 -0500
24474 -+++ linux-2.6.37.3/drivers/block/cciss.c 2011-01-17 02:41:01.000000000 -0500
24475 +diff -urNp linux-2.6.37.4/drivers/block/cciss.c linux-2.6.37.4/drivers/block/cciss.c
24476 +--- linux-2.6.37.4/drivers/block/cciss.c 2011-01-04 19:50:19.000000000 -0500
24477 ++++ linux-2.6.37.4/drivers/block/cciss.c 2011-01-17 02:41:01.000000000 -0500
24478 @@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct
24479 int err;
24480 u32 cp;
24481 @@ -23644,9 +23799,9 @@ diff -urNp linux-2.6.37.3/drivers/block/cciss.c linux-2.6.37.3/drivers/block/cci
24482 err = 0;
24483 err |=
24484 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
24485 -diff -urNp linux-2.6.37.3/drivers/char/agp/frontend.c linux-2.6.37.3/drivers/char/agp/frontend.c
24486 ---- linux-2.6.37.3/drivers/char/agp/frontend.c 2011-01-04 19:50:19.000000000 -0500
24487 -+++ linux-2.6.37.3/drivers/char/agp/frontend.c 2011-01-17 02:41:01.000000000 -0500
24488 +diff -urNp linux-2.6.37.4/drivers/char/agp/frontend.c linux-2.6.37.4/drivers/char/agp/frontend.c
24489 +--- linux-2.6.37.4/drivers/char/agp/frontend.c 2011-01-04 19:50:19.000000000 -0500
24490 ++++ linux-2.6.37.4/drivers/char/agp/frontend.c 2011-01-17 02:41:01.000000000 -0500
24491 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
24492 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
24493 return -EFAULT;
24494 @@ -23656,9 +23811,9 @@ diff -urNp linux-2.6.37.3/drivers/char/agp/frontend.c linux-2.6.37.3/drivers/cha
24495 return -EFAULT;
24496
24497 client = agp_find_client_by_pid(reserve.pid);
24498 -diff -urNp linux-2.6.37.3/drivers/char/agp/intel-agp.c linux-2.6.37.3/drivers/char/agp/intel-agp.c
24499 ---- linux-2.6.37.3/drivers/char/agp/intel-agp.c 2011-02-22 16:05:30.000000000 -0500
24500 -+++ linux-2.6.37.3/drivers/char/agp/intel-agp.c 2011-02-22 16:05:42.000000000 -0500
24501 +diff -urNp linux-2.6.37.4/drivers/char/agp/intel-agp.c linux-2.6.37.4/drivers/char/agp/intel-agp.c
24502 +--- linux-2.6.37.4/drivers/char/agp/intel-agp.c 2011-02-22 16:05:30.000000000 -0500
24503 ++++ linux-2.6.37.4/drivers/char/agp/intel-agp.c 2011-02-22 16:05:42.000000000 -0500
24504 @@ -908,7 +908,7 @@ static struct pci_device_id agp_intel_pc
24505 ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
24506 ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
24507 @@ -23668,9 +23823,9 @@ diff -urNp linux-2.6.37.3/drivers/char/agp/intel-agp.c linux-2.6.37.3/drivers/ch
24508 };
24509
24510 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
24511 -diff -urNp linux-2.6.37.3/drivers/char/hpet.c linux-2.6.37.3/drivers/char/hpet.c
24512 ---- linux-2.6.37.3/drivers/char/hpet.c 2011-01-04 19:50:19.000000000 -0500
24513 -+++ linux-2.6.37.3/drivers/char/hpet.c 2011-01-17 02:41:01.000000000 -0500
24514 +diff -urNp linux-2.6.37.4/drivers/char/hpet.c linux-2.6.37.4/drivers/char/hpet.c
24515 +--- linux-2.6.37.4/drivers/char/hpet.c 2011-01-04 19:50:19.000000000 -0500
24516 ++++ linux-2.6.37.4/drivers/char/hpet.c 2011-01-17 02:41:01.000000000 -0500
24517 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di
24518 }
24519
24520 @@ -23689,9 +23844,9 @@ diff -urNp linux-2.6.37.3/drivers/char/hpet.c linux-2.6.37.3/drivers/char/hpet.c
24521
24522 static int __init hpet_init(void)
24523 {
24524 -diff -urNp linux-2.6.37.3/drivers/char/hvc_console.h linux-2.6.37.3/drivers/char/hvc_console.h
24525 ---- linux-2.6.37.3/drivers/char/hvc_console.h 2011-01-04 19:50:19.000000000 -0500
24526 -+++ linux-2.6.37.3/drivers/char/hvc_console.h 2011-01-17 02:41:01.000000000 -0500
24527 +diff -urNp linux-2.6.37.4/drivers/char/hvc_console.h linux-2.6.37.4/drivers/char/hvc_console.h
24528 +--- linux-2.6.37.4/drivers/char/hvc_console.h 2011-01-04 19:50:19.000000000 -0500
24529 ++++ linux-2.6.37.4/drivers/char/hvc_console.h 2011-01-17 02:41:01.000000000 -0500
24530 @@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter
24531 /* register a vterm for hvc tty operation (module_init or hotplug add) */
24532 extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
24533 @@ -23700,9 +23855,9 @@ diff -urNp linux-2.6.37.3/drivers/char/hvc_console.h linux-2.6.37.3/drivers/char
24534 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
24535 extern int hvc_remove(struct hvc_struct *hp);
24536
24537 -diff -urNp linux-2.6.37.3/drivers/char/hvcs.c linux-2.6.37.3/drivers/char/hvcs.c
24538 ---- linux-2.6.37.3/drivers/char/hvcs.c 2011-01-04 19:50:19.000000000 -0500
24539 -+++ linux-2.6.37.3/drivers/char/hvcs.c 2011-01-25 20:24:56.000000000 -0500
24540 +diff -urNp linux-2.6.37.4/drivers/char/hvcs.c linux-2.6.37.4/drivers/char/hvcs.c
24541 +--- linux-2.6.37.4/drivers/char/hvcs.c 2011-01-04 19:50:19.000000000 -0500
24542 ++++ linux-2.6.37.4/drivers/char/hvcs.c 2011-01-25 20:24:56.000000000 -0500
24543 @@ -83,6 +83,7 @@
24544 #include <asm/hvcserver.h>
24545 #include <asm/uaccess.h>
24546 @@ -23805,9 +23960,9 @@ diff -urNp linux-2.6.37.3/drivers/char/hvcs.c linux-2.6.37.3/drivers/char/hvcs.c
24547 return 0;
24548
24549 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
24550 -diff -urNp linux-2.6.37.3/drivers/char/hvc_xen.c linux-2.6.37.3/drivers/char/hvc_xen.c
24551 ---- linux-2.6.37.3/drivers/char/hvc_xen.c 2011-01-04 19:50:19.000000000 -0500
24552 -+++ linux-2.6.37.3/drivers/char/hvc_xen.c 2011-01-17 02:41:01.000000000 -0500
24553 +diff -urNp linux-2.6.37.4/drivers/char/hvc_xen.c linux-2.6.37.4/drivers/char/hvc_xen.c
24554 +--- linux-2.6.37.4/drivers/char/hvc_xen.c 2011-01-04 19:50:19.000000000 -0500
24555 ++++ linux-2.6.37.4/drivers/char/hvc_xen.c 2011-01-17 02:41:01.000000000 -0500
24556 @@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt
24557 return recv;
24558 }
24559 @@ -23844,9 +23999,9 @@ diff -urNp linux-2.6.37.3/drivers/char/hvc_xen.c linux-2.6.37.3/drivers/char/hvc
24560
24561 if (!xen_pv_domain())
24562 return 0;
24563 -diff -urNp linux-2.6.37.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.37.3/drivers/char/ipmi/ipmi_msghandler.c
24564 ---- linux-2.6.37.3/drivers/char/ipmi/ipmi_msghandler.c 2011-01-04 19:50:19.000000000 -0500
24565 -+++ linux-2.6.37.3/drivers/char/ipmi/ipmi_msghandler.c 2011-01-17 02:41:01.000000000 -0500
24566 +diff -urNp linux-2.6.37.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.37.4/drivers/char/ipmi/ipmi_msghandler.c
24567 +--- linux-2.6.37.4/drivers/char/ipmi/ipmi_msghandler.c 2011-01-04 19:50:19.000000000 -0500
24568 ++++ linux-2.6.37.4/drivers/char/ipmi/ipmi_msghandler.c 2011-01-17 02:41:01.000000000 -0500
24569 @@ -414,7 +414,7 @@ struct ipmi_smi {
24570 struct proc_dir_entry *proc_dir;
24571 char proc_dir_name[10];
24572 @@ -23877,9 +24032,9 @@ diff -urNp linux-2.6.37.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.37.3/dri
24573
24574 intf->proc_dir = NULL;
24575
24576 -diff -urNp linux-2.6.37.3/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37.3/drivers/char/ipmi/ipmi_si_intf.c
24577 ---- linux-2.6.37.3/drivers/char/ipmi/ipmi_si_intf.c 2011-02-22 16:05:30.000000000 -0500
24578 -+++ linux-2.6.37.3/drivers/char/ipmi/ipmi_si_intf.c 2011-02-22 16:05:42.000000000 -0500
24579 +diff -urNp linux-2.6.37.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37.4/drivers/char/ipmi/ipmi_si_intf.c
24580 +--- linux-2.6.37.4/drivers/char/ipmi/ipmi_si_intf.c 2011-02-22 16:05:30.000000000 -0500
24581 ++++ linux-2.6.37.4/drivers/char/ipmi/ipmi_si_intf.c 2011-02-22 16:05:42.000000000 -0500
24582 @@ -286,7 +286,7 @@ struct smi_info {
24583 unsigned char slave_addr;
24584
24585 @@ -23910,9 +24065,9 @@ diff -urNp linux-2.6.37.3/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37.3/driver
24586
24587 new_smi->interrupt_disabled = 1;
24588 atomic_set(&new_smi->stop_operation, 0);
24589 -diff -urNp linux-2.6.37.3/drivers/char/mem.c linux-2.6.37.3/drivers/char/mem.c
24590 ---- linux-2.6.37.3/drivers/char/mem.c 2011-01-04 19:50:19.000000000 -0500
24591 -+++ linux-2.6.37.3/drivers/char/mem.c 2011-01-17 02:41:01.000000000 -0500
24592 +diff -urNp linux-2.6.37.4/drivers/char/mem.c linux-2.6.37.4/drivers/char/mem.c
24593 +--- linux-2.6.37.4/drivers/char/mem.c 2011-01-04 19:50:19.000000000 -0500
24594 ++++ linux-2.6.37.4/drivers/char/mem.c 2011-01-17 02:41:01.000000000 -0500
24595 @@ -18,6 +18,7 @@
24596 #include <linux/raw.h>
24597 #include <linux/tty.h>
24598 @@ -24080,9 +24235,9 @@ diff -urNp linux-2.6.37.3/drivers/char/mem.c linux-2.6.37.3/drivers/char/mem.c
24599 };
24600
24601 static int memory_open(struct inode *inode, struct file *filp)
24602 -diff -urNp linux-2.6.37.3/drivers/char/nvram.c linux-2.6.37.3/drivers/char/nvram.c
24603 ---- linux-2.6.37.3/drivers/char/nvram.c 2011-01-04 19:50:19.000000000 -0500
24604 -+++ linux-2.6.37.3/drivers/char/nvram.c 2011-01-17 02:41:01.000000000 -0500
24605 +diff -urNp linux-2.6.37.4/drivers/char/nvram.c linux-2.6.37.4/drivers/char/nvram.c
24606 +--- linux-2.6.37.4/drivers/char/nvram.c 2011-01-04 19:50:19.000000000 -0500
24607 ++++ linux-2.6.37.4/drivers/char/nvram.c 2011-01-17 02:41:01.000000000 -0500
24608 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
24609
24610 spin_unlock_irq(&rtc_lock);
24611 @@ -24104,9 +24259,9 @@ diff -urNp linux-2.6.37.3/drivers/char/nvram.c linux-2.6.37.3/drivers/char/nvram
24612 };
24613
24614 static int __init nvram_init(void)
24615 -diff -urNp linux-2.6.37.3/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37.3/drivers/char/pcmcia/ipwireless/tty.c
24616 ---- linux-2.6.37.3/drivers/char/pcmcia/ipwireless/tty.c 2011-01-04 19:50:19.000000000 -0500
24617 -+++ linux-2.6.37.3/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:56.000000000 -0500
24618 +diff -urNp linux-2.6.37.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37.4/drivers/char/pcmcia/ipwireless/tty.c
24619 +--- linux-2.6.37.4/drivers/char/pcmcia/ipwireless/tty.c 2011-01-04 19:50:19.000000000 -0500
24620 ++++ linux-2.6.37.4/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:56.000000000 -0500
24621 @@ -29,6 +29,7 @@
24622 #include <linux/tty_driver.h>
24623 #include <linux/tty_flip.h>
24624 @@ -24229,9 +24384,9 @@ diff -urNp linux-2.6.37.3/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37.3/dr
24625 do_ipw_close(ttyj);
24626 ipwireless_disassociate_network_ttys(network,
24627 ttyj->channel_idx);
24628 -diff -urNp linux-2.6.37.3/drivers/char/random.c linux-2.6.37.3/drivers/char/random.c
24629 ---- linux-2.6.37.3/drivers/char/random.c 2011-01-04 19:50:19.000000000 -0500
24630 -+++ linux-2.6.37.3/drivers/char/random.c 2011-01-17 02:41:01.000000000 -0500
24631 +diff -urNp linux-2.6.37.4/drivers/char/random.c linux-2.6.37.4/drivers/char/random.c
24632 +--- linux-2.6.37.4/drivers/char/random.c 2011-01-04 19:50:19.000000000 -0500
24633 ++++ linux-2.6.37.4/drivers/char/random.c 2011-01-17 02:41:01.000000000 -0500
24634 @@ -254,8 +254,13 @@
24635 /*
24636 * Configuration information
24637 @@ -24282,9 +24437,9 @@ diff -urNp linux-2.6.37.3/drivers/char/random.c linux-2.6.37.3/drivers/char/rand
24638 static int max_write_thresh = INPUT_POOL_WORDS * 32;
24639 static char sysctl_bootid[16];
24640
24641 -diff -urNp linux-2.6.37.3/drivers/char/sonypi.c linux-2.6.37.3/drivers/char/sonypi.c
24642 ---- linux-2.6.37.3/drivers/char/sonypi.c 2011-01-04 19:50:19.000000000 -0500
24643 -+++ linux-2.6.37.3/drivers/char/sonypi.c 2011-01-25 20:24:56.000000000 -0500
24644 +diff -urNp linux-2.6.37.4/drivers/char/sonypi.c linux-2.6.37.4/drivers/char/sonypi.c
24645 +--- linux-2.6.37.4/drivers/char/sonypi.c 2011-01-04 19:50:19.000000000 -0500
24646 ++++ linux-2.6.37.4/drivers/char/sonypi.c 2011-01-25 20:24:56.000000000 -0500
24647 @@ -55,6 +55,7 @@
24648 #include <asm/uaccess.h>
24649 #include <asm/io.h>
24650 @@ -24323,9 +24478,9 @@ diff -urNp linux-2.6.37.3/drivers/char/sonypi.c linux-2.6.37.3/drivers/char/sony
24651 mutex_unlock(&sonypi_device.lock);
24652
24653 return 0;
24654 -diff -urNp linux-2.6.37.3/drivers/char/tpm/tpm_bios.c linux-2.6.37.3/drivers/char/tpm/tpm_bios.c
24655 ---- linux-2.6.37.3/drivers/char/tpm/tpm_bios.c 2011-01-04 19:50:19.000000000 -0500
24656 -+++ linux-2.6.37.3/drivers/char/tpm/tpm_bios.c 2011-01-17 02:41:01.000000000 -0500
24657 +diff -urNp linux-2.6.37.4/drivers/char/tpm/tpm_bios.c linux-2.6.37.4/drivers/char/tpm/tpm_bios.c
24658 +--- linux-2.6.37.4/drivers/char/tpm/tpm_bios.c 2011-01-04 19:50:19.000000000 -0500
24659 ++++ linux-2.6.37.4/drivers/char/tpm/tpm_bios.c 2011-01-17 02:41:01.000000000 -0500
24660 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
24661 event = addr;
24662
24663 @@ -24366,9 +24521,21 @@ diff -urNp linux-2.6.37.3/drivers/char/tpm/tpm_bios.c linux-2.6.37.3/drivers/cha
24664
24665 memcpy(log->bios_event_log, virt, len);
24666
24667 -diff -urNp linux-2.6.37.3/drivers/cpuidle/sysfs.c linux-2.6.37.3/drivers/cpuidle/sysfs.c
24668 ---- linux-2.6.37.3/drivers/cpuidle/sysfs.c 2011-01-04 19:50:19.000000000 -0500
24669 -+++ linux-2.6.37.3/drivers/cpuidle/sysfs.c 2011-01-17 02:41:01.000000000 -0500
24670 +diff -urNp linux-2.6.37.4/drivers/char/tpm/tpm.c linux-2.6.37.4/drivers/char/tpm/tpm.c
24671 +--- linux-2.6.37.4/drivers/char/tpm/tpm.c 2011-02-27 14:49:17.000000000 -0500
24672 ++++ linux-2.6.37.4/drivers/char/tpm/tpm.c 2011-03-21 17:16:23.000000000 -0400
24673 +@@ -413,7 +413,7 @@ static ssize_t tpm_transmit(struct tpm_c
24674 + chip->vendor.req_complete_val)
24675 + goto out_recv;
24676 +
24677 +- if ((status == chip->vendor.req_canceled)) {
24678 ++ if (status == chip->vendor.req_canceled) {
24679 + dev_err(chip->dev, "Operation Canceled\n");
24680 + rc = -ECANCELED;
24681 + goto out;
24682 +diff -urNp linux-2.6.37.4/drivers/cpuidle/sysfs.c linux-2.6.37.4/drivers/cpuidle/sysfs.c
24683 +--- linux-2.6.37.4/drivers/cpuidle/sysfs.c 2011-01-04 19:50:19.000000000 -0500
24684 ++++ linux-2.6.37.4/drivers/cpuidle/sysfs.c 2011-01-17 02:41:01.000000000 -0500
24685 @@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
24686 .release = cpuidle_state_sysfs_release,
24687 };
24688 @@ -24378,9 +24545,9 @@ diff -urNp linux-2.6.37.3/drivers/cpuidle/sysfs.c linux-2.6.37.3/drivers/cpuidle
24689 {
24690 kobject_put(&device->kobjs[i]->kobj);
24691 wait_for_completion(&device->kobjs[i]->kobj_unregister);
24692 -diff -urNp linux-2.6.37.3/drivers/edac/edac_core.h linux-2.6.37.3/drivers/edac/edac_core.h
24693 ---- linux-2.6.37.3/drivers/edac/edac_core.h 2011-01-04 19:50:19.000000000 -0500
24694 -+++ linux-2.6.37.3/drivers/edac/edac_core.h 2011-01-17 02:41:01.000000000 -0500
24695 +diff -urNp linux-2.6.37.4/drivers/edac/edac_core.h linux-2.6.37.4/drivers/edac/edac_core.h
24696 +--- linux-2.6.37.4/drivers/edac/edac_core.h 2011-01-04 19:50:19.000000000 -0500
24697 ++++ linux-2.6.37.4/drivers/edac/edac_core.h 2011-01-17 02:41:01.000000000 -0500
24698 @@ -87,11 +87,11 @@ extern const char *edac_mem_types[];
24699
24700 #else /* !CONFIG_EDAC_DEBUG */
24701 @@ -24398,9 +24565,9 @@ diff -urNp linux-2.6.37.3/drivers/edac/edac_core.h linux-2.6.37.3/drivers/edac/e
24702
24703 #endif /* !CONFIG_EDAC_DEBUG */
24704
24705 -diff -urNp linux-2.6.37.3/drivers/edac/edac_mc_sysfs.c linux-2.6.37.3/drivers/edac/edac_mc_sysfs.c
24706 ---- linux-2.6.37.3/drivers/edac/edac_mc_sysfs.c 2011-01-04 19:50:19.000000000 -0500
24707 -+++ linux-2.6.37.3/drivers/edac/edac_mc_sysfs.c 2011-01-17 02:41:01.000000000 -0500
24708 +diff -urNp linux-2.6.37.4/drivers/edac/edac_mc_sysfs.c linux-2.6.37.4/drivers/edac/edac_mc_sysfs.c
24709 +--- linux-2.6.37.4/drivers/edac/edac_mc_sysfs.c 2011-01-04 19:50:19.000000000 -0500
24710 ++++ linux-2.6.37.4/drivers/edac/edac_mc_sysfs.c 2011-01-17 02:41:01.000000000 -0500
24711 @@ -762,7 +762,7 @@ static void edac_inst_grp_release(struct
24712 }
24713
24714 @@ -24410,9 +24577,9 @@ diff -urNp linux-2.6.37.3/drivers/edac/edac_mc_sysfs.c linux-2.6.37.3/drivers/ed
24715 .show = inst_grp_show,
24716 .store = inst_grp_store
24717 };
24718 -diff -urNp linux-2.6.37.3/drivers/firewire/core-cdev.c linux-2.6.37.3/drivers/firewire/core-cdev.c
24719 ---- linux-2.6.37.3/drivers/firewire/core-cdev.c 2011-01-04 19:50:19.000000000 -0500
24720 -+++ linux-2.6.37.3/drivers/firewire/core-cdev.c 2011-01-17 02:41:01.000000000 -0500
24721 +diff -urNp linux-2.6.37.4/drivers/firewire/core-cdev.c linux-2.6.37.4/drivers/firewire/core-cdev.c
24722 +--- linux-2.6.37.4/drivers/firewire/core-cdev.c 2011-01-04 19:50:19.000000000 -0500
24723 ++++ linux-2.6.37.4/drivers/firewire/core-cdev.c 2011-01-17 02:41:01.000000000 -0500
24724 @@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie
24725 int ret;
24726
24727 @@ -24423,9 +24590,9 @@ diff -urNp linux-2.6.37.3/drivers/firewire/core-cdev.c linux-2.6.37.3/drivers/fi
24728 return -EINVAL;
24729
24730 r = kmalloc(sizeof(*r), GFP_KERNEL);
24731 -diff -urNp linux-2.6.37.3/drivers/firmware/dmi_scan.c linux-2.6.37.3/drivers/firmware/dmi_scan.c
24732 ---- linux-2.6.37.3/drivers/firmware/dmi_scan.c 2011-02-22 16:05:30.000000000 -0500
24733 -+++ linux-2.6.37.3/drivers/firmware/dmi_scan.c 2011-02-22 16:05:42.000000000 -0500
24734 +diff -urNp linux-2.6.37.4/drivers/firmware/dmi_scan.c linux-2.6.37.4/drivers/firmware/dmi_scan.c
24735 +--- linux-2.6.37.4/drivers/firmware/dmi_scan.c 2011-02-22 16:05:30.000000000 -0500
24736 ++++ linux-2.6.37.4/drivers/firmware/dmi_scan.c 2011-02-22 16:05:42.000000000 -0500
24737 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
24738 }
24739 }
24740 @@ -24438,9 +24605,9 @@ diff -urNp linux-2.6.37.3/drivers/firmware/dmi_scan.c linux-2.6.37.3/drivers/fir
24741 p = dmi_ioremap(0xF0000, 0x10000);
24742 if (p == NULL)
24743 goto error;
24744 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.37.3/drivers/gpu/drm/drm_crtc_helper.c
24745 ---- linux-2.6.37.3/drivers/gpu/drm/drm_crtc_helper.c 2011-02-22 16:05:30.000000000 -0500
24746 -+++ linux-2.6.37.3/drivers/gpu/drm/drm_crtc_helper.c 2011-02-22 16:05:42.000000000 -0500
24747 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.37.4/drivers/gpu/drm/drm_crtc_helper.c
24748 +--- linux-2.6.37.4/drivers/gpu/drm/drm_crtc_helper.c 2011-02-22 16:05:30.000000000 -0500
24749 ++++ linux-2.6.37.4/drivers/gpu/drm/drm_crtc_helper.c 2011-02-22 16:05:42.000000000 -0500
24750 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
24751 struct drm_crtc *tmp;
24752 int crtc_mask = 1;
24753 @@ -24450,9 +24617,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.37.3/drive
24754
24755 dev = crtc->dev;
24756
24757 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_drv.c linux-2.6.37.3/drivers/gpu/drm/drm_drv.c
24758 ---- linux-2.6.37.3/drivers/gpu/drm/drm_drv.c 2011-01-04 19:50:19.000000000 -0500
24759 -+++ linux-2.6.37.3/drivers/gpu/drm/drm_drv.c 2011-01-17 02:41:01.000000000 -0500
24760 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/drm_drv.c linux-2.6.37.4/drivers/gpu/drm/drm_drv.c
24761 +--- linux-2.6.37.4/drivers/gpu/drm/drm_drv.c 2011-01-04 19:50:19.000000000 -0500
24762 ++++ linux-2.6.37.4/drivers/gpu/drm/drm_drv.c 2011-01-17 02:41:01.000000000 -0500
24763 @@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp,
24764
24765 dev = file_priv->minor->dev;
24766 @@ -24462,9 +24629,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_drv.c linux-2.6.37.3/drivers/gpu/d
24767 ++file_priv->ioctl_count;
24768
24769 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
24770 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_fops.c linux-2.6.37.3/drivers/gpu/drm/drm_fops.c
24771 ---- linux-2.6.37.3/drivers/gpu/drm/drm_fops.c 2011-01-04 19:50:19.000000000 -0500
24772 -+++ linux-2.6.37.3/drivers/gpu/drm/drm_fops.c 2011-01-24 18:04:15.000000000 -0500
24773 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/drm_fops.c linux-2.6.37.4/drivers/gpu/drm/drm_fops.c
24774 +--- linux-2.6.37.4/drivers/gpu/drm/drm_fops.c 2011-01-04 19:50:19.000000000 -0500
24775 ++++ linux-2.6.37.4/drivers/gpu/drm/drm_fops.c 2011-01-24 18:04:15.000000000 -0500
24776 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
24777 }
24778
24779 @@ -24514,9 +24681,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_fops.c linux-2.6.37.3/drivers/gpu/
24780 if (atomic_read(&dev->ioctl_count)) {
24781 DRM_ERROR("Device busy: %d\n",
24782 atomic_read(&dev->ioctl_count));
24783 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_global.c linux-2.6.37.3/drivers/gpu/drm/drm_global.c
24784 ---- linux-2.6.37.3/drivers/gpu/drm/drm_global.c 2011-01-04 19:50:19.000000000 -0500
24785 -+++ linux-2.6.37.3/drivers/gpu/drm/drm_global.c 2011-01-17 02:41:01.000000000 -0500
24786 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/drm_global.c linux-2.6.37.4/drivers/gpu/drm/drm_global.c
24787 +--- linux-2.6.37.4/drivers/gpu/drm/drm_global.c 2011-01-04 19:50:19.000000000 -0500
24788 ++++ linux-2.6.37.4/drivers/gpu/drm/drm_global.c 2011-01-17 02:41:01.000000000 -0500
24789 @@ -36,7 +36,7 @@
24790 struct drm_global_item {
24791 struct mutex mutex;
24792 @@ -24574,9 +24741,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_global.c linux-2.6.37.3/drivers/gp
24793 ref->release(ref);
24794 item->object = NULL;
24795 }
24796 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_info.c linux-2.6.37.3/drivers/gpu/drm/drm_info.c
24797 ---- linux-2.6.37.3/drivers/gpu/drm/drm_info.c 2011-01-04 19:50:19.000000000 -0500
24798 -+++ linux-2.6.37.3/drivers/gpu/drm/drm_info.c 2011-03-12 19:51:43.000000000 -0500
24799 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/drm_info.c linux-2.6.37.4/drivers/gpu/drm/drm_info.c
24800 +--- linux-2.6.37.4/drivers/gpu/drm/drm_info.c 2011-01-04 19:50:19.000000000 -0500
24801 ++++ linux-2.6.37.4/drivers/gpu/drm/drm_info.c 2011-03-12 19:51:43.000000000 -0500
24802 @@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
24803 struct drm_local_map *map;
24804 struct drm_map_list *r_list;
24805 @@ -24642,9 +24809,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_info.c linux-2.6.37.3/drivers/gpu/
24806
24807 #if defined(__i386__)
24808 pgprot = pgprot_val(vma->vm_page_prot);
24809 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c
24810 ---- linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c 2011-01-04 19:50:19.000000000 -0500
24811 -+++ linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c 2011-01-17 02:41:01.000000000 -0500
24812 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.37.4/drivers/gpu/drm/drm_ioctl.c
24813 +--- linux-2.6.37.4/drivers/gpu/drm/drm_ioctl.c 2011-01-04 19:50:19.000000000 -0500
24814 ++++ linux-2.6.37.4/drivers/gpu/drm/drm_ioctl.c 2011-01-17 02:41:01.000000000 -0500
24815 @@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev,
24816 stats->data[i].value =
24817 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
24818 @@ -24654,9 +24821,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.37.3/drivers/gpu
24819 stats->data[i].type = dev->types[i];
24820 }
24821
24822 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_lock.c linux-2.6.37.3/drivers/gpu/drm/drm_lock.c
24823 ---- linux-2.6.37.3/drivers/gpu/drm/drm_lock.c 2011-01-04 19:50:19.000000000 -0500
24824 -+++ linux-2.6.37.3/drivers/gpu/drm/drm_lock.c 2011-01-17 02:41:01.000000000 -0500
24825 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/drm_lock.c linux-2.6.37.4/drivers/gpu/drm/drm_lock.c
24826 +--- linux-2.6.37.4/drivers/gpu/drm/drm_lock.c 2011-01-04 19:50:19.000000000 -0500
24827 ++++ linux-2.6.37.4/drivers/gpu/drm/drm_lock.c 2011-01-17 02:41:01.000000000 -0500
24828 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
24829 if (drm_lock_take(&master->lock, lock->context)) {
24830 master->lock.file_priv = file_priv;
24831 @@ -24675,9 +24842,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_lock.c linux-2.6.37.3/drivers/gpu/
24832
24833 if (drm_lock_free(&master->lock, lock->context)) {
24834 /* FIXME: Should really bail out here. */
24835 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i810/i810_dma.c linux-2.6.37.3/drivers/gpu/drm/i810/i810_dma.c
24836 ---- linux-2.6.37.3/drivers/gpu/drm/i810/i810_dma.c 2011-01-04 19:50:19.000000000 -0500
24837 -+++ linux-2.6.37.3/drivers/gpu/drm/i810/i810_dma.c 2011-01-17 02:41:01.000000000 -0500
24838 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.37.4/drivers/gpu/drm/i810/i810_dma.c
24839 +--- linux-2.6.37.4/drivers/gpu/drm/i810/i810_dma.c 2011-01-04 19:50:19.000000000 -0500
24840 ++++ linux-2.6.37.4/drivers/gpu/drm/i810/i810_dma.c 2011-01-17 02:41:01.000000000 -0500
24841 @@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
24842 dma->buflist[vertex->idx],
24843 vertex->discard, vertex->used);
24844 @@ -24700,9 +24867,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i810/i810_dma.c linux-2.6.37.3/drivers
24845 sarea_priv->last_enqueue = dev_priv->counter - 1;
24846 sarea_priv->last_dispatch = (int)hw_status[5];
24847
24848 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7017.c
24849 ---- linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-04 19:50:19.000000000 -0500
24850 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-17 02:41:01.000000000 -0500
24851 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7017.c
24852 +--- linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-04 19:50:19.000000000 -0500
24853 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-17 02:41:01.000000000 -0500
24854 @@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_
24855 }
24856 }
24857 @@ -24712,9 +24879,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.37.3/drive
24858 .init = ch7017_init,
24859 .detect = ch7017_detect,
24860 .mode_valid = ch7017_mode_valid,
24861 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7xxx.c
24862 ---- linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-04 19:50:19.000000000 -0500
24863 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-17 02:41:01.000000000 -0500
24864 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7xxx.c
24865 +--- linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-04 19:50:19.000000000 -0500
24866 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-17 02:41:01.000000000 -0500
24867 @@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_
24868 }
24869 }
24870 @@ -24724,9 +24891,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.37.3/drive
24871 .init = ch7xxx_init,
24872 .detect = ch7xxx_detect,
24873 .mode_valid = ch7xxx_mode_valid,
24874 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo.h linux-2.6.37.3/drivers/gpu/drm/i915/dvo.h
24875 ---- linux-2.6.37.3/drivers/gpu/drm/i915/dvo.h 2011-01-04 19:50:19.000000000 -0500
24876 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/dvo.h 2011-01-17 02:41:01.000000000 -0500
24877 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/dvo.h linux-2.6.37.4/drivers/gpu/drm/i915/dvo.h
24878 +--- linux-2.6.37.4/drivers/gpu/drm/i915/dvo.h 2011-01-04 19:50:19.000000000 -0500
24879 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/dvo.h 2011-01-17 02:41:01.000000000 -0500
24880 @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops {
24881 *
24882 * \return singly-linked list of modes or NULL if no modes found.
24883 @@ -24759,9 +24926,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo.h linux-2.6.37.3/drivers/gpu/
24884 +extern const struct intel_dvo_dev_ops ch7017_ops;
24885
24886 #endif /* _INTEL_DVO_H */
24887 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ivch.c
24888 ---- linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-04 19:50:19.000000000 -0500
24889 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-17 02:41:01.000000000 -0500
24890 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ivch.c
24891 +--- linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-04 19:50:19.000000000 -0500
24892 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-17 02:41:01.000000000 -0500
24893 @@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv
24894 }
24895 }
24896 @@ -24771,9 +24938,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.37.3/drivers
24897 .init = ivch_init,
24898 .dpms = ivch_dpms,
24899 .mode_valid = ivch_mode_valid,
24900 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.37.3/drivers/gpu/drm/i915/dvo_sil164.c
24901 ---- linux-2.6.37.3/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-04 19:50:19.000000000 -0500
24902 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-17 02:41:01.000000000 -0500
24903 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.37.4/drivers/gpu/drm/i915/dvo_sil164.c
24904 +--- linux-2.6.37.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-04 19:50:19.000000000 -0500
24905 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-17 02:41:01.000000000 -0500
24906 @@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_
24907 }
24908 }
24909 @@ -24783,9 +24950,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.37.3/drive
24910 .init = sil164_init,
24911 .detect = sil164_detect,
24912 .mode_valid = sil164_mode_valid,
24913 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.37.3/drivers/gpu/drm/i915/dvo_tfp410.c
24914 ---- linux-2.6.37.3/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-04 19:50:19.000000000 -0500
24915 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-17 02:41:01.000000000 -0500
24916 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.37.4/drivers/gpu/drm/i915/dvo_tfp410.c
24917 +--- linux-2.6.37.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-04 19:50:19.000000000 -0500
24918 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-17 02:41:01.000000000 -0500
24919 @@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_
24920 }
24921 }
24922 @@ -24795,9 +24962,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.37.3/drive
24923 .init = tfp410_init,
24924 .detect = tfp410_detect,
24925 .mode_valid = tfp410_mode_valid,
24926 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/i915_dma.c linux-2.6.37.3/drivers/gpu/drm/i915/i915_dma.c
24927 ---- linux-2.6.37.3/drivers/gpu/drm/i915/i915_dma.c 2011-03-11 17:22:42.000000000 -0500
24928 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/i915_dma.c 2011-03-11 17:23:03.000000000 -0500
24929 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.37.4/drivers/gpu/drm/i915/i915_dma.c
24930 +--- linux-2.6.37.4/drivers/gpu/drm/i915/i915_dma.c 2011-03-11 17:22:42.000000000 -0500
24931 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/i915_dma.c 2011-03-11 17:23:03.000000000 -0500
24932 @@ -1191,7 +1191,7 @@ static bool i915_switcheroo_can_switch(s
24933 bool can_switch;
24934
24935 @@ -24807,9 +24974,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/i915_dma.c linux-2.6.37.3/drivers
24936 spin_unlock(&dev->count_lock);
24937 return can_switch;
24938 }
24939 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/i915_drv.c linux-2.6.37.3/drivers/gpu/drm/i915/i915_drv.c
24940 ---- linux-2.6.37.3/drivers/gpu/drm/i915/i915_drv.c 2011-02-22 16:05:30.000000000 -0500
24941 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/i915_drv.c 2011-02-22 16:05:42.000000000 -0500
24942 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.37.4/drivers/gpu/drm/i915/i915_drv.c
24943 +--- linux-2.6.37.4/drivers/gpu/drm/i915/i915_drv.c 2011-02-22 16:05:30.000000000 -0500
24944 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/i915_drv.c 2011-02-22 16:05:42.000000000 -0500
24945 @@ -587,7 +587,7 @@ static const struct dev_pm_ops i915_pm_o
24946 .restore = i915_pm_resume,
24947 };
24948 @@ -24819,9 +24986,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/i915_drv.c linux-2.6.37.3/drivers
24949 .fault = i915_gem_fault,
24950 .open = drm_gem_vm_open,
24951 .close = drm_gem_vm_close,
24952 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/i915_gem.c linux-2.6.37.3/drivers/gpu/drm/i915/i915_gem.c
24953 ---- linux-2.6.37.3/drivers/gpu/drm/i915/i915_gem.c 2011-01-04 19:50:19.000000000 -0500
24954 -+++ linux-2.6.37.3/drivers/gpu/drm/i915/i915_gem.c 2011-01-17 02:41:01.000000000 -0500
24955 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/i915/i915_gem.c linux-2.6.37.4/drivers/gpu/drm/i915/i915_gem.c
24956 +--- linux-2.6.37.4/drivers/gpu/drm/i915/i915_gem.c 2011-01-04 19:50:19.000000000 -0500
24957 ++++ linux-2.6.37.4/drivers/gpu/drm/i915/i915_gem.c 2011-01-17 02:41:01.000000000 -0500
24958 @@ -587,6 +587,7 @@ i915_gem_pread_ioctl(struct drm_device *
24959 goto out_put;
24960
24961 @@ -24830,9 +24997,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/i915/i915_gem.c linux-2.6.37.3/drivers
24962 if (!i915_gem_object_needs_bit17_swizzle(obj))
24963 ret = i915_gem_shmem_pread_fast(dev, obj, args, file_priv);
24964 if (ret == -EFAULT)
24965 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_backlight.c
24966 ---- linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-04 19:50:19.000000000 -0500
24967 -+++ linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-17 02:41:01.000000000 -0500
24968 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_backlight.c
24969 +--- linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-04 19:50:19.000000000 -0500
24970 ++++ linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-17 02:41:01.000000000 -0500
24971 @@ -59,7 +59,7 @@ static int nv40_set_intensity(struct bac
24972 return 0;
24973 }
24974 @@ -24851,9 +25018,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.
24975 .options = BL_CORE_SUSPENDRESUME,
24976 .get_brightness = nv50_get_intensity,
24977 .update_status = nv50_set_intensity,
24978 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_state.c
24979 ---- linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-04 19:50:19.000000000 -0500
24980 -+++ linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-24 18:04:15.000000000 -0500
24981 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_state.c
24982 +--- linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-04 19:50:19.000000000 -0500
24983 ++++ linux-2.6.37.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-24 18:04:15.000000000 -0500
24984 @@ -546,7 +546,7 @@ static bool nouveau_switcheroo_can_switc
24985 bool can_switch;
24986
24987 @@ -24863,9 +25030,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.37.3
24988 spin_unlock(&dev->count_lock);
24989 return can_switch;
24990 }
24991 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.37.3/drivers/gpu/drm/radeon/mkregtable.c
24992 ---- linux-2.6.37.3/drivers/gpu/drm/radeon/mkregtable.c 2011-01-04 19:50:19.000000000 -0500
24993 -+++ linux-2.6.37.3/drivers/gpu/drm/radeon/mkregtable.c 2011-01-17 02:41:01.000000000 -0500
24994 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.37.4/drivers/gpu/drm/radeon/mkregtable.c
24995 +--- linux-2.6.37.4/drivers/gpu/drm/radeon/mkregtable.c 2011-01-04 19:50:19.000000000 -0500
24996 ++++ linux-2.6.37.4/drivers/gpu/drm/radeon/mkregtable.c 2011-01-17 02:41:01.000000000 -0500
24997 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
24998 regex_t mask_rex;
24999 regmatch_t match[4];
25000 @@ -24883,9 +25050,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.37.3/dri
25001
25002 if (regcomp
25003 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
25004 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_device.c
25005 ---- linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_device.c 2011-01-04 19:50:19.000000000 -0500
25006 -+++ linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_device.c 2011-01-24 18:04:15.000000000 -0500
25007 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_device.c
25008 +--- linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_device.c 2011-01-04 19:50:19.000000000 -0500
25009 ++++ linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_device.c 2011-01-24 18:04:15.000000000 -0500
25010 @@ -659,7 +659,7 @@ static bool radeon_switcheroo_can_switch
25011 bool can_switch;
25012
25013 @@ -24895,9 +25062,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.37.3/
25014 spin_unlock(&dev->count_lock);
25015 return can_switch;
25016 }
25017 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_state.c
25018 ---- linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_state.c 2011-01-04 19:50:19.000000000 -0500
25019 -+++ linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_state.c 2011-01-17 02:41:01.000000000 -0500
25020 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_state.c
25021 +--- linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_state.c 2011-01-04 19:50:19.000000000 -0500
25022 ++++ linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_state.c 2011-01-17 02:41:01.000000000 -0500
25023 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
25024 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
25025 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
25026 @@ -24916,9 +25083,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.37.3/d
25027
25028 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
25029
25030 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_ttm.c
25031 ---- linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-02-27 14:49:17.000000000 -0500
25032 -+++ linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-02-27 14:49:45.000000000 -0500
25033 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_ttm.c
25034 +--- linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-02-27 14:49:17.000000000 -0500
25035 ++++ linux-2.6.37.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-02-27 14:49:45.000000000 -0500
25036 @@ -589,8 +589,9 @@ void radeon_ttm_fini(struct radeon_devic
25037 DRM_INFO("radeon: ttm finalized\n");
25038 }
25039 @@ -24979,9 +25146,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.37.3/dri
25040 vma->vm_ops = &radeon_ttm_vm_ops;
25041 return 0;
25042 }
25043 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo.c
25044 ---- linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-04 19:50:19.000000000 -0500
25045 -+++ linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-17 02:41:01.000000000 -0500
25046 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo.c
25047 +--- linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-04 19:50:19.000000000 -0500
25048 ++++ linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-17 02:41:01.000000000 -0500
25049 @@ -40,7 +40,7 @@
25050 #include <asm/atomic.h>
25051
25052 @@ -24991,9 +25158,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.37.3/drivers/gp
25053 #define TTM_BO_HASH_ORDER 13
25054
25055 static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
25056 -diff -urNp linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo_vm.c
25057 ---- linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-04 19:50:19.000000000 -0500
25058 -+++ linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-17 02:41:01.000000000 -0500
25059 +diff -urNp linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo_vm.c
25060 +--- linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-04 19:50:19.000000000 -0500
25061 ++++ linux-2.6.37.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-17 02:41:01.000000000 -0500
25062 @@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
25063 return best_bo;
25064 }
25065 @@ -25047,9 +25214,9 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.37.3/drivers
25066
25067 static const struct vm_operations_struct ttm_bo_vm_ops = {
25068 .fault = ttm_bo_vm_fault,
25069 -diff -urNp linux-2.6.37.3/drivers/hid/usbhid/hiddev.c linux-2.6.37.3/drivers/hid/usbhid/hiddev.c
25070 ---- linux-2.6.37.3/drivers/hid/usbhid/hiddev.c 2011-01-04 19:50:19.000000000 -0500
25071 -+++ linux-2.6.37.3/drivers/hid/usbhid/hiddev.c 2011-01-17 02:41:01.000000000 -0500
25072 +diff -urNp linux-2.6.37.4/drivers/hid/usbhid/hiddev.c linux-2.6.37.4/drivers/hid/usbhid/hiddev.c
25073 +--- linux-2.6.37.4/drivers/hid/usbhid/hiddev.c 2011-01-04 19:50:19.000000000 -0500
25074 ++++ linux-2.6.37.4/drivers/hid/usbhid/hiddev.c 2011-01-17 02:41:01.000000000 -0500
25075 @@ -611,7 +611,7 @@ static long hiddev_ioctl(struct file *fi
25076 return put_user(HID_VERSION, (int __user *)arg);
25077
25078 @@ -25059,9 +25226,9 @@ diff -urNp linux-2.6.37.3/drivers/hid/usbhid/hiddev.c linux-2.6.37.3/drivers/hid
25079 return -EINVAL;
25080
25081 for (i = 0; i < hid->maxcollection; i++)
25082 -diff -urNp linux-2.6.37.3/drivers/hwmon/k8temp.c linux-2.6.37.3/drivers/hwmon/k8temp.c
25083 ---- linux-2.6.37.3/drivers/hwmon/k8temp.c 2011-01-04 19:50:19.000000000 -0500
25084 -+++ linux-2.6.37.3/drivers/hwmon/k8temp.c 2011-01-17 02:41:01.000000000 -0500
25085 +diff -urNp linux-2.6.37.4/drivers/hwmon/k8temp.c linux-2.6.37.4/drivers/hwmon/k8temp.c
25086 +--- linux-2.6.37.4/drivers/hwmon/k8temp.c 2011-01-04 19:50:19.000000000 -0500
25087 ++++ linux-2.6.37.4/drivers/hwmon/k8temp.c 2011-01-17 02:41:01.000000000 -0500
25088 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
25089
25090 static const struct pci_device_id k8temp_ids[] = {
25091 @@ -25071,9 +25238,9 @@ diff -urNp linux-2.6.37.3/drivers/hwmon/k8temp.c linux-2.6.37.3/drivers/hwmon/k8
25092 };
25093
25094 MODULE_DEVICE_TABLE(pci, k8temp_ids);
25095 -diff -urNp linux-2.6.37.3/drivers/hwmon/sis5595.c linux-2.6.37.3/drivers/hwmon/sis5595.c
25096 ---- linux-2.6.37.3/drivers/hwmon/sis5595.c 2011-01-04 19:50:19.000000000 -0500
25097 -+++ linux-2.6.37.3/drivers/hwmon/sis5595.c 2011-01-17 02:41:01.000000000 -0500
25098 +diff -urNp linux-2.6.37.4/drivers/hwmon/sis5595.c linux-2.6.37.4/drivers/hwmon/sis5595.c
25099 +--- linux-2.6.37.4/drivers/hwmon/sis5595.c 2011-01-04 19:50:19.000000000 -0500
25100 ++++ linux-2.6.37.4/drivers/hwmon/sis5595.c 2011-01-17 02:41:01.000000000 -0500
25101 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
25102
25103 static const struct pci_device_id sis5595_pci_ids[] = {
25104 @@ -25083,9 +25250,9 @@ diff -urNp linux-2.6.37.3/drivers/hwmon/sis5595.c linux-2.6.37.3/drivers/hwmon/s
25105 };
25106
25107 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
25108 -diff -urNp linux-2.6.37.3/drivers/hwmon/via686a.c linux-2.6.37.3/drivers/hwmon/via686a.c
25109 ---- linux-2.6.37.3/drivers/hwmon/via686a.c 2011-02-22 16:05:30.000000000 -0500
25110 -+++ linux-2.6.37.3/drivers/hwmon/via686a.c 2011-02-22 16:05:42.000000000 -0500
25111 +diff -urNp linux-2.6.37.4/drivers/hwmon/via686a.c linux-2.6.37.4/drivers/hwmon/via686a.c
25112 +--- linux-2.6.37.4/drivers/hwmon/via686a.c 2011-02-22 16:05:30.000000000 -0500
25113 ++++ linux-2.6.37.4/drivers/hwmon/via686a.c 2011-02-22 16:05:42.000000000 -0500
25114 @@ -777,7 +777,7 @@ static struct via686a_data *via686a_upda
25115
25116 static const struct pci_device_id via686a_pci_ids[] = {
25117 @@ -25095,9 +25262,9 @@ diff -urNp linux-2.6.37.3/drivers/hwmon/via686a.c linux-2.6.37.3/drivers/hwmon/v
25118 };
25119
25120 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
25121 -diff -urNp linux-2.6.37.3/drivers/hwmon/vt8231.c linux-2.6.37.3/drivers/hwmon/vt8231.c
25122 ---- linux-2.6.37.3/drivers/hwmon/vt8231.c 2011-01-04 19:50:19.000000000 -0500
25123 -+++ linux-2.6.37.3/drivers/hwmon/vt8231.c 2011-01-17 02:41:01.000000000 -0500
25124 +diff -urNp linux-2.6.37.4/drivers/hwmon/vt8231.c linux-2.6.37.4/drivers/hwmon/vt8231.c
25125 +--- linux-2.6.37.4/drivers/hwmon/vt8231.c 2011-01-04 19:50:19.000000000 -0500
25126 ++++ linux-2.6.37.4/drivers/hwmon/vt8231.c 2011-01-17 02:41:01.000000000 -0500
25127 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
25128
25129 static const struct pci_device_id vt8231_pci_ids[] = {
25130 @@ -25107,9 +25274,9 @@ diff -urNp linux-2.6.37.3/drivers/hwmon/vt8231.c linux-2.6.37.3/drivers/hwmon/vt
25131 };
25132
25133 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
25134 -diff -urNp linux-2.6.37.3/drivers/hwmon/w83791d.c linux-2.6.37.3/drivers/hwmon/w83791d.c
25135 ---- linux-2.6.37.3/drivers/hwmon/w83791d.c 2011-01-04 19:50:19.000000000 -0500
25136 -+++ linux-2.6.37.3/drivers/hwmon/w83791d.c 2011-01-17 02:41:01.000000000 -0500
25137 +diff -urNp linux-2.6.37.4/drivers/hwmon/w83791d.c linux-2.6.37.4/drivers/hwmon/w83791d.c
25138 +--- linux-2.6.37.4/drivers/hwmon/w83791d.c 2011-01-04 19:50:19.000000000 -0500
25139 ++++ linux-2.6.37.4/drivers/hwmon/w83791d.c 2011-01-17 02:41:01.000000000 -0500
25140 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
25141 struct i2c_board_info *info);
25142 static int w83791d_remove(struct i2c_client *client);
25143 @@ -25121,9 +25288,9 @@ diff -urNp linux-2.6.37.3/drivers/hwmon/w83791d.c linux-2.6.37.3/drivers/hwmon/w
25144 static struct w83791d_data *w83791d_update_device(struct device *dev);
25145
25146 #ifdef DEBUG
25147 -diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-i801.c linux-2.6.37.3/drivers/i2c/busses/i2c-i801.c
25148 ---- linux-2.6.37.3/drivers/i2c/busses/i2c-i801.c 2011-01-04 19:50:19.000000000 -0500
25149 -+++ linux-2.6.37.3/drivers/i2c/busses/i2c-i801.c 2011-01-17 02:41:01.000000000 -0500
25150 +diff -urNp linux-2.6.37.4/drivers/i2c/busses/i2c-i801.c linux-2.6.37.4/drivers/i2c/busses/i2c-i801.c
25151 +--- linux-2.6.37.4/drivers/i2c/busses/i2c-i801.c 2011-01-04 19:50:19.000000000 -0500
25152 ++++ linux-2.6.37.4/drivers/i2c/busses/i2c-i801.c 2011-01-17 02:41:01.000000000 -0500
25153 @@ -620,7 +620,7 @@ static const struct pci_device_id i801_i
25154 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) },
25155 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
25156 @@ -25133,9 +25300,9 @@ diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-i801.c linux-2.6.37.3/drivers/i
25157 };
25158
25159 MODULE_DEVICE_TABLE(pci, i801_ids);
25160 -diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-piix4.c linux-2.6.37.3/drivers/i2c/busses/i2c-piix4.c
25161 ---- linux-2.6.37.3/drivers/i2c/busses/i2c-piix4.c 2011-01-04 19:50:19.000000000 -0500
25162 -+++ linux-2.6.37.3/drivers/i2c/busses/i2c-piix4.c 2011-01-17 02:41:01.000000000 -0500
25163 +diff -urNp linux-2.6.37.4/drivers/i2c/busses/i2c-piix4.c linux-2.6.37.4/drivers/i2c/busses/i2c-piix4.c
25164 +--- linux-2.6.37.4/drivers/i2c/busses/i2c-piix4.c 2011-01-04 19:50:19.000000000 -0500
25165 ++++ linux-2.6.37.4/drivers/i2c/busses/i2c-piix4.c 2011-01-17 02:41:01.000000000 -0500
25166 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
25167 .ident = "IBM",
25168 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
25169 @@ -25154,9 +25321,9 @@ diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-piix4.c linux-2.6.37.3/drivers/
25170 };
25171
25172 MODULE_DEVICE_TABLE (pci, piix4_ids);
25173 -diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-sis630.c linux-2.6.37.3/drivers/i2c/busses/i2c-sis630.c
25174 ---- linux-2.6.37.3/drivers/i2c/busses/i2c-sis630.c 2011-01-04 19:50:19.000000000 -0500
25175 -+++ linux-2.6.37.3/drivers/i2c/busses/i2c-sis630.c 2011-01-17 02:41:01.000000000 -0500
25176 +diff -urNp linux-2.6.37.4/drivers/i2c/busses/i2c-sis630.c linux-2.6.37.4/drivers/i2c/busses/i2c-sis630.c
25177 +--- linux-2.6.37.4/drivers/i2c/busses/i2c-sis630.c 2011-01-04 19:50:19.000000000 -0500
25178 ++++ linux-2.6.37.4/drivers/i2c/busses/i2c-sis630.c 2011-01-17 02:41:01.000000000 -0500
25179 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
25180 static const struct pci_device_id sis630_ids[] __devinitconst = {
25181 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
25182 @@ -25166,9 +25333,9 @@ diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-sis630.c linux-2.6.37.3/drivers
25183 };
25184
25185 MODULE_DEVICE_TABLE (pci, sis630_ids);
25186 -diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-sis96x.c linux-2.6.37.3/drivers/i2c/busses/i2c-sis96x.c
25187 ---- linux-2.6.37.3/drivers/i2c/busses/i2c-sis96x.c 2011-01-04 19:50:19.000000000 -0500
25188 -+++ linux-2.6.37.3/drivers/i2c/busses/i2c-sis96x.c 2011-01-17 02:41:01.000000000 -0500
25189 +diff -urNp linux-2.6.37.4/drivers/i2c/busses/i2c-sis96x.c linux-2.6.37.4/drivers/i2c/busses/i2c-sis96x.c
25190 +--- linux-2.6.37.4/drivers/i2c/busses/i2c-sis96x.c 2011-01-04 19:50:19.000000000 -0500
25191 ++++ linux-2.6.37.4/drivers/i2c/busses/i2c-sis96x.c 2011-01-17 02:41:01.000000000 -0500
25192 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
25193
25194 static const struct pci_device_id sis96x_ids[] = {
25195 @@ -25178,9 +25345,9 @@ diff -urNp linux-2.6.37.3/drivers/i2c/busses/i2c-sis96x.c linux-2.6.37.3/drivers
25196 };
25197
25198 MODULE_DEVICE_TABLE (pci, sis96x_ids);
25199 -diff -urNp linux-2.6.37.3/drivers/ide/ide-cd.c linux-2.6.37.3/drivers/ide/ide-cd.c
25200 ---- linux-2.6.37.3/drivers/ide/ide-cd.c 2011-01-04 19:50:19.000000000 -0500
25201 -+++ linux-2.6.37.3/drivers/ide/ide-cd.c 2011-01-17 02:41:01.000000000 -0500
25202 +diff -urNp linux-2.6.37.4/drivers/ide/ide-cd.c linux-2.6.37.4/drivers/ide/ide-cd.c
25203 +--- linux-2.6.37.4/drivers/ide/ide-cd.c 2011-01-04 19:50:19.000000000 -0500
25204 ++++ linux-2.6.37.4/drivers/ide/ide-cd.c 2011-01-17 02:41:01.000000000 -0500
25205 @@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_
25206 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
25207 if ((unsigned long)buf & alignment
25208 @@ -25190,9 +25357,9 @@ diff -urNp linux-2.6.37.3/drivers/ide/ide-cd.c linux-2.6.37.3/drivers/ide/ide-cd
25209 drive->dma = 0;
25210 }
25211 }
25212 -diff -urNp linux-2.6.37.3/drivers/infiniband/core/cm.c linux-2.6.37.3/drivers/infiniband/core/cm.c
25213 ---- linux-2.6.37.3/drivers/infiniband/core/cm.c 2011-01-04 19:50:19.000000000 -0500
25214 -+++ linux-2.6.37.3/drivers/infiniband/core/cm.c 2011-01-17 02:41:01.000000000 -0500
25215 +diff -urNp linux-2.6.37.4/drivers/infiniband/core/cm.c linux-2.6.37.4/drivers/infiniband/core/cm.c
25216 +--- linux-2.6.37.4/drivers/infiniband/core/cm.c 2011-01-04 19:50:19.000000000 -0500
25217 ++++ linux-2.6.37.4/drivers/infiniband/core/cm.c 2011-01-17 02:41:01.000000000 -0500
25218 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
25219
25220 struct cm_counter_group {
25221 @@ -25332,9 +25499,9 @@ diff -urNp linux-2.6.37.3/drivers/infiniband/core/cm.c linux-2.6.37.3/drivers/in
25222 }
25223
25224 static const struct sysfs_ops cm_counter_ops = {
25225 -diff -urNp linux-2.6.37.3/drivers/infiniband/hw/qib/qib.h linux-2.6.37.3/drivers/infiniband/hw/qib/qib.h
25226 ---- linux-2.6.37.3/drivers/infiniband/hw/qib/qib.h 2011-01-04 19:50:19.000000000 -0500
25227 -+++ linux-2.6.37.3/drivers/infiniband/hw/qib/qib.h 2011-01-17 02:41:01.000000000 -0500
25228 +diff -urNp linux-2.6.37.4/drivers/infiniband/hw/qib/qib.h linux-2.6.37.4/drivers/infiniband/hw/qib/qib.h
25229 +--- linux-2.6.37.4/drivers/infiniband/hw/qib/qib.h 2011-01-04 19:50:19.000000000 -0500
25230 ++++ linux-2.6.37.4/drivers/infiniband/hw/qib/qib.h 2011-01-17 02:41:01.000000000 -0500
25231 @@ -51,6 +51,7 @@
25232 #include <linux/completion.h>
25233 #include <linux/kref.h>
25234 @@ -25343,9 +25510,9 @@ diff -urNp linux-2.6.37.3/drivers/infiniband/hw/qib/qib.h linux-2.6.37.3/drivers
25235
25236 #include "qib_common.h"
25237 #include "qib_verbs.h"
25238 -diff -urNp linux-2.6.37.3/drivers/input/keyboard/atkbd.c linux-2.6.37.3/drivers/input/keyboard/atkbd.c
25239 ---- linux-2.6.37.3/drivers/input/keyboard/atkbd.c 2011-01-04 19:50:19.000000000 -0500
25240 -+++ linux-2.6.37.3/drivers/input/keyboard/atkbd.c 2011-01-17 02:41:01.000000000 -0500
25241 +diff -urNp linux-2.6.37.4/drivers/input/keyboard/atkbd.c linux-2.6.37.4/drivers/input/keyboard/atkbd.c
25242 +--- linux-2.6.37.4/drivers/input/keyboard/atkbd.c 2011-01-04 19:50:19.000000000 -0500
25243 ++++ linux-2.6.37.4/drivers/input/keyboard/atkbd.c 2011-01-17 02:41:01.000000000 -0500
25244 @@ -1250,7 +1250,7 @@ static struct serio_device_id atkbd_seri
25245 .id = SERIO_ANY,
25246 .extra = SERIO_ANY,
25247 @@ -25355,9 +25522,9 @@ diff -urNp linux-2.6.37.3/drivers/input/keyboard/atkbd.c linux-2.6.37.3/drivers/
25248 };
25249
25250 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
25251 -diff -urNp linux-2.6.37.3/drivers/input/mouse/lifebook.c linux-2.6.37.3/drivers/input/mouse/lifebook.c
25252 ---- linux-2.6.37.3/drivers/input/mouse/lifebook.c 2011-01-04 19:50:19.000000000 -0500
25253 -+++ linux-2.6.37.3/drivers/input/mouse/lifebook.c 2011-01-17 02:41:01.000000000 -0500
25254 +diff -urNp linux-2.6.37.4/drivers/input/mouse/lifebook.c linux-2.6.37.4/drivers/input/mouse/lifebook.c
25255 +--- linux-2.6.37.4/drivers/input/mouse/lifebook.c 2011-01-04 19:50:19.000000000 -0500
25256 ++++ linux-2.6.37.4/drivers/input/mouse/lifebook.c 2011-01-17 02:41:01.000000000 -0500
25257 @@ -123,7 +123,7 @@ static const struct dmi_system_id __init
25258 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
25259 },
25260 @@ -25367,9 +25534,9 @@ diff -urNp linux-2.6.37.3/drivers/input/mouse/lifebook.c linux-2.6.37.3/drivers/
25261 };
25262
25263 void __init lifebook_module_init(void)
25264 -diff -urNp linux-2.6.37.3/drivers/input/mouse/psmouse-base.c linux-2.6.37.3/drivers/input/mouse/psmouse-base.c
25265 ---- linux-2.6.37.3/drivers/input/mouse/psmouse-base.c 2011-01-04 19:50:19.000000000 -0500
25266 -+++ linux-2.6.37.3/drivers/input/mouse/psmouse-base.c 2011-01-17 02:41:01.000000000 -0500
25267 +diff -urNp linux-2.6.37.4/drivers/input/mouse/psmouse-base.c linux-2.6.37.4/drivers/input/mouse/psmouse-base.c
25268 +--- linux-2.6.37.4/drivers/input/mouse/psmouse-base.c 2011-01-04 19:50:19.000000000 -0500
25269 ++++ linux-2.6.37.4/drivers/input/mouse/psmouse-base.c 2011-01-17 02:41:01.000000000 -0500
25270 @@ -1462,7 +1462,7 @@ static struct serio_device_id psmouse_se
25271 .id = SERIO_ANY,
25272 .extra = SERIO_ANY,
25273 @@ -25379,9 +25546,9 @@ diff -urNp linux-2.6.37.3/drivers/input/mouse/psmouse-base.c linux-2.6.37.3/driv
25274 };
25275
25276 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
25277 -diff -urNp linux-2.6.37.3/drivers/input/mouse/synaptics.c linux-2.6.37.3/drivers/input/mouse/synaptics.c
25278 ---- linux-2.6.37.3/drivers/input/mouse/synaptics.c 2011-01-04 19:50:19.000000000 -0500
25279 -+++ linux-2.6.37.3/drivers/input/mouse/synaptics.c 2011-01-17 02:41:01.000000000 -0500
25280 +diff -urNp linux-2.6.37.4/drivers/input/mouse/synaptics.c linux-2.6.37.4/drivers/input/mouse/synaptics.c
25281 +--- linux-2.6.37.4/drivers/input/mouse/synaptics.c 2011-01-04 19:50:19.000000000 -0500
25282 ++++ linux-2.6.37.4/drivers/input/mouse/synaptics.c 2011-01-17 02:41:01.000000000 -0500
25283 @@ -499,7 +499,7 @@ static void synaptics_process_packet(str
25284 break;
25285 case 2:
25286 @@ -25410,9 +25577,9 @@ diff -urNp linux-2.6.37.3/drivers/input/mouse/synaptics.c linux-2.6.37.3/drivers
25287 #endif
25288 };
25289
25290 -diff -urNp linux-2.6.37.3/drivers/input/mousedev.c linux-2.6.37.3/drivers/input/mousedev.c
25291 ---- linux-2.6.37.3/drivers/input/mousedev.c 2011-01-04 19:50:19.000000000 -0500
25292 -+++ linux-2.6.37.3/drivers/input/mousedev.c 2011-01-17 02:41:01.000000000 -0500
25293 +diff -urNp linux-2.6.37.4/drivers/input/mousedev.c linux-2.6.37.4/drivers/input/mousedev.c
25294 +--- linux-2.6.37.4/drivers/input/mousedev.c 2011-01-04 19:50:19.000000000 -0500
25295 ++++ linux-2.6.37.4/drivers/input/mousedev.c 2011-01-17 02:41:01.000000000 -0500
25296 @@ -762,7 +762,7 @@ static ssize_t mousedev_read(struct file
25297
25298 spin_unlock_irq(&client->packet_lock);
25299 @@ -25431,9 +25598,9 @@ diff -urNp linux-2.6.37.3/drivers/input/mousedev.c linux-2.6.37.3/drivers/input/
25300 };
25301 static int psaux_registered;
25302 #endif
25303 -diff -urNp linux-2.6.37.3/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37.3/drivers/input/serio/i8042-x86ia64io.h
25304 ---- linux-2.6.37.3/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:05:30.000000000 -0500
25305 -+++ linux-2.6.37.3/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:11:44.000000000 -0500
25306 +diff -urNp linux-2.6.37.4/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37.4/drivers/input/serio/i8042-x86ia64io.h
25307 +--- linux-2.6.37.4/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:05:30.000000000 -0500
25308 ++++ linux-2.6.37.4/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:11:44.000000000 -0500
25309 @@ -183,7 +183,7 @@ static const struct dmi_system_id __init
25310 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
25311 },
25312 @@ -25488,9 +25655,9 @@ diff -urNp linux-2.6.37.3/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37.3/d
25313 };
25314
25315 #endif /* CONFIG_X86 */
25316 -diff -urNp linux-2.6.37.3/drivers/input/serio/serio_raw.c linux-2.6.37.3/drivers/input/serio/serio_raw.c
25317 ---- linux-2.6.37.3/drivers/input/serio/serio_raw.c 2011-01-04 19:50:19.000000000 -0500
25318 -+++ linux-2.6.37.3/drivers/input/serio/serio_raw.c 2011-01-17 02:41:01.000000000 -0500
25319 +diff -urNp linux-2.6.37.4/drivers/input/serio/serio_raw.c linux-2.6.37.4/drivers/input/serio/serio_raw.c
25320 +--- linux-2.6.37.4/drivers/input/serio/serio_raw.c 2011-01-04 19:50:19.000000000 -0500
25321 ++++ linux-2.6.37.4/drivers/input/serio/serio_raw.c 2011-01-17 02:41:01.000000000 -0500
25322 @@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_
25323 .id = SERIO_ANY,
25324 .extra = SERIO_ANY,
25325 @@ -25500,9 +25667,9 @@ diff -urNp linux-2.6.37.3/drivers/input/serio/serio_raw.c linux-2.6.37.3/drivers
25326 };
25327
25328 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
25329 -diff -urNp linux-2.6.37.3/drivers/isdn/gigaset/common.c linux-2.6.37.3/drivers/isdn/gigaset/common.c
25330 ---- linux-2.6.37.3/drivers/isdn/gigaset/common.c 2011-01-04 19:50:19.000000000 -0500
25331 -+++ linux-2.6.37.3/drivers/isdn/gigaset/common.c 2011-01-24 18:04:15.000000000 -0500
25332 +diff -urNp linux-2.6.37.4/drivers/isdn/gigaset/common.c linux-2.6.37.4/drivers/isdn/gigaset/common.c
25333 +--- linux-2.6.37.4/drivers/isdn/gigaset/common.c 2011-01-04 19:50:19.000000000 -0500
25334 ++++ linux-2.6.37.4/drivers/isdn/gigaset/common.c 2011-01-24 18:04:15.000000000 -0500
25335 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
25336 cs->commands_pending = 0;
25337 cs->cur_at_seq = 0;
25338 @@ -25512,9 +25679,9 @@ diff -urNp linux-2.6.37.3/drivers/isdn/gigaset/common.c linux-2.6.37.3/drivers/i
25339 cs->dev = NULL;
25340 cs->tty = NULL;
25341 cs->tty_dev = NULL;
25342 -diff -urNp linux-2.6.37.3/drivers/isdn/gigaset/gigaset.h linux-2.6.37.3/drivers/isdn/gigaset/gigaset.h
25343 ---- linux-2.6.37.3/drivers/isdn/gigaset/gigaset.h 2011-01-04 19:50:19.000000000 -0500
25344 -+++ linux-2.6.37.3/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:56.000000000 -0500
25345 +diff -urNp linux-2.6.37.4/drivers/isdn/gigaset/gigaset.h linux-2.6.37.4/drivers/isdn/gigaset/gigaset.h
25346 +--- linux-2.6.37.4/drivers/isdn/gigaset/gigaset.h 2011-01-04 19:50:19.000000000 -0500
25347 ++++ linux-2.6.37.4/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:56.000000000 -0500
25348 @@ -35,6 +35,7 @@
25349 #include <linux/tty_driver.h>
25350 #include <linux/list.h>
25351 @@ -25532,9 +25699,9 @@ diff -urNp linux-2.6.37.3/drivers/isdn/gigaset/gigaset.h linux-2.6.37.3/drivers/
25352 struct tty_struct *tty;
25353 struct tasklet_struct if_wake_tasklet;
25354 unsigned control_state;
25355 -diff -urNp linux-2.6.37.3/drivers/isdn/gigaset/interface.c linux-2.6.37.3/drivers/isdn/gigaset/interface.c
25356 ---- linux-2.6.37.3/drivers/isdn/gigaset/interface.c 2011-01-04 19:50:19.000000000 -0500
25357 -+++ linux-2.6.37.3/drivers/isdn/gigaset/interface.c 2011-01-24 18:04:15.000000000 -0500
25358 +diff -urNp linux-2.6.37.4/drivers/isdn/gigaset/interface.c linux-2.6.37.4/drivers/isdn/gigaset/interface.c
25359 +--- linux-2.6.37.4/drivers/isdn/gigaset/interface.c 2011-01-04 19:50:19.000000000 -0500
25360 ++++ linux-2.6.37.4/drivers/isdn/gigaset/interface.c 2011-01-24 18:04:15.000000000 -0500
25361 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
25362 return -ERESTARTSYS;
25363 tty->driver_data = cs;
25364 @@ -25622,9 +25789,9 @@ diff -urNp linux-2.6.37.3/drivers/isdn/gigaset/interface.c linux-2.6.37.3/driver
25365 dev_warn(cs->dev, "%s: device not opened\n", __func__);
25366 goto out;
25367 }
25368 -diff -urNp linux-2.6.37.3/drivers/isdn/hardware/avm/b1.c linux-2.6.37.3/drivers/isdn/hardware/avm/b1.c
25369 ---- linux-2.6.37.3/drivers/isdn/hardware/avm/b1.c 2011-01-04 19:50:19.000000000 -0500
25370 -+++ linux-2.6.37.3/drivers/isdn/hardware/avm/b1.c 2011-01-17 02:41:01.000000000 -0500
25371 +diff -urNp linux-2.6.37.4/drivers/isdn/hardware/avm/b1.c linux-2.6.37.4/drivers/isdn/hardware/avm/b1.c
25372 +--- linux-2.6.37.4/drivers/isdn/hardware/avm/b1.c 2011-01-04 19:50:19.000000000 -0500
25373 ++++ linux-2.6.37.4/drivers/isdn/hardware/avm/b1.c 2011-01-17 02:41:01.000000000 -0500
25374 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
25375 }
25376 if (left) {
25377 @@ -25643,9 +25810,9 @@ diff -urNp linux-2.6.37.3/drivers/isdn/hardware/avm/b1.c linux-2.6.37.3/drivers/
25378 return -EFAULT;
25379 } else {
25380 memcpy(buf, dp, left);
25381 -diff -urNp linux-2.6.37.3/drivers/isdn/icn/icn.c linux-2.6.37.3/drivers/isdn/icn/icn.c
25382 ---- linux-2.6.37.3/drivers/isdn/icn/icn.c 2011-01-04 19:50:19.000000000 -0500
25383 -+++ linux-2.6.37.3/drivers/isdn/icn/icn.c 2011-01-17 02:41:01.000000000 -0500
25384 +diff -urNp linux-2.6.37.4/drivers/isdn/icn/icn.c linux-2.6.37.4/drivers/isdn/icn/icn.c
25385 +--- linux-2.6.37.4/drivers/isdn/icn/icn.c 2011-01-04 19:50:19.000000000 -0500
25386 ++++ linux-2.6.37.4/drivers/isdn/icn/icn.c 2011-01-17 02:41:01.000000000 -0500
25387 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
25388 if (count > len)
25389 count = len;
25390 @@ -25655,9 +25822,9 @@ diff -urNp linux-2.6.37.3/drivers/isdn/icn/icn.c linux-2.6.37.3/drivers/isdn/icn
25391 return -EFAULT;
25392 } else
25393 memcpy(msg, buf, count);
25394 -diff -urNp linux-2.6.37.3/drivers/leds/leds-lp5521.c linux-2.6.37.3/drivers/leds/leds-lp5521.c
25395 ---- linux-2.6.37.3/drivers/leds/leds-lp5521.c 2011-01-04 19:50:19.000000000 -0500
25396 -+++ linux-2.6.37.3/drivers/leds/leds-lp5521.c 2011-02-27 15:29:26.000000000 -0500
25397 +diff -urNp linux-2.6.37.4/drivers/leds/leds-lp5521.c linux-2.6.37.4/drivers/leds/leds-lp5521.c
25398 +--- linux-2.6.37.4/drivers/leds/leds-lp5521.c 2011-01-04 19:50:19.000000000 -0500
25399 ++++ linux-2.6.37.4/drivers/leds/leds-lp5521.c 2011-02-27 15:29:26.000000000 -0500
25400 @@ -544,7 +544,7 @@ static ssize_t lp5521_selftest(struct de
25401 }
25402
25403 @@ -25689,9 +25856,9 @@ diff -urNp linux-2.6.37.3/drivers/leds/leds-lp5521.c linux-2.6.37.3/drivers/leds
25404 static DEVICE_ATTR(selftest, S_IRUGO, lp5521_selftest, NULL);
25405
25406 static struct attribute *lp5521_attributes[] = {
25407 -diff -urNp linux-2.6.37.3/drivers/leds/leds-lp5523.c linux-2.6.37.3/drivers/leds/leds-lp5523.c
25408 ---- linux-2.6.37.3/drivers/leds/leds-lp5523.c 2011-01-04 19:50:19.000000000 -0500
25409 -+++ linux-2.6.37.3/drivers/leds/leds-lp5523.c 2011-02-27 15:29:58.000000000 -0500
25410 +diff -urNp linux-2.6.37.4/drivers/leds/leds-lp5523.c linux-2.6.37.4/drivers/leds/leds-lp5523.c
25411 +--- linux-2.6.37.4/drivers/leds/leds-lp5523.c 2011-01-04 19:50:19.000000000 -0500
25412 ++++ linux-2.6.37.4/drivers/leds/leds-lp5523.c 2011-02-27 15:29:58.000000000 -0500
25413 @@ -701,7 +701,7 @@ static ssize_t store_current(struct devi
25414 }
25415
25416 @@ -25732,9 +25899,9 @@ diff -urNp linux-2.6.37.3/drivers/leds/leds-lp5523.c linux-2.6.37.3/drivers/leds
25417 static DEVICE_ATTR(selftest, S_IRUGO, lp5523_selftest, NULL);
25418
25419 static struct attribute *lp5523_attributes[] = {
25420 -diff -urNp linux-2.6.37.3/drivers/lguest/core.c linux-2.6.37.3/drivers/lguest/core.c
25421 ---- linux-2.6.37.3/drivers/lguest/core.c 2011-01-04 19:50:19.000000000 -0500
25422 -+++ linux-2.6.37.3/drivers/lguest/core.c 2011-01-17 02:41:01.000000000 -0500
25423 +diff -urNp linux-2.6.37.4/drivers/lguest/core.c linux-2.6.37.4/drivers/lguest/core.c
25424 +--- linux-2.6.37.4/drivers/lguest/core.c 2011-01-04 19:50:19.000000000 -0500
25425 ++++ linux-2.6.37.4/drivers/lguest/core.c 2011-01-17 02:41:01.000000000 -0500
25426 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
25427 * it's worked so far. The end address needs +1 because __get_vm_area
25428 * allocates an extra guard page, so we need space for that.
25429 @@ -25762,9 +25929,9 @@ diff -urNp linux-2.6.37.3/drivers/lguest/core.c linux-2.6.37.3/drivers/lguest/co
25430 end_switcher_text - start_switcher_text);
25431
25432 printk(KERN_INFO "lguest: mapped switcher at %p\n",
25433 -diff -urNp linux-2.6.37.3/drivers/lguest/x86/core.c linux-2.6.37.3/drivers/lguest/x86/core.c
25434 ---- linux-2.6.37.3/drivers/lguest/x86/core.c 2011-01-04 19:50:19.000000000 -0500
25435 -+++ linux-2.6.37.3/drivers/lguest/x86/core.c 2011-01-17 02:41:01.000000000 -0500
25436 +diff -urNp linux-2.6.37.4/drivers/lguest/x86/core.c linux-2.6.37.4/drivers/lguest/x86/core.c
25437 +--- linux-2.6.37.4/drivers/lguest/x86/core.c 2011-01-04 19:50:19.000000000 -0500
25438 ++++ linux-2.6.37.4/drivers/lguest/x86/core.c 2011-01-17 02:41:01.000000000 -0500
25439 @@ -59,7 +59,7 @@ static struct {
25440 /* Offset from where switcher.S was compiled to where we've copied it */
25441 static unsigned long switcher_offset(void)
25442 @@ -25806,9 +25973,9 @@ diff -urNp linux-2.6.37.3/drivers/lguest/x86/core.c linux-2.6.37.3/drivers/lgues
25443 lguest_entry.segment = LGUEST_CS;
25444
25445 /*
25446 -diff -urNp linux-2.6.37.3/drivers/lguest/x86/switcher_32.S linux-2.6.37.3/drivers/lguest/x86/switcher_32.S
25447 ---- linux-2.6.37.3/drivers/lguest/x86/switcher_32.S 2011-01-04 19:50:19.000000000 -0500
25448 -+++ linux-2.6.37.3/drivers/lguest/x86/switcher_32.S 2011-01-17 02:41:01.000000000 -0500
25449 +diff -urNp linux-2.6.37.4/drivers/lguest/x86/switcher_32.S linux-2.6.37.4/drivers/lguest/x86/switcher_32.S
25450 +--- linux-2.6.37.4/drivers/lguest/x86/switcher_32.S 2011-01-04 19:50:19.000000000 -0500
25451 ++++ linux-2.6.37.4/drivers/lguest/x86/switcher_32.S 2011-01-17 02:41:01.000000000 -0500
25452 @@ -87,6 +87,7 @@
25453 #include <asm/page.h>
25454 #include <asm/segment.h>
25455 @@ -25867,9 +26034,9 @@ diff -urNp linux-2.6.37.3/drivers/lguest/x86/switcher_32.S linux-2.6.37.3/driver
25456
25457 // Every interrupt can come to us here
25458 // But we must truly tell each apart.
25459 -diff -urNp linux-2.6.37.3/drivers/macintosh/via-pmu-backlight.c linux-2.6.37.3/drivers/macintosh/via-pmu-backlight.c
25460 ---- linux-2.6.37.3/drivers/macintosh/via-pmu-backlight.c 2011-01-04 19:50:19.000000000 -0500
25461 -+++ linux-2.6.37.3/drivers/macintosh/via-pmu-backlight.c 2011-01-17 02:41:01.000000000 -0500
25462 +diff -urNp linux-2.6.37.4/drivers/macintosh/via-pmu-backlight.c linux-2.6.37.4/drivers/macintosh/via-pmu-backlight.c
25463 +--- linux-2.6.37.4/drivers/macintosh/via-pmu-backlight.c 2011-01-04 19:50:19.000000000 -0500
25464 ++++ linux-2.6.37.4/drivers/macintosh/via-pmu-backlight.c 2011-01-17 02:41:01.000000000 -0500
25465 @@ -15,7 +15,7 @@
25466
25467 #define MAX_PMU_LEVEL 0xFF
25468 @@ -25888,9 +26055,9 @@ diff -urNp linux-2.6.37.3/drivers/macintosh/via-pmu-backlight.c linux-2.6.37.3/d
25469 .get_brightness = pmu_backlight_get_brightness,
25470 .update_status = pmu_backlight_update_status,
25471
25472 -diff -urNp linux-2.6.37.3/drivers/macintosh/via-pmu.c linux-2.6.37.3/drivers/macintosh/via-pmu.c
25473 ---- linux-2.6.37.3/drivers/macintosh/via-pmu.c 2011-01-04 19:50:19.000000000 -0500
25474 -+++ linux-2.6.37.3/drivers/macintosh/via-pmu.c 2011-01-17 02:41:01.000000000 -0500
25475 +diff -urNp linux-2.6.37.4/drivers/macintosh/via-pmu.c linux-2.6.37.4/drivers/macintosh/via-pmu.c
25476 +--- linux-2.6.37.4/drivers/macintosh/via-pmu.c 2011-01-04 19:50:19.000000000 -0500
25477 ++++ linux-2.6.37.4/drivers/macintosh/via-pmu.c 2011-01-17 02:41:01.000000000 -0500
25478 @@ -2257,7 +2257,7 @@ static int pmu_sleep_valid(suspend_state
25479 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
25480 }
25481 @@ -25900,9 +26067,9 @@ diff -urNp linux-2.6.37.3/drivers/macintosh/via-pmu.c linux-2.6.37.3/drivers/mac
25482 .enter = powerbook_sleep,
25483 .valid = pmu_sleep_valid,
25484 };
25485 -diff -urNp linux-2.6.37.3/drivers/md/bitmap.c linux-2.6.37.3/drivers/md/bitmap.c
25486 ---- linux-2.6.37.3/drivers/md/bitmap.c 2011-01-04 19:50:19.000000000 -0500
25487 -+++ linux-2.6.37.3/drivers/md/bitmap.c 2011-01-17 02:41:01.000000000 -0500
25488 +diff -urNp linux-2.6.37.4/drivers/md/bitmap.c linux-2.6.37.4/drivers/md/bitmap.c
25489 +--- linux-2.6.37.4/drivers/md/bitmap.c 2011-01-04 19:50:19.000000000 -0500
25490 ++++ linux-2.6.37.4/drivers/md/bitmap.c 2011-01-17 02:41:01.000000000 -0500
25491 @@ -55,7 +55,7 @@
25492 # if DEBUG > 0
25493 # define PRINTK(x...) printk(KERN_DEBUG x)
25494 @@ -25912,9 +26079,21 @@ diff -urNp linux-2.6.37.3/drivers/md/bitmap.c linux-2.6.37.3/drivers/md/bitmap.c
25495 # endif
25496 #endif
25497
25498 -diff -urNp linux-2.6.37.3/drivers/md/dm-table.c linux-2.6.37.3/drivers/md/dm-table.c
25499 ---- linux-2.6.37.3/drivers/md/dm-table.c 2011-01-04 19:50:19.000000000 -0500
25500 -+++ linux-2.6.37.3/drivers/md/dm-table.c 2011-01-17 02:41:01.000000000 -0500
25501 +diff -urNp linux-2.6.37.4/drivers/md/dm-ioctl.c linux-2.6.37.4/drivers/md/dm-ioctl.c
25502 +--- linux-2.6.37.4/drivers/md/dm-ioctl.c 2011-01-04 19:50:19.000000000 -0500
25503 ++++ linux-2.6.37.4/drivers/md/dm-ioctl.c 2011-03-21 17:16:23.000000000 -0400
25504 +@@ -1488,7 +1488,7 @@ static int validate_params(uint cmd, str
25505 + cmd == DM_LIST_VERSIONS_CMD)
25506 + return 0;
25507 +
25508 +- if ((cmd == DM_DEV_CREATE_CMD)) {
25509 ++ if (cmd == DM_DEV_CREATE_CMD) {
25510 + if (!*param->name) {
25511 + DMWARN("name not supplied when creating device");
25512 + return -EINVAL;
25513 +diff -urNp linux-2.6.37.4/drivers/md/dm-table.c linux-2.6.37.4/drivers/md/dm-table.c
25514 +--- linux-2.6.37.4/drivers/md/dm-table.c 2011-01-04 19:50:19.000000000 -0500
25515 ++++ linux-2.6.37.4/drivers/md/dm-table.c 2011-01-17 02:41:01.000000000 -0500
25516 @@ -366,7 +366,7 @@ static int device_area_is_invalid(struct
25517 if (!dev_size)
25518 return 0;
25519 @@ -25924,9 +26103,9 @@ diff -urNp linux-2.6.37.3/drivers/md/dm-table.c linux-2.6.37.3/drivers/md/dm-tab
25520 DMWARN("%s: %s too small for target: "
25521 "start=%llu, len=%llu, dev_size=%llu",
25522 dm_device_name(ti->table->md), bdevname(bdev, b),
25523 -diff -urNp linux-2.6.37.3/drivers/md/md.c linux-2.6.37.3/drivers/md/md.c
25524 ---- linux-2.6.37.3/drivers/md/md.c 2011-03-11 17:22:42.000000000 -0500
25525 -+++ linux-2.6.37.3/drivers/md/md.c 2011-03-11 17:23:03.000000000 -0500
25526 +diff -urNp linux-2.6.37.4/drivers/md/md.c linux-2.6.37.4/drivers/md/md.c
25527 +--- linux-2.6.37.4/drivers/md/md.c 2011-03-11 17:22:42.000000000 -0500
25528 ++++ linux-2.6.37.4/drivers/md/md.c 2011-03-11 17:23:03.000000000 -0500
25529 @@ -1885,7 +1885,7 @@ static int bind_rdev_to_array(mdk_rdev_t
25530
25531 ko = &part_to_dev(rdev->bdev->bd_part)->kobj;
25532 @@ -25981,9 +26160,9 @@ diff -urNp linux-2.6.37.3/drivers/md/md.c linux-2.6.37.3/drivers/md/md.c
25533 spares++;
25534 md_new_event(mddev);
25535 set_bit(MD_CHANGE_DEVS, &mddev->flags);
25536 -diff -urNp linux-2.6.37.3/drivers/md/md.h linux-2.6.37.3/drivers/md/md.h
25537 ---- linux-2.6.37.3/drivers/md/md.h 2011-03-11 17:22:42.000000000 -0500
25538 -+++ linux-2.6.37.3/drivers/md/md.h 2011-03-11 17:23:03.000000000 -0500
25539 +diff -urNp linux-2.6.37.4/drivers/md/md.h linux-2.6.37.4/drivers/md/md.h
25540 +--- linux-2.6.37.4/drivers/md/md.h 2011-03-11 17:22:42.000000000 -0500
25541 ++++ linux-2.6.37.4/drivers/md/md.h 2011-03-11 17:23:03.000000000 -0500
25542 @@ -356,7 +356,7 @@ static inline void rdev_dec_pending(mdk_
25543
25544 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
25545 @@ -25993,9 +26172,9 @@ diff -urNp linux-2.6.37.3/drivers/md/md.h linux-2.6.37.3/drivers/md/md.h
25546 }
25547
25548 struct mdk_personality
25549 -diff -urNp linux-2.6.37.3/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.37.3/drivers/media/dvb/dvb-core/dvbdev.c
25550 ---- linux-2.6.37.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-04 19:50:19.000000000 -0500
25551 -+++ linux-2.6.37.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-17 02:41:01.000000000 -0500
25552 +diff -urNp linux-2.6.37.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.37.4/drivers/media/dvb/dvb-core/dvbdev.c
25553 +--- linux-2.6.37.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-04 19:50:19.000000000 -0500
25554 ++++ linux-2.6.37.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-17 02:41:01.000000000 -0500
25555 @@ -192,6 +192,7 @@ int dvb_register_device(struct dvb_adapt
25556 const struct dvb_device *template, void *priv, int type)
25557 {
25558 @@ -26004,9 +26183,9 @@ diff -urNp linux-2.6.37.3/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.37.3/dri
25559 struct file_operations *dvbdevfops;
25560 struct device *clsdev;
25561 int minor;
25562 -diff -urNp linux-2.6.37.3/drivers/media/IR/ir-lirc-codec.c linux-2.6.37.3/drivers/media/IR/ir-lirc-codec.c
25563 ---- linux-2.6.37.3/drivers/media/IR/ir-lirc-codec.c 2011-01-04 19:50:19.000000000 -0500
25564 -+++ linux-2.6.37.3/drivers/media/IR/ir-lirc-codec.c 2011-01-17 02:41:01.000000000 -0500
25565 +diff -urNp linux-2.6.37.4/drivers/media/IR/ir-lirc-codec.c linux-2.6.37.4/drivers/media/IR/ir-lirc-codec.c
25566 +--- linux-2.6.37.4/drivers/media/IR/ir-lirc-codec.c 2011-01-04 19:50:19.000000000 -0500
25567 ++++ linux-2.6.37.4/drivers/media/IR/ir-lirc-codec.c 2011-01-17 02:41:01.000000000 -0500
25568 @@ -275,7 +275,7 @@ static void ir_lirc_close(void *data)
25569 return;
25570 }
25571 @@ -26016,9 +26195,9 @@ diff -urNp linux-2.6.37.3/drivers/media/IR/ir-lirc-codec.c linux-2.6.37.3/driver
25572 .owner = THIS_MODULE,
25573 .write = ir_lirc_transmit_ir,
25574 .unlocked_ioctl = ir_lirc_ioctl,
25575 -diff -urNp linux-2.6.37.3/drivers/media/IR/lirc_dev.c linux-2.6.37.3/drivers/media/IR/lirc_dev.c
25576 ---- linux-2.6.37.3/drivers/media/IR/lirc_dev.c 2011-01-04 19:50:19.000000000 -0500
25577 -+++ linux-2.6.37.3/drivers/media/IR/lirc_dev.c 2011-01-17 02:41:01.000000000 -0500
25578 +diff -urNp linux-2.6.37.4/drivers/media/IR/lirc_dev.c linux-2.6.37.4/drivers/media/IR/lirc_dev.c
25579 +--- linux-2.6.37.4/drivers/media/IR/lirc_dev.c 2011-01-04 19:50:19.000000000 -0500
25580 ++++ linux-2.6.37.4/drivers/media/IR/lirc_dev.c 2011-01-17 02:41:01.000000000 -0500
25581 @@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
25582 }
25583
25584 @@ -26028,9 +26207,9 @@ diff -urNp linux-2.6.37.3/drivers/media/IR/lirc_dev.c linux-2.6.37.3/drivers/med
25585 .owner = THIS_MODULE,
25586 .read = lirc_dev_fop_read,
25587 .write = lirc_dev_fop_write,
25588 -diff -urNp linux-2.6.37.3/drivers/media/radio/radio-cadet.c linux-2.6.37.3/drivers/media/radio/radio-cadet.c
25589 ---- linux-2.6.37.3/drivers/media/radio/radio-cadet.c 2011-01-04 19:50:19.000000000 -0500
25590 -+++ linux-2.6.37.3/drivers/media/radio/radio-cadet.c 2011-01-17 02:41:01.000000000 -0500
25591 +diff -urNp linux-2.6.37.4/drivers/media/radio/radio-cadet.c linux-2.6.37.4/drivers/media/radio/radio-cadet.c
25592 +--- linux-2.6.37.4/drivers/media/radio/radio-cadet.c 2011-01-04 19:50:19.000000000 -0500
25593 ++++ linux-2.6.37.4/drivers/media/radio/radio-cadet.c 2011-01-17 02:41:01.000000000 -0500
25594 @@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f
25595 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
25596 mutex_unlock(&dev->lock);
25597 @@ -26040,9 +26219,9 @@ diff -urNp linux-2.6.37.3/drivers/media/radio/radio-cadet.c linux-2.6.37.3/drive
25598 return -EFAULT;
25599 return i;
25600 }
25601 -diff -urNp linux-2.6.37.3/drivers/media/video/saa7164/saa7164-core.c linux-2.6.37.3/drivers/media/video/saa7164/saa7164-core.c
25602 ---- linux-2.6.37.3/drivers/media/video/saa7164/saa7164-core.c 2011-01-04 19:50:19.000000000 -0500
25603 -+++ linux-2.6.37.3/drivers/media/video/saa7164/saa7164-core.c 2011-01-17 02:41:01.000000000 -0500
25604 +diff -urNp linux-2.6.37.4/drivers/media/video/saa7164/saa7164-core.c linux-2.6.37.4/drivers/media/video/saa7164/saa7164-core.c
25605 +--- linux-2.6.37.4/drivers/media/video/saa7164/saa7164-core.c 2011-01-04 19:50:19.000000000 -0500
25606 ++++ linux-2.6.37.4/drivers/media/video/saa7164/saa7164-core.c 2011-01-17 02:41:01.000000000 -0500
25607 @@ -1169,7 +1169,7 @@ static int saa7164_proc_open(struct inod
25608 return single_open(filp, saa7164_proc_show, NULL);
25609 }
25610 @@ -26052,9 +26231,9 @@ diff -urNp linux-2.6.37.3/drivers/media/video/saa7164/saa7164-core.c linux-2.6.3
25611 .open = saa7164_proc_open,
25612 .read = seq_read,
25613 .llseek = seq_lseek,
25614 -diff -urNp linux-2.6.37.3/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.37.3/drivers/media/video/sn9c102/sn9c102_core.c
25615 ---- linux-2.6.37.3/drivers/media/video/sn9c102/sn9c102_core.c 2011-01-04 19:50:19.000000000 -0500
25616 -+++ linux-2.6.37.3/drivers/media/video/sn9c102/sn9c102_core.c 2011-02-27 15:17:29.000000000 -0500
25617 +diff -urNp linux-2.6.37.4/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.37.4/drivers/media/video/sn9c102/sn9c102_core.c
25618 +--- linux-2.6.37.4/drivers/media/video/sn9c102/sn9c102_core.c 2011-01-04 19:50:19.000000000 -0500
25619 ++++ linux-2.6.37.4/drivers/media/video/sn9c102/sn9c102_core.c 2011-02-27 15:17:29.000000000 -0500
25620 @@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_
25621 sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
25622 static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
25623 @@ -26068,9 +26247,9 @@ diff -urNp linux-2.6.37.3/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.3
25624 static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL);
25625
25626
25627 -diff -urNp linux-2.6.37.3/drivers/message/fusion/mptbase.c linux-2.6.37.3/drivers/message/fusion/mptbase.c
25628 ---- linux-2.6.37.3/drivers/message/fusion/mptbase.c 2011-01-04 19:50:19.000000000 -0500
25629 -+++ linux-2.6.37.3/drivers/message/fusion/mptbase.c 2011-01-17 02:41:01.000000000 -0500
25630 +diff -urNp linux-2.6.37.4/drivers/message/fusion/mptbase.c linux-2.6.37.4/drivers/message/fusion/mptbase.c
25631 +--- linux-2.6.37.4/drivers/message/fusion/mptbase.c 2011-01-04 19:50:19.000000000 -0500
25632 ++++ linux-2.6.37.4/drivers/message/fusion/mptbase.c 2011-01-17 02:41:01.000000000 -0500
25633 @@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct
25634 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
25635 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
25636 @@ -26085,9 +26264,9 @@ diff -urNp linux-2.6.37.3/drivers/message/fusion/mptbase.c linux-2.6.37.3/driver
25637 /*
25638 * Rounding UP to nearest 4-kB boundary here...
25639 */
25640 -diff -urNp linux-2.6.37.3/drivers/message/fusion/mptdebug.h linux-2.6.37.3/drivers/message/fusion/mptdebug.h
25641 ---- linux-2.6.37.3/drivers/message/fusion/mptdebug.h 2011-01-04 19:50:19.000000000 -0500
25642 -+++ linux-2.6.37.3/drivers/message/fusion/mptdebug.h 2011-01-17 02:41:01.000000000 -0500
25643 +diff -urNp linux-2.6.37.4/drivers/message/fusion/mptdebug.h linux-2.6.37.4/drivers/message/fusion/mptdebug.h
25644 +--- linux-2.6.37.4/drivers/message/fusion/mptdebug.h 2011-01-04 19:50:19.000000000 -0500
25645 ++++ linux-2.6.37.4/drivers/message/fusion/mptdebug.h 2011-01-17 02:41:01.000000000 -0500
25646 @@ -71,7 +71,7 @@
25647 CMD; \
25648 }
25649 @@ -26097,9 +26276,9 @@ diff -urNp linux-2.6.37.3/drivers/message/fusion/mptdebug.h linux-2.6.37.3/drive
25650 #endif
25651
25652
25653 -diff -urNp linux-2.6.37.3/drivers/message/fusion/mptsas.c linux-2.6.37.3/drivers/message/fusion/mptsas.c
25654 ---- linux-2.6.37.3/drivers/message/fusion/mptsas.c 2011-01-04 19:50:19.000000000 -0500
25655 -+++ linux-2.6.37.3/drivers/message/fusion/mptsas.c 2011-01-17 02:41:01.000000000 -0500
25656 +diff -urNp linux-2.6.37.4/drivers/message/fusion/mptsas.c linux-2.6.37.4/drivers/message/fusion/mptsas.c
25657 +--- linux-2.6.37.4/drivers/message/fusion/mptsas.c 2011-01-04 19:50:19.000000000 -0500
25658 ++++ linux-2.6.37.4/drivers/message/fusion/mptsas.c 2011-01-17 02:41:01.000000000 -0500
25659 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
25660 return 0;
25661 }
25662 @@ -26148,9 +26327,9 @@ diff -urNp linux-2.6.37.3/drivers/message/fusion/mptsas.c linux-2.6.37.3/drivers
25663 static inline struct sas_port *
25664 mptsas_get_port(struct mptsas_phyinfo *phy_info)
25665 {
25666 -diff -urNp linux-2.6.37.3/drivers/message/fusion/mptscsih.c linux-2.6.37.3/drivers/message/fusion/mptscsih.c
25667 ---- linux-2.6.37.3/drivers/message/fusion/mptscsih.c 2011-02-27 14:49:17.000000000 -0500
25668 -+++ linux-2.6.37.3/drivers/message/fusion/mptscsih.c 2011-02-27 14:49:53.000000000 -0500
25669 +diff -urNp linux-2.6.37.4/drivers/message/fusion/mptscsih.c linux-2.6.37.4/drivers/message/fusion/mptscsih.c
25670 +--- linux-2.6.37.4/drivers/message/fusion/mptscsih.c 2011-02-27 14:49:17.000000000 -0500
25671 ++++ linux-2.6.37.4/drivers/message/fusion/mptscsih.c 2011-02-27 14:49:53.000000000 -0500
25672 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
25673
25674 h = shost_priv(SChost);
25675 @@ -26176,9 +26355,9 @@ diff -urNp linux-2.6.37.3/drivers/message/fusion/mptscsih.c linux-2.6.37.3/drive
25676
25677 return h->info_kbuf;
25678 }
25679 -diff -urNp linux-2.6.37.3/drivers/message/i2o/i2o_proc.c linux-2.6.37.3/drivers/message/i2o/i2o_proc.c
25680 ---- linux-2.6.37.3/drivers/message/i2o/i2o_proc.c 2011-01-04 19:50:19.000000000 -0500
25681 -+++ linux-2.6.37.3/drivers/message/i2o/i2o_proc.c 2011-01-17 02:41:01.000000000 -0500
25682 +diff -urNp linux-2.6.37.4/drivers/message/i2o/i2o_proc.c linux-2.6.37.4/drivers/message/i2o/i2o_proc.c
25683 +--- linux-2.6.37.4/drivers/message/i2o/i2o_proc.c 2011-01-04 19:50:19.000000000 -0500
25684 ++++ linux-2.6.37.4/drivers/message/i2o/i2o_proc.c 2011-01-17 02:41:01.000000000 -0500
25685 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
25686 "Array Controller Device"
25687 };
25688 @@ -26265,9 +26444,9 @@ diff -urNp linux-2.6.37.3/drivers/message/i2o/i2o_proc.c linux-2.6.37.3/drivers/
25689
25690 return 0;
25691 }
25692 -diff -urNp linux-2.6.37.3/drivers/mfd/ab3100-core.c linux-2.6.37.3/drivers/mfd/ab3100-core.c
25693 ---- linux-2.6.37.3/drivers/mfd/ab3100-core.c 2011-01-04 19:50:19.000000000 -0500
25694 -+++ linux-2.6.37.3/drivers/mfd/ab3100-core.c 2011-02-27 15:32:39.000000000 -0500
25695 +diff -urNp linux-2.6.37.4/drivers/mfd/ab3100-core.c linux-2.6.37.4/drivers/mfd/ab3100-core.c
25696 +--- linux-2.6.37.4/drivers/mfd/ab3100-core.c 2011-01-04 19:50:19.000000000 -0500
25697 ++++ linux-2.6.37.4/drivers/mfd/ab3100-core.c 2011-02-27 15:32:39.000000000 -0500
25698 @@ -613,7 +613,7 @@ static void ab3100_setup_debugfs(struct
25699 ab3100_get_priv.ab3100 = ab3100;
25700 ab3100_get_priv.mode = false;
25701 @@ -26286,9 +26465,9 @@ diff -urNp linux-2.6.37.3/drivers/mfd/ab3100-core.c linux-2.6.37.3/drivers/mfd/a
25702 &ab3100_get_set_reg_fops);
25703 if (!ab3100_set_reg_file) {
25704 err = -ENOMEM;
25705 -diff -urNp linux-2.6.37.3/drivers/mfd/ab3550-core.c linux-2.6.37.3/drivers/mfd/ab3550-core.c
25706 ---- linux-2.6.37.3/drivers/mfd/ab3550-core.c 2011-01-04 19:50:19.000000000 -0500
25707 -+++ linux-2.6.37.3/drivers/mfd/ab3550-core.c 2011-02-27 15:33:08.000000000 -0500
25708 +diff -urNp linux-2.6.37.4/drivers/mfd/ab3550-core.c linux-2.6.37.4/drivers/mfd/ab3550-core.c
25709 +--- linux-2.6.37.4/drivers/mfd/ab3550-core.c 2011-01-04 19:50:19.000000000 -0500
25710 ++++ linux-2.6.37.4/drivers/mfd/ab3550-core.c 2011-02-27 15:33:08.000000000 -0500
25711 @@ -1053,17 +1053,17 @@ static inline void ab3550_setup_debugfs(
25712 goto exit_destroy_dir;
25713
25714 @@ -26310,9 +26489,9 @@ diff -urNp linux-2.6.37.3/drivers/mfd/ab3550-core.c linux-2.6.37.3/drivers/mfd/a
25715 if (!ab3550_val_file)
25716 goto exit_destroy_address;
25717
25718 -diff -urNp linux-2.6.37.3/drivers/mfd/ab8500-debugfs.c linux-2.6.37.3/drivers/mfd/ab8500-debugfs.c
25719 ---- linux-2.6.37.3/drivers/mfd/ab8500-debugfs.c 2011-01-04 19:50:19.000000000 -0500
25720 -+++ linux-2.6.37.3/drivers/mfd/ab8500-debugfs.c 2011-02-27 15:33:15.000000000 -0500
25721 +diff -urNp linux-2.6.37.4/drivers/mfd/ab8500-debugfs.c linux-2.6.37.4/drivers/mfd/ab8500-debugfs.c
25722 +--- linux-2.6.37.4/drivers/mfd/ab8500-debugfs.c 2011-01-04 19:50:19.000000000 -0500
25723 ++++ linux-2.6.37.4/drivers/mfd/ab8500-debugfs.c 2011-02-27 15:33:15.000000000 -0500
25724 @@ -585,18 +585,18 @@ static int __devinit ab8500_debug_probe(
25725 goto exit_destroy_dir;
25726
25727 @@ -26335,9 +26514,9 @@ diff -urNp linux-2.6.37.3/drivers/mfd/ab8500-debugfs.c linux-2.6.37.3/drivers/mf
25728 if (!ab8500_val_file)
25729 goto exit_destroy_address;
25730
25731 -diff -urNp linux-2.6.37.3/drivers/mfd/janz-cmodio.c linux-2.6.37.3/drivers/mfd/janz-cmodio.c
25732 ---- linux-2.6.37.3/drivers/mfd/janz-cmodio.c 2011-01-04 19:50:19.000000000 -0500
25733 -+++ linux-2.6.37.3/drivers/mfd/janz-cmodio.c 2011-01-17 02:41:01.000000000 -0500
25734 +diff -urNp linux-2.6.37.4/drivers/mfd/janz-cmodio.c linux-2.6.37.4/drivers/mfd/janz-cmodio.c
25735 +--- linux-2.6.37.4/drivers/mfd/janz-cmodio.c 2011-01-04 19:50:19.000000000 -0500
25736 ++++ linux-2.6.37.4/drivers/mfd/janz-cmodio.c 2011-01-17 02:41:01.000000000 -0500
25737 @@ -13,6 +13,7 @@
25738
25739 #include <linux/kernel.h>
25740 @@ -26346,9 +26525,9 @@ diff -urNp linux-2.6.37.3/drivers/mfd/janz-cmodio.c linux-2.6.37.3/drivers/mfd/j
25741 #include <linux/init.h>
25742 #include <linux/pci.h>
25743 #include <linux/interrupt.h>
25744 -diff -urNp linux-2.6.37.3/drivers/misc/ep93xx_pwm.c linux-2.6.37.3/drivers/misc/ep93xx_pwm.c
25745 ---- linux-2.6.37.3/drivers/misc/ep93xx_pwm.c 2011-01-04 19:50:19.000000000 -0500
25746 -+++ linux-2.6.37.3/drivers/misc/ep93xx_pwm.c 2011-02-27 15:24:05.000000000 -0500
25747 +diff -urNp linux-2.6.37.4/drivers/misc/ep93xx_pwm.c linux-2.6.37.4/drivers/misc/ep93xx_pwm.c
25748 +--- linux-2.6.37.4/drivers/misc/ep93xx_pwm.c 2011-01-04 19:50:19.000000000 -0500
25749 ++++ linux-2.6.37.4/drivers/misc/ep93xx_pwm.c 2011-02-27 15:24:05.000000000 -0500
25750 @@ -249,11 +249,11 @@ static ssize_t ep93xx_pwm_set_invert(str
25751
25752 static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL);
25753 @@ -26364,9 +26543,9 @@ diff -urNp linux-2.6.37.3/drivers/misc/ep93xx_pwm.c linux-2.6.37.3/drivers/misc/
25754 ep93xx_pwm_get_invert, ep93xx_pwm_set_invert);
25755
25756 static struct attribute *ep93xx_pwm_attrs[] = {
25757 -diff -urNp linux-2.6.37.3/drivers/misc/kgdbts.c linux-2.6.37.3/drivers/misc/kgdbts.c
25758 ---- linux-2.6.37.3/drivers/misc/kgdbts.c 2011-01-04 19:50:19.000000000 -0500
25759 -+++ linux-2.6.37.3/drivers/misc/kgdbts.c 2011-01-17 02:41:01.000000000 -0500
25760 +diff -urNp linux-2.6.37.4/drivers/misc/kgdbts.c linux-2.6.37.4/drivers/misc/kgdbts.c
25761 +--- linux-2.6.37.4/drivers/misc/kgdbts.c 2011-01-04 19:50:19.000000000 -0500
25762 ++++ linux-2.6.37.4/drivers/misc/kgdbts.c 2011-01-17 02:41:01.000000000 -0500
25763 @@ -118,7 +118,7 @@
25764 } while (0)
25765 #define MAX_CONFIG_LEN 40
25766 @@ -26385,9 +26564,9 @@ diff -urNp linux-2.6.37.3/drivers/misc/kgdbts.c linux-2.6.37.3/drivers/misc/kgdb
25767 .name = "kgdbts",
25768 .read_char = kgdbts_get_char,
25769 .write_char = kgdbts_put_char,
25770 -diff -urNp linux-2.6.37.3/drivers/misc/sgi-gru/gruhandles.c linux-2.6.37.3/drivers/misc/sgi-gru/gruhandles.c
25771 ---- linux-2.6.37.3/drivers/misc/sgi-gru/gruhandles.c 2011-01-04 19:50:19.000000000 -0500
25772 -+++ linux-2.6.37.3/drivers/misc/sgi-gru/gruhandles.c 2011-01-17 02:41:01.000000000 -0500
25773 +diff -urNp linux-2.6.37.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.37.4/drivers/misc/sgi-gru/gruhandles.c
25774 +--- linux-2.6.37.4/drivers/misc/sgi-gru/gruhandles.c 2011-01-04 19:50:19.000000000 -0500
25775 ++++ linux-2.6.37.4/drivers/misc/sgi-gru/gruhandles.c 2011-01-17 02:41:01.000000000 -0500
25776 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
25777 unsigned long nsec;
25778
25779 @@ -26399,9 +26578,9 @@ diff -urNp linux-2.6.37.3/drivers/misc/sgi-gru/gruhandles.c linux-2.6.37.3/drive
25780 if (mcs_op_statistics[op].max < nsec)
25781 mcs_op_statistics[op].max = nsec;
25782 }
25783 -diff -urNp linux-2.6.37.3/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.37.3/drivers/misc/sgi-gru/gruprocfs.c
25784 ---- linux-2.6.37.3/drivers/misc/sgi-gru/gruprocfs.c 2011-01-04 19:50:19.000000000 -0500
25785 -+++ linux-2.6.37.3/drivers/misc/sgi-gru/gruprocfs.c 2011-01-17 02:41:01.000000000 -0500
25786 +diff -urNp linux-2.6.37.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.37.4/drivers/misc/sgi-gru/gruprocfs.c
25787 +--- linux-2.6.37.4/drivers/misc/sgi-gru/gruprocfs.c 2011-01-04 19:50:19.000000000 -0500
25788 ++++ linux-2.6.37.4/drivers/misc/sgi-gru/gruprocfs.c 2011-01-17 02:41:01.000000000 -0500
25789 @@ -32,9 +32,9 @@
25790
25791 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
25792 @@ -26425,9 +26604,9 @@ diff -urNp linux-2.6.37.3/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.37.3/driver
25793 max = mcs_op_statistics[op].max;
25794 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
25795 count ? total / count : 0, max);
25796 -diff -urNp linux-2.6.37.3/drivers/misc/sgi-gru/grutables.h linux-2.6.37.3/drivers/misc/sgi-gru/grutables.h
25797 ---- linux-2.6.37.3/drivers/misc/sgi-gru/grutables.h 2011-01-04 19:50:19.000000000 -0500
25798 -+++ linux-2.6.37.3/drivers/misc/sgi-gru/grutables.h 2011-01-17 02:41:01.000000000 -0500
25799 +diff -urNp linux-2.6.37.4/drivers/misc/sgi-gru/grutables.h linux-2.6.37.4/drivers/misc/sgi-gru/grutables.h
25800 +--- linux-2.6.37.4/drivers/misc/sgi-gru/grutables.h 2011-01-04 19:50:19.000000000 -0500
25801 ++++ linux-2.6.37.4/drivers/misc/sgi-gru/grutables.h 2011-01-17 02:41:01.000000000 -0500
25802 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
25803 * GRU statistics.
25804 */
25805 @@ -26607,9 +26786,9 @@ diff -urNp linux-2.6.37.3/drivers/misc/sgi-gru/grutables.h linux-2.6.37.3/driver
25806 } while (0)
25807
25808 #ifdef CONFIG_SGI_GRU_DEBUG
25809 -diff -urNp linux-2.6.37.3/drivers/mtd/devices/doc2000.c linux-2.6.37.3/drivers/mtd/devices/doc2000.c
25810 ---- linux-2.6.37.3/drivers/mtd/devices/doc2000.c 2011-01-04 19:50:19.000000000 -0500
25811 -+++ linux-2.6.37.3/drivers/mtd/devices/doc2000.c 2011-01-17 02:41:01.000000000 -0500
25812 +diff -urNp linux-2.6.37.4/drivers/mtd/devices/doc2000.c linux-2.6.37.4/drivers/mtd/devices/doc2000.c
25813 +--- linux-2.6.37.4/drivers/mtd/devices/doc2000.c 2011-01-04 19:50:19.000000000 -0500
25814 ++++ linux-2.6.37.4/drivers/mtd/devices/doc2000.c 2011-01-17 02:41:01.000000000 -0500
25815 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
25816
25817 /* The ECC will not be calculated correctly if less than 512 is written */
25818 @@ -26619,9 +26798,9 @@ diff -urNp linux-2.6.37.3/drivers/mtd/devices/doc2000.c linux-2.6.37.3/drivers/m
25819 printk(KERN_WARNING
25820 "ECC needs a full sector write (adr: %lx size %lx)\n",
25821 (long) to, (long) len);
25822 -diff -urNp linux-2.6.37.3/drivers/mtd/devices/doc2001.c linux-2.6.37.3/drivers/mtd/devices/doc2001.c
25823 ---- linux-2.6.37.3/drivers/mtd/devices/doc2001.c 2011-01-04 19:50:19.000000000 -0500
25824 -+++ linux-2.6.37.3/drivers/mtd/devices/doc2001.c 2011-01-17 02:41:01.000000000 -0500
25825 +diff -urNp linux-2.6.37.4/drivers/mtd/devices/doc2001.c linux-2.6.37.4/drivers/mtd/devices/doc2001.c
25826 +--- linux-2.6.37.4/drivers/mtd/devices/doc2001.c 2011-01-04 19:50:19.000000000 -0500
25827 ++++ linux-2.6.37.4/drivers/mtd/devices/doc2001.c 2011-01-17 02:41:01.000000000 -0500
25828 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
25829 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
25830
25831 @@ -26631,9 +26810,9 @@ diff -urNp linux-2.6.37.3/drivers/mtd/devices/doc2001.c linux-2.6.37.3/drivers/m
25832 return -EINVAL;
25833
25834 /* Don't allow a single read to cross a 512-byte block boundary */
25835 -diff -urNp linux-2.6.37.3/drivers/mtd/nand/denali.c linux-2.6.37.3/drivers/mtd/nand/denali.c
25836 ---- linux-2.6.37.3/drivers/mtd/nand/denali.c 2011-01-04 19:50:19.000000000 -0500
25837 -+++ linux-2.6.37.3/drivers/mtd/nand/denali.c 2011-01-17 02:41:01.000000000 -0500
25838 +diff -urNp linux-2.6.37.4/drivers/mtd/nand/denali.c linux-2.6.37.4/drivers/mtd/nand/denali.c
25839 +--- linux-2.6.37.4/drivers/mtd/nand/denali.c 2011-01-04 19:50:19.000000000 -0500
25840 ++++ linux-2.6.37.4/drivers/mtd/nand/denali.c 2011-01-17 02:41:01.000000000 -0500
25841 @@ -25,6 +25,7 @@
25842 #include <linux/pci.h>
25843 #include <linux/mtd/mtd.h>
25844 @@ -26642,9 +26821,9 @@ diff -urNp linux-2.6.37.3/drivers/mtd/nand/denali.c linux-2.6.37.3/drivers/mtd/n
25845
25846 #include "denali.h"
25847
25848 -diff -urNp linux-2.6.37.3/drivers/mtd/ubi/build.c linux-2.6.37.3/drivers/mtd/ubi/build.c
25849 ---- linux-2.6.37.3/drivers/mtd/ubi/build.c 2011-01-04 19:50:19.000000000 -0500
25850 -+++ linux-2.6.37.3/drivers/mtd/ubi/build.c 2011-01-17 02:41:01.000000000 -0500
25851 +diff -urNp linux-2.6.37.4/drivers/mtd/ubi/build.c linux-2.6.37.4/drivers/mtd/ubi/build.c
25852 +--- linux-2.6.37.4/drivers/mtd/ubi/build.c 2011-01-04 19:50:19.000000000 -0500
25853 ++++ linux-2.6.37.4/drivers/mtd/ubi/build.c 2011-01-17 02:41:01.000000000 -0500
25854 @@ -1285,7 +1285,7 @@ module_exit(ubi_exit);
25855 static int __init bytes_str_to_int(const char *str)
25856 {
25857 @@ -26684,9 +26863,9 @@ diff -urNp linux-2.6.37.3/drivers/mtd/ubi/build.c linux-2.6.37.3/drivers/mtd/ubi
25858 }
25859
25860 /**
25861 -diff -urNp linux-2.6.37.3/drivers/net/e1000e/82571.c linux-2.6.37.3/drivers/net/e1000e/82571.c
25862 ---- linux-2.6.37.3/drivers/net/e1000e/82571.c 2011-01-04 19:50:19.000000000 -0500
25863 -+++ linux-2.6.37.3/drivers/net/e1000e/82571.c 2011-01-17 02:41:01.000000000 -0500
25864 +diff -urNp linux-2.6.37.4/drivers/net/e1000e/82571.c linux-2.6.37.4/drivers/net/e1000e/82571.c
25865 +--- linux-2.6.37.4/drivers/net/e1000e/82571.c 2011-01-04 19:50:19.000000000 -0500
25866 ++++ linux-2.6.37.4/drivers/net/e1000e/82571.c 2011-01-17 02:41:01.000000000 -0500
25867 @@ -211,6 +211,7 @@ static s32 e1000_init_mac_params_82571(s
25868 {
25869 struct e1000_hw *hw = &adapter->hw;
25870 @@ -26740,9 +26919,9 @@ diff -urNp linux-2.6.37.3/drivers/net/e1000e/82571.c linux-2.6.37.3/drivers/net/
25871 .acquire = e1000_acquire_nvm_82571,
25872 .read = e1000e_read_nvm_eerd,
25873 .release = e1000_release_nvm_82571,
25874 -diff -urNp linux-2.6.37.3/drivers/net/e1000e/e1000.h linux-2.6.37.3/drivers/net/e1000e/e1000.h
25875 ---- linux-2.6.37.3/drivers/net/e1000e/e1000.h 2011-01-04 19:50:19.000000000 -0500
25876 -+++ linux-2.6.37.3/drivers/net/e1000e/e1000.h 2011-01-17 02:41:01.000000000 -0500
25877 +diff -urNp linux-2.6.37.4/drivers/net/e1000e/e1000.h linux-2.6.37.4/drivers/net/e1000e/e1000.h
25878 +--- linux-2.6.37.4/drivers/net/e1000e/e1000.h 2011-01-04 19:50:19.000000000 -0500
25879 ++++ linux-2.6.37.4/drivers/net/e1000e/e1000.h 2011-01-17 02:41:01.000000000 -0500
25880 @@ -407,9 +407,9 @@ struct e1000_info {
25881 u32 pba;
25882 u32 max_hw_frame_size;
25883 @@ -26756,9 +26935,9 @@ diff -urNp linux-2.6.37.3/drivers/net/e1000e/e1000.h linux-2.6.37.3/drivers/net/
25884 };
25885
25886 /* hardware capability, feature, and workaround flags */
25887 -diff -urNp linux-2.6.37.3/drivers/net/e1000e/es2lan.c linux-2.6.37.3/drivers/net/e1000e/es2lan.c
25888 ---- linux-2.6.37.3/drivers/net/e1000e/es2lan.c 2011-01-04 19:50:19.000000000 -0500
25889 -+++ linux-2.6.37.3/drivers/net/e1000e/es2lan.c 2011-01-17 02:41:01.000000000 -0500
25890 +diff -urNp linux-2.6.37.4/drivers/net/e1000e/es2lan.c linux-2.6.37.4/drivers/net/e1000e/es2lan.c
25891 +--- linux-2.6.37.4/drivers/net/e1000e/es2lan.c 2011-01-04 19:50:19.000000000 -0500
25892 ++++ linux-2.6.37.4/drivers/net/e1000e/es2lan.c 2011-01-17 02:41:01.000000000 -0500
25893 @@ -205,6 +205,7 @@ static s32 e1000_init_mac_params_80003es
25894 {
25895 struct e1000_hw *hw = &adapter->hw;
25896 @@ -26794,9 +26973,9 @@ diff -urNp linux-2.6.37.3/drivers/net/e1000e/es2lan.c linux-2.6.37.3/drivers/net
25897 .acquire = e1000_acquire_nvm_80003es2lan,
25898 .read = e1000e_read_nvm_eerd,
25899 .release = e1000_release_nvm_80003es2lan,
25900 -diff -urNp linux-2.6.37.3/drivers/net/e1000e/hw.h linux-2.6.37.3/drivers/net/e1000e/hw.h
25901 ---- linux-2.6.37.3/drivers/net/e1000e/hw.h 2011-01-04 19:50:19.000000000 -0500
25902 -+++ linux-2.6.37.3/drivers/net/e1000e/hw.h 2011-01-17 02:41:01.000000000 -0500
25903 +diff -urNp linux-2.6.37.4/drivers/net/e1000e/hw.h linux-2.6.37.4/drivers/net/e1000e/hw.h
25904 +--- linux-2.6.37.4/drivers/net/e1000e/hw.h 2011-01-04 19:50:19.000000000 -0500
25905 ++++ linux-2.6.37.4/drivers/net/e1000e/hw.h 2011-01-17 02:41:01.000000000 -0500
25906 @@ -800,16 +800,17 @@ struct e1000_phy_operations {
25907
25908 /* Function pointers for the NVM. */
25909 @@ -26838,9 +27017,9 @@ diff -urNp linux-2.6.37.3/drivers/net/e1000e/hw.h linux-2.6.37.3/drivers/net/e10
25910 struct e1000_nvm_operations ops;
25911
25912 enum e1000_nvm_type type;
25913 -diff -urNp linux-2.6.37.3/drivers/net/e1000e/ich8lan.c linux-2.6.37.3/drivers/net/e1000e/ich8lan.c
25914 ---- linux-2.6.37.3/drivers/net/e1000e/ich8lan.c 2011-03-11 17:22:42.000000000 -0500
25915 -+++ linux-2.6.37.3/drivers/net/e1000e/ich8lan.c 2011-03-11 17:23:03.000000000 -0500
25916 +diff -urNp linux-2.6.37.4/drivers/net/e1000e/ich8lan.c linux-2.6.37.4/drivers/net/e1000e/ich8lan.c
25917 +--- linux-2.6.37.4/drivers/net/e1000e/ich8lan.c 2011-03-11 17:22:42.000000000 -0500
25918 ++++ linux-2.6.37.4/drivers/net/e1000e/ich8lan.c 2011-03-11 17:23:03.000000000 -0500
25919 @@ -3862,7 +3862,7 @@ static void e1000_clear_hw_cntrs_ich8lan
25920 }
25921 }
25922 @@ -26868,9 +27047,9 @@ diff -urNp linux-2.6.37.3/drivers/net/e1000e/ich8lan.c linux-2.6.37.3/drivers/ne
25923 .acquire = e1000_acquire_nvm_ich8lan,
25924 .read = e1000_read_nvm_ich8lan,
25925 .release = e1000_release_nvm_ich8lan,
25926 -diff -urNp linux-2.6.37.3/drivers/net/igb/e1000_82575.c linux-2.6.37.3/drivers/net/igb/e1000_82575.c
25927 ---- linux-2.6.37.3/drivers/net/igb/e1000_82575.c 2011-01-04 19:50:19.000000000 -0500
25928 -+++ linux-2.6.37.3/drivers/net/igb/e1000_82575.c 2011-01-17 02:41:01.000000000 -0500
25929 +diff -urNp linux-2.6.37.4/drivers/net/igb/e1000_82575.c linux-2.6.37.4/drivers/net/igb/e1000_82575.c
25930 +--- linux-2.6.37.4/drivers/net/igb/e1000_82575.c 2011-01-04 19:50:19.000000000 -0500
25931 ++++ linux-2.6.37.4/drivers/net/igb/e1000_82575.c 2011-01-17 02:41:01.000000000 -0500
25932 @@ -1712,7 +1712,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
25933 return ret_val;
25934 }
25935 @@ -26896,9 +27075,9 @@ diff -urNp linux-2.6.37.3/drivers/net/igb/e1000_82575.c linux-2.6.37.3/drivers/n
25936 .acquire = igb_acquire_nvm_82575,
25937 .read = igb_read_nvm_eerd,
25938 .release = igb_release_nvm_82575,
25939 -diff -urNp linux-2.6.37.3/drivers/net/igb/e1000_hw.h linux-2.6.37.3/drivers/net/igb/e1000_hw.h
25940 ---- linux-2.6.37.3/drivers/net/igb/e1000_hw.h 2011-01-04 19:50:19.000000000 -0500
25941 -+++ linux-2.6.37.3/drivers/net/igb/e1000_hw.h 2011-01-17 02:41:01.000000000 -0500
25942 +diff -urNp linux-2.6.37.4/drivers/net/igb/e1000_hw.h linux-2.6.37.4/drivers/net/igb/e1000_hw.h
25943 +--- linux-2.6.37.4/drivers/net/igb/e1000_hw.h 2011-01-04 19:50:19.000000000 -0500
25944 ++++ linux-2.6.37.4/drivers/net/igb/e1000_hw.h 2011-01-17 02:41:01.000000000 -0500
25945 @@ -325,22 +325,23 @@ struct e1000_phy_operations {
25946 };
25947
25948 @@ -26946,9 +27125,9 @@ diff -urNp linux-2.6.37.3/drivers/net/igb/e1000_hw.h linux-2.6.37.3/drivers/net/
25949 struct e1000_nvm_operations ops;
25950
25951 enum e1000_nvm_type type;
25952 -diff -urNp linux-2.6.37.3/drivers/net/igbvf/vf.h linux-2.6.37.3/drivers/net/igbvf/vf.h
25953 ---- linux-2.6.37.3/drivers/net/igbvf/vf.h 2011-01-04 19:50:19.000000000 -0500
25954 -+++ linux-2.6.37.3/drivers/net/igbvf/vf.h 2011-01-17 02:41:01.000000000 -0500
25955 +diff -urNp linux-2.6.37.4/drivers/net/igbvf/vf.h linux-2.6.37.4/drivers/net/igbvf/vf.h
25956 +--- linux-2.6.37.4/drivers/net/igbvf/vf.h 2011-01-04 19:50:19.000000000 -0500
25957 ++++ linux-2.6.37.4/drivers/net/igbvf/vf.h 2011-01-17 02:41:01.000000000 -0500
25958 @@ -189,6 +189,7 @@ struct e1000_mac_operations {
25959 };
25960
25961 @@ -26957,9 +27136,9 @@ diff -urNp linux-2.6.37.3/drivers/net/igbvf/vf.h linux-2.6.37.3/drivers/net/igbv
25962 struct e1000_mac_operations ops;
25963 u8 addr[6];
25964 u8 perm_addr[6];
25965 -diff -urNp linux-2.6.37.3/drivers/net/irda/vlsi_ir.c linux-2.6.37.3/drivers/net/irda/vlsi_ir.c
25966 ---- linux-2.6.37.3/drivers/net/irda/vlsi_ir.c 2011-01-04 19:50:19.000000000 -0500
25967 -+++ linux-2.6.37.3/drivers/net/irda/vlsi_ir.c 2011-01-17 02:41:01.000000000 -0500
25968 +diff -urNp linux-2.6.37.4/drivers/net/irda/vlsi_ir.c linux-2.6.37.4/drivers/net/irda/vlsi_ir.c
25969 +--- linux-2.6.37.4/drivers/net/irda/vlsi_ir.c 2011-01-04 19:50:19.000000000 -0500
25970 ++++ linux-2.6.37.4/drivers/net/irda/vlsi_ir.c 2011-01-17 02:41:01.000000000 -0500
25971 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
25972 /* no race - tx-ring already empty */
25973 vlsi_set_baud(idev, iobase);
25974 @@ -26976,9 +27155,9 @@ diff -urNp linux-2.6.37.3/drivers/net/irda/vlsi_ir.c linux-2.6.37.3/drivers/net/
25975 spin_unlock_irqrestore(&idev->lock, flags);
25976 dev_kfree_skb_any(skb);
25977 return NETDEV_TX_OK;
25978 -diff -urNp linux-2.6.37.3/drivers/net/macvtap.c linux-2.6.37.3/drivers/net/macvtap.c
25979 ---- linux-2.6.37.3/drivers/net/macvtap.c 2011-01-04 19:50:19.000000000 -0500
25980 -+++ linux-2.6.37.3/drivers/net/macvtap.c 2011-01-17 02:41:01.000000000 -0500
25981 +diff -urNp linux-2.6.37.4/drivers/net/macvtap.c linux-2.6.37.4/drivers/net/macvtap.c
25982 +--- linux-2.6.37.4/drivers/net/macvtap.c 2011-01-04 19:50:19.000000000 -0500
25983 ++++ linux-2.6.37.4/drivers/net/macvtap.c 2011-01-17 02:41:01.000000000 -0500
25984 @@ -529,8 +529,9 @@ static ssize_t macvtap_get_user(struct m
25985 vnet_hdr_len = q->vnet_hdr_sz;
25986
25987 @@ -26990,9 +27169,9 @@ diff -urNp linux-2.6.37.3/drivers/net/macvtap.c linux-2.6.37.3/drivers/net/macvt
25988
25989 err = memcpy_fromiovecend((void *)&vnet_hdr, iv, 0,
25990 sizeof(vnet_hdr));
25991 -diff -urNp linux-2.6.37.3/drivers/net/pcnet32.c linux-2.6.37.3/drivers/net/pcnet32.c
25992 ---- linux-2.6.37.3/drivers/net/pcnet32.c 2011-01-04 19:50:19.000000000 -0500
25993 -+++ linux-2.6.37.3/drivers/net/pcnet32.c 2011-01-17 02:41:01.000000000 -0500
25994 +diff -urNp linux-2.6.37.4/drivers/net/pcnet32.c linux-2.6.37.4/drivers/net/pcnet32.c
25995 +--- linux-2.6.37.4/drivers/net/pcnet32.c 2011-01-04 19:50:19.000000000 -0500
25996 ++++ linux-2.6.37.4/drivers/net/pcnet32.c 2011-01-17 02:41:01.000000000 -0500
25997 @@ -82,7 +82,7 @@ static int cards_found;
25998 /*
25999 * VLB I/O addresses
26000 @@ -27002,9 +27181,9 @@ diff -urNp linux-2.6.37.3/drivers/net/pcnet32.c linux-2.6.37.3/drivers/net/pcnet
26001 { 0x300, 0x320, 0x340, 0x360, 0 };
26002
26003 static int pcnet32_debug;
26004 -diff -urNp linux-2.6.37.3/drivers/net/ppp_generic.c linux-2.6.37.3/drivers/net/ppp_generic.c
26005 ---- linux-2.6.37.3/drivers/net/ppp_generic.c 2011-01-04 19:50:19.000000000 -0500
26006 -+++ linux-2.6.37.3/drivers/net/ppp_generic.c 2011-01-17 02:41:01.000000000 -0500
26007 +diff -urNp linux-2.6.37.4/drivers/net/ppp_generic.c linux-2.6.37.4/drivers/net/ppp_generic.c
26008 +--- linux-2.6.37.4/drivers/net/ppp_generic.c 2011-01-04 19:50:19.000000000 -0500
26009 ++++ linux-2.6.37.4/drivers/net/ppp_generic.c 2011-01-17 02:41:01.000000000 -0500
26010 @@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st
26011 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
26012 struct ppp_stats stats;
26013 @@ -27023,9 +27202,9 @@ diff -urNp linux-2.6.37.3/drivers/net/ppp_generic.c linux-2.6.37.3/drivers/net/p
26014 break;
26015 err = 0;
26016 break;
26017 -diff -urNp linux-2.6.37.3/drivers/net/tg3.h linux-2.6.37.3/drivers/net/tg3.h
26018 ---- linux-2.6.37.3/drivers/net/tg3.h 2011-01-04 19:50:19.000000000 -0500
26019 -+++ linux-2.6.37.3/drivers/net/tg3.h 2011-01-17 02:41:01.000000000 -0500
26020 +diff -urNp linux-2.6.37.4/drivers/net/tg3.h linux-2.6.37.4/drivers/net/tg3.h
26021 +--- linux-2.6.37.4/drivers/net/tg3.h 2011-01-04 19:50:19.000000000 -0500
26022 ++++ linux-2.6.37.4/drivers/net/tg3.h 2011-01-17 02:41:01.000000000 -0500
26023 @@ -131,6 +131,7 @@
26024 #define CHIPREV_ID_5750_A0 0x4000
26025 #define CHIPREV_ID_5750_A1 0x4001
26026 @@ -27034,9 +27213,9 @@ diff -urNp linux-2.6.37.3/drivers/net/tg3.h linux-2.6.37.3/drivers/net/tg3.h
26027 #define CHIPREV_ID_5750_C2 0x4202
26028 #define CHIPREV_ID_5752_A0_HW 0x5000
26029 #define CHIPREV_ID_5752_A0 0x6000
26030 -diff -urNp linux-2.6.37.3/drivers/net/tulip/de4x5.c linux-2.6.37.3/drivers/net/tulip/de4x5.c
26031 ---- linux-2.6.37.3/drivers/net/tulip/de4x5.c 2011-01-04 19:50:19.000000000 -0500
26032 -+++ linux-2.6.37.3/drivers/net/tulip/de4x5.c 2011-01-17 02:41:01.000000000 -0500
26033 +diff -urNp linux-2.6.37.4/drivers/net/tulip/de4x5.c linux-2.6.37.4/drivers/net/tulip/de4x5.c
26034 +--- linux-2.6.37.4/drivers/net/tulip/de4x5.c 2011-01-04 19:50:19.000000000 -0500
26035 ++++ linux-2.6.37.4/drivers/net/tulip/de4x5.c 2011-01-17 02:41:01.000000000 -0500
26036 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
26037 for (i=0; i<ETH_ALEN; i++) {
26038 tmp.addr[i] = dev->dev_addr[i];
26039 @@ -27055,9 +27234,9 @@ diff -urNp linux-2.6.37.3/drivers/net/tulip/de4x5.c linux-2.6.37.3/drivers/net/t
26040 return -EFAULT;
26041 break;
26042 }
26043 -diff -urNp linux-2.6.37.3/drivers/net/usb/hso.c linux-2.6.37.3/drivers/net/usb/hso.c
26044 ---- linux-2.6.37.3/drivers/net/usb/hso.c 2011-01-04 19:50:19.000000000 -0500
26045 -+++ linux-2.6.37.3/drivers/net/usb/hso.c 2011-01-24 18:04:15.000000000 -0500
26046 +diff -urNp linux-2.6.37.4/drivers/net/usb/hso.c linux-2.6.37.4/drivers/net/usb/hso.c
26047 +--- linux-2.6.37.4/drivers/net/usb/hso.c 2011-01-04 19:50:19.000000000 -0500
26048 ++++ linux-2.6.37.4/drivers/net/usb/hso.c 2011-01-24 18:04:15.000000000 -0500
26049 @@ -71,7 +71,7 @@
26050 #include <asm/byteorder.h>
26051 #include <linux/serial_core.h>
26052 @@ -27154,9 +27333,9 @@ diff -urNp linux-2.6.37.3/drivers/net/usb/hso.c linux-2.6.37.3/drivers/net/usb/h
26053 result =
26054 hso_start_serial_device(serial_table[i], GFP_NOIO);
26055 hso_kick_transmit(dev2ser(serial_table[i]));
26056 -diff -urNp linux-2.6.37.3/drivers/net/wireless/b43/debugfs.c linux-2.6.37.3/drivers/net/wireless/b43/debugfs.c
26057 ---- linux-2.6.37.3/drivers/net/wireless/b43/debugfs.c 2011-01-04 19:50:19.000000000 -0500
26058 -+++ linux-2.6.37.3/drivers/net/wireless/b43/debugfs.c 2011-01-17 02:41:01.000000000 -0500
26059 +diff -urNp linux-2.6.37.4/drivers/net/wireless/b43/debugfs.c linux-2.6.37.4/drivers/net/wireless/b43/debugfs.c
26060 +--- linux-2.6.37.4/drivers/net/wireless/b43/debugfs.c 2011-01-04 19:50:19.000000000 -0500
26061 ++++ linux-2.6.37.4/drivers/net/wireless/b43/debugfs.c 2011-01-17 02:41:01.000000000 -0500
26062 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
26063 struct b43_debugfs_fops {
26064 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
26065 @@ -27166,9 +27345,9 @@ diff -urNp linux-2.6.37.3/drivers/net/wireless/b43/debugfs.c linux-2.6.37.3/driv
26066 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
26067 size_t file_struct_offset;
26068 };
26069 -diff -urNp linux-2.6.37.3/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.37.3/drivers/net/wireless/b43legacy/debugfs.c
26070 ---- linux-2.6.37.3/drivers/net/wireless/b43legacy/debugfs.c 2011-01-04 19:50:19.000000000 -0500
26071 -+++ linux-2.6.37.3/drivers/net/wireless/b43legacy/debugfs.c 2011-01-17 02:41:01.000000000 -0500
26072 +diff -urNp linux-2.6.37.4/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.37.4/drivers/net/wireless/b43legacy/debugfs.c
26073 +--- linux-2.6.37.4/drivers/net/wireless/b43legacy/debugfs.c 2011-01-04 19:50:19.000000000 -0500
26074 ++++ linux-2.6.37.4/drivers/net/wireless/b43legacy/debugfs.c 2011-01-17 02:41:01.000000000 -0500
26075 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
26076 struct b43legacy_debugfs_fops {
26077 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
26078 @@ -27178,9 +27357,9 @@ diff -urNp linux-2.6.37.3/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.37.
26079 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
26080 size_t file_struct_offset;
26081 /* Take wl->irq_lock before calling read/write? */
26082 -diff -urNp linux-2.6.37.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.37.3/drivers/net/wireless/iwlwifi/iwl-debug.h
26083 ---- linux-2.6.37.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-04 19:50:19.000000000 -0500
26084 -+++ linux-2.6.37.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-17 02:41:01.000000000 -0500
26085 +diff -urNp linux-2.6.37.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.37.4/drivers/net/wireless/iwlwifi/iwl-debug.h
26086 +--- linux-2.6.37.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-04 19:50:19.000000000 -0500
26087 ++++ linux-2.6.37.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-17 02:41:01.000000000 -0500
26088 @@ -68,8 +68,8 @@ do {
26089 } while (0)
26090
26091 @@ -27192,9 +27371,9 @@ diff -urNp linux-2.6.37.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.37.
26092 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
26093 const void *p, u32 len)
26094 {}
26095 -diff -urNp linux-2.6.37.3/drivers/net/wireless/libertas/debugfs.c linux-2.6.37.3/drivers/net/wireless/libertas/debugfs.c
26096 ---- linux-2.6.37.3/drivers/net/wireless/libertas/debugfs.c 2011-01-04 19:50:19.000000000 -0500
26097 -+++ linux-2.6.37.3/drivers/net/wireless/libertas/debugfs.c 2011-01-17 02:41:01.000000000 -0500
26098 +diff -urNp linux-2.6.37.4/drivers/net/wireless/libertas/debugfs.c linux-2.6.37.4/drivers/net/wireless/libertas/debugfs.c
26099 +--- linux-2.6.37.4/drivers/net/wireless/libertas/debugfs.c 2011-01-04 19:50:19.000000000 -0500
26100 ++++ linux-2.6.37.4/drivers/net/wireless/libertas/debugfs.c 2011-01-17 02:41:01.000000000 -0500
26101 @@ -702,7 +702,7 @@ out_unlock:
26102 struct lbs_debugfs_files {
26103 const char *name;
26104 @@ -27204,9 +27383,9 @@ diff -urNp linux-2.6.37.3/drivers/net/wireless/libertas/debugfs.c linux-2.6.37.3
26105 };
26106
26107 static const struct lbs_debugfs_files debugfs_files[] = {
26108 -diff -urNp linux-2.6.37.3/drivers/net/wireless/rndis_wlan.c linux-2.6.37.3/drivers/net/wireless/rndis_wlan.c
26109 ---- linux-2.6.37.3/drivers/net/wireless/rndis_wlan.c 2011-01-04 19:50:19.000000000 -0500
26110 -+++ linux-2.6.37.3/drivers/net/wireless/rndis_wlan.c 2011-01-17 02:41:01.000000000 -0500
26111 +diff -urNp linux-2.6.37.4/drivers/net/wireless/rndis_wlan.c linux-2.6.37.4/drivers/net/wireless/rndis_wlan.c
26112 +--- linux-2.6.37.4/drivers/net/wireless/rndis_wlan.c 2011-01-04 19:50:19.000000000 -0500
26113 ++++ linux-2.6.37.4/drivers/net/wireless/rndis_wlan.c 2011-01-17 02:41:01.000000000 -0500
26114 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbn
26115
26116 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
26117 @@ -27216,9 +27395,9 @@ diff -urNp linux-2.6.37.3/drivers/net/wireless/rndis_wlan.c linux-2.6.37.3/drive
26118 rts_threshold = 2347;
26119
26120 tmp = cpu_to_le32(rts_threshold);
26121 -diff -urNp linux-2.6.37.3/drivers/oprofile/buffer_sync.c linux-2.6.37.3/drivers/oprofile/buffer_sync.c
26122 ---- linux-2.6.37.3/drivers/oprofile/buffer_sync.c 2011-01-04 19:50:19.000000000 -0500
26123 -+++ linux-2.6.37.3/drivers/oprofile/buffer_sync.c 2011-01-17 02:41:01.000000000 -0500
26124 +diff -urNp linux-2.6.37.4/drivers/oprofile/buffer_sync.c linux-2.6.37.4/drivers/oprofile/buffer_sync.c
26125 +--- linux-2.6.37.4/drivers/oprofile/buffer_sync.c 2011-01-04 19:50:19.000000000 -0500
26126 ++++ linux-2.6.37.4/drivers/oprofile/buffer_sync.c 2011-01-17 02:41:01.000000000 -0500
26127 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
26128 if (cookie == NO_COOKIE)
26129 offset = pc;
26130 @@ -27254,9 +27433,9 @@ diff -urNp linux-2.6.37.3/drivers/oprofile/buffer_sync.c linux-2.6.37.3/drivers/
26131 }
26132 }
26133 release_mm(mm);
26134 -diff -urNp linux-2.6.37.3/drivers/oprofile/event_buffer.c linux-2.6.37.3/drivers/oprofile/event_buffer.c
26135 ---- linux-2.6.37.3/drivers/oprofile/event_buffer.c 2011-01-04 19:50:19.000000000 -0500
26136 -+++ linux-2.6.37.3/drivers/oprofile/event_buffer.c 2011-01-17 02:41:01.000000000 -0500
26137 +diff -urNp linux-2.6.37.4/drivers/oprofile/event_buffer.c linux-2.6.37.4/drivers/oprofile/event_buffer.c
26138 +--- linux-2.6.37.4/drivers/oprofile/event_buffer.c 2011-01-04 19:50:19.000000000 -0500
26139 ++++ linux-2.6.37.4/drivers/oprofile/event_buffer.c 2011-01-17 02:41:01.000000000 -0500
26140 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
26141 }
26142
26143 @@ -27266,9 +27445,9 @@ diff -urNp linux-2.6.37.3/drivers/oprofile/event_buffer.c linux-2.6.37.3/drivers
26144 return;
26145 }
26146
26147 -diff -urNp linux-2.6.37.3/drivers/oprofile/oprof.c linux-2.6.37.3/drivers/oprofile/oprof.c
26148 ---- linux-2.6.37.3/drivers/oprofile/oprof.c 2011-01-04 19:50:19.000000000 -0500
26149 -+++ linux-2.6.37.3/drivers/oprofile/oprof.c 2011-01-17 02:41:01.000000000 -0500
26150 +diff -urNp linux-2.6.37.4/drivers/oprofile/oprof.c linux-2.6.37.4/drivers/oprofile/oprof.c
26151 +--- linux-2.6.37.4/drivers/oprofile/oprof.c 2011-01-04 19:50:19.000000000 -0500
26152 ++++ linux-2.6.37.4/drivers/oprofile/oprof.c 2011-01-17 02:41:01.000000000 -0500
26153 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
26154 if (oprofile_ops.switch_events())
26155 return;
26156 @@ -27278,9 +27457,9 @@ diff -urNp linux-2.6.37.3/drivers/oprofile/oprof.c linux-2.6.37.3/drivers/oprofi
26157 start_switch_worker();
26158 }
26159
26160 -diff -urNp linux-2.6.37.3/drivers/oprofile/oprofilefs.c linux-2.6.37.3/drivers/oprofile/oprofilefs.c
26161 ---- linux-2.6.37.3/drivers/oprofile/oprofilefs.c 2011-01-04 19:50:19.000000000 -0500
26162 -+++ linux-2.6.37.3/drivers/oprofile/oprofilefs.c 2011-01-17 02:41:01.000000000 -0500
26163 +diff -urNp linux-2.6.37.4/drivers/oprofile/oprofilefs.c linux-2.6.37.4/drivers/oprofile/oprofilefs.c
26164 +--- linux-2.6.37.4/drivers/oprofile/oprofilefs.c 2011-01-04 19:50:19.000000000 -0500
26165 ++++ linux-2.6.37.4/drivers/oprofile/oprofilefs.c 2011-01-17 02:41:01.000000000 -0500
26166 @@ -186,7 +186,7 @@ static const struct file_operations atom
26167
26168
26169 @@ -27290,9 +27469,9 @@ diff -urNp linux-2.6.37.3/drivers/oprofile/oprofilefs.c linux-2.6.37.3/drivers/o
26170 {
26171 return __oprofilefs_create_file(sb, root, name,
26172 &atomic_ro_fops, 0444, val);
26173 -diff -urNp linux-2.6.37.3/drivers/oprofile/oprofile_stats.c linux-2.6.37.3/drivers/oprofile/oprofile_stats.c
26174 ---- linux-2.6.37.3/drivers/oprofile/oprofile_stats.c 2011-01-04 19:50:19.000000000 -0500
26175 -+++ linux-2.6.37.3/drivers/oprofile/oprofile_stats.c 2011-01-17 02:41:01.000000000 -0500
26176 +diff -urNp linux-2.6.37.4/drivers/oprofile/oprofile_stats.c linux-2.6.37.4/drivers/oprofile/oprofile_stats.c
26177 +--- linux-2.6.37.4/drivers/oprofile/oprofile_stats.c 2011-01-04 19:50:19.000000000 -0500
26178 ++++ linux-2.6.37.4/drivers/oprofile/oprofile_stats.c 2011-01-17 02:41:01.000000000 -0500
26179 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
26180 cpu_buf->sample_invalid_eip = 0;
26181 }
26182 @@ -27310,9 +27489,9 @@ diff -urNp linux-2.6.37.3/drivers/oprofile/oprofile_stats.c linux-2.6.37.3/drive
26183 }
26184
26185
26186 -diff -urNp linux-2.6.37.3/drivers/oprofile/oprofile_stats.h linux-2.6.37.3/drivers/oprofile/oprofile_stats.h
26187 ---- linux-2.6.37.3/drivers/oprofile/oprofile_stats.h 2011-01-04 19:50:19.000000000 -0500
26188 -+++ linux-2.6.37.3/drivers/oprofile/oprofile_stats.h 2011-01-17 02:41:01.000000000 -0500
26189 +diff -urNp linux-2.6.37.4/drivers/oprofile/oprofile_stats.h linux-2.6.37.4/drivers/oprofile/oprofile_stats.h
26190 +--- linux-2.6.37.4/drivers/oprofile/oprofile_stats.h 2011-01-04 19:50:19.000000000 -0500
26191 ++++ linux-2.6.37.4/drivers/oprofile/oprofile_stats.h 2011-01-17 02:41:01.000000000 -0500
26192 @@ -13,11 +13,11 @@
26193 #include <asm/atomic.h>
26194
26195 @@ -27330,9 +27509,9 @@ diff -urNp linux-2.6.37.3/drivers/oprofile/oprofile_stats.h linux-2.6.37.3/drive
26196 };
26197
26198 extern struct oprofile_stat_struct oprofile_stats;
26199 -diff -urNp linux-2.6.37.3/drivers/parport/procfs.c linux-2.6.37.3/drivers/parport/procfs.c
26200 ---- linux-2.6.37.3/drivers/parport/procfs.c 2011-01-04 19:50:19.000000000 -0500
26201 -+++ linux-2.6.37.3/drivers/parport/procfs.c 2011-01-17 02:41:01.000000000 -0500
26202 +diff -urNp linux-2.6.37.4/drivers/parport/procfs.c linux-2.6.37.4/drivers/parport/procfs.c
26203 +--- linux-2.6.37.4/drivers/parport/procfs.c 2011-01-04 19:50:19.000000000 -0500
26204 ++++ linux-2.6.37.4/drivers/parport/procfs.c 2011-01-17 02:41:01.000000000 -0500
26205 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
26206
26207 *ppos += len;
26208 @@ -27351,9 +27530,9 @@ diff -urNp linux-2.6.37.3/drivers/parport/procfs.c linux-2.6.37.3/drivers/parpor
26209 }
26210 #endif /* IEEE1284.3 support. */
26211
26212 -diff -urNp linux-2.6.37.3/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.37.3/drivers/pci/hotplug/acpiphp_glue.c
26213 ---- linux-2.6.37.3/drivers/pci/hotplug/acpiphp_glue.c 2011-01-04 19:50:19.000000000 -0500
26214 -+++ linux-2.6.37.3/drivers/pci/hotplug/acpiphp_glue.c 2011-01-17 02:41:01.000000000 -0500
26215 +diff -urNp linux-2.6.37.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.37.4/drivers/pci/hotplug/acpiphp_glue.c
26216 +--- linux-2.6.37.4/drivers/pci/hotplug/acpiphp_glue.c 2011-01-04 19:50:19.000000000 -0500
26217 ++++ linux-2.6.37.4/drivers/pci/hotplug/acpiphp_glue.c 2011-01-17 02:41:01.000000000 -0500
26218 @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
26219 }
26220
26221 @@ -27363,9 +27542,9 @@ diff -urNp linux-2.6.37.3/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.37.3/driv
26222 .handler = handle_hotplug_event_func,
26223 };
26224
26225 -diff -urNp linux-2.6.37.3/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.37.3/drivers/pci/hotplug/cpqphp_nvram.c
26226 ---- linux-2.6.37.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-04 19:50:19.000000000 -0500
26227 -+++ linux-2.6.37.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-17 02:41:01.000000000 -0500
26228 +diff -urNp linux-2.6.37.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.37.4/drivers/pci/hotplug/cpqphp_nvram.c
26229 +--- linux-2.6.37.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-04 19:50:19.000000000 -0500
26230 ++++ linux-2.6.37.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-17 02:41:01.000000000 -0500
26231 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
26232
26233 void compaq_nvram_init (void __iomem *rom_start)
26234 @@ -27380,9 +27559,9 @@ diff -urNp linux-2.6.37.3/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.37.3/driv
26235 dbg("int15 entry = %p\n", compaq_int15_entry_point);
26236
26237 /* initialize our int15 lock */
26238 -diff -urNp linux-2.6.37.3/drivers/pci/intel-iommu.c linux-2.6.37.3/drivers/pci/intel-iommu.c
26239 ---- linux-2.6.37.3/drivers/pci/intel-iommu.c 2011-01-04 19:50:19.000000000 -0500
26240 -+++ linux-2.6.37.3/drivers/pci/intel-iommu.c 2011-01-17 02:41:01.000000000 -0500
26241 +diff -urNp linux-2.6.37.4/drivers/pci/intel-iommu.c linux-2.6.37.4/drivers/pci/intel-iommu.c
26242 +--- linux-2.6.37.4/drivers/pci/intel-iommu.c 2011-01-04 19:50:19.000000000 -0500
26243 ++++ linux-2.6.37.4/drivers/pci/intel-iommu.c 2011-01-17 02:41:01.000000000 -0500
26244 @@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de
26245 return !dma_addr;
26246 }
26247 @@ -27392,9 +27571,25 @@ diff -urNp linux-2.6.37.3/drivers/pci/intel-iommu.c linux-2.6.37.3/drivers/pci/i
26248 .alloc_coherent = intel_alloc_coherent,
26249 .free_coherent = intel_free_coherent,
26250 .map_sg = intel_map_sg,
26251 -diff -urNp linux-2.6.37.3/drivers/pci/pcie/portdrv_pci.c linux-2.6.37.3/drivers/pci/pcie/portdrv_pci.c
26252 ---- linux-2.6.37.3/drivers/pci/pcie/portdrv_pci.c 2011-01-04 19:50:19.000000000 -0500
26253 -+++ linux-2.6.37.3/drivers/pci/pcie/portdrv_pci.c 2011-01-17 02:41:01.000000000 -0500
26254 +diff -urNp linux-2.6.37.4/drivers/pci/pcie/aspm.c linux-2.6.37.4/drivers/pci/pcie/aspm.c
26255 +--- linux-2.6.37.4/drivers/pci/pcie/aspm.c 2011-01-04 19:50:19.000000000 -0500
26256 ++++ linux-2.6.37.4/drivers/pci/pcie/aspm.c 2011-03-21 17:16:23.000000000 -0400
26257 +@@ -27,9 +27,9 @@
26258 + #define MODULE_PARAM_PREFIX "pcie_aspm."
26259 +
26260 + /* Note: those are not register definitions */
26261 +-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
26262 +-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
26263 +-#define ASPM_STATE_L1 (4) /* L1 state */
26264 ++#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
26265 ++#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
26266 ++#define ASPM_STATE_L1 (4U) /* L1 state */
26267 + #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
26268 + #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
26269 +
26270 +diff -urNp linux-2.6.37.4/drivers/pci/pcie/portdrv_pci.c linux-2.6.37.4/drivers/pci/pcie/portdrv_pci.c
26271 +--- linux-2.6.37.4/drivers/pci/pcie/portdrv_pci.c 2011-01-04 19:50:19.000000000 -0500
26272 ++++ linux-2.6.37.4/drivers/pci/pcie/portdrv_pci.c 2011-01-17 02:41:01.000000000 -0500
26273 @@ -276,7 +276,7 @@ static void pcie_portdrv_err_resume(stru
26274 static const struct pci_device_id port_pci_ids[] = { {
26275 /* handle any PCI-Express port */
26276 @@ -27404,9 +27599,9 @@ diff -urNp linux-2.6.37.3/drivers/pci/pcie/portdrv_pci.c linux-2.6.37.3/drivers/
26277 };
26278 MODULE_DEVICE_TABLE(pci, port_pci_ids);
26279
26280 -diff -urNp linux-2.6.37.3/drivers/pci/probe.c linux-2.6.37.3/drivers/pci/probe.c
26281 ---- linux-2.6.37.3/drivers/pci/probe.c 2011-01-04 19:50:19.000000000 -0500
26282 -+++ linux-2.6.37.3/drivers/pci/probe.c 2011-01-17 02:41:01.000000000 -0500
26283 +diff -urNp linux-2.6.37.4/drivers/pci/probe.c linux-2.6.37.4/drivers/pci/probe.c
26284 +--- linux-2.6.37.4/drivers/pci/probe.c 2011-01-04 19:50:19.000000000 -0500
26285 ++++ linux-2.6.37.4/drivers/pci/probe.c 2011-01-17 02:41:01.000000000 -0500
26286 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
26287 return ret;
26288 }
26289 @@ -27433,9 +27628,9 @@ diff -urNp linux-2.6.37.3/drivers/pci/probe.c linux-2.6.37.3/drivers/pci/probe.c
26290
26291 if (!dev->mmio_always_on) {
26292 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
26293 -diff -urNp linux-2.6.37.3/drivers/pci/proc.c linux-2.6.37.3/drivers/pci/proc.c
26294 ---- linux-2.6.37.3/drivers/pci/proc.c 2011-01-04 19:50:19.000000000 -0500
26295 -+++ linux-2.6.37.3/drivers/pci/proc.c 2011-01-17 02:41:01.000000000 -0500
26296 +diff -urNp linux-2.6.37.4/drivers/pci/proc.c linux-2.6.37.4/drivers/pci/proc.c
26297 +--- linux-2.6.37.4/drivers/pci/proc.c 2011-01-04 19:50:19.000000000 -0500
26298 ++++ linux-2.6.37.4/drivers/pci/proc.c 2011-01-17 02:41:01.000000000 -0500
26299 @@ -476,7 +476,16 @@ static const struct file_operations proc
26300 static int __init pci_proc_init(void)
26301 {
26302 @@ -27453,9 +27648,9 @@ diff -urNp linux-2.6.37.3/drivers/pci/proc.c linux-2.6.37.3/drivers/pci/proc.c
26303 proc_create("devices", 0, proc_bus_pci_dir,
26304 &proc_bus_pci_dev_operations);
26305 proc_initialized = 1;
26306 -diff -urNp linux-2.6.37.3/drivers/pcmcia/ti113x.h linux-2.6.37.3/drivers/pcmcia/ti113x.h
26307 ---- linux-2.6.37.3/drivers/pcmcia/ti113x.h 2011-01-04 19:50:19.000000000 -0500
26308 -+++ linux-2.6.37.3/drivers/pcmcia/ti113x.h 2011-01-17 02:41:01.000000000 -0500
26309 +diff -urNp linux-2.6.37.4/drivers/pcmcia/ti113x.h linux-2.6.37.4/drivers/pcmcia/ti113x.h
26310 +--- linux-2.6.37.4/drivers/pcmcia/ti113x.h 2011-01-04 19:50:19.000000000 -0500
26311 ++++ linux-2.6.37.4/drivers/pcmcia/ti113x.h 2011-01-17 02:41:01.000000000 -0500
26312 @@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl
26313 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
26314 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
26315 @@ -27465,9 +27660,9 @@ diff -urNp linux-2.6.37.3/drivers/pcmcia/ti113x.h linux-2.6.37.3/drivers/pcmcia/
26316 };
26317
26318 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
26319 -diff -urNp linux-2.6.37.3/drivers/pcmcia/yenta_socket.c linux-2.6.37.3/drivers/pcmcia/yenta_socket.c
26320 ---- linux-2.6.37.3/drivers/pcmcia/yenta_socket.c 2011-01-04 19:50:19.000000000 -0500
26321 -+++ linux-2.6.37.3/drivers/pcmcia/yenta_socket.c 2011-01-17 02:41:01.000000000 -0500
26322 +diff -urNp linux-2.6.37.4/drivers/pcmcia/yenta_socket.c linux-2.6.37.4/drivers/pcmcia/yenta_socket.c
26323 +--- linux-2.6.37.4/drivers/pcmcia/yenta_socket.c 2011-01-04 19:50:19.000000000 -0500
26324 ++++ linux-2.6.37.4/drivers/pcmcia/yenta_socket.c 2011-01-17 02:41:01.000000000 -0500
26325 @@ -1426,7 +1426,7 @@ static struct pci_device_id yenta_table[
26326
26327 /* match any cardbus bridge */
26328 @@ -27477,9 +27672,9 @@ diff -urNp linux-2.6.37.3/drivers/pcmcia/yenta_socket.c linux-2.6.37.3/drivers/p
26329 };
26330 MODULE_DEVICE_TABLE(pci, yenta_table);
26331
26332 -diff -urNp linux-2.6.37.3/drivers/platform/x86/acer-wmi.c linux-2.6.37.3/drivers/platform/x86/acer-wmi.c
26333 ---- linux-2.6.37.3/drivers/platform/x86/acer-wmi.c 2011-02-27 14:49:17.000000000 -0500
26334 -+++ linux-2.6.37.3/drivers/platform/x86/acer-wmi.c 2011-02-27 14:49:58.000000000 -0500
26335 +diff -urNp linux-2.6.37.4/drivers/platform/x86/acer-wmi.c linux-2.6.37.4/drivers/platform/x86/acer-wmi.c
26336 +--- linux-2.6.37.4/drivers/platform/x86/acer-wmi.c 2011-02-27 14:49:17.000000000 -0500
26337 ++++ linux-2.6.37.4/drivers/platform/x86/acer-wmi.c 2011-02-27 14:49:58.000000000 -0500
26338 @@ -915,7 +915,7 @@ static int update_bl_status(struct backl
26339 return 0;
26340 }
26341 @@ -27489,9 +27684,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/acer-wmi.c linux-2.6.37.3/drivers
26342 .get_brightness = read_brightness,
26343 .update_status = update_bl_status,
26344 };
26345 -diff -urNp linux-2.6.37.3/drivers/platform/x86/asus_acpi.c linux-2.6.37.3/drivers/platform/x86/asus_acpi.c
26346 ---- linux-2.6.37.3/drivers/platform/x86/asus_acpi.c 2011-02-27 14:49:17.000000000 -0500
26347 -+++ linux-2.6.37.3/drivers/platform/x86/asus_acpi.c 2011-02-27 14:49:58.000000000 -0500
26348 +diff -urNp linux-2.6.37.4/drivers/platform/x86/asus_acpi.c linux-2.6.37.4/drivers/platform/x86/asus_acpi.c
26349 +--- linux-2.6.37.4/drivers/platform/x86/asus_acpi.c 2011-02-27 14:49:17.000000000 -0500
26350 ++++ linux-2.6.37.4/drivers/platform/x86/asus_acpi.c 2011-02-27 14:49:58.000000000 -0500
26351 @@ -1461,7 +1461,7 @@ static int asus_hotk_remove(struct acpi_
26352 return 0;
26353 }
26354 @@ -27501,9 +27696,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/asus_acpi.c linux-2.6.37.3/driver
26355 .get_brightness = read_brightness,
26356 .update_status = set_brightness_status,
26357 };
26358 -diff -urNp linux-2.6.37.3/drivers/platform/x86/asus-laptop.c linux-2.6.37.3/drivers/platform/x86/asus-laptop.c
26359 ---- linux-2.6.37.3/drivers/platform/x86/asus-laptop.c 2011-01-04 19:50:19.000000000 -0500
26360 -+++ linux-2.6.37.3/drivers/platform/x86/asus-laptop.c 2011-01-17 02:41:01.000000000 -0500
26361 +diff -urNp linux-2.6.37.4/drivers/platform/x86/asus-laptop.c linux-2.6.37.4/drivers/platform/x86/asus-laptop.c
26362 +--- linux-2.6.37.4/drivers/platform/x86/asus-laptop.c 2011-01-04 19:50:19.000000000 -0500
26363 ++++ linux-2.6.37.4/drivers/platform/x86/asus-laptop.c 2011-01-17 02:41:01.000000000 -0500
26364 @@ -243,7 +243,6 @@ struct asus_laptop {
26365 struct asus_led gled;
26366 struct asus_led kled;
26367 @@ -27521,9 +27716,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/asus-laptop.c linux-2.6.37.3/driv
26368 .get_brightness = asus_read_brightness,
26369 .update_status = update_bl_status,
26370 };
26371 -diff -urNp linux-2.6.37.3/drivers/platform/x86/dell-laptop.c linux-2.6.37.3/drivers/platform/x86/dell-laptop.c
26372 ---- linux-2.6.37.3/drivers/platform/x86/dell-laptop.c 2011-01-04 19:50:19.000000000 -0500
26373 -+++ linux-2.6.37.3/drivers/platform/x86/dell-laptop.c 2011-01-17 02:41:01.000000000 -0500
26374 +diff -urNp linux-2.6.37.4/drivers/platform/x86/dell-laptop.c linux-2.6.37.4/drivers/platform/x86/dell-laptop.c
26375 +--- linux-2.6.37.4/drivers/platform/x86/dell-laptop.c 2011-01-04 19:50:19.000000000 -0500
26376 ++++ linux-2.6.37.4/drivers/platform/x86/dell-laptop.c 2011-01-17 02:41:01.000000000 -0500
26377 @@ -546,7 +546,7 @@ out:
26378 return buffer->output[1];
26379 }
26380 @@ -27533,9 +27728,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/dell-laptop.c linux-2.6.37.3/driv
26381 .get_brightness = dell_get_intensity,
26382 .update_status = dell_send_intensity,
26383 };
26384 -diff -urNp linux-2.6.37.3/drivers/platform/x86/eeepc-laptop.c linux-2.6.37.3/drivers/platform/x86/eeepc-laptop.c
26385 ---- linux-2.6.37.3/drivers/platform/x86/eeepc-laptop.c 2011-01-04 19:50:19.000000000 -0500
26386 -+++ linux-2.6.37.3/drivers/platform/x86/eeepc-laptop.c 2011-01-17 02:41:01.000000000 -0500
26387 +diff -urNp linux-2.6.37.4/drivers/platform/x86/eeepc-laptop.c linux-2.6.37.4/drivers/platform/x86/eeepc-laptop.c
26388 +--- linux-2.6.37.4/drivers/platform/x86/eeepc-laptop.c 2011-01-04 19:50:19.000000000 -0500
26389 ++++ linux-2.6.37.4/drivers/platform/x86/eeepc-laptop.c 2011-01-17 02:41:01.000000000 -0500
26390 @@ -1115,7 +1115,7 @@ static int update_bl_status(struct backl
26391 return set_brightness(bd, bd->props.brightness);
26392 }
26393 @@ -27545,9 +27740,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/eeepc-laptop.c linux-2.6.37.3/dri
26394 .get_brightness = read_brightness,
26395 .update_status = update_bl_status,
26396 };
26397 -diff -urNp linux-2.6.37.3/drivers/platform/x86/fujitsu-laptop.c linux-2.6.37.3/drivers/platform/x86/fujitsu-laptop.c
26398 ---- linux-2.6.37.3/drivers/platform/x86/fujitsu-laptop.c 2011-01-04 19:50:19.000000000 -0500
26399 -+++ linux-2.6.37.3/drivers/platform/x86/fujitsu-laptop.c 2011-01-17 02:41:01.000000000 -0500
26400 +diff -urNp linux-2.6.37.4/drivers/platform/x86/fujitsu-laptop.c linux-2.6.37.4/drivers/platform/x86/fujitsu-laptop.c
26401 +--- linux-2.6.37.4/drivers/platform/x86/fujitsu-laptop.c 2011-01-04 19:50:19.000000000 -0500
26402 ++++ linux-2.6.37.4/drivers/platform/x86/fujitsu-laptop.c 2011-01-17 02:41:01.000000000 -0500
26403 @@ -437,7 +437,7 @@ static int bl_update_status(struct backl
26404 return ret;
26405 }
26406 @@ -27557,9 +27752,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/fujitsu-laptop.c linux-2.6.37.3/d
26407 .get_brightness = bl_get_brightness,
26408 .update_status = bl_update_status,
26409 };
26410 -diff -urNp linux-2.6.37.3/drivers/platform/x86/sony-laptop.c linux-2.6.37.3/drivers/platform/x86/sony-laptop.c
26411 ---- linux-2.6.37.3/drivers/platform/x86/sony-laptop.c 2011-01-04 19:50:19.000000000 -0500
26412 -+++ linux-2.6.37.3/drivers/platform/x86/sony-laptop.c 2011-01-17 02:41:01.000000000 -0500
26413 +diff -urNp linux-2.6.37.4/drivers/platform/x86/sony-laptop.c linux-2.6.37.4/drivers/platform/x86/sony-laptop.c
26414 +--- linux-2.6.37.4/drivers/platform/x86/sony-laptop.c 2011-01-04 19:50:19.000000000 -0500
26415 ++++ linux-2.6.37.4/drivers/platform/x86/sony-laptop.c 2011-01-17 02:41:01.000000000 -0500
26416 @@ -856,7 +856,7 @@ static int sony_backlight_get_brightness
26417 }
26418
26419 @@ -27569,9 +27764,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/sony-laptop.c linux-2.6.37.3/driv
26420 .update_status = sony_backlight_update_status,
26421 .get_brightness = sony_backlight_get_brightness,
26422 };
26423 -diff -urNp linux-2.6.37.3/drivers/platform/x86/thinkpad_acpi.c linux-2.6.37.3/drivers/platform/x86/thinkpad_acpi.c
26424 ---- linux-2.6.37.3/drivers/platform/x86/thinkpad_acpi.c 2011-01-04 19:50:19.000000000 -0500
26425 -+++ linux-2.6.37.3/drivers/platform/x86/thinkpad_acpi.c 2011-01-17 02:41:01.000000000 -0500
26426 +diff -urNp linux-2.6.37.4/drivers/platform/x86/thinkpad_acpi.c linux-2.6.37.4/drivers/platform/x86/thinkpad_acpi.c
26427 +--- linux-2.6.37.4/drivers/platform/x86/thinkpad_acpi.c 2011-01-04 19:50:19.000000000 -0500
26428 ++++ linux-2.6.37.4/drivers/platform/x86/thinkpad_acpi.c 2011-01-17 02:41:01.000000000 -0500
26429 @@ -6109,7 +6109,7 @@ static void tpacpi_brightness_notify_cha
26430 BACKLIGHT_UPDATE_HOTKEY);
26431 }
26432 @@ -27581,9 +27776,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/thinkpad_acpi.c linux-2.6.37.3/dr
26433 .get_brightness = brightness_get,
26434 .update_status = brightness_update_status,
26435 };
26436 -diff -urNp linux-2.6.37.3/drivers/platform/x86/toshiba_acpi.c linux-2.6.37.3/drivers/platform/x86/toshiba_acpi.c
26437 ---- linux-2.6.37.3/drivers/platform/x86/toshiba_acpi.c 2011-01-04 19:50:19.000000000 -0500
26438 -+++ linux-2.6.37.3/drivers/platform/x86/toshiba_acpi.c 2011-01-17 02:41:01.000000000 -0500
26439 +diff -urNp linux-2.6.37.4/drivers/platform/x86/toshiba_acpi.c linux-2.6.37.4/drivers/platform/x86/toshiba_acpi.c
26440 +--- linux-2.6.37.4/drivers/platform/x86/toshiba_acpi.c 2011-01-04 19:50:19.000000000 -0500
26441 ++++ linux-2.6.37.4/drivers/platform/x86/toshiba_acpi.c 2011-01-17 02:41:01.000000000 -0500
26442 @@ -841,7 +841,7 @@ static void remove_toshiba_proc_entries(
26443 remove_proc_entry("version", toshiba_proc_dir);
26444 }
26445 @@ -27593,9 +27788,9 @@ diff -urNp linux-2.6.37.3/drivers/platform/x86/toshiba_acpi.c linux-2.6.37.3/dri
26446 .get_brightness = get_lcd,
26447 .update_status = set_lcd_status,
26448 };
26449 -diff -urNp linux-2.6.37.3/drivers/pnp/pnpbios/bioscalls.c linux-2.6.37.3/drivers/pnp/pnpbios/bioscalls.c
26450 ---- linux-2.6.37.3/drivers/pnp/pnpbios/bioscalls.c 2011-01-04 19:50:19.000000000 -0500
26451 -+++ linux-2.6.37.3/drivers/pnp/pnpbios/bioscalls.c 2011-01-17 02:41:01.000000000 -0500
26452 +diff -urNp linux-2.6.37.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.37.4/drivers/pnp/pnpbios/bioscalls.c
26453 +--- linux-2.6.37.4/drivers/pnp/pnpbios/bioscalls.c 2011-01-04 19:50:19.000000000 -0500
26454 ++++ linux-2.6.37.4/drivers/pnp/pnpbios/bioscalls.c 2011-01-17 02:41:01.000000000 -0500
26455 @@ -59,7 +59,7 @@ do { \
26456 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
26457 } while(0)
26458 @@ -27652,9 +27847,9 @@ diff -urNp linux-2.6.37.3/drivers/pnp/pnpbios/bioscalls.c linux-2.6.37.3/drivers
26459 +
26460 + pax_close_kernel();
26461 }
26462 -diff -urNp linux-2.6.37.3/drivers/pnp/quirks.c linux-2.6.37.3/drivers/pnp/quirks.c
26463 ---- linux-2.6.37.3/drivers/pnp/quirks.c 2011-01-04 19:50:19.000000000 -0500
26464 -+++ linux-2.6.37.3/drivers/pnp/quirks.c 2011-01-17 02:41:01.000000000 -0500
26465 +diff -urNp linux-2.6.37.4/drivers/pnp/quirks.c linux-2.6.37.4/drivers/pnp/quirks.c
26466 +--- linux-2.6.37.4/drivers/pnp/quirks.c 2011-01-04 19:50:19.000000000 -0500
26467 ++++ linux-2.6.37.4/drivers/pnp/quirks.c 2011-01-17 02:41:01.000000000 -0500
26468 @@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
26469 /* PnP resources that might overlap PCI BARs */
26470 {"PNP0c01", quirk_system_pci_resources},
26471 @@ -27664,9 +27859,9 @@ diff -urNp linux-2.6.37.3/drivers/pnp/quirks.c linux-2.6.37.3/drivers/pnp/quirks
26472 };
26473
26474 void pnp_fixup_device(struct pnp_dev *dev)
26475 -diff -urNp linux-2.6.37.3/drivers/pnp/resource.c linux-2.6.37.3/drivers/pnp/resource.c
26476 ---- linux-2.6.37.3/drivers/pnp/resource.c 2011-01-04 19:50:19.000000000 -0500
26477 -+++ linux-2.6.37.3/drivers/pnp/resource.c 2011-01-17 02:41:01.000000000 -0500
26478 +diff -urNp linux-2.6.37.4/drivers/pnp/resource.c linux-2.6.37.4/drivers/pnp/resource.c
26479 +--- linux-2.6.37.4/drivers/pnp/resource.c 2011-01-04 19:50:19.000000000 -0500
26480 ++++ linux-2.6.37.4/drivers/pnp/resource.c 2011-01-17 02:41:01.000000000 -0500
26481 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
26482 return 1;
26483
26484 @@ -27685,9 +27880,9 @@ diff -urNp linux-2.6.37.3/drivers/pnp/resource.c linux-2.6.37.3/drivers/pnp/reso
26485 return 0;
26486
26487 /* check if the resource is reserved */
26488 -diff -urNp linux-2.6.37.3/drivers/rtc/rtc-dev.c linux-2.6.37.3/drivers/rtc/rtc-dev.c
26489 ---- linux-2.6.37.3/drivers/rtc/rtc-dev.c 2011-01-04 19:50:19.000000000 -0500
26490 -+++ linux-2.6.37.3/drivers/rtc/rtc-dev.c 2011-01-17 02:41:01.000000000 -0500
26491 +diff -urNp linux-2.6.37.4/drivers/rtc/rtc-dev.c linux-2.6.37.4/drivers/rtc/rtc-dev.c
26492 +--- linux-2.6.37.4/drivers/rtc/rtc-dev.c 2011-01-04 19:50:19.000000000 -0500
26493 ++++ linux-2.6.37.4/drivers/rtc/rtc-dev.c 2011-01-17 02:41:01.000000000 -0500
26494 @@ -14,6 +14,7 @@
26495 #include <linux/module.h>
26496 #include <linux/rtc.h>
26497 @@ -27705,9 +27900,9 @@ diff -urNp linux-2.6.37.3/drivers/rtc/rtc-dev.c linux-2.6.37.3/drivers/rtc/rtc-d
26498 return rtc_set_time(rtc, &tm);
26499
26500 case RTC_PIE_ON:
26501 -diff -urNp linux-2.6.37.3/drivers/rtc/rtc-ds1511.c linux-2.6.37.3/drivers/rtc/rtc-ds1511.c
26502 ---- linux-2.6.37.3/drivers/rtc/rtc-ds1511.c 2011-01-04 19:50:19.000000000 -0500
26503 -+++ linux-2.6.37.3/drivers/rtc/rtc-ds1511.c 2011-02-27 15:20:36.000000000 -0500
26504 +diff -urNp linux-2.6.37.4/drivers/rtc/rtc-ds1511.c linux-2.6.37.4/drivers/rtc/rtc-ds1511.c
26505 +--- linux-2.6.37.4/drivers/rtc/rtc-ds1511.c 2011-01-04 19:50:19.000000000 -0500
26506 ++++ linux-2.6.37.4/drivers/rtc/rtc-ds1511.c 2011-02-27 15:20:36.000000000 -0500
26507 @@ -485,7 +485,7 @@ ds1511_nvram_write(struct file *filp, st
26508 static struct bin_attribute ds1511_nvram_attr = {
26509 .attr = {
26510 @@ -27717,9 +27912,9 @@ diff -urNp linux-2.6.37.3/drivers/rtc/rtc-ds1511.c linux-2.6.37.3/drivers/rtc/rt
26511 },
26512 .size = DS1511_RAM_MAX,
26513 .read = ds1511_nvram_read,
26514 -diff -urNp linux-2.6.37.3/drivers/s390/cio/qdio_debug.c linux-2.6.37.3/drivers/s390/cio/qdio_debug.c
26515 ---- linux-2.6.37.3/drivers/s390/cio/qdio_debug.c 2011-01-04 19:50:19.000000000 -0500
26516 -+++ linux-2.6.37.3/drivers/s390/cio/qdio_debug.c 2011-01-17 02:41:01.000000000 -0500
26517 +diff -urNp linux-2.6.37.4/drivers/s390/cio/qdio_debug.c linux-2.6.37.4/drivers/s390/cio/qdio_debug.c
26518 +--- linux-2.6.37.4/drivers/s390/cio/qdio_debug.c 2011-01-04 19:50:19.000000000 -0500
26519 ++++ linux-2.6.37.4/drivers/s390/cio/qdio_debug.c 2011-01-17 02:41:01.000000000 -0500
26520 @@ -224,7 +224,7 @@ static int qperf_seq_open(struct inode *
26521 filp->f_path.dentry->d_inode->i_private);
26522 }
26523 @@ -27729,9 +27924,9 @@ diff -urNp linux-2.6.37.3/drivers/s390/cio/qdio_debug.c linux-2.6.37.3/drivers/s
26524 .owner = THIS_MODULE,
26525 .open = qperf_seq_open,
26526 .read = seq_read,
26527 -diff -urNp linux-2.6.37.3/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.37.3/drivers/scsi/aic94xx/aic94xx_init.c
26528 ---- linux-2.6.37.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-01-04 19:50:19.000000000 -0500
26529 -+++ linux-2.6.37.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-02-27 15:21:39.000000000 -0500
26530 +diff -urNp linux-2.6.37.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.37.4/drivers/scsi/aic94xx/aic94xx_init.c
26531 +--- linux-2.6.37.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-01-04 19:50:19.000000000 -0500
26532 ++++ linux-2.6.37.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-02-27 15:21:39.000000000 -0500
26533 @@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru
26534 flash_error_table[i].reason);
26535 }
26536 @@ -27741,9 +27936,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.37.3/dri
26537 asd_show_update_bios, asd_store_update_bios);
26538
26539 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
26540 -diff -urNp linux-2.6.37.3/drivers/scsi/hpsa.c linux-2.6.37.3/drivers/scsi/hpsa.c
26541 ---- linux-2.6.37.3/drivers/scsi/hpsa.c 2011-01-04 19:50:19.000000000 -0500
26542 -+++ linux-2.6.37.3/drivers/scsi/hpsa.c 2011-01-17 02:41:01.000000000 -0500
26543 +diff -urNp linux-2.6.37.4/drivers/scsi/hpsa.c linux-2.6.37.4/drivers/scsi/hpsa.c
26544 +--- linux-2.6.37.4/drivers/scsi/hpsa.c 2011-01-04 19:50:19.000000000 -0500
26545 ++++ linux-2.6.37.4/drivers/scsi/hpsa.c 2011-01-17 02:41:01.000000000 -0500
26546 @@ -2292,6 +2292,8 @@ static int hpsa_ioctl32_passthru(struct
26547 int err;
26548 u32 cp;
26549 @@ -27753,9 +27948,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/hpsa.c linux-2.6.37.3/drivers/scsi/hpsa.c
26550 err = 0;
26551 err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
26552 sizeof(arg64.LUN_info));
26553 -diff -urNp linux-2.6.37.3/drivers/scsi/ipr.c linux-2.6.37.3/drivers/scsi/ipr.c
26554 ---- linux-2.6.37.3/drivers/scsi/ipr.c 2011-01-04 19:50:19.000000000 -0500
26555 -+++ linux-2.6.37.3/drivers/scsi/ipr.c 2011-01-17 02:41:01.000000000 -0500
26556 +diff -urNp linux-2.6.37.4/drivers/scsi/ipr.c linux-2.6.37.4/drivers/scsi/ipr.c
26557 +--- linux-2.6.37.4/drivers/scsi/ipr.c 2011-01-04 19:50:19.000000000 -0500
26558 ++++ linux-2.6.37.4/drivers/scsi/ipr.c 2011-01-17 02:41:01.000000000 -0500
26559 @@ -6202,7 +6202,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
26560 return true;
26561 }
26562 @@ -27765,9 +27960,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/ipr.c linux-2.6.37.3/drivers/scsi/ipr.c
26563 .phy_reset = ipr_ata_phy_reset,
26564 .hardreset = ipr_sata_reset,
26565 .post_internal_cmd = ipr_ata_post_internal,
26566 -diff -urNp linux-2.6.37.3/drivers/scsi/libfc/fc_exch.c linux-2.6.37.3/drivers/scsi/libfc/fc_exch.c
26567 ---- linux-2.6.37.3/drivers/scsi/libfc/fc_exch.c 2011-01-04 19:50:19.000000000 -0500
26568 -+++ linux-2.6.37.3/drivers/scsi/libfc/fc_exch.c 2011-01-17 02:41:01.000000000 -0500
26569 +diff -urNp linux-2.6.37.4/drivers/scsi/libfc/fc_exch.c linux-2.6.37.4/drivers/scsi/libfc/fc_exch.c
26570 +--- linux-2.6.37.4/drivers/scsi/libfc/fc_exch.c 2011-01-04 19:50:19.000000000 -0500
26571 ++++ linux-2.6.37.4/drivers/scsi/libfc/fc_exch.c 2011-01-17 02:41:01.000000000 -0500
26572 @@ -100,12 +100,12 @@ struct fc_exch_mgr {
26573 * all together if not used XXX
26574 */
26575 @@ -27889,9 +28084,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/libfc/fc_exch.c linux-2.6.37.3/drivers/sc
26576
26577 fc_frame_free(fp);
26578 }
26579 -diff -urNp linux-2.6.37.3/drivers/scsi/libsas/sas_ata.c linux-2.6.37.3/drivers/scsi/libsas/sas_ata.c
26580 ---- linux-2.6.37.3/drivers/scsi/libsas/sas_ata.c 2011-01-04 19:50:19.000000000 -0500
26581 -+++ linux-2.6.37.3/drivers/scsi/libsas/sas_ata.c 2011-01-17 02:41:01.000000000 -0500
26582 +diff -urNp linux-2.6.37.4/drivers/scsi/libsas/sas_ata.c linux-2.6.37.4/drivers/scsi/libsas/sas_ata.c
26583 +--- linux-2.6.37.4/drivers/scsi/libsas/sas_ata.c 2011-01-04 19:50:19.000000000 -0500
26584 ++++ linux-2.6.37.4/drivers/scsi/libsas/sas_ata.c 2011-01-17 02:41:01.000000000 -0500
26585 @@ -348,10 +348,10 @@ static int sas_ata_scr_read(struct ata_l
26586 }
26587 }
26588 @@ -27905,9 +28100,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/libsas/sas_ata.c linux-2.6.37.3/drivers/s
26589 .qc_prep = ata_noop_qc_prep,
26590 .qc_issue = sas_ata_qc_issue,
26591 .qc_fill_rtf = sas_ata_qc_fill_rtf,
26592 -diff -urNp linux-2.6.37.3/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.37.3/drivers/scsi/mpt2sas/mpt2sas_debug.h
26593 ---- linux-2.6.37.3/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-04 19:50:19.000000000 -0500
26594 -+++ linux-2.6.37.3/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-17 02:41:01.000000000 -0500
26595 +diff -urNp linux-2.6.37.4/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.37.4/drivers/scsi/mpt2sas/mpt2sas_debug.h
26596 +--- linux-2.6.37.4/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-04 19:50:19.000000000 -0500
26597 ++++ linux-2.6.37.4/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-17 02:41:01.000000000 -0500
26598 @@ -79,7 +79,7 @@
26599 CMD; \
26600 }
26601 @@ -27917,9 +28112,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.37.3/dr
26602 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
26603
26604
26605 -diff -urNp linux-2.6.37.3/drivers/scsi/qla2xxx/qla_os.c linux-2.6.37.3/drivers/scsi/qla2xxx/qla_os.c
26606 ---- linux-2.6.37.3/drivers/scsi/qla2xxx/qla_os.c 2011-01-04 19:50:19.000000000 -0500
26607 -+++ linux-2.6.37.3/drivers/scsi/qla2xxx/qla_os.c 2011-01-17 02:41:01.000000000 -0500
26608 +diff -urNp linux-2.6.37.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.37.4/drivers/scsi/qla2xxx/qla_os.c
26609 +--- linux-2.6.37.4/drivers/scsi/qla2xxx/qla_os.c 2011-01-04 19:50:19.000000000 -0500
26610 ++++ linux-2.6.37.4/drivers/scsi/qla2xxx/qla_os.c 2011-01-17 02:41:01.000000000 -0500
26611 @@ -4083,7 +4083,7 @@ static struct pci_driver qla2xxx_pci_dri
26612 .err_handler = &qla2xxx_err_handler,
26613 };
26614 @@ -27929,9 +28124,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/qla2xxx/qla_os.c linux-2.6.37.3/drivers/s
26615 .owner = THIS_MODULE,
26616 .llseek = noop_llseek,
26617 };
26618 -diff -urNp linux-2.6.37.3/drivers/scsi/scsi_logging.h linux-2.6.37.3/drivers/scsi/scsi_logging.h
26619 ---- linux-2.6.37.3/drivers/scsi/scsi_logging.h 2011-01-04 19:50:19.000000000 -0500
26620 -+++ linux-2.6.37.3/drivers/scsi/scsi_logging.h 2011-01-17 02:41:01.000000000 -0500
26621 +diff -urNp linux-2.6.37.4/drivers/scsi/scsi_logging.h linux-2.6.37.4/drivers/scsi/scsi_logging.h
26622 +--- linux-2.6.37.4/drivers/scsi/scsi_logging.h 2011-01-04 19:50:19.000000000 -0500
26623 ++++ linux-2.6.37.4/drivers/scsi/scsi_logging.h 2011-01-17 02:41:01.000000000 -0500
26624 @@ -51,7 +51,7 @@ do { \
26625 } while (0); \
26626 } while (0)
26627 @@ -27941,9 +28136,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/scsi_logging.h linux-2.6.37.3/drivers/scs
26628 #endif /* CONFIG_SCSI_LOGGING */
26629
26630 /*
26631 -diff -urNp linux-2.6.37.3/drivers/scsi/scsi_transport_iscsi.c linux-2.6.37.3/drivers/scsi/scsi_transport_iscsi.c
26632 ---- linux-2.6.37.3/drivers/scsi/scsi_transport_iscsi.c 2011-01-04 19:50:19.000000000 -0500
26633 -+++ linux-2.6.37.3/drivers/scsi/scsi_transport_iscsi.c 2011-02-27 15:25:03.000000000 -0500
26634 +diff -urNp linux-2.6.37.4/drivers/scsi/scsi_transport_iscsi.c linux-2.6.37.4/drivers/scsi/scsi_transport_iscsi.c
26635 +--- linux-2.6.37.4/drivers/scsi/scsi_transport_iscsi.c 2011-01-04 19:50:19.000000000 -0500
26636 ++++ linux-2.6.37.4/drivers/scsi/scsi_transport_iscsi.c 2011-02-27 15:25:03.000000000 -0500
26637 @@ -1847,7 +1847,7 @@ store_priv_session_##field(struct device
26638 #define iscsi_priv_session_rw_attr(field, format) \
26639 iscsi_priv_session_attr_show(field, format) \
26640 @@ -27953,9 +28148,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/scsi_transport_iscsi.c linux-2.6.37.3/dri
26641 show_priv_session_##field, \
26642 store_priv_session_##field)
26643 iscsi_priv_session_rw_attr(recovery_tmo, "%d");
26644 -diff -urNp linux-2.6.37.3/drivers/scsi/sg.c linux-2.6.37.3/drivers/scsi/sg.c
26645 ---- linux-2.6.37.3/drivers/scsi/sg.c 2011-01-04 19:50:19.000000000 -0500
26646 -+++ linux-2.6.37.3/drivers/scsi/sg.c 2011-01-17 02:41:01.000000000 -0500
26647 +diff -urNp linux-2.6.37.4/drivers/scsi/sg.c linux-2.6.37.4/drivers/scsi/sg.c
26648 +--- linux-2.6.37.4/drivers/scsi/sg.c 2011-01-04 19:50:19.000000000 -0500
26649 ++++ linux-2.6.37.4/drivers/scsi/sg.c 2011-01-17 02:41:01.000000000 -0500
26650 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
26651 const struct file_operations * fops;
26652 };
26653 @@ -27974,9 +28169,9 @@ diff -urNp linux-2.6.37.3/drivers/scsi/sg.c linux-2.6.37.3/drivers/scsi/sg.c
26654
26655 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
26656 if (!sg_proc_sgp)
26657 -diff -urNp linux-2.6.37.3/drivers/serial/8250_pci.c linux-2.6.37.3/drivers/serial/8250_pci.c
26658 ---- linux-2.6.37.3/drivers/serial/8250_pci.c 2011-01-04 19:50:19.000000000 -0500
26659 -+++ linux-2.6.37.3/drivers/serial/8250_pci.c 2011-01-17 02:41:01.000000000 -0500
26660 +diff -urNp linux-2.6.37.4/drivers/serial/8250_pci.c linux-2.6.37.4/drivers/serial/8250_pci.c
26661 +--- linux-2.6.37.4/drivers/serial/8250_pci.c 2011-01-04 19:50:19.000000000 -0500
26662 ++++ linux-2.6.37.4/drivers/serial/8250_pci.c 2011-01-17 02:41:01.000000000 -0500
26663 @@ -3782,7 +3782,7 @@ static struct pci_device_id serial_pci_t
26664 PCI_ANY_ID, PCI_ANY_ID,
26665 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
26666 @@ -27986,9 +28181,9 @@ diff -urNp linux-2.6.37.3/drivers/serial/8250_pci.c linux-2.6.37.3/drivers/seria
26667 };
26668
26669 static struct pci_driver serial_pci_driver = {
26670 -diff -urNp linux-2.6.37.3/drivers/serial/kgdboc.c linux-2.6.37.3/drivers/serial/kgdboc.c
26671 ---- linux-2.6.37.3/drivers/serial/kgdboc.c 2011-01-04 19:50:19.000000000 -0500
26672 -+++ linux-2.6.37.3/drivers/serial/kgdboc.c 2011-01-17 02:41:01.000000000 -0500
26673 +diff -urNp linux-2.6.37.4/drivers/serial/kgdboc.c linux-2.6.37.4/drivers/serial/kgdboc.c
26674 +--- linux-2.6.37.4/drivers/serial/kgdboc.c 2011-01-04 19:50:19.000000000 -0500
26675 ++++ linux-2.6.37.4/drivers/serial/kgdboc.c 2011-01-17 02:41:01.000000000 -0500
26676 @@ -22,7 +22,8 @@
26677
26678 #define MAX_CONFIG_LEN 40
26679 @@ -28007,9 +28202,9 @@ diff -urNp linux-2.6.37.3/drivers/serial/kgdboc.c linux-2.6.37.3/drivers/serial/
26680 static struct kgdb_io kgdboc_io_ops = {
26681 .name = "kgdboc",
26682 .read_char = kgdboc_get_char,
26683 -diff -urNp linux-2.6.37.3/drivers/staging/autofs/root.c linux-2.6.37.3/drivers/staging/autofs/root.c
26684 ---- linux-2.6.37.3/drivers/staging/autofs/root.c 2011-01-04 19:50:19.000000000 -0500
26685 -+++ linux-2.6.37.3/drivers/staging/autofs/root.c 2011-01-24 18:04:18.000000000 -0500
26686 +diff -urNp linux-2.6.37.4/drivers/staging/autofs/root.c linux-2.6.37.4/drivers/staging/autofs/root.c
26687 +--- linux-2.6.37.4/drivers/staging/autofs/root.c 2011-01-04 19:50:19.000000000 -0500
26688 ++++ linux-2.6.37.4/drivers/staging/autofs/root.c 2011-01-24 18:04:18.000000000 -0500
26689 @@ -308,7 +308,8 @@ static int autofs_root_symlink(struct in
26690 set_bit(n,sbi->symlink_bitmap);
26691 sl = &sbi->symlink[n];
26692 @@ -28020,9 +28215,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/autofs/root.c linux-2.6.37.3/drivers/s
26693 if (!sl->data) {
26694 clear_bit(n,sbi->symlink_bitmap);
26695 unlock_kernel();
26696 -diff -urNp linux-2.6.37.3/drivers/staging/bcm/Bcmchar.c linux-2.6.37.3/drivers/staging/bcm/Bcmchar.c
26697 ---- linux-2.6.37.3/drivers/staging/bcm/Bcmchar.c 2011-01-04 19:50:19.000000000 -0500
26698 -+++ linux-2.6.37.3/drivers/staging/bcm/Bcmchar.c 2011-01-17 02:41:01.000000000 -0500
26699 +diff -urNp linux-2.6.37.4/drivers/staging/bcm/Bcmchar.c linux-2.6.37.4/drivers/staging/bcm/Bcmchar.c
26700 +--- linux-2.6.37.4/drivers/staging/bcm/Bcmchar.c 2011-01-04 19:50:19.000000000 -0500
26701 ++++ linux-2.6.37.4/drivers/staging/bcm/Bcmchar.c 2011-01-17 02:41:01.000000000 -0500
26702 @@ -2386,7 +2386,7 @@ static long bcm_char_ioctl(struct file *
26703 }
26704
26705 @@ -28032,9 +28227,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/bcm/Bcmchar.c linux-2.6.37.3/drivers/s
26706 .owner = THIS_MODULE,
26707 .open = bcm_char_open,
26708 .release = bcm_char_release,
26709 -diff -urNp linux-2.6.37.3/drivers/staging/bcm/InterfaceInit.c linux-2.6.37.3/drivers/staging/bcm/InterfaceInit.c
26710 ---- linux-2.6.37.3/drivers/staging/bcm/InterfaceInit.c 2011-02-22 16:05:31.000000000 -0500
26711 -+++ linux-2.6.37.3/drivers/staging/bcm/InterfaceInit.c 2011-02-22 16:05:42.000000000 -0500
26712 +diff -urNp linux-2.6.37.4/drivers/staging/bcm/InterfaceInit.c linux-2.6.37.4/drivers/staging/bcm/InterfaceInit.c
26713 +--- linux-2.6.37.4/drivers/staging/bcm/InterfaceInit.c 2011-02-22 16:05:31.000000000 -0500
26714 ++++ linux-2.6.37.4/drivers/staging/bcm/InterfaceInit.c 2011-02-22 16:05:42.000000000 -0500
26715 @@ -158,7 +158,7 @@ VOID ConfigureEndPointTypesThroughEEPROM
26716
26717 }
26718 @@ -28044,9 +28239,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/bcm/InterfaceInit.c linux-2.6.37.3/dri
26719 .open = usbbcm_open,
26720 .release = usbbcm_release,
26721 .read = usbbcm_read,
26722 -diff -urNp linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
26723 ---- linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-04 19:50:19.000000000 -0500
26724 -+++ linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-24 18:04:18.000000000 -0500
26725 +diff -urNp linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
26726 +--- linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-04 19:50:19.000000000 -0500
26727 ++++ linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-24 18:04:18.000000000 -0500
26728 @@ -864,14 +864,14 @@ static void dhd_op_if(dhd_if_t *ifp)
26729 free_netdev(ifp->net);
26730 }
26731 @@ -28102,9 +28297,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2
26732
26733 #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
26734 g_bus = bus;
26735 -diff -urNp linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c
26736 ---- linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-04 19:50:19.000000000 -0500
26737 -+++ linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-24 18:04:18.000000000 -0500
26738 +diff -urNp linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c
26739 +--- linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-04 19:50:19.000000000 -0500
26740 ++++ linux-2.6.37.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-24 18:04:18.000000000 -0500
26741 @@ -514,7 +514,7 @@ wl_iw_get_range(struct net_device *dev,
26742 list = (wl_u32_list_t *) channels;
26743
26744 @@ -28114,9 +28309,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.3
26745
26746 range->min_nwid = range->max_nwid = 0;
26747
26748 -diff -urNp linux-2.6.37.3/drivers/staging/comedi/comedi_fops.c linux-2.6.37.3/drivers/staging/comedi/comedi_fops.c
26749 ---- linux-2.6.37.3/drivers/staging/comedi/comedi_fops.c 2011-01-04 19:50:19.000000000 -0500
26750 -+++ linux-2.6.37.3/drivers/staging/comedi/comedi_fops.c 2011-01-17 02:41:01.000000000 -0500
26751 +diff -urNp linux-2.6.37.4/drivers/staging/comedi/comedi_fops.c linux-2.6.37.4/drivers/staging/comedi/comedi_fops.c
26752 +--- linux-2.6.37.4/drivers/staging/comedi/comedi_fops.c 2011-01-04 19:50:19.000000000 -0500
26753 ++++ linux-2.6.37.4/drivers/staging/comedi/comedi_fops.c 2011-01-17 02:41:01.000000000 -0500
26754 @@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_
26755 mutex_unlock(&dev->mutex);
26756 }
26757 @@ -28126,9 +28321,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/comedi/comedi_fops.c linux-2.6.37.3/dr
26758 .close = comedi_unmap,
26759 };
26760
26761 -diff -urNp linux-2.6.37.3/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c linux-2.6.37.3/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
26762 ---- linux-2.6.37.3/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-04 19:50:19.000000000 -0500
26763 -+++ linux-2.6.37.3/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-17 02:41:01.000000000 -0500
26764 +diff -urNp linux-2.6.37.4/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c linux-2.6.37.4/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
26765 +--- linux-2.6.37.4/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-04 19:50:19.000000000 -0500
26766 ++++ linux-2.6.37.4/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-17 02:41:01.000000000 -0500
26767 @@ -69,7 +69,7 @@ int numofmsgbuf = 0;
26768 //
26769 // Table of entry-point routines for char device
26770 @@ -28138,9 +28333,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c linux
26771 {
26772 .unlocked_ioctl = ft1000_ChIoctl,
26773 .poll = ft1000_ChPoll,
26774 -diff -urNp linux-2.6.37.3/drivers/staging/go7007/go7007-v4l2.c linux-2.6.37.3/drivers/staging/go7007/go7007-v4l2.c
26775 ---- linux-2.6.37.3/drivers/staging/go7007/go7007-v4l2.c 2011-01-04 19:50:19.000000000 -0500
26776 -+++ linux-2.6.37.3/drivers/staging/go7007/go7007-v4l2.c 2011-01-17 02:41:01.000000000 -0500
26777 +diff -urNp linux-2.6.37.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.37.4/drivers/staging/go7007/go7007-v4l2.c
26778 +--- linux-2.6.37.4/drivers/staging/go7007/go7007-v4l2.c 2011-01-04 19:50:19.000000000 -0500
26779 ++++ linux-2.6.37.4/drivers/staging/go7007/go7007-v4l2.c 2011-01-17 02:41:01.000000000 -0500
26780 @@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are
26781 return 0;
26782 }
26783 @@ -28150,9 +28345,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/go7007/go7007-v4l2.c linux-2.6.37.3/dr
26784 .open = go7007_vm_open,
26785 .close = go7007_vm_close,
26786 .fault = go7007_vm_fault,
26787 -diff -urNp linux-2.6.37.3/drivers/staging/hv/hv.c linux-2.6.37.3/drivers/staging/hv/hv.c
26788 ---- linux-2.6.37.3/drivers/staging/hv/hv.c 2011-01-04 19:50:19.000000000 -0500
26789 -+++ linux-2.6.37.3/drivers/staging/hv/hv.c 2011-01-17 02:41:01.000000000 -0500
26790 +diff -urNp linux-2.6.37.4/drivers/staging/hv/hv.c linux-2.6.37.4/drivers/staging/hv/hv.c
26791 +--- linux-2.6.37.4/drivers/staging/hv/hv.c 2011-01-04 19:50:19.000000000 -0500
26792 ++++ linux-2.6.37.4/drivers/staging/hv/hv.c 2011-01-17 02:41:01.000000000 -0500
26793 @@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, vo
26794 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
26795 u32 outputAddressHi = outputAddress >> 32;
26796 @@ -28162,9 +28357,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/hv/hv.c linux-2.6.37.3/drivers/staging
26797
26798 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
26799 Control, Input, Output);
26800 -diff -urNp linux-2.6.37.3/drivers/staging/msm/msm_fb_bl.c linux-2.6.37.3/drivers/staging/msm/msm_fb_bl.c
26801 ---- linux-2.6.37.3/drivers/staging/msm/msm_fb_bl.c 2011-01-04 19:50:19.000000000 -0500
26802 -+++ linux-2.6.37.3/drivers/staging/msm/msm_fb_bl.c 2011-01-17 02:41:01.000000000 -0500
26803 +diff -urNp linux-2.6.37.4/drivers/staging/msm/msm_fb_bl.c linux-2.6.37.4/drivers/staging/msm/msm_fb_bl.c
26804 +--- linux-2.6.37.4/drivers/staging/msm/msm_fb_bl.c 2011-01-04 19:50:19.000000000 -0500
26805 ++++ linux-2.6.37.4/drivers/staging/msm/msm_fb_bl.c 2011-01-17 02:41:01.000000000 -0500
26806 @@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struc
26807 return 0;
26808 }
26809 @@ -28174,9 +28369,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/msm/msm_fb_bl.c linux-2.6.37.3/drivers
26810 .get_brightness = msm_fb_bl_get_brightness,
26811 .update_status = msm_fb_bl_update_status,
26812 };
26813 -diff -urNp linux-2.6.37.3/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.37.3/drivers/staging/olpc_dcon/olpc_dcon.c
26814 ---- linux-2.6.37.3/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-04 19:50:19.000000000 -0500
26815 -+++ linux-2.6.37.3/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-17 02:41:01.000000000 -0500
26816 +diff -urNp linux-2.6.37.4/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.37.4/drivers/staging/olpc_dcon/olpc_dcon.c
26817 +--- linux-2.6.37.4/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-04 19:50:19.000000000 -0500
26818 ++++ linux-2.6.37.4/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-17 02:41:01.000000000 -0500
26819 @@ -615,7 +615,7 @@ static struct device_attribute dcon_devi
26820 __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store),
26821 };
26822 @@ -28186,9 +28381,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.37.3/d
26823 .get_brightness = dconbl_get,
26824 .update_status = dconbl_set
26825 };
26826 -diff -urNp linux-2.6.37.3/drivers/staging/phison/phison.c linux-2.6.37.3/drivers/staging/phison/phison.c
26827 ---- linux-2.6.37.3/drivers/staging/phison/phison.c 2011-01-04 19:50:19.000000000 -0500
26828 -+++ linux-2.6.37.3/drivers/staging/phison/phison.c 2011-01-17 02:41:01.000000000 -0500
26829 +diff -urNp linux-2.6.37.4/drivers/staging/phison/phison.c linux-2.6.37.4/drivers/staging/phison/phison.c
26830 +--- linux-2.6.37.4/drivers/staging/phison/phison.c 2011-01-04 19:50:19.000000000 -0500
26831 ++++ linux-2.6.37.4/drivers/staging/phison/phison.c 2011-01-17 02:41:01.000000000 -0500
26832 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
26833 ATA_BMDMA_SHT(DRV_NAME),
26834 };
26835 @@ -28198,9 +28393,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/phison/phison.c linux-2.6.37.3/drivers
26836 .inherits = &ata_bmdma_port_ops,
26837 .prereset = phison_pre_reset,
26838 };
26839 -diff -urNp linux-2.6.37.3/drivers/staging/pohmelfs/inode.c linux-2.6.37.3/drivers/staging/pohmelfs/inode.c
26840 ---- linux-2.6.37.3/drivers/staging/pohmelfs/inode.c 2011-01-04 19:50:19.000000000 -0500
26841 -+++ linux-2.6.37.3/drivers/staging/pohmelfs/inode.c 2011-01-17 02:41:01.000000000 -0500
26842 +diff -urNp linux-2.6.37.4/drivers/staging/pohmelfs/inode.c linux-2.6.37.4/drivers/staging/pohmelfs/inode.c
26843 +--- linux-2.6.37.4/drivers/staging/pohmelfs/inode.c 2011-01-04 19:50:19.000000000 -0500
26844 ++++ linux-2.6.37.4/drivers/staging/pohmelfs/inode.c 2011-01-17 02:41:01.000000000 -0500
26845 @@ -1848,7 +1848,7 @@ static int pohmelfs_fill_super(struct su
26846 mutex_init(&psb->mcache_lock);
26847 psb->mcache_root = RB_ROOT;
26848 @@ -28210,9 +28405,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/pohmelfs/inode.c linux-2.6.37.3/driver
26849
26850 psb->trans_max_pages = 100;
26851
26852 -diff -urNp linux-2.6.37.3/drivers/staging/pohmelfs/mcache.c linux-2.6.37.3/drivers/staging/pohmelfs/mcache.c
26853 ---- linux-2.6.37.3/drivers/staging/pohmelfs/mcache.c 2011-01-04 19:50:19.000000000 -0500
26854 -+++ linux-2.6.37.3/drivers/staging/pohmelfs/mcache.c 2011-01-17 02:41:01.000000000 -0500
26855 +diff -urNp linux-2.6.37.4/drivers/staging/pohmelfs/mcache.c linux-2.6.37.4/drivers/staging/pohmelfs/mcache.c
26856 +--- linux-2.6.37.4/drivers/staging/pohmelfs/mcache.c 2011-01-04 19:50:19.000000000 -0500
26857 ++++ linux-2.6.37.4/drivers/staging/pohmelfs/mcache.c 2011-01-17 02:41:01.000000000 -0500
26858 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
26859 m->data = data;
26860 m->start = start;
26861 @@ -28222,9 +28417,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/pohmelfs/mcache.c linux-2.6.37.3/drive
26862
26863 mutex_lock(&psb->mcache_lock);
26864 err = pohmelfs_mcache_insert(psb, m);
26865 -diff -urNp linux-2.6.37.3/drivers/staging/pohmelfs/netfs.h linux-2.6.37.3/drivers/staging/pohmelfs/netfs.h
26866 ---- linux-2.6.37.3/drivers/staging/pohmelfs/netfs.h 2011-01-04 19:50:19.000000000 -0500
26867 -+++ linux-2.6.37.3/drivers/staging/pohmelfs/netfs.h 2011-01-17 02:41:01.000000000 -0500
26868 +diff -urNp linux-2.6.37.4/drivers/staging/pohmelfs/netfs.h linux-2.6.37.4/drivers/staging/pohmelfs/netfs.h
26869 +--- linux-2.6.37.4/drivers/staging/pohmelfs/netfs.h 2011-01-04 19:50:19.000000000 -0500
26870 ++++ linux-2.6.37.4/drivers/staging/pohmelfs/netfs.h 2011-01-17 02:41:01.000000000 -0500
26871 @@ -571,7 +571,7 @@ struct pohmelfs_config;
26872 struct pohmelfs_sb {
26873 struct rb_root mcache_root;
26874 @@ -28234,9 +28429,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/pohmelfs/netfs.h linux-2.6.37.3/driver
26875 unsigned long mcache_timeout;
26876
26877 unsigned int idx;
26878 -diff -urNp linux-2.6.37.3/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.37.3/drivers/staging/rtl8192u/ieee80211/proc.c
26879 ---- linux-2.6.37.3/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-04 19:50:19.000000000 -0500
26880 -+++ linux-2.6.37.3/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-17 02:41:01.000000000 -0500
26881 +diff -urNp linux-2.6.37.4/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.37.4/drivers/staging/rtl8192u/ieee80211/proc.c
26882 +--- linux-2.6.37.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-04 19:50:19.000000000 -0500
26883 ++++ linux-2.6.37.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-17 02:41:01.000000000 -0500
26884 @@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
26885 return seq_open(file, &crypto_seq_ops);
26886 }
26887 @@ -28246,9 +28441,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.37
26888 .open = crypto_info_open,
26889 .read = seq_read,
26890 .llseek = seq_lseek,
26891 -diff -urNp linux-2.6.37.3/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.37.3/drivers/staging/samsung-laptop/samsung-laptop.c
26892 ---- linux-2.6.37.3/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-04 19:50:19.000000000 -0500
26893 -+++ linux-2.6.37.3/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-17 02:41:01.000000000 -0500
26894 +diff -urNp linux-2.6.37.4/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.37.4/drivers/staging/samsung-laptop/samsung-laptop.c
26895 +--- linux-2.6.37.4/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-04 19:50:19.000000000 -0500
26896 ++++ linux-2.6.37.4/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-17 02:41:01.000000000 -0500
26897 @@ -269,7 +269,7 @@ static int update_status(struct backligh
26898 return 0;
26899 }
26900 @@ -28258,9 +28453,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/samsung-laptop/samsung-laptop.c linux-
26901 .get_brightness = get_brightness,
26902 .update_status = update_status,
26903 };
26904 -diff -urNp linux-2.6.37.3/drivers/staging/spectra/ffsport.c linux-2.6.37.3/drivers/staging/spectra/ffsport.c
26905 ---- linux-2.6.37.3/drivers/staging/spectra/ffsport.c 2011-01-04 19:50:19.000000000 -0500
26906 -+++ linux-2.6.37.3/drivers/staging/spectra/ffsport.c 2011-01-17 02:41:01.000000000 -0500
26907 +diff -urNp linux-2.6.37.4/drivers/staging/spectra/ffsport.c linux-2.6.37.4/drivers/staging/spectra/ffsport.c
26908 +--- linux-2.6.37.4/drivers/staging/spectra/ffsport.c 2011-01-04 19:50:19.000000000 -0500
26909 ++++ linux-2.6.37.4/drivers/staging/spectra/ffsport.c 2011-01-17 02:41:01.000000000 -0500
26910 @@ -603,7 +603,7 @@ int GLOB_SBD_unlocked_ioctl(struct block
26911 return ret;
26912 }
26913 @@ -28270,9 +28465,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/spectra/ffsport.c linux-2.6.37.3/drive
26914 .owner = THIS_MODULE,
26915 .open = GLOB_SBD_open,
26916 .release = GLOB_SBD_release,
26917 -diff -urNp linux-2.6.37.3/drivers/staging/vme/devices/vme_user.c linux-2.6.37.3/drivers/staging/vme/devices/vme_user.c
26918 ---- linux-2.6.37.3/drivers/staging/vme/devices/vme_user.c 2011-01-04 19:50:19.000000000 -0500
26919 -+++ linux-2.6.37.3/drivers/staging/vme/devices/vme_user.c 2011-01-17 02:41:01.000000000 -0500
26920 +diff -urNp linux-2.6.37.4/drivers/staging/vme/devices/vme_user.c linux-2.6.37.4/drivers/staging/vme/devices/vme_user.c
26921 +--- linux-2.6.37.4/drivers/staging/vme/devices/vme_user.c 2011-01-04 19:50:19.000000000 -0500
26922 ++++ linux-2.6.37.4/drivers/staging/vme/devices/vme_user.c 2011-01-17 02:41:01.000000000 -0500
26923 @@ -137,7 +137,7 @@ static long vme_user_unlocked_ioctl(stru
26924 static int __init vme_user_probe(struct device *, int, int);
26925 static int __exit vme_user_remove(struct device *, int, int);
26926 @@ -28282,9 +28477,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/vme/devices/vme_user.c linux-2.6.37.3/
26927 .open = vme_user_open,
26928 .release = vme_user_release,
26929 .read = vme_user_read,
26930 -diff -urNp linux-2.6.37.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.37.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
26931 ---- linux-2.6.37.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-04 19:50:19.000000000 -0500
26932 -+++ linux-2.6.37.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-17 02:41:01.000000000 -0500
26933 +diff -urNp linux-2.6.37.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.37.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
26934 +--- linux-2.6.37.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-04 19:50:19.000000000 -0500
26935 ++++ linux-2.6.37.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-17 02:41:01.000000000 -0500
26936 @@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge
26937
26938
26939 @@ -28294,9 +28489,9 @@ diff -urNp linux-2.6.37.3/drivers/staging/westbridge/astoria/block/cyasblkdev_bl
26940 .open = cyasblkdev_blk_open,
26941 .release = cyasblkdev_blk_release,
26942 .ioctl = cyasblkdev_blk_ioctl,
26943 -diff -urNp linux-2.6.37.3/drivers/tty/n_gsm.c linux-2.6.37.3/drivers/tty/n_gsm.c
26944 ---- linux-2.6.37.3/drivers/tty/n_gsm.c 2011-02-22 16:05:31.000000000 -0500
26945 -+++ linux-2.6.37.3/drivers/tty/n_gsm.c 2011-02-22 16:05:42.000000000 -0500
26946 +diff -urNp linux-2.6.37.4/drivers/tty/n_gsm.c linux-2.6.37.4/drivers/tty/n_gsm.c
26947 +--- linux-2.6.37.4/drivers/tty/n_gsm.c 2011-02-22 16:05:31.000000000 -0500
26948 ++++ linux-2.6.37.4/drivers/tty/n_gsm.c 2011-02-22 16:05:42.000000000 -0500
26949 @@ -1579,7 +1579,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
26950 return NULL;
26951 spin_lock_init(&dlci->lock);
26952 @@ -28306,9 +28501,9 @@ diff -urNp linux-2.6.37.3/drivers/tty/n_gsm.c linux-2.6.37.3/drivers/tty/n_gsm.c
26953 kfree(dlci);
26954 return NULL;
26955 }
26956 -diff -urNp linux-2.6.37.3/drivers/tty/n_tty.c linux-2.6.37.3/drivers/tty/n_tty.c
26957 ---- linux-2.6.37.3/drivers/tty/n_tty.c 2011-01-04 19:50:19.000000000 -0500
26958 -+++ linux-2.6.37.3/drivers/tty/n_tty.c 2011-01-17 02:41:01.000000000 -0500
26959 +diff -urNp linux-2.6.37.4/drivers/tty/n_tty.c linux-2.6.37.4/drivers/tty/n_tty.c
26960 +--- linux-2.6.37.4/drivers/tty/n_tty.c 2011-01-04 19:50:19.000000000 -0500
26961 ++++ linux-2.6.37.4/drivers/tty/n_tty.c 2011-01-17 02:41:01.000000000 -0500
26962 @@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
26963 {
26964 *ops = tty_ldisc_N_TTY;
26965 @@ -28318,9 +28513,9 @@ diff -urNp linux-2.6.37.3/drivers/tty/n_tty.c linux-2.6.37.3/drivers/tty/n_tty.c
26966 + ops->flags = 0;
26967 }
26968 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
26969 -diff -urNp linux-2.6.37.3/drivers/tty/pty.c linux-2.6.37.3/drivers/tty/pty.c
26970 ---- linux-2.6.37.3/drivers/tty/pty.c 2011-01-04 19:50:19.000000000 -0500
26971 -+++ linux-2.6.37.3/drivers/tty/pty.c 2011-01-17 02:41:01.000000000 -0500
26972 +diff -urNp linux-2.6.37.4/drivers/tty/pty.c linux-2.6.37.4/drivers/tty/pty.c
26973 +--- linux-2.6.37.4/drivers/tty/pty.c 2011-01-04 19:50:19.000000000 -0500
26974 ++++ linux-2.6.37.4/drivers/tty/pty.c 2011-01-17 02:41:01.000000000 -0500
26975 @@ -700,7 +700,18 @@ out:
26976 return retval;
26977 }
26978 @@ -28352,9 +28547,9 @@ diff -urNp linux-2.6.37.3/drivers/tty/pty.c linux-2.6.37.3/drivers/tty/pty.c
26979 cdev_init(&ptmx_cdev, &ptmx_fops);
26980 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
26981 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
26982 -diff -urNp linux-2.6.37.3/drivers/tty/tty_io.c linux-2.6.37.3/drivers/tty/tty_io.c
26983 ---- linux-2.6.37.3/drivers/tty/tty_io.c 2011-01-04 19:50:19.000000000 -0500
26984 -+++ linux-2.6.37.3/drivers/tty/tty_io.c 2011-01-17 02:41:01.000000000 -0500
26985 +diff -urNp linux-2.6.37.4/drivers/tty/tty_io.c linux-2.6.37.4/drivers/tty/tty_io.c
26986 +--- linux-2.6.37.4/drivers/tty/tty_io.c 2011-01-04 19:50:19.000000000 -0500
26987 ++++ linux-2.6.37.4/drivers/tty/tty_io.c 2011-01-17 02:41:01.000000000 -0500
26988 @@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex);
26989 /* Spinlock to protect the tty->tty_files list */
26990 DEFINE_SPINLOCK(tty_files_lock);
26991 @@ -28492,9 +28687,9 @@ diff -urNp linux-2.6.37.3/drivers/tty/tty_io.c linux-2.6.37.3/drivers/tty/tty_io
26992 /*
26993 * Initialize the console device. This is called *early*, so
26994 * we can't necessarily depend on lots of kernel help here.
26995 -diff -urNp linux-2.6.37.3/drivers/tty/tty_ldisc.c linux-2.6.37.3/drivers/tty/tty_ldisc.c
26996 ---- linux-2.6.37.3/drivers/tty/tty_ldisc.c 2011-01-04 19:50:19.000000000 -0500
26997 -+++ linux-2.6.37.3/drivers/tty/tty_ldisc.c 2011-01-17 02:41:01.000000000 -0500
26998 +diff -urNp linux-2.6.37.4/drivers/tty/tty_ldisc.c linux-2.6.37.4/drivers/tty/tty_ldisc.c
26999 +--- linux-2.6.37.4/drivers/tty/tty_ldisc.c 2011-01-04 19:50:19.000000000 -0500
27000 ++++ linux-2.6.37.4/drivers/tty/tty_ldisc.c 2011-01-17 02:41:01.000000000 -0500
27001 @@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *
27002 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
27003 struct tty_ldisc_ops *ldo = ld->ops;
27004 @@ -28540,9 +28735,9 @@ diff -urNp linux-2.6.37.3/drivers/tty/tty_ldisc.c linux-2.6.37.3/drivers/tty/tty
27005 module_put(ldops->owner);
27006 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
27007 }
27008 -diff -urNp linux-2.6.37.3/drivers/tty/vt/keyboard.c linux-2.6.37.3/drivers/tty/vt/keyboard.c
27009 ---- linux-2.6.37.3/drivers/tty/vt/keyboard.c 2011-01-04 19:50:19.000000000 -0500
27010 -+++ linux-2.6.37.3/drivers/tty/vt/keyboard.c 2011-01-17 02:41:01.000000000 -0500
27011 +diff -urNp linux-2.6.37.4/drivers/tty/vt/keyboard.c linux-2.6.37.4/drivers/tty/vt/keyboard.c
27012 +--- linux-2.6.37.4/drivers/tty/vt/keyboard.c 2011-01-04 19:50:19.000000000 -0500
27013 ++++ linux-2.6.37.4/drivers/tty/vt/keyboard.c 2011-01-17 02:41:01.000000000 -0500
27014 @@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u
27015 kbd->kbdmode == VC_MEDIUMRAW) &&
27016 value != KVAL(K_SAK))
27017 @@ -28569,9 +28764,21 @@ diff -urNp linux-2.6.37.3/drivers/tty/vt/keyboard.c linux-2.6.37.3/drivers/tty/v
27018 };
27019
27020 MODULE_DEVICE_TABLE(input, kbd_ids);
27021 -diff -urNp linux-2.6.37.3/drivers/tty/vt/vt_ioctl.c linux-2.6.37.3/drivers/tty/vt/vt_ioctl.c
27022 ---- linux-2.6.37.3/drivers/tty/vt/vt_ioctl.c 2011-01-04 19:50:19.000000000 -0500
27023 -+++ linux-2.6.37.3/drivers/tty/vt/vt_ioctl.c 2011-01-17 02:41:01.000000000 -0500
27024 +diff -urNp linux-2.6.37.4/drivers/tty/vt/vt.c linux-2.6.37.4/drivers/tty/vt/vt.c
27025 +--- linux-2.6.37.4/drivers/tty/vt/vt.c 2011-02-27 14:49:17.000000000 -0500
27026 ++++ linux-2.6.37.4/drivers/tty/vt/vt.c 2011-03-21 17:16:23.000000000 -0400
27027 +@@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
27028 +
27029 + static void notify_write(struct vc_data *vc, unsigned int unicode)
27030 + {
27031 +- struct vt_notifier_param param = { .vc = vc, unicode = unicode };
27032 ++ struct vt_notifier_param param = { .vc = vc, .c = unicode };
27033 + atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
27034 + }
27035 +
27036 +diff -urNp linux-2.6.37.4/drivers/tty/vt/vt_ioctl.c linux-2.6.37.4/drivers/tty/vt/vt_ioctl.c
27037 +--- linux-2.6.37.4/drivers/tty/vt/vt_ioctl.c 2011-01-04 19:50:19.000000000 -0500
27038 ++++ linux-2.6.37.4/drivers/tty/vt/vt_ioctl.c 2011-01-17 02:41:01.000000000 -0500
27039 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
27040 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
27041 return -EFAULT;
27042 @@ -28612,9 +28819,9 @@ diff -urNp linux-2.6.37.3/drivers/tty/vt/vt_ioctl.c linux-2.6.37.3/drivers/tty/v
27043 if (!perm) {
27044 ret = -EPERM;
27045 goto reterr;
27046 -diff -urNp linux-2.6.37.3/drivers/uio/uio.c linux-2.6.37.3/drivers/uio/uio.c
27047 ---- linux-2.6.37.3/drivers/uio/uio.c 2011-01-04 19:50:19.000000000 -0500
27048 -+++ linux-2.6.37.3/drivers/uio/uio.c 2011-01-24 18:04:18.000000000 -0500
27049 +diff -urNp linux-2.6.37.4/drivers/uio/uio.c linux-2.6.37.4/drivers/uio/uio.c
27050 +--- linux-2.6.37.4/drivers/uio/uio.c 2011-01-04 19:50:19.000000000 -0500
27051 ++++ linux-2.6.37.4/drivers/uio/uio.c 2011-01-24 18:04:18.000000000 -0500
27052 @@ -25,6 +25,7 @@
27053 #include <linux/kobject.h>
27054 #include <linux/cdev.h>
27055 @@ -28648,9 +28855,9 @@ diff -urNp linux-2.6.37.3/drivers/uio/uio.c linux-2.6.37.3/drivers/uio/uio.c
27056 }
27057
27058 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
27059 -diff -urNp linux-2.6.37.3/drivers/usb/atm/cxacru.c linux-2.6.37.3/drivers/usb/atm/cxacru.c
27060 ---- linux-2.6.37.3/drivers/usb/atm/cxacru.c 2011-01-04 19:50:19.000000000 -0500
27061 -+++ linux-2.6.37.3/drivers/usb/atm/cxacru.c 2011-01-17 02:41:01.000000000 -0500
27062 +diff -urNp linux-2.6.37.4/drivers/usb/atm/cxacru.c linux-2.6.37.4/drivers/usb/atm/cxacru.c
27063 +--- linux-2.6.37.4/drivers/usb/atm/cxacru.c 2011-01-04 19:50:19.000000000 -0500
27064 ++++ linux-2.6.37.4/drivers/usb/atm/cxacru.c 2011-01-17 02:41:01.000000000 -0500
27065 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
27066 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
27067 if (ret < 2)
27068 @@ -28660,9 +28867,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/atm/cxacru.c linux-2.6.37.3/drivers/usb/at
27069 return -EINVAL;
27070 pos += tmp;
27071
27072 -diff -urNp linux-2.6.37.3/drivers/usb/atm/usbatm.c linux-2.6.37.3/drivers/usb/atm/usbatm.c
27073 ---- linux-2.6.37.3/drivers/usb/atm/usbatm.c 2011-01-04 19:50:19.000000000 -0500
27074 -+++ linux-2.6.37.3/drivers/usb/atm/usbatm.c 2011-01-17 02:41:01.000000000 -0500
27075 +diff -urNp linux-2.6.37.4/drivers/usb/atm/usbatm.c linux-2.6.37.4/drivers/usb/atm/usbatm.c
27076 +--- linux-2.6.37.4/drivers/usb/atm/usbatm.c 2011-01-04 19:50:19.000000000 -0500
27077 ++++ linux-2.6.37.4/drivers/usb/atm/usbatm.c 2011-01-17 02:41:01.000000000 -0500
27078 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
27079 if (printk_ratelimit())
27080 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
27081 @@ -28742,9 +28949,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/atm/usbatm.c linux-2.6.37.3/drivers/usb/at
27082
27083 if (!left--) {
27084 if (instance->disconnected)
27085 -diff -urNp linux-2.6.37.3/drivers/usb/class/cdc-acm.c linux-2.6.37.3/drivers/usb/class/cdc-acm.c
27086 ---- linux-2.6.37.3/drivers/usb/class/cdc-acm.c 2011-02-22 16:05:31.000000000 -0500
27087 -+++ linux-2.6.37.3/drivers/usb/class/cdc-acm.c 2011-02-22 16:05:42.000000000 -0500
27088 +diff -urNp linux-2.6.37.4/drivers/usb/class/cdc-acm.c linux-2.6.37.4/drivers/usb/class/cdc-acm.c
27089 +--- linux-2.6.37.4/drivers/usb/class/cdc-acm.c 2011-02-22 16:05:31.000000000 -0500
27090 ++++ linux-2.6.37.4/drivers/usb/class/cdc-acm.c 2011-02-22 16:05:42.000000000 -0500
27091 @@ -1635,7 +1635,7 @@ static const struct usb_device_id acm_id
27092 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
27093 USB_CDC_ACM_PROTO_AT_CDMA) },
27094 @@ -28754,9 +28961,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/class/cdc-acm.c linux-2.6.37.3/drivers/usb
27095 };
27096
27097 MODULE_DEVICE_TABLE(usb, acm_ids);
27098 -diff -urNp linux-2.6.37.3/drivers/usb/class/cdc-wdm.c linux-2.6.37.3/drivers/usb/class/cdc-wdm.c
27099 ---- linux-2.6.37.3/drivers/usb/class/cdc-wdm.c 2011-01-04 19:50:19.000000000 -0500
27100 -+++ linux-2.6.37.3/drivers/usb/class/cdc-wdm.c 2011-01-17 02:41:01.000000000 -0500
27101 +diff -urNp linux-2.6.37.4/drivers/usb/class/cdc-wdm.c linux-2.6.37.4/drivers/usb/class/cdc-wdm.c
27102 +--- linux-2.6.37.4/drivers/usb/class/cdc-wdm.c 2011-01-04 19:50:19.000000000 -0500
27103 ++++ linux-2.6.37.4/drivers/usb/class/cdc-wdm.c 2011-01-17 02:41:01.000000000 -0500
27104 @@ -342,7 +342,7 @@ static ssize_t wdm_write
27105 goto outnp;
27106 }
27107 @@ -28766,9 +28973,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/class/cdc-wdm.c linux-2.6.37.3/drivers/usb
27108 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
27109 &desc->flags));
27110 else
27111 -diff -urNp linux-2.6.37.3/drivers/usb/class/usblp.c linux-2.6.37.3/drivers/usb/class/usblp.c
27112 ---- linux-2.6.37.3/drivers/usb/class/usblp.c 2011-01-04 19:50:19.000000000 -0500
27113 -+++ linux-2.6.37.3/drivers/usb/class/usblp.c 2011-01-17 02:41:01.000000000 -0500
27114 +diff -urNp linux-2.6.37.4/drivers/usb/class/usblp.c linux-2.6.37.4/drivers/usb/class/usblp.c
27115 +--- linux-2.6.37.4/drivers/usb/class/usblp.c 2011-01-04 19:50:19.000000000 -0500
27116 ++++ linux-2.6.37.4/drivers/usb/class/usblp.c 2011-01-17 02:41:01.000000000 -0500
27117 @@ -227,7 +227,7 @@ static const struct quirk_printer_struct
27118 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@×××.de> */
27119 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
27120 @@ -28787,9 +28994,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/class/usblp.c linux-2.6.37.3/drivers/usb/c
27121 };
27122
27123 MODULE_DEVICE_TABLE(usb, usblp_ids);
27124 -diff -urNp linux-2.6.37.3/drivers/usb/core/hcd.c linux-2.6.37.3/drivers/usb/core/hcd.c
27125 ---- linux-2.6.37.3/drivers/usb/core/hcd.c 2011-02-22 16:05:31.000000000 -0500
27126 -+++ linux-2.6.37.3/drivers/usb/core/hcd.c 2011-02-22 16:05:42.000000000 -0500
27127 +diff -urNp linux-2.6.37.4/drivers/usb/core/hcd.c linux-2.6.37.4/drivers/usb/core/hcd.c
27128 +--- linux-2.6.37.4/drivers/usb/core/hcd.c 2011-02-22 16:05:31.000000000 -0500
27129 ++++ linux-2.6.37.4/drivers/usb/core/hcd.c 2011-02-22 16:05:42.000000000 -0500
27130 @@ -2431,7 +2431,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
27131
27132 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
27133 @@ -28808,9 +29015,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/core/hcd.c linux-2.6.37.3/drivers/usb/core
27134 {
27135
27136 if (mon_ops)
27137 -diff -urNp linux-2.6.37.3/drivers/usb/core/hub.c linux-2.6.37.3/drivers/usb/core/hub.c
27138 ---- linux-2.6.37.3/drivers/usb/core/hub.c 2011-03-11 17:22:42.000000000 -0500
27139 -+++ linux-2.6.37.3/drivers/usb/core/hub.c 2011-03-11 17:23:03.000000000 -0500
27140 +diff -urNp linux-2.6.37.4/drivers/usb/core/hub.c linux-2.6.37.4/drivers/usb/core/hub.c
27141 +--- linux-2.6.37.4/drivers/usb/core/hub.c 2011-03-11 17:22:42.000000000 -0500
27142 ++++ linux-2.6.37.4/drivers/usb/core/hub.c 2011-03-11 17:23:03.000000000 -0500
27143 @@ -3483,7 +3483,7 @@ static const struct usb_device_id hub_id
27144 .bDeviceClass = USB_CLASS_HUB},
27145 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
27146 @@ -28820,9 +29027,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/core/hub.c linux-2.6.37.3/drivers/usb/core
27147 };
27148
27149 MODULE_DEVICE_TABLE (usb, hub_id_table);
27150 -diff -urNp linux-2.6.37.3/drivers/usb/core/message.c linux-2.6.37.3/drivers/usb/core/message.c
27151 ---- linux-2.6.37.3/drivers/usb/core/message.c 2011-01-04 19:50:19.000000000 -0500
27152 -+++ linux-2.6.37.3/drivers/usb/core/message.c 2011-01-17 02:41:01.000000000 -0500
27153 +diff -urNp linux-2.6.37.4/drivers/usb/core/message.c linux-2.6.37.4/drivers/usb/core/message.c
27154 +--- linux-2.6.37.4/drivers/usb/core/message.c 2011-01-04 19:50:19.000000000 -0500
27155 ++++ linux-2.6.37.4/drivers/usb/core/message.c 2011-01-17 02:41:01.000000000 -0500
27156 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
27157 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
27158 if (buf) {
27159 @@ -28834,9 +29041,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/core/message.c linux-2.6.37.3/drivers/usb/
27160 if (!smallbuf)
27161 return buf;
27162 memcpy(smallbuf, buf, len);
27163 -diff -urNp linux-2.6.37.3/drivers/usb/early/ehci-dbgp.c linux-2.6.37.3/drivers/usb/early/ehci-dbgp.c
27164 ---- linux-2.6.37.3/drivers/usb/early/ehci-dbgp.c 2011-01-04 19:50:19.000000000 -0500
27165 -+++ linux-2.6.37.3/drivers/usb/early/ehci-dbgp.c 2011-01-17 02:41:01.000000000 -0500
27166 +diff -urNp linux-2.6.37.4/drivers/usb/early/ehci-dbgp.c linux-2.6.37.4/drivers/usb/early/ehci-dbgp.c
27167 +--- linux-2.6.37.4/drivers/usb/early/ehci-dbgp.c 2011-01-04 19:50:19.000000000 -0500
27168 ++++ linux-2.6.37.4/drivers/usb/early/ehci-dbgp.c 2011-01-17 02:41:01.000000000 -0500
27169 @@ -96,6 +96,7 @@ static inline u32 dbgp_len_update(u32 x,
27170 }
27171
27172 @@ -28853,9 +29060,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/early/ehci-dbgp.c linux-2.6.37.3/drivers/u
27173 static struct kgdb_io kgdbdbgp_io_ops = {
27174 .name = "kgdbdbgp",
27175 .read_char = kgdbdbgp_read_char,
27176 -diff -urNp linux-2.6.37.3/drivers/usb/host/ehci-pci.c linux-2.6.37.3/drivers/usb/host/ehci-pci.c
27177 ---- linux-2.6.37.3/drivers/usb/host/ehci-pci.c 2011-02-22 16:05:31.000000000 -0500
27178 -+++ linux-2.6.37.3/drivers/usb/host/ehci-pci.c 2011-02-22 16:05:42.000000000 -0500
27179 +diff -urNp linux-2.6.37.4/drivers/usb/host/ehci-pci.c linux-2.6.37.4/drivers/usb/host/ehci-pci.c
27180 +--- linux-2.6.37.4/drivers/usb/host/ehci-pci.c 2011-02-22 16:05:31.000000000 -0500
27181 ++++ linux-2.6.37.4/drivers/usb/host/ehci-pci.c 2011-02-22 16:05:42.000000000 -0500
27182 @@ -509,7 +509,7 @@ static const struct pci_device_id pci_id
27183 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
27184 .driver_data = (unsigned long) &ehci_pci_hc_driver,
27185 @@ -28865,9 +29072,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/host/ehci-pci.c linux-2.6.37.3/drivers/usb
27186 };
27187 MODULE_DEVICE_TABLE(pci, pci_ids);
27188
27189 -diff -urNp linux-2.6.37.3/drivers/usb/host/uhci-hcd.c linux-2.6.37.3/drivers/usb/host/uhci-hcd.c
27190 ---- linux-2.6.37.3/drivers/usb/host/uhci-hcd.c 2011-01-04 19:50:19.000000000 -0500
27191 -+++ linux-2.6.37.3/drivers/usb/host/uhci-hcd.c 2011-01-17 02:41:01.000000000 -0500
27192 +diff -urNp linux-2.6.37.4/drivers/usb/host/uhci-hcd.c linux-2.6.37.4/drivers/usb/host/uhci-hcd.c
27193 +--- linux-2.6.37.4/drivers/usb/host/uhci-hcd.c 2011-01-04 19:50:19.000000000 -0500
27194 ++++ linux-2.6.37.4/drivers/usb/host/uhci-hcd.c 2011-01-17 02:41:01.000000000 -0500
27195 @@ -948,7 +948,7 @@ static const struct pci_device_id uhci_p
27196 /* handle any USB UHCI controller */
27197 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
27198 @@ -28877,9 +29084,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/host/uhci-hcd.c linux-2.6.37.3/drivers/usb
27199 };
27200
27201 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
27202 -diff -urNp linux-2.6.37.3/drivers/usb/mon/mon_main.c linux-2.6.37.3/drivers/usb/mon/mon_main.c
27203 ---- linux-2.6.37.3/drivers/usb/mon/mon_main.c 2011-01-04 19:50:19.000000000 -0500
27204 -+++ linux-2.6.37.3/drivers/usb/mon/mon_main.c 2011-01-17 02:41:01.000000000 -0500
27205 +diff -urNp linux-2.6.37.4/drivers/usb/mon/mon_main.c linux-2.6.37.4/drivers/usb/mon/mon_main.c
27206 +--- linux-2.6.37.4/drivers/usb/mon/mon_main.c 2011-01-04 19:50:19.000000000 -0500
27207 ++++ linux-2.6.37.4/drivers/usb/mon/mon_main.c 2011-01-17 02:41:01.000000000 -0500
27208 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
27209 /*
27210 * Ops
27211 @@ -28889,9 +29096,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/mon/mon_main.c linux-2.6.37.3/drivers/usb/
27212 .urb_submit = mon_submit,
27213 .urb_submit_error = mon_submit_error,
27214 .urb_complete = mon_complete,
27215 -diff -urNp linux-2.6.37.3/drivers/usb/storage/debug.h linux-2.6.37.3/drivers/usb/storage/debug.h
27216 ---- linux-2.6.37.3/drivers/usb/storage/debug.h 2011-01-04 19:50:19.000000000 -0500
27217 -+++ linux-2.6.37.3/drivers/usb/storage/debug.h 2011-01-17 02:41:01.000000000 -0500
27218 +diff -urNp linux-2.6.37.4/drivers/usb/storage/debug.h linux-2.6.37.4/drivers/usb/storage/debug.h
27219 +--- linux-2.6.37.4/drivers/usb/storage/debug.h 2011-01-04 19:50:19.000000000 -0500
27220 ++++ linux-2.6.37.4/drivers/usb/storage/debug.h 2011-01-17 02:41:01.000000000 -0500
27221 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
27222 #define US_DEBUGPX(x...) printk( x )
27223 #define US_DEBUG(x) x
27224 @@ -28905,9 +29112,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/storage/debug.h linux-2.6.37.3/drivers/usb
27225 #endif
27226
27227 #endif
27228 -diff -urNp linux-2.6.37.3/drivers/usb/storage/usb.c linux-2.6.37.3/drivers/usb/storage/usb.c
27229 ---- linux-2.6.37.3/drivers/usb/storage/usb.c 2011-01-04 19:50:19.000000000 -0500
27230 -+++ linux-2.6.37.3/drivers/usb/storage/usb.c 2011-01-17 02:41:01.000000000 -0500
27231 +diff -urNp linux-2.6.37.4/drivers/usb/storage/usb.c linux-2.6.37.4/drivers/usb/storage/usb.c
27232 +--- linux-2.6.37.4/drivers/usb/storage/usb.c 2011-01-04 19:50:19.000000000 -0500
27233 ++++ linux-2.6.37.4/drivers/usb/storage/usb.c 2011-01-17 02:41:01.000000000 -0500
27234 @@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
27235
27236 static struct us_unusual_dev us_unusual_dev_list[] = {
27237 @@ -28917,9 +29124,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/storage/usb.c linux-2.6.37.3/drivers/usb/s
27238 };
27239
27240 #undef UNUSUAL_DEV
27241 -diff -urNp linux-2.6.37.3/drivers/usb/storage/usual-tables.c linux-2.6.37.3/drivers/usb/storage/usual-tables.c
27242 ---- linux-2.6.37.3/drivers/usb/storage/usual-tables.c 2011-01-04 19:50:19.000000000 -0500
27243 -+++ linux-2.6.37.3/drivers/usb/storage/usual-tables.c 2011-01-17 02:41:01.000000000 -0500
27244 +diff -urNp linux-2.6.37.4/drivers/usb/storage/usual-tables.c linux-2.6.37.4/drivers/usb/storage/usual-tables.c
27245 +--- linux-2.6.37.4/drivers/usb/storage/usual-tables.c 2011-01-04 19:50:19.000000000 -0500
27246 ++++ linux-2.6.37.4/drivers/usb/storage/usual-tables.c 2011-01-17 02:41:01.000000000 -0500
27247 @@ -48,7 +48,7 @@
27248
27249 struct usb_device_id usb_storage_usb_ids[] = {
27250 @@ -28929,9 +29136,9 @@ diff -urNp linux-2.6.37.3/drivers/usb/storage/usual-tables.c linux-2.6.37.3/driv
27251 };
27252 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
27253
27254 -diff -urNp linux-2.6.37.3/drivers/vhost/vhost.c linux-2.6.37.3/drivers/vhost/vhost.c
27255 ---- linux-2.6.37.3/drivers/vhost/vhost.c 2011-01-04 19:50:19.000000000 -0500
27256 -+++ linux-2.6.37.3/drivers/vhost/vhost.c 2011-01-17 02:41:01.000000000 -0500
27257 +diff -urNp linux-2.6.37.4/drivers/vhost/vhost.c linux-2.6.37.4/drivers/vhost/vhost.c
27258 +--- linux-2.6.37.4/drivers/vhost/vhost.c 2011-01-04 19:50:19.000000000 -0500
27259 ++++ linux-2.6.37.4/drivers/vhost/vhost.c 2011-01-17 02:41:01.000000000 -0500
27260 @@ -560,7 +560,7 @@ static int init_used(struct vhost_virtqu
27261 return get_user(vq->last_used_idx, &used->idx);
27262 }
27263 @@ -28941,9 +29148,9 @@ diff -urNp linux-2.6.37.3/drivers/vhost/vhost.c linux-2.6.37.3/drivers/vhost/vho
27264 {
27265 struct file *eventfp, *filep = NULL,
27266 *pollstart = NULL, *pollstop = NULL;
27267 -diff -urNp linux-2.6.37.3/drivers/video/atmel_lcdfb.c linux-2.6.37.3/drivers/video/atmel_lcdfb.c
27268 ---- linux-2.6.37.3/drivers/video/atmel_lcdfb.c 2011-01-04 19:50:19.000000000 -0500
27269 -+++ linux-2.6.37.3/drivers/video/atmel_lcdfb.c 2011-01-17 02:41:01.000000000 -0500
27270 +diff -urNp linux-2.6.37.4/drivers/video/atmel_lcdfb.c linux-2.6.37.4/drivers/video/atmel_lcdfb.c
27271 +--- linux-2.6.37.4/drivers/video/atmel_lcdfb.c 2011-01-04 19:50:19.000000000 -0500
27272 ++++ linux-2.6.37.4/drivers/video/atmel_lcdfb.c 2011-01-17 02:41:01.000000000 -0500
27273 @@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struc
27274 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
27275 }
27276 @@ -28953,9 +29160,9 @@ diff -urNp linux-2.6.37.3/drivers/video/atmel_lcdfb.c linux-2.6.37.3/drivers/vid
27277 .update_status = atmel_bl_update_status,
27278 .get_brightness = atmel_bl_get_brightness,
27279 };
27280 -diff -urNp linux-2.6.37.3/drivers/video/aty/aty128fb.c linux-2.6.37.3/drivers/video/aty/aty128fb.c
27281 ---- linux-2.6.37.3/drivers/video/aty/aty128fb.c 2011-01-04 19:50:19.000000000 -0500
27282 -+++ linux-2.6.37.3/drivers/video/aty/aty128fb.c 2011-01-17 02:41:01.000000000 -0500
27283 +diff -urNp linux-2.6.37.4/drivers/video/aty/aty128fb.c linux-2.6.37.4/drivers/video/aty/aty128fb.c
27284 +--- linux-2.6.37.4/drivers/video/aty/aty128fb.c 2011-01-04 19:50:19.000000000 -0500
27285 ++++ linux-2.6.37.4/drivers/video/aty/aty128fb.c 2011-01-17 02:41:01.000000000 -0500
27286 @@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(stru
27287 return bd->props.brightness;
27288 }
27289 @@ -28965,9 +29172,9 @@ diff -urNp linux-2.6.37.3/drivers/video/aty/aty128fb.c linux-2.6.37.3/drivers/vi
27290 .get_brightness = aty128_bl_get_brightness,
27291 .update_status = aty128_bl_update_status,
27292 };
27293 -diff -urNp linux-2.6.37.3/drivers/video/aty/atyfb_base.c linux-2.6.37.3/drivers/video/aty/atyfb_base.c
27294 ---- linux-2.6.37.3/drivers/video/aty/atyfb_base.c 2011-02-22 16:05:31.000000000 -0500
27295 -+++ linux-2.6.37.3/drivers/video/aty/atyfb_base.c 2011-02-22 16:05:42.000000000 -0500
27296 +diff -urNp linux-2.6.37.4/drivers/video/aty/atyfb_base.c linux-2.6.37.4/drivers/video/aty/atyfb_base.c
27297 +--- linux-2.6.37.4/drivers/video/aty/atyfb_base.c 2011-02-22 16:05:31.000000000 -0500
27298 ++++ linux-2.6.37.4/drivers/video/aty/atyfb_base.c 2011-02-22 16:05:42.000000000 -0500
27299 @@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct
27300 return bd->props.brightness;
27301 }
27302 @@ -28977,9 +29184,9 @@ diff -urNp linux-2.6.37.3/drivers/video/aty/atyfb_base.c linux-2.6.37.3/drivers/
27303 .get_brightness = aty_bl_get_brightness,
27304 .update_status = aty_bl_update_status,
27305 };
27306 -diff -urNp linux-2.6.37.3/drivers/video/aty/radeon_backlight.c linux-2.6.37.3/drivers/video/aty/radeon_backlight.c
27307 ---- linux-2.6.37.3/drivers/video/aty/radeon_backlight.c 2011-01-04 19:50:19.000000000 -0500
27308 -+++ linux-2.6.37.3/drivers/video/aty/radeon_backlight.c 2011-01-17 02:41:01.000000000 -0500
27309 +diff -urNp linux-2.6.37.4/drivers/video/aty/radeon_backlight.c linux-2.6.37.4/drivers/video/aty/radeon_backlight.c
27310 +--- linux-2.6.37.4/drivers/video/aty/radeon_backlight.c 2011-01-04 19:50:19.000000000 -0500
27311 ++++ linux-2.6.37.4/drivers/video/aty/radeon_backlight.c 2011-01-17 02:41:01.000000000 -0500
27312 @@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(stru
27313 return bd->props.brightness;
27314 }
27315 @@ -28989,9 +29196,9 @@ diff -urNp linux-2.6.37.3/drivers/video/aty/radeon_backlight.c linux-2.6.37.3/dr
27316 .get_brightness = radeon_bl_get_brightness,
27317 .update_status = radeon_bl_update_status,
27318 };
27319 -diff -urNp linux-2.6.37.3/drivers/video/backlight/88pm860x_bl.c linux-2.6.37.3/drivers/video/backlight/88pm860x_bl.c
27320 ---- linux-2.6.37.3/drivers/video/backlight/88pm860x_bl.c 2011-02-22 16:05:31.000000000 -0500
27321 -+++ linux-2.6.37.3/drivers/video/backlight/88pm860x_bl.c 2011-02-22 16:05:42.000000000 -0500
27322 +diff -urNp linux-2.6.37.4/drivers/video/backlight/88pm860x_bl.c linux-2.6.37.4/drivers/video/backlight/88pm860x_bl.c
27323 +--- linux-2.6.37.4/drivers/video/backlight/88pm860x_bl.c 2011-02-22 16:05:31.000000000 -0500
27324 ++++ linux-2.6.37.4/drivers/video/backlight/88pm860x_bl.c 2011-02-22 16:05:42.000000000 -0500
27325 @@ -155,7 +155,7 @@ out:
27326 return -EINVAL;
27327 }
27328 @@ -29001,9 +29208,9 @@ diff -urNp linux-2.6.37.3/drivers/video/backlight/88pm860x_bl.c linux-2.6.37.3/d
27329 .options = BL_CORE_SUSPENDRESUME,
27330 .update_status = pm860x_backlight_update_status,
27331 .get_brightness = pm860x_backlight_get_brightness,
27332 -diff -urNp linux-2.6.37.3/drivers/video/backlight/max8925_bl.c linux-2.6.37.3/drivers/video/backlight/max8925_bl.c
27333 ---- linux-2.6.37.3/drivers/video/backlight/max8925_bl.c 2011-01-04 19:50:19.000000000 -0500
27334 -+++ linux-2.6.37.3/drivers/video/backlight/max8925_bl.c 2011-01-17 02:41:01.000000000 -0500
27335 +diff -urNp linux-2.6.37.4/drivers/video/backlight/max8925_bl.c linux-2.6.37.4/drivers/video/backlight/max8925_bl.c
27336 +--- linux-2.6.37.4/drivers/video/backlight/max8925_bl.c 2011-01-04 19:50:19.000000000 -0500
27337 ++++ linux-2.6.37.4/drivers/video/backlight/max8925_bl.c 2011-01-17 02:41:01.000000000 -0500
27338 @@ -92,7 +92,7 @@ static int max8925_backlight_get_brightn
27339 return ret;
27340 }
27341 @@ -29013,9 +29220,9 @@ diff -urNp linux-2.6.37.3/drivers/video/backlight/max8925_bl.c linux-2.6.37.3/dr
27342 .options = BL_CORE_SUSPENDRESUME,
27343 .update_status = max8925_backlight_update_status,
27344 .get_brightness = max8925_backlight_get_brightness,
27345 -diff -urNp linux-2.6.37.3/drivers/video/fbcmap.c linux-2.6.37.3/drivers/video/fbcmap.c
27346 ---- linux-2.6.37.3/drivers/video/fbcmap.c 2011-01-04 19:50:19.000000000 -0500
27347 -+++ linux-2.6.37.3/drivers/video/fbcmap.c 2011-01-17 02:41:01.000000000 -0500
27348 +diff -urNp linux-2.6.37.4/drivers/video/fbcmap.c linux-2.6.37.4/drivers/video/fbcmap.c
27349 +--- linux-2.6.37.4/drivers/video/fbcmap.c 2011-01-04 19:50:19.000000000 -0500
27350 ++++ linux-2.6.37.4/drivers/video/fbcmap.c 2011-01-17 02:41:01.000000000 -0500
27351 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
27352 rc = -ENODEV;
27353 goto out;
27354 @@ -29026,9 +29233,9 @@ diff -urNp linux-2.6.37.3/drivers/video/fbcmap.c linux-2.6.37.3/drivers/video/fb
27355 rc = -EINVAL;
27356 goto out1;
27357 }
27358 -diff -urNp linux-2.6.37.3/drivers/video/fbmem.c linux-2.6.37.3/drivers/video/fbmem.c
27359 ---- linux-2.6.37.3/drivers/video/fbmem.c 2011-01-04 19:50:19.000000000 -0500
27360 -+++ linux-2.6.37.3/drivers/video/fbmem.c 2011-01-17 02:41:01.000000000 -0500
27361 +diff -urNp linux-2.6.37.4/drivers/video/fbmem.c linux-2.6.37.4/drivers/video/fbmem.c
27362 +--- linux-2.6.37.4/drivers/video/fbmem.c 2011-01-04 19:50:19.000000000 -0500
27363 ++++ linux-2.6.37.4/drivers/video/fbmem.c 2011-01-17 02:41:01.000000000 -0500
27364 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
27365 image->dx += image->width + 8;
27366 }
27367 @@ -29056,9 +29263,9 @@ diff -urNp linux-2.6.37.3/drivers/video/fbmem.c linux-2.6.37.3/drivers/video/fbm
27368 return -EINVAL;
27369 if (!registered_fb[con2fb.framebuffer])
27370 request_module("fb%d", con2fb.framebuffer);
27371 -diff -urNp linux-2.6.37.3/drivers/video/fbmon.c linux-2.6.37.3/drivers/video/fbmon.c
27372 ---- linux-2.6.37.3/drivers/video/fbmon.c 2011-01-04 19:50:19.000000000 -0500
27373 -+++ linux-2.6.37.3/drivers/video/fbmon.c 2011-01-17 02:41:01.000000000 -0500
27374 +diff -urNp linux-2.6.37.4/drivers/video/fbmon.c linux-2.6.37.4/drivers/video/fbmon.c
27375 +--- linux-2.6.37.4/drivers/video/fbmon.c 2011-01-04 19:50:19.000000000 -0500
27376 ++++ linux-2.6.37.4/drivers/video/fbmon.c 2011-01-17 02:41:01.000000000 -0500
27377 @@ -46,7 +46,7 @@
27378 #ifdef DEBUG
27379 #define DPRINTK(fmt, args...) printk(fmt,## args)
27380 @@ -29068,9 +29275,9 @@ diff -urNp linux-2.6.37.3/drivers/video/fbmon.c linux-2.6.37.3/drivers/video/fbm
27381 #endif
27382
27383 #define FBMON_FIX_HEADER 1
27384 -diff -urNp linux-2.6.37.3/drivers/video/i810/i810_accel.c linux-2.6.37.3/drivers/video/i810/i810_accel.c
27385 ---- linux-2.6.37.3/drivers/video/i810/i810_accel.c 2011-01-04 19:50:19.000000000 -0500
27386 -+++ linux-2.6.37.3/drivers/video/i810/i810_accel.c 2011-01-17 02:41:01.000000000 -0500
27387 +diff -urNp linux-2.6.37.4/drivers/video/i810/i810_accel.c linux-2.6.37.4/drivers/video/i810/i810_accel.c
27388 +--- linux-2.6.37.4/drivers/video/i810/i810_accel.c 2011-01-04 19:50:19.000000000 -0500
27389 ++++ linux-2.6.37.4/drivers/video/i810/i810_accel.c 2011-01-17 02:41:01.000000000 -0500
27390 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct
27391 }
27392 }
27393 @@ -29079,9 +29286,9 @@ diff -urNp linux-2.6.37.3/drivers/video/i810/i810_accel.c linux-2.6.37.3/drivers
27394 i810_report_error(mmio);
27395 par->dev_flags |= LOCKUP;
27396 info->pixmap.scan_align = 1;
27397 -diff -urNp linux-2.6.37.3/drivers/video/i810/i810_main.c linux-2.6.37.3/drivers/video/i810/i810_main.c
27398 ---- linux-2.6.37.3/drivers/video/i810/i810_main.c 2011-01-04 19:50:19.000000000 -0500
27399 -+++ linux-2.6.37.3/drivers/video/i810/i810_main.c 2011-01-17 02:41:01.000000000 -0500
27400 +diff -urNp linux-2.6.37.4/drivers/video/i810/i810_main.c linux-2.6.37.4/drivers/video/i810/i810_main.c
27401 +--- linux-2.6.37.4/drivers/video/i810/i810_main.c 2011-01-04 19:50:19.000000000 -0500
27402 ++++ linux-2.6.37.4/drivers/video/i810/i810_main.c 2011-01-17 02:41:01.000000000 -0500
27403 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
27404 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
27405 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
27406 @@ -29091,9 +29298,9 @@ diff -urNp linux-2.6.37.3/drivers/video/i810/i810_main.c linux-2.6.37.3/drivers/
27407 };
27408
27409 static struct pci_driver i810fb_driver = {
27410 -diff -urNp linux-2.6.37.3/drivers/video/modedb.c linux-2.6.37.3/drivers/video/modedb.c
27411 ---- linux-2.6.37.3/drivers/video/modedb.c 2011-01-04 19:50:19.000000000 -0500
27412 -+++ linux-2.6.37.3/drivers/video/modedb.c 2011-01-17 02:41:01.000000000 -0500
27413 +diff -urNp linux-2.6.37.4/drivers/video/modedb.c linux-2.6.37.4/drivers/video/modedb.c
27414 +--- linux-2.6.37.4/drivers/video/modedb.c 2011-01-04 19:50:19.000000000 -0500
27415 ++++ linux-2.6.37.4/drivers/video/modedb.c 2011-01-17 02:41:01.000000000 -0500
27416 @@ -40,240 +40,240 @@ static const struct fb_videomode modedb[
27417 {
27418 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
27419 @@ -29394,9 +29601,9 @@ diff -urNp linux-2.6.37.3/drivers/video/modedb.c linux-2.6.37.3/drivers/video/mo
27420 },
27421 };
27422
27423 -diff -urNp linux-2.6.37.3/drivers/video/nvidia/nv_backlight.c linux-2.6.37.3/drivers/video/nvidia/nv_backlight.c
27424 ---- linux-2.6.37.3/drivers/video/nvidia/nv_backlight.c 2011-01-04 19:50:19.000000000 -0500
27425 -+++ linux-2.6.37.3/drivers/video/nvidia/nv_backlight.c 2011-01-17 02:41:01.000000000 -0500
27426 +diff -urNp linux-2.6.37.4/drivers/video/nvidia/nv_backlight.c linux-2.6.37.4/drivers/video/nvidia/nv_backlight.c
27427 +--- linux-2.6.37.4/drivers/video/nvidia/nv_backlight.c 2011-01-04 19:50:19.000000000 -0500
27428 ++++ linux-2.6.37.4/drivers/video/nvidia/nv_backlight.c 2011-01-17 02:41:01.000000000 -0500
27429 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
27430 return bd->props.brightness;
27431 }
27432 @@ -29406,9 +29613,9 @@ diff -urNp linux-2.6.37.3/drivers/video/nvidia/nv_backlight.c linux-2.6.37.3/dri
27433 .get_brightness = nvidia_bl_get_brightness,
27434 .update_status = nvidia_bl_update_status,
27435 };
27436 -diff -urNp linux-2.6.37.3/drivers/video/omap2/displays/panel-taal.c linux-2.6.37.3/drivers/video/omap2/displays/panel-taal.c
27437 ---- linux-2.6.37.3/drivers/video/omap2/displays/panel-taal.c 2011-01-04 19:50:19.000000000 -0500
27438 -+++ linux-2.6.37.3/drivers/video/omap2/displays/panel-taal.c 2011-01-17 02:41:01.000000000 -0500
27439 +diff -urNp linux-2.6.37.4/drivers/video/omap2/displays/panel-taal.c linux-2.6.37.4/drivers/video/omap2/displays/panel-taal.c
27440 +--- linux-2.6.37.4/drivers/video/omap2/displays/panel-taal.c 2011-01-04 19:50:19.000000000 -0500
27441 ++++ linux-2.6.37.4/drivers/video/omap2/displays/panel-taal.c 2011-01-17 02:41:01.000000000 -0500
27442 @@ -465,7 +465,7 @@ static int taal_bl_get_intensity(struct
27443 return 0;
27444 }
27445 @@ -29418,9 +29625,9 @@ diff -urNp linux-2.6.37.3/drivers/video/omap2/displays/panel-taal.c linux-2.6.37
27446 .get_brightness = taal_bl_get_intensity,
27447 .update_status = taal_bl_update_status,
27448 };
27449 -diff -urNp linux-2.6.37.3/drivers/video/riva/fbdev.c linux-2.6.37.3/drivers/video/riva/fbdev.c
27450 ---- linux-2.6.37.3/drivers/video/riva/fbdev.c 2011-01-04 19:50:19.000000000 -0500
27451 -+++ linux-2.6.37.3/drivers/video/riva/fbdev.c 2011-01-17 02:41:01.000000000 -0500
27452 +diff -urNp linux-2.6.37.4/drivers/video/riva/fbdev.c linux-2.6.37.4/drivers/video/riva/fbdev.c
27453 +--- linux-2.6.37.4/drivers/video/riva/fbdev.c 2011-01-04 19:50:19.000000000 -0500
27454 ++++ linux-2.6.37.4/drivers/video/riva/fbdev.c 2011-01-17 02:41:01.000000000 -0500
27455 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
27456 return bd->props.brightness;
27457 }
27458 @@ -29430,9 +29637,9 @@ diff -urNp linux-2.6.37.3/drivers/video/riva/fbdev.c linux-2.6.37.3/drivers/vide
27459 .get_brightness = riva_bl_get_brightness,
27460 .update_status = riva_bl_update_status,
27461 };
27462 -diff -urNp linux-2.6.37.3/drivers/video/uvesafb.c linux-2.6.37.3/drivers/video/uvesafb.c
27463 ---- linux-2.6.37.3/drivers/video/uvesafb.c 2011-01-04 19:50:19.000000000 -0500
27464 -+++ linux-2.6.37.3/drivers/video/uvesafb.c 2011-01-17 02:41:01.000000000 -0500
27465 +diff -urNp linux-2.6.37.4/drivers/video/uvesafb.c linux-2.6.37.4/drivers/video/uvesafb.c
27466 +--- linux-2.6.37.4/drivers/video/uvesafb.c 2011-01-04 19:50:19.000000000 -0500
27467 ++++ linux-2.6.37.4/drivers/video/uvesafb.c 2011-01-17 02:41:01.000000000 -0500
27468 @@ -19,6 +19,7 @@
27469 #include <linux/io.h>
27470 #include <linux/mutex.h>
27471 @@ -29508,9 +29715,9 @@ diff -urNp linux-2.6.37.3/drivers/video/uvesafb.c linux-2.6.37.3/drivers/video/u
27472 }
27473
27474 framebuffer_release(info);
27475 -diff -urNp linux-2.6.37.3/drivers/video/vesafb.c linux-2.6.37.3/drivers/video/vesafb.c
27476 ---- linux-2.6.37.3/drivers/video/vesafb.c 2011-01-04 19:50:19.000000000 -0500
27477 -+++ linux-2.6.37.3/drivers/video/vesafb.c 2011-01-17 02:41:01.000000000 -0500
27478 +diff -urNp linux-2.6.37.4/drivers/video/vesafb.c linux-2.6.37.4/drivers/video/vesafb.c
27479 +--- linux-2.6.37.4/drivers/video/vesafb.c 2011-01-04 19:50:19.000000000 -0500
27480 ++++ linux-2.6.37.4/drivers/video/vesafb.c 2011-01-17 02:41:01.000000000 -0500
27481 @@ -9,6 +9,7 @@
27482 */
27483
27484 @@ -29614,9 +29821,9 @@ diff -urNp linux-2.6.37.3/drivers/video/vesafb.c linux-2.6.37.3/drivers/video/ve
27485 if (info->screen_base)
27486 iounmap(info->screen_base);
27487 framebuffer_release(info);
27488 -diff -urNp linux-2.6.37.3/fs/9p/vfs_inode.c linux-2.6.37.3/fs/9p/vfs_inode.c
27489 ---- linux-2.6.37.3/fs/9p/vfs_inode.c 2011-01-04 19:50:19.000000000 -0500
27490 -+++ linux-2.6.37.3/fs/9p/vfs_inode.c 2011-01-17 02:41:01.000000000 -0500
27491 +diff -urNp linux-2.6.37.4/fs/9p/vfs_inode.c linux-2.6.37.4/fs/9p/vfs_inode.c
27492 +--- linux-2.6.37.4/fs/9p/vfs_inode.c 2011-01-04 19:50:19.000000000 -0500
27493 ++++ linux-2.6.37.4/fs/9p/vfs_inode.c 2011-01-17 02:41:01.000000000 -0500
27494 @@ -1598,7 +1598,7 @@ static void *v9fs_vfs_follow_link(struct
27495 static void
27496 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
27497 @@ -29626,9 +29833,9 @@ diff -urNp linux-2.6.37.3/fs/9p/vfs_inode.c linux-2.6.37.3/fs/9p/vfs_inode.c
27498
27499 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
27500 IS_ERR(s) ? "<error>" : s);
27501 -diff -urNp linux-2.6.37.3/fs/aio.c linux-2.6.37.3/fs/aio.c
27502 ---- linux-2.6.37.3/fs/aio.c 2011-01-04 19:50:19.000000000 -0500
27503 -+++ linux-2.6.37.3/fs/aio.c 2011-01-17 02:41:01.000000000 -0500
27504 +diff -urNp linux-2.6.37.4/fs/aio.c linux-2.6.37.4/fs/aio.c
27505 +--- linux-2.6.37.4/fs/aio.c 2011-01-04 19:50:19.000000000 -0500
27506 ++++ linux-2.6.37.4/fs/aio.c 2011-01-17 02:41:01.000000000 -0500
27507 @@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx
27508 size += sizeof(struct io_event) * nr_events;
27509 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
27510 @@ -29638,9 +29845,9 @@ diff -urNp linux-2.6.37.3/fs/aio.c linux-2.6.37.3/fs/aio.c
27511 return -EINVAL;
27512
27513 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
27514 -diff -urNp linux-2.6.37.3/fs/attr.c linux-2.6.37.3/fs/attr.c
27515 ---- linux-2.6.37.3/fs/attr.c 2011-01-04 19:50:19.000000000 -0500
27516 -+++ linux-2.6.37.3/fs/attr.c 2011-01-17 02:41:01.000000000 -0500
27517 +diff -urNp linux-2.6.37.4/fs/attr.c linux-2.6.37.4/fs/attr.c
27518 +--- linux-2.6.37.4/fs/attr.c 2011-01-04 19:50:19.000000000 -0500
27519 ++++ linux-2.6.37.4/fs/attr.c 2011-01-17 02:41:01.000000000 -0500
27520 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
27521 unsigned long limit;
27522
27523 @@ -29649,9 +29856,9 @@ diff -urNp linux-2.6.37.3/fs/attr.c linux-2.6.37.3/fs/attr.c
27524 if (limit != RLIM_INFINITY && offset > limit)
27525 goto out_sig;
27526 if (offset > inode->i_sb->s_maxbytes)
27527 -diff -urNp linux-2.6.37.3/fs/autofs4/symlink.c linux-2.6.37.3/fs/autofs4/symlink.c
27528 ---- linux-2.6.37.3/fs/autofs4/symlink.c 2011-01-04 19:50:19.000000000 -0500
27529 -+++ linux-2.6.37.3/fs/autofs4/symlink.c 2011-01-17 02:41:01.000000000 -0500
27530 +diff -urNp linux-2.6.37.4/fs/autofs4/symlink.c linux-2.6.37.4/fs/autofs4/symlink.c
27531 +--- linux-2.6.37.4/fs/autofs4/symlink.c 2011-01-04 19:50:19.000000000 -0500
27532 ++++ linux-2.6.37.4/fs/autofs4/symlink.c 2011-01-17 02:41:01.000000000 -0500
27533 @@ -15,7 +15,7 @@
27534 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
27535 {
27536 @@ -29661,9 +29868,9 @@ diff -urNp linux-2.6.37.3/fs/autofs4/symlink.c linux-2.6.37.3/fs/autofs4/symlink
27537 return NULL;
27538 }
27539
27540 -diff -urNp linux-2.6.37.3/fs/befs/linuxvfs.c linux-2.6.37.3/fs/befs/linuxvfs.c
27541 ---- linux-2.6.37.3/fs/befs/linuxvfs.c 2011-01-04 19:50:19.000000000 -0500
27542 -+++ linux-2.6.37.3/fs/befs/linuxvfs.c 2011-01-17 02:41:01.000000000 -0500
27543 +diff -urNp linux-2.6.37.4/fs/befs/linuxvfs.c linux-2.6.37.4/fs/befs/linuxvfs.c
27544 +--- linux-2.6.37.4/fs/befs/linuxvfs.c 2011-01-04 19:50:19.000000000 -0500
27545 ++++ linux-2.6.37.4/fs/befs/linuxvfs.c 2011-01-17 02:41:01.000000000 -0500
27546 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
27547 {
27548 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
27549 @@ -29673,9 +29880,9 @@ diff -urNp linux-2.6.37.3/fs/befs/linuxvfs.c linux-2.6.37.3/fs/befs/linuxvfs.c
27550 if (!IS_ERR(link))
27551 kfree(link);
27552 }
27553 -diff -urNp linux-2.6.37.3/fs/binfmt_aout.c linux-2.6.37.3/fs/binfmt_aout.c
27554 ---- linux-2.6.37.3/fs/binfmt_aout.c 2011-01-04 19:50:19.000000000 -0500
27555 -+++ linux-2.6.37.3/fs/binfmt_aout.c 2011-01-17 02:41:01.000000000 -0500
27556 +diff -urNp linux-2.6.37.4/fs/binfmt_aout.c linux-2.6.37.4/fs/binfmt_aout.c
27557 +--- linux-2.6.37.4/fs/binfmt_aout.c 2011-01-04 19:50:19.000000000 -0500
27558 ++++ linux-2.6.37.4/fs/binfmt_aout.c 2011-01-17 02:41:01.000000000 -0500
27559 @@ -16,6 +16,7 @@
27560 #include <linux/string.h>
27561 #include <linux/fs.h>
27562 @@ -29752,9 +29959,9 @@ diff -urNp linux-2.6.37.3/fs/binfmt_aout.c linux-2.6.37.3/fs/binfmt_aout.c
27563 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
27564 fd_offset + ex.a_text);
27565 up_write(&current->mm->mmap_sem);
27566 -diff -urNp linux-2.6.37.3/fs/binfmt_elf.c linux-2.6.37.3/fs/binfmt_elf.c
27567 ---- linux-2.6.37.3/fs/binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
27568 -+++ linux-2.6.37.3/fs/binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
27569 +diff -urNp linux-2.6.37.4/fs/binfmt_elf.c linux-2.6.37.4/fs/binfmt_elf.c
27570 +--- linux-2.6.37.4/fs/binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
27571 ++++ linux-2.6.37.4/fs/binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
27572 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
27573 #define elf_core_dump NULL
27574 #endif
27575 @@ -30420,9 +30627,9 @@ diff -urNp linux-2.6.37.3/fs/binfmt_elf.c linux-2.6.37.3/fs/binfmt_elf.c
27576 static int __init init_elf_binfmt(void)
27577 {
27578 return register_binfmt(&elf_format);
27579 -diff -urNp linux-2.6.37.3/fs/binfmt_flat.c linux-2.6.37.3/fs/binfmt_flat.c
27580 ---- linux-2.6.37.3/fs/binfmt_flat.c 2011-01-04 19:50:19.000000000 -0500
27581 -+++ linux-2.6.37.3/fs/binfmt_flat.c 2011-01-17 02:41:01.000000000 -0500
27582 +diff -urNp linux-2.6.37.4/fs/binfmt_flat.c linux-2.6.37.4/fs/binfmt_flat.c
27583 +--- linux-2.6.37.4/fs/binfmt_flat.c 2011-01-04 19:50:19.000000000 -0500
27584 ++++ linux-2.6.37.4/fs/binfmt_flat.c 2011-01-17 02:41:01.000000000 -0500
27585 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
27586 realdatastart = (unsigned long) -ENOMEM;
27587 printk("Unable to allocate RAM for process data, errno %d\n",
27588 @@ -30455,9 +30662,9 @@ diff -urNp linux-2.6.37.3/fs/binfmt_flat.c linux-2.6.37.3/fs/binfmt_flat.c
27589 ret = result;
27590 goto err;
27591 }
27592 -diff -urNp linux-2.6.37.3/fs/binfmt_misc.c linux-2.6.37.3/fs/binfmt_misc.c
27593 ---- linux-2.6.37.3/fs/binfmt_misc.c 2011-01-04 19:50:19.000000000 -0500
27594 -+++ linux-2.6.37.3/fs/binfmt_misc.c 2011-01-17 02:41:01.000000000 -0500
27595 +diff -urNp linux-2.6.37.4/fs/binfmt_misc.c linux-2.6.37.4/fs/binfmt_misc.c
27596 +--- linux-2.6.37.4/fs/binfmt_misc.c 2011-01-04 19:50:19.000000000 -0500
27597 ++++ linux-2.6.37.4/fs/binfmt_misc.c 2011-01-17 02:41:01.000000000 -0500
27598 @@ -698,7 +698,7 @@ static int bm_fill_super(struct super_bl
27599 static struct tree_descr bm_files[] = {
27600 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
27601 @@ -30467,9 +30674,9 @@ diff -urNp linux-2.6.37.3/fs/binfmt_misc.c linux-2.6.37.3/fs/binfmt_misc.c
27602 };
27603 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
27604 if (!err)
27605 -diff -urNp linux-2.6.37.3/fs/bio.c linux-2.6.37.3/fs/bio.c
27606 ---- linux-2.6.37.3/fs/bio.c 2011-01-04 19:50:19.000000000 -0500
27607 -+++ linux-2.6.37.3/fs/bio.c 2011-01-17 02:41:01.000000000 -0500
27608 +diff -urNp linux-2.6.37.4/fs/bio.c linux-2.6.37.4/fs/bio.c
27609 +--- linux-2.6.37.4/fs/bio.c 2011-01-04 19:50:19.000000000 -0500
27610 ++++ linux-2.6.37.4/fs/bio.c 2011-01-17 02:41:01.000000000 -0500
27611 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
27612 const int read = bio_data_dir(bio) == READ;
27613 struct bio_map_data *bmd = bio->bi_private;
27614 @@ -30479,9 +30686,9 @@ diff -urNp linux-2.6.37.3/fs/bio.c linux-2.6.37.3/fs/bio.c
27615
27616 __bio_for_each_segment(bvec, bio, i, 0) {
27617 char *addr = page_address(bvec->bv_page);
27618 -diff -urNp linux-2.6.37.3/fs/block_dev.c linux-2.6.37.3/fs/block_dev.c
27619 ---- linux-2.6.37.3/fs/block_dev.c 2011-03-11 17:22:42.000000000 -0500
27620 -+++ linux-2.6.37.3/fs/block_dev.c 2011-03-11 17:23:03.000000000 -0500
27621 +diff -urNp linux-2.6.37.4/fs/block_dev.c linux-2.6.37.4/fs/block_dev.c
27622 +--- linux-2.6.37.4/fs/block_dev.c 2011-03-11 17:22:42.000000000 -0500
27623 ++++ linux-2.6.37.4/fs/block_dev.c 2011-03-11 17:23:03.000000000 -0500
27624 @@ -662,7 +662,7 @@ static bool bd_may_claim(struct block_de
27625 else if (bdev->bd_contains == bdev)
27626 return true; /* is a whole device which isn't held */
27627 @@ -30491,9 +30698,9 @@ diff -urNp linux-2.6.37.3/fs/block_dev.c linux-2.6.37.3/fs/block_dev.c
27628 return true; /* is a partition of a device that is being partitioned */
27629 else if (whole->bd_holder != NULL)
27630 return false; /* is a partition of a held device */
27631 -diff -urNp linux-2.6.37.3/fs/btrfs/ctree.c linux-2.6.37.3/fs/btrfs/ctree.c
27632 ---- linux-2.6.37.3/fs/btrfs/ctree.c 2011-01-04 19:50:19.000000000 -0500
27633 -+++ linux-2.6.37.3/fs/btrfs/ctree.c 2011-01-17 02:41:01.000000000 -0500
27634 +diff -urNp linux-2.6.37.4/fs/btrfs/ctree.c linux-2.6.37.4/fs/btrfs/ctree.c
27635 +--- linux-2.6.37.4/fs/btrfs/ctree.c 2011-01-04 19:50:19.000000000 -0500
27636 ++++ linux-2.6.37.4/fs/btrfs/ctree.c 2011-01-17 02:41:01.000000000 -0500
27637 @@ -466,9 +466,12 @@ static noinline int __btrfs_cow_block(st
27638 free_extent_buffer(buf);
27639 add_root_to_dirty_list(root);
27640 @@ -30518,9 +30725,9 @@ diff -urNp linux-2.6.37.3/fs/btrfs/ctree.c linux-2.6.37.3/fs/btrfs/ctree.c
27641 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
27642 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
27643 }
27644 -diff -urNp linux-2.6.37.3/fs/btrfs/disk-io.c linux-2.6.37.3/fs/btrfs/disk-io.c
27645 ---- linux-2.6.37.3/fs/btrfs/disk-io.c 2011-01-04 19:50:19.000000000 -0500
27646 -+++ linux-2.6.37.3/fs/btrfs/disk-io.c 2011-01-17 02:41:01.000000000 -0500
27647 +diff -urNp linux-2.6.37.4/fs/btrfs/disk-io.c linux-2.6.37.4/fs/btrfs/disk-io.c
27648 +--- linux-2.6.37.4/fs/btrfs/disk-io.c 2011-01-04 19:50:19.000000000 -0500
27649 ++++ linux-2.6.37.4/fs/btrfs/disk-io.c 2011-01-17 02:41:01.000000000 -0500
27650 @@ -41,7 +41,7 @@
27651 #include "tree-log.h"
27652 #include "free-space-cache.h"
27653 @@ -30539,9 +30746,9 @@ diff -urNp linux-2.6.37.3/fs/btrfs/disk-io.c linux-2.6.37.3/fs/btrfs/disk-io.c
27654 .write_cache_pages_lock_hook = btree_lock_page_hook,
27655 .readpage_end_io_hook = btree_readpage_end_io_hook,
27656 .submit_bio_hook = btree_submit_bio_hook,
27657 -diff -urNp linux-2.6.37.3/fs/btrfs/extent_io.h linux-2.6.37.3/fs/btrfs/extent_io.h
27658 ---- linux-2.6.37.3/fs/btrfs/extent_io.h 2011-01-04 19:50:19.000000000 -0500
27659 -+++ linux-2.6.37.3/fs/btrfs/extent_io.h 2011-01-17 02:41:01.000000000 -0500
27660 +diff -urNp linux-2.6.37.4/fs/btrfs/extent_io.h linux-2.6.37.4/fs/btrfs/extent_io.h
27661 +--- linux-2.6.37.4/fs/btrfs/extent_io.h 2011-01-04 19:50:19.000000000 -0500
27662 ++++ linux-2.6.37.4/fs/btrfs/extent_io.h 2011-01-17 02:41:01.000000000 -0500
27663 @@ -51,36 +51,36 @@ typedef int (extent_submit_bio_hook_t)(s
27664 struct bio *bio, int mirror_num,
27665 unsigned long bio_flags, u64 bio_offset);
27666 @@ -30602,9 +30809,9 @@ diff -urNp linux-2.6.37.3/fs/btrfs/extent_io.h linux-2.6.37.3/fs/btrfs/extent_io
27667 };
27668
27669 struct extent_state {
27670 -diff -urNp linux-2.6.37.3/fs/btrfs/free-space-cache.c linux-2.6.37.3/fs/btrfs/free-space-cache.c
27671 ---- linux-2.6.37.3/fs/btrfs/free-space-cache.c 2011-01-04 19:50:19.000000000 -0500
27672 -+++ linux-2.6.37.3/fs/btrfs/free-space-cache.c 2011-01-17 02:41:01.000000000 -0500
27673 +diff -urNp linux-2.6.37.4/fs/btrfs/free-space-cache.c linux-2.6.37.4/fs/btrfs/free-space-cache.c
27674 +--- linux-2.6.37.4/fs/btrfs/free-space-cache.c 2011-01-04 19:50:19.000000000 -0500
27675 ++++ linux-2.6.37.4/fs/btrfs/free-space-cache.c 2011-01-17 02:41:01.000000000 -0500
27676 @@ -1828,8 +1828,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
27677
27678 while(1) {
27679 @@ -30623,9 +30830,9 @@ diff -urNp linux-2.6.37.3/fs/btrfs/free-space-cache.c linux-2.6.37.3/fs/btrfs/fr
27680
27681 if (entry->bitmap && entry->bytes > bytes + empty_size) {
27682 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
27683 -diff -urNp linux-2.6.37.3/fs/btrfs/inode.c linux-2.6.37.3/fs/btrfs/inode.c
27684 ---- linux-2.6.37.3/fs/btrfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27685 -+++ linux-2.6.37.3/fs/btrfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27686 +diff -urNp linux-2.6.37.4/fs/btrfs/inode.c linux-2.6.37.4/fs/btrfs/inode.c
27687 +--- linux-2.6.37.4/fs/btrfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27688 ++++ linux-2.6.37.4/fs/btrfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27689 @@ -64,7 +64,7 @@ static const struct inode_operations btr
27690 static const struct address_space_operations btrfs_aops;
27691 static const struct address_space_operations btrfs_symlink_aops;
27692 @@ -30644,9 +30851,9 @@ diff -urNp linux-2.6.37.3/fs/btrfs/inode.c linux-2.6.37.3/fs/btrfs/inode.c
27693 .fill_delalloc = run_delalloc_range,
27694 .submit_bio_hook = btrfs_submit_bio_hook,
27695 .merge_bio_hook = btrfs_merge_bio_hook,
27696 -diff -urNp linux-2.6.37.3/fs/btrfs/ioctl.c linux-2.6.37.3/fs/btrfs/ioctl.c
27697 ---- linux-2.6.37.3/fs/btrfs/ioctl.c 2011-02-27 14:49:17.000000000 -0500
27698 -+++ linux-2.6.37.3/fs/btrfs/ioctl.c 2011-02-12 10:29:31.000000000 -0500
27699 +diff -urNp linux-2.6.37.4/fs/btrfs/ioctl.c linux-2.6.37.4/fs/btrfs/ioctl.c
27700 +--- linux-2.6.37.4/fs/btrfs/ioctl.c 2011-02-27 14:49:17.000000000 -0500
27701 ++++ linux-2.6.37.4/fs/btrfs/ioctl.c 2011-02-12 10:29:31.000000000 -0500
27702 @@ -2146,9 +2146,12 @@ long btrfs_ioctl_space_info(struct btrfs
27703 for (i = 0; i < num_types; i++) {
27704 struct btrfs_space_info *tmp;
27705 @@ -30671,9 +30878,9 @@ diff -urNp linux-2.6.37.3/fs/btrfs/ioctl.c linux-2.6.37.3/fs/btrfs/ioctl.c
27706 }
27707 up_read(&info->groups_sem);
27708 }
27709 -diff -urNp linux-2.6.37.3/fs/btrfs/relocation.c linux-2.6.37.3/fs/btrfs/relocation.c
27710 ---- linux-2.6.37.3/fs/btrfs/relocation.c 2011-01-04 19:50:19.000000000 -0500
27711 -+++ linux-2.6.37.3/fs/btrfs/relocation.c 2011-01-17 02:41:01.000000000 -0500
27712 +diff -urNp linux-2.6.37.4/fs/btrfs/relocation.c linux-2.6.37.4/fs/btrfs/relocation.c
27713 +--- linux-2.6.37.4/fs/btrfs/relocation.c 2011-01-04 19:50:19.000000000 -0500
27714 ++++ linux-2.6.37.4/fs/btrfs/relocation.c 2011-01-17 02:41:01.000000000 -0500
27715 @@ -1238,7 +1238,7 @@ static int __update_reloc_root(struct bt
27716 }
27717 spin_unlock(&rc->reloc_root_tree.lock);
27718 @@ -30683,9 +30890,9 @@ diff -urNp linux-2.6.37.3/fs/btrfs/relocation.c linux-2.6.37.3/fs/btrfs/relocati
27719
27720 if (!del) {
27721 spin_lock(&rc->reloc_root_tree.lock);
27722 -diff -urNp linux-2.6.37.3/fs/cachefiles/bind.c linux-2.6.37.3/fs/cachefiles/bind.c
27723 ---- linux-2.6.37.3/fs/cachefiles/bind.c 2011-01-04 19:50:19.000000000 -0500
27724 -+++ linux-2.6.37.3/fs/cachefiles/bind.c 2011-01-17 02:41:01.000000000 -0500
27725 +diff -urNp linux-2.6.37.4/fs/cachefiles/bind.c linux-2.6.37.4/fs/cachefiles/bind.c
27726 +--- linux-2.6.37.4/fs/cachefiles/bind.c 2011-01-04 19:50:19.000000000 -0500
27727 ++++ linux-2.6.37.4/fs/cachefiles/bind.c 2011-01-17 02:41:01.000000000 -0500
27728 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
27729 args);
27730
27731 @@ -30702,9 +30909,9 @@ diff -urNp linux-2.6.37.3/fs/cachefiles/bind.c linux-2.6.37.3/fs/cachefiles/bind
27732 cache->bcull_percent < cache->brun_percent &&
27733 cache->brun_percent < 100);
27734
27735 -diff -urNp linux-2.6.37.3/fs/cachefiles/daemon.c linux-2.6.37.3/fs/cachefiles/daemon.c
27736 ---- linux-2.6.37.3/fs/cachefiles/daemon.c 2011-01-04 19:50:19.000000000 -0500
27737 -+++ linux-2.6.37.3/fs/cachefiles/daemon.c 2011-01-17 02:41:01.000000000 -0500
27738 +diff -urNp linux-2.6.37.4/fs/cachefiles/daemon.c linux-2.6.37.4/fs/cachefiles/daemon.c
27739 +--- linux-2.6.37.4/fs/cachefiles/daemon.c 2011-01-04 19:50:19.000000000 -0500
27740 ++++ linux-2.6.37.4/fs/cachefiles/daemon.c 2011-01-17 02:41:01.000000000 -0500
27741 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
27742 if (n > buflen)
27743 return -EMSGSIZE;
27744 @@ -30741,9 +30948,9 @@ diff -urNp linux-2.6.37.3/fs/cachefiles/daemon.c linux-2.6.37.3/fs/cachefiles/da
27745 return cachefiles_daemon_range_error(cache, args);
27746
27747 cache->bstop_percent = bstop;
27748 -diff -urNp linux-2.6.37.3/fs/cachefiles/rdwr.c linux-2.6.37.3/fs/cachefiles/rdwr.c
27749 ---- linux-2.6.37.3/fs/cachefiles/rdwr.c 2011-01-04 19:50:19.000000000 -0500
27750 -+++ linux-2.6.37.3/fs/cachefiles/rdwr.c 2011-01-17 02:41:01.000000000 -0500
27751 +diff -urNp linux-2.6.37.4/fs/cachefiles/rdwr.c linux-2.6.37.4/fs/cachefiles/rdwr.c
27752 +--- linux-2.6.37.4/fs/cachefiles/rdwr.c 2011-01-04 19:50:19.000000000 -0500
27753 ++++ linux-2.6.37.4/fs/cachefiles/rdwr.c 2011-01-17 02:41:01.000000000 -0500
27754 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
27755 old_fs = get_fs();
27756 set_fs(KERNEL_DS);
27757 @@ -30753,9 +30960,9 @@ diff -urNp linux-2.6.37.3/fs/cachefiles/rdwr.c linux-2.6.37.3/fs/cachefiles/rdwr
27758 set_fs(old_fs);
27759 kunmap(page);
27760 if (ret != len)
27761 -diff -urNp linux-2.6.37.3/fs/ceph/dir.c linux-2.6.37.3/fs/ceph/dir.c
27762 ---- linux-2.6.37.3/fs/ceph/dir.c 2011-01-04 19:50:19.000000000 -0500
27763 -+++ linux-2.6.37.3/fs/ceph/dir.c 2011-01-17 02:41:01.000000000 -0500
27764 +diff -urNp linux-2.6.37.4/fs/ceph/dir.c linux-2.6.37.4/fs/ceph/dir.c
27765 +--- linux-2.6.37.4/fs/ceph/dir.c 2011-01-04 19:50:19.000000000 -0500
27766 ++++ linux-2.6.37.4/fs/ceph/dir.c 2011-01-17 02:41:01.000000000 -0500
27767 @@ -223,7 +223,7 @@ static int ceph_readdir(struct file *fil
27768 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
27769 struct ceph_mds_client *mdsc = fsc->mdsc;
27770 @@ -30774,9 +30981,9 @@ diff -urNp linux-2.6.37.3/fs/ceph/dir.c linux-2.6.37.3/fs/ceph/dir.c
27771 u64 pos = ceph_make_fpos(frag, off);
27772 struct ceph_mds_reply_inode *in =
27773 rinfo->dir_in[off - fi->offset].in;
27774 -diff -urNp linux-2.6.37.3/fs/cifs/cifs_uniupr.h linux-2.6.37.3/fs/cifs/cifs_uniupr.h
27775 ---- linux-2.6.37.3/fs/cifs/cifs_uniupr.h 2011-01-04 19:50:19.000000000 -0500
27776 -+++ linux-2.6.37.3/fs/cifs/cifs_uniupr.h 2011-01-17 02:41:01.000000000 -0500
27777 +diff -urNp linux-2.6.37.4/fs/cifs/cifs_uniupr.h linux-2.6.37.4/fs/cifs/cifs_uniupr.h
27778 +--- linux-2.6.37.4/fs/cifs/cifs_uniupr.h 2011-01-04 19:50:19.000000000 -0500
27779 ++++ linux-2.6.37.4/fs/cifs/cifs_uniupr.h 2011-01-17 02:41:01.000000000 -0500
27780 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
27781 {0x0490, 0x04cc, UniCaseRangeU0490},
27782 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
27783 @@ -30786,9 +30993,9 @@ diff -urNp linux-2.6.37.3/fs/cifs/cifs_uniupr.h linux-2.6.37.3/fs/cifs/cifs_uniu
27784 };
27785 #endif
27786
27787 -diff -urNp linux-2.6.37.3/fs/cifs/link.c linux-2.6.37.3/fs/cifs/link.c
27788 ---- linux-2.6.37.3/fs/cifs/link.c 2011-01-04 19:50:19.000000000 -0500
27789 -+++ linux-2.6.37.3/fs/cifs/link.c 2011-01-17 02:41:01.000000000 -0500
27790 +diff -urNp linux-2.6.37.4/fs/cifs/link.c linux-2.6.37.4/fs/cifs/link.c
27791 +--- linux-2.6.37.4/fs/cifs/link.c 2011-01-04 19:50:19.000000000 -0500
27792 ++++ linux-2.6.37.4/fs/cifs/link.c 2011-01-17 02:41:01.000000000 -0500
27793 @@ -540,7 +540,7 @@ symlink_exit:
27794
27795 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
27796 @@ -30798,9 +31005,9 @@ diff -urNp linux-2.6.37.3/fs/cifs/link.c linux-2.6.37.3/fs/cifs/link.c
27797 if (!IS_ERR(p))
27798 kfree(p);
27799 }
27800 -diff -urNp linux-2.6.37.3/fs/compat_binfmt_elf.c linux-2.6.37.3/fs/compat_binfmt_elf.c
27801 ---- linux-2.6.37.3/fs/compat_binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
27802 -+++ linux-2.6.37.3/fs/compat_binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
27803 +diff -urNp linux-2.6.37.4/fs/compat_binfmt_elf.c linux-2.6.37.4/fs/compat_binfmt_elf.c
27804 +--- linux-2.6.37.4/fs/compat_binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
27805 ++++ linux-2.6.37.4/fs/compat_binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
27806 @@ -30,11 +30,13 @@
27807 #undef elf_phdr
27808 #undef elf_shdr
27809 @@ -30815,9 +31022,9 @@ diff -urNp linux-2.6.37.3/fs/compat_binfmt_elf.c linux-2.6.37.3/fs/compat_binfmt
27810 #define elf_addr_t Elf32_Addr
27811
27812 /*
27813 -diff -urNp linux-2.6.37.3/fs/compat.c linux-2.6.37.3/fs/compat.c
27814 ---- linux-2.6.37.3/fs/compat.c 2011-01-04 19:50:19.000000000 -0500
27815 -+++ linux-2.6.37.3/fs/compat.c 2011-01-17 02:41:01.000000000 -0500
27816 +diff -urNp linux-2.6.37.4/fs/compat.c linux-2.6.37.4/fs/compat.c
27817 +--- linux-2.6.37.4/fs/compat.c 2011-01-04 19:50:19.000000000 -0500
27818 ++++ linux-2.6.37.4/fs/compat.c 2011-01-17 02:41:01.000000000 -0500
27819 @@ -592,7 +592,7 @@ ssize_t compat_rw_copy_check_uvector(int
27820 goto out;
27821
27822 @@ -31000,9 +31207,9 @@ diff -urNp linux-2.6.37.3/fs/compat.c linux-2.6.37.3/fs/compat.c
27823 out:
27824 if (bprm->mm) {
27825 acct_arg_size(bprm, 0);
27826 -diff -urNp linux-2.6.37.3/fs/compat_ioctl.c linux-2.6.37.3/fs/compat_ioctl.c
27827 ---- linux-2.6.37.3/fs/compat_ioctl.c 2011-01-04 19:50:19.000000000 -0500
27828 -+++ linux-2.6.37.3/fs/compat_ioctl.c 2011-01-17 02:41:01.000000000 -0500
27829 +diff -urNp linux-2.6.37.4/fs/compat_ioctl.c linux-2.6.37.4/fs/compat_ioctl.c
27830 +--- linux-2.6.37.4/fs/compat_ioctl.c 2011-01-04 19:50:19.000000000 -0500
27831 ++++ linux-2.6.37.4/fs/compat_ioctl.c 2011-01-17 02:41:01.000000000 -0500
27832 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
27833
27834 err = get_user(palp, &up->palette);
27835 @@ -31023,9 +31230,9 @@ diff -urNp linux-2.6.37.3/fs/compat_ioctl.c linux-2.6.37.3/fs/compat_ioctl.c
27836 if (a > b)
27837 return 1;
27838 if (a < b)
27839 -diff -urNp linux-2.6.37.3/fs/debugfs/inode.c linux-2.6.37.3/fs/debugfs/inode.c
27840 ---- linux-2.6.37.3/fs/debugfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27841 -+++ linux-2.6.37.3/fs/debugfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27842 +diff -urNp linux-2.6.37.4/fs/debugfs/inode.c linux-2.6.37.4/fs/debugfs/inode.c
27843 +--- linux-2.6.37.4/fs/debugfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27844 ++++ linux-2.6.37.4/fs/debugfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27845 @@ -130,7 +130,7 @@ static inline int debugfs_positive(struc
27846
27847 static int debug_fill_super(struct super_block *sb, void *data, int silent)
27848 @@ -31035,9 +31242,9 @@ diff -urNp linux-2.6.37.3/fs/debugfs/inode.c linux-2.6.37.3/fs/debugfs/inode.c
27849
27850 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
27851 }
27852 -diff -urNp linux-2.6.37.3/fs/dlm/lockspace.c linux-2.6.37.3/fs/dlm/lockspace.c
27853 ---- linux-2.6.37.3/fs/dlm/lockspace.c 2011-01-04 19:50:19.000000000 -0500
27854 -+++ linux-2.6.37.3/fs/dlm/lockspace.c 2011-01-17 02:41:01.000000000 -0500
27855 +diff -urNp linux-2.6.37.4/fs/dlm/lockspace.c linux-2.6.37.4/fs/dlm/lockspace.c
27856 +--- linux-2.6.37.4/fs/dlm/lockspace.c 2011-01-04 19:50:19.000000000 -0500
27857 ++++ linux-2.6.37.4/fs/dlm/lockspace.c 2011-01-17 02:41:01.000000000 -0500
27858 @@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
27859 return 0;
27860 }
27861 @@ -31047,9 +31254,9 @@ diff -urNp linux-2.6.37.3/fs/dlm/lockspace.c linux-2.6.37.3/fs/dlm/lockspace.c
27862 .uevent = dlm_uevent,
27863 };
27864
27865 -diff -urNp linux-2.6.37.3/fs/ecryptfs/inode.c linux-2.6.37.3/fs/ecryptfs/inode.c
27866 ---- linux-2.6.37.3/fs/ecryptfs/inode.c 2011-02-27 14:49:17.000000000 -0500
27867 -+++ linux-2.6.37.3/fs/ecryptfs/inode.c 2011-02-27 14:50:02.000000000 -0500
27868 +diff -urNp linux-2.6.37.4/fs/ecryptfs/inode.c linux-2.6.37.4/fs/ecryptfs/inode.c
27869 +--- linux-2.6.37.4/fs/ecryptfs/inode.c 2011-02-27 14:49:17.000000000 -0500
27870 ++++ linux-2.6.37.4/fs/ecryptfs/inode.c 2011-02-27 14:50:02.000000000 -0500
27871 @@ -745,7 +745,7 @@ static int ecryptfs_readlink_lower(struc
27872 old_fs = get_fs();
27873 set_fs(get_ds());
27874 @@ -31077,9 +31284,9 @@ diff -urNp linux-2.6.37.3/fs/ecryptfs/inode.c linux-2.6.37.3/fs/ecryptfs/inode.c
27875 if (!IS_ERR(buf)) {
27876 /* Free the char* */
27877 kfree(buf);
27878 -diff -urNp linux-2.6.37.3/fs/ecryptfs/miscdev.c linux-2.6.37.3/fs/ecryptfs/miscdev.c
27879 ---- linux-2.6.37.3/fs/ecryptfs/miscdev.c 2011-01-04 19:50:19.000000000 -0500
27880 -+++ linux-2.6.37.3/fs/ecryptfs/miscdev.c 2011-01-17 02:41:01.000000000 -0500
27881 +diff -urNp linux-2.6.37.4/fs/ecryptfs/miscdev.c linux-2.6.37.4/fs/ecryptfs/miscdev.c
27882 +--- linux-2.6.37.4/fs/ecryptfs/miscdev.c 2011-01-04 19:50:19.000000000 -0500
27883 ++++ linux-2.6.37.4/fs/ecryptfs/miscdev.c 2011-01-17 02:41:01.000000000 -0500
27884 @@ -328,7 +328,7 @@ check_list:
27885 goto out_unlock_msg_ctx;
27886 i = 5;
27887 @@ -31089,9 +31296,9 @@ diff -urNp linux-2.6.37.3/fs/ecryptfs/miscdev.c linux-2.6.37.3/fs/ecryptfs/miscd
27888 goto out_unlock_msg_ctx;
27889 i += packet_length_size;
27890 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
27891 -diff -urNp linux-2.6.37.3/fs/exec.c linux-2.6.37.3/fs/exec.c
27892 ---- linux-2.6.37.3/fs/exec.c 2011-01-04 19:50:19.000000000 -0500
27893 -+++ linux-2.6.37.3/fs/exec.c 2011-02-12 11:21:04.000000000 -0500
27894 +diff -urNp linux-2.6.37.4/fs/exec.c linux-2.6.37.4/fs/exec.c
27895 +--- linux-2.6.37.4/fs/exec.c 2011-01-04 19:50:19.000000000 -0500
27896 ++++ linux-2.6.37.4/fs/exec.c 2011-02-12 11:21:04.000000000 -0500
27897 @@ -55,12 +55,24 @@
27898 #include <linux/fs_struct.h>
27899 #include <linux/pipe_fs_i.h>
27900 @@ -31624,9 +31831,9 @@ diff -urNp linux-2.6.37.3/fs/exec.c linux-2.6.37.3/fs/exec.c
27901 if (ispipe) {
27902 int dump_count;
27903 char **helper_argv;
27904 -diff -urNp linux-2.6.37.3/fs/ext2/balloc.c linux-2.6.37.3/fs/ext2/balloc.c
27905 ---- linux-2.6.37.3/fs/ext2/balloc.c 2011-01-04 19:50:19.000000000 -0500
27906 -+++ linux-2.6.37.3/fs/ext2/balloc.c 2011-01-17 02:41:01.000000000 -0500
27907 +diff -urNp linux-2.6.37.4/fs/ext2/balloc.c linux-2.6.37.4/fs/ext2/balloc.c
27908 +--- linux-2.6.37.4/fs/ext2/balloc.c 2011-01-04 19:50:19.000000000 -0500
27909 ++++ linux-2.6.37.4/fs/ext2/balloc.c 2011-01-17 02:41:01.000000000 -0500
27910 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
27911
27912 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
27913 @@ -31636,9 +31843,9 @@ diff -urNp linux-2.6.37.3/fs/ext2/balloc.c linux-2.6.37.3/fs/ext2/balloc.c
27914 sbi->s_resuid != current_fsuid() &&
27915 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
27916 return 0;
27917 -diff -urNp linux-2.6.37.3/fs/ext2/xattr.c linux-2.6.37.3/fs/ext2/xattr.c
27918 ---- linux-2.6.37.3/fs/ext2/xattr.c 2011-01-04 19:50:19.000000000 -0500
27919 -+++ linux-2.6.37.3/fs/ext2/xattr.c 2011-01-17 02:41:01.000000000 -0500
27920 +diff -urNp linux-2.6.37.4/fs/ext2/xattr.c linux-2.6.37.4/fs/ext2/xattr.c
27921 +--- linux-2.6.37.4/fs/ext2/xattr.c 2011-01-04 19:50:19.000000000 -0500
27922 ++++ linux-2.6.37.4/fs/ext2/xattr.c 2011-01-17 02:41:01.000000000 -0500
27923 @@ -86,8 +86,8 @@
27924 printk("\n"); \
27925 } while (0)
27926 @@ -31650,9 +31857,9 @@ diff -urNp linux-2.6.37.3/fs/ext2/xattr.c linux-2.6.37.3/fs/ext2/xattr.c
27927 #endif
27928
27929 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
27930 -diff -urNp linux-2.6.37.3/fs/ext3/balloc.c linux-2.6.37.3/fs/ext3/balloc.c
27931 ---- linux-2.6.37.3/fs/ext3/balloc.c 2011-01-04 19:50:19.000000000 -0500
27932 -+++ linux-2.6.37.3/fs/ext3/balloc.c 2011-01-17 02:41:01.000000000 -0500
27933 +diff -urNp linux-2.6.37.4/fs/ext3/balloc.c linux-2.6.37.4/fs/ext3/balloc.c
27934 +--- linux-2.6.37.4/fs/ext3/balloc.c 2011-01-04 19:50:19.000000000 -0500
27935 ++++ linux-2.6.37.4/fs/ext3/balloc.c 2011-01-17 02:41:01.000000000 -0500
27936 @@ -1425,7 +1425,7 @@ static int ext3_has_free_blocks(struct e
27937
27938 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
27939 @@ -31662,9 +31869,9 @@ diff -urNp linux-2.6.37.3/fs/ext3/balloc.c linux-2.6.37.3/fs/ext3/balloc.c
27940 sbi->s_resuid != current_fsuid() &&
27941 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
27942 return 0;
27943 -diff -urNp linux-2.6.37.3/fs/ext3/namei.c linux-2.6.37.3/fs/ext3/namei.c
27944 ---- linux-2.6.37.3/fs/ext3/namei.c 2011-01-04 19:50:19.000000000 -0500
27945 -+++ linux-2.6.37.3/fs/ext3/namei.c 2011-01-17 02:41:01.000000000 -0500
27946 +diff -urNp linux-2.6.37.4/fs/ext3/namei.c linux-2.6.37.4/fs/ext3/namei.c
27947 +--- linux-2.6.37.4/fs/ext3/namei.c 2011-01-04 19:50:19.000000000 -0500
27948 ++++ linux-2.6.37.4/fs/ext3/namei.c 2011-01-17 02:41:01.000000000 -0500
27949 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
27950 char *data1 = (*bh)->b_data, *data2;
27951 unsigned split, move, size;
27952 @@ -31674,9 +31881,9 @@ diff -urNp linux-2.6.37.3/fs/ext3/namei.c linux-2.6.37.3/fs/ext3/namei.c
27953
27954 bh2 = ext3_append (handle, dir, &newblock, &err);
27955 if (!(bh2)) {
27956 -diff -urNp linux-2.6.37.3/fs/ext3/xattr.c linux-2.6.37.3/fs/ext3/xattr.c
27957 ---- linux-2.6.37.3/fs/ext3/xattr.c 2011-01-04 19:50:19.000000000 -0500
27958 -+++ linux-2.6.37.3/fs/ext3/xattr.c 2011-01-17 02:41:01.000000000 -0500
27959 +diff -urNp linux-2.6.37.4/fs/ext3/xattr.c linux-2.6.37.4/fs/ext3/xattr.c
27960 +--- linux-2.6.37.4/fs/ext3/xattr.c 2011-01-04 19:50:19.000000000 -0500
27961 ++++ linux-2.6.37.4/fs/ext3/xattr.c 2011-01-17 02:41:01.000000000 -0500
27962 @@ -89,8 +89,8 @@
27963 printk("\n"); \
27964 } while (0)
27965 @@ -31688,9 +31895,9 @@ diff -urNp linux-2.6.37.3/fs/ext3/xattr.c linux-2.6.37.3/fs/ext3/xattr.c
27966 #endif
27967
27968 static void ext3_xattr_cache_insert(struct buffer_head *);
27969 -diff -urNp linux-2.6.37.3/fs/ext4/balloc.c linux-2.6.37.3/fs/ext4/balloc.c
27970 ---- linux-2.6.37.3/fs/ext4/balloc.c 2011-01-04 19:50:19.000000000 -0500
27971 -+++ linux-2.6.37.3/fs/ext4/balloc.c 2011-01-17 02:41:01.000000000 -0500
27972 +diff -urNp linux-2.6.37.4/fs/ext4/balloc.c linux-2.6.37.4/fs/ext4/balloc.c
27973 +--- linux-2.6.37.4/fs/ext4/balloc.c 2011-01-04 19:50:19.000000000 -0500
27974 ++++ linux-2.6.37.4/fs/ext4/balloc.c 2011-01-17 02:41:01.000000000 -0500
27975 @@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e
27976 /* Hm, nope. Are (enough) root reserved blocks available? */
27977 if (sbi->s_resuid == current_fsuid() ||
27978 @@ -31700,9 +31907,9 @@ diff -urNp linux-2.6.37.3/fs/ext4/balloc.c linux-2.6.37.3/fs/ext4/balloc.c
27979 if (free_blocks >= (nblocks + dirty_blocks))
27980 return 1;
27981 }
27982 -diff -urNp linux-2.6.37.3/fs/ext4/ext4.h linux-2.6.37.3/fs/ext4/ext4.h
27983 ---- linux-2.6.37.3/fs/ext4/ext4.h 2011-01-04 19:50:19.000000000 -0500
27984 -+++ linux-2.6.37.3/fs/ext4/ext4.h 2011-01-17 02:41:01.000000000 -0500
27985 +diff -urNp linux-2.6.37.4/fs/ext4/ext4.h linux-2.6.37.4/fs/ext4/ext4.h
27986 +--- linux-2.6.37.4/fs/ext4/ext4.h 2011-01-04 19:50:19.000000000 -0500
27987 ++++ linux-2.6.37.4/fs/ext4/ext4.h 2011-01-17 02:41:01.000000000 -0500
27988 @@ -1164,19 +1164,19 @@ struct ext4_sb_info {
27989 unsigned long s_mb_last_start;
27990
27991 @@ -31733,9 +31940,9 @@ diff -urNp linux-2.6.37.3/fs/ext4/ext4.h linux-2.6.37.3/fs/ext4/ext4.h
27992 atomic_t s_lock_busy;
27993
27994 /* locality groups */
27995 -diff -urNp linux-2.6.37.3/fs/ext4/mballoc.c linux-2.6.37.3/fs/ext4/mballoc.c
27996 ---- linux-2.6.37.3/fs/ext4/mballoc.c 2011-02-22 16:05:31.000000000 -0500
27997 -+++ linux-2.6.37.3/fs/ext4/mballoc.c 2011-02-22 16:05:42.000000000 -0500
27998 +diff -urNp linux-2.6.37.4/fs/ext4/mballoc.c linux-2.6.37.4/fs/ext4/mballoc.c
27999 +--- linux-2.6.37.4/fs/ext4/mballoc.c 2011-02-22 16:05:31.000000000 -0500
28000 ++++ linux-2.6.37.4/fs/ext4/mballoc.c 2011-02-22 16:05:42.000000000 -0500
28001 @@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex
28002 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
28003
28004 @@ -31849,9 +32056,9 @@ diff -urNp linux-2.6.37.3/fs/ext4/mballoc.c linux-2.6.37.3/fs/ext4/mballoc.c
28005 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
28006
28007 return 0;
28008 -diff -urNp linux-2.6.37.3/fs/ext4/namei.c linux-2.6.37.3/fs/ext4/namei.c
28009 ---- linux-2.6.37.3/fs/ext4/namei.c 2011-01-04 19:50:19.000000000 -0500
28010 -+++ linux-2.6.37.3/fs/ext4/namei.c 2011-01-17 02:41:01.000000000 -0500
28011 +diff -urNp linux-2.6.37.4/fs/ext4/namei.c linux-2.6.37.4/fs/ext4/namei.c
28012 +--- linux-2.6.37.4/fs/ext4/namei.c 2011-01-04 19:50:19.000000000 -0500
28013 ++++ linux-2.6.37.4/fs/ext4/namei.c 2011-01-17 02:41:01.000000000 -0500
28014 @@ -1161,7 +1161,7 @@ static struct ext4_dir_entry_2 *do_split
28015 char *data1 = (*bh)->b_data, *data2;
28016 unsigned split, move, size;
28017 @@ -31861,9 +32068,9 @@ diff -urNp linux-2.6.37.3/fs/ext4/namei.c linux-2.6.37.3/fs/ext4/namei.c
28018
28019 bh2 = ext4_append (handle, dir, &newblock, &err);
28020 if (!(bh2)) {
28021 -diff -urNp linux-2.6.37.3/fs/ext4/xattr.c linux-2.6.37.3/fs/ext4/xattr.c
28022 ---- linux-2.6.37.3/fs/ext4/xattr.c 2011-01-04 19:50:19.000000000 -0500
28023 -+++ linux-2.6.37.3/fs/ext4/xattr.c 2011-01-17 02:41:01.000000000 -0500
28024 +diff -urNp linux-2.6.37.4/fs/ext4/xattr.c linux-2.6.37.4/fs/ext4/xattr.c
28025 +--- linux-2.6.37.4/fs/ext4/xattr.c 2011-01-04 19:50:19.000000000 -0500
28026 ++++ linux-2.6.37.4/fs/ext4/xattr.c 2011-01-17 02:41:01.000000000 -0500
28027 @@ -82,8 +82,8 @@
28028 printk("\n"); \
28029 } while (0)
28030 @@ -31875,9 +32082,9 @@ diff -urNp linux-2.6.37.3/fs/ext4/xattr.c linux-2.6.37.3/fs/ext4/xattr.c
28031 #endif
28032
28033 static void ext4_xattr_cache_insert(struct buffer_head *);
28034 -diff -urNp linux-2.6.37.3/fs/fcntl.c linux-2.6.37.3/fs/fcntl.c
28035 ---- linux-2.6.37.3/fs/fcntl.c 2011-01-04 19:50:19.000000000 -0500
28036 -+++ linux-2.6.37.3/fs/fcntl.c 2011-01-17 02:53:49.000000000 -0500
28037 +diff -urNp linux-2.6.37.4/fs/fcntl.c linux-2.6.37.4/fs/fcntl.c
28038 +--- linux-2.6.37.4/fs/fcntl.c 2011-01-04 19:50:19.000000000 -0500
28039 ++++ linux-2.6.37.4/fs/fcntl.c 2011-01-17 02:53:49.000000000 -0500
28040 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
28041 if (err)
28042 return err;
28043 @@ -31915,9 +32122,9 @@ diff -urNp linux-2.6.37.3/fs/fcntl.c linux-2.6.37.3/fs/fcntl.c
28044 ));
28045
28046 fasync_cache = kmem_cache_create("fasync_cache",
28047 -diff -urNp linux-2.6.37.3/fs/fifo.c linux-2.6.37.3/fs/fifo.c
28048 ---- linux-2.6.37.3/fs/fifo.c 2011-01-04 19:50:19.000000000 -0500
28049 -+++ linux-2.6.37.3/fs/fifo.c 2011-01-17 02:41:01.000000000 -0500
28050 +diff -urNp linux-2.6.37.4/fs/fifo.c linux-2.6.37.4/fs/fifo.c
28051 +--- linux-2.6.37.4/fs/fifo.c 2011-01-04 19:50:19.000000000 -0500
28052 ++++ linux-2.6.37.4/fs/fifo.c 2011-01-17 02:41:01.000000000 -0500
28053 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
28054 */
28055 filp->f_op = &read_pipefifo_fops;
28056 @@ -31988,9 +32195,9 @@ diff -urNp linux-2.6.37.3/fs/fifo.c linux-2.6.37.3/fs/fifo.c
28057 free_pipe_info(inode);
28058
28059 err_nocleanup:
28060 -diff -urNp linux-2.6.37.3/fs/file.c linux-2.6.37.3/fs/file.c
28061 ---- linux-2.6.37.3/fs/file.c 2011-01-04 19:50:19.000000000 -0500
28062 -+++ linux-2.6.37.3/fs/file.c 2011-01-17 02:41:01.000000000 -0500
28063 +diff -urNp linux-2.6.37.4/fs/file.c linux-2.6.37.4/fs/file.c
28064 +--- linux-2.6.37.4/fs/file.c 2011-01-04 19:50:19.000000000 -0500
28065 ++++ linux-2.6.37.4/fs/file.c 2011-01-17 02:41:01.000000000 -0500
28066 @@ -14,6 +14,7 @@
28067 #include <linux/slab.h>
28068 #include <linux/vmalloc.h>
28069 @@ -32007,9 +32214,9 @@ diff -urNp linux-2.6.37.3/fs/file.c linux-2.6.37.3/fs/file.c
28070 if (nr >= rlimit(RLIMIT_NOFILE))
28071 return -EMFILE;
28072
28073 -diff -urNp linux-2.6.37.3/fs/fs_struct.c linux-2.6.37.3/fs/fs_struct.c
28074 ---- linux-2.6.37.3/fs/fs_struct.c 2011-01-04 19:50:19.000000000 -0500
28075 -+++ linux-2.6.37.3/fs/fs_struct.c 2011-01-17 02:41:01.000000000 -0500
28076 +diff -urNp linux-2.6.37.4/fs/fs_struct.c linux-2.6.37.4/fs/fs_struct.c
28077 +--- linux-2.6.37.4/fs/fs_struct.c 2011-01-04 19:50:19.000000000 -0500
28078 ++++ linux-2.6.37.4/fs/fs_struct.c 2011-01-17 02:41:01.000000000 -0500
28079 @@ -4,6 +4,7 @@
28080 #include <linux/path.h>
28081 #include <linux/slab.h>
28082 @@ -32089,9 +32296,9 @@ diff -urNp linux-2.6.37.3/fs/fs_struct.c linux-2.6.37.3/fs/fs_struct.c
28083 spin_unlock(&fs->lock);
28084
28085 task_unlock(current);
28086 -diff -urNp linux-2.6.37.3/fs/fuse/control.c linux-2.6.37.3/fs/fuse/control.c
28087 ---- linux-2.6.37.3/fs/fuse/control.c 2011-01-04 19:50:19.000000000 -0500
28088 -+++ linux-2.6.37.3/fs/fuse/control.c 2011-01-17 02:41:01.000000000 -0500
28089 +diff -urNp linux-2.6.37.4/fs/fuse/control.c linux-2.6.37.4/fs/fuse/control.c
28090 +--- linux-2.6.37.4/fs/fuse/control.c 2011-01-04 19:50:19.000000000 -0500
28091 ++++ linux-2.6.37.4/fs/fuse/control.c 2011-01-17 02:41:01.000000000 -0500
28092 @@ -298,7 +298,7 @@ void fuse_ctl_remove_conn(struct fuse_co
28093
28094 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
28095 @@ -32101,9 +32308,9 @@ diff -urNp linux-2.6.37.3/fs/fuse/control.c linux-2.6.37.3/fs/fuse/control.c
28096 struct fuse_conn *fc;
28097 int err;
28098
28099 -diff -urNp linux-2.6.37.3/fs/fuse/cuse.c linux-2.6.37.3/fs/fuse/cuse.c
28100 ---- linux-2.6.37.3/fs/fuse/cuse.c 2011-01-04 19:50:19.000000000 -0500
28101 -+++ linux-2.6.37.3/fs/fuse/cuse.c 2011-01-17 02:41:01.000000000 -0500
28102 +diff -urNp linux-2.6.37.4/fs/fuse/cuse.c linux-2.6.37.4/fs/fuse/cuse.c
28103 +--- linux-2.6.37.4/fs/fuse/cuse.c 2011-01-04 19:50:19.000000000 -0500
28104 ++++ linux-2.6.37.4/fs/fuse/cuse.c 2011-01-17 02:41:01.000000000 -0500
28105 @@ -530,8 +530,18 @@ static int cuse_channel_release(struct i
28106 return rc;
28107 }
28108 @@ -32138,9 +32345,9 @@ diff -urNp linux-2.6.37.3/fs/fuse/cuse.c linux-2.6.37.3/fs/fuse/cuse.c
28109 cuse_class = class_create(THIS_MODULE, "cuse");
28110 if (IS_ERR(cuse_class))
28111 return PTR_ERR(cuse_class);
28112 -diff -urNp linux-2.6.37.3/fs/fuse/dev.c linux-2.6.37.3/fs/fuse/dev.c
28113 ---- linux-2.6.37.3/fs/fuse/dev.c 2011-01-04 19:50:19.000000000 -0500
28114 -+++ linux-2.6.37.3/fs/fuse/dev.c 2011-01-17 02:41:01.000000000 -0500
28115 +diff -urNp linux-2.6.37.4/fs/fuse/dev.c linux-2.6.37.4/fs/fuse/dev.c
28116 +--- linux-2.6.37.4/fs/fuse/dev.c 2011-01-04 19:50:19.000000000 -0500
28117 ++++ linux-2.6.37.4/fs/fuse/dev.c 2011-01-17 02:41:01.000000000 -0500
28118 @@ -1047,7 +1047,7 @@ static ssize_t fuse_dev_do_read(struct f
28119 return err;
28120 }
28121 @@ -32222,9 +32429,9 @@ diff -urNp linux-2.6.37.3/fs/fuse/dev.c linux-2.6.37.3/fs/fuse/dev.c
28122 const struct file_operations fuse_dev_operations = {
28123 .owner = THIS_MODULE,
28124 .llseek = no_llseek,
28125 -diff -urNp linux-2.6.37.3/fs/fuse/dir.c linux-2.6.37.3/fs/fuse/dir.c
28126 ---- linux-2.6.37.3/fs/fuse/dir.c 2011-01-04 19:50:19.000000000 -0500
28127 -+++ linux-2.6.37.3/fs/fuse/dir.c 2011-01-17 02:41:01.000000000 -0500
28128 +diff -urNp linux-2.6.37.4/fs/fuse/dir.c linux-2.6.37.4/fs/fuse/dir.c
28129 +--- linux-2.6.37.4/fs/fuse/dir.c 2011-01-04 19:50:19.000000000 -0500
28130 ++++ linux-2.6.37.4/fs/fuse/dir.c 2011-01-17 02:41:01.000000000 -0500
28131 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
28132 return link;
28133 }
28134 @@ -32234,9 +32441,9 @@ diff -urNp linux-2.6.37.3/fs/fuse/dir.c linux-2.6.37.3/fs/fuse/dir.c
28135 {
28136 if (!IS_ERR(link))
28137 free_page((unsigned long) link);
28138 -diff -urNp linux-2.6.37.3/fs/fuse/fuse_i.h linux-2.6.37.3/fs/fuse/fuse_i.h
28139 ---- linux-2.6.37.3/fs/fuse/fuse_i.h 2011-03-11 17:22:42.000000000 -0500
28140 -+++ linux-2.6.37.3/fs/fuse/fuse_i.h 2011-03-11 17:23:03.000000000 -0500
28141 +diff -urNp linux-2.6.37.4/fs/fuse/fuse_i.h linux-2.6.37.4/fs/fuse/fuse_i.h
28142 +--- linux-2.6.37.4/fs/fuse/fuse_i.h 2011-03-11 17:22:42.000000000 -0500
28143 ++++ linux-2.6.37.4/fs/fuse/fuse_i.h 2011-03-11 17:23:03.000000000 -0500
28144 @@ -529,6 +529,16 @@ extern const struct file_operations fuse
28145
28146 extern const struct dentry_operations fuse_dentry_operations;
28147 @@ -32254,9 +32461,9 @@ diff -urNp linux-2.6.37.3/fs/fuse/fuse_i.h linux-2.6.37.3/fs/fuse/fuse_i.h
28148 /**
28149 * Inode to nodeid comparison.
28150 */
28151 -diff -urNp linux-2.6.37.3/fs/hfs/inode.c linux-2.6.37.3/fs/hfs/inode.c
28152 ---- linux-2.6.37.3/fs/hfs/inode.c 2011-01-04 19:50:19.000000000 -0500
28153 -+++ linux-2.6.37.3/fs/hfs/inode.c 2011-01-17 02:41:01.000000000 -0500
28154 +diff -urNp linux-2.6.37.4/fs/hfs/inode.c linux-2.6.37.4/fs/hfs/inode.c
28155 +--- linux-2.6.37.4/fs/hfs/inode.c 2011-01-04 19:50:19.000000000 -0500
28156 ++++ linux-2.6.37.4/fs/hfs/inode.c 2011-01-17 02:41:01.000000000 -0500
28157 @@ -447,7 +447,7 @@ int hfs_write_inode(struct inode *inode,
28158
28159 if (S_ISDIR(main_inode->i_mode)) {
28160 @@ -32275,9 +32482,9 @@ diff -urNp linux-2.6.37.3/fs/hfs/inode.c linux-2.6.37.3/fs/hfs/inode.c
28161 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
28162 sizeof(struct hfs_cat_file));
28163 if (rec.type != HFS_CDR_FIL ||
28164 -diff -urNp linux-2.6.37.3/fs/hfsplus/inode.c linux-2.6.37.3/fs/hfsplus/inode.c
28165 ---- linux-2.6.37.3/fs/hfsplus/inode.c 2011-01-04 19:50:19.000000000 -0500
28166 -+++ linux-2.6.37.3/fs/hfsplus/inode.c 2011-01-17 02:41:01.000000000 -0500
28167 +diff -urNp linux-2.6.37.4/fs/hfsplus/inode.c linux-2.6.37.4/fs/hfsplus/inode.c
28168 +--- linux-2.6.37.4/fs/hfsplus/inode.c 2011-01-04 19:50:19.000000000 -0500
28169 ++++ linux-2.6.37.4/fs/hfsplus/inode.c 2011-01-17 02:41:01.000000000 -0500
28170 @@ -478,7 +478,7 @@ int hfsplus_cat_read_inode(struct inode
28171 struct hfsplus_cat_folder *folder = &entry.folder;
28172
28173 @@ -32314,9 +32521,9 @@ diff -urNp linux-2.6.37.3/fs/hfsplus/inode.c linux-2.6.37.3/fs/hfsplus/inode.c
28174 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
28175 sizeof(struct hfsplus_cat_file));
28176 hfsplus_inode_write_fork(inode, &file->data_fork);
28177 -diff -urNp linux-2.6.37.3/fs/hugetlbfs/inode.c linux-2.6.37.3/fs/hugetlbfs/inode.c
28178 ---- linux-2.6.37.3/fs/hugetlbfs/inode.c 2011-01-04 19:50:19.000000000 -0500
28179 -+++ linux-2.6.37.3/fs/hugetlbfs/inode.c 2011-01-17 02:41:01.000000000 -0500
28180 +diff -urNp linux-2.6.37.4/fs/hugetlbfs/inode.c linux-2.6.37.4/fs/hugetlbfs/inode.c
28181 +--- linux-2.6.37.4/fs/hugetlbfs/inode.c 2011-01-04 19:50:19.000000000 -0500
28182 ++++ linux-2.6.37.4/fs/hugetlbfs/inode.c 2011-01-17 02:41:01.000000000 -0500
28183 @@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs
28184 .kill_sb = kill_litter_super,
28185 };
28186 @@ -32326,9 +32533,9 @@ diff -urNp linux-2.6.37.3/fs/hugetlbfs/inode.c linux-2.6.37.3/fs/hugetlbfs/inode
28187
28188 static int can_do_hugetlb_shm(void)
28189 {
28190 -diff -urNp linux-2.6.37.3/fs/ioctl.c linux-2.6.37.3/fs/ioctl.c
28191 ---- linux-2.6.37.3/fs/ioctl.c 2011-01-04 19:50:19.000000000 -0500
28192 -+++ linux-2.6.37.3/fs/ioctl.c 2011-01-17 02:41:01.000000000 -0500
28193 +diff -urNp linux-2.6.37.4/fs/ioctl.c linux-2.6.37.4/fs/ioctl.c
28194 +--- linux-2.6.37.4/fs/ioctl.c 2011-01-04 19:50:19.000000000 -0500
28195 ++++ linux-2.6.37.4/fs/ioctl.c 2011-01-17 02:41:01.000000000 -0500
28196 @@ -86,7 +86,7 @@ int fiemap_fill_next_extent(struct fiema
28197 u64 phys, u64 len, u32 flags)
28198 {
28199 @@ -32356,9 +32563,9 @@ diff -urNp linux-2.6.37.3/fs/ioctl.c linux-2.6.37.3/fs/ioctl.c
28200 error = -EFAULT;
28201
28202 return error;
28203 -diff -urNp linux-2.6.37.3/fs/jffs2/debug.h linux-2.6.37.3/fs/jffs2/debug.h
28204 ---- linux-2.6.37.3/fs/jffs2/debug.h 2011-01-04 19:50:19.000000000 -0500
28205 -+++ linux-2.6.37.3/fs/jffs2/debug.h 2011-01-17 02:41:01.000000000 -0500
28206 +diff -urNp linux-2.6.37.4/fs/jffs2/debug.h linux-2.6.37.4/fs/jffs2/debug.h
28207 +--- linux-2.6.37.4/fs/jffs2/debug.h 2011-01-04 19:50:19.000000000 -0500
28208 ++++ linux-2.6.37.4/fs/jffs2/debug.h 2011-01-17 02:41:01.000000000 -0500
28209 @@ -53,13 +53,13 @@
28210 #if CONFIG_JFFS2_FS_DEBUG > 0
28211 #define D1(x) x
28212 @@ -32460,9 +32667,9 @@ diff -urNp linux-2.6.37.3/fs/jffs2/debug.h linux-2.6.37.3/fs/jffs2/debug.h
28213 #endif
28214
28215 /* "Sanity" checks */
28216 -diff -urNp linux-2.6.37.3/fs/jffs2/erase.c linux-2.6.37.3/fs/jffs2/erase.c
28217 ---- linux-2.6.37.3/fs/jffs2/erase.c 2011-01-04 19:50:19.000000000 -0500
28218 -+++ linux-2.6.37.3/fs/jffs2/erase.c 2011-01-17 02:41:01.000000000 -0500
28219 +diff -urNp linux-2.6.37.4/fs/jffs2/erase.c linux-2.6.37.4/fs/jffs2/erase.c
28220 +--- linux-2.6.37.4/fs/jffs2/erase.c 2011-01-04 19:50:19.000000000 -0500
28221 ++++ linux-2.6.37.4/fs/jffs2/erase.c 2011-01-17 02:41:01.000000000 -0500
28222 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
28223 struct jffs2_unknown_node marker = {
28224 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
28225 @@ -32473,9 +32680,9 @@ diff -urNp linux-2.6.37.3/fs/jffs2/erase.c linux-2.6.37.3/fs/jffs2/erase.c
28226 };
28227
28228 jffs2_prealloc_raw_node_refs(c, jeb, 1);
28229 -diff -urNp linux-2.6.37.3/fs/jffs2/summary.h linux-2.6.37.3/fs/jffs2/summary.h
28230 ---- linux-2.6.37.3/fs/jffs2/summary.h 2011-01-04 19:50:19.000000000 -0500
28231 -+++ linux-2.6.37.3/fs/jffs2/summary.h 2011-01-17 02:41:01.000000000 -0500
28232 +diff -urNp linux-2.6.37.4/fs/jffs2/summary.h linux-2.6.37.4/fs/jffs2/summary.h
28233 +--- linux-2.6.37.4/fs/jffs2/summary.h 2011-01-04 19:50:19.000000000 -0500
28234 ++++ linux-2.6.37.4/fs/jffs2/summary.h 2011-01-17 02:41:01.000000000 -0500
28235 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
28236
28237 #define jffs2_sum_active() (0)
28238 @@ -32504,9 +32711,9 @@ diff -urNp linux-2.6.37.3/fs/jffs2/summary.h linux-2.6.37.3/fs/jffs2/summary.h
28239 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
28240
28241 #endif /* CONFIG_JFFS2_SUMMARY */
28242 -diff -urNp linux-2.6.37.3/fs/jffs2/wbuf.c linux-2.6.37.3/fs/jffs2/wbuf.c
28243 ---- linux-2.6.37.3/fs/jffs2/wbuf.c 2011-01-04 19:50:19.000000000 -0500
28244 -+++ linux-2.6.37.3/fs/jffs2/wbuf.c 2011-01-17 02:41:01.000000000 -0500
28245 +diff -urNp linux-2.6.37.4/fs/jffs2/wbuf.c linux-2.6.37.4/fs/jffs2/wbuf.c
28246 +--- linux-2.6.37.4/fs/jffs2/wbuf.c 2011-01-04 19:50:19.000000000 -0500
28247 ++++ linux-2.6.37.4/fs/jffs2/wbuf.c 2011-01-17 02:41:01.000000000 -0500
28248 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
28249 {
28250 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
28251 @@ -32517,9 +32724,9 @@ diff -urNp linux-2.6.37.3/fs/jffs2/wbuf.c linux-2.6.37.3/fs/jffs2/wbuf.c
28252 };
28253
28254 /*
28255 -diff -urNp linux-2.6.37.3/fs/Kconfig.binfmt linux-2.6.37.3/fs/Kconfig.binfmt
28256 ---- linux-2.6.37.3/fs/Kconfig.binfmt 2011-01-04 19:50:19.000000000 -0500
28257 -+++ linux-2.6.37.3/fs/Kconfig.binfmt 2011-01-17 02:41:01.000000000 -0500
28258 +diff -urNp linux-2.6.37.4/fs/Kconfig.binfmt linux-2.6.37.4/fs/Kconfig.binfmt
28259 +--- linux-2.6.37.4/fs/Kconfig.binfmt 2011-01-04 19:50:19.000000000 -0500
28260 ++++ linux-2.6.37.4/fs/Kconfig.binfmt 2011-01-17 02:41:01.000000000 -0500
28261 @@ -86,7 +86,7 @@ config HAVE_AOUT
28262
28263 config BINFMT_AOUT
28264 @@ -32529,9 +32736,9 @@ diff -urNp linux-2.6.37.3/fs/Kconfig.binfmt linux-2.6.37.3/fs/Kconfig.binfmt
28265 ---help---
28266 A.out (Assembler.OUTput) is a set of formats for libraries and
28267 executables used in the earliest versions of UNIX. Linux used
28268 -diff -urNp linux-2.6.37.3/fs/lockd/svc.c linux-2.6.37.3/fs/lockd/svc.c
28269 ---- linux-2.6.37.3/fs/lockd/svc.c 2011-01-04 19:50:19.000000000 -0500
28270 -+++ linux-2.6.37.3/fs/lockd/svc.c 2011-01-17 02:41:01.000000000 -0500
28271 +diff -urNp linux-2.6.37.4/fs/lockd/svc.c linux-2.6.37.4/fs/lockd/svc.c
28272 +--- linux-2.6.37.4/fs/lockd/svc.c 2011-01-04 19:50:19.000000000 -0500
28273 ++++ linux-2.6.37.4/fs/lockd/svc.c 2011-01-17 02:41:01.000000000 -0500
28274 @@ -41,7 +41,7 @@
28275
28276 static struct svc_program nlmsvc_program;
28277 @@ -32541,9 +32748,9 @@ diff -urNp linux-2.6.37.3/fs/lockd/svc.c linux-2.6.37.3/fs/lockd/svc.c
28278 EXPORT_SYMBOL_GPL(nlmsvc_ops);
28279
28280 static DEFINE_MUTEX(nlmsvc_mutex);
28281 -diff -urNp linux-2.6.37.3/fs/locks.c linux-2.6.37.3/fs/locks.c
28282 ---- linux-2.6.37.3/fs/locks.c 2011-01-04 19:50:19.000000000 -0500
28283 -+++ linux-2.6.37.3/fs/locks.c 2011-01-17 02:41:01.000000000 -0500
28284 +diff -urNp linux-2.6.37.4/fs/locks.c linux-2.6.37.4/fs/locks.c
28285 +--- linux-2.6.37.4/fs/locks.c 2011-01-04 19:50:19.000000000 -0500
28286 ++++ linux-2.6.37.4/fs/locks.c 2011-01-17 02:41:01.000000000 -0500
28287 @@ -2050,16 +2050,16 @@ void locks_remove_flock(struct file *fil
28288 return;
28289
28290 @@ -32565,9 +32772,9 @@ diff -urNp linux-2.6.37.3/fs/locks.c linux-2.6.37.3/fs/locks.c
28291 }
28292
28293 lock_flocks();
28294 -diff -urNp linux-2.6.37.3/fs/namei.c linux-2.6.37.3/fs/namei.c
28295 ---- linux-2.6.37.3/fs/namei.c 2011-01-04 19:50:19.000000000 -0500
28296 -+++ linux-2.6.37.3/fs/namei.c 2011-01-17 11:57:48.000000000 -0500
28297 +diff -urNp linux-2.6.37.4/fs/namei.c linux-2.6.37.4/fs/namei.c
28298 +--- linux-2.6.37.4/fs/namei.c 2011-01-04 19:50:19.000000000 -0500
28299 ++++ linux-2.6.37.4/fs/namei.c 2011-01-17 11:57:48.000000000 -0500
28300 @@ -221,14 +221,6 @@ int generic_permission(struct inode *ino
28301 return ret;
28302
28303 @@ -32997,9 +33204,9 @@ diff -urNp linux-2.6.37.3/fs/namei.c linux-2.6.37.3/fs/namei.c
28304 exit6:
28305 mnt_drop_write(oldnd.path.mnt);
28306 exit5:
28307 -diff -urNp linux-2.6.37.3/fs/namespace.c linux-2.6.37.3/fs/namespace.c
28308 ---- linux-2.6.37.3/fs/namespace.c 2011-01-04 19:50:19.000000000 -0500
28309 -+++ linux-2.6.37.3/fs/namespace.c 2011-01-17 02:41:01.000000000 -0500
28310 +diff -urNp linux-2.6.37.4/fs/namespace.c linux-2.6.37.4/fs/namespace.c
28311 +--- linux-2.6.37.4/fs/namespace.c 2011-01-04 19:50:19.000000000 -0500
28312 ++++ linux-2.6.37.4/fs/namespace.c 2011-01-17 02:41:01.000000000 -0500
28313 @@ -1141,6 +1141,9 @@ static int do_umount(struct vfsmount *mn
28314 if (!(sb->s_flags & MS_RDONLY))
28315 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
28316 @@ -33060,9 +33267,9 @@ diff -urNp linux-2.6.37.3/fs/namespace.c linux-2.6.37.3/fs/namespace.c
28317 get_fs_root(current->fs, &root);
28318 down_write(&namespace_sem);
28319 mutex_lock(&old.dentry->d_inode->i_mutex);
28320 -diff -urNp linux-2.6.37.3/fs/nfs/inode.c linux-2.6.37.3/fs/nfs/inode.c
28321 ---- linux-2.6.37.3/fs/nfs/inode.c 2011-01-04 19:50:19.000000000 -0500
28322 -+++ linux-2.6.37.3/fs/nfs/inode.c 2011-01-17 02:41:01.000000000 -0500
28323 +diff -urNp linux-2.6.37.4/fs/nfs/inode.c linux-2.6.37.4/fs/nfs/inode.c
28324 +--- linux-2.6.37.4/fs/nfs/inode.c 2011-01-04 19:50:19.000000000 -0500
28325 ++++ linux-2.6.37.4/fs/nfs/inode.c 2011-01-17 02:41:01.000000000 -0500
28326 @@ -985,16 +985,16 @@ static int nfs_size_need_update(const st
28327 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
28328 }
28329 @@ -33083,10 +33290,10 @@ diff -urNp linux-2.6.37.3/fs/nfs/inode.c linux-2.6.37.3/fs/nfs/inode.c
28330 }
28331
28332 void nfs_fattr_init(struct nfs_fattr *fattr)
28333 -diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28334 ---- linux-2.6.37.3/fs/nfs/nfs4proc.c 2011-01-04 19:50:19.000000000 -0500
28335 -+++ linux-2.6.37.3/fs/nfs/nfs4proc.c 2011-01-17 02:41:01.000000000 -0500
28336 -@@ -1184,7 +1184,7 @@ static int _nfs4_do_open_reclaim(struct
28337 +diff -urNp linux-2.6.37.4/fs/nfs/nfs4proc.c linux-2.6.37.4/fs/nfs/nfs4proc.c
28338 +--- linux-2.6.37.4/fs/nfs/nfs4proc.c 2011-03-18 17:47:00.000000000 -0400
28339 ++++ linux-2.6.37.4/fs/nfs/nfs4proc.c 2011-03-18 17:48:11.000000000 -0400
28340 +@@ -1185,7 +1185,7 @@ static int _nfs4_do_open_reclaim(struct
28341 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
28342 {
28343 struct nfs_server *server = NFS_SERVER(state->inode);
28344 @@ -33095,7 +33302,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28345 int err;
28346 do {
28347 err = _nfs4_do_open_reclaim(ctx, state);
28348 -@@ -1226,7 +1226,7 @@ static int _nfs4_open_delegation_recall(
28349 +@@ -1227,7 +1227,7 @@ static int _nfs4_open_delegation_recall(
28350
28351 int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid)
28352 {
28353 @@ -33104,7 +33311,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28354 struct nfs_server *server = NFS_SERVER(state->inode);
28355 int err;
28356 do {
28357 -@@ -1602,7 +1602,7 @@ static int _nfs4_open_expired(struct nfs
28358 +@@ -1603,7 +1603,7 @@ static int _nfs4_open_expired(struct nfs
28359 static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
28360 {
28361 struct nfs_server *server = NFS_SERVER(state->inode);
28362 @@ -33113,7 +33320,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28363 int err;
28364
28365 do {
28366 -@@ -1717,7 +1717,7 @@ out_err:
28367 +@@ -1718,7 +1718,7 @@ out_err:
28368
28369 static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred)
28370 {
28371 @@ -33122,7 +33329,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28372 struct nfs4_state *res;
28373 int status;
28374
28375 -@@ -1808,7 +1808,7 @@ static int nfs4_do_setattr(struct inode
28376 +@@ -1809,7 +1809,7 @@ static int nfs4_do_setattr(struct inode
28377 struct nfs4_state *state)
28378 {
28379 struct nfs_server *server = NFS_SERVER(inode);
28380 @@ -33131,7 +33338,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28381 int err;
28382 do {
28383 err = nfs4_handle_exception(server,
28384 -@@ -2081,7 +2081,7 @@ static int _nfs4_server_capabilities(str
28385 +@@ -2082,7 +2082,7 @@ static int _nfs4_server_capabilities(str
28386
28387 int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
28388 {
28389 @@ -33140,7 +33347,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28390 int err;
28391 do {
28392 err = nfs4_handle_exception(server,
28393 -@@ -2115,7 +2115,7 @@ static int _nfs4_lookup_root(struct nfs_
28394 +@@ -2116,7 +2116,7 @@ static int _nfs4_lookup_root(struct nfs_
28395 static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
28396 struct nfs_fsinfo *info)
28397 {
28398 @@ -33149,7 +33356,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28399 int err;
28400 do {
28401 err = nfs4_handle_exception(server,
28402 -@@ -2203,7 +2203,7 @@ static int _nfs4_proc_getattr(struct nfs
28403 +@@ -2204,7 +2204,7 @@ static int _nfs4_proc_getattr(struct nfs
28404
28405 static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
28406 {
28407 @@ -33158,7 +33365,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28408 int err;
28409 do {
28410 err = nfs4_handle_exception(server,
28411 -@@ -2291,7 +2291,7 @@ static int nfs4_proc_lookupfh(struct nfs
28412 +@@ -2292,7 +2292,7 @@ static int nfs4_proc_lookupfh(struct nfs
28413 struct qstr *name, struct nfs_fh *fhandle,
28414 struct nfs_fattr *fattr)
28415 {
28416 @@ -33167,7 +33374,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28417 int err;
28418 do {
28419 err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
28420 -@@ -2320,7 +2320,7 @@ static int _nfs4_proc_lookup(struct inod
28421 +@@ -2321,7 +2321,7 @@ static int _nfs4_proc_lookup(struct inod
28422
28423 static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
28424 {
28425 @@ -33176,7 +33383,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28426 int err;
28427 do {
28428 err = nfs4_handle_exception(NFS_SERVER(dir),
28429 -@@ -2387,7 +2387,7 @@ static int _nfs4_proc_access(struct inod
28430 +@@ -2388,7 +2388,7 @@ static int _nfs4_proc_access(struct inod
28431
28432 static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
28433 {
28434 @@ -33185,7 +33392,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28435 int err;
28436 do {
28437 err = nfs4_handle_exception(NFS_SERVER(inode),
28438 -@@ -2443,7 +2443,7 @@ static int _nfs4_proc_readlink(struct in
28439 +@@ -2444,7 +2444,7 @@ static int _nfs4_proc_readlink(struct in
28440 static int nfs4_proc_readlink(struct inode *inode, struct page *page,
28441 unsigned int pgbase, unsigned int pglen)
28442 {
28443 @@ -33194,7 +33401,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28444 int err;
28445 do {
28446 err = nfs4_handle_exception(NFS_SERVER(inode),
28447 -@@ -2537,7 +2537,7 @@ out:
28448 +@@ -2538,7 +2538,7 @@ out:
28449
28450 static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
28451 {
28452 @@ -33203,7 +33410,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28453 int err;
28454 do {
28455 err = nfs4_handle_exception(NFS_SERVER(dir),
28456 -@@ -2642,7 +2642,7 @@ out:
28457 +@@ -2643,7 +2643,7 @@ out:
28458 static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
28459 struct inode *new_dir, struct qstr *new_name)
28460 {
28461 @@ -33212,7 +33419,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28462 int err;
28463 do {
28464 err = nfs4_handle_exception(NFS_SERVER(old_dir),
28465 -@@ -2691,7 +2691,7 @@ out:
28466 +@@ -2692,7 +2692,7 @@ out:
28467
28468 static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
28469 {
28470 @@ -33221,7 +33428,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28471 int err;
28472 do {
28473 err = nfs4_handle_exception(NFS_SERVER(inode),
28474 -@@ -2783,7 +2783,7 @@ out:
28475 +@@ -2784,7 +2784,7 @@ out:
28476 static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
28477 struct page *page, unsigned int len, struct iattr *sattr)
28478 {
28479 @@ -33230,7 +33437,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28480 int err;
28481 do {
28482 err = nfs4_handle_exception(NFS_SERVER(dir),
28483 -@@ -2814,7 +2814,7 @@ out:
28484 +@@ -2815,7 +2815,7 @@ out:
28485 static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
28486 struct iattr *sattr)
28487 {
28488 @@ -33239,7 +33446,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28489 int err;
28490 do {
28491 err = nfs4_handle_exception(NFS_SERVER(dir),
28492 -@@ -2866,7 +2866,7 @@ static int _nfs4_proc_readdir(struct den
28493 +@@ -2867,7 +2867,7 @@ static int _nfs4_proc_readdir(struct den
28494 static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
28495 u64 cookie, struct page **pages, unsigned int count, int plus)
28496 {
28497 @@ -33248,7 +33455,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28498 int err;
28499 do {
28500 err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
28501 -@@ -2914,7 +2914,7 @@ out:
28502 +@@ -2915,7 +2915,7 @@ out:
28503 static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
28504 struct iattr *sattr, dev_t rdev)
28505 {
28506 @@ -33257,7 +33464,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28507 int err;
28508 do {
28509 err = nfs4_handle_exception(NFS_SERVER(dir),
28510 -@@ -2946,7 +2946,7 @@ static int _nfs4_proc_statfs(struct nfs_
28511 +@@ -2947,7 +2947,7 @@ static int _nfs4_proc_statfs(struct nfs_
28512
28513 static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
28514 {
28515 @@ -33266,7 +33473,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28516 int err;
28517 do {
28518 err = nfs4_handle_exception(server,
28519 -@@ -2977,7 +2977,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
28520 +@@ -2978,7 +2978,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
28521
28522 static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
28523 {
28524 @@ -33275,7 +33482,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28525 int err;
28526
28527 do {
28528 -@@ -3023,7 +3023,7 @@ static int _nfs4_proc_pathconf(struct nf
28529 +@@ -3024,7 +3024,7 @@ static int _nfs4_proc_pathconf(struct nf
28530 static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
28531 struct nfs_pathconf *pathconf)
28532 {
28533 @@ -33284,7 +33491,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28534 int err;
28535
28536 do {
28537 -@@ -3340,7 +3340,7 @@ out_free:
28538 +@@ -3370,7 +3370,7 @@ out_free:
28539
28540 static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
28541 {
28542 @@ -33293,7 +33500,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28543 ssize_t ret;
28544 do {
28545 ret = __nfs4_get_acl_uncached(inode, buf, buflen);
28546 -@@ -3405,7 +3405,7 @@ static int __nfs4_proc_set_acl(struct in
28547 +@@ -3445,7 +3445,7 @@ static int __nfs4_proc_set_acl(struct in
28548
28549 static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
28550 {
28551 @@ -33302,7 +33509,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28552 int err;
28553 do {
28554 err = nfs4_handle_exception(NFS_SERVER(inode),
28555 -@@ -3685,7 +3685,7 @@ out:
28556 +@@ -3725,7 +3725,7 @@ out:
28557 int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
28558 {
28559 struct nfs_server *server = NFS_SERVER(inode);
28560 @@ -33311,7 +33518,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28561 int err;
28562 do {
28563 err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
28564 -@@ -3758,7 +3758,7 @@ out:
28565 +@@ -3798,7 +3798,7 @@ out:
28566
28567 static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
28568 {
28569 @@ -33320,7 +33527,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28570 int err;
28571
28572 do {
28573 -@@ -4167,7 +4167,7 @@ static int _nfs4_do_setlk(struct nfs4_st
28574 +@@ -4207,7 +4207,7 @@ static int _nfs4_do_setlk(struct nfs4_st
28575 static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
28576 {
28577 struct nfs_server *server = NFS_SERVER(state->inode);
28578 @@ -33329,7 +33536,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28579 int err;
28580
28581 do {
28582 -@@ -4185,7 +4185,7 @@ static int nfs4_lock_reclaim(struct nfs4
28583 +@@ -4225,7 +4225,7 @@ static int nfs4_lock_reclaim(struct nfs4
28584 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
28585 {
28586 struct nfs_server *server = NFS_SERVER(state->inode);
28587 @@ -33338,7 +33545,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28588 int err;
28589
28590 err = nfs4_set_lock_state(state, request);
28591 -@@ -4249,7 +4249,7 @@ out:
28592 +@@ -4289,7 +4289,7 @@ out:
28593
28594 static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
28595 {
28596 @@ -33347,7 +33554,7 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28597 int err;
28598
28599 do {
28600 -@@ -4309,7 +4309,7 @@ nfs4_proc_lock(struct file *filp, int cm
28601 +@@ -4349,7 +4349,7 @@ nfs4_proc_lock(struct file *filp, int cm
28602 int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
28603 {
28604 struct nfs_server *server = NFS_SERVER(state->inode);
28605 @@ -33356,9 +33563,9 @@ diff -urNp linux-2.6.37.3/fs/nfs/nfs4proc.c linux-2.6.37.3/fs/nfs/nfs4proc.c
28606 int err;
28607
28608 err = nfs4_set_lock_state(state, fl);
28609 -diff -urNp linux-2.6.37.3/fs/nfsd/lockd.c linux-2.6.37.3/fs/nfsd/lockd.c
28610 ---- linux-2.6.37.3/fs/nfsd/lockd.c 2011-01-04 19:50:19.000000000 -0500
28611 -+++ linux-2.6.37.3/fs/nfsd/lockd.c 2011-01-17 02:41:01.000000000 -0500
28612 +diff -urNp linux-2.6.37.4/fs/nfsd/lockd.c linux-2.6.37.4/fs/nfsd/lockd.c
28613 +--- linux-2.6.37.4/fs/nfsd/lockd.c 2011-01-04 19:50:19.000000000 -0500
28614 ++++ linux-2.6.37.4/fs/nfsd/lockd.c 2011-01-17 02:41:01.000000000 -0500
28615 @@ -61,7 +61,7 @@ nlm_fclose(struct file *filp)
28616 fput(filp);
28617 }
28618 @@ -33368,9 +33575,9 @@ diff -urNp linux-2.6.37.3/fs/nfsd/lockd.c linux-2.6.37.3/fs/nfsd/lockd.c
28619 .fopen = nlm_fopen, /* open file for locking */
28620 .fclose = nlm_fclose, /* close file */
28621 };
28622 -diff -urNp linux-2.6.37.3/fs/nfsd/nfsctl.c linux-2.6.37.3/fs/nfsd/nfsctl.c
28623 ---- linux-2.6.37.3/fs/nfsd/nfsctl.c 2011-01-04 19:50:19.000000000 -0500
28624 -+++ linux-2.6.37.3/fs/nfsd/nfsctl.c 2011-01-17 02:41:01.000000000 -0500
28625 +diff -urNp linux-2.6.37.4/fs/nfsd/nfsctl.c linux-2.6.37.4/fs/nfsd/nfsctl.c
28626 +--- linux-2.6.37.4/fs/nfsd/nfsctl.c 2011-01-04 19:50:19.000000000 -0500
28627 ++++ linux-2.6.37.4/fs/nfsd/nfsctl.c 2011-01-17 02:41:01.000000000 -0500
28628 @@ -178,7 +178,7 @@ static int export_features_open(struct i
28629 return single_open(file, export_features_show, NULL);
28630 }
28631 @@ -33380,9 +33587,9 @@ diff -urNp linux-2.6.37.3/fs/nfsd/nfsctl.c linux-2.6.37.3/fs/nfsd/nfsctl.c
28632 .open = export_features_open,
28633 .read = seq_read,
28634 .llseek = seq_lseek,
28635 -diff -urNp linux-2.6.37.3/fs/nfsd/vfs.c linux-2.6.37.3/fs/nfsd/vfs.c
28636 ---- linux-2.6.37.3/fs/nfsd/vfs.c 2011-02-27 14:49:17.000000000 -0500
28637 -+++ linux-2.6.37.3/fs/nfsd/vfs.c 2011-02-27 14:50:02.000000000 -0500
28638 +diff -urNp linux-2.6.37.4/fs/nfsd/vfs.c linux-2.6.37.4/fs/nfsd/vfs.c
28639 +--- linux-2.6.37.4/fs/nfsd/vfs.c 2011-02-27 14:49:17.000000000 -0500
28640 ++++ linux-2.6.37.4/fs/nfsd/vfs.c 2011-02-27 14:50:02.000000000 -0500
28641 @@ -916,7 +916,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
28642 } else {
28643 oldfs = get_fs();
28644 @@ -33410,9 +33617,9 @@ diff -urNp linux-2.6.37.3/fs/nfsd/vfs.c linux-2.6.37.3/fs/nfsd/vfs.c
28645 set_fs(oldfs);
28646
28647 if (host_err < 0)
28648 -diff -urNp linux-2.6.37.3/fs/nls/nls_base.c linux-2.6.37.3/fs/nls/nls_base.c
28649 ---- linux-2.6.37.3/fs/nls/nls_base.c 2011-01-04 19:50:19.000000000 -0500
28650 -+++ linux-2.6.37.3/fs/nls/nls_base.c 2011-01-17 02:41:01.000000000 -0500
28651 +diff -urNp linux-2.6.37.4/fs/nls/nls_base.c linux-2.6.37.4/fs/nls/nls_base.c
28652 +--- linux-2.6.37.4/fs/nls/nls_base.c 2011-01-04 19:50:19.000000000 -0500
28653 ++++ linux-2.6.37.4/fs/nls/nls_base.c 2011-01-17 02:41:01.000000000 -0500
28654 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
28655 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
28656 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
28657 @@ -33422,9 +33629,9 @@ diff -urNp linux-2.6.37.3/fs/nls/nls_base.c linux-2.6.37.3/fs/nls/nls_base.c
28658 };
28659
28660 #define UNICODE_MAX 0x0010ffff
28661 -diff -urNp linux-2.6.37.3/fs/ntfs/dir.c linux-2.6.37.3/fs/ntfs/dir.c
28662 ---- linux-2.6.37.3/fs/ntfs/dir.c 2011-01-04 19:50:19.000000000 -0500
28663 -+++ linux-2.6.37.3/fs/ntfs/dir.c 2011-01-17 02:41:01.000000000 -0500
28664 +diff -urNp linux-2.6.37.4/fs/ntfs/dir.c linux-2.6.37.4/fs/ntfs/dir.c
28665 +--- linux-2.6.37.4/fs/ntfs/dir.c 2011-01-04 19:50:19.000000000 -0500
28666 ++++ linux-2.6.37.4/fs/ntfs/dir.c 2011-01-17 02:41:01.000000000 -0500
28667 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
28668 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
28669 ~(s64)(ndir->itype.index.block_size - 1)));
28670 @@ -33434,9 +33641,9 @@ diff -urNp linux-2.6.37.3/fs/ntfs/dir.c linux-2.6.37.3/fs/ntfs/dir.c
28671 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
28672 "inode 0x%lx or driver bug.", vdir->i_ino);
28673 goto err_out;
28674 -diff -urNp linux-2.6.37.3/fs/ntfs/file.c linux-2.6.37.3/fs/ntfs/file.c
28675 ---- linux-2.6.37.3/fs/ntfs/file.c 2011-01-04 19:50:19.000000000 -0500
28676 -+++ linux-2.6.37.3/fs/ntfs/file.c 2011-01-17 02:41:01.000000000 -0500
28677 +diff -urNp linux-2.6.37.4/fs/ntfs/file.c linux-2.6.37.4/fs/ntfs/file.c
28678 +--- linux-2.6.37.4/fs/ntfs/file.c 2011-01-04 19:50:19.000000000 -0500
28679 ++++ linux-2.6.37.4/fs/ntfs/file.c 2011-01-17 02:41:01.000000000 -0500
28680 @@ -2223,6 +2223,6 @@ const struct inode_operations ntfs_file_
28681 #endif /* NTFS_RW */
28682 };
28683 @@ -33446,9 +33653,9 @@ diff -urNp linux-2.6.37.3/fs/ntfs/file.c linux-2.6.37.3/fs/ntfs/file.c
28684
28685 -const struct inode_operations ntfs_empty_inode_ops = {};
28686 +const struct inode_operations ntfs_empty_inode_ops __read_only;
28687 -diff -urNp linux-2.6.37.3/fs/ocfs2/localalloc.c linux-2.6.37.3/fs/ocfs2/localalloc.c
28688 ---- linux-2.6.37.3/fs/ocfs2/localalloc.c 2011-01-04 19:50:19.000000000 -0500
28689 -+++ linux-2.6.37.3/fs/ocfs2/localalloc.c 2011-01-17 02:41:01.000000000 -0500
28690 +diff -urNp linux-2.6.37.4/fs/ocfs2/localalloc.c linux-2.6.37.4/fs/ocfs2/localalloc.c
28691 +--- linux-2.6.37.4/fs/ocfs2/localalloc.c 2011-01-04 19:50:19.000000000 -0500
28692 ++++ linux-2.6.37.4/fs/ocfs2/localalloc.c 2011-01-17 02:41:01.000000000 -0500
28693 @@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
28694 goto bail;
28695 }
28696 @@ -33458,9 +33665,9 @@ diff -urNp linux-2.6.37.3/fs/ocfs2/localalloc.c linux-2.6.37.3/fs/ocfs2/localall
28697
28698 bail:
28699 if (handle)
28700 -diff -urNp linux-2.6.37.3/fs/ocfs2/ocfs2.h linux-2.6.37.3/fs/ocfs2/ocfs2.h
28701 ---- linux-2.6.37.3/fs/ocfs2/ocfs2.h 2011-01-04 19:50:19.000000000 -0500
28702 -+++ linux-2.6.37.3/fs/ocfs2/ocfs2.h 2011-01-17 02:41:01.000000000 -0500
28703 +diff -urNp linux-2.6.37.4/fs/ocfs2/ocfs2.h linux-2.6.37.4/fs/ocfs2/ocfs2.h
28704 +--- linux-2.6.37.4/fs/ocfs2/ocfs2.h 2011-01-04 19:50:19.000000000 -0500
28705 ++++ linux-2.6.37.4/fs/ocfs2/ocfs2.h 2011-01-17 02:41:01.000000000 -0500
28706 @@ -230,11 +230,11 @@ enum ocfs2_vol_state
28707
28708 struct ocfs2_alloc_stats
28709 @@ -33478,9 +33685,9 @@ diff -urNp linux-2.6.37.3/fs/ocfs2/ocfs2.h linux-2.6.37.3/fs/ocfs2/ocfs2.h
28710 };
28711
28712 enum ocfs2_local_alloc_state
28713 -diff -urNp linux-2.6.37.3/fs/ocfs2/suballoc.c linux-2.6.37.3/fs/ocfs2/suballoc.c
28714 ---- linux-2.6.37.3/fs/ocfs2/suballoc.c 2011-01-04 19:50:19.000000000 -0500
28715 -+++ linux-2.6.37.3/fs/ocfs2/suballoc.c 2011-01-17 02:41:01.000000000 -0500
28716 +diff -urNp linux-2.6.37.4/fs/ocfs2/suballoc.c linux-2.6.37.4/fs/ocfs2/suballoc.c
28717 +--- linux-2.6.37.4/fs/ocfs2/suballoc.c 2011-01-04 19:50:19.000000000 -0500
28718 ++++ linux-2.6.37.4/fs/ocfs2/suballoc.c 2011-01-17 02:41:01.000000000 -0500
28719 @@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s
28720 mlog_errno(status);
28721 goto bail;
28722 @@ -33526,9 +33733,9 @@ diff -urNp linux-2.6.37.3/fs/ocfs2/suballoc.c linux-2.6.37.3/fs/ocfs2/suballoc.c
28723 *num_clusters = res.sr_bits;
28724 }
28725 }
28726 -diff -urNp linux-2.6.37.3/fs/ocfs2/super.c linux-2.6.37.3/fs/ocfs2/super.c
28727 ---- linux-2.6.37.3/fs/ocfs2/super.c 2011-03-11 17:22:42.000000000 -0500
28728 -+++ linux-2.6.37.3/fs/ocfs2/super.c 2011-03-11 17:23:03.000000000 -0500
28729 +diff -urNp linux-2.6.37.4/fs/ocfs2/super.c linux-2.6.37.4/fs/ocfs2/super.c
28730 +--- linux-2.6.37.4/fs/ocfs2/super.c 2011-03-11 17:22:42.000000000 -0500
28731 ++++ linux-2.6.37.4/fs/ocfs2/super.c 2011-03-11 17:23:03.000000000 -0500
28732 @@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
28733 "%10s => GlobalAllocs: %d LocalAllocs: %d "
28734 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
28735 @@ -33563,9 +33770,9 @@ diff -urNp linux-2.6.37.3/fs/ocfs2/super.c linux-2.6.37.3/fs/ocfs2/super.c
28736
28737 /* Copy the blockcheck stats from the superblock probe */
28738 osb->osb_ecc_stats = *stats;
28739 -diff -urNp linux-2.6.37.3/fs/ocfs2/symlink.c linux-2.6.37.3/fs/ocfs2/symlink.c
28740 ---- linux-2.6.37.3/fs/ocfs2/symlink.c 2011-01-04 19:50:19.000000000 -0500
28741 -+++ linux-2.6.37.3/fs/ocfs2/symlink.c 2011-01-17 02:41:01.000000000 -0500
28742 +diff -urNp linux-2.6.37.4/fs/ocfs2/symlink.c linux-2.6.37.4/fs/ocfs2/symlink.c
28743 +--- linux-2.6.37.4/fs/ocfs2/symlink.c 2011-01-04 19:50:19.000000000 -0500
28744 ++++ linux-2.6.37.4/fs/ocfs2/symlink.c 2011-01-17 02:41:01.000000000 -0500
28745 @@ -148,7 +148,7 @@ bail:
28746
28747 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
28748 @@ -33575,9 +33782,9 @@ diff -urNp linux-2.6.37.3/fs/ocfs2/symlink.c linux-2.6.37.3/fs/ocfs2/symlink.c
28749 if (!IS_ERR(link))
28750 kfree(link);
28751 }
28752 -diff -urNp linux-2.6.37.3/fs/open.c linux-2.6.37.3/fs/open.c
28753 ---- linux-2.6.37.3/fs/open.c 2011-01-04 19:50:19.000000000 -0500
28754 -+++ linux-2.6.37.3/fs/open.c 2011-01-17 02:49:14.000000000 -0500
28755 +diff -urNp linux-2.6.37.4/fs/open.c linux-2.6.37.4/fs/open.c
28756 +--- linux-2.6.37.4/fs/open.c 2011-01-04 19:50:19.000000000 -0500
28757 ++++ linux-2.6.37.4/fs/open.c 2011-01-17 02:49:14.000000000 -0500
28758 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
28759 error = locks_verify_truncate(inode, NULL, length);
28760 if (!error)
28761 @@ -33715,9 +33922,9 @@ diff -urNp linux-2.6.37.3/fs/open.c linux-2.6.37.3/fs/open.c
28762 if (IS_ERR(f)) {
28763 put_unused_fd(fd);
28764 fd = PTR_ERR(f);
28765 -diff -urNp linux-2.6.37.3/fs/partitions/ldm.c linux-2.6.37.3/fs/partitions/ldm.c
28766 ---- linux-2.6.37.3/fs/partitions/ldm.c 2011-03-11 17:22:42.000000000 -0500
28767 -+++ linux-2.6.37.3/fs/partitions/ldm.c 2011-02-28 17:17:36.000000000 -0500
28768 +diff -urNp linux-2.6.37.4/fs/partitions/ldm.c linux-2.6.37.4/fs/partitions/ldm.c
28769 +--- linux-2.6.37.4/fs/partitions/ldm.c 2011-03-11 17:22:42.000000000 -0500
28770 ++++ linux-2.6.37.4/fs/partitions/ldm.c 2011-02-28 17:17:36.000000000 -0500
28771 @@ -1313,7 +1313,7 @@ static bool ldm_frag_add (const u8 *data
28772 goto found;
28773 }
28774 @@ -33727,9 +33934,9 @@ diff -urNp linux-2.6.37.3/fs/partitions/ldm.c linux-2.6.37.3/fs/partitions/ldm.c
28775 if (!f) {
28776 ldm_crit ("Out of memory.");
28777 return false;
28778 -diff -urNp linux-2.6.37.3/fs/pipe.c linux-2.6.37.3/fs/pipe.c
28779 ---- linux-2.6.37.3/fs/pipe.c 2011-01-04 19:50:19.000000000 -0500
28780 -+++ linux-2.6.37.3/fs/pipe.c 2011-01-17 02:41:01.000000000 -0500
28781 +diff -urNp linux-2.6.37.4/fs/pipe.c linux-2.6.37.4/fs/pipe.c
28782 +--- linux-2.6.37.4/fs/pipe.c 2011-01-04 19:50:19.000000000 -0500
28783 ++++ linux-2.6.37.4/fs/pipe.c 2011-01-17 02:41:01.000000000 -0500
28784 @@ -420,9 +420,9 @@ redo:
28785 }
28786 if (bufs) /* More to do? */
28787 @@ -33853,9 +34060,9 @@ diff -urNp linux-2.6.37.3/fs/pipe.c linux-2.6.37.3/fs/pipe.c
28788 inode->i_fop = &rdwr_pipefifo_fops;
28789
28790 /*
28791 -diff -urNp linux-2.6.37.3/fs/proc/array.c linux-2.6.37.3/fs/proc/array.c
28792 ---- linux-2.6.37.3/fs/proc/array.c 2011-02-27 14:49:17.000000000 -0500
28793 -+++ linux-2.6.37.3/fs/proc/array.c 2011-02-27 14:50:09.000000000 -0500
28794 +diff -urNp linux-2.6.37.4/fs/proc/array.c linux-2.6.37.4/fs/proc/array.c
28795 +--- linux-2.6.37.4/fs/proc/array.c 2011-02-27 14:49:17.000000000 -0500
28796 ++++ linux-2.6.37.4/fs/proc/array.c 2011-02-27 14:50:09.000000000 -0500
28797 @@ -60,6 +60,7 @@
28798 #include <linux/tty.h>
28799 #include <linux/string.h>
28800 @@ -33958,9 +34165,9 @@ diff -urNp linux-2.6.37.3/fs/proc/array.c linux-2.6.37.3/fs/proc/array.c
28801 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
28802 +}
28803 +#endif
28804 -diff -urNp linux-2.6.37.3/fs/proc/base.c linux-2.6.37.3/fs/proc/base.c
28805 ---- linux-2.6.37.3/fs/proc/base.c 2011-01-04 19:50:19.000000000 -0500
28806 -+++ linux-2.6.37.3/fs/proc/base.c 2011-01-17 02:41:01.000000000 -0500
28807 +diff -urNp linux-2.6.37.4/fs/proc/base.c linux-2.6.37.4/fs/proc/base.c
28808 +--- linux-2.6.37.4/fs/proc/base.c 2011-01-04 19:50:19.000000000 -0500
28809 ++++ linux-2.6.37.4/fs/proc/base.c 2011-01-17 02:41:01.000000000 -0500
28810 @@ -104,6 +104,22 @@ struct pid_entry {
28811 union proc_op op;
28812 };
28813 @@ -34335,9 +34542,9 @@ diff -urNp linux-2.6.37.3/fs/proc/base.c linux-2.6.37.3/fs/proc/base.c
28814 ONE("stack", S_IRUSR, proc_pid_stack),
28815 #endif
28816 #ifdef CONFIG_SCHEDSTATS
28817 -diff -urNp linux-2.6.37.3/fs/proc/cmdline.c linux-2.6.37.3/fs/proc/cmdline.c
28818 ---- linux-2.6.37.3/fs/proc/cmdline.c 2011-01-04 19:50:19.000000000 -0500
28819 -+++ linux-2.6.37.3/fs/proc/cmdline.c 2011-01-17 02:41:01.000000000 -0500
28820 +diff -urNp linux-2.6.37.4/fs/proc/cmdline.c linux-2.6.37.4/fs/proc/cmdline.c
28821 +--- linux-2.6.37.4/fs/proc/cmdline.c 2011-01-04 19:50:19.000000000 -0500
28822 ++++ linux-2.6.37.4/fs/proc/cmdline.c 2011-01-17 02:41:01.000000000 -0500
28823 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
28824
28825 static int __init proc_cmdline_init(void)
28826 @@ -34350,9 +34557,9 @@ diff -urNp linux-2.6.37.3/fs/proc/cmdline.c linux-2.6.37.3/fs/proc/cmdline.c
28827 return 0;
28828 }
28829 module_init(proc_cmdline_init);
28830 -diff -urNp linux-2.6.37.3/fs/proc/devices.c linux-2.6.37.3/fs/proc/devices.c
28831 ---- linux-2.6.37.3/fs/proc/devices.c 2011-01-04 19:50:19.000000000 -0500
28832 -+++ linux-2.6.37.3/fs/proc/devices.c 2011-01-17 02:41:01.000000000 -0500
28833 +diff -urNp linux-2.6.37.4/fs/proc/devices.c linux-2.6.37.4/fs/proc/devices.c
28834 +--- linux-2.6.37.4/fs/proc/devices.c 2011-01-04 19:50:19.000000000 -0500
28835 ++++ linux-2.6.37.4/fs/proc/devices.c 2011-01-17 02:41:01.000000000 -0500
28836 @@ -64,7 +64,11 @@ static const struct file_operations proc
28837
28838 static int __init proc_devices_init(void)
28839 @@ -34365,9 +34572,9 @@ diff -urNp linux-2.6.37.3/fs/proc/devices.c linux-2.6.37.3/fs/proc/devices.c
28840 return 0;
28841 }
28842 module_init(proc_devices_init);
28843 -diff -urNp linux-2.6.37.3/fs/proc/inode.c linux-2.6.37.3/fs/proc/inode.c
28844 ---- linux-2.6.37.3/fs/proc/inode.c 2011-01-04 19:50:19.000000000 -0500
28845 -+++ linux-2.6.37.3/fs/proc/inode.c 2011-01-17 02:41:01.000000000 -0500
28846 +diff -urNp linux-2.6.37.4/fs/proc/inode.c linux-2.6.37.4/fs/proc/inode.c
28847 +--- linux-2.6.37.4/fs/proc/inode.c 2011-01-04 19:50:19.000000000 -0500
28848 ++++ linux-2.6.37.4/fs/proc/inode.c 2011-01-17 02:41:01.000000000 -0500
28849 @@ -425,7 +425,11 @@ struct inode *proc_get_inode(struct supe
28850 if (de->mode) {
28851 inode->i_mode = de->mode;
28852 @@ -34380,9 +34587,9 @@ diff -urNp linux-2.6.37.3/fs/proc/inode.c linux-2.6.37.3/fs/proc/inode.c
28853 }
28854 if (de->size)
28855 inode->i_size = de->size;
28856 -diff -urNp linux-2.6.37.3/fs/proc/internal.h linux-2.6.37.3/fs/proc/internal.h
28857 ---- linux-2.6.37.3/fs/proc/internal.h 2011-01-04 19:50:19.000000000 -0500
28858 -+++ linux-2.6.37.3/fs/proc/internal.h 2011-01-17 02:41:01.000000000 -0500
28859 +diff -urNp linux-2.6.37.4/fs/proc/internal.h linux-2.6.37.4/fs/proc/internal.h
28860 +--- linux-2.6.37.4/fs/proc/internal.h 2011-01-04 19:50:19.000000000 -0500
28861 ++++ linux-2.6.37.4/fs/proc/internal.h 2011-01-17 02:41:01.000000000 -0500
28862 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
28863 struct pid *pid, struct task_struct *task);
28864 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
28865 @@ -34393,9 +34600,9 @@ diff -urNp linux-2.6.37.3/fs/proc/internal.h linux-2.6.37.3/fs/proc/internal.h
28866 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
28867
28868 extern const struct file_operations proc_maps_operations;
28869 -diff -urNp linux-2.6.37.3/fs/proc/Kconfig linux-2.6.37.3/fs/proc/Kconfig
28870 ---- linux-2.6.37.3/fs/proc/Kconfig 2011-01-04 19:50:19.000000000 -0500
28871 -+++ linux-2.6.37.3/fs/proc/Kconfig 2011-01-17 02:41:01.000000000 -0500
28872 +diff -urNp linux-2.6.37.4/fs/proc/Kconfig linux-2.6.37.4/fs/proc/Kconfig
28873 +--- linux-2.6.37.4/fs/proc/Kconfig 2011-01-04 19:50:19.000000000 -0500
28874 ++++ linux-2.6.37.4/fs/proc/Kconfig 2011-01-17 02:41:01.000000000 -0500
28875 @@ -30,12 +30,12 @@ config PROC_FS
28876
28877 config PROC_KCORE
28878 @@ -34423,9 +34630,9 @@ diff -urNp linux-2.6.37.3/fs/proc/Kconfig linux-2.6.37.3/fs/proc/Kconfig
28879 bool "Enable /proc page monitoring" if EMBEDDED
28880 help
28881 Various /proc files exist to monitor process memory utilization:
28882 -diff -urNp linux-2.6.37.3/fs/proc/kcore.c linux-2.6.37.3/fs/proc/kcore.c
28883 ---- linux-2.6.37.3/fs/proc/kcore.c 2011-02-22 16:05:31.000000000 -0500
28884 -+++ linux-2.6.37.3/fs/proc/kcore.c 2011-02-22 16:05:42.000000000 -0500
28885 +diff -urNp linux-2.6.37.4/fs/proc/kcore.c linux-2.6.37.4/fs/proc/kcore.c
28886 +--- linux-2.6.37.4/fs/proc/kcore.c 2011-02-22 16:05:31.000000000 -0500
28887 ++++ linux-2.6.37.4/fs/proc/kcore.c 2011-02-22 16:05:42.000000000 -0500
28888 @@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
28889 * the addresses in the elf_phdr on our list.
28890 */
28891 @@ -34484,9 +34691,9 @@ diff -urNp linux-2.6.37.3/fs/proc/kcore.c linux-2.6.37.3/fs/proc/kcore.c
28892 if (!capable(CAP_SYS_RAWIO))
28893 return -EPERM;
28894 if (kcore_need_update)
28895 -diff -urNp linux-2.6.37.3/fs/proc/meminfo.c linux-2.6.37.3/fs/proc/meminfo.c
28896 ---- linux-2.6.37.3/fs/proc/meminfo.c 2011-01-04 19:50:19.000000000 -0500
28897 -+++ linux-2.6.37.3/fs/proc/meminfo.c 2011-01-17 02:41:01.000000000 -0500
28898 +diff -urNp linux-2.6.37.4/fs/proc/meminfo.c linux-2.6.37.4/fs/proc/meminfo.c
28899 +--- linux-2.6.37.4/fs/proc/meminfo.c 2011-01-04 19:50:19.000000000 -0500
28900 ++++ linux-2.6.37.4/fs/proc/meminfo.c 2011-01-17 02:41:01.000000000 -0500
28901 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
28902 vmi.used >> 10,
28903 vmi.largest_chunk >> 10
28904 @@ -34496,9 +34703,9 @@ diff -urNp linux-2.6.37.3/fs/proc/meminfo.c linux-2.6.37.3/fs/proc/meminfo.c
28905 #endif
28906 );
28907
28908 -diff -urNp linux-2.6.37.3/fs/proc/nommu.c linux-2.6.37.3/fs/proc/nommu.c
28909 ---- linux-2.6.37.3/fs/proc/nommu.c 2011-01-04 19:50:19.000000000 -0500
28910 -+++ linux-2.6.37.3/fs/proc/nommu.c 2011-01-17 02:41:01.000000000 -0500
28911 +diff -urNp linux-2.6.37.4/fs/proc/nommu.c linux-2.6.37.4/fs/proc/nommu.c
28912 +--- linux-2.6.37.4/fs/proc/nommu.c 2011-01-04 19:50:19.000000000 -0500
28913 ++++ linux-2.6.37.4/fs/proc/nommu.c 2011-01-17 02:41:01.000000000 -0500
28914 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
28915 if (len < 1)
28916 len = 1;
28917 @@ -34508,9 +34715,9 @@ diff -urNp linux-2.6.37.3/fs/proc/nommu.c linux-2.6.37.3/fs/proc/nommu.c
28918 }
28919
28920 seq_putc(m, '\n');
28921 -diff -urNp linux-2.6.37.3/fs/proc/proc_net.c linux-2.6.37.3/fs/proc/proc_net.c
28922 ---- linux-2.6.37.3/fs/proc/proc_net.c 2011-01-04 19:50:19.000000000 -0500
28923 -+++ linux-2.6.37.3/fs/proc/proc_net.c 2011-01-17 02:41:01.000000000 -0500
28924 +diff -urNp linux-2.6.37.4/fs/proc/proc_net.c linux-2.6.37.4/fs/proc/proc_net.c
28925 +--- linux-2.6.37.4/fs/proc/proc_net.c 2011-01-04 19:50:19.000000000 -0500
28926 ++++ linux-2.6.37.4/fs/proc/proc_net.c 2011-01-17 02:41:01.000000000 -0500
28927 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
28928 struct task_struct *task;
28929 struct nsproxy *ns;
28930 @@ -34529,9 +34736,9 @@ diff -urNp linux-2.6.37.3/fs/proc/proc_net.c linux-2.6.37.3/fs/proc/proc_net.c
28931
28932 rcu_read_lock();
28933 task = pid_task(proc_pid(dir), PIDTYPE_PID);
28934 -diff -urNp linux-2.6.37.3/fs/proc/proc_sysctl.c linux-2.6.37.3/fs/proc/proc_sysctl.c
28935 ---- linux-2.6.37.3/fs/proc/proc_sysctl.c 2011-01-04 19:50:19.000000000 -0500
28936 -+++ linux-2.6.37.3/fs/proc/proc_sysctl.c 2011-01-17 02:41:01.000000000 -0500
28937 +diff -urNp linux-2.6.37.4/fs/proc/proc_sysctl.c linux-2.6.37.4/fs/proc/proc_sysctl.c
28938 +--- linux-2.6.37.4/fs/proc/proc_sysctl.c 2011-01-04 19:50:19.000000000 -0500
28939 ++++ linux-2.6.37.4/fs/proc/proc_sysctl.c 2011-01-17 02:41:01.000000000 -0500
28940 @@ -7,6 +7,8 @@
28941 #include <linux/security.h>
28942 #include "internal.h"
28943 @@ -34571,9 +34778,9 @@ diff -urNp linux-2.6.37.3/fs/proc/proc_sysctl.c linux-2.6.37.3/fs/proc/proc_sysc
28944 generic_fillattr(inode, stat);
28945 if (table)
28946 stat->mode = (stat->mode & S_IFMT) | table->mode;
28947 -diff -urNp linux-2.6.37.3/fs/proc/root.c linux-2.6.37.3/fs/proc/root.c
28948 ---- linux-2.6.37.3/fs/proc/root.c 2011-01-04 19:50:19.000000000 -0500
28949 -+++ linux-2.6.37.3/fs/proc/root.c 2011-01-17 02:41:01.000000000 -0500
28950 +diff -urNp linux-2.6.37.4/fs/proc/root.c linux-2.6.37.4/fs/proc/root.c
28951 +--- linux-2.6.37.4/fs/proc/root.c 2011-01-04 19:50:19.000000000 -0500
28952 ++++ linux-2.6.37.4/fs/proc/root.c 2011-01-17 02:41:01.000000000 -0500
28953 @@ -132,7 +132,15 @@ void __init proc_root_init(void)
28954 #ifdef CONFIG_PROC_DEVICETREE
28955 proc_device_tree_init();
28956 @@ -34590,9 +34797,9 @@ diff -urNp linux-2.6.37.3/fs/proc/root.c linux-2.6.37.3/fs/proc/root.c
28957 proc_sys_init();
28958 }
28959
28960 -diff -urNp linux-2.6.37.3/fs/proc/task_mmu.c linux-2.6.37.3/fs/proc/task_mmu.c
28961 ---- linux-2.6.37.3/fs/proc/task_mmu.c 2011-01-04 19:50:19.000000000 -0500
28962 -+++ linux-2.6.37.3/fs/proc/task_mmu.c 2011-01-17 02:41:01.000000000 -0500
28963 +diff -urNp linux-2.6.37.4/fs/proc/task_mmu.c linux-2.6.37.4/fs/proc/task_mmu.c
28964 +--- linux-2.6.37.4/fs/proc/task_mmu.c 2011-01-04 19:50:19.000000000 -0500
28965 ++++ linux-2.6.37.4/fs/proc/task_mmu.c 2011-01-17 02:41:01.000000000 -0500
28966 @@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
28967 "VmExe:\t%8lu kB\n"
28968 "VmLib:\t%8lu kB\n"
28969 @@ -34732,9 +34939,9 @@ diff -urNp linux-2.6.37.3/fs/proc/task_mmu.c linux-2.6.37.3/fs/proc/task_mmu.c
28970 mss.resident >> 10,
28971 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
28972 mss.shared_clean >> 10,
28973 -diff -urNp linux-2.6.37.3/fs/proc/task_nommu.c linux-2.6.37.3/fs/proc/task_nommu.c
28974 ---- linux-2.6.37.3/fs/proc/task_nommu.c 2011-01-04 19:50:19.000000000 -0500
28975 -+++ linux-2.6.37.3/fs/proc/task_nommu.c 2011-01-17 02:41:01.000000000 -0500
28976 +diff -urNp linux-2.6.37.4/fs/proc/task_nommu.c linux-2.6.37.4/fs/proc/task_nommu.c
28977 +--- linux-2.6.37.4/fs/proc/task_nommu.c 2011-01-04 19:50:19.000000000 -0500
28978 ++++ linux-2.6.37.4/fs/proc/task_nommu.c 2011-01-17 02:41:01.000000000 -0500
28979 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
28980 else
28981 bytes += kobjsize(mm);
28982 @@ -34753,9 +34960,9 @@ diff -urNp linux-2.6.37.3/fs/proc/task_nommu.c linux-2.6.37.3/fs/proc/task_nommu
28983 } else if (mm) {
28984 if (vma->vm_start <= mm->start_stack &&
28985 vma->vm_end >= mm->start_stack) {
28986 -diff -urNp linux-2.6.37.3/fs/readdir.c linux-2.6.37.3/fs/readdir.c
28987 ---- linux-2.6.37.3/fs/readdir.c 2011-01-04 19:50:19.000000000 -0500
28988 -+++ linux-2.6.37.3/fs/readdir.c 2011-01-17 02:41:01.000000000 -0500
28989 +diff -urNp linux-2.6.37.4/fs/readdir.c linux-2.6.37.4/fs/readdir.c
28990 +--- linux-2.6.37.4/fs/readdir.c 2011-01-04 19:50:19.000000000 -0500
28991 ++++ linux-2.6.37.4/fs/readdir.c 2011-01-17 02:41:01.000000000 -0500
28992 @@ -17,6 +17,7 @@
28993 #include <linux/security.h>
28994 #include <linux/syscalls.h>
28995 @@ -34845,9 +35052,9 @@ diff -urNp linux-2.6.37.3/fs/readdir.c linux-2.6.37.3/fs/readdir.c
28996 buf.count = count;
28997 buf.error = 0;
28998
28999 -diff -urNp linux-2.6.37.3/fs/reiserfs/do_balan.c linux-2.6.37.3/fs/reiserfs/do_balan.c
29000 ---- linux-2.6.37.3/fs/reiserfs/do_balan.c 2011-01-04 19:50:19.000000000 -0500
29001 -+++ linux-2.6.37.3/fs/reiserfs/do_balan.c 2011-01-17 02:41:02.000000000 -0500
29002 +diff -urNp linux-2.6.37.4/fs/reiserfs/do_balan.c linux-2.6.37.4/fs/reiserfs/do_balan.c
29003 +--- linux-2.6.37.4/fs/reiserfs/do_balan.c 2011-01-04 19:50:19.000000000 -0500
29004 ++++ linux-2.6.37.4/fs/reiserfs/do_balan.c 2011-01-17 02:41:02.000000000 -0500
29005 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
29006 return;
29007 }
29008 @@ -34857,9 +35064,9 @@ diff -urNp linux-2.6.37.3/fs/reiserfs/do_balan.c linux-2.6.37.3/fs/reiserfs/do_b
29009 do_balance_starts(tb);
29010
29011 /* balance leaf returns 0 except if combining L R and S into
29012 -diff -urNp linux-2.6.37.3/fs/reiserfs/item_ops.c linux-2.6.37.3/fs/reiserfs/item_ops.c
29013 ---- linux-2.6.37.3/fs/reiserfs/item_ops.c 2011-01-04 19:50:19.000000000 -0500
29014 -+++ linux-2.6.37.3/fs/reiserfs/item_ops.c 2011-01-17 02:41:02.000000000 -0500
29015 +diff -urNp linux-2.6.37.4/fs/reiserfs/item_ops.c linux-2.6.37.4/fs/reiserfs/item_ops.c
29016 +--- linux-2.6.37.4/fs/reiserfs/item_ops.c 2011-01-04 19:50:19.000000000 -0500
29017 ++++ linux-2.6.37.4/fs/reiserfs/item_ops.c 2011-01-17 02:41:02.000000000 -0500
29018 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
29019 vi->vi_index, vi->vi_type, vi->vi_ih);
29020 }
29021 @@ -34914,9 +35121,9 @@ diff -urNp linux-2.6.37.3/fs/reiserfs/item_ops.c linux-2.6.37.3/fs/reiserfs/item
29022 &stat_data_ops,
29023 &indirect_ops,
29024 &direct_ops,
29025 -diff -urNp linux-2.6.37.3/fs/reiserfs/procfs.c linux-2.6.37.3/fs/reiserfs/procfs.c
29026 ---- linux-2.6.37.3/fs/reiserfs/procfs.c 2011-01-04 19:50:19.000000000 -0500
29027 -+++ linux-2.6.37.3/fs/reiserfs/procfs.c 2011-01-17 02:41:02.000000000 -0500
29028 +diff -urNp linux-2.6.37.4/fs/reiserfs/procfs.c linux-2.6.37.4/fs/reiserfs/procfs.c
29029 +--- linux-2.6.37.4/fs/reiserfs/procfs.c 2011-01-04 19:50:19.000000000 -0500
29030 ++++ linux-2.6.37.4/fs/reiserfs/procfs.c 2011-01-17 02:41:02.000000000 -0500
29031 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
29032 "SMALL_TAILS " : "NO_TAILS ",
29033 replay_only(sb) ? "REPLAY_ONLY " : "",
29034 @@ -34926,9 +35133,9 @@ diff -urNp linux-2.6.37.3/fs/reiserfs/procfs.c linux-2.6.37.3/fs/reiserfs/procfs
29035 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
29036 SF(s_do_balance), SF(s_unneeded_left_neighbor),
29037 SF(s_good_search_by_key_reada), SF(s_bmaps),
29038 -diff -urNp linux-2.6.37.3/fs/select.c linux-2.6.37.3/fs/select.c
29039 ---- linux-2.6.37.3/fs/select.c 2011-01-04 19:50:19.000000000 -0500
29040 -+++ linux-2.6.37.3/fs/select.c 2011-01-17 02:41:02.000000000 -0500
29041 +diff -urNp linux-2.6.37.4/fs/select.c linux-2.6.37.4/fs/select.c
29042 +--- linux-2.6.37.4/fs/select.c 2011-01-04 19:50:19.000000000 -0500
29043 ++++ linux-2.6.37.4/fs/select.c 2011-01-17 02:41:02.000000000 -0500
29044 @@ -20,6 +20,7 @@
29045 #include <linux/module.h>
29046 #include <linux/slab.h>
29047 @@ -34945,9 +35152,9 @@ diff -urNp linux-2.6.37.3/fs/select.c linux-2.6.37.3/fs/select.c
29048 if (nfds > rlimit(RLIMIT_NOFILE))
29049 return -EINVAL;
29050
29051 -diff -urNp linux-2.6.37.3/fs/seq_file.c linux-2.6.37.3/fs/seq_file.c
29052 ---- linux-2.6.37.3/fs/seq_file.c 2011-01-04 19:50:19.000000000 -0500
29053 -+++ linux-2.6.37.3/fs/seq_file.c 2011-01-17 02:41:02.000000000 -0500
29054 +diff -urNp linux-2.6.37.4/fs/seq_file.c linux-2.6.37.4/fs/seq_file.c
29055 +--- linux-2.6.37.4/fs/seq_file.c 2011-01-04 19:50:19.000000000 -0500
29056 ++++ linux-2.6.37.4/fs/seq_file.c 2011-01-17 02:41:02.000000000 -0500
29057 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
29058 return 0;
29059 }
29060 @@ -34988,9 +35195,9 @@ diff -urNp linux-2.6.37.3/fs/seq_file.c linux-2.6.37.3/fs/seq_file.c
29061 if (!m->buf)
29062 goto Enomem;
29063 m->count = 0;
29064 -diff -urNp linux-2.6.37.3/fs/splice.c linux-2.6.37.3/fs/splice.c
29065 ---- linux-2.6.37.3/fs/splice.c 2011-01-04 19:50:19.000000000 -0500
29066 -+++ linux-2.6.37.3/fs/splice.c 2011-01-17 02:41:02.000000000 -0500
29067 +diff -urNp linux-2.6.37.4/fs/splice.c linux-2.6.37.4/fs/splice.c
29068 +--- linux-2.6.37.4/fs/splice.c 2011-01-04 19:50:19.000000000 -0500
29069 ++++ linux-2.6.37.4/fs/splice.c 2011-01-17 02:41:02.000000000 -0500
29070 @@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
29071 pipe_lock(pipe);
29072
29073 @@ -35129,9 +35336,9 @@ diff -urNp linux-2.6.37.3/fs/splice.c linux-2.6.37.3/fs/splice.c
29074 ret = -EAGAIN;
29075
29076 pipe_unlock(ipipe);
29077 -diff -urNp linux-2.6.37.3/fs/sysfs/mount.c linux-2.6.37.3/fs/sysfs/mount.c
29078 ---- linux-2.6.37.3/fs/sysfs/mount.c 2011-01-04 19:50:19.000000000 -0500
29079 -+++ linux-2.6.37.3/fs/sysfs/mount.c 2011-03-11 18:56:40.000000000 -0500
29080 +diff -urNp linux-2.6.37.4/fs/sysfs/mount.c linux-2.6.37.4/fs/sysfs/mount.c
29081 +--- linux-2.6.37.4/fs/sysfs/mount.c 2011-01-04 19:50:19.000000000 -0500
29082 ++++ linux-2.6.37.4/fs/sysfs/mount.c 2011-03-11 18:56:40.000000000 -0500
29083 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
29084 .s_name = "",
29085 .s_count = ATOMIC_INIT(1),
29086 @@ -35144,9 +35351,9 @@ diff -urNp linux-2.6.37.3/fs/sysfs/mount.c linux-2.6.37.3/fs/sysfs/mount.c
29087 .s_ino = 1,
29088 };
29089
29090 -diff -urNp linux-2.6.37.3/fs/sysfs/symlink.c linux-2.6.37.3/fs/sysfs/symlink.c
29091 ---- linux-2.6.37.3/fs/sysfs/symlink.c 2011-01-04 19:50:19.000000000 -0500
29092 -+++ linux-2.6.37.3/fs/sysfs/symlink.c 2011-01-17 02:41:02.000000000 -0500
29093 +diff -urNp linux-2.6.37.4/fs/sysfs/symlink.c linux-2.6.37.4/fs/sysfs/symlink.c
29094 +--- linux-2.6.37.4/fs/sysfs/symlink.c 2011-01-04 19:50:19.000000000 -0500
29095 ++++ linux-2.6.37.4/fs/sysfs/symlink.c 2011-01-17 02:41:02.000000000 -0500
29096 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
29097
29098 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
29099 @@ -35156,9 +35363,9 @@ diff -urNp linux-2.6.37.3/fs/sysfs/symlink.c linux-2.6.37.3/fs/sysfs/symlink.c
29100 if (!IS_ERR(page))
29101 free_page((unsigned long)page);
29102 }
29103 -diff -urNp linux-2.6.37.3/fs/ubifs/debug.c linux-2.6.37.3/fs/ubifs/debug.c
29104 ---- linux-2.6.37.3/fs/ubifs/debug.c 2011-01-04 19:50:19.000000000 -0500
29105 -+++ linux-2.6.37.3/fs/ubifs/debug.c 2011-02-27 15:31:52.000000000 -0500
29106 +diff -urNp linux-2.6.37.4/fs/ubifs/debug.c linux-2.6.37.4/fs/ubifs/debug.c
29107 +--- linux-2.6.37.4/fs/ubifs/debug.c 2011-01-04 19:50:19.000000000 -0500
29108 ++++ linux-2.6.37.4/fs/ubifs/debug.c 2011-02-27 15:31:52.000000000 -0500
29109 @@ -2813,19 +2813,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf
29110 }
29111
29112 @@ -35182,9 +35389,9 @@ diff -urNp linux-2.6.37.3/fs/ubifs/debug.c linux-2.6.37.3/fs/ubifs/debug.c
29113 if (IS_ERR(dent))
29114 goto out_remove;
29115 d->dfs_dump_tnc = dent;
29116 -diff -urNp linux-2.6.37.3/fs/udf/misc.c linux-2.6.37.3/fs/udf/misc.c
29117 ---- linux-2.6.37.3/fs/udf/misc.c 2011-01-04 19:50:19.000000000 -0500
29118 -+++ linux-2.6.37.3/fs/udf/misc.c 2011-01-17 02:41:02.000000000 -0500
29119 +diff -urNp linux-2.6.37.4/fs/udf/misc.c linux-2.6.37.4/fs/udf/misc.c
29120 +--- linux-2.6.37.4/fs/udf/misc.c 2011-01-04 19:50:19.000000000 -0500
29121 ++++ linux-2.6.37.4/fs/udf/misc.c 2011-01-17 02:41:02.000000000 -0500
29122 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
29123 iinfo->i_lenEAttr += size;
29124 return (struct genericFormat *)&ea[offset];
29125 @@ -35205,9 +35412,9 @@ diff -urNp linux-2.6.37.3/fs/udf/misc.c linux-2.6.37.3/fs/udf/misc.c
29126 u8 checksum = 0;
29127 int i;
29128 for (i = 0; i < sizeof(struct tag); ++i)
29129 -diff -urNp linux-2.6.37.3/fs/udf/udfdecl.h linux-2.6.37.3/fs/udf/udfdecl.h
29130 ---- linux-2.6.37.3/fs/udf/udfdecl.h 2011-01-04 19:50:19.000000000 -0500
29131 -+++ linux-2.6.37.3/fs/udf/udfdecl.h 2011-01-17 02:41:02.000000000 -0500
29132 +diff -urNp linux-2.6.37.4/fs/udf/udfdecl.h linux-2.6.37.4/fs/udf/udfdecl.h
29133 +--- linux-2.6.37.4/fs/udf/udfdecl.h 2011-01-04 19:50:19.000000000 -0500
29134 ++++ linux-2.6.37.4/fs/udf/udfdecl.h 2011-01-17 02:41:02.000000000 -0500
29135 @@ -26,7 +26,7 @@ do { \
29136 printk(f, ##a); \
29137 } while (0)
29138 @@ -35217,9 +35424,9 @@ diff -urNp linux-2.6.37.3/fs/udf/udfdecl.h linux-2.6.37.3/fs/udf/udfdecl.h
29139 #endif
29140
29141 #define udf_info(f, a...) \
29142 -diff -urNp linux-2.6.37.3/fs/utimes.c linux-2.6.37.3/fs/utimes.c
29143 ---- linux-2.6.37.3/fs/utimes.c 2011-01-04 19:50:19.000000000 -0500
29144 -+++ linux-2.6.37.3/fs/utimes.c 2011-01-17 02:41:02.000000000 -0500
29145 +diff -urNp linux-2.6.37.4/fs/utimes.c linux-2.6.37.4/fs/utimes.c
29146 +--- linux-2.6.37.4/fs/utimes.c 2011-01-04 19:50:19.000000000 -0500
29147 ++++ linux-2.6.37.4/fs/utimes.c 2011-01-17 02:41:02.000000000 -0500
29148 @@ -1,6 +1,7 @@
29149 #include <linux/compiler.h>
29150 #include <linux/file.h>
29151 @@ -35241,9 +35448,9 @@ diff -urNp linux-2.6.37.3/fs/utimes.c linux-2.6.37.3/fs/utimes.c
29152 mutex_lock(&inode->i_mutex);
29153 error = notify_change(path->dentry, &newattrs);
29154 mutex_unlock(&inode->i_mutex);
29155 -diff -urNp linux-2.6.37.3/fs/xattr_acl.c linux-2.6.37.3/fs/xattr_acl.c
29156 ---- linux-2.6.37.3/fs/xattr_acl.c 2011-01-04 19:50:19.000000000 -0500
29157 -+++ linux-2.6.37.3/fs/xattr_acl.c 2011-01-17 02:41:02.000000000 -0500
29158 +diff -urNp linux-2.6.37.4/fs/xattr_acl.c linux-2.6.37.4/fs/xattr_acl.c
29159 +--- linux-2.6.37.4/fs/xattr_acl.c 2011-01-04 19:50:19.000000000 -0500
29160 ++++ linux-2.6.37.4/fs/xattr_acl.c 2011-01-17 02:41:02.000000000 -0500
29161 @@ -17,8 +17,8 @@
29162 struct posix_acl *
29163 posix_acl_from_xattr(const void *value, size_t size)
29164 @@ -35255,9 +35462,9 @@ diff -urNp linux-2.6.37.3/fs/xattr_acl.c linux-2.6.37.3/fs/xattr_acl.c
29165 int count;
29166 struct posix_acl *acl;
29167 struct posix_acl_entry *acl_e;
29168 -diff -urNp linux-2.6.37.3/fs/xattr.c linux-2.6.37.3/fs/xattr.c
29169 ---- linux-2.6.37.3/fs/xattr.c 2011-01-04 19:50:19.000000000 -0500
29170 -+++ linux-2.6.37.3/fs/xattr.c 2011-01-17 02:41:02.000000000 -0500
29171 +diff -urNp linux-2.6.37.4/fs/xattr.c linux-2.6.37.4/fs/xattr.c
29172 +--- linux-2.6.37.4/fs/xattr.c 2011-01-04 19:50:19.000000000 -0500
29173 ++++ linux-2.6.37.4/fs/xattr.c 2011-01-17 02:41:02.000000000 -0500
29174 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
29175 * Extended attribute SET operations
29176 */
29177 @@ -35320,9 +35527,9 @@ diff -urNp linux-2.6.37.3/fs/xattr.c linux-2.6.37.3/fs/xattr.c
29178 mnt_drop_write(f->f_path.mnt);
29179 }
29180 fput(f);
29181 -diff -urNp linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl32.c
29182 ---- linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-01-04 19:50:19.000000000 -0500
29183 -+++ linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:13:59.000000000 -0500
29184 +diff -urNp linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl32.c
29185 +--- linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-01-04 19:50:19.000000000 -0500
29186 ++++ linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:13:59.000000000 -0500
29187 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
29188 xfs_fsop_geom_t fsgeo;
29189 int error;
29190 @@ -35331,9 +35538,9 @@ diff -urNp linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.37.3/fs/xfs/l
29191 error = xfs_fs_geometry(mp, &fsgeo, 3);
29192 if (error)
29193 return -error;
29194 -diff -urNp linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl.c
29195 ---- linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-01-04 19:50:19.000000000 -0500
29196 -+++ linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:14:17.000000000 -0500
29197 +diff -urNp linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl.c
29198 +--- linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-01-04 19:50:19.000000000 -0500
29199 ++++ linux-2.6.37.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:14:17.000000000 -0500
29200 @@ -127,7 +127,7 @@ xfs_find_handle(
29201 }
29202
29203 @@ -35359,9 +35566,9 @@ diff -urNp linux-2.6.37.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37.3/fs/xfs/lin
29204 error = xfs_fs_geometry(mp, &fsgeo, 4);
29205 if (error)
29206 return -error;
29207 -diff -urNp linux-2.6.37.3/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37.3/fs/xfs/linux-2.6/xfs_iops.c
29208 ---- linux-2.6.37.3/fs/xfs/linux-2.6/xfs_iops.c 2011-01-04 19:50:19.000000000 -0500
29209 -+++ linux-2.6.37.3/fs/xfs/linux-2.6/xfs_iops.c 2011-01-17 02:41:02.000000000 -0500
29210 +diff -urNp linux-2.6.37.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37.4/fs/xfs/linux-2.6/xfs_iops.c
29211 +--- linux-2.6.37.4/fs/xfs/linux-2.6/xfs_iops.c 2011-01-04 19:50:19.000000000 -0500
29212 ++++ linux-2.6.37.4/fs/xfs/linux-2.6/xfs_iops.c 2011-01-17 02:41:02.000000000 -0500
29213 @@ -437,7 +437,7 @@ xfs_vn_put_link(
29214 struct nameidata *nd,
29215 void *p)
29216 @@ -35371,9 +35578,9 @@ diff -urNp linux-2.6.37.3/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37.3/fs/xfs/linu
29217
29218 if (!IS_ERR(s))
29219 kfree(s);
29220 -diff -urNp linux-2.6.37.3/fs/xfs/xfs_bmap.c linux-2.6.37.3/fs/xfs/xfs_bmap.c
29221 ---- linux-2.6.37.3/fs/xfs/xfs_bmap.c 2011-01-04 19:50:19.000000000 -0500
29222 -+++ linux-2.6.37.3/fs/xfs/xfs_bmap.c 2011-01-17 02:41:02.000000000 -0500
29223 +diff -urNp linux-2.6.37.4/fs/xfs/xfs_bmap.c linux-2.6.37.4/fs/xfs/xfs_bmap.c
29224 +--- linux-2.6.37.4/fs/xfs/xfs_bmap.c 2011-01-04 19:50:19.000000000 -0500
29225 ++++ linux-2.6.37.4/fs/xfs/xfs_bmap.c 2011-01-17 02:41:02.000000000 -0500
29226 @@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
29227 int nmap,
29228 int ret_nmap);
29229 @@ -35383,9 +35590,9 @@ diff -urNp linux-2.6.37.3/fs/xfs/xfs_bmap.c linux-2.6.37.3/fs/xfs/xfs_bmap.c
29230 #endif /* DEBUG */
29231
29232 STATIC int
29233 -diff -urNp linux-2.6.37.3/grsecurity/gracl_alloc.c linux-2.6.37.3/grsecurity/gracl_alloc.c
29234 ---- linux-2.6.37.3/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
29235 -+++ linux-2.6.37.3/grsecurity/gracl_alloc.c 2011-01-17 02:41:02.000000000 -0500
29236 +diff -urNp linux-2.6.37.4/grsecurity/gracl_alloc.c linux-2.6.37.4/grsecurity/gracl_alloc.c
29237 +--- linux-2.6.37.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
29238 ++++ linux-2.6.37.4/grsecurity/gracl_alloc.c 2011-01-17 02:41:02.000000000 -0500
29239 @@ -0,0 +1,105 @@
29240 +#include <linux/kernel.h>
29241 +#include <linux/mm.h>
29242 @@ -35492,10 +35699,10 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_alloc.c linux-2.6.37.3/grsecurity/gra
29243 + else
29244 + return 1;
29245 +}
29246 -diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29247 ---- linux-2.6.37.3/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
29248 -+++ linux-2.6.37.3/grsecurity/gracl.c 2011-01-17 20:20:28.000000000 -0500
29249 -@@ -0,0 +1,3991 @@
29250 +diff -urNp linux-2.6.37.4/grsecurity/gracl.c linux-2.6.37.4/grsecurity/gracl.c
29251 +--- linux-2.6.37.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
29252 ++++ linux-2.6.37.4/grsecurity/gracl.c 2011-03-18 17:54:56.000000000 -0400
29253 +@@ -0,0 +1,3995 @@
29254 +#include <linux/kernel.h>
29255 +#include <linux/module.h>
29256 +#include <linux/sched.h>
29257 @@ -36296,6 +36503,10 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29258 + /* grab reference for the real root dentry and vfsmount */
29259 + get_fs_root(reaper->fs, &real_root);
29260 +
29261 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
29262 ++ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", real_root.dentry->d_inode->i_sb->s_dev, real_root.dentry->d_inode->i_ino);
29263 ++#endif
29264 ++
29265 + fakefs_obj = acl_alloc(sizeof(struct acl_object_label));
29266 + if (fakefs_obj == NULL)
29267 + return 1;
29268 @@ -36931,7 +37142,7 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29269 + goto cleanup;
29270 + }
29271 + tmp[len-1] = '\0';
29272 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
29273 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
29274 + printk(KERN_ALERT "Copying special role %s\n", tmp);
29275 +#endif
29276 + sptmp->rolename = tmp;
29277 @@ -37896,7 +38107,7 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29278 + if (unlikely(obj->mode & GR_WRITE))
29279 + task->is_writable = 1;
29280 +
29281 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
29282 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
29283 + printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
29284 +#endif
29285 +
29286 @@ -37959,7 +38170,7 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29287 +
29288 + gr_set_proc_res(task);
29289 +
29290 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
29291 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
29292 + printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
29293 +#endif
29294 + return 0;
29295 @@ -38340,7 +38551,7 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29296 + if (unlikely(obj->mode & GR_WRITE))
29297 + tsk->is_writable = 1;
29298 +
29299 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
29300 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
29301 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
29302 +#endif
29303 +
29304 @@ -38742,7 +38953,7 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29305 +
29306 + gr_set_proc_res(task);
29307 +
29308 -+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
29309 ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
29310 + printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
29311 +#endif
29312 + } else {
29313 @@ -39487,9 +39698,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl.c linux-2.6.37.3/grsecurity/gracl.c
29314 +EXPORT_SYMBOL(gr_check_group_change);
29315 +#endif
29316 +
29317 -diff -urNp linux-2.6.37.3/grsecurity/gracl_cap.c linux-2.6.37.3/grsecurity/gracl_cap.c
29318 ---- linux-2.6.37.3/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
29319 -+++ linux-2.6.37.3/grsecurity/gracl_cap.c 2011-01-17 02:41:02.000000000 -0500
29320 +diff -urNp linux-2.6.37.4/grsecurity/gracl_cap.c linux-2.6.37.4/grsecurity/gracl_cap.c
29321 +--- linux-2.6.37.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
29322 ++++ linux-2.6.37.4/grsecurity/gracl_cap.c 2011-01-17 02:41:02.000000000 -0500
29323 @@ -0,0 +1,138 @@
29324 +#include <linux/kernel.h>
29325 +#include <linux/module.h>
29326 @@ -39629,9 +39840,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_cap.c linux-2.6.37.3/grsecurity/gracl
29327 + return 0;
29328 +}
29329 +
29330 -diff -urNp linux-2.6.37.3/grsecurity/gracl_fs.c linux-2.6.37.3/grsecurity/gracl_fs.c
29331 ---- linux-2.6.37.3/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
29332 -+++ linux-2.6.37.3/grsecurity/gracl_fs.c 2011-01-17 02:41:02.000000000 -0500
29333 +diff -urNp linux-2.6.37.4/grsecurity/gracl_fs.c linux-2.6.37.4/grsecurity/gracl_fs.c
29334 +--- linux-2.6.37.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
29335 ++++ linux-2.6.37.4/grsecurity/gracl_fs.c 2011-01-17 02:41:02.000000000 -0500
29336 @@ -0,0 +1,430 @@
29337 +#include <linux/kernel.h>
29338 +#include <linux/sched.h>
29339 @@ -40063,9 +40274,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_fs.c linux-2.6.37.3/grsecurity/gracl_
29340 +
29341 + return 0;
29342 +}
29343 -diff -urNp linux-2.6.37.3/grsecurity/gracl_ip.c linux-2.6.37.3/grsecurity/gracl_ip.c
29344 ---- linux-2.6.37.3/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
29345 -+++ linux-2.6.37.3/grsecurity/gracl_ip.c 2011-02-15 19:42:06.000000000 -0500
29346 +diff -urNp linux-2.6.37.4/grsecurity/gracl_ip.c linux-2.6.37.4/grsecurity/gracl_ip.c
29347 +--- linux-2.6.37.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
29348 ++++ linux-2.6.37.4/grsecurity/gracl_ip.c 2011-02-15 19:42:06.000000000 -0500
29349 @@ -0,0 +1,382 @@
29350 +#include <linux/kernel.h>
29351 +#include <asm/uaccess.h>
29352 @@ -40449,9 +40660,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_ip.c linux-2.6.37.3/grsecurity/gracl_
29353 +
29354 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
29355 +}
29356 -diff -urNp linux-2.6.37.3/grsecurity/gracl_learn.c linux-2.6.37.3/grsecurity/gracl_learn.c
29357 ---- linux-2.6.37.3/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
29358 -+++ linux-2.6.37.3/grsecurity/gracl_learn.c 2011-01-17 02:41:02.000000000 -0500
29359 +diff -urNp linux-2.6.37.4/grsecurity/gracl_learn.c linux-2.6.37.4/grsecurity/gracl_learn.c
29360 +--- linux-2.6.37.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
29361 ++++ linux-2.6.37.4/grsecurity/gracl_learn.c 2011-01-17 02:41:02.000000000 -0500
29362 @@ -0,0 +1,211 @@
29363 +#include <linux/kernel.h>
29364 +#include <linux/mm.h>
29365 @@ -40664,9 +40875,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_learn.c linux-2.6.37.3/grsecurity/gra
29366 + .release = close_learn,
29367 + .poll = poll_learn,
29368 +};
29369 -diff -urNp linux-2.6.37.3/grsecurity/gracl_res.c linux-2.6.37.3/grsecurity/gracl_res.c
29370 ---- linux-2.6.37.3/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
29371 -+++ linux-2.6.37.3/grsecurity/gracl_res.c 2011-01-17 02:41:02.000000000 -0500
29372 +diff -urNp linux-2.6.37.4/grsecurity/gracl_res.c linux-2.6.37.4/grsecurity/gracl_res.c
29373 +--- linux-2.6.37.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
29374 ++++ linux-2.6.37.4/grsecurity/gracl_res.c 2011-01-17 02:41:02.000000000 -0500
29375 @@ -0,0 +1,68 @@
29376 +#include <linux/kernel.h>
29377 +#include <linux/sched.h>
29378 @@ -40736,9 +40947,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_res.c linux-2.6.37.3/grsecurity/gracl
29379 + rcu_read_unlock();
29380 + return;
29381 +}
29382 -diff -urNp linux-2.6.37.3/grsecurity/gracl_segv.c linux-2.6.37.3/grsecurity/gracl_segv.c
29383 ---- linux-2.6.37.3/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
29384 -+++ linux-2.6.37.3/grsecurity/gracl_segv.c 2011-01-17 02:41:02.000000000 -0500
29385 +diff -urNp linux-2.6.37.4/grsecurity/gracl_segv.c linux-2.6.37.4/grsecurity/gracl_segv.c
29386 +--- linux-2.6.37.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
29387 ++++ linux-2.6.37.4/grsecurity/gracl_segv.c 2011-01-17 02:41:02.000000000 -0500
29388 @@ -0,0 +1,310 @@
29389 +#include <linux/kernel.h>
29390 +#include <linux/mm.h>
29391 @@ -41050,9 +41261,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_segv.c linux-2.6.37.3/grsecurity/grac
29392 +
29393 + return;
29394 +}
29395 -diff -urNp linux-2.6.37.3/grsecurity/gracl_shm.c linux-2.6.37.3/grsecurity/gracl_shm.c
29396 ---- linux-2.6.37.3/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
29397 -+++ linux-2.6.37.3/grsecurity/gracl_shm.c 2011-01-17 02:41:02.000000000 -0500
29398 +diff -urNp linux-2.6.37.4/grsecurity/gracl_shm.c linux-2.6.37.4/grsecurity/gracl_shm.c
29399 +--- linux-2.6.37.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
29400 ++++ linux-2.6.37.4/grsecurity/gracl_shm.c 2011-01-17 02:41:02.000000000 -0500
29401 @@ -0,0 +1,40 @@
29402 +#include <linux/kernel.h>
29403 +#include <linux/mm.h>
29404 @@ -41094,9 +41305,9 @@ diff -urNp linux-2.6.37.3/grsecurity/gracl_shm.c linux-2.6.37.3/grsecurity/gracl
29405 +
29406 + return 1;
29407 +}
29408 -diff -urNp linux-2.6.37.3/grsecurity/grsec_chdir.c linux-2.6.37.3/grsecurity/grsec_chdir.c
29409 ---- linux-2.6.37.3/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
29410 -+++ linux-2.6.37.3/grsecurity/grsec_chdir.c 2011-01-17 02:41:02.000000000 -0500
29411 +diff -urNp linux-2.6.37.4/grsecurity/grsec_chdir.c linux-2.6.37.4/grsecurity/grsec_chdir.c
29412 +--- linux-2.6.37.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
29413 ++++ linux-2.6.37.4/grsecurity/grsec_chdir.c 2011-01-17 02:41:02.000000000 -0500
29414 @@ -0,0 +1,19 @@
29415 +#include <linux/kernel.h>
29416 +#include <linux/sched.h>
29417 @@ -41117,9 +41328,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_chdir.c linux-2.6.37.3/grsecurity/grs
29418 +#endif
29419 + return;
29420 +}
29421 -diff -urNp linux-2.6.37.3/grsecurity/grsec_chroot.c linux-2.6.37.3/grsecurity/grsec_chroot.c
29422 ---- linux-2.6.37.3/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
29423 -+++ linux-2.6.37.3/grsecurity/grsec_chroot.c 2011-01-17 02:41:02.000000000 -0500
29424 +diff -urNp linux-2.6.37.4/grsecurity/grsec_chroot.c linux-2.6.37.4/grsecurity/grsec_chroot.c
29425 +--- linux-2.6.37.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
29426 ++++ linux-2.6.37.4/grsecurity/grsec_chroot.c 2011-01-17 02:41:02.000000000 -0500
29427 @@ -0,0 +1,373 @@
29428 +#include <linux/kernel.h>
29429 +#include <linux/module.h>
29430 @@ -41494,9 +41705,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_chroot.c linux-2.6.37.3/grsecurity/gr
29431 +#ifdef CONFIG_SECURITY
29432 +EXPORT_SYMBOL(gr_handle_chroot_caps);
29433 +#endif
29434 -diff -urNp linux-2.6.37.3/grsecurity/grsec_disabled.c linux-2.6.37.3/grsecurity/grsec_disabled.c
29435 ---- linux-2.6.37.3/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
29436 -+++ linux-2.6.37.3/grsecurity/grsec_disabled.c 2011-01-17 02:41:02.000000000 -0500
29437 +diff -urNp linux-2.6.37.4/grsecurity/grsec_disabled.c linux-2.6.37.4/grsecurity/grsec_disabled.c
29438 +--- linux-2.6.37.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
29439 ++++ linux-2.6.37.4/grsecurity/grsec_disabled.c 2011-01-17 02:41:02.000000000 -0500
29440 @@ -0,0 +1,442 @@
29441 +#include <linux/kernel.h>
29442 +#include <linux/module.h>
29443 @@ -41940,9 +42151,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_disabled.c linux-2.6.37.3/grsecurity/
29444 +EXPORT_SYMBOL(gr_check_user_change);
29445 +EXPORT_SYMBOL(gr_check_group_change);
29446 +#endif
29447 -diff -urNp linux-2.6.37.3/grsecurity/grsec_exec.c linux-2.6.37.3/grsecurity/grsec_exec.c
29448 ---- linux-2.6.37.3/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
29449 -+++ linux-2.6.37.3/grsecurity/grsec_exec.c 2011-01-17 02:41:02.000000000 -0500
29450 +diff -urNp linux-2.6.37.4/grsecurity/grsec_exec.c linux-2.6.37.4/grsecurity/grsec_exec.c
29451 +--- linux-2.6.37.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
29452 ++++ linux-2.6.37.4/grsecurity/grsec_exec.c 2011-01-17 02:41:02.000000000 -0500
29453 @@ -0,0 +1,147 @@
29454 +#include <linux/kernel.h>
29455 +#include <linux/sched.h>
29456 @@ -42091,9 +42302,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_exec.c linux-2.6.37.3/grsecurity/grse
29457 + return;
29458 +}
29459 +#endif
29460 -diff -urNp linux-2.6.37.3/grsecurity/grsec_fifo.c linux-2.6.37.3/grsecurity/grsec_fifo.c
29461 ---- linux-2.6.37.3/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
29462 -+++ linux-2.6.37.3/grsecurity/grsec_fifo.c 2011-01-17 02:41:02.000000000 -0500
29463 +diff -urNp linux-2.6.37.4/grsecurity/grsec_fifo.c linux-2.6.37.4/grsecurity/grsec_fifo.c
29464 +--- linux-2.6.37.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
29465 ++++ linux-2.6.37.4/grsecurity/grsec_fifo.c 2011-01-17 02:41:02.000000000 -0500
29466 @@ -0,0 +1,24 @@
29467 +#include <linux/kernel.h>
29468 +#include <linux/sched.h>
29469 @@ -42119,9 +42330,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_fifo.c linux-2.6.37.3/grsecurity/grse
29470 +#endif
29471 + return 0;
29472 +}
29473 -diff -urNp linux-2.6.37.3/grsecurity/grsec_fork.c linux-2.6.37.3/grsecurity/grsec_fork.c
29474 ---- linux-2.6.37.3/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
29475 -+++ linux-2.6.37.3/grsecurity/grsec_fork.c 2011-01-17 02:41:02.000000000 -0500
29476 +diff -urNp linux-2.6.37.4/grsecurity/grsec_fork.c linux-2.6.37.4/grsecurity/grsec_fork.c
29477 +--- linux-2.6.37.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
29478 ++++ linux-2.6.37.4/grsecurity/grsec_fork.c 2011-01-17 02:41:02.000000000 -0500
29479 @@ -0,0 +1,23 @@
29480 +#include <linux/kernel.h>
29481 +#include <linux/sched.h>
29482 @@ -42146,9 +42357,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_fork.c linux-2.6.37.3/grsecurity/grse
29483 +#endif
29484 + return;
29485 +}
29486 -diff -urNp linux-2.6.37.3/grsecurity/grsec_init.c linux-2.6.37.3/grsecurity/grsec_init.c
29487 ---- linux-2.6.37.3/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
29488 -+++ linux-2.6.37.3/grsecurity/grsec_init.c 2011-01-17 02:41:02.000000000 -0500
29489 +diff -urNp linux-2.6.37.4/grsecurity/grsec_init.c linux-2.6.37.4/grsecurity/grsec_init.c
29490 +--- linux-2.6.37.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
29491 ++++ linux-2.6.37.4/grsecurity/grsec_init.c 2011-01-17 02:41:02.000000000 -0500
29492 @@ -0,0 +1,270 @@
29493 +#include <linux/kernel.h>
29494 +#include <linux/sched.h>
29495 @@ -42420,9 +42631,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_init.c linux-2.6.37.3/grsecurity/grse
29496 +
29497 + return;
29498 +}
29499 -diff -urNp linux-2.6.37.3/grsecurity/grsec_link.c linux-2.6.37.3/grsecurity/grsec_link.c
29500 ---- linux-2.6.37.3/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
29501 -+++ linux-2.6.37.3/grsecurity/grsec_link.c 2011-01-17 02:41:02.000000000 -0500
29502 +diff -urNp linux-2.6.37.4/grsecurity/grsec_link.c linux-2.6.37.4/grsecurity/grsec_link.c
29503 +--- linux-2.6.37.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
29504 ++++ linux-2.6.37.4/grsecurity/grsec_link.c 2011-01-17 02:41:02.000000000 -0500
29505 @@ -0,0 +1,43 @@
29506 +#include <linux/kernel.h>
29507 +#include <linux/sched.h>
29508 @@ -42467,9 +42678,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_link.c linux-2.6.37.3/grsecurity/grse
29509 +#endif
29510 + return 0;
29511 +}
29512 -diff -urNp linux-2.6.37.3/grsecurity/grsec_log.c linux-2.6.37.3/grsecurity/grsec_log.c
29513 ---- linux-2.6.37.3/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
29514 -+++ linux-2.6.37.3/grsecurity/grsec_log.c 2011-01-17 02:41:02.000000000 -0500
29515 +diff -urNp linux-2.6.37.4/grsecurity/grsec_log.c linux-2.6.37.4/grsecurity/grsec_log.c
29516 +--- linux-2.6.37.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
29517 ++++ linux-2.6.37.4/grsecurity/grsec_log.c 2011-01-17 02:41:02.000000000 -0500
29518 @@ -0,0 +1,310 @@
29519 +#include <linux/kernel.h>
29520 +#include <linux/sched.h>
29521 @@ -42781,9 +42992,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_log.c linux-2.6.37.3/grsecurity/grsec
29522 + gr_log_end(audit);
29523 + END_LOCKS(audit);
29524 +}
29525 -diff -urNp linux-2.6.37.3/grsecurity/grsec_mem.c linux-2.6.37.3/grsecurity/grsec_mem.c
29526 ---- linux-2.6.37.3/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
29527 -+++ linux-2.6.37.3/grsecurity/grsec_mem.c 2011-01-17 02:41:02.000000000 -0500
29528 +diff -urNp linux-2.6.37.4/grsecurity/grsec_mem.c linux-2.6.37.4/grsecurity/grsec_mem.c
29529 +--- linux-2.6.37.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
29530 ++++ linux-2.6.37.4/grsecurity/grsec_mem.c 2011-01-17 02:41:02.000000000 -0500
29531 @@ -0,0 +1,85 @@
29532 +#include <linux/kernel.h>
29533 +#include <linux/sched.h>
29534 @@ -42870,9 +43081,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_mem.c linux-2.6.37.3/grsecurity/grsec
29535 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
29536 + return;
29537 +}
29538 -diff -urNp linux-2.6.37.3/grsecurity/grsec_mount.c linux-2.6.37.3/grsecurity/grsec_mount.c
29539 ---- linux-2.6.37.3/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
29540 -+++ linux-2.6.37.3/grsecurity/grsec_mount.c 2011-01-17 02:41:02.000000000 -0500
29541 +diff -urNp linux-2.6.37.4/grsecurity/grsec_mount.c linux-2.6.37.4/grsecurity/grsec_mount.c
29542 +--- linux-2.6.37.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
29543 ++++ linux-2.6.37.4/grsecurity/grsec_mount.c 2011-01-17 02:41:02.000000000 -0500
29544 @@ -0,0 +1,62 @@
29545 +#include <linux/kernel.h>
29546 +#include <linux/sched.h>
29547 @@ -42936,9 +43147,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_mount.c linux-2.6.37.3/grsecurity/grs
29548 +#endif
29549 + return 0;
29550 +}
29551 -diff -urNp linux-2.6.37.3/grsecurity/grsec_pax.c linux-2.6.37.3/grsecurity/grsec_pax.c
29552 ---- linux-2.6.37.3/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
29553 -+++ linux-2.6.37.3/grsecurity/grsec_pax.c 2011-01-17 02:41:02.000000000 -0500
29554 +diff -urNp linux-2.6.37.4/grsecurity/grsec_pax.c linux-2.6.37.4/grsecurity/grsec_pax.c
29555 +--- linux-2.6.37.4/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
29556 ++++ linux-2.6.37.4/grsecurity/grsec_pax.c 2011-01-17 02:41:02.000000000 -0500
29557 @@ -0,0 +1,36 @@
29558 +#include <linux/kernel.h>
29559 +#include <linux/sched.h>
29560 @@ -42976,9 +43187,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_pax.c linux-2.6.37.3/grsecurity/grsec
29561 +#endif
29562 + return;
29563 +}
29564 -diff -urNp linux-2.6.37.3/grsecurity/grsec_ptrace.c linux-2.6.37.3/grsecurity/grsec_ptrace.c
29565 ---- linux-2.6.37.3/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
29566 -+++ linux-2.6.37.3/grsecurity/grsec_ptrace.c 2011-01-17 02:41:02.000000000 -0500
29567 +diff -urNp linux-2.6.37.4/grsecurity/grsec_ptrace.c linux-2.6.37.4/grsecurity/grsec_ptrace.c
29568 +--- linux-2.6.37.4/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
29569 ++++ linux-2.6.37.4/grsecurity/grsec_ptrace.c 2011-01-17 02:41:02.000000000 -0500
29570 @@ -0,0 +1,14 @@
29571 +#include <linux/kernel.h>
29572 +#include <linux/sched.h>
29573 @@ -42994,9 +43205,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_ptrace.c linux-2.6.37.3/grsecurity/gr
29574 +#endif
29575 + return;
29576 +}
29577 -diff -urNp linux-2.6.37.3/grsecurity/grsec_sig.c linux-2.6.37.3/grsecurity/grsec_sig.c
29578 ---- linux-2.6.37.3/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
29579 -+++ linux-2.6.37.3/grsecurity/grsec_sig.c 2011-01-17 02:41:02.000000000 -0500
29580 +diff -urNp linux-2.6.37.4/grsecurity/grsec_sig.c linux-2.6.37.4/grsecurity/grsec_sig.c
29581 +--- linux-2.6.37.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
29582 ++++ linux-2.6.37.4/grsecurity/grsec_sig.c 2011-01-17 02:41:02.000000000 -0500
29583 @@ -0,0 +1,65 @@
29584 +#include <linux/kernel.h>
29585 +#include <linux/sched.h>
29586 @@ -43063,9 +43274,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_sig.c linux-2.6.37.3/grsecurity/grsec
29587 + return;
29588 +}
29589 +
29590 -diff -urNp linux-2.6.37.3/grsecurity/grsec_sock.c linux-2.6.37.3/grsecurity/grsec_sock.c
29591 ---- linux-2.6.37.3/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
29592 -+++ linux-2.6.37.3/grsecurity/grsec_sock.c 2011-01-17 02:41:02.000000000 -0500
29593 +diff -urNp linux-2.6.37.4/grsecurity/grsec_sock.c linux-2.6.37.4/grsecurity/grsec_sock.c
29594 +--- linux-2.6.37.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
29595 ++++ linux-2.6.37.4/grsecurity/grsec_sock.c 2011-01-17 02:41:02.000000000 -0500
29596 @@ -0,0 +1,275 @@
29597 +#include <linux/kernel.h>
29598 +#include <linux/module.h>
29599 @@ -43342,9 +43553,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_sock.c linux-2.6.37.3/grsecurity/grse
29600 + return current_cap();
29601 +#endif
29602 +}
29603 -diff -urNp linux-2.6.37.3/grsecurity/grsec_sysctl.c linux-2.6.37.3/grsecurity/grsec_sysctl.c
29604 ---- linux-2.6.37.3/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
29605 -+++ linux-2.6.37.3/grsecurity/grsec_sysctl.c 2011-01-17 02:41:02.000000000 -0500
29606 +diff -urNp linux-2.6.37.4/grsecurity/grsec_sysctl.c linux-2.6.37.4/grsecurity/grsec_sysctl.c
29607 +--- linux-2.6.37.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
29608 ++++ linux-2.6.37.4/grsecurity/grsec_sysctl.c 2011-01-17 02:41:02.000000000 -0500
29609 @@ -0,0 +1,433 @@
29610 +#include <linux/kernel.h>
29611 +#include <linux/sched.h>
29612 @@ -43779,9 +43990,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_sysctl.c linux-2.6.37.3/grsecurity/gr
29613 + { }
29614 +};
29615 +#endif
29616 -diff -urNp linux-2.6.37.3/grsecurity/grsec_time.c linux-2.6.37.3/grsecurity/grsec_time.c
29617 ---- linux-2.6.37.3/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
29618 -+++ linux-2.6.37.3/grsecurity/grsec_time.c 2011-01-17 02:41:02.000000000 -0500
29619 +diff -urNp linux-2.6.37.4/grsecurity/grsec_time.c linux-2.6.37.4/grsecurity/grsec_time.c
29620 +--- linux-2.6.37.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
29621 ++++ linux-2.6.37.4/grsecurity/grsec_time.c 2011-01-17 02:41:02.000000000 -0500
29622 @@ -0,0 +1,16 @@
29623 +#include <linux/kernel.h>
29624 +#include <linux/sched.h>
29625 @@ -43799,9 +44010,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_time.c linux-2.6.37.3/grsecurity/grse
29626 +}
29627 +
29628 +EXPORT_SYMBOL(gr_log_timechange);
29629 -diff -urNp linux-2.6.37.3/grsecurity/grsec_tpe.c linux-2.6.37.3/grsecurity/grsec_tpe.c
29630 ---- linux-2.6.37.3/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
29631 -+++ linux-2.6.37.3/grsecurity/grsec_tpe.c 2011-01-17 02:41:02.000000000 -0500
29632 +diff -urNp linux-2.6.37.4/grsecurity/grsec_tpe.c linux-2.6.37.4/grsecurity/grsec_tpe.c
29633 +--- linux-2.6.37.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
29634 ++++ linux-2.6.37.4/grsecurity/grsec_tpe.c 2011-01-17 02:41:02.000000000 -0500
29635 @@ -0,0 +1,39 @@
29636 +#include <linux/kernel.h>
29637 +#include <linux/sched.h>
29638 @@ -43842,9 +44053,9 @@ diff -urNp linux-2.6.37.3/grsecurity/grsec_tpe.c linux-2.6.37.3/grsecurity/grsec
29639 +#endif
29640 + return 1;
29641 +}
29642 -diff -urNp linux-2.6.37.3/grsecurity/grsum.c linux-2.6.37.3/grsecurity/grsum.c
29643 ---- linux-2.6.37.3/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
29644 -+++ linux-2.6.37.3/grsecurity/grsum.c 2011-01-17 02:41:02.000000000 -0500
29645 +diff -urNp linux-2.6.37.4/grsecurity/grsum.c linux-2.6.37.4/grsecurity/grsum.c
29646 +--- linux-2.6.37.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
29647 ++++ linux-2.6.37.4/grsecurity/grsum.c 2011-01-17 02:41:02.000000000 -0500
29648 @@ -0,0 +1,61 @@
29649 +#include <linux/err.h>
29650 +#include <linux/kernel.h>
29651 @@ -43907,10 +44118,10 @@ diff -urNp linux-2.6.37.3/grsecurity/grsum.c linux-2.6.37.3/grsecurity/grsum.c
29652 +
29653 + return retval;
29654 +}
29655 -diff -urNp linux-2.6.37.3/grsecurity/Kconfig linux-2.6.37.3/grsecurity/Kconfig
29656 ---- linux-2.6.37.3/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
29657 -+++ linux-2.6.37.3/grsecurity/Kconfig 2011-03-11 19:17:02.000000000 -0500
29658 -@@ -0,0 +1,1017 @@
29659 +diff -urNp linux-2.6.37.4/grsecurity/Kconfig linux-2.6.37.4/grsecurity/Kconfig
29660 +--- linux-2.6.37.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
29661 ++++ linux-2.6.37.4/grsecurity/Kconfig 2011-03-21 17:10:07.000000000 -0400
29662 +@@ -0,0 +1,1021 @@
29663 +#
29664 +# grecurity configuration
29665 +#
29666 @@ -44247,6 +44458,10 @@ diff -urNp linux-2.6.37.3/grsecurity/Kconfig linux-2.6.37.3/grsecurity/Kconfig
29667 +menu "Role Based Access Control Options"
29668 +depends on GRKERNSEC
29669 +
29670 ++config GRKERNSEC_RBAC_DEBUG
29671 ++ bool
29672 ++ default n
29673 ++
29674 +config GRKERNSEC_NO_RBAC
29675 + bool "Disable RBAC system"
29676 + help
29677 @@ -44928,9 +45143,9 @@ diff -urNp linux-2.6.37.3/grsecurity/Kconfig linux-2.6.37.3/grsecurity/Kconfig
29678 +endmenu
29679 +
29680 +endmenu
29681 -diff -urNp linux-2.6.37.3/grsecurity/Makefile linux-2.6.37.3/grsecurity/Makefile
29682 ---- linux-2.6.37.3/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
29683 -+++ linux-2.6.37.3/grsecurity/Makefile 2011-01-17 02:41:02.000000000 -0500
29684 +diff -urNp linux-2.6.37.4/grsecurity/Makefile linux-2.6.37.4/grsecurity/Makefile
29685 +--- linux-2.6.37.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
29686 ++++ linux-2.6.37.4/grsecurity/Makefile 2011-01-17 02:41:02.000000000 -0500
29687 @@ -0,0 +1,29 @@
29688 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
29689 +# during 2001-2009 it has been completely redesigned by Brad Spengler
29690 @@ -44961,9 +45176,9 @@ diff -urNp linux-2.6.37.3/grsecurity/Makefile linux-2.6.37.3/grsecurity/Makefile
29691 + @-chmod -f 700 .
29692 + @echo ' grsec: protected kernel image paths'
29693 +endif
29694 -diff -urNp linux-2.6.37.3/include/acpi/acoutput.h linux-2.6.37.3/include/acpi/acoutput.h
29695 ---- linux-2.6.37.3/include/acpi/acoutput.h 2011-01-04 19:50:19.000000000 -0500
29696 -+++ linux-2.6.37.3/include/acpi/acoutput.h 2011-01-17 02:41:02.000000000 -0500
29697 +diff -urNp linux-2.6.37.4/include/acpi/acoutput.h linux-2.6.37.4/include/acpi/acoutput.h
29698 +--- linux-2.6.37.4/include/acpi/acoutput.h 2011-01-04 19:50:19.000000000 -0500
29699 ++++ linux-2.6.37.4/include/acpi/acoutput.h 2011-01-17 02:41:02.000000000 -0500
29700 @@ -269,8 +269,8 @@
29701 * leaving no executable debug code!
29702 */
29703 @@ -44975,9 +45190,9 @@ diff -urNp linux-2.6.37.3/include/acpi/acoutput.h linux-2.6.37.3/include/acpi/ac
29704
29705 #endif /* ACPI_DEBUG_OUTPUT */
29706
29707 -diff -urNp linux-2.6.37.3/include/acpi/acpi_drivers.h linux-2.6.37.3/include/acpi/acpi_drivers.h
29708 ---- linux-2.6.37.3/include/acpi/acpi_drivers.h 2011-01-04 19:50:19.000000000 -0500
29709 -+++ linux-2.6.37.3/include/acpi/acpi_drivers.h 2011-01-17 02:41:02.000000000 -0500
29710 +diff -urNp linux-2.6.37.4/include/acpi/acpi_drivers.h linux-2.6.37.4/include/acpi/acpi_drivers.h
29711 +--- linux-2.6.37.4/include/acpi/acpi_drivers.h 2011-01-04 19:50:19.000000000 -0500
29712 ++++ linux-2.6.37.4/include/acpi/acpi_drivers.h 2011-01-17 02:41:02.000000000 -0500
29713 @@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void);
29714 Dock Station
29715 -------------------------------------------------------------------------- */
29716 @@ -45007,9 +45222,9 @@ diff -urNp linux-2.6.37.3/include/acpi/acpi_drivers.h linux-2.6.37.3/include/acp
29717 void *context)
29718 {
29719 return -ENODEV;
29720 -diff -urNp linux-2.6.37.3/include/asm-generic/atomic-long.h linux-2.6.37.3/include/asm-generic/atomic-long.h
29721 ---- linux-2.6.37.3/include/asm-generic/atomic-long.h 2011-01-04 19:50:19.000000000 -0500
29722 -+++ linux-2.6.37.3/include/asm-generic/atomic-long.h 2011-01-17 02:41:02.000000000 -0500
29723 +diff -urNp linux-2.6.37.4/include/asm-generic/atomic-long.h linux-2.6.37.4/include/asm-generic/atomic-long.h
29724 +--- linux-2.6.37.4/include/asm-generic/atomic-long.h 2011-01-04 19:50:19.000000000 -0500
29725 ++++ linux-2.6.37.4/include/asm-generic/atomic-long.h 2011-01-17 02:41:02.000000000 -0500
29726 @@ -22,6 +22,12 @@
29727
29728 typedef atomic64_t atomic_long_t;
29729 @@ -45302,9 +45517,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/atomic-long.h linux-2.6.37.3/inclu
29730 +#endif
29731 +
29732 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
29733 -diff -urNp linux-2.6.37.3/include/asm-generic/dma-mapping-common.h linux-2.6.37.3/include/asm-generic/dma-mapping-common.h
29734 ---- linux-2.6.37.3/include/asm-generic/dma-mapping-common.h 2011-01-04 19:50:19.000000000 -0500
29735 -+++ linux-2.6.37.3/include/asm-generic/dma-mapping-common.h 2011-01-17 02:41:02.000000000 -0500
29736 +diff -urNp linux-2.6.37.4/include/asm-generic/dma-mapping-common.h linux-2.6.37.4/include/asm-generic/dma-mapping-common.h
29737 +--- linux-2.6.37.4/include/asm-generic/dma-mapping-common.h 2011-01-04 19:50:19.000000000 -0500
29738 ++++ linux-2.6.37.4/include/asm-generic/dma-mapping-common.h 2011-01-17 02:41:02.000000000 -0500
29739 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
29740 enum dma_data_direction dir,
29741 struct dma_attrs *attrs)
29742 @@ -45395,9 +45610,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/dma-mapping-common.h linux-2.6.37.
29743
29744 BUG_ON(!valid_dma_direction(dir));
29745 if (ops->sync_sg_for_device)
29746 -diff -urNp linux-2.6.37.3/include/asm-generic/futex.h linux-2.6.37.3/include/asm-generic/futex.h
29747 ---- linux-2.6.37.3/include/asm-generic/futex.h 2011-01-04 19:50:19.000000000 -0500
29748 -+++ linux-2.6.37.3/include/asm-generic/futex.h 2011-01-17 02:41:02.000000000 -0500
29749 +diff -urNp linux-2.6.37.4/include/asm-generic/futex.h linux-2.6.37.4/include/asm-generic/futex.h
29750 +--- linux-2.6.37.4/include/asm-generic/futex.h 2011-01-04 19:50:19.000000000 -0500
29751 ++++ linux-2.6.37.4/include/asm-generic/futex.h 2011-01-17 02:41:02.000000000 -0500
29752 @@ -6,7 +6,7 @@
29753 #include <asm/errno.h>
29754
29755 @@ -45416,9 +45631,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/futex.h linux-2.6.37.3/include/asm
29756 {
29757 return -ENOSYS;
29758 }
29759 -diff -urNp linux-2.6.37.3/include/asm-generic/int-l64.h linux-2.6.37.3/include/asm-generic/int-l64.h
29760 ---- linux-2.6.37.3/include/asm-generic/int-l64.h 2011-01-04 19:50:19.000000000 -0500
29761 -+++ linux-2.6.37.3/include/asm-generic/int-l64.h 2011-01-17 02:41:02.000000000 -0500
29762 +diff -urNp linux-2.6.37.4/include/asm-generic/int-l64.h linux-2.6.37.4/include/asm-generic/int-l64.h
29763 +--- linux-2.6.37.4/include/asm-generic/int-l64.h 2011-01-04 19:50:19.000000000 -0500
29764 ++++ linux-2.6.37.4/include/asm-generic/int-l64.h 2011-01-17 02:41:02.000000000 -0500
29765 @@ -46,6 +46,8 @@ typedef unsigned int u32;
29766 typedef signed long s64;
29767 typedef unsigned long u64;
29768 @@ -45428,9 +45643,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/int-l64.h linux-2.6.37.3/include/a
29769 #define S8_C(x) x
29770 #define U8_C(x) x ## U
29771 #define S16_C(x) x
29772 -diff -urNp linux-2.6.37.3/include/asm-generic/int-ll64.h linux-2.6.37.3/include/asm-generic/int-ll64.h
29773 ---- linux-2.6.37.3/include/asm-generic/int-ll64.h 2011-01-04 19:50:19.000000000 -0500
29774 -+++ linux-2.6.37.3/include/asm-generic/int-ll64.h 2011-01-17 02:41:02.000000000 -0500
29775 +diff -urNp linux-2.6.37.4/include/asm-generic/int-ll64.h linux-2.6.37.4/include/asm-generic/int-ll64.h
29776 +--- linux-2.6.37.4/include/asm-generic/int-ll64.h 2011-01-04 19:50:19.000000000 -0500
29777 ++++ linux-2.6.37.4/include/asm-generic/int-ll64.h 2011-01-17 02:41:02.000000000 -0500
29778 @@ -51,6 +51,8 @@ typedef unsigned int u32;
29779 typedef signed long long s64;
29780 typedef unsigned long long u64;
29781 @@ -45440,9 +45655,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/int-ll64.h linux-2.6.37.3/include/
29782 #define S8_C(x) x
29783 #define U8_C(x) x ## U
29784 #define S16_C(x) x
29785 -diff -urNp linux-2.6.37.3/include/asm-generic/kmap_types.h linux-2.6.37.3/include/asm-generic/kmap_types.h
29786 ---- linux-2.6.37.3/include/asm-generic/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
29787 -+++ linux-2.6.37.3/include/asm-generic/kmap_types.h 2011-01-17 02:41:02.000000000 -0500
29788 +diff -urNp linux-2.6.37.4/include/asm-generic/kmap_types.h linux-2.6.37.4/include/asm-generic/kmap_types.h
29789 +--- linux-2.6.37.4/include/asm-generic/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
29790 ++++ linux-2.6.37.4/include/asm-generic/kmap_types.h 2011-01-17 02:41:02.000000000 -0500
29791 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
29792 KMAP_D(17) KM_NMI,
29793 KMAP_D(18) KM_NMI_PTE,
29794 @@ -45456,9 +45671,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/kmap_types.h linux-2.6.37.3/includ
29795 };
29796
29797 #undef KMAP_D
29798 -diff -urNp linux-2.6.37.3/include/asm-generic/pgtable.h linux-2.6.37.3/include/asm-generic/pgtable.h
29799 ---- linux-2.6.37.3/include/asm-generic/pgtable.h 2011-01-04 19:50:19.000000000 -0500
29800 -+++ linux-2.6.37.3/include/asm-generic/pgtable.h 2011-01-17 02:41:02.000000000 -0500
29801 +diff -urNp linux-2.6.37.4/include/asm-generic/pgtable.h linux-2.6.37.4/include/asm-generic/pgtable.h
29802 +--- linux-2.6.37.4/include/asm-generic/pgtable.h 2011-01-04 19:50:19.000000000 -0500
29803 ++++ linux-2.6.37.4/include/asm-generic/pgtable.h 2011-01-17 02:41:02.000000000 -0500
29804 @@ -348,6 +348,14 @@ extern void untrack_pfn_vma(struct vm_ar
29805 unsigned long size);
29806 #endif
29807 @@ -45474,9 +45689,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/pgtable.h linux-2.6.37.3/include/a
29808 #endif /* !__ASSEMBLY__ */
29809
29810 #endif /* _ASM_GENERIC_PGTABLE_H */
29811 -diff -urNp linux-2.6.37.3/include/asm-generic/pgtable-nopmd.h linux-2.6.37.3/include/asm-generic/pgtable-nopmd.h
29812 ---- linux-2.6.37.3/include/asm-generic/pgtable-nopmd.h 2011-01-04 19:50:19.000000000 -0500
29813 -+++ linux-2.6.37.3/include/asm-generic/pgtable-nopmd.h 2011-01-17 02:41:02.000000000 -0500
29814 +diff -urNp linux-2.6.37.4/include/asm-generic/pgtable-nopmd.h linux-2.6.37.4/include/asm-generic/pgtable-nopmd.h
29815 +--- linux-2.6.37.4/include/asm-generic/pgtable-nopmd.h 2011-01-04 19:50:19.000000000 -0500
29816 ++++ linux-2.6.37.4/include/asm-generic/pgtable-nopmd.h 2011-01-17 02:41:02.000000000 -0500
29817 @@ -1,14 +1,19 @@
29818 #ifndef _PGTABLE_NOPMD_H
29819 #define _PGTABLE_NOPMD_H
29820 @@ -45513,9 +45728,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/pgtable-nopmd.h linux-2.6.37.3/inc
29821 /*
29822 * The "pud_xxx()" functions here are trivial for a folded two-level
29823 * setup: the pmd is never bad, and a pmd always exists (as it's folded
29824 -diff -urNp linux-2.6.37.3/include/asm-generic/pgtable-nopud.h linux-2.6.37.3/include/asm-generic/pgtable-nopud.h
29825 ---- linux-2.6.37.3/include/asm-generic/pgtable-nopud.h 2011-01-04 19:50:19.000000000 -0500
29826 -+++ linux-2.6.37.3/include/asm-generic/pgtable-nopud.h 2011-01-17 02:41:02.000000000 -0500
29827 +diff -urNp linux-2.6.37.4/include/asm-generic/pgtable-nopud.h linux-2.6.37.4/include/asm-generic/pgtable-nopud.h
29828 +--- linux-2.6.37.4/include/asm-generic/pgtable-nopud.h 2011-01-04 19:50:19.000000000 -0500
29829 ++++ linux-2.6.37.4/include/asm-generic/pgtable-nopud.h 2011-01-17 02:41:02.000000000 -0500
29830 @@ -1,10 +1,15 @@
29831 #ifndef _PGTABLE_NOPUD_H
29832 #define _PGTABLE_NOPUD_H
29833 @@ -45546,9 +45761,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/pgtable-nopud.h linux-2.6.37.3/inc
29834 /*
29835 * The "pgd_xxx()" functions here are trivial for a folded two-level
29836 * setup: the pud is never bad, and a pud always exists (as it's folded
29837 -diff -urNp linux-2.6.37.3/include/asm-generic/vmlinux.lds.h linux-2.6.37.3/include/asm-generic/vmlinux.lds.h
29838 ---- linux-2.6.37.3/include/asm-generic/vmlinux.lds.h 2011-01-04 19:50:19.000000000 -0500
29839 -+++ linux-2.6.37.3/include/asm-generic/vmlinux.lds.h 2011-01-17 02:41:02.000000000 -0500
29840 +diff -urNp linux-2.6.37.4/include/asm-generic/vmlinux.lds.h linux-2.6.37.4/include/asm-generic/vmlinux.lds.h
29841 +--- linux-2.6.37.4/include/asm-generic/vmlinux.lds.h 2011-01-04 19:50:19.000000000 -0500
29842 ++++ linux-2.6.37.4/include/asm-generic/vmlinux.lds.h 2011-01-17 02:41:02.000000000 -0500
29843 @@ -210,6 +210,7 @@
29844 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
29845 VMLINUX_SYMBOL(__start_rodata) = .; \
29846 @@ -45585,9 +45800,9 @@ diff -urNp linux-2.6.37.3/include/asm-generic/vmlinux.lds.h linux-2.6.37.3/inclu
29847
29848 /**
29849 * PERCPU - define output section for percpu area, simple version
29850 -diff -urNp linux-2.6.37.3/include/drm/drm_pciids.h linux-2.6.37.3/include/drm/drm_pciids.h
29851 ---- linux-2.6.37.3/include/drm/drm_pciids.h 2011-02-22 16:05:31.000000000 -0500
29852 -+++ linux-2.6.37.3/include/drm/drm_pciids.h 2011-02-22 16:05:42.000000000 -0500
29853 +diff -urNp linux-2.6.37.4/include/drm/drm_pciids.h linux-2.6.37.4/include/drm/drm_pciids.h
29854 +--- linux-2.6.37.4/include/drm/drm_pciids.h 2011-02-22 16:05:31.000000000 -0500
29855 ++++ linux-2.6.37.4/include/drm/drm_pciids.h 2011-02-22 16:05:42.000000000 -0500
29856 @@ -418,7 +418,7 @@
29857 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
29858 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
29859 @@ -45691,9 +45906,9 @@ diff -urNp linux-2.6.37.3/include/drm/drm_pciids.h linux-2.6.37.3/include/drm/dr
29860 {0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
29861 - {0, 0, 0}
29862 + {0, 0, 0, 0, 0, 0}
29863 -diff -urNp linux-2.6.37.3/include/drm/drmP.h linux-2.6.37.3/include/drm/drmP.h
29864 ---- linux-2.6.37.3/include/drm/drmP.h 2011-03-11 17:22:42.000000000 -0500
29865 -+++ linux-2.6.37.3/include/drm/drmP.h 2011-03-11 17:23:06.000000000 -0500
29866 +diff -urNp linux-2.6.37.4/include/drm/drmP.h linux-2.6.37.4/include/drm/drmP.h
29867 +--- linux-2.6.37.4/include/drm/drmP.h 2011-03-11 17:22:42.000000000 -0500
29868 ++++ linux-2.6.37.4/include/drm/drmP.h 2011-03-11 17:23:06.000000000 -0500
29869 @@ -73,6 +73,7 @@
29870 #include <linux/workqueue.h>
29871 #include <linux/poll.h>
29872 @@ -45747,9 +45962,9 @@ diff -urNp linux-2.6.37.3/include/drm/drmP.h linux-2.6.37.3/include/drm/drmP.h
29873 void *dev_private; /**< device private data */
29874 void *mm_private;
29875 struct address_space *dev_mapping;
29876 -diff -urNp linux-2.6.37.3/include/linux/a.out.h linux-2.6.37.3/include/linux/a.out.h
29877 ---- linux-2.6.37.3/include/linux/a.out.h 2011-01-04 19:50:19.000000000 -0500
29878 -+++ linux-2.6.37.3/include/linux/a.out.h 2011-01-17 02:41:02.000000000 -0500
29879 +diff -urNp linux-2.6.37.4/include/linux/a.out.h linux-2.6.37.4/include/linux/a.out.h
29880 +--- linux-2.6.37.4/include/linux/a.out.h 2011-01-04 19:50:19.000000000 -0500
29881 ++++ linux-2.6.37.4/include/linux/a.out.h 2011-01-17 02:41:02.000000000 -0500
29882 @@ -39,6 +39,14 @@ enum machine_type {
29883 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
29884 };
29885 @@ -45765,9 +45980,9 @@ diff -urNp linux-2.6.37.3/include/linux/a.out.h linux-2.6.37.3/include/linux/a.o
29886 #if !defined (N_MAGIC)
29887 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
29888 #endif
29889 -diff -urNp linux-2.6.37.3/include/linux/atmdev.h linux-2.6.37.3/include/linux/atmdev.h
29890 ---- linux-2.6.37.3/include/linux/atmdev.h 2011-01-04 19:50:19.000000000 -0500
29891 -+++ linux-2.6.37.3/include/linux/atmdev.h 2011-01-17 02:41:02.000000000 -0500
29892 +diff -urNp linux-2.6.37.4/include/linux/atmdev.h linux-2.6.37.4/include/linux/atmdev.h
29893 +--- linux-2.6.37.4/include/linux/atmdev.h 2011-01-04 19:50:19.000000000 -0500
29894 ++++ linux-2.6.37.4/include/linux/atmdev.h 2011-01-17 02:41:02.000000000 -0500
29895 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
29896 #endif
29897
29898 @@ -45777,9 +45992,9 @@ diff -urNp linux-2.6.37.3/include/linux/atmdev.h linux-2.6.37.3/include/linux/at
29899 __AAL_STAT_ITEMS
29900 #undef __HANDLE_ITEM
29901 };
29902 -diff -urNp linux-2.6.37.3/include/linux/binfmts.h linux-2.6.37.3/include/linux/binfmts.h
29903 ---- linux-2.6.37.3/include/linux/binfmts.h 2011-01-04 19:50:19.000000000 -0500
29904 -+++ linux-2.6.37.3/include/linux/binfmts.h 2011-01-17 02:41:02.000000000 -0500
29905 +diff -urNp linux-2.6.37.4/include/linux/binfmts.h linux-2.6.37.4/include/linux/binfmts.h
29906 +--- linux-2.6.37.4/include/linux/binfmts.h 2011-01-04 19:50:19.000000000 -0500
29907 ++++ linux-2.6.37.4/include/linux/binfmts.h 2011-01-17 02:41:02.000000000 -0500
29908 @@ -92,6 +92,7 @@ struct linux_binfmt {
29909 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
29910 int (*load_shlib)(struct file *);
29911 @@ -45788,9 +46003,9 @@ diff -urNp linux-2.6.37.3/include/linux/binfmts.h linux-2.6.37.3/include/linux/b
29912 unsigned long min_coredump; /* minimal dump size */
29913 int hasvdso;
29914 };
29915 -diff -urNp linux-2.6.37.3/include/linux/blkdev.h linux-2.6.37.3/include/linux/blkdev.h
29916 ---- linux-2.6.37.3/include/linux/blkdev.h 2011-03-11 17:22:42.000000000 -0500
29917 -+++ linux-2.6.37.3/include/linux/blkdev.h 2011-03-11 17:23:06.000000000 -0500
29918 +diff -urNp linux-2.6.37.4/include/linux/blkdev.h linux-2.6.37.4/include/linux/blkdev.h
29919 +--- linux-2.6.37.4/include/linux/blkdev.h 2011-03-11 17:22:42.000000000 -0500
29920 ++++ linux-2.6.37.4/include/linux/blkdev.h 2011-03-11 17:23:06.000000000 -0500
29921 @@ -1248,19 +1248,19 @@ queue_max_integrity_segments(struct requ
29922 #endif /* CONFIG_BLK_DEV_INTEGRITY */
29923
29924 @@ -45822,9 +46037,9 @@ diff -urNp linux-2.6.37.3/include/linux/blkdev.h linux-2.6.37.3/include/linux/bl
29925 };
29926
29927 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
29928 -diff -urNp linux-2.6.37.3/include/linux/byteorder/little_endian.h linux-2.6.37.3/include/linux/byteorder/little_endian.h
29929 ---- linux-2.6.37.3/include/linux/byteorder/little_endian.h 2011-01-04 19:50:19.000000000 -0500
29930 -+++ linux-2.6.37.3/include/linux/byteorder/little_endian.h 2011-01-17 02:41:02.000000000 -0500
29931 +diff -urNp linux-2.6.37.4/include/linux/byteorder/little_endian.h linux-2.6.37.4/include/linux/byteorder/little_endian.h
29932 +--- linux-2.6.37.4/include/linux/byteorder/little_endian.h 2011-01-04 19:50:19.000000000 -0500
29933 ++++ linux-2.6.37.4/include/linux/byteorder/little_endian.h 2011-01-17 02:41:02.000000000 -0500
29934 @@ -42,51 +42,51 @@
29935
29936 static inline __le64 __cpu_to_le64p(const __u64 *p)
29937 @@ -45889,9 +46104,9 @@ diff -urNp linux-2.6.37.3/include/linux/byteorder/little_endian.h linux-2.6.37.3
29938 }
29939 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
29940 #define __le64_to_cpus(x) do { (void)(x); } while (0)
29941 -diff -urNp linux-2.6.37.3/include/linux/cache.h linux-2.6.37.3/include/linux/cache.h
29942 ---- linux-2.6.37.3/include/linux/cache.h 2011-01-04 19:50:19.000000000 -0500
29943 -+++ linux-2.6.37.3/include/linux/cache.h 2011-01-17 02:41:02.000000000 -0500
29944 +diff -urNp linux-2.6.37.4/include/linux/cache.h linux-2.6.37.4/include/linux/cache.h
29945 +--- linux-2.6.37.4/include/linux/cache.h 2011-01-04 19:50:19.000000000 -0500
29946 ++++ linux-2.6.37.4/include/linux/cache.h 2011-01-17 02:41:02.000000000 -0500
29947 @@ -16,6 +16,10 @@
29948 #define __read_mostly
29949 #endif
29950 @@ -45903,9 +46118,9 @@ diff -urNp linux-2.6.37.3/include/linux/cache.h linux-2.6.37.3/include/linux/cac
29951 #ifndef ____cacheline_aligned
29952 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
29953 #endif
29954 -diff -urNp linux-2.6.37.3/include/linux/capability.h linux-2.6.37.3/include/linux/capability.h
29955 ---- linux-2.6.37.3/include/linux/capability.h 2011-01-04 19:50:19.000000000 -0500
29956 -+++ linux-2.6.37.3/include/linux/capability.h 2011-01-17 02:41:02.000000000 -0500
29957 +diff -urNp linux-2.6.37.4/include/linux/capability.h linux-2.6.37.4/include/linux/capability.h
29958 +--- linux-2.6.37.4/include/linux/capability.h 2011-01-04 19:50:19.000000000 -0500
29959 ++++ linux-2.6.37.4/include/linux/capability.h 2011-01-17 02:41:02.000000000 -0500
29960 @@ -558,6 +558,7 @@ extern const kernel_cap_t __cap_init_eff
29961 (security_real_capable_noaudit((t), (cap)) == 0)
29962
29963 @@ -45914,9 +46129,9 @@ diff -urNp linux-2.6.37.3/include/linux/capability.h linux-2.6.37.3/include/linu
29964
29965 /* audit system wants to get cap info from files as well */
29966 struct dentry;
29967 -diff -urNp linux-2.6.37.3/include/linux/compiler-gcc4.h linux-2.6.37.3/include/linux/compiler-gcc4.h
29968 ---- linux-2.6.37.3/include/linux/compiler-gcc4.h 2011-01-04 19:50:19.000000000 -0500
29969 -+++ linux-2.6.37.3/include/linux/compiler-gcc4.h 2011-01-17 02:41:02.000000000 -0500
29970 +diff -urNp linux-2.6.37.4/include/linux/compiler-gcc4.h linux-2.6.37.4/include/linux/compiler-gcc4.h
29971 +--- linux-2.6.37.4/include/linux/compiler-gcc4.h 2011-01-04 19:50:19.000000000 -0500
29972 ++++ linux-2.6.37.4/include/linux/compiler-gcc4.h 2011-01-17 02:41:02.000000000 -0500
29973 @@ -54,6 +54,10 @@
29974
29975 #endif
29976 @@ -45928,9 +46143,9 @@ diff -urNp linux-2.6.37.3/include/linux/compiler-gcc4.h linux-2.6.37.3/include/l
29977 #endif
29978
29979 #if __GNUC_MINOR__ > 0
29980 -diff -urNp linux-2.6.37.3/include/linux/compiler.h linux-2.6.37.3/include/linux/compiler.h
29981 ---- linux-2.6.37.3/include/linux/compiler.h 2011-01-04 19:50:19.000000000 -0500
29982 -+++ linux-2.6.37.3/include/linux/compiler.h 2011-01-17 02:41:02.000000000 -0500
29983 +diff -urNp linux-2.6.37.4/include/linux/compiler.h linux-2.6.37.4/include/linux/compiler.h
29984 +--- linux-2.6.37.4/include/linux/compiler.h 2011-01-04 19:50:19.000000000 -0500
29985 ++++ linux-2.6.37.4/include/linux/compiler.h 2011-01-17 02:41:02.000000000 -0500
29986 @@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_
29987 #define __cold
29988 #endif
29989 @@ -45963,9 +46178,9 @@ diff -urNp linux-2.6.37.3/include/linux/compiler.h linux-2.6.37.3/include/linux/
29990 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
29991
29992 #endif /* __LINUX_COMPILER_H */
29993 -diff -urNp linux-2.6.37.3/include/linux/cpuset.h linux-2.6.37.3/include/linux/cpuset.h
29994 ---- linux-2.6.37.3/include/linux/cpuset.h 2011-01-04 19:50:19.000000000 -0500
29995 -+++ linux-2.6.37.3/include/linux/cpuset.h 2011-01-17 02:41:02.000000000 -0500
29996 +diff -urNp linux-2.6.37.4/include/linux/cpuset.h linux-2.6.37.4/include/linux/cpuset.h
29997 +--- linux-2.6.37.4/include/linux/cpuset.h 2011-01-04 19:50:19.000000000 -0500
29998 ++++ linux-2.6.37.4/include/linux/cpuset.h 2011-01-17 02:41:02.000000000 -0500
29999 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
30000 * nodemask.
30001 */
30002 @@ -45975,9 +46190,9 @@ diff -urNp linux-2.6.37.3/include/linux/cpuset.h linux-2.6.37.3/include/linux/cp
30003 }
30004
30005 static inline void set_mems_allowed(nodemask_t nodemask)
30006 -diff -urNp linux-2.6.37.3/include/linux/decompress/mm.h linux-2.6.37.3/include/linux/decompress/mm.h
30007 ---- linux-2.6.37.3/include/linux/decompress/mm.h 2011-01-04 19:50:19.000000000 -0500
30008 -+++ linux-2.6.37.3/include/linux/decompress/mm.h 2011-01-17 02:41:02.000000000 -0500
30009 +diff -urNp linux-2.6.37.4/include/linux/decompress/mm.h linux-2.6.37.4/include/linux/decompress/mm.h
30010 +--- linux-2.6.37.4/include/linux/decompress/mm.h 2011-01-04 19:50:19.000000000 -0500
30011 ++++ linux-2.6.37.4/include/linux/decompress/mm.h 2011-01-17 02:41:02.000000000 -0500
30012 @@ -78,7 +78,7 @@ static void free(void *where)
30013 * warnings when not needed (indeed large_malloc / large_free are not
30014 * needed by inflate */
30015 @@ -45987,9 +46202,9 @@ diff -urNp linux-2.6.37.3/include/linux/decompress/mm.h linux-2.6.37.3/include/l
30016 #define free(a) kfree(a)
30017
30018 #define large_malloc(a) vmalloc(a)
30019 -diff -urNp linux-2.6.37.3/include/linux/dma-mapping.h linux-2.6.37.3/include/linux/dma-mapping.h
30020 ---- linux-2.6.37.3/include/linux/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
30021 -+++ linux-2.6.37.3/include/linux/dma-mapping.h 2011-01-17 02:41:02.000000000 -0500
30022 +diff -urNp linux-2.6.37.4/include/linux/dma-mapping.h linux-2.6.37.4/include/linux/dma-mapping.h
30023 +--- linux-2.6.37.4/include/linux/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
30024 ++++ linux-2.6.37.4/include/linux/dma-mapping.h 2011-01-17 02:41:02.000000000 -0500
30025 @@ -16,40 +16,40 @@ enum dma_data_direction {
30026 };
30027
30028 @@ -46045,9 +46260,9 @@ diff -urNp linux-2.6.37.3/include/linux/dma-mapping.h linux-2.6.37.3/include/lin
30029 };
30030
30031 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
30032 -diff -urNp linux-2.6.37.3/include/linux/elf.h linux-2.6.37.3/include/linux/elf.h
30033 ---- linux-2.6.37.3/include/linux/elf.h 2011-01-04 19:50:19.000000000 -0500
30034 -+++ linux-2.6.37.3/include/linux/elf.h 2011-01-17 02:41:02.000000000 -0500
30035 +diff -urNp linux-2.6.37.4/include/linux/elf.h linux-2.6.37.4/include/linux/elf.h
30036 +--- linux-2.6.37.4/include/linux/elf.h 2011-01-04 19:50:19.000000000 -0500
30037 ++++ linux-2.6.37.4/include/linux/elf.h 2011-01-17 02:41:02.000000000 -0500
30038 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
30039 #define PT_GNU_EH_FRAME 0x6474e550
30040
30041 @@ -46120,9 +46335,9 @@ diff -urNp linux-2.6.37.3/include/linux/elf.h linux-2.6.37.3/include/linux/elf.h
30042
30043 #endif
30044
30045 -diff -urNp linux-2.6.37.3/include/linux/fs.h linux-2.6.37.3/include/linux/fs.h
30046 ---- linux-2.6.37.3/include/linux/fs.h 2011-03-11 17:22:42.000000000 -0500
30047 -+++ linux-2.6.37.3/include/linux/fs.h 2011-03-11 17:23:06.000000000 -0500
30048 +diff -urNp linux-2.6.37.4/include/linux/fs.h linux-2.6.37.4/include/linux/fs.h
30049 +--- linux-2.6.37.4/include/linux/fs.h 2011-03-11 17:22:42.000000000 -0500
30050 ++++ linux-2.6.37.4/include/linux/fs.h 2011-03-11 17:23:06.000000000 -0500
30051 @@ -105,6 +105,11 @@ struct inodes_stat_t {
30052 /* File was opened by fanotify and shouldn't generate fanotify events */
30053 #define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
30054 @@ -46282,9 +46497,9 @@ diff -urNp linux-2.6.37.3/include/linux/fs.h linux-2.6.37.3/include/linux/fs.h
30055 };
30056
30057 /*
30058 -diff -urNp linux-2.6.37.3/include/linux/fs_struct.h linux-2.6.37.3/include/linux/fs_struct.h
30059 ---- linux-2.6.37.3/include/linux/fs_struct.h 2011-01-04 19:50:19.000000000 -0500
30060 -+++ linux-2.6.37.3/include/linux/fs_struct.h 2011-01-17 02:41:02.000000000 -0500
30061 +diff -urNp linux-2.6.37.4/include/linux/fs_struct.h linux-2.6.37.4/include/linux/fs_struct.h
30062 +--- linux-2.6.37.4/include/linux/fs_struct.h 2011-01-04 19:50:19.000000000 -0500
30063 ++++ linux-2.6.37.4/include/linux/fs_struct.h 2011-01-17 02:41:02.000000000 -0500
30064 @@ -4,7 +4,7 @@
30065 #include <linux/path.h>
30066
30067 @@ -46294,9 +46509,9 @@ diff -urNp linux-2.6.37.3/include/linux/fs_struct.h linux-2.6.37.3/include/linux
30068 spinlock_t lock;
30069 int umask;
30070 int in_exec;
30071 -diff -urNp linux-2.6.37.3/include/linux/genhd.h linux-2.6.37.3/include/linux/genhd.h
30072 ---- linux-2.6.37.3/include/linux/genhd.h 2011-02-22 16:05:31.000000000 -0500
30073 -+++ linux-2.6.37.3/include/linux/genhd.h 2011-02-22 16:05:42.000000000 -0500
30074 +diff -urNp linux-2.6.37.4/include/linux/genhd.h linux-2.6.37.4/include/linux/genhd.h
30075 +--- linux-2.6.37.4/include/linux/genhd.h 2011-02-22 16:05:31.000000000 -0500
30076 ++++ linux-2.6.37.4/include/linux/genhd.h 2011-02-22 16:05:42.000000000 -0500
30077 @@ -173,7 +173,7 @@ struct gendisk {
30078
30079 struct timer_rand_state *random;
30080 @@ -46306,9 +46521,9 @@ diff -urNp linux-2.6.37.3/include/linux/genhd.h linux-2.6.37.3/include/linux/gen
30081 struct work_struct async_notify;
30082 #ifdef CONFIG_BLK_DEV_INTEGRITY
30083 struct blk_integrity *integrity;
30084 -diff -urNp linux-2.6.37.3/include/linux/gracl.h linux-2.6.37.3/include/linux/gracl.h
30085 ---- linux-2.6.37.3/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
30086 -+++ linux-2.6.37.3/include/linux/gracl.h 2011-01-17 02:41:02.000000000 -0500
30087 +diff -urNp linux-2.6.37.4/include/linux/gracl.h linux-2.6.37.4/include/linux/gracl.h
30088 +--- linux-2.6.37.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
30089 ++++ linux-2.6.37.4/include/linux/gracl.h 2011-01-17 02:41:02.000000000 -0500
30090 @@ -0,0 +1,317 @@
30091 +#ifndef GR_ACL_H
30092 +#define GR_ACL_H
30093 @@ -46627,9 +46842,9 @@ diff -urNp linux-2.6.37.3/include/linux/gracl.h linux-2.6.37.3/include/linux/gra
30094 +
30095 +#endif
30096 +
30097 -diff -urNp linux-2.6.37.3/include/linux/gralloc.h linux-2.6.37.3/include/linux/gralloc.h
30098 ---- linux-2.6.37.3/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
30099 -+++ linux-2.6.37.3/include/linux/gralloc.h 2011-01-17 02:41:02.000000000 -0500
30100 +diff -urNp linux-2.6.37.4/include/linux/gralloc.h linux-2.6.37.4/include/linux/gralloc.h
30101 +--- linux-2.6.37.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
30102 ++++ linux-2.6.37.4/include/linux/gralloc.h 2011-01-17 02:41:02.000000000 -0500
30103 @@ -0,0 +1,9 @@
30104 +#ifndef __GRALLOC_H
30105 +#define __GRALLOC_H
30106 @@ -46640,9 +46855,9 @@ diff -urNp linux-2.6.37.3/include/linux/gralloc.h linux-2.6.37.3/include/linux/g
30107 +void *acl_alloc_num(unsigned long num, unsigned long len);
30108 +
30109 +#endif
30110 -diff -urNp linux-2.6.37.3/include/linux/grdefs.h linux-2.6.37.3/include/linux/grdefs.h
30111 ---- linux-2.6.37.3/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
30112 -+++ linux-2.6.37.3/include/linux/grdefs.h 2011-01-17 02:41:02.000000000 -0500
30113 +diff -urNp linux-2.6.37.4/include/linux/grdefs.h linux-2.6.37.4/include/linux/grdefs.h
30114 +--- linux-2.6.37.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
30115 ++++ linux-2.6.37.4/include/linux/grdefs.h 2011-01-17 02:41:02.000000000 -0500
30116 @@ -0,0 +1,137 @@
30117 +#ifndef GRDEFS_H
30118 +#define GRDEFS_H
30119 @@ -46781,9 +46996,9 @@ diff -urNp linux-2.6.37.3/include/linux/grdefs.h linux-2.6.37.3/include/linux/gr
30120 +};
30121 +
30122 +#endif
30123 -diff -urNp linux-2.6.37.3/include/linux/grinternal.h linux-2.6.37.3/include/linux/grinternal.h
30124 ---- linux-2.6.37.3/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
30125 -+++ linux-2.6.37.3/include/linux/grinternal.h 2011-01-17 02:41:02.000000000 -0500
30126 +diff -urNp linux-2.6.37.4/include/linux/grinternal.h linux-2.6.37.4/include/linux/grinternal.h
30127 +--- linux-2.6.37.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
30128 ++++ linux-2.6.37.4/include/linux/grinternal.h 2011-01-17 02:41:02.000000000 -0500
30129 @@ -0,0 +1,216 @@
30130 +#ifndef __GRINTERNAL_H
30131 +#define __GRINTERNAL_H
30132 @@ -47001,9 +47216,9 @@ diff -urNp linux-2.6.37.3/include/linux/grinternal.h linux-2.6.37.3/include/linu
30133 +#endif
30134 +
30135 +#endif
30136 -diff -urNp linux-2.6.37.3/include/linux/grmsg.h linux-2.6.37.3/include/linux/grmsg.h
30137 ---- linux-2.6.37.3/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
30138 -+++ linux-2.6.37.3/include/linux/grmsg.h 2011-01-17 02:41:02.000000000 -0500
30139 +diff -urNp linux-2.6.37.4/include/linux/grmsg.h linux-2.6.37.4/include/linux/grmsg.h
30140 +--- linux-2.6.37.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
30141 ++++ linux-2.6.37.4/include/linux/grmsg.h 2011-01-17 02:41:02.000000000 -0500
30142 @@ -0,0 +1,111 @@
30143 +#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"
30144 +#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"
30145 @@ -47116,9 +47331,9 @@ diff -urNp linux-2.6.37.3/include/linux/grmsg.h linux-2.6.37.3/include/linux/grm
30146 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
30147 +#define GR_VM86_MSG "denied use of vm86 by "
30148 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
30149 -diff -urNp linux-2.6.37.3/include/linux/grsecurity.h linux-2.6.37.3/include/linux/grsecurity.h
30150 ---- linux-2.6.37.3/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
30151 -+++ linux-2.6.37.3/include/linux/grsecurity.h 2011-01-17 02:41:02.000000000 -0500
30152 +diff -urNp linux-2.6.37.4/include/linux/grsecurity.h linux-2.6.37.4/include/linux/grsecurity.h
30153 +--- linux-2.6.37.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
30154 ++++ linux-2.6.37.4/include/linux/grsecurity.h 2011-01-17 02:41:02.000000000 -0500
30155 @@ -0,0 +1,214 @@
30156 +#ifndef GR_SECURITY_H
30157 +#define GR_SECURITY_H
30158 @@ -47334,9 +47549,9 @@ diff -urNp linux-2.6.37.3/include/linux/grsecurity.h linux-2.6.37.3/include/linu
30159 +#endif
30160 +
30161 +#endif
30162 -diff -urNp linux-2.6.37.3/include/linux/grsock.h linux-2.6.37.3/include/linux/grsock.h
30163 ---- linux-2.6.37.3/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
30164 -+++ linux-2.6.37.3/include/linux/grsock.h 2011-01-17 02:41:02.000000000 -0500
30165 +diff -urNp linux-2.6.37.4/include/linux/grsock.h linux-2.6.37.4/include/linux/grsock.h
30166 +--- linux-2.6.37.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
30167 ++++ linux-2.6.37.4/include/linux/grsock.h 2011-01-17 02:41:02.000000000 -0500
30168 @@ -0,0 +1,19 @@
30169 +#ifndef __GRSOCK_H
30170 +#define __GRSOCK_H
30171 @@ -47357,9 +47572,9 @@ diff -urNp linux-2.6.37.3/include/linux/grsock.h linux-2.6.37.3/include/linux/gr
30172 + const int protocol);
30173 +
30174 +#endif
30175 -diff -urNp linux-2.6.37.3/include/linux/highmem.h linux-2.6.37.3/include/linux/highmem.h
30176 ---- linux-2.6.37.3/include/linux/highmem.h 2011-01-04 19:50:19.000000000 -0500
30177 -+++ linux-2.6.37.3/include/linux/highmem.h 2011-01-17 02:41:02.000000000 -0500
30178 +diff -urNp linux-2.6.37.4/include/linux/highmem.h linux-2.6.37.4/include/linux/highmem.h
30179 +--- linux-2.6.37.4/include/linux/highmem.h 2011-01-04 19:50:19.000000000 -0500
30180 ++++ linux-2.6.37.4/include/linux/highmem.h 2011-01-17 02:41:02.000000000 -0500
30181 @@ -182,6 +182,18 @@ static inline void clear_highpage(struct
30182 kunmap_atomic(kaddr, KM_USER0);
30183 }
30184 @@ -47379,9 +47594,9 @@ diff -urNp linux-2.6.37.3/include/linux/highmem.h linux-2.6.37.3/include/linux/h
30185 static inline void zero_user_segments(struct page *page,
30186 unsigned start1, unsigned end1,
30187 unsigned start2, unsigned end2)
30188 -diff -urNp linux-2.6.37.3/include/linux/init.h linux-2.6.37.3/include/linux/init.h
30189 ---- linux-2.6.37.3/include/linux/init.h 2011-01-04 19:50:19.000000000 -0500
30190 -+++ linux-2.6.37.3/include/linux/init.h 2011-01-17 02:41:02.000000000 -0500
30191 +diff -urNp linux-2.6.37.4/include/linux/init.h linux-2.6.37.4/include/linux/init.h
30192 +--- linux-2.6.37.4/include/linux/init.h 2011-01-04 19:50:19.000000000 -0500
30193 ++++ linux-2.6.37.4/include/linux/init.h 2011-01-17 02:41:02.000000000 -0500
30194 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
30195
30196 /* Each module must use one module_init(). */
30197 @@ -47398,9 +47613,9 @@ diff -urNp linux-2.6.37.3/include/linux/init.h linux-2.6.37.3/include/linux/init
30198 { return exitfn; } \
30199 void cleanup_module(void) __attribute__((alias(#exitfn)));
30200
30201 -diff -urNp linux-2.6.37.3/include/linux/interrupt.h linux-2.6.37.3/include/linux/interrupt.h
30202 ---- linux-2.6.37.3/include/linux/interrupt.h 2011-01-04 19:50:19.000000000 -0500
30203 -+++ linux-2.6.37.3/include/linux/interrupt.h 2011-01-17 02:41:02.000000000 -0500
30204 +diff -urNp linux-2.6.37.4/include/linux/interrupt.h linux-2.6.37.4/include/linux/interrupt.h
30205 +--- linux-2.6.37.4/include/linux/interrupt.h 2011-01-04 19:50:19.000000000 -0500
30206 ++++ linux-2.6.37.4/include/linux/interrupt.h 2011-01-17 02:41:02.000000000 -0500
30207 @@ -393,7 +393,7 @@ enum
30208 /* map softirq index to softirq name. update 'softirq_to_name' in
30209 * kernel/softirq.c when adding a new softirq.
30210 @@ -47425,9 +47640,9 @@ diff -urNp linux-2.6.37.3/include/linux/interrupt.h linux-2.6.37.3/include/linux
30211 extern void softirq_init(void);
30212 static inline void __raise_softirq_irqoff(unsigned int nr)
30213 {
30214 -diff -urNp linux-2.6.37.3/include/linux/jbd2.h linux-2.6.37.3/include/linux/jbd2.h
30215 ---- linux-2.6.37.3/include/linux/jbd2.h 2011-01-04 19:50:19.000000000 -0500
30216 -+++ linux-2.6.37.3/include/linux/jbd2.h 2011-01-17 02:41:02.000000000 -0500
30217 +diff -urNp linux-2.6.37.4/include/linux/jbd2.h linux-2.6.37.4/include/linux/jbd2.h
30218 +--- linux-2.6.37.4/include/linux/jbd2.h 2011-01-04 19:50:19.000000000 -0500
30219 ++++ linux-2.6.37.4/include/linux/jbd2.h 2011-01-17 02:41:02.000000000 -0500
30220 @@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
30221 } \
30222 } while (0)
30223 @@ -47437,9 +47652,9 @@ diff -urNp linux-2.6.37.3/include/linux/jbd2.h linux-2.6.37.3/include/linux/jbd2
30224 #endif
30225
30226 extern void *jbd2_alloc(size_t size, gfp_t flags);
30227 -diff -urNp linux-2.6.37.3/include/linux/jbd.h linux-2.6.37.3/include/linux/jbd.h
30228 ---- linux-2.6.37.3/include/linux/jbd.h 2011-01-04 19:50:19.000000000 -0500
30229 -+++ linux-2.6.37.3/include/linux/jbd.h 2011-01-17 02:41:02.000000000 -0500
30230 +diff -urNp linux-2.6.37.4/include/linux/jbd.h linux-2.6.37.4/include/linux/jbd.h
30231 +--- linux-2.6.37.4/include/linux/jbd.h 2011-01-04 19:50:19.000000000 -0500
30232 ++++ linux-2.6.37.4/include/linux/jbd.h 2011-01-17 02:41:02.000000000 -0500
30233 @@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
30234 } \
30235 } while (0)
30236 @@ -47449,9 +47664,9 @@ diff -urNp linux-2.6.37.3/include/linux/jbd.h linux-2.6.37.3/include/linux/jbd.h
30237 #endif
30238
30239 static inline void *jbd_alloc(size_t size, gfp_t flags)
30240 -diff -urNp linux-2.6.37.3/include/linux/kallsyms.h linux-2.6.37.3/include/linux/kallsyms.h
30241 ---- linux-2.6.37.3/include/linux/kallsyms.h 2011-01-04 19:50:19.000000000 -0500
30242 -+++ linux-2.6.37.3/include/linux/kallsyms.h 2011-01-17 02:41:02.000000000 -0500
30243 +diff -urNp linux-2.6.37.4/include/linux/kallsyms.h linux-2.6.37.4/include/linux/kallsyms.h
30244 +--- linux-2.6.37.4/include/linux/kallsyms.h 2011-01-04 19:50:19.000000000 -0500
30245 ++++ linux-2.6.37.4/include/linux/kallsyms.h 2011-01-17 02:41:02.000000000 -0500
30246 @@ -15,7 +15,8 @@
30247
30248 struct module;
30249 @@ -47478,9 +47693,9 @@ diff -urNp linux-2.6.37.3/include/linux/kallsyms.h linux-2.6.37.3/include/linux/
30250
30251 /* This macro allows us to keep printk typechecking */
30252 static void __check_printsym_format(const char *fmt, ...)
30253 -diff -urNp linux-2.6.37.3/include/linux/kgdb.h linux-2.6.37.3/include/linux/kgdb.h
30254 ---- linux-2.6.37.3/include/linux/kgdb.h 2011-01-04 19:50:19.000000000 -0500
30255 -+++ linux-2.6.37.3/include/linux/kgdb.h 2011-01-17 02:41:02.000000000 -0500
30256 +diff -urNp linux-2.6.37.4/include/linux/kgdb.h linux-2.6.37.4/include/linux/kgdb.h
30257 +--- linux-2.6.37.4/include/linux/kgdb.h 2011-01-04 19:50:19.000000000 -0500
30258 ++++ linux-2.6.37.4/include/linux/kgdb.h 2011-01-17 02:41:02.000000000 -0500
30259 @@ -269,22 +269,22 @@ struct kgdb_arch {
30260 */
30261 struct kgdb_io {
30262 @@ -47514,9 +47729,9 @@ diff -urNp linux-2.6.37.3/include/linux/kgdb.h linux-2.6.37.3/include/linux/kgdb
30263
30264 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
30265 extern char *kgdb_mem2hex(char *mem, char *buf, int count);
30266 -diff -urNp linux-2.6.37.3/include/linux/kvm_host.h linux-2.6.37.3/include/linux/kvm_host.h
30267 ---- linux-2.6.37.3/include/linux/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
30268 -+++ linux-2.6.37.3/include/linux/kvm_host.h 2011-01-17 02:41:02.000000000 -0500
30269 +diff -urNp linux-2.6.37.4/include/linux/kvm_host.h linux-2.6.37.4/include/linux/kvm_host.h
30270 +--- linux-2.6.37.4/include/linux/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
30271 ++++ linux-2.6.37.4/include/linux/kvm_host.h 2011-01-17 02:41:02.000000000 -0500
30272 @@ -246,7 +246,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
30273 void vcpu_load(struct kvm_vcpu *vcpu);
30274 void vcpu_put(struct kvm_vcpu *vcpu);
30275 @@ -47535,9 +47750,9 @@ diff -urNp linux-2.6.37.3/include/linux/kvm_host.h linux-2.6.37.3/include/linux/
30276 void kvm_arch_exit(void);
30277
30278 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
30279 -diff -urNp linux-2.6.37.3/include/linux/libata.h linux-2.6.37.3/include/linux/libata.h
30280 ---- linux-2.6.37.3/include/linux/libata.h 2011-01-04 19:50:19.000000000 -0500
30281 -+++ linux-2.6.37.3/include/linux/libata.h 2011-01-17 02:41:02.000000000 -0500
30282 +diff -urNp linux-2.6.37.4/include/linux/libata.h linux-2.6.37.4/include/linux/libata.h
30283 +--- linux-2.6.37.4/include/linux/libata.h 2011-01-04 19:50:19.000000000 -0500
30284 ++++ linux-2.6.37.4/include/linux/libata.h 2011-01-17 02:41:02.000000000 -0500
30285 @@ -65,11 +65,11 @@
30286 #ifdef ATA_VERBOSE_DEBUG
30287 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
30288 @@ -47603,9 +47818,9 @@ diff -urNp linux-2.6.37.3/include/linux/libata.h linux-2.6.37.3/include/linux/li
30289 extern int ata_scsi_detect(struct scsi_host_template *sht);
30290 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
30291 extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
30292 -diff -urNp linux-2.6.37.3/include/linux/lockd/bind.h linux-2.6.37.3/include/linux/lockd/bind.h
30293 ---- linux-2.6.37.3/include/linux/lockd/bind.h 2011-01-04 19:50:19.000000000 -0500
30294 -+++ linux-2.6.37.3/include/linux/lockd/bind.h 2011-01-17 02:41:02.000000000 -0500
30295 +diff -urNp linux-2.6.37.4/include/linux/lockd/bind.h linux-2.6.37.4/include/linux/lockd/bind.h
30296 +--- linux-2.6.37.4/include/linux/lockd/bind.h 2011-01-04 19:50:19.000000000 -0500
30297 ++++ linux-2.6.37.4/include/linux/lockd/bind.h 2011-01-17 02:41:02.000000000 -0500
30298 @@ -23,13 +23,13 @@ struct svc_rqst;
30299 * This is the set of functions for lockd->nfsd communication
30300 */
30301 @@ -47623,9 +47838,9 @@ diff -urNp linux-2.6.37.3/include/linux/lockd/bind.h linux-2.6.37.3/include/linu
30302
30303 /*
30304 * Similar to nfs_client_initdata, but without the NFS-specific
30305 -diff -urNp linux-2.6.37.3/include/linux/mm.h linux-2.6.37.3/include/linux/mm.h
30306 ---- linux-2.6.37.3/include/linux/mm.h 2011-01-04 19:50:19.000000000 -0500
30307 -+++ linux-2.6.37.3/include/linux/mm.h 2011-01-17 02:41:02.000000000 -0500
30308 +diff -urNp linux-2.6.37.4/include/linux/mm.h linux-2.6.37.4/include/linux/mm.h
30309 +--- linux-2.6.37.4/include/linux/mm.h 2011-01-04 19:50:19.000000000 -0500
30310 ++++ linux-2.6.37.4/include/linux/mm.h 2011-01-17 02:41:02.000000000 -0500
30311 @@ -107,7 +107,14 @@ extern unsigned int kobjsize(const void
30312
30313 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
30314 @@ -47726,9 +47941,9 @@ diff -urNp linux-2.6.37.3/include/linux/mm.h linux-2.6.37.3/include/linux/mm.h
30315 +
30316 #endif /* __KERNEL__ */
30317 #endif /* _LINUX_MM_H */
30318 -diff -urNp linux-2.6.37.3/include/linux/mm_types.h linux-2.6.37.3/include/linux/mm_types.h
30319 ---- linux-2.6.37.3/include/linux/mm_types.h 2011-01-04 19:50:19.000000000 -0500
30320 -+++ linux-2.6.37.3/include/linux/mm_types.h 2011-01-17 02:41:02.000000000 -0500
30321 +diff -urNp linux-2.6.37.4/include/linux/mm_types.h linux-2.6.37.4/include/linux/mm_types.h
30322 +--- linux-2.6.37.4/include/linux/mm_types.h 2011-01-04 19:50:19.000000000 -0500
30323 ++++ linux-2.6.37.4/include/linux/mm_types.h 2011-01-17 02:41:02.000000000 -0500
30324 @@ -183,6 +183,8 @@ struct vm_area_struct {
30325 #ifdef CONFIG_NUMA
30326 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
30327 @@ -47763,9 +47978,9 @@ diff -urNp linux-2.6.37.3/include/linux/mm_types.h linux-2.6.37.3/include/linux/
30328 };
30329
30330 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
30331 -diff -urNp linux-2.6.37.3/include/linux/mmu_notifier.h linux-2.6.37.3/include/linux/mmu_notifier.h
30332 ---- linux-2.6.37.3/include/linux/mmu_notifier.h 2011-01-04 19:50:19.000000000 -0500
30333 -+++ linux-2.6.37.3/include/linux/mmu_notifier.h 2011-01-17 02:41:02.000000000 -0500
30334 +diff -urNp linux-2.6.37.4/include/linux/mmu_notifier.h linux-2.6.37.4/include/linux/mmu_notifier.h
30335 +--- linux-2.6.37.4/include/linux/mmu_notifier.h 2011-01-04 19:50:19.000000000 -0500
30336 ++++ linux-2.6.37.4/include/linux/mmu_notifier.h 2011-01-17 02:41:02.000000000 -0500
30337 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
30338 */
30339 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
30340 @@ -47782,9 +47997,9 @@ diff -urNp linux-2.6.37.3/include/linux/mmu_notifier.h linux-2.6.37.3/include/li
30341 })
30342
30343 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
30344 -diff -urNp linux-2.6.37.3/include/linux/mmzone.h linux-2.6.37.3/include/linux/mmzone.h
30345 ---- linux-2.6.37.3/include/linux/mmzone.h 2011-02-22 16:05:31.000000000 -0500
30346 -+++ linux-2.6.37.3/include/linux/mmzone.h 2011-02-22 16:05:42.000000000 -0500
30347 +diff -urNp linux-2.6.37.4/include/linux/mmzone.h linux-2.6.37.4/include/linux/mmzone.h
30348 +--- linux-2.6.37.4/include/linux/mmzone.h 2011-02-22 16:05:31.000000000 -0500
30349 ++++ linux-2.6.37.4/include/linux/mmzone.h 2011-02-22 16:05:42.000000000 -0500
30350 @@ -354,7 +354,7 @@ struct zone {
30351 unsigned long flags; /* zone flags, see below */
30352
30353 @@ -47794,9 +48009,9 @@ diff -urNp linux-2.6.37.3/include/linux/mmzone.h linux-2.6.37.3/include/linux/mm
30354
30355 /*
30356 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
30357 -diff -urNp linux-2.6.37.3/include/linux/mod_devicetable.h linux-2.6.37.3/include/linux/mod_devicetable.h
30358 ---- linux-2.6.37.3/include/linux/mod_devicetable.h 2011-01-04 19:50:19.000000000 -0500
30359 -+++ linux-2.6.37.3/include/linux/mod_devicetable.h 2011-01-17 02:41:02.000000000 -0500
30360 +diff -urNp linux-2.6.37.4/include/linux/mod_devicetable.h linux-2.6.37.4/include/linux/mod_devicetable.h
30361 +--- linux-2.6.37.4/include/linux/mod_devicetable.h 2011-01-04 19:50:19.000000000 -0500
30362 ++++ linux-2.6.37.4/include/linux/mod_devicetable.h 2011-01-17 02:41:02.000000000 -0500
30363 @@ -12,7 +12,7 @@
30364 typedef unsigned long kernel_ulong_t;
30365 #endif
30366 @@ -47815,9 +48030,9 @@ diff -urNp linux-2.6.37.3/include/linux/mod_devicetable.h linux-2.6.37.3/include
30367
30368 struct hid_device_id {
30369 __u16 bus;
30370 -diff -urNp linux-2.6.37.3/include/linux/module.h linux-2.6.37.3/include/linux/module.h
30371 ---- linux-2.6.37.3/include/linux/module.h 2011-01-04 19:50:19.000000000 -0500
30372 -+++ linux-2.6.37.3/include/linux/module.h 2011-01-17 02:41:02.000000000 -0500
30373 +diff -urNp linux-2.6.37.4/include/linux/module.h linux-2.6.37.4/include/linux/module.h
30374 +--- linux-2.6.37.4/include/linux/module.h 2011-01-04 19:50:19.000000000 -0500
30375 ++++ linux-2.6.37.4/include/linux/module.h 2011-01-17 02:41:02.000000000 -0500
30376 @@ -297,16 +297,16 @@ struct module
30377 int (*init)(void);
30378
30379 @@ -47890,9 +48105,9 @@ diff -urNp linux-2.6.37.3/include/linux/module.h linux-2.6.37.3/include/linux/mo
30380 }
30381
30382 /* Search for module by name: must hold module_mutex. */
30383 -diff -urNp linux-2.6.37.3/include/linux/moduleloader.h linux-2.6.37.3/include/linux/moduleloader.h
30384 ---- linux-2.6.37.3/include/linux/moduleloader.h 2011-01-04 19:50:19.000000000 -0500
30385 -+++ linux-2.6.37.3/include/linux/moduleloader.h 2011-01-17 02:41:02.000000000 -0500
30386 +diff -urNp linux-2.6.37.4/include/linux/moduleloader.h linux-2.6.37.4/include/linux/moduleloader.h
30387 +--- linux-2.6.37.4/include/linux/moduleloader.h 2011-01-04 19:50:19.000000000 -0500
30388 ++++ linux-2.6.37.4/include/linux/moduleloader.h 2011-01-17 02:41:02.000000000 -0500
30389 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
30390 sections. Returns NULL on failure. */
30391 void *module_alloc(unsigned long size);
30392 @@ -47915,9 +48130,9 @@ diff -urNp linux-2.6.37.3/include/linux/moduleloader.h linux-2.6.37.3/include/li
30393 /* Apply the given relocation to the (simplified) ELF. Return -error
30394 or 0. */
30395 int apply_relocate(Elf_Shdr *sechdrs,
30396 -diff -urNp linux-2.6.37.3/include/linux/moduleparam.h linux-2.6.37.3/include/linux/moduleparam.h
30397 ---- linux-2.6.37.3/include/linux/moduleparam.h 2011-01-04 19:50:19.000000000 -0500
30398 -+++ linux-2.6.37.3/include/linux/moduleparam.h 2011-01-17 02:41:02.000000000 -0500
30399 +diff -urNp linux-2.6.37.4/include/linux/moduleparam.h linux-2.6.37.4/include/linux/moduleparam.h
30400 +--- linux-2.6.37.4/include/linux/moduleparam.h 2011-01-04 19:50:19.000000000 -0500
30401 ++++ linux-2.6.37.4/include/linux/moduleparam.h 2011-01-17 02:41:02.000000000 -0500
30402 @@ -253,7 +253,7 @@ static inline void __kernel_param_unlock
30403 * @len is usually just sizeof(string).
30404 */
30405 @@ -47936,9 +48151,9 @@ diff -urNp linux-2.6.37.3/include/linux/moduleparam.h linux-2.6.37.3/include/lin
30406 = { ARRAY_SIZE(array), nump, &param_ops_##type, \
30407 sizeof(array[0]), array }; \
30408 __module_param_call(MODULE_PARAM_PREFIX, name, \
30409 -diff -urNp linux-2.6.37.3/include/linux/namei.h linux-2.6.37.3/include/linux/namei.h
30410 ---- linux-2.6.37.3/include/linux/namei.h 2011-01-04 19:50:19.000000000 -0500
30411 -+++ linux-2.6.37.3/include/linux/namei.h 2011-01-17 02:41:02.000000000 -0500
30412 +diff -urNp linux-2.6.37.4/include/linux/namei.h linux-2.6.37.4/include/linux/namei.h
30413 +--- linux-2.6.37.4/include/linux/namei.h 2011-01-04 19:50:19.000000000 -0500
30414 ++++ linux-2.6.37.4/include/linux/namei.h 2011-01-17 02:41:02.000000000 -0500
30415 @@ -22,7 +22,7 @@ struct nameidata {
30416 unsigned int flags;
30417 int last_type;
30418 @@ -47963,22 +48178,9 @@ diff -urNp linux-2.6.37.3/include/linux/namei.h linux-2.6.37.3/include/linux/nam
30419 {
30420 return nd->saved_names[nd->depth];
30421 }
30422 -diff -urNp linux-2.6.37.3/include/linux/netdevice.h linux-2.6.37.3/include/linux/netdevice.h
30423 ---- linux-2.6.37.3/include/linux/netdevice.h 2011-01-04 19:50:19.000000000 -0500
30424 -+++ linux-2.6.37.3/include/linux/netdevice.h 2011-02-28 18:18:13.000000000 -0500
30425 -@@ -2336,6 +2336,9 @@ extern int netdev_notice(const struct ne
30426 - extern int netdev_info(const struct net_device *dev, const char *format, ...)
30427 - __attribute__ ((format (printf, 2, 3)));
30428 -
30429 -+#define MODULE_ALIAS_NETDEV(device) \
30430 -+ MODULE_ALIAS("netdev-" device)
30431 -+
30432 - #if defined(DEBUG)
30433 - #define netdev_dbg(__dev, format, args...) \
30434 - netdev_printk(KERN_DEBUG, __dev, format, ##args)
30435 -diff -urNp linux-2.6.37.3/include/linux/netfilter/xt_gradm.h linux-2.6.37.3/include/linux/netfilter/xt_gradm.h
30436 ---- linux-2.6.37.3/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
30437 -+++ linux-2.6.37.3/include/linux/netfilter/xt_gradm.h 2011-01-17 02:41:02.000000000 -0500
30438 +diff -urNp linux-2.6.37.4/include/linux/netfilter/xt_gradm.h linux-2.6.37.4/include/linux/netfilter/xt_gradm.h
30439 +--- linux-2.6.37.4/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
30440 ++++ linux-2.6.37.4/include/linux/netfilter/xt_gradm.h 2011-01-17 02:41:02.000000000 -0500
30441 @@ -0,0 +1,9 @@
30442 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
30443 +#define _LINUX_NETFILTER_XT_GRADM_H 1
30444 @@ -47989,9 +48191,9 @@ diff -urNp linux-2.6.37.3/include/linux/netfilter/xt_gradm.h linux-2.6.37.3/incl
30445 +};
30446 +
30447 +#endif
30448 -diff -urNp linux-2.6.37.3/include/linux/oprofile.h linux-2.6.37.3/include/linux/oprofile.h
30449 ---- linux-2.6.37.3/include/linux/oprofile.h 2011-02-22 16:05:31.000000000 -0500
30450 -+++ linux-2.6.37.3/include/linux/oprofile.h 2011-02-22 16:05:42.000000000 -0500
30451 +diff -urNp linux-2.6.37.4/include/linux/oprofile.h linux-2.6.37.4/include/linux/oprofile.h
30452 +--- linux-2.6.37.4/include/linux/oprofile.h 2011-02-22 16:05:31.000000000 -0500
30453 ++++ linux-2.6.37.4/include/linux/oprofile.h 2011-02-22 16:05:42.000000000 -0500
30454 @@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super
30455 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
30456 char const * name, ulong * val);
30457 @@ -48004,9 +48206,9 @@ diff -urNp linux-2.6.37.3/include/linux/oprofile.h linux-2.6.37.3/include/linux/
30458
30459 /** create a directory */
30460 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
30461 -diff -urNp linux-2.6.37.3/include/linux/pipe_fs_i.h linux-2.6.37.3/include/linux/pipe_fs_i.h
30462 ---- linux-2.6.37.3/include/linux/pipe_fs_i.h 2011-01-04 19:50:19.000000000 -0500
30463 -+++ linux-2.6.37.3/include/linux/pipe_fs_i.h 2011-01-17 02:41:02.000000000 -0500
30464 +diff -urNp linux-2.6.37.4/include/linux/pipe_fs_i.h linux-2.6.37.4/include/linux/pipe_fs_i.h
30465 +--- linux-2.6.37.4/include/linux/pipe_fs_i.h 2011-01-04 19:50:19.000000000 -0500
30466 ++++ linux-2.6.37.4/include/linux/pipe_fs_i.h 2011-01-17 02:41:02.000000000 -0500
30467 @@ -45,9 +45,9 @@ struct pipe_buffer {
30468 struct pipe_inode_info {
30469 wait_queue_head_t wait;
30470 @@ -48020,9 +48222,9 @@ diff -urNp linux-2.6.37.3/include/linux/pipe_fs_i.h linux-2.6.37.3/include/linux
30471 unsigned int r_counter;
30472 unsigned int w_counter;
30473 struct page *tmp_page;
30474 -diff -urNp linux-2.6.37.3/include/linux/pm_runtime.h linux-2.6.37.3/include/linux/pm_runtime.h
30475 ---- linux-2.6.37.3/include/linux/pm_runtime.h 2011-01-04 19:50:19.000000000 -0500
30476 -+++ linux-2.6.37.3/include/linux/pm_runtime.h 2011-01-17 02:41:02.000000000 -0500
30477 +diff -urNp linux-2.6.37.4/include/linux/pm_runtime.h linux-2.6.37.4/include/linux/pm_runtime.h
30478 +--- linux-2.6.37.4/include/linux/pm_runtime.h 2011-01-04 19:50:19.000000000 -0500
30479 ++++ linux-2.6.37.4/include/linux/pm_runtime.h 2011-01-17 02:41:02.000000000 -0500
30480 @@ -83,7 +83,7 @@ static inline bool pm_runtime_suspended(
30481
30482 static inline void pm_runtime_mark_last_busy(struct device *dev)
30483 @@ -48032,9 +48234,9 @@ diff -urNp linux-2.6.37.3/include/linux/pm_runtime.h linux-2.6.37.3/include/linu
30484 }
30485
30486 #else /* !CONFIG_PM_RUNTIME */
30487 -diff -urNp linux-2.6.37.3/include/linux/poison.h linux-2.6.37.3/include/linux/poison.h
30488 ---- linux-2.6.37.3/include/linux/poison.h 2011-01-04 19:50:19.000000000 -0500
30489 -+++ linux-2.6.37.3/include/linux/poison.h 2011-01-17 02:41:02.000000000 -0500
30490 +diff -urNp linux-2.6.37.4/include/linux/poison.h linux-2.6.37.4/include/linux/poison.h
30491 +--- linux-2.6.37.4/include/linux/poison.h 2011-01-04 19:50:19.000000000 -0500
30492 ++++ linux-2.6.37.4/include/linux/poison.h 2011-01-17 02:41:02.000000000 -0500
30493 @@ -19,8 +19,8 @@
30494 * under normal circumstances, used to verify that nobody uses
30495 * non-initialized list entries.
30496 @@ -48046,9 +48248,9 @@ diff -urNp linux-2.6.37.3/include/linux/poison.h linux-2.6.37.3/include/linux/po
30497
30498 /********** include/linux/timer.h **********/
30499 /*
30500 -diff -urNp linux-2.6.37.3/include/linux/proc_fs.h linux-2.6.37.3/include/linux/proc_fs.h
30501 ---- linux-2.6.37.3/include/linux/proc_fs.h 2011-01-04 19:50:19.000000000 -0500
30502 -+++ linux-2.6.37.3/include/linux/proc_fs.h 2011-01-17 02:41:02.000000000 -0500
30503 +diff -urNp linux-2.6.37.4/include/linux/proc_fs.h linux-2.6.37.4/include/linux/proc_fs.h
30504 +--- linux-2.6.37.4/include/linux/proc_fs.h 2011-01-04 19:50:19.000000000 -0500
30505 ++++ linux-2.6.37.4/include/linux/proc_fs.h 2011-01-17 02:41:02.000000000 -0500
30506 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
30507 return proc_create_data(name, mode, parent, proc_fops, NULL);
30508 }
30509 @@ -48069,9 +48271,9 @@ diff -urNp linux-2.6.37.3/include/linux/proc_fs.h linux-2.6.37.3/include/linux/p
30510 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
30511 mode_t mode, struct proc_dir_entry *base,
30512 read_proc_t *read_proc, void * data)
30513 -diff -urNp linux-2.6.37.3/include/linux/random.h linux-2.6.37.3/include/linux/random.h
30514 ---- linux-2.6.37.3/include/linux/random.h 2011-01-04 19:50:19.000000000 -0500
30515 -+++ linux-2.6.37.3/include/linux/random.h 2011-01-17 02:41:02.000000000 -0500
30516 +diff -urNp linux-2.6.37.4/include/linux/random.h linux-2.6.37.4/include/linux/random.h
30517 +--- linux-2.6.37.4/include/linux/random.h 2011-01-04 19:50:19.000000000 -0500
30518 ++++ linux-2.6.37.4/include/linux/random.h 2011-01-17 02:41:02.000000000 -0500
30519 @@ -80,12 +80,17 @@ void srandom32(u32 seed);
30520
30521 u32 prandom32(struct rnd_state *);
30522 @@ -48091,9 +48293,9 @@ diff -urNp linux-2.6.37.3/include/linux/random.h linux-2.6.37.3/include/linux/ra
30523 }
30524
30525 /**
30526 -diff -urNp linux-2.6.37.3/include/linux/reiserfs_fs.h linux-2.6.37.3/include/linux/reiserfs_fs.h
30527 ---- linux-2.6.37.3/include/linux/reiserfs_fs.h 2011-01-04 19:50:19.000000000 -0500
30528 -+++ linux-2.6.37.3/include/linux/reiserfs_fs.h 2011-01-17 02:41:02.000000000 -0500
30529 +diff -urNp linux-2.6.37.4/include/linux/reiserfs_fs.h linux-2.6.37.4/include/linux/reiserfs_fs.h
30530 +--- linux-2.6.37.4/include/linux/reiserfs_fs.h 2011-01-04 19:50:19.000000000 -0500
30531 ++++ linux-2.6.37.4/include/linux/reiserfs_fs.h 2011-01-17 02:41:02.000000000 -0500
30532 @@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset
30533 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
30534
30535 @@ -48140,9 +48342,9 @@ diff -urNp linux-2.6.37.3/include/linux/reiserfs_fs.h linux-2.6.37.3/include/lin
30536
30537 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
30538 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
30539 -diff -urNp linux-2.6.37.3/include/linux/reiserfs_fs_sb.h linux-2.6.37.3/include/linux/reiserfs_fs_sb.h
30540 ---- linux-2.6.37.3/include/linux/reiserfs_fs_sb.h 2011-01-04 19:50:19.000000000 -0500
30541 -+++ linux-2.6.37.3/include/linux/reiserfs_fs_sb.h 2011-01-17 02:41:02.000000000 -0500
30542 +diff -urNp linux-2.6.37.4/include/linux/reiserfs_fs_sb.h linux-2.6.37.4/include/linux/reiserfs_fs_sb.h
30543 +--- linux-2.6.37.4/include/linux/reiserfs_fs_sb.h 2011-01-04 19:50:19.000000000 -0500
30544 ++++ linux-2.6.37.4/include/linux/reiserfs_fs_sb.h 2011-01-17 02:41:02.000000000 -0500
30545 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
30546 /* Comment? -Hans */
30547 wait_queue_head_t s_wait;
30548 @@ -48152,9 +48354,9 @@ diff -urNp linux-2.6.37.3/include/linux/reiserfs_fs_sb.h linux-2.6.37.3/include/
30549 // tree gets re-balanced
30550 unsigned long s_properties; /* File system properties. Currently holds
30551 on-disk FS format */
30552 -diff -urNp linux-2.6.37.3/include/linux/rmap.h linux-2.6.37.3/include/linux/rmap.h
30553 ---- linux-2.6.37.3/include/linux/rmap.h 2011-01-04 19:50:19.000000000 -0500
30554 -+++ linux-2.6.37.3/include/linux/rmap.h 2011-01-17 02:41:02.000000000 -0500
30555 +diff -urNp linux-2.6.37.4/include/linux/rmap.h linux-2.6.37.4/include/linux/rmap.h
30556 +--- linux-2.6.37.4/include/linux/rmap.h 2011-01-04 19:50:19.000000000 -0500
30557 ++++ linux-2.6.37.4/include/linux/rmap.h 2011-01-17 02:41:02.000000000 -0500
30558 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc
30559 void anon_vma_init(void); /* create anon_vma_cachep */
30560 int anon_vma_prepare(struct vm_area_struct *);
30561 @@ -48166,9 +48368,9 @@ diff -urNp linux-2.6.37.3/include/linux/rmap.h linux-2.6.37.3/include/linux/rmap
30562 void __anon_vma_link(struct vm_area_struct *);
30563 void anon_vma_free(struct anon_vma *);
30564
30565 -diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sched.h
30566 ---- linux-2.6.37.3/include/linux/sched.h 2011-01-04 19:50:19.000000000 -0500
30567 -+++ linux-2.6.37.3/include/linux/sched.h 2011-01-17 02:41:02.000000000 -0500
30568 +diff -urNp linux-2.6.37.4/include/linux/sched.h linux-2.6.37.4/include/linux/sched.h
30569 +--- linux-2.6.37.4/include/linux/sched.h 2011-01-04 19:50:19.000000000 -0500
30570 ++++ linux-2.6.37.4/include/linux/sched.h 2011-03-21 17:35:08.000000000 -0400
30571 @@ -100,6 +100,7 @@ struct robust_list_head;
30572 struct bio_list;
30573 struct fs_struct;
30574 @@ -48177,7 +48379,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30575
30576 /*
30577 * List of flags we want to share for kernel threads,
30578 -@@ -377,10 +378,12 @@ struct user_namespace;
30579 +@@ -377,10 +378,13 @@ struct user_namespace;
30580 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
30581
30582 extern int sysctl_max_map_count;
30583 @@ -48186,11 +48388,12 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30584 #include <linux/aio.h>
30585
30586 #ifdef CONFIG_MMU
30587 -+extern bool check_heap_stack_gap(struct vm_area_struct *vma, unsigned long addr, unsigned long len);
30588 ++extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
30589 ++extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
30590 extern void arch_pick_mmap_layout(struct mm_struct *mm);
30591 extern unsigned long
30592 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
30593 -@@ -624,6 +627,16 @@ struct signal_struct {
30594 +@@ -624,6 +628,16 @@ struct signal_struct {
30595 struct tty_audit_buf *tty_audit_buf;
30596 #endif
30597
30598 @@ -48207,7 +48410,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30599 int oom_adj; /* OOM kill score adjustment (bit shift) */
30600 int oom_score_adj; /* OOM kill score adjustment */
30601
30602 -@@ -1181,7 +1194,7 @@ enum perf_event_task_context {
30603 +@@ -1181,7 +1195,7 @@ enum perf_event_task_context {
30604
30605 struct task_struct {
30606 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
30607 @@ -48216,7 +48419,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30608 atomic_t usage;
30609 unsigned int flags; /* per process flags, defined below */
30610 unsigned int ptrace;
30611 -@@ -1291,8 +1304,8 @@ struct task_struct {
30612 +@@ -1291,8 +1305,8 @@ struct task_struct {
30613 struct list_head thread_group;
30614
30615 struct completion *vfork_done; /* for vfork() */
30616 @@ -48227,7 +48430,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30617
30618 cputime_t utime, stime, utimescaled, stimescaled;
30619 cputime_t gtime;
30620 -@@ -1308,13 +1321,6 @@ struct task_struct {
30621 +@@ -1308,13 +1322,6 @@ struct task_struct {
30622 struct task_cputime cputime_expires;
30623 struct list_head cpu_timers[3];
30624
30625 @@ -48241,7 +48444,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30626 char comm[TASK_COMM_LEN]; /* executable name excluding path
30627 - access with [gs]et_task_comm (which lock
30628 it with task_lock())
30629 -@@ -1333,6 +1339,10 @@ struct task_struct {
30630 +@@ -1333,6 +1340,10 @@ struct task_struct {
30631 struct thread_struct thread;
30632 /* filesystem information */
30633 struct fs_struct *fs;
30634 @@ -48252,7 +48455,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30635 /* open file information */
30636 struct files_struct *files;
30637 /* namespaces */
30638 -@@ -1379,6 +1389,11 @@ struct task_struct {
30639 +@@ -1379,6 +1390,11 @@ struct task_struct {
30640 struct rt_mutex_waiter *pi_blocked_on;
30641 #endif
30642
30643 @@ -48264,7 +48467,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30644 #ifdef CONFIG_DEBUG_MUTEXES
30645 /* mutex deadlock detection */
30646 struct mutex_waiter *blocked_on;
30647 -@@ -1483,6 +1498,20 @@ struct task_struct {
30648 +@@ -1483,6 +1499,20 @@ struct task_struct {
30649 unsigned long default_timer_slack_ns;
30650
30651 struct list_head *scm_work_list;
30652 @@ -48285,7 +48488,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30653 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
30654 /* Index of current stored address in ret_stack */
30655 int curr_ret_stack;
30656 -@@ -1514,6 +1543,52 @@ struct task_struct {
30657 +@@ -1514,6 +1544,52 @@ struct task_struct {
30658 #endif
30659 };
30660
30661 @@ -48338,7 +48541,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30662 /* Future-safe accessor for struct task_struct's cpus_allowed. */
30663 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
30664
30665 -@@ -2134,7 +2209,7 @@ extern void __cleanup_sighand(struct sig
30666 +@@ -2134,7 +2210,7 @@ extern void __cleanup_sighand(struct sig
30667 extern void exit_itimers(struct signal_struct *);
30668 extern void flush_itimer_signals(void);
30669
30670 @@ -48347,7 +48550,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30671
30672 extern void daemonize(const char *, ...);
30673 extern int allow_signal(int);
30674 -@@ -2259,8 +2334,8 @@ static inline void unlock_task_sighand(s
30675 +@@ -2259,8 +2335,8 @@ static inline void unlock_task_sighand(s
30676
30677 #ifndef __HAVE_THREAD_FUNCTIONS
30678
30679 @@ -48358,7 +48561,7 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30680
30681 static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
30682 {
30683 -@@ -2275,13 +2350,17 @@ static inline unsigned long *end_of_stac
30684 +@@ -2275,13 +2351,17 @@ static inline unsigned long *end_of_stac
30685
30686 #endif
30687
30688 @@ -48378,9 +48581,9 @@ diff -urNp linux-2.6.37.3/include/linux/sched.h linux-2.6.37.3/include/linux/sch
30689 extern void thread_info_cache_init(void);
30690
30691 #ifdef CONFIG_DEBUG_STACK_USAGE
30692 -diff -urNp linux-2.6.37.3/include/linux/screen_info.h linux-2.6.37.3/include/linux/screen_info.h
30693 ---- linux-2.6.37.3/include/linux/screen_info.h 2011-01-04 19:50:19.000000000 -0500
30694 -+++ linux-2.6.37.3/include/linux/screen_info.h 2011-01-17 02:41:02.000000000 -0500
30695 +diff -urNp linux-2.6.37.4/include/linux/screen_info.h linux-2.6.37.4/include/linux/screen_info.h
30696 +--- linux-2.6.37.4/include/linux/screen_info.h 2011-01-04 19:50:19.000000000 -0500
30697 ++++ linux-2.6.37.4/include/linux/screen_info.h 2011-01-17 02:41:02.000000000 -0500
30698 @@ -43,7 +43,8 @@ struct screen_info {
30699 __u16 pages; /* 0x32 */
30700 __u16 vesa_attributes; /* 0x34 */
30701 @@ -48391,9 +48594,9 @@ diff -urNp linux-2.6.37.3/include/linux/screen_info.h linux-2.6.37.3/include/lin
30702 } __attribute__((packed));
30703
30704 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
30705 -diff -urNp linux-2.6.37.3/include/linux/security.h linux-2.6.37.3/include/linux/security.h
30706 ---- linux-2.6.37.3/include/linux/security.h 2011-02-27 14:49:17.000000000 -0500
30707 -+++ linux-2.6.37.3/include/linux/security.h 2011-02-22 16:05:42.000000000 -0500
30708 +diff -urNp linux-2.6.37.4/include/linux/security.h linux-2.6.37.4/include/linux/security.h
30709 +--- linux-2.6.37.4/include/linux/security.h 2011-02-27 14:49:17.000000000 -0500
30710 ++++ linux-2.6.37.4/include/linux/security.h 2011-02-22 16:05:42.000000000 -0500
30711 @@ -35,6 +35,7 @@
30712 #include <linux/key.h>
30713 #include <linux/xfrm.h>
30714 @@ -48402,9 +48605,9 @@ diff -urNp linux-2.6.37.3/include/linux/security.h linux-2.6.37.3/include/linux/
30715 #include <net/flow.h>
30716
30717 /* Maximum number of letters for an LSM name string */
30718 -diff -urNp linux-2.6.37.3/include/linux/shm.h linux-2.6.37.3/include/linux/shm.h
30719 ---- linux-2.6.37.3/include/linux/shm.h 2011-01-04 19:50:19.000000000 -0500
30720 -+++ linux-2.6.37.3/include/linux/shm.h 2011-01-17 02:41:02.000000000 -0500
30721 +diff -urNp linux-2.6.37.4/include/linux/shm.h linux-2.6.37.4/include/linux/shm.h
30722 +--- linux-2.6.37.4/include/linux/shm.h 2011-01-04 19:50:19.000000000 -0500
30723 ++++ linux-2.6.37.4/include/linux/shm.h 2011-01-17 02:41:02.000000000 -0500
30724 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
30725 pid_t shm_cprid;
30726 pid_t shm_lprid;
30727 @@ -48416,9 +48619,9 @@ diff -urNp linux-2.6.37.3/include/linux/shm.h linux-2.6.37.3/include/linux/shm.h
30728 };
30729
30730 /* shm_mode upper byte flags */
30731 -diff -urNp linux-2.6.37.3/include/linux/skbuff.h linux-2.6.37.3/include/linux/skbuff.h
30732 ---- linux-2.6.37.3/include/linux/skbuff.h 2011-01-04 19:50:19.000000000 -0500
30733 -+++ linux-2.6.37.3/include/linux/skbuff.h 2011-01-17 02:41:02.000000000 -0500
30734 +diff -urNp linux-2.6.37.4/include/linux/skbuff.h linux-2.6.37.4/include/linux/skbuff.h
30735 +--- linux-2.6.37.4/include/linux/skbuff.h 2011-01-04 19:50:19.000000000 -0500
30736 ++++ linux-2.6.37.4/include/linux/skbuff.h 2011-01-17 02:41:02.000000000 -0500
30737 @@ -581,7 +581,7 @@ static inline struct skb_shared_hwtstamp
30738 */
30739 static inline int skb_queue_empty(const struct sk_buff_head *list)
30740 @@ -48446,9 +48649,9 @@ diff -urNp linux-2.6.37.3/include/linux/skbuff.h linux-2.6.37.3/include/linux/sk
30741 }
30742
30743 /**
30744 -diff -urNp linux-2.6.37.3/include/linux/slab.h linux-2.6.37.3/include/linux/slab.h
30745 ---- linux-2.6.37.3/include/linux/slab.h 2011-01-04 19:50:19.000000000 -0500
30746 -+++ linux-2.6.37.3/include/linux/slab.h 2011-01-17 02:41:02.000000000 -0500
30747 +diff -urNp linux-2.6.37.4/include/linux/slab.h linux-2.6.37.4/include/linux/slab.h
30748 +--- linux-2.6.37.4/include/linux/slab.h 2011-01-04 19:50:19.000000000 -0500
30749 ++++ linux-2.6.37.4/include/linux/slab.h 2011-01-17 02:41:02.000000000 -0500
30750 @@ -11,6 +11,7 @@
30751
30752 #include <linux/gfp.h>
30753 @@ -48520,9 +48723,9 @@ diff -urNp linux-2.6.37.3/include/linux/slab.h linux-2.6.37.3/include/linux/slab
30754 +})
30755 +
30756 #endif /* _LINUX_SLAB_H */
30757 -diff -urNp linux-2.6.37.3/include/linux/slub_def.h linux-2.6.37.3/include/linux/slub_def.h
30758 ---- linux-2.6.37.3/include/linux/slub_def.h 2011-01-04 19:50:19.000000000 -0500
30759 -+++ linux-2.6.37.3/include/linux/slub_def.h 2011-01-17 02:41:02.000000000 -0500
30760 +diff -urNp linux-2.6.37.4/include/linux/slub_def.h linux-2.6.37.4/include/linux/slub_def.h
30761 +--- linux-2.6.37.4/include/linux/slub_def.h 2011-01-04 19:50:19.000000000 -0500
30762 ++++ linux-2.6.37.4/include/linux/slub_def.h 2011-01-17 02:41:02.000000000 -0500
30763 @@ -80,7 +80,7 @@ struct kmem_cache {
30764 struct kmem_cache_order_objects max;
30765 struct kmem_cache_order_objects min;
30766 @@ -48532,9 +48735,9 @@ diff -urNp linux-2.6.37.3/include/linux/slub_def.h linux-2.6.37.3/include/linux/
30767 void (*ctor)(void *);
30768 int inuse; /* Offset to metadata */
30769 int align; /* Alignment */
30770 -diff -urNp linux-2.6.37.3/include/linux/sonet.h linux-2.6.37.3/include/linux/sonet.h
30771 ---- linux-2.6.37.3/include/linux/sonet.h 2011-01-04 19:50:19.000000000 -0500
30772 -+++ linux-2.6.37.3/include/linux/sonet.h 2011-01-17 02:41:02.000000000 -0500
30773 +diff -urNp linux-2.6.37.4/include/linux/sonet.h linux-2.6.37.4/include/linux/sonet.h
30774 +--- linux-2.6.37.4/include/linux/sonet.h 2011-01-04 19:50:19.000000000 -0500
30775 ++++ linux-2.6.37.4/include/linux/sonet.h 2011-01-17 02:41:02.000000000 -0500
30776 @@ -61,7 +61,7 @@ struct sonet_stats {
30777 #include <asm/atomic.h>
30778
30779 @@ -48544,9 +48747,9 @@ diff -urNp linux-2.6.37.3/include/linux/sonet.h linux-2.6.37.3/include/linux/son
30780 __SONET_ITEMS
30781 #undef __HANDLE_ITEM
30782 };
30783 -diff -urNp linux-2.6.37.3/include/linux/sunrpc/clnt.h linux-2.6.37.3/include/linux/sunrpc/clnt.h
30784 ---- linux-2.6.37.3/include/linux/sunrpc/clnt.h 2011-01-04 19:50:19.000000000 -0500
30785 -+++ linux-2.6.37.3/include/linux/sunrpc/clnt.h 2011-01-17 02:41:02.000000000 -0500
30786 +diff -urNp linux-2.6.37.4/include/linux/sunrpc/clnt.h linux-2.6.37.4/include/linux/sunrpc/clnt.h
30787 +--- linux-2.6.37.4/include/linux/sunrpc/clnt.h 2011-01-04 19:50:19.000000000 -0500
30788 ++++ linux-2.6.37.4/include/linux/sunrpc/clnt.h 2011-01-17 02:41:02.000000000 -0500
30789 @@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por
30790 {
30791 switch (sap->sa_family) {
30792 @@ -48577,9 +48780,9 @@ diff -urNp linux-2.6.37.3/include/linux/sunrpc/clnt.h linux-2.6.37.3/include/lin
30793 }
30794
30795 #endif /* __KERNEL__ */
30796 -diff -urNp linux-2.6.37.3/include/linux/suspend.h linux-2.6.37.3/include/linux/suspend.h
30797 ---- linux-2.6.37.3/include/linux/suspend.h 2011-01-04 19:50:19.000000000 -0500
30798 -+++ linux-2.6.37.3/include/linux/suspend.h 2011-01-17 02:41:02.000000000 -0500
30799 +diff -urNp linux-2.6.37.4/include/linux/suspend.h linux-2.6.37.4/include/linux/suspend.h
30800 +--- linux-2.6.37.4/include/linux/suspend.h 2011-01-04 19:50:19.000000000 -0500
30801 ++++ linux-2.6.37.4/include/linux/suspend.h 2011-01-17 02:41:02.000000000 -0500
30802 @@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
30803 * which require special recovery actions in that situation.
30804 */
30805 @@ -48668,9 +48871,9 @@ diff -urNp linux-2.6.37.3/include/linux/suspend.h linux-2.6.37.3/include/linux/s
30806 static inline int hibernate(void) { return -ENOSYS; }
30807 static inline bool system_entering_hibernation(void) { return false; }
30808 #endif /* CONFIG_HIBERNATION */
30809 -diff -urNp linux-2.6.37.3/include/linux/sysctl.h linux-2.6.37.3/include/linux/sysctl.h
30810 ---- linux-2.6.37.3/include/linux/sysctl.h 2011-01-04 19:50:19.000000000 -0500
30811 -+++ linux-2.6.37.3/include/linux/sysctl.h 2011-01-17 02:41:02.000000000 -0500
30812 +diff -urNp linux-2.6.37.4/include/linux/sysctl.h linux-2.6.37.4/include/linux/sysctl.h
30813 +--- linux-2.6.37.4/include/linux/sysctl.h 2011-01-04 19:50:19.000000000 -0500
30814 ++++ linux-2.6.37.4/include/linux/sysctl.h 2011-01-17 02:41:02.000000000 -0500
30815 @@ -155,7 +155,11 @@ enum
30816 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
30817 };
30818 @@ -48693,9 +48896,9 @@ diff -urNp linux-2.6.37.3/include/linux/sysctl.h linux-2.6.37.3/include/linux/sy
30819 extern int proc_dointvec(struct ctl_table *, int,
30820 void __user *, size_t *, loff_t *);
30821 extern int proc_dointvec_minmax(struct ctl_table *, int,
30822 -diff -urNp linux-2.6.37.3/include/linux/sysfs.h linux-2.6.37.3/include/linux/sysfs.h
30823 ---- linux-2.6.37.3/include/linux/sysfs.h 2011-01-04 19:50:19.000000000 -0500
30824 -+++ linux-2.6.37.3/include/linux/sysfs.h 2011-01-17 02:41:02.000000000 -0500
30825 +diff -urNp linux-2.6.37.4/include/linux/sysfs.h linux-2.6.37.4/include/linux/sysfs.h
30826 +--- linux-2.6.37.4/include/linux/sysfs.h 2011-01-04 19:50:19.000000000 -0500
30827 ++++ linux-2.6.37.4/include/linux/sysfs.h 2011-01-17 02:41:02.000000000 -0500
30828 @@ -110,8 +110,8 @@ struct bin_attribute {
30829 #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
30830
30831 @@ -48707,9 +48910,9 @@ diff -urNp linux-2.6.37.3/include/linux/sysfs.h linux-2.6.37.3/include/linux/sys
30832 };
30833
30834 struct sysfs_dirent;
30835 -diff -urNp linux-2.6.37.3/include/linux/tty.h linux-2.6.37.3/include/linux/tty.h
30836 ---- linux-2.6.37.3/include/linux/tty.h 2011-01-04 19:50:19.000000000 -0500
30837 -+++ linux-2.6.37.3/include/linux/tty.h 2011-01-17 02:41:02.000000000 -0500
30838 +diff -urNp linux-2.6.37.4/include/linux/tty.h linux-2.6.37.4/include/linux/tty.h
30839 +--- linux-2.6.37.4/include/linux/tty.h 2011-01-04 19:50:19.000000000 -0500
30840 ++++ linux-2.6.37.4/include/linux/tty.h 2011-01-17 02:41:02.000000000 -0500
30841 @@ -13,6 +13,8 @@
30842 #include <linux/tty_driver.h>
30843 #include <linux/tty_ldisc.h>
30844 @@ -48746,9 +48949,9 @@ diff -urNp linux-2.6.37.3/include/linux/tty.h linux-2.6.37.3/include/linux/tty.h
30845
30846 /* n_tty.c */
30847 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
30848 -diff -urNp linux-2.6.37.3/include/linux/tty_ldisc.h linux-2.6.37.3/include/linux/tty_ldisc.h
30849 ---- linux-2.6.37.3/include/linux/tty_ldisc.h 2011-01-04 19:50:19.000000000 -0500
30850 -+++ linux-2.6.37.3/include/linux/tty_ldisc.h 2011-01-17 02:41:02.000000000 -0500
30851 +diff -urNp linux-2.6.37.4/include/linux/tty_ldisc.h linux-2.6.37.4/include/linux/tty_ldisc.h
30852 +--- linux-2.6.37.4/include/linux/tty_ldisc.h 2011-01-04 19:50:19.000000000 -0500
30853 ++++ linux-2.6.37.4/include/linux/tty_ldisc.h 2011-01-17 02:41:02.000000000 -0500
30854 @@ -147,7 +147,7 @@ struct tty_ldisc_ops {
30855
30856 struct module *owner;
30857 @@ -48758,9 +48961,9 @@ diff -urNp linux-2.6.37.3/include/linux/tty_ldisc.h linux-2.6.37.3/include/linux
30858 };
30859
30860 struct tty_ldisc {
30861 -diff -urNp linux-2.6.37.3/include/linux/types.h linux-2.6.37.3/include/linux/types.h
30862 ---- linux-2.6.37.3/include/linux/types.h 2011-01-04 19:50:19.000000000 -0500
30863 -+++ linux-2.6.37.3/include/linux/types.h 2011-01-17 02:41:02.000000000 -0500
30864 +diff -urNp linux-2.6.37.4/include/linux/types.h linux-2.6.37.4/include/linux/types.h
30865 +--- linux-2.6.37.4/include/linux/types.h 2011-01-04 19:50:19.000000000 -0500
30866 ++++ linux-2.6.37.4/include/linux/types.h 2011-01-17 02:41:02.000000000 -0500
30867 @@ -207,10 +207,26 @@ typedef struct {
30868 int counter;
30869 } atomic_t;
30870 @@ -48788,9 +48991,9 @@ diff -urNp linux-2.6.37.3/include/linux/types.h linux-2.6.37.3/include/linux/typ
30871 #endif
30872
30873 struct list_head {
30874 -diff -urNp linux-2.6.37.3/include/linux/u64_stats_sync.h linux-2.6.37.3/include/linux/u64_stats_sync.h
30875 ---- linux-2.6.37.3/include/linux/u64_stats_sync.h 2011-01-04 19:50:19.000000000 -0500
30876 -+++ linux-2.6.37.3/include/linux/u64_stats_sync.h 2011-01-17 02:41:02.000000000 -0500
30877 +diff -urNp linux-2.6.37.4/include/linux/u64_stats_sync.h linux-2.6.37.4/include/linux/u64_stats_sync.h
30878 +--- linux-2.6.37.4/include/linux/u64_stats_sync.h 2011-01-04 19:50:19.000000000 -0500
30879 ++++ linux-2.6.37.4/include/linux/u64_stats_sync.h 2011-01-17 02:41:02.000000000 -0500
30880 @@ -67,21 +67,21 @@ struct u64_stats_sync {
30881 #endif
30882 };
30883 @@ -48843,9 +49046,9 @@ diff -urNp linux-2.6.37.3/include/linux/u64_stats_sync.h linux-2.6.37.3/include/
30884 unsigned int start)
30885 {
30886 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
30887 -diff -urNp linux-2.6.37.3/include/linux/uaccess.h linux-2.6.37.3/include/linux/uaccess.h
30888 ---- linux-2.6.37.3/include/linux/uaccess.h 2011-01-04 19:50:19.000000000 -0500
30889 -+++ linux-2.6.37.3/include/linux/uaccess.h 2011-01-17 02:41:02.000000000 -0500
30890 +diff -urNp linux-2.6.37.4/include/linux/uaccess.h linux-2.6.37.4/include/linux/uaccess.h
30891 +--- linux-2.6.37.4/include/linux/uaccess.h 2011-01-04 19:50:19.000000000 -0500
30892 ++++ linux-2.6.37.4/include/linux/uaccess.h 2011-01-17 02:41:02.000000000 -0500
30893 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
30894 long ret; \
30895 mm_segment_t old_fs = get_fs(); \
30896 @@ -48881,9 +49084,9 @@ diff -urNp linux-2.6.37.3/include/linux/uaccess.h linux-2.6.37.3/include/linux/u
30897 +extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
30898
30899 #endif /* __LINUX_UACCESS_H__ */
30900 -diff -urNp linux-2.6.37.3/include/linux/unaligned/access_ok.h linux-2.6.37.3/include/linux/unaligned/access_ok.h
30901 ---- linux-2.6.37.3/include/linux/unaligned/access_ok.h 2011-01-04 19:50:19.000000000 -0500
30902 -+++ linux-2.6.37.3/include/linux/unaligned/access_ok.h 2011-01-17 02:41:02.000000000 -0500
30903 +diff -urNp linux-2.6.37.4/include/linux/unaligned/access_ok.h linux-2.6.37.4/include/linux/unaligned/access_ok.h
30904 +--- linux-2.6.37.4/include/linux/unaligned/access_ok.h 2011-01-04 19:50:19.000000000 -0500
30905 ++++ linux-2.6.37.4/include/linux/unaligned/access_ok.h 2011-01-17 02:41:02.000000000 -0500
30906 @@ -6,32 +6,32 @@
30907
30908 static inline u16 get_unaligned_le16(const void *p)
30909 @@ -48923,9 +49126,9 @@ diff -urNp linux-2.6.37.3/include/linux/unaligned/access_ok.h linux-2.6.37.3/inc
30910 }
30911
30912 static inline void put_unaligned_le16(u16 val, void *p)
30913 -diff -urNp linux-2.6.37.3/include/linux/usb/hcd.h linux-2.6.37.3/include/linux/usb/hcd.h
30914 ---- linux-2.6.37.3/include/linux/usb/hcd.h 2011-02-22 16:05:31.000000000 -0500
30915 -+++ linux-2.6.37.3/include/linux/usb/hcd.h 2011-02-22 16:05:42.000000000 -0500
30916 +diff -urNp linux-2.6.37.4/include/linux/usb/hcd.h linux-2.6.37.4/include/linux/usb/hcd.h
30917 +--- linux-2.6.37.4/include/linux/usb/hcd.h 2011-02-22 16:05:31.000000000 -0500
30918 ++++ linux-2.6.37.4/include/linux/usb/hcd.h 2011-02-22 16:05:42.000000000 -0500
30919 @@ -581,7 +581,7 @@ struct usb_mon_operations {
30920 /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
30921 };
30922 @@ -48944,9 +49147,9 @@ diff -urNp linux-2.6.37.3/include/linux/usb/hcd.h linux-2.6.37.3/include/linux/u
30923 void usb_mon_deregister(void);
30924
30925 #else
30926 -diff -urNp linux-2.6.37.3/include/linux/vmalloc.h linux-2.6.37.3/include/linux/vmalloc.h
30927 ---- linux-2.6.37.3/include/linux/vmalloc.h 2011-01-04 19:50:19.000000000 -0500
30928 -+++ linux-2.6.37.3/include/linux/vmalloc.h 2011-01-17 02:41:02.000000000 -0500
30929 +diff -urNp linux-2.6.37.4/include/linux/vmalloc.h linux-2.6.37.4/include/linux/vmalloc.h
30930 +--- linux-2.6.37.4/include/linux/vmalloc.h 2011-01-04 19:50:19.000000000 -0500
30931 ++++ linux-2.6.37.4/include/linux/vmalloc.h 2011-01-17 02:41:02.000000000 -0500
30932 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
30933 #define VM_MAP 0x00000004 /* vmap()ed pages */
30934 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
30935 @@ -49063,9 +49266,9 @@ diff -urNp linux-2.6.37.3/include/linux/vmalloc.h linux-2.6.37.3/include/linux/v
30936 +})
30937 +
30938 #endif /* _LINUX_VMALLOC_H */
30939 -diff -urNp linux-2.6.37.3/include/linux/vmstat.h linux-2.6.37.3/include/linux/vmstat.h
30940 ---- linux-2.6.37.3/include/linux/vmstat.h 2011-03-11 17:22:42.000000000 -0500
30941 -+++ linux-2.6.37.3/include/linux/vmstat.h 2011-03-11 17:23:06.000000000 -0500
30942 +diff -urNp linux-2.6.37.4/include/linux/vmstat.h linux-2.6.37.4/include/linux/vmstat.h
30943 +--- linux-2.6.37.4/include/linux/vmstat.h 2011-03-11 17:22:42.000000000 -0500
30944 ++++ linux-2.6.37.4/include/linux/vmstat.h 2011-03-11 17:23:06.000000000 -0500
30945 @@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in
30946 /*
30947 * Zone based page accounting with per cpu differentials.
30948 @@ -49129,9 +49332,9 @@ diff -urNp linux-2.6.37.3/include/linux/vmstat.h linux-2.6.37.3/include/linux/vm
30949 }
30950
30951 static inline void __dec_zone_page_state(struct page *page,
30952 -diff -urNp linux-2.6.37.3/include/net/inetpeer.h linux-2.6.37.3/include/net/inetpeer.h
30953 ---- linux-2.6.37.3/include/net/inetpeer.h 2011-01-04 19:50:19.000000000 -0500
30954 -+++ linux-2.6.37.3/include/net/inetpeer.h 2011-01-17 02:41:02.000000000 -0500
30955 +diff -urNp linux-2.6.37.4/include/net/inetpeer.h linux-2.6.37.4/include/net/inetpeer.h
30956 +--- linux-2.6.37.4/include/net/inetpeer.h 2011-01-04 19:50:19.000000000 -0500
30957 ++++ linux-2.6.37.4/include/net/inetpeer.h 2011-01-17 02:41:02.000000000 -0500
30958 @@ -30,8 +30,8 @@ struct inet_peer {
30959 */
30960 union {
30961 @@ -49152,9 +49355,9 @@ diff -urNp linux-2.6.37.3/include/net/inetpeer.h linux-2.6.37.3/include/net/inet
30962 }
30963
30964 #endif /* _NET_INETPEER_H */
30965 -diff -urNp linux-2.6.37.3/include/net/irda/ircomm_tty.h linux-2.6.37.3/include/net/irda/ircomm_tty.h
30966 ---- linux-2.6.37.3/include/net/irda/ircomm_tty.h 2011-01-04 19:50:19.000000000 -0500
30967 -+++ linux-2.6.37.3/include/net/irda/ircomm_tty.h 2011-01-25 20:24:56.000000000 -0500
30968 +diff -urNp linux-2.6.37.4/include/net/irda/ircomm_tty.h linux-2.6.37.4/include/net/irda/ircomm_tty.h
30969 +--- linux-2.6.37.4/include/net/irda/ircomm_tty.h 2011-01-04 19:50:19.000000000 -0500
30970 ++++ linux-2.6.37.4/include/net/irda/ircomm_tty.h 2011-01-25 20:24:56.000000000 -0500
30971 @@ -35,6 +35,7 @@
30972 #include <linux/termios.h>
30973 #include <linux/timer.h>
30974 @@ -49174,9 +49377,9 @@ diff -urNp linux-2.6.37.3/include/net/irda/ircomm_tty.h linux-2.6.37.3/include/n
30975
30976 /* Protect concurent access to :
30977 * o self->open_count
30978 -diff -urNp linux-2.6.37.3/include/net/neighbour.h linux-2.6.37.3/include/net/neighbour.h
30979 ---- linux-2.6.37.3/include/net/neighbour.h 2011-01-04 19:50:19.000000000 -0500
30980 -+++ linux-2.6.37.3/include/net/neighbour.h 2011-01-17 02:41:02.000000000 -0500
30981 +diff -urNp linux-2.6.37.4/include/net/neighbour.h linux-2.6.37.4/include/net/neighbour.h
30982 +--- linux-2.6.37.4/include/net/neighbour.h 2011-01-04 19:50:19.000000000 -0500
30983 ++++ linux-2.6.37.4/include/net/neighbour.h 2011-01-17 02:41:02.000000000 -0500
30984 @@ -118,12 +118,12 @@ struct neighbour {
30985
30986 struct neigh_ops {
30987 @@ -49196,9 +49399,9 @@ diff -urNp linux-2.6.37.3/include/net/neighbour.h linux-2.6.37.3/include/net/nei
30988 };
30989
30990 struct pneigh_entry {
30991 -diff -urNp linux-2.6.37.3/include/net/netlink.h linux-2.6.37.3/include/net/netlink.h
30992 ---- linux-2.6.37.3/include/net/netlink.h 2011-01-04 19:50:19.000000000 -0500
30993 -+++ linux-2.6.37.3/include/net/netlink.h 2011-01-17 02:41:02.000000000 -0500
30994 +diff -urNp linux-2.6.37.4/include/net/netlink.h linux-2.6.37.4/include/net/netlink.h
30995 +--- linux-2.6.37.4/include/net/netlink.h 2011-01-04 19:50:19.000000000 -0500
30996 ++++ linux-2.6.37.4/include/net/netlink.h 2011-01-17 02:41:02.000000000 -0500
30997 @@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
30998 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
30999 {
31000 @@ -49208,9 +49411,9 @@ diff -urNp linux-2.6.37.3/include/net/netlink.h linux-2.6.37.3/include/net/netli
31001 }
31002
31003 /**
31004 -diff -urNp linux-2.6.37.3/include/net/sctp/sctp.h linux-2.6.37.3/include/net/sctp/sctp.h
31005 ---- linux-2.6.37.3/include/net/sctp/sctp.h 2011-01-04 19:50:19.000000000 -0500
31006 -+++ linux-2.6.37.3/include/net/sctp/sctp.h 2011-01-17 02:41:02.000000000 -0500
31007 +diff -urNp linux-2.6.37.4/include/net/sctp/sctp.h linux-2.6.37.4/include/net/sctp/sctp.h
31008 +--- linux-2.6.37.4/include/net/sctp/sctp.h 2011-01-04 19:50:19.000000000 -0500
31009 ++++ linux-2.6.37.4/include/net/sctp/sctp.h 2011-01-17 02:41:02.000000000 -0500
31010 @@ -316,9 +316,9 @@ do { \
31011
31012 #else /* SCTP_DEBUG */
31013 @@ -49224,9 +49427,9 @@ diff -urNp linux-2.6.37.3/include/net/sctp/sctp.h linux-2.6.37.3/include/net/sct
31014 #define SCTP_ENABLE_DEBUG
31015 #define SCTP_DISABLE_DEBUG
31016 #define SCTP_ASSERT(expr, str, func)
31017 -diff -urNp linux-2.6.37.3/include/net/tcp.h linux-2.6.37.3/include/net/tcp.h
31018 ---- linux-2.6.37.3/include/net/tcp.h 2011-01-04 19:50:19.000000000 -0500
31019 -+++ linux-2.6.37.3/include/net/tcp.h 2011-01-17 02:41:02.000000000 -0500
31020 +diff -urNp linux-2.6.37.4/include/net/tcp.h linux-2.6.37.4/include/net/tcp.h
31021 +--- linux-2.6.37.4/include/net/tcp.h 2011-01-04 19:50:19.000000000 -0500
31022 ++++ linux-2.6.37.4/include/net/tcp.h 2011-01-17 02:41:02.000000000 -0500
31023 @@ -1380,6 +1380,7 @@ enum tcp_seq_states {
31024 struct tcp_seq_afinfo {
31025 char *name;
31026 @@ -49235,9 +49438,9 @@ diff -urNp linux-2.6.37.3/include/net/tcp.h linux-2.6.37.3/include/net/tcp.h
31027 struct file_operations seq_fops;
31028 struct seq_operations seq_ops;
31029 };
31030 -diff -urNp linux-2.6.37.3/include/net/udp.h linux-2.6.37.3/include/net/udp.h
31031 ---- linux-2.6.37.3/include/net/udp.h 2011-01-04 19:50:19.000000000 -0500
31032 -+++ linux-2.6.37.3/include/net/udp.h 2011-01-17 02:41:02.000000000 -0500
31033 +diff -urNp linux-2.6.37.4/include/net/udp.h linux-2.6.37.4/include/net/udp.h
31034 +--- linux-2.6.37.4/include/net/udp.h 2011-01-04 19:50:19.000000000 -0500
31035 ++++ linux-2.6.37.4/include/net/udp.h 2011-01-17 02:41:02.000000000 -0500
31036 @@ -223,6 +223,7 @@ struct udp_seq_afinfo {
31037 char *name;
31038 sa_family_t family;
31039 @@ -49246,9 +49449,9 @@ diff -urNp linux-2.6.37.3/include/net/udp.h linux-2.6.37.3/include/net/udp.h
31040 struct file_operations seq_fops;
31041 struct seq_operations seq_ops;
31042 };
31043 -diff -urNp linux-2.6.37.3/include/sound/ac97_codec.h linux-2.6.37.3/include/sound/ac97_codec.h
31044 ---- linux-2.6.37.3/include/sound/ac97_codec.h 2011-01-04 19:50:19.000000000 -0500
31045 -+++ linux-2.6.37.3/include/sound/ac97_codec.h 2011-01-17 02:41:02.000000000 -0500
31046 +diff -urNp linux-2.6.37.4/include/sound/ac97_codec.h linux-2.6.37.4/include/sound/ac97_codec.h
31047 +--- linux-2.6.37.4/include/sound/ac97_codec.h 2011-01-04 19:50:19.000000000 -0500
31048 ++++ linux-2.6.37.4/include/sound/ac97_codec.h 2011-01-17 02:41:02.000000000 -0500
31049 @@ -419,15 +419,15 @@
31050 struct snd_ac97;
31051
31052 @@ -49281,9 +49484,9 @@ diff -urNp linux-2.6.37.3/include/sound/ac97_codec.h linux-2.6.37.3/include/soun
31053 void *private_data;
31054 void (*private_free) (struct snd_ac97 *ac97);
31055 /* --- */
31056 -diff -urNp linux-2.6.37.3/include/trace/events/irq.h linux-2.6.37.3/include/trace/events/irq.h
31057 ---- linux-2.6.37.3/include/trace/events/irq.h 2011-01-04 19:50:19.000000000 -0500
31058 -+++ linux-2.6.37.3/include/trace/events/irq.h 2011-01-17 02:41:02.000000000 -0500
31059 +diff -urNp linux-2.6.37.4/include/trace/events/irq.h linux-2.6.37.4/include/trace/events/irq.h
31060 +--- linux-2.6.37.4/include/trace/events/irq.h 2011-01-04 19:50:19.000000000 -0500
31061 ++++ linux-2.6.37.4/include/trace/events/irq.h 2011-01-17 02:41:02.000000000 -0500
31062 @@ -36,7 +36,7 @@ struct softirq_action;
31063 */
31064 TRACE_EVENT(irq_handler_entry,
31065 @@ -49302,9 +49505,9 @@ diff -urNp linux-2.6.37.3/include/trace/events/irq.h linux-2.6.37.3/include/trac
31066
31067 TP_ARGS(irq, action, ret),
31068
31069 -diff -urNp linux-2.6.37.3/include/video/uvesafb.h linux-2.6.37.3/include/video/uvesafb.h
31070 ---- linux-2.6.37.3/include/video/uvesafb.h 2011-01-04 19:50:19.000000000 -0500
31071 -+++ linux-2.6.37.3/include/video/uvesafb.h 2011-01-17 02:41:02.000000000 -0500
31072 +diff -urNp linux-2.6.37.4/include/video/uvesafb.h linux-2.6.37.4/include/video/uvesafb.h
31073 +--- linux-2.6.37.4/include/video/uvesafb.h 2011-01-04 19:50:19.000000000 -0500
31074 ++++ linux-2.6.37.4/include/video/uvesafb.h 2011-01-17 02:41:02.000000000 -0500
31075 @@ -177,6 +177,7 @@ struct uvesafb_par {
31076 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
31077 u8 pmi_setpal; /* PMI for palette changes */
31078 @@ -49313,9 +49516,9 @@ diff -urNp linux-2.6.37.3/include/video/uvesafb.h linux-2.6.37.3/include/video/u
31079 void *pmi_start;
31080 void *pmi_pal;
31081 u8 *vbe_state_orig; /*
31082 -diff -urNp linux-2.6.37.3/init/do_mounts.c linux-2.6.37.3/init/do_mounts.c
31083 ---- linux-2.6.37.3/init/do_mounts.c 2011-01-04 19:50:19.000000000 -0500
31084 -+++ linux-2.6.37.3/init/do_mounts.c 2011-01-17 02:41:02.000000000 -0500
31085 +diff -urNp linux-2.6.37.4/init/do_mounts.c linux-2.6.37.4/init/do_mounts.c
31086 +--- linux-2.6.37.4/init/do_mounts.c 2011-01-04 19:50:19.000000000 -0500
31087 ++++ linux-2.6.37.4/init/do_mounts.c 2011-01-17 02:41:02.000000000 -0500
31088 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
31089
31090 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
31091 @@ -49355,9 +49558,9 @@ diff -urNp linux-2.6.37.3/init/do_mounts.c linux-2.6.37.3/init/do_mounts.c
31092 + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
31093 sys_chroot((const char __user __force *)".");
31094 }
31095 -diff -urNp linux-2.6.37.3/init/do_mounts.h linux-2.6.37.3/init/do_mounts.h
31096 ---- linux-2.6.37.3/init/do_mounts.h 2011-01-04 19:50:19.000000000 -0500
31097 -+++ linux-2.6.37.3/init/do_mounts.h 2011-01-17 02:41:02.000000000 -0500
31098 +diff -urNp linux-2.6.37.4/init/do_mounts.h linux-2.6.37.4/init/do_mounts.h
31099 +--- linux-2.6.37.4/init/do_mounts.h 2011-01-04 19:50:19.000000000 -0500
31100 ++++ linux-2.6.37.4/init/do_mounts.h 2011-01-17 02:41:02.000000000 -0500
31101 @@ -15,15 +15,15 @@ extern int root_mountflags;
31102
31103 static inline int create_dev(char *name, dev_t dev)
31104 @@ -49377,9 +49580,9 @@ diff -urNp linux-2.6.37.3/init/do_mounts.h linux-2.6.37.3/init/do_mounts.h
31105 return 0;
31106 if (!S_ISBLK(stat.st_mode))
31107 return 0;
31108 -diff -urNp linux-2.6.37.3/init/do_mounts_initrd.c linux-2.6.37.3/init/do_mounts_initrd.c
31109 ---- linux-2.6.37.3/init/do_mounts_initrd.c 2011-01-04 19:50:19.000000000 -0500
31110 -+++ linux-2.6.37.3/init/do_mounts_initrd.c 2011-01-17 02:41:02.000000000 -0500
31111 +diff -urNp linux-2.6.37.4/init/do_mounts_initrd.c linux-2.6.37.4/init/do_mounts_initrd.c
31112 +--- linux-2.6.37.4/init/do_mounts_initrd.c 2011-01-04 19:50:19.000000000 -0500
31113 ++++ linux-2.6.37.4/init/do_mounts_initrd.c 2011-01-17 02:41:02.000000000 -0500
31114 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
31115 create_dev("/dev/root.old", Root_RAM0);
31116 /* mount initrd on rootfs' /root */
31117 @@ -49454,9 +49657,9 @@ diff -urNp linux-2.6.37.3/init/do_mounts_initrd.c linux-2.6.37.3/init/do_mounts_
31118 + sys_unlink((__force const char __user *)"/initrd.image");
31119 return 0;
31120 }
31121 -diff -urNp linux-2.6.37.3/init/do_mounts_md.c linux-2.6.37.3/init/do_mounts_md.c
31122 ---- linux-2.6.37.3/init/do_mounts_md.c 2011-01-04 19:50:19.000000000 -0500
31123 -+++ linux-2.6.37.3/init/do_mounts_md.c 2011-01-17 02:41:02.000000000 -0500
31124 +diff -urNp linux-2.6.37.4/init/do_mounts_md.c linux-2.6.37.4/init/do_mounts_md.c
31125 +--- linux-2.6.37.4/init/do_mounts_md.c 2011-01-04 19:50:19.000000000 -0500
31126 ++++ linux-2.6.37.4/init/do_mounts_md.c 2011-01-17 02:41:02.000000000 -0500
31127 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
31128 partitioned ? "_d" : "", minor,
31129 md_setup_args[ent].device_names);
31130 @@ -49475,9 +49678,9 @@ diff -urNp linux-2.6.37.3/init/do_mounts_md.c linux-2.6.37.3/init/do_mounts_md.c
31131 sys_ioctl(fd, BLKRRPART, 0);
31132 }
31133 sys_close(fd);
31134 -diff -urNp linux-2.6.37.3/init/initramfs.c linux-2.6.37.3/init/initramfs.c
31135 ---- linux-2.6.37.3/init/initramfs.c 2011-01-04 19:50:19.000000000 -0500
31136 -+++ linux-2.6.37.3/init/initramfs.c 2011-01-17 02:41:02.000000000 -0500
31137 +diff -urNp linux-2.6.37.4/init/initramfs.c linux-2.6.37.4/init/initramfs.c
31138 +--- linux-2.6.37.4/init/initramfs.c 2011-01-04 19:50:19.000000000 -0500
31139 ++++ linux-2.6.37.4/init/initramfs.c 2011-01-17 02:41:02.000000000 -0500
31140 @@ -74,7 +74,7 @@ static void __init free_hash(void)
31141 }
31142 }
31143 @@ -49586,9 +49789,9 @@ diff -urNp linux-2.6.37.3/init/initramfs.c linux-2.6.37.3/init/initramfs.c
31144 state = SkipIt;
31145 next_state = Reset;
31146 return 0;
31147 -diff -urNp linux-2.6.37.3/init/Kconfig linux-2.6.37.3/init/Kconfig
31148 ---- linux-2.6.37.3/init/Kconfig 2011-01-04 19:50:19.000000000 -0500
31149 -+++ linux-2.6.37.3/init/Kconfig 2011-01-17 02:41:02.000000000 -0500
31150 +diff -urNp linux-2.6.37.4/init/Kconfig linux-2.6.37.4/init/Kconfig
31151 +--- linux-2.6.37.4/init/Kconfig 2011-01-04 19:50:19.000000000 -0500
31152 ++++ linux-2.6.37.4/init/Kconfig 2011-01-17 02:41:02.000000000 -0500
31153 @@ -1108,7 +1108,7 @@ config SLUB_DEBUG
31154
31155 config COMPAT_BRK
31156 @@ -49598,9 +49801,9 @@ diff -urNp linux-2.6.37.3/init/Kconfig linux-2.6.37.3/init/Kconfig
31157 help
31158 Randomizing heap placement makes heap exploits harder, but it
31159 also breaks ancient binaries (including anything libc5 based).
31160 -diff -urNp linux-2.6.37.3/init/main.c linux-2.6.37.3/init/main.c
31161 ---- linux-2.6.37.3/init/main.c 2011-01-04 19:50:19.000000000 -0500
31162 -+++ linux-2.6.37.3/init/main.c 2011-01-17 02:41:02.000000000 -0500
31163 +diff -urNp linux-2.6.37.4/init/main.c linux-2.6.37.4/init/main.c
31164 +--- linux-2.6.37.4/init/main.c 2011-01-04 19:50:19.000000000 -0500
31165 ++++ linux-2.6.37.4/init/main.c 2011-01-17 02:41:02.000000000 -0500
31166 @@ -94,6 +94,7 @@ static inline void mark_rodata_ro(void)
31167 #ifdef CONFIG_TC
31168 extern void tc_init(void);
31169 @@ -49709,9 +49912,9 @@ diff -urNp linux-2.6.37.3/init/main.c linux-2.6.37.3/init/main.c
31170 /*
31171 * Ok, we have completed the initial bootup, and
31172 * we're essentially up and running. Get rid of the
31173 -diff -urNp linux-2.6.37.3/ipc/mqueue.c linux-2.6.37.3/ipc/mqueue.c
31174 ---- linux-2.6.37.3/ipc/mqueue.c 2011-01-04 19:50:19.000000000 -0500
31175 -+++ linux-2.6.37.3/ipc/mqueue.c 2011-01-17 02:41:02.000000000 -0500
31176 +diff -urNp linux-2.6.37.4/ipc/mqueue.c linux-2.6.37.4/ipc/mqueue.c
31177 +--- linux-2.6.37.4/ipc/mqueue.c 2011-01-04 19:50:19.000000000 -0500
31178 ++++ linux-2.6.37.4/ipc/mqueue.c 2011-01-17 02:41:02.000000000 -0500
31179 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
31180 mq_bytes = (mq_msg_tblsz +
31181 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
31182 @@ -49720,9 +49923,9 @@ diff -urNp linux-2.6.37.3/ipc/mqueue.c linux-2.6.37.3/ipc/mqueue.c
31183 spin_lock(&mq_lock);
31184 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
31185 u->mq_bytes + mq_bytes >
31186 -diff -urNp linux-2.6.37.3/ipc/shm.c linux-2.6.37.3/ipc/shm.c
31187 ---- linux-2.6.37.3/ipc/shm.c 2011-01-04 19:50:19.000000000 -0500
31188 -+++ linux-2.6.37.3/ipc/shm.c 2011-01-17 02:41:02.000000000 -0500
31189 +diff -urNp linux-2.6.37.4/ipc/shm.c linux-2.6.37.4/ipc/shm.c
31190 +--- linux-2.6.37.4/ipc/shm.c 2011-01-04 19:50:19.000000000 -0500
31191 ++++ linux-2.6.37.4/ipc/shm.c 2011-01-17 02:41:02.000000000 -0500
31192 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
31193 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
31194 #endif
31195 @@ -49775,9 +49978,9 @@ diff -urNp linux-2.6.37.3/ipc/shm.c linux-2.6.37.3/ipc/shm.c
31196 size = i_size_read(path.dentry->d_inode);
31197 shm_unlock(shp);
31198
31199 -diff -urNp linux-2.6.37.3/kernel/acct.c linux-2.6.37.3/kernel/acct.c
31200 ---- linux-2.6.37.3/kernel/acct.c 2011-01-04 19:50:19.000000000 -0500
31201 -+++ linux-2.6.37.3/kernel/acct.c 2011-01-17 02:41:02.000000000 -0500
31202 +diff -urNp linux-2.6.37.4/kernel/acct.c linux-2.6.37.4/kernel/acct.c
31203 +--- linux-2.6.37.4/kernel/acct.c 2011-01-04 19:50:19.000000000 -0500
31204 ++++ linux-2.6.37.4/kernel/acct.c 2011-01-17 02:41:02.000000000 -0500
31205 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
31206 */
31207 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
31208 @@ -49787,9 +49990,9 @@ diff -urNp linux-2.6.37.3/kernel/acct.c linux-2.6.37.3/kernel/acct.c
31209 sizeof(acct_t), &file->f_pos);
31210 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
31211 set_fs(fs);
31212 -diff -urNp linux-2.6.37.3/kernel/capability.c linux-2.6.37.3/kernel/capability.c
31213 ---- linux-2.6.37.3/kernel/capability.c 2011-02-27 14:49:17.000000000 -0500
31214 -+++ linux-2.6.37.3/kernel/capability.c 2011-02-27 14:50:12.000000000 -0500
31215 +diff -urNp linux-2.6.37.4/kernel/capability.c linux-2.6.37.4/kernel/capability.c
31216 +--- linux-2.6.37.4/kernel/capability.c 2011-02-27 14:49:17.000000000 -0500
31217 ++++ linux-2.6.37.4/kernel/capability.c 2011-02-27 14:50:12.000000000 -0500
31218 @@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
31219 * before modification is attempted and the application
31220 * fails.
31221 @@ -49828,9 +50031,9 @@ diff -urNp linux-2.6.37.3/kernel/capability.c linux-2.6.37.3/kernel/capability.c
31222 +
31223 EXPORT_SYMBOL(capable);
31224 +EXPORT_SYMBOL(capable_nolog);
31225 -diff -urNp linux-2.6.37.3/kernel/compat.c linux-2.6.37.3/kernel/compat.c
31226 ---- linux-2.6.37.3/kernel/compat.c 2011-01-04 19:50:19.000000000 -0500
31227 -+++ linux-2.6.37.3/kernel/compat.c 2011-01-17 02:41:02.000000000 -0500
31228 +diff -urNp linux-2.6.37.4/kernel/compat.c linux-2.6.37.4/kernel/compat.c
31229 +--- linux-2.6.37.4/kernel/compat.c 2011-01-04 19:50:19.000000000 -0500
31230 ++++ linux-2.6.37.4/kernel/compat.c 2011-01-17 02:41:02.000000000 -0500
31231 @@ -13,6 +13,7 @@
31232
31233 #include <linux/linkage.h>
31234 @@ -49839,9 +50042,9 @@ diff -urNp linux-2.6.37.3/kernel/compat.c linux-2.6.37.3/kernel/compat.c
31235 #include <linux/errno.h>
31236 #include <linux/time.h>
31237 #include <linux/signal.h>
31238 -diff -urNp linux-2.6.37.3/kernel/configs.c linux-2.6.37.3/kernel/configs.c
31239 ---- linux-2.6.37.3/kernel/configs.c 2011-01-04 19:50:19.000000000 -0500
31240 -+++ linux-2.6.37.3/kernel/configs.c 2011-01-17 02:41:02.000000000 -0500
31241 +diff -urNp linux-2.6.37.4/kernel/configs.c linux-2.6.37.4/kernel/configs.c
31242 +--- linux-2.6.37.4/kernel/configs.c 2011-01-04 19:50:19.000000000 -0500
31243 ++++ linux-2.6.37.4/kernel/configs.c 2011-01-17 02:41:02.000000000 -0500
31244 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
31245 struct proc_dir_entry *entry;
31246
31247 @@ -49862,9 +50065,9 @@ diff -urNp linux-2.6.37.3/kernel/configs.c linux-2.6.37.3/kernel/configs.c
31248 if (!entry)
31249 return -ENOMEM;
31250
31251 -diff -urNp linux-2.6.37.3/kernel/cred.c linux-2.6.37.3/kernel/cred.c
31252 ---- linux-2.6.37.3/kernel/cred.c 2011-02-27 14:49:17.000000000 -0500
31253 -+++ linux-2.6.37.3/kernel/cred.c 2011-02-12 11:03:34.000000000 -0500
31254 +diff -urNp linux-2.6.37.4/kernel/cred.c linux-2.6.37.4/kernel/cred.c
31255 +--- linux-2.6.37.4/kernel/cred.c 2011-02-27 14:49:17.000000000 -0500
31256 ++++ linux-2.6.37.4/kernel/cred.c 2011-02-12 11:03:34.000000000 -0500
31257 @@ -483,6 +483,8 @@ int commit_creds(struct cred *new)
31258
31259 get_cred(new); /* we will require a ref for the subj creds too */
31260 @@ -49874,9 +50077,9 @@ diff -urNp linux-2.6.37.3/kernel/cred.c linux-2.6.37.3/kernel/cred.c
31261 /* dumpability changes */
31262 if (old->euid != new->euid ||
31263 old->egid != new->egid ||
31264 -diff -urNp linux-2.6.37.3/kernel/debug/debug_core.c linux-2.6.37.3/kernel/debug/debug_core.c
31265 ---- linux-2.6.37.3/kernel/debug/debug_core.c 2011-01-04 19:50:19.000000000 -0500
31266 -+++ linux-2.6.37.3/kernel/debug/debug_core.c 2011-01-17 02:41:02.000000000 -0500
31267 +diff -urNp linux-2.6.37.4/kernel/debug/debug_core.c linux-2.6.37.4/kernel/debug/debug_core.c
31268 +--- linux-2.6.37.4/kernel/debug/debug_core.c 2011-01-04 19:50:19.000000000 -0500
31269 ++++ linux-2.6.37.4/kernel/debug/debug_core.c 2011-01-17 02:41:02.000000000 -0500
31270 @@ -72,7 +72,7 @@ int kgdb_io_module_registered;
31271 /* Guard for recursive entry */
31272 static int exception_level;
31273 @@ -49904,9 +50107,9 @@ diff -urNp linux-2.6.37.3/kernel/debug/debug_core.c linux-2.6.37.3/kernel/debug/
31274 {
31275 BUG_ON(kgdb_connected);
31276
31277 -diff -urNp linux-2.6.37.3/kernel/debug/kdb/kdb_main.c linux-2.6.37.3/kernel/debug/kdb/kdb_main.c
31278 ---- linux-2.6.37.3/kernel/debug/kdb/kdb_main.c 2011-01-04 19:50:19.000000000 -0500
31279 -+++ linux-2.6.37.3/kernel/debug/kdb/kdb_main.c 2011-01-17 02:41:02.000000000 -0500
31280 +diff -urNp linux-2.6.37.4/kernel/debug/kdb/kdb_main.c linux-2.6.37.4/kernel/debug/kdb/kdb_main.c
31281 +--- linux-2.6.37.4/kernel/debug/kdb/kdb_main.c 2011-01-04 19:50:19.000000000 -0500
31282 ++++ linux-2.6.37.4/kernel/debug/kdb/kdb_main.c 2011-01-17 02:41:02.000000000 -0500
31283 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
31284 list_for_each_entry(mod, kdb_modules, list) {
31285
31286 @@ -49925,9 +50128,9 @@ diff -urNp linux-2.6.37.3/kernel/debug/kdb/kdb_main.c linux-2.6.37.3/kernel/debu
31287
31288 #ifdef CONFIG_MODULE_UNLOAD
31289 {
31290 -diff -urNp linux-2.6.37.3/kernel/exit.c linux-2.6.37.3/kernel/exit.c
31291 ---- linux-2.6.37.3/kernel/exit.c 2011-01-04 19:50:19.000000000 -0500
31292 -+++ linux-2.6.37.3/kernel/exit.c 2011-01-17 02:41:02.000000000 -0500
31293 +diff -urNp linux-2.6.37.4/kernel/exit.c linux-2.6.37.4/kernel/exit.c
31294 +--- linux-2.6.37.4/kernel/exit.c 2011-01-04 19:50:19.000000000 -0500
31295 ++++ linux-2.6.37.4/kernel/exit.c 2011-01-17 02:41:02.000000000 -0500
31296 @@ -57,6 +57,10 @@
31297 #include <asm/pgtable.h>
31298 #include <asm/mmu_context.h>
31299 @@ -50047,9 +50250,9 @@ diff -urNp linux-2.6.37.3/kernel/exit.c linux-2.6.37.3/kernel/exit.c
31300 exit_mm(tsk);
31301
31302 if (group_dead)
31303 -diff -urNp linux-2.6.37.3/kernel/fork.c linux-2.6.37.3/kernel/fork.c
31304 ---- linux-2.6.37.3/kernel/fork.c 2011-01-04 19:50:19.000000000 -0500
31305 -+++ linux-2.6.37.3/kernel/fork.c 2011-01-17 02:41:02.000000000 -0500
31306 +diff -urNp linux-2.6.37.4/kernel/fork.c linux-2.6.37.4/kernel/fork.c
31307 +--- linux-2.6.37.4/kernel/fork.c 2011-01-04 19:50:19.000000000 -0500
31308 ++++ linux-2.6.37.4/kernel/fork.c 2011-01-17 02:41:02.000000000 -0500
31309 @@ -278,7 +278,7 @@ static struct task_struct *dup_task_stru
31310 *stackend = STACK_END_MAGIC; /* for overflow detection */
31311
31312 @@ -50346,9 +50549,9 @@ diff -urNp linux-2.6.37.3/kernel/fork.c linux-2.6.37.3/kernel/fork.c
31313 new_fs = NULL;
31314 else
31315 new_fs = fs;
31316 -diff -urNp linux-2.6.37.3/kernel/futex.c linux-2.6.37.3/kernel/futex.c
31317 ---- linux-2.6.37.3/kernel/futex.c 2011-01-04 19:50:19.000000000 -0500
31318 -+++ linux-2.6.37.3/kernel/futex.c 2011-01-17 02:41:02.000000000 -0500
31319 +diff -urNp linux-2.6.37.4/kernel/futex.c linux-2.6.37.4/kernel/futex.c
31320 +--- linux-2.6.37.4/kernel/futex.c 2011-01-04 19:50:19.000000000 -0500
31321 ++++ linux-2.6.37.4/kernel/futex.c 2011-01-17 02:41:02.000000000 -0500
31322 @@ -54,6 +54,7 @@
31323 #include <linux/mount.h>
31324 #include <linux/pagemap.h>
31325 @@ -50415,9 +50618,9 @@ diff -urNp linux-2.6.37.3/kernel/futex.c linux-2.6.37.3/kernel/futex.c
31326 if (curval == -EFAULT)
31327 futex_cmpxchg_enabled = 1;
31328
31329 -diff -urNp linux-2.6.37.3/kernel/futex_compat.c linux-2.6.37.3/kernel/futex_compat.c
31330 ---- linux-2.6.37.3/kernel/futex_compat.c 2011-01-04 19:50:19.000000000 -0500
31331 -+++ linux-2.6.37.3/kernel/futex_compat.c 2011-01-17 02:41:02.000000000 -0500
31332 +diff -urNp linux-2.6.37.4/kernel/futex_compat.c linux-2.6.37.4/kernel/futex_compat.c
31333 +--- linux-2.6.37.4/kernel/futex_compat.c 2011-01-04 19:50:19.000000000 -0500
31334 ++++ linux-2.6.37.4/kernel/futex_compat.c 2011-01-17 02:41:02.000000000 -0500
31335 @@ -10,6 +10,7 @@
31336 #include <linux/compat.h>
31337 #include <linux/nsproxy.h>
31338 @@ -50455,9 +50658,9 @@ diff -urNp linux-2.6.37.3/kernel/futex_compat.c linux-2.6.37.3/kernel/futex_comp
31339 head = p->compat_robust_list;
31340 rcu_read_unlock();
31341 }
31342 -diff -urNp linux-2.6.37.3/kernel/gcov/base.c linux-2.6.37.3/kernel/gcov/base.c
31343 ---- linux-2.6.37.3/kernel/gcov/base.c 2011-01-04 19:50:19.000000000 -0500
31344 -+++ linux-2.6.37.3/kernel/gcov/base.c 2011-01-17 02:41:02.000000000 -0500
31345 +diff -urNp linux-2.6.37.4/kernel/gcov/base.c linux-2.6.37.4/kernel/gcov/base.c
31346 +--- linux-2.6.37.4/kernel/gcov/base.c 2011-01-04 19:50:19.000000000 -0500
31347 ++++ linux-2.6.37.4/kernel/gcov/base.c 2011-01-17 02:41:02.000000000 -0500
31348 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
31349 }
31350
31351 @@ -50479,9 +50682,9 @@ diff -urNp linux-2.6.37.3/kernel/gcov/base.c linux-2.6.37.3/kernel/gcov/base.c
31352 if (prev)
31353 prev->next = info->next;
31354 else
31355 -diff -urNp linux-2.6.37.3/kernel/hrtimer.c linux-2.6.37.3/kernel/hrtimer.c
31356 ---- linux-2.6.37.3/kernel/hrtimer.c 2011-01-04 19:50:19.000000000 -0500
31357 -+++ linux-2.6.37.3/kernel/hrtimer.c 2011-01-17 02:41:02.000000000 -0500
31358 +diff -urNp linux-2.6.37.4/kernel/hrtimer.c linux-2.6.37.4/kernel/hrtimer.c
31359 +--- linux-2.6.37.4/kernel/hrtimer.c 2011-01-04 19:50:19.000000000 -0500
31360 ++++ linux-2.6.37.4/kernel/hrtimer.c 2011-01-17 02:41:02.000000000 -0500
31361 @@ -1401,7 +1401,7 @@ void hrtimer_peek_ahead_timers(void)
31362 local_irq_restore(flags);
31363 }
31364 @@ -50491,9 +50694,9 @@ diff -urNp linux-2.6.37.3/kernel/hrtimer.c linux-2.6.37.3/kernel/hrtimer.c
31365 {
31366 hrtimer_peek_ahead_timers();
31367 }
31368 -diff -urNp linux-2.6.37.3/kernel/jump_label.c linux-2.6.37.3/kernel/jump_label.c
31369 ---- linux-2.6.37.3/kernel/jump_label.c 2011-01-04 19:50:19.000000000 -0500
31370 -+++ linux-2.6.37.3/kernel/jump_label.c 2011-01-17 02:41:02.000000000 -0500
31371 +diff -urNp linux-2.6.37.4/kernel/jump_label.c linux-2.6.37.4/kernel/jump_label.c
31372 +--- linux-2.6.37.4/kernel/jump_label.c 2011-01-04 19:50:19.000000000 -0500
31373 ++++ linux-2.6.37.4/kernel/jump_label.c 2011-01-17 02:41:02.000000000 -0500
31374 @@ -49,6 +49,17 @@ void jump_label_unlock(void)
31375 mutex_unlock(&jump_label_mutex);
31376 }
31377 @@ -50534,9 +50737,9 @@ diff -urNp linux-2.6.37.3/kernel/jump_label.c linux-2.6.37.3/kernel/jump_label.c
31378 iter++;
31379 }
31380 }
31381 -diff -urNp linux-2.6.37.3/kernel/kallsyms.c linux-2.6.37.3/kernel/kallsyms.c
31382 ---- linux-2.6.37.3/kernel/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
31383 -+++ linux-2.6.37.3/kernel/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
31384 +diff -urNp linux-2.6.37.4/kernel/kallsyms.c linux-2.6.37.4/kernel/kallsyms.c
31385 +--- linux-2.6.37.4/kernel/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
31386 ++++ linux-2.6.37.4/kernel/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
31387 @@ -11,6 +11,9 @@
31388 * Changed the compression method from stem compression to "table lookup"
31389 * compression (see scripts/kallsyms.c for a more complete description)
31390 @@ -50639,9 +50842,9 @@ diff -urNp linux-2.6.37.3/kernel/kallsyms.c linux-2.6.37.3/kernel/kallsyms.c
31391 if (!iter)
31392 return -ENOMEM;
31393 reset_iter(iter, 0);
31394 -diff -urNp linux-2.6.37.3/kernel/kmod.c linux-2.6.37.3/kernel/kmod.c
31395 ---- linux-2.6.37.3/kernel/kmod.c 2011-01-04 19:50:19.000000000 -0500
31396 -+++ linux-2.6.37.3/kernel/kmod.c 2011-02-12 10:56:18.000000000 -0500
31397 +diff -urNp linux-2.6.37.4/kernel/kmod.c linux-2.6.37.4/kernel/kmod.c
31398 +--- linux-2.6.37.4/kernel/kmod.c 2011-01-04 19:50:19.000000000 -0500
31399 ++++ linux-2.6.37.4/kernel/kmod.c 2011-02-12 10:56:18.000000000 -0500
31400 @@ -90,6 +90,28 @@ int __request_module(bool wait, const ch
31401 if (ret)
31402 return ret;
31403 @@ -50671,9 +50874,9 @@ diff -urNp linux-2.6.37.3/kernel/kmod.c linux-2.6.37.3/kernel/kmod.c
31404 /* If modprobe needs a service that is in a module, we get a recursive
31405 * loop. Limit the number of running kmod threads to max_threads/2 or
31406 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
31407 -diff -urNp linux-2.6.37.3/kernel/kprobes.c linux-2.6.37.3/kernel/kprobes.c
31408 ---- linux-2.6.37.3/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
31409 -+++ linux-2.6.37.3/kernel/kprobes.c 2011-01-17 02:41:02.000000000 -0500
31410 +diff -urNp linux-2.6.37.4/kernel/kprobes.c linux-2.6.37.4/kernel/kprobes.c
31411 +--- linux-2.6.37.4/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
31412 ++++ linux-2.6.37.4/kernel/kprobes.c 2011-01-17 02:41:02.000000000 -0500
31413 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
31414 * kernel image and loaded module images reside. This is required
31415 * so x86_64 can correctly handle the %rip-relative fixups.
31416 @@ -50710,9 +50913,9 @@ diff -urNp linux-2.6.37.3/kernel/kprobes.c linux-2.6.37.3/kernel/kprobes.c
31417
31418 head = &kprobe_table[i];
31419 preempt_disable();
31420 -diff -urNp linux-2.6.37.3/kernel/lockdep.c linux-2.6.37.3/kernel/lockdep.c
31421 ---- linux-2.6.37.3/kernel/lockdep.c 2011-01-04 19:50:19.000000000 -0500
31422 -+++ linux-2.6.37.3/kernel/lockdep.c 2011-01-17 02:41:02.000000000 -0500
31423 +diff -urNp linux-2.6.37.4/kernel/lockdep.c linux-2.6.37.4/kernel/lockdep.c
31424 +--- linux-2.6.37.4/kernel/lockdep.c 2011-01-04 19:50:19.000000000 -0500
31425 ++++ linux-2.6.37.4/kernel/lockdep.c 2011-01-17 02:41:02.000000000 -0500
31426 @@ -571,6 +571,10 @@ static int static_obj(void *obj)
31427 end = (unsigned long) &_end,
31428 addr = (unsigned long) obj;
31429 @@ -50741,9 +50944,9 @@ diff -urNp linux-2.6.37.3/kernel/lockdep.c linux-2.6.37.3/kernel/lockdep.c
31430 if (very_verbose(class)) {
31431 printk("\nacquire class [%p] %s", class->key, class->name);
31432 if (class->name_version > 1)
31433 -diff -urNp linux-2.6.37.3/kernel/lockdep_proc.c linux-2.6.37.3/kernel/lockdep_proc.c
31434 ---- linux-2.6.37.3/kernel/lockdep_proc.c 2011-01-04 19:50:19.000000000 -0500
31435 -+++ linux-2.6.37.3/kernel/lockdep_proc.c 2011-01-17 02:41:02.000000000 -0500
31436 +diff -urNp linux-2.6.37.4/kernel/lockdep_proc.c linux-2.6.37.4/kernel/lockdep_proc.c
31437 +--- linux-2.6.37.4/kernel/lockdep_proc.c 2011-01-04 19:50:19.000000000 -0500
31438 ++++ linux-2.6.37.4/kernel/lockdep_proc.c 2011-01-17 02:41:02.000000000 -0500
31439 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
31440
31441 static void print_name(struct seq_file *m, struct lock_class *class)
31442 @@ -50753,9 +50956,9 @@ diff -urNp linux-2.6.37.3/kernel/lockdep_proc.c linux-2.6.37.3/kernel/lockdep_pr
31443 const char *name = class->name;
31444
31445 if (!name) {
31446 -diff -urNp linux-2.6.37.3/kernel/module.c linux-2.6.37.3/kernel/module.c
31447 ---- linux-2.6.37.3/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
31448 -+++ linux-2.6.37.3/kernel/module.c 2011-02-02 20:28:40.000000000 -0500
31449 +diff -urNp linux-2.6.37.4/kernel/module.c linux-2.6.37.4/kernel/module.c
31450 +--- linux-2.6.37.4/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
31451 ++++ linux-2.6.37.4/kernel/module.c 2011-02-02 20:28:40.000000000 -0500
31452 @@ -97,7 +97,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not
31453
31454 /* Bounds of module allocation, for speeding __module_address.
31455 @@ -51246,9 +51449,9 @@ diff -urNp linux-2.6.37.3/kernel/module.c linux-2.6.37.3/kernel/module.c
31456 mod = NULL;
31457 }
31458 return mod;
31459 -diff -urNp linux-2.6.37.3/kernel/panic.c linux-2.6.37.3/kernel/panic.c
31460 ---- linux-2.6.37.3/kernel/panic.c 2011-01-04 19:50:19.000000000 -0500
31461 -+++ linux-2.6.37.3/kernel/panic.c 2011-01-17 02:41:02.000000000 -0500
31462 +diff -urNp linux-2.6.37.4/kernel/panic.c linux-2.6.37.4/kernel/panic.c
31463 +--- linux-2.6.37.4/kernel/panic.c 2011-01-04 19:50:19.000000000 -0500
31464 ++++ linux-2.6.37.4/kernel/panic.c 2011-01-17 02:41:02.000000000 -0500
31465 @@ -368,7 +368,7 @@ static void warn_slowpath_common(const c
31466 const char *board;
31467
31468 @@ -51268,9 +51471,9 @@ diff -urNp linux-2.6.37.3/kernel/panic.c linux-2.6.37.3/kernel/panic.c
31469 __builtin_return_address(0));
31470 }
31471 EXPORT_SYMBOL(__stack_chk_fail);
31472 -diff -urNp linux-2.6.37.3/kernel/pid.c linux-2.6.37.3/kernel/pid.c
31473 ---- linux-2.6.37.3/kernel/pid.c 2011-01-04 19:50:19.000000000 -0500
31474 -+++ linux-2.6.37.3/kernel/pid.c 2011-01-17 02:41:02.000000000 -0500
31475 +diff -urNp linux-2.6.37.4/kernel/pid.c linux-2.6.37.4/kernel/pid.c
31476 +--- linux-2.6.37.4/kernel/pid.c 2011-01-04 19:50:19.000000000 -0500
31477 ++++ linux-2.6.37.4/kernel/pid.c 2011-01-17 02:41:02.000000000 -0500
31478 @@ -33,6 +33,7 @@
31479 #include <linux/rculist.h>
31480 #include <linux/bootmem.h>
31481 @@ -51305,9 +51508,9 @@ diff -urNp linux-2.6.37.3/kernel/pid.c linux-2.6.37.3/kernel/pid.c
31482 }
31483
31484 struct task_struct *find_task_by_vpid(pid_t vnr)
31485 -diff -urNp linux-2.6.37.3/kernel/posix-cpu-timers.c linux-2.6.37.3/kernel/posix-cpu-timers.c
31486 ---- linux-2.6.37.3/kernel/posix-cpu-timers.c 2011-01-04 19:50:19.000000000 -0500
31487 -+++ linux-2.6.37.3/kernel/posix-cpu-timers.c 2011-01-17 02:41:02.000000000 -0500
31488 +diff -urNp linux-2.6.37.4/kernel/posix-cpu-timers.c linux-2.6.37.4/kernel/posix-cpu-timers.c
31489 +--- linux-2.6.37.4/kernel/posix-cpu-timers.c 2011-01-04 19:50:19.000000000 -0500
31490 ++++ linux-2.6.37.4/kernel/posix-cpu-timers.c 2011-01-17 02:41:02.000000000 -0500
31491 @@ -6,6 +6,7 @@
31492 #include <linux/posix-timers.h>
31493 #include <linux/errno.h>
31494 @@ -51316,9 +51519,9 @@ diff -urNp linux-2.6.37.3/kernel/posix-cpu-timers.c linux-2.6.37.3/kernel/posix-
31495 #include <asm/uaccess.h>
31496 #include <linux/kernel_stat.h>
31497 #include <trace/events/timer.h>
31498 -diff -urNp linux-2.6.37.3/kernel/posix-timers.c linux-2.6.37.3/kernel/posix-timers.c
31499 ---- linux-2.6.37.3/kernel/posix-timers.c 2011-01-04 19:50:19.000000000 -0500
31500 -+++ linux-2.6.37.3/kernel/posix-timers.c 2011-01-17 02:41:02.000000000 -0500
31501 +diff -urNp linux-2.6.37.4/kernel/posix-timers.c linux-2.6.37.4/kernel/posix-timers.c
31502 +--- linux-2.6.37.4/kernel/posix-timers.c 2011-01-04 19:50:19.000000000 -0500
31503 ++++ linux-2.6.37.4/kernel/posix-timers.c 2011-01-17 02:41:02.000000000 -0500
31504 @@ -42,6 +42,7 @@
31505 #include <linux/compiler.h>
31506 #include <linux/idr.h>
31507 @@ -51341,9 +51544,9 @@ diff -urNp linux-2.6.37.3/kernel/posix-timers.c linux-2.6.37.3/kernel/posix-time
31508 return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
31509 }
31510
31511 -diff -urNp linux-2.6.37.3/kernel/power/hibernate.c linux-2.6.37.3/kernel/power/hibernate.c
31512 ---- linux-2.6.37.3/kernel/power/hibernate.c 2011-01-04 19:50:19.000000000 -0500
31513 -+++ linux-2.6.37.3/kernel/power/hibernate.c 2011-01-17 02:41:02.000000000 -0500
31514 +diff -urNp linux-2.6.37.4/kernel/power/hibernate.c linux-2.6.37.4/kernel/power/hibernate.c
31515 +--- linux-2.6.37.4/kernel/power/hibernate.c 2011-01-04 19:50:19.000000000 -0500
31516 ++++ linux-2.6.37.4/kernel/power/hibernate.c 2011-01-17 02:41:02.000000000 -0500
31517 @@ -51,14 +51,14 @@ enum {
31518
31519 static int hibernation_mode = HIBERNATION_SHUTDOWN;
31520 @@ -51361,9 +51564,9 @@ diff -urNp linux-2.6.37.3/kernel/power/hibernate.c linux-2.6.37.3/kernel/power/h
31521 {
31522 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
31523 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
31524 -diff -urNp linux-2.6.37.3/kernel/power/poweroff.c linux-2.6.37.3/kernel/power/poweroff.c
31525 ---- linux-2.6.37.3/kernel/power/poweroff.c 2011-01-04 19:50:19.000000000 -0500
31526 -+++ linux-2.6.37.3/kernel/power/poweroff.c 2011-01-17 02:41:02.000000000 -0500
31527 +diff -urNp linux-2.6.37.4/kernel/power/poweroff.c linux-2.6.37.4/kernel/power/poweroff.c
31528 +--- linux-2.6.37.4/kernel/power/poweroff.c 2011-01-04 19:50:19.000000000 -0500
31529 ++++ linux-2.6.37.4/kernel/power/poweroff.c 2011-01-17 02:41:02.000000000 -0500
31530 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
31531 .enable_mask = SYSRQ_ENABLE_BOOT,
31532 };
31533 @@ -51373,9 +51576,9 @@ diff -urNp linux-2.6.37.3/kernel/power/poweroff.c linux-2.6.37.3/kernel/power/po
31534 {
31535 register_sysrq_key('o', &sysrq_poweroff_op);
31536 return 0;
31537 -diff -urNp linux-2.6.37.3/kernel/power/process.c linux-2.6.37.3/kernel/power/process.c
31538 ---- linux-2.6.37.3/kernel/power/process.c 2011-01-04 19:50:19.000000000 -0500
31539 -+++ linux-2.6.37.3/kernel/power/process.c 2011-01-17 02:41:02.000000000 -0500
31540 +diff -urNp linux-2.6.37.4/kernel/power/process.c linux-2.6.37.4/kernel/power/process.c
31541 +--- linux-2.6.37.4/kernel/power/process.c 2011-01-04 19:50:19.000000000 -0500
31542 ++++ linux-2.6.37.4/kernel/power/process.c 2011-01-17 02:41:02.000000000 -0500
31543 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
31544 u64 elapsed_csecs64;
31545 unsigned int elapsed_csecs;
31546 @@ -51418,9 +51621,9 @@ diff -urNp linux-2.6.37.3/kernel/power/process.c linux-2.6.37.3/kernel/power/pro
31547 break;
31548
31549 if (!pm_check_wakeup_events()) {
31550 -diff -urNp linux-2.6.37.3/kernel/power/suspend.c linux-2.6.37.3/kernel/power/suspend.c
31551 ---- linux-2.6.37.3/kernel/power/suspend.c 2011-01-04 19:50:19.000000000 -0500
31552 -+++ linux-2.6.37.3/kernel/power/suspend.c 2011-01-17 02:41:02.000000000 -0500
31553 +diff -urNp linux-2.6.37.4/kernel/power/suspend.c linux-2.6.37.4/kernel/power/suspend.c
31554 +--- linux-2.6.37.4/kernel/power/suspend.c 2011-01-04 19:50:19.000000000 -0500
31555 ++++ linux-2.6.37.4/kernel/power/suspend.c 2011-01-17 02:41:02.000000000 -0500
31556 @@ -30,13 +30,13 @@ const char *const pm_states[PM_SUSPEND_M
31557 [PM_SUSPEND_MEM] = "mem",
31558 };
31559 @@ -51437,9 +51640,9 @@ diff -urNp linux-2.6.37.3/kernel/power/suspend.c linux-2.6.37.3/kernel/power/sus
31560 {
31561 mutex_lock(&pm_mutex);
31562 suspend_ops = ops;
31563 -diff -urNp linux-2.6.37.3/kernel/printk.c linux-2.6.37.3/kernel/printk.c
31564 ---- linux-2.6.37.3/kernel/printk.c 2011-01-04 19:50:19.000000000 -0500
31565 -+++ linux-2.6.37.3/kernel/printk.c 2011-01-17 02:41:02.000000000 -0500
31566 +diff -urNp linux-2.6.37.4/kernel/printk.c linux-2.6.37.4/kernel/printk.c
31567 +--- linux-2.6.37.4/kernel/printk.c 2011-01-04 19:50:19.000000000 -0500
31568 ++++ linux-2.6.37.4/kernel/printk.c 2011-01-17 02:41:02.000000000 -0500
31569 @@ -274,6 +274,11 @@ int do_syslog(int type, char __user *buf
31570 char c;
31571 int error = 0;
31572 @@ -51452,9 +51655,9 @@ diff -urNp linux-2.6.37.3/kernel/printk.c linux-2.6.37.3/kernel/printk.c
31573 /*
31574 * If this is from /proc/kmsg we only do the capabilities checks
31575 * at open time.
31576 -diff -urNp linux-2.6.37.3/kernel/ptrace.c linux-2.6.37.3/kernel/ptrace.c
31577 ---- linux-2.6.37.3/kernel/ptrace.c 2011-02-22 16:05:31.000000000 -0500
31578 -+++ linux-2.6.37.3/kernel/ptrace.c 2011-02-12 10:37:18.000000000 -0500
31579 +diff -urNp linux-2.6.37.4/kernel/ptrace.c linux-2.6.37.4/kernel/ptrace.c
31580 +--- linux-2.6.37.4/kernel/ptrace.c 2011-02-22 16:05:31.000000000 -0500
31581 ++++ linux-2.6.37.4/kernel/ptrace.c 2011-02-12 10:37:18.000000000 -0500
31582 @@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_stru
31583 cred->gid != tcred->egid ||
31584 cred->gid != tcred->sgid ||
31585 @@ -51555,9 +51758,9 @@ diff -urNp linux-2.6.37.3/kernel/ptrace.c linux-2.6.37.3/kernel/ptrace.c
31586 goto out_put_task_struct;
31587 }
31588
31589 -diff -urNp linux-2.6.37.3/kernel/rcutree.c linux-2.6.37.3/kernel/rcutree.c
31590 ---- linux-2.6.37.3/kernel/rcutree.c 2011-01-04 19:50:19.000000000 -0500
31591 -+++ linux-2.6.37.3/kernel/rcutree.c 2011-01-17 02:41:02.000000000 -0500
31592 +diff -urNp linux-2.6.37.4/kernel/rcutree.c linux-2.6.37.4/kernel/rcutree.c
31593 +--- linux-2.6.37.4/kernel/rcutree.c 2011-01-04 19:50:19.000000000 -0500
31594 ++++ linux-2.6.37.4/kernel/rcutree.c 2011-01-17 02:41:02.000000000 -0500
31595 @@ -1394,7 +1394,7 @@ __rcu_process_callbacks(struct rcu_state
31596 /*
31597 * Do softirq processing for the current CPU.
31598 @@ -51567,9 +51770,9 @@ diff -urNp linux-2.6.37.3/kernel/rcutree.c linux-2.6.37.3/kernel/rcutree.c
31599 {
31600 /*
31601 * Memory references from any prior RCU read-side critical sections
31602 -diff -urNp linux-2.6.37.3/kernel/rcutree_plugin.h linux-2.6.37.3/kernel/rcutree_plugin.h
31603 ---- linux-2.6.37.3/kernel/rcutree_plugin.h 2011-01-04 19:50:19.000000000 -0500
31604 -+++ linux-2.6.37.3/kernel/rcutree_plugin.h 2011-01-17 02:41:02.000000000 -0500
31605 +diff -urNp linux-2.6.37.4/kernel/rcutree_plugin.h linux-2.6.37.4/kernel/rcutree_plugin.h
31606 +--- linux-2.6.37.4/kernel/rcutree_plugin.h 2011-01-04 19:50:19.000000000 -0500
31607 ++++ linux-2.6.37.4/kernel/rcutree_plugin.h 2011-01-17 02:41:02.000000000 -0500
31608 @@ -729,7 +729,7 @@ void synchronize_rcu_expedited(void)
31609
31610 /* Clean up and exit. */
31611 @@ -51579,9 +51782,9 @@ diff -urNp linux-2.6.37.3/kernel/rcutree_plugin.h linux-2.6.37.3/kernel/rcutree_
31612 unlock_mb_ret:
31613 mutex_unlock(&sync_rcu_preempt_exp_mutex);
31614 mb_ret:
31615 -diff -urNp linux-2.6.37.3/kernel/resource.c linux-2.6.37.3/kernel/resource.c
31616 ---- linux-2.6.37.3/kernel/resource.c 2011-01-04 19:50:19.000000000 -0500
31617 -+++ linux-2.6.37.3/kernel/resource.c 2011-01-17 02:41:02.000000000 -0500
31618 +diff -urNp linux-2.6.37.4/kernel/resource.c linux-2.6.37.4/kernel/resource.c
31619 +--- linux-2.6.37.4/kernel/resource.c 2011-01-04 19:50:19.000000000 -0500
31620 ++++ linux-2.6.37.4/kernel/resource.c 2011-01-17 02:41:02.000000000 -0500
31621 @@ -133,8 +133,18 @@ static const struct file_operations proc
31622
31623 static int __init ioresources_init(void)
31624 @@ -51601,9 +51804,9 @@ diff -urNp linux-2.6.37.3/kernel/resource.c linux-2.6.37.3/kernel/resource.c
31625 return 0;
31626 }
31627 __initcall(ioresources_init);
31628 -diff -urNp linux-2.6.37.3/kernel/rtmutex.c linux-2.6.37.3/kernel/rtmutex.c
31629 ---- linux-2.6.37.3/kernel/rtmutex.c 2011-01-04 19:50:19.000000000 -0500
31630 -+++ linux-2.6.37.3/kernel/rtmutex.c 2011-01-17 02:41:02.000000000 -0500
31631 +diff -urNp linux-2.6.37.4/kernel/rtmutex.c linux-2.6.37.4/kernel/rtmutex.c
31632 +--- linux-2.6.37.4/kernel/rtmutex.c 2011-01-04 19:50:19.000000000 -0500
31633 ++++ linux-2.6.37.4/kernel/rtmutex.c 2011-01-17 02:41:02.000000000 -0500
31634 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
31635 */
31636 raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
31637 @@ -51613,9 +51816,9 @@ diff -urNp linux-2.6.37.3/kernel/rtmutex.c linux-2.6.37.3/kernel/rtmutex.c
31638 WARN_ON(pendowner->pi_blocked_on != waiter);
31639 WARN_ON(pendowner->pi_blocked_on->lock != lock);
31640
31641 -diff -urNp linux-2.6.37.3/kernel/sched.c linux-2.6.37.3/kernel/sched.c
31642 ---- linux-2.6.37.3/kernel/sched.c 2011-02-22 16:05:31.000000000 -0500
31643 -+++ linux-2.6.37.3/kernel/sched.c 2011-02-22 16:05:44.000000000 -0500
31644 +diff -urNp linux-2.6.37.4/kernel/sched.c linux-2.6.37.4/kernel/sched.c
31645 +--- linux-2.6.37.4/kernel/sched.c 2011-02-22 16:05:31.000000000 -0500
31646 ++++ linux-2.6.37.4/kernel/sched.c 2011-02-22 16:05:44.000000000 -0500
31647 @@ -4773,6 +4773,8 @@ int can_nice(const struct task_struct *p
31648 /* convert nice value [19,-20] to rlimit style value [1,40] */
31649 int nice_rlim = 20 - nice;
31650 @@ -51652,9 +51855,9 @@ diff -urNp linux-2.6.37.3/kernel/sched.c linux-2.6.37.3/kernel/sched.c
31651
31652 if (cpu != group_first_cpu(sd->groups))
31653 return;
31654 -diff -urNp linux-2.6.37.3/kernel/sched_fair.c linux-2.6.37.3/kernel/sched_fair.c
31655 ---- linux-2.6.37.3/kernel/sched_fair.c 2011-01-04 19:50:19.000000000 -0500
31656 -+++ linux-2.6.37.3/kernel/sched_fair.c 2011-01-17 02:41:02.000000000 -0500
31657 +diff -urNp linux-2.6.37.4/kernel/sched_fair.c linux-2.6.37.4/kernel/sched_fair.c
31658 +--- linux-2.6.37.4/kernel/sched_fair.c 2011-01-04 19:50:19.000000000 -0500
31659 ++++ linux-2.6.37.4/kernel/sched_fair.c 2011-01-17 02:41:02.000000000 -0500
31660 @@ -3724,7 +3724,7 @@ static void nohz_idle_balance(int this_c
31661 * run_rebalance_domains is triggered when needed from the scheduler tick.
31662 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
31663 @@ -51664,9 +51867,9 @@ diff -urNp linux-2.6.37.3/kernel/sched_fair.c linux-2.6.37.3/kernel/sched_fair.c
31664 {
31665 int this_cpu = smp_processor_id();
31666 struct rq *this_rq = cpu_rq(this_cpu);
31667 -diff -urNp linux-2.6.37.3/kernel/signal.c linux-2.6.37.3/kernel/signal.c
31668 ---- linux-2.6.37.3/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
31669 -+++ linux-2.6.37.3/kernel/signal.c 2011-02-12 11:22:39.000000000 -0500
31670 +diff -urNp linux-2.6.37.4/kernel/signal.c linux-2.6.37.4/kernel/signal.c
31671 +--- linux-2.6.37.4/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
31672 ++++ linux-2.6.37.4/kernel/signal.c 2011-02-12 11:22:39.000000000 -0500
31673 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
31674
31675 int print_fatal_signals __read_mostly;
31676 @@ -51769,9 +51972,9 @@ diff -urNp linux-2.6.37.3/kernel/signal.c linux-2.6.37.3/kernel/signal.c
31677
31678 return ret;
31679 }
31680 -diff -urNp linux-2.6.37.3/kernel/smp.c linux-2.6.37.3/kernel/smp.c
31681 ---- linux-2.6.37.3/kernel/smp.c 2011-02-22 16:05:31.000000000 -0500
31682 -+++ linux-2.6.37.3/kernel/smp.c 2011-02-22 16:05:44.000000000 -0500
31683 +diff -urNp linux-2.6.37.4/kernel/smp.c linux-2.6.37.4/kernel/smp.c
31684 +--- linux-2.6.37.4/kernel/smp.c 2011-02-22 16:05:31.000000000 -0500
31685 ++++ linux-2.6.37.4/kernel/smp.c 2011-02-22 16:05:44.000000000 -0500
31686 @@ -540,22 +540,22 @@ int smp_call_function(smp_call_func_t fu
31687 }
31688 EXPORT_SYMBOL(smp_call_function);
31689 @@ -51799,9 +52002,9 @@ diff -urNp linux-2.6.37.3/kernel/smp.c linux-2.6.37.3/kernel/smp.c
31690 {
31691 raw_spin_unlock_irq(&call_function.lock);
31692 }
31693 -diff -urNp linux-2.6.37.3/kernel/softirq.c linux-2.6.37.3/kernel/softirq.c
31694 ---- linux-2.6.37.3/kernel/softirq.c 2011-01-04 19:50:19.000000000 -0500
31695 -+++ linux-2.6.37.3/kernel/softirq.c 2011-01-17 02:41:02.000000000 -0500
31696 +diff -urNp linux-2.6.37.4/kernel/softirq.c linux-2.6.37.4/kernel/softirq.c
31697 +--- linux-2.6.37.4/kernel/softirq.c 2011-01-04 19:50:19.000000000 -0500
31698 ++++ linux-2.6.37.4/kernel/softirq.c 2011-01-17 02:41:02.000000000 -0500
31699 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
31700
31701 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
31702 @@ -51856,9 +52059,9 @@ diff -urNp linux-2.6.37.3/kernel/softirq.c linux-2.6.37.3/kernel/softirq.c
31703 {
31704 struct tasklet_struct *list;
31705
31706 -diff -urNp linux-2.6.37.3/kernel/sys.c linux-2.6.37.3/kernel/sys.c
31707 ---- linux-2.6.37.3/kernel/sys.c 2011-02-22 16:05:31.000000000 -0500
31708 -+++ linux-2.6.37.3/kernel/sys.c 2011-02-22 16:05:44.000000000 -0500
31709 +diff -urNp linux-2.6.37.4/kernel/sys.c linux-2.6.37.4/kernel/sys.c
31710 +--- linux-2.6.37.4/kernel/sys.c 2011-02-22 16:05:31.000000000 -0500
31711 ++++ linux-2.6.37.4/kernel/sys.c 2011-02-22 16:05:44.000000000 -0500
31712 @@ -134,6 +134,12 @@ static int set_one_prio(struct task_stru
31713 error = -EACCES;
31714 goto out;
31715 @@ -51980,9 +52183,9 @@ diff -urNp linux-2.6.37.3/kernel/sys.c linux-2.6.37.3/kernel/sys.c
31716 error = -EINVAL;
31717 break;
31718 }
31719 -diff -urNp linux-2.6.37.3/kernel/sysctl.c linux-2.6.37.3/kernel/sysctl.c
31720 ---- linux-2.6.37.3/kernel/sysctl.c 2011-02-22 16:05:31.000000000 -0500
31721 -+++ linux-2.6.37.3/kernel/sysctl.c 2011-02-22 16:05:44.000000000 -0500
31722 +diff -urNp linux-2.6.37.4/kernel/sysctl.c linux-2.6.37.4/kernel/sysctl.c
31723 +--- linux-2.6.37.4/kernel/sysctl.c 2011-02-22 16:05:31.000000000 -0500
31724 ++++ linux-2.6.37.4/kernel/sysctl.c 2011-02-22 16:05:44.000000000 -0500
31725 @@ -83,6 +83,13 @@
31726
31727
31728 @@ -52149,9 +52352,9 @@ diff -urNp linux-2.6.37.3/kernel/sysctl.c linux-2.6.37.3/kernel/sysctl.c
31729 EXPORT_SYMBOL(proc_doulongvec_minmax);
31730 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
31731 EXPORT_SYMBOL(register_sysctl_table);
31732 -diff -urNp linux-2.6.37.3/kernel/sysctl_check.c linux-2.6.37.3/kernel/sysctl_check.c
31733 ---- linux-2.6.37.3/kernel/sysctl_check.c 2011-01-04 19:50:19.000000000 -0500
31734 -+++ linux-2.6.37.3/kernel/sysctl_check.c 2011-01-17 02:41:02.000000000 -0500
31735 +diff -urNp linux-2.6.37.4/kernel/sysctl_check.c linux-2.6.37.4/kernel/sysctl_check.c
31736 +--- linux-2.6.37.4/kernel/sysctl_check.c 2011-01-04 19:50:19.000000000 -0500
31737 ++++ linux-2.6.37.4/kernel/sysctl_check.c 2011-01-17 02:41:02.000000000 -0500
31738 @@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n
31739 set_fail(&fail, table, "Directory with extra2");
31740 } else {
31741 @@ -52160,9 +52363,9 @@ diff -urNp linux-2.6.37.3/kernel/sysctl_check.c linux-2.6.37.3/kernel/sysctl_che
31742 (table->proc_handler == proc_dointvec) ||
31743 (table->proc_handler == proc_dointvec_minmax) ||
31744 (table->proc_handler == proc_dointvec_jiffies) ||
31745 -diff -urNp linux-2.6.37.3/kernel/taskstats.c linux-2.6.37.3/kernel/taskstats.c
31746 ---- linux-2.6.37.3/kernel/taskstats.c 2011-01-04 19:50:19.000000000 -0500
31747 -+++ linux-2.6.37.3/kernel/taskstats.c 2011-01-17 02:41:02.000000000 -0500
31748 +diff -urNp linux-2.6.37.4/kernel/taskstats.c linux-2.6.37.4/kernel/taskstats.c
31749 +--- linux-2.6.37.4/kernel/taskstats.c 2011-01-04 19:50:19.000000000 -0500
31750 ++++ linux-2.6.37.4/kernel/taskstats.c 2011-01-17 02:41:02.000000000 -0500
31751 @@ -27,9 +27,12 @@
31752 #include <linux/cgroup.h>
31753 #include <linux/fs.h>
31754 @@ -52186,9 +52389,9 @@ diff -urNp linux-2.6.37.3/kernel/taskstats.c linux-2.6.37.3/kernel/taskstats.c
31755 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
31756 return cmd_attr_register_cpumask(info);
31757 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
31758 -diff -urNp linux-2.6.37.3/kernel/time/tick-broadcast.c linux-2.6.37.3/kernel/time/tick-broadcast.c
31759 ---- linux-2.6.37.3/kernel/time/tick-broadcast.c 2011-03-11 17:22:42.000000000 -0500
31760 -+++ linux-2.6.37.3/kernel/time/tick-broadcast.c 2011-03-11 17:23:06.000000000 -0500
31761 +diff -urNp linux-2.6.37.4/kernel/time/tick-broadcast.c linux-2.6.37.4/kernel/time/tick-broadcast.c
31762 +--- linux-2.6.37.4/kernel/time/tick-broadcast.c 2011-03-11 17:22:42.000000000 -0500
31763 ++++ linux-2.6.37.4/kernel/time/tick-broadcast.c 2011-03-11 17:23:06.000000000 -0500
31764 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
31765 * then clear the broadcast bit.
31766 */
31767 @@ -52198,9 +52401,9 @@ diff -urNp linux-2.6.37.3/kernel/time/tick-broadcast.c linux-2.6.37.3/kernel/tim
31768
31769 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
31770 tick_broadcast_clear_oneshot(cpu);
31771 -diff -urNp linux-2.6.37.3/kernel/time/timekeeping.c linux-2.6.37.3/kernel/time/timekeeping.c
31772 ---- linux-2.6.37.3/kernel/time/timekeeping.c 2011-01-04 19:50:19.000000000 -0500
31773 -+++ linux-2.6.37.3/kernel/time/timekeeping.c 2011-01-17 02:41:02.000000000 -0500
31774 +diff -urNp linux-2.6.37.4/kernel/time/timekeeping.c linux-2.6.37.4/kernel/time/timekeeping.c
31775 +--- linux-2.6.37.4/kernel/time/timekeeping.c 2011-01-04 19:50:19.000000000 -0500
31776 ++++ linux-2.6.37.4/kernel/time/timekeeping.c 2011-01-17 02:41:02.000000000 -0500
31777 @@ -14,6 +14,7 @@
31778 #include <linux/init.h>
31779 #include <linux/mm.h>
31780 @@ -52218,9 +52421,9 @@ diff -urNp linux-2.6.37.3/kernel/time/timekeeping.c linux-2.6.37.3/kernel/time/t
31781 write_seqlock_irqsave(&xtime_lock, flags);
31782
31783 timekeeping_forward_now();
31784 -diff -urNp linux-2.6.37.3/kernel/time/timer_list.c linux-2.6.37.3/kernel/time/timer_list.c
31785 ---- linux-2.6.37.3/kernel/time/timer_list.c 2011-01-04 19:50:19.000000000 -0500
31786 -+++ linux-2.6.37.3/kernel/time/timer_list.c 2011-01-17 02:41:02.000000000 -0500
31787 +diff -urNp linux-2.6.37.4/kernel/time/timer_list.c linux-2.6.37.4/kernel/time/timer_list.c
31788 +--- linux-2.6.37.4/kernel/time/timer_list.c 2011-01-04 19:50:19.000000000 -0500
31789 ++++ linux-2.6.37.4/kernel/time/timer_list.c 2011-01-17 02:41:02.000000000 -0500
31790 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
31791
31792 static void print_name_offset(struct seq_file *m, void *sym)
31793 @@ -52262,9 +52465,9 @@ diff -urNp linux-2.6.37.3/kernel/time/timer_list.c linux-2.6.37.3/kernel/time/ti
31794 if (!pe)
31795 return -ENOMEM;
31796 return 0;
31797 -diff -urNp linux-2.6.37.3/kernel/time/timer_stats.c linux-2.6.37.3/kernel/time/timer_stats.c
31798 ---- linux-2.6.37.3/kernel/time/timer_stats.c 2011-01-04 19:50:19.000000000 -0500
31799 -+++ linux-2.6.37.3/kernel/time/timer_stats.c 2011-01-17 02:41:02.000000000 -0500
31800 +diff -urNp linux-2.6.37.4/kernel/time/timer_stats.c linux-2.6.37.4/kernel/time/timer_stats.c
31801 +--- linux-2.6.37.4/kernel/time/timer_stats.c 2011-01-04 19:50:19.000000000 -0500
31802 ++++ linux-2.6.37.4/kernel/time/timer_stats.c 2011-01-17 02:41:02.000000000 -0500
31803 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
31804
31805 static void print_name_offset(struct seq_file *m, unsigned long addr)
31806 @@ -52294,9 +52497,9 @@ diff -urNp linux-2.6.37.3/kernel/time/timer_stats.c linux-2.6.37.3/kernel/time/t
31807 if (!pe)
31808 return -ENOMEM;
31809 return 0;
31810 -diff -urNp linux-2.6.37.3/kernel/time.c linux-2.6.37.3/kernel/time.c
31811 ---- linux-2.6.37.3/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
31812 -+++ linux-2.6.37.3/kernel/time.c 2011-01-17 02:41:02.000000000 -0500
31813 +diff -urNp linux-2.6.37.4/kernel/time.c linux-2.6.37.4/kernel/time.c
31814 +--- linux-2.6.37.4/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
31815 ++++ linux-2.6.37.4/kernel/time.c 2011-01-17 02:41:02.000000000 -0500
31816 @@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec
31817 return error;
31818
31819 @@ -52327,9 +52530,9 @@ diff -urNp linux-2.6.37.3/kernel/time.c linux-2.6.37.3/kernel/time.c
31820 {
31821 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
31822 return (USEC_PER_SEC / HZ) * j;
31823 -diff -urNp linux-2.6.37.3/kernel/timer.c linux-2.6.37.3/kernel/timer.c
31824 ---- linux-2.6.37.3/kernel/timer.c 2011-01-04 19:50:19.000000000 -0500
31825 -+++ linux-2.6.37.3/kernel/timer.c 2011-01-17 02:41:02.000000000 -0500
31826 +diff -urNp linux-2.6.37.4/kernel/timer.c linux-2.6.37.4/kernel/timer.c
31827 +--- linux-2.6.37.4/kernel/timer.c 2011-01-04 19:50:19.000000000 -0500
31828 ++++ linux-2.6.37.4/kernel/timer.c 2011-01-17 02:41:02.000000000 -0500
31829 @@ -1296,7 +1296,7 @@ void update_process_times(int user_tick)
31830 /*
31831 * This function runs timers and the timer-tq in bottom half context.
31832 @@ -52339,9 +52542,9 @@ diff -urNp linux-2.6.37.3/kernel/timer.c linux-2.6.37.3/kernel/timer.c
31833 {
31834 struct tvec_base *base = __get_cpu_var(tvec_bases);
31835
31836 -diff -urNp linux-2.6.37.3/kernel/trace/ftrace.c linux-2.6.37.3/kernel/trace/ftrace.c
31837 ---- linux-2.6.37.3/kernel/trace/ftrace.c 2011-01-04 19:50:19.000000000 -0500
31838 -+++ linux-2.6.37.3/kernel/trace/ftrace.c 2011-01-17 02:41:02.000000000 -0500
31839 +diff -urNp linux-2.6.37.4/kernel/trace/ftrace.c linux-2.6.37.4/kernel/trace/ftrace.c
31840 +--- linux-2.6.37.4/kernel/trace/ftrace.c 2011-01-04 19:50:19.000000000 -0500
31841 ++++ linux-2.6.37.4/kernel/trace/ftrace.c 2011-01-17 02:41:02.000000000 -0500
31842 @@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod,
31843
31844 ip = rec->ip;
31845 @@ -52363,9 +52566,9 @@ diff -urNp linux-2.6.37.3/kernel/trace/ftrace.c linux-2.6.37.3/kernel/trace/ftra
31846 }
31847
31848 /*
31849 -diff -urNp linux-2.6.37.3/kernel/trace/ring_buffer.c linux-2.6.37.3/kernel/trace/ring_buffer.c
31850 ---- linux-2.6.37.3/kernel/trace/ring_buffer.c 2011-01-04 19:50:19.000000000 -0500
31851 -+++ linux-2.6.37.3/kernel/trace/ring_buffer.c 2011-01-17 02:41:02.000000000 -0500
31852 +diff -urNp linux-2.6.37.4/kernel/trace/ring_buffer.c linux-2.6.37.4/kernel/trace/ring_buffer.c
31853 +--- linux-2.6.37.4/kernel/trace/ring_buffer.c 2011-01-04 19:50:19.000000000 -0500
31854 ++++ linux-2.6.37.4/kernel/trace/ring_buffer.c 2011-01-17 02:41:02.000000000 -0500
31855 @@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st
31856 * the reader page). But if the next page is a header page,
31857 * its flags will be non zero.
31858 @@ -52375,9 +52578,9 @@ diff -urNp linux-2.6.37.3/kernel/trace/ring_buffer.c linux-2.6.37.3/kernel/trace
31859 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
31860 struct buffer_page *page, struct list_head *list)
31861 {
31862 -diff -urNp linux-2.6.37.3/kernel/trace/trace.c linux-2.6.37.3/kernel/trace/trace.c
31863 ---- linux-2.6.37.3/kernel/trace/trace.c 2011-02-22 16:05:31.000000000 -0500
31864 -+++ linux-2.6.37.3/kernel/trace/trace.c 2011-02-22 16:05:44.000000000 -0500
31865 +diff -urNp linux-2.6.37.4/kernel/trace/trace.c linux-2.6.37.4/kernel/trace/trace.c
31866 +--- linux-2.6.37.4/kernel/trace/trace.c 2011-02-22 16:05:31.000000000 -0500
31867 ++++ linux-2.6.37.4/kernel/trace/trace.c 2011-02-22 16:05:44.000000000 -0500
31868 @@ -3967,10 +3967,9 @@ static const struct file_operations trac
31869 };
31870 #endif
31871 @@ -52402,9 +52605,9 @@ diff -urNp linux-2.6.37.3/kernel/trace/trace.c linux-2.6.37.3/kernel/trace/trace
31872 static int once;
31873 struct dentry *d_tracer;
31874
31875 -diff -urNp linux-2.6.37.3/kernel/trace/trace_events.c linux-2.6.37.3/kernel/trace/trace_events.c
31876 ---- linux-2.6.37.3/kernel/trace/trace_events.c 2011-01-04 19:50:19.000000000 -0500
31877 -+++ linux-2.6.37.3/kernel/trace/trace_events.c 2011-01-17 02:41:02.000000000 -0500
31878 +diff -urNp linux-2.6.37.4/kernel/trace/trace_events.c linux-2.6.37.4/kernel/trace/trace_events.c
31879 +--- linux-2.6.37.4/kernel/trace/trace_events.c 2011-01-04 19:50:19.000000000 -0500
31880 ++++ linux-2.6.37.4/kernel/trace/trace_events.c 2011-01-17 02:41:02.000000000 -0500
31881 @@ -1231,6 +1231,7 @@ static LIST_HEAD(ftrace_module_file_list
31882 * Modules must own their file_operations to keep up with
31883 * reference counting.
31884 @@ -52413,9 +52616,9 @@ diff -urNp linux-2.6.37.3/kernel/trace/trace_events.c linux-2.6.37.3/kernel/trac
31885 struct ftrace_module_file_ops {
31886 struct list_head list;
31887 struct module *mod;
31888 -diff -urNp linux-2.6.37.3/kernel/trace/trace_output.c linux-2.6.37.3/kernel/trace/trace_output.c
31889 ---- linux-2.6.37.3/kernel/trace/trace_output.c 2011-01-04 19:50:19.000000000 -0500
31890 -+++ linux-2.6.37.3/kernel/trace/trace_output.c 2011-01-17 02:41:02.000000000 -0500
31891 +diff -urNp linux-2.6.37.4/kernel/trace/trace_output.c linux-2.6.37.4/kernel/trace/trace_output.c
31892 +--- linux-2.6.37.4/kernel/trace/trace_output.c 2011-01-04 19:50:19.000000000 -0500
31893 ++++ linux-2.6.37.4/kernel/trace/trace_output.c 2011-01-17 02:41:02.000000000 -0500
31894 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,
31895
31896 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
31897 @@ -52425,9 +52628,9 @@ diff -urNp linux-2.6.37.3/kernel/trace/trace_output.c linux-2.6.37.3/kernel/trac
31898 if (p) {
31899 s->len = p - s->buffer;
31900 return 1;
31901 -diff -urNp linux-2.6.37.3/kernel/trace/trace_stack.c linux-2.6.37.3/kernel/trace/trace_stack.c
31902 ---- linux-2.6.37.3/kernel/trace/trace_stack.c 2011-01-04 19:50:19.000000000 -0500
31903 -+++ linux-2.6.37.3/kernel/trace/trace_stack.c 2011-01-17 02:41:02.000000000 -0500
31904 +diff -urNp linux-2.6.37.4/kernel/trace/trace_stack.c linux-2.6.37.4/kernel/trace/trace_stack.c
31905 +--- linux-2.6.37.4/kernel/trace/trace_stack.c 2011-01-04 19:50:19.000000000 -0500
31906 ++++ linux-2.6.37.4/kernel/trace/trace_stack.c 2011-01-17 02:41:02.000000000 -0500
31907 @@ -50,7 +50,7 @@ static inline void check_stack(void)
31908 return;
31909
31910 @@ -52437,9 +52640,9 @@ diff -urNp linux-2.6.37.3/kernel/trace/trace_stack.c linux-2.6.37.3/kernel/trace
31911 return;
31912
31913 local_irq_save(flags);
31914 -diff -urNp linux-2.6.37.3/lib/bug.c linux-2.6.37.3/lib/bug.c
31915 ---- linux-2.6.37.3/lib/bug.c 2011-01-04 19:50:19.000000000 -0500
31916 -+++ linux-2.6.37.3/lib/bug.c 2011-01-17 02:41:02.000000000 -0500
31917 +diff -urNp linux-2.6.37.4/lib/bug.c linux-2.6.37.4/lib/bug.c
31918 +--- linux-2.6.37.4/lib/bug.c 2011-01-04 19:50:19.000000000 -0500
31919 ++++ linux-2.6.37.4/lib/bug.c 2011-01-17 02:41:02.000000000 -0500
31920 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
31921 return BUG_TRAP_TYPE_NONE;
31922
31923 @@ -52449,9 +52652,9 @@ diff -urNp linux-2.6.37.3/lib/bug.c linux-2.6.37.3/lib/bug.c
31924
31925 file = NULL;
31926 line = 0;
31927 -diff -urNp linux-2.6.37.3/lib/debugobjects.c linux-2.6.37.3/lib/debugobjects.c
31928 ---- linux-2.6.37.3/lib/debugobjects.c 2011-01-04 19:50:19.000000000 -0500
31929 -+++ linux-2.6.37.3/lib/debugobjects.c 2011-01-17 02:41:02.000000000 -0500
31930 +diff -urNp linux-2.6.37.4/lib/debugobjects.c linux-2.6.37.4/lib/debugobjects.c
31931 +--- linux-2.6.37.4/lib/debugobjects.c 2011-01-04 19:50:19.000000000 -0500
31932 ++++ linux-2.6.37.4/lib/debugobjects.c 2011-01-17 02:41:02.000000000 -0500
31933 @@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi
31934 if (limit > 4)
31935 return;
31936 @@ -52461,9 +52664,9 @@ diff -urNp linux-2.6.37.3/lib/debugobjects.c linux-2.6.37.3/lib/debugobjects.c
31937 if (is_on_stack == onstack)
31938 return;
31939
31940 -diff -urNp linux-2.6.37.3/lib/dma-debug.c linux-2.6.37.3/lib/dma-debug.c
31941 ---- linux-2.6.37.3/lib/dma-debug.c 2011-01-04 19:50:19.000000000 -0500
31942 -+++ linux-2.6.37.3/lib/dma-debug.c 2011-01-17 02:41:02.000000000 -0500
31943 +diff -urNp linux-2.6.37.4/lib/dma-debug.c linux-2.6.37.4/lib/dma-debug.c
31944 +--- linux-2.6.37.4/lib/dma-debug.c 2011-01-04 19:50:19.000000000 -0500
31945 ++++ linux-2.6.37.4/lib/dma-debug.c 2011-01-17 02:41:02.000000000 -0500
31946 @@ -862,7 +862,7 @@ out:
31947
31948 static void check_for_stack(struct device *dev, void *addr)
31949 @@ -52473,9 +52676,9 @@ diff -urNp linux-2.6.37.3/lib/dma-debug.c linux-2.6.37.3/lib/dma-debug.c
31950 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
31951 "stack [addr=%p]\n", addr);
31952 }
31953 -diff -urNp linux-2.6.37.3/lib/inflate.c linux-2.6.37.3/lib/inflate.c
31954 ---- linux-2.6.37.3/lib/inflate.c 2011-01-04 19:50:19.000000000 -0500
31955 -+++ linux-2.6.37.3/lib/inflate.c 2011-01-17 02:41:02.000000000 -0500
31956 +diff -urNp linux-2.6.37.4/lib/inflate.c linux-2.6.37.4/lib/inflate.c
31957 +--- linux-2.6.37.4/lib/inflate.c 2011-01-04 19:50:19.000000000 -0500
31958 ++++ linux-2.6.37.4/lib/inflate.c 2011-01-17 02:41:02.000000000 -0500
31959 @@ -269,7 +269,7 @@ static void free(void *where)
31960 malloc_ptr = free_mem_ptr;
31961 }
31962 @@ -52485,9 +52688,9 @@ diff -urNp linux-2.6.37.3/lib/inflate.c linux-2.6.37.3/lib/inflate.c
31963 #define free(a) kfree(a)
31964 #endif
31965
31966 -diff -urNp linux-2.6.37.3/lib/Kconfig.debug linux-2.6.37.3/lib/Kconfig.debug
31967 ---- linux-2.6.37.3/lib/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
31968 -+++ linux-2.6.37.3/lib/Kconfig.debug 2011-01-17 02:41:02.000000000 -0500
31969 +diff -urNp linux-2.6.37.4/lib/Kconfig.debug linux-2.6.37.4/lib/Kconfig.debug
31970 +--- linux-2.6.37.4/lib/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
31971 ++++ linux-2.6.37.4/lib/Kconfig.debug 2011-01-17 02:41:02.000000000 -0500
31972 @@ -1065,6 +1065,7 @@ config LATENCYTOP
31973 depends on DEBUG_KERNEL
31974 depends on STACKTRACE_SUPPORT
31975 @@ -52496,9 +52699,9 @@ diff -urNp linux-2.6.37.3/lib/Kconfig.debug linux-2.6.37.3/lib/Kconfig.debug
31976 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
31977 select KALLSYMS
31978 select KALLSYMS_ALL
31979 -diff -urNp linux-2.6.37.3/lib/kref.c linux-2.6.37.3/lib/kref.c
31980 ---- linux-2.6.37.3/lib/kref.c 2011-02-22 16:05:31.000000000 -0500
31981 -+++ linux-2.6.37.3/lib/kref.c 2011-02-22 16:05:44.000000000 -0500
31982 +diff -urNp linux-2.6.37.4/lib/kref.c linux-2.6.37.4/lib/kref.c
31983 +--- linux-2.6.37.4/lib/kref.c 2011-02-22 16:05:31.000000000 -0500
31984 ++++ linux-2.6.37.4/lib/kref.c 2011-02-22 16:05:44.000000000 -0500
31985 @@ -64,7 +64,7 @@ int kref_test_and_get(struct kref *kref)
31986 */
31987 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
31988 @@ -52508,9 +52711,9 @@ diff -urNp linux-2.6.37.3/lib/kref.c linux-2.6.37.3/lib/kref.c
31989 WARN_ON(release == (void (*)(struct kref *))kfree);
31990
31991 if (atomic_dec_and_test(&kref->refcount)) {
31992 -diff -urNp linux-2.6.37.3/lib/radix-tree.c linux-2.6.37.3/lib/radix-tree.c
31993 ---- linux-2.6.37.3/lib/radix-tree.c 2011-01-04 19:50:19.000000000 -0500
31994 -+++ linux-2.6.37.3/lib/radix-tree.c 2011-01-17 02:41:02.000000000 -0500
31995 +diff -urNp linux-2.6.37.4/lib/radix-tree.c linux-2.6.37.4/lib/radix-tree.c
31996 +--- linux-2.6.37.4/lib/radix-tree.c 2011-01-04 19:50:19.000000000 -0500
31997 ++++ linux-2.6.37.4/lib/radix-tree.c 2011-01-17 02:41:02.000000000 -0500
31998 @@ -80,7 +80,7 @@ struct radix_tree_preload {
31999 int nr;
32000 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
32001 @@ -52520,9 +52723,9 @@ diff -urNp linux-2.6.37.3/lib/radix-tree.c linux-2.6.37.3/lib/radix-tree.c
32002
32003 static inline void *ptr_to_indirect(void *ptr)
32004 {
32005 -diff -urNp linux-2.6.37.3/lib/vsprintf.c linux-2.6.37.3/lib/vsprintf.c
32006 ---- linux-2.6.37.3/lib/vsprintf.c 2011-01-04 19:50:19.000000000 -0500
32007 -+++ linux-2.6.37.3/lib/vsprintf.c 2011-01-17 02:41:02.000000000 -0500
32008 +diff -urNp linux-2.6.37.4/lib/vsprintf.c linux-2.6.37.4/lib/vsprintf.c
32009 +--- linux-2.6.37.4/lib/vsprintf.c 2011-01-04 19:50:19.000000000 -0500
32010 ++++ linux-2.6.37.4/lib/vsprintf.c 2011-01-17 02:41:02.000000000 -0500
32011 @@ -16,6 +16,9 @@
32012 * - scnprintf and vscnprintf
32013 */
32014 @@ -52604,14 +52807,14 @@ diff -urNp linux-2.6.37.3/lib/vsprintf.c linux-2.6.37.3/lib/vsprintf.c
32015 break;
32016 }
32017
32018 -diff -urNp linux-2.6.37.3/localversion-grsec linux-2.6.37.3/localversion-grsec
32019 ---- linux-2.6.37.3/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
32020 -+++ linux-2.6.37.3/localversion-grsec 2011-01-17 02:41:02.000000000 -0500
32021 +diff -urNp linux-2.6.37.4/localversion-grsec linux-2.6.37.4/localversion-grsec
32022 +--- linux-2.6.37.4/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
32023 ++++ linux-2.6.37.4/localversion-grsec 2011-01-17 02:41:02.000000000 -0500
32024 @@ -0,0 +1 @@
32025 +-grsec
32026 -diff -urNp linux-2.6.37.3/Makefile linux-2.6.37.3/Makefile
32027 ---- linux-2.6.37.3/Makefile 2011-03-11 17:22:42.000000000 -0500
32028 -+++ linux-2.6.37.3/Makefile 2011-03-11 17:22:56.000000000 -0500
32029 +diff -urNp linux-2.6.37.4/Makefile linux-2.6.37.4/Makefile
32030 +--- linux-2.6.37.4/Makefile 2011-03-18 17:47:00.000000000 -0400
32031 ++++ linux-2.6.37.4/Makefile 2011-03-18 17:48:11.000000000 -0400
32032 @@ -232,8 +232,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
32033
32034 HOSTCC = gcc
32035 @@ -52632,9 +52835,9 @@ diff -urNp linux-2.6.37.3/Makefile linux-2.6.37.3/Makefile
32036
32037 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
32038 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
32039 -diff -urNp linux-2.6.37.3/mm/bootmem.c linux-2.6.37.3/mm/bootmem.c
32040 ---- linux-2.6.37.3/mm/bootmem.c 2011-01-04 19:50:19.000000000 -0500
32041 -+++ linux-2.6.37.3/mm/bootmem.c 2011-01-17 02:41:02.000000000 -0500
32042 +diff -urNp linux-2.6.37.4/mm/bootmem.c linux-2.6.37.4/mm/bootmem.c
32043 +--- linux-2.6.37.4/mm/bootmem.c 2011-01-04 19:50:19.000000000 -0500
32044 ++++ linux-2.6.37.4/mm/bootmem.c 2011-01-17 02:41:02.000000000 -0500
32045 @@ -201,19 +201,30 @@ static void __init __free_pages_memory(u
32046 unsigned long __init free_all_memory_core_early(int nodeid)
32047 {
32048 @@ -52668,9 +52871,9 @@ diff -urNp linux-2.6.37.3/mm/bootmem.c linux-2.6.37.3/mm/bootmem.c
32049
32050 return count;
32051 }
32052 -diff -urNp linux-2.6.37.3/mm/filemap.c linux-2.6.37.3/mm/filemap.c
32053 ---- linux-2.6.37.3/mm/filemap.c 2011-01-04 19:50:19.000000000 -0500
32054 -+++ linux-2.6.37.3/mm/filemap.c 2011-01-17 02:41:02.000000000 -0500
32055 +diff -urNp linux-2.6.37.4/mm/filemap.c linux-2.6.37.4/mm/filemap.c
32056 +--- linux-2.6.37.4/mm/filemap.c 2011-01-04 19:50:19.000000000 -0500
32057 ++++ linux-2.6.37.4/mm/filemap.c 2011-01-17 02:41:02.000000000 -0500
32058 @@ -1660,7 +1660,7 @@ int generic_file_mmap(struct file * file
32059 struct address_space *mapping = file->f_mapping;
32060
32061 @@ -52688,9 +52891,9 @@ diff -urNp linux-2.6.37.3/mm/filemap.c linux-2.6.37.3/mm/filemap.c
32062 if (*pos >= limit) {
32063 send_sig(SIGXFSZ, current, 0);
32064 return -EFBIG;
32065 -diff -urNp linux-2.6.37.3/mm/fremap.c linux-2.6.37.3/mm/fremap.c
32066 ---- linux-2.6.37.3/mm/fremap.c 2011-01-04 19:50:19.000000000 -0500
32067 -+++ linux-2.6.37.3/mm/fremap.c 2011-01-17 02:41:02.000000000 -0500
32068 +diff -urNp linux-2.6.37.4/mm/fremap.c linux-2.6.37.4/mm/fremap.c
32069 +--- linux-2.6.37.4/mm/fremap.c 2011-01-04 19:50:19.000000000 -0500
32070 ++++ linux-2.6.37.4/mm/fremap.c 2011-01-17 02:41:02.000000000 -0500
32071 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
32072 retry:
32073 vma = find_vma(mm, start);
32074 @@ -52712,9 +52915,9 @@ diff -urNp linux-2.6.37.3/mm/fremap.c linux-2.6.37.3/mm/fremap.c
32075 munlock_vma_pages_range(vma, start, start + size);
32076 vma->vm_flags = saved_flags;
32077 }
32078 -diff -urNp linux-2.6.37.3/mm/highmem.c linux-2.6.37.3/mm/highmem.c
32079 ---- linux-2.6.37.3/mm/highmem.c 2011-01-04 19:50:19.000000000 -0500
32080 -+++ linux-2.6.37.3/mm/highmem.c 2011-01-17 02:41:02.000000000 -0500
32081 +diff -urNp linux-2.6.37.4/mm/highmem.c linux-2.6.37.4/mm/highmem.c
32082 +--- linux-2.6.37.4/mm/highmem.c 2011-01-04 19:50:19.000000000 -0500
32083 ++++ linux-2.6.37.4/mm/highmem.c 2011-01-17 02:41:02.000000000 -0500
32084 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
32085 * So no dangers, even with speculative execution.
32086 */
32087 @@ -52740,9 +52943,9 @@ diff -urNp linux-2.6.37.3/mm/highmem.c linux-2.6.37.3/mm/highmem.c
32088 pkmap_count[last_pkmap_nr] = 1;
32089 set_page_address(page, (void *)vaddr);
32090
32091 -diff -urNp linux-2.6.37.3/mm/hugetlb.c linux-2.6.37.3/mm/hugetlb.c
32092 ---- linux-2.6.37.3/mm/hugetlb.c 2011-01-04 19:50:19.000000000 -0500
32093 -+++ linux-2.6.37.3/mm/hugetlb.c 2011-01-17 02:41:02.000000000 -0500
32094 +diff -urNp linux-2.6.37.4/mm/hugetlb.c linux-2.6.37.4/mm/hugetlb.c
32095 +--- linux-2.6.37.4/mm/hugetlb.c 2011-01-04 19:50:19.000000000 -0500
32096 ++++ linux-2.6.37.4/mm/hugetlb.c 2011-01-17 02:41:02.000000000 -0500
32097 @@ -2373,6 +2373,27 @@ static int unmap_ref_private(struct mm_s
32098 return 1;
32099 }
32100 @@ -52832,9 +53035,9 @@ diff -urNp linux-2.6.37.3/mm/hugetlb.c linux-2.6.37.3/mm/hugetlb.c
32101 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
32102 if (!ptep)
32103 return VM_FAULT_OOM;
32104 -diff -urNp linux-2.6.37.3/mm/Kconfig linux-2.6.37.3/mm/Kconfig
32105 ---- linux-2.6.37.3/mm/Kconfig 2011-01-04 19:50:19.000000000 -0500
32106 -+++ linux-2.6.37.3/mm/Kconfig 2011-01-17 02:41:02.000000000 -0500
32107 +diff -urNp linux-2.6.37.4/mm/Kconfig linux-2.6.37.4/mm/Kconfig
32108 +--- linux-2.6.37.4/mm/Kconfig 2011-01-04 19:50:19.000000000 -0500
32109 ++++ linux-2.6.37.4/mm/Kconfig 2011-01-17 02:41:02.000000000 -0500
32110 @@ -240,7 +240,7 @@ config KSM
32111 config DEFAULT_MMAP_MIN_ADDR
32112 int "Low address space to protect from user allocation"
32113 @@ -52844,9 +53047,9 @@ diff -urNp linux-2.6.37.3/mm/Kconfig linux-2.6.37.3/mm/Kconfig
32114 help
32115 This is the portion of low virtual memory which should be protected
32116 from userspace allocation. Keeping a user from writing to low pages
32117 -diff -urNp linux-2.6.37.3/mm/kmemleak.c linux-2.6.37.3/mm/kmemleak.c
32118 ---- linux-2.6.37.3/mm/kmemleak.c 2011-01-04 19:50:19.000000000 -0500
32119 -+++ linux-2.6.37.3/mm/kmemleak.c 2011-01-17 02:41:02.000000000 -0500
32120 +diff -urNp linux-2.6.37.4/mm/kmemleak.c linux-2.6.37.4/mm/kmemleak.c
32121 +--- linux-2.6.37.4/mm/kmemleak.c 2011-01-04 19:50:19.000000000 -0500
32122 ++++ linux-2.6.37.4/mm/kmemleak.c 2011-01-17 02:41:02.000000000 -0500
32123 @@ -355,7 +355,7 @@ static void print_unreferenced(struct se
32124
32125 for (i = 0; i < object->trace_len; i++) {
32126 @@ -52856,9 +53059,9 @@ diff -urNp linux-2.6.37.3/mm/kmemleak.c linux-2.6.37.3/mm/kmemleak.c
32127 }
32128 }
32129
32130 -diff -urNp linux-2.6.37.3/mm/maccess.c linux-2.6.37.3/mm/maccess.c
32131 ---- linux-2.6.37.3/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
32132 -+++ linux-2.6.37.3/mm/maccess.c 2011-01-17 02:41:02.000000000 -0500
32133 +diff -urNp linux-2.6.37.4/mm/maccess.c linux-2.6.37.4/mm/maccess.c
32134 +--- linux-2.6.37.4/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
32135 ++++ linux-2.6.37.4/mm/maccess.c 2011-01-17 02:41:02.000000000 -0500
32136 @@ -15,10 +15,10 @@
32137 * happens, handle that and return -EFAULT.
32138 */
32139 @@ -52885,9 +53088,9 @@ diff -urNp linux-2.6.37.3/mm/maccess.c linux-2.6.37.3/mm/maccess.c
32140 {
32141 long ret;
32142 mm_segment_t old_fs = get_fs();
32143 -diff -urNp linux-2.6.37.3/mm/madvise.c linux-2.6.37.3/mm/madvise.c
32144 ---- linux-2.6.37.3/mm/madvise.c 2011-01-04 19:50:19.000000000 -0500
32145 -+++ linux-2.6.37.3/mm/madvise.c 2011-01-17 02:41:02.000000000 -0500
32146 +diff -urNp linux-2.6.37.4/mm/madvise.c linux-2.6.37.4/mm/madvise.c
32147 +--- linux-2.6.37.4/mm/madvise.c 2011-01-04 19:50:19.000000000 -0500
32148 ++++ linux-2.6.37.4/mm/madvise.c 2011-01-17 02:41:02.000000000 -0500
32149 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
32150 pgoff_t pgoff;
32151 unsigned long new_flags = vma->vm_flags;
32152 @@ -52964,9 +53167,9 @@ diff -urNp linux-2.6.37.3/mm/madvise.c linux-2.6.37.3/mm/madvise.c
32153 error = 0;
32154 if (end == start)
32155 goto out;
32156 -diff -urNp linux-2.6.37.3/mm/memory.c linux-2.6.37.3/mm/memory.c
32157 ---- linux-2.6.37.3/mm/memory.c 2011-03-11 17:22:42.000000000 -0500
32158 -+++ linux-2.6.37.3/mm/memory.c 2011-03-11 17:23:06.000000000 -0500
32159 +diff -urNp linux-2.6.37.4/mm/memory.c linux-2.6.37.4/mm/memory.c
32160 +--- linux-2.6.37.4/mm/memory.c 2011-03-11 17:22:42.000000000 -0500
32161 ++++ linux-2.6.37.4/mm/memory.c 2011-03-11 17:23:06.000000000 -0500
32162 @@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
32163 return;
32164
32165 @@ -53496,9 +53699,9 @@ diff -urNp linux-2.6.37.3/mm/memory.c linux-2.6.37.3/mm/memory.c
32166 /*
32167 * Make sure the vDSO gets into every core dump.
32168 * Dumping its contents makes post-mortem fully interpretable later
32169 -diff -urNp linux-2.6.37.3/mm/memory-failure.c linux-2.6.37.3/mm/memory-failure.c
32170 ---- linux-2.6.37.3/mm/memory-failure.c 2011-01-04 19:50:19.000000000 -0500
32171 -+++ linux-2.6.37.3/mm/memory-failure.c 2011-01-17 02:41:02.000000000 -0500
32172 +diff -urNp linux-2.6.37.4/mm/memory-failure.c linux-2.6.37.4/mm/memory-failure.c
32173 +--- linux-2.6.37.4/mm/memory-failure.c 2011-01-04 19:50:19.000000000 -0500
32174 ++++ linux-2.6.37.4/mm/memory-failure.c 2011-01-17 02:41:02.000000000 -0500
32175 @@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r
32176
32177 int sysctl_memory_failure_recovery __read_mostly = 1;
32178 @@ -53571,9 +53774,9 @@ diff -urNp linux-2.6.37.3/mm/memory-failure.c linux-2.6.37.3/mm/memory-failure.c
32179 SetPageHWPoison(page);
32180 /* keep elevated page count for bad page */
32181 return ret;
32182 -diff -urNp linux-2.6.37.3/mm/mempolicy.c linux-2.6.37.3/mm/mempolicy.c
32183 ---- linux-2.6.37.3/mm/mempolicy.c 2011-01-04 19:50:19.000000000 -0500
32184 -+++ linux-2.6.37.3/mm/mempolicy.c 2011-01-17 02:41:02.000000000 -0500
32185 +diff -urNp linux-2.6.37.4/mm/mempolicy.c linux-2.6.37.4/mm/mempolicy.c
32186 +--- linux-2.6.37.4/mm/mempolicy.c 2011-01-04 19:50:19.000000000 -0500
32187 ++++ linux-2.6.37.4/mm/mempolicy.c 2011-01-17 02:41:02.000000000 -0500
32188 @@ -642,6 +642,10 @@ static int mbind_range(struct mm_struct
32189 unsigned long vmstart;
32190 unsigned long vmend;
32191 @@ -53654,9 +53857,9 @@ diff -urNp linux-2.6.37.3/mm/mempolicy.c linux-2.6.37.3/mm/mempolicy.c
32192 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
32193 seq_printf(m, " heap");
32194 } else if (vma->vm_start <= mm->start_stack &&
32195 -diff -urNp linux-2.6.37.3/mm/migrate.c linux-2.6.37.3/mm/migrate.c
32196 ---- linux-2.6.37.3/mm/migrate.c 2011-02-22 16:05:31.000000000 -0500
32197 -+++ linux-2.6.37.3/mm/migrate.c 2011-02-22 16:05:44.000000000 -0500
32198 +diff -urNp linux-2.6.37.4/mm/migrate.c linux-2.6.37.4/mm/migrate.c
32199 +--- linux-2.6.37.4/mm/migrate.c 2011-02-22 16:05:31.000000000 -0500
32200 ++++ linux-2.6.37.4/mm/migrate.c 2011-02-22 16:05:44.000000000 -0500
32201 @@ -1278,6 +1278,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
32202 if (!mm)
32203 return -EINVAL;
32204 @@ -53682,9 +53885,9 @@ diff -urNp linux-2.6.37.3/mm/migrate.c linux-2.6.37.3/mm/migrate.c
32205 rcu_read_unlock();
32206 err = -EPERM;
32207 goto out;
32208 -diff -urNp linux-2.6.37.3/mm/mlock.c linux-2.6.37.3/mm/mlock.c
32209 ---- linux-2.6.37.3/mm/mlock.c 2011-01-04 19:50:19.000000000 -0500
32210 -+++ linux-2.6.37.3/mm/mlock.c 2011-01-24 18:04:18.000000000 -0500
32211 +diff -urNp linux-2.6.37.4/mm/mlock.c linux-2.6.37.4/mm/mlock.c
32212 +--- linux-2.6.37.4/mm/mlock.c 2011-01-04 19:50:19.000000000 -0500
32213 ++++ linux-2.6.37.4/mm/mlock.c 2011-01-24 18:04:18.000000000 -0500
32214 @@ -13,6 +13,7 @@
32215 #include <linux/pagemap.h>
32216 #include <linux/mempolicy.h>
32217 @@ -53795,9 +53998,9 @@ diff -urNp linux-2.6.37.3/mm/mlock.c linux-2.6.37.3/mm/mlock.c
32218 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
32219 capable(CAP_IPC_LOCK))
32220 ret = do_mlockall(flags);
32221 -diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32222 ---- linux-2.6.37.3/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
32223 -+++ linux-2.6.37.3/mm/mmap.c 2011-02-12 11:36:29.000000000 -0500
32224 +diff -urNp linux-2.6.37.4/mm/mmap.c linux-2.6.37.4/mm/mmap.c
32225 +--- linux-2.6.37.4/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
32226 ++++ linux-2.6.37.4/mm/mmap.c 2011-03-21 17:35:08.000000000 -0400
32227 @@ -45,6 +45,16 @@
32228 #define arch_rebalance_pgtables(addr, len) (addr)
32229 #endif
32230 @@ -54185,11 +54388,11 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32231 kmem_cache_free(vm_area_cachep, vma);
32232 unacct_error:
32233 if (charged)
32234 -@@ -1372,6 +1528,33 @@ unacct_error:
32235 +@@ -1372,6 +1528,44 @@ unacct_error:
32236 return error;
32237 }
32238
32239 -+bool check_heap_stack_gap(struct vm_area_struct *vma, unsigned long addr, unsigned long len)
32240 ++bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
32241 +{
32242 + if (!vma) {
32243 +#ifdef CONFIG_STACK_GROWSUP
32244 @@ -54216,10 +54419,21 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32245 + return true;
32246 +}
32247 +
32248 ++unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
32249 ++{
32250 ++ if (vma->vm_start < len)
32251 ++ return -ENOMEM;
32252 ++ if (!(vma->vm_flags & VM_GROWSDOWN))
32253 ++ return vma->vm_start - len;
32254 ++ if (sysctl_heap_stack_gap <= vma->vm_start - len)
32255 ++ return vma->vm_start - len - sysctl_heap_stack_gap;
32256 ++ return -ENOMEM;
32257 ++}
32258 ++
32259 /* Get an address range which is currently unmapped.
32260 * For shmat() with addr=0.
32261 *
32262 -@@ -1398,18 +1581,23 @@ arch_get_unmapped_area(struct file *filp
32263 +@@ -1398,18 +1592,23 @@ arch_get_unmapped_area(struct file *filp
32264 if (flags & MAP_FIXED)
32265 return addr;
32266
32267 @@ -54250,7 +54464,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32268 }
32269
32270 full_search:
32271 -@@ -1420,34 +1608,40 @@ full_search:
32272 +@@ -1420,34 +1619,40 @@ full_search:
32273 * Start a new search - just in case we missed
32274 * some holes.
32275 */
32276 @@ -54302,7 +54516,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32277 mm->free_area_cache = addr;
32278 mm->cached_hole_size = ~0UL;
32279 }
32280 -@@ -1465,7 +1659,7 @@ arch_get_unmapped_area_topdown(struct fi
32281 +@@ -1465,7 +1670,7 @@ arch_get_unmapped_area_topdown(struct fi
32282 {
32283 struct vm_area_struct *vma;
32284 struct mm_struct *mm = current->mm;
32285 @@ -54311,7 +54525,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32286
32287 /* requested length too big for entire address space */
32288 if (len > TASK_SIZE)
32289 -@@ -1474,13 +1668,18 @@ arch_get_unmapped_area_topdown(struct fi
32290 +@@ -1474,13 +1679,18 @@ arch_get_unmapped_area_topdown(struct fi
32291 if (flags & MAP_FIXED)
32292 return addr;
32293
32294 @@ -54334,7 +54548,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32295 }
32296
32297 /* check if free_area_cache is useful for us */
32298 -@@ -1495,7 +1694,7 @@ arch_get_unmapped_area_topdown(struct fi
32299 +@@ -1495,7 +1705,7 @@ arch_get_unmapped_area_topdown(struct fi
32300 /* make sure it can fit in the remaining address space */
32301 if (addr > len) {
32302 vma = find_vma(mm, addr-len);
32303 @@ -54343,7 +54557,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32304 /* remember the address as a hint for next time */
32305 return (mm->free_area_cache = addr-len);
32306 }
32307 -@@ -1512,7 +1711,7 @@ arch_get_unmapped_area_topdown(struct fi
32308 +@@ -1512,7 +1722,7 @@ arch_get_unmapped_area_topdown(struct fi
32309 * return with success:
32310 */
32311 vma = find_vma(mm, addr);
32312 @@ -54352,7 +54566,18 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32313 /* remember the address as a hint for next time */
32314 return (mm->free_area_cache = addr);
32315
32316 -@@ -1531,13 +1730,21 @@ bottomup:
32317 +@@ -1521,8 +1731,8 @@ arch_get_unmapped_area_topdown(struct fi
32318 + mm->cached_hole_size = vma->vm_start - addr;
32319 +
32320 + /* try just below the current vma->vm_start */
32321 +- addr = vma->vm_start-len;
32322 +- } while (len < vma->vm_start);
32323 ++ addr = skip_heap_stack_gap(vma, len);
32324 ++ } while (!IS_ERR_VALUE(addr));
32325 +
32326 + bottomup:
32327 + /*
32328 +@@ -1531,13 +1741,21 @@ bottomup:
32329 * can happen with large stack limits and large mmap()
32330 * allocations.
32331 */
32332 @@ -54376,7 +54601,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32333 mm->cached_hole_size = ~0UL;
32334
32335 return addr;
32336 -@@ -1546,6 +1753,12 @@ bottomup:
32337 +@@ -1546,6 +1764,12 @@ bottomup:
32338
32339 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
32340 {
32341 @@ -54389,7 +54614,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32342 /*
32343 * Is this a new hole at the highest possible address?
32344 */
32345 -@@ -1553,8 +1766,10 @@ void arch_unmap_area_topdown(struct mm_s
32346 +@@ -1553,8 +1777,10 @@ void arch_unmap_area_topdown(struct mm_s
32347 mm->free_area_cache = addr;
32348
32349 /* dont allow allocations above current base */
32350 @@ -54401,7 +54626,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32351 }
32352
32353 unsigned long
32354 -@@ -1662,6 +1877,28 @@ out:
32355 +@@ -1662,6 +1888,28 @@ out:
32356 return prev ? prev->vm_next : vma;
32357 }
32358
32359 @@ -54430,7 +54655,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32360 /*
32361 * Verify that the stack growth is acceptable and
32362 * update accounting. This is shared with both the
32363 -@@ -1678,6 +1915,7 @@ static int acct_stack_growth(struct vm_a
32364 +@@ -1678,6 +1926,7 @@ static int acct_stack_growth(struct vm_a
32365 return -ENOMEM;
32366
32367 /* Stack limit test */
32368 @@ -54438,7 +54663,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32369 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
32370 return -ENOMEM;
32371
32372 -@@ -1688,6 +1926,7 @@ static int acct_stack_growth(struct vm_a
32373 +@@ -1688,6 +1937,7 @@ static int acct_stack_growth(struct vm_a
32374 locked = mm->locked_vm + grow;
32375 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
32376 limit >>= PAGE_SHIFT;
32377 @@ -54446,7 +54671,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32378 if (locked > limit && !capable(CAP_IPC_LOCK))
32379 return -ENOMEM;
32380 }
32381 -@@ -1718,37 +1957,48 @@ static int acct_stack_growth(struct vm_a
32382 +@@ -1718,37 +1968,48 @@ static int acct_stack_growth(struct vm_a
32383 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
32384 * vma is the last one with address > vma->vm_end. Have to extend vma.
32385 */
32386 @@ -54504,7 +54729,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32387 unsigned long size, grow;
32388
32389 size = address - vma->vm_start;
32390 -@@ -1760,6 +2010,8 @@ int expand_upwards(struct vm_area_struct
32391 +@@ -1760,6 +2021,8 @@ int expand_upwards(struct vm_area_struct
32392 perf_event_mmap(vma);
32393 }
32394 }
32395 @@ -54513,7 +54738,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32396 vma_unlock_anon_vma(vma);
32397 return error;
32398 }
32399 -@@ -1772,6 +2024,8 @@ static int expand_downwards(struct vm_ar
32400 +@@ -1772,6 +2035,8 @@ static int expand_downwards(struct vm_ar
32401 unsigned long address)
32402 {
32403 int error;
32404 @@ -54522,7 +54747,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32405
32406 /*
32407 * We must make sure the anon_vma is allocated
32408 -@@ -1785,6 +2039,15 @@ static int expand_downwards(struct vm_ar
32409 +@@ -1785,6 +2050,15 @@ static int expand_downwards(struct vm_ar
32410 if (error)
32411 return error;
32412
32413 @@ -54538,7 +54763,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32414 vma_lock_anon_vma(vma);
32415
32416 /*
32417 -@@ -1794,9 +2057,17 @@ static int expand_downwards(struct vm_ar
32418 +@@ -1794,9 +2068,17 @@ static int expand_downwards(struct vm_ar
32419 */
32420
32421 /* Somebody else might have raced and expanded it already */
32422 @@ -54557,7 +54782,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32423 size = vma->vm_end - address;
32424 grow = (vma->vm_start - address) >> PAGE_SHIFT;
32425
32426 -@@ -1804,10 +2075,21 @@ static int expand_downwards(struct vm_ar
32427 +@@ -1804,10 +2086,21 @@ static int expand_downwards(struct vm_ar
32428 if (!error) {
32429 vma->vm_start = address;
32430 vma->vm_pgoff -= grow;
32431 @@ -54579,7 +54804,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32432 return error;
32433 }
32434
32435 -@@ -1881,6 +2163,13 @@ static void remove_vma_list(struct mm_st
32436 +@@ -1881,6 +2174,13 @@ static void remove_vma_list(struct mm_st
32437 do {
32438 long nrpages = vma_pages(vma);
32439
32440 @@ -54593,7 +54818,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32441 mm->total_vm -= nrpages;
32442 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
32443 vma = remove_vma(vma);
32444 -@@ -1926,6 +2215,16 @@ detach_vmas_to_be_unmapped(struct mm_str
32445 +@@ -1926,6 +2226,16 @@ detach_vmas_to_be_unmapped(struct mm_str
32446 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
32447 vma->vm_prev = NULL;
32448 do {
32449 @@ -54610,7 +54835,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32450 rb_erase(&vma->vm_rb, &mm->mm_rb);
32451 mm->map_count--;
32452 tail_vma = vma;
32453 -@@ -1954,14 +2253,33 @@ static int __split_vma(struct mm_struct
32454 +@@ -1954,14 +2264,33 @@ static int __split_vma(struct mm_struct
32455 struct vm_area_struct *new;
32456 int err = -ENOMEM;
32457
32458 @@ -54644,7 +54869,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32459 /* most fields are the same, copy all, and then fixup */
32460 *new = *vma;
32461
32462 -@@ -1974,6 +2292,22 @@ static int __split_vma(struct mm_struct
32463 +@@ -1974,6 +2303,22 @@ static int __split_vma(struct mm_struct
32464 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
32465 }
32466
32467 @@ -54667,7 +54892,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32468 pol = mpol_dup(vma_policy(vma));
32469 if (IS_ERR(pol)) {
32470 err = PTR_ERR(pol);
32471 -@@ -1999,6 +2333,42 @@ static int __split_vma(struct mm_struct
32472 +@@ -1999,6 +2344,42 @@ static int __split_vma(struct mm_struct
32473 else
32474 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
32475
32476 @@ -54710,7 +54935,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32477 /* Success. */
32478 if (!err)
32479 return 0;
32480 -@@ -2011,10 +2381,18 @@ static int __split_vma(struct mm_struct
32481 +@@ -2011,10 +2392,18 @@ static int __split_vma(struct mm_struct
32482 removed_exe_file_vma(mm);
32483 fput(new->vm_file);
32484 }
32485 @@ -54730,7 +54955,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32486 kmem_cache_free(vm_area_cachep, new);
32487 out_err:
32488 return err;
32489 -@@ -2027,6 +2405,15 @@ static int __split_vma(struct mm_struct
32490 +@@ -2027,6 +2416,15 @@ static int __split_vma(struct mm_struct
32491 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
32492 unsigned long addr, int new_below)
32493 {
32494 @@ -54746,13 +54971,13 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32495 if (mm->map_count >= sysctl_max_map_count)
32496 return -ENOMEM;
32497
32498 -@@ -2038,11 +2425,30 @@ int split_vma(struct mm_struct *mm, stru
32499 +@@ -2038,11 +2436,30 @@ int split_vma(struct mm_struct *mm, stru
32500 * work. This now handles partial unmappings.
32501 * Jeremy Fitzhardinge <jeremy@××××.org>
32502 */
32503 +#ifdef CONFIG_PAX_SEGMEXEC
32504 -+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
32505 -+{
32506 + int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
32507 + {
32508 + int ret = __do_munmap(mm, start, len);
32509 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
32510 + return ret;
32511 @@ -54762,9 +54987,9 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32512 +
32513 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
32514 +#else
32515 - int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
32516 ++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
32517 +#endif
32518 - {
32519 ++{
32520 unsigned long end;
32521 struct vm_area_struct *vma, *prev, *last;
32522
32523 @@ -54777,7 +55002,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32524 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
32525 return -EINVAL;
32526
32527 -@@ -2116,6 +2522,8 @@ int do_munmap(struct mm_struct *mm, unsi
32528 +@@ -2116,6 +2533,8 @@ int do_munmap(struct mm_struct *mm, unsi
32529 /* Fix up all other VM information */
32530 remove_vma_list(mm, vma);
32531
32532 @@ -54786,7 +55011,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32533 return 0;
32534 }
32535
32536 -@@ -2128,22 +2536,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
32537 +@@ -2128,22 +2547,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
32538
32539 profile_munmap(addr);
32540
32541 @@ -54815,7 +55040,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32542 /*
32543 * this is really a simplified "do_mmap". it only handles
32544 * anonymous maps. eventually we may be able to do some
32545 -@@ -2157,6 +2561,7 @@ unsigned long do_brk(unsigned long addr,
32546 +@@ -2157,6 +2572,7 @@ unsigned long do_brk(unsigned long addr,
32547 struct rb_node ** rb_link, * rb_parent;
32548 pgoff_t pgoff = addr >> PAGE_SHIFT;
32549 int error;
32550 @@ -54823,7 +55048,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32551
32552 len = PAGE_ALIGN(len);
32553 if (!len)
32554 -@@ -2168,16 +2573,30 @@ unsigned long do_brk(unsigned long addr,
32555 +@@ -2168,16 +2584,30 @@ unsigned long do_brk(unsigned long addr,
32556
32557 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
32558
32559 @@ -54855,7 +55080,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32560 locked += mm->locked_vm;
32561 lock_limit = rlimit(RLIMIT_MEMLOCK);
32562 lock_limit >>= PAGE_SHIFT;
32563 -@@ -2194,22 +2613,22 @@ unsigned long do_brk(unsigned long addr,
32564 +@@ -2194,22 +2624,22 @@ unsigned long do_brk(unsigned long addr,
32565 /*
32566 * Clear old maps. this also does some error checking for us
32567 */
32568 @@ -54882,7 +55107,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32569 return -ENOMEM;
32570
32571 /* Can we just expand an old private anonymous mapping? */
32572 -@@ -2223,7 +2642,7 @@ unsigned long do_brk(unsigned long addr,
32573 +@@ -2223,7 +2653,7 @@ unsigned long do_brk(unsigned long addr,
32574 */
32575 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
32576 if (!vma) {
32577 @@ -54891,7 +55116,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32578 return -ENOMEM;
32579 }
32580
32581 -@@ -2237,11 +2656,12 @@ unsigned long do_brk(unsigned long addr,
32582 +@@ -2237,11 +2667,12 @@ unsigned long do_brk(unsigned long addr,
32583 vma_link(mm, vma, prev, rb_link, rb_parent);
32584 out:
32585 perf_event_mmap(vma);
32586 @@ -54906,7 +55131,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32587 return addr;
32588 }
32589
32590 -@@ -2288,8 +2708,10 @@ void exit_mmap(struct mm_struct *mm)
32591 +@@ -2288,8 +2719,10 @@ void exit_mmap(struct mm_struct *mm)
32592 * Walk the list again, actually closing and freeing it,
32593 * with preemption enabled, without holding any MM locks.
32594 */
32595 @@ -54918,7 +55143,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32596
32597 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
32598 }
32599 -@@ -2303,6 +2725,13 @@ int insert_vm_struct(struct mm_struct *
32600 +@@ -2303,6 +2736,13 @@ int insert_vm_struct(struct mm_struct *
32601 struct vm_area_struct * __vma, * prev;
32602 struct rb_node ** rb_link, * rb_parent;
32603
32604 @@ -54932,7 +55157,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32605 /*
32606 * The vm_pgoff of a purely anonymous vma should be irrelevant
32607 * until its first write fault, when page's anon_vma and index
32608 -@@ -2325,7 +2754,22 @@ int insert_vm_struct(struct mm_struct *
32609 +@@ -2325,7 +2765,22 @@ int insert_vm_struct(struct mm_struct *
32610 if ((vma->vm_flags & VM_ACCOUNT) &&
32611 security_vm_enough_memory_mm(mm, vma_pages(vma)))
32612 return -ENOMEM;
32613 @@ -54955,7 +55180,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32614 return 0;
32615 }
32616
32617 -@@ -2343,6 +2787,8 @@ struct vm_area_struct *copy_vma(struct v
32618 +@@ -2343,6 +2798,8 @@ struct vm_area_struct *copy_vma(struct v
32619 struct rb_node **rb_link, *rb_parent;
32620 struct mempolicy *pol;
32621
32622 @@ -54964,7 +55189,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32623 /*
32624 * If anonymous vma has not yet been faulted, update new pgoff
32625 * to match new location, to increase its chance of merging.
32626 -@@ -2392,6 +2838,39 @@ struct vm_area_struct *copy_vma(struct v
32627 +@@ -2392,6 +2849,39 @@ struct vm_area_struct *copy_vma(struct v
32628 kmem_cache_free(vm_area_cachep, new_vma);
32629 return NULL;
32630 }
32631 @@ -55004,7 +55229,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32632
32633 /*
32634 * Return true if the calling process may expand its vm space by the passed
32635 -@@ -2403,7 +2882,7 @@ int may_expand_vm(struct mm_struct *mm,
32636 +@@ -2403,7 +2893,7 @@ int may_expand_vm(struct mm_struct *mm,
32637 unsigned long lim;
32638
32639 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
32640 @@ -55013,7 +55238,7 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32641 if (cur + npages > lim)
32642 return 0;
32643 return 1;
32644 -@@ -2474,6 +2953,22 @@ int install_special_mapping(struct mm_st
32645 +@@ -2474,6 +2964,22 @@ int install_special_mapping(struct mm_st
32646 vma->vm_start = addr;
32647 vma->vm_end = addr + len;
32648
32649 @@ -55036,9 +55261,9 @@ diff -urNp linux-2.6.37.3/mm/mmap.c linux-2.6.37.3/mm/mmap.c
32650 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
32651 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
32652
32653 -diff -urNp linux-2.6.37.3/mm/mprotect.c linux-2.6.37.3/mm/mprotect.c
32654 ---- linux-2.6.37.3/mm/mprotect.c 2011-01-04 19:50:19.000000000 -0500
32655 -+++ linux-2.6.37.3/mm/mprotect.c 2011-01-17 02:41:02.000000000 -0500
32656 +diff -urNp linux-2.6.37.4/mm/mprotect.c linux-2.6.37.4/mm/mprotect.c
32657 +--- linux-2.6.37.4/mm/mprotect.c 2011-01-04 19:50:19.000000000 -0500
32658 ++++ linux-2.6.37.4/mm/mprotect.c 2011-01-17 02:41:02.000000000 -0500
32659 @@ -23,10 +23,16 @@
32660 #include <linux/mmu_notifier.h>
32661 #include <linux/migrate.h>
32662 @@ -55265,10 +55490,10 @@ diff -urNp linux-2.6.37.3/mm/mprotect.c linux-2.6.37.3/mm/mprotect.c
32663 nstart = tmp;
32664
32665 if (nstart < prev->vm_end)
32666 -diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32667 ---- linux-2.6.37.3/mm/mremap.c 2011-01-04 19:50:19.000000000 -0500
32668 -+++ linux-2.6.37.3/mm/mremap.c 2011-01-17 02:41:02.000000000 -0500
32669 -@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
32670 +diff -urNp linux-2.6.37.4/mm/mremap.c linux-2.6.37.4/mm/mremap.c
32671 +--- linux-2.6.37.4/mm/mremap.c 2011-03-18 17:47:01.000000000 -0400
32672 ++++ linux-2.6.37.4/mm/mremap.c 2011-03-18 17:48:16.000000000 -0400
32673 +@@ -111,6 +111,12 @@ static void move_ptes(struct vm_area_str
32674 continue;
32675 pte = ptep_clear_flush(vma, old_addr, old_pte);
32676 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
32677 @@ -55281,7 +55506,7 @@ diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32678 set_pte_at(mm, new_addr, new_pte, pte);
32679 }
32680
32681 -@@ -272,6 +278,11 @@ static struct vm_area_struct *vma_to_res
32682 +@@ -270,6 +276,11 @@ static struct vm_area_struct *vma_to_res
32683 if (is_vm_hugetlb_page(vma))
32684 goto Einval;
32685
32686 @@ -55293,7 +55518,7 @@ diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32687 /* We can't remap across vm area boundaries */
32688 if (old_len > vma->vm_end - addr)
32689 goto Efault;
32690 -@@ -321,20 +332,25 @@ static unsigned long mremap_to(unsigned
32691 +@@ -319,20 +330,25 @@ static unsigned long mremap_to(unsigned
32692 unsigned long ret = -EINVAL;
32693 unsigned long charged = 0;
32694 unsigned long map_flags;
32695 @@ -55324,7 +55549,7 @@ diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32696 goto out;
32697
32698 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
32699 -@@ -406,6 +422,7 @@ unsigned long do_mremap(unsigned long ad
32700 +@@ -404,6 +420,7 @@ unsigned long do_mremap(unsigned long ad
32701 struct vm_area_struct *vma;
32702 unsigned long ret = -EINVAL;
32703 unsigned long charged = 0;
32704 @@ -55332,7 +55557,7 @@ diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32705
32706 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
32707 goto out;
32708 -@@ -424,6 +441,17 @@ unsigned long do_mremap(unsigned long ad
32709 +@@ -422,6 +439,17 @@ unsigned long do_mremap(unsigned long ad
32710 if (!new_len)
32711 goto out;
32712
32713 @@ -55350,7 +55575,7 @@ diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32714 if (flags & MREMAP_FIXED) {
32715 if (flags & MREMAP_MAYMOVE)
32716 ret = mremap_to(addr, old_len, new_addr, new_len);
32717 -@@ -473,6 +501,7 @@ unsigned long do_mremap(unsigned long ad
32718 +@@ -471,6 +499,7 @@ unsigned long do_mremap(unsigned long ad
32719 addr + new_len);
32720 }
32721 ret = addr;
32722 @@ -55358,7 +55583,7 @@ diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32723 goto out;
32724 }
32725 }
32726 -@@ -499,7 +528,13 @@ unsigned long do_mremap(unsigned long ad
32727 +@@ -497,7 +526,13 @@ unsigned long do_mremap(unsigned long ad
32728 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
32729 if (ret)
32730 goto out;
32731 @@ -55372,9 +55597,9 @@ diff -urNp linux-2.6.37.3/mm/mremap.c linux-2.6.37.3/mm/mremap.c
32732 }
32733 out:
32734 if (ret & ~PAGE_MASK)
32735 -diff -urNp linux-2.6.37.3/mm/nommu.c linux-2.6.37.3/mm/nommu.c
32736 ---- linux-2.6.37.3/mm/nommu.c 2011-01-04 19:50:19.000000000 -0500
32737 -+++ linux-2.6.37.3/mm/nommu.c 2011-01-17 02:41:02.000000000 -0500
32738 +diff -urNp linux-2.6.37.4/mm/nommu.c linux-2.6.37.4/mm/nommu.c
32739 +--- linux-2.6.37.4/mm/nommu.c 2011-01-04 19:50:19.000000000 -0500
32740 ++++ linux-2.6.37.4/mm/nommu.c 2011-01-17 02:41:02.000000000 -0500
32741 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
32742 int sysctl_overcommit_ratio = 50; /* default is 50% */
32743 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
32744 @@ -55407,9 +55632,9 @@ diff -urNp linux-2.6.37.3/mm/nommu.c linux-2.6.37.3/mm/nommu.c
32745 *region = *vma->vm_region;
32746 new->vm_region = region;
32747
32748 -diff -urNp linux-2.6.37.3/mm/page_alloc.c linux-2.6.37.3/mm/page_alloc.c
32749 ---- linux-2.6.37.3/mm/page_alloc.c 2011-03-11 17:22:42.000000000 -0500
32750 -+++ linux-2.6.37.3/mm/page_alloc.c 2011-03-11 17:23:06.000000000 -0500
32751 +diff -urNp linux-2.6.37.4/mm/page_alloc.c linux-2.6.37.4/mm/page_alloc.c
32752 +--- linux-2.6.37.4/mm/page_alloc.c 2011-03-11 17:22:42.000000000 -0500
32753 ++++ linux-2.6.37.4/mm/page_alloc.c 2011-03-11 17:23:06.000000000 -0500
32754 @@ -648,6 +648,10 @@ static bool free_pages_prepare(struct pa
32755 int i;
32756 int bad = 0;
32757 @@ -55454,9 +55679,9 @@ diff -urNp linux-2.6.37.3/mm/page_alloc.c linux-2.6.37.3/mm/page_alloc.c
32758 struct zone *zone, unsigned long zonesize) {}
32759 #endif /* CONFIG_SPARSEMEM */
32760
32761 -diff -urNp linux-2.6.37.3/mm/percpu.c linux-2.6.37.3/mm/percpu.c
32762 ---- linux-2.6.37.3/mm/percpu.c 2011-01-04 19:50:19.000000000 -0500
32763 -+++ linux-2.6.37.3/mm/percpu.c 2011-01-17 02:41:02.000000000 -0500
32764 +diff -urNp linux-2.6.37.4/mm/percpu.c linux-2.6.37.4/mm/percpu.c
32765 +--- linux-2.6.37.4/mm/percpu.c 2011-01-04 19:50:19.000000000 -0500
32766 ++++ linux-2.6.37.4/mm/percpu.c 2011-01-17 02:41:02.000000000 -0500
32767 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu
32768 static unsigned int pcpu_last_unit_cpu __read_mostly;
32769
32770 @@ -55466,9 +55691,9 @@ diff -urNp linux-2.6.37.3/mm/percpu.c linux-2.6.37.3/mm/percpu.c
32771 EXPORT_SYMBOL_GPL(pcpu_base_addr);
32772
32773 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
32774 -diff -urNp linux-2.6.37.3/mm/rmap.c linux-2.6.37.3/mm/rmap.c
32775 ---- linux-2.6.37.3/mm/rmap.c 2011-01-04 19:50:19.000000000 -0500
32776 -+++ linux-2.6.37.3/mm/rmap.c 2011-01-17 02:41:02.000000000 -0500
32777 +diff -urNp linux-2.6.37.4/mm/rmap.c linux-2.6.37.4/mm/rmap.c
32778 +--- linux-2.6.37.4/mm/rmap.c 2011-01-04 19:50:19.000000000 -0500
32779 ++++ linux-2.6.37.4/mm/rmap.c 2011-01-17 02:41:02.000000000 -0500
32780 @@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru
32781 struct anon_vma *anon_vma = vma->anon_vma;
32782 struct anon_vma_chain *avc;
32783 @@ -55558,9 +55783,9 @@ diff -urNp linux-2.6.37.3/mm/rmap.c linux-2.6.37.3/mm/rmap.c
32784 {
32785 struct anon_vma_chain *avc;
32786 struct anon_vma *anon_vma;
32787 -diff -urNp linux-2.6.37.3/mm/shmem.c linux-2.6.37.3/mm/shmem.c
32788 ---- linux-2.6.37.3/mm/shmem.c 2011-01-04 19:50:19.000000000 -0500
32789 -+++ linux-2.6.37.3/mm/shmem.c 2011-01-24 18:04:18.000000000 -0500
32790 +diff -urNp linux-2.6.37.4/mm/shmem.c linux-2.6.37.4/mm/shmem.c
32791 +--- linux-2.6.37.4/mm/shmem.c 2011-01-04 19:50:19.000000000 -0500
32792 ++++ linux-2.6.37.4/mm/shmem.c 2011-01-24 18:04:18.000000000 -0500
32793 @@ -31,7 +31,7 @@
32794 #include <linux/percpu_counter.h>
32795 #include <linux/swap.h>
32796 @@ -55579,9 +55804,9 @@ diff -urNp linux-2.6.37.3/mm/shmem.c linux-2.6.37.3/mm/shmem.c
32797 if (entry->val) {
32798 /*
32799 * The more uptodate page coming down from a stacked
32800 -diff -urNp linux-2.6.37.3/mm/slab.c linux-2.6.37.3/mm/slab.c
32801 ---- linux-2.6.37.3/mm/slab.c 2011-01-04 19:50:19.000000000 -0500
32802 -+++ linux-2.6.37.3/mm/slab.c 2011-01-17 02:41:02.000000000 -0500
32803 +diff -urNp linux-2.6.37.4/mm/slab.c linux-2.6.37.4/mm/slab.c
32804 +--- linux-2.6.37.4/mm/slab.c 2011-01-04 19:50:19.000000000 -0500
32805 ++++ linux-2.6.37.4/mm/slab.c 2011-01-17 02:41:02.000000000 -0500
32806 @@ -284,7 +284,7 @@ struct kmem_list3 {
32807 * Need this for bootstrapping a per node allocator.
32808 */
32809 @@ -55687,9 +55912,9 @@ diff -urNp linux-2.6.37.3/mm/slab.c linux-2.6.37.3/mm/slab.c
32810 /**
32811 * ksize - get the actual amount of memory allocated for a given object
32812 * @objp: Pointer to the object
32813 -diff -urNp linux-2.6.37.3/mm/slob.c linux-2.6.37.3/mm/slob.c
32814 ---- linux-2.6.37.3/mm/slob.c 2011-01-04 19:50:19.000000000 -0500
32815 -+++ linux-2.6.37.3/mm/slob.c 2011-01-17 02:41:02.000000000 -0500
32816 +diff -urNp linux-2.6.37.4/mm/slob.c linux-2.6.37.4/mm/slob.c
32817 +--- linux-2.6.37.4/mm/slob.c 2011-01-04 19:50:19.000000000 -0500
32818 ++++ linux-2.6.37.4/mm/slob.c 2011-01-17 02:41:02.000000000 -0500
32819 @@ -29,7 +29,7 @@
32820 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
32821 * alloc_pages() directly, allocating compound pages so the page order
32822 @@ -56009,9 +56234,9 @@ diff -urNp linux-2.6.37.3/mm/slob.c linux-2.6.37.3/mm/slob.c
32823 }
32824
32825 trace_kmem_cache_free(_RET_IP_, b);
32826 -diff -urNp linux-2.6.37.3/mm/slub.c linux-2.6.37.3/mm/slub.c
32827 ---- linux-2.6.37.3/mm/slub.c 2011-02-22 16:05:31.000000000 -0500
32828 -+++ linux-2.6.37.3/mm/slub.c 2011-02-22 16:05:44.000000000 -0500
32829 +diff -urNp linux-2.6.37.4/mm/slub.c linux-2.6.37.4/mm/slub.c
32830 +--- linux-2.6.37.4/mm/slub.c 2011-02-22 16:05:31.000000000 -0500
32831 ++++ linux-2.6.37.4/mm/slub.c 2011-02-22 16:05:44.000000000 -0500
32832 @@ -388,7 +388,7 @@ static void print_track(const char *s, s
32833 if (!t->addr)
32834 return;
32835 @@ -56165,9 +56390,9 @@ diff -urNp linux-2.6.37.3/mm/slub.c linux-2.6.37.3/mm/slub.c
32836 return 0;
32837 }
32838 module_init(slab_proc_init);
32839 -diff -urNp linux-2.6.37.3/mm/util.c linux-2.6.37.3/mm/util.c
32840 ---- linux-2.6.37.3/mm/util.c 2011-01-04 19:50:19.000000000 -0500
32841 -+++ linux-2.6.37.3/mm/util.c 2011-01-17 02:41:02.000000000 -0500
32842 +diff -urNp linux-2.6.37.4/mm/util.c linux-2.6.37.4/mm/util.c
32843 +--- linux-2.6.37.4/mm/util.c 2011-01-04 19:50:19.000000000 -0500
32844 ++++ linux-2.6.37.4/mm/util.c 2011-01-17 02:41:02.000000000 -0500
32845 @@ -240,6 +240,12 @@ EXPORT_SYMBOL(strndup_user);
32846 void arch_pick_mmap_layout(struct mm_struct *mm)
32847 {
32848 @@ -56181,9 +56406,9 @@ diff -urNp linux-2.6.37.3/mm/util.c linux-2.6.37.3/mm/util.c
32849 mm->get_unmapped_area = arch_get_unmapped_area;
32850 mm->unmap_area = arch_unmap_area;
32851 }
32852 -diff -urNp linux-2.6.37.3/mm/vmalloc.c linux-2.6.37.3/mm/vmalloc.c
32853 ---- linux-2.6.37.3/mm/vmalloc.c 2011-01-04 19:50:19.000000000 -0500
32854 -+++ linux-2.6.37.3/mm/vmalloc.c 2011-01-17 02:41:02.000000000 -0500
32855 +diff -urNp linux-2.6.37.4/mm/vmalloc.c linux-2.6.37.4/mm/vmalloc.c
32856 +--- linux-2.6.37.4/mm/vmalloc.c 2011-01-04 19:50:19.000000000 -0500
32857 ++++ linux-2.6.37.4/mm/vmalloc.c 2011-01-17 02:41:02.000000000 -0500
32858 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
32859
32860 pte = pte_offset_kernel(pmd, addr);
32861 @@ -56416,9 +56641,9 @@ diff -urNp linux-2.6.37.3/mm/vmalloc.c linux-2.6.37.3/mm/vmalloc.c
32862 if ((PAGE_SIZE-1) & (unsigned long)addr)
32863 return -EINVAL;
32864
32865 -diff -urNp linux-2.6.37.3/mm/vmstat.c linux-2.6.37.3/mm/vmstat.c
32866 ---- linux-2.6.37.3/mm/vmstat.c 2011-03-11 17:22:42.000000000 -0500
32867 -+++ linux-2.6.37.3/mm/vmstat.c 2011-03-11 17:23:06.000000000 -0500
32868 +diff -urNp linux-2.6.37.4/mm/vmstat.c linux-2.6.37.4/mm/vmstat.c
32869 +--- linux-2.6.37.4/mm/vmstat.c 2011-03-11 17:22:42.000000000 -0500
32870 ++++ linux-2.6.37.4/mm/vmstat.c 2011-03-11 17:23:06.000000000 -0500
32871 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
32872 *
32873 * vm_stat contains the global counters
32874 @@ -56471,9 +56696,9 @@ diff -urNp linux-2.6.37.3/mm/vmstat.c linux-2.6.37.3/mm/vmstat.c
32875 #endif
32876 return 0;
32877 }
32878 -diff -urNp linux-2.6.37.3/net/8021q/vlan.c linux-2.6.37.3/net/8021q/vlan.c
32879 ---- linux-2.6.37.3/net/8021q/vlan.c 2011-01-04 19:50:19.000000000 -0500
32880 -+++ linux-2.6.37.3/net/8021q/vlan.c 2011-01-17 02:41:02.000000000 -0500
32881 +diff -urNp linux-2.6.37.4/net/8021q/vlan.c linux-2.6.37.4/net/8021q/vlan.c
32882 +--- linux-2.6.37.4/net/8021q/vlan.c 2011-01-04 19:50:19.000000000 -0500
32883 ++++ linux-2.6.37.4/net/8021q/vlan.c 2011-01-17 02:41:02.000000000 -0500
32884 @@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net
32885 err = -EPERM;
32886 if (!capable(CAP_NET_ADMIN))
32887 @@ -56484,9 +56709,9 @@ diff -urNp linux-2.6.37.3/net/8021q/vlan.c linux-2.6.37.3/net/8021q/vlan.c
32888 struct vlan_net *vn;
32889
32890 vn = net_generic(net, vlan_net_id);
32891 -diff -urNp linux-2.6.37.3/net/atm/atm_misc.c linux-2.6.37.3/net/atm/atm_misc.c
32892 ---- linux-2.6.37.3/net/atm/atm_misc.c 2011-01-04 19:50:19.000000000 -0500
32893 -+++ linux-2.6.37.3/net/atm/atm_misc.c 2011-01-17 02:41:02.000000000 -0500
32894 +diff -urNp linux-2.6.37.4/net/atm/atm_misc.c linux-2.6.37.4/net/atm/atm_misc.c
32895 +--- linux-2.6.37.4/net/atm/atm_misc.c 2011-01-04 19:50:19.000000000 -0500
32896 ++++ linux-2.6.37.4/net/atm/atm_misc.c 2011-01-17 02:41:02.000000000 -0500
32897 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int
32898 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
32899 return 1;
32900 @@ -56523,9 +56748,9 @@ diff -urNp linux-2.6.37.3/net/atm/atm_misc.c linux-2.6.37.3/net/atm/atm_misc.c
32901 __SONET_ITEMS
32902 #undef __HANDLE_ITEM
32903 }
32904 -diff -urNp linux-2.6.37.3/net/atm/proc.c linux-2.6.37.3/net/atm/proc.c
32905 ---- linux-2.6.37.3/net/atm/proc.c 2011-01-04 19:50:19.000000000 -0500
32906 -+++ linux-2.6.37.3/net/atm/proc.c 2011-03-12 19:47:22.000000000 -0500
32907 +diff -urNp linux-2.6.37.4/net/atm/proc.c linux-2.6.37.4/net/atm/proc.c
32908 +--- linux-2.6.37.4/net/atm/proc.c 2011-01-04 19:50:19.000000000 -0500
32909 ++++ linux-2.6.37.4/net/atm/proc.c 2011-03-12 19:47:22.000000000 -0500
32910 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
32911 const struct k_atm_aal_stats *stats)
32912 {
32913 @@ -56564,9 +56789,9 @@ diff -urNp linux-2.6.37.3/net/atm/proc.c linux-2.6.37.3/net/atm/proc.c
32914 else
32915 seq_printf(seq, "%3d %3d %5d ",
32916 vcc->dev->number, vcc->vpi, vcc->vci);
32917 -diff -urNp linux-2.6.37.3/net/atm/resources.c linux-2.6.37.3/net/atm/resources.c
32918 ---- linux-2.6.37.3/net/atm/resources.c 2011-01-04 19:50:19.000000000 -0500
32919 -+++ linux-2.6.37.3/net/atm/resources.c 2011-01-17 02:41:02.000000000 -0500
32920 +diff -urNp linux-2.6.37.4/net/atm/resources.c linux-2.6.37.4/net/atm/resources.c
32921 +--- linux-2.6.37.4/net/atm/resources.c 2011-01-04 19:50:19.000000000 -0500
32922 ++++ linux-2.6.37.4/net/atm/resources.c 2011-01-17 02:41:02.000000000 -0500
32923 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
32924 static void copy_aal_stats(struct k_atm_aal_stats *from,
32925 struct atm_aal_stats *to)
32926 @@ -56585,9 +56810,9 @@ diff -urNp linux-2.6.37.3/net/atm/resources.c linux-2.6.37.3/net/atm/resources.c
32927 __AAL_STAT_ITEMS
32928 #undef __HANDLE_ITEM
32929 }
32930 -diff -urNp linux-2.6.37.3/net/bluetooth/bnep/sock.c linux-2.6.37.3/net/bluetooth/bnep/sock.c
32931 ---- linux-2.6.37.3/net/bluetooth/bnep/sock.c 2011-01-04 19:50:19.000000000 -0500
32932 -+++ linux-2.6.37.3/net/bluetooth/bnep/sock.c 2011-02-28 17:57:36.000000000 -0500
32933 +diff -urNp linux-2.6.37.4/net/bluetooth/bnep/sock.c linux-2.6.37.4/net/bluetooth/bnep/sock.c
32934 +--- linux-2.6.37.4/net/bluetooth/bnep/sock.c 2011-01-04 19:50:19.000000000 -0500
32935 ++++ linux-2.6.37.4/net/bluetooth/bnep/sock.c 2011-02-28 17:57:36.000000000 -0500
32936 @@ -88,6 +88,7 @@ static int bnep_sock_ioctl(struct socket
32937 sockfd_put(nsock);
32938 return -EBADFD;
32939 @@ -56596,9 +56821,9 @@ diff -urNp linux-2.6.37.3/net/bluetooth/bnep/sock.c linux-2.6.37.3/net/bluetooth
32940
32941 err = bnep_add_connection(&ca, nsock);
32942 if (!err) {
32943 -diff -urNp linux-2.6.37.3/net/bluetooth/sco.c linux-2.6.37.3/net/bluetooth/sco.c
32944 ---- linux-2.6.37.3/net/bluetooth/sco.c 2011-01-04 19:50:19.000000000 -0500
32945 -+++ linux-2.6.37.3/net/bluetooth/sco.c 2011-02-28 17:56:06.000000000 -0500
32946 +diff -urNp linux-2.6.37.4/net/bluetooth/sco.c linux-2.6.37.4/net/bluetooth/sco.c
32947 +--- linux-2.6.37.4/net/bluetooth/sco.c 2011-01-04 19:50:19.000000000 -0500
32948 ++++ linux-2.6.37.4/net/bluetooth/sco.c 2011-02-28 17:56:06.000000000 -0500
32949 @@ -700,6 +700,7 @@ static int sco_sock_getsockopt_old(struc
32950 break;
32951 }
32952 @@ -56607,9 +56832,9 @@ diff -urNp linux-2.6.37.3/net/bluetooth/sco.c linux-2.6.37.3/net/bluetooth/sco.c
32953 cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
32954 memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
32955
32956 -diff -urNp linux-2.6.37.3/net/bridge/br_multicast.c linux-2.6.37.3/net/bridge/br_multicast.c
32957 ---- linux-2.6.37.3/net/bridge/br_multicast.c 2011-01-04 19:50:19.000000000 -0500
32958 -+++ linux-2.6.37.3/net/bridge/br_multicast.c 2011-02-22 16:37:28.000000000 -0500
32959 +diff -urNp linux-2.6.37.4/net/bridge/br_multicast.c linux-2.6.37.4/net/bridge/br_multicast.c
32960 +--- linux-2.6.37.4/net/bridge/br_multicast.c 2011-01-04 19:50:19.000000000 -0500
32961 ++++ linux-2.6.37.4/net/bridge/br_multicast.c 2011-02-22 16:37:28.000000000 -0500
32962 @@ -707,7 +707,8 @@ static int br_multicast_add_group(struct
32963 goto err;
32964
32965 @@ -56629,9 +56854,9 @@ diff -urNp linux-2.6.37.3/net/bridge/br_multicast.c linux-2.6.37.3/net/bridge/br
32966 return 0;
32967
32968 /* Okay, we found ICMPv6 header */
32969 -diff -urNp linux-2.6.37.3/net/bridge/br_stp_if.c linux-2.6.37.3/net/bridge/br_stp_if.c
32970 ---- linux-2.6.37.3/net/bridge/br_stp_if.c 2011-01-04 19:50:19.000000000 -0500
32971 -+++ linux-2.6.37.3/net/bridge/br_stp_if.c 2011-01-17 02:41:02.000000000 -0500
32972 +diff -urNp linux-2.6.37.4/net/bridge/br_stp_if.c linux-2.6.37.4/net/bridge/br_stp_if.c
32973 +--- linux-2.6.37.4/net/bridge/br_stp_if.c 2011-01-04 19:50:19.000000000 -0500
32974 ++++ linux-2.6.37.4/net/bridge/br_stp_if.c 2011-01-17 02:41:02.000000000 -0500
32975 @@ -145,7 +145,7 @@ static void br_stp_stop(struct net_bridg
32976 char *envp[] = { NULL };
32977
32978 @@ -56641,9 +56866,9 @@ diff -urNp linux-2.6.37.3/net/bridge/br_stp_if.c linux-2.6.37.3/net/bridge/br_st
32979 br_info(br, "userspace STP stopped, return code %d\n", r);
32980
32981 /* To start timers on any ports left in blocking */
32982 -diff -urNp linux-2.6.37.3/net/bridge/netfilter/ebtables.c linux-2.6.37.3/net/bridge/netfilter/ebtables.c
32983 ---- linux-2.6.37.3/net/bridge/netfilter/ebtables.c 2011-01-04 19:50:19.000000000 -0500
32984 -+++ linux-2.6.37.3/net/bridge/netfilter/ebtables.c 2011-02-28 17:58:40.000000000 -0500
32985 +diff -urNp linux-2.6.37.4/net/bridge/netfilter/ebtables.c linux-2.6.37.4/net/bridge/netfilter/ebtables.c
32986 +--- linux-2.6.37.4/net/bridge/netfilter/ebtables.c 2011-01-04 19:50:19.000000000 -0500
32987 ++++ linux-2.6.37.4/net/bridge/netfilter/ebtables.c 2011-02-28 17:58:40.000000000 -0500
32988 @@ -1108,6 +1108,8 @@ static int do_replace(struct net *net, c
32989 if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
32990 return -ENOMEM;
32991 @@ -56662,9 +56887,9 @@ diff -urNp linux-2.6.37.3/net/bridge/netfilter/ebtables.c linux-2.6.37.3/net/bri
32992 BUGPRINT("c2u Didn't work\n");
32993 ret = -EFAULT;
32994 break;
32995 -diff -urNp linux-2.6.37.3/net/can/bcm.c linux-2.6.37.3/net/can/bcm.c
32996 ---- linux-2.6.37.3/net/can/bcm.c 2011-01-04 19:50:19.000000000 -0500
32997 -+++ linux-2.6.37.3/net/can/bcm.c 2011-03-12 19:49:01.000000000 -0500
32998 +diff -urNp linux-2.6.37.4/net/can/bcm.c linux-2.6.37.4/net/can/bcm.c
32999 +--- linux-2.6.37.4/net/can/bcm.c 2011-01-04 19:50:19.000000000 -0500
33000 ++++ linux-2.6.37.4/net/can/bcm.c 2011-03-12 19:49:01.000000000 -0500
33001 @@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file
33002 struct bcm_sock *bo = bcm_sk(sk);
33003 struct bcm_op *op;
33004 @@ -56681,30 +56906,19 @@ diff -urNp linux-2.6.37.3/net/can/bcm.c linux-2.6.37.3/net/can/bcm.c
33005 seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
33006 seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
33007 seq_printf(m, " <<<\n");
33008 -diff -urNp linux-2.6.37.3/net/core/dev.c linux-2.6.37.3/net/core/dev.c
33009 ---- linux-2.6.37.3/net/core/dev.c 2011-02-27 14:49:17.000000000 -0500
33010 -+++ linux-2.6.37.3/net/core/dev.c 2011-02-28 18:08:16.000000000 -0500
33011 -@@ -1121,8 +1121,17 @@ void dev_load(struct net *net, const cha
33012 - dev = dev_get_by_name_rcu(net, name);
33013 - rcu_read_unlock();
33014 -
33015 -- if (!dev && capable(CAP_NET_ADMIN))
33016 -- request_module("%s", name);
33017 -+ if (!dev) {
33018 -+ if (capable(CAP_NET_ADMIN))
33019 -+ request_module("netdev-%s", name);
33020 -+ if (capable(CAP_SYS_MODULE)) {
33021 -+ if (!request_module("%s", name))
33022 -+ WARN_ONCE(1, "Loading kernel module for a network device"
33023 -+ " with CAP_SYS_MODULE (deprecated). Use "
33024 -+ "CAP_NET_ADMIN and alias netdev-%s instead\n",
33025 -+ name);
33026 -+ }
33027 -+ }
33028 - }
33029 - EXPORT_SYMBOL(dev_load);
33030 -
33031 -@@ -2654,7 +2663,7 @@ int netif_rx_ni(struct sk_buff *skb)
33032 +diff -urNp linux-2.6.37.4/net/core/dev.c linux-2.6.37.4/net/core/dev.c
33033 +--- linux-2.6.37.4/net/core/dev.c 2011-03-18 17:47:01.000000000 -0400
33034 ++++ linux-2.6.37.4/net/core/dev.c 2011-03-18 17:50:19.000000000 -0400
33035 +@@ -1126,7 +1126,7 @@ void dev_load(struct net *net, const cha
33036 + if (no_module && capable(CAP_NET_ADMIN))
33037 + no_module = request_module("netdev-%s", name);
33038 + if (no_module && capable(CAP_SYS_MODULE)) {
33039 +- if (!request_module("%s", name))
33040 ++ if (!request_module("%s", name))
33041 + pr_err("Loading kernel module for a network device "
33042 + "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
33043 + "instead\n", name);
33044 +@@ -2662,7 +2662,7 @@ int netif_rx_ni(struct sk_buff *skb)
33045 }
33046 EXPORT_SYMBOL(netif_rx_ni);
33047
33048 @@ -56713,7 +56927,7 @@ diff -urNp linux-2.6.37.3/net/core/dev.c linux-2.6.37.3/net/core/dev.c
33049 {
33050 struct softnet_data *sd = &__get_cpu_var(softnet_data);
33051
33052 -@@ -3570,7 +3579,7 @@ void netif_napi_del(struct napi_struct *
33053 +@@ -3578,7 +3578,7 @@ void netif_napi_del(struct napi_struct *
33054 }
33055 EXPORT_SYMBOL(netif_napi_del);
33056
33057 @@ -56722,9 +56936,9 @@ diff -urNp linux-2.6.37.3/net/core/dev.c linux-2.6.37.3/net/core/dev.c
33058 {
33059 struct softnet_data *sd = &__get_cpu_var(softnet_data);
33060 unsigned long time_limit = jiffies + 2;
33061 -diff -urNp linux-2.6.37.3/net/core/sock.c linux-2.6.37.3/net/core/sock.c
33062 ---- linux-2.6.37.3/net/core/sock.c 2011-02-22 16:05:31.000000000 -0500
33063 -+++ linux-2.6.37.3/net/core/sock.c 2011-02-22 16:05:49.000000000 -0500
33064 +diff -urNp linux-2.6.37.4/net/core/sock.c linux-2.6.37.4/net/core/sock.c
33065 +--- linux-2.6.37.4/net/core/sock.c 2011-02-22 16:05:31.000000000 -0500
33066 ++++ linux-2.6.37.4/net/core/sock.c 2011-02-22 16:05:49.000000000 -0500
33067 @@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
33068 return -ENOTCONN;
33069 if (lv < len)
33070 @@ -56743,9 +56957,9 @@ diff -urNp linux-2.6.37.3/net/core/sock.c linux-2.6.37.3/net/core/sock.c
33071 return -EFAULT;
33072 lenout:
33073 if (put_user(len, optlen))
33074 -diff -urNp linux-2.6.37.3/net/dccp/ccids/ccid3.c linux-2.6.37.3/net/dccp/ccids/ccid3.c
33075 ---- linux-2.6.37.3/net/dccp/ccids/ccid3.c 2011-01-04 19:50:19.000000000 -0500
33076 -+++ linux-2.6.37.3/net/dccp/ccids/ccid3.c 2011-01-17 02:41:02.000000000 -0500
33077 +diff -urNp linux-2.6.37.4/net/dccp/ccids/ccid3.c linux-2.6.37.4/net/dccp/ccids/ccid3.c
33078 +--- linux-2.6.37.4/net/dccp/ccids/ccid3.c 2011-01-04 19:50:19.000000000 -0500
33079 ++++ linux-2.6.37.4/net/dccp/ccids/ccid3.c 2011-01-17 02:41:02.000000000 -0500
33080 @@ -41,7 +41,7 @@
33081 static int ccid3_debug;
33082 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
33083 @@ -56755,9 +56969,9 @@ diff -urNp linux-2.6.37.3/net/dccp/ccids/ccid3.c linux-2.6.37.3/net/dccp/ccids/c
33084 #endif
33085
33086 /*
33087 -diff -urNp linux-2.6.37.3/net/dccp/dccp.h linux-2.6.37.3/net/dccp/dccp.h
33088 ---- linux-2.6.37.3/net/dccp/dccp.h 2011-01-04 19:50:19.000000000 -0500
33089 -+++ linux-2.6.37.3/net/dccp/dccp.h 2011-01-17 02:41:02.000000000 -0500
33090 +diff -urNp linux-2.6.37.4/net/dccp/dccp.h linux-2.6.37.4/net/dccp/dccp.h
33091 +--- linux-2.6.37.4/net/dccp/dccp.h 2011-01-04 19:50:19.000000000 -0500
33092 ++++ linux-2.6.37.4/net/dccp/dccp.h 2011-01-17 02:41:02.000000000 -0500
33093 @@ -44,9 +44,9 @@ extern int dccp_debug;
33094 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
33095 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
33096 @@ -56771,9 +56985,9 @@ diff -urNp linux-2.6.37.3/net/dccp/dccp.h linux-2.6.37.3/net/dccp/dccp.h
33097 #endif
33098
33099 extern struct inet_hashinfo dccp_hashinfo;
33100 -diff -urNp linux-2.6.37.3/net/decnet/sysctl_net_decnet.c linux-2.6.37.3/net/decnet/sysctl_net_decnet.c
33101 ---- linux-2.6.37.3/net/decnet/sysctl_net_decnet.c 2011-01-04 19:50:19.000000000 -0500
33102 -+++ linux-2.6.37.3/net/decnet/sysctl_net_decnet.c 2011-01-17 02:41:02.000000000 -0500
33103 +diff -urNp linux-2.6.37.4/net/decnet/sysctl_net_decnet.c linux-2.6.37.4/net/decnet/sysctl_net_decnet.c
33104 +--- linux-2.6.37.4/net/decnet/sysctl_net_decnet.c 2011-01-04 19:50:19.000000000 -0500
33105 ++++ linux-2.6.37.4/net/decnet/sysctl_net_decnet.c 2011-01-17 02:41:02.000000000 -0500
33106 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
33107
33108 if (len > *lenp) len = *lenp;
33109 @@ -56792,9 +57006,9 @@ diff -urNp linux-2.6.37.3/net/decnet/sysctl_net_decnet.c linux-2.6.37.3/net/decn
33110 return -EFAULT;
33111
33112 *lenp = len;
33113 -diff -urNp linux-2.6.37.3/net/econet/Kconfig linux-2.6.37.3/net/econet/Kconfig
33114 ---- linux-2.6.37.3/net/econet/Kconfig 2011-01-04 19:50:19.000000000 -0500
33115 -+++ linux-2.6.37.3/net/econet/Kconfig 2011-01-17 02:41:02.000000000 -0500
33116 +diff -urNp linux-2.6.37.4/net/econet/Kconfig linux-2.6.37.4/net/econet/Kconfig
33117 +--- linux-2.6.37.4/net/econet/Kconfig 2011-01-04 19:50:19.000000000 -0500
33118 ++++ linux-2.6.37.4/net/econet/Kconfig 2011-01-17 02:41:02.000000000 -0500
33119 @@ -4,7 +4,7 @@
33120
33121 config ECONET
33122 @@ -56804,9 +57018,9 @@ diff -urNp linux-2.6.37.3/net/econet/Kconfig linux-2.6.37.3/net/econet/Kconfig
33123 ---help---
33124 Econet is a fairly old and slow networking protocol mainly used by
33125 Acorn computers to access file and print servers. It uses native
33126 -diff -urNp linux-2.6.37.3/net/ipv4/inet_diag.c linux-2.6.37.3/net/ipv4/inet_diag.c
33127 ---- linux-2.6.37.3/net/ipv4/inet_diag.c 2011-01-04 19:50:19.000000000 -0500
33128 -+++ linux-2.6.37.3/net/ipv4/inet_diag.c 2011-01-17 02:41:02.000000000 -0500
33129 +diff -urNp linux-2.6.37.4/net/ipv4/inet_diag.c linux-2.6.37.4/net/ipv4/inet_diag.c
33130 +--- linux-2.6.37.4/net/ipv4/inet_diag.c 2011-01-04 19:50:19.000000000 -0500
33131 ++++ linux-2.6.37.4/net/ipv4/inet_diag.c 2011-01-17 02:41:02.000000000 -0500
33132 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
33133 r->idiag_retrans = 0;
33134
33135 @@ -56868,9 +57082,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/inet_diag.c linux-2.6.37.3/net/ipv4/inet_diag
33136
33137 tmo = req->expires - jiffies;
33138 if (tmo < 0)
33139 -diff -urNp linux-2.6.37.3/net/ipv4/inet_hashtables.c linux-2.6.37.3/net/ipv4/inet_hashtables.c
33140 ---- linux-2.6.37.3/net/ipv4/inet_hashtables.c 2011-01-04 19:50:19.000000000 -0500
33141 -+++ linux-2.6.37.3/net/ipv4/inet_hashtables.c 2011-01-17 02:41:02.000000000 -0500
33142 +diff -urNp linux-2.6.37.4/net/ipv4/inet_hashtables.c linux-2.6.37.4/net/ipv4/inet_hashtables.c
33143 +--- linux-2.6.37.4/net/ipv4/inet_hashtables.c 2011-01-04 19:50:19.000000000 -0500
33144 ++++ linux-2.6.37.4/net/ipv4/inet_hashtables.c 2011-01-17 02:41:02.000000000 -0500
33145 @@ -18,11 +18,14 @@
33146 #include <linux/sched.h>
33147 #include <linux/slab.h>
33148 @@ -56895,9 +57109,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/inet_hashtables.c linux-2.6.37.3/net/ipv4/ine
33149 if (tw) {
33150 inet_twsk_deschedule(tw, death_row);
33151 while (twrefcnt) {
33152 -diff -urNp linux-2.6.37.3/net/ipv4/inetpeer.c linux-2.6.37.3/net/ipv4/inetpeer.c
33153 ---- linux-2.6.37.3/net/ipv4/inetpeer.c 2011-01-04 19:50:19.000000000 -0500
33154 -+++ linux-2.6.37.3/net/ipv4/inetpeer.c 2011-01-17 02:41:02.000000000 -0500
33155 +diff -urNp linux-2.6.37.4/net/ipv4/inetpeer.c linux-2.6.37.4/net/ipv4/inetpeer.c
33156 +--- linux-2.6.37.4/net/ipv4/inetpeer.c 2011-01-04 19:50:19.000000000 -0500
33157 ++++ linux-2.6.37.4/net/ipv4/inetpeer.c 2011-01-17 02:41:02.000000000 -0500
33158 @@ -469,8 +469,8 @@ struct inet_peer *inet_getpeer(__be32 da
33159 if (p) {
33160 p->v4daddr = daddr;
33161 @@ -56909,9 +57123,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/inetpeer.c linux-2.6.37.3/net/ipv4/inetpeer.c
33162 p->tcp_ts_stamp = 0;
33163 INIT_LIST_HEAD(&p->unused);
33164
33165 -diff -urNp linux-2.6.37.3/net/ipv4/ip_fragment.c linux-2.6.37.3/net/ipv4/ip_fragment.c
33166 ---- linux-2.6.37.3/net/ipv4/ip_fragment.c 2011-02-22 16:05:31.000000000 -0500
33167 -+++ linux-2.6.37.3/net/ipv4/ip_fragment.c 2011-02-22 16:05:49.000000000 -0500
33168 +diff -urNp linux-2.6.37.4/net/ipv4/ip_fragment.c linux-2.6.37.4/net/ipv4/ip_fragment.c
33169 +--- linux-2.6.37.4/net/ipv4/ip_fragment.c 2011-02-22 16:05:31.000000000 -0500
33170 ++++ linux-2.6.37.4/net/ipv4/ip_fragment.c 2011-02-22 16:05:49.000000000 -0500
33171 @@ -298,7 +298,7 @@ static inline int ip_frag_too_far(struct
33172 return 0;
33173
33174 @@ -56921,9 +57135,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/ip_fragment.c linux-2.6.37.3/net/ipv4/ip_frag
33175 qp->rid = end;
33176
33177 rc = qp->q.fragments && (end - start) > max;
33178 -diff -urNp linux-2.6.37.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.37.3/net/ipv4/netfilter/nf_nat_snmp_basic.c
33179 ---- linux-2.6.37.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-04 19:50:19.000000000 -0500
33180 -+++ linux-2.6.37.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-17 02:41:02.000000000 -0500
33181 +diff -urNp linux-2.6.37.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.37.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
33182 +--- linux-2.6.37.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-04 19:50:19.000000000 -0500
33183 ++++ linux-2.6.37.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-17 02:41:02.000000000 -0500
33184 @@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
33185
33186 *len = 0;
33187 @@ -56933,9 +57147,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.37.3/
33188 if (*octets == NULL) {
33189 if (net_ratelimit())
33190 pr_notice("OOM in bsalg (%d)\n", __LINE__);
33191 -diff -urNp linux-2.6.37.3/net/ipv4/route.c linux-2.6.37.3/net/ipv4/route.c
33192 ---- linux-2.6.37.3/net/ipv4/route.c 2011-01-04 19:50:19.000000000 -0500
33193 -+++ linux-2.6.37.3/net/ipv4/route.c 2011-01-17 02:41:02.000000000 -0500
33194 +diff -urNp linux-2.6.37.4/net/ipv4/route.c linux-2.6.37.4/net/ipv4/route.c
33195 +--- linux-2.6.37.4/net/ipv4/route.c 2011-01-04 19:50:19.000000000 -0500
33196 ++++ linux-2.6.37.4/net/ipv4/route.c 2011-01-17 02:41:02.000000000 -0500
33197 @@ -2876,7 +2876,7 @@ static int rt_fill_info(struct net *net,
33198 expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
33199 if (rt->peer) {
33200 @@ -56945,9 +57159,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/route.c linux-2.6.37.3/net/ipv4/route.c
33201 if (rt->peer->tcp_ts_stamp) {
33202 ts = rt->peer->tcp_ts;
33203 tsage = get_seconds() - rt->peer->tcp_ts_stamp;
33204 -diff -urNp linux-2.6.37.3/net/ipv4/tcp_ipv4.c linux-2.6.37.3/net/ipv4/tcp_ipv4.c
33205 ---- linux-2.6.37.3/net/ipv4/tcp_ipv4.c 2011-01-04 19:50:19.000000000 -0500
33206 -+++ linux-2.6.37.3/net/ipv4/tcp_ipv4.c 2011-01-17 02:41:02.000000000 -0500
33207 +diff -urNp linux-2.6.37.4/net/ipv4/tcp_ipv4.c linux-2.6.37.4/net/ipv4/tcp_ipv4.c
33208 +--- linux-2.6.37.4/net/ipv4/tcp_ipv4.c 2011-01-04 19:50:19.000000000 -0500
33209 ++++ linux-2.6.37.4/net/ipv4/tcp_ipv4.c 2011-01-17 02:41:02.000000000 -0500
33210 @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
33211 int sysctl_tcp_low_latency __read_mostly;
33212 EXPORT_SYMBOL(sysctl_tcp_low_latency);
33213 @@ -57043,9 +57257,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/tcp_ipv4.c linux-2.6.37.3/net/ipv4/tcp_ipv4.c
33214 }
33215
33216 #define TMPSZ 150
33217 -diff -urNp linux-2.6.37.3/net/ipv4/tcp_minisocks.c linux-2.6.37.3/net/ipv4/tcp_minisocks.c
33218 ---- linux-2.6.37.3/net/ipv4/tcp_minisocks.c 2011-01-04 19:50:19.000000000 -0500
33219 -+++ linux-2.6.37.3/net/ipv4/tcp_minisocks.c 2011-01-17 02:41:02.000000000 -0500
33220 +diff -urNp linux-2.6.37.4/net/ipv4/tcp_minisocks.c linux-2.6.37.4/net/ipv4/tcp_minisocks.c
33221 +--- linux-2.6.37.4/net/ipv4/tcp_minisocks.c 2011-01-04 19:50:19.000000000 -0500
33222 ++++ linux-2.6.37.4/net/ipv4/tcp_minisocks.c 2011-01-17 02:41:02.000000000 -0500
33223 @@ -27,6 +27,10 @@
33224 #include <net/inet_common.h>
33225 #include <net/xfrm.h>
33226 @@ -57068,9 +57282,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/tcp_minisocks.c linux-2.6.37.3/net/ipv4/tcp_m
33227 if (!(flg & TCP_FLAG_RST))
33228 req->rsk_ops->send_reset(sk, skb);
33229
33230 -diff -urNp linux-2.6.37.3/net/ipv4/tcp_probe.c linux-2.6.37.3/net/ipv4/tcp_probe.c
33231 ---- linux-2.6.37.3/net/ipv4/tcp_probe.c 2011-01-04 19:50:19.000000000 -0500
33232 -+++ linux-2.6.37.3/net/ipv4/tcp_probe.c 2011-01-17 02:41:02.000000000 -0500
33233 +diff -urNp linux-2.6.37.4/net/ipv4/tcp_probe.c linux-2.6.37.4/net/ipv4/tcp_probe.c
33234 +--- linux-2.6.37.4/net/ipv4/tcp_probe.c 2011-01-04 19:50:19.000000000 -0500
33235 ++++ linux-2.6.37.4/net/ipv4/tcp_probe.c 2011-01-17 02:41:02.000000000 -0500
33236 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
33237 if (cnt + width >= len)
33238 break;
33239 @@ -57080,9 +57294,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/tcp_probe.c linux-2.6.37.3/net/ipv4/tcp_probe
33240 return -EFAULT;
33241 cnt += width;
33242 }
33243 -diff -urNp linux-2.6.37.3/net/ipv4/tcp_timer.c linux-2.6.37.3/net/ipv4/tcp_timer.c
33244 ---- linux-2.6.37.3/net/ipv4/tcp_timer.c 2011-01-04 19:50:19.000000000 -0500
33245 -+++ linux-2.6.37.3/net/ipv4/tcp_timer.c 2011-01-17 02:41:02.000000000 -0500
33246 +diff -urNp linux-2.6.37.4/net/ipv4/tcp_timer.c linux-2.6.37.4/net/ipv4/tcp_timer.c
33247 +--- linux-2.6.37.4/net/ipv4/tcp_timer.c 2011-01-04 19:50:19.000000000 -0500
33248 ++++ linux-2.6.37.4/net/ipv4/tcp_timer.c 2011-01-17 02:41:02.000000000 -0500
33249 @@ -22,6 +22,10 @@
33250 #include <linux/gfp.h>
33251 #include <net/tcp.h>
33252 @@ -57108,9 +57322,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/tcp_timer.c linux-2.6.37.3/net/ipv4/tcp_timer
33253 if (retransmits_timed_out(sk, retry_until,
33254 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
33255 /* Has it gone just too far? */
33256 -diff -urNp linux-2.6.37.3/net/ipv4/udp.c linux-2.6.37.3/net/ipv4/udp.c
33257 ---- linux-2.6.37.3/net/ipv4/udp.c 2011-01-04 19:50:19.000000000 -0500
33258 -+++ linux-2.6.37.3/net/ipv4/udp.c 2011-01-17 02:41:02.000000000 -0500
33259 +diff -urNp linux-2.6.37.4/net/ipv4/udp.c linux-2.6.37.4/net/ipv4/udp.c
33260 +--- linux-2.6.37.4/net/ipv4/udp.c 2011-01-04 19:50:19.000000000 -0500
33261 ++++ linux-2.6.37.4/net/ipv4/udp.c 2011-01-17 02:41:02.000000000 -0500
33262 @@ -86,6 +86,7 @@
33263 #include <linux/types.h>
33264 #include <linux/fcntl.h>
33265 @@ -57194,9 +57408,9 @@ diff -urNp linux-2.6.37.3/net/ipv4/udp.c linux-2.6.37.3/net/ipv4/udp.c
33266 atomic_read(&sp->sk_drops), len);
33267 }
33268
33269 -diff -urNp linux-2.6.37.3/net/ipv6/exthdrs.c linux-2.6.37.3/net/ipv6/exthdrs.c
33270 ---- linux-2.6.37.3/net/ipv6/exthdrs.c 2011-01-04 19:50:19.000000000 -0500
33271 -+++ linux-2.6.37.3/net/ipv6/exthdrs.c 2011-01-17 02:41:02.000000000 -0500
33272 +diff -urNp linux-2.6.37.4/net/ipv6/exthdrs.c linux-2.6.37.4/net/ipv6/exthdrs.c
33273 +--- linux-2.6.37.4/net/ipv6/exthdrs.c 2011-01-04 19:50:19.000000000 -0500
33274 ++++ linux-2.6.37.4/net/ipv6/exthdrs.c 2011-01-17 02:41:02.000000000 -0500
33275 @@ -634,7 +634,7 @@ static struct tlvtype_proc tlvprochopopt
33276 .type = IPV6_TLV_JUMBO,
33277 .func = ipv6_hop_jumbo,
33278 @@ -57206,9 +57420,9 @@ diff -urNp linux-2.6.37.3/net/ipv6/exthdrs.c linux-2.6.37.3/net/ipv6/exthdrs.c
33279 };
33280
33281 int ipv6_parse_hopopts(struct sk_buff *skb)
33282 -diff -urNp linux-2.6.37.3/net/ipv6/raw.c linux-2.6.37.3/net/ipv6/raw.c
33283 ---- linux-2.6.37.3/net/ipv6/raw.c 2011-01-04 19:50:19.000000000 -0500
33284 -+++ linux-2.6.37.3/net/ipv6/raw.c 2011-01-17 02:41:02.000000000 -0500
33285 +diff -urNp linux-2.6.37.4/net/ipv6/raw.c linux-2.6.37.4/net/ipv6/raw.c
33286 +--- linux-2.6.37.4/net/ipv6/raw.c 2011-01-04 19:50:19.000000000 -0500
33287 ++++ linux-2.6.37.4/net/ipv6/raw.c 2011-01-17 02:41:02.000000000 -0500
33288 @@ -601,7 +601,7 @@ out:
33289 return err;
33290 }
33291 @@ -57233,18 +57447,9 @@ diff -urNp linux-2.6.37.3/net/ipv6/raw.c linux-2.6.37.3/net/ipv6/raw.c
33292 }
33293
33294 static int raw6_seq_show(struct seq_file *seq, void *v)
33295 -diff -urNp linux-2.6.37.3/net/ipv6/sit.c linux-2.6.37.3/net/ipv6/sit.c
33296 ---- linux-2.6.37.3/net/ipv6/sit.c 2011-01-04 19:50:19.000000000 -0500
33297 -+++ linux-2.6.37.3/net/ipv6/sit.c 2011-02-28 18:20:31.000000000 -0500
33298 -@@ -1292,4 +1292,4 @@ static int __init sit_init(void)
33299 - module_init(sit_init);
33300 - module_exit(sit_cleanup);
33301 - MODULE_LICENSE("GPL");
33302 --MODULE_ALIAS("sit0");
33303 -+MODULE_ALIAS_NETDEV("sit0");
33304 -diff -urNp linux-2.6.37.3/net/ipv6/tcp_ipv6.c linux-2.6.37.3/net/ipv6/tcp_ipv6.c
33305 ---- linux-2.6.37.3/net/ipv6/tcp_ipv6.c 2011-01-04 19:50:19.000000000 -0500
33306 -+++ linux-2.6.37.3/net/ipv6/tcp_ipv6.c 2011-01-17 02:41:02.000000000 -0500
33307 +diff -urNp linux-2.6.37.4/net/ipv6/tcp_ipv6.c linux-2.6.37.4/net/ipv6/tcp_ipv6.c
33308 +--- linux-2.6.37.4/net/ipv6/tcp_ipv6.c 2011-01-04 19:50:19.000000000 -0500
33309 ++++ linux-2.6.37.4/net/ipv6/tcp_ipv6.c 2011-01-17 02:41:02.000000000 -0500
33310 @@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
33311 }
33312 #endif
33313 @@ -57344,9 +57549,9 @@ diff -urNp linux-2.6.37.3/net/ipv6/tcp_ipv6.c linux-2.6.37.3/net/ipv6/tcp_ipv6.c
33314 }
33315
33316 static int tcp6_seq_show(struct seq_file *seq, void *v)
33317 -diff -urNp linux-2.6.37.3/net/ipv6/udp.c linux-2.6.37.3/net/ipv6/udp.c
33318 ---- linux-2.6.37.3/net/ipv6/udp.c 2011-01-04 19:50:19.000000000 -0500
33319 -+++ linux-2.6.37.3/net/ipv6/udp.c 2011-01-17 02:41:02.000000000 -0500
33320 +diff -urNp linux-2.6.37.4/net/ipv6/udp.c linux-2.6.37.4/net/ipv6/udp.c
33321 +--- linux-2.6.37.4/net/ipv6/udp.c 2011-01-04 19:50:19.000000000 -0500
33322 ++++ linux-2.6.37.4/net/ipv6/udp.c 2011-01-17 02:41:02.000000000 -0500
33323 @@ -50,6 +50,10 @@
33324 #include <linux/seq_file.h>
33325 #include "udp_impl.h"
33326 @@ -57382,9 +57587,9 @@ diff -urNp linux-2.6.37.3/net/ipv6/udp.c linux-2.6.37.3/net/ipv6/udp.c
33327 atomic_read(&sp->sk_drops));
33328 }
33329
33330 -diff -urNp linux-2.6.37.3/net/irda/ircomm/ircomm_tty.c linux-2.6.37.3/net/irda/ircomm/ircomm_tty.c
33331 ---- linux-2.6.37.3/net/irda/ircomm/ircomm_tty.c 2011-01-04 19:50:19.000000000 -0500
33332 -+++ linux-2.6.37.3/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:04:18.000000000 -0500
33333 +diff -urNp linux-2.6.37.4/net/irda/ircomm/ircomm_tty.c linux-2.6.37.4/net/irda/ircomm/ircomm_tty.c
33334 +--- linux-2.6.37.4/net/irda/ircomm/ircomm_tty.c 2011-01-04 19:50:19.000000000 -0500
33335 ++++ linux-2.6.37.4/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:04:18.000000000 -0500
33336 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
33337 add_wait_queue(&self->open_wait, &wait);
33338
33339 @@ -57507,9 +57712,9 @@ diff -urNp linux-2.6.37.3/net/irda/ircomm/ircomm_tty.c linux-2.6.37.3/net/irda/i
33340 seq_printf(m, "Max data size: %d\n", self->max_data_size);
33341 seq_printf(m, "Max header size: %d\n", self->max_header_size);
33342
33343 -diff -urNp linux-2.6.37.3/net/key/af_key.c linux-2.6.37.3/net/key/af_key.c
33344 ---- linux-2.6.37.3/net/key/af_key.c 2011-01-04 19:50:19.000000000 -0500
33345 -+++ linux-2.6.37.3/net/key/af_key.c 2011-01-17 02:41:02.000000000 -0500
33346 +diff -urNp linux-2.6.37.4/net/key/af_key.c linux-2.6.37.4/net/key/af_key.c
33347 +--- linux-2.6.37.4/net/key/af_key.c 2011-01-04 19:50:19.000000000 -0500
33348 ++++ linux-2.6.37.4/net/key/af_key.c 2011-01-17 02:41:02.000000000 -0500
33349 @@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil
33350 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
33351 else
33352 @@ -57522,9 +57727,9 @@ diff -urNp linux-2.6.37.3/net/key/af_key.c linux-2.6.37.3/net/key/af_key.c
33353 atomic_read(&s->sk_refcnt),
33354 sk_rmem_alloc_get(s),
33355 sk_wmem_alloc_get(s),
33356 -diff -urNp linux-2.6.37.3/net/mac80211/ieee80211_i.h linux-2.6.37.3/net/mac80211/ieee80211_i.h
33357 ---- linux-2.6.37.3/net/mac80211/ieee80211_i.h 2011-01-04 19:50:19.000000000 -0500
33358 -+++ linux-2.6.37.3/net/mac80211/ieee80211_i.h 2011-01-24 18:04:18.000000000 -0500
33359 +diff -urNp linux-2.6.37.4/net/mac80211/ieee80211_i.h linux-2.6.37.4/net/mac80211/ieee80211_i.h
33360 +--- linux-2.6.37.4/net/mac80211/ieee80211_i.h 2011-01-04 19:50:19.000000000 -0500
33361 ++++ linux-2.6.37.4/net/mac80211/ieee80211_i.h 2011-01-24 18:04:18.000000000 -0500
33362 @@ -26,6 +26,7 @@
33363 #include <net/ieee80211_radiotap.h>
33364 #include <net/cfg80211.h>
33365 @@ -57542,9 +57747,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/ieee80211_i.h linux-2.6.37.3/net/mac80211
33366 int monitors, cooked_mntrs;
33367 /* number of interfaces with corresponding FIF_ flags */
33368 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
33369 -diff -urNp linux-2.6.37.3/net/mac80211/iface.c linux-2.6.37.3/net/mac80211/iface.c
33370 ---- linux-2.6.37.3/net/mac80211/iface.c 2011-01-04 19:50:19.000000000 -0500
33371 -+++ linux-2.6.37.3/net/mac80211/iface.c 2011-01-24 18:04:18.000000000 -0500
33372 +diff -urNp linux-2.6.37.4/net/mac80211/iface.c linux-2.6.37.4/net/mac80211/iface.c
33373 +--- linux-2.6.37.4/net/mac80211/iface.c 2011-01-04 19:50:19.000000000 -0500
33374 ++++ linux-2.6.37.4/net/mac80211/iface.c 2011-01-24 18:04:18.000000000 -0500
33375 @@ -216,7 +216,7 @@ static int ieee80211_do_open(struct net_
33376 break;
33377 }
33378 @@ -57599,9 +57804,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/iface.c linux-2.6.37.3/net/mac80211/iface
33379 if (local->ops->napi_poll)
33380 napi_disable(&local->napi);
33381 ieee80211_clear_tx_pending(local);
33382 -diff -urNp linux-2.6.37.3/net/mac80211/main.c linux-2.6.37.3/net/mac80211/main.c
33383 ---- linux-2.6.37.3/net/mac80211/main.c 2011-01-04 19:50:19.000000000 -0500
33384 -+++ linux-2.6.37.3/net/mac80211/main.c 2011-01-24 18:04:18.000000000 -0500
33385 +diff -urNp linux-2.6.37.4/net/mac80211/main.c linux-2.6.37.4/net/mac80211/main.c
33386 +--- linux-2.6.37.4/net/mac80211/main.c 2011-01-04 19:50:19.000000000 -0500
33387 ++++ linux-2.6.37.4/net/mac80211/main.c 2011-01-24 18:04:18.000000000 -0500
33388 @@ -159,7 +159,7 @@ int ieee80211_hw_config(struct ieee80211
33389 local->hw.conf.power_level = power;
33390 }
33391 @@ -57611,9 +57816,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/main.c linux-2.6.37.3/net/mac80211/main.c
33392 ret = drv_config(local, changed);
33393 /*
33394 * Goal:
33395 -diff -urNp linux-2.6.37.3/net/mac80211/pm.c linux-2.6.37.3/net/mac80211/pm.c
33396 ---- linux-2.6.37.3/net/mac80211/pm.c 2011-01-04 19:50:19.000000000 -0500
33397 -+++ linux-2.6.37.3/net/mac80211/pm.c 2011-01-24 18:04:18.000000000 -0500
33398 +diff -urNp linux-2.6.37.4/net/mac80211/pm.c linux-2.6.37.4/net/mac80211/pm.c
33399 +--- linux-2.6.37.4/net/mac80211/pm.c 2011-01-04 19:50:19.000000000 -0500
33400 ++++ linux-2.6.37.4/net/mac80211/pm.c 2011-01-24 18:04:18.000000000 -0500
33401 @@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
33402 }
33403
33404 @@ -57623,9 +57828,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/pm.c linux-2.6.37.3/net/mac80211/pm.c
33405 ieee80211_stop_device(local);
33406
33407 local->suspended = true;
33408 -diff -urNp linux-2.6.37.3/net/mac80211/rate.c linux-2.6.37.3/net/mac80211/rate.c
33409 ---- linux-2.6.37.3/net/mac80211/rate.c 2011-01-04 19:50:19.000000000 -0500
33410 -+++ linux-2.6.37.3/net/mac80211/rate.c 2011-01-24 18:04:18.000000000 -0500
33411 +diff -urNp linux-2.6.37.4/net/mac80211/rate.c linux-2.6.37.4/net/mac80211/rate.c
33412 +--- linux-2.6.37.4/net/mac80211/rate.c 2011-01-04 19:50:19.000000000 -0500
33413 ++++ linux-2.6.37.4/net/mac80211/rate.c 2011-01-24 18:04:18.000000000 -0500
33414 @@ -361,7 +361,7 @@ int ieee80211_init_rate_ctrl_alg(struct
33415
33416 ASSERT_RTNL();
33417 @@ -57635,9 +57840,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/rate.c linux-2.6.37.3/net/mac80211/rate.c
33418 return -EBUSY;
33419
33420 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
33421 -diff -urNp linux-2.6.37.3/net/mac80211/rc80211_pid_debugfs.c linux-2.6.37.3/net/mac80211/rc80211_pid_debugfs.c
33422 ---- linux-2.6.37.3/net/mac80211/rc80211_pid_debugfs.c 2011-01-04 19:50:19.000000000 -0500
33423 -+++ linux-2.6.37.3/net/mac80211/rc80211_pid_debugfs.c 2011-01-17 02:41:02.000000000 -0500
33424 +diff -urNp linux-2.6.37.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.37.4/net/mac80211/rc80211_pid_debugfs.c
33425 +--- linux-2.6.37.4/net/mac80211/rc80211_pid_debugfs.c 2011-01-04 19:50:19.000000000 -0500
33426 ++++ linux-2.6.37.4/net/mac80211/rc80211_pid_debugfs.c 2011-01-17 02:41:02.000000000 -0500
33427 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
33428
33429 spin_unlock_irqrestore(&events->lock, status);
33430 @@ -57647,9 +57852,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/rc80211_pid_debugfs.c linux-2.6.37.3/net/
33431 return -EFAULT;
33432
33433 return p;
33434 -diff -urNp linux-2.6.37.3/net/mac80211/tx.c linux-2.6.37.3/net/mac80211/tx.c
33435 ---- linux-2.6.37.3/net/mac80211/tx.c 2011-02-22 16:05:31.000000000 -0500
33436 -+++ linux-2.6.37.3/net/mac80211/tx.c 2011-02-22 16:05:49.000000000 -0500
33437 +diff -urNp linux-2.6.37.4/net/mac80211/tx.c linux-2.6.37.4/net/mac80211/tx.c
33438 +--- linux-2.6.37.4/net/mac80211/tx.c 2011-02-22 16:05:31.000000000 -0500
33439 ++++ linux-2.6.37.4/net/mac80211/tx.c 2011-02-22 16:05:49.000000000 -0500
33440 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
33441 return cpu_to_le16(dur);
33442 }
33443 @@ -57659,9 +57864,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/tx.c linux-2.6.37.3/net/mac80211/tx.c
33444 struct net_device *dev)
33445 {
33446 return local == wdev_priv(dev->ieee80211_ptr);
33447 -diff -urNp linux-2.6.37.3/net/mac80211/util.c linux-2.6.37.3/net/mac80211/util.c
33448 ---- linux-2.6.37.3/net/mac80211/util.c 2011-01-04 19:50:19.000000000 -0500
33449 -+++ linux-2.6.37.3/net/mac80211/util.c 2011-01-24 18:04:18.000000000 -0500
33450 +diff -urNp linux-2.6.37.4/net/mac80211/util.c linux-2.6.37.4/net/mac80211/util.c
33451 +--- linux-2.6.37.4/net/mac80211/util.c 2011-01-04 19:50:19.000000000 -0500
33452 ++++ linux-2.6.37.4/net/mac80211/util.c 2011-01-24 18:04:18.000000000 -0500
33453 @@ -1111,7 +1111,7 @@ int ieee80211_reconfig(struct ieee80211_
33454 local->resuming = true;
33455
33456 @@ -57671,9 +57876,9 @@ diff -urNp linux-2.6.37.3/net/mac80211/util.c linux-2.6.37.3/net/mac80211/util.c
33457 /*
33458 * Upon resume hardware can sometimes be goofy due to
33459 * various platform / driver / bus issues, so restarting
33460 -diff -urNp linux-2.6.37.3/net/netfilter/Kconfig linux-2.6.37.3/net/netfilter/Kconfig
33461 ---- linux-2.6.37.3/net/netfilter/Kconfig 2011-01-04 19:50:19.000000000 -0500
33462 -+++ linux-2.6.37.3/net/netfilter/Kconfig 2011-01-17 02:41:02.000000000 -0500
33463 +diff -urNp linux-2.6.37.4/net/netfilter/Kconfig linux-2.6.37.4/net/netfilter/Kconfig
33464 +--- linux-2.6.37.4/net/netfilter/Kconfig 2011-01-04 19:50:19.000000000 -0500
33465 ++++ linux-2.6.37.4/net/netfilter/Kconfig 2011-01-17 02:41:02.000000000 -0500
33466 @@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP
33467
33468 To compile it as a module, choose M here. If unsure, say N.
33469 @@ -57691,9 +57896,9 @@ diff -urNp linux-2.6.37.3/net/netfilter/Kconfig linux-2.6.37.3/net/netfilter/Kco
33470 config NETFILTER_XT_MATCH_HASHLIMIT
33471 tristate '"hashlimit" match support'
33472 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
33473 -diff -urNp linux-2.6.37.3/net/netfilter/Makefile linux-2.6.37.3/net/netfilter/Makefile
33474 ---- linux-2.6.37.3/net/netfilter/Makefile 2011-01-04 19:50:19.000000000 -0500
33475 -+++ linux-2.6.37.3/net/netfilter/Makefile 2011-01-17 02:41:02.000000000 -0500
33476 +diff -urNp linux-2.6.37.4/net/netfilter/Makefile linux-2.6.37.4/net/netfilter/Makefile
33477 +--- linux-2.6.37.4/net/netfilter/Makefile 2011-01-04 19:50:19.000000000 -0500
33478 ++++ linux-2.6.37.4/net/netfilter/Makefile 2011-01-17 02:41:02.000000000 -0500
33479 @@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) +=
33480 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
33481 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
33482 @@ -57702,9 +57907,9 @@ diff -urNp linux-2.6.37.3/net/netfilter/Makefile linux-2.6.37.3/net/netfilter/Ma
33483 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
33484 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
33485 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
33486 -diff -urNp linux-2.6.37.3/net/netfilter/nf_conntrack_netlink.c linux-2.6.37.3/net/netfilter/nf_conntrack_netlink.c
33487 ---- linux-2.6.37.3/net/netfilter/nf_conntrack_netlink.c 2011-02-27 14:49:17.000000000 -0500
33488 -+++ linux-2.6.37.3/net/netfilter/nf_conntrack_netlink.c 2011-02-27 14:50:36.000000000 -0500
33489 +diff -urNp linux-2.6.37.4/net/netfilter/nf_conntrack_netlink.c linux-2.6.37.4/net/netfilter/nf_conntrack_netlink.c
33490 +--- linux-2.6.37.4/net/netfilter/nf_conntrack_netlink.c 2011-02-27 14:49:17.000000000 -0500
33491 ++++ linux-2.6.37.4/net/netfilter/nf_conntrack_netlink.c 2011-02-27 14:50:36.000000000 -0500
33492 @@ -758,7 +758,7 @@ static const struct nla_policy tuple_nla
33493 static int
33494 ctnetlink_parse_tuple(const struct nlattr * const cda[],
33495 @@ -57714,9 +57919,9 @@ diff -urNp linux-2.6.37.3/net/netfilter/nf_conntrack_netlink.c linux-2.6.37.3/ne
33496 {
33497 struct nlattr *tb[CTA_TUPLE_MAX+1];
33498 int err;
33499 -diff -urNp linux-2.6.37.3/net/netfilter/xt_gradm.c linux-2.6.37.3/net/netfilter/xt_gradm.c
33500 ---- linux-2.6.37.3/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
33501 -+++ linux-2.6.37.3/net/netfilter/xt_gradm.c 2011-01-17 02:41:02.000000000 -0500
33502 +diff -urNp linux-2.6.37.4/net/netfilter/xt_gradm.c linux-2.6.37.4/net/netfilter/xt_gradm.c
33503 +--- linux-2.6.37.4/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
33504 ++++ linux-2.6.37.4/net/netfilter/xt_gradm.c 2011-01-17 02:41:02.000000000 -0500
33505 @@ -0,0 +1,51 @@
33506 +/*
33507 + * gradm match for netfilter
33508 @@ -57769,9 +57974,9 @@ diff -urNp linux-2.6.37.3/net/netfilter/xt_gradm.c linux-2.6.37.3/net/netfilter/
33509 +MODULE_LICENSE("GPL");
33510 +MODULE_ALIAS("ipt_gradm");
33511 +MODULE_ALIAS("ip6t_gradm");
33512 -diff -urNp linux-2.6.37.3/net/netlink/af_netlink.c linux-2.6.37.3/net/netlink/af_netlink.c
33513 ---- linux-2.6.37.3/net/netlink/af_netlink.c 2011-01-04 19:50:19.000000000 -0500
33514 -+++ linux-2.6.37.3/net/netlink/af_netlink.c 2011-01-17 02:41:02.000000000 -0500
33515 +diff -urNp linux-2.6.37.4/net/netlink/af_netlink.c linux-2.6.37.4/net/netlink/af_netlink.c
33516 +--- linux-2.6.37.4/net/netlink/af_netlink.c 2011-01-04 19:50:19.000000000 -0500
33517 ++++ linux-2.6.37.4/net/netlink/af_netlink.c 2011-01-17 02:41:02.000000000 -0500
33518 @@ -1991,13 +1991,21 @@ static int netlink_seq_show(struct seq_f
33519 struct netlink_sock *nlk = nlk_sk(s);
33520
33521 @@ -57794,9 +57999,9 @@ diff -urNp linux-2.6.37.3/net/netlink/af_netlink.c linux-2.6.37.3/net/netlink/af
33522 atomic_read(&s->sk_refcnt),
33523 atomic_read(&s->sk_drops),
33524 sock_i_ino(s)
33525 -diff -urNp linux-2.6.37.3/net/netrom/af_netrom.c linux-2.6.37.3/net/netrom/af_netrom.c
33526 ---- linux-2.6.37.3/net/netrom/af_netrom.c 2011-01-04 19:50:19.000000000 -0500
33527 -+++ linux-2.6.37.3/net/netrom/af_netrom.c 2011-01-17 02:41:02.000000000 -0500
33528 +diff -urNp linux-2.6.37.4/net/netrom/af_netrom.c linux-2.6.37.4/net/netrom/af_netrom.c
33529 +--- linux-2.6.37.4/net/netrom/af_netrom.c 2011-01-04 19:50:19.000000000 -0500
33530 ++++ linux-2.6.37.4/net/netrom/af_netrom.c 2011-01-17 02:41:02.000000000 -0500
33531 @@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc
33532 struct sock *sk = sock->sk;
33533 struct nr_sock *nr = nr_sk(sk);
33534 @@ -57813,9 +58018,9 @@ diff -urNp linux-2.6.37.3/net/netrom/af_netrom.c linux-2.6.37.3/net/netrom/af_ne
33535 sax->fsa_ax25.sax25_call = nr->source_addr;
33536 *uaddr_len = sizeof(struct sockaddr_ax25);
33537 }
33538 -diff -urNp linux-2.6.37.3/net/packet/af_packet.c linux-2.6.37.3/net/packet/af_packet.c
33539 ---- linux-2.6.37.3/net/packet/af_packet.c 2011-01-04 19:50:19.000000000 -0500
33540 -+++ linux-2.6.37.3/net/packet/af_packet.c 2011-01-17 02:41:02.000000000 -0500
33541 +diff -urNp linux-2.6.37.4/net/packet/af_packet.c linux-2.6.37.4/net/packet/af_packet.c
33542 +--- linux-2.6.37.4/net/packet/af_packet.c 2011-01-04 19:50:19.000000000 -0500
33543 ++++ linux-2.6.37.4/net/packet/af_packet.c 2011-01-17 02:41:02.000000000 -0500
33544 @@ -2123,7 +2123,7 @@ static int packet_getsockopt(struct sock
33545 case PACKET_HDRLEN:
33546 if (len > sizeof(int))
33547 @@ -57846,9 +58051,9 @@ diff -urNp linux-2.6.37.3/net/packet/af_packet.c linux-2.6.37.3/net/packet/af_pa
33548 atomic_read(&s->sk_refcnt),
33549 s->sk_type,
33550 ntohs(po->num),
33551 -diff -urNp linux-2.6.37.3/net/phonet/af_phonet.c linux-2.6.37.3/net/phonet/af_phonet.c
33552 ---- linux-2.6.37.3/net/phonet/af_phonet.c 2011-01-04 19:50:19.000000000 -0500
33553 -+++ linux-2.6.37.3/net/phonet/af_phonet.c 2011-01-17 02:41:02.000000000 -0500
33554 +diff -urNp linux-2.6.37.4/net/phonet/af_phonet.c linux-2.6.37.4/net/phonet/af_phonet.c
33555 +--- linux-2.6.37.4/net/phonet/af_phonet.c 2011-01-04 19:50:19.000000000 -0500
33556 ++++ linux-2.6.37.4/net/phonet/af_phonet.c 2011-01-17 02:41:02.000000000 -0500
33557 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
33558 {
33559 struct phonet_protocol *pp;
33560 @@ -57867,9 +58072,9 @@ diff -urNp linux-2.6.37.3/net/phonet/af_phonet.c linux-2.6.37.3/net/phonet/af_ph
33561 return -EINVAL;
33562
33563 err = proto_register(pp->prot, 1);
33564 -diff -urNp linux-2.6.37.3/net/phonet/socket.c linux-2.6.37.3/net/phonet/socket.c
33565 ---- linux-2.6.37.3/net/phonet/socket.c 2011-01-04 19:50:19.000000000 -0500
33566 -+++ linux-2.6.37.3/net/phonet/socket.c 2011-01-17 02:41:02.000000000 -0500
33567 +diff -urNp linux-2.6.37.4/net/phonet/socket.c linux-2.6.37.4/net/phonet/socket.c
33568 +--- linux-2.6.37.4/net/phonet/socket.c 2011-01-04 19:50:19.000000000 -0500
33569 ++++ linux-2.6.37.4/net/phonet/socket.c 2011-01-17 02:41:02.000000000 -0500
33570 @@ -637,7 +637,12 @@ static int pn_sock_seq_show(struct seq_f
33571 sk->sk_state,
33572 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
33573 @@ -57884,9 +58089,9 @@ diff -urNp linux-2.6.37.3/net/phonet/socket.c linux-2.6.37.3/net/phonet/socket.c
33574 atomic_read(&sk->sk_drops), &len);
33575 }
33576 seq_printf(seq, "%*s\n", 127 - len, "");
33577 -diff -urNp linux-2.6.37.3/net/rxrpc/ar-key.c linux-2.6.37.3/net/rxrpc/ar-key.c
33578 ---- linux-2.6.37.3/net/rxrpc/ar-key.c 2011-01-04 19:50:19.000000000 -0500
33579 -+++ linux-2.6.37.3/net/rxrpc/ar-key.c 2011-02-27 15:02:18.000000000 -0500
33580 +diff -urNp linux-2.6.37.4/net/rxrpc/ar-key.c linux-2.6.37.4/net/rxrpc/ar-key.c
33581 +--- linux-2.6.37.4/net/rxrpc/ar-key.c 2011-01-04 19:50:19.000000000 -0500
33582 ++++ linux-2.6.37.4/net/rxrpc/ar-key.c 2011-02-27 15:02:18.000000000 -0500
33583 @@ -89,11 +89,11 @@ static int rxrpc_instantiate_xdr_rxkad(s
33584 return ret;
33585
33586 @@ -57914,9 +58119,9 @@ diff -urNp linux-2.6.37.3/net/rxrpc/ar-key.c linux-2.6.37.3/net/rxrpc/ar-key.c
33587 if (!token->kad)
33588 goto error_free;
33589
33590 -diff -urNp linux-2.6.37.3/net/sctp/proc.c linux-2.6.37.3/net/sctp/proc.c
33591 ---- linux-2.6.37.3/net/sctp/proc.c 2011-01-04 19:50:19.000000000 -0500
33592 -+++ linux-2.6.37.3/net/sctp/proc.c 2011-01-17 02:41:02.000000000 -0500
33593 +diff -urNp linux-2.6.37.4/net/sctp/proc.c linux-2.6.37.4/net/sctp/proc.c
33594 +--- linux-2.6.37.4/net/sctp/proc.c 2011-01-04 19:50:19.000000000 -0500
33595 ++++ linux-2.6.37.4/net/sctp/proc.c 2011-01-17 02:41:02.000000000 -0500
33596 @@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_
33597 sctp_for_each_hentry(epb, node, &head->chain) {
33598 ep = sctp_ep(epb);
33599 @@ -57945,9 +58150,9 @@ diff -urNp linux-2.6.37.3/net/sctp/proc.c linux-2.6.37.3/net/sctp/proc.c
33600 assoc->state, hash,
33601 assoc->assoc_id,
33602 assoc->sndbuf_used,
33603 -diff -urNp linux-2.6.37.3/net/sctp/socket.c linux-2.6.37.3/net/sctp/socket.c
33604 ---- linux-2.6.37.3/net/sctp/socket.c 2011-01-04 19:50:19.000000000 -0500
33605 -+++ linux-2.6.37.3/net/sctp/socket.c 2011-01-17 02:41:02.000000000 -0500
33606 +diff -urNp linux-2.6.37.4/net/sctp/socket.c linux-2.6.37.4/net/sctp/socket.c
33607 +--- linux-2.6.37.4/net/sctp/socket.c 2011-01-04 19:50:19.000000000 -0500
33608 ++++ linux-2.6.37.4/net/sctp/socket.c 2011-01-17 02:41:02.000000000 -0500
33609 @@ -1496,7 +1496,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
33610 struct sctp_sndrcvinfo *sinfo;
33611 struct sctp_initmsg *sinit;
33612 @@ -57966,9 +58171,9 @@ diff -urNp linux-2.6.37.3/net/sctp/socket.c linux-2.6.37.3/net/sctp/socket.c
33613 return -EFAULT;
33614 to += addrlen;
33615 cnt++;
33616 -diff -urNp linux-2.6.37.3/net/socket.c linux-2.6.37.3/net/socket.c
33617 ---- linux-2.6.37.3/net/socket.c 2011-01-04 19:50:19.000000000 -0500
33618 -+++ linux-2.6.37.3/net/socket.c 2011-01-17 02:41:02.000000000 -0500
33619 +diff -urNp linux-2.6.37.4/net/socket.c linux-2.6.37.4/net/socket.c
33620 +--- linux-2.6.37.4/net/socket.c 2011-01-04 19:50:19.000000000 -0500
33621 ++++ linux-2.6.37.4/net/socket.c 2011-01-17 02:41:02.000000000 -0500
33622 @@ -88,6 +88,7 @@
33623 #include <linux/nsproxy.h>
33624 #include <linux/magic.h>
33625 @@ -58119,9 +58324,9 @@ diff -urNp linux-2.6.37.3/net/socket.c linux-2.6.37.3/net/socket.c
33626 err =
33627 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
33628 if (err)
33629 -diff -urNp linux-2.6.37.3/net/sunrpc/sched.c linux-2.6.37.3/net/sunrpc/sched.c
33630 ---- linux-2.6.37.3/net/sunrpc/sched.c 2011-01-04 19:50:19.000000000 -0500
33631 -+++ linux-2.6.37.3/net/sunrpc/sched.c 2011-01-17 02:41:02.000000000 -0500
33632 +diff -urNp linux-2.6.37.4/net/sunrpc/sched.c linux-2.6.37.4/net/sunrpc/sched.c
33633 +--- linux-2.6.37.4/net/sunrpc/sched.c 2011-01-04 19:50:19.000000000 -0500
33634 ++++ linux-2.6.37.4/net/sunrpc/sched.c 2011-01-17 02:41:02.000000000 -0500
33635 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
33636 #ifdef RPC_DEBUG
33637 static void rpc_task_set_debuginfo(struct rpc_task *task)
33638 @@ -58134,9 +58339,9 @@ diff -urNp linux-2.6.37.3/net/sunrpc/sched.c linux-2.6.37.3/net/sunrpc/sched.c
33639 }
33640 #else
33641 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
33642 -diff -urNp linux-2.6.37.3/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.37.3/net/sunrpc/xprtrdma/svc_rdma.c
33643 ---- linux-2.6.37.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-04 19:50:19.000000000 -0500
33644 -+++ linux-2.6.37.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-17 02:41:02.000000000 -0500
33645 +diff -urNp linux-2.6.37.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.37.4/net/sunrpc/xprtrdma/svc_rdma.c
33646 +--- linux-2.6.37.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-04 19:50:19.000000000 -0500
33647 ++++ linux-2.6.37.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-17 02:41:02.000000000 -0500
33648 @@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta
33649 len -= *ppos;
33650 if (len > *lenp)
33651 @@ -58146,9 +58351,9 @@ diff -urNp linux-2.6.37.3/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.37.3/net/sunr
33652 return -EFAULT;
33653 *lenp = len;
33654 *ppos += len;
33655 -diff -urNp linux-2.6.37.3/net/sysctl_net.c linux-2.6.37.3/net/sysctl_net.c
33656 ---- linux-2.6.37.3/net/sysctl_net.c 2011-01-04 19:50:19.000000000 -0500
33657 -+++ linux-2.6.37.3/net/sysctl_net.c 2011-01-17 02:41:02.000000000 -0500
33658 +diff -urNp linux-2.6.37.4/net/sysctl_net.c linux-2.6.37.4/net/sysctl_net.c
33659 +--- linux-2.6.37.4/net/sysctl_net.c 2011-01-04 19:50:19.000000000 -0500
33660 ++++ linux-2.6.37.4/net/sysctl_net.c 2011-01-17 02:41:02.000000000 -0500
33661 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
33662 struct ctl_table *table)
33663 {
33664 @@ -58158,9 +58363,9 @@ diff -urNp linux-2.6.37.3/net/sysctl_net.c linux-2.6.37.3/net/sysctl_net.c
33665 int mode = (table->mode >> 6) & 7;
33666 return (mode << 6) | (mode << 3) | mode;
33667 }
33668 -diff -urNp linux-2.6.37.3/net/tipc/socket.c linux-2.6.37.3/net/tipc/socket.c
33669 ---- linux-2.6.37.3/net/tipc/socket.c 2011-01-04 19:50:19.000000000 -0500
33670 -+++ linux-2.6.37.3/net/tipc/socket.c 2011-01-17 02:41:02.000000000 -0500
33671 +diff -urNp linux-2.6.37.4/net/tipc/socket.c linux-2.6.37.4/net/tipc/socket.c
33672 +--- linux-2.6.37.4/net/tipc/socket.c 2011-01-04 19:50:19.000000000 -0500
33673 ++++ linux-2.6.37.4/net/tipc/socket.c 2011-01-17 02:41:02.000000000 -0500
33674 @@ -1475,8 +1475,9 @@ static int connect(struct socket *sock,
33675 } else {
33676 if (res == 0)
33677 @@ -58173,9 +58378,9 @@ diff -urNp linux-2.6.37.3/net/tipc/socket.c linux-2.6.37.3/net/tipc/socket.c
33678 sock->state = SS_DISCONNECTING;
33679 }
33680
33681 -diff -urNp linux-2.6.37.3/net/unix/af_unix.c linux-2.6.37.3/net/unix/af_unix.c
33682 ---- linux-2.6.37.3/net/unix/af_unix.c 2011-02-22 16:05:31.000000000 -0500
33683 -+++ linux-2.6.37.3/net/unix/af_unix.c 2011-02-22 16:05:49.000000000 -0500
33684 +diff -urNp linux-2.6.37.4/net/unix/af_unix.c linux-2.6.37.4/net/unix/af_unix.c
33685 +--- linux-2.6.37.4/net/unix/af_unix.c 2011-02-22 16:05:31.000000000 -0500
33686 ++++ linux-2.6.37.4/net/unix/af_unix.c 2011-02-22 16:05:49.000000000 -0500
33687 @@ -764,6 +764,12 @@ static struct sock *unix_find_other(stru
33688 err = -ECONNREFUSED;
33689 if (!S_ISSOCK(inode->i_mode))
33690 @@ -58246,9 +58451,9 @@ diff -urNp linux-2.6.37.3/net/unix/af_unix.c linux-2.6.37.3/net/unix/af_unix.c
33691 atomic_read(&s->sk_refcnt),
33692 0,
33693 s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
33694 -diff -urNp linux-2.6.37.3/net/wireless/reg.c linux-2.6.37.3/net/wireless/reg.c
33695 ---- linux-2.6.37.3/net/wireless/reg.c 2011-02-22 16:05:31.000000000 -0500
33696 -+++ linux-2.6.37.3/net/wireless/reg.c 2011-02-22 16:05:49.000000000 -0500
33697 +diff -urNp linux-2.6.37.4/net/wireless/reg.c linux-2.6.37.4/net/wireless/reg.c
33698 +--- linux-2.6.37.4/net/wireless/reg.c 2011-02-22 16:05:31.000000000 -0500
33699 ++++ linux-2.6.37.4/net/wireless/reg.c 2011-02-22 16:05:49.000000000 -0500
33700 @@ -51,7 +51,7 @@
33701 printk(KERN_DEBUG format , ## args); \
33702 } while (0)
33703 @@ -58258,9 +58463,9 @@ diff -urNp linux-2.6.37.3/net/wireless/reg.c linux-2.6.37.3/net/wireless/reg.c
33704 #endif
33705
33706 /* Receipt of information from last regulatory request */
33707 -diff -urNp linux-2.6.37.3/net/wireless/wext-core.c linux-2.6.37.3/net/wireless/wext-core.c
33708 ---- linux-2.6.37.3/net/wireless/wext-core.c 2011-01-04 19:50:19.000000000 -0500
33709 -+++ linux-2.6.37.3/net/wireless/wext-core.c 2011-01-17 02:41:02.000000000 -0500
33710 +diff -urNp linux-2.6.37.4/net/wireless/wext-core.c linux-2.6.37.4/net/wireless/wext-core.c
33711 +--- linux-2.6.37.4/net/wireless/wext-core.c 2011-01-04 19:50:19.000000000 -0500
33712 ++++ linux-2.6.37.4/net/wireless/wext-core.c 2011-01-17 02:41:02.000000000 -0500
33713 @@ -744,8 +744,7 @@ static int ioctl_standard_iw_point(struc
33714 */
33715
33716 @@ -58294,9 +58499,9 @@ diff -urNp linux-2.6.37.3/net/wireless/wext-core.c linux-2.6.37.3/net/wireless/w
33717 err = handler(dev, info, (union iwreq_data *) iwp, extra);
33718
33719 iwp->length += essid_compat;
33720 -diff -urNp linux-2.6.37.3/net/x25/x25_facilities.c linux-2.6.37.3/net/x25/x25_facilities.c
33721 ---- linux-2.6.37.3/net/x25/x25_facilities.c 2011-01-04 19:50:19.000000000 -0500
33722 -+++ linux-2.6.37.3/net/x25/x25_facilities.c 2011-01-17 02:41:02.000000000 -0500
33723 +diff -urNp linux-2.6.37.4/net/x25/x25_facilities.c linux-2.6.37.4/net/x25/x25_facilities.c
33724 +--- linux-2.6.37.4/net/x25/x25_facilities.c 2011-01-04 19:50:19.000000000 -0500
33725 ++++ linux-2.6.37.4/net/x25/x25_facilities.c 2011-01-17 02:41:02.000000000 -0500
33726 @@ -157,7 +157,8 @@ int x25_parse_facilities(struct sk_buff
33727 break;
33728 default:
33729 @@ -58307,9 +58512,9 @@ diff -urNp linux-2.6.37.3/net/x25/x25_facilities.c linux-2.6.37.3/net/x25/x25_fa
33730 break;
33731 }
33732 len -= p[1] + 2;
33733 -diff -urNp linux-2.6.37.3/net/xfrm/xfrm_policy.c linux-2.6.37.3/net/xfrm/xfrm_policy.c
33734 ---- linux-2.6.37.3/net/xfrm/xfrm_policy.c 2011-01-04 19:50:19.000000000 -0500
33735 -+++ linux-2.6.37.3/net/xfrm/xfrm_policy.c 2011-01-17 02:41:02.000000000 -0500
33736 +diff -urNp linux-2.6.37.4/net/xfrm/xfrm_policy.c linux-2.6.37.4/net/xfrm/xfrm_policy.c
33737 +--- linux-2.6.37.4/net/xfrm/xfrm_policy.c 2011-01-04 19:50:19.000000000 -0500
33738 ++++ linux-2.6.37.4/net/xfrm/xfrm_policy.c 2011-01-17 02:41:02.000000000 -0500
33739 @@ -1504,7 +1504,7 @@ free_dst:
33740 goto out;
33741 }
33742 @@ -58337,9 +58542,9 @@ diff -urNp linux-2.6.37.3/net/xfrm/xfrm_policy.c linux-2.6.37.3/net/xfrm/xfrm_po
33743 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
33744 {
33745 #ifdef CONFIG_XFRM_SUB_POLICY
33746 -diff -urNp linux-2.6.37.3/scripts/basic/fixdep.c linux-2.6.37.3/scripts/basic/fixdep.c
33747 ---- linux-2.6.37.3/scripts/basic/fixdep.c 2011-01-04 19:50:19.000000000 -0500
33748 -+++ linux-2.6.37.3/scripts/basic/fixdep.c 2011-01-17 02:41:02.000000000 -0500
33749 +diff -urNp linux-2.6.37.4/scripts/basic/fixdep.c linux-2.6.37.4/scripts/basic/fixdep.c
33750 +--- linux-2.6.37.4/scripts/basic/fixdep.c 2011-01-04 19:50:19.000000000 -0500
33751 ++++ linux-2.6.37.4/scripts/basic/fixdep.c 2011-01-17 02:41:02.000000000 -0500
33752 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
33753
33754 static void parse_config_file(char *map, size_t len)
33755 @@ -58361,9 +58566,9 @@ diff -urNp linux-2.6.37.3/scripts/basic/fixdep.c linux-2.6.37.3/scripts/basic/fi
33756
33757 if (*p != INT_CONF) {
33758 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
33759 -diff -urNp linux-2.6.37.3/scripts/kallsyms.c linux-2.6.37.3/scripts/kallsyms.c
33760 ---- linux-2.6.37.3/scripts/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
33761 -+++ linux-2.6.37.3/scripts/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
33762 +diff -urNp linux-2.6.37.4/scripts/kallsyms.c linux-2.6.37.4/scripts/kallsyms.c
33763 +--- linux-2.6.37.4/scripts/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
33764 ++++ linux-2.6.37.4/scripts/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
33765 @@ -43,10 +43,10 @@ struct text_range {
33766
33767 static unsigned long long _text;
33768 @@ -58379,9 +58584,9 @@ diff -urNp linux-2.6.37.3/scripts/kallsyms.c linux-2.6.37.3/scripts/kallsyms.c
33769 };
33770 #define text_range_text (&text_ranges[0])
33771 #define text_range_inittext (&text_ranges[1])
33772 -diff -urNp linux-2.6.37.3/scripts/mod/file2alias.c linux-2.6.37.3/scripts/mod/file2alias.c
33773 ---- linux-2.6.37.3/scripts/mod/file2alias.c 2011-01-04 19:50:19.000000000 -0500
33774 -+++ linux-2.6.37.3/scripts/mod/file2alias.c 2011-01-17 02:41:02.000000000 -0500
33775 +diff -urNp linux-2.6.37.4/scripts/mod/file2alias.c linux-2.6.37.4/scripts/mod/file2alias.c
33776 +--- linux-2.6.37.4/scripts/mod/file2alias.c 2011-01-04 19:50:19.000000000 -0500
33777 ++++ linux-2.6.37.4/scripts/mod/file2alias.c 2011-01-17 02:41:02.000000000 -0500
33778 @@ -72,7 +72,7 @@ static void device_id_check(const char *
33779 unsigned long size, unsigned long id_size,
33780 void *symval)
33781 @@ -58436,9 +58641,9 @@ diff -urNp linux-2.6.37.3/scripts/mod/file2alias.c linux-2.6.37.3/scripts/mod/fi
33782
33783 sprintf(alias, "dmi*");
33784
33785 -diff -urNp linux-2.6.37.3/scripts/mod/modpost.c linux-2.6.37.3/scripts/mod/modpost.c
33786 ---- linux-2.6.37.3/scripts/mod/modpost.c 2011-01-04 19:50:19.000000000 -0500
33787 -+++ linux-2.6.37.3/scripts/mod/modpost.c 2011-01-17 02:41:02.000000000 -0500
33788 +diff -urNp linux-2.6.37.4/scripts/mod/modpost.c linux-2.6.37.4/scripts/mod/modpost.c
33789 +--- linux-2.6.37.4/scripts/mod/modpost.c 2011-01-04 19:50:19.000000000 -0500
33790 ++++ linux-2.6.37.4/scripts/mod/modpost.c 2011-01-17 02:41:02.000000000 -0500
33791 @@ -895,6 +895,7 @@ enum mismatch {
33792 ANY_INIT_TO_ANY_EXIT,
33793 ANY_EXIT_TO_ANY_INIT,
33794 @@ -58506,9 +58711,9 @@ diff -urNp linux-2.6.37.3/scripts/mod/modpost.c linux-2.6.37.3/scripts/mod/modpo
33795 goto close_write;
33796
33797 tmp = NOFAIL(malloc(b->pos));
33798 -diff -urNp linux-2.6.37.3/scripts/mod/modpost.h linux-2.6.37.3/scripts/mod/modpost.h
33799 ---- linux-2.6.37.3/scripts/mod/modpost.h 2011-01-04 19:50:19.000000000 -0500
33800 -+++ linux-2.6.37.3/scripts/mod/modpost.h 2011-01-17 02:41:02.000000000 -0500
33801 +diff -urNp linux-2.6.37.4/scripts/mod/modpost.h linux-2.6.37.4/scripts/mod/modpost.h
33802 +--- linux-2.6.37.4/scripts/mod/modpost.h 2011-01-04 19:50:19.000000000 -0500
33803 ++++ linux-2.6.37.4/scripts/mod/modpost.h 2011-01-17 02:41:02.000000000 -0500
33804 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
33805
33806 struct buffer {
33807 @@ -58528,9 +58733,9 @@ diff -urNp linux-2.6.37.3/scripts/mod/modpost.h linux-2.6.37.3/scripts/mod/modpo
33808
33809 struct module {
33810 struct module *next;
33811 -diff -urNp linux-2.6.37.3/scripts/mod/sumversion.c linux-2.6.37.3/scripts/mod/sumversion.c
33812 ---- linux-2.6.37.3/scripts/mod/sumversion.c 2011-01-04 19:50:19.000000000 -0500
33813 -+++ linux-2.6.37.3/scripts/mod/sumversion.c 2011-01-17 02:41:02.000000000 -0500
33814 +diff -urNp linux-2.6.37.4/scripts/mod/sumversion.c linux-2.6.37.4/scripts/mod/sumversion.c
33815 +--- linux-2.6.37.4/scripts/mod/sumversion.c 2011-01-04 19:50:19.000000000 -0500
33816 ++++ linux-2.6.37.4/scripts/mod/sumversion.c 2011-01-17 02:41:02.000000000 -0500
33817 @@ -455,7 +455,7 @@ static void write_version(const char *fi
33818 goto out;
33819 }
33820 @@ -58540,9 +58745,9 @@ diff -urNp linux-2.6.37.3/scripts/mod/sumversion.c linux-2.6.37.3/scripts/mod/su
33821 warn("writing sum in %s failed: %s\n",
33822 filename, strerror(errno));
33823 goto out;
33824 -diff -urNp linux-2.6.37.3/scripts/pnmtologo.c linux-2.6.37.3/scripts/pnmtologo.c
33825 ---- linux-2.6.37.3/scripts/pnmtologo.c 2011-01-04 19:50:19.000000000 -0500
33826 -+++ linux-2.6.37.3/scripts/pnmtologo.c 2011-01-17 02:41:02.000000000 -0500
33827 +diff -urNp linux-2.6.37.4/scripts/pnmtologo.c linux-2.6.37.4/scripts/pnmtologo.c
33828 +--- linux-2.6.37.4/scripts/pnmtologo.c 2011-01-04 19:50:19.000000000 -0500
33829 ++++ linux-2.6.37.4/scripts/pnmtologo.c 2011-01-17 02:41:02.000000000 -0500
33830 @@ -237,14 +237,14 @@ static void write_header(void)
33831 fprintf(out, " * Linux logo %s\n", logoname);
33832 fputs(" */\n\n", out);
33833 @@ -58569,9 +58774,9 @@ diff -urNp linux-2.6.37.3/scripts/pnmtologo.c linux-2.6.37.3/scripts/pnmtologo.c
33834 logoname);
33835 write_hex_cnt = 0;
33836 for (i = 0; i < logo_clutsize; i++) {
33837 -diff -urNp linux-2.6.37.3/security/apparmor/lsm.c linux-2.6.37.3/security/apparmor/lsm.c
33838 ---- linux-2.6.37.3/security/apparmor/lsm.c 2011-01-04 19:50:19.000000000 -0500
33839 -+++ linux-2.6.37.3/security/apparmor/lsm.c 2011-01-17 02:41:02.000000000 -0500
33840 +diff -urNp linux-2.6.37.4/security/apparmor/lsm.c linux-2.6.37.4/security/apparmor/lsm.c
33841 +--- linux-2.6.37.4/security/apparmor/lsm.c 2011-01-04 19:50:19.000000000 -0500
33842 ++++ linux-2.6.37.4/security/apparmor/lsm.c 2011-01-17 02:41:02.000000000 -0500
33843 @@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc
33844 return error;
33845 }
33846 @@ -58581,9 +58786,9 @@ diff -urNp linux-2.6.37.3/security/apparmor/lsm.c linux-2.6.37.3/security/apparm
33847 .name = "apparmor",
33848
33849 .ptrace_access_check = apparmor_ptrace_access_check,
33850 -diff -urNp linux-2.6.37.3/security/commoncap.c linux-2.6.37.3/security/commoncap.c
33851 ---- linux-2.6.37.3/security/commoncap.c 2011-01-04 19:50:19.000000000 -0500
33852 -+++ linux-2.6.37.3/security/commoncap.c 2011-01-17 02:41:02.000000000 -0500
33853 +diff -urNp linux-2.6.37.4/security/commoncap.c linux-2.6.37.4/security/commoncap.c
33854 +--- linux-2.6.37.4/security/commoncap.c 2011-01-04 19:50:19.000000000 -0500
33855 ++++ linux-2.6.37.4/security/commoncap.c 2011-01-17 02:41:02.000000000 -0500
33856 @@ -27,6 +27,7 @@
33857 #include <linux/sched.h>
33858 #include <linux/prctl.h>
33859 @@ -58615,9 +58820,9 @@ diff -urNp linux-2.6.37.3/security/commoncap.c linux-2.6.37.3/security/commoncap
33860 if (cred->uid != 0) {
33861 if (bprm->cap_effective)
33862 return 1;
33863 -diff -urNp linux-2.6.37.3/security/integrity/ima/ima_api.c linux-2.6.37.3/security/integrity/ima/ima_api.c
33864 ---- linux-2.6.37.3/security/integrity/ima/ima_api.c 2011-01-04 19:50:19.000000000 -0500
33865 -+++ linux-2.6.37.3/security/integrity/ima/ima_api.c 2011-01-17 02:41:02.000000000 -0500
33866 +diff -urNp linux-2.6.37.4/security/integrity/ima/ima_api.c linux-2.6.37.4/security/integrity/ima/ima_api.c
33867 +--- linux-2.6.37.4/security/integrity/ima/ima_api.c 2011-01-04 19:50:19.000000000 -0500
33868 ++++ linux-2.6.37.4/security/integrity/ima/ima_api.c 2011-01-17 02:41:02.000000000 -0500
33869 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
33870 int result;
33871
33872 @@ -58627,9 +58832,9 @@ diff -urNp linux-2.6.37.3/security/integrity/ima/ima_api.c linux-2.6.37.3/securi
33873
33874 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
33875 if (!entry) {
33876 -diff -urNp linux-2.6.37.3/security/integrity/ima/ima_fs.c linux-2.6.37.3/security/integrity/ima/ima_fs.c
33877 ---- linux-2.6.37.3/security/integrity/ima/ima_fs.c 2011-01-04 19:50:19.000000000 -0500
33878 -+++ linux-2.6.37.3/security/integrity/ima/ima_fs.c 2011-01-17 02:41:02.000000000 -0500
33879 +diff -urNp linux-2.6.37.4/security/integrity/ima/ima_fs.c linux-2.6.37.4/security/integrity/ima/ima_fs.c
33880 +--- linux-2.6.37.4/security/integrity/ima/ima_fs.c 2011-01-04 19:50:19.000000000 -0500
33881 ++++ linux-2.6.37.4/security/integrity/ima/ima_fs.c 2011-01-17 02:41:02.000000000 -0500
33882 @@ -28,12 +28,12 @@
33883 static int valid_policy = 1;
33884 #define TMPBUFLEN 12
33885 @@ -58645,9 +58850,9 @@ diff -urNp linux-2.6.37.3/security/integrity/ima/ima_fs.c linux-2.6.37.3/securit
33886 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
33887 }
33888
33889 -diff -urNp linux-2.6.37.3/security/integrity/ima/ima.h linux-2.6.37.3/security/integrity/ima/ima.h
33890 ---- linux-2.6.37.3/security/integrity/ima/ima.h 2011-01-04 19:50:19.000000000 -0500
33891 -+++ linux-2.6.37.3/security/integrity/ima/ima.h 2011-01-17 02:41:02.000000000 -0500
33892 +diff -urNp linux-2.6.37.4/security/integrity/ima/ima.h linux-2.6.37.4/security/integrity/ima/ima.h
33893 +--- linux-2.6.37.4/security/integrity/ima/ima.h 2011-01-04 19:50:19.000000000 -0500
33894 ++++ linux-2.6.37.4/security/integrity/ima/ima.h 2011-01-17 02:41:02.000000000 -0500
33895 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
33896 extern spinlock_t ima_queue_lock;
33897
33898 @@ -58659,9 +58864,9 @@ diff -urNp linux-2.6.37.3/security/integrity/ima/ima.h linux-2.6.37.3/security/i
33899 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
33900 };
33901 extern struct ima_h_table ima_htable;
33902 -diff -urNp linux-2.6.37.3/security/integrity/ima/ima_queue.c linux-2.6.37.3/security/integrity/ima/ima_queue.c
33903 ---- linux-2.6.37.3/security/integrity/ima/ima_queue.c 2011-01-04 19:50:19.000000000 -0500
33904 -+++ linux-2.6.37.3/security/integrity/ima/ima_queue.c 2011-01-17 02:41:02.000000000 -0500
33905 +diff -urNp linux-2.6.37.4/security/integrity/ima/ima_queue.c linux-2.6.37.4/security/integrity/ima/ima_queue.c
33906 +--- linux-2.6.37.4/security/integrity/ima/ima_queue.c 2011-01-04 19:50:19.000000000 -0500
33907 ++++ linux-2.6.37.4/security/integrity/ima/ima_queue.c 2011-01-17 02:41:02.000000000 -0500
33908 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
33909 INIT_LIST_HEAD(&qe->later);
33910 list_add_tail_rcu(&qe->later, &ima_measurements);
33911 @@ -58671,9 +58876,9 @@ diff -urNp linux-2.6.37.3/security/integrity/ima/ima_queue.c linux-2.6.37.3/secu
33912 key = ima_hash_key(entry->digest);
33913 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
33914 return 0;
33915 -diff -urNp linux-2.6.37.3/security/Kconfig linux-2.6.37.3/security/Kconfig
33916 ---- linux-2.6.37.3/security/Kconfig 2011-01-04 19:50:19.000000000 -0500
33917 -+++ linux-2.6.37.3/security/Kconfig 2011-02-12 11:32:56.000000000 -0500
33918 +diff -urNp linux-2.6.37.4/security/Kconfig linux-2.6.37.4/security/Kconfig
33919 +--- linux-2.6.37.4/security/Kconfig 2011-01-04 19:50:19.000000000 -0500
33920 ++++ linux-2.6.37.4/security/Kconfig 2011-02-12 11:32:56.000000000 -0500
33921 @@ -4,6 +4,527 @@
33922
33923 menu "Security options"
33924 @@ -59211,9 +59416,9 @@ diff -urNp linux-2.6.37.3/security/Kconfig linux-2.6.37.3/security/Kconfig
33925 help
33926 This is the portion of low virtual memory which should be protected
33927 from userspace allocation. Keeping a user from writing to low pages
33928 -diff -urNp linux-2.6.37.3/security/min_addr.c linux-2.6.37.3/security/min_addr.c
33929 ---- linux-2.6.37.3/security/min_addr.c 2011-01-04 19:50:19.000000000 -0500
33930 -+++ linux-2.6.37.3/security/min_addr.c 2011-01-17 02:41:02.000000000 -0500
33931 +diff -urNp linux-2.6.37.4/security/min_addr.c linux-2.6.37.4/security/min_addr.c
33932 +--- linux-2.6.37.4/security/min_addr.c 2011-01-04 19:50:19.000000000 -0500
33933 ++++ linux-2.6.37.4/security/min_addr.c 2011-01-17 02:41:02.000000000 -0500
33934 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
33935 */
33936 static void update_mmap_min_addr(void)
33937 @@ -59230,9 +59435,9 @@ diff -urNp linux-2.6.37.3/security/min_addr.c linux-2.6.37.3/security/min_addr.c
33938 }
33939
33940 /*
33941 -diff -urNp linux-2.6.37.3/security/security.c linux-2.6.37.3/security/security.c
33942 ---- linux-2.6.37.3/security/security.c 2011-02-27 14:49:17.000000000 -0500
33943 -+++ linux-2.6.37.3/security/security.c 2011-02-22 16:05:49.000000000 -0500
33944 +diff -urNp linux-2.6.37.4/security/security.c linux-2.6.37.4/security/security.c
33945 +--- linux-2.6.37.4/security/security.c 2011-02-27 14:49:17.000000000 -0500
33946 ++++ linux-2.6.37.4/security/security.c 2011-02-22 16:05:49.000000000 -0500
33947 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
33948 /* things that live in capability.c */
33949 extern void __init security_fixup_ops(struct security_operations *ops);
33950 @@ -59254,9 +59459,9 @@ diff -urNp linux-2.6.37.3/security/security.c linux-2.6.37.3/security/security.c
33951 }
33952
33953 /* Save user chosen LSM */
33954 -diff -urNp linux-2.6.37.3/security/selinux/hooks.c linux-2.6.37.3/security/selinux/hooks.c
33955 ---- linux-2.6.37.3/security/selinux/hooks.c 2011-02-27 14:49:17.000000000 -0500
33956 -+++ linux-2.6.37.3/security/selinux/hooks.c 2011-02-22 16:05:49.000000000 -0500
33957 +diff -urNp linux-2.6.37.4/security/selinux/hooks.c linux-2.6.37.4/security/selinux/hooks.c
33958 +--- linux-2.6.37.4/security/selinux/hooks.c 2011-02-27 14:49:17.000000000 -0500
33959 ++++ linux-2.6.37.4/security/selinux/hooks.c 2011-02-22 16:05:49.000000000 -0500
33960 @@ -90,7 +90,6 @@
33961 #define NUM_SEL_MNT_OPTS 5
33962
33963 @@ -59274,9 +59479,9 @@ diff -urNp linux-2.6.37.3/security/selinux/hooks.c linux-2.6.37.3/security/selin
33964 .name = "selinux",
33965
33966 .ptrace_access_check = selinux_ptrace_access_check,
33967 -diff -urNp linux-2.6.37.3/security/smack/smack_lsm.c linux-2.6.37.3/security/smack/smack_lsm.c
33968 ---- linux-2.6.37.3/security/smack/smack_lsm.c 2011-02-22 16:05:31.000000000 -0500
33969 -+++ linux-2.6.37.3/security/smack/smack_lsm.c 2011-02-22 16:05:49.000000000 -0500
33970 +diff -urNp linux-2.6.37.4/security/smack/smack_lsm.c linux-2.6.37.4/security/smack/smack_lsm.c
33971 +--- linux-2.6.37.4/security/smack/smack_lsm.c 2011-02-22 16:05:31.000000000 -0500
33972 ++++ linux-2.6.37.4/security/smack/smack_lsm.c 2011-02-22 16:05:49.000000000 -0500
33973 @@ -3052,7 +3052,7 @@ static int smack_inode_getsecctx(struct
33974 return 0;
33975 }
33976 @@ -59286,9 +59491,9 @@ diff -urNp linux-2.6.37.3/security/smack/smack_lsm.c linux-2.6.37.3/security/sma
33977 .name = "smack",
33978
33979 .ptrace_access_check = smack_ptrace_access_check,
33980 -diff -urNp linux-2.6.37.3/security/tomoyo/tomoyo.c linux-2.6.37.3/security/tomoyo/tomoyo.c
33981 ---- linux-2.6.37.3/security/tomoyo/tomoyo.c 2011-01-04 19:50:19.000000000 -0500
33982 -+++ linux-2.6.37.3/security/tomoyo/tomoyo.c 2011-01-17 02:41:02.000000000 -0500
33983 +diff -urNp linux-2.6.37.4/security/tomoyo/tomoyo.c linux-2.6.37.4/security/tomoyo/tomoyo.c
33984 +--- linux-2.6.37.4/security/tomoyo/tomoyo.c 2011-01-04 19:50:19.000000000 -0500
33985 ++++ linux-2.6.37.4/security/tomoyo/tomoyo.c 2011-01-17 02:41:02.000000000 -0500
33986 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
33987 * tomoyo_security_ops is a "struct security_operations" which is used for
33988 * registering TOMOYO.
33989 @@ -59298,9 +59503,9 @@ diff -urNp linux-2.6.37.3/security/tomoyo/tomoyo.c linux-2.6.37.3/security/tomoy
33990 .name = "tomoyo",
33991 .cred_alloc_blank = tomoyo_cred_alloc_blank,
33992 .cred_prepare = tomoyo_cred_prepare,
33993 -diff -urNp linux-2.6.37.3/sound/aoa/codecs/onyx.c linux-2.6.37.3/sound/aoa/codecs/onyx.c
33994 ---- linux-2.6.37.3/sound/aoa/codecs/onyx.c 2011-01-04 19:50:19.000000000 -0500
33995 -+++ linux-2.6.37.3/sound/aoa/codecs/onyx.c 2011-01-24 18:04:18.000000000 -0500
33996 +diff -urNp linux-2.6.37.4/sound/aoa/codecs/onyx.c linux-2.6.37.4/sound/aoa/codecs/onyx.c
33997 +--- linux-2.6.37.4/sound/aoa/codecs/onyx.c 2011-01-04 19:50:19.000000000 -0500
33998 ++++ linux-2.6.37.4/sound/aoa/codecs/onyx.c 2011-01-24 18:04:18.000000000 -0500
33999 @@ -54,7 +54,7 @@ struct onyx {
34000 spdif_locked:1,
34001 analog_locked:1,
34002 @@ -59329,9 +59534,9 @@ diff -urNp linux-2.6.37.3/sound/aoa/codecs/onyx.c linux-2.6.37.3/sound/aoa/codec
34003 onyx->spdif_locked = onyx->analog_locked = 0;
34004 mutex_unlock(&onyx->mutex);
34005
34006 -diff -urNp linux-2.6.37.3/sound/aoa/codecs/onyx.h linux-2.6.37.3/sound/aoa/codecs/onyx.h
34007 ---- linux-2.6.37.3/sound/aoa/codecs/onyx.h 2011-01-04 19:50:19.000000000 -0500
34008 -+++ linux-2.6.37.3/sound/aoa/codecs/onyx.h 2011-01-25 20:24:56.000000000 -0500
34009 +diff -urNp linux-2.6.37.4/sound/aoa/codecs/onyx.h linux-2.6.37.4/sound/aoa/codecs/onyx.h
34010 +--- linux-2.6.37.4/sound/aoa/codecs/onyx.h 2011-01-04 19:50:19.000000000 -0500
34011 ++++ linux-2.6.37.4/sound/aoa/codecs/onyx.h 2011-01-25 20:24:56.000000000 -0500
34012 @@ -11,6 +11,7 @@
34013 #include <linux/i2c.h>
34014 #include <asm/pmac_low_i2c.h>
34015 @@ -59340,9 +59545,9 @@ diff -urNp linux-2.6.37.3/sound/aoa/codecs/onyx.h linux-2.6.37.3/sound/aoa/codec
34016
34017 /* PCM3052 register definitions */
34018
34019 -diff -urNp linux-2.6.37.3/sound/core/oss/pcm_oss.c linux-2.6.37.3/sound/core/oss/pcm_oss.c
34020 ---- linux-2.6.37.3/sound/core/oss/pcm_oss.c 2011-01-04 19:50:19.000000000 -0500
34021 -+++ linux-2.6.37.3/sound/core/oss/pcm_oss.c 2011-01-17 02:41:02.000000000 -0500
34022 +diff -urNp linux-2.6.37.4/sound/core/oss/pcm_oss.c linux-2.6.37.4/sound/core/oss/pcm_oss.c
34023 +--- linux-2.6.37.4/sound/core/oss/pcm_oss.c 2011-01-04 19:50:19.000000000 -0500
34024 ++++ linux-2.6.37.4/sound/core/oss/pcm_oss.c 2011-01-17 02:41:02.000000000 -0500
34025 @@ -2969,8 +2969,8 @@ static void snd_pcm_oss_proc_done(struct
34026 }
34027 }
34028 @@ -59354,9 +59559,9 @@ diff -urNp linux-2.6.37.3/sound/core/oss/pcm_oss.c linux-2.6.37.3/sound/core/oss
34029 #endif /* CONFIG_SND_VERBOSE_PROCFS */
34030
34031 /*
34032 -diff -urNp linux-2.6.37.3/sound/core/seq/seq_lock.h linux-2.6.37.3/sound/core/seq/seq_lock.h
34033 ---- linux-2.6.37.3/sound/core/seq/seq_lock.h 2011-01-04 19:50:19.000000000 -0500
34034 -+++ linux-2.6.37.3/sound/core/seq/seq_lock.h 2011-01-17 02:41:02.000000000 -0500
34035 +diff -urNp linux-2.6.37.4/sound/core/seq/seq_lock.h linux-2.6.37.4/sound/core/seq/seq_lock.h
34036 +--- linux-2.6.37.4/sound/core/seq/seq_lock.h 2011-01-04 19:50:19.000000000 -0500
34037 ++++ linux-2.6.37.4/sound/core/seq/seq_lock.h 2011-01-17 02:41:02.000000000 -0500
34038 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
34039 #else /* SMP || CONFIG_SND_DEBUG */
34040
34041 @@ -59372,9 +59577,9 @@ diff -urNp linux-2.6.37.3/sound/core/seq/seq_lock.h linux-2.6.37.3/sound/core/se
34042
34043 #endif /* SMP || CONFIG_SND_DEBUG */
34044
34045 -diff -urNp linux-2.6.37.3/sound/drivers/mts64.c linux-2.6.37.3/sound/drivers/mts64.c
34046 ---- linux-2.6.37.3/sound/drivers/mts64.c 2011-01-04 19:50:19.000000000 -0500
34047 -+++ linux-2.6.37.3/sound/drivers/mts64.c 2011-01-25 22:35:55.000000000 -0500
34048 +diff -urNp linux-2.6.37.4/sound/drivers/mts64.c linux-2.6.37.4/sound/drivers/mts64.c
34049 +--- linux-2.6.37.4/sound/drivers/mts64.c 2011-01-04 19:50:19.000000000 -0500
34050 ++++ linux-2.6.37.4/sound/drivers/mts64.c 2011-01-25 22:35:55.000000000 -0500
34051 @@ -28,6 +28,7 @@
34052 #include <sound/initval.h>
34053 #include <sound/rawmidi.h>
34054 @@ -59431,9 +59636,9 @@ diff -urNp linux-2.6.37.3/sound/drivers/mts64.c linux-2.6.37.3/sound/drivers/mts
34055
34056 return 0;
34057 }
34058 -diff -urNp linux-2.6.37.3/sound/drivers/portman2x4.c linux-2.6.37.3/sound/drivers/portman2x4.c
34059 ---- linux-2.6.37.3/sound/drivers/portman2x4.c 2011-01-04 19:50:19.000000000 -0500
34060 -+++ linux-2.6.37.3/sound/drivers/portman2x4.c 2011-01-25 20:24:56.000000000 -0500
34061 +diff -urNp linux-2.6.37.4/sound/drivers/portman2x4.c linux-2.6.37.4/sound/drivers/portman2x4.c
34062 +--- linux-2.6.37.4/sound/drivers/portman2x4.c 2011-01-04 19:50:19.000000000 -0500
34063 ++++ linux-2.6.37.4/sound/drivers/portman2x4.c 2011-01-25 20:24:56.000000000 -0500
34064 @@ -47,6 +47,7 @@
34065 #include <sound/initval.h>
34066 #include <sound/rawmidi.h>
34067 @@ -59451,9 +59656,9 @@ diff -urNp linux-2.6.37.3/sound/drivers/portman2x4.c linux-2.6.37.3/sound/driver
34068 int mode[PORTMAN_NUM_INPUT_PORTS];
34069 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
34070 };
34071 -diff -urNp linux-2.6.37.3/sound/oss/sb_audio.c linux-2.6.37.3/sound/oss/sb_audio.c
34072 ---- linux-2.6.37.3/sound/oss/sb_audio.c 2011-01-04 19:50:19.000000000 -0500
34073 -+++ linux-2.6.37.3/sound/oss/sb_audio.c 2011-01-17 02:41:02.000000000 -0500
34074 +diff -urNp linux-2.6.37.4/sound/oss/sb_audio.c linux-2.6.37.4/sound/oss/sb_audio.c
34075 +--- linux-2.6.37.4/sound/oss/sb_audio.c 2011-01-04 19:50:19.000000000 -0500
34076 ++++ linux-2.6.37.4/sound/oss/sb_audio.c 2011-01-17 02:41:02.000000000 -0500
34077 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
34078 buf16 = (signed short *)(localbuf + localoffs);
34079 while (c)
34080 @@ -59463,9 +59668,9 @@ diff -urNp linux-2.6.37.3/sound/oss/sb_audio.c linux-2.6.37.3/sound/oss/sb_audio
34081 if (copy_from_user(lbuf8,
34082 userbuf+useroffs + p,
34083 locallen))
34084 -diff -urNp linux-2.6.37.3/sound/oss/swarm_cs4297a.c linux-2.6.37.3/sound/oss/swarm_cs4297a.c
34085 ---- linux-2.6.37.3/sound/oss/swarm_cs4297a.c 2011-01-04 19:50:19.000000000 -0500
34086 -+++ linux-2.6.37.3/sound/oss/swarm_cs4297a.c 2011-01-17 02:41:02.000000000 -0500
34087 +diff -urNp linux-2.6.37.4/sound/oss/swarm_cs4297a.c linux-2.6.37.4/sound/oss/swarm_cs4297a.c
34088 +--- linux-2.6.37.4/sound/oss/swarm_cs4297a.c 2011-01-04 19:50:19.000000000 -0500
34089 ++++ linux-2.6.37.4/sound/oss/swarm_cs4297a.c 2011-01-17 02:41:02.000000000 -0500
34090 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
34091 {
34092 struct cs4297a_state *s;
34093 @@ -59500,9 +59705,9 @@ diff -urNp linux-2.6.37.3/sound/oss/swarm_cs4297a.c linux-2.6.37.3/sound/oss/swa
34094
34095 list_add(&s->list, &cs4297a_devs);
34096
34097 -diff -urNp linux-2.6.37.3/sound/pci/ac97/ac97_codec.c linux-2.6.37.3/sound/pci/ac97/ac97_codec.c
34098 ---- linux-2.6.37.3/sound/pci/ac97/ac97_codec.c 2011-01-04 19:50:19.000000000 -0500
34099 -+++ linux-2.6.37.3/sound/pci/ac97/ac97_codec.c 2011-01-17 02:41:02.000000000 -0500
34100 +diff -urNp linux-2.6.37.4/sound/pci/ac97/ac97_codec.c linux-2.6.37.4/sound/pci/ac97/ac97_codec.c
34101 +--- linux-2.6.37.4/sound/pci/ac97/ac97_codec.c 2011-01-04 19:50:19.000000000 -0500
34102 ++++ linux-2.6.37.4/sound/pci/ac97/ac97_codec.c 2011-01-17 02:41:02.000000000 -0500
34103 @@ -1962,7 +1962,7 @@ static int snd_ac97_dev_disconnect(struc
34104 }
34105
34106 @@ -59512,9 +59717,9 @@ diff -urNp linux-2.6.37.3/sound/pci/ac97/ac97_codec.c linux-2.6.37.3/sound/pci/a
34107
34108 #ifdef CONFIG_SND_AC97_POWER_SAVE
34109 static void do_update_power(struct work_struct *work)
34110 -diff -urNp linux-2.6.37.3/sound/pci/ac97/ac97_patch.c linux-2.6.37.3/sound/pci/ac97/ac97_patch.c
34111 ---- linux-2.6.37.3/sound/pci/ac97/ac97_patch.c 2011-01-04 19:50:19.000000000 -0500
34112 -+++ linux-2.6.37.3/sound/pci/ac97/ac97_patch.c 2011-01-17 02:41:02.000000000 -0500
34113 +diff -urNp linux-2.6.37.4/sound/pci/ac97/ac97_patch.c linux-2.6.37.4/sound/pci/ac97/ac97_patch.c
34114 +--- linux-2.6.37.4/sound/pci/ac97/ac97_patch.c 2011-01-04 19:50:19.000000000 -0500
34115 ++++ linux-2.6.37.4/sound/pci/ac97/ac97_patch.c 2011-01-17 02:41:02.000000000 -0500
34116 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
34117 return 0;
34118 }
34119 @@ -59812,9 +60017,9 @@ diff -urNp linux-2.6.37.3/sound/pci/ac97/ac97_patch.c linux-2.6.37.3/sound/pci/a
34120 .build_specific = patch_ucb1400_specific,
34121 };
34122
34123 -diff -urNp linux-2.6.37.3/sound/pci/ens1370.c linux-2.6.37.3/sound/pci/ens1370.c
34124 ---- linux-2.6.37.3/sound/pci/ens1370.c 2011-01-04 19:50:19.000000000 -0500
34125 -+++ linux-2.6.37.3/sound/pci/ens1370.c 2011-01-17 02:41:02.000000000 -0500
34126 +diff -urNp linux-2.6.37.4/sound/pci/ens1370.c linux-2.6.37.4/sound/pci/ens1370.c
34127 +--- linux-2.6.37.4/sound/pci/ens1370.c 2011-01-04 19:50:19.000000000 -0500
34128 ++++ linux-2.6.37.4/sound/pci/ens1370.c 2011-01-17 02:41:02.000000000 -0500
34129 @@ -452,7 +452,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio
34130 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
34131 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
34132 @@ -59824,9 +60029,9 @@ diff -urNp linux-2.6.37.3/sound/pci/ens1370.c linux-2.6.37.3/sound/pci/ens1370.c
34133 };
34134
34135 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
34136 -diff -urNp linux-2.6.37.3/sound/pci/hda/patch_hdmi.c linux-2.6.37.3/sound/pci/hda/patch_hdmi.c
34137 ---- linux-2.6.37.3/sound/pci/hda/patch_hdmi.c 2011-02-22 16:05:31.000000000 -0500
34138 -+++ linux-2.6.37.3/sound/pci/hda/patch_hdmi.c 2011-02-22 16:05:49.000000000 -0500
34139 +diff -urNp linux-2.6.37.4/sound/pci/hda/patch_hdmi.c linux-2.6.37.4/sound/pci/hda/patch_hdmi.c
34140 +--- linux-2.6.37.4/sound/pci/hda/patch_hdmi.c 2011-02-22 16:05:31.000000000 -0500
34141 ++++ linux-2.6.37.4/sound/pci/hda/patch_hdmi.c 2011-02-22 16:05:49.000000000 -0500
34142 @@ -733,10 +733,10 @@ static void hdmi_non_intrinsic_event(str
34143 cp_ready);
34144
34145 @@ -59842,9 +60047,9 @@ diff -urNp linux-2.6.37.3/sound/pci/hda/patch_hdmi.c linux-2.6.37.3/sound/pci/hd
34146 }
34147
34148
34149 -diff -urNp linux-2.6.37.3/sound/pci/intel8x0.c linux-2.6.37.3/sound/pci/intel8x0.c
34150 ---- linux-2.6.37.3/sound/pci/intel8x0.c 2011-01-04 19:50:19.000000000 -0500
34151 -+++ linux-2.6.37.3/sound/pci/intel8x0.c 2011-01-17 02:41:02.000000000 -0500
34152 +diff -urNp linux-2.6.37.4/sound/pci/intel8x0.c linux-2.6.37.4/sound/pci/intel8x0.c
34153 +--- linux-2.6.37.4/sound/pci/intel8x0.c 2011-01-04 19:50:19.000000000 -0500
34154 ++++ linux-2.6.37.4/sound/pci/intel8x0.c 2011-01-17 02:41:02.000000000 -0500
34155 @@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
34156 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
34157 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
34158 @@ -59863,9 +60068,9 @@ diff -urNp linux-2.6.37.3/sound/pci/intel8x0.c linux-2.6.37.3/sound/pci/intel8x0
34159 };
34160
34161 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
34162 -diff -urNp linux-2.6.37.3/sound/pci/intel8x0m.c linux-2.6.37.3/sound/pci/intel8x0m.c
34163 ---- linux-2.6.37.3/sound/pci/intel8x0m.c 2011-01-04 19:50:19.000000000 -0500
34164 -+++ linux-2.6.37.3/sound/pci/intel8x0m.c 2011-01-17 02:41:02.000000000 -0500
34165 +diff -urNp linux-2.6.37.4/sound/pci/intel8x0m.c linux-2.6.37.4/sound/pci/intel8x0m.c
34166 +--- linux-2.6.37.4/sound/pci/intel8x0m.c 2011-01-04 19:50:19.000000000 -0500
34167 ++++ linux-2.6.37.4/sound/pci/intel8x0m.c 2011-01-17 02:41:02.000000000 -0500
34168 @@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
34169 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
34170 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
34171 @@ -59884,9 +60089,9 @@ diff -urNp linux-2.6.37.3/sound/pci/intel8x0m.c linux-2.6.37.3/sound/pci/intel8x
34172 };
34173
34174 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
34175 -diff -urNp linux-2.6.37.3/usr/gen_init_cpio.c linux-2.6.37.3/usr/gen_init_cpio.c
34176 ---- linux-2.6.37.3/usr/gen_init_cpio.c 2011-01-04 19:50:19.000000000 -0500
34177 -+++ linux-2.6.37.3/usr/gen_init_cpio.c 2011-01-17 02:41:02.000000000 -0500
34178 +diff -urNp linux-2.6.37.4/usr/gen_init_cpio.c linux-2.6.37.4/usr/gen_init_cpio.c
34179 +--- linux-2.6.37.4/usr/gen_init_cpio.c 2011-01-04 19:50:19.000000000 -0500
34180 ++++ linux-2.6.37.4/usr/gen_init_cpio.c 2011-01-17 02:41:02.000000000 -0500
34181 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
34182 int retval;
34183 int rc = -1;
34184 @@ -59909,9 +60114,9 @@ diff -urNp linux-2.6.37.3/usr/gen_init_cpio.c linux-2.6.37.3/usr/gen_init_cpio.c
34185 } else
34186 break;
34187 }
34188 -diff -urNp linux-2.6.37.3/virt/kvm/kvm_main.c linux-2.6.37.3/virt/kvm/kvm_main.c
34189 ---- linux-2.6.37.3/virt/kvm/kvm_main.c 2011-01-04 19:50:19.000000000 -0500
34190 -+++ linux-2.6.37.3/virt/kvm/kvm_main.c 2011-01-17 02:41:02.000000000 -0500
34191 +diff -urNp linux-2.6.37.4/virt/kvm/kvm_main.c linux-2.6.37.4/virt/kvm/kvm_main.c
34192 +--- linux-2.6.37.4/virt/kvm/kvm_main.c 2011-01-04 19:50:19.000000000 -0500
34193 ++++ linux-2.6.37.4/virt/kvm/kvm_main.c 2011-01-17 02:41:02.000000000 -0500
34194 @@ -1344,6 +1344,7 @@ static int kvm_vcpu_release(struct inode
34195 return 0;
34196 }
Report Message
Find on MARC Find on Google Groups