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: Sat, 26 Feb 2011 02:20:37
Message-Id: dc93dcb4dcc11a6b0f5677d418811d95e6ca7f75.blueness@gentoo
1 commit: dc93dcb4dcc11a6b0f5677d418811d95e6ca7f75
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 26 02:17:25 2011 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 26 02:17:25 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=dc93dcb4
7
8 Update Grsec/PaX
9 2.2.1-2.6.32.29-201102221638
10 2.2.1-2.6.37.1-201102221638
11
12 ---
13 2.6.32/0000_README | 2 +-
14 ..._grsecurity-2.2.1-2.6.32.29-201102221638.patch} | 7771 ++++++++++----------
15 2.6.32/4445_disable-compat_vdso.patch | 2 +-
16 2.6.37/0000_README | 2 +-
17 ...0_grsecurity-2.2.1-2.6.37.1-201102221638.patch} | 7359 ++++++++++---------
18 5 files changed, 7699 insertions(+), 7437 deletions(-)
19
20 diff --git a/2.6.32/0000_README b/2.6.32/0000_README
21 index 84ae47c..c8824fb 100644
22 --- a/2.6.32/0000_README
23 +++ b/2.6.32/0000_README
24 @@ -3,7 +3,7 @@ README
25
26 Individual Patch Descriptions:
27 -----------------------------------------------------------------------------
28 -Patch: 4420_grsecurity-2.2.1-2.6.32.28-201102151944.patch
29 +Patch: 4420_grsecurity-2.2.1-2.6.32.29-201102221638.patch
30 From: http://www.grsecurity.net
31 Desc: hardened-sources base patch from upstream grsecurity
32
33
34 diff --git a/2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201102151944.patch b/2.6.32/4420_grsecurity-2.2.1-2.6.32.29-201102221638.patch
35 similarity index 86%
36 rename from 2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201102151944.patch
37 rename to 2.6.32/4420_grsecurity-2.2.1-2.6.32.29-201102221638.patch
38 index 2d18d43..b491451 100644
39 --- a/2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201102151944.patch
40 +++ b/2.6.32/4420_grsecurity-2.2.1-2.6.32.29-201102221638.patch
41 @@ -1,6 +1,6 @@
42 -diff -urNp linux-2.6.32.28/arch/alpha/include/asm/elf.h linux-2.6.32.28/arch/alpha/include/asm/elf.h
43 ---- linux-2.6.32.28/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
44 -+++ linux-2.6.32.28/arch/alpha/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
45 +diff -urNp linux-2.6.32.29/arch/alpha/include/asm/elf.h linux-2.6.32.29/arch/alpha/include/asm/elf.h
46 +--- linux-2.6.32.29/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
47 ++++ linux-2.6.32.29/arch/alpha/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
48 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
49
50 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
51 @@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.28/arch/alpha/include/asm/elf.h linux-2.6.32.28/arch/alp
52 /* $0 is set by ld.so to a pointer to a function which might be
53 registered using atexit. This provides a mean for the dynamic
54 linker to call DT_FINI functions for shared libraries that have
55 -diff -urNp linux-2.6.32.28/arch/alpha/include/asm/pgtable.h linux-2.6.32.28/arch/alpha/include/asm/pgtable.h
56 ---- linux-2.6.32.28/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
57 -+++ linux-2.6.32.28/arch/alpha/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
58 +diff -urNp linux-2.6.32.29/arch/alpha/include/asm/pgtable.h linux-2.6.32.29/arch/alpha/include/asm/pgtable.h
59 +--- linux-2.6.32.29/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
60 ++++ linux-2.6.32.29/arch/alpha/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
61 @@ -101,6 +101,17 @@ struct vm_area_struct;
62 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
63 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
64 @@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.28/arch/alpha/include/asm/pgtable.h linux-2.6.32.28/arch
65 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
66
67 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
68 -diff -urNp linux-2.6.32.28/arch/alpha/kernel/module.c linux-2.6.32.28/arch/alpha/kernel/module.c
69 ---- linux-2.6.32.28/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
70 -+++ linux-2.6.32.28/arch/alpha/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
71 +diff -urNp linux-2.6.32.29/arch/alpha/kernel/module.c linux-2.6.32.29/arch/alpha/kernel/module.c
72 +--- linux-2.6.32.29/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
73 ++++ linux-2.6.32.29/arch/alpha/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
74 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
75
76 /* The small sections were sorted to the end of the segment.
77 @@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.28/arch/alpha/kernel/module.c linux-2.6.32.28/arch/alpha
78 got = sechdrs[me->arch.gotsecindex].sh_addr;
79
80 for (i = 0; i < n; i++) {
81 -diff -urNp linux-2.6.32.28/arch/alpha/kernel/osf_sys.c linux-2.6.32.28/arch/alpha/kernel/osf_sys.c
82 ---- linux-2.6.32.28/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
83 -+++ linux-2.6.32.28/arch/alpha/kernel/osf_sys.c 2010-12-31 14:46:53.000000000 -0500
84 +diff -urNp linux-2.6.32.29/arch/alpha/kernel/osf_sys.c linux-2.6.32.29/arch/alpha/kernel/osf_sys.c
85 +--- linux-2.6.32.29/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
86 ++++ linux-2.6.32.29/arch/alpha/kernel/osf_sys.c 2010-12-31 14:46:53.000000000 -0500
87 @@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a
88 /* At this point: (!vma || addr < vma->vm_end). */
89 if (limit - len < addr)
90 @@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.28/arch/alpha/kernel/osf_sys.c linux-2.6.32.28/arch/alph
91 if (addr != (unsigned long) -ENOMEM)
92 return addr;
93
94 -diff -urNp linux-2.6.32.28/arch/alpha/mm/fault.c linux-2.6.32.28/arch/alpha/mm/fault.c
95 ---- linux-2.6.32.28/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
96 -+++ linux-2.6.32.28/arch/alpha/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
97 +diff -urNp linux-2.6.32.29/arch/alpha/mm/fault.c linux-2.6.32.29/arch/alpha/mm/fault.c
98 +--- linux-2.6.32.29/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
99 ++++ linux-2.6.32.29/arch/alpha/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
100 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
101 __reload_thread(pcb);
102 }
103 @@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.28/arch/alpha/mm/fault.c linux-2.6.32.28/arch/alpha/mm/f
104 } else if (!cause) {
105 /* Allow reads even for write-only mappings */
106 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
107 -diff -urNp linux-2.6.32.28/arch/arm/include/asm/elf.h linux-2.6.32.28/arch/arm/include/asm/elf.h
108 ---- linux-2.6.32.28/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
109 -+++ linux-2.6.32.28/arch/arm/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
110 +diff -urNp linux-2.6.32.29/arch/arm/include/asm/elf.h linux-2.6.32.29/arch/arm/include/asm/elf.h
111 +--- linux-2.6.32.29/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
112 ++++ linux-2.6.32.29/arch/arm/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
113 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
114 the loader. We need to make sure that it is out of the way of the program
115 that it will "exec", and that there is sufficient room for the brk. */
116 @@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.28/arch/arm/include/asm/elf.h linux-2.6.32.28/arch/arm/i
117
118 /* When the program starts, a1 contains a pointer to a function to be
119 registered with atexit, as per the SVR4 ABI. A value of 0 means we
120 -diff -urNp linux-2.6.32.28/arch/arm/include/asm/kmap_types.h linux-2.6.32.28/arch/arm/include/asm/kmap_types.h
121 ---- linux-2.6.32.28/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
122 -+++ linux-2.6.32.28/arch/arm/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
123 +diff -urNp linux-2.6.32.29/arch/arm/include/asm/kmap_types.h linux-2.6.32.29/arch/arm/include/asm/kmap_types.h
124 +--- linux-2.6.32.29/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
125 ++++ linux-2.6.32.29/arch/arm/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
126 @@ -19,6 +19,7 @@ enum km_type {
127 KM_SOFTIRQ0,
128 KM_SOFTIRQ1,
129 @@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.28/arch/arm/include/asm/kmap_types.h linux-2.6.32.28/arc
130 KM_TYPE_NR
131 };
132
133 -diff -urNp linux-2.6.32.28/arch/arm/include/asm/uaccess.h linux-2.6.32.28/arch/arm/include/asm/uaccess.h
134 ---- linux-2.6.32.28/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
135 -+++ linux-2.6.32.28/arch/arm/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
136 +diff -urNp linux-2.6.32.29/arch/arm/include/asm/uaccess.h linux-2.6.32.29/arch/arm/include/asm/uaccess.h
137 +--- linux-2.6.32.29/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
138 ++++ linux-2.6.32.29/arch/arm/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
139 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
140
141 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
142 @@ -294,9 +294,9 @@ diff -urNp linux-2.6.32.28/arch/arm/include/asm/uaccess.h linux-2.6.32.28/arch/a
143 if (access_ok(VERIFY_WRITE, to, n))
144 n = __copy_to_user(to, from, n);
145 return n;
146 -diff -urNp linux-2.6.32.28/arch/arm/kernel/kgdb.c linux-2.6.32.28/arch/arm/kernel/kgdb.c
147 ---- linux-2.6.32.28/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
148 -+++ linux-2.6.32.28/arch/arm/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
149 +diff -urNp linux-2.6.32.29/arch/arm/kernel/kgdb.c linux-2.6.32.29/arch/arm/kernel/kgdb.c
150 +--- linux-2.6.32.29/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
151 ++++ linux-2.6.32.29/arch/arm/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
152 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
153 * and we handle the normal undef case within the do_undefinstr
154 * handler.
155 @@ -306,9 +306,9 @@ diff -urNp linux-2.6.32.28/arch/arm/kernel/kgdb.c linux-2.6.32.28/arch/arm/kerne
156 #ifndef __ARMEB__
157 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
158 #else /* ! __ARMEB__ */
159 -diff -urNp linux-2.6.32.28/arch/arm/mach-at91/pm.c linux-2.6.32.28/arch/arm/mach-at91/pm.c
160 ---- linux-2.6.32.28/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
161 -+++ linux-2.6.32.28/arch/arm/mach-at91/pm.c 2010-12-31 14:46:53.000000000 -0500
162 +diff -urNp linux-2.6.32.29/arch/arm/mach-at91/pm.c linux-2.6.32.29/arch/arm/mach-at91/pm.c
163 +--- linux-2.6.32.29/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
164 ++++ linux-2.6.32.29/arch/arm/mach-at91/pm.c 2010-12-31 14:46:53.000000000 -0500
165 @@ -348,7 +348,7 @@ static void at91_pm_end(void)
166 }
167
168 @@ -318,9 +318,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-at91/pm.c linux-2.6.32.28/arch/arm/mach
169 .valid = at91_pm_valid_state,
170 .begin = at91_pm_begin,
171 .enter = at91_pm_enter,
172 -diff -urNp linux-2.6.32.28/arch/arm/mach-omap1/pm.c linux-2.6.32.28/arch/arm/mach-omap1/pm.c
173 ---- linux-2.6.32.28/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
174 -+++ linux-2.6.32.28/arch/arm/mach-omap1/pm.c 2010-12-31 14:46:53.000000000 -0500
175 +diff -urNp linux-2.6.32.29/arch/arm/mach-omap1/pm.c linux-2.6.32.29/arch/arm/mach-omap1/pm.c
176 +--- linux-2.6.32.29/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
177 ++++ linux-2.6.32.29/arch/arm/mach-omap1/pm.c 2010-12-31 14:46:53.000000000 -0500
178 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
179
180
181 @@ -330,9 +330,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-omap1/pm.c linux-2.6.32.28/arch/arm/mac
182 .prepare = omap_pm_prepare,
183 .enter = omap_pm_enter,
184 .finish = omap_pm_finish,
185 -diff -urNp linux-2.6.32.28/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.28/arch/arm/mach-omap2/pm24xx.c
186 ---- linux-2.6.32.28/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
187 -+++ linux-2.6.32.28/arch/arm/mach-omap2/pm24xx.c 2010-12-31 14:46:53.000000000 -0500
188 +diff -urNp linux-2.6.32.29/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.29/arch/arm/mach-omap2/pm24xx.c
189 +--- linux-2.6.32.29/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
190 ++++ linux-2.6.32.29/arch/arm/mach-omap2/pm24xx.c 2010-12-31 14:46:53.000000000 -0500
191 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
192 enable_hlt();
193 }
194 @@ -342,9 +342,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.28/arch/arm
195 .prepare = omap2_pm_prepare,
196 .enter = omap2_pm_enter,
197 .finish = omap2_pm_finish,
198 -diff -urNp linux-2.6.32.28/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.28/arch/arm/mach-omap2/pm34xx.c
199 ---- linux-2.6.32.28/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
200 -+++ linux-2.6.32.28/arch/arm/mach-omap2/pm34xx.c 2010-12-31 14:46:53.000000000 -0500
201 +diff -urNp linux-2.6.32.29/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.29/arch/arm/mach-omap2/pm34xx.c
202 +--- linux-2.6.32.29/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
203 ++++ linux-2.6.32.29/arch/arm/mach-omap2/pm34xx.c 2010-12-31 14:46:53.000000000 -0500
204 @@ -401,7 +401,7 @@ static void omap3_pm_end(void)
205 return;
206 }
207 @@ -354,9 +354,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.28/arch/arm
208 .begin = omap3_pm_begin,
209 .end = omap3_pm_end,
210 .prepare = omap3_pm_prepare,
211 -diff -urNp linux-2.6.32.28/arch/arm/mach-pnx4008/pm.c linux-2.6.32.28/arch/arm/mach-pnx4008/pm.c
212 ---- linux-2.6.32.28/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
213 -+++ linux-2.6.32.28/arch/arm/mach-pnx4008/pm.c 2010-12-31 14:46:53.000000000 -0500
214 +diff -urNp linux-2.6.32.29/arch/arm/mach-pnx4008/pm.c linux-2.6.32.29/arch/arm/mach-pnx4008/pm.c
215 +--- linux-2.6.32.29/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
216 ++++ linux-2.6.32.29/arch/arm/mach-pnx4008/pm.c 2010-12-31 14:46:53.000000000 -0500
217 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
218 (state == PM_SUSPEND_MEM);
219 }
220 @@ -366,9 +366,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-pnx4008/pm.c linux-2.6.32.28/arch/arm/m
221 .enter = pnx4008_pm_enter,
222 .valid = pnx4008_pm_valid,
223 };
224 -diff -urNp linux-2.6.32.28/arch/arm/mach-pxa/pm.c linux-2.6.32.28/arch/arm/mach-pxa/pm.c
225 ---- linux-2.6.32.28/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
226 -+++ linux-2.6.32.28/arch/arm/mach-pxa/pm.c 2010-12-31 14:46:53.000000000 -0500
227 +diff -urNp linux-2.6.32.29/arch/arm/mach-pxa/pm.c linux-2.6.32.29/arch/arm/mach-pxa/pm.c
228 +--- linux-2.6.32.29/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
229 ++++ linux-2.6.32.29/arch/arm/mach-pxa/pm.c 2010-12-31 14:46:53.000000000 -0500
230 @@ -95,7 +95,7 @@ void pxa_pm_finish(void)
231 pxa_cpu_pm_fns->finish();
232 }
233 @@ -378,9 +378,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-pxa/pm.c linux-2.6.32.28/arch/arm/mach-
234 .valid = pxa_pm_valid,
235 .enter = pxa_pm_enter,
236 .prepare = pxa_pm_prepare,
237 -diff -urNp linux-2.6.32.28/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.28/arch/arm/mach-pxa/sharpsl_pm.c
238 ---- linux-2.6.32.28/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
239 -+++ linux-2.6.32.28/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-31 14:46:53.000000000 -0500
240 +diff -urNp linux-2.6.32.29/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.29/arch/arm/mach-pxa/sharpsl_pm.c
241 +--- linux-2.6.32.29/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
242 ++++ linux-2.6.32.29/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-31 14:46:53.000000000 -0500
243 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
244 }
245
246 @@ -390,9 +390,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.28/arch/a
247 .prepare = pxa_pm_prepare,
248 .finish = pxa_pm_finish,
249 .enter = corgi_pxa_pm_enter,
250 -diff -urNp linux-2.6.32.28/arch/arm/mach-sa1100/pm.c linux-2.6.32.28/arch/arm/mach-sa1100/pm.c
251 ---- linux-2.6.32.28/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
252 -+++ linux-2.6.32.28/arch/arm/mach-sa1100/pm.c 2010-12-31 14:46:53.000000000 -0500
253 +diff -urNp linux-2.6.32.29/arch/arm/mach-sa1100/pm.c linux-2.6.32.29/arch/arm/mach-sa1100/pm.c
254 +--- linux-2.6.32.29/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
255 ++++ linux-2.6.32.29/arch/arm/mach-sa1100/pm.c 2010-12-31 14:46:53.000000000 -0500
256 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
257 return virt_to_phys(sp);
258 }
259 @@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mach-sa1100/pm.c linux-2.6.32.28/arch/arm/ma
260 .enter = sa11x0_pm_enter,
261 .valid = suspend_valid_only_mem,
262 };
263 -diff -urNp linux-2.6.32.28/arch/arm/mm/fault.c linux-2.6.32.28/arch/arm/mm/fault.c
264 ---- linux-2.6.32.28/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
265 -+++ linux-2.6.32.28/arch/arm/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
266 +diff -urNp linux-2.6.32.29/arch/arm/mm/fault.c linux-2.6.32.29/arch/arm/mm/fault.c
267 +--- linux-2.6.32.29/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
268 ++++ linux-2.6.32.29/arch/arm/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
269 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
270 }
271 #endif
272 @@ -453,9 +453,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mm/fault.c linux-2.6.32.28/arch/arm/mm/fault
273 /*
274 * First Level Translation Fault Handler
275 *
276 -diff -urNp linux-2.6.32.28/arch/arm/mm/mmap.c linux-2.6.32.28/arch/arm/mm/mmap.c
277 ---- linux-2.6.32.28/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
278 -+++ linux-2.6.32.28/arch/arm/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
279 +diff -urNp linux-2.6.32.29/arch/arm/mm/mmap.c linux-2.6.32.29/arch/arm/mm/mmap.c
280 +--- linux-2.6.32.29/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
281 ++++ linux-2.6.32.29/arch/arm/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
282 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
283 if (len > TASK_SIZE)
284 return -ENOMEM;
285 @@ -505,9 +505,9 @@ diff -urNp linux-2.6.32.28/arch/arm/mm/mmap.c linux-2.6.32.28/arch/arm/mm/mmap.c
286 /*
287 * Remember the place where we stopped the search:
288 */
289 -diff -urNp linux-2.6.32.28/arch/arm/plat-s3c/pm.c linux-2.6.32.28/arch/arm/plat-s3c/pm.c
290 ---- linux-2.6.32.28/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
291 -+++ linux-2.6.32.28/arch/arm/plat-s3c/pm.c 2010-12-31 14:46:53.000000000 -0500
292 +diff -urNp linux-2.6.32.29/arch/arm/plat-s3c/pm.c linux-2.6.32.29/arch/arm/plat-s3c/pm.c
293 +--- linux-2.6.32.29/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
294 ++++ linux-2.6.32.29/arch/arm/plat-s3c/pm.c 2010-12-31 14:46:53.000000000 -0500
295 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
296 s3c_pm_check_cleanup();
297 }
298 @@ -517,9 +517,9 @@ diff -urNp linux-2.6.32.28/arch/arm/plat-s3c/pm.c linux-2.6.32.28/arch/arm/plat-
299 .enter = s3c_pm_enter,
300 .prepare = s3c_pm_prepare,
301 .finish = s3c_pm_finish,
302 -diff -urNp linux-2.6.32.28/arch/avr32/include/asm/elf.h linux-2.6.32.28/arch/avr32/include/asm/elf.h
303 ---- linux-2.6.32.28/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
304 -+++ linux-2.6.32.28/arch/avr32/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
305 +diff -urNp linux-2.6.32.29/arch/avr32/include/asm/elf.h linux-2.6.32.29/arch/avr32/include/asm/elf.h
306 +--- linux-2.6.32.29/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
307 ++++ linux-2.6.32.29/arch/avr32/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
308 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
309 the loader. We need to make sure that it is out of the way of the program
310 that it will "exec", and that there is sufficient room for the brk. */
311 @@ -536,9 +536,9 @@ diff -urNp linux-2.6.32.28/arch/avr32/include/asm/elf.h linux-2.6.32.28/arch/avr
312
313 /* This yields a mask that user programs can use to figure out what
314 instruction set this CPU supports. This could be done in user space,
315 -diff -urNp linux-2.6.32.28/arch/avr32/include/asm/kmap_types.h linux-2.6.32.28/arch/avr32/include/asm/kmap_types.h
316 ---- linux-2.6.32.28/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
317 -+++ linux-2.6.32.28/arch/avr32/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
318 +diff -urNp linux-2.6.32.29/arch/avr32/include/asm/kmap_types.h linux-2.6.32.29/arch/avr32/include/asm/kmap_types.h
319 +--- linux-2.6.32.29/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
320 ++++ linux-2.6.32.29/arch/avr32/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
321 @@ -22,7 +22,8 @@ D(10) KM_IRQ0,
322 D(11) KM_IRQ1,
323 D(12) KM_SOFTIRQ0,
324 @@ -549,9 +549,9 @@ diff -urNp linux-2.6.32.28/arch/avr32/include/asm/kmap_types.h linux-2.6.32.28/a
325 };
326
327 #undef D
328 -diff -urNp linux-2.6.32.28/arch/avr32/mach-at32ap/pm.c linux-2.6.32.28/arch/avr32/mach-at32ap/pm.c
329 ---- linux-2.6.32.28/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
330 -+++ linux-2.6.32.28/arch/avr32/mach-at32ap/pm.c 2010-12-31 14:46:53.000000000 -0500
331 +diff -urNp linux-2.6.32.29/arch/avr32/mach-at32ap/pm.c linux-2.6.32.29/arch/avr32/mach-at32ap/pm.c
332 +--- linux-2.6.32.29/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
333 ++++ linux-2.6.32.29/arch/avr32/mach-at32ap/pm.c 2010-12-31 14:46:53.000000000 -0500
334 @@ -176,7 +176,7 @@ out:
335 return 0;
336 }
337 @@ -561,9 +561,9 @@ diff -urNp linux-2.6.32.28/arch/avr32/mach-at32ap/pm.c linux-2.6.32.28/arch/avr3
338 .valid = avr32_pm_valid_state,
339 .enter = avr32_pm_enter,
340 };
341 -diff -urNp linux-2.6.32.28/arch/avr32/mm/fault.c linux-2.6.32.28/arch/avr32/mm/fault.c
342 ---- linux-2.6.32.28/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
343 -+++ linux-2.6.32.28/arch/avr32/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
344 +diff -urNp linux-2.6.32.29/arch/avr32/mm/fault.c linux-2.6.32.29/arch/avr32/mm/fault.c
345 +--- linux-2.6.32.29/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
346 ++++ linux-2.6.32.29/arch/avr32/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
347 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
348
349 int exception_trace = 1;
350 @@ -605,9 +605,9 @@ diff -urNp linux-2.6.32.28/arch/avr32/mm/fault.c linux-2.6.32.28/arch/avr32/mm/f
351 if (exception_trace && printk_ratelimit())
352 printk("%s%s[%d]: segfault at %08lx pc %08lx "
353 "sp %08lx ecr %lu\n",
354 -diff -urNp linux-2.6.32.28/arch/blackfin/kernel/kgdb.c linux-2.6.32.28/arch/blackfin/kernel/kgdb.c
355 ---- linux-2.6.32.28/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
356 -+++ linux-2.6.32.28/arch/blackfin/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
357 +diff -urNp linux-2.6.32.29/arch/blackfin/kernel/kgdb.c linux-2.6.32.29/arch/blackfin/kernel/kgdb.c
358 +--- linux-2.6.32.29/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
359 ++++ linux-2.6.32.29/arch/blackfin/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
360 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
361 return -1; /* this means that we do not want to exit from the handler */
362 }
363 @@ -617,9 +617,9 @@ diff -urNp linux-2.6.32.28/arch/blackfin/kernel/kgdb.c linux-2.6.32.28/arch/blac
364 .gdb_bpt_instr = {0xa1},
365 #ifdef CONFIG_SMP
366 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
367 -diff -urNp linux-2.6.32.28/arch/blackfin/mach-common/pm.c linux-2.6.32.28/arch/blackfin/mach-common/pm.c
368 ---- linux-2.6.32.28/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
369 -+++ linux-2.6.32.28/arch/blackfin/mach-common/pm.c 2010-12-31 14:46:53.000000000 -0500
370 +diff -urNp linux-2.6.32.29/arch/blackfin/mach-common/pm.c linux-2.6.32.29/arch/blackfin/mach-common/pm.c
371 +--- linux-2.6.32.29/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
372 ++++ linux-2.6.32.29/arch/blackfin/mach-common/pm.c 2010-12-31 14:46:53.000000000 -0500
373 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
374 return 0;
375 }
376 @@ -629,9 +629,9 @@ diff -urNp linux-2.6.32.28/arch/blackfin/mach-common/pm.c linux-2.6.32.28/arch/b
377 .enter = bfin_pm_enter,
378 .valid = bfin_pm_valid,
379 };
380 -diff -urNp linux-2.6.32.28/arch/frv/include/asm/kmap_types.h linux-2.6.32.28/arch/frv/include/asm/kmap_types.h
381 ---- linux-2.6.32.28/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
382 -+++ linux-2.6.32.28/arch/frv/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
383 +diff -urNp linux-2.6.32.29/arch/frv/include/asm/kmap_types.h linux-2.6.32.29/arch/frv/include/asm/kmap_types.h
384 +--- linux-2.6.32.29/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
385 ++++ linux-2.6.32.29/arch/frv/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
386 @@ -23,6 +23,7 @@ enum km_type {
387 KM_IRQ1,
388 KM_SOFTIRQ0,
389 @@ -640,9 +640,9 @@ diff -urNp linux-2.6.32.28/arch/frv/include/asm/kmap_types.h linux-2.6.32.28/arc
390 KM_TYPE_NR
391 };
392
393 -diff -urNp linux-2.6.32.28/arch/frv/mm/elf-fdpic.c linux-2.6.32.28/arch/frv/mm/elf-fdpic.c
394 ---- linux-2.6.32.28/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
395 -+++ linux-2.6.32.28/arch/frv/mm/elf-fdpic.c 2010-12-31 14:46:53.000000000 -0500
396 +diff -urNp linux-2.6.32.29/arch/frv/mm/elf-fdpic.c linux-2.6.32.29/arch/frv/mm/elf-fdpic.c
397 +--- linux-2.6.32.29/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
398 ++++ linux-2.6.32.29/arch/frv/mm/elf-fdpic.c 2010-12-31 14:46:53.000000000 -0500
399 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
400 if (addr) {
401 addr = PAGE_ALIGN(addr);
402 @@ -671,9 +671,9 @@ diff -urNp linux-2.6.32.28/arch/frv/mm/elf-fdpic.c linux-2.6.32.28/arch/frv/mm/e
403 goto success;
404 addr = vma->vm_end;
405 }
406 -diff -urNp linux-2.6.32.28/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.28/arch/ia64/hp/common/hwsw_iommu.c
407 ---- linux-2.6.32.28/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
408 -+++ linux-2.6.32.28/arch/ia64/hp/common/hwsw_iommu.c 2010-12-31 14:46:53.000000000 -0500
409 +diff -urNp linux-2.6.32.29/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.29/arch/ia64/hp/common/hwsw_iommu.c
410 +--- linux-2.6.32.29/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
411 ++++ linux-2.6.32.29/arch/ia64/hp/common/hwsw_iommu.c 2010-12-31 14:46:53.000000000 -0500
412 @@ -17,7 +17,7 @@
413 #include <linux/swiotlb.h>
414 #include <asm/machvec.h>
415 @@ -692,9 +692,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.28/arch
416 {
417 if (use_swiotlb(dev))
418 return &swiotlb_dma_ops;
419 -diff -urNp linux-2.6.32.28/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.28/arch/ia64/hp/common/sba_iommu.c
420 ---- linux-2.6.32.28/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
421 -+++ linux-2.6.32.28/arch/ia64/hp/common/sba_iommu.c 2010-12-31 14:46:53.000000000 -0500
422 +diff -urNp linux-2.6.32.29/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.29/arch/ia64/hp/common/sba_iommu.c
423 +--- linux-2.6.32.29/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
424 ++++ linux-2.6.32.29/arch/ia64/hp/common/sba_iommu.c 2010-12-31 14:46:53.000000000 -0500
425 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
426 },
427 };
428 @@ -713,9 +713,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.28/arch/
429 .alloc_coherent = sba_alloc_coherent,
430 .free_coherent = sba_free_coherent,
431 .map_page = sba_map_page,
432 -diff -urNp linux-2.6.32.28/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.28/arch/ia64/ia32/binfmt_elf32.c
433 ---- linux-2.6.32.28/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
434 -+++ linux-2.6.32.28/arch/ia64/ia32/binfmt_elf32.c 2010-12-31 14:46:53.000000000 -0500
435 +diff -urNp linux-2.6.32.29/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.29/arch/ia64/ia32/binfmt_elf32.c
436 +--- linux-2.6.32.29/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
437 ++++ linux-2.6.32.29/arch/ia64/ia32/binfmt_elf32.c 2010-12-31 14:46:53.000000000 -0500
438 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
439
440 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
441 @@ -730,9 +730,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.28/arch/ia
442 /* Ugly but avoids duplication */
443 #include "../../../fs/binfmt_elf.c"
444
445 -diff -urNp linux-2.6.32.28/arch/ia64/ia32/ia32priv.h linux-2.6.32.28/arch/ia64/ia32/ia32priv.h
446 ---- linux-2.6.32.28/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
447 -+++ linux-2.6.32.28/arch/ia64/ia32/ia32priv.h 2010-12-31 14:46:53.000000000 -0500
448 +diff -urNp linux-2.6.32.29/arch/ia64/ia32/ia32priv.h linux-2.6.32.29/arch/ia64/ia32/ia32priv.h
449 +--- linux-2.6.32.29/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
450 ++++ linux-2.6.32.29/arch/ia64/ia32/ia32priv.h 2010-12-31 14:46:53.000000000 -0500
451 @@ -296,7 +296,14 @@ typedef struct compat_siginfo {
452 #define ELF_DATA ELFDATA2LSB
453 #define ELF_ARCH EM_386
454 @@ -749,9 +749,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/ia32/ia32priv.h linux-2.6.32.28/arch/ia64/i
455 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
456 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
457
458 -diff -urNp linux-2.6.32.28/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.28/arch/ia64/include/asm/dma-mapping.h
459 ---- linux-2.6.32.28/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
460 -+++ linux-2.6.32.28/arch/ia64/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
461 +diff -urNp linux-2.6.32.29/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.29/arch/ia64/include/asm/dma-mapping.h
462 +--- linux-2.6.32.29/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
463 ++++ linux-2.6.32.29/arch/ia64/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
464 @@ -12,7 +12,7 @@
465
466 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
467 @@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.28/a
468 return ops->dma_supported(dev, mask);
469 }
470
471 -diff -urNp linux-2.6.32.28/arch/ia64/include/asm/elf.h linux-2.6.32.28/arch/ia64/include/asm/elf.h
472 ---- linux-2.6.32.28/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
473 -+++ linux-2.6.32.28/arch/ia64/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
474 +diff -urNp linux-2.6.32.29/arch/ia64/include/asm/elf.h linux-2.6.32.29/arch/ia64/include/asm/elf.h
475 +--- linux-2.6.32.29/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
476 ++++ linux-2.6.32.29/arch/ia64/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
477 @@ -43,6 +43,13 @@
478 */
479 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
480 @@ -812,9 +812,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/include/asm/elf.h linux-2.6.32.28/arch/ia64
481 #define PT_IA_64_UNWIND 0x70000001
482
483 /* IA-64 relocations: */
484 -diff -urNp linux-2.6.32.28/arch/ia64/include/asm/machvec.h linux-2.6.32.28/arch/ia64/include/asm/machvec.h
485 ---- linux-2.6.32.28/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
486 -+++ linux-2.6.32.28/arch/ia64/include/asm/machvec.h 2010-12-31 14:46:53.000000000 -0500
487 +diff -urNp linux-2.6.32.29/arch/ia64/include/asm/machvec.h linux-2.6.32.29/arch/ia64/include/asm/machvec.h
488 +--- linux-2.6.32.29/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
489 ++++ linux-2.6.32.29/arch/ia64/include/asm/machvec.h 2010-12-31 14:46:53.000000000 -0500
490 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
491 /* DMA-mapping interface: */
492 typedef void ia64_mv_dma_init (void);
493 @@ -833,9 +833,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/include/asm/machvec.h linux-2.6.32.28/arch/
494
495 /*
496 * Define default versions so we can extend machvec for new platforms without having
497 -diff -urNp linux-2.6.32.28/arch/ia64/include/asm/pgtable.h linux-2.6.32.28/arch/ia64/include/asm/pgtable.h
498 ---- linux-2.6.32.28/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
499 -+++ linux-2.6.32.28/arch/ia64/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
500 +diff -urNp linux-2.6.32.29/arch/ia64/include/asm/pgtable.h linux-2.6.32.29/arch/ia64/include/asm/pgtable.h
501 +--- linux-2.6.32.29/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
502 ++++ linux-2.6.32.29/arch/ia64/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
503 @@ -12,7 +12,7 @@
504 * David Mosberger-Tang <davidm@××××××.com>
505 */
506 @@ -863,9 +863,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/include/asm/pgtable.h linux-2.6.32.28/arch/
507 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
508 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
509 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
510 -diff -urNp linux-2.6.32.28/arch/ia64/include/asm/uaccess.h linux-2.6.32.28/arch/ia64/include/asm/uaccess.h
511 ---- linux-2.6.32.28/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
512 -+++ linux-2.6.32.28/arch/ia64/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
513 +diff -urNp linux-2.6.32.29/arch/ia64/include/asm/uaccess.h linux-2.6.32.29/arch/ia64/include/asm/uaccess.h
514 +--- linux-2.6.32.29/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
515 ++++ linux-2.6.32.29/arch/ia64/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
516 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
517 const void *__cu_from = (from); \
518 long __cu_len = (n); \
519 @@ -884,9 +884,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/include/asm/uaccess.h linux-2.6.32.28/arch/
520 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
521 __cu_len; \
522 })
523 -diff -urNp linux-2.6.32.28/arch/ia64/kernel/dma-mapping.c linux-2.6.32.28/arch/ia64/kernel/dma-mapping.c
524 ---- linux-2.6.32.28/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
525 -+++ linux-2.6.32.28/arch/ia64/kernel/dma-mapping.c 2010-12-31 14:46:53.000000000 -0500
526 +diff -urNp linux-2.6.32.29/arch/ia64/kernel/dma-mapping.c linux-2.6.32.29/arch/ia64/kernel/dma-mapping.c
527 +--- linux-2.6.32.29/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
528 ++++ linux-2.6.32.29/arch/ia64/kernel/dma-mapping.c 2010-12-31 14:46:53.000000000 -0500
529 @@ -3,7 +3,7 @@
530 /* Set this to 1 if there is a HW IOMMU in the system */
531 int iommu_detected __read_mostly;
532 @@ -905,9 +905,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/kernel/dma-mapping.c linux-2.6.32.28/arch/i
533 {
534 return dma_ops;
535 }
536 -diff -urNp linux-2.6.32.28/arch/ia64/kernel/module.c linux-2.6.32.28/arch/ia64/kernel/module.c
537 ---- linux-2.6.32.28/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
538 -+++ linux-2.6.32.28/arch/ia64/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
539 +diff -urNp linux-2.6.32.29/arch/ia64/kernel/module.c linux-2.6.32.29/arch/ia64/kernel/module.c
540 +--- linux-2.6.32.29/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
541 ++++ linux-2.6.32.29/arch/ia64/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
542 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
543 void
544 module_free (struct module *mod, void *module_region)
545 @@ -996,9 +996,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/kernel/module.c linux-2.6.32.28/arch/ia64/k
546 mod->arch.gp = gp;
547 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
548 }
549 -diff -urNp linux-2.6.32.28/arch/ia64/kernel/pci-dma.c linux-2.6.32.28/arch/ia64/kernel/pci-dma.c
550 ---- linux-2.6.32.28/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
551 -+++ linux-2.6.32.28/arch/ia64/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
552 +diff -urNp linux-2.6.32.29/arch/ia64/kernel/pci-dma.c linux-2.6.32.29/arch/ia64/kernel/pci-dma.c
553 +--- linux-2.6.32.29/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
554 ++++ linux-2.6.32.29/arch/ia64/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
555 @@ -43,7 +43,7 @@ struct device fallback_dev = {
556 .dma_mask = &fallback_dev.coherent_dma_mask,
557 };
558 @@ -1050,9 +1050,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/kernel/pci-dma.c linux-2.6.32.28/arch/ia64/
559
560 /*
561 * The order of these functions is important for
562 -diff -urNp linux-2.6.32.28/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.28/arch/ia64/kernel/pci-swiotlb.c
563 ---- linux-2.6.32.28/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
564 -+++ linux-2.6.32.28/arch/ia64/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
565 +diff -urNp linux-2.6.32.29/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.29/arch/ia64/kernel/pci-swiotlb.c
566 +--- linux-2.6.32.29/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
567 ++++ linux-2.6.32.29/arch/ia64/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
568 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
569 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
570 }
571 @@ -1062,9 +1062,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.28/arch/i
572 .alloc_coherent = ia64_swiotlb_alloc_coherent,
573 .free_coherent = swiotlb_free_coherent,
574 .map_page = swiotlb_map_page,
575 -diff -urNp linux-2.6.32.28/arch/ia64/kernel/sys_ia64.c linux-2.6.32.28/arch/ia64/kernel/sys_ia64.c
576 ---- linux-2.6.32.28/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
577 -+++ linux-2.6.32.28/arch/ia64/kernel/sys_ia64.c 2010-12-31 14:46:53.000000000 -0500
578 +diff -urNp linux-2.6.32.29/arch/ia64/kernel/sys_ia64.c linux-2.6.32.29/arch/ia64/kernel/sys_ia64.c
579 +--- linux-2.6.32.29/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
580 ++++ linux-2.6.32.29/arch/ia64/kernel/sys_ia64.c 2010-12-31 14:46:53.000000000 -0500
581 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
582 if (REGION_NUMBER(addr) == RGN_HPAGE)
583 addr = 0;
584 @@ -1097,9 +1097,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/kernel/sys_ia64.c linux-2.6.32.28/arch/ia64
585 /* Remember the address where we stopped this search: */
586 mm->free_area_cache = addr + len;
587 return addr;
588 -diff -urNp linux-2.6.32.28/arch/ia64/kernel/topology.c linux-2.6.32.28/arch/ia64/kernel/topology.c
589 ---- linux-2.6.32.28/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
590 -+++ linux-2.6.32.28/arch/ia64/kernel/topology.c 2010-12-31 14:46:53.000000000 -0500
591 +diff -urNp linux-2.6.32.29/arch/ia64/kernel/topology.c linux-2.6.32.29/arch/ia64/kernel/topology.c
592 +--- linux-2.6.32.29/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
593 ++++ linux-2.6.32.29/arch/ia64/kernel/topology.c 2010-12-31 14:46:53.000000000 -0500
594 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
595 return ret;
596 }
597 @@ -1109,9 +1109,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/kernel/topology.c linux-2.6.32.28/arch/ia64
598 .show = cache_show
599 };
600
601 -diff -urNp linux-2.6.32.28/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.28/arch/ia64/kernel/vmlinux.lds.S
602 ---- linux-2.6.32.28/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
603 -+++ linux-2.6.32.28/arch/ia64/kernel/vmlinux.lds.S 2010-12-31 14:46:53.000000000 -0500
604 +diff -urNp linux-2.6.32.29/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.29/arch/ia64/kernel/vmlinux.lds.S
605 +--- linux-2.6.32.29/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
606 ++++ linux-2.6.32.29/arch/ia64/kernel/vmlinux.lds.S 2010-12-31 14:46:53.000000000 -0500
607 @@ -190,7 +190,7 @@ SECTIONS
608 /* Per-cpu data: */
609 . = ALIGN(PERCPU_PAGE_SIZE);
610 @@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.28/arch/i
611 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
612 * into percpu page size
613 */
614 -diff -urNp linux-2.6.32.28/arch/ia64/mm/fault.c linux-2.6.32.28/arch/ia64/mm/fault.c
615 ---- linux-2.6.32.28/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
616 -+++ linux-2.6.32.28/arch/ia64/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
617 +diff -urNp linux-2.6.32.29/arch/ia64/mm/fault.c linux-2.6.32.29/arch/ia64/mm/fault.c
618 +--- linux-2.6.32.29/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
619 ++++ linux-2.6.32.29/arch/ia64/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
620 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
621 return pte_present(pte);
622 }
623 @@ -1173,9 +1173,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/mm/fault.c linux-2.6.32.28/arch/ia64/mm/fau
624 survive:
625 /*
626 * If for any reason at all we couldn't handle the fault, make
627 -diff -urNp linux-2.6.32.28/arch/ia64/mm/hugetlbpage.c linux-2.6.32.28/arch/ia64/mm/hugetlbpage.c
628 ---- linux-2.6.32.28/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
629 -+++ linux-2.6.32.28/arch/ia64/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
630 +diff -urNp linux-2.6.32.29/arch/ia64/mm/hugetlbpage.c linux-2.6.32.29/arch/ia64/mm/hugetlbpage.c
631 +--- linux-2.6.32.29/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
632 ++++ linux-2.6.32.29/arch/ia64/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
633 @@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
634 /* At this point: (!vmm || addr < vmm->vm_end). */
635 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
636 @@ -1185,9 +1185,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/mm/hugetlbpage.c linux-2.6.32.28/arch/ia64/
637 return addr;
638 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
639 }
640 -diff -urNp linux-2.6.32.28/arch/ia64/mm/init.c linux-2.6.32.28/arch/ia64/mm/init.c
641 ---- linux-2.6.32.28/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
642 -+++ linux-2.6.32.28/arch/ia64/mm/init.c 2010-12-31 14:46:53.000000000 -0500
643 +diff -urNp linux-2.6.32.29/arch/ia64/mm/init.c linux-2.6.32.29/arch/ia64/mm/init.c
644 +--- linux-2.6.32.29/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
645 ++++ linux-2.6.32.29/arch/ia64/mm/init.c 2010-12-31 14:46:53.000000000 -0500
646 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
647 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
648 vma->vm_end = vma->vm_start + PAGE_SIZE;
649 @@ -1208,9 +1208,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/mm/init.c linux-2.6.32.28/arch/ia64/mm/init
650 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
651 down_write(&current->mm->mmap_sem);
652 if (insert_vm_struct(current->mm, vma)) {
653 -diff -urNp linux-2.6.32.28/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.28/arch/ia64/sn/pci/pci_dma.c
654 ---- linux-2.6.32.28/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
655 -+++ linux-2.6.32.28/arch/ia64/sn/pci/pci_dma.c 2010-12-31 14:46:53.000000000 -0500
656 +diff -urNp linux-2.6.32.29/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.29/arch/ia64/sn/pci/pci_dma.c
657 +--- linux-2.6.32.29/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
658 ++++ linux-2.6.32.29/arch/ia64/sn/pci/pci_dma.c 2010-12-31 14:46:53.000000000 -0500
659 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
660 return ret;
661 }
662 @@ -1220,9 +1220,9 @@ diff -urNp linux-2.6.32.28/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.28/arch/ia64/
663 .alloc_coherent = sn_dma_alloc_coherent,
664 .free_coherent = sn_dma_free_coherent,
665 .map_page = sn_dma_map_page,
666 -diff -urNp linux-2.6.32.28/arch/m32r/lib/usercopy.c linux-2.6.32.28/arch/m32r/lib/usercopy.c
667 ---- linux-2.6.32.28/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
668 -+++ linux-2.6.32.28/arch/m32r/lib/usercopy.c 2010-12-31 14:46:53.000000000 -0500
669 +diff -urNp linux-2.6.32.29/arch/m32r/lib/usercopy.c linux-2.6.32.29/arch/m32r/lib/usercopy.c
670 +--- linux-2.6.32.29/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
671 ++++ linux-2.6.32.29/arch/m32r/lib/usercopy.c 2010-12-31 14:46:53.000000000 -0500
672 @@ -14,6 +14,9 @@
673 unsigned long
674 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
675 @@ -1243,9 +1243,9 @@ diff -urNp linux-2.6.32.28/arch/m32r/lib/usercopy.c linux-2.6.32.28/arch/m32r/li
676 prefetchw(to);
677 if (access_ok(VERIFY_READ, from, n))
678 __copy_user_zeroing(to,from,n);
679 -diff -urNp linux-2.6.32.28/arch/mips/alchemy/devboards/pm.c linux-2.6.32.28/arch/mips/alchemy/devboards/pm.c
680 ---- linux-2.6.32.28/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
681 -+++ linux-2.6.32.28/arch/mips/alchemy/devboards/pm.c 2010-12-31 14:46:53.000000000 -0500
682 +diff -urNp linux-2.6.32.29/arch/mips/alchemy/devboards/pm.c linux-2.6.32.29/arch/mips/alchemy/devboards/pm.c
683 +--- linux-2.6.32.29/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
684 ++++ linux-2.6.32.29/arch/mips/alchemy/devboards/pm.c 2010-12-31 14:46:53.000000000 -0500
685 @@ -78,7 +78,7 @@ static void db1x_pm_end(void)
686
687 }
688 @@ -1255,9 +1255,9 @@ diff -urNp linux-2.6.32.28/arch/mips/alchemy/devboards/pm.c linux-2.6.32.28/arch
689 .valid = suspend_valid_only_mem,
690 .begin = db1x_pm_begin,
691 .enter = db1x_pm_enter,
692 -diff -urNp linux-2.6.32.28/arch/mips/include/asm/elf.h linux-2.6.32.28/arch/mips/include/asm/elf.h
693 ---- linux-2.6.32.28/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
694 -+++ linux-2.6.32.28/arch/mips/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
695 +diff -urNp linux-2.6.32.29/arch/mips/include/asm/elf.h linux-2.6.32.29/arch/mips/include/asm/elf.h
696 +--- linux-2.6.32.29/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
697 ++++ linux-2.6.32.29/arch/mips/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
698 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
699 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
700 #endif
701 @@ -1270,9 +1270,9 @@ diff -urNp linux-2.6.32.28/arch/mips/include/asm/elf.h linux-2.6.32.28/arch/mips
702 +#endif
703 +
704 #endif /* _ASM_ELF_H */
705 -diff -urNp linux-2.6.32.28/arch/mips/include/asm/page.h linux-2.6.32.28/arch/mips/include/asm/page.h
706 ---- linux-2.6.32.28/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
707 -+++ linux-2.6.32.28/arch/mips/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
708 +diff -urNp linux-2.6.32.29/arch/mips/include/asm/page.h linux-2.6.32.29/arch/mips/include/asm/page.h
709 +--- linux-2.6.32.29/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
710 ++++ linux-2.6.32.29/arch/mips/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
711 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
712 #ifdef CONFIG_CPU_MIPS32
713 typedef struct { unsigned long pte_low, pte_high; } pte_t;
714 @@ -1282,9 +1282,9 @@ diff -urNp linux-2.6.32.28/arch/mips/include/asm/page.h linux-2.6.32.28/arch/mip
715 #else
716 typedef struct { unsigned long long pte; } pte_t;
717 #define pte_val(x) ((x).pte)
718 -diff -urNp linux-2.6.32.28/arch/mips/include/asm/system.h linux-2.6.32.28/arch/mips/include/asm/system.h
719 ---- linux-2.6.32.28/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
720 -+++ linux-2.6.32.28/arch/mips/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
721 +diff -urNp linux-2.6.32.29/arch/mips/include/asm/system.h linux-2.6.32.29/arch/mips/include/asm/system.h
722 +--- linux-2.6.32.29/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
723 ++++ linux-2.6.32.29/arch/mips/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
724 @@ -23,6 +23,7 @@
725 #include <asm/dsp.h>
726 #include <asm/watch.h>
727 @@ -1301,9 +1301,9 @@ diff -urNp linux-2.6.32.28/arch/mips/include/asm/system.h linux-2.6.32.28/arch/m
728 +#define arch_align_stack(x) ((x) & ALMASK)
729
730 #endif /* _ASM_SYSTEM_H */
731 -diff -urNp linux-2.6.32.28/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.28/arch/mips/kernel/binfmt_elfn32.c
732 ---- linux-2.6.32.28/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
733 -+++ linux-2.6.32.28/arch/mips/kernel/binfmt_elfn32.c 2010-12-31 14:46:53.000000000 -0500
734 +diff -urNp linux-2.6.32.29/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.29/arch/mips/kernel/binfmt_elfn32.c
735 +--- linux-2.6.32.29/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
736 ++++ linux-2.6.32.29/arch/mips/kernel/binfmt_elfn32.c 2010-12-31 14:46:53.000000000 -0500
737 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
738 #undef ELF_ET_DYN_BASE
739 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
740 @@ -1318,9 +1318,9 @@ diff -urNp linux-2.6.32.28/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.28/arch
741 #include <asm/processor.h>
742 #include <linux/module.h>
743 #include <linux/elfcore.h>
744 -diff -urNp linux-2.6.32.28/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.28/arch/mips/kernel/binfmt_elfo32.c
745 ---- linux-2.6.32.28/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
746 -+++ linux-2.6.32.28/arch/mips/kernel/binfmt_elfo32.c 2010-12-31 14:46:53.000000000 -0500
747 +diff -urNp linux-2.6.32.29/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.29/arch/mips/kernel/binfmt_elfo32.c
748 +--- linux-2.6.32.29/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
749 ++++ linux-2.6.32.29/arch/mips/kernel/binfmt_elfo32.c 2010-12-31 14:46:53.000000000 -0500
750 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
751 #undef ELF_ET_DYN_BASE
752 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
753 @@ -1335,9 +1335,9 @@ diff -urNp linux-2.6.32.28/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.28/arch
754 #include <asm/processor.h>
755
756 /*
757 -diff -urNp linux-2.6.32.28/arch/mips/kernel/kgdb.c linux-2.6.32.28/arch/mips/kernel/kgdb.c
758 ---- linux-2.6.32.28/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
759 -+++ linux-2.6.32.28/arch/mips/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
760 +diff -urNp linux-2.6.32.29/arch/mips/kernel/kgdb.c linux-2.6.32.29/arch/mips/kernel/kgdb.c
761 +--- linux-2.6.32.29/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
762 ++++ linux-2.6.32.29/arch/mips/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
763 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
764 return -1;
765 }
766 @@ -1346,9 +1346,9 @@ diff -urNp linux-2.6.32.28/arch/mips/kernel/kgdb.c linux-2.6.32.28/arch/mips/ker
767 struct kgdb_arch arch_kgdb_ops;
768
769 /*
770 -diff -urNp linux-2.6.32.28/arch/mips/kernel/process.c linux-2.6.32.28/arch/mips/kernel/process.c
771 ---- linux-2.6.32.28/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
772 -+++ linux-2.6.32.28/arch/mips/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
773 +diff -urNp linux-2.6.32.29/arch/mips/kernel/process.c linux-2.6.32.29/arch/mips/kernel/process.c
774 +--- linux-2.6.32.29/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
775 ++++ linux-2.6.32.29/arch/mips/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
776 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
777 out:
778 return pc;
779 @@ -1365,9 +1365,9 @@ diff -urNp linux-2.6.32.28/arch/mips/kernel/process.c linux-2.6.32.28/arch/mips/
780 -
781 - return sp & ALMASK;
782 -}
783 -diff -urNp linux-2.6.32.28/arch/mips/kernel/syscall.c linux-2.6.32.28/arch/mips/kernel/syscall.c
784 ---- linux-2.6.32.28/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
785 -+++ linux-2.6.32.28/arch/mips/kernel/syscall.c 2010-12-31 14:46:53.000000000 -0500
786 +diff -urNp linux-2.6.32.29/arch/mips/kernel/syscall.c linux-2.6.32.29/arch/mips/kernel/syscall.c
787 +--- linux-2.6.32.29/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
788 ++++ linux-2.6.32.29/arch/mips/kernel/syscall.c 2010-12-31 14:46:53.000000000 -0500
789 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
790 do_color_align = 0;
791 if (filp || (flags & MAP_SHARED))
792 @@ -1402,9 +1402,9 @@ diff -urNp linux-2.6.32.28/arch/mips/kernel/syscall.c linux-2.6.32.28/arch/mips/
793 return addr;
794 addr = vmm->vm_end;
795 if (do_color_align)
796 -diff -urNp linux-2.6.32.28/arch/mips/mm/fault.c linux-2.6.32.28/arch/mips/mm/fault.c
797 ---- linux-2.6.32.28/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
798 -+++ linux-2.6.32.28/arch/mips/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
799 +diff -urNp linux-2.6.32.29/arch/mips/mm/fault.c linux-2.6.32.29/arch/mips/mm/fault.c
800 +--- linux-2.6.32.29/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
801 ++++ linux-2.6.32.29/arch/mips/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
802 @@ -26,6 +26,23 @@
803 #include <asm/ptrace.h>
804 #include <asm/highmem.h> /* For VMALLOC_END */
805 @@ -1429,9 +1429,9 @@ diff -urNp linux-2.6.32.28/arch/mips/mm/fault.c linux-2.6.32.28/arch/mips/mm/fau
806 /*
807 * This routine handles page faults. It determines the address,
808 * and the problem, and then passes it off to one of the appropriate
809 -diff -urNp linux-2.6.32.28/arch/parisc/include/asm/elf.h linux-2.6.32.28/arch/parisc/include/asm/elf.h
810 ---- linux-2.6.32.28/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
811 -+++ linux-2.6.32.28/arch/parisc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
812 +diff -urNp linux-2.6.32.29/arch/parisc/include/asm/elf.h linux-2.6.32.29/arch/parisc/include/asm/elf.h
813 +--- linux-2.6.32.29/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
814 ++++ linux-2.6.32.29/arch/parisc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
815 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
816
817 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
818 @@ -1446,9 +1446,9 @@ diff -urNp linux-2.6.32.28/arch/parisc/include/asm/elf.h linux-2.6.32.28/arch/pa
819 /* This yields a mask that user programs can use to figure out what
820 instruction set this CPU supports. This could be done in user space,
821 but it's not easy, and we've already done it here. */
822 -diff -urNp linux-2.6.32.28/arch/parisc/include/asm/pgtable.h linux-2.6.32.28/arch/parisc/include/asm/pgtable.h
823 ---- linux-2.6.32.28/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
824 -+++ linux-2.6.32.28/arch/parisc/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
825 +diff -urNp linux-2.6.32.29/arch/parisc/include/asm/pgtable.h linux-2.6.32.29/arch/parisc/include/asm/pgtable.h
826 +--- linux-2.6.32.29/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
827 ++++ linux-2.6.32.29/arch/parisc/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
828 @@ -207,6 +207,17 @@
829 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
830 #define PAGE_COPY PAGE_EXECREAD
831 @@ -1467,9 +1467,9 @@ diff -urNp linux-2.6.32.28/arch/parisc/include/asm/pgtable.h linux-2.6.32.28/arc
832 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
833 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
834 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
835 -diff -urNp linux-2.6.32.28/arch/parisc/kernel/module.c linux-2.6.32.28/arch/parisc/kernel/module.c
836 ---- linux-2.6.32.28/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
837 -+++ linux-2.6.32.28/arch/parisc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
838 +diff -urNp linux-2.6.32.29/arch/parisc/kernel/module.c linux-2.6.32.29/arch/parisc/kernel/module.c
839 +--- linux-2.6.32.29/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
840 ++++ linux-2.6.32.29/arch/parisc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
841 @@ -95,16 +95,38 @@
842
843 /* three functions to determine where in the module core
844 @@ -1570,9 +1570,9 @@ diff -urNp linux-2.6.32.28/arch/parisc/kernel/module.c linux-2.6.32.28/arch/pari
845
846 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
847 me->arch.unwind_section, table, end, gp);
848 -diff -urNp linux-2.6.32.28/arch/parisc/kernel/sys_parisc.c linux-2.6.32.28/arch/parisc/kernel/sys_parisc.c
849 ---- linux-2.6.32.28/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
850 -+++ linux-2.6.32.28/arch/parisc/kernel/sys_parisc.c 2010-12-31 14:46:53.000000000 -0500
851 +diff -urNp linux-2.6.32.29/arch/parisc/kernel/sys_parisc.c linux-2.6.32.29/arch/parisc/kernel/sys_parisc.c
852 +--- linux-2.6.32.29/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
853 ++++ linux-2.6.32.29/arch/parisc/kernel/sys_parisc.c 2010-12-31 14:46:53.000000000 -0500
854 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
855 /* At this point: (!vma || addr < vma->vm_end). */
856 if (TASK_SIZE - len < addr)
857 @@ -1600,9 +1600,9 @@ diff -urNp linux-2.6.32.28/arch/parisc/kernel/sys_parisc.c linux-2.6.32.28/arch/
858
859 if (filp) {
860 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
861 -diff -urNp linux-2.6.32.28/arch/parisc/kernel/traps.c linux-2.6.32.28/arch/parisc/kernel/traps.c
862 ---- linux-2.6.32.28/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
863 -+++ linux-2.6.32.28/arch/parisc/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
864 +diff -urNp linux-2.6.32.29/arch/parisc/kernel/traps.c linux-2.6.32.29/arch/parisc/kernel/traps.c
865 +--- linux-2.6.32.29/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
866 ++++ linux-2.6.32.29/arch/parisc/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
867 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
868
869 down_read(&current->mm->mmap_sem);
870 @@ -1614,9 +1614,9 @@ diff -urNp linux-2.6.32.28/arch/parisc/kernel/traps.c linux-2.6.32.28/arch/paris
871 fault_address = regs->iaoq[0];
872 fault_space = regs->iasq[0];
873
874 -diff -urNp linux-2.6.32.28/arch/parisc/mm/fault.c linux-2.6.32.28/arch/parisc/mm/fault.c
875 ---- linux-2.6.32.28/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
876 -+++ linux-2.6.32.28/arch/parisc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
877 +diff -urNp linux-2.6.32.29/arch/parisc/mm/fault.c linux-2.6.32.29/arch/parisc/mm/fault.c
878 +--- linux-2.6.32.29/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
879 ++++ linux-2.6.32.29/arch/parisc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
880 @@ -15,6 +15,7 @@
881 #include <linux/sched.h>
882 #include <linux/interrupt.h>
883 @@ -1786,9 +1786,9 @@ diff -urNp linux-2.6.32.28/arch/parisc/mm/fault.c linux-2.6.32.28/arch/parisc/mm
884
885 /*
886 * If for any reason at all we couldn't handle the fault, make
887 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/device.h linux-2.6.32.28/arch/powerpc/include/asm/device.h
888 ---- linux-2.6.32.28/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
889 -+++ linux-2.6.32.28/arch/powerpc/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
890 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/device.h linux-2.6.32.29/arch/powerpc/include/asm/device.h
891 +--- linux-2.6.32.29/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
892 ++++ linux-2.6.32.29/arch/powerpc/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
893 @@ -14,7 +14,7 @@ struct dev_archdata {
894 struct device_node *of_node;
895
896 @@ -1798,9 +1798,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/device.h linux-2.6.32.28/arc
897
898 /*
899 * When an iommu is in use, dma_data is used as a ptr to the base of the
900 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.28/arch/powerpc/include/asm/dma-mapping.h
901 ---- linux-2.6.32.28/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
902 -+++ linux-2.6.32.28/arch/powerpc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
903 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.29/arch/powerpc/include/asm/dma-mapping.h
904 +--- linux-2.6.32.29/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
905 ++++ linux-2.6.32.29/arch/powerpc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
906 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
907 #ifdef CONFIG_PPC64
908 extern struct dma_map_ops dma_iommu_ops;
909 @@ -1867,9 +1867,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.2
910
911 if (dma_ops->mapping_error)
912 return dma_ops->mapping_error(dev, dma_addr);
913 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/elf.h linux-2.6.32.28/arch/powerpc/include/asm/elf.h
914 ---- linux-2.6.32.28/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
915 -+++ linux-2.6.32.28/arch/powerpc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
916 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/elf.h linux-2.6.32.29/arch/powerpc/include/asm/elf.h
917 +--- linux-2.6.32.29/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
918 ++++ linux-2.6.32.29/arch/powerpc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
919 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
920 the loader. We need to make sure that it is out of the way of the program
921 that it will "exec", and that there is sufficient room for the brk. */
922 @@ -1902,9 +1902,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/elf.h linux-2.6.32.28/arch/p
923 #endif /* __KERNEL__ */
924
925 /*
926 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/iommu.h linux-2.6.32.28/arch/powerpc/include/asm/iommu.h
927 ---- linux-2.6.32.28/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
928 -+++ linux-2.6.32.28/arch/powerpc/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
929 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/iommu.h linux-2.6.32.29/arch/powerpc/include/asm/iommu.h
930 +--- linux-2.6.32.29/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
931 ++++ linux-2.6.32.29/arch/powerpc/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
932 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
933 extern void iommu_init_early_dart(void);
934 extern void iommu_init_early_pasemi(void);
935 @@ -1915,9 +1915,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/iommu.h linux-2.6.32.28/arch
936 #ifdef CONFIG_PCI
937 extern void pci_iommu_init(void);
938 extern void pci_direct_iommu_init(void);
939 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.28/arch/powerpc/include/asm/kmap_types.h
940 ---- linux-2.6.32.28/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
941 -+++ linux-2.6.32.28/arch/powerpc/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
942 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.29/arch/powerpc/include/asm/kmap_types.h
943 +--- linux-2.6.32.29/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
944 ++++ linux-2.6.32.29/arch/powerpc/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
945 @@ -26,6 +26,7 @@ enum km_type {
946 KM_SOFTIRQ1,
947 KM_PPC_SYNC_PAGE,
948 @@ -1926,9 +1926,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.28
949 KM_TYPE_NR
950 };
951
952 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/page_64.h linux-2.6.32.28/arch/powerpc/include/asm/page_64.h
953 ---- linux-2.6.32.28/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
954 -+++ linux-2.6.32.28/arch/powerpc/include/asm/page_64.h 2010-12-31 14:46:53.000000000 -0500
955 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/page_64.h linux-2.6.32.29/arch/powerpc/include/asm/page_64.h
956 +--- linux-2.6.32.29/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
957 ++++ linux-2.6.32.29/arch/powerpc/include/asm/page_64.h 2010-12-31 14:46:53.000000000 -0500
958 @@ -180,15 +180,18 @@ do { \
959 * stack by default, so in the absense of a PT_GNU_STACK program header
960 * we turn execute permission off.
961 @@ -1950,9 +1950,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/page_64.h linux-2.6.32.28/ar
962
963 #include <asm-generic/getorder.h>
964
965 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/page.h linux-2.6.32.28/arch/powerpc/include/asm/page.h
966 ---- linux-2.6.32.28/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
967 -+++ linux-2.6.32.28/arch/powerpc/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
968 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/page.h linux-2.6.32.29/arch/powerpc/include/asm/page.h
969 +--- linux-2.6.32.29/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
970 ++++ linux-2.6.32.29/arch/powerpc/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
971 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
972 * and needs to be executable. This means the whole heap ends
973 * up being executable.
974 @@ -1975,9 +1975,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/page.h linux-2.6.32.28/arch/
975 #ifndef __ASSEMBLY__
976
977 #undef STRICT_MM_TYPECHECKS
978 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/pci.h linux-2.6.32.28/arch/powerpc/include/asm/pci.h
979 ---- linux-2.6.32.28/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
980 -+++ linux-2.6.32.28/arch/powerpc/include/asm/pci.h 2010-12-31 14:46:53.000000000 -0500
981 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/pci.h linux-2.6.32.29/arch/powerpc/include/asm/pci.h
982 +--- linux-2.6.32.29/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
983 ++++ linux-2.6.32.29/arch/powerpc/include/asm/pci.h 2010-12-31 14:46:53.000000000 -0500
984 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
985 }
986
987 @@ -1989,9 +1989,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/pci.h linux-2.6.32.28/arch/p
988 #else /* CONFIG_PCI */
989 #define set_pci_dma_ops(d)
990 #define get_pci_dma_ops() NULL
991 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.28/arch/powerpc/include/asm/pte-hash32.h
992 ---- linux-2.6.32.28/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
993 -+++ linux-2.6.32.28/arch/powerpc/include/asm/pte-hash32.h 2010-12-31 14:46:53.000000000 -0500
994 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.29/arch/powerpc/include/asm/pte-hash32.h
995 +--- linux-2.6.32.29/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
996 ++++ linux-2.6.32.29/arch/powerpc/include/asm/pte-hash32.h 2010-12-31 14:46:53.000000000 -0500
997 @@ -21,6 +21,7 @@
998 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
999 #define _PAGE_USER 0x004 /* usermode access allowed */
1000 @@ -2000,9 +2000,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.28
1001 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1002 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1003 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1004 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/reg.h linux-2.6.32.28/arch/powerpc/include/asm/reg.h
1005 ---- linux-2.6.32.28/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
1006 -+++ linux-2.6.32.28/arch/powerpc/include/asm/reg.h 2010-12-31 14:46:53.000000000 -0500
1007 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/reg.h linux-2.6.32.29/arch/powerpc/include/asm/reg.h
1008 +--- linux-2.6.32.29/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
1009 ++++ linux-2.6.32.29/arch/powerpc/include/asm/reg.h 2010-12-31 14:46:53.000000000 -0500
1010 @@ -191,6 +191,7 @@
1011 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1012 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
1013 @@ -2011,9 +2011,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/reg.h linux-2.6.32.28/arch/p
1014 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1015 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1016 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1017 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.28/arch/powerpc/include/asm/swiotlb.h
1018 ---- linux-2.6.32.28/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
1019 -+++ linux-2.6.32.28/arch/powerpc/include/asm/swiotlb.h 2010-12-31 14:46:53.000000000 -0500
1020 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.29/arch/powerpc/include/asm/swiotlb.h
1021 +--- linux-2.6.32.29/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
1022 ++++ linux-2.6.32.29/arch/powerpc/include/asm/swiotlb.h 2010-12-31 14:46:53.000000000 -0500
1023 @@ -13,7 +13,7 @@
1024
1025 #include <linux/swiotlb.h>
1026 @@ -2023,9 +2023,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.28/ar
1027
1028 static inline void dma_mark_clean(void *addr, size_t size) {}
1029
1030 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/system.h linux-2.6.32.28/arch/powerpc/include/asm/system.h
1031 ---- linux-2.6.32.28/arch/powerpc/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
1032 -+++ linux-2.6.32.28/arch/powerpc/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
1033 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/system.h linux-2.6.32.29/arch/powerpc/include/asm/system.h
1034 +--- linux-2.6.32.29/arch/powerpc/include/asm/system.h 2011-02-22 15:56:54.000000000 -0500
1035 ++++ linux-2.6.32.29/arch/powerpc/include/asm/system.h 2011-02-22 15:57:23.000000000 -0500
1036 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
1037 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
1038 #endif
1039 @@ -2035,9 +2035,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/system.h linux-2.6.32.28/arc
1040
1041 /* Used in very early kernel initialization. */
1042 extern unsigned long reloc_offset(void);
1043 -diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/uaccess.h linux-2.6.32.28/arch/powerpc/include/asm/uaccess.h
1044 ---- linux-2.6.32.28/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1045 -+++ linux-2.6.32.28/arch/powerpc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1046 +diff -urNp linux-2.6.32.29/arch/powerpc/include/asm/uaccess.h linux-2.6.32.29/arch/powerpc/include/asm/uaccess.h
1047 +--- linux-2.6.32.29/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1048 ++++ linux-2.6.32.29/arch/powerpc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1049 @@ -13,6 +13,8 @@
1050 #define VERIFY_READ 0
1051 #define VERIFY_WRITE 1
1052 @@ -2215,9 +2215,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/include/asm/uaccess.h linux-2.6.32.28/ar
1053 extern unsigned long __clear_user(void __user *addr, unsigned long size);
1054
1055 static inline unsigned long clear_user(void __user *addr, unsigned long size)
1056 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.28/arch/powerpc/kernel/cacheinfo.c
1057 ---- linux-2.6.32.28/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
1058 -+++ linux-2.6.32.28/arch/powerpc/kernel/cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
1059 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.29/arch/powerpc/kernel/cacheinfo.c
1060 +--- linux-2.6.32.29/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
1061 ++++ linux-2.6.32.29/arch/powerpc/kernel/cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
1062 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
1063 &cache_assoc_attr,
1064 };
1065 @@ -2227,9 +2227,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.28/arch/
1066 .show = cache_index_show,
1067 };
1068
1069 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/dma.c linux-2.6.32.28/arch/powerpc/kernel/dma.c
1070 ---- linux-2.6.32.28/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
1071 -+++ linux-2.6.32.28/arch/powerpc/kernel/dma.c 2010-12-31 14:46:53.000000000 -0500
1072 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/dma.c linux-2.6.32.29/arch/powerpc/kernel/dma.c
1073 +--- linux-2.6.32.29/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
1074 ++++ linux-2.6.32.29/arch/powerpc/kernel/dma.c 2010-12-31 14:46:53.000000000 -0500
1075 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
1076 }
1077 #endif
1078 @@ -2239,9 +2239,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/dma.c linux-2.6.32.28/arch/powerp
1079 .alloc_coherent = dma_direct_alloc_coherent,
1080 .free_coherent = dma_direct_free_coherent,
1081 .map_sg = dma_direct_map_sg,
1082 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.28/arch/powerpc/kernel/dma-iommu.c
1083 ---- linux-2.6.32.28/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
1084 -+++ linux-2.6.32.28/arch/powerpc/kernel/dma-iommu.c 2010-12-31 14:46:53.000000000 -0500
1085 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.29/arch/powerpc/kernel/dma-iommu.c
1086 +--- linux-2.6.32.29/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
1087 ++++ linux-2.6.32.29/arch/powerpc/kernel/dma-iommu.c 2010-12-31 14:46:53.000000000 -0500
1088 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
1089 }
1090
1091 @@ -2251,9 +2251,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.28/arch/
1092 {
1093 struct iommu_table *tbl = get_iommu_table_base(dev);
1094
1095 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.28/arch/powerpc/kernel/dma-swiotlb.c
1096 ---- linux-2.6.32.28/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
1097 -+++ linux-2.6.32.28/arch/powerpc/kernel/dma-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
1098 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.29/arch/powerpc/kernel/dma-swiotlb.c
1099 +--- linux-2.6.32.29/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
1100 ++++ linux-2.6.32.29/arch/powerpc/kernel/dma-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
1101 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
1102 * map_page, and unmap_page on highmem, use normal dma_ops
1103 * for everything else.
1104 @@ -2263,9 +2263,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.28/arc
1105 .alloc_coherent = dma_direct_alloc_coherent,
1106 .free_coherent = dma_direct_free_coherent,
1107 .map_sg = swiotlb_map_sg_attrs,
1108 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.28/arch/powerpc/kernel/exceptions-64e.S
1109 ---- linux-2.6.32.28/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
1110 -+++ linux-2.6.32.28/arch/powerpc/kernel/exceptions-64e.S 2010-12-31 14:46:53.000000000 -0500
1111 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.29/arch/powerpc/kernel/exceptions-64e.S
1112 +--- linux-2.6.32.29/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
1113 ++++ linux-2.6.32.29/arch/powerpc/kernel/exceptions-64e.S 2010-12-31 14:46:53.000000000 -0500
1114 @@ -455,6 +455,7 @@ storage_fault_common:
1115 std r14,_DAR(r1)
1116 std r15,_DSISR(r1)
1117 @@ -2284,9 +2284,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.28/
1118 addi r3,r1,STACK_FRAME_OVERHEAD
1119 ld r4,_DAR(r1)
1120 bl .bad_page_fault
1121 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.28/arch/powerpc/kernel/exceptions-64s.S
1122 ---- linux-2.6.32.28/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
1123 -+++ linux-2.6.32.28/arch/powerpc/kernel/exceptions-64s.S 2010-12-31 14:46:53.000000000 -0500
1124 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.29/arch/powerpc/kernel/exceptions-64s.S
1125 +--- linux-2.6.32.29/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
1126 ++++ linux-2.6.32.29/arch/powerpc/kernel/exceptions-64s.S 2010-12-31 14:46:53.000000000 -0500
1127 @@ -818,10 +818,10 @@ handle_page_fault:
1128 11: ld r4,_DAR(r1)
1129 ld r5,_DSISR(r1)
1130 @@ -2299,9 +2299,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.28/
1131 mr r5,r3
1132 addi r3,r1,STACK_FRAME_OVERHEAD
1133 lwz r4,_DAR(r1)
1134 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/ibmebus.c linux-2.6.32.28/arch/powerpc/kernel/ibmebus.c
1135 ---- linux-2.6.32.28/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
1136 -+++ linux-2.6.32.28/arch/powerpc/kernel/ibmebus.c 2010-12-31 14:46:53.000000000 -0500
1137 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/ibmebus.c linux-2.6.32.29/arch/powerpc/kernel/ibmebus.c
1138 +--- linux-2.6.32.29/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
1139 ++++ linux-2.6.32.29/arch/powerpc/kernel/ibmebus.c 2010-12-31 14:46:53.000000000 -0500
1140 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
1141 return 1;
1142 }
1143 @@ -2311,9 +2311,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/ibmebus.c linux-2.6.32.28/arch/po
1144 .alloc_coherent = ibmebus_alloc_coherent,
1145 .free_coherent = ibmebus_free_coherent,
1146 .map_sg = ibmebus_map_sg,
1147 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/kgdb.c linux-2.6.32.28/arch/powerpc/kernel/kgdb.c
1148 ---- linux-2.6.32.28/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1149 -+++ linux-2.6.32.28/arch/powerpc/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1150 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/kgdb.c linux-2.6.32.29/arch/powerpc/kernel/kgdb.c
1151 +--- linux-2.6.32.29/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1152 ++++ linux-2.6.32.29/arch/powerpc/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1153 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
1154 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
1155 return 0;
1156 @@ -2332,9 +2332,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/kgdb.c linux-2.6.32.28/arch/power
1157 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
1158 };
1159
1160 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/module_32.c linux-2.6.32.28/arch/powerpc/kernel/module_32.c
1161 ---- linux-2.6.32.28/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
1162 -+++ linux-2.6.32.28/arch/powerpc/kernel/module_32.c 2010-12-31 14:46:53.000000000 -0500
1163 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/module_32.c linux-2.6.32.29/arch/powerpc/kernel/module_32.c
1164 +--- linux-2.6.32.29/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
1165 ++++ linux-2.6.32.29/arch/powerpc/kernel/module_32.c 2010-12-31 14:46:53.000000000 -0500
1166 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
1167 me->arch.core_plt_section = i;
1168 }
1169 @@ -2364,9 +2364,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/module_32.c linux-2.6.32.28/arch/
1170
1171 /* Find this entry, or if that fails, the next avail. entry */
1172 while (entry->jump[0]) {
1173 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/module.c linux-2.6.32.28/arch/powerpc/kernel/module.c
1174 ---- linux-2.6.32.28/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1175 -+++ linux-2.6.32.28/arch/powerpc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1176 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/module.c linux-2.6.32.29/arch/powerpc/kernel/module.c
1177 +--- linux-2.6.32.29/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1178 ++++ linux-2.6.32.29/arch/powerpc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1179 @@ -31,11 +31,24 @@
1180
1181 LIST_HEAD(module_bug_list);
1182 @@ -2406,9 +2406,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/module.c linux-2.6.32.28/arch/pow
1183 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
1184 const Elf_Shdr *sechdrs,
1185 const char *name)
1186 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/pci-common.c linux-2.6.32.28/arch/powerpc/kernel/pci-common.c
1187 ---- linux-2.6.32.28/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
1188 -+++ linux-2.6.32.28/arch/powerpc/kernel/pci-common.c 2010-12-31 14:46:53.000000000 -0500
1189 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/pci-common.c linux-2.6.32.29/arch/powerpc/kernel/pci-common.c
1190 +--- linux-2.6.32.29/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
1191 ++++ linux-2.6.32.29/arch/powerpc/kernel/pci-common.c 2010-12-31 14:46:53.000000000 -0500
1192 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
1193 unsigned int ppc_pci_flags = 0;
1194
1195 @@ -2427,9 +2427,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/pci-common.c linux-2.6.32.28/arch
1196 {
1197 return pci_dma_ops;
1198 }
1199 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/process.c linux-2.6.32.28/arch/powerpc/kernel/process.c
1200 ---- linux-2.6.32.28/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1201 -+++ linux-2.6.32.28/arch/powerpc/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1202 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/process.c linux-2.6.32.29/arch/powerpc/kernel/process.c
1203 +--- linux-2.6.32.29/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1204 ++++ linux-2.6.32.29/arch/powerpc/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1205 @@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
1206 * Lookup NIP late so we have the best change of getting the
1207 * above info out without failing
1208 @@ -2522,9 +2522,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/process.c linux-2.6.32.28/arch/po
1209 -
1210 - return ret;
1211 -}
1212 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/signal_32.c linux-2.6.32.28/arch/powerpc/kernel/signal_32.c
1213 ---- linux-2.6.32.28/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
1214 -+++ linux-2.6.32.28/arch/powerpc/kernel/signal_32.c 2010-12-31 14:46:53.000000000 -0500
1215 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/signal_32.c linux-2.6.32.29/arch/powerpc/kernel/signal_32.c
1216 +--- linux-2.6.32.29/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
1217 ++++ linux-2.6.32.29/arch/powerpc/kernel/signal_32.c 2010-12-31 14:46:53.000000000 -0500
1218 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
1219 /* Save user registers on the stack */
1220 frame = &rt_sf->uc.uc_mcontext;
1221 @@ -2534,9 +2534,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/signal_32.c linux-2.6.32.28/arch/
1222 if (save_user_regs(regs, frame, 0, 1))
1223 goto badframe;
1224 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
1225 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/signal_64.c linux-2.6.32.28/arch/powerpc/kernel/signal_64.c
1226 ---- linux-2.6.32.28/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
1227 -+++ linux-2.6.32.28/arch/powerpc/kernel/signal_64.c 2010-12-31 14:46:53.000000000 -0500
1228 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/signal_64.c linux-2.6.32.29/arch/powerpc/kernel/signal_64.c
1229 +--- linux-2.6.32.29/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
1230 ++++ linux-2.6.32.29/arch/powerpc/kernel/signal_64.c 2010-12-31 14:46:53.000000000 -0500
1231 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
1232 current->thread.fpscr.val = 0;
1233
1234 @@ -2546,9 +2546,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/signal_64.c linux-2.6.32.28/arch/
1235 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
1236 } else {
1237 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
1238 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.28/arch/powerpc/kernel/sys_ppc32.c
1239 ---- linux-2.6.32.28/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
1240 -+++ linux-2.6.32.28/arch/powerpc/kernel/sys_ppc32.c 2010-12-31 14:46:53.000000000 -0500
1241 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.29/arch/powerpc/kernel/sys_ppc32.c
1242 +--- linux-2.6.32.29/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
1243 ++++ linux-2.6.32.29/arch/powerpc/kernel/sys_ppc32.c 2010-12-31 14:46:53.000000000 -0500
1244 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
1245 if (oldlenp) {
1246 if (!error) {
1247 @@ -2562,9 +2562,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.28/arch/
1248 }
1249 return error;
1250 }
1251 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/vdso.c linux-2.6.32.28/arch/powerpc/kernel/vdso.c
1252 ---- linux-2.6.32.28/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
1253 -+++ linux-2.6.32.28/arch/powerpc/kernel/vdso.c 2010-12-31 14:46:53.000000000 -0500
1254 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/vdso.c linux-2.6.32.29/arch/powerpc/kernel/vdso.c
1255 +--- linux-2.6.32.29/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
1256 ++++ linux-2.6.32.29/arch/powerpc/kernel/vdso.c 2010-12-31 14:46:53.000000000 -0500
1257 @@ -36,6 +36,7 @@
1258 #include <asm/firmware.h>
1259 #include <asm/vdso.h>
1260 @@ -2591,9 +2591,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/vdso.c linux-2.6.32.28/arch/power
1261 if (IS_ERR_VALUE(vdso_base)) {
1262 rc = vdso_base;
1263 goto fail_mmapsem;
1264 -diff -urNp linux-2.6.32.28/arch/powerpc/kernel/vio.c linux-2.6.32.28/arch/powerpc/kernel/vio.c
1265 ---- linux-2.6.32.28/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
1266 -+++ linux-2.6.32.28/arch/powerpc/kernel/vio.c 2010-12-31 14:46:53.000000000 -0500
1267 +diff -urNp linux-2.6.32.29/arch/powerpc/kernel/vio.c linux-2.6.32.29/arch/powerpc/kernel/vio.c
1268 +--- linux-2.6.32.29/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
1269 ++++ linux-2.6.32.29/arch/powerpc/kernel/vio.c 2010-12-31 14:46:53.000000000 -0500
1270 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
1271 vio_cmo_dealloc(viodev, alloc_size);
1272 }
1273 @@ -2616,9 +2616,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/kernel/vio.c linux-2.6.32.28/arch/powerp
1274 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
1275 }
1276
1277 -diff -urNp linux-2.6.32.28/arch/powerpc/lib/usercopy_64.c linux-2.6.32.28/arch/powerpc/lib/usercopy_64.c
1278 ---- linux-2.6.32.28/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
1279 -+++ linux-2.6.32.28/arch/powerpc/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
1280 +diff -urNp linux-2.6.32.29/arch/powerpc/lib/usercopy_64.c linux-2.6.32.29/arch/powerpc/lib/usercopy_64.c
1281 +--- linux-2.6.32.29/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
1282 ++++ linux-2.6.32.29/arch/powerpc/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
1283 @@ -9,22 +9,6 @@
1284 #include <linux/module.h>
1285 #include <asm/uaccess.h>
1286 @@ -2650,9 +2650,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/lib/usercopy_64.c linux-2.6.32.28/arch/p
1287 -EXPORT_SYMBOL(copy_to_user);
1288 EXPORT_SYMBOL(copy_in_user);
1289
1290 -diff -urNp linux-2.6.32.28/arch/powerpc/mm/fault.c linux-2.6.32.28/arch/powerpc/mm/fault.c
1291 ---- linux-2.6.32.28/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
1292 -+++ linux-2.6.32.28/arch/powerpc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
1293 +diff -urNp linux-2.6.32.29/arch/powerpc/mm/fault.c linux-2.6.32.29/arch/powerpc/mm/fault.c
1294 +--- linux-2.6.32.29/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
1295 ++++ linux-2.6.32.29/arch/powerpc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
1296 @@ -30,6 +30,10 @@
1297 #include <linux/kprobes.h>
1298 #include <linux/kdebug.h>
1299 @@ -2757,9 +2757,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/mm/fault.c linux-2.6.32.28/arch/powerpc/
1300 _exception(SIGSEGV, regs, code, address);
1301 return 0;
1302 }
1303 -diff -urNp linux-2.6.32.28/arch/powerpc/mm/mmap_64.c linux-2.6.32.28/arch/powerpc/mm/mmap_64.c
1304 ---- linux-2.6.32.28/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
1305 -+++ linux-2.6.32.28/arch/powerpc/mm/mmap_64.c 2010-12-31 14:46:53.000000000 -0500
1306 +diff -urNp linux-2.6.32.29/arch/powerpc/mm/mmap_64.c linux-2.6.32.29/arch/powerpc/mm/mmap_64.c
1307 +--- linux-2.6.32.29/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
1308 ++++ linux-2.6.32.29/arch/powerpc/mm/mmap_64.c 2010-12-31 14:46:53.000000000 -0500
1309 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
1310 */
1311 if (mmap_is_legacy()) {
1312 @@ -2783,9 +2783,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/mm/mmap_64.c linux-2.6.32.28/arch/powerp
1313 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
1314 mm->unmap_area = arch_unmap_area_topdown;
1315 }
1316 -diff -urNp linux-2.6.32.28/arch/powerpc/mm/slice.c linux-2.6.32.28/arch/powerpc/mm/slice.c
1317 ---- linux-2.6.32.28/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
1318 -+++ linux-2.6.32.28/arch/powerpc/mm/slice.c 2010-12-31 14:46:53.000000000 -0500
1319 +diff -urNp linux-2.6.32.29/arch/powerpc/mm/slice.c linux-2.6.32.29/arch/powerpc/mm/slice.c
1320 +--- linux-2.6.32.29/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
1321 ++++ linux-2.6.32.29/arch/powerpc/mm/slice.c 2010-12-31 14:46:53.000000000 -0500
1322 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
1323 if ((mm->task_size - len) < addr)
1324 return 0;
1325 @@ -2825,9 +2825,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/mm/slice.c linux-2.6.32.28/arch/powerpc/
1326 /* If hint, make sure it matches our alignment restrictions */
1327 if (!fixed && addr) {
1328 addr = _ALIGN_UP(addr, 1ul << pshift);
1329 -diff -urNp linux-2.6.32.28/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.28/arch/powerpc/platforms/52xx/lite5200_pm.c
1330 ---- linux-2.6.32.28/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
1331 -+++ linux-2.6.32.28/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-31 14:46:53.000000000 -0500
1332 +diff -urNp linux-2.6.32.29/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.29/arch/powerpc/platforms/52xx/lite5200_pm.c
1333 +--- linux-2.6.32.29/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
1334 ++++ linux-2.6.32.29/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-31 14:46:53.000000000 -0500
1335 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
1336 lite5200_pm_target_state = PM_SUSPEND_ON;
1337 }
1338 @@ -2837,9 +2837,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
1339 .valid = lite5200_pm_valid,
1340 .begin = lite5200_pm_begin,
1341 .prepare = lite5200_pm_prepare,
1342 -diff -urNp linux-2.6.32.28/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.28/arch/powerpc/platforms/52xx/mpc52xx_pm.c
1343 ---- linux-2.6.32.28/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
1344 -+++ linux-2.6.32.28/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-31 14:46:53.000000000 -0500
1345 +diff -urNp linux-2.6.32.29/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.29/arch/powerpc/platforms/52xx/mpc52xx_pm.c
1346 +--- linux-2.6.32.29/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
1347 ++++ linux-2.6.32.29/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-31 14:46:53.000000000 -0500
1348 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
1349 iounmap(mbar);
1350 }
1351 @@ -2849,9 +2849,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
1352 .valid = mpc52xx_pm_valid,
1353 .prepare = mpc52xx_pm_prepare,
1354 .enter = mpc52xx_pm_enter,
1355 -diff -urNp linux-2.6.32.28/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.28/arch/powerpc/platforms/83xx/suspend.c
1356 ---- linux-2.6.32.28/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
1357 -+++ linux-2.6.32.28/arch/powerpc/platforms/83xx/suspend.c 2010-12-31 14:46:53.000000000 -0500
1358 +diff -urNp linux-2.6.32.29/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.29/arch/powerpc/platforms/83xx/suspend.c
1359 +--- linux-2.6.32.29/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
1360 ++++ linux-2.6.32.29/arch/powerpc/platforms/83xx/suspend.c 2010-12-31 14:46:53.000000000 -0500
1361 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
1362 return ret;
1363 }
1364 @@ -2861,9 +2861,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.28
1365 .valid = mpc83xx_suspend_valid,
1366 .begin = mpc83xx_suspend_begin,
1367 .enter = mpc83xx_suspend_enter,
1368 -diff -urNp linux-2.6.32.28/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.28/arch/powerpc/platforms/cell/iommu.c
1369 ---- linux-2.6.32.28/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
1370 -+++ linux-2.6.32.28/arch/powerpc/platforms/cell/iommu.c 2010-12-31 14:46:53.000000000 -0500
1371 +diff -urNp linux-2.6.32.29/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.29/arch/powerpc/platforms/cell/iommu.c
1372 +--- linux-2.6.32.29/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
1373 ++++ linux-2.6.32.29/arch/powerpc/platforms/cell/iommu.c 2010-12-31 14:46:53.000000000 -0500
1374 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
1375
1376 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
1377 @@ -2873,9 +2873,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.28/a
1378 .alloc_coherent = dma_fixed_alloc_coherent,
1379 .free_coherent = dma_fixed_free_coherent,
1380 .map_sg = dma_fixed_map_sg,
1381 -diff -urNp linux-2.6.32.28/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.28/arch/powerpc/platforms/ps3/system-bus.c
1382 ---- linux-2.6.32.28/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
1383 -+++ linux-2.6.32.28/arch/powerpc/platforms/ps3/system-bus.c 2010-12-31 14:46:53.000000000 -0500
1384 +diff -urNp linux-2.6.32.29/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.29/arch/powerpc/platforms/ps3/system-bus.c
1385 +--- linux-2.6.32.29/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
1386 ++++ linux-2.6.32.29/arch/powerpc/platforms/ps3/system-bus.c 2010-12-31 14:46:53.000000000 -0500
1387 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
1388 return mask >= DMA_BIT_MASK(32);
1389 }
1390 @@ -2894,9 +2894,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
1391 .alloc_coherent = ps3_alloc_coherent,
1392 .free_coherent = ps3_free_coherent,
1393 .map_sg = ps3_ioc0_map_sg,
1394 -diff -urNp linux-2.6.32.28/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.28/arch/powerpc/platforms/pseries/Kconfig
1395 ---- linux-2.6.32.28/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
1396 -+++ linux-2.6.32.28/arch/powerpc/platforms/pseries/Kconfig 2010-12-31 14:46:53.000000000 -0500
1397 +diff -urNp linux-2.6.32.29/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.29/arch/powerpc/platforms/pseries/Kconfig
1398 +--- linux-2.6.32.29/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
1399 ++++ linux-2.6.32.29/arch/powerpc/platforms/pseries/Kconfig 2010-12-31 14:46:53.000000000 -0500
1400 @@ -2,6 +2,8 @@ config PPC_PSERIES
1401 depends on PPC64 && PPC_BOOK3S
1402 bool "IBM pSeries & new (POWER5-based) iSeries"
1403 @@ -2906,9 +2906,9 @@ diff -urNp linux-2.6.32.28/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.2
1404 select PPC_I8259
1405 select PPC_RTAS
1406 select RTAS_ERROR_LOGGING
1407 -diff -urNp linux-2.6.32.28/arch/s390/include/asm/elf.h linux-2.6.32.28/arch/s390/include/asm/elf.h
1408 ---- linux-2.6.32.28/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
1409 -+++ linux-2.6.32.28/arch/s390/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
1410 +diff -urNp linux-2.6.32.29/arch/s390/include/asm/elf.h linux-2.6.32.29/arch/s390/include/asm/elf.h
1411 +--- linux-2.6.32.29/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
1412 ++++ linux-2.6.32.29/arch/s390/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
1413 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
1414 that it will "exec", and that there is sufficient room for the brk. */
1415 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
1416 @@ -2923,9 +2923,24 @@ diff -urNp linux-2.6.32.28/arch/s390/include/asm/elf.h linux-2.6.32.28/arch/s390
1417 /* This yields a mask that user programs can use to figure out what
1418 instruction set this CPU supports. */
1419
1420 -diff -urNp linux-2.6.32.28/arch/s390/include/asm/setup.h linux-2.6.32.28/arch/s390/include/asm/setup.h
1421 ---- linux-2.6.32.28/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
1422 -+++ linux-2.6.32.28/arch/s390/include/asm/setup.h 2010-12-31 14:46:53.000000000 -0500
1423 +diff -urNp linux-2.6.32.29/arch/s390/include/asm/processor.h linux-2.6.32.29/arch/s390/include/asm/processor.h
1424 +--- linux-2.6.32.29/arch/s390/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400
1425 ++++ linux-2.6.32.29/arch/s390/include/asm/processor.h 2011-02-22 16:33:50.000000000 -0500
1426 +@@ -150,11 +150,6 @@ extern int kernel_thread(int (*fn)(void
1427 + */
1428 + extern unsigned long thread_saved_pc(struct task_struct *t);
1429 +
1430 +-/*
1431 +- * Print register of task into buffer. Used in fs/proc/array.c.
1432 +- */
1433 +-extern void task_show_regs(struct seq_file *m, struct task_struct *task);
1434 +-
1435 + extern void show_code(struct pt_regs *regs);
1436 +
1437 + unsigned long get_wchan(struct task_struct *p);
1438 +diff -urNp linux-2.6.32.29/arch/s390/include/asm/setup.h linux-2.6.32.29/arch/s390/include/asm/setup.h
1439 +--- linux-2.6.32.29/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
1440 ++++ linux-2.6.32.29/arch/s390/include/asm/setup.h 2010-12-31 14:46:53.000000000 -0500
1441 @@ -50,13 +50,13 @@ extern unsigned long memory_end;
1442 void detect_memory_layout(struct mem_chunk chunk[]);
1443
1444 @@ -2942,9 +2957,9 @@ diff -urNp linux-2.6.32.28/arch/s390/include/asm/setup.h linux-2.6.32.28/arch/s3
1445 #else
1446 #define s390_noexec (0)
1447 #endif
1448 -diff -urNp linux-2.6.32.28/arch/s390/include/asm/uaccess.h linux-2.6.32.28/arch/s390/include/asm/uaccess.h
1449 ---- linux-2.6.32.28/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1450 -+++ linux-2.6.32.28/arch/s390/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1451 +diff -urNp linux-2.6.32.29/arch/s390/include/asm/uaccess.h linux-2.6.32.29/arch/s390/include/asm/uaccess.h
1452 +--- linux-2.6.32.29/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1453 ++++ linux-2.6.32.29/arch/s390/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1454 @@ -232,6 +232,10 @@ static inline unsigned long __must_check
1455 copy_to_user(void __user *to, const void *from, unsigned long n)
1456 {
1457 @@ -2977,9 +2992,9 @@ diff -urNp linux-2.6.32.28/arch/s390/include/asm/uaccess.h linux-2.6.32.28/arch/
1458 if (access_ok(VERIFY_READ, from, n))
1459 n = __copy_from_user(to, from, n);
1460 else
1461 -diff -urNp linux-2.6.32.28/arch/s390/Kconfig linux-2.6.32.28/arch/s390/Kconfig
1462 ---- linux-2.6.32.28/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
1463 -+++ linux-2.6.32.28/arch/s390/Kconfig 2010-12-31 14:46:53.000000000 -0500
1464 +diff -urNp linux-2.6.32.29/arch/s390/Kconfig linux-2.6.32.29/arch/s390/Kconfig
1465 +--- linux-2.6.32.29/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
1466 ++++ linux-2.6.32.29/arch/s390/Kconfig 2010-12-31 14:46:53.000000000 -0500
1467 @@ -194,28 +194,26 @@ config AUDIT_ARCH
1468
1469 config S390_SWITCH_AMODE
1470 @@ -3017,9 +3032,9 @@ diff -urNp linux-2.6.32.28/arch/s390/Kconfig linux-2.6.32.28/arch/s390/Kconfig
1471
1472 comment "Code generation options"
1473
1474 -diff -urNp linux-2.6.32.28/arch/s390/kernel/module.c linux-2.6.32.28/arch/s390/kernel/module.c
1475 ---- linux-2.6.32.28/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1476 -+++ linux-2.6.32.28/arch/s390/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1477 +diff -urNp linux-2.6.32.29/arch/s390/kernel/module.c linux-2.6.32.29/arch/s390/kernel/module.c
1478 +--- linux-2.6.32.29/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1479 ++++ linux-2.6.32.29/arch/s390/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
1480 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
1481
1482 /* Increase core size by size of got & plt and set start
1483 @@ -3091,9 +3106,9 @@ diff -urNp linux-2.6.32.28/arch/s390/kernel/module.c linux-2.6.32.28/arch/s390/k
1484 rela->r_addend - loc;
1485 if (r_type == R_390_GOTPC)
1486 *(unsigned int *) loc = val;
1487 -diff -urNp linux-2.6.32.28/arch/s390/kernel/setup.c linux-2.6.32.28/arch/s390/kernel/setup.c
1488 ---- linux-2.6.32.28/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
1489 -+++ linux-2.6.32.28/arch/s390/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
1490 +diff -urNp linux-2.6.32.29/arch/s390/kernel/setup.c linux-2.6.32.29/arch/s390/kernel/setup.c
1491 +--- linux-2.6.32.29/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
1492 ++++ linux-2.6.32.29/arch/s390/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
1493 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
1494 early_param("mem", early_parse_mem);
1495
1496 @@ -3147,9 +3162,56 @@ diff -urNp linux-2.6.32.28/arch/s390/kernel/setup.c linux-2.6.32.28/arch/s390/ke
1497 static void setup_addressing_mode(void)
1498 {
1499 if (s390_noexec) {
1500 -diff -urNp linux-2.6.32.28/arch/s390/mm/mmap.c linux-2.6.32.28/arch/s390/mm/mmap.c
1501 ---- linux-2.6.32.28/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1502 -+++ linux-2.6.32.28/arch/s390/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
1503 +diff -urNp linux-2.6.32.29/arch/s390/kernel/traps.c linux-2.6.32.29/arch/s390/kernel/traps.c
1504 +--- linux-2.6.32.29/arch/s390/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
1505 ++++ linux-2.6.32.29/arch/s390/kernel/traps.c 2011-02-22 16:34:04.000000000 -0500
1506 +@@ -243,43 +243,6 @@ void show_regs(struct pt_regs *regs)
1507 + show_last_breaking_event(regs);
1508 + }
1509 +
1510 +-/* This is called from fs/proc/array.c */
1511 +-void task_show_regs(struct seq_file *m, struct task_struct *task)
1512 +-{
1513 +- struct pt_regs *regs;
1514 +-
1515 +- regs = task_pt_regs(task);
1516 +- seq_printf(m, "task: %p, ksp: %p\n",
1517 +- task, (void *)task->thread.ksp);
1518 +- seq_printf(m, "User PSW : %p %p\n",
1519 +- (void *) regs->psw.mask, (void *)regs->psw.addr);
1520 +-
1521 +- seq_printf(m, "User GPRS: " FOURLONG,
1522 +- regs->gprs[0], regs->gprs[1],
1523 +- regs->gprs[2], regs->gprs[3]);
1524 +- seq_printf(m, " " FOURLONG,
1525 +- regs->gprs[4], regs->gprs[5],
1526 +- regs->gprs[6], regs->gprs[7]);
1527 +- seq_printf(m, " " FOURLONG,
1528 +- regs->gprs[8], regs->gprs[9],
1529 +- regs->gprs[10], regs->gprs[11]);
1530 +- seq_printf(m, " " FOURLONG,
1531 +- regs->gprs[12], regs->gprs[13],
1532 +- regs->gprs[14], regs->gprs[15]);
1533 +- seq_printf(m, "User ACRS: %08x %08x %08x %08x\n",
1534 +- task->thread.acrs[0], task->thread.acrs[1],
1535 +- task->thread.acrs[2], task->thread.acrs[3]);
1536 +- seq_printf(m, " %08x %08x %08x %08x\n",
1537 +- task->thread.acrs[4], task->thread.acrs[5],
1538 +- task->thread.acrs[6], task->thread.acrs[7]);
1539 +- seq_printf(m, " %08x %08x %08x %08x\n",
1540 +- task->thread.acrs[8], task->thread.acrs[9],
1541 +- task->thread.acrs[10], task->thread.acrs[11]);
1542 +- seq_printf(m, " %08x %08x %08x %08x\n",
1543 +- task->thread.acrs[12], task->thread.acrs[13],
1544 +- task->thread.acrs[14], task->thread.acrs[15]);
1545 +-}
1546 +-
1547 + static DEFINE_SPINLOCK(die_lock);
1548 +
1549 + void die(const char * str, struct pt_regs * regs, long err)
1550 +diff -urNp linux-2.6.32.29/arch/s390/mm/mmap.c linux-2.6.32.29/arch/s390/mm/mmap.c
1551 +--- linux-2.6.32.29/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1552 ++++ linux-2.6.32.29/arch/s390/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
1553 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
1554 */
1555 if (mmap_is_legacy()) {
1556 @@ -3196,9 +3258,9 @@ diff -urNp linux-2.6.32.28/arch/s390/mm/mmap.c linux-2.6.32.28/arch/s390/mm/mmap
1557 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
1558 mm->unmap_area = arch_unmap_area_topdown;
1559 }
1560 -diff -urNp linux-2.6.32.28/arch/score/include/asm/system.h linux-2.6.32.28/arch/score/include/asm/system.h
1561 ---- linux-2.6.32.28/arch/score/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
1562 -+++ linux-2.6.32.28/arch/score/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
1563 +diff -urNp linux-2.6.32.29/arch/score/include/asm/system.h linux-2.6.32.29/arch/score/include/asm/system.h
1564 +--- linux-2.6.32.29/arch/score/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
1565 ++++ linux-2.6.32.29/arch/score/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
1566 @@ -17,7 +17,7 @@ do { \
1567 #define finish_arch_switch(prev) do {} while (0)
1568
1569 @@ -3208,9 +3270,9 @@ diff -urNp linux-2.6.32.28/arch/score/include/asm/system.h linux-2.6.32.28/arch/
1570
1571 #define mb() barrier()
1572 #define rmb() barrier()
1573 -diff -urNp linux-2.6.32.28/arch/score/kernel/process.c linux-2.6.32.28/arch/score/kernel/process.c
1574 ---- linux-2.6.32.28/arch/score/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1575 -+++ linux-2.6.32.28/arch/score/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1576 +diff -urNp linux-2.6.32.29/arch/score/kernel/process.c linux-2.6.32.29/arch/score/kernel/process.c
1577 +--- linux-2.6.32.29/arch/score/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1578 ++++ linux-2.6.32.29/arch/score/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
1579 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
1580
1581 return task_pt_regs(task)->cp0_epc;
1582 @@ -3220,9 +3282,9 @@ diff -urNp linux-2.6.32.28/arch/score/kernel/process.c linux-2.6.32.28/arch/scor
1583 -{
1584 - return sp;
1585 -}
1586 -diff -urNp linux-2.6.32.28/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.28/arch/sh/boards/mach-hp6xx/pm.c
1587 ---- linux-2.6.32.28/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
1588 -+++ linux-2.6.32.28/arch/sh/boards/mach-hp6xx/pm.c 2010-12-31 14:46:53.000000000 -0500
1589 +diff -urNp linux-2.6.32.29/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.29/arch/sh/boards/mach-hp6xx/pm.c
1590 +--- linux-2.6.32.29/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
1591 ++++ linux-2.6.32.29/arch/sh/boards/mach-hp6xx/pm.c 2010-12-31 14:46:53.000000000 -0500
1592 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
1593 return 0;
1594 }
1595 @@ -3232,9 +3294,9 @@ diff -urNp linux-2.6.32.28/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.28/arch/s
1596 .enter = hp6x0_pm_enter,
1597 .valid = suspend_valid_only_mem,
1598 };
1599 -diff -urNp linux-2.6.32.28/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.28/arch/sh/kernel/cpu/sh4/sq.c
1600 ---- linux-2.6.32.28/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
1601 -+++ linux-2.6.32.28/arch/sh/kernel/cpu/sh4/sq.c 2010-12-31 14:46:53.000000000 -0500
1602 +diff -urNp linux-2.6.32.29/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.29/arch/sh/kernel/cpu/sh4/sq.c
1603 +--- linux-2.6.32.29/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
1604 ++++ linux-2.6.32.29/arch/sh/kernel/cpu/sh4/sq.c 2010-12-31 14:46:53.000000000 -0500
1605 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
1606 NULL,
1607 };
1608 @@ -3244,9 +3306,9 @@ diff -urNp linux-2.6.32.28/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.28/arch/sh/k
1609 .show = sq_sysfs_show,
1610 .store = sq_sysfs_store,
1611 };
1612 -diff -urNp linux-2.6.32.28/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.28/arch/sh/kernel/cpu/shmobile/pm.c
1613 ---- linux-2.6.32.28/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
1614 -+++ linux-2.6.32.28/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-31 14:46:53.000000000 -0500
1615 +diff -urNp linux-2.6.32.29/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.29/arch/sh/kernel/cpu/shmobile/pm.c
1616 +--- linux-2.6.32.29/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
1617 ++++ linux-2.6.32.29/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-31 14:46:53.000000000 -0500
1618 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
1619 return 0;
1620 }
1621 @@ -3256,9 +3318,9 @@ diff -urNp linux-2.6.32.28/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.28/arch
1622 .enter = sh_pm_enter,
1623 .valid = suspend_valid_only_mem,
1624 };
1625 -diff -urNp linux-2.6.32.28/arch/sh/kernel/kgdb.c linux-2.6.32.28/arch/sh/kernel/kgdb.c
1626 ---- linux-2.6.32.28/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1627 -+++ linux-2.6.32.28/arch/sh/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1628 +diff -urNp linux-2.6.32.29/arch/sh/kernel/kgdb.c linux-2.6.32.29/arch/sh/kernel/kgdb.c
1629 +--- linux-2.6.32.29/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1630 ++++ linux-2.6.32.29/arch/sh/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
1631 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
1632 {
1633 }
1634 @@ -3268,9 +3330,9 @@ diff -urNp linux-2.6.32.28/arch/sh/kernel/kgdb.c linux-2.6.32.28/arch/sh/kernel/
1635 /* Breakpoint instruction: trapa #0x3c */
1636 #ifdef CONFIG_CPU_LITTLE_ENDIAN
1637 .gdb_bpt_instr = { 0x3c, 0xc3 },
1638 -diff -urNp linux-2.6.32.28/arch/sh/mm/mmap.c linux-2.6.32.28/arch/sh/mm/mmap.c
1639 ---- linux-2.6.32.28/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1640 -+++ linux-2.6.32.28/arch/sh/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
1641 +diff -urNp linux-2.6.32.29/arch/sh/mm/mmap.c linux-2.6.32.29/arch/sh/mm/mmap.c
1642 +--- linux-2.6.32.29/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
1643 ++++ linux-2.6.32.29/arch/sh/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
1644 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
1645 addr = PAGE_ALIGN(addr);
1646
1647 @@ -3318,9 +3380,9 @@ diff -urNp linux-2.6.32.28/arch/sh/mm/mmap.c linux-2.6.32.28/arch/sh/mm/mmap.c
1648 /* remember the address as a hint for next time */
1649 return (mm->free_area_cache = addr);
1650 }
1651 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/atomic_64.h linux-2.6.32.28/arch/sparc/include/asm/atomic_64.h
1652 ---- linux-2.6.32.28/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
1653 -+++ linux-2.6.32.28/arch/sparc/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
1654 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/atomic_64.h linux-2.6.32.29/arch/sparc/include/asm/atomic_64.h
1655 +--- linux-2.6.32.29/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
1656 ++++ linux-2.6.32.29/arch/sparc/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
1657 @@ -14,18 +14,40 @@
1658 #define ATOMIC64_INIT(i) { (i) }
1659
1660 @@ -3471,9 +3533,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/atomic_64.h linux-2.6.32.28/ar
1661 }
1662
1663 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
1664 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.28/arch/sparc/include/asm/dma-mapping.h
1665 ---- linux-2.6.32.28/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
1666 -+++ linux-2.6.32.28/arch/sparc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
1667 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.29/arch/sparc/include/asm/dma-mapping.h
1668 +--- linux-2.6.32.29/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
1669 ++++ linux-2.6.32.29/arch/sparc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
1670 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
1671 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
1672 #define dma_is_consistent(d, h) (1)
1673 @@ -3505,9 +3567,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.28/
1674
1675 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
1676 ops->free_coherent(dev, size, cpu_addr, dma_handle);
1677 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/elf_32.h linux-2.6.32.28/arch/sparc/include/asm/elf_32.h
1678 ---- linux-2.6.32.28/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
1679 -+++ linux-2.6.32.28/arch/sparc/include/asm/elf_32.h 2010-12-31 14:46:53.000000000 -0500
1680 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/elf_32.h linux-2.6.32.29/arch/sparc/include/asm/elf_32.h
1681 +--- linux-2.6.32.29/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
1682 ++++ linux-2.6.32.29/arch/sparc/include/asm/elf_32.h 2010-12-31 14:46:53.000000000 -0500
1683 @@ -116,6 +116,13 @@ typedef struct {
1684
1685 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
1686 @@ -3522,9 +3584,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/elf_32.h linux-2.6.32.28/arch/
1687 /* This yields a mask that user programs can use to figure out what
1688 instruction set this cpu supports. This can NOT be done in userspace
1689 on Sparc. */
1690 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/elf_64.h linux-2.6.32.28/arch/sparc/include/asm/elf_64.h
1691 ---- linux-2.6.32.28/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
1692 -+++ linux-2.6.32.28/arch/sparc/include/asm/elf_64.h 2010-12-31 14:46:53.000000000 -0500
1693 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/elf_64.h linux-2.6.32.29/arch/sparc/include/asm/elf_64.h
1694 +--- linux-2.6.32.29/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
1695 ++++ linux-2.6.32.29/arch/sparc/include/asm/elf_64.h 2010-12-31 14:46:53.000000000 -0500
1696 @@ -163,6 +163,12 @@ typedef struct {
1697 #define ELF_ET_DYN_BASE 0x0000010000000000UL
1698 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
1699 @@ -3538,9 +3600,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/elf_64.h linux-2.6.32.28/arch/
1700
1701 /* This yields a mask that user programs can use to figure out what
1702 instruction set this cpu supports. */
1703 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.28/arch/sparc/include/asm/pgtable_32.h
1704 ---- linux-2.6.32.28/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
1705 -+++ linux-2.6.32.28/arch/sparc/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
1706 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.29/arch/sparc/include/asm/pgtable_32.h
1707 +--- linux-2.6.32.29/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
1708 ++++ linux-2.6.32.29/arch/sparc/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
1709 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
1710 BTFIXUPDEF_INT(page_none)
1711 BTFIXUPDEF_INT(page_copy)
1712 @@ -3572,9 +3634,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.28/a
1713 extern unsigned long page_kernel;
1714
1715 #ifdef MODULE
1716 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.28/arch/sparc/include/asm/pgtsrmmu.h
1717 ---- linux-2.6.32.28/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
1718 -+++ linux-2.6.32.28/arch/sparc/include/asm/pgtsrmmu.h 2010-12-31 14:46:53.000000000 -0500
1719 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.29/arch/sparc/include/asm/pgtsrmmu.h
1720 +--- linux-2.6.32.29/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
1721 ++++ linux-2.6.32.29/arch/sparc/include/asm/pgtsrmmu.h 2010-12-31 14:46:53.000000000 -0500
1722 @@ -115,6 +115,13 @@
1723 SRMMU_EXEC | SRMMU_REF)
1724 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
1725 @@ -3589,9 +3651,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.28/arc
1726 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
1727 SRMMU_DIRTY | SRMMU_REF)
1728
1729 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.28/arch/sparc/include/asm/spinlock_64.h
1730 ---- linux-2.6.32.28/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
1731 -+++ linux-2.6.32.28/arch/sparc/include/asm/spinlock_64.h 2010-12-31 14:46:53.000000000 -0500
1732 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.29/arch/sparc/include/asm/spinlock_64.h
1733 +--- linux-2.6.32.29/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
1734 ++++ linux-2.6.32.29/arch/sparc/include/asm/spinlock_64.h 2010-12-31 14:46:53.000000000 -0500
1735 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
1736 __asm__ __volatile__ (
1737 "1: ldsw [%2], %0\n"
1738 @@ -3643,9 +3705,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.28/
1739 " cas [%2], %0, %1\n"
1740 " cmp %0, %1\n"
1741 " bne,pn %%xcc, 1b\n"
1742 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.28/arch/sparc/include/asm/uaccess_32.h
1743 ---- linux-2.6.32.28/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
1744 -+++ linux-2.6.32.28/arch/sparc/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
1745 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.29/arch/sparc/include/asm/uaccess_32.h
1746 +--- linux-2.6.32.29/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
1747 ++++ linux-2.6.32.29/arch/sparc/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
1748 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
1749
1750 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
1751 @@ -3697,9 +3759,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.28/a
1752 return __copy_user((__force void __user *) to, from, n);
1753 }
1754
1755 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.28/arch/sparc/include/asm/uaccess_64.h
1756 ---- linux-2.6.32.28/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
1757 -+++ linux-2.6.32.28/arch/sparc/include/asm/uaccess_64.h 2010-12-31 14:46:53.000000000 -0500
1758 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.29/arch/sparc/include/asm/uaccess_64.h
1759 +--- linux-2.6.32.29/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
1760 ++++ linux-2.6.32.29/arch/sparc/include/asm/uaccess_64.h 2010-12-31 14:46:53.000000000 -0500
1761 @@ -9,6 +9,7 @@
1762 #include <linux/compiler.h>
1763 #include <linux/string.h>
1764 @@ -3742,9 +3804,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.28/a
1765 if (unlikely(ret))
1766 ret = copy_to_user_fixup(to, from, size);
1767 return ret;
1768 -diff -urNp linux-2.6.32.28/arch/sparc/include/asm/uaccess.h linux-2.6.32.28/arch/sparc/include/asm/uaccess.h
1769 ---- linux-2.6.32.28/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1770 -+++ linux-2.6.32.28/arch/sparc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1771 +diff -urNp linux-2.6.32.29/arch/sparc/include/asm/uaccess.h linux-2.6.32.29/arch/sparc/include/asm/uaccess.h
1772 +--- linux-2.6.32.29/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
1773 ++++ linux-2.6.32.29/arch/sparc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
1774 @@ -1,5 +1,13 @@
1775 #ifndef ___ASM_SPARC_UACCESS_H
1776 #define ___ASM_SPARC_UACCESS_H
1777 @@ -3759,9 +3821,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/include/asm/uaccess.h linux-2.6.32.28/arch
1778 #if defined(__sparc__) && defined(__arch64__)
1779 #include <asm/uaccess_64.h>
1780 #else
1781 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/iommu.c linux-2.6.32.28/arch/sparc/kernel/iommu.c
1782 ---- linux-2.6.32.28/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
1783 -+++ linux-2.6.32.28/arch/sparc/kernel/iommu.c 2010-12-31 14:46:53.000000000 -0500
1784 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/iommu.c linux-2.6.32.29/arch/sparc/kernel/iommu.c
1785 +--- linux-2.6.32.29/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
1786 ++++ linux-2.6.32.29/arch/sparc/kernel/iommu.c 2010-12-31 14:46:53.000000000 -0500
1787 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
1788 spin_unlock_irqrestore(&iommu->lock, flags);
1789 }
1790 @@ -3780,9 +3842,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/iommu.c linux-2.6.32.28/arch/sparc/
1791 EXPORT_SYMBOL(dma_ops);
1792
1793 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
1794 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/ioport.c linux-2.6.32.28/arch/sparc/kernel/ioport.c
1795 ---- linux-2.6.32.28/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
1796 -+++ linux-2.6.32.28/arch/sparc/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
1797 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/ioport.c linux-2.6.32.29/arch/sparc/kernel/ioport.c
1798 +--- linux-2.6.32.29/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
1799 ++++ linux-2.6.32.29/arch/sparc/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
1800 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
1801 BUG();
1802 }
1803 @@ -3810,9 +3872,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/ioport.c linux-2.6.32.28/arch/sparc
1804 .alloc_coherent = pci32_alloc_coherent,
1805 .free_coherent = pci32_free_coherent,
1806 .map_page = pci32_map_page,
1807 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/kgdb_32.c linux-2.6.32.28/arch/sparc/kernel/kgdb_32.c
1808 ---- linux-2.6.32.28/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
1809 -+++ linux-2.6.32.28/arch/sparc/kernel/kgdb_32.c 2010-12-31 14:46:53.000000000 -0500
1810 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/kgdb_32.c linux-2.6.32.29/arch/sparc/kernel/kgdb_32.c
1811 +--- linux-2.6.32.29/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
1812 ++++ linux-2.6.32.29/arch/sparc/kernel/kgdb_32.c 2010-12-31 14:46:53.000000000 -0500
1813 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
1814 {
1815 }
1816 @@ -3822,9 +3884,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/kgdb_32.c linux-2.6.32.28/arch/spar
1817 /* Breakpoint instruction: ta 0x7d */
1818 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
1819 };
1820 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/kgdb_64.c linux-2.6.32.28/arch/sparc/kernel/kgdb_64.c
1821 ---- linux-2.6.32.28/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
1822 -+++ linux-2.6.32.28/arch/sparc/kernel/kgdb_64.c 2010-12-31 14:46:53.000000000 -0500
1823 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/kgdb_64.c linux-2.6.32.29/arch/sparc/kernel/kgdb_64.c
1824 +--- linux-2.6.32.29/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
1825 ++++ linux-2.6.32.29/arch/sparc/kernel/kgdb_64.c 2010-12-31 14:46:53.000000000 -0500
1826 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
1827 {
1828 }
1829 @@ -3834,9 +3896,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/kgdb_64.c linux-2.6.32.28/arch/spar
1830 /* Breakpoint instruction: ta 0x72 */
1831 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
1832 };
1833 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/Makefile linux-2.6.32.28/arch/sparc/kernel/Makefile
1834 ---- linux-2.6.32.28/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
1835 -+++ linux-2.6.32.28/arch/sparc/kernel/Makefile 2010-12-31 14:46:53.000000000 -0500
1836 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/Makefile linux-2.6.32.29/arch/sparc/kernel/Makefile
1837 +--- linux-2.6.32.29/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
1838 ++++ linux-2.6.32.29/arch/sparc/kernel/Makefile 2010-12-31 14:46:53.000000000 -0500
1839 @@ -3,7 +3,7 @@
1840 #
1841
1842 @@ -3846,9 +3908,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/Makefile linux-2.6.32.28/arch/sparc
1843
1844 extra-y := head_$(BITS).o
1845 extra-y += init_task.o
1846 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.28/arch/sparc/kernel/pci_sun4v.c
1847 ---- linux-2.6.32.28/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
1848 -+++ linux-2.6.32.28/arch/sparc/kernel/pci_sun4v.c 2010-12-31 14:46:53.000000000 -0500
1849 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.29/arch/sparc/kernel/pci_sun4v.c
1850 +--- linux-2.6.32.29/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
1851 ++++ linux-2.6.32.29/arch/sparc/kernel/pci_sun4v.c 2010-12-31 14:46:53.000000000 -0500
1852 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
1853 spin_unlock_irqrestore(&iommu->lock, flags);
1854 }
1855 @@ -3858,9 +3920,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.28/arch/sp
1856 .alloc_coherent = dma_4v_alloc_coherent,
1857 .free_coherent = dma_4v_free_coherent,
1858 .map_page = dma_4v_map_page,
1859 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/process_32.c linux-2.6.32.28/arch/sparc/kernel/process_32.c
1860 ---- linux-2.6.32.28/arch/sparc/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
1861 -+++ linux-2.6.32.28/arch/sparc/kernel/process_32.c 2010-12-31 14:46:53.000000000 -0500
1862 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/process_32.c linux-2.6.32.29/arch/sparc/kernel/process_32.c
1863 +--- linux-2.6.32.29/arch/sparc/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
1864 ++++ linux-2.6.32.29/arch/sparc/kernel/process_32.c 2010-12-31 14:46:53.000000000 -0500
1865 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
1866 rw->ins[4], rw->ins[5],
1867 rw->ins[6],
1868 @@ -3896,9 +3958,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/process_32.c linux-2.6.32.28/arch/s
1869 fp = rw->ins[6];
1870 } while (++count < 16);
1871 printk("\n");
1872 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/process_64.c linux-2.6.32.28/arch/sparc/kernel/process_64.c
1873 ---- linux-2.6.32.28/arch/sparc/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
1874 -+++ linux-2.6.32.28/arch/sparc/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
1875 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/process_64.c linux-2.6.32.29/arch/sparc/kernel/process_64.c
1876 +--- linux-2.6.32.29/arch/sparc/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
1877 ++++ linux-2.6.32.29/arch/sparc/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
1878 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
1879 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
1880 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
1881 @@ -3934,9 +3996,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/process_64.c linux-2.6.32.28/arch/s
1882 (void *) gp->tpc,
1883 (void *) gp->o7,
1884 (void *) gp->i7,
1885 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.28/arch/sparc/kernel/sys_sparc_32.c
1886 ---- linux-2.6.32.28/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
1887 -+++ linux-2.6.32.28/arch/sparc/kernel/sys_sparc_32.c 2010-12-31 14:46:53.000000000 -0500
1888 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.29/arch/sparc/kernel/sys_sparc_32.c
1889 +--- linux-2.6.32.29/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
1890 ++++ linux-2.6.32.29/arch/sparc/kernel/sys_sparc_32.c 2010-12-31 14:46:53.000000000 -0500
1891 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
1892 if (ARCH_SUN4C && len > 0x20000000)
1893 return -ENOMEM;
1894 @@ -3955,9 +4017,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.28/arch
1895 return addr;
1896 addr = vmm->vm_end;
1897 if (flags & MAP_SHARED)
1898 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.28/arch/sparc/kernel/sys_sparc_64.c
1899 ---- linux-2.6.32.28/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
1900 -+++ linux-2.6.32.28/arch/sparc/kernel/sys_sparc_64.c 2010-12-31 14:46:53.000000000 -0500
1901 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.29/arch/sparc/kernel/sys_sparc_64.c
1902 +--- linux-2.6.32.29/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
1903 ++++ linux-2.6.32.29/arch/sparc/kernel/sys_sparc_64.c 2010-12-31 14:46:53.000000000 -0500
1904 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
1905 /* We do not accept a shared mapping if it would violate
1906 * cache aliasing constraints.
1907 @@ -4078,9 +4140,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.28/arch
1908 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
1909 mm->unmap_area = arch_unmap_area_topdown;
1910 }
1911 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/traps_32.c linux-2.6.32.28/arch/sparc/kernel/traps_32.c
1912 ---- linux-2.6.32.28/arch/sparc/kernel/traps_32.c 2010-08-13 16:24:37.000000000 -0400
1913 -+++ linux-2.6.32.28/arch/sparc/kernel/traps_32.c 2010-12-31 14:46:53.000000000 -0500
1914 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/traps_32.c linux-2.6.32.29/arch/sparc/kernel/traps_32.c
1915 +--- linux-2.6.32.29/arch/sparc/kernel/traps_32.c 2010-08-13 16:24:37.000000000 -0400
1916 ++++ linux-2.6.32.29/arch/sparc/kernel/traps_32.c 2010-12-31 14:46:53.000000000 -0500
1917 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
1918 count++ < 30 &&
1919 (((unsigned long) rw) >= PAGE_OFFSET) &&
1920 @@ -4090,9 +4152,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/traps_32.c linux-2.6.32.28/arch/spa
1921 (void *) rw->ins[7]);
1922 rw = (struct reg_window32 *)rw->ins[6];
1923 }
1924 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/traps_64.c linux-2.6.32.28/arch/sparc/kernel/traps_64.c
1925 ---- linux-2.6.32.28/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
1926 -+++ linux-2.6.32.28/arch/sparc/kernel/traps_64.c 2010-12-31 14:46:53.000000000 -0500
1927 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/traps_64.c linux-2.6.32.29/arch/sparc/kernel/traps_64.c
1928 +--- linux-2.6.32.29/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
1929 ++++ linux-2.6.32.29/arch/sparc/kernel/traps_64.c 2010-12-31 14:46:53.000000000 -0500
1930 @@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
1931 i + 1,
1932 p->trapstack[i].tstate, p->trapstack[i].tpc,
1933 @@ -4202,9 +4264,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/traps_64.c linux-2.6.32.28/arch/spa
1934 (void *) rw->ins[7]);
1935
1936 rw = kernel_stack_up(rw);
1937 -diff -urNp linux-2.6.32.28/arch/sparc/kernel/unaligned_64.c linux-2.6.32.28/arch/sparc/kernel/unaligned_64.c
1938 ---- linux-2.6.32.28/arch/sparc/kernel/unaligned_64.c 2010-08-13 16:24:37.000000000 -0400
1939 -+++ linux-2.6.32.28/arch/sparc/kernel/unaligned_64.c 2010-12-31 14:46:53.000000000 -0500
1940 +diff -urNp linux-2.6.32.29/arch/sparc/kernel/unaligned_64.c linux-2.6.32.29/arch/sparc/kernel/unaligned_64.c
1941 +--- linux-2.6.32.29/arch/sparc/kernel/unaligned_64.c 2010-08-13 16:24:37.000000000 -0400
1942 ++++ linux-2.6.32.29/arch/sparc/kernel/unaligned_64.c 2010-12-31 14:46:53.000000000 -0500
1943 @@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
1944 if (count < 5) {
1945 last_time = jiffies;
1946 @@ -4214,9 +4276,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/kernel/unaligned_64.c linux-2.6.32.28/arch
1947 regs->tpc, (void *) regs->tpc);
1948 }
1949 }
1950 -diff -urNp linux-2.6.32.28/arch/sparc/lib/atomic_64.S linux-2.6.32.28/arch/sparc/lib/atomic_64.S
1951 ---- linux-2.6.32.28/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
1952 -+++ linux-2.6.32.28/arch/sparc/lib/atomic_64.S 2010-12-31 14:46:53.000000000 -0500
1953 +diff -urNp linux-2.6.32.29/arch/sparc/lib/atomic_64.S linux-2.6.32.29/arch/sparc/lib/atomic_64.S
1954 +--- linux-2.6.32.29/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
1955 ++++ linux-2.6.32.29/arch/sparc/lib/atomic_64.S 2010-12-31 14:46:53.000000000 -0500
1956 @@ -18,7 +18,12 @@
1957 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
1958 BACKOFF_SETUP(%o2)
1959 @@ -4451,9 +4513,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/lib/atomic_64.S linux-2.6.32.28/arch/sparc
1960 casx [%o1], %g1, %g7
1961 cmp %g1, %g7
1962 bne,pn %xcc, 2f
1963 -diff -urNp linux-2.6.32.28/arch/sparc/lib/ksyms.c linux-2.6.32.28/arch/sparc/lib/ksyms.c
1964 ---- linux-2.6.32.28/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
1965 -+++ linux-2.6.32.28/arch/sparc/lib/ksyms.c 2010-12-31 14:46:53.000000000 -0500
1966 +diff -urNp linux-2.6.32.29/arch/sparc/lib/ksyms.c linux-2.6.32.29/arch/sparc/lib/ksyms.c
1967 +--- linux-2.6.32.29/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
1968 ++++ linux-2.6.32.29/arch/sparc/lib/ksyms.c 2010-12-31 14:46:53.000000000 -0500
1969 @@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write);
1970
1971 /* Atomic counter implementation. */
1972 @@ -4472,9 +4534,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/lib/ksyms.c linux-2.6.32.28/arch/sparc/lib
1973 EXPORT_SYMBOL(atomic64_sub_ret);
1974
1975 /* Atomic bit operations. */
1976 -diff -urNp linux-2.6.32.28/arch/sparc/lib/rwsem_64.S linux-2.6.32.28/arch/sparc/lib/rwsem_64.S
1977 ---- linux-2.6.32.28/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
1978 -+++ linux-2.6.32.28/arch/sparc/lib/rwsem_64.S 2010-12-31 14:46:53.000000000 -0500
1979 +diff -urNp linux-2.6.32.29/arch/sparc/lib/rwsem_64.S linux-2.6.32.29/arch/sparc/lib/rwsem_64.S
1980 +--- linux-2.6.32.29/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
1981 ++++ linux-2.6.32.29/arch/sparc/lib/rwsem_64.S 2010-12-31 14:46:53.000000000 -0500
1982 @@ -11,7 +11,12 @@
1983 .globl __down_read
1984 __down_read:
1985 @@ -4573,9 +4635,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/lib/rwsem_64.S linux-2.6.32.28/arch/sparc/
1986 cas [%o0], %g3, %g7
1987 cmp %g3, %g7
1988 bne,pn %icc, 1b
1989 -diff -urNp linux-2.6.32.28/arch/sparc/Makefile linux-2.6.32.28/arch/sparc/Makefile
1990 ---- linux-2.6.32.28/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
1991 -+++ linux-2.6.32.28/arch/sparc/Makefile 2010-12-31 14:46:53.000000000 -0500
1992 +diff -urNp linux-2.6.32.29/arch/sparc/Makefile linux-2.6.32.29/arch/sparc/Makefile
1993 +--- linux-2.6.32.29/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
1994 ++++ linux-2.6.32.29/arch/sparc/Makefile 2010-12-31 14:46:53.000000000 -0500
1995 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
1996 # Export what is needed by arch/sparc/boot/Makefile
1997 export VMLINUX_INIT VMLINUX_MAIN
1998 @@ -4585,9 +4647,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/Makefile linux-2.6.32.28/arch/sparc/Makefi
1999 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
2000 VMLINUX_MAIN += $(drivers-y) $(net-y)
2001
2002 -diff -urNp linux-2.6.32.28/arch/sparc/mm/fault_32.c linux-2.6.32.28/arch/sparc/mm/fault_32.c
2003 ---- linux-2.6.32.28/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
2004 -+++ linux-2.6.32.28/arch/sparc/mm/fault_32.c 2010-12-31 14:46:53.000000000 -0500
2005 +diff -urNp linux-2.6.32.29/arch/sparc/mm/fault_32.c linux-2.6.32.29/arch/sparc/mm/fault_32.c
2006 +--- linux-2.6.32.29/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
2007 ++++ linux-2.6.32.29/arch/sparc/mm/fault_32.c 2010-12-31 14:46:53.000000000 -0500
2008 @@ -21,6 +21,9 @@
2009 #include <linux/interrupt.h>
2010 #include <linux/module.h>
2011 @@ -4891,9 +4953,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/mm/fault_32.c linux-2.6.32.28/arch/sparc/m
2012 /* Allow reads even for write-only mappings */
2013 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
2014 goto bad_area;
2015 -diff -urNp linux-2.6.32.28/arch/sparc/mm/fault_64.c linux-2.6.32.28/arch/sparc/mm/fault_64.c
2016 ---- linux-2.6.32.28/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
2017 -+++ linux-2.6.32.28/arch/sparc/mm/fault_64.c 2010-12-31 14:46:53.000000000 -0500
2018 +diff -urNp linux-2.6.32.29/arch/sparc/mm/fault_64.c linux-2.6.32.29/arch/sparc/mm/fault_64.c
2019 +--- linux-2.6.32.29/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
2020 ++++ linux-2.6.32.29/arch/sparc/mm/fault_64.c 2010-12-31 14:46:53.000000000 -0500
2021 @@ -20,6 +20,9 @@
2022 #include <linux/kprobes.h>
2023 #include <linux/kdebug.h>
2024 @@ -5400,9 +5462,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/mm/fault_64.c linux-2.6.32.28/arch/sparc/m
2025 /* Pure DTLB misses do not tell us whether the fault causing
2026 * load/store/atomic was a write or not, it only says that there
2027 * was no match. So in such a case we (carefully) read the
2028 -diff -urNp linux-2.6.32.28/arch/sparc/mm/hugetlbpage.c linux-2.6.32.28/arch/sparc/mm/hugetlbpage.c
2029 ---- linux-2.6.32.28/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
2030 -+++ linux-2.6.32.28/arch/sparc/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
2031 +diff -urNp linux-2.6.32.29/arch/sparc/mm/hugetlbpage.c linux-2.6.32.29/arch/sparc/mm/hugetlbpage.c
2032 +--- linux-2.6.32.29/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
2033 ++++ linux-2.6.32.29/arch/sparc/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
2034 @@ -69,7 +69,7 @@ full_search:
2035 }
2036 return -ENOMEM;
2037 @@ -5440,9 +5502,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/mm/hugetlbpage.c linux-2.6.32.28/arch/spar
2038 return addr;
2039 }
2040 if (mm->get_unmapped_area == arch_get_unmapped_area)
2041 -diff -urNp linux-2.6.32.28/arch/sparc/mm/init_32.c linux-2.6.32.28/arch/sparc/mm/init_32.c
2042 ---- linux-2.6.32.28/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
2043 -+++ linux-2.6.32.28/arch/sparc/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
2044 +diff -urNp linux-2.6.32.29/arch/sparc/mm/init_32.c linux-2.6.32.29/arch/sparc/mm/init_32.c
2045 +--- linux-2.6.32.29/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
2046 ++++ linux-2.6.32.29/arch/sparc/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
2047 @@ -317,6 +317,9 @@ extern void device_scan(void);
2048 pgprot_t PAGE_SHARED __read_mostly;
2049 EXPORT_SYMBOL(PAGE_SHARED);
2050 @@ -5477,9 +5539,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/mm/init_32.c linux-2.6.32.28/arch/sparc/mm
2051 protection_map[12] = PAGE_READONLY;
2052 protection_map[13] = PAGE_READONLY;
2053 protection_map[14] = PAGE_SHARED;
2054 -diff -urNp linux-2.6.32.28/arch/sparc/mm/Makefile linux-2.6.32.28/arch/sparc/mm/Makefile
2055 ---- linux-2.6.32.28/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
2056 -+++ linux-2.6.32.28/arch/sparc/mm/Makefile 2010-12-31 14:46:53.000000000 -0500
2057 +diff -urNp linux-2.6.32.29/arch/sparc/mm/Makefile linux-2.6.32.29/arch/sparc/mm/Makefile
2058 +--- linux-2.6.32.29/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
2059 ++++ linux-2.6.32.29/arch/sparc/mm/Makefile 2010-12-31 14:46:53.000000000 -0500
2060 @@ -2,7 +2,7 @@
2061 #
2062
2063 @@ -5489,9 +5551,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/mm/Makefile linux-2.6.32.28/arch/sparc/mm/
2064
2065 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
2066 obj-y += fault_$(BITS).o
2067 -diff -urNp linux-2.6.32.28/arch/sparc/mm/srmmu.c linux-2.6.32.28/arch/sparc/mm/srmmu.c
2068 ---- linux-2.6.32.28/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
2069 -+++ linux-2.6.32.28/arch/sparc/mm/srmmu.c 2010-12-31 14:46:53.000000000 -0500
2070 +diff -urNp linux-2.6.32.29/arch/sparc/mm/srmmu.c linux-2.6.32.29/arch/sparc/mm/srmmu.c
2071 +--- linux-2.6.32.29/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
2072 ++++ linux-2.6.32.29/arch/sparc/mm/srmmu.c 2010-12-31 14:46:53.000000000 -0500
2073 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
2074 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
2075 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
2076 @@ -5506,9 +5568,9 @@ diff -urNp linux-2.6.32.28/arch/sparc/mm/srmmu.c linux-2.6.32.28/arch/sparc/mm/s
2077 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
2078 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
2079
2080 -diff -urNp linux-2.6.32.28/arch/um/include/asm/kmap_types.h linux-2.6.32.28/arch/um/include/asm/kmap_types.h
2081 ---- linux-2.6.32.28/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
2082 -+++ linux-2.6.32.28/arch/um/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
2083 +diff -urNp linux-2.6.32.29/arch/um/include/asm/kmap_types.h linux-2.6.32.29/arch/um/include/asm/kmap_types.h
2084 +--- linux-2.6.32.29/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
2085 ++++ linux-2.6.32.29/arch/um/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
2086 @@ -23,6 +23,7 @@ enum km_type {
2087 KM_IRQ1,
2088 KM_SOFTIRQ0,
2089 @@ -5517,9 +5579,9 @@ diff -urNp linux-2.6.32.28/arch/um/include/asm/kmap_types.h linux-2.6.32.28/arch
2090 KM_TYPE_NR
2091 };
2092
2093 -diff -urNp linux-2.6.32.28/arch/um/include/asm/page.h linux-2.6.32.28/arch/um/include/asm/page.h
2094 ---- linux-2.6.32.28/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
2095 -+++ linux-2.6.32.28/arch/um/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
2096 +diff -urNp linux-2.6.32.29/arch/um/include/asm/page.h linux-2.6.32.29/arch/um/include/asm/page.h
2097 +--- linux-2.6.32.29/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
2098 ++++ linux-2.6.32.29/arch/um/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
2099 @@ -14,6 +14,9 @@
2100 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
2101 #define PAGE_MASK (~(PAGE_SIZE-1))
2102 @@ -5530,9 +5592,9 @@ diff -urNp linux-2.6.32.28/arch/um/include/asm/page.h linux-2.6.32.28/arch/um/in
2103 #ifndef __ASSEMBLY__
2104
2105 struct page;
2106 -diff -urNp linux-2.6.32.28/arch/um/kernel/process.c linux-2.6.32.28/arch/um/kernel/process.c
2107 ---- linux-2.6.32.28/arch/um/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
2108 -+++ linux-2.6.32.28/arch/um/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
2109 +diff -urNp linux-2.6.32.29/arch/um/kernel/process.c linux-2.6.32.29/arch/um/kernel/process.c
2110 +--- linux-2.6.32.29/arch/um/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
2111 ++++ linux-2.6.32.29/arch/um/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
2112 @@ -393,22 +393,6 @@ int singlestepping(void * t)
2113 return 2;
2114 }
2115 @@ -5556,9 +5618,9 @@ diff -urNp linux-2.6.32.28/arch/um/kernel/process.c linux-2.6.32.28/arch/um/kern
2116 unsigned long get_wchan(struct task_struct *p)
2117 {
2118 unsigned long stack_page, sp, ip;
2119 -diff -urNp linux-2.6.32.28/arch/um/sys-i386/syscalls.c linux-2.6.32.28/arch/um/sys-i386/syscalls.c
2120 ---- linux-2.6.32.28/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
2121 -+++ linux-2.6.32.28/arch/um/sys-i386/syscalls.c 2010-12-31 14:46:53.000000000 -0500
2122 +diff -urNp linux-2.6.32.29/arch/um/sys-i386/syscalls.c linux-2.6.32.29/arch/um/sys-i386/syscalls.c
2123 +--- linux-2.6.32.29/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
2124 ++++ linux-2.6.32.29/arch/um/sys-i386/syscalls.c 2010-12-31 14:46:53.000000000 -0500
2125 @@ -11,6 +11,21 @@
2126 #include "asm/uaccess.h"
2127 #include "asm/unistd.h"
2128 @@ -5581,9 +5643,9 @@ diff -urNp linux-2.6.32.28/arch/um/sys-i386/syscalls.c linux-2.6.32.28/arch/um/s
2129 /*
2130 * Perform the select(nd, in, out, ex, tv) and mmap() system
2131 * calls. Linux/i386 didn't use to be able to handle more than
2132 -diff -urNp linux-2.6.32.28/arch/x86/boot/bitops.h linux-2.6.32.28/arch/x86/boot/bitops.h
2133 ---- linux-2.6.32.28/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
2134 -+++ linux-2.6.32.28/arch/x86/boot/bitops.h 2010-12-31 14:46:53.000000000 -0500
2135 +diff -urNp linux-2.6.32.29/arch/x86/boot/bitops.h linux-2.6.32.29/arch/x86/boot/bitops.h
2136 +--- linux-2.6.32.29/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
2137 ++++ linux-2.6.32.29/arch/x86/boot/bitops.h 2010-12-31 14:46:53.000000000 -0500
2138 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int
2139 u8 v;
2140 const u32 *p = (const u32 *)addr;
2141 @@ -5602,9 +5664,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/bitops.h linux-2.6.32.28/arch/x86/boot/
2142 }
2143
2144 #endif /* BOOT_BITOPS_H */
2145 -diff -urNp linux-2.6.32.28/arch/x86/boot/boot.h linux-2.6.32.28/arch/x86/boot/boot.h
2146 ---- linux-2.6.32.28/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
2147 -+++ linux-2.6.32.28/arch/x86/boot/boot.h 2010-12-31 14:46:53.000000000 -0500
2148 +diff -urNp linux-2.6.32.29/arch/x86/boot/boot.h linux-2.6.32.29/arch/x86/boot/boot.h
2149 +--- linux-2.6.32.29/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
2150 ++++ linux-2.6.32.29/arch/x86/boot/boot.h 2010-12-31 14:46:53.000000000 -0500
2151 @@ -82,7 +82,7 @@ static inline void io_delay(void)
2152 static inline u16 ds(void)
2153 {
2154 @@ -5623,9 +5685,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/boot.h linux-2.6.32.28/arch/x86/boot/bo
2155 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
2156 return diff;
2157 }
2158 -diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/head_32.S linux-2.6.32.28/arch/x86/boot/compressed/head_32.S
2159 ---- linux-2.6.32.28/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
2160 -+++ linux-2.6.32.28/arch/x86/boot/compressed/head_32.S 2010-12-31 14:46:53.000000000 -0500
2161 +diff -urNp linux-2.6.32.29/arch/x86/boot/compressed/head_32.S linux-2.6.32.29/arch/x86/boot/compressed/head_32.S
2162 +--- linux-2.6.32.29/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
2163 ++++ linux-2.6.32.29/arch/x86/boot/compressed/head_32.S 2010-12-31 14:46:53.000000000 -0500
2164 @@ -76,7 +76,7 @@ ENTRY(startup_32)
2165 notl %eax
2166 andl %eax, %ebx
2167 @@ -5654,9 +5716,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/head_32.S linux-2.6.32.28/ar
2168 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
2169 jmp 1b
2170 2:
2171 -diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/head_64.S linux-2.6.32.28/arch/x86/boot/compressed/head_64.S
2172 ---- linux-2.6.32.28/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
2173 -+++ linux-2.6.32.28/arch/x86/boot/compressed/head_64.S 2010-12-31 14:46:53.000000000 -0500
2174 +diff -urNp linux-2.6.32.29/arch/x86/boot/compressed/head_64.S linux-2.6.32.29/arch/x86/boot/compressed/head_64.S
2175 +--- linux-2.6.32.29/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
2176 ++++ linux-2.6.32.29/arch/x86/boot/compressed/head_64.S 2010-12-31 14:46:53.000000000 -0500
2177 @@ -91,7 +91,7 @@ ENTRY(startup_32)
2178 notl %eax
2179 andl %eax, %ebx
2180 @@ -5675,9 +5737,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/head_64.S linux-2.6.32.28/ar
2181 #endif
2182
2183 /* Target address to relocate to for decompression */
2184 -diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/misc.c linux-2.6.32.28/arch/x86/boot/compressed/misc.c
2185 ---- linux-2.6.32.28/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
2186 -+++ linux-2.6.32.28/arch/x86/boot/compressed/misc.c 2010-12-31 14:46:53.000000000 -0500
2187 +diff -urNp linux-2.6.32.29/arch/x86/boot/compressed/misc.c linux-2.6.32.29/arch/x86/boot/compressed/misc.c
2188 +--- linux-2.6.32.29/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
2189 ++++ linux-2.6.32.29/arch/x86/boot/compressed/misc.c 2010-12-31 14:46:53.000000000 -0500
2190 @@ -288,7 +288,7 @@ static void parse_elf(void *output)
2191 case PT_LOAD:
2192 #ifdef CONFIG_RELOCATABLE
2193 @@ -5696,9 +5758,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/misc.c linux-2.6.32.28/arch/
2194 error("Wrong destination address");
2195 #endif
2196
2197 -diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.28/arch/x86/boot/compressed/mkpiggy.c
2198 ---- linux-2.6.32.28/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
2199 -+++ linux-2.6.32.28/arch/x86/boot/compressed/mkpiggy.c 2010-12-31 14:46:53.000000000 -0500
2200 +diff -urNp linux-2.6.32.29/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.29/arch/x86/boot/compressed/mkpiggy.c
2201 +--- linux-2.6.32.29/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
2202 ++++ linux-2.6.32.29/arch/x86/boot/compressed/mkpiggy.c 2010-12-31 14:46:53.000000000 -0500
2203 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
2204
2205 offs = (olen > ilen) ? olen - ilen : 0;
2206 @@ -5708,9 +5770,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.28/ar
2207 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
2208
2209 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
2210 -diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/relocs.c linux-2.6.32.28/arch/x86/boot/compressed/relocs.c
2211 ---- linux-2.6.32.28/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
2212 -+++ linux-2.6.32.28/arch/x86/boot/compressed/relocs.c 2010-12-31 14:46:53.000000000 -0500
2213 +diff -urNp linux-2.6.32.29/arch/x86/boot/compressed/relocs.c linux-2.6.32.29/arch/x86/boot/compressed/relocs.c
2214 +--- linux-2.6.32.29/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
2215 ++++ linux-2.6.32.29/arch/x86/boot/compressed/relocs.c 2010-12-31 14:46:53.000000000 -0500
2216 @@ -10,8 +10,11 @@
2217 #define USE_BSD
2218 #include <endian.h>
2219 @@ -5911,9 +5973,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/compressed/relocs.c linux-2.6.32.28/arc
2220 read_shdrs(fp);
2221 read_strtabs(fp);
2222 read_symtabs(fp);
2223 -diff -urNp linux-2.6.32.28/arch/x86/boot/cpucheck.c linux-2.6.32.28/arch/x86/boot/cpucheck.c
2224 ---- linux-2.6.32.28/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
2225 -+++ linux-2.6.32.28/arch/x86/boot/cpucheck.c 2010-12-31 14:46:53.000000000 -0500
2226 +diff -urNp linux-2.6.32.29/arch/x86/boot/cpucheck.c linux-2.6.32.29/arch/x86/boot/cpucheck.c
2227 +--- linux-2.6.32.29/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
2228 ++++ linux-2.6.32.29/arch/x86/boot/cpucheck.c 2010-12-31 14:46:53.000000000 -0500
2229 @@ -74,7 +74,7 @@ static int has_fpu(void)
2230 u16 fcw = -1, fsw = -1;
2231 u32 cr0;
2232 @@ -6009,9 +6071,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/cpucheck.c linux-2.6.32.28/arch/x86/boo
2233
2234 err = check_flags();
2235 }
2236 -diff -urNp linux-2.6.32.28/arch/x86/boot/header.S linux-2.6.32.28/arch/x86/boot/header.S
2237 ---- linux-2.6.32.28/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
2238 -+++ linux-2.6.32.28/arch/x86/boot/header.S 2010-12-31 14:46:53.000000000 -0500
2239 +diff -urNp linux-2.6.32.29/arch/x86/boot/header.S linux-2.6.32.29/arch/x86/boot/header.S
2240 +--- linux-2.6.32.29/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
2241 ++++ linux-2.6.32.29/arch/x86/boot/header.S 2010-12-31 14:46:53.000000000 -0500
2242 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
2243 # single linked list of
2244 # struct setup_data
2245 @@ -6021,9 +6083,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/header.S linux-2.6.32.28/arch/x86/boot/
2246
2247 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
2248 #define VO_INIT_SIZE (VO__end - VO__text)
2249 -diff -urNp linux-2.6.32.28/arch/x86/boot/memory.c linux-2.6.32.28/arch/x86/boot/memory.c
2250 ---- linux-2.6.32.28/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
2251 -+++ linux-2.6.32.28/arch/x86/boot/memory.c 2010-12-31 14:46:53.000000000 -0500
2252 +diff -urNp linux-2.6.32.29/arch/x86/boot/memory.c linux-2.6.32.29/arch/x86/boot/memory.c
2253 +--- linux-2.6.32.29/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
2254 ++++ linux-2.6.32.29/arch/x86/boot/memory.c 2010-12-31 14:46:53.000000000 -0500
2255 @@ -19,7 +19,7 @@
2256
2257 static int detect_memory_e820(void)
2258 @@ -6033,9 +6095,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/memory.c linux-2.6.32.28/arch/x86/boot/
2259 struct biosregs ireg, oreg;
2260 struct e820entry *desc = boot_params.e820_map;
2261 static struct e820entry buf; /* static so it is zeroed */
2262 -diff -urNp linux-2.6.32.28/arch/x86/boot/video.c linux-2.6.32.28/arch/x86/boot/video.c
2263 ---- linux-2.6.32.28/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
2264 -+++ linux-2.6.32.28/arch/x86/boot/video.c 2010-12-31 14:46:53.000000000 -0500
2265 +diff -urNp linux-2.6.32.29/arch/x86/boot/video.c linux-2.6.32.29/arch/x86/boot/video.c
2266 +--- linux-2.6.32.29/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
2267 ++++ linux-2.6.32.29/arch/x86/boot/video.c 2010-12-31 14:46:53.000000000 -0500
2268 @@ -90,7 +90,7 @@ static void store_mode_params(void)
2269 static unsigned int get_entry(void)
2270 {
2271 @@ -6045,9 +6107,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/video.c linux-2.6.32.28/arch/x86/boot/v
2272 int key;
2273 unsigned int v;
2274
2275 -diff -urNp linux-2.6.32.28/arch/x86/boot/video-vesa.c linux-2.6.32.28/arch/x86/boot/video-vesa.c
2276 ---- linux-2.6.32.28/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
2277 -+++ linux-2.6.32.28/arch/x86/boot/video-vesa.c 2010-12-31 14:46:53.000000000 -0500
2278 +diff -urNp linux-2.6.32.29/arch/x86/boot/video-vesa.c linux-2.6.32.29/arch/x86/boot/video-vesa.c
2279 +--- linux-2.6.32.29/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
2280 ++++ linux-2.6.32.29/arch/x86/boot/video-vesa.c 2010-12-31 14:46:53.000000000 -0500
2281 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
2282
2283 boot_params.screen_info.vesapm_seg = oreg.es;
2284 @@ -6056,9 +6118,9 @@ diff -urNp linux-2.6.32.28/arch/x86/boot/video-vesa.c linux-2.6.32.28/arch/x86/b
2285 }
2286
2287 /*
2288 -diff -urNp linux-2.6.32.28/arch/x86/ia32/ia32_aout.c linux-2.6.32.28/arch/x86/ia32/ia32_aout.c
2289 ---- linux-2.6.32.28/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
2290 -+++ linux-2.6.32.28/arch/x86/ia32/ia32_aout.c 2010-12-31 14:46:53.000000000 -0500
2291 +diff -urNp linux-2.6.32.29/arch/x86/ia32/ia32_aout.c linux-2.6.32.29/arch/x86/ia32/ia32_aout.c
2292 +--- linux-2.6.32.29/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
2293 ++++ linux-2.6.32.29/arch/x86/ia32/ia32_aout.c 2010-12-31 14:46:53.000000000 -0500
2294 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
2295 unsigned long dump_start, dump_size;
2296 struct user32 dump;
2297 @@ -6081,9 +6143,9 @@ diff -urNp linux-2.6.32.28/arch/x86/ia32/ia32_aout.c linux-2.6.32.28/arch/x86/ia
2298 end_coredump:
2299 set_fs(fs);
2300 return has_dumped;
2301 -diff -urNp linux-2.6.32.28/arch/x86/ia32/ia32entry.S linux-2.6.32.28/arch/x86/ia32/ia32entry.S
2302 ---- linux-2.6.32.28/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
2303 -+++ linux-2.6.32.28/arch/x86/ia32/ia32entry.S 2010-12-31 14:46:53.000000000 -0500
2304 +diff -urNp linux-2.6.32.29/arch/x86/ia32/ia32entry.S linux-2.6.32.29/arch/x86/ia32/ia32entry.S
2305 +--- linux-2.6.32.29/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
2306 ++++ linux-2.6.32.29/arch/x86/ia32/ia32entry.S 2010-12-31 14:46:53.000000000 -0500
2307 @@ -13,6 +13,7 @@
2308 #include <asm/thread_info.h>
2309 #include <asm/segment.h>
2310 @@ -6178,9 +6240,9 @@ diff -urNp linux-2.6.32.28/arch/x86/ia32/ia32entry.S linux-2.6.32.28/arch/x86/ia
2311 /*
2312 * No need to follow this irqs on/off section: the syscall
2313 * disabled irqs and here we enable it straight after entry:
2314 -diff -urNp linux-2.6.32.28/arch/x86/ia32/ia32_signal.c linux-2.6.32.28/arch/x86/ia32/ia32_signal.c
2315 ---- linux-2.6.32.28/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
2316 -+++ linux-2.6.32.28/arch/x86/ia32/ia32_signal.c 2010-12-31 14:46:53.000000000 -0500
2317 +diff -urNp linux-2.6.32.29/arch/x86/ia32/ia32_signal.c linux-2.6.32.29/arch/x86/ia32/ia32_signal.c
2318 +--- linux-2.6.32.29/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
2319 ++++ linux-2.6.32.29/arch/x86/ia32/ia32_signal.c 2010-12-31 14:46:53.000000000 -0500
2320 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
2321 sp -= frame_size;
2322 /* Align the stack pointer according to the i386 ABI,
2323 @@ -6230,9 +6292,9 @@ diff -urNp linux-2.6.32.28/arch/x86/ia32/ia32_signal.c linux-2.6.32.28/arch/x86/
2324 } put_user_catch(err);
2325
2326 if (err)
2327 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/alternative.h linux-2.6.32.28/arch/x86/include/asm/alternative.h
2328 ---- linux-2.6.32.28/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
2329 -+++ linux-2.6.32.28/arch/x86/include/asm/alternative.h 2010-12-31 14:46:53.000000000 -0500
2330 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/alternative.h linux-2.6.32.29/arch/x86/include/asm/alternative.h
2331 +--- linux-2.6.32.29/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
2332 ++++ linux-2.6.32.29/arch/x86/include/asm/alternative.h 2010-12-31 14:46:53.000000000 -0500
2333 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
2334 " .byte 662b-661b\n" /* sourcelen */ \
2335 " .byte 664f-663f\n" /* replacementlen */ \
2336 @@ -6242,9 +6304,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/alternative.h linux-2.6.32.28/ar
2337 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
2338 ".previous"
2339
2340 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/apm.h linux-2.6.32.28/arch/x86/include/asm/apm.h
2341 ---- linux-2.6.32.28/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
2342 -+++ linux-2.6.32.28/arch/x86/include/asm/apm.h 2010-12-31 14:46:53.000000000 -0500
2343 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/apm.h linux-2.6.32.29/arch/x86/include/asm/apm.h
2344 +--- linux-2.6.32.29/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
2345 ++++ linux-2.6.32.29/arch/x86/include/asm/apm.h 2010-12-31 14:46:53.000000000 -0500
2346 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
2347 __asm__ __volatile__(APM_DO_ZERO_SEGS
2348 "pushl %%edi\n\t"
2349 @@ -6263,9 +6325,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/apm.h linux-2.6.32.28/arch/x86/i
2350 "setc %%bl\n\t"
2351 "popl %%ebp\n\t"
2352 "popl %%edi\n\t"
2353 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/atomic_32.h linux-2.6.32.28/arch/x86/include/asm/atomic_32.h
2354 ---- linux-2.6.32.28/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
2355 -+++ linux-2.6.32.28/arch/x86/include/asm/atomic_32.h 2010-12-31 14:46:58.000000000 -0500
2356 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/atomic_32.h linux-2.6.32.29/arch/x86/include/asm/atomic_32.h
2357 +--- linux-2.6.32.29/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
2358 ++++ linux-2.6.32.29/arch/x86/include/asm/atomic_32.h 2010-12-31 14:46:58.000000000 -0500
2359 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom
2360 }
2361
2362 @@ -6601,9 +6663,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/atomic_32.h linux-2.6.32.28/arch
2363 #define ATOMIC64_INIT(val) { (val) }
2364
2365 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
2366 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/atomic_64.h linux-2.6.32.28/arch/x86/include/asm/atomic_64.h
2367 ---- linux-2.6.32.28/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
2368 -+++ linux-2.6.32.28/arch/x86/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
2369 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/atomic_64.h linux-2.6.32.29/arch/x86/include/asm/atomic_64.h
2370 +--- linux-2.6.32.29/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
2371 ++++ linux-2.6.32.29/arch/x86/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
2372 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom
2373 }
2374
2375 @@ -7207,9 +7269,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/atomic_64.h linux-2.6.32.28/arch
2376 }
2377
2378 /**
2379 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/bitops.h linux-2.6.32.28/arch/x86/include/asm/bitops.h
2380 ---- linux-2.6.32.28/arch/x86/include/asm/bitops.h 2010-08-13 16:24:37.000000000 -0400
2381 -+++ linux-2.6.32.28/arch/x86/include/asm/bitops.h 2010-12-31 14:46:53.000000000 -0500
2382 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/bitops.h linux-2.6.32.29/arch/x86/include/asm/bitops.h
2383 +--- linux-2.6.32.29/arch/x86/include/asm/bitops.h 2010-08-13 16:24:37.000000000 -0400
2384 ++++ linux-2.6.32.29/arch/x86/include/asm/bitops.h 2010-12-31 14:46:53.000000000 -0500
2385 @@ -38,7 +38,7 @@
2386 * a mask operation on a byte.
2387 */
2388 @@ -7219,9 +7281,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/bitops.h linux-2.6.32.28/arch/x8
2389 #define CONST_MASK(nr) (1 << ((nr) & 7))
2390
2391 /**
2392 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/boot.h linux-2.6.32.28/arch/x86/include/asm/boot.h
2393 ---- linux-2.6.32.28/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
2394 -+++ linux-2.6.32.28/arch/x86/include/asm/boot.h 2010-12-31 14:46:53.000000000 -0500
2395 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/boot.h linux-2.6.32.29/arch/x86/include/asm/boot.h
2396 +--- linux-2.6.32.29/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
2397 ++++ linux-2.6.32.29/arch/x86/include/asm/boot.h 2010-12-31 14:46:53.000000000 -0500
2398 @@ -11,10 +11,15 @@
2399 #include <asm/pgtable_types.h>
2400
2401 @@ -7239,9 +7301,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/boot.h linux-2.6.32.28/arch/x86/
2402 /* Minimum kernel alignment, as a power of two */
2403 #ifdef CONFIG_X86_64
2404 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
2405 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/cacheflush.h linux-2.6.32.28/arch/x86/include/asm/cacheflush.h
2406 ---- linux-2.6.32.28/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
2407 -+++ linux-2.6.32.28/arch/x86/include/asm/cacheflush.h 2010-12-31 14:46:53.000000000 -0500
2408 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/cacheflush.h linux-2.6.32.29/arch/x86/include/asm/cacheflush.h
2409 +--- linux-2.6.32.29/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
2410 ++++ linux-2.6.32.29/arch/x86/include/asm/cacheflush.h 2010-12-31 14:46:53.000000000 -0500
2411 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
2412 static inline unsigned long get_page_memtype(struct page *pg)
2413 {
2414 @@ -7260,9 +7322,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/cacheflush.h linux-2.6.32.28/arc
2415 ClearPageUncached(pg);
2416 ClearPageWC(pg);
2417 break;
2418 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/cache.h linux-2.6.32.28/arch/x86/include/asm/cache.h
2419 ---- linux-2.6.32.28/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
2420 -+++ linux-2.6.32.28/arch/x86/include/asm/cache.h 2010-12-31 14:46:53.000000000 -0500
2421 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/cache.h linux-2.6.32.29/arch/x86/include/asm/cache.h
2422 +--- linux-2.6.32.29/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
2423 ++++ linux-2.6.32.29/arch/x86/include/asm/cache.h 2010-12-31 14:46:53.000000000 -0500
2424 @@ -8,6 +8,7 @@
2425 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2426
2427 @@ -7271,9 +7333,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/cache.h linux-2.6.32.28/arch/x86
2428
2429 #ifdef CONFIG_X86_VSMP
2430 /* vSMP Internode cacheline shift */
2431 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/checksum_32.h linux-2.6.32.28/arch/x86/include/asm/checksum_32.h
2432 ---- linux-2.6.32.28/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
2433 -+++ linux-2.6.32.28/arch/x86/include/asm/checksum_32.h 2010-12-31 14:46:53.000000000 -0500
2434 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/checksum_32.h linux-2.6.32.29/arch/x86/include/asm/checksum_32.h
2435 +--- linux-2.6.32.29/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
2436 ++++ linux-2.6.32.29/arch/x86/include/asm/checksum_32.h 2010-12-31 14:46:53.000000000 -0500
2437 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
2438 int len, __wsum sum,
2439 int *src_err_ptr, int *dst_err_ptr);
2440 @@ -7307,9 +7369,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/checksum_32.h linux-2.6.32.28/ar
2441 len, sum, NULL, err_ptr);
2442
2443 if (len)
2444 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/desc.h linux-2.6.32.28/arch/x86/include/asm/desc.h
2445 ---- linux-2.6.32.28/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
2446 -+++ linux-2.6.32.28/arch/x86/include/asm/desc.h 2010-12-31 14:46:53.000000000 -0500
2447 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/desc.h linux-2.6.32.29/arch/x86/include/asm/desc.h
2448 +--- linux-2.6.32.29/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
2449 ++++ linux-2.6.32.29/arch/x86/include/asm/desc.h 2010-12-31 14:46:53.000000000 -0500
2450 @@ -4,6 +4,7 @@
2451 #include <asm/desc_defs.h>
2452 #include <asm/ldt.h>
2453 @@ -7479,9 +7541,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/desc.h linux-2.6.32.28/arch/x86/
2454 +#endif
2455 +
2456 #endif /* _ASM_X86_DESC_H */
2457 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/device.h linux-2.6.32.28/arch/x86/include/asm/device.h
2458 ---- linux-2.6.32.28/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
2459 -+++ linux-2.6.32.28/arch/x86/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
2460 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/device.h linux-2.6.32.29/arch/x86/include/asm/device.h
2461 +--- linux-2.6.32.29/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
2462 ++++ linux-2.6.32.29/arch/x86/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
2463 @@ -6,7 +6,7 @@ struct dev_archdata {
2464 void *acpi_handle;
2465 #endif
2466 @@ -7491,9 +7553,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/device.h linux-2.6.32.28/arch/x8
2467 #endif
2468 #ifdef CONFIG_DMAR
2469 void *iommu; /* hook for IOMMU specific extension */
2470 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/dma-mapping.h linux-2.6.32.28/arch/x86/include/asm/dma-mapping.h
2471 ---- linux-2.6.32.28/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
2472 -+++ linux-2.6.32.28/arch/x86/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
2473 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/dma-mapping.h linux-2.6.32.29/arch/x86/include/asm/dma-mapping.h
2474 +--- linux-2.6.32.29/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
2475 ++++ linux-2.6.32.29/arch/x86/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
2476 @@ -25,9 +25,9 @@ extern int iommu_merge;
2477 extern struct device x86_dma_fallback_dev;
2478 extern int panic_on_overflow;
2479 @@ -7533,9 +7595,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/dma-mapping.h linux-2.6.32.28/ar
2480
2481 WARN_ON(irqs_disabled()); /* for portability */
2482
2483 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/e820.h linux-2.6.32.28/arch/x86/include/asm/e820.h
2484 ---- linux-2.6.32.28/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
2485 -+++ linux-2.6.32.28/arch/x86/include/asm/e820.h 2010-12-31 14:46:53.000000000 -0500
2486 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/e820.h linux-2.6.32.29/arch/x86/include/asm/e820.h
2487 +--- linux-2.6.32.29/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
2488 ++++ linux-2.6.32.29/arch/x86/include/asm/e820.h 2010-12-31 14:46:53.000000000 -0500
2489 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me
2490 #define ISA_END_ADDRESS 0x100000
2491 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
2492 @@ -7545,9 +7607,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/e820.h linux-2.6.32.28/arch/x86/
2493 #define BIOS_END 0x00100000
2494
2495 #ifdef __KERNEL__
2496 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/elf.h linux-2.6.32.28/arch/x86/include/asm/elf.h
2497 ---- linux-2.6.32.28/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
2498 -+++ linux-2.6.32.28/arch/x86/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
2499 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/elf.h linux-2.6.32.29/arch/x86/include/asm/elf.h
2500 +--- linux-2.6.32.29/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
2501 ++++ linux-2.6.32.29/arch/x86/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
2502 @@ -257,7 +257,25 @@ extern int force_personality32;
2503 the loader. We need to make sure that it is out of the way of the program
2504 that it will "exec", and that there is sufficient room for the brk. */
2505 @@ -7601,9 +7663,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/elf.h linux-2.6.32.28/arch/x86/i
2506 -#define arch_randomize_brk arch_randomize_brk
2507 -
2508 #endif /* _ASM_X86_ELF_H */
2509 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/futex.h linux-2.6.32.28/arch/x86/include/asm/futex.h
2510 ---- linux-2.6.32.28/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
2511 -+++ linux-2.6.32.28/arch/x86/include/asm/futex.h 2011-01-25 20:24:47.000000000 -0500
2512 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/futex.h linux-2.6.32.29/arch/x86/include/asm/futex.h
2513 +--- linux-2.6.32.29/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
2514 ++++ linux-2.6.32.29/arch/x86/include/asm/futex.h 2011-01-25 20:24:47.000000000 -0500
2515 @@ -12,16 +12,18 @@
2516 #include <asm/system.h>
2517
2518 @@ -7679,9 +7741,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/futex.h linux-2.6.32.28/arch/x86
2519 : "i" (-EFAULT), "r" (newval), "0" (oldval)
2520 : "memory"
2521 );
2522 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/i387.h linux-2.6.32.28/arch/x86/include/asm/i387.h
2523 ---- linux-2.6.32.28/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
2524 -+++ linux-2.6.32.28/arch/x86/include/asm/i387.h 2010-12-31 14:46:53.000000000 -0500
2525 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/i387.h linux-2.6.32.29/arch/x86/include/asm/i387.h
2526 +--- linux-2.6.32.29/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
2527 ++++ linux-2.6.32.29/arch/x86/include/asm/i387.h 2010-12-31 14:46:53.000000000 -0500
2528 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
2529 {
2530 int err;
2531 @@ -7722,9 +7784,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/i387.h linux-2.6.32.28/arch/x86/
2532
2533 /*
2534 * These must be called with preempt disabled
2535 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/io_32.h linux-2.6.32.28/arch/x86/include/asm/io_32.h
2536 ---- linux-2.6.32.28/arch/x86/include/asm/io_32.h 2010-08-13 16:24:37.000000000 -0400
2537 -+++ linux-2.6.32.28/arch/x86/include/asm/io_32.h 2011-01-27 22:39:52.000000000 -0500
2538 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/io_32.h linux-2.6.32.29/arch/x86/include/asm/io_32.h
2539 +--- linux-2.6.32.29/arch/x86/include/asm/io_32.h 2010-08-13 16:24:37.000000000 -0400
2540 ++++ linux-2.6.32.29/arch/x86/include/asm/io_32.h 2011-01-27 22:39:52.000000000 -0500
2541 @@ -3,6 +3,7 @@
2542
2543 #include <linux/string.h>
2544 @@ -7751,9 +7813,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/io_32.h linux-2.6.32.28/arch/x86
2545 #include <asm-generic/iomap.h>
2546
2547 #include <linux/vmalloc.h>
2548 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/io_64.h linux-2.6.32.28/arch/x86/include/asm/io_64.h
2549 ---- linux-2.6.32.28/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
2550 -+++ linux-2.6.32.28/arch/x86/include/asm/io_64.h 2011-01-27 22:39:52.000000000 -0500
2551 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/io_64.h linux-2.6.32.29/arch/x86/include/asm/io_64.h
2552 +--- linux-2.6.32.29/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
2553 ++++ linux-2.6.32.29/arch/x86/include/asm/io_64.h 2011-01-27 22:39:52.000000000 -0500
2554 @@ -140,6 +140,17 @@ __OUTS(l)
2555
2556 #include <linux/vmalloc.h>
2557 @@ -7772,9 +7834,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/io_64.h linux-2.6.32.28/arch/x86
2558 #include <asm-generic/iomap.h>
2559
2560 void __memcpy_fromio(void *, unsigned long, unsigned);
2561 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/iommu.h linux-2.6.32.28/arch/x86/include/asm/iommu.h
2562 ---- linux-2.6.32.28/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
2563 -+++ linux-2.6.32.28/arch/x86/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
2564 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/iommu.h linux-2.6.32.29/arch/x86/include/asm/iommu.h
2565 +--- linux-2.6.32.29/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
2566 ++++ linux-2.6.32.29/arch/x86/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
2567 @@ -3,7 +3,7 @@
2568
2569 extern void pci_iommu_shutdown(void);
2570 @@ -7784,9 +7846,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/iommu.h linux-2.6.32.28/arch/x86
2571 extern int force_iommu, no_iommu;
2572 extern int iommu_detected;
2573 extern int iommu_pass_through;
2574 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/irqflags.h linux-2.6.32.28/arch/x86/include/asm/irqflags.h
2575 ---- linux-2.6.32.28/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
2576 -+++ linux-2.6.32.28/arch/x86/include/asm/irqflags.h 2010-12-31 14:46:53.000000000 -0500
2577 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/irqflags.h linux-2.6.32.29/arch/x86/include/asm/irqflags.h
2578 +--- linux-2.6.32.29/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
2579 ++++ linux-2.6.32.29/arch/x86/include/asm/irqflags.h 2010-12-31 14:46:53.000000000 -0500
2580 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
2581 sti; \
2582 sysexit
2583 @@ -7799,9 +7861,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/irqflags.h linux-2.6.32.28/arch/
2584 #else
2585 #define INTERRUPT_RETURN iret
2586 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
2587 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/kvm_host.h linux-2.6.32.28/arch/x86/include/asm/kvm_host.h
2588 ---- linux-2.6.32.28/arch/x86/include/asm/kvm_host.h 2010-11-26 18:22:29.000000000 -0500
2589 -+++ linux-2.6.32.28/arch/x86/include/asm/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
2590 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/kvm_host.h linux-2.6.32.29/arch/x86/include/asm/kvm_host.h
2591 +--- linux-2.6.32.29/arch/x86/include/asm/kvm_host.h 2010-11-26 18:22:29.000000000 -0500
2592 ++++ linux-2.6.32.29/arch/x86/include/asm/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
2593 @@ -533,7 +533,7 @@ struct kvm_x86_ops {
2594 const struct trace_print_flags *exit_reasons_str;
2595 };
2596 @@ -7811,9 +7873,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/kvm_host.h linux-2.6.32.28/arch/
2597
2598 int kvm_mmu_module_init(void);
2599 void kvm_mmu_module_exit(void);
2600 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/local.h linux-2.6.32.28/arch/x86/include/asm/local.h
2601 ---- linux-2.6.32.28/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
2602 -+++ linux-2.6.32.28/arch/x86/include/asm/local.h 2010-12-31 14:47:00.000000000 -0500
2603 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/local.h linux-2.6.32.29/arch/x86/include/asm/local.h
2604 +--- linux-2.6.32.29/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
2605 ++++ linux-2.6.32.29/arch/x86/include/asm/local.h 2010-12-31 14:47:00.000000000 -0500
2606 @@ -18,26 +18,58 @@ typedef struct {
2607
2608 static inline void local_inc(local_t *l)
2609 @@ -7966,9 +8028,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/local.h linux-2.6.32.28/arch/x86
2610 : "+r" (i), "+m" (l->a.counter)
2611 : : "memory");
2612 return i + __i;
2613 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.28/arch/x86/include/asm/mc146818rtc.h
2614 ---- linux-2.6.32.28/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
2615 -+++ linux-2.6.32.28/arch/x86/include/asm/mc146818rtc.h 2010-12-31 14:46:53.000000000 -0500
2616 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.29/arch/x86/include/asm/mc146818rtc.h
2617 +--- linux-2.6.32.29/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
2618 ++++ linux-2.6.32.29/arch/x86/include/asm/mc146818rtc.h 2010-12-31 14:46:53.000000000 -0500
2619 @@ -81,8 +81,8 @@ static inline unsigned char current_lock
2620 #else
2621 #define lock_cmos_prefix(reg) do {} while (0)
2622 @@ -7980,9 +8042,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.28/ar
2623 #define do_i_have_lock_cmos() 0
2624 #define current_lock_cmos_reg() 0
2625 #endif
2626 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/microcode.h linux-2.6.32.28/arch/x86/include/asm/microcode.h
2627 ---- linux-2.6.32.28/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
2628 -+++ linux-2.6.32.28/arch/x86/include/asm/microcode.h 2010-12-31 14:46:53.000000000 -0500
2629 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/microcode.h linux-2.6.32.29/arch/x86/include/asm/microcode.h
2630 +--- linux-2.6.32.29/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
2631 ++++ linux-2.6.32.29/arch/x86/include/asm/microcode.h 2010-12-31 14:46:53.000000000 -0500
2632 @@ -12,13 +12,13 @@ struct device;
2633 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
2634
2635 @@ -8023,9 +8085,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/microcode.h linux-2.6.32.28/arch
2636 {
2637 return NULL;
2638 }
2639 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/mman.h linux-2.6.32.28/arch/x86/include/asm/mman.h
2640 ---- linux-2.6.32.28/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
2641 -+++ linux-2.6.32.28/arch/x86/include/asm/mman.h 2010-12-31 14:46:53.000000000 -0500
2642 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/mman.h linux-2.6.32.29/arch/x86/include/asm/mman.h
2643 +--- linux-2.6.32.29/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
2644 ++++ linux-2.6.32.29/arch/x86/include/asm/mman.h 2010-12-31 14:46:53.000000000 -0500
2645 @@ -5,4 +5,14 @@
2646
2647 #include <asm-generic/mman.h>
2648 @@ -8041,9 +8103,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mman.h linux-2.6.32.28/arch/x86/
2649 +#endif
2650 +
2651 #endif /* _ASM_X86_MMAN_H */
2652 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu_context.h linux-2.6.32.28/arch/x86/include/asm/mmu_context.h
2653 ---- linux-2.6.32.28/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400
2654 -+++ linux-2.6.32.28/arch/x86/include/asm/mmu_context.h 2011-02-12 11:05:01.000000000 -0500
2655 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/mmu_context.h linux-2.6.32.29/arch/x86/include/asm/mmu_context.h
2656 +--- linux-2.6.32.29/arch/x86/include/asm/mmu_context.h 2011-02-22 15:56:54.000000000 -0500
2657 ++++ linux-2.6.32.29/arch/x86/include/asm/mmu_context.h 2011-02-22 15:57:23.000000000 -0500
2658 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
2659
2660 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
2661 @@ -8066,7 +8128,7 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu_context.h linux-2.6.32.28/ar
2662 #ifdef CONFIG_SMP
2663 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
2664 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
2665 -@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_s
2666 +@@ -34,17 +49,30 @@ static inline void switch_mm(struct mm_s
2667 struct task_struct *tsk)
2668 {
2669 unsigned cpu = smp_processor_id();
2670 @@ -8075,8 +8137,6 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu_context.h linux-2.6.32.28/ar
2671 +#endif
2672
2673 if (likely(prev != next)) {
2674 -- /* stop flush ipis for the previous mm */
2675 -- cpumask_clear_cpu(cpu, mm_cpumask(prev));
2676 #ifdef CONFIG_SMP
2677 +#ifdef CONFIG_X86_32
2678 + tlbstate = percpu_read(cpu_tlbstate.state);
2679 @@ -8095,12 +8155,12 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu_context.h linux-2.6.32.28/ar
2680 + load_cr3(get_cpu_pgd(cpu));
2681 +#else
2682 load_cr3(next->pgd);
2683 +-
2684 +#endif
2685 -+ /* stop flush ipis for the previous mm */
2686 -+ cpumask_clear_cpu(cpu, mm_cpumask(prev));
2687 + /* stop flush ipis for the previous mm */
2688 + cpumask_clear_cpu(cpu, mm_cpumask(prev));
2689
2690 - /*
2691 - * load the LDT, if the LDT is different:
2692 +@@ -53,9 +81,38 @@ static inline void switch_mm(struct mm_s
2693 */
2694 if (unlikely(prev->context.ldt != next->context.ldt))
2695 load_LDT_nolock(&next->context);
2696 @@ -8140,7 +8200,7 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu_context.h linux-2.6.32.28/ar
2697 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
2698 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
2699
2700 -@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_s
2701 +@@ -64,11 +121,28 @@ static inline void switch_mm(struct mm_s
2702 * tlb flush IPI delivery. We must reload CR3
2703 * to make sure to use no freed page tables.
2704 */
2705 @@ -8170,9 +8230,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu_context.h linux-2.6.32.28/ar
2706 }
2707
2708 #define activate_mm(prev, next) \
2709 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu.h linux-2.6.32.28/arch/x86/include/asm/mmu.h
2710 ---- linux-2.6.32.28/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
2711 -+++ linux-2.6.32.28/arch/x86/include/asm/mmu.h 2010-12-31 14:46:53.000000000 -0500
2712 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/mmu.h linux-2.6.32.29/arch/x86/include/asm/mmu.h
2713 +--- linux-2.6.32.29/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
2714 ++++ linux-2.6.32.29/arch/x86/include/asm/mmu.h 2010-12-31 14:46:53.000000000 -0500
2715 @@ -9,10 +9,23 @@
2716 * we put the segment information here.
2717 */
2718 @@ -8199,9 +8259,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/mmu.h linux-2.6.32.28/arch/x86/i
2719 } mm_context_t;
2720
2721 #ifdef CONFIG_SMP
2722 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/module.h linux-2.6.32.28/arch/x86/include/asm/module.h
2723 ---- linux-2.6.32.28/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
2724 -+++ linux-2.6.32.28/arch/x86/include/asm/module.h 2010-12-31 14:46:53.000000000 -0500
2725 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/module.h linux-2.6.32.29/arch/x86/include/asm/module.h
2726 +--- linux-2.6.32.29/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
2727 ++++ linux-2.6.32.29/arch/x86/include/asm/module.h 2010-12-31 14:46:53.000000000 -0500
2728 @@ -59,13 +59,31 @@
2729 #error unknown processor family
2730 #endif
2731 @@ -8235,9 +8295,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/module.h linux-2.6.32.28/arch/x8
2732 #endif
2733
2734 #endif /* _ASM_X86_MODULE_H */
2735 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/page_64_types.h linux-2.6.32.28/arch/x86/include/asm/page_64_types.h
2736 ---- linux-2.6.32.28/arch/x86/include/asm/page_64_types.h 2010-08-13 16:24:37.000000000 -0400
2737 -+++ linux-2.6.32.28/arch/x86/include/asm/page_64_types.h 2010-12-31 14:46:53.000000000 -0500
2738 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/page_64_types.h linux-2.6.32.29/arch/x86/include/asm/page_64_types.h
2739 +--- linux-2.6.32.29/arch/x86/include/asm/page_64_types.h 2010-08-13 16:24:37.000000000 -0400
2740 ++++ linux-2.6.32.29/arch/x86/include/asm/page_64_types.h 2010-12-31 14:46:53.000000000 -0500
2741 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
2742
2743 /* duplicated to the one in bootmem.h */
2744 @@ -8247,9 +8307,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/page_64_types.h linux-2.6.32.28/
2745
2746 extern unsigned long __phys_addr(unsigned long);
2747 #define __phys_reloc_hide(x) (x)
2748 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/paravirt.h linux-2.6.32.28/arch/x86/include/asm/paravirt.h
2749 ---- linux-2.6.32.28/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
2750 -+++ linux-2.6.32.28/arch/x86/include/asm/paravirt.h 2010-12-31 14:46:53.000000000 -0500
2751 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/paravirt.h linux-2.6.32.29/arch/x86/include/asm/paravirt.h
2752 +--- linux-2.6.32.29/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
2753 ++++ linux-2.6.32.29/arch/x86/include/asm/paravirt.h 2010-12-31 14:46:53.000000000 -0500
2754 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
2755 pv_mmu_ops.set_fixmap(idx, phys, flags);
2756 }
2757 @@ -8303,9 +8363,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/paravirt.h linux-2.6.32.28/arch/
2758 #endif /* CONFIG_X86_32 */
2759
2760 #endif /* __ASSEMBLY__ */
2761 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/paravirt_types.h linux-2.6.32.28/arch/x86/include/asm/paravirt_types.h
2762 ---- linux-2.6.32.28/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
2763 -+++ linux-2.6.32.28/arch/x86/include/asm/paravirt_types.h 2010-12-31 14:46:53.000000000 -0500
2764 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/paravirt_types.h linux-2.6.32.29/arch/x86/include/asm/paravirt_types.h
2765 +--- linux-2.6.32.29/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
2766 ++++ linux-2.6.32.29/arch/x86/include/asm/paravirt_types.h 2010-12-31 14:46:53.000000000 -0500
2767 @@ -316,6 +316,12 @@ struct pv_mmu_ops {
2768 an mfn. We can tell which is which from the index. */
2769 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
2770 @@ -8319,9 +8379,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/paravirt_types.h linux-2.6.32.28
2771 };
2772
2773 struct raw_spinlock;
2774 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pci_x86.h linux-2.6.32.28/arch/x86/include/asm/pci_x86.h
2775 ---- linux-2.6.32.28/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
2776 -+++ linux-2.6.32.28/arch/x86/include/asm/pci_x86.h 2010-12-31 14:46:53.000000000 -0500
2777 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pci_x86.h linux-2.6.32.29/arch/x86/include/asm/pci_x86.h
2778 +--- linux-2.6.32.29/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
2779 ++++ linux-2.6.32.29/arch/x86/include/asm/pci_x86.h 2010-12-31 14:46:53.000000000 -0500
2780 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
2781 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
2782
2783 @@ -8344,9 +8404,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pci_x86.h linux-2.6.32.28/arch/x
2784 extern bool port_cf9_safe;
2785
2786 /* arch_initcall level */
2787 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgalloc.h linux-2.6.32.28/arch/x86/include/asm/pgalloc.h
2788 ---- linux-2.6.32.28/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
2789 -+++ linux-2.6.32.28/arch/x86/include/asm/pgalloc.h 2010-12-31 14:46:53.000000000 -0500
2790 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgalloc.h linux-2.6.32.29/arch/x86/include/asm/pgalloc.h
2791 +--- linux-2.6.32.29/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
2792 ++++ linux-2.6.32.29/arch/x86/include/asm/pgalloc.h 2010-12-31 14:46:53.000000000 -0500
2793 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
2794 pmd_t *pmd, pte_t *pte)
2795 {
2796 @@ -8361,9 +8421,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgalloc.h linux-2.6.32.28/arch/x
2797 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
2798 }
2799
2800 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.28/arch/x86/include/asm/pgtable-2level.h
2801 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
2802 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable-2level.h 2010-12-31 14:46:53.000000000 -0500
2803 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.29/arch/x86/include/asm/pgtable-2level.h
2804 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
2805 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable-2level.h 2010-12-31 14:46:53.000000000 -0500
2806 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
2807
2808 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
2809 @@ -8374,9 +8434,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.28
2810 }
2811
2812 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
2813 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_32.h linux-2.6.32.28/arch/x86/include/asm/pgtable_32.h
2814 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:13:03.000000000 -0500
2815 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
2816 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable_32.h linux-2.6.32.29/arch/x86/include/asm/pgtable_32.h
2817 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:13:03.000000000 -0500
2818 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
2819 @@ -26,9 +26,6 @@
2820 struct mm_struct;
2821 struct vm_area_struct;
2822 @@ -8420,9 +8480,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_32.h linux-2.6.32.28/arc
2823 /*
2824 * kern_addr_valid() is (1) for FLATMEM and (0) for
2825 * SPARSEMEM and DISCONTIGMEM
2826 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.28/arch/x86/include/asm/pgtable_32_types.h
2827 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
2828 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable_32_types.h 2010-12-31 14:46:53.000000000 -0500
2829 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.29/arch/x86/include/asm/pgtable_32_types.h
2830 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
2831 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable_32_types.h 2010-12-31 14:46:53.000000000 -0500
2832 @@ -8,7 +8,7 @@
2833 */
2834 #ifdef CONFIG_X86_PAE
2835 @@ -8452,9 +8512,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
2836 #define MODULES_VADDR VMALLOC_START
2837 #define MODULES_END VMALLOC_END
2838 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
2839 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.28/arch/x86/include/asm/pgtable-3level.h
2840 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
2841 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable-3level.h 2010-12-31 14:46:53.000000000 -0500
2842 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.29/arch/x86/include/asm/pgtable-3level.h
2843 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
2844 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable-3level.h 2010-12-31 14:46:53.000000000 -0500
2845 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
2846
2847 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
2848 @@ -8472,9 +8532,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.28
2849 }
2850
2851 /*
2852 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_64.h linux-2.6.32.28/arch/x86/include/asm/pgtable_64.h
2853 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
2854 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable_64.h 2010-12-31 14:46:53.000000000 -0500
2855 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable_64.h linux-2.6.32.29/arch/x86/include/asm/pgtable_64.h
2856 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
2857 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable_64.h 2010-12-31 14:46:53.000000000 -0500
2858 @@ -16,10 +16,13 @@
2859
2860 extern pud_t level3_kernel_pgt[512];
2861 @@ -8511,9 +8571,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_64.h linux-2.6.32.28/arc
2862 }
2863
2864 static inline void native_pgd_clear(pgd_t *pgd)
2865 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.28/arch/x86/include/asm/pgtable_64_types.h
2866 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
2867 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable_64_types.h 2010-12-31 14:46:53.000000000 -0500
2868 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.29/arch/x86/include/asm/pgtable_64_types.h
2869 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
2870 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable_64_types.h 2010-12-31 14:46:53.000000000 -0500
2871 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
2872 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
2873 #define MODULES_END _AC(0xffffffffff000000, UL)
2874 @@ -8525,9 +8585,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
2875 +#define ktva_ktla(addr) (addr)
2876
2877 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
2878 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable.h linux-2.6.32.28/arch/x86/include/asm/pgtable.h
2879 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
2880 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
2881 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable.h linux-2.6.32.29/arch/x86/include/asm/pgtable.h
2882 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
2883 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
2884 @@ -74,12 +74,51 @@ extern struct list_head pgd_list;
2885
2886 #define arch_end_context_switch(prev) do {} while(0)
2887 @@ -8697,9 +8757,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable.h linux-2.6.32.28/arch/x
2888
2889 #include <asm-generic/pgtable.h>
2890 #endif /* __ASSEMBLY__ */
2891 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_types.h linux-2.6.32.28/arch/x86/include/asm/pgtable_types.h
2892 ---- linux-2.6.32.28/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
2893 -+++ linux-2.6.32.28/arch/x86/include/asm/pgtable_types.h 2010-12-31 14:46:53.000000000 -0500
2894 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/pgtable_types.h linux-2.6.32.29/arch/x86/include/asm/pgtable_types.h
2895 +--- linux-2.6.32.29/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
2896 ++++ linux-2.6.32.29/arch/x86/include/asm/pgtable_types.h 2010-12-31 14:46:53.000000000 -0500
2897 @@ -16,12 +16,11 @@
2898 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
2899 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
2900 @@ -8820,9 +8880,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/pgtable_types.h linux-2.6.32.28/
2901
2902 #define pgprot_writecombine pgprot_writecombine
2903 extern pgprot_t pgprot_writecombine(pgprot_t prot);
2904 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/processor.h linux-2.6.32.28/arch/x86/include/asm/processor.h
2905 ---- linux-2.6.32.28/arch/x86/include/asm/processor.h 2011-01-11 23:55:34.000000000 -0500
2906 -+++ linux-2.6.32.28/arch/x86/include/asm/processor.h 2011-01-11 23:56:03.000000000 -0500
2907 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/processor.h linux-2.6.32.29/arch/x86/include/asm/processor.h
2908 +--- linux-2.6.32.29/arch/x86/include/asm/processor.h 2011-01-11 23:55:34.000000000 -0500
2909 ++++ linux-2.6.32.29/arch/x86/include/asm/processor.h 2011-01-11 23:56:03.000000000 -0500
2910 @@ -272,7 +272,7 @@ struct tss_struct {
2911
2912 } ____cacheline_aligned;
2913 @@ -8907,9 +8967,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/processor.h linux-2.6.32.28/arch
2914 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
2915
2916 /* Get/set a process' ability to use the timestamp counter instruction */
2917 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/ptrace.h linux-2.6.32.28/arch/x86/include/asm/ptrace.h
2918 ---- linux-2.6.32.28/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
2919 -+++ linux-2.6.32.28/arch/x86/include/asm/ptrace.h 2010-12-31 14:46:53.000000000 -0500
2920 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/ptrace.h linux-2.6.32.29/arch/x86/include/asm/ptrace.h
2921 +--- linux-2.6.32.29/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
2922 ++++ linux-2.6.32.29/arch/x86/include/asm/ptrace.h 2010-12-31 14:46:53.000000000 -0500
2923 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_
2924 }
2925
2926 @@ -8946,9 +9006,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/ptrace.h linux-2.6.32.28/arch/x8
2927 #endif
2928 }
2929
2930 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/reboot.h linux-2.6.32.28/arch/x86/include/asm/reboot.h
2931 ---- linux-2.6.32.28/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
2932 -+++ linux-2.6.32.28/arch/x86/include/asm/reboot.h 2010-12-31 14:46:53.000000000 -0500
2933 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/reboot.h linux-2.6.32.29/arch/x86/include/asm/reboot.h
2934 +--- linux-2.6.32.29/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
2935 ++++ linux-2.6.32.29/arch/x86/include/asm/reboot.h 2010-12-31 14:46:53.000000000 -0500
2936 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
2937
2938 void native_machine_crash_shutdown(struct pt_regs *regs);
2939 @@ -8958,9 +9018,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/reboot.h linux-2.6.32.28/arch/x8
2940
2941 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
2942 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
2943 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/rwsem.h linux-2.6.32.28/arch/x86/include/asm/rwsem.h
2944 ---- linux-2.6.32.28/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
2945 -+++ linux-2.6.32.28/arch/x86/include/asm/rwsem.h 2010-12-31 14:47:01.000000000 -0500
2946 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/rwsem.h linux-2.6.32.29/arch/x86/include/asm/rwsem.h
2947 +--- linux-2.6.32.29/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
2948 ++++ linux-2.6.32.29/arch/x86/include/asm/rwsem.h 2010-12-31 14:47:01.000000000 -0500
2949 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw
2950 {
2951 asm volatile("# beginning down_read\n\t"
2952 @@ -9085,9 +9145,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/rwsem.h linux-2.6.32.28/arch/x86
2953 : "+r" (tmp), "+m" (sem->count)
2954 : : "memory");
2955
2956 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/segment.h linux-2.6.32.28/arch/x86/include/asm/segment.h
2957 ---- linux-2.6.32.28/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
2958 -+++ linux-2.6.32.28/arch/x86/include/asm/segment.h 2010-12-31 14:46:53.000000000 -0500
2959 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/segment.h linux-2.6.32.29/arch/x86/include/asm/segment.h
2960 +--- linux-2.6.32.29/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
2961 ++++ linux-2.6.32.29/arch/x86/include/asm/segment.h 2010-12-31 14:46:53.000000000 -0500
2962 @@ -62,8 +62,8 @@
2963 * 26 - ESPFIX small SS
2964 * 27 - per-cpu [ offset to per-cpu data area ]
2965 @@ -9156,9 +9216,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/segment.h linux-2.6.32.28/arch/x
2966 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
2967 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
2968 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
2969 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/smp.h linux-2.6.32.28/arch/x86/include/asm/smp.h
2970 ---- linux-2.6.32.28/arch/x86/include/asm/smp.h 2010-11-26 18:22:29.000000000 -0500
2971 -+++ linux-2.6.32.28/arch/x86/include/asm/smp.h 2010-12-31 14:46:53.000000000 -0500
2972 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/smp.h linux-2.6.32.29/arch/x86/include/asm/smp.h
2973 +--- linux-2.6.32.29/arch/x86/include/asm/smp.h 2010-11-26 18:22:29.000000000 -0500
2974 ++++ linux-2.6.32.29/arch/x86/include/asm/smp.h 2010-12-31 14:46:53.000000000 -0500
2975 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
2976 DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
2977 DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
2978 @@ -9168,9 +9228,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/smp.h linux-2.6.32.28/arch/x86/i
2979
2980 static inline struct cpumask *cpu_sibling_mask(int cpu)
2981 {
2982 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/spinlock.h linux-2.6.32.28/arch/x86/include/asm/spinlock.h
2983 ---- linux-2.6.32.28/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
2984 -+++ linux-2.6.32.28/arch/x86/include/asm/spinlock.h 2010-12-31 14:47:01.000000000 -0500
2985 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/spinlock.h linux-2.6.32.29/arch/x86/include/asm/spinlock.h
2986 +--- linux-2.6.32.29/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
2987 ++++ linux-2.6.32.29/arch/x86/include/asm/spinlock.h 2010-12-31 14:47:01.000000000 -0500
2988 @@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
2989 static inline void __raw_read_lock(raw_rwlock_t *rw)
2990 {
2991 @@ -9233,9 +9293,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/spinlock.h linux-2.6.32.28/arch/
2992 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
2993 }
2994
2995 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/stackprotector.h linux-2.6.32.28/arch/x86/include/asm/stackprotector.h
2996 ---- linux-2.6.32.28/arch/x86/include/asm/stackprotector.h 2010-08-13 16:24:37.000000000 -0400
2997 -+++ linux-2.6.32.28/arch/x86/include/asm/stackprotector.h 2010-12-31 14:47:01.000000000 -0500
2998 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/stackprotector.h linux-2.6.32.29/arch/x86/include/asm/stackprotector.h
2999 +--- linux-2.6.32.29/arch/x86/include/asm/stackprotector.h 2010-08-13 16:24:37.000000000 -0400
3000 ++++ linux-2.6.32.29/arch/x86/include/asm/stackprotector.h 2010-12-31 14:47:01.000000000 -0500
3001 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
3002
3003 static inline void load_stack_canary_segment(void)
3004 @@ -9245,9 +9305,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/stackprotector.h linux-2.6.32.28
3005 asm volatile ("mov %0, %%gs" : : "r" (0));
3006 #endif
3007 }
3008 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/system.h linux-2.6.32.28/arch/x86/include/asm/system.h
3009 ---- linux-2.6.32.28/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
3010 -+++ linux-2.6.32.28/arch/x86/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
3011 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/system.h linux-2.6.32.29/arch/x86/include/asm/system.h
3012 +--- linux-2.6.32.29/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
3013 ++++ linux-2.6.32.29/arch/x86/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
3014 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
3015 {
3016 unsigned long __limit;
3017 @@ -9266,9 +9326,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/system.h linux-2.6.32.28/arch/x8
3018 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
3019
3020 void default_idle(void);
3021 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/uaccess_32.h linux-2.6.32.28/arch/x86/include/asm/uaccess_32.h
3022 ---- linux-2.6.32.28/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
3023 -+++ linux-2.6.32.28/arch/x86/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
3024 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/uaccess_32.h linux-2.6.32.29/arch/x86/include/asm/uaccess_32.h
3025 +--- linux-2.6.32.29/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
3026 ++++ linux-2.6.32.29/arch/x86/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
3027 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
3028 static __always_inline unsigned long __must_check
3029 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
3030 @@ -9398,9 +9458,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/uaccess_32.h linux-2.6.32.28/arc
3031 long __must_check strncpy_from_user(char *dst, const char __user *src,
3032 long count);
3033 long __must_check __strncpy_from_user(char *dst,
3034 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/uaccess_64.h linux-2.6.32.28/arch/x86/include/asm/uaccess_64.h
3035 ---- linux-2.6.32.28/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
3036 -+++ linux-2.6.32.28/arch/x86/include/asm/uaccess_64.h 2010-12-31 14:47:01.000000000 -0500
3037 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/uaccess_64.h linux-2.6.32.29/arch/x86/include/asm/uaccess_64.h
3038 +--- linux-2.6.32.29/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
3039 ++++ linux-2.6.32.29/arch/x86/include/asm/uaccess_64.h 2010-12-31 14:47:01.000000000 -0500
3040 @@ -9,6 +9,9 @@
3041 #include <linux/prefetch.h>
3042 #include <linux/lockdep.h>
3043 @@ -9746,9 +9806,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/uaccess_64.h linux-2.6.32.28/arc
3044 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
3045
3046 #endif /* _ASM_X86_UACCESS_64_H */
3047 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/uaccess.h linux-2.6.32.28/arch/x86/include/asm/uaccess.h
3048 ---- linux-2.6.32.28/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
3049 -+++ linux-2.6.32.28/arch/x86/include/asm/uaccess.h 2010-12-31 14:47:01.000000000 -0500
3050 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/uaccess.h linux-2.6.32.29/arch/x86/include/asm/uaccess.h
3051 +--- linux-2.6.32.29/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
3052 ++++ linux-2.6.32.29/arch/x86/include/asm/uaccess.h 2010-12-31 14:47:01.000000000 -0500
3053 @@ -8,12 +8,15 @@
3054 #include <linux/thread_info.h>
3055 #include <linux/prefetch.h>
3056 @@ -9967,9 +10027,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/uaccess.h linux-2.6.32.28/arch/x
3057 #ifdef CONFIG_X86_32
3058 # include "uaccess_32.h"
3059 #else
3060 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/vgtod.h linux-2.6.32.28/arch/x86/include/asm/vgtod.h
3061 ---- linux-2.6.32.28/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
3062 -+++ linux-2.6.32.28/arch/x86/include/asm/vgtod.h 2010-12-31 14:46:53.000000000 -0500
3063 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/vgtod.h linux-2.6.32.29/arch/x86/include/asm/vgtod.h
3064 +--- linux-2.6.32.29/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
3065 ++++ linux-2.6.32.29/arch/x86/include/asm/vgtod.h 2010-12-31 14:46:53.000000000 -0500
3066 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
3067 int sysctl_enabled;
3068 struct timezone sys_tz;
3069 @@ -9978,9 +10038,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/vgtod.h linux-2.6.32.28/arch/x86
3070 cycle_t (*vread)(void);
3071 cycle_t cycle_last;
3072 cycle_t mask;
3073 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/vmi.h linux-2.6.32.28/arch/x86/include/asm/vmi.h
3074 ---- linux-2.6.32.28/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
3075 -+++ linux-2.6.32.28/arch/x86/include/asm/vmi.h 2010-12-31 14:46:53.000000000 -0500
3076 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/vmi.h linux-2.6.32.29/arch/x86/include/asm/vmi.h
3077 +--- linux-2.6.32.29/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
3078 ++++ linux-2.6.32.29/arch/x86/include/asm/vmi.h 2010-12-31 14:46:53.000000000 -0500
3079 @@ -191,6 +191,7 @@ struct vrom_header {
3080 u8 reserved[96]; /* Reserved for headers */
3081 char vmi_init[8]; /* VMI_Init jump point */
3082 @@ -9989,9 +10049,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/vmi.h linux-2.6.32.28/arch/x86/i
3083 } __attribute__((packed));
3084
3085 struct pnp_header {
3086 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/vsyscall.h linux-2.6.32.28/arch/x86/include/asm/vsyscall.h
3087 ---- linux-2.6.32.28/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
3088 -+++ linux-2.6.32.28/arch/x86/include/asm/vsyscall.h 2010-12-31 14:46:53.000000000 -0500
3089 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/vsyscall.h linux-2.6.32.29/arch/x86/include/asm/vsyscall.h
3090 +--- linux-2.6.32.29/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
3091 ++++ linux-2.6.32.29/arch/x86/include/asm/vsyscall.h 2010-12-31 14:46:53.000000000 -0500
3092 @@ -15,9 +15,10 @@ enum vsyscall_num {
3093
3094 #ifdef __KERNEL__
3095 @@ -10022,9 +10082,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/vsyscall.h linux-2.6.32.28/arch/
3096 #endif /* __KERNEL__ */
3097
3098 #endif /* _ASM_X86_VSYSCALL_H */
3099 -diff -urNp linux-2.6.32.28/arch/x86/include/asm/xsave.h linux-2.6.32.28/arch/x86/include/asm/xsave.h
3100 ---- linux-2.6.32.28/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
3101 -+++ linux-2.6.32.28/arch/x86/include/asm/xsave.h 2010-12-31 14:46:53.000000000 -0500
3102 +diff -urNp linux-2.6.32.29/arch/x86/include/asm/xsave.h linux-2.6.32.29/arch/x86/include/asm/xsave.h
3103 +--- linux-2.6.32.29/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
3104 ++++ linux-2.6.32.29/arch/x86/include/asm/xsave.h 2010-12-31 14:46:53.000000000 -0500
3105 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
3106 static inline int xsave_user(struct xsave_struct __user *buf)
3107 {
3108 @@ -10050,9 +10110,9 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/xsave.h linux-2.6.32.28/arch/x86
3109 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
3110 "2:\n"
3111 ".section .fixup,\"ax\"\n"
3112 -diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3113 ---- linux-2.6.32.28/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400
3114 -+++ linux-2.6.32.28/arch/x86/Kconfig 2010-12-31 14:47:01.000000000 -0500
3115 +diff -urNp linux-2.6.32.29/arch/x86/Kconfig linux-2.6.32.29/arch/x86/Kconfig
3116 +--- linux-2.6.32.29/arch/x86/Kconfig 2011-02-22 15:56:54.000000000 -0500
3117 ++++ linux-2.6.32.29/arch/x86/Kconfig 2011-02-22 15:57:23.000000000 -0500
3118 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE
3119
3120 config X86_32_LAZY_GS
3121 @@ -10062,7 +10122,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3122
3123 config KTIME_SCALAR
3124 def_bool X86_32
3125 -@@ -997,7 +997,7 @@ choice
3126 +@@ -1008,7 +1008,7 @@ choice
3127
3128 config NOHIGHMEM
3129 bool "off"
3130 @@ -10071,7 +10131,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3131 ---help---
3132 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
3133 However, the address space of 32-bit x86 processors is only 4
3134 -@@ -1034,7 +1034,7 @@ config NOHIGHMEM
3135 +@@ -1045,7 +1045,7 @@ config NOHIGHMEM
3136
3137 config HIGHMEM4G
3138 bool "4GB"
3139 @@ -10080,7 +10140,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3140 ---help---
3141 Select this if you have a 32-bit processor and between 1 and 4
3142 gigabytes of physical RAM.
3143 -@@ -1088,7 +1088,7 @@ config PAGE_OFFSET
3144 +@@ -1099,7 +1099,7 @@ config PAGE_OFFSET
3145 hex
3146 default 0xB0000000 if VMSPLIT_3G_OPT
3147 default 0x80000000 if VMSPLIT_2G
3148 @@ -10089,7 +10149,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3149 default 0x40000000 if VMSPLIT_1G
3150 default 0xC0000000
3151 depends on X86_32
3152 -@@ -1419,7 +1419,7 @@ config ARCH_USES_PG_UNCACHED
3153 +@@ -1430,7 +1430,7 @@ config ARCH_USES_PG_UNCACHED
3154
3155 config EFI
3156 bool "EFI runtime service support"
3157 @@ -10098,7 +10158,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3158 ---help---
3159 This enables the kernel to use EFI runtime services that are
3160 available (such as the EFI variable services).
3161 -@@ -1449,6 +1449,7 @@ config SECCOMP
3162 +@@ -1460,6 +1460,7 @@ config SECCOMP
3163
3164 config CC_STACKPROTECTOR
3165 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
3166 @@ -10106,7 +10166,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3167 ---help---
3168 This option turns on the -fstack-protector GCC feature. This
3169 feature puts, at the beginning of functions, a canary value on
3170 -@@ -1506,6 +1507,7 @@ config KEXEC_JUMP
3171 +@@ -1517,6 +1518,7 @@ config KEXEC_JUMP
3172 config PHYSICAL_START
3173 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
3174 default "0x1000000"
3175 @@ -10114,7 +10174,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3176 ---help---
3177 This gives the physical address where the kernel is loaded.
3178
3179 -@@ -1570,6 +1572,7 @@ config PHYSICAL_ALIGN
3180 +@@ -1581,6 +1583,7 @@ config PHYSICAL_ALIGN
3181 hex
3182 prompt "Alignment value to which kernel should be aligned" if X86_32
3183 default "0x1000000"
3184 @@ -10122,7 +10182,7 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3185 range 0x2000 0x1000000
3186 ---help---
3187 This value puts the alignment restrictions on physical address
3188 -@@ -1601,9 +1604,10 @@ config HOTPLUG_CPU
3189 +@@ -1612,9 +1615,10 @@ config HOTPLUG_CPU
3190 Say N if you want to disable CPU hotplug.
3191
3192 config COMPAT_VDSO
3193 @@ -10134,9 +10194,9 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig linux-2.6.32.28/arch/x86/Kconfig
3194 ---help---
3195 Map the 32-bit VDSO to the predictable old-style address too.
3196 ---help---
3197 -diff -urNp linux-2.6.32.28/arch/x86/Kconfig.cpu linux-2.6.32.28/arch/x86/Kconfig.cpu
3198 ---- linux-2.6.32.28/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
3199 -+++ linux-2.6.32.28/arch/x86/Kconfig.cpu 2010-12-31 14:46:53.000000000 -0500
3200 +diff -urNp linux-2.6.32.29/arch/x86/Kconfig.cpu linux-2.6.32.29/arch/x86/Kconfig.cpu
3201 +--- linux-2.6.32.29/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
3202 ++++ linux-2.6.32.29/arch/x86/Kconfig.cpu 2010-12-31 14:46:53.000000000 -0500
3203 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE
3204
3205 config X86_F00F_BUG
3206 @@ -10164,9 +10224,9 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig.cpu linux-2.6.32.28/arch/x86/Kconfig
3207
3208 config X86_MINIMUM_CPU_FAMILY
3209 int
3210 -diff -urNp linux-2.6.32.28/arch/x86/Kconfig.debug linux-2.6.32.28/arch/x86/Kconfig.debug
3211 ---- linux-2.6.32.28/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
3212 -+++ linux-2.6.32.28/arch/x86/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
3213 +diff -urNp linux-2.6.32.29/arch/x86/Kconfig.debug linux-2.6.32.29/arch/x86/Kconfig.debug
3214 +--- linux-2.6.32.29/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
3215 ++++ linux-2.6.32.29/arch/x86/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
3216 @@ -99,7 +99,7 @@ config X86_PTDUMP
3217 config DEBUG_RODATA
3218 bool "Write protect kernel read-only data structures"
3219 @@ -10176,9 +10236,9 @@ diff -urNp linux-2.6.32.28/arch/x86/Kconfig.debug linux-2.6.32.28/arch/x86/Kconf
3220 ---help---
3221 Mark the kernel read-only data as write-protected in the pagetables,
3222 in order to catch accidental (and incorrect) writes to such const
3223 -diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/boot.c linux-2.6.32.28/arch/x86/kernel/acpi/boot.c
3224 ---- linux-2.6.32.28/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400
3225 -+++ linux-2.6.32.28/arch/x86/kernel/acpi/boot.c 2010-12-31 14:46:53.000000000 -0500
3226 +diff -urNp linux-2.6.32.29/arch/x86/kernel/acpi/boot.c linux-2.6.32.29/arch/x86/kernel/acpi/boot.c
3227 +--- linux-2.6.32.29/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400
3228 ++++ linux-2.6.32.29/arch/x86/kernel/acpi/boot.c 2010-12-31 14:46:53.000000000 -0500
3229 @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
3230 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
3231 },
3232 @@ -10188,9 +10248,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/boot.c linux-2.6.32.28/arch/x86/
3233 };
3234
3235 /*
3236 -diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.28/arch/x86/kernel/acpi/realmode/wakeup.S
3237 ---- linux-2.6.32.28/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
3238 -+++ linux-2.6.32.28/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-31 14:46:53.000000000 -0500
3239 +diff -urNp linux-2.6.32.29/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.29/arch/x86/kernel/acpi/realmode/wakeup.S
3240 +--- linux-2.6.32.29/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
3241 ++++ linux-2.6.32.29/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-31 14:46:53.000000000 -0500
3242 @@ -104,7 +104,7 @@ _start:
3243 movl %eax, %ecx
3244 orl %edx, %ecx
3245 @@ -10200,9 +10260,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.2
3246 wrmsr
3247 1:
3248
3249 -diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/sleep.c linux-2.6.32.28/arch/x86/kernel/acpi/sleep.c
3250 ---- linux-2.6.32.28/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
3251 -+++ linux-2.6.32.28/arch/x86/kernel/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
3252 +diff -urNp linux-2.6.32.29/arch/x86/kernel/acpi/sleep.c linux-2.6.32.29/arch/x86/kernel/acpi/sleep.c
3253 +--- linux-2.6.32.29/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
3254 ++++ linux-2.6.32.29/arch/x86/kernel/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
3255 @@ -11,11 +11,12 @@
3256 #include <linux/cpumask.h>
3257 #include <asm/segment.h>
3258 @@ -10247,9 +10307,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/sleep.c linux-2.6.32.28/arch/x86
3259 }
3260
3261
3262 -diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.28/arch/x86/kernel/acpi/wakeup_32.S
3263 ---- linux-2.6.32.28/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
3264 -+++ linux-2.6.32.28/arch/x86/kernel/acpi/wakeup_32.S 2010-12-31 14:46:53.000000000 -0500
3265 +diff -urNp linux-2.6.32.29/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.29/arch/x86/kernel/acpi/wakeup_32.S
3266 +--- linux-2.6.32.29/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
3267 ++++ linux-2.6.32.29/arch/x86/kernel/acpi/wakeup_32.S 2010-12-31 14:46:53.000000000 -0500
3268 @@ -30,13 +30,11 @@ wakeup_pmode_return:
3269 # and restore the stack ... but you need gdt for this to work
3270 movl saved_context_esp, %esp
3271 @@ -10266,9 +10326,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.28/arch
3272
3273 bogus_magic:
3274 jmp bogus_magic
3275 -diff -urNp linux-2.6.32.28/arch/x86/kernel/alternative.c linux-2.6.32.28/arch/x86/kernel/alternative.c
3276 ---- linux-2.6.32.28/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
3277 -+++ linux-2.6.32.28/arch/x86/kernel/alternative.c 2010-12-31 14:46:53.000000000 -0500
3278 +diff -urNp linux-2.6.32.29/arch/x86/kernel/alternative.c linux-2.6.32.29/arch/x86/kernel/alternative.c
3279 +--- linux-2.6.32.29/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
3280 ++++ linux-2.6.32.29/arch/x86/kernel/alternative.c 2010-12-31 14:46:53.000000000 -0500
3281 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
3282
3283 BUG_ON(p->len > MAX_PATCH_LEN);
3284 @@ -10351,9 +10411,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/alternative.c linux-2.6.32.28/arch/x8
3285 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
3286 return addr;
3287 }
3288 -diff -urNp linux-2.6.32.28/arch/x86/kernel/amd_iommu.c linux-2.6.32.28/arch/x86/kernel/amd_iommu.c
3289 ---- linux-2.6.32.28/arch/x86/kernel/amd_iommu.c 2010-10-31 16:44:11.000000000 -0400
3290 -+++ linux-2.6.32.28/arch/x86/kernel/amd_iommu.c 2010-12-31 14:46:53.000000000 -0500
3291 +diff -urNp linux-2.6.32.29/arch/x86/kernel/amd_iommu.c linux-2.6.32.29/arch/x86/kernel/amd_iommu.c
3292 +--- linux-2.6.32.29/arch/x86/kernel/amd_iommu.c 2010-10-31 16:44:11.000000000 -0400
3293 ++++ linux-2.6.32.29/arch/x86/kernel/amd_iommu.c 2010-12-31 14:46:53.000000000 -0500
3294 @@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
3295 }
3296 }
3297 @@ -10363,9 +10423,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/amd_iommu.c linux-2.6.32.28/arch/x86/
3298 .alloc_coherent = alloc_coherent,
3299 .free_coherent = free_coherent,
3300 .map_page = map_page,
3301 -diff -urNp linux-2.6.32.28/arch/x86/kernel/apic/io_apic.c linux-2.6.32.28/arch/x86/kernel/apic/io_apic.c
3302 ---- linux-2.6.32.28/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:55:35.000000000 -0500
3303 -+++ linux-2.6.32.28/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:56:03.000000000 -0500
3304 +diff -urNp linux-2.6.32.29/arch/x86/kernel/apic/io_apic.c linux-2.6.32.29/arch/x86/kernel/apic/io_apic.c
3305 +--- linux-2.6.32.29/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:55:35.000000000 -0500
3306 ++++ linux-2.6.32.29/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:56:03.000000000 -0500
3307 @@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
3308 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
3309 GFP_ATOMIC);
3310 @@ -10402,9 +10462,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/apic/io_apic.c linux-2.6.32.28/arch/x
3311 {
3312 spin_unlock(&vector_lock);
3313 }
3314 -diff -urNp linux-2.6.32.28/arch/x86/kernel/apm_32.c linux-2.6.32.28/arch/x86/kernel/apm_32.c
3315 ---- linux-2.6.32.28/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
3316 -+++ linux-2.6.32.28/arch/x86/kernel/apm_32.c 2010-12-31 14:46:53.000000000 -0500
3317 +diff -urNp linux-2.6.32.29/arch/x86/kernel/apm_32.c linux-2.6.32.29/arch/x86/kernel/apm_32.c
3318 +--- linux-2.6.32.29/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
3319 ++++ linux-2.6.32.29/arch/x86/kernel/apm_32.c 2010-12-31 14:46:53.000000000 -0500
3320 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
3321 * This is for buggy BIOS's that refer to (real mode) segment 0x40
3322 * even though they are called in protected mode.
3323 @@ -10506,9 +10566,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/apm_32.c linux-2.6.32.28/arch/x86/ker
3324
3325 proc_create("apm", 0, NULL, &apm_file_ops);
3326
3327 -diff -urNp linux-2.6.32.28/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.28/arch/x86/kernel/asm-offsets_32.c
3328 ---- linux-2.6.32.28/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
3329 -+++ linux-2.6.32.28/arch/x86/kernel/asm-offsets_32.c 2010-12-31 14:46:53.000000000 -0500
3330 +diff -urNp linux-2.6.32.29/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.29/arch/x86/kernel/asm-offsets_32.c
3331 +--- linux-2.6.32.29/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
3332 ++++ linux-2.6.32.29/arch/x86/kernel/asm-offsets_32.c 2010-12-31 14:46:53.000000000 -0500
3333 @@ -115,6 +115,11 @@ void foo(void)
3334 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
3335 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
3336 @@ -10521,9 +10581,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.28/arch
3337 #endif
3338
3339 #ifdef CONFIG_XEN
3340 -diff -urNp linux-2.6.32.28/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.28/arch/x86/kernel/asm-offsets_64.c
3341 ---- linux-2.6.32.28/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
3342 -+++ linux-2.6.32.28/arch/x86/kernel/asm-offsets_64.c 2010-12-31 14:46:53.000000000 -0500
3343 +diff -urNp linux-2.6.32.29/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.29/arch/x86/kernel/asm-offsets_64.c
3344 +--- linux-2.6.32.29/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
3345 ++++ linux-2.6.32.29/arch/x86/kernel/asm-offsets_64.c 2010-12-31 14:46:53.000000000 -0500
3346 @@ -63,6 +63,18 @@ int main(void)
3347 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
3348 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
3349 @@ -10551,9 +10611,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.28/arch
3350 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
3351 BLANK();
3352 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
3353 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/common.c linux-2.6.32.28/arch/x86/kernel/cpu/common.c
3354 ---- linux-2.6.32.28/arch/x86/kernel/cpu/common.c 2010-10-31 16:44:11.000000000 -0400
3355 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/common.c 2010-12-31 14:47:01.000000000 -0500
3356 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/common.c linux-2.6.32.29/arch/x86/kernel/cpu/common.c
3357 +--- linux-2.6.32.29/arch/x86/kernel/cpu/common.c 2010-10-31 16:44:11.000000000 -0400
3358 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/common.c 2010-12-31 14:47:01.000000000 -0500
3359 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
3360
3361 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
3362 @@ -10679,9 +10739,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/common.c linux-2.6.32.28/arch/x86
3363 struct thread_struct *thread = &curr->thread;
3364
3365 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
3366 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
3367 ---- linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:13:03.000000000 -0500
3368 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-31 14:46:53.000000000 -0500
3369 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
3370 +--- linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:13:03.000000000 -0500
3371 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-31 14:46:53.000000000 -0500
3372 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
3373 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
3374 },
3375 @@ -10691,9 +10751,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
3376 };
3377
3378 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
3379 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
3380 ---- linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
3381 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-31 14:46:53.000000000 -0500
3382 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
3383 +--- linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
3384 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-31 14:46:53.000000000 -0500
3385 @@ -225,7 +225,7 @@ static struct cpu_model models[] =
3386 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
3387 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
3388 @@ -10703,9 +10763,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
3389 };
3390 #undef _BANIAS
3391 #undef BANIAS
3392 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/intel.c linux-2.6.32.28/arch/x86/kernel/cpu/intel.c
3393 ---- linux-2.6.32.28/arch/x86/kernel/cpu/intel.c 2010-10-31 16:44:11.000000000 -0400
3394 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/intel.c 2010-12-31 14:46:53.000000000 -0500
3395 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/intel.c linux-2.6.32.29/arch/x86/kernel/cpu/intel.c
3396 +--- linux-2.6.32.29/arch/x86/kernel/cpu/intel.c 2010-10-31 16:44:11.000000000 -0400
3397 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/intel.c 2010-12-31 14:46:53.000000000 -0500
3398 @@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug
3399 * Update the IDT descriptor and reload the IDT so that
3400 * it uses the read-only mapped virtual address.
3401 @@ -10715,9 +10775,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/intel.c linux-2.6.32.28/arch/x86/
3402 load_idt(&idt_descr);
3403 }
3404 #endif
3405 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.28/arch/x86/kernel/cpu/intel_cacheinfo.c
3406 ---- linux-2.6.32.28/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
3407 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
3408 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.29/arch/x86/kernel/cpu/intel_cacheinfo.c
3409 +--- linux-2.6.32.29/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
3410 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
3411 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
3412 return ret;
3413 }
3414 @@ -10727,9 +10787,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.28
3415 .show = show,
3416 .store = store,
3417 };
3418 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/Makefile linux-2.6.32.28/arch/x86/kernel/cpu/Makefile
3419 ---- linux-2.6.32.28/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
3420 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/Makefile 2010-12-31 14:46:53.000000000 -0500
3421 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/Makefile linux-2.6.32.29/arch/x86/kernel/cpu/Makefile
3422 +--- linux-2.6.32.29/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
3423 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/Makefile 2010-12-31 14:46:53.000000000 -0500
3424 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
3425 CFLAGS_REMOVE_common.o = -pg
3426 endif
3427 @@ -10741,9 +10801,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/Makefile linux-2.6.32.28/arch/x86
3428 obj-y := intel_cacheinfo.o addon_cpuid_features.o
3429 obj-y += proc.o capflags.o powerflags.o common.o
3430 obj-y += vmware.o hypervisor.o sched.o
3431 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce_amd.c
3432 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-31 16:44:11.000000000 -0400
3433 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-31 14:46:53.000000000 -0500
3434 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce_amd.c
3435 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-31 16:44:11.000000000 -0400
3436 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-31 14:46:53.000000000 -0500
3437 @@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
3438 return ret;
3439 }
3440 @@ -10753,9 +10813,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.28/
3441 .show = show,
3442 .store = store,
3443 };
3444 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce.c
3445 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
3446 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:47.000000000 -0500
3447 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce.c
3448 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
3449 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:47.000000000 -0500
3450 @@ -43,6 +43,7 @@
3451 #include <asm/ipi.h>
3452 #include <asm/mce.h>
3453 @@ -10816,9 +10876,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.28/arch
3454 };
3455
3456 /*
3457 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/amd.c
3458 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
3459 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-31 14:46:53.000000000 -0500
3460 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/amd.c
3461 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
3462 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-31 14:46:53.000000000 -0500
3463 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
3464 return 0;
3465 }
3466 @@ -10828,9 +10888,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.28/arch/x
3467 .vendor = X86_VENDOR_AMD,
3468 .set = amd_set_mtrr,
3469 .get = amd_get_mtrr,
3470 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/centaur.c
3471 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
3472 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-31 14:46:53.000000000 -0500
3473 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/centaur.c
3474 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
3475 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-31 14:46:53.000000000 -0500
3476 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
3477 return 0;
3478 }
3479 @@ -10840,9 +10900,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.28/ar
3480 .vendor = X86_VENDOR_CENTAUR,
3481 .set = centaur_set_mcr,
3482 .get = centaur_get_mcr,
3483 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/cyrix.c
3484 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
3485 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-31 14:46:53.000000000 -0500
3486 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/cyrix.c
3487 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
3488 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-31 14:46:53.000000000 -0500
3489 @@ -265,7 +265,7 @@ static void cyrix_set_all(void)
3490 post_set();
3491 }
3492 @@ -10852,9 +10912,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.28/arch
3493 .vendor = X86_VENDOR_CYRIX,
3494 .set_all = cyrix_set_all,
3495 .set = cyrix_set_arr,
3496 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/generic.c
3497 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
3498 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-31 14:46:53.000000000 -0500
3499 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/generic.c
3500 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
3501 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-31 14:46:53.000000000 -0500
3502 @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
3503 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
3504 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
3505 @@ -10873,9 +10933,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.28/ar
3506 .use_intel_if = 1,
3507 .set_all = generic_set_all,
3508 .get = generic_get_mtrr,
3509 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/main.c
3510 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400
3511 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/main.c 2010-12-31 14:46:53.000000000 -0500
3512 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/main.c
3513 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:56:54.000000000 -0500
3514 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:57:23.000000000 -0500
3515 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
3516 u64 size_or_mask, size_and_mask;
3517 static bool mtrr_aps_delayed_init;
3518 @@ -10894,9 +10954,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.28/arch/
3519 {
3520 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
3521 mtrr_ops[ops->vendor] = ops;
3522 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/mtrr.h
3523 ---- linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
3524 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-31 14:46:53.000000000 -0500
3525 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/mtrr.h
3526 +--- linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
3527 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-31 14:46:53.000000000 -0500
3528 @@ -12,19 +12,19 @@
3529 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
3530
3531 @@ -10947,9 +11007,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.28/arch/
3532
3533 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
3534 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
3535 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.28/arch/x86/kernel/cpu/perfctr-watchdog.c
3536 ---- linux-2.6.32.28/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
3537 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-31 14:46:53.000000000 -0500
3538 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.29/arch/x86/kernel/cpu/perfctr-watchdog.c
3539 +--- linux-2.6.32.29/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
3540 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-31 14:46:53.000000000 -0500
3541 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
3542
3543 /* Interface defining a CPU specific perfctr watchdog */
3544 @@ -10983,9 +11043,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.2
3545 static struct wd_ops intel_arch_wd_ops __read_mostly = {
3546 .reserve = single_msr_reserve,
3547 .unreserve = single_msr_unreserve,
3548 -diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.28/arch/x86/kernel/cpu/perf_event.c
3549 ---- linux-2.6.32.28/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
3550 -+++ linux-2.6.32.28/arch/x86/kernel/cpu/perf_event.c 2010-12-31 14:46:53.000000000 -0500
3551 +diff -urNp linux-2.6.32.29/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.29/arch/x86/kernel/cpu/perf_event.c
3552 +--- linux-2.6.32.29/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
3553 ++++ linux-2.6.32.29/arch/x86/kernel/cpu/perf_event.c 2010-12-31 14:46:53.000000000 -0500
3554 @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
3555 break;
3556
3557 @@ -10995,9 +11055,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.28/arch
3558 }
3559 }
3560
3561 -diff -urNp linux-2.6.32.28/arch/x86/kernel/crash.c linux-2.6.32.28/arch/x86/kernel/crash.c
3562 ---- linux-2.6.32.28/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
3563 -+++ linux-2.6.32.28/arch/x86/kernel/crash.c 2010-12-31 14:46:53.000000000 -0500
3564 +diff -urNp linux-2.6.32.29/arch/x86/kernel/crash.c linux-2.6.32.29/arch/x86/kernel/crash.c
3565 +--- linux-2.6.32.29/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
3566 ++++ linux-2.6.32.29/arch/x86/kernel/crash.c 2010-12-31 14:46:53.000000000 -0500
3567 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
3568 regs = args->regs;
3569
3570 @@ -11007,9 +11067,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/crash.c linux-2.6.32.28/arch/x86/kern
3571 crash_fixup_ss_esp(&fixed_regs, regs);
3572 regs = &fixed_regs;
3573 }
3574 -diff -urNp linux-2.6.32.28/arch/x86/kernel/doublefault_32.c linux-2.6.32.28/arch/x86/kernel/doublefault_32.c
3575 ---- linux-2.6.32.28/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
3576 -+++ linux-2.6.32.28/arch/x86/kernel/doublefault_32.c 2010-12-31 14:46:53.000000000 -0500
3577 +diff -urNp linux-2.6.32.29/arch/x86/kernel/doublefault_32.c linux-2.6.32.29/arch/x86/kernel/doublefault_32.c
3578 +--- linux-2.6.32.29/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
3579 ++++ linux-2.6.32.29/arch/x86/kernel/doublefault_32.c 2010-12-31 14:46:53.000000000 -0500
3580 @@ -11,7 +11,7 @@
3581
3582 #define DOUBLEFAULT_STACKSIZE (1024)
3583 @@ -11041,9 +11101,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/doublefault_32.c linux-2.6.32.28/arch
3584 .fs = __KERNEL_PERCPU,
3585
3586 .__cr3 = __pa_nodebug(swapper_pg_dir),
3587 -diff -urNp linux-2.6.32.28/arch/x86/kernel/dumpstack_32.c linux-2.6.32.28/arch/x86/kernel/dumpstack_32.c
3588 ---- linux-2.6.32.28/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
3589 -+++ linux-2.6.32.28/arch/x86/kernel/dumpstack_32.c 2010-12-31 14:46:53.000000000 -0500
3590 +diff -urNp linux-2.6.32.29/arch/x86/kernel/dumpstack_32.c linux-2.6.32.29/arch/x86/kernel/dumpstack_32.c
3591 +--- linux-2.6.32.29/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
3592 ++++ linux-2.6.32.29/arch/x86/kernel/dumpstack_32.c 2010-12-31 14:46:53.000000000 -0500
3593 @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
3594 * When in-kernel, we also print out the stack and code at the
3595 * time of the fault..
3596 @@ -11088,9 +11148,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/dumpstack_32.c linux-2.6.32.28/arch/x
3597 if (ip < PAGE_OFFSET)
3598 return 0;
3599 if (probe_kernel_address((unsigned short *)ip, ud2))
3600 -diff -urNp linux-2.6.32.28/arch/x86/kernel/dumpstack.c linux-2.6.32.28/arch/x86/kernel/dumpstack.c
3601 ---- linux-2.6.32.28/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
3602 -+++ linux-2.6.32.28/arch/x86/kernel/dumpstack.c 2010-12-31 14:52:58.000000000 -0500
3603 +diff -urNp linux-2.6.32.29/arch/x86/kernel/dumpstack.c linux-2.6.32.29/arch/x86/kernel/dumpstack.c
3604 +--- linux-2.6.32.29/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
3605 ++++ linux-2.6.32.29/arch/x86/kernel/dumpstack.c 2010-12-31 14:52:58.000000000 -0500
3606 @@ -2,6 +2,9 @@
3607 * Copyright (C) 1991, 1992 Linus Torvalds
3608 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
3609 @@ -11137,9 +11197,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/dumpstack.c linux-2.6.32.28/arch/x86/
3610 report_bug(regs->ip, regs);
3611
3612 if (__die(str, regs, err))
3613 -diff -urNp linux-2.6.32.28/arch/x86/kernel/e820.c linux-2.6.32.28/arch/x86/kernel/e820.c
3614 ---- linux-2.6.32.28/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
3615 -+++ linux-2.6.32.28/arch/x86/kernel/e820.c 2010-12-31 14:46:53.000000000 -0500
3616 +diff -urNp linux-2.6.32.29/arch/x86/kernel/e820.c linux-2.6.32.29/arch/x86/kernel/e820.c
3617 +--- linux-2.6.32.29/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
3618 ++++ linux-2.6.32.29/arch/x86/kernel/e820.c 2010-12-31 14:46:53.000000000 -0500
3619 @@ -733,7 +733,7 @@ struct early_res {
3620 };
3621 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
3622 @@ -11149,9 +11209,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/e820.c linux-2.6.32.28/arch/x86/kerne
3623 };
3624
3625 static int __init find_overlapped_early(u64 start, u64 end)
3626 -diff -urNp linux-2.6.32.28/arch/x86/kernel/efi_32.c linux-2.6.32.28/arch/x86/kernel/efi_32.c
3627 ---- linux-2.6.32.28/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
3628 -+++ linux-2.6.32.28/arch/x86/kernel/efi_32.c 2010-12-31 14:46:53.000000000 -0500
3629 +diff -urNp linux-2.6.32.29/arch/x86/kernel/efi_32.c linux-2.6.32.29/arch/x86/kernel/efi_32.c
3630 +--- linux-2.6.32.29/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
3631 ++++ linux-2.6.32.29/arch/x86/kernel/efi_32.c 2010-12-31 14:46:53.000000000 -0500
3632 @@ -38,70 +38,38 @@
3633 */
3634
3635 @@ -11232,9 +11292,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/efi_32.c linux-2.6.32.28/arch/x86/ker
3636
3637 /*
3638 * After the lock is released, the original page table is restored.
3639 -diff -urNp linux-2.6.32.28/arch/x86/kernel/efi_stub_32.S linux-2.6.32.28/arch/x86/kernel/efi_stub_32.S
3640 ---- linux-2.6.32.28/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
3641 -+++ linux-2.6.32.28/arch/x86/kernel/efi_stub_32.S 2010-12-31 14:46:53.000000000 -0500
3642 +diff -urNp linux-2.6.32.29/arch/x86/kernel/efi_stub_32.S linux-2.6.32.29/arch/x86/kernel/efi_stub_32.S
3643 +--- linux-2.6.32.29/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
3644 ++++ linux-2.6.32.29/arch/x86/kernel/efi_stub_32.S 2010-12-31 14:46:53.000000000 -0500
3645 @@ -6,6 +6,7 @@
3646 */
3647
3648 @@ -11333,9 +11393,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/efi_stub_32.S linux-2.6.32.28/arch/x8
3649 saved_return_addr:
3650 .long 0
3651 efi_rt_function_ptr:
3652 -diff -urNp linux-2.6.32.28/arch/x86/kernel/entry_32.S linux-2.6.32.28/arch/x86/kernel/entry_32.S
3653 ---- linux-2.6.32.28/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
3654 -+++ linux-2.6.32.28/arch/x86/kernel/entry_32.S 2011-01-04 17:42:43.000000000 -0500
3655 +diff -urNp linux-2.6.32.29/arch/x86/kernel/entry_32.S linux-2.6.32.29/arch/x86/kernel/entry_32.S
3656 +--- linux-2.6.32.29/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
3657 ++++ linux-2.6.32.29/arch/x86/kernel/entry_32.S 2011-01-04 17:42:43.000000000 -0500
3658 @@ -185,13 +185,81 @@
3659 /*CFI_REL_OFFSET gs, PT_GS*/
3660 .endm
3661 @@ -11694,9 +11754,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/entry_32.S linux-2.6.32.28/arch/x86/k
3662 RESTORE_REGS
3663 lss 12+4(%esp), %esp # back to espfix stack
3664 CFI_ADJUST_CFA_OFFSET -24
3665 -diff -urNp linux-2.6.32.28/arch/x86/kernel/entry_64.S linux-2.6.32.28/arch/x86/kernel/entry_64.S
3666 ---- linux-2.6.32.28/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
3667 -+++ linux-2.6.32.28/arch/x86/kernel/entry_64.S 2010-12-31 14:46:53.000000000 -0500
3668 +diff -urNp linux-2.6.32.29/arch/x86/kernel/entry_64.S linux-2.6.32.29/arch/x86/kernel/entry_64.S
3669 +--- linux-2.6.32.29/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
3670 ++++ linux-2.6.32.29/arch/x86/kernel/entry_64.S 2010-12-31 14:46:53.000000000 -0500
3671 @@ -53,6 +53,7 @@
3672 #include <asm/paravirt.h>
3673 #include <asm/ftrace.h>
3674 @@ -12154,9 +12214,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/entry_64.S linux-2.6.32.28/arch/x86/k
3675 RESTORE_ALL 8
3676 jmp irq_return
3677 nmi_userspace:
3678 -diff -urNp linux-2.6.32.28/arch/x86/kernel/ftrace.c linux-2.6.32.28/arch/x86/kernel/ftrace.c
3679 ---- linux-2.6.32.28/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
3680 -+++ linux-2.6.32.28/arch/x86/kernel/ftrace.c 2010-12-31 14:46:53.000000000 -0500
3681 +diff -urNp linux-2.6.32.29/arch/x86/kernel/ftrace.c linux-2.6.32.29/arch/x86/kernel/ftrace.c
3682 +--- linux-2.6.32.29/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
3683 ++++ linux-2.6.32.29/arch/x86/kernel/ftrace.c 2010-12-31 14:46:53.000000000 -0500
3684 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
3685 {
3686 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
3687 @@ -12222,9 +12282,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/ftrace.c linux-2.6.32.28/arch/x86/ker
3688 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
3689 return -EFAULT;
3690
3691 -diff -urNp linux-2.6.32.28/arch/x86/kernel/head32.c linux-2.6.32.28/arch/x86/kernel/head32.c
3692 ---- linux-2.6.32.28/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
3693 -+++ linux-2.6.32.28/arch/x86/kernel/head32.c 2010-12-31 14:46:53.000000000 -0500
3694 +diff -urNp linux-2.6.32.29/arch/x86/kernel/head32.c linux-2.6.32.29/arch/x86/kernel/head32.c
3695 +--- linux-2.6.32.29/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
3696 ++++ linux-2.6.32.29/arch/x86/kernel/head32.c 2010-12-31 14:46:53.000000000 -0500
3697 @@ -16,6 +16,7 @@
3698 #include <asm/apic.h>
3699 #include <asm/io_apic.h>
3700 @@ -12242,9 +12302,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/head32.c linux-2.6.32.28/arch/x86/ker
3701
3702 #ifdef CONFIG_BLK_DEV_INITRD
3703 /* Reserve INITRD */
3704 -diff -urNp linux-2.6.32.28/arch/x86/kernel/head_32.S linux-2.6.32.28/arch/x86/kernel/head_32.S
3705 ---- linux-2.6.32.28/arch/x86/kernel/head_32.S 2010-12-09 18:13:03.000000000 -0500
3706 -+++ linux-2.6.32.28/arch/x86/kernel/head_32.S 2010-12-31 14:47:01.000000000 -0500
3707 +diff -urNp linux-2.6.32.29/arch/x86/kernel/head_32.S linux-2.6.32.29/arch/x86/kernel/head_32.S
3708 +--- linux-2.6.32.29/arch/x86/kernel/head_32.S 2010-12-09 18:13:03.000000000 -0500
3709 ++++ linux-2.6.32.29/arch/x86/kernel/head_32.S 2010-12-31 14:47:01.000000000 -0500
3710 @@ -19,10 +19,17 @@
3711 #include <asm/setup.h>
3712 #include <asm/processor-flags.h>
3713 @@ -12714,9 +12774,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/head_32.S linux-2.6.32.28/arch/x86/ke
3714 + /* Be sure this is zeroed to avoid false validations in Xen */
3715 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
3716 + .endr
3717 -diff -urNp linux-2.6.32.28/arch/x86/kernel/head_64.S linux-2.6.32.28/arch/x86/kernel/head_64.S
3718 ---- linux-2.6.32.28/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
3719 -+++ linux-2.6.32.28/arch/x86/kernel/head_64.S 2010-12-31 14:46:53.000000000 -0500
3720 +diff -urNp linux-2.6.32.29/arch/x86/kernel/head_64.S linux-2.6.32.29/arch/x86/kernel/head_64.S
3721 +--- linux-2.6.32.29/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
3722 ++++ linux-2.6.32.29/arch/x86/kernel/head_64.S 2010-12-31 14:46:53.000000000 -0500
3723 @@ -19,6 +19,7 @@
3724 #include <asm/cache.h>
3725 #include <asm/processor-flags.h>
3726 @@ -12987,9 +13047,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/head_64.S linux-2.6.32.28/arch/x86/ke
3727
3728 __PAGE_ALIGNED_BSS
3729 .align PAGE_SIZE
3730 -diff -urNp linux-2.6.32.28/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.28/arch/x86/kernel/i386_ksyms_32.c
3731 ---- linux-2.6.32.28/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
3732 -+++ linux-2.6.32.28/arch/x86/kernel/i386_ksyms_32.c 2010-12-31 14:46:53.000000000 -0500
3733 +diff -urNp linux-2.6.32.29/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.29/arch/x86/kernel/i386_ksyms_32.c
3734 +--- linux-2.6.32.29/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
3735 ++++ linux-2.6.32.29/arch/x86/kernel/i386_ksyms_32.c 2010-12-31 14:46:53.000000000 -0500
3736 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
3737 EXPORT_SYMBOL(cmpxchg8b_emu);
3738 #endif
3739 @@ -13011,9 +13071,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.28/arch/
3740 +#ifdef CONFIG_PAX_KERNEXEC
3741 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
3742 +#endif
3743 -diff -urNp linux-2.6.32.28/arch/x86/kernel/init_task.c linux-2.6.32.28/arch/x86/kernel/init_task.c
3744 ---- linux-2.6.32.28/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
3745 -+++ linux-2.6.32.28/arch/x86/kernel/init_task.c 2010-12-31 14:46:53.000000000 -0500
3746 +diff -urNp linux-2.6.32.29/arch/x86/kernel/init_task.c linux-2.6.32.29/arch/x86/kernel/init_task.c
3747 +--- linux-2.6.32.29/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
3748 ++++ linux-2.6.32.29/arch/x86/kernel/init_task.c 2010-12-31 14:46:53.000000000 -0500
3749 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
3750 * section. Since TSS's are completely CPU-local, we want them
3751 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
3752 @@ -13022,9 +13082,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/init_task.c linux-2.6.32.28/arch/x86/
3753 -
3754 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
3755 +EXPORT_SYMBOL(init_tss);
3756 -diff -urNp linux-2.6.32.28/arch/x86/kernel/ioport.c linux-2.6.32.28/arch/x86/kernel/ioport.c
3757 ---- linux-2.6.32.28/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
3758 -+++ linux-2.6.32.28/arch/x86/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
3759 +diff -urNp linux-2.6.32.29/arch/x86/kernel/ioport.c linux-2.6.32.29/arch/x86/kernel/ioport.c
3760 +--- linux-2.6.32.29/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
3761 ++++ linux-2.6.32.29/arch/x86/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
3762 @@ -6,6 +6,7 @@
3763 #include <linux/sched.h>
3764 #include <linux/kernel.h>
3765 @@ -13068,9 +13128,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/ioport.c linux-2.6.32.28/arch/x86/ker
3766 if (!capable(CAP_SYS_RAWIO))
3767 return -EPERM;
3768 }
3769 -diff -urNp linux-2.6.32.28/arch/x86/kernel/irq_32.c linux-2.6.32.28/arch/x86/kernel/irq_32.c
3770 ---- linux-2.6.32.28/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
3771 -+++ linux-2.6.32.28/arch/x86/kernel/irq_32.c 2010-12-31 14:58:57.000000000 -0500
3772 +diff -urNp linux-2.6.32.29/arch/x86/kernel/irq_32.c linux-2.6.32.29/arch/x86/kernel/irq_32.c
3773 +--- linux-2.6.32.29/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
3774 ++++ linux-2.6.32.29/arch/x86/kernel/irq_32.c 2010-12-31 14:58:57.000000000 -0500
3775 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
3776 return 0;
3777
3778 @@ -13123,9 +13183,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/irq_32.c linux-2.6.32.28/arch/x86/ker
3779 /*
3780 * Shouldnt happen, we returned above if in_interrupt():
3781 */
3782 -diff -urNp linux-2.6.32.28/arch/x86/kernel/kgdb.c linux-2.6.32.28/arch/x86/kernel/kgdb.c
3783 ---- linux-2.6.32.28/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
3784 -+++ linux-2.6.32.28/arch/x86/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
3785 +diff -urNp linux-2.6.32.29/arch/x86/kernel/kgdb.c linux-2.6.32.29/arch/x86/kernel/kgdb.c
3786 +--- linux-2.6.32.29/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
3787 ++++ linux-2.6.32.29/arch/x86/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
3788 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
3789 return instruction_pointer(regs);
3790 }
3791 @@ -13135,9 +13195,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/kgdb.c linux-2.6.32.28/arch/x86/kerne
3792 /* Breakpoint instruction: */
3793 .gdb_bpt_instr = { 0xcc },
3794 .flags = KGDB_HW_BREAKPOINT,
3795 -diff -urNp linux-2.6.32.28/arch/x86/kernel/kprobes.c linux-2.6.32.28/arch/x86/kernel/kprobes.c
3796 ---- linux-2.6.32.28/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
3797 -+++ linux-2.6.32.28/arch/x86/kernel/kprobes.c 2010-12-31 14:47:01.000000000 -0500
3798 +diff -urNp linux-2.6.32.29/arch/x86/kernel/kprobes.c linux-2.6.32.29/arch/x86/kernel/kprobes.c
3799 +--- linux-2.6.32.29/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
3800 ++++ linux-2.6.32.29/arch/x86/kernel/kprobes.c 2010-12-31 14:47:01.000000000 -0500
3801 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
3802 char op;
3803 s32 raddr;
3804 @@ -13239,9 +13299,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/kprobes.c linux-2.6.32.28/arch/x86/ke
3805 return ret;
3806
3807 switch (val) {
3808 -diff -urNp linux-2.6.32.28/arch/x86/kernel/ldt.c linux-2.6.32.28/arch/x86/kernel/ldt.c
3809 ---- linux-2.6.32.28/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
3810 -+++ linux-2.6.32.28/arch/x86/kernel/ldt.c 2010-12-31 14:46:53.000000000 -0500
3811 +diff -urNp linux-2.6.32.29/arch/x86/kernel/ldt.c linux-2.6.32.29/arch/x86/kernel/ldt.c
3812 +--- linux-2.6.32.29/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
3813 ++++ linux-2.6.32.29/arch/x86/kernel/ldt.c 2010-12-31 14:46:53.000000000 -0500
3814 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
3815 if (reload) {
3816 #ifdef CONFIG_SMP
3817 @@ -13306,9 +13366,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/ldt.c linux-2.6.32.28/arch/x86/kernel
3818 fill_ldt(&ldt, &ldt_info);
3819 if (oldmode)
3820 ldt.avl = 0;
3821 -diff -urNp linux-2.6.32.28/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.28/arch/x86/kernel/machine_kexec_32.c
3822 ---- linux-2.6.32.28/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
3823 -+++ linux-2.6.32.28/arch/x86/kernel/machine_kexec_32.c 2010-12-31 14:46:53.000000000 -0500
3824 +diff -urNp linux-2.6.32.29/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.29/arch/x86/kernel/machine_kexec_32.c
3825 +--- linux-2.6.32.29/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
3826 ++++ linux-2.6.32.29/arch/x86/kernel/machine_kexec_32.c 2010-12-31 14:46:53.000000000 -0500
3827 @@ -26,7 +26,7 @@
3828 #include <asm/system.h>
3829 #include <asm/cacheflush.h>
3830 @@ -13336,9 +13396,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.28/ar
3831
3832 relocate_kernel_ptr = control_page;
3833 page_list[PA_CONTROL_PAGE] = __pa(control_page);
3834 -diff -urNp linux-2.6.32.28/arch/x86/kernel/microcode_amd.c linux-2.6.32.28/arch/x86/kernel/microcode_amd.c
3835 ---- linux-2.6.32.28/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
3836 -+++ linux-2.6.32.28/arch/x86/kernel/microcode_amd.c 2010-12-31 14:46:53.000000000 -0500
3837 +diff -urNp linux-2.6.32.29/arch/x86/kernel/microcode_amd.c linux-2.6.32.29/arch/x86/kernel/microcode_amd.c
3838 +--- linux-2.6.32.29/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
3839 ++++ linux-2.6.32.29/arch/x86/kernel/microcode_amd.c 2010-12-31 14:46:53.000000000 -0500
3840 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
3841 uci->mc = NULL;
3842 }
3843 @@ -13357,9 +13417,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/microcode_amd.c linux-2.6.32.28/arch/
3844 {
3845 return &microcode_amd_ops;
3846 }
3847 -diff -urNp linux-2.6.32.28/arch/x86/kernel/microcode_core.c linux-2.6.32.28/arch/x86/kernel/microcode_core.c
3848 ---- linux-2.6.32.28/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
3849 -+++ linux-2.6.32.28/arch/x86/kernel/microcode_core.c 2010-12-31 14:46:53.000000000 -0500
3850 +diff -urNp linux-2.6.32.29/arch/x86/kernel/microcode_core.c linux-2.6.32.29/arch/x86/kernel/microcode_core.c
3851 +--- linux-2.6.32.29/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
3852 ++++ linux-2.6.32.29/arch/x86/kernel/microcode_core.c 2010-12-31 14:46:53.000000000 -0500
3853 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
3854
3855 #define MICROCODE_VERSION "2.00"
3856 @@ -13369,9 +13429,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/microcode_core.c linux-2.6.32.28/arch
3857
3858 /*
3859 * Synchronization.
3860 -diff -urNp linux-2.6.32.28/arch/x86/kernel/microcode_intel.c linux-2.6.32.28/arch/x86/kernel/microcode_intel.c
3861 ---- linux-2.6.32.28/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
3862 -+++ linux-2.6.32.28/arch/x86/kernel/microcode_intel.c 2010-12-31 14:46:53.000000000 -0500
3863 +diff -urNp linux-2.6.32.29/arch/x86/kernel/microcode_intel.c linux-2.6.32.29/arch/x86/kernel/microcode_intel.c
3864 +--- linux-2.6.32.29/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
3865 ++++ linux-2.6.32.29/arch/x86/kernel/microcode_intel.c 2010-12-31 14:46:53.000000000 -0500
3866 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod
3867
3868 static int get_ucode_user(void *to, const void *from, size_t n)
3869 @@ -13406,9 +13466,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/microcode_intel.c linux-2.6.32.28/arc
3870 {
3871 return &microcode_intel_ops;
3872 }
3873 -diff -urNp linux-2.6.32.28/arch/x86/kernel/module.c linux-2.6.32.28/arch/x86/kernel/module.c
3874 ---- linux-2.6.32.28/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
3875 -+++ linux-2.6.32.28/arch/x86/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
3876 +diff -urNp linux-2.6.32.29/arch/x86/kernel/module.c linux-2.6.32.29/arch/x86/kernel/module.c
3877 +--- linux-2.6.32.29/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
3878 ++++ linux-2.6.32.29/arch/x86/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
3879 @@ -34,7 +34,7 @@
3880 #define DEBUGP(fmt...)
3881 #endif
3882 @@ -13549,9 +13609,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/module.c linux-2.6.32.28/arch/x86/ker
3883 #if 0
3884 if ((s64)val != *(s32 *)loc)
3885 goto overflow;
3886 -diff -urNp linux-2.6.32.28/arch/x86/kernel/paravirt.c linux-2.6.32.28/arch/x86/kernel/paravirt.c
3887 ---- linux-2.6.32.28/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
3888 -+++ linux-2.6.32.28/arch/x86/kernel/paravirt.c 2010-12-31 14:46:53.000000000 -0500
3889 +diff -urNp linux-2.6.32.29/arch/x86/kernel/paravirt.c linux-2.6.32.29/arch/x86/kernel/paravirt.c
3890 +--- linux-2.6.32.29/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
3891 ++++ linux-2.6.32.29/arch/x86/kernel/paravirt.c 2010-12-31 14:46:53.000000000 -0500
3892 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
3893 * corresponding structure. */
3894 static void *get_call_destination(u8 type)
3895 @@ -13655,9 +13715,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/paravirt.c linux-2.6.32.28/arch/x86/k
3896 };
3897
3898 EXPORT_SYMBOL_GPL(pv_time_ops);
3899 -diff -urNp linux-2.6.32.28/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.28/arch/x86/kernel/paravirt-spinlocks.c
3900 ---- linux-2.6.32.28/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
3901 -+++ linux-2.6.32.28/arch/x86/kernel/paravirt-spinlocks.c 2010-12-31 14:46:53.000000000 -0500
3902 +diff -urNp linux-2.6.32.29/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.29/arch/x86/kernel/paravirt-spinlocks.c
3903 +--- linux-2.6.32.29/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
3904 ++++ linux-2.6.32.29/arch/x86/kernel/paravirt-spinlocks.c 2010-12-31 14:46:53.000000000 -0500
3905 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
3906 __raw_spin_lock(lock);
3907 }
3908 @@ -13667,9 +13727,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.28/
3909 #ifdef CONFIG_SMP
3910 .spin_is_locked = __ticket_spin_is_locked,
3911 .spin_is_contended = __ticket_spin_is_contended,
3912 -diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.28/arch/x86/kernel/pci-calgary_64.c
3913 ---- linux-2.6.32.28/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
3914 -+++ linux-2.6.32.28/arch/x86/kernel/pci-calgary_64.c 2010-12-31 14:46:53.000000000 -0500
3915 +diff -urNp linux-2.6.32.29/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.29/arch/x86/kernel/pci-calgary_64.c
3916 +--- linux-2.6.32.29/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
3917 ++++ linux-2.6.32.29/arch/x86/kernel/pci-calgary_64.c 2010-12-31 14:46:53.000000000 -0500
3918 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
3919 free_pages((unsigned long)vaddr, get_order(size));
3920 }
3921 @@ -13679,9 +13739,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.28/arch
3922 .alloc_coherent = calgary_alloc_coherent,
3923 .free_coherent = calgary_free_coherent,
3924 .map_sg = calgary_map_sg,
3925 -diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-dma.c linux-2.6.32.28/arch/x86/kernel/pci-dma.c
3926 ---- linux-2.6.32.28/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
3927 -+++ linux-2.6.32.28/arch/x86/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
3928 +diff -urNp linux-2.6.32.29/arch/x86/kernel/pci-dma.c linux-2.6.32.29/arch/x86/kernel/pci-dma.c
3929 +--- linux-2.6.32.29/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
3930 ++++ linux-2.6.32.29/arch/x86/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
3931 @@ -14,7 +14,7 @@
3932
3933 static int forbid_dac __read_mostly;
3934 @@ -13700,9 +13760,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-dma.c linux-2.6.32.28/arch/x86/ke
3935
3936 #ifdef CONFIG_PCI
3937 if (mask > 0xffffffff && forbid_dac > 0) {
3938 -diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-gart_64.c linux-2.6.32.28/arch/x86/kernel/pci-gart_64.c
3939 ---- linux-2.6.32.28/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
3940 -+++ linux-2.6.32.28/arch/x86/kernel/pci-gart_64.c 2010-12-31 14:46:53.000000000 -0500
3941 +diff -urNp linux-2.6.32.29/arch/x86/kernel/pci-gart_64.c linux-2.6.32.29/arch/x86/kernel/pci-gart_64.c
3942 +--- linux-2.6.32.29/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
3943 ++++ linux-2.6.32.29/arch/x86/kernel/pci-gart_64.c 2010-12-31 14:46:53.000000000 -0500
3944 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
3945 return -1;
3946 }
3947 @@ -13712,9 +13772,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-gart_64.c linux-2.6.32.28/arch/x8
3948 .map_sg = gart_map_sg,
3949 .unmap_sg = gart_unmap_sg,
3950 .map_page = gart_map_page,
3951 -diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-nommu.c linux-2.6.32.28/arch/x86/kernel/pci-nommu.c
3952 ---- linux-2.6.32.28/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
3953 -+++ linux-2.6.32.28/arch/x86/kernel/pci-nommu.c 2010-12-31 14:46:53.000000000 -0500
3954 +diff -urNp linux-2.6.32.29/arch/x86/kernel/pci-nommu.c linux-2.6.32.29/arch/x86/kernel/pci-nommu.c
3955 +--- linux-2.6.32.29/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
3956 ++++ linux-2.6.32.29/arch/x86/kernel/pci-nommu.c 2010-12-31 14:46:53.000000000 -0500
3957 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
3958 flush_write_buffers();
3959 }
3960 @@ -13724,9 +13784,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-nommu.c linux-2.6.32.28/arch/x86/
3961 .alloc_coherent = dma_generic_alloc_coherent,
3962 .free_coherent = nommu_free_coherent,
3963 .map_sg = nommu_map_sg,
3964 -diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.28/arch/x86/kernel/pci-swiotlb.c
3965 ---- linux-2.6.32.28/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
3966 -+++ linux-2.6.32.28/arch/x86/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
3967 +diff -urNp linux-2.6.32.29/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.29/arch/x86/kernel/pci-swiotlb.c
3968 +--- linux-2.6.32.29/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
3969 ++++ linux-2.6.32.29/arch/x86/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
3970 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
3971 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
3972 }
3973 @@ -13736,9 +13796,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.28/arch/x8
3974 .mapping_error = swiotlb_dma_mapping_error,
3975 .alloc_coherent = x86_swiotlb_alloc_coherent,
3976 .free_coherent = swiotlb_free_coherent,
3977 -diff -urNp linux-2.6.32.28/arch/x86/kernel/process_32.c linux-2.6.32.28/arch/x86/kernel/process_32.c
3978 ---- linux-2.6.32.28/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
3979 -+++ linux-2.6.32.28/arch/x86/kernel/process_32.c 2010-12-31 14:47:01.000000000 -0500
3980 +diff -urNp linux-2.6.32.29/arch/x86/kernel/process_32.c linux-2.6.32.29/arch/x86/kernel/process_32.c
3981 +--- linux-2.6.32.29/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
3982 ++++ linux-2.6.32.29/arch/x86/kernel/process_32.c 2010-12-31 14:47:01.000000000 -0500
3983 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
3984 unsigned long thread_saved_pc(struct task_struct *tsk)
3985 {
3986 @@ -13836,9 +13896,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/process_32.c linux-2.6.32.28/arch/x86
3987 + load_sp0(init_tss + smp_processor_id(), thread);
3988 +}
3989 +#endif
3990 -diff -urNp linux-2.6.32.28/arch/x86/kernel/process_64.c linux-2.6.32.28/arch/x86/kernel/process_64.c
3991 ---- linux-2.6.32.28/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
3992 -+++ linux-2.6.32.28/arch/x86/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
3993 +diff -urNp linux-2.6.32.29/arch/x86/kernel/process_64.c linux-2.6.32.29/arch/x86/kernel/process_64.c
3994 +--- linux-2.6.32.29/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
3995 ++++ linux-2.6.32.29/arch/x86/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
3996 @@ -91,7 +91,7 @@ static void __exit_idle(void)
3997 void exit_idle(void)
3998 {
3999 @@ -13881,9 +13941,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/process_64.c linux-2.6.32.28/arch/x86
4000 return 0;
4001 ip = *(u64 *)(fp+8);
4002 if (!in_sched_functions(ip))
4003 -diff -urNp linux-2.6.32.28/arch/x86/kernel/process.c linux-2.6.32.28/arch/x86/kernel/process.c
4004 ---- linux-2.6.32.28/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
4005 -+++ linux-2.6.32.28/arch/x86/kernel/process.c 2010-12-31 14:47:01.000000000 -0500
4006 +diff -urNp linux-2.6.32.29/arch/x86/kernel/process.c linux-2.6.32.29/arch/x86/kernel/process.c
4007 +--- linux-2.6.32.29/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
4008 ++++ linux-2.6.32.29/arch/x86/kernel/process.c 2010-12-31 14:47:01.000000000 -0500
4009 @@ -73,7 +73,7 @@ void exit_thread(void)
4010 unsigned long *bp = t->io_bitmap_ptr;
4011
4012 @@ -13921,9 +13981,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/process.c linux-2.6.32.28/arch/x86/ke
4013 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
4014 -}
4015 -
4016 -diff -urNp linux-2.6.32.28/arch/x86/kernel/ptrace.c linux-2.6.32.28/arch/x86/kernel/ptrace.c
4017 ---- linux-2.6.32.28/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
4018 -+++ linux-2.6.32.28/arch/x86/kernel/ptrace.c 2010-12-31 14:46:53.000000000 -0500
4019 +diff -urNp linux-2.6.32.29/arch/x86/kernel/ptrace.c linux-2.6.32.29/arch/x86/kernel/ptrace.c
4020 +--- linux-2.6.32.29/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
4021 ++++ linux-2.6.32.29/arch/x86/kernel/ptrace.c 2010-12-31 14:46:53.000000000 -0500
4022 @@ -925,7 +925,7 @@ static const struct user_regset_view use
4023 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
4024 {
4025 @@ -13992,9 +14052,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/ptrace.c linux-2.6.32.28/arch/x86/ker
4026
4027 /* Send us the fake SIGTRAP */
4028 force_sig_info(SIGTRAP, &info, tsk);
4029 -diff -urNp linux-2.6.32.28/arch/x86/kernel/reboot.c linux-2.6.32.28/arch/x86/kernel/reboot.c
4030 ---- linux-2.6.32.28/arch/x86/kernel/reboot.c 2010-11-26 18:22:29.000000000 -0500
4031 -+++ linux-2.6.32.28/arch/x86/kernel/reboot.c 2010-12-31 14:46:53.000000000 -0500
4032 +diff -urNp linux-2.6.32.29/arch/x86/kernel/reboot.c linux-2.6.32.29/arch/x86/kernel/reboot.c
4033 +--- linux-2.6.32.29/arch/x86/kernel/reboot.c 2010-11-26 18:22:29.000000000 -0500
4034 ++++ linux-2.6.32.29/arch/x86/kernel/reboot.c 2010-12-31 14:46:53.000000000 -0500
4035 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
4036 EXPORT_SYMBOL(pm_power_off);
4037
4038 @@ -14071,9 +14131,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/reboot.c linux-2.6.32.28/arch/x86/ker
4039
4040 /* Set up the IDT for real mode. */
4041 load_idt(&real_mode_idt);
4042 -diff -urNp linux-2.6.32.28/arch/x86/kernel/setup.c linux-2.6.32.28/arch/x86/kernel/setup.c
4043 ---- linux-2.6.32.28/arch/x86/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
4044 -+++ linux-2.6.32.28/arch/x86/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
4045 +diff -urNp linux-2.6.32.29/arch/x86/kernel/setup.c linux-2.6.32.29/arch/x86/kernel/setup.c
4046 +--- linux-2.6.32.29/arch/x86/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
4047 ++++ linux-2.6.32.29/arch/x86/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
4048 @@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
4049
4050 if (!boot_params.hdr.root_flags)
4051 @@ -14094,9 +14154,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/setup.c linux-2.6.32.28/arch/x86/kern
4052 data_resource.end = virt_to_phys(_edata)-1;
4053 bss_resource.start = virt_to_phys(&__bss_start);
4054 bss_resource.end = virt_to_phys(&__bss_stop)-1;
4055 -diff -urNp linux-2.6.32.28/arch/x86/kernel/setup_percpu.c linux-2.6.32.28/arch/x86/kernel/setup_percpu.c
4056 ---- linux-2.6.32.28/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
4057 -+++ linux-2.6.32.28/arch/x86/kernel/setup_percpu.c 2010-12-31 14:46:53.000000000 -0500
4058 +diff -urNp linux-2.6.32.29/arch/x86/kernel/setup_percpu.c linux-2.6.32.29/arch/x86/kernel/setup_percpu.c
4059 +--- linux-2.6.32.29/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
4060 ++++ linux-2.6.32.29/arch/x86/kernel/setup_percpu.c 2010-12-31 14:46:53.000000000 -0500
4061 @@ -25,19 +25,17 @@
4062 # define DBG(x...)
4063 #endif
4064 @@ -14160,9 +14220,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/setup_percpu.c linux-2.6.32.28/arch/x
4065 /*
4066 * Up to this point, the boot CPU has been using .data.init
4067 * area. Reload any changed state for the boot CPU.
4068 -diff -urNp linux-2.6.32.28/arch/x86/kernel/signal.c linux-2.6.32.28/arch/x86/kernel/signal.c
4069 ---- linux-2.6.32.28/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
4070 -+++ linux-2.6.32.28/arch/x86/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
4071 +diff -urNp linux-2.6.32.29/arch/x86/kernel/signal.c linux-2.6.32.29/arch/x86/kernel/signal.c
4072 +--- linux-2.6.32.29/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
4073 ++++ linux-2.6.32.29/arch/x86/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
4074 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
4075 * Align the stack pointer according to the i386 ABI,
4076 * i.e. so that on function entry ((sp + 4) & 15) == 0.
4077 @@ -14237,9 +14297,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/signal.c linux-2.6.32.28/arch/x86/ker
4078 return;
4079
4080 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
4081 -diff -urNp linux-2.6.32.28/arch/x86/kernel/smpboot.c linux-2.6.32.28/arch/x86/kernel/smpboot.c
4082 ---- linux-2.6.32.28/arch/x86/kernel/smpboot.c 2011-01-11 23:55:35.000000000 -0500
4083 -+++ linux-2.6.32.28/arch/x86/kernel/smpboot.c 2011-01-11 23:56:03.000000000 -0500
4084 +diff -urNp linux-2.6.32.29/arch/x86/kernel/smpboot.c linux-2.6.32.29/arch/x86/kernel/smpboot.c
4085 +--- linux-2.6.32.29/arch/x86/kernel/smpboot.c 2011-01-11 23:55:35.000000000 -0500
4086 ++++ linux-2.6.32.29/arch/x86/kernel/smpboot.c 2011-01-11 23:56:03.000000000 -0500
4087 @@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
4088 */
4089 static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
4090 @@ -14284,9 +14344,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/smpboot.c linux-2.6.32.28/arch/x86/ke
4091 err = do_boot_cpu(apicid, cpu);
4092
4093 if (err) {
4094 -diff -urNp linux-2.6.32.28/arch/x86/kernel/step.c linux-2.6.32.28/arch/x86/kernel/step.c
4095 ---- linux-2.6.32.28/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
4096 -+++ linux-2.6.32.28/arch/x86/kernel/step.c 2010-12-31 14:47:01.000000000 -0500
4097 +diff -urNp linux-2.6.32.29/arch/x86/kernel/step.c linux-2.6.32.29/arch/x86/kernel/step.c
4098 +--- linux-2.6.32.29/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
4099 ++++ linux-2.6.32.29/arch/x86/kernel/step.c 2010-12-31 14:47:01.000000000 -0500
4100 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
4101 struct desc_struct *desc;
4102 unsigned long base;
4103 @@ -14329,17 +14389,17 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/step.c linux-2.6.32.28/arch/x86/kerne
4104 /* 32-bit mode: register increment */
4105 return 0;
4106 /* 64-bit mode: REX prefix */
4107 -diff -urNp linux-2.6.32.28/arch/x86/kernel/syscall_table_32.S linux-2.6.32.28/arch/x86/kernel/syscall_table_32.S
4108 ---- linux-2.6.32.28/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
4109 -+++ linux-2.6.32.28/arch/x86/kernel/syscall_table_32.S 2010-12-31 14:46:53.000000000 -0500
4110 +diff -urNp linux-2.6.32.29/arch/x86/kernel/syscall_table_32.S linux-2.6.32.29/arch/x86/kernel/syscall_table_32.S
4111 +--- linux-2.6.32.29/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
4112 ++++ linux-2.6.32.29/arch/x86/kernel/syscall_table_32.S 2010-12-31 14:46:53.000000000 -0500
4113 @@ -1,3 +1,4 @@
4114 +.section .rodata,"a",@progbits
4115 ENTRY(sys_call_table)
4116 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
4117 .long sys_exit
4118 -diff -urNp linux-2.6.32.28/arch/x86/kernel/sys_i386_32.c linux-2.6.32.28/arch/x86/kernel/sys_i386_32.c
4119 ---- linux-2.6.32.28/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
4120 -+++ linux-2.6.32.28/arch/x86/kernel/sys_i386_32.c 2010-12-31 14:47:01.000000000 -0500
4121 +diff -urNp linux-2.6.32.29/arch/x86/kernel/sys_i386_32.c linux-2.6.32.29/arch/x86/kernel/sys_i386_32.c
4122 +--- linux-2.6.32.29/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
4123 ++++ linux-2.6.32.29/arch/x86/kernel/sys_i386_32.c 2010-12-31 14:47:01.000000000 -0500
4124 @@ -24,6 +24,21 @@
4125
4126 #include <asm/syscalls.h>
4127 @@ -14611,9 +14671,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/sys_i386_32.c linux-2.6.32.28/arch/x8
4128 - : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
4129 - return __res;
4130 -}
4131 -diff -urNp linux-2.6.32.28/arch/x86/kernel/sys_x86_64.c linux-2.6.32.28/arch/x86/kernel/sys_x86_64.c
4132 ---- linux-2.6.32.28/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
4133 -+++ linux-2.6.32.28/arch/x86/kernel/sys_x86_64.c 2010-12-31 14:46:53.000000000 -0500
4134 +diff -urNp linux-2.6.32.29/arch/x86/kernel/sys_x86_64.c linux-2.6.32.29/arch/x86/kernel/sys_x86_64.c
4135 +--- linux-2.6.32.29/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
4136 ++++ linux-2.6.32.29/arch/x86/kernel/sys_x86_64.c 2010-12-31 14:46:53.000000000 -0500
4137 @@ -32,8 +32,8 @@ out:
4138 return error;
4139 }
4140 @@ -14735,9 +14795,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/sys_x86_64.c linux-2.6.32.28/arch/x86
4141 mm->cached_hole_size = ~0UL;
4142
4143 return addr;
4144 -diff -urNp linux-2.6.32.28/arch/x86/kernel/time.c linux-2.6.32.28/arch/x86/kernel/time.c
4145 ---- linux-2.6.32.28/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
4146 -+++ linux-2.6.32.28/arch/x86/kernel/time.c 2010-12-31 14:46:53.000000000 -0500
4147 +diff -urNp linux-2.6.32.29/arch/x86/kernel/time.c linux-2.6.32.29/arch/x86/kernel/time.c
4148 +--- linux-2.6.32.29/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
4149 ++++ linux-2.6.32.29/arch/x86/kernel/time.c 2010-12-31 14:46:53.000000000 -0500
4150 @@ -26,17 +26,13 @@
4151 int timer_ack;
4152 #endif
4153 @@ -14776,9 +14836,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/time.c linux-2.6.32.28/arch/x86/kerne
4154 }
4155 return pc;
4156 }
4157 -diff -urNp linux-2.6.32.28/arch/x86/kernel/tls.c linux-2.6.32.28/arch/x86/kernel/tls.c
4158 ---- linux-2.6.32.28/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
4159 -+++ linux-2.6.32.28/arch/x86/kernel/tls.c 2010-12-31 14:46:53.000000000 -0500
4160 +diff -urNp linux-2.6.32.29/arch/x86/kernel/tls.c linux-2.6.32.29/arch/x86/kernel/tls.c
4161 +--- linux-2.6.32.29/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
4162 ++++ linux-2.6.32.29/arch/x86/kernel/tls.c 2010-12-31 14:46:53.000000000 -0500
4163 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
4164 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
4165 return -EINVAL;
4166 @@ -14791,9 +14851,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/tls.c linux-2.6.32.28/arch/x86/kernel
4167 set_tls_desc(p, idx, &info, 1);
4168
4169 return 0;
4170 -diff -urNp linux-2.6.32.28/arch/x86/kernel/trampoline_32.S linux-2.6.32.28/arch/x86/kernel/trampoline_32.S
4171 ---- linux-2.6.32.28/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
4172 -+++ linux-2.6.32.28/arch/x86/kernel/trampoline_32.S 2010-12-31 14:46:53.000000000 -0500
4173 +diff -urNp linux-2.6.32.29/arch/x86/kernel/trampoline_32.S linux-2.6.32.29/arch/x86/kernel/trampoline_32.S
4174 +--- linux-2.6.32.29/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
4175 ++++ linux-2.6.32.29/arch/x86/kernel/trampoline_32.S 2010-12-31 14:46:53.000000000 -0500
4176 @@ -32,6 +32,12 @@
4177 #include <asm/segment.h>
4178 #include <asm/page_types.h>
4179 @@ -14816,9 +14876,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/trampoline_32.S linux-2.6.32.28/arch/
4180
4181 # These need to be in the same 64K segment as the above;
4182 # hence we don't use the boot_gdt_descr defined in head.S
4183 -diff -urNp linux-2.6.32.28/arch/x86/kernel/trampoline_64.S linux-2.6.32.28/arch/x86/kernel/trampoline_64.S
4184 ---- linux-2.6.32.28/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400
4185 -+++ linux-2.6.32.28/arch/x86/kernel/trampoline_64.S 2010-12-31 14:46:53.000000000 -0500
4186 +diff -urNp linux-2.6.32.29/arch/x86/kernel/trampoline_64.S linux-2.6.32.29/arch/x86/kernel/trampoline_64.S
4187 +--- linux-2.6.32.29/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400
4188 ++++ linux-2.6.32.29/arch/x86/kernel/trampoline_64.S 2010-12-31 14:46:53.000000000 -0500
4189 @@ -91,7 +91,7 @@ startup_32:
4190 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
4191 movl %eax, %ds
4192 @@ -14837,9 +14897,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/trampoline_64.S linux-2.6.32.28/arch/
4193 .long tgdt - r_base
4194 .short 0
4195 .quad 0x00cf9b000000ffff # __KERNEL32_CS
4196 -diff -urNp linux-2.6.32.28/arch/x86/kernel/traps.c linux-2.6.32.28/arch/x86/kernel/traps.c
4197 ---- linux-2.6.32.28/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
4198 -+++ linux-2.6.32.28/arch/x86/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
4199 +diff -urNp linux-2.6.32.29/arch/x86/kernel/traps.c linux-2.6.32.29/arch/x86/kernel/traps.c
4200 +--- linux-2.6.32.29/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
4201 ++++ linux-2.6.32.29/arch/x86/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
4202 @@ -69,12 +69,6 @@ asmlinkage int system_call(void);
4203
4204 /* Do we ignore FPU interrupts ? */
4205 @@ -14989,10 +15049,10 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/traps.c linux-2.6.32.28/arch/x86/kern
4206 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
4207 return;
4208 }
4209 -diff -urNp linux-2.6.32.28/arch/x86/kernel/tsc.c linux-2.6.32.28/arch/x86/kernel/tsc.c
4210 ---- linux-2.6.32.28/arch/x86/kernel/tsc.c 2010-09-20 17:26:42.000000000 -0400
4211 -+++ linux-2.6.32.28/arch/x86/kernel/tsc.c 2010-12-31 14:46:53.000000000 -0500
4212 -@@ -833,7 +833,7 @@ static struct dmi_system_id __initdata b
4213 +diff -urNp linux-2.6.32.29/arch/x86/kernel/tsc.c linux-2.6.32.29/arch/x86/kernel/tsc.c
4214 +--- linux-2.6.32.29/arch/x86/kernel/tsc.c 2011-02-22 15:56:54.000000000 -0500
4215 ++++ linux-2.6.32.29/arch/x86/kernel/tsc.c 2011-02-22 15:57:23.000000000 -0500
4216 +@@ -838,7 +838,7 @@ static struct dmi_system_id __initdata b
4217 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
4218 },
4219 },
4220 @@ -15001,9 +15061,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/tsc.c linux-2.6.32.28/arch/x86/kernel
4221 };
4222
4223 static void __init check_system_tsc_reliable(void)
4224 -diff -urNp linux-2.6.32.28/arch/x86/kernel/vm86_32.c linux-2.6.32.28/arch/x86/kernel/vm86_32.c
4225 ---- linux-2.6.32.28/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
4226 -+++ linux-2.6.32.28/arch/x86/kernel/vm86_32.c 2010-12-31 14:46:53.000000000 -0500
4227 +diff -urNp linux-2.6.32.29/arch/x86/kernel/vm86_32.c linux-2.6.32.29/arch/x86/kernel/vm86_32.c
4228 +--- linux-2.6.32.29/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
4229 ++++ linux-2.6.32.29/arch/x86/kernel/vm86_32.c 2010-12-31 14:46:53.000000000 -0500
4230 @@ -41,6 +41,7 @@
4231 #include <linux/ptrace.h>
4232 #include <linux/audit.h>
4233 @@ -15068,9 +15128,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/vm86_32.c linux-2.6.32.28/arch/x86/ke
4234 if (get_user(segoffs, intr_ptr))
4235 goto cannot_handle;
4236 if ((segoffs >> 16) == BIOSSEG)
4237 -diff -urNp linux-2.6.32.28/arch/x86/kernel/vmi_32.c linux-2.6.32.28/arch/x86/kernel/vmi_32.c
4238 ---- linux-2.6.32.28/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
4239 -+++ linux-2.6.32.28/arch/x86/kernel/vmi_32.c 2010-12-31 14:47:01.000000000 -0500
4240 +diff -urNp linux-2.6.32.29/arch/x86/kernel/vmi_32.c linux-2.6.32.29/arch/x86/kernel/vmi_32.c
4241 +--- linux-2.6.32.29/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
4242 ++++ linux-2.6.32.29/arch/x86/kernel/vmi_32.c 2010-12-31 14:47:01.000000000 -0500
4243 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
4244 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
4245
4246 @@ -15233,9 +15293,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/vmi_32.c linux-2.6.32.28/arch/x86/ker
4247 return;
4248
4249 local_irq_save(flags);
4250 -diff -urNp linux-2.6.32.28/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.28/arch/x86/kernel/vmlinux.lds.S
4251 ---- linux-2.6.32.28/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
4252 -+++ linux-2.6.32.28/arch/x86/kernel/vmlinux.lds.S 2010-12-31 14:47:01.000000000 -0500
4253 +diff -urNp linux-2.6.32.29/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.29/arch/x86/kernel/vmlinux.lds.S
4254 +--- linux-2.6.32.29/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
4255 ++++ linux-2.6.32.29/arch/x86/kernel/vmlinux.lds.S 2010-12-31 14:47:01.000000000 -0500
4256 @@ -26,6 +26,13 @@
4257 #include <asm/page_types.h>
4258 #include <asm/cache.h>
4259 @@ -15528,9 +15588,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.28/arch/x8
4260 "kernel image bigger than KERNEL_IMAGE_SIZE");
4261
4262 #ifdef CONFIG_SMP
4263 -diff -urNp linux-2.6.32.28/arch/x86/kernel/vsyscall_64.c linux-2.6.32.28/arch/x86/kernel/vsyscall_64.c
4264 ---- linux-2.6.32.28/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
4265 -+++ linux-2.6.32.28/arch/x86/kernel/vsyscall_64.c 2010-12-31 14:46:53.000000000 -0500
4266 +diff -urNp linux-2.6.32.29/arch/x86/kernel/vsyscall_64.c linux-2.6.32.29/arch/x86/kernel/vsyscall_64.c
4267 +--- linux-2.6.32.29/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
4268 ++++ linux-2.6.32.29/arch/x86/kernel/vsyscall_64.c 2010-12-31 14:46:53.000000000 -0500
4269 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
4270
4271 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
4272 @@ -15564,9 +15624,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/vsyscall_64.c linux-2.6.32.28/arch/x8
4273 };
4274 #endif
4275
4276 -diff -urNp linux-2.6.32.28/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.28/arch/x86/kernel/x8664_ksyms_64.c
4277 ---- linux-2.6.32.28/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
4278 -+++ linux-2.6.32.28/arch/x86/kernel/x8664_ksyms_64.c 2010-12-31 14:46:53.000000000 -0500
4279 +diff -urNp linux-2.6.32.29/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.29/arch/x86/kernel/x8664_ksyms_64.c
4280 +--- linux-2.6.32.29/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
4281 ++++ linux-2.6.32.29/arch/x86/kernel/x8664_ksyms_64.c 2010-12-31 14:46:53.000000000 -0500
4282 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
4283
4284 EXPORT_SYMBOL(copy_user_generic);
4285 @@ -15576,9 +15636,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.28/arch
4286 EXPORT_SYMBOL(__copy_from_user_inatomic);
4287
4288 EXPORT_SYMBOL(copy_page);
4289 -diff -urNp linux-2.6.32.28/arch/x86/kernel/xsave.c linux-2.6.32.28/arch/x86/kernel/xsave.c
4290 ---- linux-2.6.32.28/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
4291 -+++ linux-2.6.32.28/arch/x86/kernel/xsave.c 2010-12-31 14:46:53.000000000 -0500
4292 +diff -urNp linux-2.6.32.29/arch/x86/kernel/xsave.c linux-2.6.32.29/arch/x86/kernel/xsave.c
4293 +--- linux-2.6.32.29/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
4294 ++++ linux-2.6.32.29/arch/x86/kernel/xsave.c 2010-12-31 14:46:53.000000000 -0500
4295 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
4296 fx_sw_user->xstate_size > fx_sw_user->extended_size)
4297 return -1;
4298 @@ -15606,9 +15666,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kernel/xsave.c linux-2.6.32.28/arch/x86/kern
4299 buf);
4300 if (unlikely(err)) {
4301 /*
4302 -diff -urNp linux-2.6.32.28/arch/x86/kvm/emulate.c linux-2.6.32.28/arch/x86/kvm/emulate.c
4303 ---- linux-2.6.32.28/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
4304 -+++ linux-2.6.32.28/arch/x86/kvm/emulate.c 2010-12-31 14:46:53.000000000 -0500
4305 +diff -urNp linux-2.6.32.29/arch/x86/kvm/emulate.c linux-2.6.32.29/arch/x86/kvm/emulate.c
4306 +--- linux-2.6.32.29/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
4307 ++++ linux-2.6.32.29/arch/x86/kvm/emulate.c 2010-12-31 14:46:53.000000000 -0500
4308 @@ -81,8 +81,8 @@
4309 #define Src2CL (1<<29)
4310 #define Src2ImmByte (2<<29)
4311 @@ -15645,9 +15705,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kvm/emulate.c linux-2.6.32.28/arch/x86/kvm/e
4312 switch ((_dst).bytes) { \
4313 case 1: \
4314 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
4315 -diff -urNp linux-2.6.32.28/arch/x86/kvm/lapic.c linux-2.6.32.28/arch/x86/kvm/lapic.c
4316 ---- linux-2.6.32.28/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
4317 -+++ linux-2.6.32.28/arch/x86/kvm/lapic.c 2010-12-31 14:46:53.000000000 -0500
4318 +diff -urNp linux-2.6.32.29/arch/x86/kvm/lapic.c linux-2.6.32.29/arch/x86/kvm/lapic.c
4319 +--- linux-2.6.32.29/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
4320 ++++ linux-2.6.32.29/arch/x86/kvm/lapic.c 2010-12-31 14:46:53.000000000 -0500
4321 @@ -52,7 +52,7 @@
4322 #define APIC_BUS_CYCLE_NS 1
4323
4324 @@ -15657,9 +15717,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kvm/lapic.c linux-2.6.32.28/arch/x86/kvm/lap
4325
4326 #define APIC_LVT_NUM 6
4327 /* 14 is the version for Xeon and Pentium 8.4.8*/
4328 -diff -urNp linux-2.6.32.28/arch/x86/kvm/svm.c linux-2.6.32.28/arch/x86/kvm/svm.c
4329 ---- linux-2.6.32.28/arch/x86/kvm/svm.c 2010-11-26 18:22:29.000000000 -0500
4330 -+++ linux-2.6.32.28/arch/x86/kvm/svm.c 2010-12-31 14:46:53.000000000 -0500
4331 +diff -urNp linux-2.6.32.29/arch/x86/kvm/svm.c linux-2.6.32.29/arch/x86/kvm/svm.c
4332 +--- linux-2.6.32.29/arch/x86/kvm/svm.c 2010-11-26 18:22:29.000000000 -0500
4333 ++++ linux-2.6.32.29/arch/x86/kvm/svm.c 2010-12-31 14:46:53.000000000 -0500
4334 @@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k
4335 static void reload_tss(struct kvm_vcpu *vcpu)
4336 {
4337 @@ -15683,9 +15743,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kvm/svm.c linux-2.6.32.28/arch/x86/kvm/svm.c
4338 .cpu_has_kvm_support = has_svm,
4339 .disabled_by_bios = is_disabled,
4340 .hardware_setup = svm_hardware_setup,
4341 -diff -urNp linux-2.6.32.28/arch/x86/kvm/vmx.c linux-2.6.32.28/arch/x86/kvm/vmx.c
4342 ---- linux-2.6.32.28/arch/x86/kvm/vmx.c 2010-12-09 18:13:03.000000000 -0500
4343 -+++ linux-2.6.32.28/arch/x86/kvm/vmx.c 2010-12-31 14:46:53.000000000 -0500
4344 +diff -urNp linux-2.6.32.29/arch/x86/kvm/vmx.c linux-2.6.32.29/arch/x86/kvm/vmx.c
4345 +--- linux-2.6.32.29/arch/x86/kvm/vmx.c 2010-12-09 18:13:03.000000000 -0500
4346 ++++ linux-2.6.32.29/arch/x86/kvm/vmx.c 2010-12-31 14:46:53.000000000 -0500
4347 @@ -570,7 +570,11 @@ static void reload_tss(void)
4348
4349 kvm_get_gdt(&gdt);
4350 @@ -15767,9 +15827,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kvm/vmx.c linux-2.6.32.28/arch/x86/kvm/vmx.c
4351 .cpu_has_kvm_support = cpu_has_kvm_support,
4352 .disabled_by_bios = vmx_disabled_by_bios,
4353 .hardware_setup = hardware_setup,
4354 -diff -urNp linux-2.6.32.28/arch/x86/kvm/x86.c linux-2.6.32.28/arch/x86/kvm/x86.c
4355 ---- linux-2.6.32.28/arch/x86/kvm/x86.c 2010-12-09 18:13:03.000000000 -0500
4356 -+++ linux-2.6.32.28/arch/x86/kvm/x86.c 2010-12-31 14:46:53.000000000 -0500
4357 +diff -urNp linux-2.6.32.29/arch/x86/kvm/x86.c linux-2.6.32.29/arch/x86/kvm/x86.c
4358 +--- linux-2.6.32.29/arch/x86/kvm/x86.c 2010-12-09 18:13:03.000000000 -0500
4359 ++++ linux-2.6.32.29/arch/x86/kvm/x86.c 2010-12-31 14:46:53.000000000 -0500
4360 @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
4361 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
4362 struct kvm_cpuid_entry2 __user *entries);
4363 @@ -15871,9 +15931,9 @@ diff -urNp linux-2.6.32.28/arch/x86/kvm/x86.c linux-2.6.32.28/arch/x86/kvm/x86.c
4364
4365 if (kvm_x86_ops) {
4366 printk(KERN_ERR "kvm: already loaded the other module\n");
4367 -diff -urNp linux-2.6.32.28/arch/x86/lib/checksum_32.S linux-2.6.32.28/arch/x86/lib/checksum_32.S
4368 ---- linux-2.6.32.28/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
4369 -+++ linux-2.6.32.28/arch/x86/lib/checksum_32.S 2011-01-16 20:53:41.000000000 -0500
4370 +diff -urNp linux-2.6.32.29/arch/x86/lib/checksum_32.S linux-2.6.32.29/arch/x86/lib/checksum_32.S
4371 +--- linux-2.6.32.29/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
4372 ++++ linux-2.6.32.29/arch/x86/lib/checksum_32.S 2011-01-16 20:53:41.000000000 -0500
4373 @@ -28,7 +28,8 @@
4374 #include <linux/linkage.h>
4375 #include <asm/dwarf2.h>
4376 @@ -16134,9 +16194,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/checksum_32.S linux-2.6.32.28/arch/x86/l
4377
4378 #undef ROUND
4379 #undef ROUND1
4380 -diff -urNp linux-2.6.32.28/arch/x86/lib/clear_page_64.S linux-2.6.32.28/arch/x86/lib/clear_page_64.S
4381 ---- linux-2.6.32.28/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
4382 -+++ linux-2.6.32.28/arch/x86/lib/clear_page_64.S 2010-12-31 14:46:53.000000000 -0500
4383 +diff -urNp linux-2.6.32.29/arch/x86/lib/clear_page_64.S linux-2.6.32.29/arch/x86/lib/clear_page_64.S
4384 +--- linux-2.6.32.29/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
4385 ++++ linux-2.6.32.29/arch/x86/lib/clear_page_64.S 2010-12-31 14:46:53.000000000 -0500
4386 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
4387
4388 #include <asm/cpufeature.h>
4389 @@ -16146,9 +16206,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/clear_page_64.S linux-2.6.32.28/arch/x86
4390 1: .byte 0xeb /* jmp <disp8> */
4391 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
4392 2:
4393 -diff -urNp linux-2.6.32.28/arch/x86/lib/copy_page_64.S linux-2.6.32.28/arch/x86/lib/copy_page_64.S
4394 ---- linux-2.6.32.28/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
4395 -+++ linux-2.6.32.28/arch/x86/lib/copy_page_64.S 2010-12-31 14:46:53.000000000 -0500
4396 +diff -urNp linux-2.6.32.29/arch/x86/lib/copy_page_64.S linux-2.6.32.29/arch/x86/lib/copy_page_64.S
4397 +--- linux-2.6.32.29/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
4398 ++++ linux-2.6.32.29/arch/x86/lib/copy_page_64.S 2010-12-31 14:46:53.000000000 -0500
4399 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
4400
4401 #include <asm/cpufeature.h>
4402 @@ -16158,9 +16218,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/copy_page_64.S linux-2.6.32.28/arch/x86/
4403 1: .byte 0xeb /* jmp <disp8> */
4404 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
4405 2:
4406 -diff -urNp linux-2.6.32.28/arch/x86/lib/copy_user_64.S linux-2.6.32.28/arch/x86/lib/copy_user_64.S
4407 ---- linux-2.6.32.28/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
4408 -+++ linux-2.6.32.28/arch/x86/lib/copy_user_64.S 2010-12-31 14:47:01.000000000 -0500
4409 +diff -urNp linux-2.6.32.29/arch/x86/lib/copy_user_64.S linux-2.6.32.29/arch/x86/lib/copy_user_64.S
4410 +--- linux-2.6.32.29/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
4411 ++++ linux-2.6.32.29/arch/x86/lib/copy_user_64.S 2010-12-31 14:47:01.000000000 -0500
4412 @@ -15,13 +15,14 @@
4413 #include <asm/asm-offsets.h>
4414 #include <asm/thread_info.h>
4415 @@ -16229,9 +16289,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/copy_user_64.S linux-2.6.32.28/arch/x86/
4416 movl %edx,%ecx
4417 xorl %eax,%eax
4418 rep
4419 -diff -urNp linux-2.6.32.28/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.28/arch/x86/lib/copy_user_nocache_64.S
4420 ---- linux-2.6.32.28/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
4421 -+++ linux-2.6.32.28/arch/x86/lib/copy_user_nocache_64.S 2010-12-31 14:46:53.000000000 -0500
4422 +diff -urNp linux-2.6.32.29/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.29/arch/x86/lib/copy_user_nocache_64.S
4423 +--- linux-2.6.32.29/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
4424 ++++ linux-2.6.32.29/arch/x86/lib/copy_user_nocache_64.S 2010-12-31 14:46:53.000000000 -0500
4425 @@ -14,6 +14,7 @@
4426 #include <asm/current.h>
4427 #include <asm/asm-offsets.h>
4428 @@ -16256,9 +16316,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.28/a
4429 cmpl $8,%edx
4430 jb 20f /* less then 8 bytes, go to byte copy loop */
4431 ALIGN_DESTINATION
4432 -diff -urNp linux-2.6.32.28/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.28/arch/x86/lib/csum-wrappers_64.c
4433 ---- linux-2.6.32.28/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
4434 -+++ linux-2.6.32.28/arch/x86/lib/csum-wrappers_64.c 2010-12-31 14:46:53.000000000 -0500
4435 +diff -urNp linux-2.6.32.29/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.29/arch/x86/lib/csum-wrappers_64.c
4436 +--- linux-2.6.32.29/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
4437 ++++ linux-2.6.32.29/arch/x86/lib/csum-wrappers_64.c 2010-12-31 14:46:53.000000000 -0500
4438 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
4439 len -= 2;
4440 }
4441 @@ -16277,9 +16337,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.28/arch/
4442 return csum_partial_copy_generic(src, (void __force *)dst,
4443 len, isum, NULL, errp);
4444 }
4445 -diff -urNp linux-2.6.32.28/arch/x86/lib/getuser.S linux-2.6.32.28/arch/x86/lib/getuser.S
4446 ---- linux-2.6.32.28/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
4447 -+++ linux-2.6.32.28/arch/x86/lib/getuser.S 2010-12-31 14:47:01.000000000 -0500
4448 +diff -urNp linux-2.6.32.29/arch/x86/lib/getuser.S linux-2.6.32.29/arch/x86/lib/getuser.S
4449 +--- linux-2.6.32.29/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
4450 ++++ linux-2.6.32.29/arch/x86/lib/getuser.S 2010-12-31 14:47:01.000000000 -0500
4451 @@ -33,14 +33,35 @@
4452 #include <asm/asm-offsets.h>
4453 #include <asm/thread_info.h>
4454 @@ -16385,9 +16445,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/getuser.S linux-2.6.32.28/arch/x86/lib/g
4455 4: movq -7(%_ASM_AX),%_ASM_DX
4456 xor %eax,%eax
4457 ret
4458 -diff -urNp linux-2.6.32.28/arch/x86/lib/memcpy_64.S linux-2.6.32.28/arch/x86/lib/memcpy_64.S
4459 ---- linux-2.6.32.28/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
4460 -+++ linux-2.6.32.28/arch/x86/lib/memcpy_64.S 2010-12-31 14:46:53.000000000 -0500
4461 +diff -urNp linux-2.6.32.29/arch/x86/lib/memcpy_64.S linux-2.6.32.29/arch/x86/lib/memcpy_64.S
4462 +--- linux-2.6.32.29/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
4463 ++++ linux-2.6.32.29/arch/x86/lib/memcpy_64.S 2010-12-31 14:46:53.000000000 -0500
4464 @@ -128,7 +128,7 @@ ENDPROC(__memcpy)
4465 * It is also a lot simpler. Use this when possible:
4466 */
4467 @@ -16397,9 +16457,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/memcpy_64.S linux-2.6.32.28/arch/x86/lib
4468 1: .byte 0xeb /* jmp <disp8> */
4469 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
4470 2:
4471 -diff -urNp linux-2.6.32.28/arch/x86/lib/memset_64.S linux-2.6.32.28/arch/x86/lib/memset_64.S
4472 ---- linux-2.6.32.28/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
4473 -+++ linux-2.6.32.28/arch/x86/lib/memset_64.S 2010-12-31 14:46:53.000000000 -0500
4474 +diff -urNp linux-2.6.32.29/arch/x86/lib/memset_64.S linux-2.6.32.29/arch/x86/lib/memset_64.S
4475 +--- linux-2.6.32.29/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
4476 ++++ linux-2.6.32.29/arch/x86/lib/memset_64.S 2010-12-31 14:46:53.000000000 -0500
4477 @@ -118,7 +118,7 @@ ENDPROC(__memset)
4478
4479 #include <asm/cpufeature.h>
4480 @@ -16409,9 +16469,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/memset_64.S linux-2.6.32.28/arch/x86/lib
4481 1: .byte 0xeb /* jmp <disp8> */
4482 .byte (memset_c - memset) - (2f - 1b) /* offset */
4483 2:
4484 -diff -urNp linux-2.6.32.28/arch/x86/lib/mmx_32.c linux-2.6.32.28/arch/x86/lib/mmx_32.c
4485 ---- linux-2.6.32.28/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
4486 -+++ linux-2.6.32.28/arch/x86/lib/mmx_32.c 2010-12-31 14:46:53.000000000 -0500
4487 +diff -urNp linux-2.6.32.29/arch/x86/lib/mmx_32.c linux-2.6.32.29/arch/x86/lib/mmx_32.c
4488 +--- linux-2.6.32.29/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
4489 ++++ linux-2.6.32.29/arch/x86/lib/mmx_32.c 2010-12-31 14:46:53.000000000 -0500
4490 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
4491 {
4492 void *p;
4493 @@ -16727,9 +16787,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/mmx_32.c linux-2.6.32.28/arch/x86/lib/mm
4494
4495 from += 64;
4496 to += 64;
4497 -diff -urNp linux-2.6.32.28/arch/x86/lib/putuser.S linux-2.6.32.28/arch/x86/lib/putuser.S
4498 ---- linux-2.6.32.28/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
4499 -+++ linux-2.6.32.28/arch/x86/lib/putuser.S 2010-12-31 14:47:01.000000000 -0500
4500 +diff -urNp linux-2.6.32.29/arch/x86/lib/putuser.S linux-2.6.32.29/arch/x86/lib/putuser.S
4501 +--- linux-2.6.32.29/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
4502 ++++ linux-2.6.32.29/arch/x86/lib/putuser.S 2010-12-31 14:47:01.000000000 -0500
4503 @@ -15,7 +15,8 @@
4504 #include <asm/thread_info.h>
4505 #include <asm/errno.h>
4506 @@ -16867,9 +16927,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/putuser.S linux-2.6.32.28/arch/x86/lib/p
4507 #endif
4508 xor %eax,%eax
4509 EXIT
4510 -diff -urNp linux-2.6.32.28/arch/x86/lib/usercopy_32.c linux-2.6.32.28/arch/x86/lib/usercopy_32.c
4511 ---- linux-2.6.32.28/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
4512 -+++ linux-2.6.32.28/arch/x86/lib/usercopy_32.c 2010-12-31 14:47:01.000000000 -0500
4513 +diff -urNp linux-2.6.32.29/arch/x86/lib/usercopy_32.c linux-2.6.32.29/arch/x86/lib/usercopy_32.c
4514 +--- linux-2.6.32.29/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
4515 ++++ linux-2.6.32.29/arch/x86/lib/usercopy_32.c 2010-12-31 14:47:01.000000000 -0500
4516 @@ -43,7 +43,7 @@ do { \
4517 __asm__ __volatile__( \
4518 " testl %1,%1\n" \
4519 @@ -17474,9 +17534,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/usercopy_32.c linux-2.6.32.28/arch/x86/l
4520 -EXPORT_SYMBOL(copy_from_user);
4521 +EXPORT_SYMBOL(set_fs);
4522 +#endif
4523 -diff -urNp linux-2.6.32.28/arch/x86/lib/usercopy_64.c linux-2.6.32.28/arch/x86/lib/usercopy_64.c
4524 ---- linux-2.6.32.28/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
4525 -+++ linux-2.6.32.28/arch/x86/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
4526 +diff -urNp linux-2.6.32.29/arch/x86/lib/usercopy_64.c linux-2.6.32.29/arch/x86/lib/usercopy_64.c
4527 +--- linux-2.6.32.29/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
4528 ++++ linux-2.6.32.29/arch/x86/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
4529 @@ -42,6 +42,8 @@ long
4530 __strncpy_from_user(char *dst, const char __user *src, long count)
4531 {
4532 @@ -17513,9 +17573,9 @@ diff -urNp linux-2.6.32.28/arch/x86/lib/usercopy_64.c linux-2.6.32.28/arch/x86/l
4533 }
4534 EXPORT_SYMBOL(copy_in_user);
4535
4536 -diff -urNp linux-2.6.32.28/arch/x86/Makefile linux-2.6.32.28/arch/x86/Makefile
4537 ---- linux-2.6.32.28/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
4538 -+++ linux-2.6.32.28/arch/x86/Makefile 2010-12-31 14:46:53.000000000 -0500
4539 +diff -urNp linux-2.6.32.29/arch/x86/Makefile linux-2.6.32.29/arch/x86/Makefile
4540 +--- linux-2.6.32.29/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
4541 ++++ linux-2.6.32.29/arch/x86/Makefile 2010-12-31 14:46:53.000000000 -0500
4542 @@ -189,3 +189,12 @@ define archhelp
4543 echo ' FDARGS="..." arguments for the booted kernel'
4544 echo ' FDINITRD=file initrd for the booted kernel'
4545 @@ -17529,9 +17589,9 @@ diff -urNp linux-2.6.32.28/arch/x86/Makefile linux-2.6.32.28/arch/x86/Makefile
4546 +
4547 +archprepare:
4548 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
4549 -diff -urNp linux-2.6.32.28/arch/x86/mm/extable.c linux-2.6.32.28/arch/x86/mm/extable.c
4550 ---- linux-2.6.32.28/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
4551 -+++ linux-2.6.32.28/arch/x86/mm/extable.c 2010-12-31 14:46:53.000000000 -0500
4552 +diff -urNp linux-2.6.32.29/arch/x86/mm/extable.c linux-2.6.32.29/arch/x86/mm/extable.c
4553 +--- linux-2.6.32.29/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
4554 ++++ linux-2.6.32.29/arch/x86/mm/extable.c 2010-12-31 14:46:53.000000000 -0500
4555 @@ -1,14 +1,71 @@
4556 #include <linux/module.h>
4557 #include <linux/spinlock.h>
4558 @@ -17605,9 +17665,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/extable.c linux-2.6.32.28/arch/x86/mm/ext
4559 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
4560 extern u32 pnp_bios_is_utter_crap;
4561 pnp_bios_is_utter_crap = 1;
4562 -diff -urNp linux-2.6.32.28/arch/x86/mm/fault.c linux-2.6.32.28/arch/x86/mm/fault.c
4563 ---- linux-2.6.32.28/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
4564 -+++ linux-2.6.32.28/arch/x86/mm/fault.c 2010-12-31 14:47:01.000000000 -0500
4565 +diff -urNp linux-2.6.32.29/arch/x86/mm/fault.c linux-2.6.32.29/arch/x86/mm/fault.c
4566 +--- linux-2.6.32.29/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
4567 ++++ linux-2.6.32.29/arch/x86/mm/fault.c 2010-12-31 14:47:01.000000000 -0500
4568 @@ -11,10 +11,19 @@
4569 #include <linux/kprobes.h> /* __kprobes, ... */
4570 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
4571 @@ -18292,9 +18352,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/fault.c linux-2.6.32.28/arch/x86/mm/fault
4572 +
4573 + return ret ? -EFAULT : 0;
4574 +}
4575 -diff -urNp linux-2.6.32.28/arch/x86/mm/gup.c linux-2.6.32.28/arch/x86/mm/gup.c
4576 ---- linux-2.6.32.28/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
4577 -+++ linux-2.6.32.28/arch/x86/mm/gup.c 2010-12-31 14:46:53.000000000 -0500
4578 +diff -urNp linux-2.6.32.29/arch/x86/mm/gup.c linux-2.6.32.29/arch/x86/mm/gup.c
4579 +--- linux-2.6.32.29/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
4580 ++++ linux-2.6.32.29/arch/x86/mm/gup.c 2010-12-31 14:46:53.000000000 -0500
4581 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
4582 addr = start;
4583 len = (unsigned long) nr_pages << PAGE_SHIFT;
4584 @@ -18304,9 +18364,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/gup.c linux-2.6.32.28/arch/x86/mm/gup.c
4585 (void __user *)start, len)))
4586 return 0;
4587
4588 -diff -urNp linux-2.6.32.28/arch/x86/mm/highmem_32.c linux-2.6.32.28/arch/x86/mm/highmem_32.c
4589 ---- linux-2.6.32.28/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
4590 -+++ linux-2.6.32.28/arch/x86/mm/highmem_32.c 2010-12-31 14:46:53.000000000 -0500
4591 +diff -urNp linux-2.6.32.29/arch/x86/mm/highmem_32.c linux-2.6.32.29/arch/x86/mm/highmem_32.c
4592 +--- linux-2.6.32.29/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
4593 ++++ linux-2.6.32.29/arch/x86/mm/highmem_32.c 2010-12-31 14:46:53.000000000 -0500
4594 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
4595 idx = type + KM_TYPE_NR*smp_processor_id();
4596 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
4597 @@ -18318,9 +18378,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/highmem_32.c linux-2.6.32.28/arch/x86/mm/
4598
4599 return (void *)vaddr;
4600 }
4601 -diff -urNp linux-2.6.32.28/arch/x86/mm/hugetlbpage.c linux-2.6.32.28/arch/x86/mm/hugetlbpage.c
4602 ---- linux-2.6.32.28/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
4603 -+++ linux-2.6.32.28/arch/x86/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
4604 +diff -urNp linux-2.6.32.29/arch/x86/mm/hugetlbpage.c linux-2.6.32.29/arch/x86/mm/hugetlbpage.c
4605 +--- linux-2.6.32.29/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
4606 ++++ linux-2.6.32.29/arch/x86/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
4607 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
4608 struct hstate *h = hstate_file(file);
4609 struct mm_struct *mm = current->mm;
4610 @@ -18524,9 +18584,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/hugetlbpage.c linux-2.6.32.28/arch/x86/mm
4611 return addr;
4612 }
4613 if (mm->get_unmapped_area == arch_get_unmapped_area)
4614 -diff -urNp linux-2.6.32.28/arch/x86/mm/init_32.c linux-2.6.32.28/arch/x86/mm/init_32.c
4615 ---- linux-2.6.32.28/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
4616 -+++ linux-2.6.32.28/arch/x86/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
4617 +diff -urNp linux-2.6.32.29/arch/x86/mm/init_32.c linux-2.6.32.29/arch/x86/mm/init_32.c
4618 +--- linux-2.6.32.29/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
4619 ++++ linux-2.6.32.29/arch/x86/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
4620 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
4621 }
4622
4623 @@ -18830,9 +18890,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/init_32.c linux-2.6.32.28/arch/x86/mm/ini
4624 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
4625 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
4626 size >> 10);
4627 -diff -urNp linux-2.6.32.28/arch/x86/mm/init_64.c linux-2.6.32.28/arch/x86/mm/init_64.c
4628 ---- linux-2.6.32.28/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
4629 -+++ linux-2.6.32.28/arch/x86/mm/init_64.c 2010-12-31 14:46:53.000000000 -0500
4630 +diff -urNp linux-2.6.32.29/arch/x86/mm/init_64.c linux-2.6.32.29/arch/x86/mm/init_64.c
4631 +--- linux-2.6.32.29/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
4632 ++++ linux-2.6.32.29/arch/x86/mm/init_64.c 2010-12-31 14:46:53.000000000 -0500
4633 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
4634 pmd = fill_pmd(pud, vaddr);
4635 pte = fill_pte(pmd, vaddr);
4636 @@ -18893,9 +18953,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/init_64.c linux-2.6.32.28/arch/x86/mm/ini
4637 return "[vdso]";
4638 if (vma == &gate_vma)
4639 return "[vsyscall]";
4640 -diff -urNp linux-2.6.32.28/arch/x86/mm/init.c linux-2.6.32.28/arch/x86/mm/init.c
4641 ---- linux-2.6.32.28/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
4642 -+++ linux-2.6.32.28/arch/x86/mm/init.c 2010-12-31 14:46:53.000000000 -0500
4643 +diff -urNp linux-2.6.32.29/arch/x86/mm/init.c linux-2.6.32.29/arch/x86/mm/init.c
4644 +--- linux-2.6.32.29/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
4645 ++++ linux-2.6.32.29/arch/x86/mm/init.c 2010-12-31 14:46:53.000000000 -0500
4646 @@ -69,11 +69,7 @@ static void __init find_early_table_spac
4647 * cause a hotspot and fill up ZONE_DMA. The page tables
4648 * need roughly 0.5KB per GB.
4649 @@ -19020,9 +19080,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/init.c linux-2.6.32.28/arch/x86/mm/init.c
4650 free_init_pages("unused kernel memory",
4651 (unsigned long)(&__init_begin),
4652 (unsigned long)(&__init_end));
4653 -diff -urNp linux-2.6.32.28/arch/x86/mm/iomap_32.c linux-2.6.32.28/arch/x86/mm/iomap_32.c
4654 ---- linux-2.6.32.28/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
4655 -+++ linux-2.6.32.28/arch/x86/mm/iomap_32.c 2010-12-31 14:46:53.000000000 -0500
4656 +diff -urNp linux-2.6.32.29/arch/x86/mm/iomap_32.c linux-2.6.32.29/arch/x86/mm/iomap_32.c
4657 +--- linux-2.6.32.29/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
4658 ++++ linux-2.6.32.29/arch/x86/mm/iomap_32.c 2010-12-31 14:46:53.000000000 -0500
4659 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
4660 debug_kmap_atomic(type);
4661 idx = type + KM_TYPE_NR * smp_processor_id();
4662 @@ -19035,9 +19095,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/iomap_32.c linux-2.6.32.28/arch/x86/mm/io
4663 arch_flush_lazy_mmu_mode();
4664
4665 return (void *)vaddr;
4666 -diff -urNp linux-2.6.32.28/arch/x86/mm/ioremap.c linux-2.6.32.28/arch/x86/mm/ioremap.c
4667 ---- linux-2.6.32.28/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
4668 -+++ linux-2.6.32.28/arch/x86/mm/ioremap.c 2010-12-31 14:46:53.000000000 -0500
4669 +diff -urNp linux-2.6.32.29/arch/x86/mm/ioremap.c linux-2.6.32.29/arch/x86/mm/ioremap.c
4670 +--- linux-2.6.32.29/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
4671 ++++ linux-2.6.32.29/arch/x86/mm/ioremap.c 2010-12-31 14:46:53.000000000 -0500
4672 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
4673 * Second special case: Some BIOSen report the PC BIOS
4674 * area (640->1Mb) as ram even though it is not.
4675 @@ -19084,9 +19144,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/ioremap.c linux-2.6.32.28/arch/x86/mm/ior
4676
4677 /*
4678 * The boot-ioremap range spans multiple pmds, for which
4679 -diff -urNp linux-2.6.32.28/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.28/arch/x86/mm/kmemcheck/kmemcheck.c
4680 ---- linux-2.6.32.28/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
4681 -+++ linux-2.6.32.28/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-31 14:46:53.000000000 -0500
4682 +diff -urNp linux-2.6.32.29/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.29/arch/x86/mm/kmemcheck/kmemcheck.c
4683 +--- linux-2.6.32.29/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
4684 ++++ linux-2.6.32.29/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-31 14:46:53.000000000 -0500
4685 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
4686 * memory (e.g. tracked pages)? For now, we need this to avoid
4687 * invoking kmemcheck for PnP BIOS calls.
4688 @@ -19099,9 +19159,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.28/arc
4689 return false;
4690
4691 pte = kmemcheck_pte_lookup(address);
4692 -diff -urNp linux-2.6.32.28/arch/x86/mm/mmap.c linux-2.6.32.28/arch/x86/mm/mmap.c
4693 ---- linux-2.6.32.28/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
4694 -+++ linux-2.6.32.28/arch/x86/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
4695 +diff -urNp linux-2.6.32.29/arch/x86/mm/mmap.c linux-2.6.32.29/arch/x86/mm/mmap.c
4696 +--- linux-2.6.32.29/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
4697 ++++ linux-2.6.32.29/arch/x86/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
4698 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
4699 * Leave an at least ~128 MB hole with possible stack randomization.
4700 */
4701 @@ -19183,9 +19243,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/mmap.c linux-2.6.32.28/arch/x86/mm/mmap.c
4702 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4703 mm->unmap_area = arch_unmap_area_topdown;
4704 }
4705 -diff -urNp linux-2.6.32.28/arch/x86/mm/numa_32.c linux-2.6.32.28/arch/x86/mm/numa_32.c
4706 ---- linux-2.6.32.28/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
4707 -+++ linux-2.6.32.28/arch/x86/mm/numa_32.c 2010-12-31 14:46:53.000000000 -0500
4708 +diff -urNp linux-2.6.32.29/arch/x86/mm/numa_32.c linux-2.6.32.29/arch/x86/mm/numa_32.c
4709 +--- linux-2.6.32.29/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
4710 ++++ linux-2.6.32.29/arch/x86/mm/numa_32.c 2010-12-31 14:46:53.000000000 -0500
4711 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
4712 }
4713 #endif
4714 @@ -19194,9 +19254,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/numa_32.c linux-2.6.32.28/arch/x86/mm/num
4715 extern unsigned long highend_pfn, highstart_pfn;
4716
4717 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
4718 -diff -urNp linux-2.6.32.28/arch/x86/mm/pageattr.c linux-2.6.32.28/arch/x86/mm/pageattr.c
4719 ---- linux-2.6.32.28/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
4720 -+++ linux-2.6.32.28/arch/x86/mm/pageattr.c 2010-12-31 14:46:53.000000000 -0500
4721 +diff -urNp linux-2.6.32.29/arch/x86/mm/pageattr.c linux-2.6.32.29/arch/x86/mm/pageattr.c
4722 +--- linux-2.6.32.29/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
4723 ++++ linux-2.6.32.29/arch/x86/mm/pageattr.c 2010-12-31 14:46:53.000000000 -0500
4724 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection
4725 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
4726 */
4727 @@ -19273,9 +19333,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/pageattr.c linux-2.6.32.28/arch/x86/mm/pa
4728 }
4729
4730 static int
4731 -diff -urNp linux-2.6.32.28/arch/x86/mm/pageattr-test.c linux-2.6.32.28/arch/x86/mm/pageattr-test.c
4732 ---- linux-2.6.32.28/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
4733 -+++ linux-2.6.32.28/arch/x86/mm/pageattr-test.c 2010-12-31 14:46:53.000000000 -0500
4734 +diff -urNp linux-2.6.32.29/arch/x86/mm/pageattr-test.c linux-2.6.32.29/arch/x86/mm/pageattr-test.c
4735 +--- linux-2.6.32.29/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
4736 ++++ linux-2.6.32.29/arch/x86/mm/pageattr-test.c 2010-12-31 14:46:53.000000000 -0500
4737 @@ -36,7 +36,7 @@ enum {
4738
4739 static int pte_testbit(pte_t pte)
4740 @@ -19285,9 +19345,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/pageattr-test.c linux-2.6.32.28/arch/x86/
4741 }
4742
4743 struct split_state {
4744 -diff -urNp linux-2.6.32.28/arch/x86/mm/pat.c linux-2.6.32.28/arch/x86/mm/pat.c
4745 ---- linux-2.6.32.28/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
4746 -+++ linux-2.6.32.28/arch/x86/mm/pat.c 2010-12-31 14:46:53.000000000 -0500
4747 +diff -urNp linux-2.6.32.29/arch/x86/mm/pat.c linux-2.6.32.29/arch/x86/mm/pat.c
4748 +--- linux-2.6.32.29/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
4749 ++++ linux-2.6.32.29/arch/x86/mm/pat.c 2010-12-31 14:46:53.000000000 -0500
4750 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
4751
4752 conflict:
4753 @@ -19335,9 +19395,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/pat.c linux-2.6.32.28/arch/x86/mm/pat.c
4754 cattr_name(want_flags),
4755 (unsigned long long)paddr,
4756 (unsigned long long)(paddr + size),
4757 -diff -urNp linux-2.6.32.28/arch/x86/mm/pgtable_32.c linux-2.6.32.28/arch/x86/mm/pgtable_32.c
4758 ---- linux-2.6.32.28/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
4759 -+++ linux-2.6.32.28/arch/x86/mm/pgtable_32.c 2010-12-31 14:46:53.000000000 -0500
4760 +diff -urNp linux-2.6.32.29/arch/x86/mm/pgtable_32.c linux-2.6.32.29/arch/x86/mm/pgtable_32.c
4761 +--- linux-2.6.32.29/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
4762 ++++ linux-2.6.32.29/arch/x86/mm/pgtable_32.c 2010-12-31 14:46:53.000000000 -0500
4763 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
4764 return;
4765 }
4766 @@ -19352,9 +19412,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/pgtable_32.c linux-2.6.32.28/arch/x86/mm/
4767
4768 /*
4769 * It's enough to flush this one mapping.
4770 -diff -urNp linux-2.6.32.28/arch/x86/mm/pgtable.c linux-2.6.32.28/arch/x86/mm/pgtable.c
4771 ---- linux-2.6.32.28/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
4772 -+++ linux-2.6.32.28/arch/x86/mm/pgtable.c 2010-12-31 14:46:53.000000000 -0500
4773 +diff -urNp linux-2.6.32.29/arch/x86/mm/pgtable.c linux-2.6.32.29/arch/x86/mm/pgtable.c
4774 +--- linux-2.6.32.29/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
4775 ++++ linux-2.6.32.29/arch/x86/mm/pgtable.c 2010-12-31 14:46:53.000000000 -0500
4776 @@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p
4777 list_del(&page->lru);
4778 }
4779 @@ -19607,9 +19667,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/pgtable.c linux-2.6.32.28/arch/x86/mm/pgt
4780 pgd_dtor(pgd);
4781 paravirt_pgd_free(mm, pgd);
4782 free_page((unsigned long)pgd);
4783 -diff -urNp linux-2.6.32.28/arch/x86/mm/setup_nx.c linux-2.6.32.28/arch/x86/mm/setup_nx.c
4784 ---- linux-2.6.32.28/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
4785 -+++ linux-2.6.32.28/arch/x86/mm/setup_nx.c 2010-12-31 14:46:53.000000000 -0500
4786 +diff -urNp linux-2.6.32.29/arch/x86/mm/setup_nx.c linux-2.6.32.29/arch/x86/mm/setup_nx.c
4787 +--- linux-2.6.32.29/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
4788 ++++ linux-2.6.32.29/arch/x86/mm/setup_nx.c 2010-12-31 14:46:53.000000000 -0500
4789 @@ -4,11 +4,10 @@
4790
4791 #include <asm/pgtable.h>
4792 @@ -19675,9 +19735,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/setup_nx.c linux-2.6.32.28/arch/x86/mm/se
4793 __supported_pte_mask &= ~_PAGE_NX;
4794 }
4795 #endif
4796 -diff -urNp linux-2.6.32.28/arch/x86/mm/tlb.c linux-2.6.32.28/arch/x86/mm/tlb.c
4797 ---- linux-2.6.32.28/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
4798 -+++ linux-2.6.32.28/arch/x86/mm/tlb.c 2010-12-31 14:46:53.000000000 -0500
4799 +diff -urNp linux-2.6.32.29/arch/x86/mm/tlb.c linux-2.6.32.29/arch/x86/mm/tlb.c
4800 +--- linux-2.6.32.29/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
4801 ++++ linux-2.6.32.29/arch/x86/mm/tlb.c 2010-12-31 14:46:53.000000000 -0500
4802 @@ -12,7 +12,7 @@
4803 #include <asm/uv/uv.h>
4804
4805 @@ -19699,9 +19759,9 @@ diff -urNp linux-2.6.32.28/arch/x86/mm/tlb.c linux-2.6.32.28/arch/x86/mm/tlb.c
4806 }
4807 EXPORT_SYMBOL_GPL(leave_mm);
4808
4809 -diff -urNp linux-2.6.32.28/arch/x86/oprofile/backtrace.c linux-2.6.32.28/arch/x86/oprofile/backtrace.c
4810 ---- linux-2.6.32.28/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
4811 -+++ linux-2.6.32.28/arch/x86/oprofile/backtrace.c 2010-12-31 14:46:53.000000000 -0500
4812 +diff -urNp linux-2.6.32.29/arch/x86/oprofile/backtrace.c linux-2.6.32.29/arch/x86/oprofile/backtrace.c
4813 +--- linux-2.6.32.29/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
4814 ++++ linux-2.6.32.29/arch/x86/oprofile/backtrace.c 2010-12-31 14:46:53.000000000 -0500
4815 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
4816 struct frame_head bufhead[2];
4817
4818 @@ -19720,9 +19780,9 @@ diff -urNp linux-2.6.32.28/arch/x86/oprofile/backtrace.c linux-2.6.32.28/arch/x8
4819 unsigned long stack = kernel_stack_pointer(regs);
4820 if (depth)
4821 dump_trace(NULL, regs, (unsigned long *)stack, 0,
4822 -diff -urNp linux-2.6.32.28/arch/x86/oprofile/op_model_p4.c linux-2.6.32.28/arch/x86/oprofile/op_model_p4.c
4823 ---- linux-2.6.32.28/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
4824 -+++ linux-2.6.32.28/arch/x86/oprofile/op_model_p4.c 2010-12-31 14:46:53.000000000 -0500
4825 +diff -urNp linux-2.6.32.29/arch/x86/oprofile/op_model_p4.c linux-2.6.32.29/arch/x86/oprofile/op_model_p4.c
4826 +--- linux-2.6.32.29/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
4827 ++++ linux-2.6.32.29/arch/x86/oprofile/op_model_p4.c 2010-12-31 14:46:53.000000000 -0500
4828 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
4829 #endif
4830 }
4831 @@ -19732,9 +19792,9 @@ diff -urNp linux-2.6.32.28/arch/x86/oprofile/op_model_p4.c linux-2.6.32.28/arch/
4832 {
4833 #ifdef CONFIG_SMP
4834 return smp_num_siblings == 2 ? 2 : 1;
4835 -diff -urNp linux-2.6.32.28/arch/x86/pci/common.c linux-2.6.32.28/arch/x86/pci/common.c
4836 ---- linux-2.6.32.28/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
4837 -+++ linux-2.6.32.28/arch/x86/pci/common.c 2010-12-31 14:46:53.000000000 -0500
4838 +diff -urNp linux-2.6.32.29/arch/x86/pci/common.c linux-2.6.32.29/arch/x86/pci/common.c
4839 +--- linux-2.6.32.29/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
4840 ++++ linux-2.6.32.29/arch/x86/pci/common.c 2010-12-31 14:46:53.000000000 -0500
4841 @@ -31,8 +31,8 @@ int noioapicreroute = 1;
4842 int pcibios_last_bus = -1;
4843 unsigned long pirq_table_addr;
4844 @@ -19755,9 +19815,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/common.c linux-2.6.32.28/arch/x86/pci/co
4845 };
4846
4847 void __init dmi_check_pciprobe(void)
4848 -diff -urNp linux-2.6.32.28/arch/x86/pci/direct.c linux-2.6.32.28/arch/x86/pci/direct.c
4849 ---- linux-2.6.32.28/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
4850 -+++ linux-2.6.32.28/arch/x86/pci/direct.c 2010-12-31 14:46:53.000000000 -0500
4851 +diff -urNp linux-2.6.32.29/arch/x86/pci/direct.c linux-2.6.32.29/arch/x86/pci/direct.c
4852 +--- linux-2.6.32.29/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
4853 ++++ linux-2.6.32.29/arch/x86/pci/direct.c 2010-12-31 14:46:53.000000000 -0500
4854 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
4855
4856 #undef PCI_CONF1_ADDRESS
4857 @@ -19785,9 +19845,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/direct.c linux-2.6.32.28/arch/x86/pci/di
4858 {
4859 u32 x = 0;
4860 int year, devfn;
4861 -diff -urNp linux-2.6.32.28/arch/x86/pci/fixup.c linux-2.6.32.28/arch/x86/pci/fixup.c
4862 ---- linux-2.6.32.28/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
4863 -+++ linux-2.6.32.28/arch/x86/pci/fixup.c 2010-12-31 14:46:53.000000000 -0500
4864 +diff -urNp linux-2.6.32.29/arch/x86/pci/fixup.c linux-2.6.32.29/arch/x86/pci/fixup.c
4865 +--- linux-2.6.32.29/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
4866 ++++ linux-2.6.32.29/arch/x86/pci/fixup.c 2010-12-31 14:46:53.000000000 -0500
4867 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
4868 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
4869 },
4870 @@ -19806,9 +19866,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/fixup.c linux-2.6.32.28/arch/x86/pci/fix
4871 };
4872
4873 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
4874 -diff -urNp linux-2.6.32.28/arch/x86/pci/irq.c linux-2.6.32.28/arch/x86/pci/irq.c
4875 ---- linux-2.6.32.28/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
4876 -+++ linux-2.6.32.28/arch/x86/pci/irq.c 2010-12-31 14:46:53.000000000 -0500
4877 +diff -urNp linux-2.6.32.29/arch/x86/pci/irq.c linux-2.6.32.29/arch/x86/pci/irq.c
4878 +--- linux-2.6.32.29/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
4879 ++++ linux-2.6.32.29/arch/x86/pci/irq.c 2010-12-31 14:46:53.000000000 -0500
4880 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str
4881 static struct pci_device_id __initdata pirq_440gx[] = {
4882 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
4883 @@ -19827,9 +19887,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/irq.c linux-2.6.32.28/arch/x86/pci/irq.c
4884 };
4885
4886 int __init pcibios_irq_init(void)
4887 -diff -urNp linux-2.6.32.28/arch/x86/pci/mmconfig_32.c linux-2.6.32.28/arch/x86/pci/mmconfig_32.c
4888 ---- linux-2.6.32.28/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
4889 -+++ linux-2.6.32.28/arch/x86/pci/mmconfig_32.c 2010-12-31 14:46:53.000000000 -0500
4890 +diff -urNp linux-2.6.32.29/arch/x86/pci/mmconfig_32.c linux-2.6.32.29/arch/x86/pci/mmconfig_32.c
4891 +--- linux-2.6.32.29/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
4892 ++++ linux-2.6.32.29/arch/x86/pci/mmconfig_32.c 2010-12-31 14:46:53.000000000 -0500
4893 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
4894 return 0;
4895 }
4896 @@ -19839,9 +19899,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/mmconfig_32.c linux-2.6.32.28/arch/x86/p
4897 .read = pci_mmcfg_read,
4898 .write = pci_mmcfg_write,
4899 };
4900 -diff -urNp linux-2.6.32.28/arch/x86/pci/mmconfig_64.c linux-2.6.32.28/arch/x86/pci/mmconfig_64.c
4901 ---- linux-2.6.32.28/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
4902 -+++ linux-2.6.32.28/arch/x86/pci/mmconfig_64.c 2010-12-31 14:46:53.000000000 -0500
4903 +diff -urNp linux-2.6.32.29/arch/x86/pci/mmconfig_64.c linux-2.6.32.29/arch/x86/pci/mmconfig_64.c
4904 +--- linux-2.6.32.29/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
4905 ++++ linux-2.6.32.29/arch/x86/pci/mmconfig_64.c 2010-12-31 14:46:53.000000000 -0500
4906 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
4907 return 0;
4908 }
4909 @@ -19851,9 +19911,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/mmconfig_64.c linux-2.6.32.28/arch/x86/p
4910 .read = pci_mmcfg_read,
4911 .write = pci_mmcfg_write,
4912 };
4913 -diff -urNp linux-2.6.32.28/arch/x86/pci/numaq_32.c linux-2.6.32.28/arch/x86/pci/numaq_32.c
4914 ---- linux-2.6.32.28/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
4915 -+++ linux-2.6.32.28/arch/x86/pci/numaq_32.c 2010-12-31 14:46:53.000000000 -0500
4916 +diff -urNp linux-2.6.32.29/arch/x86/pci/numaq_32.c linux-2.6.32.29/arch/x86/pci/numaq_32.c
4917 +--- linux-2.6.32.29/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
4918 ++++ linux-2.6.32.29/arch/x86/pci/numaq_32.c 2010-12-31 14:46:53.000000000 -0500
4919 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
4920
4921 #undef PCI_CONF1_MQ_ADDRESS
4922 @@ -19863,9 +19923,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/numaq_32.c linux-2.6.32.28/arch/x86/pci/
4923 .read = pci_conf1_mq_read,
4924 .write = pci_conf1_mq_write
4925 };
4926 -diff -urNp linux-2.6.32.28/arch/x86/pci/olpc.c linux-2.6.32.28/arch/x86/pci/olpc.c
4927 ---- linux-2.6.32.28/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
4928 -+++ linux-2.6.32.28/arch/x86/pci/olpc.c 2010-12-31 14:46:53.000000000 -0500
4929 +diff -urNp linux-2.6.32.29/arch/x86/pci/olpc.c linux-2.6.32.29/arch/x86/pci/olpc.c
4930 +--- linux-2.6.32.29/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
4931 ++++ linux-2.6.32.29/arch/x86/pci/olpc.c 2010-12-31 14:46:53.000000000 -0500
4932 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
4933 return 0;
4934 }
4935 @@ -19875,9 +19935,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/olpc.c linux-2.6.32.28/arch/x86/pci/olpc
4936 .read = pci_olpc_read,
4937 .write = pci_olpc_write,
4938 };
4939 -diff -urNp linux-2.6.32.28/arch/x86/pci/pcbios.c linux-2.6.32.28/arch/x86/pci/pcbios.c
4940 ---- linux-2.6.32.28/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
4941 -+++ linux-2.6.32.28/arch/x86/pci/pcbios.c 2010-12-31 14:46:53.000000000 -0500
4942 +diff -urNp linux-2.6.32.29/arch/x86/pci/pcbios.c linux-2.6.32.29/arch/x86/pci/pcbios.c
4943 +--- linux-2.6.32.29/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
4944 ++++ linux-2.6.32.29/arch/x86/pci/pcbios.c 2010-12-31 14:46:53.000000000 -0500
4945 @@ -56,50 +56,93 @@ union bios32 {
4946 static struct {
4947 unsigned long address;
4948 @@ -20200,9 +20260,9 @@ diff -urNp linux-2.6.32.28/arch/x86/pci/pcbios.c linux-2.6.32.28/arch/x86/pci/pc
4949 return !(ret & 0xff00);
4950 }
4951 EXPORT_SYMBOL(pcibios_set_irq_routing);
4952 -diff -urNp linux-2.6.32.28/arch/x86/power/cpu.c linux-2.6.32.28/arch/x86/power/cpu.c
4953 ---- linux-2.6.32.28/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
4954 -+++ linux-2.6.32.28/arch/x86/power/cpu.c 2010-12-31 14:46:53.000000000 -0500
4955 +diff -urNp linux-2.6.32.29/arch/x86/power/cpu.c linux-2.6.32.29/arch/x86/power/cpu.c
4956 +--- linux-2.6.32.29/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
4957 ++++ linux-2.6.32.29/arch/x86/power/cpu.c 2010-12-31 14:46:53.000000000 -0500
4958 @@ -129,7 +129,7 @@ static void do_fpu_end(void)
4959 static void fix_processor_context(void)
4960 {
4961 @@ -20222,9 +20282,9 @@ diff -urNp linux-2.6.32.28/arch/x86/power/cpu.c linux-2.6.32.28/arch/x86/power/c
4962
4963 syscall_init(); /* This sets MSR_*STAR and related */
4964 #endif
4965 -diff -urNp linux-2.6.32.28/arch/x86/vdso/Makefile linux-2.6.32.28/arch/x86/vdso/Makefile
4966 ---- linux-2.6.32.28/arch/x86/vdso/Makefile 2011-01-11 23:55:35.000000000 -0500
4967 -+++ linux-2.6.32.28/arch/x86/vdso/Makefile 2011-01-11 23:56:03.000000000 -0500
4968 +diff -urNp linux-2.6.32.29/arch/x86/vdso/Makefile linux-2.6.32.29/arch/x86/vdso/Makefile
4969 +--- linux-2.6.32.29/arch/x86/vdso/Makefile 2011-01-11 23:55:35.000000000 -0500
4970 ++++ linux-2.6.32.29/arch/x86/vdso/Makefile 2011-01-11 23:56:03.000000000 -0500
4971 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
4972 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
4973 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
4974 @@ -20234,9 +20294,9 @@ diff -urNp linux-2.6.32.28/arch/x86/vdso/Makefile linux-2.6.32.28/arch/x86/vdso/
4975 GCOV_PROFILE := n
4976
4977 #
4978 -diff -urNp linux-2.6.32.28/arch/x86/vdso/vclock_gettime.c linux-2.6.32.28/arch/x86/vdso/vclock_gettime.c
4979 ---- linux-2.6.32.28/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
4980 -+++ linux-2.6.32.28/arch/x86/vdso/vclock_gettime.c 2010-12-31 14:46:53.000000000 -0500
4981 +diff -urNp linux-2.6.32.29/arch/x86/vdso/vclock_gettime.c linux-2.6.32.29/arch/x86/vdso/vclock_gettime.c
4982 +--- linux-2.6.32.29/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
4983 ++++ linux-2.6.32.29/arch/x86/vdso/vclock_gettime.c 2010-12-31 14:46:53.000000000 -0500
4984 @@ -22,24 +22,48 @@
4985 #include <asm/hpet.h>
4986 #include <asm/unistd.h>
4987 @@ -20335,9 +20395,9 @@ diff -urNp linux-2.6.32.28/arch/x86/vdso/vclock_gettime.c linux-2.6.32.28/arch/x
4988 }
4989 int gettimeofday(struct timeval *, struct timezone *)
4990 __attribute__((weak, alias("__vdso_gettimeofday")));
4991 -diff -urNp linux-2.6.32.28/arch/x86/vdso/vdso32-setup.c linux-2.6.32.28/arch/x86/vdso/vdso32-setup.c
4992 ---- linux-2.6.32.28/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
4993 -+++ linux-2.6.32.28/arch/x86/vdso/vdso32-setup.c 2010-12-31 14:46:53.000000000 -0500
4994 +diff -urNp linux-2.6.32.29/arch/x86/vdso/vdso32-setup.c linux-2.6.32.29/arch/x86/vdso/vdso32-setup.c
4995 +--- linux-2.6.32.29/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
4996 ++++ linux-2.6.32.29/arch/x86/vdso/vdso32-setup.c 2010-12-31 14:46:53.000000000 -0500
4997 @@ -25,6 +25,7 @@
4998 #include <asm/tlbflush.h>
4999 #include <asm/vdso.h>
5000 @@ -20438,9 +20498,9 @@ diff -urNp linux-2.6.32.28/arch/x86/vdso/vdso32-setup.c linux-2.6.32.28/arch/x86
5001 return &gate_vma;
5002 return NULL;
5003 }
5004 -diff -urNp linux-2.6.32.28/arch/x86/vdso/vdso.lds.S linux-2.6.32.28/arch/x86/vdso/vdso.lds.S
5005 ---- linux-2.6.32.28/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
5006 -+++ linux-2.6.32.28/arch/x86/vdso/vdso.lds.S 2010-12-31 14:46:53.000000000 -0500
5007 +diff -urNp linux-2.6.32.29/arch/x86/vdso/vdso.lds.S linux-2.6.32.29/arch/x86/vdso/vdso.lds.S
5008 +--- linux-2.6.32.29/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
5009 ++++ linux-2.6.32.29/arch/x86/vdso/vdso.lds.S 2010-12-31 14:46:53.000000000 -0500
5010 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
5011 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
5012 #include "vextern.h"
5013 @@ -20451,9 +20511,9 @@ diff -urNp linux-2.6.32.28/arch/x86/vdso/vdso.lds.S linux-2.6.32.28/arch/x86/vds
5014 +VEXTERN(fallback_time)
5015 +VEXTERN(getcpu)
5016 +#undef VEXTERN
5017 -diff -urNp linux-2.6.32.28/arch/x86/vdso/vextern.h linux-2.6.32.28/arch/x86/vdso/vextern.h
5018 ---- linux-2.6.32.28/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
5019 -+++ linux-2.6.32.28/arch/x86/vdso/vextern.h 2010-12-31 14:46:53.000000000 -0500
5020 +diff -urNp linux-2.6.32.29/arch/x86/vdso/vextern.h linux-2.6.32.29/arch/x86/vdso/vextern.h
5021 +--- linux-2.6.32.29/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
5022 ++++ linux-2.6.32.29/arch/x86/vdso/vextern.h 2010-12-31 14:46:53.000000000 -0500
5023 @@ -11,6 +11,5 @@
5024 put into vextern.h and be referenced as a pointer with vdso prefix.
5025 The main kernel later fills in the values. */
5026 @@ -20461,9 +20521,9 @@ diff -urNp linux-2.6.32.28/arch/x86/vdso/vextern.h linux-2.6.32.28/arch/x86/vdso
5027 -VEXTERN(jiffies)
5028 VEXTERN(vgetcpu_mode)
5029 VEXTERN(vsyscall_gtod_data)
5030 -diff -urNp linux-2.6.32.28/arch/x86/vdso/vma.c linux-2.6.32.28/arch/x86/vdso/vma.c
5031 ---- linux-2.6.32.28/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
5032 -+++ linux-2.6.32.28/arch/x86/vdso/vma.c 2010-12-31 14:46:53.000000000 -0500
5033 +diff -urNp linux-2.6.32.29/arch/x86/vdso/vma.c linux-2.6.32.29/arch/x86/vdso/vma.c
5034 +--- linux-2.6.32.29/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
5035 ++++ linux-2.6.32.29/arch/x86/vdso/vma.c 2010-12-31 14:46:53.000000000 -0500
5036 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
5037 if (!vbase)
5038 goto oom;
5039 @@ -20510,9 +20570,9 @@ diff -urNp linux-2.6.32.28/arch/x86/vdso/vma.c linux-2.6.32.28/arch/x86/vdso/vma
5040 - return 0;
5041 -}
5042 -__setup("vdso=", vdso_setup);
5043 -diff -urNp linux-2.6.32.28/arch/x86/xen/enlighten.c linux-2.6.32.28/arch/x86/xen/enlighten.c
5044 ---- linux-2.6.32.28/arch/x86/xen/enlighten.c 2010-12-09 18:13:03.000000000 -0500
5045 -+++ linux-2.6.32.28/arch/x86/xen/enlighten.c 2010-12-31 14:46:53.000000000 -0500
5046 +diff -urNp linux-2.6.32.29/arch/x86/xen/enlighten.c linux-2.6.32.29/arch/x86/xen/enlighten.c
5047 +--- linux-2.6.32.29/arch/x86/xen/enlighten.c 2010-12-09 18:13:03.000000000 -0500
5048 ++++ linux-2.6.32.29/arch/x86/xen/enlighten.c 2010-12-31 14:46:53.000000000 -0500
5049 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
5050
5051 struct shared_info xen_dummy_shared_info;
5052 @@ -20568,9 +20628,9 @@ diff -urNp linux-2.6.32.28/arch/x86/xen/enlighten.c linux-2.6.32.28/arch/x86/xen
5053 xen_smp_init();
5054
5055 pgd = (pgd_t *)xen_start_info->pt_base;
5056 -diff -urNp linux-2.6.32.28/arch/x86/xen/mmu.c linux-2.6.32.28/arch/x86/xen/mmu.c
5057 ---- linux-2.6.32.28/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
5058 -+++ linux-2.6.32.28/arch/x86/xen/mmu.c 2010-12-31 14:46:53.000000000 -0500
5059 +diff -urNp linux-2.6.32.29/arch/x86/xen/mmu.c linux-2.6.32.29/arch/x86/xen/mmu.c
5060 +--- linux-2.6.32.29/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
5061 ++++ linux-2.6.32.29/arch/x86/xen/mmu.c 2010-12-31 14:46:53.000000000 -0500
5062 @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
5063 convert_pfn_mfn(init_level4_pgt);
5064 convert_pfn_mfn(level3_ident_pgt);
5065 @@ -20591,9 +20651,9 @@ diff -urNp linux-2.6.32.28/arch/x86/xen/mmu.c linux-2.6.32.28/arch/x86/xen/mmu.c
5066 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
5067 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
5068
5069 -diff -urNp linux-2.6.32.28/arch/x86/xen/smp.c linux-2.6.32.28/arch/x86/xen/smp.c
5070 ---- linux-2.6.32.28/arch/x86/xen/smp.c 2010-11-26 18:22:29.000000000 -0500
5071 -+++ linux-2.6.32.28/arch/x86/xen/smp.c 2010-12-31 14:47:01.000000000 -0500
5072 +diff -urNp linux-2.6.32.29/arch/x86/xen/smp.c linux-2.6.32.29/arch/x86/xen/smp.c
5073 +--- linux-2.6.32.29/arch/x86/xen/smp.c 2010-11-26 18:22:29.000000000 -0500
5074 ++++ linux-2.6.32.29/arch/x86/xen/smp.c 2010-12-31 14:47:01.000000000 -0500
5075 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
5076 {
5077 BUG_ON(smp_processor_id() != 0);
5078 @@ -20622,9 +20682,9 @@ diff -urNp linux-2.6.32.28/arch/x86/xen/smp.c linux-2.6.32.28/arch/x86/xen/smp.c
5079 #else
5080 ctxt->gs_base_kernel = per_cpu_offset(cpu);
5081 #endif
5082 -diff -urNp linux-2.6.32.28/arch/x86/xen/xen-head.S linux-2.6.32.28/arch/x86/xen/xen-head.S
5083 ---- linux-2.6.32.28/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
5084 -+++ linux-2.6.32.28/arch/x86/xen/xen-head.S 2010-12-31 14:46:53.000000000 -0500
5085 +diff -urNp linux-2.6.32.29/arch/x86/xen/xen-head.S linux-2.6.32.29/arch/x86/xen/xen-head.S
5086 +--- linux-2.6.32.29/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
5087 ++++ linux-2.6.32.29/arch/x86/xen/xen-head.S 2010-12-31 14:46:53.000000000 -0500
5088 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
5089 #ifdef CONFIG_X86_32
5090 mov %esi,xen_start_info
5091 @@ -20643,9 +20703,9 @@ diff -urNp linux-2.6.32.28/arch/x86/xen/xen-head.S linux-2.6.32.28/arch/x86/xen/
5092 #else
5093 mov %rsi,xen_start_info
5094 mov $init_thread_union+THREAD_SIZE,%rsp
5095 -diff -urNp linux-2.6.32.28/arch/x86/xen/xen-ops.h linux-2.6.32.28/arch/x86/xen/xen-ops.h
5096 ---- linux-2.6.32.28/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
5097 -+++ linux-2.6.32.28/arch/x86/xen/xen-ops.h 2010-12-31 14:46:53.000000000 -0500
5098 +diff -urNp linux-2.6.32.29/arch/x86/xen/xen-ops.h linux-2.6.32.29/arch/x86/xen/xen-ops.h
5099 +--- linux-2.6.32.29/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
5100 ++++ linux-2.6.32.29/arch/x86/xen/xen-ops.h 2010-12-31 14:46:53.000000000 -0500
5101 @@ -10,8 +10,6 @@
5102 extern const char xen_hypervisor_callback[];
5103 extern const char xen_failsafe_callback[];
5104 @@ -20655,9 +20715,9 @@ diff -urNp linux-2.6.32.28/arch/x86/xen/xen-ops.h linux-2.6.32.28/arch/x86/xen/x
5105 struct trap_info;
5106 void xen_copy_trap_info(struct trap_info *traps);
5107
5108 -diff -urNp linux-2.6.32.28/block/blk-integrity.c linux-2.6.32.28/block/blk-integrity.c
5109 ---- linux-2.6.32.28/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
5110 -+++ linux-2.6.32.28/block/blk-integrity.c 2010-12-31 14:46:53.000000000 -0500
5111 +diff -urNp linux-2.6.32.29/block/blk-integrity.c linux-2.6.32.29/block/blk-integrity.c
5112 +--- linux-2.6.32.29/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
5113 ++++ linux-2.6.32.29/block/blk-integrity.c 2010-12-31 14:46:53.000000000 -0500
5114 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
5115 NULL,
5116 };
5117 @@ -20667,9 +20727,9 @@ diff -urNp linux-2.6.32.28/block/blk-integrity.c linux-2.6.32.28/block/blk-integ
5118 .show = &integrity_attr_show,
5119 .store = &integrity_attr_store,
5120 };
5121 -diff -urNp linux-2.6.32.28/block/blk-iopoll.c linux-2.6.32.28/block/blk-iopoll.c
5122 ---- linux-2.6.32.28/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
5123 -+++ linux-2.6.32.28/block/blk-iopoll.c 2010-12-31 14:46:53.000000000 -0500
5124 +diff -urNp linux-2.6.32.29/block/blk-iopoll.c linux-2.6.32.29/block/blk-iopoll.c
5125 +--- linux-2.6.32.29/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
5126 ++++ linux-2.6.32.29/block/blk-iopoll.c 2010-12-31 14:46:53.000000000 -0500
5127 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
5128 }
5129 EXPORT_SYMBOL(blk_iopoll_complete);
5130 @@ -20679,9 +20739,9 @@ diff -urNp linux-2.6.32.28/block/blk-iopoll.c linux-2.6.32.28/block/blk-iopoll.c
5131 {
5132 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
5133 int rearm = 0, budget = blk_iopoll_budget;
5134 -diff -urNp linux-2.6.32.28/block/blk-map.c linux-2.6.32.28/block/blk-map.c
5135 ---- linux-2.6.32.28/block/blk-map.c 2010-12-09 18:13:03.000000000 -0500
5136 -+++ linux-2.6.32.28/block/blk-map.c 2010-12-31 14:46:53.000000000 -0500
5137 +diff -urNp linux-2.6.32.29/block/blk-map.c linux-2.6.32.29/block/blk-map.c
5138 +--- linux-2.6.32.29/block/blk-map.c 2010-12-09 18:13:03.000000000 -0500
5139 ++++ linux-2.6.32.29/block/blk-map.c 2010-12-31 14:46:53.000000000 -0500
5140 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
5141 * direct dma. else, set up kernel bounce buffers
5142 */
5143 @@ -20710,9 +20770,9 @@ diff -urNp linux-2.6.32.28/block/blk-map.c linux-2.6.32.28/block/blk-map.c
5144 if (do_copy)
5145 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
5146 else
5147 -diff -urNp linux-2.6.32.28/block/blk-softirq.c linux-2.6.32.28/block/blk-softirq.c
5148 ---- linux-2.6.32.28/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
5149 -+++ linux-2.6.32.28/block/blk-softirq.c 2010-12-31 14:46:53.000000000 -0500
5150 +diff -urNp linux-2.6.32.29/block/blk-softirq.c linux-2.6.32.29/block/blk-softirq.c
5151 +--- linux-2.6.32.29/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
5152 ++++ linux-2.6.32.29/block/blk-softirq.c 2010-12-31 14:46:53.000000000 -0500
5153 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
5154 * Softirq action handler - move entries to local list and loop over them
5155 * while passing them to the queue registered handler.
5156 @@ -20722,9 +20782,9 @@ diff -urNp linux-2.6.32.28/block/blk-softirq.c linux-2.6.32.28/block/blk-softirq
5157 {
5158 struct list_head *cpu_list, local_list;
5159
5160 -diff -urNp linux-2.6.32.28/block/blk-sysfs.c linux-2.6.32.28/block/blk-sysfs.c
5161 ---- linux-2.6.32.28/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
5162 -+++ linux-2.6.32.28/block/blk-sysfs.c 2010-12-31 14:46:53.000000000 -0500
5163 +diff -urNp linux-2.6.32.29/block/blk-sysfs.c linux-2.6.32.29/block/blk-sysfs.c
5164 +--- linux-2.6.32.29/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
5165 ++++ linux-2.6.32.29/block/blk-sysfs.c 2010-12-31 14:46:53.000000000 -0500
5166 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
5167 kmem_cache_free(blk_requestq_cachep, q);
5168 }
5169 @@ -20734,9 +20794,9 @@ diff -urNp linux-2.6.32.28/block/blk-sysfs.c linux-2.6.32.28/block/blk-sysfs.c
5170 .show = queue_attr_show,
5171 .store = queue_attr_store,
5172 };
5173 -diff -urNp linux-2.6.32.28/block/elevator.c linux-2.6.32.28/block/elevator.c
5174 ---- linux-2.6.32.28/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
5175 -+++ linux-2.6.32.28/block/elevator.c 2010-12-31 14:46:53.000000000 -0500
5176 +diff -urNp linux-2.6.32.29/block/elevator.c linux-2.6.32.29/block/elevator.c
5177 +--- linux-2.6.32.29/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
5178 ++++ linux-2.6.32.29/block/elevator.c 2010-12-31 14:46:53.000000000 -0500
5179 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
5180 return error;
5181 }
5182 @@ -20746,9 +20806,9 @@ diff -urNp linux-2.6.32.28/block/elevator.c linux-2.6.32.28/block/elevator.c
5183 .show = elv_attr_show,
5184 .store = elv_attr_store,
5185 };
5186 -diff -urNp linux-2.6.32.28/crypto/lrw.c linux-2.6.32.28/crypto/lrw.c
5187 ---- linux-2.6.32.28/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
5188 -+++ linux-2.6.32.28/crypto/lrw.c 2010-12-31 14:46:53.000000000 -0500
5189 +diff -urNp linux-2.6.32.29/crypto/lrw.c linux-2.6.32.29/crypto/lrw.c
5190 +--- linux-2.6.32.29/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
5191 ++++ linux-2.6.32.29/crypto/lrw.c 2010-12-31 14:46:53.000000000 -0500
5192 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
5193 struct priv *ctx = crypto_tfm_ctx(parent);
5194 struct crypto_cipher *child = ctx->child;
5195 @@ -20758,9 +20818,9 @@ diff -urNp linux-2.6.32.28/crypto/lrw.c linux-2.6.32.28/crypto/lrw.c
5196 int bsize = crypto_cipher_blocksize(child);
5197
5198 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
5199 -diff -urNp linux-2.6.32.28/Documentation/dontdiff linux-2.6.32.28/Documentation/dontdiff
5200 ---- linux-2.6.32.28/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
5201 -+++ linux-2.6.32.28/Documentation/dontdiff 2010-12-31 14:46:53.000000000 -0500
5202 +diff -urNp linux-2.6.32.29/Documentation/dontdiff linux-2.6.32.29/Documentation/dontdiff
5203 +--- linux-2.6.32.29/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
5204 ++++ linux-2.6.32.29/Documentation/dontdiff 2010-12-31 14:46:53.000000000 -0500
5205 @@ -3,6 +3,7 @@
5206 *.bin
5207 *.cpio
5208 @@ -20878,10 +20938,10 @@ diff -urNp linux-2.6.32.28/Documentation/dontdiff linux-2.6.32.28/Documentation/
5209 zImage*
5210 zconf.hash.c
5211 +zoffset.h
5212 -diff -urNp linux-2.6.32.28/Documentation/kernel-parameters.txt linux-2.6.32.28/Documentation/kernel-parameters.txt
5213 ---- linux-2.6.32.28/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400
5214 -+++ linux-2.6.32.28/Documentation/kernel-parameters.txt 2011-01-16 20:53:41.000000000 -0500
5215 -@@ -1836,6 +1836,13 @@ and is between 256 and 4096 characters.
5216 +diff -urNp linux-2.6.32.29/Documentation/kernel-parameters.txt linux-2.6.32.29/Documentation/kernel-parameters.txt
5217 +--- linux-2.6.32.29/Documentation/kernel-parameters.txt 2011-02-22 15:56:54.000000000 -0500
5218 ++++ linux-2.6.32.29/Documentation/kernel-parameters.txt 2011-02-22 15:57:23.000000000 -0500
5219 +@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters.
5220 the specified number of seconds. This is to be used if
5221 your oopses keep scrolling off the screen.
5222
5223 @@ -20895,9 +20955,9 @@ diff -urNp linux-2.6.32.28/Documentation/kernel-parameters.txt linux-2.6.32.28/D
5224 pcbit= [HW,ISDN]
5225
5226 pcd. [PARIDE]
5227 -diff -urNp linux-2.6.32.28/drivers/acpi/acpi_pad.c linux-2.6.32.28/drivers/acpi/acpi_pad.c
5228 ---- linux-2.6.32.28/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
5229 -+++ linux-2.6.32.28/drivers/acpi/acpi_pad.c 2010-12-31 14:46:53.000000000 -0500
5230 +diff -urNp linux-2.6.32.29/drivers/acpi/acpi_pad.c linux-2.6.32.29/drivers/acpi/acpi_pad.c
5231 +--- linux-2.6.32.29/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
5232 ++++ linux-2.6.32.29/drivers/acpi/acpi_pad.c 2010-12-31 14:46:53.000000000 -0500
5233 @@ -30,7 +30,7 @@
5234 #include <acpi/acpi_bus.h>
5235 #include <acpi/acpi_drivers.h>
5236 @@ -20907,9 +20967,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/acpi_pad.c linux-2.6.32.28/drivers/acpi/
5237 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
5238 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
5239 static DEFINE_MUTEX(isolated_cpus_lock);
5240 -diff -urNp linux-2.6.32.28/drivers/acpi/battery.c linux-2.6.32.28/drivers/acpi/battery.c
5241 ---- linux-2.6.32.28/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
5242 -+++ linux-2.6.32.28/drivers/acpi/battery.c 2010-12-31 14:46:53.000000000 -0500
5243 +diff -urNp linux-2.6.32.29/drivers/acpi/battery.c linux-2.6.32.29/drivers/acpi/battery.c
5244 +--- linux-2.6.32.29/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
5245 ++++ linux-2.6.32.29/drivers/acpi/battery.c 2010-12-31 14:46:53.000000000 -0500
5246 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
5247 }
5248
5249 @@ -20919,9 +20979,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/battery.c linux-2.6.32.28/drivers/acpi/b
5250 mode_t mode;
5251 const char *name;
5252 } acpi_battery_file[] = {
5253 -diff -urNp linux-2.6.32.28/drivers/acpi/blacklist.c linux-2.6.32.28/drivers/acpi/blacklist.c
5254 ---- linux-2.6.32.28/drivers/acpi/blacklist.c 2010-12-09 18:13:03.000000000 -0500
5255 -+++ linux-2.6.32.28/drivers/acpi/blacklist.c 2010-12-31 14:46:53.000000000 -0500
5256 +diff -urNp linux-2.6.32.29/drivers/acpi/blacklist.c linux-2.6.32.29/drivers/acpi/blacklist.c
5257 +--- linux-2.6.32.29/drivers/acpi/blacklist.c 2010-12-09 18:13:03.000000000 -0500
5258 ++++ linux-2.6.32.29/drivers/acpi/blacklist.c 2010-12-31 14:46:53.000000000 -0500
5259 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
5260 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
5261 "Incorrect _ADR", 1},
5262 @@ -20931,9 +20991,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/blacklist.c linux-2.6.32.28/drivers/acpi
5263 };
5264
5265 #if CONFIG_ACPI_BLACKLIST_YEAR
5266 -diff -urNp linux-2.6.32.28/drivers/acpi/dock.c linux-2.6.32.28/drivers/acpi/dock.c
5267 ---- linux-2.6.32.28/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
5268 -+++ linux-2.6.32.28/drivers/acpi/dock.c 2010-12-31 14:46:53.000000000 -0500
5269 +diff -urNp linux-2.6.32.29/drivers/acpi/dock.c linux-2.6.32.29/drivers/acpi/dock.c
5270 +--- linux-2.6.32.29/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
5271 ++++ linux-2.6.32.29/drivers/acpi/dock.c 2010-12-31 14:46:53.000000000 -0500
5272 @@ -77,7 +77,7 @@ struct dock_dependent_device {
5273 struct list_head list;
5274 struct list_head hotplug_list;
5275 @@ -20952,9 +21012,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/dock.c linux-2.6.32.28/drivers/acpi/dock
5276 void *context)
5277 {
5278 struct dock_dependent_device *dd;
5279 -diff -urNp linux-2.6.32.28/drivers/acpi/osl.c linux-2.6.32.28/drivers/acpi/osl.c
5280 ---- linux-2.6.32.28/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
5281 -+++ linux-2.6.32.28/drivers/acpi/osl.c 2010-12-31 14:46:53.000000000 -0500
5282 +diff -urNp linux-2.6.32.29/drivers/acpi/osl.c linux-2.6.32.29/drivers/acpi/osl.c
5283 +--- linux-2.6.32.29/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
5284 ++++ linux-2.6.32.29/drivers/acpi/osl.c 2010-12-31 14:46:53.000000000 -0500
5285 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
5286 void __iomem *virt_addr;
5287
5288 @@ -20973,9 +21033,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/osl.c linux-2.6.32.28/drivers/acpi/osl.c
5289
5290 switch (width) {
5291 case 8:
5292 -diff -urNp linux-2.6.32.28/drivers/acpi/power_meter.c linux-2.6.32.28/drivers/acpi/power_meter.c
5293 ---- linux-2.6.32.28/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
5294 -+++ linux-2.6.32.28/drivers/acpi/power_meter.c 2010-12-31 14:46:53.000000000 -0500
5295 +diff -urNp linux-2.6.32.29/drivers/acpi/power_meter.c linux-2.6.32.29/drivers/acpi/power_meter.c
5296 +--- linux-2.6.32.29/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
5297 ++++ linux-2.6.32.29/drivers/acpi/power_meter.c 2010-12-31 14:46:53.000000000 -0500
5298 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
5299 return res;
5300
5301 @@ -20985,9 +21045,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/power_meter.c linux-2.6.32.28/drivers/ac
5302
5303 mutex_lock(&resource->lock);
5304 resource->trip[attr->index - 7] = temp;
5305 -diff -urNp linux-2.6.32.28/drivers/acpi/proc.c linux-2.6.32.28/drivers/acpi/proc.c
5306 ---- linux-2.6.32.28/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
5307 -+++ linux-2.6.32.28/drivers/acpi/proc.c 2010-12-31 14:46:53.000000000 -0500
5308 +diff -urNp linux-2.6.32.29/drivers/acpi/proc.c linux-2.6.32.29/drivers/acpi/proc.c
5309 +--- linux-2.6.32.29/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
5310 ++++ linux-2.6.32.29/drivers/acpi/proc.c 2010-12-31 14:46:53.000000000 -0500
5311 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
5312 size_t count, loff_t * ppos)
5313 {
5314 @@ -21023,9 +21083,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/proc.c linux-2.6.32.28/drivers/acpi/proc
5315 dev->wakeup.state.enabled =
5316 dev->wakeup.state.enabled ? 0 : 1;
5317 found_dev = dev;
5318 -diff -urNp linux-2.6.32.28/drivers/acpi/processor_core.c linux-2.6.32.28/drivers/acpi/processor_core.c
5319 ---- linux-2.6.32.28/drivers/acpi/processor_core.c 2010-10-31 16:44:11.000000000 -0400
5320 -+++ linux-2.6.32.28/drivers/acpi/processor_core.c 2010-12-31 14:46:53.000000000 -0500
5321 +diff -urNp linux-2.6.32.29/drivers/acpi/processor_core.c linux-2.6.32.29/drivers/acpi/processor_core.c
5322 +--- linux-2.6.32.29/drivers/acpi/processor_core.c 2010-10-31 16:44:11.000000000 -0400
5323 ++++ linux-2.6.32.29/drivers/acpi/processor_core.c 2010-12-31 14:46:53.000000000 -0500
5324 @@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
5325 return 0;
5326 }
5327 @@ -21035,9 +21095,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/processor_core.c linux-2.6.32.28/drivers
5328
5329 /*
5330 * Buggy BIOS check
5331 -diff -urNp linux-2.6.32.28/drivers/acpi/processor_idle.c linux-2.6.32.28/drivers/acpi/processor_idle.c
5332 ---- linux-2.6.32.28/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
5333 -+++ linux-2.6.32.28/drivers/acpi/processor_idle.c 2010-12-31 14:46:53.000000000 -0500
5334 +diff -urNp linux-2.6.32.29/drivers/acpi/processor_idle.c linux-2.6.32.29/drivers/acpi/processor_idle.c
5335 +--- linux-2.6.32.29/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
5336 ++++ linux-2.6.32.29/drivers/acpi/processor_idle.c 2010-12-31 14:46:53.000000000 -0500
5337 @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
5338 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
5339 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
5340 @@ -21047,9 +21107,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/processor_idle.c linux-2.6.32.28/drivers
5341 };
5342
5343
5344 -diff -urNp linux-2.6.32.28/drivers/acpi/sbshc.c linux-2.6.32.28/drivers/acpi/sbshc.c
5345 ---- linux-2.6.32.28/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
5346 -+++ linux-2.6.32.28/drivers/acpi/sbshc.c 2010-12-31 14:46:53.000000000 -0500
5347 +diff -urNp linux-2.6.32.29/drivers/acpi/sbshc.c linux-2.6.32.29/drivers/acpi/sbshc.c
5348 +--- linux-2.6.32.29/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
5349 ++++ linux-2.6.32.29/drivers/acpi/sbshc.c 2010-12-31 14:46:53.000000000 -0500
5350 @@ -17,7 +17,7 @@
5351
5352 #define PREFIX "ACPI: "
5353 @@ -21059,9 +21119,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/sbshc.c linux-2.6.32.28/drivers/acpi/sbs
5354 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
5355
5356 struct acpi_smb_hc {
5357 -diff -urNp linux-2.6.32.28/drivers/acpi/sleep.c linux-2.6.32.28/drivers/acpi/sleep.c
5358 ---- linux-2.6.32.28/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
5359 -+++ linux-2.6.32.28/drivers/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
5360 +diff -urNp linux-2.6.32.29/drivers/acpi/sleep.c linux-2.6.32.29/drivers/acpi/sleep.c
5361 +--- linux-2.6.32.29/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
5362 ++++ linux-2.6.32.29/drivers/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
5363 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
5364 }
5365 }
5366 @@ -21098,9 +21158,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/sleep.c linux-2.6.32.28/drivers/acpi/sle
5367 .begin = acpi_hibernation_begin_old,
5368 .end = acpi_pm_end,
5369 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
5370 -diff -urNp linux-2.6.32.28/drivers/acpi/video.c linux-2.6.32.28/drivers/acpi/video.c
5371 ---- linux-2.6.32.28/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
5372 -+++ linux-2.6.32.28/drivers/acpi/video.c 2010-12-31 14:46:53.000000000 -0500
5373 +diff -urNp linux-2.6.32.29/drivers/acpi/video.c linux-2.6.32.29/drivers/acpi/video.c
5374 +--- linux-2.6.32.29/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
5375 ++++ linux-2.6.32.29/drivers/acpi/video.c 2010-12-31 14:46:53.000000000 -0500
5376 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
5377 vd->brightness->levels[request_level]);
5378 }
5379 @@ -21110,9 +21170,9 @@ diff -urNp linux-2.6.32.28/drivers/acpi/video.c linux-2.6.32.28/drivers/acpi/vid
5380 .get_brightness = acpi_video_get_brightness,
5381 .update_status = acpi_video_set_brightness,
5382 };
5383 -diff -urNp linux-2.6.32.28/drivers/ata/ahci.c linux-2.6.32.28/drivers/ata/ahci.c
5384 ---- linux-2.6.32.28/drivers/ata/ahci.c 2010-12-09 18:13:03.000000000 -0500
5385 -+++ linux-2.6.32.28/drivers/ata/ahci.c 2010-12-31 14:46:53.000000000 -0500
5386 +diff -urNp linux-2.6.32.29/drivers/ata/ahci.c linux-2.6.32.29/drivers/ata/ahci.c
5387 +--- linux-2.6.32.29/drivers/ata/ahci.c 2010-12-09 18:13:03.000000000 -0500
5388 ++++ linux-2.6.32.29/drivers/ata/ahci.c 2010-12-31 14:46:53.000000000 -0500
5389 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
5390 .sdev_attrs = ahci_sdev_attrs,
5391 };
5392 @@ -21152,9 +21212,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/ahci.c linux-2.6.32.28/drivers/ata/ahci.c
5393 };
5394
5395
5396 -diff -urNp linux-2.6.32.28/drivers/ata/ata_generic.c linux-2.6.32.28/drivers/ata/ata_generic.c
5397 ---- linux-2.6.32.28/drivers/ata/ata_generic.c 2010-12-09 18:13:03.000000000 -0500
5398 -+++ linux-2.6.32.28/drivers/ata/ata_generic.c 2010-12-31 14:46:53.000000000 -0500
5399 +diff -urNp linux-2.6.32.29/drivers/ata/ata_generic.c linux-2.6.32.29/drivers/ata/ata_generic.c
5400 +--- linux-2.6.32.29/drivers/ata/ata_generic.c 2010-12-09 18:13:03.000000000 -0500
5401 ++++ linux-2.6.32.29/drivers/ata/ata_generic.c 2010-12-31 14:46:53.000000000 -0500
5402 @@ -104,7 +104,7 @@ static struct scsi_host_template generic
5403 ATA_BMDMA_SHT(DRV_NAME),
5404 };
5405 @@ -21164,9 +21224,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/ata_generic.c linux-2.6.32.28/drivers/ata
5406 .inherits = &ata_bmdma_port_ops,
5407 .cable_detect = ata_cable_unknown,
5408 .set_mode = generic_set_mode,
5409 -diff -urNp linux-2.6.32.28/drivers/ata/ata_piix.c linux-2.6.32.28/drivers/ata/ata_piix.c
5410 ---- linux-2.6.32.28/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
5411 -+++ linux-2.6.32.28/drivers/ata/ata_piix.c 2010-12-31 14:46:53.000000000 -0500
5412 +diff -urNp linux-2.6.32.29/drivers/ata/ata_piix.c linux-2.6.32.29/drivers/ata/ata_piix.c
5413 +--- linux-2.6.32.29/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
5414 ++++ linux-2.6.32.29/drivers/ata/ata_piix.c 2010-12-31 14:46:53.000000000 -0500
5415 @@ -300,7 +300,7 @@ static const struct pci_device_id piix_p
5416 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
5417 /* SATA Controller IDE (CPT) */
5418 @@ -21230,9 +21290,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/ata_piix.c linux-2.6.32.28/drivers/ata/at
5419 };
5420 static const char *oemstrs[] = {
5421 "Tecra M3,",
5422 -diff -urNp linux-2.6.32.28/drivers/ata/libata-acpi.c linux-2.6.32.28/drivers/ata/libata-acpi.c
5423 ---- linux-2.6.32.28/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
5424 -+++ linux-2.6.32.28/drivers/ata/libata-acpi.c 2010-12-31 14:46:53.000000000 -0500
5425 +diff -urNp linux-2.6.32.29/drivers/ata/libata-acpi.c linux-2.6.32.29/drivers/ata/libata-acpi.c
5426 +--- linux-2.6.32.29/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
5427 ++++ linux-2.6.32.29/drivers/ata/libata-acpi.c 2010-12-31 14:46:53.000000000 -0500
5428 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
5429 ata_acpi_uevent(dev->link->ap, dev, event);
5430 }
5431 @@ -21248,9 +21308,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/libata-acpi.c linux-2.6.32.28/drivers/ata
5432 .handler = ata_acpi_ap_notify_dock,
5433 .uevent = ata_acpi_ap_uevent,
5434 };
5435 -diff -urNp linux-2.6.32.28/drivers/ata/libata-core.c linux-2.6.32.28/drivers/ata/libata-core.c
5436 ---- linux-2.6.32.28/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
5437 -+++ linux-2.6.32.28/drivers/ata/libata-core.c 2010-12-31 14:46:53.000000000 -0500
5438 +diff -urNp linux-2.6.32.29/drivers/ata/libata-core.c linux-2.6.32.29/drivers/ata/libata-core.c
5439 +--- linux-2.6.32.29/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
5440 ++++ linux-2.6.32.29/drivers/ata/libata-core.c 2010-12-31 14:46:53.000000000 -0500
5441 @@ -900,7 +900,7 @@ static const struct ata_xfer_ent {
5442 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
5443 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
5444 @@ -21342,9 +21402,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/libata-core.c linux-2.6.32.28/drivers/ata
5445 .qc_prep = ata_noop_qc_prep,
5446 .qc_issue = ata_dummy_qc_issue,
5447 .error_handler = ata_dummy_error_handler,
5448 -diff -urNp linux-2.6.32.28/drivers/ata/libata-eh.c linux-2.6.32.28/drivers/ata/libata-eh.c
5449 ---- linux-2.6.32.28/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
5450 -+++ linux-2.6.32.28/drivers/ata/libata-eh.c 2010-12-31 14:46:53.000000000 -0500
5451 +diff -urNp linux-2.6.32.29/drivers/ata/libata-eh.c linux-2.6.32.29/drivers/ata/libata-eh.c
5452 +--- linux-2.6.32.29/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
5453 ++++ linux-2.6.32.29/drivers/ata/libata-eh.c 2010-12-31 14:46:53.000000000 -0500
5454 @@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_
5455 */
5456 void ata_std_error_handler(struct ata_port *ap)
5457 @@ -21354,9 +21414,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/libata-eh.c linux-2.6.32.28/drivers/ata/l
5458 ata_reset_fn_t hardreset = ops->hardreset;
5459
5460 /* ignore built-in hardreset if SCR access is not available */
5461 -diff -urNp linux-2.6.32.28/drivers/ata/libata-pmp.c linux-2.6.32.28/drivers/ata/libata-pmp.c
5462 ---- linux-2.6.32.28/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
5463 -+++ linux-2.6.32.28/drivers/ata/libata-pmp.c 2010-12-31 14:46:53.000000000 -0500
5464 +diff -urNp linux-2.6.32.29/drivers/ata/libata-pmp.c linux-2.6.32.29/drivers/ata/libata-pmp.c
5465 +--- linux-2.6.32.29/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
5466 ++++ linux-2.6.32.29/drivers/ata/libata-pmp.c 2010-12-31 14:46:53.000000000 -0500
5467 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
5468 */
5469 static int sata_pmp_eh_recover(struct ata_port *ap)
5470 @@ -21366,9 +21426,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/libata-pmp.c linux-2.6.32.28/drivers/ata/
5471 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
5472 struct ata_link *pmp_link = &ap->link;
5473 struct ata_device *pmp_dev = pmp_link->device;
5474 -diff -urNp linux-2.6.32.28/drivers/ata/pata_acpi.c linux-2.6.32.28/drivers/ata/pata_acpi.c
5475 ---- linux-2.6.32.28/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
5476 -+++ linux-2.6.32.28/drivers/ata/pata_acpi.c 2010-12-31 14:46:53.000000000 -0500
5477 +diff -urNp linux-2.6.32.29/drivers/ata/pata_acpi.c linux-2.6.32.29/drivers/ata/pata_acpi.c
5478 +--- linux-2.6.32.29/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
5479 ++++ linux-2.6.32.29/drivers/ata/pata_acpi.c 2010-12-31 14:46:53.000000000 -0500
5480 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
5481 ATA_BMDMA_SHT(DRV_NAME),
5482 };
5483 @@ -21378,9 +21438,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_acpi.c linux-2.6.32.28/drivers/ata/p
5484 .inherits = &ata_bmdma_port_ops,
5485 .qc_issue = pacpi_qc_issue,
5486 .cable_detect = pacpi_cable_detect,
5487 -diff -urNp linux-2.6.32.28/drivers/ata/pata_ali.c linux-2.6.32.28/drivers/ata/pata_ali.c
5488 ---- linux-2.6.32.28/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
5489 -+++ linux-2.6.32.28/drivers/ata/pata_ali.c 2010-12-31 14:46:53.000000000 -0500
5490 +diff -urNp linux-2.6.32.29/drivers/ata/pata_ali.c linux-2.6.32.29/drivers/ata/pata_ali.c
5491 +--- linux-2.6.32.29/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
5492 ++++ linux-2.6.32.29/drivers/ata/pata_ali.c 2010-12-31 14:46:53.000000000 -0500
5493 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
5494 * Port operations for PIO only ALi
5495 */
5496 @@ -21426,9 +21486,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_ali.c linux-2.6.32.28/drivers/ata/pa
5497 .inherits = &ali_dma_base_ops,
5498 .check_atapi_dma = ali_check_atapi_dma,
5499 .dev_config = ali_warn_atapi_dma,
5500 -diff -urNp linux-2.6.32.28/drivers/ata/pata_amd.c linux-2.6.32.28/drivers/ata/pata_amd.c
5501 ---- linux-2.6.32.28/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
5502 -+++ linux-2.6.32.28/drivers/ata/pata_amd.c 2010-12-31 14:46:53.000000000 -0500
5503 +diff -urNp linux-2.6.32.29/drivers/ata/pata_amd.c linux-2.6.32.29/drivers/ata/pata_amd.c
5504 +--- linux-2.6.32.29/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
5505 ++++ linux-2.6.32.29/drivers/ata/pata_amd.c 2010-12-31 14:46:53.000000000 -0500
5506 @@ -397,28 +397,28 @@ static const struct ata_port_operations
5507 .prereset = amd_pre_reset,
5508 };
5509 @@ -21478,9 +21538,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_amd.c linux-2.6.32.28/drivers/ata/pa
5510 .inherits = &nv_base_port_ops,
5511 .set_piomode = nv133_set_piomode,
5512 .set_dmamode = nv133_set_dmamode,
5513 -diff -urNp linux-2.6.32.28/drivers/ata/pata_artop.c linux-2.6.32.28/drivers/ata/pata_artop.c
5514 ---- linux-2.6.32.28/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
5515 -+++ linux-2.6.32.28/drivers/ata/pata_artop.c 2010-12-31 14:46:53.000000000 -0500
5516 +diff -urNp linux-2.6.32.29/drivers/ata/pata_artop.c linux-2.6.32.29/drivers/ata/pata_artop.c
5517 +--- linux-2.6.32.29/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
5518 ++++ linux-2.6.32.29/drivers/ata/pata_artop.c 2010-12-31 14:46:53.000000000 -0500
5519 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
5520 ATA_BMDMA_SHT(DRV_NAME),
5521 };
5522 @@ -21499,9 +21559,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_artop.c linux-2.6.32.28/drivers/ata/
5523 .inherits = &ata_bmdma_port_ops,
5524 .cable_detect = artop6260_cable_detect,
5525 .set_piomode = artop6260_set_piomode,
5526 -diff -urNp linux-2.6.32.28/drivers/ata/pata_at32.c linux-2.6.32.28/drivers/ata/pata_at32.c
5527 ---- linux-2.6.32.28/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
5528 -+++ linux-2.6.32.28/drivers/ata/pata_at32.c 2010-12-31 14:46:53.000000000 -0500
5529 +diff -urNp linux-2.6.32.29/drivers/ata/pata_at32.c linux-2.6.32.29/drivers/ata/pata_at32.c
5530 +--- linux-2.6.32.29/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
5531 ++++ linux-2.6.32.29/drivers/ata/pata_at32.c 2010-12-31 14:46:53.000000000 -0500
5532 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
5533 ATA_PIO_SHT(DRV_NAME),
5534 };
5535 @@ -21511,9 +21571,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_at32.c linux-2.6.32.28/drivers/ata/p
5536 .inherits = &ata_sff_port_ops,
5537 .cable_detect = ata_cable_40wire,
5538 .set_piomode = pata_at32_set_piomode,
5539 -diff -urNp linux-2.6.32.28/drivers/ata/pata_at91.c linux-2.6.32.28/drivers/ata/pata_at91.c
5540 ---- linux-2.6.32.28/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
5541 -+++ linux-2.6.32.28/drivers/ata/pata_at91.c 2010-12-31 14:46:53.000000000 -0500
5542 +diff -urNp linux-2.6.32.29/drivers/ata/pata_at91.c linux-2.6.32.29/drivers/ata/pata_at91.c
5543 +--- linux-2.6.32.29/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
5544 ++++ linux-2.6.32.29/drivers/ata/pata_at91.c 2010-12-31 14:46:53.000000000 -0500
5545 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
5546 ATA_PIO_SHT(DRV_NAME),
5547 };
5548 @@ -21523,9 +21583,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_at91.c linux-2.6.32.28/drivers/ata/p
5549 .inherits = &ata_sff_port_ops,
5550
5551 .sff_data_xfer = pata_at91_data_xfer_noirq,
5552 -diff -urNp linux-2.6.32.28/drivers/ata/pata_atiixp.c linux-2.6.32.28/drivers/ata/pata_atiixp.c
5553 ---- linux-2.6.32.28/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
5554 -+++ linux-2.6.32.28/drivers/ata/pata_atiixp.c 2010-12-31 14:46:53.000000000 -0500
5555 +diff -urNp linux-2.6.32.29/drivers/ata/pata_atiixp.c linux-2.6.32.29/drivers/ata/pata_atiixp.c
5556 +--- linux-2.6.32.29/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
5557 ++++ linux-2.6.32.29/drivers/ata/pata_atiixp.c 2010-12-31 14:46:53.000000000 -0500
5558 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
5559 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
5560 };
5561 @@ -21535,9 +21595,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_atiixp.c linux-2.6.32.28/drivers/ata
5562 .inherits = &ata_bmdma_port_ops,
5563
5564 .qc_prep = ata_sff_dumb_qc_prep,
5565 -diff -urNp linux-2.6.32.28/drivers/ata/pata_atp867x.c linux-2.6.32.28/drivers/ata/pata_atp867x.c
5566 ---- linux-2.6.32.28/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
5567 -+++ linux-2.6.32.28/drivers/ata/pata_atp867x.c 2010-12-31 14:46:53.000000000 -0500
5568 +diff -urNp linux-2.6.32.29/drivers/ata/pata_atp867x.c linux-2.6.32.29/drivers/ata/pata_atp867x.c
5569 +--- linux-2.6.32.29/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
5570 ++++ linux-2.6.32.29/drivers/ata/pata_atp867x.c 2010-12-31 14:46:53.000000000 -0500
5571 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
5572 ATA_BMDMA_SHT(DRV_NAME),
5573 };
5574 @@ -21547,9 +21607,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_atp867x.c linux-2.6.32.28/drivers/at
5575 .inherits = &ata_bmdma_port_ops,
5576 .cable_detect = atp867x_cable_detect,
5577 .set_piomode = atp867x_set_piomode,
5578 -diff -urNp linux-2.6.32.28/drivers/ata/pata_bf54x.c linux-2.6.32.28/drivers/ata/pata_bf54x.c
5579 ---- linux-2.6.32.28/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
5580 -+++ linux-2.6.32.28/drivers/ata/pata_bf54x.c 2010-12-31 14:46:53.000000000 -0500
5581 +diff -urNp linux-2.6.32.29/drivers/ata/pata_bf54x.c linux-2.6.32.29/drivers/ata/pata_bf54x.c
5582 +--- linux-2.6.32.29/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
5583 ++++ linux-2.6.32.29/drivers/ata/pata_bf54x.c 2010-12-31 14:46:53.000000000 -0500
5584 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
5585 .dma_boundary = ATA_DMA_BOUNDARY,
5586 };
5587 @@ -21559,9 +21619,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_bf54x.c linux-2.6.32.28/drivers/ata/
5588 .inherits = &ata_sff_port_ops,
5589
5590 .set_piomode = bfin_set_piomode,
5591 -diff -urNp linux-2.6.32.28/drivers/ata/pata_cmd640.c linux-2.6.32.28/drivers/ata/pata_cmd640.c
5592 ---- linux-2.6.32.28/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
5593 -+++ linux-2.6.32.28/drivers/ata/pata_cmd640.c 2010-12-31 14:46:53.000000000 -0500
5594 +diff -urNp linux-2.6.32.29/drivers/ata/pata_cmd640.c linux-2.6.32.29/drivers/ata/pata_cmd640.c
5595 +--- linux-2.6.32.29/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
5596 ++++ linux-2.6.32.29/drivers/ata/pata_cmd640.c 2010-12-31 14:46:53.000000000 -0500
5597 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
5598 ATA_BMDMA_SHT(DRV_NAME),
5599 };
5600 @@ -21571,9 +21631,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_cmd640.c linux-2.6.32.28/drivers/ata
5601 .inherits = &ata_bmdma_port_ops,
5602 /* In theory xfer_noirq is not needed once we kill the prefetcher */
5603 .sff_data_xfer = ata_sff_data_xfer_noirq,
5604 -diff -urNp linux-2.6.32.28/drivers/ata/pata_cmd64x.c linux-2.6.32.28/drivers/ata/pata_cmd64x.c
5605 ---- linux-2.6.32.28/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
5606 -+++ linux-2.6.32.28/drivers/ata/pata_cmd64x.c 2010-12-31 14:46:53.000000000 -0500
5607 +diff -urNp linux-2.6.32.29/drivers/ata/pata_cmd64x.c linux-2.6.32.29/drivers/ata/pata_cmd64x.c
5608 +--- linux-2.6.32.29/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
5609 ++++ linux-2.6.32.29/drivers/ata/pata_cmd64x.c 2010-12-31 14:46:53.000000000 -0500
5610 @@ -275,18 +275,18 @@ static const struct ata_port_operations
5611 .set_dmamode = cmd64x_set_dmamode,
5612 };
5613 @@ -21596,9 +21656,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_cmd64x.c linux-2.6.32.28/drivers/ata
5614 .inherits = &cmd64x_base_ops,
5615 .bmdma_stop = cmd648_bmdma_stop,
5616 .cable_detect = cmd648_cable_detect,
5617 -diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5520.c linux-2.6.32.28/drivers/ata/pata_cs5520.c
5618 ---- linux-2.6.32.28/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
5619 -+++ linux-2.6.32.28/drivers/ata/pata_cs5520.c 2010-12-31 14:46:53.000000000 -0500
5620 +diff -urNp linux-2.6.32.29/drivers/ata/pata_cs5520.c linux-2.6.32.29/drivers/ata/pata_cs5520.c
5621 +--- linux-2.6.32.29/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
5622 ++++ linux-2.6.32.29/drivers/ata/pata_cs5520.c 2010-12-31 14:46:53.000000000 -0500
5623 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
5624 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
5625 };
5626 @@ -21608,9 +21668,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5520.c linux-2.6.32.28/drivers/ata
5627 .inherits = &ata_bmdma_port_ops,
5628 .qc_prep = ata_sff_dumb_qc_prep,
5629 .cable_detect = ata_cable_40wire,
5630 -diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5530.c linux-2.6.32.28/drivers/ata/pata_cs5530.c
5631 ---- linux-2.6.32.28/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
5632 -+++ linux-2.6.32.28/drivers/ata/pata_cs5530.c 2010-12-31 14:46:53.000000000 -0500
5633 +diff -urNp linux-2.6.32.29/drivers/ata/pata_cs5530.c linux-2.6.32.29/drivers/ata/pata_cs5530.c
5634 +--- linux-2.6.32.29/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
5635 ++++ linux-2.6.32.29/drivers/ata/pata_cs5530.c 2010-12-31 14:46:53.000000000 -0500
5636 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
5637 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
5638 };
5639 @@ -21620,9 +21680,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5530.c linux-2.6.32.28/drivers/ata
5640 .inherits = &ata_bmdma_port_ops,
5641
5642 .qc_prep = ata_sff_dumb_qc_prep,
5643 -diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5535.c linux-2.6.32.28/drivers/ata/pata_cs5535.c
5644 ---- linux-2.6.32.28/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
5645 -+++ linux-2.6.32.28/drivers/ata/pata_cs5535.c 2010-12-31 14:46:53.000000000 -0500
5646 +diff -urNp linux-2.6.32.29/drivers/ata/pata_cs5535.c linux-2.6.32.29/drivers/ata/pata_cs5535.c
5647 +--- linux-2.6.32.29/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
5648 ++++ linux-2.6.32.29/drivers/ata/pata_cs5535.c 2010-12-31 14:46:53.000000000 -0500
5649 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
5650 ATA_BMDMA_SHT(DRV_NAME),
5651 };
5652 @@ -21632,9 +21692,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5535.c linux-2.6.32.28/drivers/ata
5653 .inherits = &ata_bmdma_port_ops,
5654 .cable_detect = cs5535_cable_detect,
5655 .set_piomode = cs5535_set_piomode,
5656 -diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5536.c linux-2.6.32.28/drivers/ata/pata_cs5536.c
5657 ---- linux-2.6.32.28/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
5658 -+++ linux-2.6.32.28/drivers/ata/pata_cs5536.c 2010-12-31 14:46:53.000000000 -0500
5659 +diff -urNp linux-2.6.32.29/drivers/ata/pata_cs5536.c linux-2.6.32.29/drivers/ata/pata_cs5536.c
5660 +--- linux-2.6.32.29/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
5661 ++++ linux-2.6.32.29/drivers/ata/pata_cs5536.c 2010-12-31 14:46:53.000000000 -0500
5662 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
5663 ATA_BMDMA_SHT(DRV_NAME),
5664 };
5665 @@ -21644,9 +21704,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_cs5536.c linux-2.6.32.28/drivers/ata
5666 .inherits = &ata_bmdma_port_ops,
5667 .cable_detect = cs5536_cable_detect,
5668 .set_piomode = cs5536_set_piomode,
5669 -diff -urNp linux-2.6.32.28/drivers/ata/pata_cypress.c linux-2.6.32.28/drivers/ata/pata_cypress.c
5670 ---- linux-2.6.32.28/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
5671 -+++ linux-2.6.32.28/drivers/ata/pata_cypress.c 2010-12-31 14:46:53.000000000 -0500
5672 +diff -urNp linux-2.6.32.29/drivers/ata/pata_cypress.c linux-2.6.32.29/drivers/ata/pata_cypress.c
5673 +--- linux-2.6.32.29/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
5674 ++++ linux-2.6.32.29/drivers/ata/pata_cypress.c 2010-12-31 14:46:53.000000000 -0500
5675 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
5676 ATA_BMDMA_SHT(DRV_NAME),
5677 };
5678 @@ -21656,9 +21716,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_cypress.c linux-2.6.32.28/drivers/at
5679 .inherits = &ata_bmdma_port_ops,
5680 .cable_detect = ata_cable_40wire,
5681 .set_piomode = cy82c693_set_piomode,
5682 -diff -urNp linux-2.6.32.28/drivers/ata/pata_efar.c linux-2.6.32.28/drivers/ata/pata_efar.c
5683 ---- linux-2.6.32.28/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
5684 -+++ linux-2.6.32.28/drivers/ata/pata_efar.c 2010-12-31 14:46:53.000000000 -0500
5685 +diff -urNp linux-2.6.32.29/drivers/ata/pata_efar.c linux-2.6.32.29/drivers/ata/pata_efar.c
5686 +--- linux-2.6.32.29/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
5687 ++++ linux-2.6.32.29/drivers/ata/pata_efar.c 2010-12-31 14:46:53.000000000 -0500
5688 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
5689 ATA_BMDMA_SHT(DRV_NAME),
5690 };
5691 @@ -21668,9 +21728,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_efar.c linux-2.6.32.28/drivers/ata/p
5692 .inherits = &ata_bmdma_port_ops,
5693 .cable_detect = efar_cable_detect,
5694 .set_piomode = efar_set_piomode,
5695 -diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt366.c linux-2.6.32.28/drivers/ata/pata_hpt366.c
5696 ---- linux-2.6.32.28/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
5697 -+++ linux-2.6.32.28/drivers/ata/pata_hpt366.c 2010-12-31 14:46:53.000000000 -0500
5698 +diff -urNp linux-2.6.32.29/drivers/ata/pata_hpt366.c linux-2.6.32.29/drivers/ata/pata_hpt366.c
5699 +--- linux-2.6.32.29/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
5700 ++++ linux-2.6.32.29/drivers/ata/pata_hpt366.c 2010-12-31 14:46:53.000000000 -0500
5701 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
5702 * Configuration for HPT366/68
5703 */
5704 @@ -21680,9 +21740,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt366.c linux-2.6.32.28/drivers/ata
5705 .inherits = &ata_bmdma_port_ops,
5706 .cable_detect = hpt36x_cable_detect,
5707 .mode_filter = hpt366_filter,
5708 -diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt37x.c linux-2.6.32.28/drivers/ata/pata_hpt37x.c
5709 ---- linux-2.6.32.28/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
5710 -+++ linux-2.6.32.28/drivers/ata/pata_hpt37x.c 2010-12-31 14:46:53.000000000 -0500
5711 +diff -urNp linux-2.6.32.29/drivers/ata/pata_hpt37x.c linux-2.6.32.29/drivers/ata/pata_hpt37x.c
5712 +--- linux-2.6.32.29/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
5713 ++++ linux-2.6.32.29/drivers/ata/pata_hpt37x.c 2010-12-31 14:46:53.000000000 -0500
5714 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
5715 * Configuration for HPT370
5716 */
5717 @@ -21719,9 +21779,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt37x.c linux-2.6.32.28/drivers/ata
5718 .inherits = &hpt372_port_ops,
5719 .prereset = hpt374_fn1_pre_reset,
5720 };
5721 -diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt3x2n.c linux-2.6.32.28/drivers/ata/pata_hpt3x2n.c
5722 ---- linux-2.6.32.28/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
5723 -+++ linux-2.6.32.28/drivers/ata/pata_hpt3x2n.c 2010-12-31 14:46:53.000000000 -0500
5724 +diff -urNp linux-2.6.32.29/drivers/ata/pata_hpt3x2n.c linux-2.6.32.29/drivers/ata/pata_hpt3x2n.c
5725 +--- linux-2.6.32.29/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
5726 ++++ linux-2.6.32.29/drivers/ata/pata_hpt3x2n.c 2010-12-31 14:46:53.000000000 -0500
5727 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
5728 * Configuration for HPT3x2n.
5729 */
5730 @@ -21731,9 +21791,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt3x2n.c linux-2.6.32.28/drivers/at
5731 .inherits = &ata_bmdma_port_ops,
5732
5733 .bmdma_stop = hpt3x2n_bmdma_stop,
5734 -diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt3x3.c linux-2.6.32.28/drivers/ata/pata_hpt3x3.c
5735 ---- linux-2.6.32.28/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
5736 -+++ linux-2.6.32.28/drivers/ata/pata_hpt3x3.c 2010-12-31 14:46:53.000000000 -0500
5737 +diff -urNp linux-2.6.32.29/drivers/ata/pata_hpt3x3.c linux-2.6.32.29/drivers/ata/pata_hpt3x3.c
5738 +--- linux-2.6.32.29/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
5739 ++++ linux-2.6.32.29/drivers/ata/pata_hpt3x3.c 2010-12-31 14:46:53.000000000 -0500
5740 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
5741 ATA_BMDMA_SHT(DRV_NAME),
5742 };
5743 @@ -21743,9 +21803,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_hpt3x3.c linux-2.6.32.28/drivers/ata
5744 .inherits = &ata_bmdma_port_ops,
5745 .cable_detect = ata_cable_40wire,
5746 .set_piomode = hpt3x3_set_piomode,
5747 -diff -urNp linux-2.6.32.28/drivers/ata/pata_icside.c linux-2.6.32.28/drivers/ata/pata_icside.c
5748 ---- linux-2.6.32.28/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
5749 -+++ linux-2.6.32.28/drivers/ata/pata_icside.c 2010-12-31 14:46:53.000000000 -0500
5750 +diff -urNp linux-2.6.32.29/drivers/ata/pata_icside.c linux-2.6.32.29/drivers/ata/pata_icside.c
5751 +--- linux-2.6.32.29/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
5752 ++++ linux-2.6.32.29/drivers/ata/pata_icside.c 2010-12-31 14:46:53.000000000 -0500
5753 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
5754 }
5755 }
5756 @@ -21755,9 +21815,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_icside.c linux-2.6.32.28/drivers/ata
5757 .inherits = &ata_sff_port_ops,
5758 /* no need to build any PRD tables for DMA */
5759 .qc_prep = ata_noop_qc_prep,
5760 -diff -urNp linux-2.6.32.28/drivers/ata/pata_isapnp.c linux-2.6.32.28/drivers/ata/pata_isapnp.c
5761 ---- linux-2.6.32.28/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
5762 -+++ linux-2.6.32.28/drivers/ata/pata_isapnp.c 2010-12-31 14:46:53.000000000 -0500
5763 +diff -urNp linux-2.6.32.29/drivers/ata/pata_isapnp.c linux-2.6.32.29/drivers/ata/pata_isapnp.c
5764 +--- linux-2.6.32.29/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
5765 ++++ linux-2.6.32.29/drivers/ata/pata_isapnp.c 2010-12-31 14:46:53.000000000 -0500
5766 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
5767 ATA_PIO_SHT(DRV_NAME),
5768 };
5769 @@ -21773,9 +21833,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_isapnp.c linux-2.6.32.28/drivers/ata
5770 .inherits = &ata_sff_port_ops,
5771 .cable_detect = ata_cable_40wire,
5772 /* No altstatus so we don't want to use the lost interrupt poll */
5773 -diff -urNp linux-2.6.32.28/drivers/ata/pata_it8213.c linux-2.6.32.28/drivers/ata/pata_it8213.c
5774 ---- linux-2.6.32.28/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
5775 -+++ linux-2.6.32.28/drivers/ata/pata_it8213.c 2010-12-31 14:46:53.000000000 -0500
5776 +diff -urNp linux-2.6.32.29/drivers/ata/pata_it8213.c linux-2.6.32.29/drivers/ata/pata_it8213.c
5777 +--- linux-2.6.32.29/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
5778 ++++ linux-2.6.32.29/drivers/ata/pata_it8213.c 2010-12-31 14:46:53.000000000 -0500
5779 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
5780 };
5781
5782 @@ -21785,9 +21845,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_it8213.c linux-2.6.32.28/drivers/ata
5783 .inherits = &ata_bmdma_port_ops,
5784 .cable_detect = it8213_cable_detect,
5785 .set_piomode = it8213_set_piomode,
5786 -diff -urNp linux-2.6.32.28/drivers/ata/pata_it821x.c linux-2.6.32.28/drivers/ata/pata_it821x.c
5787 ---- linux-2.6.32.28/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
5788 -+++ linux-2.6.32.28/drivers/ata/pata_it821x.c 2010-12-31 14:46:53.000000000 -0500
5789 +diff -urNp linux-2.6.32.29/drivers/ata/pata_it821x.c linux-2.6.32.29/drivers/ata/pata_it821x.c
5790 +--- linux-2.6.32.29/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
5791 ++++ linux-2.6.32.29/drivers/ata/pata_it821x.c 2010-12-31 14:46:53.000000000 -0500
5792 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
5793 ATA_BMDMA_SHT(DRV_NAME),
5794 };
5795 @@ -21815,9 +21875,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_it821x.c linux-2.6.32.28/drivers/ata
5796 .inherits = &ata_bmdma_port_ops,
5797
5798 .check_atapi_dma= it821x_check_atapi_dma,
5799 -diff -urNp linux-2.6.32.28/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.28/drivers/ata/pata_ixp4xx_cf.c
5800 ---- linux-2.6.32.28/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
5801 -+++ linux-2.6.32.28/drivers/ata/pata_ixp4xx_cf.c 2010-12-31 14:46:53.000000000 -0500
5802 +diff -urNp linux-2.6.32.29/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.29/drivers/ata/pata_ixp4xx_cf.c
5803 +--- linux-2.6.32.29/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
5804 ++++ linux-2.6.32.29/drivers/ata/pata_ixp4xx_cf.c 2010-12-31 14:46:53.000000000 -0500
5805 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
5806 ATA_PIO_SHT(DRV_NAME),
5807 };
5808 @@ -21827,9 +21887,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.28/drivers/
5809 .inherits = &ata_sff_port_ops,
5810 .sff_data_xfer = ixp4xx_mmio_data_xfer,
5811 .cable_detect = ata_cable_40wire,
5812 -diff -urNp linux-2.6.32.28/drivers/ata/pata_jmicron.c linux-2.6.32.28/drivers/ata/pata_jmicron.c
5813 ---- linux-2.6.32.28/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
5814 -+++ linux-2.6.32.28/drivers/ata/pata_jmicron.c 2010-12-31 14:46:53.000000000 -0500
5815 +diff -urNp linux-2.6.32.29/drivers/ata/pata_jmicron.c linux-2.6.32.29/drivers/ata/pata_jmicron.c
5816 +--- linux-2.6.32.29/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
5817 ++++ linux-2.6.32.29/drivers/ata/pata_jmicron.c 2010-12-31 14:46:53.000000000 -0500
5818 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
5819 ATA_BMDMA_SHT(DRV_NAME),
5820 };
5821 @@ -21839,9 +21899,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_jmicron.c linux-2.6.32.28/drivers/at
5822 .inherits = &ata_bmdma_port_ops,
5823 .prereset = jmicron_pre_reset,
5824 };
5825 -diff -urNp linux-2.6.32.28/drivers/ata/pata_legacy.c linux-2.6.32.28/drivers/ata/pata_legacy.c
5826 ---- linux-2.6.32.28/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
5827 -+++ linux-2.6.32.28/drivers/ata/pata_legacy.c 2010-12-31 14:46:53.000000000 -0500
5828 +diff -urNp linux-2.6.32.29/drivers/ata/pata_legacy.c linux-2.6.32.29/drivers/ata/pata_legacy.c
5829 +--- linux-2.6.32.29/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
5830 ++++ linux-2.6.32.29/drivers/ata/pata_legacy.c 2010-12-31 14:46:53.000000000 -0500
5831 @@ -106,7 +106,7 @@ struct legacy_probe {
5832
5833 struct legacy_controller {
5834 @@ -21953,9 +22013,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_legacy.c linux-2.6.32.28/drivers/ata
5835 struct legacy_data *ld = &legacy_data[probe->slot];
5836 struct ata_host *host = NULL;
5837 struct ata_port *ap;
5838 -diff -urNp linux-2.6.32.28/drivers/ata/pata_marvell.c linux-2.6.32.28/drivers/ata/pata_marvell.c
5839 ---- linux-2.6.32.28/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
5840 -+++ linux-2.6.32.28/drivers/ata/pata_marvell.c 2010-12-31 14:46:53.000000000 -0500
5841 +diff -urNp linux-2.6.32.29/drivers/ata/pata_marvell.c linux-2.6.32.29/drivers/ata/pata_marvell.c
5842 +--- linux-2.6.32.29/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
5843 ++++ linux-2.6.32.29/drivers/ata/pata_marvell.c 2010-12-31 14:46:53.000000000 -0500
5844 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
5845 ATA_BMDMA_SHT(DRV_NAME),
5846 };
5847 @@ -21965,21 +22025,21 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_marvell.c linux-2.6.32.28/drivers/at
5848 .inherits = &ata_bmdma_port_ops,
5849 .cable_detect = marvell_cable_detect,
5850 .prereset = marvell_pre_reset,
5851 -diff -urNp linux-2.6.32.28/drivers/ata/pata_mpc52xx.c linux-2.6.32.28/drivers/ata/pata_mpc52xx.c
5852 ---- linux-2.6.32.28/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400
5853 -+++ linux-2.6.32.28/drivers/ata/pata_mpc52xx.c 2010-12-31 14:46:53.000000000 -0500
5854 +diff -urNp linux-2.6.32.29/drivers/ata/pata_mpc52xx.c linux-2.6.32.29/drivers/ata/pata_mpc52xx.c
5855 +--- linux-2.6.32.29/drivers/ata/pata_mpc52xx.c 2011-02-22 15:56:54.000000000 -0500
5856 ++++ linux-2.6.32.29/drivers/ata/pata_mpc52xx.c 2011-02-22 16:03:07.000000000 -0500
5857 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
5858 ATA_PIO_SHT(DRV_NAME),
5859 };
5860
5861 -static struct ata_port_operations mpc52xx_ata_port_ops = {
5862 +static const struct ata_port_operations mpc52xx_ata_port_ops = {
5863 - .inherits = &ata_sff_port_ops,
5864 + .inherits = &ata_bmdma_port_ops,
5865 .sff_dev_select = mpc52xx_ata_dev_select,
5866 .set_piomode = mpc52xx_ata_set_piomode,
5867 -diff -urNp linux-2.6.32.28/drivers/ata/pata_mpiix.c linux-2.6.32.28/drivers/ata/pata_mpiix.c
5868 ---- linux-2.6.32.28/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
5869 -+++ linux-2.6.32.28/drivers/ata/pata_mpiix.c 2010-12-31 14:46:53.000000000 -0500
5870 +diff -urNp linux-2.6.32.29/drivers/ata/pata_mpiix.c linux-2.6.32.29/drivers/ata/pata_mpiix.c
5871 +--- linux-2.6.32.29/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
5872 ++++ linux-2.6.32.29/drivers/ata/pata_mpiix.c 2010-12-31 14:46:53.000000000 -0500
5873 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
5874 ATA_PIO_SHT(DRV_NAME),
5875 };
5876 @@ -21989,9 +22049,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_mpiix.c linux-2.6.32.28/drivers/ata/
5877 .inherits = &ata_sff_port_ops,
5878 .qc_issue = mpiix_qc_issue,
5879 .cable_detect = ata_cable_40wire,
5880 -diff -urNp linux-2.6.32.28/drivers/ata/pata_netcell.c linux-2.6.32.28/drivers/ata/pata_netcell.c
5881 ---- linux-2.6.32.28/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
5882 -+++ linux-2.6.32.28/drivers/ata/pata_netcell.c 2010-12-31 14:46:53.000000000 -0500
5883 +diff -urNp linux-2.6.32.29/drivers/ata/pata_netcell.c linux-2.6.32.29/drivers/ata/pata_netcell.c
5884 +--- linux-2.6.32.29/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
5885 ++++ linux-2.6.32.29/drivers/ata/pata_netcell.c 2010-12-31 14:46:53.000000000 -0500
5886 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
5887 ATA_BMDMA_SHT(DRV_NAME),
5888 };
5889 @@ -22001,9 +22061,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_netcell.c linux-2.6.32.28/drivers/at
5890 .inherits = &ata_bmdma_port_ops,
5891 .cable_detect = ata_cable_80wire,
5892 .read_id = netcell_read_id,
5893 -diff -urNp linux-2.6.32.28/drivers/ata/pata_ninja32.c linux-2.6.32.28/drivers/ata/pata_ninja32.c
5894 ---- linux-2.6.32.28/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
5895 -+++ linux-2.6.32.28/drivers/ata/pata_ninja32.c 2010-12-31 14:46:53.000000000 -0500
5896 +diff -urNp linux-2.6.32.29/drivers/ata/pata_ninja32.c linux-2.6.32.29/drivers/ata/pata_ninja32.c
5897 +--- linux-2.6.32.29/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
5898 ++++ linux-2.6.32.29/drivers/ata/pata_ninja32.c 2010-12-31 14:46:53.000000000 -0500
5899 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
5900 ATA_BMDMA_SHT(DRV_NAME),
5901 };
5902 @@ -22013,9 +22073,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_ninja32.c linux-2.6.32.28/drivers/at
5903 .inherits = &ata_bmdma_port_ops,
5904 .sff_dev_select = ninja32_dev_select,
5905 .cable_detect = ata_cable_40wire,
5906 -diff -urNp linux-2.6.32.28/drivers/ata/pata_ns87410.c linux-2.6.32.28/drivers/ata/pata_ns87410.c
5907 ---- linux-2.6.32.28/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
5908 -+++ linux-2.6.32.28/drivers/ata/pata_ns87410.c 2010-12-31 14:46:53.000000000 -0500
5909 +diff -urNp linux-2.6.32.29/drivers/ata/pata_ns87410.c linux-2.6.32.29/drivers/ata/pata_ns87410.c
5910 +--- linux-2.6.32.29/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
5911 ++++ linux-2.6.32.29/drivers/ata/pata_ns87410.c 2010-12-31 14:46:53.000000000 -0500
5912 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
5913 ATA_PIO_SHT(DRV_NAME),
5914 };
5915 @@ -22025,9 +22085,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_ns87410.c linux-2.6.32.28/drivers/at
5916 .inherits = &ata_sff_port_ops,
5917 .qc_issue = ns87410_qc_issue,
5918 .cable_detect = ata_cable_40wire,
5919 -diff -urNp linux-2.6.32.28/drivers/ata/pata_ns87415.c linux-2.6.32.28/drivers/ata/pata_ns87415.c
5920 ---- linux-2.6.32.28/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
5921 -+++ linux-2.6.32.28/drivers/ata/pata_ns87415.c 2010-12-31 14:46:53.000000000 -0500
5922 +diff -urNp linux-2.6.32.29/drivers/ata/pata_ns87415.c linux-2.6.32.29/drivers/ata/pata_ns87415.c
5923 +--- linux-2.6.32.29/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
5924 ++++ linux-2.6.32.29/drivers/ata/pata_ns87415.c 2010-12-31 14:46:53.000000000 -0500
5925 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
5926 }
5927 #endif /* 87560 SuperIO Support */
5928 @@ -22046,9 +22106,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_ns87415.c linux-2.6.32.28/drivers/at
5929 .inherits = &ns87415_pata_ops,
5930 .sff_tf_read = ns87560_tf_read,
5931 .sff_check_status = ns87560_check_status,
5932 -diff -urNp linux-2.6.32.28/drivers/ata/pata_octeon_cf.c linux-2.6.32.28/drivers/ata/pata_octeon_cf.c
5933 ---- linux-2.6.32.28/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
5934 -+++ linux-2.6.32.28/drivers/ata/pata_octeon_cf.c 2010-12-31 14:46:53.000000000 -0500
5935 +diff -urNp linux-2.6.32.29/drivers/ata/pata_octeon_cf.c linux-2.6.32.29/drivers/ata/pata_octeon_cf.c
5936 +--- linux-2.6.32.29/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
5937 ++++ linux-2.6.32.29/drivers/ata/pata_octeon_cf.c 2010-12-31 14:46:53.000000000 -0500
5938 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
5939 return 0;
5940 }
5941 @@ -22057,9 +22117,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_octeon_cf.c linux-2.6.32.28/drivers/
5942 static struct ata_port_operations octeon_cf_ops = {
5943 .inherits = &ata_sff_port_ops,
5944 .check_atapi_dma = octeon_cf_check_atapi_dma,
5945 -diff -urNp linux-2.6.32.28/drivers/ata/pata_oldpiix.c linux-2.6.32.28/drivers/ata/pata_oldpiix.c
5946 ---- linux-2.6.32.28/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
5947 -+++ linux-2.6.32.28/drivers/ata/pata_oldpiix.c 2010-12-31 14:46:53.000000000 -0500
5948 +diff -urNp linux-2.6.32.29/drivers/ata/pata_oldpiix.c linux-2.6.32.29/drivers/ata/pata_oldpiix.c
5949 +--- linux-2.6.32.29/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
5950 ++++ linux-2.6.32.29/drivers/ata/pata_oldpiix.c 2010-12-31 14:46:53.000000000 -0500
5951 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
5952 ATA_BMDMA_SHT(DRV_NAME),
5953 };
5954 @@ -22069,9 +22129,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_oldpiix.c linux-2.6.32.28/drivers/at
5955 .inherits = &ata_bmdma_port_ops,
5956 .qc_issue = oldpiix_qc_issue,
5957 .cable_detect = ata_cable_40wire,
5958 -diff -urNp linux-2.6.32.28/drivers/ata/pata_opti.c linux-2.6.32.28/drivers/ata/pata_opti.c
5959 ---- linux-2.6.32.28/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
5960 -+++ linux-2.6.32.28/drivers/ata/pata_opti.c 2010-12-31 14:46:53.000000000 -0500
5961 +diff -urNp linux-2.6.32.29/drivers/ata/pata_opti.c linux-2.6.32.29/drivers/ata/pata_opti.c
5962 +--- linux-2.6.32.29/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
5963 ++++ linux-2.6.32.29/drivers/ata/pata_opti.c 2010-12-31 14:46:53.000000000 -0500
5964 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
5965 ATA_PIO_SHT(DRV_NAME),
5966 };
5967 @@ -22081,9 +22141,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_opti.c linux-2.6.32.28/drivers/ata/p
5968 .inherits = &ata_sff_port_ops,
5969 .cable_detect = ata_cable_40wire,
5970 .set_piomode = opti_set_piomode,
5971 -diff -urNp linux-2.6.32.28/drivers/ata/pata_optidma.c linux-2.6.32.28/drivers/ata/pata_optidma.c
5972 ---- linux-2.6.32.28/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
5973 -+++ linux-2.6.32.28/drivers/ata/pata_optidma.c 2010-12-31 14:46:53.000000000 -0500
5974 +diff -urNp linux-2.6.32.29/drivers/ata/pata_optidma.c linux-2.6.32.29/drivers/ata/pata_optidma.c
5975 +--- linux-2.6.32.29/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
5976 ++++ linux-2.6.32.29/drivers/ata/pata_optidma.c 2010-12-31 14:46:53.000000000 -0500
5977 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
5978 ATA_BMDMA_SHT(DRV_NAME),
5979 };
5980 @@ -22102,9 +22162,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_optidma.c linux-2.6.32.28/drivers/at
5981 .inherits = &optidma_port_ops,
5982 .set_piomode = optiplus_set_pio_mode,
5983 .set_dmamode = optiplus_set_dma_mode,
5984 -diff -urNp linux-2.6.32.28/drivers/ata/pata_palmld.c linux-2.6.32.28/drivers/ata/pata_palmld.c
5985 ---- linux-2.6.32.28/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
5986 -+++ linux-2.6.32.28/drivers/ata/pata_palmld.c 2010-12-31 14:46:53.000000000 -0500
5987 +diff -urNp linux-2.6.32.29/drivers/ata/pata_palmld.c linux-2.6.32.29/drivers/ata/pata_palmld.c
5988 +--- linux-2.6.32.29/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
5989 ++++ linux-2.6.32.29/drivers/ata/pata_palmld.c 2010-12-31 14:46:53.000000000 -0500
5990 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
5991 ATA_PIO_SHT(DRV_NAME),
5992 };
5993 @@ -22114,9 +22174,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_palmld.c linux-2.6.32.28/drivers/ata
5994 .inherits = &ata_sff_port_ops,
5995 .sff_data_xfer = ata_sff_data_xfer_noirq,
5996 .cable_detect = ata_cable_40wire,
5997 -diff -urNp linux-2.6.32.28/drivers/ata/pata_pcmcia.c linux-2.6.32.28/drivers/ata/pata_pcmcia.c
5998 ---- linux-2.6.32.28/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
5999 -+++ linux-2.6.32.28/drivers/ata/pata_pcmcia.c 2010-12-31 14:46:53.000000000 -0500
6000 +diff -urNp linux-2.6.32.29/drivers/ata/pata_pcmcia.c linux-2.6.32.29/drivers/ata/pata_pcmcia.c
6001 +--- linux-2.6.32.29/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
6002 ++++ linux-2.6.32.29/drivers/ata/pata_pcmcia.c 2010-12-31 14:46:53.000000000 -0500
6003 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
6004 ATA_PIO_SHT(DRV_NAME),
6005 };
6006 @@ -22143,9 +22203,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_pcmcia.c linux-2.6.32.28/drivers/ata
6007
6008 info = kzalloc(sizeof(*info), GFP_KERNEL);
6009 if (info == NULL)
6010 -diff -urNp linux-2.6.32.28/drivers/ata/pata_pdc2027x.c linux-2.6.32.28/drivers/ata/pata_pdc2027x.c
6011 ---- linux-2.6.32.28/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
6012 -+++ linux-2.6.32.28/drivers/ata/pata_pdc2027x.c 2010-12-31 14:46:53.000000000 -0500
6013 +diff -urNp linux-2.6.32.29/drivers/ata/pata_pdc2027x.c linux-2.6.32.29/drivers/ata/pata_pdc2027x.c
6014 +--- linux-2.6.32.29/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
6015 ++++ linux-2.6.32.29/drivers/ata/pata_pdc2027x.c 2010-12-31 14:46:53.000000000 -0500
6016 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
6017 ATA_BMDMA_SHT(DRV_NAME),
6018 };
6019 @@ -22163,9 +22223,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_pdc2027x.c linux-2.6.32.28/drivers/a
6020 .inherits = &pdc2027x_pata100_ops,
6021 .mode_filter = pdc2027x_mode_filter,
6022 .set_piomode = pdc2027x_set_piomode,
6023 -diff -urNp linux-2.6.32.28/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.28/drivers/ata/pata_pdc202xx_old.c
6024 ---- linux-2.6.32.28/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
6025 -+++ linux-2.6.32.28/drivers/ata/pata_pdc202xx_old.c 2010-12-31 14:46:53.000000000 -0500
6026 +diff -urNp linux-2.6.32.29/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.29/drivers/ata/pata_pdc202xx_old.c
6027 +--- linux-2.6.32.29/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
6028 ++++ linux-2.6.32.29/drivers/ata/pata_pdc202xx_old.c 2010-12-31 14:46:53.000000000 -0500
6029 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
6030 ATA_BMDMA_SHT(DRV_NAME),
6031 };
6032 @@ -22184,9 +22244,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.28/drive
6033 .inherits = &pdc2024x_port_ops,
6034
6035 .check_atapi_dma = pdc2026x_check_atapi_dma,
6036 -diff -urNp linux-2.6.32.28/drivers/ata/pata_platform.c linux-2.6.32.28/drivers/ata/pata_platform.c
6037 ---- linux-2.6.32.28/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
6038 -+++ linux-2.6.32.28/drivers/ata/pata_platform.c 2010-12-31 14:46:53.000000000 -0500
6039 +diff -urNp linux-2.6.32.29/drivers/ata/pata_platform.c linux-2.6.32.29/drivers/ata/pata_platform.c
6040 +--- linux-2.6.32.29/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
6041 ++++ linux-2.6.32.29/drivers/ata/pata_platform.c 2010-12-31 14:46:53.000000000 -0500
6042 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
6043 ATA_PIO_SHT(DRV_NAME),
6044 };
6045 @@ -22196,9 +22256,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_platform.c linux-2.6.32.28/drivers/a
6046 .inherits = &ata_sff_port_ops,
6047 .sff_data_xfer = ata_sff_data_xfer_noirq,
6048 .cable_detect = ata_cable_unknown,
6049 -diff -urNp linux-2.6.32.28/drivers/ata/pata_qdi.c linux-2.6.32.28/drivers/ata/pata_qdi.c
6050 ---- linux-2.6.32.28/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
6051 -+++ linux-2.6.32.28/drivers/ata/pata_qdi.c 2010-12-31 14:46:53.000000000 -0500
6052 +diff -urNp linux-2.6.32.29/drivers/ata/pata_qdi.c linux-2.6.32.29/drivers/ata/pata_qdi.c
6053 +--- linux-2.6.32.29/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
6054 ++++ linux-2.6.32.29/drivers/ata/pata_qdi.c 2010-12-31 14:46:53.000000000 -0500
6055 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
6056 ATA_PIO_SHT(DRV_NAME),
6057 };
6058 @@ -22217,9 +22277,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_qdi.c linux-2.6.32.28/drivers/ata/pa
6059 .inherits = &qdi6500_port_ops,
6060 .set_piomode = qdi6580_set_piomode,
6061 };
6062 -diff -urNp linux-2.6.32.28/drivers/ata/pata_radisys.c linux-2.6.32.28/drivers/ata/pata_radisys.c
6063 ---- linux-2.6.32.28/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
6064 -+++ linux-2.6.32.28/drivers/ata/pata_radisys.c 2010-12-31 14:46:53.000000000 -0500
6065 +diff -urNp linux-2.6.32.29/drivers/ata/pata_radisys.c linux-2.6.32.29/drivers/ata/pata_radisys.c
6066 +--- linux-2.6.32.29/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
6067 ++++ linux-2.6.32.29/drivers/ata/pata_radisys.c 2010-12-31 14:46:53.000000000 -0500
6068 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
6069 ATA_BMDMA_SHT(DRV_NAME),
6070 };
6071 @@ -22229,9 +22289,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_radisys.c linux-2.6.32.28/drivers/at
6072 .inherits = &ata_bmdma_port_ops,
6073 .qc_issue = radisys_qc_issue,
6074 .cable_detect = ata_cable_unknown,
6075 -diff -urNp linux-2.6.32.28/drivers/ata/pata_rb532_cf.c linux-2.6.32.28/drivers/ata/pata_rb532_cf.c
6076 ---- linux-2.6.32.28/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
6077 -+++ linux-2.6.32.28/drivers/ata/pata_rb532_cf.c 2010-12-31 14:46:53.000000000 -0500
6078 +diff -urNp linux-2.6.32.29/drivers/ata/pata_rb532_cf.c linux-2.6.32.29/drivers/ata/pata_rb532_cf.c
6079 +--- linux-2.6.32.29/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
6080 ++++ linux-2.6.32.29/drivers/ata/pata_rb532_cf.c 2010-12-31 14:46:53.000000000 -0500
6081 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
6082 return IRQ_HANDLED;
6083 }
6084 @@ -22241,9 +22301,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_rb532_cf.c linux-2.6.32.28/drivers/a
6085 .inherits = &ata_sff_port_ops,
6086 .sff_data_xfer = ata_sff_data_xfer32,
6087 };
6088 -diff -urNp linux-2.6.32.28/drivers/ata/pata_rdc.c linux-2.6.32.28/drivers/ata/pata_rdc.c
6089 ---- linux-2.6.32.28/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
6090 -+++ linux-2.6.32.28/drivers/ata/pata_rdc.c 2010-12-31 14:46:53.000000000 -0500
6091 +diff -urNp linux-2.6.32.29/drivers/ata/pata_rdc.c linux-2.6.32.29/drivers/ata/pata_rdc.c
6092 +--- linux-2.6.32.29/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
6093 ++++ linux-2.6.32.29/drivers/ata/pata_rdc.c 2010-12-31 14:46:53.000000000 -0500
6094 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
6095 pci_write_config_byte(dev, 0x48, udma_enable);
6096 }
6097 @@ -22253,9 +22313,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_rdc.c linux-2.6.32.28/drivers/ata/pa
6098 .inherits = &ata_bmdma32_port_ops,
6099 .cable_detect = rdc_pata_cable_detect,
6100 .set_piomode = rdc_set_piomode,
6101 -diff -urNp linux-2.6.32.28/drivers/ata/pata_rz1000.c linux-2.6.32.28/drivers/ata/pata_rz1000.c
6102 ---- linux-2.6.32.28/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
6103 -+++ linux-2.6.32.28/drivers/ata/pata_rz1000.c 2010-12-31 14:46:53.000000000 -0500
6104 +diff -urNp linux-2.6.32.29/drivers/ata/pata_rz1000.c linux-2.6.32.29/drivers/ata/pata_rz1000.c
6105 +--- linux-2.6.32.29/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
6106 ++++ linux-2.6.32.29/drivers/ata/pata_rz1000.c 2010-12-31 14:46:53.000000000 -0500
6107 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
6108 ATA_PIO_SHT(DRV_NAME),
6109 };
6110 @@ -22265,9 +22325,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_rz1000.c linux-2.6.32.28/drivers/ata
6111 .inherits = &ata_sff_port_ops,
6112 .cable_detect = ata_cable_40wire,
6113 .set_mode = rz1000_set_mode,
6114 -diff -urNp linux-2.6.32.28/drivers/ata/pata_sc1200.c linux-2.6.32.28/drivers/ata/pata_sc1200.c
6115 ---- linux-2.6.32.28/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
6116 -+++ linux-2.6.32.28/drivers/ata/pata_sc1200.c 2010-12-31 14:46:53.000000000 -0500
6117 +diff -urNp linux-2.6.32.29/drivers/ata/pata_sc1200.c linux-2.6.32.29/drivers/ata/pata_sc1200.c
6118 +--- linux-2.6.32.29/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
6119 ++++ linux-2.6.32.29/drivers/ata/pata_sc1200.c 2010-12-31 14:46:53.000000000 -0500
6120 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
6121 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
6122 };
6123 @@ -22277,9 +22337,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_sc1200.c linux-2.6.32.28/drivers/ata
6124 .inherits = &ata_bmdma_port_ops,
6125 .qc_prep = ata_sff_dumb_qc_prep,
6126 .qc_issue = sc1200_qc_issue,
6127 -diff -urNp linux-2.6.32.28/drivers/ata/pata_scc.c linux-2.6.32.28/drivers/ata/pata_scc.c
6128 ---- linux-2.6.32.28/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
6129 -+++ linux-2.6.32.28/drivers/ata/pata_scc.c 2010-12-31 14:46:53.000000000 -0500
6130 +diff -urNp linux-2.6.32.29/drivers/ata/pata_scc.c linux-2.6.32.29/drivers/ata/pata_scc.c
6131 +--- linux-2.6.32.29/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
6132 ++++ linux-2.6.32.29/drivers/ata/pata_scc.c 2010-12-31 14:46:53.000000000 -0500
6133 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
6134 ATA_BMDMA_SHT(DRV_NAME),
6135 };
6136 @@ -22289,9 +22349,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_scc.c linux-2.6.32.28/drivers/ata/pa
6137 .inherits = &ata_bmdma_port_ops,
6138
6139 .set_piomode = scc_set_piomode,
6140 -diff -urNp linux-2.6.32.28/drivers/ata/pata_sch.c linux-2.6.32.28/drivers/ata/pata_sch.c
6141 ---- linux-2.6.32.28/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
6142 -+++ linux-2.6.32.28/drivers/ata/pata_sch.c 2010-12-31 14:46:53.000000000 -0500
6143 +diff -urNp linux-2.6.32.29/drivers/ata/pata_sch.c linux-2.6.32.29/drivers/ata/pata_sch.c
6144 +--- linux-2.6.32.29/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
6145 ++++ linux-2.6.32.29/drivers/ata/pata_sch.c 2010-12-31 14:46:53.000000000 -0500
6146 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
6147 ATA_BMDMA_SHT(DRV_NAME),
6148 };
6149 @@ -22301,9 +22361,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_sch.c linux-2.6.32.28/drivers/ata/pa
6150 .inherits = &ata_bmdma_port_ops,
6151 .cable_detect = ata_cable_unknown,
6152 .set_piomode = sch_set_piomode,
6153 -diff -urNp linux-2.6.32.28/drivers/ata/pata_serverworks.c linux-2.6.32.28/drivers/ata/pata_serverworks.c
6154 ---- linux-2.6.32.28/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
6155 -+++ linux-2.6.32.28/drivers/ata/pata_serverworks.c 2010-12-31 14:46:53.000000000 -0500
6156 +diff -urNp linux-2.6.32.29/drivers/ata/pata_serverworks.c linux-2.6.32.29/drivers/ata/pata_serverworks.c
6157 +--- linux-2.6.32.29/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
6158 ++++ linux-2.6.32.29/drivers/ata/pata_serverworks.c 2010-12-31 14:46:53.000000000 -0500
6159 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw
6160 ATA_BMDMA_SHT(DRV_NAME),
6161 };
6162 @@ -22322,9 +22382,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_serverworks.c linux-2.6.32.28/driver
6163 .inherits = &serverworks_osb4_port_ops,
6164 .mode_filter = serverworks_csb_filter,
6165 };
6166 -diff -urNp linux-2.6.32.28/drivers/ata/pata_sil680.c linux-2.6.32.28/drivers/ata/pata_sil680.c
6167 ---- linux-2.6.32.28/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
6168 -+++ linux-2.6.32.28/drivers/ata/pata_sil680.c 2010-12-31 14:46:53.000000000 -0500
6169 +diff -urNp linux-2.6.32.29/drivers/ata/pata_sil680.c linux-2.6.32.29/drivers/ata/pata_sil680.c
6170 +--- linux-2.6.32.29/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
6171 ++++ linux-2.6.32.29/drivers/ata/pata_sil680.c 2010-12-31 14:46:53.000000000 -0500
6172 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
6173 ATA_BMDMA_SHT(DRV_NAME),
6174 };
6175 @@ -22334,9 +22394,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_sil680.c linux-2.6.32.28/drivers/ata
6176 .inherits = &ata_bmdma32_port_ops,
6177 .cable_detect = sil680_cable_detect,
6178 .set_piomode = sil680_set_piomode,
6179 -diff -urNp linux-2.6.32.28/drivers/ata/pata_sis.c linux-2.6.32.28/drivers/ata/pata_sis.c
6180 ---- linux-2.6.32.28/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
6181 -+++ linux-2.6.32.28/drivers/ata/pata_sis.c 2010-12-31 14:46:53.000000000 -0500
6182 +diff -urNp linux-2.6.32.29/drivers/ata/pata_sis.c linux-2.6.32.29/drivers/ata/pata_sis.c
6183 +--- linux-2.6.32.29/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
6184 ++++ linux-2.6.32.29/drivers/ata/pata_sis.c 2010-12-31 14:46:53.000000000 -0500
6185 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
6186 ATA_BMDMA_SHT(DRV_NAME),
6187 };
6188 @@ -22392,9 +22452,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_sis.c linux-2.6.32.28/drivers/ata/pa
6189 .inherits = &sis_base_ops,
6190 .set_piomode = sis_old_set_piomode,
6191 .set_dmamode = sis_old_set_dmamode,
6192 -diff -urNp linux-2.6.32.28/drivers/ata/pata_sl82c105.c linux-2.6.32.28/drivers/ata/pata_sl82c105.c
6193 ---- linux-2.6.32.28/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
6194 -+++ linux-2.6.32.28/drivers/ata/pata_sl82c105.c 2010-12-31 14:46:53.000000000 -0500
6195 +diff -urNp linux-2.6.32.29/drivers/ata/pata_sl82c105.c linux-2.6.32.29/drivers/ata/pata_sl82c105.c
6196 +--- linux-2.6.32.29/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
6197 ++++ linux-2.6.32.29/drivers/ata/pata_sl82c105.c 2010-12-31 14:46:53.000000000 -0500
6198 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
6199 ATA_BMDMA_SHT(DRV_NAME),
6200 };
6201 @@ -22404,9 +22464,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_sl82c105.c linux-2.6.32.28/drivers/a
6202 .inherits = &ata_bmdma_port_ops,
6203 .qc_defer = sl82c105_qc_defer,
6204 .bmdma_start = sl82c105_bmdma_start,
6205 -diff -urNp linux-2.6.32.28/drivers/ata/pata_triflex.c linux-2.6.32.28/drivers/ata/pata_triflex.c
6206 ---- linux-2.6.32.28/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
6207 -+++ linux-2.6.32.28/drivers/ata/pata_triflex.c 2010-12-31 14:46:53.000000000 -0500
6208 +diff -urNp linux-2.6.32.29/drivers/ata/pata_triflex.c linux-2.6.32.29/drivers/ata/pata_triflex.c
6209 +--- linux-2.6.32.29/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
6210 ++++ linux-2.6.32.29/drivers/ata/pata_triflex.c 2010-12-31 14:46:53.000000000 -0500
6211 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
6212 ATA_BMDMA_SHT(DRV_NAME),
6213 };
6214 @@ -22416,9 +22476,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_triflex.c linux-2.6.32.28/drivers/at
6215 .inherits = &ata_bmdma_port_ops,
6216 .bmdma_start = triflex_bmdma_start,
6217 .bmdma_stop = triflex_bmdma_stop,
6218 -diff -urNp linux-2.6.32.28/drivers/ata/pata_via.c linux-2.6.32.28/drivers/ata/pata_via.c
6219 ---- linux-2.6.32.28/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
6220 -+++ linux-2.6.32.28/drivers/ata/pata_via.c 2010-12-31 14:46:53.000000000 -0500
6221 +diff -urNp linux-2.6.32.29/drivers/ata/pata_via.c linux-2.6.32.29/drivers/ata/pata_via.c
6222 +--- linux-2.6.32.29/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
6223 ++++ linux-2.6.32.29/drivers/ata/pata_via.c 2010-12-31 14:46:53.000000000 -0500
6224 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
6225 ATA_BMDMA_SHT(DRV_NAME),
6226 };
6227 @@ -22437,9 +22497,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_via.c linux-2.6.32.28/drivers/ata/pa
6228 .inherits = &via_port_ops,
6229 .sff_data_xfer = ata_sff_data_xfer_noirq,
6230 };
6231 -diff -urNp linux-2.6.32.28/drivers/ata/pata_winbond.c linux-2.6.32.28/drivers/ata/pata_winbond.c
6232 ---- linux-2.6.32.28/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
6233 -+++ linux-2.6.32.28/drivers/ata/pata_winbond.c 2010-12-31 14:46:53.000000000 -0500
6234 +diff -urNp linux-2.6.32.29/drivers/ata/pata_winbond.c linux-2.6.32.29/drivers/ata/pata_winbond.c
6235 +--- linux-2.6.32.29/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
6236 ++++ linux-2.6.32.29/drivers/ata/pata_winbond.c 2010-12-31 14:46:53.000000000 -0500
6237 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond
6238 ATA_PIO_SHT(DRV_NAME),
6239 };
6240 @@ -22449,9 +22509,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pata_winbond.c linux-2.6.32.28/drivers/at
6241 .inherits = &ata_sff_port_ops,
6242 .sff_data_xfer = winbond_data_xfer,
6243 .cable_detect = ata_cable_40wire,
6244 -diff -urNp linux-2.6.32.28/drivers/ata/pdc_adma.c linux-2.6.32.28/drivers/ata/pdc_adma.c
6245 ---- linux-2.6.32.28/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
6246 -+++ linux-2.6.32.28/drivers/ata/pdc_adma.c 2010-12-31 14:46:53.000000000 -0500
6247 +diff -urNp linux-2.6.32.29/drivers/ata/pdc_adma.c linux-2.6.32.29/drivers/ata/pdc_adma.c
6248 +--- linux-2.6.32.29/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
6249 ++++ linux-2.6.32.29/drivers/ata/pdc_adma.c 2010-12-31 14:46:53.000000000 -0500
6250 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
6251 .dma_boundary = ADMA_DMA_BOUNDARY,
6252 };
6253 @@ -22461,9 +22521,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/pdc_adma.c linux-2.6.32.28/drivers/ata/pd
6254 .inherits = &ata_sff_port_ops,
6255
6256 .lost_interrupt = ATA_OP_NULL,
6257 -diff -urNp linux-2.6.32.28/drivers/ata/sata_fsl.c linux-2.6.32.28/drivers/ata/sata_fsl.c
6258 ---- linux-2.6.32.28/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
6259 -+++ linux-2.6.32.28/drivers/ata/sata_fsl.c 2010-12-31 14:46:53.000000000 -0500
6260 +diff -urNp linux-2.6.32.29/drivers/ata/sata_fsl.c linux-2.6.32.29/drivers/ata/sata_fsl.c
6261 +--- linux-2.6.32.29/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
6262 ++++ linux-2.6.32.29/drivers/ata/sata_fsl.c 2010-12-31 14:46:53.000000000 -0500
6263 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
6264 .dma_boundary = ATA_DMA_BOUNDARY,
6265 };
6266 @@ -22473,9 +22533,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_fsl.c linux-2.6.32.28/drivers/ata/sa
6267 .inherits = &sata_pmp_port_ops,
6268
6269 .qc_defer = ata_std_qc_defer,
6270 -diff -urNp linux-2.6.32.28/drivers/ata/sata_inic162x.c linux-2.6.32.28/drivers/ata/sata_inic162x.c
6271 ---- linux-2.6.32.28/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
6272 -+++ linux-2.6.32.28/drivers/ata/sata_inic162x.c 2010-12-31 14:46:53.000000000 -0500
6273 +diff -urNp linux-2.6.32.29/drivers/ata/sata_inic162x.c linux-2.6.32.29/drivers/ata/sata_inic162x.c
6274 +--- linux-2.6.32.29/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
6275 ++++ linux-2.6.32.29/drivers/ata/sata_inic162x.c 2010-12-31 14:46:53.000000000 -0500
6276 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
6277 return 0;
6278 }
6279 @@ -22485,9 +22545,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_inic162x.c linux-2.6.32.28/drivers/a
6280 .inherits = &sata_port_ops,
6281
6282 .check_atapi_dma = inic_check_atapi_dma,
6283 -diff -urNp linux-2.6.32.28/drivers/ata/sata_mv.c linux-2.6.32.28/drivers/ata/sata_mv.c
6284 ---- linux-2.6.32.28/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
6285 -+++ linux-2.6.32.28/drivers/ata/sata_mv.c 2010-12-31 14:46:53.000000000 -0500
6286 +diff -urNp linux-2.6.32.29/drivers/ata/sata_mv.c linux-2.6.32.29/drivers/ata/sata_mv.c
6287 +--- linux-2.6.32.29/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
6288 ++++ linux-2.6.32.29/drivers/ata/sata_mv.c 2010-12-31 14:46:53.000000000 -0500
6289 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
6290 .dma_boundary = MV_DMA_BOUNDARY,
6291 };
6292 @@ -22515,9 +22575,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_mv.c linux-2.6.32.28/drivers/ata/sat
6293 .inherits = &mv6_ops,
6294 .dev_config = ATA_OP_NULL,
6295 .qc_prep = mv_qc_prep_iie,
6296 -diff -urNp linux-2.6.32.28/drivers/ata/sata_nv.c linux-2.6.32.28/drivers/ata/sata_nv.c
6297 ---- linux-2.6.32.28/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
6298 -+++ linux-2.6.32.28/drivers/ata/sata_nv.c 2010-12-31 14:46:53.000000000 -0500
6299 +diff -urNp linux-2.6.32.29/drivers/ata/sata_nv.c linux-2.6.32.29/drivers/ata/sata_nv.c
6300 +--- linux-2.6.32.29/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
6301 ++++ linux-2.6.32.29/drivers/ata/sata_nv.c 2010-12-31 14:46:53.000000000 -0500
6302 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
6303 * cases. Define nv_hardreset() which only kicks in for post-boot
6304 * probing and use it for all variants.
6305 @@ -22560,9 +22620,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_nv.c linux-2.6.32.28/drivers/ata/sat
6306 .inherits = &nv_generic_ops,
6307
6308 .qc_defer = ata_std_qc_defer,
6309 -diff -urNp linux-2.6.32.28/drivers/ata/sata_promise.c linux-2.6.32.28/drivers/ata/sata_promise.c
6310 ---- linux-2.6.32.28/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
6311 -+++ linux-2.6.32.28/drivers/ata/sata_promise.c 2010-12-31 14:46:53.000000000 -0500
6312 +diff -urNp linux-2.6.32.29/drivers/ata/sata_promise.c linux-2.6.32.29/drivers/ata/sata_promise.c
6313 +--- linux-2.6.32.29/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
6314 ++++ linux-2.6.32.29/drivers/ata/sata_promise.c 2010-12-31 14:46:53.000000000 -0500
6315 @@ -195,7 +195,7 @@ static const struct ata_port_operations
6316 .error_handler = pdc_error_handler,
6317 };
6318 @@ -22589,9 +22649,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_promise.c linux-2.6.32.28/drivers/at
6319 .inherits = &pdc_common_ops,
6320 .cable_detect = pdc_pata_cable_detect,
6321 .freeze = pdc_freeze,
6322 -diff -urNp linux-2.6.32.28/drivers/ata/sata_qstor.c linux-2.6.32.28/drivers/ata/sata_qstor.c
6323 ---- linux-2.6.32.28/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
6324 -+++ linux-2.6.32.28/drivers/ata/sata_qstor.c 2010-12-31 14:46:53.000000000 -0500
6325 +diff -urNp linux-2.6.32.29/drivers/ata/sata_qstor.c linux-2.6.32.29/drivers/ata/sata_qstor.c
6326 +--- linux-2.6.32.29/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
6327 ++++ linux-2.6.32.29/drivers/ata/sata_qstor.c 2010-12-31 14:46:53.000000000 -0500
6328 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
6329 .dma_boundary = QS_DMA_BOUNDARY,
6330 };
6331 @@ -22601,9 +22661,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_qstor.c linux-2.6.32.28/drivers/ata/
6332 .inherits = &ata_sff_port_ops,
6333
6334 .check_atapi_dma = qs_check_atapi_dma,
6335 -diff -urNp linux-2.6.32.28/drivers/ata/sata_sil24.c linux-2.6.32.28/drivers/ata/sata_sil24.c
6336 ---- linux-2.6.32.28/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
6337 -+++ linux-2.6.32.28/drivers/ata/sata_sil24.c 2010-12-31 14:46:53.000000000 -0500
6338 +diff -urNp linux-2.6.32.29/drivers/ata/sata_sil24.c linux-2.6.32.29/drivers/ata/sata_sil24.c
6339 +--- linux-2.6.32.29/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
6340 ++++ linux-2.6.32.29/drivers/ata/sata_sil24.c 2010-12-31 14:46:53.000000000 -0500
6341 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
6342 .dma_boundary = ATA_DMA_BOUNDARY,
6343 };
6344 @@ -22613,9 +22673,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_sil24.c linux-2.6.32.28/drivers/ata/
6345 .inherits = &sata_pmp_port_ops,
6346
6347 .qc_defer = sil24_qc_defer,
6348 -diff -urNp linux-2.6.32.28/drivers/ata/sata_sil.c linux-2.6.32.28/drivers/ata/sata_sil.c
6349 ---- linux-2.6.32.28/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
6350 -+++ linux-2.6.32.28/drivers/ata/sata_sil.c 2010-12-31 14:46:53.000000000 -0500
6351 +diff -urNp linux-2.6.32.29/drivers/ata/sata_sil.c linux-2.6.32.29/drivers/ata/sata_sil.c
6352 +--- linux-2.6.32.29/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
6353 ++++ linux-2.6.32.29/drivers/ata/sata_sil.c 2010-12-31 14:46:53.000000000 -0500
6354 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
6355 .sg_tablesize = ATA_MAX_PRD
6356 };
6357 @@ -22625,9 +22685,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_sil.c linux-2.6.32.28/drivers/ata/sa
6358 .inherits = &ata_bmdma32_port_ops,
6359 .dev_config = sil_dev_config,
6360 .set_mode = sil_set_mode,
6361 -diff -urNp linux-2.6.32.28/drivers/ata/sata_sis.c linux-2.6.32.28/drivers/ata/sata_sis.c
6362 ---- linux-2.6.32.28/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
6363 -+++ linux-2.6.32.28/drivers/ata/sata_sis.c 2010-12-31 14:46:53.000000000 -0500
6364 +diff -urNp linux-2.6.32.29/drivers/ata/sata_sis.c linux-2.6.32.29/drivers/ata/sata_sis.c
6365 +--- linux-2.6.32.29/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
6366 ++++ linux-2.6.32.29/drivers/ata/sata_sis.c 2010-12-31 14:46:53.000000000 -0500
6367 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
6368 ATA_BMDMA_SHT(DRV_NAME),
6369 };
6370 @@ -22637,9 +22697,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_sis.c linux-2.6.32.28/drivers/ata/sa
6371 .inherits = &ata_bmdma_port_ops,
6372 .scr_read = sis_scr_read,
6373 .scr_write = sis_scr_write,
6374 -diff -urNp linux-2.6.32.28/drivers/ata/sata_svw.c linux-2.6.32.28/drivers/ata/sata_svw.c
6375 ---- linux-2.6.32.28/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
6376 -+++ linux-2.6.32.28/drivers/ata/sata_svw.c 2010-12-31 14:46:53.000000000 -0500
6377 +diff -urNp linux-2.6.32.29/drivers/ata/sata_svw.c linux-2.6.32.29/drivers/ata/sata_svw.c
6378 +--- linux-2.6.32.29/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
6379 ++++ linux-2.6.32.29/drivers/ata/sata_svw.c 2010-12-31 14:46:53.000000000 -0500
6380 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
6381 };
6382
6383 @@ -22649,9 +22709,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_svw.c linux-2.6.32.28/drivers/ata/sa
6384 .inherits = &ata_bmdma_port_ops,
6385 .sff_tf_load = k2_sata_tf_load,
6386 .sff_tf_read = k2_sata_tf_read,
6387 -diff -urNp linux-2.6.32.28/drivers/ata/sata_sx4.c linux-2.6.32.28/drivers/ata/sata_sx4.c
6388 ---- linux-2.6.32.28/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
6389 -+++ linux-2.6.32.28/drivers/ata/sata_sx4.c 2010-12-31 14:46:53.000000000 -0500
6390 +diff -urNp linux-2.6.32.29/drivers/ata/sata_sx4.c linux-2.6.32.29/drivers/ata/sata_sx4.c
6391 +--- linux-2.6.32.29/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
6392 ++++ linux-2.6.32.29/drivers/ata/sata_sx4.c 2010-12-31 14:46:53.000000000 -0500
6393 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
6394 };
6395
6396 @@ -22661,9 +22721,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_sx4.c linux-2.6.32.28/drivers/ata/sa
6397 .inherits = &ata_sff_port_ops,
6398
6399 .check_atapi_dma = pdc_check_atapi_dma,
6400 -diff -urNp linux-2.6.32.28/drivers/ata/sata_uli.c linux-2.6.32.28/drivers/ata/sata_uli.c
6401 ---- linux-2.6.32.28/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
6402 -+++ linux-2.6.32.28/drivers/ata/sata_uli.c 2010-12-31 14:46:53.000000000 -0500
6403 +diff -urNp linux-2.6.32.29/drivers/ata/sata_uli.c linux-2.6.32.29/drivers/ata/sata_uli.c
6404 +--- linux-2.6.32.29/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
6405 ++++ linux-2.6.32.29/drivers/ata/sata_uli.c 2010-12-31 14:46:53.000000000 -0500
6406 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
6407 ATA_BMDMA_SHT(DRV_NAME),
6408 };
6409 @@ -22673,9 +22733,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_uli.c linux-2.6.32.28/drivers/ata/sa
6410 .inherits = &ata_bmdma_port_ops,
6411 .scr_read = uli_scr_read,
6412 .scr_write = uli_scr_write,
6413 -diff -urNp linux-2.6.32.28/drivers/ata/sata_via.c linux-2.6.32.28/drivers/ata/sata_via.c
6414 ---- linux-2.6.32.28/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
6415 -+++ linux-2.6.32.28/drivers/ata/sata_via.c 2010-12-31 14:46:53.000000000 -0500
6416 +diff -urNp linux-2.6.32.29/drivers/ata/sata_via.c linux-2.6.32.29/drivers/ata/sata_via.c
6417 +--- linux-2.6.32.29/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
6418 ++++ linux-2.6.32.29/drivers/ata/sata_via.c 2010-12-31 14:46:53.000000000 -0500
6419 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
6420 ATA_BMDMA_SHT(DRV_NAME),
6421 };
6422 @@ -22713,9 +22773,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_via.c linux-2.6.32.28/drivers/ata/sa
6423 .inherits = &svia_base_ops,
6424 .hardreset = sata_std_hardreset,
6425 .scr_read = vt8251_scr_read,
6426 -diff -urNp linux-2.6.32.28/drivers/ata/sata_vsc.c linux-2.6.32.28/drivers/ata/sata_vsc.c
6427 ---- linux-2.6.32.28/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
6428 -+++ linux-2.6.32.28/drivers/ata/sata_vsc.c 2010-12-31 14:46:53.000000000 -0500
6429 +diff -urNp linux-2.6.32.29/drivers/ata/sata_vsc.c linux-2.6.32.29/drivers/ata/sata_vsc.c
6430 +--- linux-2.6.32.29/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
6431 ++++ linux-2.6.32.29/drivers/ata/sata_vsc.c 2010-12-31 14:46:53.000000000 -0500
6432 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
6433 };
6434
6435 @@ -22725,9 +22785,9 @@ diff -urNp linux-2.6.32.28/drivers/ata/sata_vsc.c linux-2.6.32.28/drivers/ata/sa
6436 .inherits = &ata_bmdma_port_ops,
6437 /* The IRQ handling is not quite standard SFF behaviour so we
6438 cannot use the default lost interrupt handler */
6439 -diff -urNp linux-2.6.32.28/drivers/atm/adummy.c linux-2.6.32.28/drivers/atm/adummy.c
6440 ---- linux-2.6.32.28/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
6441 -+++ linux-2.6.32.28/drivers/atm/adummy.c 2010-12-31 14:46:53.000000000 -0500
6442 +diff -urNp linux-2.6.32.29/drivers/atm/adummy.c linux-2.6.32.29/drivers/atm/adummy.c
6443 +--- linux-2.6.32.29/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
6444 ++++ linux-2.6.32.29/drivers/atm/adummy.c 2010-12-31 14:46:53.000000000 -0500
6445 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
6446 vcc->pop(vcc, skb);
6447 else
6448 @@ -22737,9 +22797,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/adummy.c linux-2.6.32.28/drivers/atm/adum
6449
6450 return 0;
6451 }
6452 -diff -urNp linux-2.6.32.28/drivers/atm/ambassador.c linux-2.6.32.28/drivers/atm/ambassador.c
6453 ---- linux-2.6.32.28/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
6454 -+++ linux-2.6.32.28/drivers/atm/ambassador.c 2010-12-31 14:46:53.000000000 -0500
6455 +diff -urNp linux-2.6.32.29/drivers/atm/ambassador.c linux-2.6.32.29/drivers/atm/ambassador.c
6456 +--- linux-2.6.32.29/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
6457 ++++ linux-2.6.32.29/drivers/atm/ambassador.c 2010-12-31 14:46:53.000000000 -0500
6458 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
6459 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
6460
6461 @@ -22776,9 +22836,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/ambassador.c linux-2.6.32.28/drivers/atm/
6462 return -ENOMEM; // ?
6463 }
6464
6465 -diff -urNp linux-2.6.32.28/drivers/atm/atmtcp.c linux-2.6.32.28/drivers/atm/atmtcp.c
6466 ---- linux-2.6.32.28/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
6467 -+++ linux-2.6.32.28/drivers/atm/atmtcp.c 2010-12-31 14:46:53.000000000 -0500
6468 +diff -urNp linux-2.6.32.29/drivers/atm/atmtcp.c linux-2.6.32.29/drivers/atm/atmtcp.c
6469 +--- linux-2.6.32.29/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
6470 ++++ linux-2.6.32.29/drivers/atm/atmtcp.c 2010-12-31 14:46:53.000000000 -0500
6471 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
6472 if (vcc->pop) vcc->pop(vcc,skb);
6473 else dev_kfree_skb(skb);
6474 @@ -22828,9 +22888,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/atmtcp.c linux-2.6.32.28/drivers/atm/atmt
6475 done:
6476 if (vcc->pop) vcc->pop(vcc,skb);
6477 else dev_kfree_skb(skb);
6478 -diff -urNp linux-2.6.32.28/drivers/atm/eni.c linux-2.6.32.28/drivers/atm/eni.c
6479 ---- linux-2.6.32.28/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
6480 -+++ linux-2.6.32.28/drivers/atm/eni.c 2010-12-31 14:46:53.000000000 -0500
6481 +diff -urNp linux-2.6.32.29/drivers/atm/eni.c linux-2.6.32.29/drivers/atm/eni.c
6482 +--- linux-2.6.32.29/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
6483 ++++ linux-2.6.32.29/drivers/atm/eni.c 2010-12-31 14:46:53.000000000 -0500
6484 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
6485 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
6486 vcc->dev->number);
6487 @@ -22876,9 +22936,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/eni.c linux-2.6.32.28/drivers/atm/eni.c
6488 wake_up(&eni_dev->tx_wait);
6489 dma_complete++;
6490 }
6491 -diff -urNp linux-2.6.32.28/drivers/atm/firestream.c linux-2.6.32.28/drivers/atm/firestream.c
6492 ---- linux-2.6.32.28/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
6493 -+++ linux-2.6.32.28/drivers/atm/firestream.c 2010-12-31 14:46:53.000000000 -0500
6494 +diff -urNp linux-2.6.32.29/drivers/atm/firestream.c linux-2.6.32.29/drivers/atm/firestream.c
6495 +--- linux-2.6.32.29/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
6496 ++++ linux-2.6.32.29/drivers/atm/firestream.c 2010-12-31 14:46:53.000000000 -0500
6497 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct
6498 }
6499 }
6500 @@ -22912,9 +22972,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/firestream.c linux-2.6.32.28/drivers/atm/
6501 break;
6502 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
6503 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
6504 -diff -urNp linux-2.6.32.28/drivers/atm/fore200e.c linux-2.6.32.28/drivers/atm/fore200e.c
6505 ---- linux-2.6.32.28/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
6506 -+++ linux-2.6.32.28/drivers/atm/fore200e.c 2010-12-31 14:46:53.000000000 -0500
6507 +diff -urNp linux-2.6.32.29/drivers/atm/fore200e.c linux-2.6.32.29/drivers/atm/fore200e.c
6508 +--- linux-2.6.32.29/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
6509 ++++ linux-2.6.32.29/drivers/atm/fore200e.c 2010-12-31 14:46:53.000000000 -0500
6510 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
6511 #endif
6512 /* check error condition */
6513 @@ -22971,9 +23031,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/fore200e.c linux-2.6.32.28/drivers/atm/fo
6514
6515 fore200e->tx_sat++;
6516 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
6517 -diff -urNp linux-2.6.32.28/drivers/atm/he.c linux-2.6.32.28/drivers/atm/he.c
6518 ---- linux-2.6.32.28/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
6519 -+++ linux-2.6.32.28/drivers/atm/he.c 2010-12-31 14:46:53.000000000 -0500
6520 +diff -urNp linux-2.6.32.29/drivers/atm/he.c linux-2.6.32.29/drivers/atm/he.c
6521 +--- linux-2.6.32.29/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
6522 ++++ linux-2.6.32.29/drivers/atm/he.c 2010-12-31 14:46:53.000000000 -0500
6523 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
6524
6525 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
6526 @@ -23055,9 +23115,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/he.c linux-2.6.32.28/drivers/atm/he.c
6527
6528 return 0;
6529 }
6530 -diff -urNp linux-2.6.32.28/drivers/atm/horizon.c linux-2.6.32.28/drivers/atm/horizon.c
6531 ---- linux-2.6.32.28/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
6532 -+++ linux-2.6.32.28/drivers/atm/horizon.c 2010-12-31 14:46:53.000000000 -0500
6533 +diff -urNp linux-2.6.32.29/drivers/atm/horizon.c linux-2.6.32.29/drivers/atm/horizon.c
6534 +--- linux-2.6.32.29/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
6535 ++++ linux-2.6.32.29/drivers/atm/horizon.c 2010-12-31 14:46:53.000000000 -0500
6536 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
6537 {
6538 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
6539 @@ -23076,9 +23136,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/horizon.c linux-2.6.32.28/drivers/atm/hor
6540
6541 // free the skb
6542 hrz_kfree_skb (skb);
6543 -diff -urNp linux-2.6.32.28/drivers/atm/idt77252.c linux-2.6.32.28/drivers/atm/idt77252.c
6544 ---- linux-2.6.32.28/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
6545 -+++ linux-2.6.32.28/drivers/atm/idt77252.c 2010-12-31 14:46:53.000000000 -0500
6546 +diff -urNp linux-2.6.32.29/drivers/atm/idt77252.c linux-2.6.32.29/drivers/atm/idt77252.c
6547 +--- linux-2.6.32.29/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
6548 ++++ linux-2.6.32.29/drivers/atm/idt77252.c 2010-12-31 14:46:53.000000000 -0500
6549 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
6550 else
6551 dev_kfree_skb(skb);
6552 @@ -23233,9 +23293,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/idt77252.c linux-2.6.32.28/drivers/atm/id
6553 return -ENOMEM;
6554 }
6555 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
6556 -diff -urNp linux-2.6.32.28/drivers/atm/iphase.c linux-2.6.32.28/drivers/atm/iphase.c
6557 ---- linux-2.6.32.28/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
6558 -+++ linux-2.6.32.28/drivers/atm/iphase.c 2010-12-31 14:46:53.000000000 -0500
6559 +diff -urNp linux-2.6.32.29/drivers/atm/iphase.c linux-2.6.32.29/drivers/atm/iphase.c
6560 +--- linux-2.6.32.29/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
6561 ++++ linux-2.6.32.29/drivers/atm/iphase.c 2010-12-31 14:46:53.000000000 -0500
6562 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
6563 status = (u_short) (buf_desc_ptr->desc_mode);
6564 if (status & (RX_CER | RX_PTE | RX_OFL))
6565 @@ -23332,9 +23392,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/iphase.c linux-2.6.32.28/drivers/atm/ipha
6566 if (iavcc->vc_desc_cnt > 10) {
6567 vcc->tx_quota = vcc->tx_quota * 3 / 4;
6568 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
6569 -diff -urNp linux-2.6.32.28/drivers/atm/lanai.c linux-2.6.32.28/drivers/atm/lanai.c
6570 ---- linux-2.6.32.28/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
6571 -+++ linux-2.6.32.28/drivers/atm/lanai.c 2010-12-31 14:46:53.000000000 -0500
6572 +diff -urNp linux-2.6.32.29/drivers/atm/lanai.c linux-2.6.32.29/drivers/atm/lanai.c
6573 +--- linux-2.6.32.29/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
6574 ++++ linux-2.6.32.29/drivers/atm/lanai.c 2010-12-31 14:46:53.000000000 -0500
6575 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
6576 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
6577 lanai_endtx(lanai, lvcc);
6578 @@ -23389,9 +23449,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/lanai.c linux-2.6.32.28/drivers/atm/lanai
6579 lvcc->stats.x.aal5.service_rxcrc++;
6580 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
6581 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
6582 -diff -urNp linux-2.6.32.28/drivers/atm/nicstar.c linux-2.6.32.28/drivers/atm/nicstar.c
6583 ---- linux-2.6.32.28/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
6584 -+++ linux-2.6.32.28/drivers/atm/nicstar.c 2010-12-31 14:46:53.000000000 -0500
6585 +diff -urNp linux-2.6.32.29/drivers/atm/nicstar.c linux-2.6.32.29/drivers/atm/nicstar.c
6586 +--- linux-2.6.32.29/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
6587 ++++ linux-2.6.32.29/drivers/atm/nicstar.c 2010-12-31 14:46:53.000000000 -0500
6588 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
6589 if ((vc = (vc_map *) vcc->dev_data) == NULL)
6590 {
6591 @@ -23594,9 +23654,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/nicstar.c linux-2.6.32.28/drivers/atm/nic
6592 }
6593 }
6594
6595 -diff -urNp linux-2.6.32.28/drivers/atm/solos-pci.c linux-2.6.32.28/drivers/atm/solos-pci.c
6596 ---- linux-2.6.32.28/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
6597 -+++ linux-2.6.32.28/drivers/atm/solos-pci.c 2010-12-31 14:46:53.000000000 -0500
6598 +diff -urNp linux-2.6.32.29/drivers/atm/solos-pci.c linux-2.6.32.29/drivers/atm/solos-pci.c
6599 +--- linux-2.6.32.29/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
6600 ++++ linux-2.6.32.29/drivers/atm/solos-pci.c 2010-12-31 14:46:53.000000000 -0500
6601 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
6602 }
6603 atm_charge(vcc, skb->truesize);
6604 @@ -23615,9 +23675,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/solos-pci.c linux-2.6.32.28/drivers/atm/s
6605 solos_pop(vcc, oldskb);
6606 } else
6607 dev_kfree_skb_irq(oldskb);
6608 -diff -urNp linux-2.6.32.28/drivers/atm/suni.c linux-2.6.32.28/drivers/atm/suni.c
6609 ---- linux-2.6.32.28/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
6610 -+++ linux-2.6.32.28/drivers/atm/suni.c 2010-12-31 14:46:53.000000000 -0500
6611 +diff -urNp linux-2.6.32.29/drivers/atm/suni.c linux-2.6.32.29/drivers/atm/suni.c
6612 +--- linux-2.6.32.29/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
6613 ++++ linux-2.6.32.29/drivers/atm/suni.c 2010-12-31 14:46:53.000000000 -0500
6614 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
6615
6616
6617 @@ -23629,9 +23689,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/suni.c linux-2.6.32.28/drivers/atm/suni.c
6618
6619
6620 static void suni_hz(unsigned long from_timer)
6621 -diff -urNp linux-2.6.32.28/drivers/atm/uPD98402.c linux-2.6.32.28/drivers/atm/uPD98402.c
6622 ---- linux-2.6.32.28/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
6623 -+++ linux-2.6.32.28/drivers/atm/uPD98402.c 2010-12-31 14:46:53.000000000 -0500
6624 +diff -urNp linux-2.6.32.29/drivers/atm/uPD98402.c linux-2.6.32.29/drivers/atm/uPD98402.c
6625 +--- linux-2.6.32.29/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
6626 ++++ linux-2.6.32.29/drivers/atm/uPD98402.c 2010-12-31 14:46:53.000000000 -0500
6627 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
6628 struct sonet_stats tmp;
6629 int error = 0;
6630 @@ -23676,9 +23736,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/uPD98402.c linux-2.6.32.28/drivers/atm/uP
6631 return 0;
6632 }
6633
6634 -diff -urNp linux-2.6.32.28/drivers/atm/zatm.c linux-2.6.32.28/drivers/atm/zatm.c
6635 ---- linux-2.6.32.28/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
6636 -+++ linux-2.6.32.28/drivers/atm/zatm.c 2010-12-31 14:46:53.000000000 -0500
6637 +diff -urNp linux-2.6.32.29/drivers/atm/zatm.c linux-2.6.32.29/drivers/atm/zatm.c
6638 +--- linux-2.6.32.29/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
6639 ++++ linux-2.6.32.29/drivers/atm/zatm.c 2010-12-31 14:46:53.000000000 -0500
6640 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
6641 }
6642 if (!size) {
6643 @@ -23706,9 +23766,9 @@ diff -urNp linux-2.6.32.28/drivers/atm/zatm.c linux-2.6.32.28/drivers/atm/zatm.c
6644 wake_up(&zatm_vcc->tx_wait);
6645 }
6646
6647 -diff -urNp linux-2.6.32.28/drivers/base/bus.c linux-2.6.32.28/drivers/base/bus.c
6648 ---- linux-2.6.32.28/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
6649 -+++ linux-2.6.32.28/drivers/base/bus.c 2010-12-31 14:46:53.000000000 -0500
6650 +diff -urNp linux-2.6.32.29/drivers/base/bus.c linux-2.6.32.29/drivers/base/bus.c
6651 +--- linux-2.6.32.29/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
6652 ++++ linux-2.6.32.29/drivers/base/bus.c 2010-12-31 14:46:53.000000000 -0500
6653 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
6654 return ret;
6655 }
6656 @@ -23736,9 +23796,9 @@ diff -urNp linux-2.6.32.28/drivers/base/bus.c linux-2.6.32.28/drivers/base/bus.c
6657 .filter = bus_uevent_filter,
6658 };
6659
6660 -diff -urNp linux-2.6.32.28/drivers/base/class.c linux-2.6.32.28/drivers/base/class.c
6661 ---- linux-2.6.32.28/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
6662 -+++ linux-2.6.32.28/drivers/base/class.c 2010-12-31 14:46:53.000000000 -0500
6663 +diff -urNp linux-2.6.32.29/drivers/base/class.c linux-2.6.32.29/drivers/base/class.c
6664 +--- linux-2.6.32.29/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
6665 ++++ linux-2.6.32.29/drivers/base/class.c 2010-12-31 14:46:53.000000000 -0500
6666 @@ -63,7 +63,7 @@ static void class_release(struct kobject
6667 kfree(cp);
6668 }
6669 @@ -23748,9 +23808,9 @@ diff -urNp linux-2.6.32.28/drivers/base/class.c linux-2.6.32.28/drivers/base/cla
6670 .show = class_attr_show,
6671 .store = class_attr_store,
6672 };
6673 -diff -urNp linux-2.6.32.28/drivers/base/core.c linux-2.6.32.28/drivers/base/core.c
6674 ---- linux-2.6.32.28/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
6675 -+++ linux-2.6.32.28/drivers/base/core.c 2010-12-31 14:46:53.000000000 -0500
6676 +diff -urNp linux-2.6.32.29/drivers/base/core.c linux-2.6.32.29/drivers/base/core.c
6677 +--- linux-2.6.32.29/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
6678 ++++ linux-2.6.32.29/drivers/base/core.c 2010-12-31 14:46:53.000000000 -0500
6679 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
6680 return ret;
6681 }
6682 @@ -23769,9 +23829,9 @@ diff -urNp linux-2.6.32.28/drivers/base/core.c linux-2.6.32.28/drivers/base/core
6683 .filter = dev_uevent_filter,
6684 .name = dev_uevent_name,
6685 .uevent = dev_uevent,
6686 -diff -urNp linux-2.6.32.28/drivers/base/memory.c linux-2.6.32.28/drivers/base/memory.c
6687 ---- linux-2.6.32.28/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
6688 -+++ linux-2.6.32.28/drivers/base/memory.c 2010-12-31 14:46:53.000000000 -0500
6689 +diff -urNp linux-2.6.32.29/drivers/base/memory.c linux-2.6.32.29/drivers/base/memory.c
6690 +--- linux-2.6.32.29/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
6691 ++++ linux-2.6.32.29/drivers/base/memory.c 2010-12-31 14:46:53.000000000 -0500
6692 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
6693 return retval;
6694 }
6695 @@ -23781,9 +23841,9 @@ diff -urNp linux-2.6.32.28/drivers/base/memory.c linux-2.6.32.28/drivers/base/me
6696 .name = memory_uevent_name,
6697 .uevent = memory_uevent,
6698 };
6699 -diff -urNp linux-2.6.32.28/drivers/base/sys.c linux-2.6.32.28/drivers/base/sys.c
6700 ---- linux-2.6.32.28/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
6701 -+++ linux-2.6.32.28/drivers/base/sys.c 2010-12-31 14:46:53.000000000 -0500
6702 +diff -urNp linux-2.6.32.29/drivers/base/sys.c linux-2.6.32.29/drivers/base/sys.c
6703 +--- linux-2.6.32.29/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
6704 ++++ linux-2.6.32.29/drivers/base/sys.c 2010-12-31 14:46:53.000000000 -0500
6705 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
6706 return -EIO;
6707 }
6708 @@ -23802,9 +23862,9 @@ diff -urNp linux-2.6.32.28/drivers/base/sys.c linux-2.6.32.28/drivers/base/sys.c
6709 .show = sysdev_class_show,
6710 .store = sysdev_class_store,
6711 };
6712 -diff -urNp linux-2.6.32.28/drivers/block/cciss.c linux-2.6.32.28/drivers/block/cciss.c
6713 ---- linux-2.6.32.28/drivers/block/cciss.c 2010-08-13 16:24:37.000000000 -0400
6714 -+++ linux-2.6.32.28/drivers/block/cciss.c 2010-12-31 14:46:53.000000000 -0500
6715 +diff -urNp linux-2.6.32.29/drivers/block/cciss.c linux-2.6.32.29/drivers/block/cciss.c
6716 +--- linux-2.6.32.29/drivers/block/cciss.c 2010-08-13 16:24:37.000000000 -0400
6717 ++++ linux-2.6.32.29/drivers/block/cciss.c 2010-12-31 14:46:53.000000000 -0500
6718 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
6719 int err;
6720 u32 cp;
6721 @@ -23814,9 +23874,9 @@ diff -urNp linux-2.6.32.28/drivers/block/cciss.c linux-2.6.32.28/drivers/block/c
6722 err = 0;
6723 err |=
6724 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
6725 -diff -urNp linux-2.6.32.28/drivers/block/pktcdvd.c linux-2.6.32.28/drivers/block/pktcdvd.c
6726 ---- linux-2.6.32.28/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400
6727 -+++ linux-2.6.32.28/drivers/block/pktcdvd.c 2010-12-31 14:46:53.000000000 -0500
6728 +diff -urNp linux-2.6.32.29/drivers/block/pktcdvd.c linux-2.6.32.29/drivers/block/pktcdvd.c
6729 +--- linux-2.6.32.29/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400
6730 ++++ linux-2.6.32.29/drivers/block/pktcdvd.c 2010-12-31 14:46:53.000000000 -0500
6731 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
6732 return len;
6733 }
6734 @@ -23835,9 +23895,9 @@ diff -urNp linux-2.6.32.28/drivers/block/pktcdvd.c linux-2.6.32.28/drivers/block
6735 {
6736 if (dev_minor >= MAX_WRITERS)
6737 return NULL;
6738 -diff -urNp linux-2.6.32.28/drivers/char/agp/frontend.c linux-2.6.32.28/drivers/char/agp/frontend.c
6739 ---- linux-2.6.32.28/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
6740 -+++ linux-2.6.32.28/drivers/char/agp/frontend.c 2010-12-31 14:46:53.000000000 -0500
6741 +diff -urNp linux-2.6.32.29/drivers/char/agp/frontend.c linux-2.6.32.29/drivers/char/agp/frontend.c
6742 +--- linux-2.6.32.29/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
6743 ++++ linux-2.6.32.29/drivers/char/agp/frontend.c 2010-12-31 14:46:53.000000000 -0500
6744 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
6745 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
6746 return -EFAULT;
6747 @@ -23847,9 +23907,9 @@ diff -urNp linux-2.6.32.28/drivers/char/agp/frontend.c linux-2.6.32.28/drivers/c
6748 return -EFAULT;
6749
6750 client = agp_find_client_by_pid(reserve.pid);
6751 -diff -urNp linux-2.6.32.28/drivers/char/agp/intel-agp.c linux-2.6.32.28/drivers/char/agp/intel-agp.c
6752 ---- linux-2.6.32.28/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
6753 -+++ linux-2.6.32.28/drivers/char/agp/intel-agp.c 2010-12-31 14:46:53.000000000 -0500
6754 +diff -urNp linux-2.6.32.29/drivers/char/agp/intel-agp.c linux-2.6.32.29/drivers/char/agp/intel-agp.c
6755 +--- linux-2.6.32.29/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
6756 ++++ linux-2.6.32.29/drivers/char/agp/intel-agp.c 2010-12-31 14:46:53.000000000 -0500
6757 @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
6758 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
6759 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
6760 @@ -23859,9 +23919,9 @@ diff -urNp linux-2.6.32.28/drivers/char/agp/intel-agp.c linux-2.6.32.28/drivers/
6761 };
6762
6763 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
6764 -diff -urNp linux-2.6.32.28/drivers/char/hpet.c linux-2.6.32.28/drivers/char/hpet.c
6765 ---- linux-2.6.32.28/drivers/char/hpet.c 2010-12-09 18:13:03.000000000 -0500
6766 -+++ linux-2.6.32.28/drivers/char/hpet.c 2010-12-31 14:46:53.000000000 -0500
6767 +diff -urNp linux-2.6.32.29/drivers/char/hpet.c linux-2.6.32.29/drivers/char/hpet.c
6768 +--- linux-2.6.32.29/drivers/char/hpet.c 2010-12-09 18:13:03.000000000 -0500
6769 ++++ linux-2.6.32.29/drivers/char/hpet.c 2010-12-31 14:46:53.000000000 -0500
6770 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
6771 return 0;
6772 }
6773 @@ -23903,9 +23963,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hpet.c linux-2.6.32.28/drivers/char/hpet
6774
6775 static int __init hpet_init(void)
6776 {
6777 -diff -urNp linux-2.6.32.28/drivers/char/hvc_beat.c linux-2.6.32.28/drivers/char/hvc_beat.c
6778 ---- linux-2.6.32.28/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
6779 -+++ linux-2.6.32.28/drivers/char/hvc_beat.c 2010-12-31 14:46:53.000000000 -0500
6780 +diff -urNp linux-2.6.32.29/drivers/char/hvc_beat.c linux-2.6.32.29/drivers/char/hvc_beat.c
6781 +--- linux-2.6.32.29/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
6782 ++++ linux-2.6.32.29/drivers/char/hvc_beat.c 2010-12-31 14:46:53.000000000 -0500
6783 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
6784 return cnt;
6785 }
6786 @@ -23915,9 +23975,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_beat.c linux-2.6.32.28/drivers/char/
6787 .get_chars = hvc_beat_get_chars,
6788 .put_chars = hvc_beat_put_chars,
6789 };
6790 -diff -urNp linux-2.6.32.28/drivers/char/hvc_console.c linux-2.6.32.28/drivers/char/hvc_console.c
6791 ---- linux-2.6.32.28/drivers/char/hvc_console.c 2011-01-11 23:55:35.000000000 -0500
6792 -+++ linux-2.6.32.28/drivers/char/hvc_console.c 2011-01-11 23:56:03.000000000 -0500
6793 +diff -urNp linux-2.6.32.29/drivers/char/hvc_console.c linux-2.6.32.29/drivers/char/hvc_console.c
6794 +--- linux-2.6.32.29/drivers/char/hvc_console.c 2011-01-11 23:55:35.000000000 -0500
6795 ++++ linux-2.6.32.29/drivers/char/hvc_console.c 2011-01-11 23:56:03.000000000 -0500
6796 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
6797 * console interfaces but can still be used as a tty device. This has to be
6798 * static because kmalloc will not work during early console init.
6799 @@ -23945,9 +24005,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_console.c linux-2.6.32.28/drivers/ch
6800 {
6801 struct hvc_struct *hp;
6802 int i;
6803 -diff -urNp linux-2.6.32.28/drivers/char/hvc_console.h linux-2.6.32.28/drivers/char/hvc_console.h
6804 ---- linux-2.6.32.28/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
6805 -+++ linux-2.6.32.28/drivers/char/hvc_console.h 2010-12-31 14:46:53.000000000 -0500
6806 +diff -urNp linux-2.6.32.29/drivers/char/hvc_console.h linux-2.6.32.29/drivers/char/hvc_console.h
6807 +--- linux-2.6.32.29/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
6808 ++++ linux-2.6.32.29/drivers/char/hvc_console.h 2010-12-31 14:46:53.000000000 -0500
6809 @@ -55,7 +55,7 @@ struct hvc_struct {
6810 int outbuf_size;
6811 int n_outbuf;
6812 @@ -23971,9 +24031,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_console.h linux-2.6.32.28/drivers/ch
6813 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
6814 extern int hvc_remove(struct hvc_struct *hp);
6815
6816 -diff -urNp linux-2.6.32.28/drivers/char/hvc_iseries.c linux-2.6.32.28/drivers/char/hvc_iseries.c
6817 ---- linux-2.6.32.28/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
6818 -+++ linux-2.6.32.28/drivers/char/hvc_iseries.c 2010-12-31 14:46:53.000000000 -0500
6819 +diff -urNp linux-2.6.32.29/drivers/char/hvc_iseries.c linux-2.6.32.29/drivers/char/hvc_iseries.c
6820 +--- linux-2.6.32.29/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
6821 ++++ linux-2.6.32.29/drivers/char/hvc_iseries.c 2010-12-31 14:46:53.000000000 -0500
6822 @@ -197,7 +197,7 @@ done:
6823 return sent;
6824 }
6825 @@ -23983,10 +24043,10 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_iseries.c linux-2.6.32.28/drivers/ch
6826 .get_chars = get_chars,
6827 .put_chars = put_chars,
6828 .notifier_add = notifier_add_irq,
6829 -diff -urNp linux-2.6.32.28/drivers/char/hvc_iucv.c linux-2.6.32.28/drivers/char/hvc_iucv.c
6830 ---- linux-2.6.32.28/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400
6831 -+++ linux-2.6.32.28/drivers/char/hvc_iucv.c 2010-12-31 14:46:53.000000000 -0500
6832 -@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
6833 +diff -urNp linux-2.6.32.29/drivers/char/hvc_iucv.c linux-2.6.32.29/drivers/char/hvc_iucv.c
6834 +--- linux-2.6.32.29/drivers/char/hvc_iucv.c 2011-02-22 15:56:54.000000000 -0500
6835 ++++ linux-2.6.32.29/drivers/char/hvc_iucv.c 2011-02-22 15:57:23.000000000 -0500
6836 +@@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru
6837
6838
6839 /* HVC operations */
6840 @@ -23995,9 +24055,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_iucv.c linux-2.6.32.28/drivers/char/
6841 .get_chars = hvc_iucv_get_chars,
6842 .put_chars = hvc_iucv_put_chars,
6843 .notifier_add = hvc_iucv_notifier_add,
6844 -diff -urNp linux-2.6.32.28/drivers/char/hvc_rtas.c linux-2.6.32.28/drivers/char/hvc_rtas.c
6845 ---- linux-2.6.32.28/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
6846 -+++ linux-2.6.32.28/drivers/char/hvc_rtas.c 2010-12-31 14:46:53.000000000 -0500
6847 +diff -urNp linux-2.6.32.29/drivers/char/hvc_rtas.c linux-2.6.32.29/drivers/char/hvc_rtas.c
6848 +--- linux-2.6.32.29/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
6849 ++++ linux-2.6.32.29/drivers/char/hvc_rtas.c 2010-12-31 14:46:53.000000000 -0500
6850 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
6851 return i;
6852 }
6853 @@ -24007,9 +24067,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_rtas.c linux-2.6.32.28/drivers/char/
6854 .get_chars = hvc_rtas_read_console,
6855 .put_chars = hvc_rtas_write_console,
6856 };
6857 -diff -urNp linux-2.6.32.28/drivers/char/hvcs.c linux-2.6.32.28/drivers/char/hvcs.c
6858 ---- linux-2.6.32.28/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
6859 -+++ linux-2.6.32.28/drivers/char/hvcs.c 2011-01-25 20:24:47.000000000 -0500
6860 +diff -urNp linux-2.6.32.29/drivers/char/hvcs.c linux-2.6.32.29/drivers/char/hvcs.c
6861 +--- linux-2.6.32.29/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
6862 ++++ linux-2.6.32.29/drivers/char/hvcs.c 2011-01-25 20:24:47.000000000 -0500
6863 @@ -82,6 +82,7 @@
6864 #include <asm/hvcserver.h>
6865 #include <asm/uaccess.h>
6866 @@ -24112,9 +24172,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvcs.c linux-2.6.32.28/drivers/char/hvcs
6867 return 0;
6868
6869 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
6870 -diff -urNp linux-2.6.32.28/drivers/char/hvc_udbg.c linux-2.6.32.28/drivers/char/hvc_udbg.c
6871 ---- linux-2.6.32.28/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
6872 -+++ linux-2.6.32.28/drivers/char/hvc_udbg.c 2010-12-31 14:46:53.000000000 -0500
6873 +diff -urNp linux-2.6.32.29/drivers/char/hvc_udbg.c linux-2.6.32.29/drivers/char/hvc_udbg.c
6874 +--- linux-2.6.32.29/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
6875 ++++ linux-2.6.32.29/drivers/char/hvc_udbg.c 2010-12-31 14:46:53.000000000 -0500
6876 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
6877 return i;
6878 }
6879 @@ -24124,9 +24184,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_udbg.c linux-2.6.32.28/drivers/char/
6880 .get_chars = hvc_udbg_get,
6881 .put_chars = hvc_udbg_put,
6882 };
6883 -diff -urNp linux-2.6.32.28/drivers/char/hvc_vio.c linux-2.6.32.28/drivers/char/hvc_vio.c
6884 ---- linux-2.6.32.28/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
6885 -+++ linux-2.6.32.28/drivers/char/hvc_vio.c 2010-12-31 14:46:53.000000000 -0500
6886 +diff -urNp linux-2.6.32.29/drivers/char/hvc_vio.c linux-2.6.32.29/drivers/char/hvc_vio.c
6887 +--- linux-2.6.32.29/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
6888 ++++ linux-2.6.32.29/drivers/char/hvc_vio.c 2010-12-31 14:46:53.000000000 -0500
6889 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
6890 return got;
6891 }
6892 @@ -24136,9 +24196,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_vio.c linux-2.6.32.28/drivers/char/h
6893 .get_chars = filtered_get_chars,
6894 .put_chars = hvc_put_chars,
6895 .notifier_add = notifier_add_irq,
6896 -diff -urNp linux-2.6.32.28/drivers/char/hvc_xen.c linux-2.6.32.28/drivers/char/hvc_xen.c
6897 ---- linux-2.6.32.28/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
6898 -+++ linux-2.6.32.28/drivers/char/hvc_xen.c 2010-12-31 14:46:53.000000000 -0500
6899 +diff -urNp linux-2.6.32.29/drivers/char/hvc_xen.c linux-2.6.32.29/drivers/char/hvc_xen.c
6900 +--- linux-2.6.32.29/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
6901 ++++ linux-2.6.32.29/drivers/char/hvc_xen.c 2010-12-31 14:46:53.000000000 -0500
6902 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
6903 return recv;
6904 }
6905 @@ -24148,9 +24208,9 @@ diff -urNp linux-2.6.32.28/drivers/char/hvc_xen.c linux-2.6.32.28/drivers/char/h
6906 .get_chars = read_console,
6907 .put_chars = write_console,
6908 .notifier_add = notifier_add_irq,
6909 -diff -urNp linux-2.6.32.28/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.28/drivers/char/ipmi/ipmi_msghandler.c
6910 ---- linux-2.6.32.28/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
6911 -+++ linux-2.6.32.28/drivers/char/ipmi/ipmi_msghandler.c 2010-12-31 14:46:53.000000000 -0500
6912 +diff -urNp linux-2.6.32.29/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.29/drivers/char/ipmi/ipmi_msghandler.c
6913 +--- linux-2.6.32.29/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
6914 ++++ linux-2.6.32.29/drivers/char/ipmi/ipmi_msghandler.c 2010-12-31 14:46:53.000000000 -0500
6915 @@ -414,7 +414,7 @@ struct ipmi_smi {
6916 struct proc_dir_entry *proc_dir;
6917 char proc_dir_name[10];
6918 @@ -24181,9 +24241,9 @@ diff -urNp linux-2.6.32.28/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.28/d
6919
6920 intf->proc_dir = NULL;
6921
6922 -diff -urNp linux-2.6.32.28/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.28/drivers/char/ipmi/ipmi_si_intf.c
6923 ---- linux-2.6.32.28/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
6924 -+++ linux-2.6.32.28/drivers/char/ipmi/ipmi_si_intf.c 2010-12-31 14:46:53.000000000 -0500
6925 +diff -urNp linux-2.6.32.29/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.29/drivers/char/ipmi/ipmi_si_intf.c
6926 +--- linux-2.6.32.29/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
6927 ++++ linux-2.6.32.29/drivers/char/ipmi/ipmi_si_intf.c 2010-12-31 14:46:53.000000000 -0500
6928 @@ -277,7 +277,7 @@ struct smi_info {
6929 unsigned char slave_addr;
6930
6931 @@ -24214,9 +24274,9 @@ diff -urNp linux-2.6.32.28/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.28/driv
6932
6933 new_smi->interrupt_disabled = 0;
6934 atomic_set(&new_smi->stop_operation, 0);
6935 -diff -urNp linux-2.6.32.28/drivers/char/keyboard.c linux-2.6.32.28/drivers/char/keyboard.c
6936 ---- linux-2.6.32.28/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
6937 -+++ linux-2.6.32.28/drivers/char/keyboard.c 2010-12-31 14:46:53.000000000 -0500
6938 +diff -urNp linux-2.6.32.29/drivers/char/keyboard.c linux-2.6.32.29/drivers/char/keyboard.c
6939 +--- linux-2.6.32.29/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
6940 ++++ linux-2.6.32.29/drivers/char/keyboard.c 2010-12-31 14:46:53.000000000 -0500
6941 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
6942 kbd->kbdmode == VC_MEDIUMRAW) &&
6943 value != KVAL(K_SAK))
6944 @@ -24243,9 +24303,9 @@ diff -urNp linux-2.6.32.28/drivers/char/keyboard.c linux-2.6.32.28/drivers/char/
6945 };
6946
6947 MODULE_DEVICE_TABLE(input, kbd_ids);
6948 -diff -urNp linux-2.6.32.28/drivers/char/mem.c linux-2.6.32.28/drivers/char/mem.c
6949 ---- linux-2.6.32.28/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
6950 -+++ linux-2.6.32.28/drivers/char/mem.c 2010-12-31 14:46:53.000000000 -0500
6951 +diff -urNp linux-2.6.32.29/drivers/char/mem.c linux-2.6.32.29/drivers/char/mem.c
6952 +--- linux-2.6.32.29/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
6953 ++++ linux-2.6.32.29/drivers/char/mem.c 2010-12-31 14:46:53.000000000 -0500
6954 @@ -18,6 +18,7 @@
6955 #include <linux/raw.h>
6956 #include <linux/tty.h>
6957 @@ -24422,9 +24482,9 @@ diff -urNp linux-2.6.32.28/drivers/char/mem.c linux-2.6.32.28/drivers/char/mem.c
6958 };
6959
6960 static int memory_open(struct inode *inode, struct file *filp)
6961 -diff -urNp linux-2.6.32.28/drivers/char/nvram.c linux-2.6.32.28/drivers/char/nvram.c
6962 ---- linux-2.6.32.28/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
6963 -+++ linux-2.6.32.28/drivers/char/nvram.c 2010-12-31 14:46:53.000000000 -0500
6964 +diff -urNp linux-2.6.32.29/drivers/char/nvram.c linux-2.6.32.29/drivers/char/nvram.c
6965 +--- linux-2.6.32.29/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
6966 ++++ linux-2.6.32.29/drivers/char/nvram.c 2010-12-31 14:46:53.000000000 -0500
6967 @@ -435,7 +435,10 @@ static const struct file_operations nvra
6968 static struct miscdevice nvram_dev = {
6969 NVRAM_MINOR,
6970 @@ -24437,9 +24497,9 @@ diff -urNp linux-2.6.32.28/drivers/char/nvram.c linux-2.6.32.28/drivers/char/nvr
6971 };
6972
6973 static int __init nvram_init(void)
6974 -diff -urNp linux-2.6.32.28/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.28/drivers/char/pcmcia/ipwireless/tty.c
6975 ---- linux-2.6.32.28/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
6976 -+++ linux-2.6.32.28/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:47.000000000 -0500
6977 +diff -urNp linux-2.6.32.29/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.29/drivers/char/pcmcia/ipwireless/tty.c
6978 +--- linux-2.6.32.29/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
6979 ++++ linux-2.6.32.29/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:47.000000000 -0500
6980 @@ -29,6 +29,7 @@
6981 #include <linux/tty_driver.h>
6982 #include <linux/tty_flip.h>
6983 @@ -24562,9 +24622,9 @@ diff -urNp linux-2.6.32.28/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.28/
6984 do_ipw_close(ttyj);
6985 ipwireless_disassociate_network_ttys(network,
6986 ttyj->channel_idx);
6987 -diff -urNp linux-2.6.32.28/drivers/char/pty.c linux-2.6.32.28/drivers/char/pty.c
6988 ---- linux-2.6.32.28/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
6989 -+++ linux-2.6.32.28/drivers/char/pty.c 2010-12-31 14:46:53.000000000 -0500
6990 +diff -urNp linux-2.6.32.29/drivers/char/pty.c linux-2.6.32.29/drivers/char/pty.c
6991 +--- linux-2.6.32.29/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
6992 ++++ linux-2.6.32.29/drivers/char/pty.c 2010-12-31 14:46:53.000000000 -0500
6993 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
6994 return ret;
6995 }
6996 @@ -24595,9 +24655,9 @@ diff -urNp linux-2.6.32.28/drivers/char/pty.c linux-2.6.32.28/drivers/char/pty.c
6997 cdev_init(&ptmx_cdev, &ptmx_fops);
6998 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
6999 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
7000 -diff -urNp linux-2.6.32.28/drivers/char/random.c linux-2.6.32.28/drivers/char/random.c
7001 ---- linux-2.6.32.28/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
7002 -+++ linux-2.6.32.28/drivers/char/random.c 2010-12-31 14:46:53.000000000 -0500
7003 +diff -urNp linux-2.6.32.29/drivers/char/random.c linux-2.6.32.29/drivers/char/random.c
7004 +--- linux-2.6.32.29/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
7005 ++++ linux-2.6.32.29/drivers/char/random.c 2010-12-31 14:46:53.000000000 -0500
7006 @@ -254,8 +254,13 @@
7007 /*
7008 * Configuration information
7009 @@ -24639,9 +24699,9 @@ diff -urNp linux-2.6.32.28/drivers/char/random.c linux-2.6.32.28/drivers/char/ra
7010 static int max_write_thresh = INPUT_POOL_WORDS * 32;
7011 static char sysctl_bootid[16];
7012
7013 -diff -urNp linux-2.6.32.28/drivers/char/sonypi.c linux-2.6.32.28/drivers/char/sonypi.c
7014 ---- linux-2.6.32.28/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
7015 -+++ linux-2.6.32.28/drivers/char/sonypi.c 2011-01-25 20:24:47.000000000 -0500
7016 +diff -urNp linux-2.6.32.29/drivers/char/sonypi.c linux-2.6.32.29/drivers/char/sonypi.c
7017 +--- linux-2.6.32.29/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
7018 ++++ linux-2.6.32.29/drivers/char/sonypi.c 2011-01-25 20:24:47.000000000 -0500
7019 @@ -55,6 +55,7 @@
7020 #include <asm/uaccess.h>
7021 #include <asm/io.h>
7022 @@ -24680,9 +24740,9 @@ diff -urNp linux-2.6.32.28/drivers/char/sonypi.c linux-2.6.32.28/drivers/char/so
7023 mutex_unlock(&sonypi_device.lock);
7024 unlock_kernel();
7025 return 0;
7026 -diff -urNp linux-2.6.32.28/drivers/char/tpm/tpm_bios.c linux-2.6.32.28/drivers/char/tpm/tpm_bios.c
7027 ---- linux-2.6.32.28/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
7028 -+++ linux-2.6.32.28/drivers/char/tpm/tpm_bios.c 2010-12-31 14:46:53.000000000 -0500
7029 +diff -urNp linux-2.6.32.29/drivers/char/tpm/tpm_bios.c linux-2.6.32.29/drivers/char/tpm/tpm_bios.c
7030 +--- linux-2.6.32.29/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
7031 ++++ linux-2.6.32.29/drivers/char/tpm/tpm_bios.c 2010-12-31 14:46:53.000000000 -0500
7032 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
7033 event = addr;
7034
7035 @@ -24723,9 +24783,9 @@ diff -urNp linux-2.6.32.28/drivers/char/tpm/tpm_bios.c linux-2.6.32.28/drivers/c
7036
7037 memcpy(log->bios_event_log, virt, len);
7038
7039 -diff -urNp linux-2.6.32.28/drivers/char/tty_io.c linux-2.6.32.28/drivers/char/tty_io.c
7040 ---- linux-2.6.32.28/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
7041 -+++ linux-2.6.32.28/drivers/char/tty_io.c 2010-12-31 14:46:53.000000000 -0500
7042 +diff -urNp linux-2.6.32.29/drivers/char/tty_io.c linux-2.6.32.29/drivers/char/tty_io.c
7043 +--- linux-2.6.32.29/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
7044 ++++ linux-2.6.32.29/drivers/char/tty_io.c 2010-12-31 14:46:53.000000000 -0500
7045 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
7046 DEFINE_MUTEX(tty_mutex);
7047 EXPORT_SYMBOL(tty_mutex);
7048 @@ -24864,9 +24924,9 @@ diff -urNp linux-2.6.32.28/drivers/char/tty_io.c linux-2.6.32.28/drivers/char/tt
7049 /*
7050 * Initialize the console device. This is called *early*, so
7051 * we can't necessarily depend on lots of kernel help here.
7052 -diff -urNp linux-2.6.32.28/drivers/char/tty_ldisc.c linux-2.6.32.28/drivers/char/tty_ldisc.c
7053 ---- linux-2.6.32.28/drivers/char/tty_ldisc.c 2011-01-11 23:55:35.000000000 -0500
7054 -+++ linux-2.6.32.28/drivers/char/tty_ldisc.c 2011-01-11 23:56:03.000000000 -0500
7055 +diff -urNp linux-2.6.32.29/drivers/char/tty_ldisc.c linux-2.6.32.29/drivers/char/tty_ldisc.c
7056 +--- linux-2.6.32.29/drivers/char/tty_ldisc.c 2011-01-11 23:55:35.000000000 -0500
7057 ++++ linux-2.6.32.29/drivers/char/tty_ldisc.c 2011-01-11 23:56:03.000000000 -0500
7058 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
7059 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
7060 struct tty_ldisc_ops *ldo = ld->ops;
7061 @@ -24912,9 +24972,9 @@ diff -urNp linux-2.6.32.28/drivers/char/tty_ldisc.c linux-2.6.32.28/drivers/char
7062 module_put(ldops->owner);
7063 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
7064 }
7065 -diff -urNp linux-2.6.32.28/drivers/char/virtio_console.c linux-2.6.32.28/drivers/char/virtio_console.c
7066 ---- linux-2.6.32.28/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
7067 -+++ linux-2.6.32.28/drivers/char/virtio_console.c 2010-12-31 14:46:53.000000000 -0500
7068 +diff -urNp linux-2.6.32.29/drivers/char/virtio_console.c linux-2.6.32.29/drivers/char/virtio_console.c
7069 +--- linux-2.6.32.29/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
7070 ++++ linux-2.6.32.29/drivers/char/virtio_console.c 2010-12-31 14:46:53.000000000 -0500
7071 @@ -44,6 +44,7 @@ static unsigned int in_len;
7072 static char *in, *inbuf;
7073
7074 @@ -24923,9 +24983,9 @@ diff -urNp linux-2.6.32.28/drivers/char/virtio_console.c linux-2.6.32.28/drivers
7075 static struct hv_ops virtio_cons;
7076
7077 /* The hvc device */
7078 -diff -urNp linux-2.6.32.28/drivers/char/vt_ioctl.c linux-2.6.32.28/drivers/char/vt_ioctl.c
7079 ---- linux-2.6.32.28/drivers/char/vt_ioctl.c 2010-12-09 18:13:03.000000000 -0500
7080 -+++ linux-2.6.32.28/drivers/char/vt_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7081 +diff -urNp linux-2.6.32.29/drivers/char/vt_ioctl.c linux-2.6.32.29/drivers/char/vt_ioctl.c
7082 +--- linux-2.6.32.29/drivers/char/vt_ioctl.c 2010-12-09 18:13:03.000000000 -0500
7083 ++++ linux-2.6.32.29/drivers/char/vt_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7084 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
7085 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
7086 return -EFAULT;
7087 @@ -24969,9 +25029,9 @@ diff -urNp linux-2.6.32.28/drivers/char/vt_ioctl.c linux-2.6.32.28/drivers/char/
7088 if (!perm) {
7089 ret = -EPERM;
7090 goto reterr;
7091 -diff -urNp linux-2.6.32.28/drivers/cpufreq/cpufreq.c linux-2.6.32.28/drivers/cpufreq/cpufreq.c
7092 ---- linux-2.6.32.28/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
7093 -+++ linux-2.6.32.28/drivers/cpufreq/cpufreq.c 2010-12-31 14:46:53.000000000 -0500
7094 +diff -urNp linux-2.6.32.29/drivers/cpufreq/cpufreq.c linux-2.6.32.29/drivers/cpufreq/cpufreq.c
7095 +--- linux-2.6.32.29/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
7096 ++++ linux-2.6.32.29/drivers/cpufreq/cpufreq.c 2010-12-31 14:46:53.000000000 -0500
7097 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
7098 complete(&policy->kobj_unregister);
7099 }
7100 @@ -24981,9 +25041,9 @@ diff -urNp linux-2.6.32.28/drivers/cpufreq/cpufreq.c linux-2.6.32.28/drivers/cpu
7101 .show = show,
7102 .store = store,
7103 };
7104 -diff -urNp linux-2.6.32.28/drivers/cpuidle/sysfs.c linux-2.6.32.28/drivers/cpuidle/sysfs.c
7105 ---- linux-2.6.32.28/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
7106 -+++ linux-2.6.32.28/drivers/cpuidle/sysfs.c 2010-12-31 14:46:53.000000000 -0500
7107 +diff -urNp linux-2.6.32.29/drivers/cpuidle/sysfs.c linux-2.6.32.29/drivers/cpuidle/sysfs.c
7108 +--- linux-2.6.32.29/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
7109 ++++ linux-2.6.32.29/drivers/cpuidle/sysfs.c 2010-12-31 14:46:53.000000000 -0500
7110 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
7111 return ret;
7112 }
7113 @@ -25011,9 +25071,9 @@ diff -urNp linux-2.6.32.28/drivers/cpuidle/sysfs.c linux-2.6.32.28/drivers/cpuid
7114 {
7115 kobject_put(&device->kobjs[i]->kobj);
7116 wait_for_completion(&device->kobjs[i]->kobj_unregister);
7117 -diff -urNp linux-2.6.32.28/drivers/dma/ioat/dma.c linux-2.6.32.28/drivers/dma/ioat/dma.c
7118 ---- linux-2.6.32.28/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
7119 -+++ linux-2.6.32.28/drivers/dma/ioat/dma.c 2010-12-31 14:46:53.000000000 -0500
7120 +diff -urNp linux-2.6.32.29/drivers/dma/ioat/dma.c linux-2.6.32.29/drivers/dma/ioat/dma.c
7121 +--- linux-2.6.32.29/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
7122 ++++ linux-2.6.32.29/drivers/dma/ioat/dma.c 2010-12-31 14:46:53.000000000 -0500
7123 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
7124 return entry->show(&chan->common, page);
7125 }
7126 @@ -25023,9 +25083,9 @@ diff -urNp linux-2.6.32.28/drivers/dma/ioat/dma.c linux-2.6.32.28/drivers/dma/io
7127 .show = ioat_attr_show,
7128 };
7129
7130 -diff -urNp linux-2.6.32.28/drivers/dma/ioat/dma.h linux-2.6.32.28/drivers/dma/ioat/dma.h
7131 ---- linux-2.6.32.28/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
7132 -+++ linux-2.6.32.28/drivers/dma/ioat/dma.h 2010-12-31 14:46:53.000000000 -0500
7133 +diff -urNp linux-2.6.32.29/drivers/dma/ioat/dma.h linux-2.6.32.29/drivers/dma/ioat/dma.h
7134 +--- linux-2.6.32.29/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
7135 ++++ linux-2.6.32.29/drivers/dma/ioat/dma.h 2010-12-31 14:46:53.000000000 -0500
7136 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
7137 unsigned long *phys_complete);
7138 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
7139 @@ -25035,9 +25095,9 @@ diff -urNp linux-2.6.32.28/drivers/dma/ioat/dma.h linux-2.6.32.28/drivers/dma/io
7140 extern struct ioat_sysfs_entry ioat_version_attr;
7141 extern struct ioat_sysfs_entry ioat_cap_attr;
7142 #endif /* IOATDMA_H */
7143 -diff -urNp linux-2.6.32.28/drivers/edac/edac_core.h linux-2.6.32.28/drivers/edac/edac_core.h
7144 ---- linux-2.6.32.28/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
7145 -+++ linux-2.6.32.28/drivers/edac/edac_core.h 2010-12-31 14:46:53.000000000 -0500
7146 +diff -urNp linux-2.6.32.29/drivers/edac/edac_core.h linux-2.6.32.29/drivers/edac/edac_core.h
7147 +--- linux-2.6.32.29/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
7148 ++++ linux-2.6.32.29/drivers/edac/edac_core.h 2010-12-31 14:46:53.000000000 -0500
7149 @@ -99,11 +99,11 @@ extern int edac_debug_level;
7150
7151 #else /* !CONFIG_EDAC_DEBUG */
7152 @@ -25055,9 +25115,9 @@ diff -urNp linux-2.6.32.28/drivers/edac/edac_core.h linux-2.6.32.28/drivers/edac
7153
7154 #endif /* !CONFIG_EDAC_DEBUG */
7155
7156 -diff -urNp linux-2.6.32.28/drivers/edac/edac_device_sysfs.c linux-2.6.32.28/drivers/edac/edac_device_sysfs.c
7157 ---- linux-2.6.32.28/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7158 -+++ linux-2.6.32.28/drivers/edac/edac_device_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7159 +diff -urNp linux-2.6.32.29/drivers/edac/edac_device_sysfs.c linux-2.6.32.29/drivers/edac/edac_device_sysfs.c
7160 +--- linux-2.6.32.29/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7161 ++++ linux-2.6.32.29/drivers/edac/edac_device_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7162 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
7163 }
7164
7165 @@ -25085,9 +25145,9 @@ diff -urNp linux-2.6.32.28/drivers/edac/edac_device_sysfs.c linux-2.6.32.28/driv
7166 .show = edac_dev_block_show,
7167 .store = edac_dev_block_store
7168 };
7169 -diff -urNp linux-2.6.32.28/drivers/edac/edac_mc_sysfs.c linux-2.6.32.28/drivers/edac/edac_mc_sysfs.c
7170 ---- linux-2.6.32.28/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7171 -+++ linux-2.6.32.28/drivers/edac/edac_mc_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7172 +diff -urNp linux-2.6.32.29/drivers/edac/edac_mc_sysfs.c linux-2.6.32.29/drivers/edac/edac_mc_sysfs.c
7173 +--- linux-2.6.32.29/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7174 ++++ linux-2.6.32.29/drivers/edac/edac_mc_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7175 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
7176 return -EIO;
7177 }
7178 @@ -25106,9 +25166,9 @@ diff -urNp linux-2.6.32.28/drivers/edac/edac_mc_sysfs.c linux-2.6.32.28/drivers/
7179 .show = mcidev_show,
7180 .store = mcidev_store
7181 };
7182 -diff -urNp linux-2.6.32.28/drivers/edac/edac_pci_sysfs.c linux-2.6.32.28/drivers/edac/edac_pci_sysfs.c
7183 ---- linux-2.6.32.28/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7184 -+++ linux-2.6.32.28/drivers/edac/edac_pci_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7185 +diff -urNp linux-2.6.32.29/drivers/edac/edac_pci_sysfs.c linux-2.6.32.29/drivers/edac/edac_pci_sysfs.c
7186 +--- linux-2.6.32.29/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
7187 ++++ linux-2.6.32.29/drivers/edac/edac_pci_sysfs.c 2010-12-31 14:46:53.000000000 -0500
7188 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
7189 }
7190
7191 @@ -25127,9 +25187,9 @@ diff -urNp linux-2.6.32.28/drivers/edac/edac_pci_sysfs.c linux-2.6.32.28/drivers
7192 .show = edac_pci_dev_show,
7193 .store = edac_pci_dev_store
7194 };
7195 -diff -urNp linux-2.6.32.28/drivers/firewire/core-cdev.c linux-2.6.32.28/drivers/firewire/core-cdev.c
7196 ---- linux-2.6.32.28/drivers/firewire/core-cdev.c 2010-12-09 18:13:03.000000000 -0500
7197 -+++ linux-2.6.32.28/drivers/firewire/core-cdev.c 2010-12-31 14:46:53.000000000 -0500
7198 +diff -urNp linux-2.6.32.29/drivers/firewire/core-cdev.c linux-2.6.32.29/drivers/firewire/core-cdev.c
7199 +--- linux-2.6.32.29/drivers/firewire/core-cdev.c 2010-12-09 18:13:03.000000000 -0500
7200 ++++ linux-2.6.32.29/drivers/firewire/core-cdev.c 2010-12-31 14:46:53.000000000 -0500
7201 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
7202 int ret;
7203
7204 @@ -25140,9 +25200,9 @@ diff -urNp linux-2.6.32.28/drivers/firewire/core-cdev.c linux-2.6.32.28/drivers/
7205 return -EINVAL;
7206
7207 r = kmalloc(sizeof(*r), GFP_KERNEL);
7208 -diff -urNp linux-2.6.32.28/drivers/firmware/dmi_scan.c linux-2.6.32.28/drivers/firmware/dmi_scan.c
7209 ---- linux-2.6.32.28/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
7210 -+++ linux-2.6.32.28/drivers/firmware/dmi_scan.c 2010-12-31 14:46:53.000000000 -0500
7211 +diff -urNp linux-2.6.32.29/drivers/firmware/dmi_scan.c linux-2.6.32.29/drivers/firmware/dmi_scan.c
7212 +--- linux-2.6.32.29/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
7213 ++++ linux-2.6.32.29/drivers/firmware/dmi_scan.c 2010-12-31 14:46:53.000000000 -0500
7214 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
7215 }
7216 }
7217 @@ -25155,9 +25215,9 @@ diff -urNp linux-2.6.32.28/drivers/firmware/dmi_scan.c linux-2.6.32.28/drivers/f
7218 p = dmi_ioremap(0xF0000, 0x10000);
7219 if (p == NULL)
7220 goto error;
7221 -diff -urNp linux-2.6.32.28/drivers/firmware/edd.c linux-2.6.32.28/drivers/firmware/edd.c
7222 ---- linux-2.6.32.28/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
7223 -+++ linux-2.6.32.28/drivers/firmware/edd.c 2010-12-31 14:46:53.000000000 -0500
7224 +diff -urNp linux-2.6.32.29/drivers/firmware/edd.c linux-2.6.32.29/drivers/firmware/edd.c
7225 +--- linux-2.6.32.29/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
7226 ++++ linux-2.6.32.29/drivers/firmware/edd.c 2010-12-31 14:46:53.000000000 -0500
7227 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
7228 return ret;
7229 }
7230 @@ -25167,9 +25227,9 @@ diff -urNp linux-2.6.32.28/drivers/firmware/edd.c linux-2.6.32.28/drivers/firmwa
7231 .show = edd_attr_show,
7232 };
7233
7234 -diff -urNp linux-2.6.32.28/drivers/firmware/efivars.c linux-2.6.32.28/drivers/firmware/efivars.c
7235 ---- linux-2.6.32.28/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
7236 -+++ linux-2.6.32.28/drivers/firmware/efivars.c 2010-12-31 14:46:53.000000000 -0500
7237 +diff -urNp linux-2.6.32.29/drivers/firmware/efivars.c linux-2.6.32.29/drivers/firmware/efivars.c
7238 +--- linux-2.6.32.29/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
7239 ++++ linux-2.6.32.29/drivers/firmware/efivars.c 2010-12-31 14:46:53.000000000 -0500
7240 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
7241 return ret;
7242 }
7243 @@ -25179,9 +25239,9 @@ diff -urNp linux-2.6.32.28/drivers/firmware/efivars.c linux-2.6.32.28/drivers/fi
7244 .show = efivar_attr_show,
7245 .store = efivar_attr_store,
7246 };
7247 -diff -urNp linux-2.6.32.28/drivers/firmware/iscsi_ibft.c linux-2.6.32.28/drivers/firmware/iscsi_ibft.c
7248 ---- linux-2.6.32.28/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
7249 -+++ linux-2.6.32.28/drivers/firmware/iscsi_ibft.c 2010-12-31 14:46:53.000000000 -0500
7250 +diff -urNp linux-2.6.32.29/drivers/firmware/iscsi_ibft.c linux-2.6.32.29/drivers/firmware/iscsi_ibft.c
7251 +--- linux-2.6.32.29/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
7252 ++++ linux-2.6.32.29/drivers/firmware/iscsi_ibft.c 2010-12-31 14:46:53.000000000 -0500
7253 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
7254 return ret;
7255 }
7256 @@ -25191,9 +25251,9 @@ diff -urNp linux-2.6.32.28/drivers/firmware/iscsi_ibft.c linux-2.6.32.28/drivers
7257 .show = ibft_show_attribute,
7258 };
7259
7260 -diff -urNp linux-2.6.32.28/drivers/firmware/memmap.c linux-2.6.32.28/drivers/firmware/memmap.c
7261 ---- linux-2.6.32.28/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
7262 -+++ linux-2.6.32.28/drivers/firmware/memmap.c 2010-12-31 14:46:53.000000000 -0500
7263 +diff -urNp linux-2.6.32.29/drivers/firmware/memmap.c linux-2.6.32.29/drivers/firmware/memmap.c
7264 +--- linux-2.6.32.29/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
7265 ++++ linux-2.6.32.29/drivers/firmware/memmap.c 2010-12-31 14:46:53.000000000 -0500
7266 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
7267 NULL
7268 };
7269 @@ -25203,9 +25263,9 @@ diff -urNp linux-2.6.32.28/drivers/firmware/memmap.c linux-2.6.32.28/drivers/fir
7270 .show = memmap_attr_show,
7271 };
7272
7273 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.28/drivers/gpu/drm/drm_crtc_helper.c
7274 ---- linux-2.6.32.28/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400
7275 -+++ linux-2.6.32.28/drivers/gpu/drm/drm_crtc_helper.c 2010-12-31 14:46:53.000000000 -0500
7276 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.29/drivers/gpu/drm/drm_crtc_helper.c
7277 +--- linux-2.6.32.29/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400
7278 ++++ linux-2.6.32.29/drivers/gpu/drm/drm_crtc_helper.c 2010-12-31 14:46:53.000000000 -0500
7279 @@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
7280 struct drm_crtc *tmp;
7281 int crtc_mask = 1;
7282 @@ -25215,9 +25275,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.28/dri
7283
7284 dev = crtc->dev;
7285
7286 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_drv.c linux-2.6.32.28/drivers/gpu/drm/drm_drv.c
7287 ---- linux-2.6.32.28/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
7288 -+++ linux-2.6.32.28/drivers/gpu/drm/drm_drv.c 2010-12-31 14:46:53.000000000 -0500
7289 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/drm_drv.c linux-2.6.32.29/drivers/gpu/drm/drm_drv.c
7290 +--- linux-2.6.32.29/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
7291 ++++ linux-2.6.32.29/drivers/gpu/drm/drm_drv.c 2010-12-31 14:46:53.000000000 -0500
7292 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
7293 char *kdata = NULL;
7294
7295 @@ -25227,9 +25287,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_drv.c linux-2.6.32.28/drivers/gpu
7296 ++file_priv->ioctl_count;
7297
7298 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
7299 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_fops.c linux-2.6.32.28/drivers/gpu/drm/drm_fops.c
7300 ---- linux-2.6.32.28/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
7301 -+++ linux-2.6.32.28/drivers/gpu/drm/drm_fops.c 2011-01-24 18:05:30.000000000 -0500
7302 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/drm_fops.c linux-2.6.32.29/drivers/gpu/drm/drm_fops.c
7303 +--- linux-2.6.32.29/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
7304 ++++ linux-2.6.32.29/drivers/gpu/drm/drm_fops.c 2011-01-24 18:05:30.000000000 -0500
7305 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
7306 }
7307
7308 @@ -25281,9 +25341,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_fops.c linux-2.6.32.28/drivers/gp
7309 if (atomic_read(&dev->ioctl_count)) {
7310 DRM_ERROR("Device busy: %d\n",
7311 atomic_read(&dev->ioctl_count));
7312 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_gem.c linux-2.6.32.28/drivers/gpu/drm/drm_gem.c
7313 ---- linux-2.6.32.28/drivers/gpu/drm/drm_gem.c 2010-08-13 16:24:37.000000000 -0400
7314 -+++ linux-2.6.32.28/drivers/gpu/drm/drm_gem.c 2011-01-24 18:05:37.000000000 -0500
7315 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/drm_gem.c linux-2.6.32.29/drivers/gpu/drm/drm_gem.c
7316 +--- linux-2.6.32.29/drivers/gpu/drm/drm_gem.c 2010-08-13 16:24:37.000000000 -0400
7317 ++++ linux-2.6.32.29/drivers/gpu/drm/drm_gem.c 2011-01-24 18:05:37.000000000 -0500
7318 @@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
7319 spin_lock_init(&dev->object_name_lock);
7320 idr_init(&dev->object_name_idr);
7321 @@ -25317,9 +25377,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_gem.c linux-2.6.32.28/drivers/gpu
7322 kfree(obj);
7323 }
7324 EXPORT_SYMBOL(drm_gem_object_free);
7325 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_info.c linux-2.6.32.28/drivers/gpu/drm/drm_info.c
7326 ---- linux-2.6.32.28/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400
7327 -+++ linux-2.6.32.28/drivers/gpu/drm/drm_info.c 2011-01-24 18:05:30.000000000 -0500
7328 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/drm_info.c linux-2.6.32.29/drivers/gpu/drm/drm_info.c
7329 +--- linux-2.6.32.29/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400
7330 ++++ linux-2.6.32.29/drivers/gpu/drm/drm_info.c 2011-01-24 18:05:30.000000000 -0500
7331 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
7332 struct drm_local_map *map;
7333 struct drm_map_list *r_list;
7334 @@ -25362,9 +25422,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_info.c linux-2.6.32.28/drivers/gp
7335 seq_printf(m, "%d gtt total\n", dev->gtt_total);
7336 return 0;
7337 }
7338 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.28/drivers/gpu/drm/drm_ioctl.c
7339 ---- linux-2.6.32.28/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
7340 -+++ linux-2.6.32.28/drivers/gpu/drm/drm_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7341 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.29/drivers/gpu/drm/drm_ioctl.c
7342 +--- linux-2.6.32.29/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
7343 ++++ linux-2.6.32.29/drivers/gpu/drm/drm_ioctl.c 2010-12-31 14:46:53.000000000 -0500
7344 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
7345 stats->data[i].value =
7346 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
7347 @@ -25374,9 +25434,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.28/drivers/g
7348 stats->data[i].type = dev->types[i];
7349 }
7350
7351 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_lock.c linux-2.6.32.28/drivers/gpu/drm/drm_lock.c
7352 ---- linux-2.6.32.28/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
7353 -+++ linux-2.6.32.28/drivers/gpu/drm/drm_lock.c 2010-12-31 14:46:53.000000000 -0500
7354 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/drm_lock.c linux-2.6.32.29/drivers/gpu/drm/drm_lock.c
7355 +--- linux-2.6.32.29/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
7356 ++++ linux-2.6.32.29/drivers/gpu/drm/drm_lock.c 2010-12-31 14:46:53.000000000 -0500
7357 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
7358 if (drm_lock_take(&master->lock, lock->context)) {
7359 master->lock.file_priv = file_priv;
7360 @@ -25395,9 +25455,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/drm_lock.c linux-2.6.32.28/drivers/gp
7361
7362 /* kernel_context_switch isn't used by any of the x86 drm
7363 * modules but is required by the Sparc driver.
7364 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.28/drivers/gpu/drm/i810/i810_dma.c
7365 ---- linux-2.6.32.28/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
7366 -+++ linux-2.6.32.28/drivers/gpu/drm/i810/i810_dma.c 2010-12-31 14:46:53.000000000 -0500
7367 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.29/drivers/gpu/drm/i810/i810_dma.c
7368 +--- linux-2.6.32.29/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
7369 ++++ linux-2.6.32.29/drivers/gpu/drm/i810/i810_dma.c 2010-12-31 14:46:53.000000000 -0500
7370 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
7371 dma->buflist[vertex->idx],
7372 vertex->discard, vertex->used);
7373 @@ -25420,9 +25480,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.28/drive
7374 sarea_priv->last_enqueue = dev_priv->counter - 1;
7375 sarea_priv->last_dispatch = (int)hw_status[5];
7376
7377 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7017.c
7378 ---- linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
7379 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-31 14:46:53.000000000 -0500
7380 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7017.c
7381 +--- linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
7382 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-31 14:46:53.000000000 -0500
7383 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
7384 }
7385 }
7386 @@ -25432,9 +25492,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.28/dri
7387 .init = ch7017_init,
7388 .detect = ch7017_detect,
7389 .mode_valid = ch7017_mode_valid,
7390 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7xxx.c
7391 ---- linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
7392 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-31 14:46:53.000000000 -0500
7393 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7xxx.c
7394 +--- linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
7395 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-31 14:46:53.000000000 -0500
7396 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
7397 }
7398 }
7399 @@ -25444,9 +25504,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.28/dri
7400 .init = ch7xxx_init,
7401 .detect = ch7xxx_detect,
7402 .mode_valid = ch7xxx_mode_valid,
7403 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo.h linux-2.6.32.28/drivers/gpu/drm/i915/dvo.h
7404 ---- linux-2.6.32.28/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
7405 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/dvo.h 2010-12-31 14:46:53.000000000 -0500
7406 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/dvo.h linux-2.6.32.29/drivers/gpu/drm/i915/dvo.h
7407 +--- linux-2.6.32.29/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
7408 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/dvo.h 2010-12-31 14:46:53.000000000 -0500
7409 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
7410 *
7411 * \return singly-linked list of modes or NULL if no modes found.
7412 @@ -25479,9 +25539,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo.h linux-2.6.32.28/drivers/gp
7413 +extern const struct intel_dvo_dev_ops ch7017_ops;
7414
7415 #endif /* _INTEL_DVO_H */
7416 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ivch.c
7417 ---- linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
7418 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-31 14:46:53.000000000 -0500
7419 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ivch.c
7420 +--- linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
7421 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-31 14:46:53.000000000 -0500
7422 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
7423 }
7424 }
7425 @@ -25491,9 +25551,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.28/drive
7426 .init = ivch_init,
7427 .dpms = ivch_dpms,
7428 .save = ivch_save,
7429 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.28/drivers/gpu/drm/i915/dvo_sil164.c
7430 ---- linux-2.6.32.28/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
7431 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-31 14:46:53.000000000 -0500
7432 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.29/drivers/gpu/drm/i915/dvo_sil164.c
7433 +--- linux-2.6.32.29/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
7434 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-31 14:46:53.000000000 -0500
7435 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
7436 }
7437 }
7438 @@ -25503,9 +25563,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.28/dri
7439 .init = sil164_init,
7440 .detect = sil164_detect,
7441 .mode_valid = sil164_mode_valid,
7442 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.28/drivers/gpu/drm/i915/dvo_tfp410.c
7443 ---- linux-2.6.32.28/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
7444 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-31 14:46:53.000000000 -0500
7445 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.29/drivers/gpu/drm/i915/dvo_tfp410.c
7446 +--- linux-2.6.32.29/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
7447 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-31 14:46:53.000000000 -0500
7448 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
7449 }
7450 }
7451 @@ -25515,9 +25575,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.28/dri
7452 .init = tfp410_init,
7453 .detect = tfp410_detect,
7454 .mode_valid = tfp410_mode_valid,
7455 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.28/drivers/gpu/drm/i915/i915_drv.c
7456 ---- linux-2.6.32.28/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
7457 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/i915_drv.c 2010-12-31 14:46:53.000000000 -0500
7458 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.29/drivers/gpu/drm/i915/i915_drv.c
7459 +--- linux-2.6.32.29/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
7460 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/i915_drv.c 2010-12-31 14:46:53.000000000 -0500
7461 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
7462 return i915_resume(dev);
7463 }
7464 @@ -25527,9 +25587,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.28/drive
7465 .fault = i915_gem_fault,
7466 .open = drm_gem_vm_open,
7467 .close = drm_gem_vm_close,
7468 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.28/drivers/gpu/drm/i915/i915_gem.c
7469 ---- linux-2.6.32.28/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
7470 -+++ linux-2.6.32.28/drivers/gpu/drm/i915/i915_gem.c 2011-01-24 18:05:30.000000000 -0500
7471 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.29/drivers/gpu/drm/i915/i915_gem.c
7472 +--- linux-2.6.32.29/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
7473 ++++ linux-2.6.32.29/drivers/gpu/drm/i915/i915_gem.c 2011-01-24 18:05:30.000000000 -0500
7474 @@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d
7475
7476 args->aper_size = dev->gtt_total;
7477 @@ -25612,9 +25672,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.28/drive
7478 }
7479 i915_verify_inactive(dev, __FILE__, __LINE__);
7480 }
7481 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.28/drivers/gpu/drm/radeon/mkregtable.c
7482 ---- linux-2.6.32.28/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
7483 -+++ linux-2.6.32.28/drivers/gpu/drm/radeon/mkregtable.c 2010-12-31 14:46:53.000000000 -0500
7484 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.29/drivers/gpu/drm/radeon/mkregtable.c
7485 +--- linux-2.6.32.29/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
7486 ++++ linux-2.6.32.29/drivers/gpu/drm/radeon/mkregtable.c 2010-12-31 14:46:53.000000000 -0500
7487 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
7488 regex_t mask_rex;
7489 regmatch_t match[4];
7490 @@ -25632,10 +25692,10 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.28/d
7491
7492 if (regcomp
7493 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
7494 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_atombios.c
7495 ---- linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400
7496 -+++ linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_atombios.c 2010-12-31 14:46:53.000000000 -0500
7497 -@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o
7498 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_atombios.c
7499 +--- linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:56:54.000000000 -0500
7500 ++++ linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:57:23.000000000 -0500
7501 +@@ -520,13 +520,13 @@ static uint16_t atombios_get_connector_o
7502 }
7503 }
7504
7505 @@ -25651,7 +25711,7 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
7506
7507 bool radeon_get_atom_connector_info_from_supported_devices_table(struct
7508 drm_device
7509 -@@ -535,7 +535,6 @@ bool radeon_get_atom_connector_info_from
7510 +@@ -542,7 +542,6 @@ bool radeon_get_atom_connector_info_from
7511 uint8_t dac;
7512 union atom_supported_devices *supported_devices;
7513 int i, j;
7514 @@ -25659,9 +25719,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
7515
7516 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
7517
7518 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_display.c
7519 ---- linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400
7520 -+++ linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_display.c 2010-12-31 14:46:53.000000000 -0500
7521 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_display.c
7522 +--- linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:56:54.000000000 -0500
7523 ++++ linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:57:23.000000000 -0500
7524 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
7525
7526 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
7527 @@ -25671,9 +25731,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
7528 } else
7529 error = abs(current_freq - freq);
7530 vco_diff = abs(vco - best_vco);
7531 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_state.c
7532 ---- linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
7533 -+++ linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_state.c 2010-12-31 14:46:53.000000000 -0500
7534 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_state.c
7535 +--- linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
7536 ++++ linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_state.c 2010-12-31 14:46:53.000000000 -0500
7537 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
7538 {
7539 drm_radeon_private_t *dev_priv = dev->dev_private;
7540 @@ -25683,9 +25743,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.28
7541
7542 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
7543
7544 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_ttm.c
7545 ---- linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
7546 -+++ linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-31 14:46:53.000000000 -0500
7547 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_ttm.c
7548 +--- linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
7549 ++++ linux-2.6.32.29/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-31 14:46:53.000000000 -0500
7550 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
7551 DRM_INFO("radeon: ttm finalized\n");
7552 }
7553 @@ -25737,9 +25797,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.28/d
7554 }
7555
7556
7557 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo.c
7558 ---- linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
7559 -+++ linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-31 14:46:53.000000000 -0500
7560 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo.c
7561 +--- linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
7562 ++++ linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-31 14:46:53.000000000 -0500
7563 @@ -39,7 +39,7 @@
7564 #include <linux/module.h>
7565
7566 @@ -25758,9 +25818,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.28/drivers/
7567 .show = &ttm_bo_global_show
7568 };
7569
7570 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo_vm.c
7571 ---- linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
7572 -+++ linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-31 14:46:53.000000000 -0500
7573 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo_vm.c
7574 +--- linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
7575 ++++ linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-31 14:46:53.000000000 -0500
7576 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
7577 {
7578 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
7579 @@ -25781,9 +25841,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.28/drive
7580 /*
7581 * Work around locking order reversal in fault / nopfn
7582 * between mmap_sem and bo_reserve: Perform a trylock operation
7583 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_global.c
7584 ---- linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
7585 -+++ linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_global.c 2010-12-31 14:46:53.000000000 -0500
7586 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_global.c
7587 +--- linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
7588 ++++ linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_global.c 2010-12-31 14:46:53.000000000 -0500
7589 @@ -36,7 +36,7 @@
7590 struct ttm_global_item {
7591 struct mutex mutex;
7592 @@ -25841,9 +25901,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.28/driv
7593 ref->release(ref);
7594 item->object = NULL;
7595 }
7596 -diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_memory.c
7597 ---- linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
7598 -+++ linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-31 14:46:53.000000000 -0500
7599 +diff -urNp linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_memory.c
7600 +--- linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
7601 ++++ linux-2.6.32.29/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-31 14:46:53.000000000 -0500
7602 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
7603 NULL
7604 };
7605 @@ -25853,9 +25913,9 @@ diff -urNp linux-2.6.32.28/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.28/driv
7606 .show = &ttm_mem_zone_show,
7607 .store = &ttm_mem_zone_store
7608 };
7609 -diff -urNp linux-2.6.32.28/drivers/hid/usbhid/hiddev.c linux-2.6.32.28/drivers/hid/usbhid/hiddev.c
7610 ---- linux-2.6.32.28/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
7611 -+++ linux-2.6.32.28/drivers/hid/usbhid/hiddev.c 2010-12-31 14:46:53.000000000 -0500
7612 +diff -urNp linux-2.6.32.29/drivers/hid/usbhid/hiddev.c linux-2.6.32.29/drivers/hid/usbhid/hiddev.c
7613 +--- linux-2.6.32.29/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
7614 ++++ linux-2.6.32.29/drivers/hid/usbhid/hiddev.c 2010-12-31 14:46:53.000000000 -0500
7615 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
7616 return put_user(HID_VERSION, (int __user *)arg);
7617
7618 @@ -25865,9 +25925,9 @@ diff -urNp linux-2.6.32.28/drivers/hid/usbhid/hiddev.c linux-2.6.32.28/drivers/h
7619 return -EINVAL;
7620
7621 for (i = 0; i < hid->maxcollection; i++)
7622 -diff -urNp linux-2.6.32.28/drivers/hwmon/k8temp.c linux-2.6.32.28/drivers/hwmon/k8temp.c
7623 ---- linux-2.6.32.28/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
7624 -+++ linux-2.6.32.28/drivers/hwmon/k8temp.c 2010-12-31 14:46:53.000000000 -0500
7625 +diff -urNp linux-2.6.32.29/drivers/hwmon/k8temp.c linux-2.6.32.29/drivers/hwmon/k8temp.c
7626 +--- linux-2.6.32.29/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
7627 ++++ linux-2.6.32.29/drivers/hwmon/k8temp.c 2010-12-31 14:46:53.000000000 -0500
7628 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
7629
7630 static struct pci_device_id k8temp_ids[] = {
7631 @@ -25877,9 +25937,9 @@ diff -urNp linux-2.6.32.28/drivers/hwmon/k8temp.c linux-2.6.32.28/drivers/hwmon/
7632 };
7633
7634 MODULE_DEVICE_TABLE(pci, k8temp_ids);
7635 -diff -urNp linux-2.6.32.28/drivers/hwmon/sis5595.c linux-2.6.32.28/drivers/hwmon/sis5595.c
7636 ---- linux-2.6.32.28/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
7637 -+++ linux-2.6.32.28/drivers/hwmon/sis5595.c 2010-12-31 14:46:53.000000000 -0500
7638 +diff -urNp linux-2.6.32.29/drivers/hwmon/sis5595.c linux-2.6.32.29/drivers/hwmon/sis5595.c
7639 +--- linux-2.6.32.29/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
7640 ++++ linux-2.6.32.29/drivers/hwmon/sis5595.c 2010-12-31 14:46:53.000000000 -0500
7641 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
7642
7643 static struct pci_device_id sis5595_pci_ids[] = {
7644 @@ -25889,10 +25949,10 @@ diff -urNp linux-2.6.32.28/drivers/hwmon/sis5595.c linux-2.6.32.28/drivers/hwmon
7645 };
7646
7647 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
7648 -diff -urNp linux-2.6.32.28/drivers/hwmon/via686a.c linux-2.6.32.28/drivers/hwmon/via686a.c
7649 ---- linux-2.6.32.28/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400
7650 -+++ linux-2.6.32.28/drivers/hwmon/via686a.c 2010-12-31 14:46:53.000000000 -0500
7651 -@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
7652 +diff -urNp linux-2.6.32.29/drivers/hwmon/via686a.c linux-2.6.32.29/drivers/hwmon/via686a.c
7653 +--- linux-2.6.32.29/drivers/hwmon/via686a.c 2011-02-22 15:56:54.000000000 -0500
7654 ++++ linux-2.6.32.29/drivers/hwmon/via686a.c 2011-02-22 15:57:23.000000000 -0500
7655 +@@ -777,7 +777,7 @@ static struct via686a_data *via686a_upda
7656
7657 static struct pci_device_id via686a_pci_ids[] = {
7658 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
7659 @@ -25901,9 +25961,9 @@ diff -urNp linux-2.6.32.28/drivers/hwmon/via686a.c linux-2.6.32.28/drivers/hwmon
7660 };
7661
7662 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
7663 -diff -urNp linux-2.6.32.28/drivers/hwmon/vt8231.c linux-2.6.32.28/drivers/hwmon/vt8231.c
7664 ---- linux-2.6.32.28/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
7665 -+++ linux-2.6.32.28/drivers/hwmon/vt8231.c 2010-12-31 14:46:53.000000000 -0500
7666 +diff -urNp linux-2.6.32.29/drivers/hwmon/vt8231.c linux-2.6.32.29/drivers/hwmon/vt8231.c
7667 +--- linux-2.6.32.29/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
7668 ++++ linux-2.6.32.29/drivers/hwmon/vt8231.c 2010-12-31 14:46:53.000000000 -0500
7669 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
7670
7671 static struct pci_device_id vt8231_pci_ids[] = {
7672 @@ -25913,9 +25973,9 @@ diff -urNp linux-2.6.32.28/drivers/hwmon/vt8231.c linux-2.6.32.28/drivers/hwmon/
7673 };
7674
7675 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
7676 -diff -urNp linux-2.6.32.28/drivers/hwmon/w83791d.c linux-2.6.32.28/drivers/hwmon/w83791d.c
7677 ---- linux-2.6.32.28/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
7678 -+++ linux-2.6.32.28/drivers/hwmon/w83791d.c 2010-12-31 14:46:53.000000000 -0500
7679 +diff -urNp linux-2.6.32.29/drivers/hwmon/w83791d.c linux-2.6.32.29/drivers/hwmon/w83791d.c
7680 +--- linux-2.6.32.29/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
7681 ++++ linux-2.6.32.29/drivers/hwmon/w83791d.c 2010-12-31 14:46:53.000000000 -0500
7682 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
7683 struct i2c_board_info *info);
7684 static int w83791d_remove(struct i2c_client *client);
7685 @@ -25927,9 +25987,9 @@ diff -urNp linux-2.6.32.28/drivers/hwmon/w83791d.c linux-2.6.32.28/drivers/hwmon
7686 static struct w83791d_data *w83791d_update_device(struct device *dev);
7687
7688 #ifdef DEBUG
7689 -diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-i801.c linux-2.6.32.28/drivers/i2c/busses/i2c-i801.c
7690 ---- linux-2.6.32.28/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
7691 -+++ linux-2.6.32.28/drivers/i2c/busses/i2c-i801.c 2010-12-31 14:46:53.000000000 -0500
7692 +diff -urNp linux-2.6.32.29/drivers/i2c/busses/i2c-i801.c linux-2.6.32.29/drivers/i2c/busses/i2c-i801.c
7693 +--- linux-2.6.32.29/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
7694 ++++ linux-2.6.32.29/drivers/i2c/busses/i2c-i801.c 2010-12-31 14:46:53.000000000 -0500
7695 @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
7696 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
7697 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
7698 @@ -25939,9 +25999,9 @@ diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-i801.c linux-2.6.32.28/drivers
7699 };
7700
7701 MODULE_DEVICE_TABLE (pci, i801_ids);
7702 -diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.28/drivers/i2c/busses/i2c-piix4.c
7703 ---- linux-2.6.32.28/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
7704 -+++ linux-2.6.32.28/drivers/i2c/busses/i2c-piix4.c 2010-12-31 14:46:53.000000000 -0500
7705 +diff -urNp linux-2.6.32.29/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.29/drivers/i2c/busses/i2c-piix4.c
7706 +--- linux-2.6.32.29/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
7707 ++++ linux-2.6.32.29/drivers/i2c/busses/i2c-piix4.c 2010-12-31 14:46:53.000000000 -0500
7708 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
7709 .ident = "IBM",
7710 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
7711 @@ -25960,9 +26020,9 @@ diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.28/driver
7712 };
7713
7714 MODULE_DEVICE_TABLE (pci, piix4_ids);
7715 -diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.28/drivers/i2c/busses/i2c-sis630.c
7716 ---- linux-2.6.32.28/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
7717 -+++ linux-2.6.32.28/drivers/i2c/busses/i2c-sis630.c 2010-12-31 14:46:53.000000000 -0500
7718 +diff -urNp linux-2.6.32.29/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.29/drivers/i2c/busses/i2c-sis630.c
7719 +--- linux-2.6.32.29/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
7720 ++++ linux-2.6.32.29/drivers/i2c/busses/i2c-sis630.c 2010-12-31 14:46:53.000000000 -0500
7721 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
7722 static struct pci_device_id sis630_ids[] __devinitdata = {
7723 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
7724 @@ -25972,9 +26032,9 @@ diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.28/drive
7725 };
7726
7727 MODULE_DEVICE_TABLE (pci, sis630_ids);
7728 -diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.28/drivers/i2c/busses/i2c-sis96x.c
7729 ---- linux-2.6.32.28/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
7730 -+++ linux-2.6.32.28/drivers/i2c/busses/i2c-sis96x.c 2010-12-31 14:46:53.000000000 -0500
7731 +diff -urNp linux-2.6.32.29/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.29/drivers/i2c/busses/i2c-sis96x.c
7732 +--- linux-2.6.32.29/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
7733 ++++ linux-2.6.32.29/drivers/i2c/busses/i2c-sis96x.c 2010-12-31 14:46:53.000000000 -0500
7734 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
7735
7736 static struct pci_device_id sis96x_ids[] = {
7737 @@ -25984,9 +26044,9 @@ diff -urNp linux-2.6.32.28/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.28/drive
7738 };
7739
7740 MODULE_DEVICE_TABLE (pci, sis96x_ids);
7741 -diff -urNp linux-2.6.32.28/drivers/ide/ide-cd.c linux-2.6.32.28/drivers/ide/ide-cd.c
7742 ---- linux-2.6.32.28/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
7743 -+++ linux-2.6.32.28/drivers/ide/ide-cd.c 2010-12-31 14:46:53.000000000 -0500
7744 +diff -urNp linux-2.6.32.29/drivers/ide/ide-cd.c linux-2.6.32.29/drivers/ide/ide-cd.c
7745 +--- linux-2.6.32.29/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
7746 ++++ linux-2.6.32.29/drivers/ide/ide-cd.c 2010-12-31 14:46:53.000000000 -0500
7747 @@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
7748 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
7749 if ((unsigned long)buf & alignment
7750 @@ -25996,9 +26056,9 @@ diff -urNp linux-2.6.32.28/drivers/ide/ide-cd.c linux-2.6.32.28/drivers/ide/ide-
7751 drive->dma = 0;
7752 }
7753 }
7754 -diff -urNp linux-2.6.32.28/drivers/ieee1394/dv1394.c linux-2.6.32.28/drivers/ieee1394/dv1394.c
7755 ---- linux-2.6.32.28/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
7756 -+++ linux-2.6.32.28/drivers/ieee1394/dv1394.c 2010-12-31 14:46:53.000000000 -0500
7757 +diff -urNp linux-2.6.32.29/drivers/ieee1394/dv1394.c linux-2.6.32.29/drivers/ieee1394/dv1394.c
7758 +--- linux-2.6.32.29/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
7759 ++++ linux-2.6.32.29/drivers/ieee1394/dv1394.c 2010-12-31 14:46:53.000000000 -0500
7760 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
7761 based upon DIF section and sequence
7762 */
7763 @@ -26017,9 +26077,9 @@ diff -urNp linux-2.6.32.28/drivers/ieee1394/dv1394.c linux-2.6.32.28/drivers/iee
7764 };
7765
7766 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
7767 -diff -urNp linux-2.6.32.28/drivers/ieee1394/eth1394.c linux-2.6.32.28/drivers/ieee1394/eth1394.c
7768 ---- linux-2.6.32.28/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
7769 -+++ linux-2.6.32.28/drivers/ieee1394/eth1394.c 2010-12-31 14:46:53.000000000 -0500
7770 +diff -urNp linux-2.6.32.29/drivers/ieee1394/eth1394.c linux-2.6.32.29/drivers/ieee1394/eth1394.c
7771 +--- linux-2.6.32.29/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
7772 ++++ linux-2.6.32.29/drivers/ieee1394/eth1394.c 2010-12-31 14:46:53.000000000 -0500
7773 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
7774 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
7775 .version = ETHER1394_GASP_VERSION,
7776 @@ -26029,9 +26089,9 @@ diff -urNp linux-2.6.32.28/drivers/ieee1394/eth1394.c linux-2.6.32.28/drivers/ie
7777 };
7778
7779 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
7780 -diff -urNp linux-2.6.32.28/drivers/ieee1394/hosts.c linux-2.6.32.28/drivers/ieee1394/hosts.c
7781 ---- linux-2.6.32.28/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
7782 -+++ linux-2.6.32.28/drivers/ieee1394/hosts.c 2010-12-31 14:46:53.000000000 -0500
7783 +diff -urNp linux-2.6.32.29/drivers/ieee1394/hosts.c linux-2.6.32.29/drivers/ieee1394/hosts.c
7784 +--- linux-2.6.32.29/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
7785 ++++ linux-2.6.32.29/drivers/ieee1394/hosts.c 2010-12-31 14:46:53.000000000 -0500
7786 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
7787 }
7788
7789 @@ -26040,9 +26100,9 @@ diff -urNp linux-2.6.32.28/drivers/ieee1394/hosts.c linux-2.6.32.28/drivers/ieee
7790 .transmit_packet = dummy_transmit_packet,
7791 .devctl = dummy_devctl,
7792 .isoctl = dummy_isoctl
7793 -diff -urNp linux-2.6.32.28/drivers/ieee1394/ohci1394.c linux-2.6.32.28/drivers/ieee1394/ohci1394.c
7794 ---- linux-2.6.32.28/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
7795 -+++ linux-2.6.32.28/drivers/ieee1394/ohci1394.c 2010-12-31 14:46:53.000000000 -0500
7796 +diff -urNp linux-2.6.32.29/drivers/ieee1394/ohci1394.c linux-2.6.32.29/drivers/ieee1394/ohci1394.c
7797 +--- linux-2.6.32.29/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
7798 ++++ linux-2.6.32.29/drivers/ieee1394/ohci1394.c 2010-12-31 14:46:53.000000000 -0500
7799 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
7800 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
7801
7802 @@ -26064,9 +26124,9 @@ diff -urNp linux-2.6.32.28/drivers/ieee1394/ohci1394.c linux-2.6.32.28/drivers/i
7803 };
7804
7805 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
7806 -diff -urNp linux-2.6.32.28/drivers/ieee1394/raw1394.c linux-2.6.32.28/drivers/ieee1394/raw1394.c
7807 ---- linux-2.6.32.28/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
7808 -+++ linux-2.6.32.28/drivers/ieee1394/raw1394.c 2010-12-31 14:46:53.000000000 -0500
7809 +diff -urNp linux-2.6.32.29/drivers/ieee1394/raw1394.c linux-2.6.32.29/drivers/ieee1394/raw1394.c
7810 +--- linux-2.6.32.29/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
7811 ++++ linux-2.6.32.29/drivers/ieee1394/raw1394.c 2010-12-31 14:46:53.000000000 -0500
7812 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
7813 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
7814 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
7815 @@ -26076,9 +26136,9 @@ diff -urNp linux-2.6.32.28/drivers/ieee1394/raw1394.c linux-2.6.32.28/drivers/ie
7816 };
7817
7818 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
7819 -diff -urNp linux-2.6.32.28/drivers/ieee1394/sbp2.c linux-2.6.32.28/drivers/ieee1394/sbp2.c
7820 ---- linux-2.6.32.28/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
7821 -+++ linux-2.6.32.28/drivers/ieee1394/sbp2.c 2010-12-31 14:46:53.000000000 -0500
7822 +diff -urNp linux-2.6.32.29/drivers/ieee1394/sbp2.c linux-2.6.32.29/drivers/ieee1394/sbp2.c
7823 +--- linux-2.6.32.29/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
7824 ++++ linux-2.6.32.29/drivers/ieee1394/sbp2.c 2010-12-31 14:46:53.000000000 -0500
7825 @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
7826 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
7827 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
7828 @@ -26097,9 +26157,9 @@ diff -urNp linux-2.6.32.28/drivers/ieee1394/sbp2.c linux-2.6.32.28/drivers/ieee1
7829 {
7830 int ret;
7831
7832 -diff -urNp linux-2.6.32.28/drivers/ieee1394/video1394.c linux-2.6.32.28/drivers/ieee1394/video1394.c
7833 ---- linux-2.6.32.28/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
7834 -+++ linux-2.6.32.28/drivers/ieee1394/video1394.c 2010-12-31 14:46:53.000000000 -0500
7835 +diff -urNp linux-2.6.32.29/drivers/ieee1394/video1394.c linux-2.6.32.29/drivers/ieee1394/video1394.c
7836 +--- linux-2.6.32.29/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
7837 ++++ linux-2.6.32.29/drivers/ieee1394/video1394.c 2010-12-31 14:46:53.000000000 -0500
7838 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
7839 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
7840 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
7841 @@ -26109,9 +26169,9 @@ diff -urNp linux-2.6.32.28/drivers/ieee1394/video1394.c linux-2.6.32.28/drivers/
7842 };
7843
7844 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
7845 -diff -urNp linux-2.6.32.28/drivers/infiniband/core/cm.c linux-2.6.32.28/drivers/infiniband/core/cm.c
7846 ---- linux-2.6.32.28/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
7847 -+++ linux-2.6.32.28/drivers/infiniband/core/cm.c 2010-12-31 14:46:53.000000000 -0500
7848 +diff -urNp linux-2.6.32.29/drivers/infiniband/core/cm.c linux-2.6.32.29/drivers/infiniband/core/cm.c
7849 +--- linux-2.6.32.29/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
7850 ++++ linux-2.6.32.29/drivers/infiniband/core/cm.c 2010-12-31 14:46:53.000000000 -0500
7851 @@ -112,7 +112,7 @@ static char const counter_group_names[CM
7852
7853 struct cm_counter_group {
7854 @@ -26255,9 +26315,9 @@ diff -urNp linux-2.6.32.28/drivers/infiniband/core/cm.c linux-2.6.32.28/drivers/
7855 .show = cm_show_counter
7856 };
7857
7858 -diff -urNp linux-2.6.32.28/drivers/infiniband/core/sysfs.c linux-2.6.32.28/drivers/infiniband/core/sysfs.c
7859 ---- linux-2.6.32.28/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
7860 -+++ linux-2.6.32.28/drivers/infiniband/core/sysfs.c 2010-12-31 14:46:53.000000000 -0500
7861 +diff -urNp linux-2.6.32.29/drivers/infiniband/core/sysfs.c linux-2.6.32.29/drivers/infiniband/core/sysfs.c
7862 +--- linux-2.6.32.29/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
7863 ++++ linux-2.6.32.29/drivers/infiniband/core/sysfs.c 2010-12-31 14:46:53.000000000 -0500
7864 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
7865 return port_attr->show(p, port_attr, buf);
7866 }
7867 @@ -26267,9 +26327,9 @@ diff -urNp linux-2.6.32.28/drivers/infiniband/core/sysfs.c linux-2.6.32.28/drive
7868 .show = port_attr_show
7869 };
7870
7871 -diff -urNp linux-2.6.32.28/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.28/drivers/infiniband/core/uverbs_marshall.c
7872 ---- linux-2.6.32.28/drivers/infiniband/core/uverbs_marshall.c 2010-08-13 16:24:37.000000000 -0400
7873 -+++ linux-2.6.32.28/drivers/infiniband/core/uverbs_marshall.c 2010-12-31 14:46:53.000000000 -0500
7874 +diff -urNp linux-2.6.32.29/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.29/drivers/infiniband/core/uverbs_marshall.c
7875 +--- linux-2.6.32.29/drivers/infiniband/core/uverbs_marshall.c 2010-08-13 16:24:37.000000000 -0400
7876 ++++ linux-2.6.32.29/drivers/infiniband/core/uverbs_marshall.c 2010-12-31 14:46:53.000000000 -0500
7877 @@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u
7878 dst->grh.sgid_index = src->grh.sgid_index;
7879 dst->grh.hop_limit = src->grh.hop_limit;
7880 @@ -26300,9 +26360,9 @@ diff -urNp linux-2.6.32.28/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3
7881 }
7882 EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
7883
7884 -diff -urNp linux-2.6.32.28/drivers/input/keyboard/atkbd.c linux-2.6.32.28/drivers/input/keyboard/atkbd.c
7885 ---- linux-2.6.32.28/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
7886 -+++ linux-2.6.32.28/drivers/input/keyboard/atkbd.c 2010-12-31 14:46:53.000000000 -0500
7887 +diff -urNp linux-2.6.32.29/drivers/input/keyboard/atkbd.c linux-2.6.32.29/drivers/input/keyboard/atkbd.c
7888 +--- linux-2.6.32.29/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
7889 ++++ linux-2.6.32.29/drivers/input/keyboard/atkbd.c 2010-12-31 14:46:53.000000000 -0500
7890 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
7891 .id = SERIO_ANY,
7892 .extra = SERIO_ANY,
7893 @@ -26312,9 +26372,9 @@ diff -urNp linux-2.6.32.28/drivers/input/keyboard/atkbd.c linux-2.6.32.28/driver
7894 };
7895
7896 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
7897 -diff -urNp linux-2.6.32.28/drivers/input/mouse/lifebook.c linux-2.6.32.28/drivers/input/mouse/lifebook.c
7898 ---- linux-2.6.32.28/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
7899 -+++ linux-2.6.32.28/drivers/input/mouse/lifebook.c 2010-12-31 14:46:53.000000000 -0500
7900 +diff -urNp linux-2.6.32.29/drivers/input/mouse/lifebook.c linux-2.6.32.29/drivers/input/mouse/lifebook.c
7901 +--- linux-2.6.32.29/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
7902 ++++ linux-2.6.32.29/drivers/input/mouse/lifebook.c 2010-12-31 14:46:53.000000000 -0500
7903 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
7904 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
7905 },
7906 @@ -26324,9 +26384,9 @@ diff -urNp linux-2.6.32.28/drivers/input/mouse/lifebook.c linux-2.6.32.28/driver
7907 };
7908
7909 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
7910 -diff -urNp linux-2.6.32.28/drivers/input/mouse/psmouse-base.c linux-2.6.32.28/drivers/input/mouse/psmouse-base.c
7911 ---- linux-2.6.32.28/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
7912 -+++ linux-2.6.32.28/drivers/input/mouse/psmouse-base.c 2010-12-31 14:46:53.000000000 -0500
7913 +diff -urNp linux-2.6.32.29/drivers/input/mouse/psmouse-base.c linux-2.6.32.29/drivers/input/mouse/psmouse-base.c
7914 +--- linux-2.6.32.29/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
7915 ++++ linux-2.6.32.29/drivers/input/mouse/psmouse-base.c 2010-12-31 14:46:53.000000000 -0500
7916 @@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
7917 .id = SERIO_ANY,
7918 .extra = SERIO_ANY,
7919 @@ -26336,9 +26396,9 @@ diff -urNp linux-2.6.32.28/drivers/input/mouse/psmouse-base.c linux-2.6.32.28/dr
7920 };
7921
7922 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
7923 -diff -urNp linux-2.6.32.28/drivers/input/mouse/synaptics.c linux-2.6.32.28/drivers/input/mouse/synaptics.c
7924 ---- linux-2.6.32.28/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
7925 -+++ linux-2.6.32.28/drivers/input/mouse/synaptics.c 2010-12-31 14:46:53.000000000 -0500
7926 +diff -urNp linux-2.6.32.29/drivers/input/mouse/synaptics.c linux-2.6.32.29/drivers/input/mouse/synaptics.c
7927 +--- linux-2.6.32.29/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
7928 ++++ linux-2.6.32.29/drivers/input/mouse/synaptics.c 2010-12-31 14:46:53.000000000 -0500
7929 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str
7930 break;
7931 case 2:
7932 @@ -26367,9 +26427,9 @@ diff -urNp linux-2.6.32.28/drivers/input/mouse/synaptics.c linux-2.6.32.28/drive
7933 };
7934 #endif
7935
7936 -diff -urNp linux-2.6.32.28/drivers/input/mousedev.c linux-2.6.32.28/drivers/input/mousedev.c
7937 ---- linux-2.6.32.28/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
7938 -+++ linux-2.6.32.28/drivers/input/mousedev.c 2010-12-31 14:46:53.000000000 -0500
7939 +diff -urNp linux-2.6.32.29/drivers/input/mousedev.c linux-2.6.32.29/drivers/input/mousedev.c
7940 +--- linux-2.6.32.29/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
7941 ++++ linux-2.6.32.29/drivers/input/mousedev.c 2010-12-31 14:46:53.000000000 -0500
7942 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
7943
7944 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
7945 @@ -26379,9 +26439,9 @@ diff -urNp linux-2.6.32.28/drivers/input/mousedev.c linux-2.6.32.28/drivers/inpu
7946 };
7947 static int psaux_registered;
7948 #endif
7949 -diff -urNp linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h
7950 ---- linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h 2010-12-09 18:13:03.000000000 -0500
7951 -+++ linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h 2010-12-31 14:46:53.000000000 -0500
7952 +diff -urNp linux-2.6.32.29/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.29/drivers/input/serio/i8042-x86ia64io.h
7953 +--- linux-2.6.32.29/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 15:56:54.000000000 -0500
7954 ++++ linux-2.6.32.29/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:04:30.000000000 -0500
7955 @@ -179,7 +179,7 @@ static const struct dmi_system_id __init
7956 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
7957 },
7958 @@ -26391,8 +26451,8 @@ diff -urNp linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.28
7959 };
7960
7961 /*
7962 -@@ -416,7 +416,7 @@ static const struct dmi_system_id __init
7963 - DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
7964 +@@ -423,7 +423,7 @@ static const struct dmi_system_id __init
7965 + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),
7966 },
7967 },
7968 - { }
7969 @@ -26400,7 +26460,7 @@ diff -urNp linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.28
7970 };
7971
7972 static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
7973 -@@ -490,7 +490,7 @@ static const struct dmi_system_id __init
7974 +@@ -497,7 +497,7 @@ static const struct dmi_system_id __init
7975 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
7976 },
7977 },
7978 @@ -26409,7 +26469,7 @@ diff -urNp linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.28
7979 };
7980
7981 #ifdef CONFIG_PNP
7982 -@@ -509,7 +509,7 @@ static const struct dmi_system_id __init
7983 +@@ -516,7 +516,7 @@ static const struct dmi_system_id __init
7984 DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
7985 },
7986 },
7987 @@ -26418,7 +26478,7 @@ diff -urNp linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.28
7988 };
7989
7990 static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
7991 -@@ -533,7 +533,7 @@ static const struct dmi_system_id __init
7992 +@@ -540,7 +540,7 @@ static const struct dmi_system_id __init
7993 DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
7994 },
7995 },
7996 @@ -26427,7 +26487,7 @@ diff -urNp linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.28
7997 };
7998 #endif
7999
8000 -@@ -607,7 +607,7 @@ static const struct dmi_system_id __init
8001 +@@ -625,7 +625,7 @@ static const struct dmi_system_id __init
8002 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
8003 },
8004 },
8005 @@ -26436,9 +26496,9 @@ diff -urNp linux-2.6.32.28/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.28
8006 };
8007
8008 #endif /* CONFIG_X86 */
8009 -diff -urNp linux-2.6.32.28/drivers/input/serio/serio_raw.c linux-2.6.32.28/drivers/input/serio/serio_raw.c
8010 ---- linux-2.6.32.28/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
8011 -+++ linux-2.6.32.28/drivers/input/serio/serio_raw.c 2010-12-31 14:46:53.000000000 -0500
8012 +diff -urNp linux-2.6.32.29/drivers/input/serio/serio_raw.c linux-2.6.32.29/drivers/input/serio/serio_raw.c
8013 +--- linux-2.6.32.29/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
8014 ++++ linux-2.6.32.29/drivers/input/serio/serio_raw.c 2010-12-31 14:46:53.000000000 -0500
8015 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
8016 .id = SERIO_ANY,
8017 .extra = SERIO_ANY,
8018 @@ -26448,9 +26508,9 @@ diff -urNp linux-2.6.32.28/drivers/input/serio/serio_raw.c linux-2.6.32.28/drive
8019 };
8020
8021 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
8022 -diff -urNp linux-2.6.32.28/drivers/isdn/gigaset/common.c linux-2.6.32.28/drivers/isdn/gigaset/common.c
8023 ---- linux-2.6.32.28/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
8024 -+++ linux-2.6.32.28/drivers/isdn/gigaset/common.c 2011-01-24 18:05:30.000000000 -0500
8025 +diff -urNp linux-2.6.32.29/drivers/isdn/gigaset/common.c linux-2.6.32.29/drivers/isdn/gigaset/common.c
8026 +--- linux-2.6.32.29/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
8027 ++++ linux-2.6.32.29/drivers/isdn/gigaset/common.c 2011-01-24 18:05:30.000000000 -0500
8028 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
8029 cs->commands_pending = 0;
8030 cs->cur_at_seq = 0;
8031 @@ -26460,9 +26520,9 @@ diff -urNp linux-2.6.32.28/drivers/isdn/gigaset/common.c linux-2.6.32.28/drivers
8032 cs->dev = NULL;
8033 cs->tty = NULL;
8034 cs->tty_dev = NULL;
8035 -diff -urNp linux-2.6.32.28/drivers/isdn/gigaset/gigaset.h linux-2.6.32.28/drivers/isdn/gigaset/gigaset.h
8036 ---- linux-2.6.32.28/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
8037 -+++ linux-2.6.32.28/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:47.000000000 -0500
8038 +diff -urNp linux-2.6.32.29/drivers/isdn/gigaset/gigaset.h linux-2.6.32.29/drivers/isdn/gigaset/gigaset.h
8039 +--- linux-2.6.32.29/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
8040 ++++ linux-2.6.32.29/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:47.000000000 -0500
8041 @@ -34,6 +34,7 @@
8042 #include <linux/tty_driver.h>
8043 #include <linux/list.h>
8044 @@ -26480,9 +26540,9 @@ diff -urNp linux-2.6.32.28/drivers/isdn/gigaset/gigaset.h linux-2.6.32.28/driver
8045 struct tty_struct *tty;
8046 struct tasklet_struct if_wake_tasklet;
8047 unsigned control_state;
8048 -diff -urNp linux-2.6.32.28/drivers/isdn/gigaset/interface.c linux-2.6.32.28/drivers/isdn/gigaset/interface.c
8049 ---- linux-2.6.32.28/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
8050 -+++ linux-2.6.32.28/drivers/isdn/gigaset/interface.c 2011-01-24 18:05:30.000000000 -0500
8051 +diff -urNp linux-2.6.32.29/drivers/isdn/gigaset/interface.c linux-2.6.32.29/drivers/isdn/gigaset/interface.c
8052 +--- linux-2.6.32.29/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
8053 ++++ linux-2.6.32.29/drivers/isdn/gigaset/interface.c 2011-01-24 18:05:30.000000000 -0500
8054 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
8055 return -ERESTARTSYS; // FIXME -EINTR?
8056 tty->driver_data = cs;
8057 @@ -26570,9 +26630,9 @@ diff -urNp linux-2.6.32.28/drivers/isdn/gigaset/interface.c linux-2.6.32.28/driv
8058 dev_warn(cs->dev, "%s: device not opened\n", __func__);
8059 goto out;
8060 }
8061 -diff -urNp linux-2.6.32.28/drivers/isdn/hardware/avm/b1.c linux-2.6.32.28/drivers/isdn/hardware/avm/b1.c
8062 ---- linux-2.6.32.28/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
8063 -+++ linux-2.6.32.28/drivers/isdn/hardware/avm/b1.c 2010-12-31 14:46:53.000000000 -0500
8064 +diff -urNp linux-2.6.32.29/drivers/isdn/hardware/avm/b1.c linux-2.6.32.29/drivers/isdn/hardware/avm/b1.c
8065 +--- linux-2.6.32.29/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
8066 ++++ linux-2.6.32.29/drivers/isdn/hardware/avm/b1.c 2010-12-31 14:46:53.000000000 -0500
8067 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
8068 }
8069 if (left) {
8070 @@ -26591,9 +26651,9 @@ diff -urNp linux-2.6.32.28/drivers/isdn/hardware/avm/b1.c linux-2.6.32.28/driver
8071 return -EFAULT;
8072 } else {
8073 memcpy(buf, dp, left);
8074 -diff -urNp linux-2.6.32.28/drivers/isdn/icn/icn.c linux-2.6.32.28/drivers/isdn/icn/icn.c
8075 ---- linux-2.6.32.28/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
8076 -+++ linux-2.6.32.28/drivers/isdn/icn/icn.c 2010-12-31 14:46:53.000000000 -0500
8077 +diff -urNp linux-2.6.32.29/drivers/isdn/icn/icn.c linux-2.6.32.29/drivers/isdn/icn/icn.c
8078 +--- linux-2.6.32.29/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
8079 ++++ linux-2.6.32.29/drivers/isdn/icn/icn.c 2010-12-31 14:46:53.000000000 -0500
8080 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
8081 if (count > len)
8082 count = len;
8083 @@ -26603,9 +26663,9 @@ diff -urNp linux-2.6.32.28/drivers/isdn/icn/icn.c linux-2.6.32.28/drivers/isdn/i
8084 return -EFAULT;
8085 } else
8086 memcpy(msg, buf, count);
8087 -diff -urNp linux-2.6.32.28/drivers/isdn/mISDN/socket.c linux-2.6.32.28/drivers/isdn/mISDN/socket.c
8088 ---- linux-2.6.32.28/drivers/isdn/mISDN/socket.c 2010-08-13 16:24:37.000000000 -0400
8089 -+++ linux-2.6.32.28/drivers/isdn/mISDN/socket.c 2010-12-31 14:46:53.000000000 -0500
8090 +diff -urNp linux-2.6.32.29/drivers/isdn/mISDN/socket.c linux-2.6.32.29/drivers/isdn/mISDN/socket.c
8091 +--- linux-2.6.32.29/drivers/isdn/mISDN/socket.c 2010-08-13 16:24:37.000000000 -0400
8092 ++++ linux-2.6.32.29/drivers/isdn/mISDN/socket.c 2010-12-31 14:46:53.000000000 -0500
8093 @@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
8094 if (dev) {
8095 struct mISDN_devinfo di;
8096 @@ -26622,9 +26682,9 @@ diff -urNp linux-2.6.32.28/drivers/isdn/mISDN/socket.c linux-2.6.32.28/drivers/i
8097 di.id = dev->id;
8098 di.Dprotocols = dev->Dprotocols;
8099 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
8100 -diff -urNp linux-2.6.32.28/drivers/isdn/sc/interrupt.c linux-2.6.32.28/drivers/isdn/sc/interrupt.c
8101 ---- linux-2.6.32.28/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400
8102 -+++ linux-2.6.32.28/drivers/isdn/sc/interrupt.c 2010-12-31 14:46:53.000000000 -0500
8103 +diff -urNp linux-2.6.32.29/drivers/isdn/sc/interrupt.c linux-2.6.32.29/drivers/isdn/sc/interrupt.c
8104 +--- linux-2.6.32.29/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400
8105 ++++ linux-2.6.32.29/drivers/isdn/sc/interrupt.c 2010-12-31 14:46:53.000000000 -0500
8106 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
8107 }
8108 else if(callid>=0x0000 && callid<=0x7FFF)
8109 @@ -26659,9 +26719,9 @@ diff -urNp linux-2.6.32.28/drivers/isdn/sc/interrupt.c linux-2.6.32.28/drivers/i
8110 continue;
8111 }
8112
8113 -diff -urNp linux-2.6.32.28/drivers/lguest/core.c linux-2.6.32.28/drivers/lguest/core.c
8114 ---- linux-2.6.32.28/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
8115 -+++ linux-2.6.32.28/drivers/lguest/core.c 2010-12-31 14:46:53.000000000 -0500
8116 +diff -urNp linux-2.6.32.29/drivers/lguest/core.c linux-2.6.32.29/drivers/lguest/core.c
8117 +--- linux-2.6.32.29/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
8118 ++++ linux-2.6.32.29/drivers/lguest/core.c 2010-12-31 14:46:53.000000000 -0500
8119 @@ -91,9 +91,17 @@ static __init int map_switcher(void)
8120 * it's worked so far. The end address needs +1 because __get_vm_area
8121 * allocates an extra guard page, so we need space for that.
8122 @@ -26689,9 +26749,9 @@ diff -urNp linux-2.6.32.28/drivers/lguest/core.c linux-2.6.32.28/drivers/lguest/
8123 end_switcher_text - start_switcher_text);
8124
8125 printk(KERN_INFO "lguest: mapped switcher at %p\n",
8126 -diff -urNp linux-2.6.32.28/drivers/lguest/x86/core.c linux-2.6.32.28/drivers/lguest/x86/core.c
8127 ---- linux-2.6.32.28/drivers/lguest/x86/core.c 2010-08-13 16:24:37.000000000 -0400
8128 -+++ linux-2.6.32.28/drivers/lguest/x86/core.c 2010-12-31 14:47:01.000000000 -0500
8129 +diff -urNp linux-2.6.32.29/drivers/lguest/x86/core.c linux-2.6.32.29/drivers/lguest/x86/core.c
8130 +--- linux-2.6.32.29/drivers/lguest/x86/core.c 2010-08-13 16:24:37.000000000 -0400
8131 ++++ linux-2.6.32.29/drivers/lguest/x86/core.c 2010-12-31 14:47:01.000000000 -0500
8132 @@ -59,7 +59,7 @@ static struct {
8133 /* Offset from where switcher.S was compiled to where we've copied it */
8134 static unsigned long switcher_offset(void)
8135 @@ -26733,9 +26793,9 @@ diff -urNp linux-2.6.32.28/drivers/lguest/x86/core.c linux-2.6.32.28/drivers/lgu
8136 lguest_entry.segment = LGUEST_CS;
8137
8138 /*
8139 -diff -urNp linux-2.6.32.28/drivers/lguest/x86/switcher_32.S linux-2.6.32.28/drivers/lguest/x86/switcher_32.S
8140 ---- linux-2.6.32.28/drivers/lguest/x86/switcher_32.S 2010-08-13 16:24:37.000000000 -0400
8141 -+++ linux-2.6.32.28/drivers/lguest/x86/switcher_32.S 2010-12-31 14:47:01.000000000 -0500
8142 +diff -urNp linux-2.6.32.29/drivers/lguest/x86/switcher_32.S linux-2.6.32.29/drivers/lguest/x86/switcher_32.S
8143 +--- linux-2.6.32.29/drivers/lguest/x86/switcher_32.S 2010-08-13 16:24:37.000000000 -0400
8144 ++++ linux-2.6.32.29/drivers/lguest/x86/switcher_32.S 2010-12-31 14:47:01.000000000 -0500
8145 @@ -87,6 +87,7 @@
8146 #include <asm/page.h>
8147 #include <asm/segment.h>
8148 @@ -26794,9 +26854,9 @@ diff -urNp linux-2.6.32.28/drivers/lguest/x86/switcher_32.S linux-2.6.32.28/driv
8149
8150 // Every interrupt can come to us here
8151 // But we must truly tell each apart.
8152 -diff -urNp linux-2.6.32.28/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.28/drivers/macintosh/via-pmu-backlight.c
8153 ---- linux-2.6.32.28/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
8154 -+++ linux-2.6.32.28/drivers/macintosh/via-pmu-backlight.c 2010-12-31 14:46:53.000000000 -0500
8155 +diff -urNp linux-2.6.32.29/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.29/drivers/macintosh/via-pmu-backlight.c
8156 +--- linux-2.6.32.29/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
8157 ++++ linux-2.6.32.29/drivers/macintosh/via-pmu-backlight.c 2010-12-31 14:46:53.000000000 -0500
8158 @@ -15,7 +15,7 @@
8159
8160 #define MAX_PMU_LEVEL 0xFF
8161 @@ -26815,9 +26875,9 @@ diff -urNp linux-2.6.32.28/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.28
8162 .get_brightness = pmu_backlight_get_brightness,
8163 .update_status = pmu_backlight_update_status,
8164
8165 -diff -urNp linux-2.6.32.28/drivers/macintosh/via-pmu.c linux-2.6.32.28/drivers/macintosh/via-pmu.c
8166 ---- linux-2.6.32.28/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
8167 -+++ linux-2.6.32.28/drivers/macintosh/via-pmu.c 2010-12-31 14:46:53.000000000 -0500
8168 +diff -urNp linux-2.6.32.29/drivers/macintosh/via-pmu.c linux-2.6.32.29/drivers/macintosh/via-pmu.c
8169 +--- linux-2.6.32.29/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
8170 ++++ linux-2.6.32.29/drivers/macintosh/via-pmu.c 2010-12-31 14:46:53.000000000 -0500
8171 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
8172 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
8173 }
8174 @@ -26827,9 +26887,9 @@ diff -urNp linux-2.6.32.28/drivers/macintosh/via-pmu.c linux-2.6.32.28/drivers/m
8175 .enter = powerbook_sleep,
8176 .valid = pmu_sleep_valid,
8177 };
8178 -diff -urNp linux-2.6.32.28/drivers/md/bitmap.c linux-2.6.32.28/drivers/md/bitmap.c
8179 ---- linux-2.6.32.28/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
8180 -+++ linux-2.6.32.28/drivers/md/bitmap.c 2010-12-31 14:46:53.000000000 -0500
8181 +diff -urNp linux-2.6.32.29/drivers/md/bitmap.c linux-2.6.32.29/drivers/md/bitmap.c
8182 +--- linux-2.6.32.29/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
8183 ++++ linux-2.6.32.29/drivers/md/bitmap.c 2010-12-31 14:46:53.000000000 -0500
8184 @@ -58,7 +58,7 @@
8185 # if DEBUG > 0
8186 # define PRINTK(x...) printk(KERN_DEBUG x)
8187 @@ -26839,9 +26899,9 @@ diff -urNp linux-2.6.32.28/drivers/md/bitmap.c linux-2.6.32.28/drivers/md/bitmap
8188 # endif
8189 #endif
8190
8191 -diff -urNp linux-2.6.32.28/drivers/md/dm-sysfs.c linux-2.6.32.28/drivers/md/dm-sysfs.c
8192 ---- linux-2.6.32.28/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
8193 -+++ linux-2.6.32.28/drivers/md/dm-sysfs.c 2010-12-31 14:46:53.000000000 -0500
8194 +diff -urNp linux-2.6.32.29/drivers/md/dm-sysfs.c linux-2.6.32.29/drivers/md/dm-sysfs.c
8195 +--- linux-2.6.32.29/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
8196 ++++ linux-2.6.32.29/drivers/md/dm-sysfs.c 2010-12-31 14:46:53.000000000 -0500
8197 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
8198 NULL,
8199 };
8200 @@ -26851,9 +26911,9 @@ diff -urNp linux-2.6.32.28/drivers/md/dm-sysfs.c linux-2.6.32.28/drivers/md/dm-s
8201 .show = dm_attr_show,
8202 };
8203
8204 -diff -urNp linux-2.6.32.28/drivers/md/dm-table.c linux-2.6.32.28/drivers/md/dm-table.c
8205 ---- linux-2.6.32.28/drivers/md/dm-table.c 2011-01-11 23:55:35.000000000 -0500
8206 -+++ linux-2.6.32.28/drivers/md/dm-table.c 2011-01-11 23:56:03.000000000 -0500
8207 +diff -urNp linux-2.6.32.29/drivers/md/dm-table.c linux-2.6.32.29/drivers/md/dm-table.c
8208 +--- linux-2.6.32.29/drivers/md/dm-table.c 2011-01-11 23:55:35.000000000 -0500
8209 ++++ linux-2.6.32.29/drivers/md/dm-table.c 2011-01-11 23:56:03.000000000 -0500
8210 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
8211 if (!dev_size)
8212 return 0;
8213 @@ -26863,9 +26923,9 @@ diff -urNp linux-2.6.32.28/drivers/md/dm-table.c linux-2.6.32.28/drivers/md/dm-t
8214 DMWARN("%s: %s too small for target: "
8215 "start=%llu, len=%llu, dev_size=%llu",
8216 dm_device_name(ti->table->md), bdevname(bdev, b),
8217 -diff -urNp linux-2.6.32.28/drivers/md/md.c linux-2.6.32.28/drivers/md/md.c
8218 ---- linux-2.6.32.28/drivers/md/md.c 2011-01-11 23:55:35.000000000 -0500
8219 -+++ linux-2.6.32.28/drivers/md/md.c 2011-01-11 23:56:03.000000000 -0500
8220 +diff -urNp linux-2.6.32.29/drivers/md/md.c linux-2.6.32.29/drivers/md/md.c
8221 +--- linux-2.6.32.29/drivers/md/md.c 2011-02-22 15:56:54.000000000 -0500
8222 ++++ linux-2.6.32.29/drivers/md/md.c 2011-02-22 15:57:23.000000000 -0500
8223 @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
8224 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
8225 kfree(rdev);
8226 @@ -26894,7 +26954,7 @@ diff -urNp linux-2.6.32.28/drivers/md/md.c linux-2.6.32.28/drivers/md/md.c
8227 return err;
8228 }
8229
8230 -@@ -6039,7 +6040,7 @@ static int md_seq_show(struct seq_file *
8231 +@@ -6040,7 +6041,7 @@ static int md_seq_show(struct seq_file *
8232 chunk_kb ? "KB" : "B");
8233 if (bitmap->file) {
8234 seq_printf(seq, ", file: ");
8235 @@ -26903,7 +26963,7 @@ diff -urNp linux-2.6.32.28/drivers/md/md.c linux-2.6.32.28/drivers/md/md.c
8236 }
8237
8238 seq_printf(seq, "\n");
8239 -@@ -6133,7 +6134,7 @@ static int is_mddev_idle(mddev_t *mddev,
8240 +@@ -6134,7 +6135,7 @@ static int is_mddev_idle(mddev_t *mddev,
8241 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
8242 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
8243 (int)part_stat_read(&disk->part0, sectors[1]) -
8244 @@ -26912,9 +26972,9 @@ diff -urNp linux-2.6.32.28/drivers/md/md.c linux-2.6.32.28/drivers/md/md.c
8245 /* sync IO will cause sync_io to increase before the disk_stats
8246 * as sync_io is counted when a request starts, and
8247 * disk_stats is counted when it completes.
8248 -diff -urNp linux-2.6.32.28/drivers/md/md.h linux-2.6.32.28/drivers/md/md.h
8249 ---- linux-2.6.32.28/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
8250 -+++ linux-2.6.32.28/drivers/md/md.h 2010-12-31 14:46:53.000000000 -0500
8251 +diff -urNp linux-2.6.32.29/drivers/md/md.h linux-2.6.32.29/drivers/md/md.h
8252 +--- linux-2.6.32.29/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
8253 ++++ linux-2.6.32.29/drivers/md/md.h 2010-12-31 14:46:53.000000000 -0500
8254 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
8255
8256 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
8257 @@ -26924,9 +26984,9 @@ diff -urNp linux-2.6.32.28/drivers/md/md.h linux-2.6.32.28/drivers/md/md.h
8258 }
8259
8260 struct mdk_personality
8261 -diff -urNp linux-2.6.32.28/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.28/drivers/media/dvb/dvb-core/dvbdev.c
8262 ---- linux-2.6.32.28/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
8263 -+++ linux-2.6.32.28/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-31 14:46:53.000000000 -0500
8264 +diff -urNp linux-2.6.32.29/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.29/drivers/media/dvb/dvb-core/dvbdev.c
8265 +--- linux-2.6.32.29/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
8266 ++++ linux-2.6.32.29/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-31 14:46:53.000000000 -0500
8267 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
8268 const struct dvb_device *template, void *priv, int type)
8269 {
8270 @@ -26935,9 +26995,9 @@ diff -urNp linux-2.6.32.28/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.28/d
8271 struct file_operations *dvbdevfops;
8272 struct device *clsdev;
8273 int minor;
8274 -diff -urNp linux-2.6.32.28/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.32.28/drivers/media/dvb/ttpci/av7110_ca.c
8275 ---- linux-2.6.32.28/drivers/media/dvb/ttpci/av7110_ca.c 2010-08-13 16:24:37.000000000 -0400
8276 -+++ linux-2.6.32.28/drivers/media/dvb/ttpci/av7110_ca.c 2011-01-24 18:12:30.000000000 -0500
8277 +diff -urNp linux-2.6.32.29/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.32.29/drivers/media/dvb/ttpci/av7110_ca.c
8278 +--- linux-2.6.32.29/drivers/media/dvb/ttpci/av7110_ca.c 2010-08-13 16:24:37.000000000 -0400
8279 ++++ linux-2.6.32.29/drivers/media/dvb/ttpci/av7110_ca.c 2011-01-24 18:12:30.000000000 -0500
8280 @@ -277,7 +277,7 @@ static int dvb_ca_ioctl(struct inode *in
8281 {
8282 ca_slot_info_t *info=(ca_slot_info_t *)parg;
8283 @@ -26947,9 +27007,9 @@ diff -urNp linux-2.6.32.28/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.32.28/d
8284 return -EINVAL;
8285 av7110->ci_slot[info->num].num = info->num;
8286 av7110->ci_slot[info->num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ?
8287 -diff -urNp linux-2.6.32.28/drivers/media/radio/radio-cadet.c linux-2.6.32.28/drivers/media/radio/radio-cadet.c
8288 ---- linux-2.6.32.28/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
8289 -+++ linux-2.6.32.28/drivers/media/radio/radio-cadet.c 2010-12-31 14:46:53.000000000 -0500
8290 +diff -urNp linux-2.6.32.29/drivers/media/radio/radio-cadet.c linux-2.6.32.29/drivers/media/radio/radio-cadet.c
8291 +--- linux-2.6.32.29/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
8292 ++++ linux-2.6.32.29/drivers/media/radio/radio-cadet.c 2010-12-31 14:46:53.000000000 -0500
8293 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
8294 while (i < count && dev->rdsin != dev->rdsout)
8295 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
8296 @@ -26959,9 +27019,9 @@ diff -urNp linux-2.6.32.28/drivers/media/radio/radio-cadet.c linux-2.6.32.28/dri
8297 return -EFAULT;
8298 return i;
8299 }
8300 -diff -urNp linux-2.6.32.28/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.28/drivers/media/video/usbvideo/konicawc.c
8301 ---- linux-2.6.32.28/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
8302 -+++ linux-2.6.32.28/drivers/media/video/usbvideo/konicawc.c 2010-12-31 14:46:53.000000000 -0500
8303 +diff -urNp linux-2.6.32.29/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.29/drivers/media/video/usbvideo/konicawc.c
8304 +--- linux-2.6.32.29/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
8305 ++++ linux-2.6.32.29/drivers/media/video/usbvideo/konicawc.c 2010-12-31 14:46:53.000000000 -0500
8306 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru
8307 int error;
8308
8309 @@ -26971,9 +27031,9 @@ diff -urNp linux-2.6.32.28/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
8310
8311 cam->input = input_dev = input_allocate_device();
8312 if (!input_dev) {
8313 -diff -urNp linux-2.6.32.28/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.28/drivers/media/video/usbvideo/quickcam_messenger.c
8314 ---- linux-2.6.32.28/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
8315 -+++ linux-2.6.32.28/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-31 14:46:53.000000000 -0500
8316 +diff -urNp linux-2.6.32.29/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.29/drivers/media/video/usbvideo/quickcam_messenger.c
8317 +--- linux-2.6.32.29/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
8318 ++++ linux-2.6.32.29/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-31 14:46:53.000000000 -0500
8319 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
8320 int error;
8321
8322 @@ -26983,9 +27043,9 @@ diff -urNp linux-2.6.32.28/drivers/media/video/usbvideo/quickcam_messenger.c lin
8323
8324 cam->input = input_dev = input_allocate_device();
8325 if (!input_dev) {
8326 -diff -urNp linux-2.6.32.28/drivers/message/fusion/mptbase.c linux-2.6.32.28/drivers/message/fusion/mptbase.c
8327 ---- linux-2.6.32.28/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
8328 -+++ linux-2.6.32.28/drivers/message/fusion/mptbase.c 2010-12-31 14:46:53.000000000 -0500
8329 +diff -urNp linux-2.6.32.29/drivers/message/fusion/mptbase.c linux-2.6.32.29/drivers/message/fusion/mptbase.c
8330 +--- linux-2.6.32.29/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
8331 ++++ linux-2.6.32.29/drivers/message/fusion/mptbase.c 2010-12-31 14:46:53.000000000 -0500
8332 @@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
8333 len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
8334 len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
8335 @@ -27001,9 +27061,9 @@ diff -urNp linux-2.6.32.28/drivers/message/fusion/mptbase.c linux-2.6.32.28/driv
8336 /*
8337 * Rounding UP to nearest 4-kB boundary here...
8338 */
8339 -diff -urNp linux-2.6.32.28/drivers/message/fusion/mptdebug.h linux-2.6.32.28/drivers/message/fusion/mptdebug.h
8340 ---- linux-2.6.32.28/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
8341 -+++ linux-2.6.32.28/drivers/message/fusion/mptdebug.h 2010-12-31 14:46:53.000000000 -0500
8342 +diff -urNp linux-2.6.32.29/drivers/message/fusion/mptdebug.h linux-2.6.32.29/drivers/message/fusion/mptdebug.h
8343 +--- linux-2.6.32.29/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
8344 ++++ linux-2.6.32.29/drivers/message/fusion/mptdebug.h 2010-12-31 14:46:53.000000000 -0500
8345 @@ -71,7 +71,7 @@
8346 CMD; \
8347 }
8348 @@ -27013,9 +27073,9 @@ diff -urNp linux-2.6.32.28/drivers/message/fusion/mptdebug.h linux-2.6.32.28/dri
8349 #endif
8350
8351
8352 -diff -urNp linux-2.6.32.28/drivers/message/fusion/mptsas.c linux-2.6.32.28/drivers/message/fusion/mptsas.c
8353 ---- linux-2.6.32.28/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
8354 -+++ linux-2.6.32.28/drivers/message/fusion/mptsas.c 2010-12-31 14:46:53.000000000 -0500
8355 +diff -urNp linux-2.6.32.29/drivers/message/fusion/mptsas.c linux-2.6.32.29/drivers/message/fusion/mptsas.c
8356 +--- linux-2.6.32.29/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
8357 ++++ linux-2.6.32.29/drivers/message/fusion/mptsas.c 2010-12-31 14:46:53.000000000 -0500
8358 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
8359 return 0;
8360 }
8361 @@ -27064,9 +27124,9 @@ diff -urNp linux-2.6.32.28/drivers/message/fusion/mptsas.c linux-2.6.32.28/drive
8362 static inline struct sas_port *
8363 mptsas_get_port(struct mptsas_phyinfo *phy_info)
8364 {
8365 -diff -urNp linux-2.6.32.28/drivers/message/fusion/mptscsih.c linux-2.6.32.28/drivers/message/fusion/mptscsih.c
8366 ---- linux-2.6.32.28/drivers/message/fusion/mptscsih.c 2010-09-26 17:26:05.000000000 -0400
8367 -+++ linux-2.6.32.28/drivers/message/fusion/mptscsih.c 2010-12-31 14:46:53.000000000 -0500
8368 +diff -urNp linux-2.6.32.29/drivers/message/fusion/mptscsih.c linux-2.6.32.29/drivers/message/fusion/mptscsih.c
8369 +--- linux-2.6.32.29/drivers/message/fusion/mptscsih.c 2010-09-26 17:26:05.000000000 -0400
8370 ++++ linux-2.6.32.29/drivers/message/fusion/mptscsih.c 2010-12-31 14:46:53.000000000 -0500
8371 @@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
8372
8373 h = shost_priv(SChost);
8374 @@ -27092,9 +27152,9 @@ diff -urNp linux-2.6.32.28/drivers/message/fusion/mptscsih.c linux-2.6.32.28/dri
8375
8376 return h->info_kbuf;
8377 }
8378 -diff -urNp linux-2.6.32.28/drivers/message/i2o/i2o_proc.c linux-2.6.32.28/drivers/message/i2o/i2o_proc.c
8379 ---- linux-2.6.32.28/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
8380 -+++ linux-2.6.32.28/drivers/message/i2o/i2o_proc.c 2010-12-31 14:46:53.000000000 -0500
8381 +diff -urNp linux-2.6.32.29/drivers/message/i2o/i2o_proc.c linux-2.6.32.29/drivers/message/i2o/i2o_proc.c
8382 +--- linux-2.6.32.29/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
8383 ++++ linux-2.6.32.29/drivers/message/i2o/i2o_proc.c 2010-12-31 14:46:53.000000000 -0500
8384 @@ -259,13 +259,6 @@ static char *scsi_devices[] = {
8385 "Array Controller Device"
8386 };
8387 @@ -27181,9 +27241,9 @@ diff -urNp linux-2.6.32.28/drivers/message/i2o/i2o_proc.c linux-2.6.32.28/driver
8388
8389 return 0;
8390 }
8391 -diff -urNp linux-2.6.32.28/drivers/misc/kgdbts.c linux-2.6.32.28/drivers/misc/kgdbts.c
8392 ---- linux-2.6.32.28/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
8393 -+++ linux-2.6.32.28/drivers/misc/kgdbts.c 2010-12-31 14:46:53.000000000 -0500
8394 +diff -urNp linux-2.6.32.29/drivers/misc/kgdbts.c linux-2.6.32.29/drivers/misc/kgdbts.c
8395 +--- linux-2.6.32.29/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
8396 ++++ linux-2.6.32.29/drivers/misc/kgdbts.c 2010-12-31 14:46:53.000000000 -0500
8397 @@ -118,7 +118,7 @@
8398 } while (0)
8399 #define MAX_CONFIG_LEN 40
8400 @@ -27202,9 +27262,9 @@ diff -urNp linux-2.6.32.28/drivers/misc/kgdbts.c linux-2.6.32.28/drivers/misc/kg
8401 .name = "kgdbts",
8402 .read_char = kgdbts_get_char,
8403 .write_char = kgdbts_put_char,
8404 -diff -urNp linux-2.6.32.28/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.28/drivers/misc/sgi-gru/gruhandles.c
8405 ---- linux-2.6.32.28/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
8406 -+++ linux-2.6.32.28/drivers/misc/sgi-gru/gruhandles.c 2010-12-31 14:46:53.000000000 -0500
8407 +diff -urNp linux-2.6.32.29/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.29/drivers/misc/sgi-gru/gruhandles.c
8408 +--- linux-2.6.32.29/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
8409 ++++ linux-2.6.32.29/drivers/misc/sgi-gru/gruhandles.c 2010-12-31 14:46:53.000000000 -0500
8410 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
8411
8412 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
8413 @@ -27216,9 +27276,9 @@ diff -urNp linux-2.6.32.28/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.28/dri
8414 if (mcs_op_statistics[op].max < clks)
8415 mcs_op_statistics[op].max = clks;
8416 }
8417 -diff -urNp linux-2.6.32.28/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.28/drivers/misc/sgi-gru/gruprocfs.c
8418 ---- linux-2.6.32.28/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
8419 -+++ linux-2.6.32.28/drivers/misc/sgi-gru/gruprocfs.c 2010-12-31 14:46:53.000000000 -0500
8420 +diff -urNp linux-2.6.32.29/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.29/drivers/misc/sgi-gru/gruprocfs.c
8421 +--- linux-2.6.32.29/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
8422 ++++ linux-2.6.32.29/drivers/misc/sgi-gru/gruprocfs.c 2010-12-31 14:46:53.000000000 -0500
8423 @@ -32,9 +32,9 @@
8424
8425 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
8426 @@ -27242,9 +27302,9 @@ diff -urNp linux-2.6.32.28/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.28/driv
8427 max = mcs_op_statistics[op].max;
8428 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
8429 count ? total / count : 0, max);
8430 -diff -urNp linux-2.6.32.28/drivers/misc/sgi-gru/grutables.h linux-2.6.32.28/drivers/misc/sgi-gru/grutables.h
8431 ---- linux-2.6.32.28/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
8432 -+++ linux-2.6.32.28/drivers/misc/sgi-gru/grutables.h 2010-12-31 14:46:53.000000000 -0500
8433 +diff -urNp linux-2.6.32.29/drivers/misc/sgi-gru/grutables.h linux-2.6.32.29/drivers/misc/sgi-gru/grutables.h
8434 +--- linux-2.6.32.29/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
8435 ++++ linux-2.6.32.29/drivers/misc/sgi-gru/grutables.h 2010-12-31 14:46:53.000000000 -0500
8436 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
8437 * GRU statistics.
8438 */
8439 @@ -27428,9 +27488,9 @@ diff -urNp linux-2.6.32.28/drivers/misc/sgi-gru/grutables.h linux-2.6.32.28/driv
8440 } while (0)
8441
8442 #ifdef CONFIG_SGI_GRU_DEBUG
8443 -diff -urNp linux-2.6.32.28/drivers/mtd/devices/doc2000.c linux-2.6.32.28/drivers/mtd/devices/doc2000.c
8444 ---- linux-2.6.32.28/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
8445 -+++ linux-2.6.32.28/drivers/mtd/devices/doc2000.c 2010-12-31 14:46:53.000000000 -0500
8446 +diff -urNp linux-2.6.32.29/drivers/mtd/devices/doc2000.c linux-2.6.32.29/drivers/mtd/devices/doc2000.c
8447 +--- linux-2.6.32.29/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
8448 ++++ linux-2.6.32.29/drivers/mtd/devices/doc2000.c 2010-12-31 14:46:53.000000000 -0500
8449 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
8450
8451 /* The ECC will not be calculated correctly if less than 512 is written */
8452 @@ -27440,9 +27500,9 @@ diff -urNp linux-2.6.32.28/drivers/mtd/devices/doc2000.c linux-2.6.32.28/drivers
8453 printk(KERN_WARNING
8454 "ECC needs a full sector write (adr: %lx size %lx)\n",
8455 (long) to, (long) len);
8456 -diff -urNp linux-2.6.32.28/drivers/mtd/devices/doc2001.c linux-2.6.32.28/drivers/mtd/devices/doc2001.c
8457 ---- linux-2.6.32.28/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
8458 -+++ linux-2.6.32.28/drivers/mtd/devices/doc2001.c 2010-12-31 14:46:53.000000000 -0500
8459 +diff -urNp linux-2.6.32.29/drivers/mtd/devices/doc2001.c linux-2.6.32.29/drivers/mtd/devices/doc2001.c
8460 +--- linux-2.6.32.29/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
8461 ++++ linux-2.6.32.29/drivers/mtd/devices/doc2001.c 2010-12-31 14:46:53.000000000 -0500
8462 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
8463 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
8464
8465 @@ -27452,9 +27512,9 @@ diff -urNp linux-2.6.32.28/drivers/mtd/devices/doc2001.c linux-2.6.32.28/drivers
8466 return -EINVAL;
8467
8468 /* Don't allow a single read to cross a 512-byte block boundary */
8469 -diff -urNp linux-2.6.32.28/drivers/mtd/ubi/build.c linux-2.6.32.28/drivers/mtd/ubi/build.c
8470 ---- linux-2.6.32.28/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
8471 -+++ linux-2.6.32.28/drivers/mtd/ubi/build.c 2010-12-31 14:46:53.000000000 -0500
8472 +diff -urNp linux-2.6.32.29/drivers/mtd/ubi/build.c linux-2.6.32.29/drivers/mtd/ubi/build.c
8473 +--- linux-2.6.32.29/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
8474 ++++ linux-2.6.32.29/drivers/mtd/ubi/build.c 2010-12-31 14:46:53.000000000 -0500
8475 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
8476 static int __init bytes_str_to_int(const char *str)
8477 {
8478 @@ -27494,9 +27554,9 @@ diff -urNp linux-2.6.32.28/drivers/mtd/ubi/build.c linux-2.6.32.28/drivers/mtd/u
8479 }
8480
8481 /**
8482 -diff -urNp linux-2.6.32.28/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.28/drivers/net/cxgb3/cxgb3_main.c
8483 ---- linux-2.6.32.28/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
8484 -+++ linux-2.6.32.28/drivers/net/cxgb3/cxgb3_main.c 2010-12-31 14:46:53.000000000 -0500
8485 +diff -urNp linux-2.6.32.29/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.29/drivers/net/cxgb3/cxgb3_main.c
8486 +--- linux-2.6.32.29/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
8487 ++++ linux-2.6.32.29/drivers/net/cxgb3/cxgb3_main.c 2010-12-31 14:46:53.000000000 -0500
8488 @@ -2275,7 +2275,7 @@ static int cxgb_extension_ioctl(struct n
8489 case CHELSIO_GET_QSET_NUM:{
8490 struct ch_reg edata;
8491 @@ -27506,9 +27566,9 @@ diff -urNp linux-2.6.32.28/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.28/driver
8492
8493 edata.cmd = CHELSIO_GET_QSET_NUM;
8494 edata.val = pi->nqsets;
8495 -diff -urNp linux-2.6.32.28/drivers/net/e1000e/82571.c linux-2.6.32.28/drivers/net/e1000e/82571.c
8496 ---- linux-2.6.32.28/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
8497 -+++ linux-2.6.32.28/drivers/net/e1000e/82571.c 2010-12-31 14:46:53.000000000 -0500
8498 +diff -urNp linux-2.6.32.29/drivers/net/e1000e/82571.c linux-2.6.32.29/drivers/net/e1000e/82571.c
8499 +--- linux-2.6.32.29/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
8500 ++++ linux-2.6.32.29/drivers/net/e1000e/82571.c 2010-12-31 14:46:53.000000000 -0500
8501 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
8502 {
8503 struct e1000_hw *hw = &adapter->hw;
8504 @@ -27562,9 +27622,9 @@ diff -urNp linux-2.6.32.28/drivers/net/e1000e/82571.c linux-2.6.32.28/drivers/ne
8505 .acquire_nvm = e1000_acquire_nvm_82571,
8506 .read_nvm = e1000e_read_nvm_eerd,
8507 .release_nvm = e1000_release_nvm_82571,
8508 -diff -urNp linux-2.6.32.28/drivers/net/e1000e/e1000.h linux-2.6.32.28/drivers/net/e1000e/e1000.h
8509 ---- linux-2.6.32.28/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
8510 -+++ linux-2.6.32.28/drivers/net/e1000e/e1000.h 2010-12-31 14:46:53.000000000 -0500
8511 +diff -urNp linux-2.6.32.29/drivers/net/e1000e/e1000.h linux-2.6.32.29/drivers/net/e1000e/e1000.h
8512 +--- linux-2.6.32.29/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
8513 ++++ linux-2.6.32.29/drivers/net/e1000e/e1000.h 2010-12-31 14:46:53.000000000 -0500
8514 @@ -375,9 +375,9 @@ struct e1000_info {
8515 u32 pba;
8516 u32 max_hw_frame_size;
8517 @@ -27578,9 +27638,9 @@ diff -urNp linux-2.6.32.28/drivers/net/e1000e/e1000.h linux-2.6.32.28/drivers/ne
8518 };
8519
8520 /* hardware capability, feature, and workaround flags */
8521 -diff -urNp linux-2.6.32.28/drivers/net/e1000e/es2lan.c linux-2.6.32.28/drivers/net/e1000e/es2lan.c
8522 ---- linux-2.6.32.28/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
8523 -+++ linux-2.6.32.28/drivers/net/e1000e/es2lan.c 2010-12-31 14:46:53.000000000 -0500
8524 +diff -urNp linux-2.6.32.29/drivers/net/e1000e/es2lan.c linux-2.6.32.29/drivers/net/e1000e/es2lan.c
8525 +--- linux-2.6.32.29/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
8526 ++++ linux-2.6.32.29/drivers/net/e1000e/es2lan.c 2010-12-31 14:46:53.000000000 -0500
8527 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
8528 {
8529 struct e1000_hw *hw = &adapter->hw;
8530 @@ -27616,9 +27676,9 @@ diff -urNp linux-2.6.32.28/drivers/net/e1000e/es2lan.c linux-2.6.32.28/drivers/n
8531 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
8532 .read_nvm = e1000e_read_nvm_eerd,
8533 .release_nvm = e1000_release_nvm_80003es2lan,
8534 -diff -urNp linux-2.6.32.28/drivers/net/e1000e/hw.h linux-2.6.32.28/drivers/net/e1000e/hw.h
8535 ---- linux-2.6.32.28/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
8536 -+++ linux-2.6.32.28/drivers/net/e1000e/hw.h 2010-12-31 14:46:53.000000000 -0500
8537 +diff -urNp linux-2.6.32.29/drivers/net/e1000e/hw.h linux-2.6.32.29/drivers/net/e1000e/hw.h
8538 +--- linux-2.6.32.29/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
8539 ++++ linux-2.6.32.29/drivers/net/e1000e/hw.h 2010-12-31 14:46:53.000000000 -0500
8540 @@ -756,34 +756,34 @@ struct e1000_mac_operations {
8541
8542 /* Function pointers for the PHY. */
8543 @@ -27678,9 +27738,9 @@ diff -urNp linux-2.6.32.28/drivers/net/e1000e/hw.h linux-2.6.32.28/drivers/net/e
8544 };
8545
8546 struct e1000_mac_info {
8547 -diff -urNp linux-2.6.32.28/drivers/net/e1000e/ich8lan.c linux-2.6.32.28/drivers/net/e1000e/ich8lan.c
8548 ---- linux-2.6.32.28/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
8549 -+++ linux-2.6.32.28/drivers/net/e1000e/ich8lan.c 2010-12-31 14:46:53.000000000 -0500
8550 +diff -urNp linux-2.6.32.29/drivers/net/e1000e/ich8lan.c linux-2.6.32.29/drivers/net/e1000e/ich8lan.c
8551 +--- linux-2.6.32.29/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
8552 ++++ linux-2.6.32.29/drivers/net/e1000e/ich8lan.c 2010-12-31 14:46:53.000000000 -0500
8553 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
8554 }
8555 }
8556 @@ -27708,9 +27768,9 @@ diff -urNp linux-2.6.32.28/drivers/net/e1000e/ich8lan.c linux-2.6.32.28/drivers/
8557 .acquire_nvm = e1000_acquire_nvm_ich8lan,
8558 .read_nvm = e1000_read_nvm_ich8lan,
8559 .release_nvm = e1000_release_nvm_ich8lan,
8560 -diff -urNp linux-2.6.32.28/drivers/net/eql.c linux-2.6.32.28/drivers/net/eql.c
8561 ---- linux-2.6.32.28/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
8562 -+++ linux-2.6.32.28/drivers/net/eql.c 2010-12-31 14:46:53.000000000 -0500
8563 +diff -urNp linux-2.6.32.29/drivers/net/eql.c linux-2.6.32.29/drivers/net/eql.c
8564 +--- linux-2.6.32.29/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
8565 ++++ linux-2.6.32.29/drivers/net/eql.c 2010-12-31 14:46:53.000000000 -0500
8566 @@ -554,7 +554,7 @@ static int eql_g_master_cfg(struct net_d
8567 equalizer_t *eql;
8568 master_config_t mc;
8569 @@ -27720,9 +27780,9 @@ diff -urNp linux-2.6.32.28/drivers/net/eql.c linux-2.6.32.28/drivers/net/eql.c
8570
8571 if (eql_is_master(dev)) {
8572 eql = netdev_priv(dev);
8573 -diff -urNp linux-2.6.32.28/drivers/net/ibmveth.c linux-2.6.32.28/drivers/net/ibmveth.c
8574 ---- linux-2.6.32.28/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
8575 -+++ linux-2.6.32.28/drivers/net/ibmveth.c 2010-12-31 14:46:53.000000000 -0500
8576 +diff -urNp linux-2.6.32.29/drivers/net/ibmveth.c linux-2.6.32.29/drivers/net/ibmveth.c
8577 +--- linux-2.6.32.29/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
8578 ++++ linux-2.6.32.29/drivers/net/ibmveth.c 2010-12-31 14:46:53.000000000 -0500
8579 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
8580 NULL,
8581 };
8582 @@ -27732,9 +27792,9 @@ diff -urNp linux-2.6.32.28/drivers/net/ibmveth.c linux-2.6.32.28/drivers/net/ibm
8583 .show = veth_pool_show,
8584 .store = veth_pool_store,
8585 };
8586 -diff -urNp linux-2.6.32.28/drivers/net/igb/e1000_82575.c linux-2.6.32.28/drivers/net/igb/e1000_82575.c
8587 ---- linux-2.6.32.28/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
8588 -+++ linux-2.6.32.28/drivers/net/igb/e1000_82575.c 2010-12-31 14:46:53.000000000 -0500
8589 +diff -urNp linux-2.6.32.29/drivers/net/igb/e1000_82575.c linux-2.6.32.29/drivers/net/igb/e1000_82575.c
8590 +--- linux-2.6.32.29/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
8591 ++++ linux-2.6.32.29/drivers/net/igb/e1000_82575.c 2010-12-31 14:46:53.000000000 -0500
8592 @@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
8593 wr32(E1000_VT_CTL, vt_ctl);
8594 }
8595 @@ -27760,9 +27820,9 @@ diff -urNp linux-2.6.32.28/drivers/net/igb/e1000_82575.c linux-2.6.32.28/drivers
8596 .acquire = igb_acquire_nvm_82575,
8597 .read = igb_read_nvm_eerd,
8598 .release = igb_release_nvm_82575,
8599 -diff -urNp linux-2.6.32.28/drivers/net/igb/e1000_hw.h linux-2.6.32.28/drivers/net/igb/e1000_hw.h
8600 ---- linux-2.6.32.28/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
8601 -+++ linux-2.6.32.28/drivers/net/igb/e1000_hw.h 2010-12-31 14:46:53.000000000 -0500
8602 +diff -urNp linux-2.6.32.29/drivers/net/igb/e1000_hw.h linux-2.6.32.29/drivers/net/igb/e1000_hw.h
8603 +--- linux-2.6.32.29/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
8604 ++++ linux-2.6.32.29/drivers/net/igb/e1000_hw.h 2010-12-31 14:46:53.000000000 -0500
8605 @@ -305,17 +305,17 @@ struct e1000_phy_operations {
8606 };
8607
8608 @@ -27788,9 +27848,9 @@ diff -urNp linux-2.6.32.28/drivers/net/igb/e1000_hw.h linux-2.6.32.28/drivers/ne
8609 };
8610
8611 extern const struct e1000_info e1000_82575_info;
8612 -diff -urNp linux-2.6.32.28/drivers/net/irda/vlsi_ir.c linux-2.6.32.28/drivers/net/irda/vlsi_ir.c
8613 ---- linux-2.6.32.28/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
8614 -+++ linux-2.6.32.28/drivers/net/irda/vlsi_ir.c 2010-12-31 14:46:53.000000000 -0500
8615 +diff -urNp linux-2.6.32.29/drivers/net/irda/vlsi_ir.c linux-2.6.32.29/drivers/net/irda/vlsi_ir.c
8616 +--- linux-2.6.32.29/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
8617 ++++ linux-2.6.32.29/drivers/net/irda/vlsi_ir.c 2010-12-31 14:46:53.000000000 -0500
8618 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
8619 /* no race - tx-ring already empty */
8620 vlsi_set_baud(idev, iobase);
8621 @@ -27807,9 +27867,9 @@ diff -urNp linux-2.6.32.28/drivers/net/irda/vlsi_ir.c linux-2.6.32.28/drivers/ne
8622 spin_unlock_irqrestore(&idev->lock, flags);
8623 dev_kfree_skb_any(skb);
8624 return NETDEV_TX_OK;
8625 -diff -urNp linux-2.6.32.28/drivers/net/iseries_veth.c linux-2.6.32.28/drivers/net/iseries_veth.c
8626 ---- linux-2.6.32.28/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
8627 -+++ linux-2.6.32.28/drivers/net/iseries_veth.c 2010-12-31 14:46:53.000000000 -0500
8628 +diff -urNp linux-2.6.32.29/drivers/net/iseries_veth.c linux-2.6.32.29/drivers/net/iseries_veth.c
8629 +--- linux-2.6.32.29/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
8630 ++++ linux-2.6.32.29/drivers/net/iseries_veth.c 2010-12-31 14:46:53.000000000 -0500
8631 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
8632 NULL
8633 };
8634 @@ -27828,9 +27888,9 @@ diff -urNp linux-2.6.32.28/drivers/net/iseries_veth.c linux-2.6.32.28/drivers/ne
8635 .show = veth_port_attribute_show
8636 };
8637
8638 -diff -urNp linux-2.6.32.28/drivers/net/pcnet32.c linux-2.6.32.28/drivers/net/pcnet32.c
8639 ---- linux-2.6.32.28/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
8640 -+++ linux-2.6.32.28/drivers/net/pcnet32.c 2010-12-31 14:46:53.000000000 -0500
8641 +diff -urNp linux-2.6.32.29/drivers/net/pcnet32.c linux-2.6.32.29/drivers/net/pcnet32.c
8642 +--- linux-2.6.32.29/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
8643 ++++ linux-2.6.32.29/drivers/net/pcnet32.c 2010-12-31 14:46:53.000000000 -0500
8644 @@ -79,7 +79,7 @@ static int cards_found;
8645 /*
8646 * VLB I/O addresses
8647 @@ -27840,9 +27900,9 @@ diff -urNp linux-2.6.32.28/drivers/net/pcnet32.c linux-2.6.32.28/drivers/net/pcn
8648 { 0x300, 0x320, 0x340, 0x360, 0 };
8649
8650 static int pcnet32_debug = 0;
8651 -diff -urNp linux-2.6.32.28/drivers/net/tg3.h linux-2.6.32.28/drivers/net/tg3.h
8652 ---- linux-2.6.32.28/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
8653 -+++ linux-2.6.32.28/drivers/net/tg3.h 2010-12-31 14:46:53.000000000 -0500
8654 +diff -urNp linux-2.6.32.29/drivers/net/tg3.h linux-2.6.32.29/drivers/net/tg3.h
8655 +--- linux-2.6.32.29/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
8656 ++++ linux-2.6.32.29/drivers/net/tg3.h 2010-12-31 14:46:53.000000000 -0500
8657 @@ -95,6 +95,7 @@
8658 #define CHIPREV_ID_5750_A0 0x4000
8659 #define CHIPREV_ID_5750_A1 0x4001
8660 @@ -27851,9 +27911,9 @@ diff -urNp linux-2.6.32.28/drivers/net/tg3.h linux-2.6.32.28/drivers/net/tg3.h
8661 #define CHIPREV_ID_5750_C2 0x4202
8662 #define CHIPREV_ID_5752_A0_HW 0x5000
8663 #define CHIPREV_ID_5752_A0 0x6000
8664 -diff -urNp linux-2.6.32.28/drivers/net/tulip/de4x5.c linux-2.6.32.28/drivers/net/tulip/de4x5.c
8665 ---- linux-2.6.32.28/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
8666 -+++ linux-2.6.32.28/drivers/net/tulip/de4x5.c 2010-12-31 14:46:53.000000000 -0500
8667 +diff -urNp linux-2.6.32.29/drivers/net/tulip/de4x5.c linux-2.6.32.29/drivers/net/tulip/de4x5.c
8668 +--- linux-2.6.32.29/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
8669 ++++ linux-2.6.32.29/drivers/net/tulip/de4x5.c 2010-12-31 14:46:53.000000000 -0500
8670 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
8671 for (i=0; i<ETH_ALEN; i++) {
8672 tmp.addr[i] = dev->dev_addr[i];
8673 @@ -27881,9 +27941,9 @@ diff -urNp linux-2.6.32.28/drivers/net/tulip/de4x5.c linux-2.6.32.28/drivers/net
8674 break;
8675
8676 #define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
8677 -diff -urNp linux-2.6.32.28/drivers/net/usb/hso.c linux-2.6.32.28/drivers/net/usb/hso.c
8678 ---- linux-2.6.32.28/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
8679 -+++ linux-2.6.32.28/drivers/net/usb/hso.c 2011-01-24 18:05:30.000000000 -0500
8680 +diff -urNp linux-2.6.32.29/drivers/net/usb/hso.c linux-2.6.32.29/drivers/net/usb/hso.c
8681 +--- linux-2.6.32.29/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
8682 ++++ linux-2.6.32.29/drivers/net/usb/hso.c 2011-01-24 18:05:30.000000000 -0500
8683 @@ -71,7 +71,7 @@
8684 #include <asm/byteorder.h>
8685 #include <linux/serial_core.h>
8686 @@ -27985,9 +28045,9 @@ diff -urNp linux-2.6.32.28/drivers/net/usb/hso.c linux-2.6.32.28/drivers/net/usb
8687 result =
8688 hso_start_serial_device(serial_table[i], GFP_NOIO);
8689 hso_kick_transmit(dev2ser(serial_table[i]));
8690 -diff -urNp linux-2.6.32.28/drivers/net/wireless/b43/debugfs.c linux-2.6.32.28/drivers/net/wireless/b43/debugfs.c
8691 ---- linux-2.6.32.28/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8692 -+++ linux-2.6.32.28/drivers/net/wireless/b43/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8693 +diff -urNp linux-2.6.32.29/drivers/net/wireless/b43/debugfs.c linux-2.6.32.29/drivers/net/wireless/b43/debugfs.c
8694 +--- linux-2.6.32.29/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8695 ++++ linux-2.6.32.29/drivers/net/wireless/b43/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8696 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
8697 struct b43_debugfs_fops {
8698 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
8699 @@ -27997,9 +28057,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/b43/debugfs.c linux-2.6.32.28/dr
8700 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
8701 size_t file_struct_offset;
8702 };
8703 -diff -urNp linux-2.6.32.28/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.28/drivers/net/wireless/b43legacy/debugfs.c
8704 ---- linux-2.6.32.28/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8705 -+++ linux-2.6.32.28/drivers/net/wireless/b43legacy/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8706 +diff -urNp linux-2.6.32.29/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.29/drivers/net/wireless/b43legacy/debugfs.c
8707 +--- linux-2.6.32.29/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8708 ++++ linux-2.6.32.29/drivers/net/wireless/b43legacy/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8709 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
8710 struct b43legacy_debugfs_fops {
8711 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
8712 @@ -28009,9 +28069,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
8713 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
8714 size_t file_struct_offset;
8715 /* Take wl->irq_lock before calling read/write? */
8716 -diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-1000.c
8717 ---- linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
8718 -+++ linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-31 14:46:53.000000000 -0500
8719 +diff -urNp linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-1000.c
8720 +--- linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
8721 ++++ linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-31 14:46:53.000000000 -0500
8722 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
8723 },
8724 };
8725 @@ -28021,9 +28081,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
8726 .ucode = &iwl5000_ucode,
8727 .lib = &iwl1000_lib,
8728 .hcmd = &iwl5000_hcmd,
8729 -diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-3945.c
8730 ---- linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
8731 -+++ linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-31 14:46:53.000000000 -0500
8732 +diff -urNp linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-3945.c
8733 +--- linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
8734 ++++ linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-31 14:46:53.000000000 -0500
8735 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
8736 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
8737 };
8738 @@ -28033,9 +28093,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
8739 .ucode = &iwl3945_ucode,
8740 .lib = &iwl3945_lib,
8741 .hcmd = &iwl3945_hcmd,
8742 -diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-4965.c
8743 ---- linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
8744 -+++ linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-31 14:46:53.000000000 -0500
8745 +diff -urNp linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-4965.c
8746 +--- linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
8747 ++++ linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-31 14:46:53.000000000 -0500
8748 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
8749 },
8750 };
8751 @@ -28045,9 +28105,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
8752 .ucode = &iwl4965_ucode,
8753 .lib = &iwl4965_lib,
8754 .hcmd = &iwl4965_hcmd,
8755 -diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-5000.c
8756 ---- linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
8757 -+++ linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-31 14:46:53.000000000 -0500
8758 +diff -urNp linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-5000.c
8759 +--- linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
8760 ++++ linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-31 14:46:53.000000000 -0500
8761 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
8762 },
8763 };
8764 @@ -28065,9 +28125,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
8765 .ucode = &iwl5000_ucode,
8766 .lib = &iwl5150_lib,
8767 .hcmd = &iwl5000_hcmd,
8768 -diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-6000.c
8769 ---- linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
8770 -+++ linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-31 14:46:53.000000000 -0500
8771 +diff -urNp linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-6000.c
8772 +--- linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
8773 ++++ linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-31 14:46:53.000000000 -0500
8774 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
8775 .calc_rssi = iwl5000_calc_rssi,
8776 };
8777 @@ -28077,9 +28137,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
8778 .ucode = &iwl5000_ucode,
8779 .lib = &iwl6000_lib,
8780 .hcmd = &iwl5000_hcmd,
8781 -diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-debug.h
8782 ---- linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
8783 -+++ linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-31 14:46:53.000000000 -0500
8784 +diff -urNp linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-debug.h
8785 +--- linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
8786 ++++ linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-31 14:46:53.000000000 -0500
8787 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
8788 #endif
8789
8790 @@ -28091,9 +28151,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
8791 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
8792 void *p, u32 len)
8793 {}
8794 -diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-dev.h
8795 ---- linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
8796 -+++ linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-31 14:46:53.000000000 -0500
8797 +diff -urNp linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-dev.h
8798 +--- linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
8799 ++++ linux-2.6.32.29/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-31 14:46:53.000000000 -0500
8800 @@ -68,7 +68,7 @@ struct iwl_tx_queue;
8801
8802 /* shared structures from iwl-5000.c */
8803 @@ -28103,9 +28163,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.2
8804 extern struct iwl_ucode_ops iwl5000_ucode;
8805 extern struct iwl_lib_ops iwl5000_lib;
8806 extern struct iwl_hcmd_ops iwl5000_hcmd;
8807 -diff -urNp linux-2.6.32.28/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.28/drivers/net/wireless/libertas/debugfs.c
8808 ---- linux-2.6.32.28/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8809 -+++ linux-2.6.32.28/drivers/net/wireless/libertas/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8810 +diff -urNp linux-2.6.32.29/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.29/drivers/net/wireless/libertas/debugfs.c
8811 +--- linux-2.6.32.29/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
8812 ++++ linux-2.6.32.29/drivers/net/wireless/libertas/debugfs.c 2010-12-31 14:46:53.000000000 -0500
8813 @@ -708,7 +708,7 @@ out_unlock:
8814 struct lbs_debugfs_files {
8815 const char *name;
8816 @@ -28115,9 +28175,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
8817 };
8818
8819 static const struct lbs_debugfs_files debugfs_files[] = {
8820 -diff -urNp linux-2.6.32.28/drivers/net/wireless/rndis_wlan.c linux-2.6.32.28/drivers/net/wireless/rndis_wlan.c
8821 ---- linux-2.6.32.28/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
8822 -+++ linux-2.6.32.28/drivers/net/wireless/rndis_wlan.c 2010-12-31 14:46:53.000000000 -0500
8823 +diff -urNp linux-2.6.32.29/drivers/net/wireless/rndis_wlan.c linux-2.6.32.29/drivers/net/wireless/rndis_wlan.c
8824 +--- linux-2.6.32.29/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
8825 ++++ linux-2.6.32.29/drivers/net/wireless/rndis_wlan.c 2010-12-31 14:46:53.000000000 -0500
8826 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
8827
8828 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
8829 @@ -28127,9 +28187,9 @@ diff -urNp linux-2.6.32.28/drivers/net/wireless/rndis_wlan.c linux-2.6.32.28/dri
8830 rts_threshold = 2347;
8831
8832 tmp = cpu_to_le32(rts_threshold);
8833 -diff -urNp linux-2.6.32.28/drivers/oprofile/buffer_sync.c linux-2.6.32.28/drivers/oprofile/buffer_sync.c
8834 ---- linux-2.6.32.28/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
8835 -+++ linux-2.6.32.28/drivers/oprofile/buffer_sync.c 2010-12-31 14:46:53.000000000 -0500
8836 +diff -urNp linux-2.6.32.29/drivers/oprofile/buffer_sync.c linux-2.6.32.29/drivers/oprofile/buffer_sync.c
8837 +--- linux-2.6.32.29/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
8838 ++++ linux-2.6.32.29/drivers/oprofile/buffer_sync.c 2010-12-31 14:46:53.000000000 -0500
8839 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
8840 if (cookie == NO_COOKIE)
8841 offset = pc;
8842 @@ -28165,9 +28225,9 @@ diff -urNp linux-2.6.32.28/drivers/oprofile/buffer_sync.c linux-2.6.32.28/driver
8843 }
8844 }
8845 release_mm(mm);
8846 -diff -urNp linux-2.6.32.28/drivers/oprofile/event_buffer.c linux-2.6.32.28/drivers/oprofile/event_buffer.c
8847 ---- linux-2.6.32.28/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
8848 -+++ linux-2.6.32.28/drivers/oprofile/event_buffer.c 2010-12-31 14:46:53.000000000 -0500
8849 +diff -urNp linux-2.6.32.29/drivers/oprofile/event_buffer.c linux-2.6.32.29/drivers/oprofile/event_buffer.c
8850 +--- linux-2.6.32.29/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
8851 ++++ linux-2.6.32.29/drivers/oprofile/event_buffer.c 2010-12-31 14:46:53.000000000 -0500
8852 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
8853 }
8854
8855 @@ -28177,9 +28237,9 @@ diff -urNp linux-2.6.32.28/drivers/oprofile/event_buffer.c linux-2.6.32.28/drive
8856 return;
8857 }
8858
8859 -diff -urNp linux-2.6.32.28/drivers/oprofile/oprof.c linux-2.6.32.28/drivers/oprofile/oprof.c
8860 ---- linux-2.6.32.28/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
8861 -+++ linux-2.6.32.28/drivers/oprofile/oprof.c 2010-12-31 14:46:53.000000000 -0500
8862 +diff -urNp linux-2.6.32.29/drivers/oprofile/oprof.c linux-2.6.32.29/drivers/oprofile/oprof.c
8863 +--- linux-2.6.32.29/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
8864 ++++ linux-2.6.32.29/drivers/oprofile/oprof.c 2010-12-31 14:46:53.000000000 -0500
8865 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
8866 if (oprofile_ops.switch_events())
8867 return;
8868 @@ -28189,9 +28249,9 @@ diff -urNp linux-2.6.32.28/drivers/oprofile/oprof.c linux-2.6.32.28/drivers/opro
8869 start_switch_worker();
8870 }
8871
8872 -diff -urNp linux-2.6.32.28/drivers/oprofile/oprofilefs.c linux-2.6.32.28/drivers/oprofile/oprofilefs.c
8873 ---- linux-2.6.32.28/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
8874 -+++ linux-2.6.32.28/drivers/oprofile/oprofilefs.c 2010-12-31 14:46:53.000000000 -0500
8875 +diff -urNp linux-2.6.32.29/drivers/oprofile/oprofilefs.c linux-2.6.32.29/drivers/oprofile/oprofilefs.c
8876 +--- linux-2.6.32.29/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
8877 ++++ linux-2.6.32.29/drivers/oprofile/oprofilefs.c 2010-12-31 14:46:53.000000000 -0500
8878 @@ -187,7 +187,7 @@ static const struct file_operations atom
8879
8880
8881 @@ -28201,9 +28261,9 @@ diff -urNp linux-2.6.32.28/drivers/oprofile/oprofilefs.c linux-2.6.32.28/drivers
8882 {
8883 struct dentry *d = __oprofilefs_create_file(sb, root, name,
8884 &atomic_ro_fops, 0444);
8885 -diff -urNp linux-2.6.32.28/drivers/oprofile/oprofile_stats.c linux-2.6.32.28/drivers/oprofile/oprofile_stats.c
8886 ---- linux-2.6.32.28/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
8887 -+++ linux-2.6.32.28/drivers/oprofile/oprofile_stats.c 2010-12-31 14:46:53.000000000 -0500
8888 +diff -urNp linux-2.6.32.29/drivers/oprofile/oprofile_stats.c linux-2.6.32.29/drivers/oprofile/oprofile_stats.c
8889 +--- linux-2.6.32.29/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
8890 ++++ linux-2.6.32.29/drivers/oprofile/oprofile_stats.c 2010-12-31 14:46:53.000000000 -0500
8891 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
8892 cpu_buf->sample_invalid_eip = 0;
8893 }
8894 @@ -28221,9 +28281,9 @@ diff -urNp linux-2.6.32.28/drivers/oprofile/oprofile_stats.c linux-2.6.32.28/dri
8895 }
8896
8897
8898 -diff -urNp linux-2.6.32.28/drivers/oprofile/oprofile_stats.h linux-2.6.32.28/drivers/oprofile/oprofile_stats.h
8899 ---- linux-2.6.32.28/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
8900 -+++ linux-2.6.32.28/drivers/oprofile/oprofile_stats.h 2010-12-31 14:46:53.000000000 -0500
8901 +diff -urNp linux-2.6.32.29/drivers/oprofile/oprofile_stats.h linux-2.6.32.29/drivers/oprofile/oprofile_stats.h
8902 +--- linux-2.6.32.29/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
8903 ++++ linux-2.6.32.29/drivers/oprofile/oprofile_stats.h 2010-12-31 14:46:53.000000000 -0500
8904 @@ -13,11 +13,11 @@
8905 #include <asm/atomic.h>
8906
8907 @@ -28241,9 +28301,9 @@ diff -urNp linux-2.6.32.28/drivers/oprofile/oprofile_stats.h linux-2.6.32.28/dri
8908 };
8909
8910 extern struct oprofile_stat_struct oprofile_stats;
8911 -diff -urNp linux-2.6.32.28/drivers/parisc/pdc_stable.c linux-2.6.32.28/drivers/parisc/pdc_stable.c
8912 ---- linux-2.6.32.28/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
8913 -+++ linux-2.6.32.28/drivers/parisc/pdc_stable.c 2010-12-31 14:46:53.000000000 -0500
8914 +diff -urNp linux-2.6.32.29/drivers/parisc/pdc_stable.c linux-2.6.32.29/drivers/parisc/pdc_stable.c
8915 +--- linux-2.6.32.29/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
8916 ++++ linux-2.6.32.29/drivers/parisc/pdc_stable.c 2010-12-31 14:46:53.000000000 -0500
8917 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
8918 return ret;
8919 }
8920 @@ -28253,9 +28313,9 @@ diff -urNp linux-2.6.32.28/drivers/parisc/pdc_stable.c linux-2.6.32.28/drivers/p
8921 .show = pdcspath_attr_show,
8922 .store = pdcspath_attr_store,
8923 };
8924 -diff -urNp linux-2.6.32.28/drivers/parport/procfs.c linux-2.6.32.28/drivers/parport/procfs.c
8925 ---- linux-2.6.32.28/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
8926 -+++ linux-2.6.32.28/drivers/parport/procfs.c 2010-12-31 14:46:53.000000000 -0500
8927 +diff -urNp linux-2.6.32.29/drivers/parport/procfs.c linux-2.6.32.29/drivers/parport/procfs.c
8928 +--- linux-2.6.32.29/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
8929 ++++ linux-2.6.32.29/drivers/parport/procfs.c 2010-12-31 14:46:53.000000000 -0500
8930 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
8931
8932 *ppos += len;
8933 @@ -28274,9 +28334,9 @@ diff -urNp linux-2.6.32.28/drivers/parport/procfs.c linux-2.6.32.28/drivers/parp
8934 }
8935 #endif /* IEEE1284.3 support. */
8936
8937 -diff -urNp linux-2.6.32.28/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.28/drivers/pci/hotplug/acpiphp_glue.c
8938 ---- linux-2.6.32.28/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
8939 -+++ linux-2.6.32.28/drivers/pci/hotplug/acpiphp_glue.c 2010-12-31 14:46:53.000000000 -0500
8940 +diff -urNp linux-2.6.32.29/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.29/drivers/pci/hotplug/acpiphp_glue.c
8941 +--- linux-2.6.32.29/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
8942 ++++ linux-2.6.32.29/drivers/pci/hotplug/acpiphp_glue.c 2010-12-31 14:46:53.000000000 -0500
8943 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
8944 }
8945
8946 @@ -28286,9 +28346,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.28/dr
8947 .handler = handle_hotplug_event_func,
8948 };
8949
8950 -diff -urNp linux-2.6.32.28/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.28/drivers/pci/hotplug/cpqphp_nvram.c
8951 ---- linux-2.6.32.28/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
8952 -+++ linux-2.6.32.28/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-31 14:46:53.000000000 -0500
8953 +diff -urNp linux-2.6.32.29/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.29/drivers/pci/hotplug/cpqphp_nvram.c
8954 +--- linux-2.6.32.29/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
8955 ++++ linux-2.6.32.29/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-31 14:46:53.000000000 -0500
8956 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
8957
8958 void compaq_nvram_init (void __iomem *rom_start)
8959 @@ -28303,9 +28363,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.28/dr
8960 dbg("int15 entry = %p\n", compaq_int15_entry_point);
8961
8962 /* initialize our int15 lock */
8963 -diff -urNp linux-2.6.32.28/drivers/pci/hotplug/fakephp.c linux-2.6.32.28/drivers/pci/hotplug/fakephp.c
8964 ---- linux-2.6.32.28/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
8965 -+++ linux-2.6.32.28/drivers/pci/hotplug/fakephp.c 2010-12-31 14:46:53.000000000 -0500
8966 +diff -urNp linux-2.6.32.29/drivers/pci/hotplug/fakephp.c linux-2.6.32.29/drivers/pci/hotplug/fakephp.c
8967 +--- linux-2.6.32.29/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
8968 ++++ linux-2.6.32.29/drivers/pci/hotplug/fakephp.c 2010-12-31 14:46:53.000000000 -0500
8969 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
8970 }
8971
8972 @@ -28315,9 +28375,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/hotplug/fakephp.c linux-2.6.32.28/drivers
8973 .store = legacy_store, .show = legacy_show
8974 },
8975 .release = &legacy_release,
8976 -diff -urNp linux-2.6.32.28/drivers/pci/intel-iommu.c linux-2.6.32.28/drivers/pci/intel-iommu.c
8977 ---- linux-2.6.32.28/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
8978 -+++ linux-2.6.32.28/drivers/pci/intel-iommu.c 2010-12-31 14:46:53.000000000 -0500
8979 +diff -urNp linux-2.6.32.29/drivers/pci/intel-iommu.c linux-2.6.32.29/drivers/pci/intel-iommu.c
8980 +--- linux-2.6.32.29/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
8981 ++++ linux-2.6.32.29/drivers/pci/intel-iommu.c 2010-12-31 14:46:53.000000000 -0500
8982 @@ -2643,7 +2643,7 @@ error:
8983 return 0;
8984 }
8985 @@ -28387,9 +28447,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/intel-iommu.c linux-2.6.32.28/drivers/pci
8986 .alloc_coherent = intel_alloc_coherent,
8987 .free_coherent = intel_free_coherent,
8988 .map_sg = intel_map_sg,
8989 -diff -urNp linux-2.6.32.28/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.28/drivers/pci/pcie/portdrv_pci.c
8990 ---- linux-2.6.32.28/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
8991 -+++ linux-2.6.32.28/drivers/pci/pcie/portdrv_pci.c 2010-12-31 14:46:53.000000000 -0500
8992 +diff -urNp linux-2.6.32.29/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.29/drivers/pci/pcie/portdrv_pci.c
8993 +--- linux-2.6.32.29/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
8994 ++++ linux-2.6.32.29/drivers/pci/pcie/portdrv_pci.c 2010-12-31 14:46:53.000000000 -0500
8995 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
8996 static const struct pci_device_id port_pci_ids[] = { {
8997 /* handle any PCI-Express port */
8998 @@ -28399,9 +28459,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.28/driver
8999 };
9000 MODULE_DEVICE_TABLE(pci, port_pci_ids);
9001
9002 -diff -urNp linux-2.6.32.28/drivers/pci/probe.c linux-2.6.32.28/drivers/pci/probe.c
9003 ---- linux-2.6.32.28/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
9004 -+++ linux-2.6.32.28/drivers/pci/probe.c 2010-12-31 14:46:53.000000000 -0500
9005 +diff -urNp linux-2.6.32.29/drivers/pci/probe.c linux-2.6.32.29/drivers/pci/probe.c
9006 +--- linux-2.6.32.29/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
9007 ++++ linux-2.6.32.29/drivers/pci/probe.c 2010-12-31 14:46:53.000000000 -0500
9008 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
9009 return ret;
9010 }
9011 @@ -28419,9 +28479,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/probe.c linux-2.6.32.28/drivers/pci/probe
9012 struct device_attribute *attr,
9013 char *buf)
9014 {
9015 -diff -urNp linux-2.6.32.28/drivers/pci/proc.c linux-2.6.32.28/drivers/pci/proc.c
9016 ---- linux-2.6.32.28/drivers/pci/proc.c 2010-12-09 18:13:03.000000000 -0500
9017 -+++ linux-2.6.32.28/drivers/pci/proc.c 2010-12-31 14:46:53.000000000 -0500
9018 +diff -urNp linux-2.6.32.29/drivers/pci/proc.c linux-2.6.32.29/drivers/pci/proc.c
9019 +--- linux-2.6.32.29/drivers/pci/proc.c 2010-12-09 18:13:03.000000000 -0500
9020 ++++ linux-2.6.32.29/drivers/pci/proc.c 2010-12-31 14:46:53.000000000 -0500
9021 @@ -480,7 +480,16 @@ static const struct file_operations proc
9022 static int __init pci_proc_init(void)
9023 {
9024 @@ -28439,9 +28499,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/proc.c linux-2.6.32.28/drivers/pci/proc.c
9025 proc_create("devices", 0, proc_bus_pci_dir,
9026 &proc_bus_pci_dev_operations);
9027 proc_initialized = 1;
9028 -diff -urNp linux-2.6.32.28/drivers/pci/slot.c linux-2.6.32.28/drivers/pci/slot.c
9029 ---- linux-2.6.32.28/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
9030 -+++ linux-2.6.32.28/drivers/pci/slot.c 2010-12-31 14:46:53.000000000 -0500
9031 +diff -urNp linux-2.6.32.29/drivers/pci/slot.c linux-2.6.32.29/drivers/pci/slot.c
9032 +--- linux-2.6.32.29/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
9033 ++++ linux-2.6.32.29/drivers/pci/slot.c 2010-12-31 14:46:53.000000000 -0500
9034 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
9035 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
9036 }
9037 @@ -28451,9 +28511,9 @@ diff -urNp linux-2.6.32.28/drivers/pci/slot.c linux-2.6.32.28/drivers/pci/slot.c
9038 .show = pci_slot_attr_show,
9039 .store = pci_slot_attr_store,
9040 };
9041 -diff -urNp linux-2.6.32.28/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.28/drivers/pcmcia/pcmcia_ioctl.c
9042 ---- linux-2.6.32.28/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
9043 -+++ linux-2.6.32.28/drivers/pcmcia/pcmcia_ioctl.c 2010-12-31 14:46:53.000000000 -0500
9044 +diff -urNp linux-2.6.32.29/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.29/drivers/pcmcia/pcmcia_ioctl.c
9045 +--- linux-2.6.32.29/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
9046 ++++ linux-2.6.32.29/drivers/pcmcia/pcmcia_ioctl.c 2010-12-31 14:46:53.000000000 -0500
9047 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
9048 return -EFAULT;
9049 }
9050 @@ -28463,9 +28523,9 @@ diff -urNp linux-2.6.32.28/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.28/drivers
9051 if (!buf)
9052 return -ENOMEM;
9053
9054 -diff -urNp linux-2.6.32.28/drivers/pcmcia/ti113x.h linux-2.6.32.28/drivers/pcmcia/ti113x.h
9055 ---- linux-2.6.32.28/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
9056 -+++ linux-2.6.32.28/drivers/pcmcia/ti113x.h 2010-12-31 14:46:53.000000000 -0500
9057 +diff -urNp linux-2.6.32.29/drivers/pcmcia/ti113x.h linux-2.6.32.29/drivers/pcmcia/ti113x.h
9058 +--- linux-2.6.32.29/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
9059 ++++ linux-2.6.32.29/drivers/pcmcia/ti113x.h 2010-12-31 14:46:53.000000000 -0500
9060 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
9061 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
9062 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
9063 @@ -28475,9 +28535,9 @@ diff -urNp linux-2.6.32.28/drivers/pcmcia/ti113x.h linux-2.6.32.28/drivers/pcmci
9064 };
9065
9066 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
9067 -diff -urNp linux-2.6.32.28/drivers/pcmcia/yenta_socket.c linux-2.6.32.28/drivers/pcmcia/yenta_socket.c
9068 ---- linux-2.6.32.28/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
9069 -+++ linux-2.6.32.28/drivers/pcmcia/yenta_socket.c 2010-12-31 14:46:53.000000000 -0500
9070 +diff -urNp linux-2.6.32.29/drivers/pcmcia/yenta_socket.c linux-2.6.32.29/drivers/pcmcia/yenta_socket.c
9071 +--- linux-2.6.32.29/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
9072 ++++ linux-2.6.32.29/drivers/pcmcia/yenta_socket.c 2010-12-31 14:46:53.000000000 -0500
9073 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
9074
9075 /* match any cardbus bridge */
9076 @@ -28487,9 +28547,9 @@ diff -urNp linux-2.6.32.28/drivers/pcmcia/yenta_socket.c linux-2.6.32.28/drivers
9077 };
9078 MODULE_DEVICE_TABLE(pci, yenta_table);
9079
9080 -diff -urNp linux-2.6.32.28/drivers/platform/x86/acer-wmi.c linux-2.6.32.28/drivers/platform/x86/acer-wmi.c
9081 ---- linux-2.6.32.28/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400
9082 -+++ linux-2.6.32.28/drivers/platform/x86/acer-wmi.c 2010-12-31 14:46:53.000000000 -0500
9083 +diff -urNp linux-2.6.32.29/drivers/platform/x86/acer-wmi.c linux-2.6.32.29/drivers/platform/x86/acer-wmi.c
9084 +--- linux-2.6.32.29/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400
9085 ++++ linux-2.6.32.29/drivers/platform/x86/acer-wmi.c 2010-12-31 14:46:53.000000000 -0500
9086 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl
9087 return 0;
9088 }
9089 @@ -28499,9 +28559,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/acer-wmi.c linux-2.6.32.28/drive
9090 .get_brightness = read_brightness,
9091 .update_status = update_bl_status,
9092 };
9093 -diff -urNp linux-2.6.32.28/drivers/platform/x86/asus_acpi.c linux-2.6.32.28/drivers/platform/x86/asus_acpi.c
9094 ---- linux-2.6.32.28/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400
9095 -+++ linux-2.6.32.28/drivers/platform/x86/asus_acpi.c 2010-12-31 14:46:53.000000000 -0500
9096 +diff -urNp linux-2.6.32.29/drivers/platform/x86/asus_acpi.c linux-2.6.32.29/drivers/platform/x86/asus_acpi.c
9097 +--- linux-2.6.32.29/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400
9098 ++++ linux-2.6.32.29/drivers/platform/x86/asus_acpi.c 2010-12-31 14:46:53.000000000 -0500
9099 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
9100 return 0;
9101 }
9102 @@ -28511,9 +28571,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/asus_acpi.c linux-2.6.32.28/driv
9103 .get_brightness = read_brightness,
9104 .update_status = set_brightness_status,
9105 };
9106 -diff -urNp linux-2.6.32.28/drivers/platform/x86/asus-laptop.c linux-2.6.32.28/drivers/platform/x86/asus-laptop.c
9107 ---- linux-2.6.32.28/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
9108 -+++ linux-2.6.32.28/drivers/platform/x86/asus-laptop.c 2010-12-31 14:46:53.000000000 -0500
9109 +diff -urNp linux-2.6.32.29/drivers/platform/x86/asus-laptop.c linux-2.6.32.29/drivers/platform/x86/asus-laptop.c
9110 +--- linux-2.6.32.29/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
9111 ++++ linux-2.6.32.29/drivers/platform/x86/asus-laptop.c 2010-12-31 14:46:53.000000000 -0500
9112 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
9113 */
9114 static int read_brightness(struct backlight_device *bd);
9115 @@ -28523,9 +28583,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/asus-laptop.c linux-2.6.32.28/dr
9116 .get_brightness = read_brightness,
9117 .update_status = update_bl_status,
9118 };
9119 -diff -urNp linux-2.6.32.28/drivers/platform/x86/compal-laptop.c linux-2.6.32.28/drivers/platform/x86/compal-laptop.c
9120 ---- linux-2.6.32.28/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
9121 -+++ linux-2.6.32.28/drivers/platform/x86/compal-laptop.c 2010-12-31 14:46:53.000000000 -0500
9122 +diff -urNp linux-2.6.32.29/drivers/platform/x86/compal-laptop.c linux-2.6.32.29/drivers/platform/x86/compal-laptop.c
9123 +--- linux-2.6.32.29/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
9124 ++++ linux-2.6.32.29/drivers/platform/x86/compal-laptop.c 2010-12-31 14:46:53.000000000 -0500
9125 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl
9126 return set_lcd_level(b->props.brightness);
9127 }
9128 @@ -28535,9 +28595,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/compal-laptop.c linux-2.6.32.28/
9129 .get_brightness = bl_get_brightness,
9130 .update_status = bl_update_status,
9131 };
9132 -diff -urNp linux-2.6.32.28/drivers/platform/x86/dell-laptop.c linux-2.6.32.28/drivers/platform/x86/dell-laptop.c
9133 ---- linux-2.6.32.28/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
9134 -+++ linux-2.6.32.28/drivers/platform/x86/dell-laptop.c 2010-12-31 14:46:53.000000000 -0500
9135 +diff -urNp linux-2.6.32.29/drivers/platform/x86/dell-laptop.c linux-2.6.32.29/drivers/platform/x86/dell-laptop.c
9136 +--- linux-2.6.32.29/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
9137 ++++ linux-2.6.32.29/drivers/platform/x86/dell-laptop.c 2010-12-31 14:46:53.000000000 -0500
9138 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
9139 return buffer.output[1];
9140 }
9141 @@ -28547,9 +28607,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/dell-laptop.c linux-2.6.32.28/dr
9142 .get_brightness = dell_get_intensity,
9143 .update_status = dell_send_intensity,
9144 };
9145 -diff -urNp linux-2.6.32.28/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.28/drivers/platform/x86/eeepc-laptop.c
9146 ---- linux-2.6.32.28/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
9147 -+++ linux-2.6.32.28/drivers/platform/x86/eeepc-laptop.c 2010-12-31 14:46:53.000000000 -0500
9148 +diff -urNp linux-2.6.32.29/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.29/drivers/platform/x86/eeepc-laptop.c
9149 +--- linux-2.6.32.29/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
9150 ++++ linux-2.6.32.29/drivers/platform/x86/eeepc-laptop.c 2010-12-31 14:46:53.000000000 -0500
9151 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
9152 */
9153 static int read_brightness(struct backlight_device *bd);
9154 @@ -28559,9 +28619,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.28/d
9155 .get_brightness = read_brightness,
9156 .update_status = update_bl_status,
9157 };
9158 -diff -urNp linux-2.6.32.28/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.28/drivers/platform/x86/fujitsu-laptop.c
9159 ---- linux-2.6.32.28/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
9160 -+++ linux-2.6.32.28/drivers/platform/x86/fujitsu-laptop.c 2010-12-31 14:46:53.000000000 -0500
9161 +diff -urNp linux-2.6.32.29/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.29/drivers/platform/x86/fujitsu-laptop.c
9162 +--- linux-2.6.32.29/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
9163 ++++ linux-2.6.32.29/drivers/platform/x86/fujitsu-laptop.c 2010-12-31 14:46:53.000000000 -0500
9164 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl
9165 return ret;
9166 }
9167 @@ -28571,9 +28631,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.28
9168 .get_brightness = bl_get_brightness,
9169 .update_status = bl_update_status,
9170 };
9171 -diff -urNp linux-2.6.32.28/drivers/platform/x86/msi-laptop.c linux-2.6.32.28/drivers/platform/x86/msi-laptop.c
9172 ---- linux-2.6.32.28/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
9173 -+++ linux-2.6.32.28/drivers/platform/x86/msi-laptop.c 2010-12-31 14:46:53.000000000 -0500
9174 +diff -urNp linux-2.6.32.29/drivers/platform/x86/msi-laptop.c linux-2.6.32.29/drivers/platform/x86/msi-laptop.c
9175 +--- linux-2.6.32.29/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
9176 ++++ linux-2.6.32.29/drivers/platform/x86/msi-laptop.c 2010-12-31 14:46:53.000000000 -0500
9177 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl
9178 return set_lcd_level(b->props.brightness);
9179 }
9180 @@ -28583,9 +28643,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/msi-laptop.c linux-2.6.32.28/dri
9181 .get_brightness = bl_get_brightness,
9182 .update_status = bl_update_status,
9183 };
9184 -diff -urNp linux-2.6.32.28/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.28/drivers/platform/x86/panasonic-laptop.c
9185 ---- linux-2.6.32.28/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
9186 -+++ linux-2.6.32.28/drivers/platform/x86/panasonic-laptop.c 2010-12-31 14:46:53.000000000 -0500
9187 +diff -urNp linux-2.6.32.29/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.29/drivers/platform/x86/panasonic-laptop.c
9188 +--- linux-2.6.32.29/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
9189 ++++ linux-2.6.32.29/drivers/platform/x86/panasonic-laptop.c 2010-12-31 14:46:53.000000000 -0500
9190 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
9191 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
9192 }
9193 @@ -28595,9 +28655,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
9194 .get_brightness = bl_get,
9195 .update_status = bl_set_status,
9196 };
9197 -diff -urNp linux-2.6.32.28/drivers/platform/x86/sony-laptop.c linux-2.6.32.28/drivers/platform/x86/sony-laptop.c
9198 ---- linux-2.6.32.28/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
9199 -+++ linux-2.6.32.28/drivers/platform/x86/sony-laptop.c 2010-12-31 14:46:53.000000000 -0500
9200 +diff -urNp linux-2.6.32.29/drivers/platform/x86/sony-laptop.c linux-2.6.32.29/drivers/platform/x86/sony-laptop.c
9201 +--- linux-2.6.32.29/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
9202 ++++ linux-2.6.32.29/drivers/platform/x86/sony-laptop.c 2010-12-31 14:46:53.000000000 -0500
9203 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
9204 }
9205
9206 @@ -28607,9 +28667,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/sony-laptop.c linux-2.6.32.28/dr
9207 .update_status = sony_backlight_update_status,
9208 .get_brightness = sony_backlight_get_brightness,
9209 };
9210 -diff -urNp linux-2.6.32.28/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.28/drivers/platform/x86/thinkpad_acpi.c
9211 ---- linux-2.6.32.28/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
9212 -+++ linux-2.6.32.28/drivers/platform/x86/thinkpad_acpi.c 2010-12-31 14:46:53.000000000 -0500
9213 +diff -urNp linux-2.6.32.29/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.29/drivers/platform/x86/thinkpad_acpi.c
9214 +--- linux-2.6.32.29/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
9215 ++++ linux-2.6.32.29/drivers/platform/x86/thinkpad_acpi.c 2010-12-31 14:46:53.000000000 -0500
9216 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
9217 BACKLIGHT_UPDATE_HOTKEY);
9218 }
9219 @@ -28619,9 +28679,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.28/
9220 .get_brightness = brightness_get,
9221 .update_status = brightness_update_status,
9222 };
9223 -diff -urNp linux-2.6.32.28/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.28/drivers/platform/x86/toshiba_acpi.c
9224 ---- linux-2.6.32.28/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
9225 -+++ linux-2.6.32.28/drivers/platform/x86/toshiba_acpi.c 2010-12-31 14:46:53.000000000 -0500
9226 +diff -urNp linux-2.6.32.29/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.29/drivers/platform/x86/toshiba_acpi.c
9227 +--- linux-2.6.32.29/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
9228 ++++ linux-2.6.32.29/drivers/platform/x86/toshiba_acpi.c 2010-12-31 14:46:53.000000000 -0500
9229 @@ -671,7 +671,7 @@ static acpi_status remove_device(void)
9230 return AE_OK;
9231 }
9232 @@ -28631,9 +28691,9 @@ diff -urNp linux-2.6.32.28/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.28/d
9233 .get_brightness = get_lcd,
9234 .update_status = set_lcd_status,
9235 };
9236 -diff -urNp linux-2.6.32.28/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.28/drivers/pnp/pnpbios/bioscalls.c
9237 ---- linux-2.6.32.28/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
9238 -+++ linux-2.6.32.28/drivers/pnp/pnpbios/bioscalls.c 2010-12-31 14:46:53.000000000 -0500
9239 +diff -urNp linux-2.6.32.29/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.29/drivers/pnp/pnpbios/bioscalls.c
9240 +--- linux-2.6.32.29/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
9241 ++++ linux-2.6.32.29/drivers/pnp/pnpbios/bioscalls.c 2010-12-31 14:46:53.000000000 -0500
9242 @@ -60,7 +60,7 @@ do { \
9243 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
9244 } while(0)
9245 @@ -28690,9 +28750,9 @@ diff -urNp linux-2.6.32.28/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.28/drive
9246 +
9247 + pax_close_kernel();
9248 }
9249 -diff -urNp linux-2.6.32.28/drivers/pnp/quirks.c linux-2.6.32.28/drivers/pnp/quirks.c
9250 ---- linux-2.6.32.28/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
9251 -+++ linux-2.6.32.28/drivers/pnp/quirks.c 2010-12-31 14:46:53.000000000 -0500
9252 +diff -urNp linux-2.6.32.29/drivers/pnp/quirks.c linux-2.6.32.29/drivers/pnp/quirks.c
9253 +--- linux-2.6.32.29/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
9254 ++++ linux-2.6.32.29/drivers/pnp/quirks.c 2010-12-31 14:46:53.000000000 -0500
9255 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
9256 /* PnP resources that might overlap PCI BARs */
9257 {"PNP0c01", quirk_system_pci_resources},
9258 @@ -28702,9 +28762,9 @@ diff -urNp linux-2.6.32.28/drivers/pnp/quirks.c linux-2.6.32.28/drivers/pnp/quir
9259 };
9260
9261 void pnp_fixup_device(struct pnp_dev *dev)
9262 -diff -urNp linux-2.6.32.28/drivers/pnp/resource.c linux-2.6.32.28/drivers/pnp/resource.c
9263 ---- linux-2.6.32.28/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
9264 -+++ linux-2.6.32.28/drivers/pnp/resource.c 2010-12-31 14:46:53.000000000 -0500
9265 +diff -urNp linux-2.6.32.29/drivers/pnp/resource.c linux-2.6.32.29/drivers/pnp/resource.c
9266 +--- linux-2.6.32.29/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
9267 ++++ linux-2.6.32.29/drivers/pnp/resource.c 2010-12-31 14:46:53.000000000 -0500
9268 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
9269 return 1;
9270
9271 @@ -28723,9 +28783,9 @@ diff -urNp linux-2.6.32.28/drivers/pnp/resource.c linux-2.6.32.28/drivers/pnp/re
9272 return 0;
9273
9274 /* check if the resource is reserved */
9275 -diff -urNp linux-2.6.32.28/drivers/rtc/rtc-dev.c linux-2.6.32.28/drivers/rtc/rtc-dev.c
9276 ---- linux-2.6.32.28/drivers/rtc/rtc-dev.c 2010-08-13 16:24:37.000000000 -0400
9277 -+++ linux-2.6.32.28/drivers/rtc/rtc-dev.c 2011-01-01 19:02:12.000000000 -0500
9278 +diff -urNp linux-2.6.32.29/drivers/rtc/rtc-dev.c linux-2.6.32.29/drivers/rtc/rtc-dev.c
9279 +--- linux-2.6.32.29/drivers/rtc/rtc-dev.c 2010-08-13 16:24:37.000000000 -0400
9280 ++++ linux-2.6.32.29/drivers/rtc/rtc-dev.c 2011-01-01 19:02:12.000000000 -0500
9281 @@ -14,6 +14,7 @@
9282 #include <linux/module.h>
9283 #include <linux/rtc.h>
9284 @@ -28743,9 +28803,9 @@ diff -urNp linux-2.6.32.28/drivers/rtc/rtc-dev.c linux-2.6.32.28/drivers/rtc/rtc
9285 return rtc_set_time(rtc, &tm);
9286
9287 case RTC_PIE_ON:
9288 -diff -urNp linux-2.6.32.28/drivers/s390/cio/qdio_perf.c linux-2.6.32.28/drivers/s390/cio/qdio_perf.c
9289 ---- linux-2.6.32.28/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
9290 -+++ linux-2.6.32.28/drivers/s390/cio/qdio_perf.c 2010-12-31 14:46:53.000000000 -0500
9291 +diff -urNp linux-2.6.32.29/drivers/s390/cio/qdio_perf.c linux-2.6.32.29/drivers/s390/cio/qdio_perf.c
9292 +--- linux-2.6.32.29/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
9293 ++++ linux-2.6.32.29/drivers/s390/cio/qdio_perf.c 2010-12-31 14:46:53.000000000 -0500
9294 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
9295 static int qdio_perf_proc_show(struct seq_file *m, void *v)
9296 {
9297 @@ -28821,9 +28881,9 @@ diff -urNp linux-2.6.32.28/drivers/s390/cio/qdio_perf.c linux-2.6.32.28/drivers/
9298 seq_printf(m, "\n");
9299 return 0;
9300 }
9301 -diff -urNp linux-2.6.32.28/drivers/s390/cio/qdio_perf.h linux-2.6.32.28/drivers/s390/cio/qdio_perf.h
9302 ---- linux-2.6.32.28/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
9303 -+++ linux-2.6.32.28/drivers/s390/cio/qdio_perf.h 2010-12-31 14:46:53.000000000 -0500
9304 +diff -urNp linux-2.6.32.29/drivers/s390/cio/qdio_perf.h linux-2.6.32.29/drivers/s390/cio/qdio_perf.h
9305 +--- linux-2.6.32.29/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
9306 ++++ linux-2.6.32.29/drivers/s390/cio/qdio_perf.h 2010-12-31 14:46:53.000000000 -0500
9307 @@ -13,46 +13,46 @@
9308
9309 struct qdio_perf_stats {
9310 @@ -28896,9 +28956,9 @@ diff -urNp linux-2.6.32.28/drivers/s390/cio/qdio_perf.h linux-2.6.32.28/drivers/
9311 }
9312
9313 int qdio_setup_perf_stats(void);
9314 -diff -urNp linux-2.6.32.28/drivers/scsi/ipr.c linux-2.6.32.28/drivers/scsi/ipr.c
9315 ---- linux-2.6.32.28/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
9316 -+++ linux-2.6.32.28/drivers/scsi/ipr.c 2010-12-31 14:46:53.000000000 -0500
9317 +diff -urNp linux-2.6.32.29/drivers/scsi/ipr.c linux-2.6.32.29/drivers/scsi/ipr.c
9318 +--- linux-2.6.32.29/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
9319 ++++ linux-2.6.32.29/drivers/scsi/ipr.c 2010-12-31 14:46:53.000000000 -0500
9320 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
9321 return true;
9322 }
9323 @@ -28908,9 +28968,9 @@ diff -urNp linux-2.6.32.28/drivers/scsi/ipr.c linux-2.6.32.28/drivers/scsi/ipr.c
9324 .phy_reset = ipr_ata_phy_reset,
9325 .hardreset = ipr_sata_reset,
9326 .post_internal_cmd = ipr_ata_post_internal,
9327 -diff -urNp linux-2.6.32.28/drivers/scsi/libfc/fc_exch.c linux-2.6.32.28/drivers/scsi/libfc/fc_exch.c
9328 ---- linux-2.6.32.28/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
9329 -+++ linux-2.6.32.28/drivers/scsi/libfc/fc_exch.c 2010-12-31 14:46:53.000000000 -0500
9330 +diff -urNp linux-2.6.32.29/drivers/scsi/libfc/fc_exch.c linux-2.6.32.29/drivers/scsi/libfc/fc_exch.c
9331 +--- linux-2.6.32.29/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
9332 ++++ linux-2.6.32.29/drivers/scsi/libfc/fc_exch.c 2010-12-31 14:46:53.000000000 -0500
9333 @@ -86,12 +86,12 @@ struct fc_exch_mgr {
9334 * all together if not used XXX
9335 */
9336 @@ -29032,9 +29092,9 @@ diff -urNp linux-2.6.32.28/drivers/scsi/libfc/fc_exch.c linux-2.6.32.28/drivers/
9337
9338 fc_frame_free(fp);
9339 }
9340 -diff -urNp linux-2.6.32.28/drivers/scsi/libsas/sas_ata.c linux-2.6.32.28/drivers/scsi/libsas/sas_ata.c
9341 ---- linux-2.6.32.28/drivers/scsi/libsas/sas_ata.c 2010-11-26 18:22:29.000000000 -0500
9342 -+++ linux-2.6.32.28/drivers/scsi/libsas/sas_ata.c 2010-12-31 14:46:53.000000000 -0500
9343 +diff -urNp linux-2.6.32.29/drivers/scsi/libsas/sas_ata.c linux-2.6.32.29/drivers/scsi/libsas/sas_ata.c
9344 +--- linux-2.6.32.29/drivers/scsi/libsas/sas_ata.c 2010-11-26 18:22:29.000000000 -0500
9345 ++++ linux-2.6.32.29/drivers/scsi/libsas/sas_ata.c 2010-12-31 14:46:53.000000000 -0500
9346 @@ -343,10 +343,10 @@ static int sas_ata_scr_read(struct ata_l
9347 }
9348 }
9349 @@ -29048,9 +29108,9 @@ diff -urNp linux-2.6.32.28/drivers/scsi/libsas/sas_ata.c linux-2.6.32.28/drivers
9350 .qc_prep = ata_noop_qc_prep,
9351 .qc_issue = sas_ata_qc_issue,
9352 .qc_fill_rtf = sas_ata_qc_fill_rtf,
9353 -diff -urNp linux-2.6.32.28/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.28/drivers/scsi/mpt2sas/mpt2sas_debug.h
9354 ---- linux-2.6.32.28/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
9355 -+++ linux-2.6.32.28/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-31 14:46:53.000000000 -0500
9356 +diff -urNp linux-2.6.32.29/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.29/drivers/scsi/mpt2sas/mpt2sas_debug.h
9357 +--- linux-2.6.32.29/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
9358 ++++ linux-2.6.32.29/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-31 14:46:53.000000000 -0500
9359 @@ -79,7 +79,7 @@
9360 CMD; \
9361 }
9362 @@ -29060,9 +29120,9 @@ diff -urNp linux-2.6.32.28/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.28/
9363 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
9364
9365
9366 -diff -urNp linux-2.6.32.28/drivers/scsi/scsi_logging.h linux-2.6.32.28/drivers/scsi/scsi_logging.h
9367 ---- linux-2.6.32.28/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
9368 -+++ linux-2.6.32.28/drivers/scsi/scsi_logging.h 2010-12-31 14:46:53.000000000 -0500
9369 +diff -urNp linux-2.6.32.29/drivers/scsi/scsi_logging.h linux-2.6.32.29/drivers/scsi/scsi_logging.h
9370 +--- linux-2.6.32.29/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
9371 ++++ linux-2.6.32.29/drivers/scsi/scsi_logging.h 2010-12-31 14:46:53.000000000 -0500
9372 @@ -51,7 +51,7 @@ do { \
9373 } while (0); \
9374 } while (0)
9375 @@ -29072,9 +29132,9 @@ diff -urNp linux-2.6.32.28/drivers/scsi/scsi_logging.h linux-2.6.32.28/drivers/s
9376 #endif /* CONFIG_SCSI_LOGGING */
9377
9378 /*
9379 -diff -urNp linux-2.6.32.28/drivers/scsi/sg.c linux-2.6.32.28/drivers/scsi/sg.c
9380 ---- linux-2.6.32.28/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
9381 -+++ linux-2.6.32.28/drivers/scsi/sg.c 2010-12-31 14:46:53.000000000 -0500
9382 +diff -urNp linux-2.6.32.29/drivers/scsi/sg.c linux-2.6.32.29/drivers/scsi/sg.c
9383 +--- linux-2.6.32.29/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
9384 ++++ linux-2.6.32.29/drivers/scsi/sg.c 2010-12-31 14:46:53.000000000 -0500
9385 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
9386 const struct file_operations * fops;
9387 };
9388 @@ -29093,9 +29153,9 @@ diff -urNp linux-2.6.32.28/drivers/scsi/sg.c linux-2.6.32.28/drivers/scsi/sg.c
9389
9390 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
9391 if (!sg_proc_sgp)
9392 -diff -urNp linux-2.6.32.28/drivers/serial/8250_pci.c linux-2.6.32.28/drivers/serial/8250_pci.c
9393 ---- linux-2.6.32.28/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
9394 -+++ linux-2.6.32.28/drivers/serial/8250_pci.c 2010-12-31 14:46:53.000000000 -0500
9395 +diff -urNp linux-2.6.32.29/drivers/serial/8250_pci.c linux-2.6.32.29/drivers/serial/8250_pci.c
9396 +--- linux-2.6.32.29/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
9397 ++++ linux-2.6.32.29/drivers/serial/8250_pci.c 2010-12-31 14:46:53.000000000 -0500
9398 @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
9399 PCI_ANY_ID, PCI_ANY_ID,
9400 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
9401 @@ -29105,9 +29165,9 @@ diff -urNp linux-2.6.32.28/drivers/serial/8250_pci.c linux-2.6.32.28/drivers/ser
9402 };
9403
9404 static struct pci_driver serial_pci_driver = {
9405 -diff -urNp linux-2.6.32.28/drivers/serial/kgdboc.c linux-2.6.32.28/drivers/serial/kgdboc.c
9406 ---- linux-2.6.32.28/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
9407 -+++ linux-2.6.32.28/drivers/serial/kgdboc.c 2010-12-31 14:46:53.000000000 -0500
9408 +diff -urNp linux-2.6.32.29/drivers/serial/kgdboc.c linux-2.6.32.29/drivers/serial/kgdboc.c
9409 +--- linux-2.6.32.29/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
9410 ++++ linux-2.6.32.29/drivers/serial/kgdboc.c 2010-12-31 14:46:53.000000000 -0500
9411 @@ -18,7 +18,7 @@
9412
9413 #define MAX_CONFIG_LEN 40
9414 @@ -29126,9 +29186,9 @@ diff -urNp linux-2.6.32.28/drivers/serial/kgdboc.c linux-2.6.32.28/drivers/seria
9415 .name = "kgdboc",
9416 .read_char = kgdboc_get_char,
9417 .write_char = kgdboc_put_char,
9418 -diff -urNp linux-2.6.32.28/drivers/staging/android/binder.c linux-2.6.32.28/drivers/staging/android/binder.c
9419 ---- linux-2.6.32.28/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
9420 -+++ linux-2.6.32.28/drivers/staging/android/binder.c 2010-12-31 14:46:53.000000000 -0500
9421 +diff -urNp linux-2.6.32.29/drivers/staging/android/binder.c linux-2.6.32.29/drivers/staging/android/binder.c
9422 +--- linux-2.6.32.29/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
9423 ++++ linux-2.6.32.29/drivers/staging/android/binder.c 2010-12-31 14:46:53.000000000 -0500
9424 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
9425 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
9426 }
9427 @@ -29138,9 +29198,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/android/binder.c linux-2.6.32.28/driv
9428 .open = binder_vma_open,
9429 .close = binder_vma_close,
9430 };
9431 -diff -urNp linux-2.6.32.28/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.28/drivers/staging/b3dfg/b3dfg.c
9432 ---- linux-2.6.32.28/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
9433 -+++ linux-2.6.32.28/drivers/staging/b3dfg/b3dfg.c 2010-12-31 14:46:53.000000000 -0500
9434 +diff -urNp linux-2.6.32.29/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.29/drivers/staging/b3dfg/b3dfg.c
9435 +--- linux-2.6.32.29/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
9436 ++++ linux-2.6.32.29/drivers/staging/b3dfg/b3dfg.c 2010-12-31 14:46:53.000000000 -0500
9437 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
9438 return VM_FAULT_NOPAGE;
9439 }
9440 @@ -29159,9 +29219,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.28/drivers
9441 .owner = THIS_MODULE,
9442 .open = b3dfg_open,
9443 .release = b3dfg_release,
9444 -diff -urNp linux-2.6.32.28/drivers/staging/comedi/comedi_fops.c linux-2.6.32.28/drivers/staging/comedi/comedi_fops.c
9445 ---- linux-2.6.32.28/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
9446 -+++ linux-2.6.32.28/drivers/staging/comedi/comedi_fops.c 2010-12-31 14:46:53.000000000 -0500
9447 +diff -urNp linux-2.6.32.29/drivers/staging/comedi/comedi_fops.c linux-2.6.32.29/drivers/staging/comedi/comedi_fops.c
9448 +--- linux-2.6.32.29/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
9449 ++++ linux-2.6.32.29/drivers/staging/comedi/comedi_fops.c 2010-12-31 14:46:53.000000000 -0500
9450 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
9451 mutex_unlock(&dev->mutex);
9452 }
9453 @@ -29171,9 +29231,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/comedi/comedi_fops.c linux-2.6.32.28/
9454 .close = comedi_unmap,
9455 };
9456
9457 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.28/drivers/staging/dream/qdsp5/adsp_driver.c
9458 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
9459 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-31 14:46:53.000000000 -0500
9460 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.29/drivers/staging/dream/qdsp5/adsp_driver.c
9461 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
9462 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-31 14:46:53.000000000 -0500
9463 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
9464 static dev_t adsp_devno;
9465 static struct class *adsp_class;
9466 @@ -29183,9 +29243,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
9467 .owner = THIS_MODULE,
9468 .open = adsp_open,
9469 .unlocked_ioctl = adsp_ioctl,
9470 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_aac.c
9471 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
9472 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-31 14:46:53.000000000 -0500
9473 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_aac.c
9474 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
9475 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-31 14:46:53.000000000 -0500
9476 @@ -1022,7 +1022,7 @@ done:
9477 return rc;
9478 }
9479 @@ -29195,9 +29255,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
9480 .owner = THIS_MODULE,
9481 .open = audio_open,
9482 .release = audio_release,
9483 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_amrnb.c
9484 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
9485 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-31 14:46:53.000000000 -0500
9486 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_amrnb.c
9487 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
9488 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-31 14:46:53.000000000 -0500
9489 @@ -833,7 +833,7 @@ done:
9490 return rc;
9491 }
9492 @@ -29207,9 +29267,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
9493 .owner = THIS_MODULE,
9494 .open = audamrnb_open,
9495 .release = audamrnb_release,
9496 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_evrc.c
9497 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
9498 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-31 14:46:53.000000000 -0500
9499 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_evrc.c
9500 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
9501 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-31 14:46:53.000000000 -0500
9502 @@ -805,7 +805,7 @@ dma_fail:
9503 return rc;
9504 }
9505 @@ -29219,9 +29279,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
9506 .owner = THIS_MODULE,
9507 .open = audevrc_open,
9508 .release = audevrc_release,
9509 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_in.c
9510 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
9511 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_in.c 2010-12-31 14:46:53.000000000 -0500
9512 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_in.c
9513 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
9514 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_in.c 2010-12-31 14:46:53.000000000 -0500
9515 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
9516 return 0;
9517 }
9518 @@ -29240,9 +29300,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.2
9519 .owner = THIS_MODULE,
9520 .open = audpre_open,
9521 .unlocked_ioctl = audpre_ioctl,
9522 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_mp3.c
9523 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
9524 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-31 14:46:53.000000000 -0500
9525 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_mp3.c
9526 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
9527 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-31 14:46:53.000000000 -0500
9528 @@ -941,7 +941,7 @@ done:
9529 return rc;
9530 }
9531 @@ -29252,9 +29312,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
9532 .owner = THIS_MODULE,
9533 .open = audio_open,
9534 .release = audio_release,
9535 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_out.c
9536 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
9537 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_out.c 2010-12-31 14:46:53.000000000 -0500
9538 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_out.c
9539 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
9540 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_out.c 2010-12-31 14:46:53.000000000 -0500
9541 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
9542 return 0;
9543 }
9544 @@ -29273,9 +29333,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
9545 .owner = THIS_MODULE,
9546 .open = audpp_open,
9547 .unlocked_ioctl = audpp_ioctl,
9548 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_qcelp.c
9549 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
9550 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-31 14:46:53.000000000 -0500
9551 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_qcelp.c
9552 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
9553 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-31 14:46:53.000000000 -0500
9554 @@ -816,7 +816,7 @@ err:
9555 return rc;
9556 }
9557 @@ -29285,9 +29345,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
9558 .owner = THIS_MODULE,
9559 .open = audqcelp_open,
9560 .release = audqcelp_release,
9561 -diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.28/drivers/staging/dream/qdsp5/snd.c
9562 ---- linux-2.6.32.28/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
9563 -+++ linux-2.6.32.28/drivers/staging/dream/qdsp5/snd.c 2010-12-31 14:46:53.000000000 -0500
9564 +diff -urNp linux-2.6.32.29/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.29/drivers/staging/dream/qdsp5/snd.c
9565 +--- linux-2.6.32.29/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
9566 ++++ linux-2.6.32.29/drivers/staging/dream/qdsp5/snd.c 2010-12-31 14:46:53.000000000 -0500
9567 @@ -242,7 +242,7 @@ err:
9568 return rc;
9569 }
9570 @@ -29297,9 +29357,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.28/dri
9571 .owner = THIS_MODULE,
9572 .open = snd_open,
9573 .release = snd_release,
9574 -diff -urNp linux-2.6.32.28/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.28/drivers/staging/dream/smd/smd_qmi.c
9575 ---- linux-2.6.32.28/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
9576 -+++ linux-2.6.32.28/drivers/staging/dream/smd/smd_qmi.c 2010-12-31 14:46:53.000000000 -0500
9577 +diff -urNp linux-2.6.32.29/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.29/drivers/staging/dream/smd/smd_qmi.c
9578 +--- linux-2.6.32.29/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
9579 ++++ linux-2.6.32.29/drivers/staging/dream/smd/smd_qmi.c 2010-12-31 14:46:53.000000000 -0500
9580 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
9581 return 0;
9582 }
9583 @@ -29309,9 +29369,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.28/d
9584 .owner = THIS_MODULE,
9585 .read = qmi_read,
9586 .write = qmi_write,
9587 -diff -urNp linux-2.6.32.28/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.28/drivers/staging/dream/smd/smd_rpcrouter_device.c
9588 ---- linux-2.6.32.28/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
9589 -+++ linux-2.6.32.28/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-31 14:46:53.000000000 -0500
9590 +diff -urNp linux-2.6.32.29/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.29/drivers/staging/dream/smd/smd_rpcrouter_device.c
9591 +--- linux-2.6.32.29/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
9592 ++++ linux-2.6.32.29/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-31 14:46:53.000000000 -0500
9593 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
9594 return rc;
9595 }
9596 @@ -29330,9 +29390,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
9597 .owner = THIS_MODULE,
9598 .open = rpcrouter_open,
9599 .release = rpcrouter_release,
9600 -diff -urNp linux-2.6.32.28/drivers/staging/dst/dcore.c linux-2.6.32.28/drivers/staging/dst/dcore.c
9601 ---- linux-2.6.32.28/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
9602 -+++ linux-2.6.32.28/drivers/staging/dst/dcore.c 2010-12-31 14:46:53.000000000 -0500
9603 +diff -urNp linux-2.6.32.29/drivers/staging/dst/dcore.c linux-2.6.32.29/drivers/staging/dst/dcore.c
9604 +--- linux-2.6.32.29/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
9605 ++++ linux-2.6.32.29/drivers/staging/dst/dcore.c 2010-12-31 14:46:53.000000000 -0500
9606 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
9607 return 0;
9608 }
9609 @@ -29351,9 +29411,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dst/dcore.c linux-2.6.32.28/drivers/s
9610 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
9611
9612 err = dst_node_sysfs_init(n);
9613 -diff -urNp linux-2.6.32.28/drivers/staging/dst/trans.c linux-2.6.32.28/drivers/staging/dst/trans.c
9614 ---- linux-2.6.32.28/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
9615 -+++ linux-2.6.32.28/drivers/staging/dst/trans.c 2010-12-31 14:46:53.000000000 -0500
9616 +diff -urNp linux-2.6.32.29/drivers/staging/dst/trans.c linux-2.6.32.29/drivers/staging/dst/trans.c
9617 +--- linux-2.6.32.29/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
9618 ++++ linux-2.6.32.29/drivers/staging/dst/trans.c 2010-12-31 14:46:53.000000000 -0500
9619 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
9620 t->error = 0;
9621 t->retries = 0;
9622 @@ -29363,9 +29423,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/dst/trans.c linux-2.6.32.28/drivers/s
9623
9624 t->enc = bio_data_dir(bio);
9625 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
9626 -diff -urNp linux-2.6.32.28/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.28/drivers/staging/go7007/go7007-v4l2.c
9627 ---- linux-2.6.32.28/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
9628 -+++ linux-2.6.32.28/drivers/staging/go7007/go7007-v4l2.c 2010-12-31 14:46:53.000000000 -0500
9629 +diff -urNp linux-2.6.32.29/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.29/drivers/staging/go7007/go7007-v4l2.c
9630 +--- linux-2.6.32.29/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
9631 ++++ linux-2.6.32.29/drivers/staging/go7007/go7007-v4l2.c 2010-12-31 14:46:53.000000000 -0500
9632 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
9633 return 0;
9634 }
9635 @@ -29375,9 +29435,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.28/
9636 .open = go7007_vm_open,
9637 .close = go7007_vm_close,
9638 .fault = go7007_vm_fault,
9639 -diff -urNp linux-2.6.32.28/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.28/drivers/staging/hv/blkvsc_drv.c
9640 ---- linux-2.6.32.28/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400
9641 -+++ linux-2.6.32.28/drivers/staging/hv/blkvsc_drv.c 2010-12-31 14:46:53.000000000 -0500
9642 +diff -urNp linux-2.6.32.29/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.29/drivers/staging/hv/blkvsc_drv.c
9643 +--- linux-2.6.32.29/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:56:54.000000000 -0500
9644 ++++ linux-2.6.32.29/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:57:23.000000000 -0500
9645 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
9646 /* The one and only one */
9647 static struct blkvsc_driver_context g_blkvsc_drv;
9648 @@ -29387,9 +29447,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.28/drive
9649 .owner = THIS_MODULE,
9650 .open = blkvsc_open,
9651 .release = blkvsc_release,
9652 -diff -urNp linux-2.6.32.28/drivers/staging/hv/Hv.c linux-2.6.32.28/drivers/staging/hv/Hv.c
9653 ---- linux-2.6.32.28/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
9654 -+++ linux-2.6.32.28/drivers/staging/hv/Hv.c 2010-12-31 14:46:53.000000000 -0500
9655 +diff -urNp linux-2.6.32.29/drivers/staging/hv/Hv.c linux-2.6.32.29/drivers/staging/hv/Hv.c
9656 +--- linux-2.6.32.29/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
9657 ++++ linux-2.6.32.29/drivers/staging/hv/Hv.c 2010-12-31 14:46:53.000000000 -0500
9658 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
9659 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
9660 u32 outputAddressHi = outputAddress >> 32;
9661 @@ -29399,9 +29459,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/hv/Hv.c linux-2.6.32.28/drivers/stagi
9662
9663 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
9664 Control, Input, Output);
9665 -diff -urNp linux-2.6.32.28/drivers/staging/panel/panel.c linux-2.6.32.28/drivers/staging/panel/panel.c
9666 ---- linux-2.6.32.28/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
9667 -+++ linux-2.6.32.28/drivers/staging/panel/panel.c 2010-12-31 14:46:53.000000000 -0500
9668 +diff -urNp linux-2.6.32.29/drivers/staging/panel/panel.c linux-2.6.32.29/drivers/staging/panel/panel.c
9669 +--- linux-2.6.32.29/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
9670 ++++ linux-2.6.32.29/drivers/staging/panel/panel.c 2010-12-31 14:46:53.000000000 -0500
9671 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
9672 return 0;
9673 }
9674 @@ -29420,9 +29480,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/panel/panel.c linux-2.6.32.28/drivers
9675 .read = keypad_read, /* read */
9676 .open = keypad_open, /* open */
9677 .release = keypad_release, /* close */
9678 -diff -urNp linux-2.6.32.28/drivers/staging/phison/phison.c linux-2.6.32.28/drivers/staging/phison/phison.c
9679 ---- linux-2.6.32.28/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
9680 -+++ linux-2.6.32.28/drivers/staging/phison/phison.c 2010-12-31 14:46:53.000000000 -0500
9681 +diff -urNp linux-2.6.32.29/drivers/staging/phison/phison.c linux-2.6.32.29/drivers/staging/phison/phison.c
9682 +--- linux-2.6.32.29/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
9683 ++++ linux-2.6.32.29/drivers/staging/phison/phison.c 2010-12-31 14:46:53.000000000 -0500
9684 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
9685 ATA_BMDMA_SHT(DRV_NAME),
9686 };
9687 @@ -29432,9 +29492,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/phison/phison.c linux-2.6.32.28/drive
9688 .inherits = &ata_bmdma_port_ops,
9689 .prereset = phison_pre_reset,
9690 };
9691 -diff -urNp linux-2.6.32.28/drivers/staging/poch/poch.c linux-2.6.32.28/drivers/staging/poch/poch.c
9692 ---- linux-2.6.32.28/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
9693 -+++ linux-2.6.32.28/drivers/staging/poch/poch.c 2010-12-31 14:46:53.000000000 -0500
9694 +diff -urNp linux-2.6.32.29/drivers/staging/poch/poch.c linux-2.6.32.29/drivers/staging/poch/poch.c
9695 +--- linux-2.6.32.29/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
9696 ++++ linux-2.6.32.29/drivers/staging/poch/poch.c 2010-12-31 14:46:53.000000000 -0500
9697 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
9698 return 0;
9699 }
9700 @@ -29444,9 +29504,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/poch/poch.c linux-2.6.32.28/drivers/s
9701 .owner = THIS_MODULE,
9702 .open = poch_open,
9703 .release = poch_release,
9704 -diff -urNp linux-2.6.32.28/drivers/staging/pohmelfs/inode.c linux-2.6.32.28/drivers/staging/pohmelfs/inode.c
9705 ---- linux-2.6.32.28/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
9706 -+++ linux-2.6.32.28/drivers/staging/pohmelfs/inode.c 2010-12-31 14:46:53.000000000 -0500
9707 +diff -urNp linux-2.6.32.29/drivers/staging/pohmelfs/inode.c linux-2.6.32.29/drivers/staging/pohmelfs/inode.c
9708 +--- linux-2.6.32.29/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
9709 ++++ linux-2.6.32.29/drivers/staging/pohmelfs/inode.c 2010-12-31 14:46:53.000000000 -0500
9710 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
9711 mutex_init(&psb->mcache_lock);
9712 psb->mcache_root = RB_ROOT;
9713 @@ -29456,9 +29516,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/pohmelfs/inode.c linux-2.6.32.28/driv
9714
9715 psb->trans_max_pages = 100;
9716
9717 -diff -urNp linux-2.6.32.28/drivers/staging/pohmelfs/mcache.c linux-2.6.32.28/drivers/staging/pohmelfs/mcache.c
9718 ---- linux-2.6.32.28/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
9719 -+++ linux-2.6.32.28/drivers/staging/pohmelfs/mcache.c 2010-12-31 14:46:53.000000000 -0500
9720 +diff -urNp linux-2.6.32.29/drivers/staging/pohmelfs/mcache.c linux-2.6.32.29/drivers/staging/pohmelfs/mcache.c
9721 +--- linux-2.6.32.29/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
9722 ++++ linux-2.6.32.29/drivers/staging/pohmelfs/mcache.c 2010-12-31 14:46:53.000000000 -0500
9723 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
9724 m->data = data;
9725 m->start = start;
9726 @@ -29468,9 +29528,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/pohmelfs/mcache.c linux-2.6.32.28/dri
9727
9728 mutex_lock(&psb->mcache_lock);
9729 err = pohmelfs_mcache_insert(psb, m);
9730 -diff -urNp linux-2.6.32.28/drivers/staging/pohmelfs/netfs.h linux-2.6.32.28/drivers/staging/pohmelfs/netfs.h
9731 ---- linux-2.6.32.28/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
9732 -+++ linux-2.6.32.28/drivers/staging/pohmelfs/netfs.h 2010-12-31 14:46:53.000000000 -0500
9733 +diff -urNp linux-2.6.32.29/drivers/staging/pohmelfs/netfs.h linux-2.6.32.29/drivers/staging/pohmelfs/netfs.h
9734 +--- linux-2.6.32.29/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
9735 ++++ linux-2.6.32.29/drivers/staging/pohmelfs/netfs.h 2010-12-31 14:46:53.000000000 -0500
9736 @@ -570,7 +570,7 @@ struct pohmelfs_config;
9737 struct pohmelfs_sb {
9738 struct rb_root mcache_root;
9739 @@ -29480,9 +29540,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/pohmelfs/netfs.h linux-2.6.32.28/driv
9740 unsigned long mcache_timeout;
9741
9742 unsigned int idx;
9743 -diff -urNp linux-2.6.32.28/drivers/staging/sep/sep_driver.c linux-2.6.32.28/drivers/staging/sep/sep_driver.c
9744 ---- linux-2.6.32.28/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
9745 -+++ linux-2.6.32.28/drivers/staging/sep/sep_driver.c 2010-12-31 14:46:53.000000000 -0500
9746 +diff -urNp linux-2.6.32.29/drivers/staging/sep/sep_driver.c linux-2.6.32.29/drivers/staging/sep/sep_driver.c
9747 +--- linux-2.6.32.29/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
9748 ++++ linux-2.6.32.29/drivers/staging/sep/sep_driver.c 2010-12-31 14:46:53.000000000 -0500
9749 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
9750 static dev_t sep_devno;
9751
9752 @@ -29492,9 +29552,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/sep/sep_driver.c linux-2.6.32.28/driv
9753 .owner = THIS_MODULE,
9754 .ioctl = sep_ioctl,
9755 .poll = sep_poll,
9756 -diff -urNp linux-2.6.32.28/drivers/staging/vme/devices/vme_user.c linux-2.6.32.28/drivers/staging/vme/devices/vme_user.c
9757 ---- linux-2.6.32.28/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
9758 -+++ linux-2.6.32.28/drivers/staging/vme/devices/vme_user.c 2010-12-31 14:46:53.000000000 -0500
9759 +diff -urNp linux-2.6.32.29/drivers/staging/vme/devices/vme_user.c linux-2.6.32.29/drivers/staging/vme/devices/vme_user.c
9760 +--- linux-2.6.32.29/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
9761 ++++ linux-2.6.32.29/drivers/staging/vme/devices/vme_user.c 2010-12-31 14:46:53.000000000 -0500
9762 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
9763 static int __init vme_user_probe(struct device *, int, int);
9764 static int __exit vme_user_remove(struct device *, int, int);
9765 @@ -29504,9 +29564,9 @@ diff -urNp linux-2.6.32.28/drivers/staging/vme/devices/vme_user.c linux-2.6.32.2
9766 .open = vme_user_open,
9767 .release = vme_user_release,
9768 .read = vme_user_read,
9769 -diff -urNp linux-2.6.32.28/drivers/uio/uio.c linux-2.6.32.28/drivers/uio/uio.c
9770 ---- linux-2.6.32.28/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
9771 -+++ linux-2.6.32.28/drivers/uio/uio.c 2011-01-24 18:05:34.000000000 -0500
9772 +diff -urNp linux-2.6.32.29/drivers/uio/uio.c linux-2.6.32.29/drivers/uio/uio.c
9773 +--- linux-2.6.32.29/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
9774 ++++ linux-2.6.32.29/drivers/uio/uio.c 2011-01-24 18:05:34.000000000 -0500
9775 @@ -23,6 +23,7 @@
9776 #include <linux/string.h>
9777 #include <linux/kobject.h>
9778 @@ -29558,9 +29618,9 @@ diff -urNp linux-2.6.32.28/drivers/uio/uio.c linux-2.6.32.28/drivers/uio/uio.c
9779 }
9780
9781 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9782 -diff -urNp linux-2.6.32.28/drivers/usb/atm/usbatm.c linux-2.6.32.28/drivers/usb/atm/usbatm.c
9783 ---- linux-2.6.32.28/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
9784 -+++ linux-2.6.32.28/drivers/usb/atm/usbatm.c 2010-12-31 14:46:53.000000000 -0500
9785 +diff -urNp linux-2.6.32.29/drivers/usb/atm/usbatm.c linux-2.6.32.29/drivers/usb/atm/usbatm.c
9786 +--- linux-2.6.32.29/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
9787 ++++ linux-2.6.32.29/drivers/usb/atm/usbatm.c 2010-12-31 14:46:53.000000000 -0500
9788 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
9789 if (printk_ratelimit())
9790 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
9791 @@ -29640,10 +29700,10 @@ diff -urNp linux-2.6.32.28/drivers/usb/atm/usbatm.c linux-2.6.32.28/drivers/usb/
9792
9793 if (!left--) {
9794 if (instance->disconnected)
9795 -diff -urNp linux-2.6.32.28/drivers/usb/class/cdc-acm.c linux-2.6.32.28/drivers/usb/class/cdc-acm.c
9796 ---- linux-2.6.32.28/drivers/usb/class/cdc-acm.c 2010-09-20 17:26:42.000000000 -0400
9797 -+++ linux-2.6.32.28/drivers/usb/class/cdc-acm.c 2010-12-31 14:46:53.000000000 -0500
9798 -@@ -1618,7 +1618,7 @@ static struct usb_device_id acm_ids[] =
9799 +diff -urNp linux-2.6.32.29/drivers/usb/class/cdc-acm.c linux-2.6.32.29/drivers/usb/class/cdc-acm.c
9800 +--- linux-2.6.32.29/drivers/usb/class/cdc-acm.c 2011-02-22 15:56:54.000000000 -0500
9801 ++++ linux-2.6.32.29/drivers/usb/class/cdc-acm.c 2011-02-22 15:57:23.000000000 -0500
9802 +@@ -1619,7 +1619,7 @@ static struct usb_device_id acm_ids[] =
9803 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
9804 USB_CDC_ACM_PROTO_AT_CDMA) },
9805
9806 @@ -29652,9 +29712,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/class/cdc-acm.c linux-2.6.32.28/drivers/u
9807 };
9808
9809 MODULE_DEVICE_TABLE(usb, acm_ids);
9810 -diff -urNp linux-2.6.32.28/drivers/usb/class/cdc-wdm.c linux-2.6.32.28/drivers/usb/class/cdc-wdm.c
9811 ---- linux-2.6.32.28/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
9812 -+++ linux-2.6.32.28/drivers/usb/class/cdc-wdm.c 2010-12-31 14:46:53.000000000 -0500
9813 +diff -urNp linux-2.6.32.29/drivers/usb/class/cdc-wdm.c linux-2.6.32.29/drivers/usb/class/cdc-wdm.c
9814 +--- linux-2.6.32.29/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
9815 ++++ linux-2.6.32.29/drivers/usb/class/cdc-wdm.c 2010-12-31 14:46:53.000000000 -0500
9816 @@ -314,7 +314,7 @@ static ssize_t wdm_write
9817 if (r < 0)
9818 goto outnp;
9819 @@ -29664,9 +29724,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/class/cdc-wdm.c linux-2.6.32.28/drivers/u
9820 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
9821 &desc->flags));
9822 else
9823 -diff -urNp linux-2.6.32.28/drivers/usb/class/usblp.c linux-2.6.32.28/drivers/usb/class/usblp.c
9824 ---- linux-2.6.32.28/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
9825 -+++ linux-2.6.32.28/drivers/usb/class/usblp.c 2010-12-31 14:46:53.000000000 -0500
9826 +diff -urNp linux-2.6.32.29/drivers/usb/class/usblp.c linux-2.6.32.29/drivers/usb/class/usblp.c
9827 +--- linux-2.6.32.29/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
9828 ++++ linux-2.6.32.29/drivers/usb/class/usblp.c 2010-12-31 14:46:53.000000000 -0500
9829 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct
9830 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@×××.de> */
9831 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
9832 @@ -29685,9 +29745,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/class/usblp.c linux-2.6.32.28/drivers/usb
9833 };
9834
9835 MODULE_DEVICE_TABLE (usb, usblp_ids);
9836 -diff -urNp linux-2.6.32.28/drivers/usb/core/hcd.c linux-2.6.32.28/drivers/usb/core/hcd.c
9837 ---- linux-2.6.32.28/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
9838 -+++ linux-2.6.32.28/drivers/usb/core/hcd.c 2010-12-31 14:46:53.000000000 -0500
9839 +diff -urNp linux-2.6.32.29/drivers/usb/core/hcd.c linux-2.6.32.29/drivers/usb/core/hcd.c
9840 +--- linux-2.6.32.29/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
9841 ++++ linux-2.6.32.29/drivers/usb/core/hcd.c 2010-12-31 14:46:53.000000000 -0500
9842 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
9843
9844 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
9845 @@ -29706,9 +29766,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/core/hcd.c linux-2.6.32.28/drivers/usb/co
9846 {
9847
9848 if (mon_ops)
9849 -diff -urNp linux-2.6.32.28/drivers/usb/core/hcd.h linux-2.6.32.28/drivers/usb/core/hcd.h
9850 ---- linux-2.6.32.28/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
9851 -+++ linux-2.6.32.28/drivers/usb/core/hcd.h 2010-12-31 14:46:53.000000000 -0500
9852 +diff -urNp linux-2.6.32.29/drivers/usb/core/hcd.h linux-2.6.32.29/drivers/usb/core/hcd.h
9853 +--- linux-2.6.32.29/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
9854 ++++ linux-2.6.32.29/drivers/usb/core/hcd.h 2010-12-31 14:46:53.000000000 -0500
9855 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
9856 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
9857
9858 @@ -29736,10 +29796,10 @@ diff -urNp linux-2.6.32.28/drivers/usb/core/hcd.h linux-2.6.32.28/drivers/usb/co
9859 void usb_mon_deregister(void);
9860
9861 #else
9862 -diff -urNp linux-2.6.32.28/drivers/usb/core/hub.c linux-2.6.32.28/drivers/usb/core/hub.c
9863 ---- linux-2.6.32.28/drivers/usb/core/hub.c 2010-11-26 18:22:29.000000000 -0500
9864 -+++ linux-2.6.32.28/drivers/usb/core/hub.c 2010-12-31 14:46:53.000000000 -0500
9865 -@@ -3404,7 +3404,7 @@ static struct usb_device_id hub_id_table
9866 +diff -urNp linux-2.6.32.29/drivers/usb/core/hub.c linux-2.6.32.29/drivers/usb/core/hub.c
9867 +--- linux-2.6.32.29/drivers/usb/core/hub.c 2011-02-22 15:56:54.000000000 -0500
9868 ++++ linux-2.6.32.29/drivers/usb/core/hub.c 2011-02-22 15:57:23.000000000 -0500
9869 +@@ -3430,7 +3430,7 @@ static struct usb_device_id hub_id_table
9870 .bDeviceClass = USB_CLASS_HUB},
9871 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
9872 .bInterfaceClass = USB_CLASS_HUB},
9873 @@ -29748,9 +29808,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/core/hub.c linux-2.6.32.28/drivers/usb/co
9874 };
9875
9876 MODULE_DEVICE_TABLE (usb, hub_id_table);
9877 -diff -urNp linux-2.6.32.28/drivers/usb/core/message.c linux-2.6.32.28/drivers/usb/core/message.c
9878 ---- linux-2.6.32.28/drivers/usb/core/message.c 2010-11-26 18:22:29.000000000 -0500
9879 -+++ linux-2.6.32.28/drivers/usb/core/message.c 2010-12-31 14:46:53.000000000 -0500
9880 +diff -urNp linux-2.6.32.29/drivers/usb/core/message.c linux-2.6.32.29/drivers/usb/core/message.c
9881 +--- linux-2.6.32.29/drivers/usb/core/message.c 2010-11-26 18:22:29.000000000 -0500
9882 ++++ linux-2.6.32.29/drivers/usb/core/message.c 2010-12-31 14:46:53.000000000 -0500
9883 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
9884 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
9885 if (buf) {
9886 @@ -29762,10 +29822,10 @@ diff -urNp linux-2.6.32.28/drivers/usb/core/message.c linux-2.6.32.28/drivers/us
9887 if (!smallbuf)
9888 return buf;
9889 memcpy(smallbuf, buf, len);
9890 -diff -urNp linux-2.6.32.28/drivers/usb/host/ehci-pci.c linux-2.6.32.28/drivers/usb/host/ehci-pci.c
9891 ---- linux-2.6.32.28/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400
9892 -+++ linux-2.6.32.28/drivers/usb/host/ehci-pci.c 2010-12-31 14:46:53.000000000 -0500
9893 -@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
9894 +diff -urNp linux-2.6.32.29/drivers/usb/host/ehci-pci.c linux-2.6.32.29/drivers/usb/host/ehci-pci.c
9895 +--- linux-2.6.32.29/drivers/usb/host/ehci-pci.c 2011-02-22 15:56:54.000000000 -0500
9896 ++++ linux-2.6.32.29/drivers/usb/host/ehci-pci.c 2011-02-22 15:57:23.000000000 -0500
9897 +@@ -461,7 +461,7 @@ static const struct pci_device_id pci_id
9898 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
9899 .driver_data = (unsigned long) &ehci_pci_hc_driver,
9900 },
9901 @@ -29774,9 +29834,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/host/ehci-pci.c linux-2.6.32.28/drivers/u
9902 };
9903 MODULE_DEVICE_TABLE(pci, pci_ids);
9904
9905 -diff -urNp linux-2.6.32.28/drivers/usb/host/uhci-hcd.c linux-2.6.32.28/drivers/usb/host/uhci-hcd.c
9906 ---- linux-2.6.32.28/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
9907 -+++ linux-2.6.32.28/drivers/usb/host/uhci-hcd.c 2010-12-31 14:46:53.000000000 -0500
9908 +diff -urNp linux-2.6.32.29/drivers/usb/host/uhci-hcd.c linux-2.6.32.29/drivers/usb/host/uhci-hcd.c
9909 +--- linux-2.6.32.29/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
9910 ++++ linux-2.6.32.29/drivers/usb/host/uhci-hcd.c 2010-12-31 14:46:53.000000000 -0500
9911 @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
9912 /* handle any USB UHCI controller */
9913 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
9914 @@ -29786,9 +29846,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/host/uhci-hcd.c linux-2.6.32.28/drivers/u
9915 };
9916
9917 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
9918 -diff -urNp linux-2.6.32.28/drivers/usb/misc/appledisplay.c linux-2.6.32.28/drivers/usb/misc/appledisplay.c
9919 ---- linux-2.6.32.28/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
9920 -+++ linux-2.6.32.28/drivers/usb/misc/appledisplay.c 2010-12-31 14:46:53.000000000 -0500
9921 +diff -urNp linux-2.6.32.29/drivers/usb/misc/appledisplay.c linux-2.6.32.29/drivers/usb/misc/appledisplay.c
9922 +--- linux-2.6.32.29/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
9923 ++++ linux-2.6.32.29/drivers/usb/misc/appledisplay.c 2010-12-31 14:46:53.000000000 -0500
9924 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
9925 return pdata->msgdata[1];
9926 }
9927 @@ -29798,9 +29858,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/misc/appledisplay.c linux-2.6.32.28/drive
9928 .get_brightness = appledisplay_bl_get_brightness,
9929 .update_status = appledisplay_bl_update_status,
9930 };
9931 -diff -urNp linux-2.6.32.28/drivers/usb/misc/iowarrior.c linux-2.6.32.28/drivers/usb/misc/iowarrior.c
9932 ---- linux-2.6.32.28/drivers/usb/misc/iowarrior.c 2010-12-09 18:13:03.000000000 -0500
9933 -+++ linux-2.6.32.28/drivers/usb/misc/iowarrior.c 2011-01-25 17:27:31.000000000 -0500
9934 +diff -urNp linux-2.6.32.29/drivers/usb/misc/iowarrior.c linux-2.6.32.29/drivers/usb/misc/iowarrior.c
9935 +--- linux-2.6.32.29/drivers/usb/misc/iowarrior.c 2010-12-09 18:13:03.000000000 -0500
9936 ++++ linux-2.6.32.29/drivers/usb/misc/iowarrior.c 2011-01-25 17:27:31.000000000 -0500
9937 @@ -373,7 +373,7 @@ static ssize_t iowarrior_write(struct fi
9938 case USB_DEVICE_ID_CODEMERCS_IOWPV2:
9939 case USB_DEVICE_ID_CODEMERCS_IOW40:
9940 @@ -29810,9 +29870,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/misc/iowarrior.c linux-2.6.32.28/drivers/
9941 if (!buf) {
9942 retval = -ENOMEM;
9943 goto exit;
9944 -diff -urNp linux-2.6.32.28/drivers/usb/mon/mon_main.c linux-2.6.32.28/drivers/usb/mon/mon_main.c
9945 ---- linux-2.6.32.28/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
9946 -+++ linux-2.6.32.28/drivers/usb/mon/mon_main.c 2010-12-31 14:46:53.000000000 -0500
9947 +diff -urNp linux-2.6.32.29/drivers/usb/mon/mon_main.c linux-2.6.32.29/drivers/usb/mon/mon_main.c
9948 +--- linux-2.6.32.29/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
9949 ++++ linux-2.6.32.29/drivers/usb/mon/mon_main.c 2010-12-31 14:46:53.000000000 -0500
9950 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
9951 /*
9952 * Ops
9953 @@ -29822,9 +29882,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/mon/mon_main.c linux-2.6.32.28/drivers/us
9954 .urb_submit = mon_submit,
9955 .urb_submit_error = mon_submit_error,
9956 .urb_complete = mon_complete,
9957 -diff -urNp linux-2.6.32.28/drivers/usb/storage/debug.h linux-2.6.32.28/drivers/usb/storage/debug.h
9958 ---- linux-2.6.32.28/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
9959 -+++ linux-2.6.32.28/drivers/usb/storage/debug.h 2010-12-31 14:46:53.000000000 -0500
9960 +diff -urNp linux-2.6.32.29/drivers/usb/storage/debug.h linux-2.6.32.29/drivers/usb/storage/debug.h
9961 +--- linux-2.6.32.29/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
9962 ++++ linux-2.6.32.29/drivers/usb/storage/debug.h 2010-12-31 14:46:53.000000000 -0500
9963 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
9964 #define US_DEBUGPX(x...) printk( x )
9965 #define US_DEBUG(x) x
9966 @@ -29838,9 +29898,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/storage/debug.h linux-2.6.32.28/drivers/u
9967 #endif
9968
9969 #endif
9970 -diff -urNp linux-2.6.32.28/drivers/usb/storage/usb.c linux-2.6.32.28/drivers/usb/storage/usb.c
9971 ---- linux-2.6.32.28/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
9972 -+++ linux-2.6.32.28/drivers/usb/storage/usb.c 2010-12-31 14:46:53.000000000 -0500
9973 +diff -urNp linux-2.6.32.29/drivers/usb/storage/usb.c linux-2.6.32.29/drivers/usb/storage/usb.c
9974 +--- linux-2.6.32.29/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
9975 ++++ linux-2.6.32.29/drivers/usb/storage/usb.c 2010-12-31 14:46:53.000000000 -0500
9976 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
9977
9978 static struct us_unusual_dev us_unusual_dev_list[] = {
9979 @@ -29850,9 +29910,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/storage/usb.c linux-2.6.32.28/drivers/usb
9980 };
9981
9982 #undef UNUSUAL_DEV
9983 -diff -urNp linux-2.6.32.28/drivers/usb/storage/usual-tables.c linux-2.6.32.28/drivers/usb/storage/usual-tables.c
9984 ---- linux-2.6.32.28/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
9985 -+++ linux-2.6.32.28/drivers/usb/storage/usual-tables.c 2010-12-31 14:46:53.000000000 -0500
9986 +diff -urNp linux-2.6.32.29/drivers/usb/storage/usual-tables.c linux-2.6.32.29/drivers/usb/storage/usual-tables.c
9987 +--- linux-2.6.32.29/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
9988 ++++ linux-2.6.32.29/drivers/usb/storage/usual-tables.c 2010-12-31 14:46:53.000000000 -0500
9989 @@ -48,7 +48,7 @@
9990
9991 struct usb_device_id usb_storage_usb_ids[] = {
9992 @@ -29862,9 +29922,9 @@ diff -urNp linux-2.6.32.28/drivers/usb/storage/usual-tables.c linux-2.6.32.28/dr
9993 };
9994 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
9995
9996 -diff -urNp linux-2.6.32.28/drivers/uwb/wlp/messages.c linux-2.6.32.28/drivers/uwb/wlp/messages.c
9997 ---- linux-2.6.32.28/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
9998 -+++ linux-2.6.32.28/drivers/uwb/wlp/messages.c 2010-12-31 14:46:53.000000000 -0500
9999 +diff -urNp linux-2.6.32.29/drivers/uwb/wlp/messages.c linux-2.6.32.29/drivers/uwb/wlp/messages.c
10000 +--- linux-2.6.32.29/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
10001 ++++ linux-2.6.32.29/drivers/uwb/wlp/messages.c 2010-12-31 14:46:53.000000000 -0500
10002 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
10003 size_t len = skb->len;
10004 size_t used;
10005 @@ -29874,9 +29934,9 @@ diff -urNp linux-2.6.32.28/drivers/uwb/wlp/messages.c linux-2.6.32.28/drivers/uw
10006 enum wlp_assc_error assc_err;
10007 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
10008 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
10009 -diff -urNp linux-2.6.32.28/drivers/uwb/wlp/sysfs.c linux-2.6.32.28/drivers/uwb/wlp/sysfs.c
10010 ---- linux-2.6.32.28/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10011 -+++ linux-2.6.32.28/drivers/uwb/wlp/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10012 +diff -urNp linux-2.6.32.29/drivers/uwb/wlp/sysfs.c linux-2.6.32.29/drivers/uwb/wlp/sysfs.c
10013 +--- linux-2.6.32.29/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10014 ++++ linux-2.6.32.29/drivers/uwb/wlp/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10015 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
10016 return ret;
10017 }
10018 @@ -29887,9 +29947,9 @@ diff -urNp linux-2.6.32.28/drivers/uwb/wlp/sysfs.c linux-2.6.32.28/drivers/uwb/w
10019 .show = wlp_wss_attr_show,
10020 .store = wlp_wss_attr_store,
10021 };
10022 -diff -urNp linux-2.6.32.28/drivers/video/atmel_lcdfb.c linux-2.6.32.28/drivers/video/atmel_lcdfb.c
10023 ---- linux-2.6.32.28/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
10024 -+++ linux-2.6.32.28/drivers/video/atmel_lcdfb.c 2010-12-31 14:46:53.000000000 -0500
10025 +diff -urNp linux-2.6.32.29/drivers/video/atmel_lcdfb.c linux-2.6.32.29/drivers/video/atmel_lcdfb.c
10026 +--- linux-2.6.32.29/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
10027 ++++ linux-2.6.32.29/drivers/video/atmel_lcdfb.c 2010-12-31 14:46:53.000000000 -0500
10028 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
10029 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
10030 }
10031 @@ -29899,9 +29959,9 @@ diff -urNp linux-2.6.32.28/drivers/video/atmel_lcdfb.c linux-2.6.32.28/drivers/v
10032 .update_status = atmel_bl_update_status,
10033 .get_brightness = atmel_bl_get_brightness,
10034 };
10035 -diff -urNp linux-2.6.32.28/drivers/video/aty/aty128fb.c linux-2.6.32.28/drivers/video/aty/aty128fb.c
10036 ---- linux-2.6.32.28/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
10037 -+++ linux-2.6.32.28/drivers/video/aty/aty128fb.c 2010-12-31 14:46:53.000000000 -0500
10038 +diff -urNp linux-2.6.32.29/drivers/video/aty/aty128fb.c linux-2.6.32.29/drivers/video/aty/aty128fb.c
10039 +--- linux-2.6.32.29/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
10040 ++++ linux-2.6.32.29/drivers/video/aty/aty128fb.c 2010-12-31 14:46:53.000000000 -0500
10041 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
10042 return bd->props.brightness;
10043 }
10044 @@ -29911,9 +29971,9 @@ diff -urNp linux-2.6.32.28/drivers/video/aty/aty128fb.c linux-2.6.32.28/drivers/
10045 .get_brightness = aty128_bl_get_brightness,
10046 .update_status = aty128_bl_update_status,
10047 };
10048 -diff -urNp linux-2.6.32.28/drivers/video/aty/atyfb_base.c linux-2.6.32.28/drivers/video/aty/atyfb_base.c
10049 ---- linux-2.6.32.28/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
10050 -+++ linux-2.6.32.28/drivers/video/aty/atyfb_base.c 2010-12-31 14:46:53.000000000 -0500
10051 +diff -urNp linux-2.6.32.29/drivers/video/aty/atyfb_base.c linux-2.6.32.29/drivers/video/aty/atyfb_base.c
10052 +--- linux-2.6.32.29/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
10053 ++++ linux-2.6.32.29/drivers/video/aty/atyfb_base.c 2010-12-31 14:46:53.000000000 -0500
10054 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
10055 return bd->props.brightness;
10056 }
10057 @@ -29923,9 +29983,9 @@ diff -urNp linux-2.6.32.28/drivers/video/aty/atyfb_base.c linux-2.6.32.28/driver
10058 .get_brightness = aty_bl_get_brightness,
10059 .update_status = aty_bl_update_status,
10060 };
10061 -diff -urNp linux-2.6.32.28/drivers/video/aty/radeon_backlight.c linux-2.6.32.28/drivers/video/aty/radeon_backlight.c
10062 ---- linux-2.6.32.28/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
10063 -+++ linux-2.6.32.28/drivers/video/aty/radeon_backlight.c 2010-12-31 14:46:53.000000000 -0500
10064 +diff -urNp linux-2.6.32.29/drivers/video/aty/radeon_backlight.c linux-2.6.32.29/drivers/video/aty/radeon_backlight.c
10065 +--- linux-2.6.32.29/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
10066 ++++ linux-2.6.32.29/drivers/video/aty/radeon_backlight.c 2010-12-31 14:46:53.000000000 -0500
10067 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
10068 return bd->props.brightness;
10069 }
10070 @@ -29935,9 +29995,9 @@ diff -urNp linux-2.6.32.28/drivers/video/aty/radeon_backlight.c linux-2.6.32.28/
10071 .get_brightness = radeon_bl_get_brightness,
10072 .update_status = radeon_bl_update_status,
10073 };
10074 -diff -urNp linux-2.6.32.28/drivers/video/backlight/adp5520_bl.c linux-2.6.32.28/drivers/video/backlight/adp5520_bl.c
10075 ---- linux-2.6.32.28/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
10076 -+++ linux-2.6.32.28/drivers/video/backlight/adp5520_bl.c 2010-12-31 14:46:53.000000000 -0500
10077 +diff -urNp linux-2.6.32.29/drivers/video/backlight/adp5520_bl.c linux-2.6.32.29/drivers/video/backlight/adp5520_bl.c
10078 +--- linux-2.6.32.29/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
10079 ++++ linux-2.6.32.29/drivers/video/backlight/adp5520_bl.c 2010-12-31 14:46:53.000000000 -0500
10080 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
10081 return error ? data->current_brightness : reg_val;
10082 }
10083 @@ -29947,9 +30007,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/adp5520_bl.c linux-2.6.32.28/
10084 .update_status = adp5520_bl_update_status,
10085 .get_brightness = adp5520_bl_get_brightness,
10086 };
10087 -diff -urNp linux-2.6.32.28/drivers/video/backlight/adx_bl.c linux-2.6.32.28/drivers/video/backlight/adx_bl.c
10088 ---- linux-2.6.32.28/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
10089 -+++ linux-2.6.32.28/drivers/video/backlight/adx_bl.c 2010-12-31 14:46:53.000000000 -0500
10090 +diff -urNp linux-2.6.32.29/drivers/video/backlight/adx_bl.c linux-2.6.32.29/drivers/video/backlight/adx_bl.c
10091 +--- linux-2.6.32.29/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
10092 ++++ linux-2.6.32.29/drivers/video/backlight/adx_bl.c 2010-12-31 14:46:53.000000000 -0500
10093 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
10094 return 1;
10095 }
10096 @@ -29959,9 +30019,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/adx_bl.c linux-2.6.32.28/driv
10097 .options = 0,
10098 .update_status = adx_backlight_update_status,
10099 .get_brightness = adx_backlight_get_brightness,
10100 -diff -urNp linux-2.6.32.28/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.28/drivers/video/backlight/atmel-pwm-bl.c
10101 ---- linux-2.6.32.28/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
10102 -+++ linux-2.6.32.28/drivers/video/backlight/atmel-pwm-bl.c 2010-12-31 14:46:53.000000000 -0500
10103 +diff -urNp linux-2.6.32.29/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.29/drivers/video/backlight/atmel-pwm-bl.c
10104 +--- linux-2.6.32.29/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
10105 ++++ linux-2.6.32.29/drivers/video/backlight/atmel-pwm-bl.c 2010-12-31 14:46:53.000000000 -0500
10106 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
10107 return pwm_channel_enable(&pwmbl->pwmc);
10108 }
10109 @@ -29971,9 +30031,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.2
10110 .get_brightness = atmel_pwm_bl_get_intensity,
10111 .update_status = atmel_pwm_bl_set_intensity,
10112 };
10113 -diff -urNp linux-2.6.32.28/drivers/video/backlight/backlight.c linux-2.6.32.28/drivers/video/backlight/backlight.c
10114 ---- linux-2.6.32.28/drivers/video/backlight/backlight.c 2010-12-09 18:13:03.000000000 -0500
10115 -+++ linux-2.6.32.28/drivers/video/backlight/backlight.c 2010-12-31 14:46:53.000000000 -0500
10116 +diff -urNp linux-2.6.32.29/drivers/video/backlight/backlight.c linux-2.6.32.29/drivers/video/backlight/backlight.c
10117 +--- linux-2.6.32.29/drivers/video/backlight/backlight.c 2010-12-09 18:13:03.000000000 -0500
10118 ++++ linux-2.6.32.29/drivers/video/backlight/backlight.c 2010-12-31 14:46:53.000000000 -0500
10119 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
10120 * ERR_PTR() or a pointer to the newly allocated device.
10121 */
10122 @@ -29983,9 +30043,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/backlight.c linux-2.6.32.28/d
10123 {
10124 struct backlight_device *new_bd;
10125 int rc;
10126 -diff -urNp linux-2.6.32.28/drivers/video/backlight/corgi_lcd.c linux-2.6.32.28/drivers/video/backlight/corgi_lcd.c
10127 ---- linux-2.6.32.28/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
10128 -+++ linux-2.6.32.28/drivers/video/backlight/corgi_lcd.c 2010-12-31 14:46:53.000000000 -0500
10129 +diff -urNp linux-2.6.32.29/drivers/video/backlight/corgi_lcd.c linux-2.6.32.29/drivers/video/backlight/corgi_lcd.c
10130 +--- linux-2.6.32.29/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
10131 ++++ linux-2.6.32.29/drivers/video/backlight/corgi_lcd.c 2010-12-31 14:46:53.000000000 -0500
10132 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
10133 }
10134 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
10135 @@ -29995,9 +30055,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/corgi_lcd.c linux-2.6.32.28/d
10136 .get_brightness = corgi_bl_get_intensity,
10137 .update_status = corgi_bl_update_status,
10138 };
10139 -diff -urNp linux-2.6.32.28/drivers/video/backlight/cr_bllcd.c linux-2.6.32.28/drivers/video/backlight/cr_bllcd.c
10140 ---- linux-2.6.32.28/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
10141 -+++ linux-2.6.32.28/drivers/video/backlight/cr_bllcd.c 2010-12-31 14:46:53.000000000 -0500
10142 +diff -urNp linux-2.6.32.29/drivers/video/backlight/cr_bllcd.c linux-2.6.32.29/drivers/video/backlight/cr_bllcd.c
10143 +--- linux-2.6.32.29/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
10144 ++++ linux-2.6.32.29/drivers/video/backlight/cr_bllcd.c 2010-12-31 14:46:53.000000000 -0500
10145 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
10146 return intensity;
10147 }
10148 @@ -30007,9 +30067,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/cr_bllcd.c linux-2.6.32.28/dr
10149 .get_brightness = cr_backlight_get_intensity,
10150 .update_status = cr_backlight_set_intensity,
10151 };
10152 -diff -urNp linux-2.6.32.28/drivers/video/backlight/da903x_bl.c linux-2.6.32.28/drivers/video/backlight/da903x_bl.c
10153 ---- linux-2.6.32.28/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
10154 -+++ linux-2.6.32.28/drivers/video/backlight/da903x_bl.c 2010-12-31 14:46:53.000000000 -0500
10155 +diff -urNp linux-2.6.32.29/drivers/video/backlight/da903x_bl.c linux-2.6.32.29/drivers/video/backlight/da903x_bl.c
10156 +--- linux-2.6.32.29/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
10157 ++++ linux-2.6.32.29/drivers/video/backlight/da903x_bl.c 2010-12-31 14:46:53.000000000 -0500
10158 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
10159 return data->current_brightness;
10160 }
10161 @@ -30019,9 +30079,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/da903x_bl.c linux-2.6.32.28/d
10162 .update_status = da903x_backlight_update_status,
10163 .get_brightness = da903x_backlight_get_brightness,
10164 };
10165 -diff -urNp linux-2.6.32.28/drivers/video/backlight/generic_bl.c linux-2.6.32.28/drivers/video/backlight/generic_bl.c
10166 ---- linux-2.6.32.28/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
10167 -+++ linux-2.6.32.28/drivers/video/backlight/generic_bl.c 2010-12-31 14:46:53.000000000 -0500
10168 +diff -urNp linux-2.6.32.29/drivers/video/backlight/generic_bl.c linux-2.6.32.29/drivers/video/backlight/generic_bl.c
10169 +--- linux-2.6.32.29/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
10170 ++++ linux-2.6.32.29/drivers/video/backlight/generic_bl.c 2010-12-31 14:46:53.000000000 -0500
10171 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
10172 }
10173 EXPORT_SYMBOL(corgibl_limit_intensity);
10174 @@ -30031,9 +30091,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/generic_bl.c linux-2.6.32.28/
10175 .options = BL_CORE_SUSPENDRESUME,
10176 .get_brightness = genericbl_get_intensity,
10177 .update_status = genericbl_send_intensity,
10178 -diff -urNp linux-2.6.32.28/drivers/video/backlight/hp680_bl.c linux-2.6.32.28/drivers/video/backlight/hp680_bl.c
10179 ---- linux-2.6.32.28/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
10180 -+++ linux-2.6.32.28/drivers/video/backlight/hp680_bl.c 2010-12-31 14:46:53.000000000 -0500
10181 +diff -urNp linux-2.6.32.29/drivers/video/backlight/hp680_bl.c linux-2.6.32.29/drivers/video/backlight/hp680_bl.c
10182 +--- linux-2.6.32.29/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
10183 ++++ linux-2.6.32.29/drivers/video/backlight/hp680_bl.c 2010-12-31 14:46:53.000000000 -0500
10184 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
10185 return current_intensity;
10186 }
10187 @@ -30043,9 +30103,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/hp680_bl.c linux-2.6.32.28/dr
10188 .get_brightness = hp680bl_get_intensity,
10189 .update_status = hp680bl_set_intensity,
10190 };
10191 -diff -urNp linux-2.6.32.28/drivers/video/backlight/jornada720_bl.c linux-2.6.32.28/drivers/video/backlight/jornada720_bl.c
10192 ---- linux-2.6.32.28/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
10193 -+++ linux-2.6.32.28/drivers/video/backlight/jornada720_bl.c 2010-12-31 14:46:53.000000000 -0500
10194 +diff -urNp linux-2.6.32.29/drivers/video/backlight/jornada720_bl.c linux-2.6.32.29/drivers/video/backlight/jornada720_bl.c
10195 +--- linux-2.6.32.29/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
10196 ++++ linux-2.6.32.29/drivers/video/backlight/jornada720_bl.c 2010-12-31 14:46:53.000000000 -0500
10197 @@ -93,7 +93,7 @@ out:
10198 return ret;
10199 }
10200 @@ -30055,9 +30115,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
10201 .get_brightness = jornada_bl_get_brightness,
10202 .update_status = jornada_bl_update_status,
10203 .options = BL_CORE_SUSPENDRESUME,
10204 -diff -urNp linux-2.6.32.28/drivers/video/backlight/kb3886_bl.c linux-2.6.32.28/drivers/video/backlight/kb3886_bl.c
10205 ---- linux-2.6.32.28/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
10206 -+++ linux-2.6.32.28/drivers/video/backlight/kb3886_bl.c 2010-12-31 14:46:53.000000000 -0500
10207 +diff -urNp linux-2.6.32.29/drivers/video/backlight/kb3886_bl.c linux-2.6.32.29/drivers/video/backlight/kb3886_bl.c
10208 +--- linux-2.6.32.29/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
10209 ++++ linux-2.6.32.29/drivers/video/backlight/kb3886_bl.c 2010-12-31 14:46:53.000000000 -0500
10210 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
10211 return kb3886bl_intensity;
10212 }
10213 @@ -30067,9 +30127,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/kb3886_bl.c linux-2.6.32.28/d
10214 .get_brightness = kb3886bl_get_intensity,
10215 .update_status = kb3886bl_send_intensity,
10216 };
10217 -diff -urNp linux-2.6.32.28/drivers/video/backlight/locomolcd.c linux-2.6.32.28/drivers/video/backlight/locomolcd.c
10218 ---- linux-2.6.32.28/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
10219 -+++ linux-2.6.32.28/drivers/video/backlight/locomolcd.c 2010-12-31 14:46:53.000000000 -0500
10220 +diff -urNp linux-2.6.32.29/drivers/video/backlight/locomolcd.c linux-2.6.32.29/drivers/video/backlight/locomolcd.c
10221 +--- linux-2.6.32.29/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
10222 ++++ linux-2.6.32.29/drivers/video/backlight/locomolcd.c 2010-12-31 14:46:53.000000000 -0500
10223 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
10224 return current_intensity;
10225 }
10226 @@ -30079,9 +30139,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/locomolcd.c linux-2.6.32.28/d
10227 .get_brightness = locomolcd_get_intensity,
10228 .update_status = locomolcd_set_intensity,
10229 };
10230 -diff -urNp linux-2.6.32.28/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.28/drivers/video/backlight/mbp_nvidia_bl.c
10231 ---- linux-2.6.32.28/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
10232 -+++ linux-2.6.32.28/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-31 14:46:53.000000000 -0500
10233 +diff -urNp linux-2.6.32.29/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.29/drivers/video/backlight/mbp_nvidia_bl.c
10234 +--- linux-2.6.32.29/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
10235 ++++ linux-2.6.32.29/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-31 14:46:53.000000000 -0500
10236 @@ -33,7 +33,7 @@ struct dmi_match_data {
10237 unsigned long iostart;
10238 unsigned long iolen;
10239 @@ -30091,9 +30151,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
10240 };
10241
10242 /* Module parameters. */
10243 -diff -urNp linux-2.6.32.28/drivers/video/backlight/omap1_bl.c linux-2.6.32.28/drivers/video/backlight/omap1_bl.c
10244 ---- linux-2.6.32.28/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
10245 -+++ linux-2.6.32.28/drivers/video/backlight/omap1_bl.c 2010-12-31 14:46:53.000000000 -0500
10246 +diff -urNp linux-2.6.32.29/drivers/video/backlight/omap1_bl.c linux-2.6.32.29/drivers/video/backlight/omap1_bl.c
10247 +--- linux-2.6.32.29/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
10248 ++++ linux-2.6.32.29/drivers/video/backlight/omap1_bl.c 2010-12-31 14:46:53.000000000 -0500
10249 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
10250 return bl->current_intensity;
10251 }
10252 @@ -30103,9 +30163,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/omap1_bl.c linux-2.6.32.28/dr
10253 .get_brightness = omapbl_get_intensity,
10254 .update_status = omapbl_update_status,
10255 };
10256 -diff -urNp linux-2.6.32.28/drivers/video/backlight/progear_bl.c linux-2.6.32.28/drivers/video/backlight/progear_bl.c
10257 ---- linux-2.6.32.28/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
10258 -+++ linux-2.6.32.28/drivers/video/backlight/progear_bl.c 2010-12-31 14:46:53.000000000 -0500
10259 +diff -urNp linux-2.6.32.29/drivers/video/backlight/progear_bl.c linux-2.6.32.29/drivers/video/backlight/progear_bl.c
10260 +--- linux-2.6.32.29/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
10261 ++++ linux-2.6.32.29/drivers/video/backlight/progear_bl.c 2010-12-31 14:46:53.000000000 -0500
10262 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
10263 return intensity - HW_LEVEL_MIN;
10264 }
10265 @@ -30115,9 +30175,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/progear_bl.c linux-2.6.32.28/
10266 .get_brightness = progearbl_get_intensity,
10267 .update_status = progearbl_set_intensity,
10268 };
10269 -diff -urNp linux-2.6.32.28/drivers/video/backlight/pwm_bl.c linux-2.6.32.28/drivers/video/backlight/pwm_bl.c
10270 ---- linux-2.6.32.28/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
10271 -+++ linux-2.6.32.28/drivers/video/backlight/pwm_bl.c 2010-12-31 14:46:53.000000000 -0500
10272 +diff -urNp linux-2.6.32.29/drivers/video/backlight/pwm_bl.c linux-2.6.32.29/drivers/video/backlight/pwm_bl.c
10273 +--- linux-2.6.32.29/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
10274 ++++ linux-2.6.32.29/drivers/video/backlight/pwm_bl.c 2010-12-31 14:46:53.000000000 -0500
10275 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
10276 return bl->props.brightness;
10277 }
10278 @@ -30127,9 +30187,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/pwm_bl.c linux-2.6.32.28/driv
10279 .update_status = pwm_backlight_update_status,
10280 .get_brightness = pwm_backlight_get_brightness,
10281 };
10282 -diff -urNp linux-2.6.32.28/drivers/video/backlight/tosa_bl.c linux-2.6.32.28/drivers/video/backlight/tosa_bl.c
10283 ---- linux-2.6.32.28/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
10284 -+++ linux-2.6.32.28/drivers/video/backlight/tosa_bl.c 2010-12-31 14:46:53.000000000 -0500
10285 +diff -urNp linux-2.6.32.29/drivers/video/backlight/tosa_bl.c linux-2.6.32.29/drivers/video/backlight/tosa_bl.c
10286 +--- linux-2.6.32.29/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
10287 ++++ linux-2.6.32.29/drivers/video/backlight/tosa_bl.c 2010-12-31 14:46:53.000000000 -0500
10288 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
10289 return props->brightness;
10290 }
10291 @@ -30139,9 +30199,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/tosa_bl.c linux-2.6.32.28/dri
10292 .get_brightness = tosa_bl_get_brightness,
10293 .update_status = tosa_bl_update_status,
10294 };
10295 -diff -urNp linux-2.6.32.28/drivers/video/backlight/wm831x_bl.c linux-2.6.32.28/drivers/video/backlight/wm831x_bl.c
10296 ---- linux-2.6.32.28/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
10297 -+++ linux-2.6.32.28/drivers/video/backlight/wm831x_bl.c 2010-12-31 14:46:53.000000000 -0500
10298 +diff -urNp linux-2.6.32.29/drivers/video/backlight/wm831x_bl.c linux-2.6.32.29/drivers/video/backlight/wm831x_bl.c
10299 +--- linux-2.6.32.29/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
10300 ++++ linux-2.6.32.29/drivers/video/backlight/wm831x_bl.c 2010-12-31 14:46:53.000000000 -0500
10301 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
10302 return data->current_brightness;
10303 }
10304 @@ -30151,9 +30211,9 @@ diff -urNp linux-2.6.32.28/drivers/video/backlight/wm831x_bl.c linux-2.6.32.28/d
10305 .options = BL_CORE_SUSPENDRESUME,
10306 .update_status = wm831x_backlight_update_status,
10307 .get_brightness = wm831x_backlight_get_brightness,
10308 -diff -urNp linux-2.6.32.28/drivers/video/bf54x-lq043fb.c linux-2.6.32.28/drivers/video/bf54x-lq043fb.c
10309 ---- linux-2.6.32.28/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
10310 -+++ linux-2.6.32.28/drivers/video/bf54x-lq043fb.c 2010-12-31 14:46:53.000000000 -0500
10311 +diff -urNp linux-2.6.32.29/drivers/video/bf54x-lq043fb.c linux-2.6.32.29/drivers/video/bf54x-lq043fb.c
10312 +--- linux-2.6.32.29/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
10313 ++++ linux-2.6.32.29/drivers/video/bf54x-lq043fb.c 2010-12-31 14:46:53.000000000 -0500
10314 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
10315 return 0;
10316 }
10317 @@ -30163,9 +30223,9 @@ diff -urNp linux-2.6.32.28/drivers/video/bf54x-lq043fb.c linux-2.6.32.28/drivers
10318 .get_brightness = bl_get_brightness,
10319 };
10320
10321 -diff -urNp linux-2.6.32.28/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.28/drivers/video/bfin-t350mcqb-fb.c
10322 ---- linux-2.6.32.28/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
10323 -+++ linux-2.6.32.28/drivers/video/bfin-t350mcqb-fb.c 2010-12-31 14:46:53.000000000 -0500
10324 +diff -urNp linux-2.6.32.29/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.29/drivers/video/bfin-t350mcqb-fb.c
10325 +--- linux-2.6.32.29/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
10326 ++++ linux-2.6.32.29/drivers/video/bfin-t350mcqb-fb.c 2010-12-31 14:46:53.000000000 -0500
10327 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
10328 return 0;
10329 }
10330 @@ -30175,9 +30235,9 @@ diff -urNp linux-2.6.32.28/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.28/driv
10331 .get_brightness = bl_get_brightness,
10332 };
10333
10334 -diff -urNp linux-2.6.32.28/drivers/video/fbcmap.c linux-2.6.32.28/drivers/video/fbcmap.c
10335 ---- linux-2.6.32.28/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
10336 -+++ linux-2.6.32.28/drivers/video/fbcmap.c 2010-12-31 14:46:53.000000000 -0500
10337 +diff -urNp linux-2.6.32.29/drivers/video/fbcmap.c linux-2.6.32.29/drivers/video/fbcmap.c
10338 +--- linux-2.6.32.29/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
10339 ++++ linux-2.6.32.29/drivers/video/fbcmap.c 2010-12-31 14:46:53.000000000 -0500
10340 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
10341 rc = -ENODEV;
10342 goto out;
10343 @@ -30188,9 +30248,9 @@ diff -urNp linux-2.6.32.28/drivers/video/fbcmap.c linux-2.6.32.28/drivers/video/
10344 rc = -EINVAL;
10345 goto out1;
10346 }
10347 -diff -urNp linux-2.6.32.28/drivers/video/fbmem.c linux-2.6.32.28/drivers/video/fbmem.c
10348 ---- linux-2.6.32.28/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
10349 -+++ linux-2.6.32.28/drivers/video/fbmem.c 2010-12-31 14:46:53.000000000 -0500
10350 +diff -urNp linux-2.6.32.29/drivers/video/fbmem.c linux-2.6.32.29/drivers/video/fbmem.c
10351 +--- linux-2.6.32.29/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
10352 ++++ linux-2.6.32.29/drivers/video/fbmem.c 2010-12-31 14:46:53.000000000 -0500
10353 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
10354 image->dx += image->width + 8;
10355 }
10356 @@ -30218,9 +30278,9 @@ diff -urNp linux-2.6.32.28/drivers/video/fbmem.c linux-2.6.32.28/drivers/video/f
10357 return -EINVAL;
10358 if (!registered_fb[con2fb.framebuffer])
10359 request_module("fb%d", con2fb.framebuffer);
10360 -diff -urNp linux-2.6.32.28/drivers/video/fbmon.c linux-2.6.32.28/drivers/video/fbmon.c
10361 ---- linux-2.6.32.28/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
10362 -+++ linux-2.6.32.28/drivers/video/fbmon.c 2010-12-31 14:46:53.000000000 -0500
10363 +diff -urNp linux-2.6.32.29/drivers/video/fbmon.c linux-2.6.32.29/drivers/video/fbmon.c
10364 +--- linux-2.6.32.29/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
10365 ++++ linux-2.6.32.29/drivers/video/fbmon.c 2010-12-31 14:46:53.000000000 -0500
10366 @@ -45,7 +45,7 @@
10367 #ifdef DEBUG
10368 #define DPRINTK(fmt, args...) printk(fmt,## args)
10369 @@ -30230,9 +30290,9 @@ diff -urNp linux-2.6.32.28/drivers/video/fbmon.c linux-2.6.32.28/drivers/video/f
10370 #endif
10371
10372 #define FBMON_FIX_HEADER 1
10373 -diff -urNp linux-2.6.32.28/drivers/video/i810/i810_accel.c linux-2.6.32.28/drivers/video/i810/i810_accel.c
10374 ---- linux-2.6.32.28/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
10375 -+++ linux-2.6.32.28/drivers/video/i810/i810_accel.c 2010-12-31 14:46:53.000000000 -0500
10376 +diff -urNp linux-2.6.32.29/drivers/video/i810/i810_accel.c linux-2.6.32.29/drivers/video/i810/i810_accel.c
10377 +--- linux-2.6.32.29/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
10378 ++++ linux-2.6.32.29/drivers/video/i810/i810_accel.c 2010-12-31 14:46:53.000000000 -0500
10379 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct
10380 }
10381 }
10382 @@ -30241,9 +30301,9 @@ diff -urNp linux-2.6.32.28/drivers/video/i810/i810_accel.c linux-2.6.32.28/drive
10383 i810_report_error(mmio);
10384 par->dev_flags |= LOCKUP;
10385 info->pixmap.scan_align = 1;
10386 -diff -urNp linux-2.6.32.28/drivers/video/i810/i810_main.c linux-2.6.32.28/drivers/video/i810/i810_main.c
10387 ---- linux-2.6.32.28/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
10388 -+++ linux-2.6.32.28/drivers/video/i810/i810_main.c 2010-12-31 14:46:53.000000000 -0500
10389 +diff -urNp linux-2.6.32.29/drivers/video/i810/i810_main.c linux-2.6.32.29/drivers/video/i810/i810_main.c
10390 +--- linux-2.6.32.29/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
10391 ++++ linux-2.6.32.29/drivers/video/i810/i810_main.c 2010-12-31 14:46:53.000000000 -0500
10392 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
10393 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
10394 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
10395 @@ -30253,9 +30313,9 @@ diff -urNp linux-2.6.32.28/drivers/video/i810/i810_main.c linux-2.6.32.28/driver
10396 };
10397
10398 static struct pci_driver i810fb_driver = {
10399 -diff -urNp linux-2.6.32.28/drivers/video/modedb.c linux-2.6.32.28/drivers/video/modedb.c
10400 ---- linux-2.6.32.28/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
10401 -+++ linux-2.6.32.28/drivers/video/modedb.c 2010-12-31 14:46:53.000000000 -0500
10402 +diff -urNp linux-2.6.32.29/drivers/video/modedb.c linux-2.6.32.29/drivers/video/modedb.c
10403 +--- linux-2.6.32.29/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
10404 ++++ linux-2.6.32.29/drivers/video/modedb.c 2010-12-31 14:46:53.000000000 -0500
10405 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
10406 {
10407 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
10408 @@ -30556,9 +30616,9 @@ diff -urNp linux-2.6.32.28/drivers/video/modedb.c linux-2.6.32.28/drivers/video/
10409 },
10410 };
10411
10412 -diff -urNp linux-2.6.32.28/drivers/video/nvidia/nv_backlight.c linux-2.6.32.28/drivers/video/nvidia/nv_backlight.c
10413 ---- linux-2.6.32.28/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
10414 -+++ linux-2.6.32.28/drivers/video/nvidia/nv_backlight.c 2010-12-31 14:46:53.000000000 -0500
10415 +diff -urNp linux-2.6.32.29/drivers/video/nvidia/nv_backlight.c linux-2.6.32.29/drivers/video/nvidia/nv_backlight.c
10416 +--- linux-2.6.32.29/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
10417 ++++ linux-2.6.32.29/drivers/video/nvidia/nv_backlight.c 2010-12-31 14:46:53.000000000 -0500
10418 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
10419 return bd->props.brightness;
10420 }
10421 @@ -30568,9 +30628,9 @@ diff -urNp linux-2.6.32.28/drivers/video/nvidia/nv_backlight.c linux-2.6.32.28/d
10422 .get_brightness = nvidia_bl_get_brightness,
10423 .update_status = nvidia_bl_update_status,
10424 };
10425 -diff -urNp linux-2.6.32.28/drivers/video/riva/fbdev.c linux-2.6.32.28/drivers/video/riva/fbdev.c
10426 ---- linux-2.6.32.28/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
10427 -+++ linux-2.6.32.28/drivers/video/riva/fbdev.c 2010-12-31 14:46:53.000000000 -0500
10428 +diff -urNp linux-2.6.32.29/drivers/video/riva/fbdev.c linux-2.6.32.29/drivers/video/riva/fbdev.c
10429 +--- linux-2.6.32.29/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
10430 ++++ linux-2.6.32.29/drivers/video/riva/fbdev.c 2010-12-31 14:46:53.000000000 -0500
10431 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
10432 return bd->props.brightness;
10433 }
10434 @@ -30580,9 +30640,9 @@ diff -urNp linux-2.6.32.28/drivers/video/riva/fbdev.c linux-2.6.32.28/drivers/vi
10435 .get_brightness = riva_bl_get_brightness,
10436 .update_status = riva_bl_update_status,
10437 };
10438 -diff -urNp linux-2.6.32.28/drivers/video/uvesafb.c linux-2.6.32.28/drivers/video/uvesafb.c
10439 ---- linux-2.6.32.28/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
10440 -+++ linux-2.6.32.28/drivers/video/uvesafb.c 2010-12-31 14:46:53.000000000 -0500
10441 +diff -urNp linux-2.6.32.29/drivers/video/uvesafb.c linux-2.6.32.29/drivers/video/uvesafb.c
10442 +--- linux-2.6.32.29/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
10443 ++++ linux-2.6.32.29/drivers/video/uvesafb.c 2010-12-31 14:46:53.000000000 -0500
10444 @@ -18,6 +18,7 @@
10445 #include <linux/fb.h>
10446 #include <linux/io.h>
10447 @@ -30658,9 +30718,9 @@ diff -urNp linux-2.6.32.28/drivers/video/uvesafb.c linux-2.6.32.28/drivers/video
10448 }
10449
10450 framebuffer_release(info);
10451 -diff -urNp linux-2.6.32.28/drivers/video/vesafb.c linux-2.6.32.28/drivers/video/vesafb.c
10452 ---- linux-2.6.32.28/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
10453 -+++ linux-2.6.32.28/drivers/video/vesafb.c 2010-12-31 14:46:53.000000000 -0500
10454 +diff -urNp linux-2.6.32.29/drivers/video/vesafb.c linux-2.6.32.29/drivers/video/vesafb.c
10455 +--- linux-2.6.32.29/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
10456 ++++ linux-2.6.32.29/drivers/video/vesafb.c 2010-12-31 14:46:53.000000000 -0500
10457 @@ -9,6 +9,7 @@
10458 */
10459
10460 @@ -30764,9 +30824,9 @@ diff -urNp linux-2.6.32.28/drivers/video/vesafb.c linux-2.6.32.28/drivers/video/
10461 if (info->screen_base)
10462 iounmap(info->screen_base);
10463 framebuffer_release(info);
10464 -diff -urNp linux-2.6.32.28/drivers/xen/sys-hypervisor.c linux-2.6.32.28/drivers/xen/sys-hypervisor.c
10465 ---- linux-2.6.32.28/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
10466 -+++ linux-2.6.32.28/drivers/xen/sys-hypervisor.c 2010-12-31 14:46:53.000000000 -0500
10467 +diff -urNp linux-2.6.32.29/drivers/xen/sys-hypervisor.c linux-2.6.32.29/drivers/xen/sys-hypervisor.c
10468 +--- linux-2.6.32.29/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
10469 ++++ linux-2.6.32.29/drivers/xen/sys-hypervisor.c 2010-12-31 14:46:53.000000000 -0500
10470 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
10471 return 0;
10472 }
10473 @@ -30776,9 +30836,9 @@ diff -urNp linux-2.6.32.28/drivers/xen/sys-hypervisor.c linux-2.6.32.28/drivers/
10474 .show = hyp_sysfs_show,
10475 .store = hyp_sysfs_store,
10476 };
10477 -diff -urNp linux-2.6.32.28/fs/9p/vfs_inode.c linux-2.6.32.28/fs/9p/vfs_inode.c
10478 ---- linux-2.6.32.28/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
10479 -+++ linux-2.6.32.28/fs/9p/vfs_inode.c 2010-12-31 14:46:53.000000000 -0500
10480 +diff -urNp linux-2.6.32.29/fs/9p/vfs_inode.c linux-2.6.32.29/fs/9p/vfs_inode.c
10481 +--- linux-2.6.32.29/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
10482 ++++ linux-2.6.32.29/fs/9p/vfs_inode.c 2010-12-31 14:46:53.000000000 -0500
10483 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
10484 static void
10485 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
10486 @@ -30788,9 +30848,9 @@ diff -urNp linux-2.6.32.28/fs/9p/vfs_inode.c linux-2.6.32.28/fs/9p/vfs_inode.c
10487
10488 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
10489 IS_ERR(s) ? "<error>" : s);
10490 -diff -urNp linux-2.6.32.28/fs/aio.c linux-2.6.32.28/fs/aio.c
10491 ---- linux-2.6.32.28/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
10492 -+++ linux-2.6.32.28/fs/aio.c 2010-12-31 14:46:53.000000000 -0500
10493 +diff -urNp linux-2.6.32.29/fs/aio.c linux-2.6.32.29/fs/aio.c
10494 +--- linux-2.6.32.29/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
10495 ++++ linux-2.6.32.29/fs/aio.c 2010-12-31 14:46:53.000000000 -0500
10496 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
10497 size += sizeof(struct io_event) * nr_events;
10498 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
10499 @@ -30800,9 +30860,9 @@ diff -urNp linux-2.6.32.28/fs/aio.c linux-2.6.32.28/fs/aio.c
10500 return -EINVAL;
10501
10502 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
10503 -diff -urNp linux-2.6.32.28/fs/attr.c linux-2.6.32.28/fs/attr.c
10504 ---- linux-2.6.32.28/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
10505 -+++ linux-2.6.32.28/fs/attr.c 2010-12-31 14:46:53.000000000 -0500
10506 +diff -urNp linux-2.6.32.29/fs/attr.c linux-2.6.32.29/fs/attr.c
10507 +--- linux-2.6.32.29/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
10508 ++++ linux-2.6.32.29/fs/attr.c 2010-12-31 14:46:53.000000000 -0500
10509 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
10510 unsigned long limit;
10511
10512 @@ -30811,9 +30871,9 @@ diff -urNp linux-2.6.32.28/fs/attr.c linux-2.6.32.28/fs/attr.c
10513 if (limit != RLIM_INFINITY && offset > limit)
10514 goto out_sig;
10515 if (offset > inode->i_sb->s_maxbytes)
10516 -diff -urNp linux-2.6.32.28/fs/autofs/root.c linux-2.6.32.28/fs/autofs/root.c
10517 ---- linux-2.6.32.28/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
10518 -+++ linux-2.6.32.28/fs/autofs/root.c 2010-12-31 14:46:53.000000000 -0500
10519 +diff -urNp linux-2.6.32.29/fs/autofs/root.c linux-2.6.32.29/fs/autofs/root.c
10520 +--- linux-2.6.32.29/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
10521 ++++ linux-2.6.32.29/fs/autofs/root.c 2010-12-31 14:46:53.000000000 -0500
10522 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
10523 set_bit(n,sbi->symlink_bitmap);
10524 sl = &sbi->symlink[n];
10525 @@ -30824,9 +30884,9 @@ diff -urNp linux-2.6.32.28/fs/autofs/root.c linux-2.6.32.28/fs/autofs/root.c
10526 if (!sl->data) {
10527 clear_bit(n,sbi->symlink_bitmap);
10528 unlock_kernel();
10529 -diff -urNp linux-2.6.32.28/fs/autofs4/symlink.c linux-2.6.32.28/fs/autofs4/symlink.c
10530 ---- linux-2.6.32.28/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
10531 -+++ linux-2.6.32.28/fs/autofs4/symlink.c 2010-12-31 14:46:53.000000000 -0500
10532 +diff -urNp linux-2.6.32.29/fs/autofs4/symlink.c linux-2.6.32.29/fs/autofs4/symlink.c
10533 +--- linux-2.6.32.29/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
10534 ++++ linux-2.6.32.29/fs/autofs4/symlink.c 2010-12-31 14:46:53.000000000 -0500
10535 @@ -15,7 +15,7 @@
10536 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
10537 {
10538 @@ -30836,9 +30896,9 @@ diff -urNp linux-2.6.32.28/fs/autofs4/symlink.c linux-2.6.32.28/fs/autofs4/symli
10539 return NULL;
10540 }
10541
10542 -diff -urNp linux-2.6.32.28/fs/befs/linuxvfs.c linux-2.6.32.28/fs/befs/linuxvfs.c
10543 ---- linux-2.6.32.28/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
10544 -+++ linux-2.6.32.28/fs/befs/linuxvfs.c 2010-12-31 14:46:53.000000000 -0500
10545 +diff -urNp linux-2.6.32.29/fs/befs/linuxvfs.c linux-2.6.32.29/fs/befs/linuxvfs.c
10546 +--- linux-2.6.32.29/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
10547 ++++ linux-2.6.32.29/fs/befs/linuxvfs.c 2010-12-31 14:46:53.000000000 -0500
10548 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
10549 {
10550 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
10551 @@ -30848,9 +30908,9 @@ diff -urNp linux-2.6.32.28/fs/befs/linuxvfs.c linux-2.6.32.28/fs/befs/linuxvfs.c
10552 if (!IS_ERR(link))
10553 kfree(link);
10554 }
10555 -diff -urNp linux-2.6.32.28/fs/binfmt_aout.c linux-2.6.32.28/fs/binfmt_aout.c
10556 ---- linux-2.6.32.28/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
10557 -+++ linux-2.6.32.28/fs/binfmt_aout.c 2010-12-31 14:46:53.000000000 -0500
10558 +diff -urNp linux-2.6.32.29/fs/binfmt_aout.c linux-2.6.32.29/fs/binfmt_aout.c
10559 +--- linux-2.6.32.29/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
10560 ++++ linux-2.6.32.29/fs/binfmt_aout.c 2010-12-31 14:46:53.000000000 -0500
10561 @@ -16,6 +16,7 @@
10562 #include <linux/string.h>
10563 #include <linux/fs.h>
10564 @@ -30938,9 +30998,9 @@ diff -urNp linux-2.6.32.28/fs/binfmt_aout.c linux-2.6.32.28/fs/binfmt_aout.c
10565 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
10566 fd_offset + ex.a_text);
10567 up_write(&current->mm->mmap_sem);
10568 -diff -urNp linux-2.6.32.28/fs/binfmt_elf.c linux-2.6.32.28/fs/binfmt_elf.c
10569 ---- linux-2.6.32.28/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
10570 -+++ linux-2.6.32.28/fs/binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
10571 +diff -urNp linux-2.6.32.29/fs/binfmt_elf.c linux-2.6.32.29/fs/binfmt_elf.c
10572 +--- linux-2.6.32.29/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
10573 ++++ linux-2.6.32.29/fs/binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
10574 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
10575 #define elf_core_dump NULL
10576 #endif
10577 @@ -31576,9 +31636,9 @@ diff -urNp linux-2.6.32.28/fs/binfmt_elf.c linux-2.6.32.28/fs/binfmt_elf.c
10578 static int __init init_elf_binfmt(void)
10579 {
10580 return register_binfmt(&elf_format);
10581 -diff -urNp linux-2.6.32.28/fs/binfmt_flat.c linux-2.6.32.28/fs/binfmt_flat.c
10582 ---- linux-2.6.32.28/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
10583 -+++ linux-2.6.32.28/fs/binfmt_flat.c 2010-12-31 14:46:53.000000000 -0500
10584 +diff -urNp linux-2.6.32.29/fs/binfmt_flat.c linux-2.6.32.29/fs/binfmt_flat.c
10585 +--- linux-2.6.32.29/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
10586 ++++ linux-2.6.32.29/fs/binfmt_flat.c 2010-12-31 14:46:53.000000000 -0500
10587 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
10588 realdatastart = (unsigned long) -ENOMEM;
10589 printk("Unable to allocate RAM for process data, errno %d\n",
10590 @@ -31611,9 +31671,9 @@ diff -urNp linux-2.6.32.28/fs/binfmt_flat.c linux-2.6.32.28/fs/binfmt_flat.c
10591 ret = result;
10592 goto err;
10593 }
10594 -diff -urNp linux-2.6.32.28/fs/binfmt_misc.c linux-2.6.32.28/fs/binfmt_misc.c
10595 ---- linux-2.6.32.28/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
10596 -+++ linux-2.6.32.28/fs/binfmt_misc.c 2010-12-31 14:46:53.000000000 -0500
10597 +diff -urNp linux-2.6.32.29/fs/binfmt_misc.c linux-2.6.32.29/fs/binfmt_misc.c
10598 +--- linux-2.6.32.29/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
10599 ++++ linux-2.6.32.29/fs/binfmt_misc.c 2010-12-31 14:46:53.000000000 -0500
10600 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
10601 static struct tree_descr bm_files[] = {
10602 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
10603 @@ -31623,9 +31683,9 @@ diff -urNp linux-2.6.32.28/fs/binfmt_misc.c linux-2.6.32.28/fs/binfmt_misc.c
10604 };
10605 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
10606 if (!err)
10607 -diff -urNp linux-2.6.32.28/fs/bio.c linux-2.6.32.28/fs/bio.c
10608 ---- linux-2.6.32.28/fs/bio.c 2010-12-09 18:13:03.000000000 -0500
10609 -+++ linux-2.6.32.28/fs/bio.c 2010-12-31 14:46:53.000000000 -0500
10610 +diff -urNp linux-2.6.32.29/fs/bio.c linux-2.6.32.29/fs/bio.c
10611 +--- linux-2.6.32.29/fs/bio.c 2010-12-09 18:13:03.000000000 -0500
10612 ++++ linux-2.6.32.29/fs/bio.c 2010-12-31 14:46:53.000000000 -0500
10613 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
10614
10615 i = 0;
10616 @@ -31644,9 +31704,9 @@ diff -urNp linux-2.6.32.28/fs/bio.c linux-2.6.32.28/fs/bio.c
10617
10618 __bio_for_each_segment(bvec, bio, i, 0) {
10619 char *addr = page_address(bvec->bv_page);
10620 -diff -urNp linux-2.6.32.28/fs/block_dev.c linux-2.6.32.28/fs/block_dev.c
10621 ---- linux-2.6.32.28/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
10622 -+++ linux-2.6.32.28/fs/block_dev.c 2010-12-31 14:46:53.000000000 -0500
10623 +diff -urNp linux-2.6.32.29/fs/block_dev.c linux-2.6.32.29/fs/block_dev.c
10624 +--- linux-2.6.32.29/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
10625 ++++ linux-2.6.32.29/fs/block_dev.c 2010-12-31 14:46:53.000000000 -0500
10626 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
10627 else if (bdev->bd_contains == bdev)
10628 res = 0; /* is a whole device which isn't held */
10629 @@ -31656,9 +31716,9 @@ diff -urNp linux-2.6.32.28/fs/block_dev.c linux-2.6.32.28/fs/block_dev.c
10630 res = 0; /* is a partition of a device that is being partitioned */
10631 else if (bdev->bd_contains->bd_holder != NULL)
10632 res = -EBUSY; /* is a partition of a held device */
10633 -diff -urNp linux-2.6.32.28/fs/btrfs/ctree.c linux-2.6.32.28/fs/btrfs/ctree.c
10634 ---- linux-2.6.32.28/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
10635 -+++ linux-2.6.32.28/fs/btrfs/ctree.c 2010-12-31 14:46:53.000000000 -0500
10636 +diff -urNp linux-2.6.32.29/fs/btrfs/ctree.c linux-2.6.32.29/fs/btrfs/ctree.c
10637 +--- linux-2.6.32.29/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
10638 ++++ linux-2.6.32.29/fs/btrfs/ctree.c 2010-12-31 14:46:53.000000000 -0500
10639 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
10640 free_extent_buffer(buf);
10641 add_root_to_dirty_list(root);
10642 @@ -31683,9 +31743,9 @@ diff -urNp linux-2.6.32.28/fs/btrfs/ctree.c linux-2.6.32.28/fs/btrfs/ctree.c
10643 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
10644 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
10645 }
10646 -diff -urNp linux-2.6.32.28/fs/btrfs/disk-io.c linux-2.6.32.28/fs/btrfs/disk-io.c
10647 ---- linux-2.6.32.28/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
10648 -+++ linux-2.6.32.28/fs/btrfs/disk-io.c 2010-12-31 14:46:53.000000000 -0500
10649 +diff -urNp linux-2.6.32.29/fs/btrfs/disk-io.c linux-2.6.32.29/fs/btrfs/disk-io.c
10650 +--- linux-2.6.32.29/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
10651 ++++ linux-2.6.32.29/fs/btrfs/disk-io.c 2010-12-31 14:46:53.000000000 -0500
10652 @@ -39,7 +39,7 @@
10653 #include "tree-log.h"
10654 #include "free-space-cache.h"
10655 @@ -31704,9 +31764,9 @@ diff -urNp linux-2.6.32.28/fs/btrfs/disk-io.c linux-2.6.32.28/fs/btrfs/disk-io.c
10656 .write_cache_pages_lock_hook = btree_lock_page_hook,
10657 .readpage_end_io_hook = btree_readpage_end_io_hook,
10658 .submit_bio_hook = btree_submit_bio_hook,
10659 -diff -urNp linux-2.6.32.28/fs/btrfs/extent_io.h linux-2.6.32.28/fs/btrfs/extent_io.h
10660 ---- linux-2.6.32.28/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
10661 -+++ linux-2.6.32.28/fs/btrfs/extent_io.h 2010-12-31 14:46:53.000000000 -0500
10662 +diff -urNp linux-2.6.32.29/fs/btrfs/extent_io.h linux-2.6.32.29/fs/btrfs/extent_io.h
10663 +--- linux-2.6.32.29/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
10664 ++++ linux-2.6.32.29/fs/btrfs/extent_io.h 2010-12-31 14:46:53.000000000 -0500
10665 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
10666 struct bio *bio, int mirror_num,
10667 unsigned long bio_flags);
10668 @@ -31767,9 +31827,9 @@ diff -urNp linux-2.6.32.28/fs/btrfs/extent_io.h linux-2.6.32.28/fs/btrfs/extent_
10669 };
10670
10671 struct extent_state {
10672 -diff -urNp linux-2.6.32.28/fs/btrfs/free-space-cache.c linux-2.6.32.28/fs/btrfs/free-space-cache.c
10673 ---- linux-2.6.32.28/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
10674 -+++ linux-2.6.32.28/fs/btrfs/free-space-cache.c 2010-12-31 14:46:53.000000000 -0500
10675 +diff -urNp linux-2.6.32.29/fs/btrfs/free-space-cache.c linux-2.6.32.29/fs/btrfs/free-space-cache.c
10676 +--- linux-2.6.32.29/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
10677 ++++ linux-2.6.32.29/fs/btrfs/free-space-cache.c 2010-12-31 14:46:53.000000000 -0500
10678 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
10679
10680 while(1) {
10681 @@ -31788,9 +31848,9 @@ diff -urNp linux-2.6.32.28/fs/btrfs/free-space-cache.c linux-2.6.32.28/fs/btrfs/
10682
10683 if (entry->bitmap && entry->bytes > bytes + empty_size) {
10684 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
10685 -diff -urNp linux-2.6.32.28/fs/btrfs/inode.c linux-2.6.32.28/fs/btrfs/inode.c
10686 ---- linux-2.6.32.28/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
10687 -+++ linux-2.6.32.28/fs/btrfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10688 +diff -urNp linux-2.6.32.29/fs/btrfs/inode.c linux-2.6.32.29/fs/btrfs/inode.c
10689 +--- linux-2.6.32.29/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
10690 ++++ linux-2.6.32.29/fs/btrfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10691 @@ -63,7 +63,7 @@ static const struct inode_operations btr
10692 static const struct address_space_operations btrfs_aops;
10693 static const struct address_space_operations btrfs_symlink_aops;
10694 @@ -31809,9 +31869,9 @@ diff -urNp linux-2.6.32.28/fs/btrfs/inode.c linux-2.6.32.28/fs/btrfs/inode.c
10695 .fill_delalloc = run_delalloc_range,
10696 .submit_bio_hook = btrfs_submit_bio_hook,
10697 .merge_bio_hook = btrfs_merge_bio_hook,
10698 -diff -urNp linux-2.6.32.28/fs/btrfs/relocation.c linux-2.6.32.28/fs/btrfs/relocation.c
10699 ---- linux-2.6.32.28/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400
10700 -+++ linux-2.6.32.28/fs/btrfs/relocation.c 2010-12-31 14:46:53.000000000 -0500
10701 +diff -urNp linux-2.6.32.29/fs/btrfs/relocation.c linux-2.6.32.29/fs/btrfs/relocation.c
10702 +--- linux-2.6.32.29/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400
10703 ++++ linux-2.6.32.29/fs/btrfs/relocation.c 2010-12-31 14:46:53.000000000 -0500
10704 @@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
10705 }
10706 spin_unlock(&rc->reloc_root_tree.lock);
10707 @@ -31821,9 +31881,9 @@ diff -urNp linux-2.6.32.28/fs/btrfs/relocation.c linux-2.6.32.28/fs/btrfs/reloca
10708
10709 if (!del) {
10710 spin_lock(&rc->reloc_root_tree.lock);
10711 -diff -urNp linux-2.6.32.28/fs/btrfs/sysfs.c linux-2.6.32.28/fs/btrfs/sysfs.c
10712 ---- linux-2.6.32.28/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10713 -+++ linux-2.6.32.28/fs/btrfs/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10714 +diff -urNp linux-2.6.32.29/fs/btrfs/sysfs.c linux-2.6.32.29/fs/btrfs/sysfs.c
10715 +--- linux-2.6.32.29/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
10716 ++++ linux-2.6.32.29/fs/btrfs/sysfs.c 2010-12-31 14:46:53.000000000 -0500
10717 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
10718 complete(&root->kobj_unregister);
10719 }
10720 @@ -31839,9 +31899,9 @@ diff -urNp linux-2.6.32.28/fs/btrfs/sysfs.c linux-2.6.32.28/fs/btrfs/sysfs.c
10721 .show = btrfs_root_attr_show,
10722 .store = btrfs_root_attr_store,
10723 };
10724 -diff -urNp linux-2.6.32.28/fs/buffer.c linux-2.6.32.28/fs/buffer.c
10725 ---- linux-2.6.32.28/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
10726 -+++ linux-2.6.32.28/fs/buffer.c 2010-12-31 14:46:53.000000000 -0500
10727 +diff -urNp linux-2.6.32.29/fs/buffer.c linux-2.6.32.29/fs/buffer.c
10728 +--- linux-2.6.32.29/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
10729 ++++ linux-2.6.32.29/fs/buffer.c 2010-12-31 14:46:53.000000000 -0500
10730 @@ -25,6 +25,7 @@
10731 #include <linux/percpu.h>
10732 #include <linux/slab.h>
10733 @@ -31850,9 +31910,9 @@ diff -urNp linux-2.6.32.28/fs/buffer.c linux-2.6.32.28/fs/buffer.c
10734 #include <linux/blkdev.h>
10735 #include <linux/file.h>
10736 #include <linux/quotaops.h>
10737 -diff -urNp linux-2.6.32.28/fs/cachefiles/bind.c linux-2.6.32.28/fs/cachefiles/bind.c
10738 ---- linux-2.6.32.28/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
10739 -+++ linux-2.6.32.28/fs/cachefiles/bind.c 2010-12-31 14:46:53.000000000 -0500
10740 +diff -urNp linux-2.6.32.29/fs/cachefiles/bind.c linux-2.6.32.29/fs/cachefiles/bind.c
10741 +--- linux-2.6.32.29/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
10742 ++++ linux-2.6.32.29/fs/cachefiles/bind.c 2010-12-31 14:46:53.000000000 -0500
10743 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
10744 args);
10745
10746 @@ -31869,9 +31929,9 @@ diff -urNp linux-2.6.32.28/fs/cachefiles/bind.c linux-2.6.32.28/fs/cachefiles/bi
10747 cache->bcull_percent < cache->brun_percent &&
10748 cache->brun_percent < 100);
10749
10750 -diff -urNp linux-2.6.32.28/fs/cachefiles/daemon.c linux-2.6.32.28/fs/cachefiles/daemon.c
10751 ---- linux-2.6.32.28/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
10752 -+++ linux-2.6.32.28/fs/cachefiles/daemon.c 2010-12-31 14:46:53.000000000 -0500
10753 +diff -urNp linux-2.6.32.29/fs/cachefiles/daemon.c linux-2.6.32.29/fs/cachefiles/daemon.c
10754 +--- linux-2.6.32.29/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
10755 ++++ linux-2.6.32.29/fs/cachefiles/daemon.c 2010-12-31 14:46:53.000000000 -0500
10756 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
10757 if (test_bit(CACHEFILES_DEAD, &cache->flags))
10758 return -EIO;
10759 @@ -31899,9 +31959,9 @@ diff -urNp linux-2.6.32.28/fs/cachefiles/daemon.c linux-2.6.32.28/fs/cachefiles/
10760 return cachefiles_daemon_range_error(cache, args);
10761
10762 cache->bstop_percent = bstop;
10763 -diff -urNp linux-2.6.32.28/fs/cachefiles/rdwr.c linux-2.6.32.28/fs/cachefiles/rdwr.c
10764 ---- linux-2.6.32.28/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
10765 -+++ linux-2.6.32.28/fs/cachefiles/rdwr.c 2010-12-31 14:46:53.000000000 -0500
10766 +diff -urNp linux-2.6.32.29/fs/cachefiles/rdwr.c linux-2.6.32.29/fs/cachefiles/rdwr.c
10767 +--- linux-2.6.32.29/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
10768 ++++ linux-2.6.32.29/fs/cachefiles/rdwr.c 2010-12-31 14:46:53.000000000 -0500
10769 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
10770 old_fs = get_fs();
10771 set_fs(KERNEL_DS);
10772 @@ -31911,9 +31971,9 @@ diff -urNp linux-2.6.32.28/fs/cachefiles/rdwr.c linux-2.6.32.28/fs/cachefiles/rd
10773 set_fs(old_fs);
10774 kunmap(page);
10775 if (ret != len)
10776 -diff -urNp linux-2.6.32.28/fs/cifs/cifs_uniupr.h linux-2.6.32.28/fs/cifs/cifs_uniupr.h
10777 ---- linux-2.6.32.28/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
10778 -+++ linux-2.6.32.28/fs/cifs/cifs_uniupr.h 2010-12-31 14:46:53.000000000 -0500
10779 +diff -urNp linux-2.6.32.29/fs/cifs/cifs_uniupr.h linux-2.6.32.29/fs/cifs/cifs_uniupr.h
10780 +--- linux-2.6.32.29/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
10781 ++++ linux-2.6.32.29/fs/cifs/cifs_uniupr.h 2010-12-31 14:46:53.000000000 -0500
10782 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
10783 {0x0490, 0x04cc, UniCaseRangeU0490},
10784 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
10785 @@ -31923,9 +31983,9 @@ diff -urNp linux-2.6.32.28/fs/cifs/cifs_uniupr.h linux-2.6.32.28/fs/cifs/cifs_un
10786 };
10787 #endif
10788
10789 -diff -urNp linux-2.6.32.28/fs/cifs/link.c linux-2.6.32.28/fs/cifs/link.c
10790 ---- linux-2.6.32.28/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
10791 -+++ linux-2.6.32.28/fs/cifs/link.c 2010-12-31 14:46:53.000000000 -0500
10792 +diff -urNp linux-2.6.32.29/fs/cifs/link.c linux-2.6.32.29/fs/cifs/link.c
10793 +--- linux-2.6.32.29/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
10794 ++++ linux-2.6.32.29/fs/cifs/link.c 2010-12-31 14:46:53.000000000 -0500
10795 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
10796
10797 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
10798 @@ -31935,9 +31995,9 @@ diff -urNp linux-2.6.32.28/fs/cifs/link.c linux-2.6.32.28/fs/cifs/link.c
10799 if (!IS_ERR(p))
10800 kfree(p);
10801 }
10802 -diff -urNp linux-2.6.32.28/fs/compat_binfmt_elf.c linux-2.6.32.28/fs/compat_binfmt_elf.c
10803 ---- linux-2.6.32.28/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
10804 -+++ linux-2.6.32.28/fs/compat_binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
10805 +diff -urNp linux-2.6.32.29/fs/compat_binfmt_elf.c linux-2.6.32.29/fs/compat_binfmt_elf.c
10806 +--- linux-2.6.32.29/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
10807 ++++ linux-2.6.32.29/fs/compat_binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
10808 @@ -29,10 +29,12 @@
10809 #undef elfhdr
10810 #undef elf_phdr
10811 @@ -31951,9 +32011,9 @@ diff -urNp linux-2.6.32.28/fs/compat_binfmt_elf.c linux-2.6.32.28/fs/compat_binf
10812 #define elf_addr_t Elf32_Addr
10813
10814 /*
10815 -diff -urNp linux-2.6.32.28/fs/compat.c linux-2.6.32.28/fs/compat.c
10816 ---- linux-2.6.32.28/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
10817 -+++ linux-2.6.32.28/fs/compat.c 2011-01-11 23:29:37.000000000 -0500
10818 +diff -urNp linux-2.6.32.29/fs/compat.c linux-2.6.32.29/fs/compat.c
10819 +--- linux-2.6.32.29/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
10820 ++++ linux-2.6.32.29/fs/compat.c 2011-01-11 23:29:37.000000000 -0500
10821 @@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
10822
10823 struct compat_readdir_callback {
10824 @@ -32178,9 +32238,9 @@ diff -urNp linux-2.6.32.28/fs/compat.c linux-2.6.32.28/fs/compat.c
10825
10826 out_file:
10827 if (bprm->file) {
10828 -diff -urNp linux-2.6.32.28/fs/compat_ioctl.c linux-2.6.32.28/fs/compat_ioctl.c
10829 ---- linux-2.6.32.28/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
10830 -+++ linux-2.6.32.28/fs/compat_ioctl.c 2010-12-31 14:46:53.000000000 -0500
10831 +diff -urNp linux-2.6.32.29/fs/compat_ioctl.c linux-2.6.32.29/fs/compat_ioctl.c
10832 +--- linux-2.6.32.29/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
10833 ++++ linux-2.6.32.29/fs/compat_ioctl.c 2010-12-31 14:46:53.000000000 -0500
10834 @@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi
10835 up = (struct compat_video_spu_palette __user *) arg;
10836 err = get_user(palp, &up->palette);
10837 @@ -32209,9 +32269,9 @@ diff -urNp linux-2.6.32.28/fs/compat_ioctl.c linux-2.6.32.28/fs/compat_ioctl.c
10838
10839 /* ioctl should not be warned about even if it's not implemented.
10840 Valid reasons to use this:
10841 -diff -urNp linux-2.6.32.28/fs/debugfs/inode.c linux-2.6.32.28/fs/debugfs/inode.c
10842 ---- linux-2.6.32.28/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
10843 -+++ linux-2.6.32.28/fs/debugfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10844 +diff -urNp linux-2.6.32.29/fs/debugfs/inode.c linux-2.6.32.29/fs/debugfs/inode.c
10845 +--- linux-2.6.32.29/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
10846 ++++ linux-2.6.32.29/fs/debugfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10847 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
10848
10849 static int debug_fill_super(struct super_block *sb, void *data, int silent)
10850 @@ -32221,9 +32281,9 @@ diff -urNp linux-2.6.32.28/fs/debugfs/inode.c linux-2.6.32.28/fs/debugfs/inode.c
10851
10852 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
10853 }
10854 -diff -urNp linux-2.6.32.28/fs/dlm/lockspace.c linux-2.6.32.28/fs/dlm/lockspace.c
10855 ---- linux-2.6.32.28/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
10856 -+++ linux-2.6.32.28/fs/dlm/lockspace.c 2010-12-31 14:46:53.000000000 -0500
10857 +diff -urNp linux-2.6.32.29/fs/dlm/lockspace.c linux-2.6.32.29/fs/dlm/lockspace.c
10858 +--- linux-2.6.32.29/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
10859 ++++ linux-2.6.32.29/fs/dlm/lockspace.c 2010-12-31 14:46:53.000000000 -0500
10860 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
10861 kfree(ls);
10862 }
10863 @@ -32233,9 +32293,9 @@ diff -urNp linux-2.6.32.28/fs/dlm/lockspace.c linux-2.6.32.28/fs/dlm/lockspace.c
10864 .show = dlm_attr_show,
10865 .store = dlm_attr_store,
10866 };
10867 -diff -urNp linux-2.6.32.28/fs/ecryptfs/inode.c linux-2.6.32.28/fs/ecryptfs/inode.c
10868 ---- linux-2.6.32.28/fs/ecryptfs/inode.c 2010-12-09 18:13:03.000000000 -0500
10869 -+++ linux-2.6.32.28/fs/ecryptfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10870 +diff -urNp linux-2.6.32.29/fs/ecryptfs/inode.c linux-2.6.32.29/fs/ecryptfs/inode.c
10871 +--- linux-2.6.32.29/fs/ecryptfs/inode.c 2010-12-09 18:13:03.000000000 -0500
10872 ++++ linux-2.6.32.29/fs/ecryptfs/inode.c 2010-12-31 14:46:53.000000000 -0500
10873 @@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
10874 old_fs = get_fs();
10875 set_fs(get_ds());
10876 @@ -32254,9 +32314,9 @@ diff -urNp linux-2.6.32.28/fs/ecryptfs/inode.c linux-2.6.32.28/fs/ecryptfs/inode
10877 set_fs(old_fs);
10878 if (rc < 0)
10879 goto out_free;
10880 -diff -urNp linux-2.6.32.28/fs/exec.c linux-2.6.32.28/fs/exec.c
10881 ---- linux-2.6.32.28/fs/exec.c 2011-01-11 23:55:35.000000000 -0500
10882 -+++ linux-2.6.32.28/fs/exec.c 2011-02-12 11:21:23.000000000 -0500
10883 +diff -urNp linux-2.6.32.29/fs/exec.c linux-2.6.32.29/fs/exec.c
10884 +--- linux-2.6.32.29/fs/exec.c 2011-01-11 23:55:35.000000000 -0500
10885 ++++ linux-2.6.32.29/fs/exec.c 2011-02-12 11:21:23.000000000 -0500
10886 @@ -56,12 +56,24 @@
10887 #include <linux/fsnotify.h>
10888 #include <linux/fs_struct.h>
10889 @@ -32848,9 +32908,9 @@ diff -urNp linux-2.6.32.28/fs/exec.c linux-2.6.32.28/fs/exec.c
10890 /*
10891 * lock_kernel() because format_corename() is controlled by sysctl, which
10892 * uses lock_kernel()
10893 -diff -urNp linux-2.6.32.28/fs/ext2/balloc.c linux-2.6.32.28/fs/ext2/balloc.c
10894 ---- linux-2.6.32.28/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
10895 -+++ linux-2.6.32.28/fs/ext2/balloc.c 2010-12-31 14:46:53.000000000 -0500
10896 +diff -urNp linux-2.6.32.29/fs/ext2/balloc.c linux-2.6.32.29/fs/ext2/balloc.c
10897 +--- linux-2.6.32.29/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
10898 ++++ linux-2.6.32.29/fs/ext2/balloc.c 2010-12-31 14:46:53.000000000 -0500
10899 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
10900
10901 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
10902 @@ -32860,9 +32920,9 @@ diff -urNp linux-2.6.32.28/fs/ext2/balloc.c linux-2.6.32.28/fs/ext2/balloc.c
10903 sbi->s_resuid != current_fsuid() &&
10904 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
10905 return 0;
10906 -diff -urNp linux-2.6.32.28/fs/ext2/xattr.c linux-2.6.32.28/fs/ext2/xattr.c
10907 ---- linux-2.6.32.28/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
10908 -+++ linux-2.6.32.28/fs/ext2/xattr.c 2010-12-31 14:46:53.000000000 -0500
10909 +diff -urNp linux-2.6.32.29/fs/ext2/xattr.c linux-2.6.32.29/fs/ext2/xattr.c
10910 +--- linux-2.6.32.29/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
10911 ++++ linux-2.6.32.29/fs/ext2/xattr.c 2010-12-31 14:46:53.000000000 -0500
10912 @@ -85,8 +85,8 @@
10913 printk("\n"); \
10914 } while (0)
10915 @@ -32874,9 +32934,9 @@ diff -urNp linux-2.6.32.28/fs/ext2/xattr.c linux-2.6.32.28/fs/ext2/xattr.c
10916 #endif
10917
10918 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
10919 -diff -urNp linux-2.6.32.28/fs/ext3/balloc.c linux-2.6.32.28/fs/ext3/balloc.c
10920 ---- linux-2.6.32.28/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
10921 -+++ linux-2.6.32.28/fs/ext3/balloc.c 2010-12-31 14:46:53.000000000 -0500
10922 +diff -urNp linux-2.6.32.29/fs/ext3/balloc.c linux-2.6.32.29/fs/ext3/balloc.c
10923 +--- linux-2.6.32.29/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
10924 ++++ linux-2.6.32.29/fs/ext3/balloc.c 2010-12-31 14:46:53.000000000 -0500
10925 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
10926
10927 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
10928 @@ -32886,9 +32946,9 @@ diff -urNp linux-2.6.32.28/fs/ext3/balloc.c linux-2.6.32.28/fs/ext3/balloc.c
10929 sbi->s_resuid != current_fsuid() &&
10930 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
10931 return 0;
10932 -diff -urNp linux-2.6.32.28/fs/ext3/namei.c linux-2.6.32.28/fs/ext3/namei.c
10933 ---- linux-2.6.32.28/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
10934 -+++ linux-2.6.32.28/fs/ext3/namei.c 2010-12-31 14:46:53.000000000 -0500
10935 +diff -urNp linux-2.6.32.29/fs/ext3/namei.c linux-2.6.32.29/fs/ext3/namei.c
10936 +--- linux-2.6.32.29/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
10937 ++++ linux-2.6.32.29/fs/ext3/namei.c 2010-12-31 14:46:53.000000000 -0500
10938 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
10939 char *data1 = (*bh)->b_data, *data2;
10940 unsigned split, move, size;
10941 @@ -32898,9 +32958,9 @@ diff -urNp linux-2.6.32.28/fs/ext3/namei.c linux-2.6.32.28/fs/ext3/namei.c
10942
10943 bh2 = ext3_append (handle, dir, &newblock, &err);
10944 if (!(bh2)) {
10945 -diff -urNp linux-2.6.32.28/fs/ext3/xattr.c linux-2.6.32.28/fs/ext3/xattr.c
10946 ---- linux-2.6.32.28/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
10947 -+++ linux-2.6.32.28/fs/ext3/xattr.c 2010-12-31 14:46:53.000000000 -0500
10948 +diff -urNp linux-2.6.32.29/fs/ext3/xattr.c linux-2.6.32.29/fs/ext3/xattr.c
10949 +--- linux-2.6.32.29/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
10950 ++++ linux-2.6.32.29/fs/ext3/xattr.c 2010-12-31 14:46:53.000000000 -0500
10951 @@ -89,8 +89,8 @@
10952 printk("\n"); \
10953 } while (0)
10954 @@ -32912,9 +32972,9 @@ diff -urNp linux-2.6.32.28/fs/ext3/xattr.c linux-2.6.32.28/fs/ext3/xattr.c
10955 #endif
10956
10957 static void ext3_xattr_cache_insert(struct buffer_head *);
10958 -diff -urNp linux-2.6.32.28/fs/ext4/balloc.c linux-2.6.32.28/fs/ext4/balloc.c
10959 ---- linux-2.6.32.28/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
10960 -+++ linux-2.6.32.28/fs/ext4/balloc.c 2010-12-31 14:46:53.000000000 -0500
10961 +diff -urNp linux-2.6.32.29/fs/ext4/balloc.c linux-2.6.32.29/fs/ext4/balloc.c
10962 +--- linux-2.6.32.29/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
10963 ++++ linux-2.6.32.29/fs/ext4/balloc.c 2010-12-31 14:46:53.000000000 -0500
10964 @@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
10965 /* Hm, nope. Are (enough) root reserved blocks available? */
10966 if (sbi->s_resuid == current_fsuid() ||
10967 @@ -32924,9 +32984,9 @@ diff -urNp linux-2.6.32.28/fs/ext4/balloc.c linux-2.6.32.28/fs/ext4/balloc.c
10968 if (free_blocks >= (nblocks + dirty_blocks))
10969 return 1;
10970 }
10971 -diff -urNp linux-2.6.32.28/fs/ext4/ext4.h linux-2.6.32.28/fs/ext4/ext4.h
10972 ---- linux-2.6.32.28/fs/ext4/ext4.h 2010-08-29 21:08:20.000000000 -0400
10973 -+++ linux-2.6.32.28/fs/ext4/ext4.h 2011-01-04 17:42:43.000000000 -0500
10974 +diff -urNp linux-2.6.32.29/fs/ext4/ext4.h linux-2.6.32.29/fs/ext4/ext4.h
10975 +--- linux-2.6.32.29/fs/ext4/ext4.h 2010-08-29 21:08:20.000000000 -0400
10976 ++++ linux-2.6.32.29/fs/ext4/ext4.h 2011-01-04 17:42:43.000000000 -0500
10977 @@ -1078,19 +1078,19 @@ struct ext4_sb_info {
10978
10979 /* stats for buddy allocator */
10980 @@ -32957,9 +33017,9 @@ diff -urNp linux-2.6.32.28/fs/ext4/ext4.h linux-2.6.32.28/fs/ext4/ext4.h
10981 atomic_t s_lock_busy;
10982
10983 /* locality groups */
10984 -diff -urNp linux-2.6.32.28/fs/ext4/mballoc.c linux-2.6.32.28/fs/ext4/mballoc.c
10985 ---- linux-2.6.32.28/fs/ext4/mballoc.c 2010-08-13 16:24:37.000000000 -0400
10986 -+++ linux-2.6.32.28/fs/ext4/mballoc.c 2011-01-04 17:42:43.000000000 -0500
10987 +diff -urNp linux-2.6.32.29/fs/ext4/mballoc.c linux-2.6.32.29/fs/ext4/mballoc.c
10988 +--- linux-2.6.32.29/fs/ext4/mballoc.c 2010-08-13 16:24:37.000000000 -0400
10989 ++++ linux-2.6.32.29/fs/ext4/mballoc.c 2011-01-04 17:42:43.000000000 -0500
10990 @@ -1753,7 +1753,7 @@ void ext4_mb_simple_scan_group(struct ex
10991 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
10992
10993 @@ -33073,9 +33133,9 @@ diff -urNp linux-2.6.32.28/fs/ext4/mballoc.c linux-2.6.32.28/fs/ext4/mballoc.c
10994
10995 if (ac) {
10996 ac->ac_sb = sb;
10997 -diff -urNp linux-2.6.32.28/fs/ext4/namei.c linux-2.6.32.28/fs/ext4/namei.c
10998 ---- linux-2.6.32.28/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
10999 -+++ linux-2.6.32.28/fs/ext4/namei.c 2010-12-31 14:46:53.000000000 -0500
11000 +diff -urNp linux-2.6.32.29/fs/ext4/namei.c linux-2.6.32.29/fs/ext4/namei.c
11001 +--- linux-2.6.32.29/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
11002 ++++ linux-2.6.32.29/fs/ext4/namei.c 2010-12-31 14:46:53.000000000 -0500
11003 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
11004 char *data1 = (*bh)->b_data, *data2;
11005 unsigned split, move, size;
11006 @@ -33085,9 +33145,9 @@ diff -urNp linux-2.6.32.28/fs/ext4/namei.c linux-2.6.32.28/fs/ext4/namei.c
11007
11008 bh2 = ext4_append (handle, dir, &newblock, &err);
11009 if (!(bh2)) {
11010 -diff -urNp linux-2.6.32.28/fs/ext4/super.c linux-2.6.32.28/fs/ext4/super.c
11011 ---- linux-2.6.32.28/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
11012 -+++ linux-2.6.32.28/fs/ext4/super.c 2010-12-31 14:46:53.000000000 -0500
11013 +diff -urNp linux-2.6.32.29/fs/ext4/super.c linux-2.6.32.29/fs/ext4/super.c
11014 +--- linux-2.6.32.29/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
11015 ++++ linux-2.6.32.29/fs/ext4/super.c 2010-12-31 14:46:53.000000000 -0500
11016 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
11017 }
11018
11019 @@ -33097,9 +33157,9 @@ diff -urNp linux-2.6.32.28/fs/ext4/super.c linux-2.6.32.28/fs/ext4/super.c
11020 .show = ext4_attr_show,
11021 .store = ext4_attr_store,
11022 };
11023 -diff -urNp linux-2.6.32.28/fs/ext4/xattr.c linux-2.6.32.28/fs/ext4/xattr.c
11024 ---- linux-2.6.32.28/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
11025 -+++ linux-2.6.32.28/fs/ext4/xattr.c 2010-12-31 14:46:53.000000000 -0500
11026 +diff -urNp linux-2.6.32.29/fs/ext4/xattr.c linux-2.6.32.29/fs/ext4/xattr.c
11027 +--- linux-2.6.32.29/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
11028 ++++ linux-2.6.32.29/fs/ext4/xattr.c 2010-12-31 14:46:53.000000000 -0500
11029 @@ -82,8 +82,8 @@
11030 printk("\n"); \
11031 } while (0)
11032 @@ -33111,9 +33171,9 @@ diff -urNp linux-2.6.32.28/fs/ext4/xattr.c linux-2.6.32.28/fs/ext4/xattr.c
11033 #endif
11034
11035 static void ext4_xattr_cache_insert(struct buffer_head *);
11036 -diff -urNp linux-2.6.32.28/fs/fcntl.c linux-2.6.32.28/fs/fcntl.c
11037 ---- linux-2.6.32.28/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
11038 -+++ linux-2.6.32.28/fs/fcntl.c 2010-12-31 14:46:53.000000000 -0500
11039 +diff -urNp linux-2.6.32.29/fs/fcntl.c linux-2.6.32.29/fs/fcntl.c
11040 +--- linux-2.6.32.29/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
11041 ++++ linux-2.6.32.29/fs/fcntl.c 2010-12-31 14:46:53.000000000 -0500
11042 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
11043 if (err)
11044 return err;
11045 @@ -33134,9 +33194,9 @@ diff -urNp linux-2.6.32.28/fs/fcntl.c linux-2.6.32.28/fs/fcntl.c
11046 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
11047 break;
11048 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
11049 -diff -urNp linux-2.6.32.28/fs/fifo.c linux-2.6.32.28/fs/fifo.c
11050 ---- linux-2.6.32.28/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
11051 -+++ linux-2.6.32.28/fs/fifo.c 2010-12-31 14:46:53.000000000 -0500
11052 +diff -urNp linux-2.6.32.29/fs/fifo.c linux-2.6.32.29/fs/fifo.c
11053 +--- linux-2.6.32.29/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
11054 ++++ linux-2.6.32.29/fs/fifo.c 2010-12-31 14:46:53.000000000 -0500
11055 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
11056 */
11057 filp->f_op = &read_pipefifo_fops;
11058 @@ -33207,9 +33267,9 @@ diff -urNp linux-2.6.32.28/fs/fifo.c linux-2.6.32.28/fs/fifo.c
11059 free_pipe_info(inode);
11060
11061 err_nocleanup:
11062 -diff -urNp linux-2.6.32.28/fs/file.c linux-2.6.32.28/fs/file.c
11063 ---- linux-2.6.32.28/fs/file.c 2010-08-13 16:24:37.000000000 -0400
11064 -+++ linux-2.6.32.28/fs/file.c 2010-12-31 14:46:53.000000000 -0500
11065 +diff -urNp linux-2.6.32.29/fs/file.c linux-2.6.32.29/fs/file.c
11066 +--- linux-2.6.32.29/fs/file.c 2010-08-13 16:24:37.000000000 -0400
11067 ++++ linux-2.6.32.29/fs/file.c 2010-12-31 14:46:53.000000000 -0500
11068 @@ -14,6 +14,7 @@
11069 #include <linux/slab.h>
11070 #include <linux/vmalloc.h>
11071 @@ -33227,9 +33287,9 @@ diff -urNp linux-2.6.32.28/fs/file.c linux-2.6.32.28/fs/file.c
11072 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
11073 return -EMFILE;
11074
11075 -diff -urNp linux-2.6.32.28/fs/fs_struct.c linux-2.6.32.28/fs/fs_struct.c
11076 ---- linux-2.6.32.28/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
11077 -+++ linux-2.6.32.28/fs/fs_struct.c 2010-12-31 14:46:53.000000000 -0500
11078 +diff -urNp linux-2.6.32.29/fs/fs_struct.c linux-2.6.32.29/fs/fs_struct.c
11079 +--- linux-2.6.32.29/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
11080 ++++ linux-2.6.32.29/fs/fs_struct.c 2010-12-31 14:46:53.000000000 -0500
11081 @@ -4,6 +4,7 @@
11082 #include <linux/path.h>
11083 #include <linux/slab.h>
11084 @@ -33309,9 +33369,9 @@ diff -urNp linux-2.6.32.28/fs/fs_struct.c linux-2.6.32.28/fs/fs_struct.c
11085 write_unlock(&fs->lock);
11086
11087 task_unlock(current);
11088 -diff -urNp linux-2.6.32.28/fs/fuse/control.c linux-2.6.32.28/fs/fuse/control.c
11089 ---- linux-2.6.32.28/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
11090 -+++ linux-2.6.32.28/fs/fuse/control.c 2010-12-31 14:46:53.000000000 -0500
11091 +diff -urNp linux-2.6.32.29/fs/fuse/control.c linux-2.6.32.29/fs/fuse/control.c
11092 +--- linux-2.6.32.29/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
11093 ++++ linux-2.6.32.29/fs/fuse/control.c 2010-12-31 14:46:53.000000000 -0500
11094 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
11095
11096 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
11097 @@ -33321,9 +33381,9 @@ diff -urNp linux-2.6.32.28/fs/fuse/control.c linux-2.6.32.28/fs/fuse/control.c
11098 struct fuse_conn *fc;
11099 int err;
11100
11101 -diff -urNp linux-2.6.32.28/fs/fuse/cuse.c linux-2.6.32.28/fs/fuse/cuse.c
11102 ---- linux-2.6.32.28/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
11103 -+++ linux-2.6.32.28/fs/fuse/cuse.c 2010-12-31 14:46:53.000000000 -0500
11104 +diff -urNp linux-2.6.32.29/fs/fuse/cuse.c linux-2.6.32.29/fs/fuse/cuse.c
11105 +--- linux-2.6.32.29/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
11106 ++++ linux-2.6.32.29/fs/fuse/cuse.c 2010-12-31 14:46:53.000000000 -0500
11107 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
11108 return rc;
11109 }
11110 @@ -33358,9 +33418,9 @@ diff -urNp linux-2.6.32.28/fs/fuse/cuse.c linux-2.6.32.28/fs/fuse/cuse.c
11111 cuse_class = class_create(THIS_MODULE, "cuse");
11112 if (IS_ERR(cuse_class))
11113 return PTR_ERR(cuse_class);
11114 -diff -urNp linux-2.6.32.28/fs/fuse/dev.c linux-2.6.32.28/fs/fuse/dev.c
11115 ---- linux-2.6.32.28/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
11116 -+++ linux-2.6.32.28/fs/fuse/dev.c 2010-12-31 14:46:53.000000000 -0500
11117 +diff -urNp linux-2.6.32.29/fs/fuse/dev.c linux-2.6.32.29/fs/fuse/dev.c
11118 +--- linux-2.6.32.29/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
11119 ++++ linux-2.6.32.29/fs/fuse/dev.c 2010-12-31 14:46:53.000000000 -0500
11120 @@ -745,7 +745,7 @@ __releases(&fc->lock)
11121 * request_end(). Otherwise add it to the processing list, and set
11122 * the 'sent' flag.
11123 @@ -33466,9 +33526,9 @@ diff -urNp linux-2.6.32.28/fs/fuse/dev.c linux-2.6.32.28/fs/fuse/dev.c
11124
11125 const struct file_operations fuse_dev_operations = {
11126 .owner = THIS_MODULE,
11127 -diff -urNp linux-2.6.32.28/fs/fuse/dir.c linux-2.6.32.28/fs/fuse/dir.c
11128 ---- linux-2.6.32.28/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
11129 -+++ linux-2.6.32.28/fs/fuse/dir.c 2010-12-31 14:46:53.000000000 -0500
11130 +diff -urNp linux-2.6.32.29/fs/fuse/dir.c linux-2.6.32.29/fs/fuse/dir.c
11131 +--- linux-2.6.32.29/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
11132 ++++ linux-2.6.32.29/fs/fuse/dir.c 2010-12-31 14:46:53.000000000 -0500
11133 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
11134 return link;
11135 }
11136 @@ -33478,9 +33538,9 @@ diff -urNp linux-2.6.32.28/fs/fuse/dir.c linux-2.6.32.28/fs/fuse/dir.c
11137 {
11138 if (!IS_ERR(link))
11139 free_page((unsigned long) link);
11140 -diff -urNp linux-2.6.32.28/fs/fuse/fuse_i.h linux-2.6.32.28/fs/fuse/fuse_i.h
11141 ---- linux-2.6.32.28/fs/fuse/fuse_i.h 2010-08-13 16:24:37.000000000 -0400
11142 -+++ linux-2.6.32.28/fs/fuse/fuse_i.h 2010-12-31 14:46:53.000000000 -0500
11143 +diff -urNp linux-2.6.32.29/fs/fuse/fuse_i.h linux-2.6.32.29/fs/fuse/fuse_i.h
11144 +--- linux-2.6.32.29/fs/fuse/fuse_i.h 2010-08-13 16:24:37.000000000 -0400
11145 ++++ linux-2.6.32.29/fs/fuse/fuse_i.h 2010-12-31 14:46:53.000000000 -0500
11146 @@ -521,6 +521,16 @@ extern const struct file_operations fuse
11147
11148 extern const struct dentry_operations fuse_dentry_operations;
11149 @@ -33498,9 +33558,9 @@ diff -urNp linux-2.6.32.28/fs/fuse/fuse_i.h linux-2.6.32.28/fs/fuse/fuse_i.h
11150 /**
11151 * Inode to nodeid comparison.
11152 */
11153 -diff -urNp linux-2.6.32.28/fs/gfs2/sys.c linux-2.6.32.28/fs/gfs2/sys.c
11154 ---- linux-2.6.32.28/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
11155 -+++ linux-2.6.32.28/fs/gfs2/sys.c 2010-12-31 14:46:53.000000000 -0500
11156 +diff -urNp linux-2.6.32.29/fs/gfs2/sys.c linux-2.6.32.29/fs/gfs2/sys.c
11157 +--- linux-2.6.32.29/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
11158 ++++ linux-2.6.32.29/fs/gfs2/sys.c 2010-12-31 14:46:53.000000000 -0500
11159 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
11160 return a->store ? a->store(sdp, buf, len) : len;
11161 }
11162 @@ -33519,9 +33579,9 @@ diff -urNp linux-2.6.32.28/fs/gfs2/sys.c linux-2.6.32.28/fs/gfs2/sys.c
11163 .uevent = gfs2_uevent,
11164 };
11165
11166 -diff -urNp linux-2.6.32.28/fs/hfs/inode.c linux-2.6.32.28/fs/hfs/inode.c
11167 ---- linux-2.6.32.28/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11168 -+++ linux-2.6.32.28/fs/hfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11169 +diff -urNp linux-2.6.32.29/fs/hfs/inode.c linux-2.6.32.29/fs/hfs/inode.c
11170 +--- linux-2.6.32.29/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11171 ++++ linux-2.6.32.29/fs/hfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11172 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
11173
11174 if (S_ISDIR(main_inode->i_mode)) {
11175 @@ -33540,9 +33600,9 @@ diff -urNp linux-2.6.32.28/fs/hfs/inode.c linux-2.6.32.28/fs/hfs/inode.c
11176 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
11177 sizeof(struct hfs_cat_file));
11178 if (rec.type != HFS_CDR_FIL ||
11179 -diff -urNp linux-2.6.32.28/fs/hfsplus/inode.c linux-2.6.32.28/fs/hfsplus/inode.c
11180 ---- linux-2.6.32.28/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
11181 -+++ linux-2.6.32.28/fs/hfsplus/inode.c 2010-12-31 14:46:53.000000000 -0500
11182 +diff -urNp linux-2.6.32.29/fs/hfsplus/inode.c linux-2.6.32.29/fs/hfsplus/inode.c
11183 +--- linux-2.6.32.29/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
11184 ++++ linux-2.6.32.29/fs/hfsplus/inode.c 2010-12-31 14:46:53.000000000 -0500
11185 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
11186 struct hfsplus_cat_folder *folder = &entry.folder;
11187
11188 @@ -33579,9 +33639,9 @@ diff -urNp linux-2.6.32.28/fs/hfsplus/inode.c linux-2.6.32.28/fs/hfsplus/inode.c
11189 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
11190 sizeof(struct hfsplus_cat_file));
11191 hfsplus_inode_write_fork(inode, &file->data_fork);
11192 -diff -urNp linux-2.6.32.28/fs/hugetlbfs/inode.c linux-2.6.32.28/fs/hugetlbfs/inode.c
11193 ---- linux-2.6.32.28/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11194 -+++ linux-2.6.32.28/fs/hugetlbfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11195 +diff -urNp linux-2.6.32.29/fs/hugetlbfs/inode.c linux-2.6.32.29/fs/hugetlbfs/inode.c
11196 +--- linux-2.6.32.29/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11197 ++++ linux-2.6.32.29/fs/hugetlbfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11198 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
11199 .kill_sb = kill_litter_super,
11200 };
11201 @@ -33591,9 +33651,9 @@ diff -urNp linux-2.6.32.28/fs/hugetlbfs/inode.c linux-2.6.32.28/fs/hugetlbfs/ino
11202
11203 static int can_do_hugetlb_shm(void)
11204 {
11205 -diff -urNp linux-2.6.32.28/fs/ioctl.c linux-2.6.32.28/fs/ioctl.c
11206 ---- linux-2.6.32.28/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
11207 -+++ linux-2.6.32.28/fs/ioctl.c 2010-12-31 14:46:53.000000000 -0500
11208 +diff -urNp linux-2.6.32.29/fs/ioctl.c linux-2.6.32.29/fs/ioctl.c
11209 +--- linux-2.6.32.29/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
11210 ++++ linux-2.6.32.29/fs/ioctl.c 2010-12-31 14:46:53.000000000 -0500
11211 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
11212 u64 phys, u64 len, u32 flags)
11213 {
11214 @@ -33621,9 +33681,9 @@ diff -urNp linux-2.6.32.28/fs/ioctl.c linux-2.6.32.28/fs/ioctl.c
11215 error = -EFAULT;
11216
11217 return error;
11218 -diff -urNp linux-2.6.32.28/fs/jffs2/debug.h linux-2.6.32.28/fs/jffs2/debug.h
11219 ---- linux-2.6.32.28/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
11220 -+++ linux-2.6.32.28/fs/jffs2/debug.h 2010-12-31 14:46:53.000000000 -0500
11221 +diff -urNp linux-2.6.32.29/fs/jffs2/debug.h linux-2.6.32.29/fs/jffs2/debug.h
11222 +--- linux-2.6.32.29/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
11223 ++++ linux-2.6.32.29/fs/jffs2/debug.h 2010-12-31 14:46:53.000000000 -0500
11224 @@ -52,13 +52,13 @@
11225 #if CONFIG_JFFS2_FS_DEBUG > 0
11226 #define D1(x) x
11227 @@ -33725,9 +33785,9 @@ diff -urNp linux-2.6.32.28/fs/jffs2/debug.h linux-2.6.32.28/fs/jffs2/debug.h
11228 #endif
11229
11230 /* "Sanity" checks */
11231 -diff -urNp linux-2.6.32.28/fs/jffs2/erase.c linux-2.6.32.28/fs/jffs2/erase.c
11232 ---- linux-2.6.32.28/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
11233 -+++ linux-2.6.32.28/fs/jffs2/erase.c 2010-12-31 14:46:53.000000000 -0500
11234 +diff -urNp linux-2.6.32.29/fs/jffs2/erase.c linux-2.6.32.29/fs/jffs2/erase.c
11235 +--- linux-2.6.32.29/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
11236 ++++ linux-2.6.32.29/fs/jffs2/erase.c 2010-12-31 14:46:53.000000000 -0500
11237 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
11238 struct jffs2_unknown_node marker = {
11239 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
11240 @@ -33738,9 +33798,9 @@ diff -urNp linux-2.6.32.28/fs/jffs2/erase.c linux-2.6.32.28/fs/jffs2/erase.c
11241 };
11242
11243 jffs2_prealloc_raw_node_refs(c, jeb, 1);
11244 -diff -urNp linux-2.6.32.28/fs/jffs2/summary.h linux-2.6.32.28/fs/jffs2/summary.h
11245 ---- linux-2.6.32.28/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
11246 -+++ linux-2.6.32.28/fs/jffs2/summary.h 2010-12-31 14:46:53.000000000 -0500
11247 +diff -urNp linux-2.6.32.29/fs/jffs2/summary.h linux-2.6.32.29/fs/jffs2/summary.h
11248 +--- linux-2.6.32.29/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
11249 ++++ linux-2.6.32.29/fs/jffs2/summary.h 2010-12-31 14:46:53.000000000 -0500
11250 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
11251
11252 #define jffs2_sum_active() (0)
11253 @@ -33769,9 +33829,9 @@ diff -urNp linux-2.6.32.28/fs/jffs2/summary.h linux-2.6.32.28/fs/jffs2/summary.h
11254 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
11255
11256 #endif /* CONFIG_JFFS2_SUMMARY */
11257 -diff -urNp linux-2.6.32.28/fs/jffs2/wbuf.c linux-2.6.32.28/fs/jffs2/wbuf.c
11258 ---- linux-2.6.32.28/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
11259 -+++ linux-2.6.32.28/fs/jffs2/wbuf.c 2010-12-31 14:46:53.000000000 -0500
11260 +diff -urNp linux-2.6.32.29/fs/jffs2/wbuf.c linux-2.6.32.29/fs/jffs2/wbuf.c
11261 +--- linux-2.6.32.29/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
11262 ++++ linux-2.6.32.29/fs/jffs2/wbuf.c 2010-12-31 14:46:53.000000000 -0500
11263 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
11264 {
11265 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
11266 @@ -33782,9 +33842,9 @@ diff -urNp linux-2.6.32.28/fs/jffs2/wbuf.c linux-2.6.32.28/fs/jffs2/wbuf.c
11267 };
11268
11269 /*
11270 -diff -urNp linux-2.6.32.28/fs/Kconfig.binfmt linux-2.6.32.28/fs/Kconfig.binfmt
11271 ---- linux-2.6.32.28/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
11272 -+++ linux-2.6.32.28/fs/Kconfig.binfmt 2010-12-31 14:46:53.000000000 -0500
11273 +diff -urNp linux-2.6.32.29/fs/Kconfig.binfmt linux-2.6.32.29/fs/Kconfig.binfmt
11274 +--- linux-2.6.32.29/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
11275 ++++ linux-2.6.32.29/fs/Kconfig.binfmt 2010-12-31 14:46:53.000000000 -0500
11276 @@ -86,7 +86,7 @@ config HAVE_AOUT
11277
11278 config BINFMT_AOUT
11279 @@ -33794,9 +33854,9 @@ diff -urNp linux-2.6.32.28/fs/Kconfig.binfmt linux-2.6.32.28/fs/Kconfig.binfmt
11280 ---help---
11281 A.out (Assembler.OUTput) is a set of formats for libraries and
11282 executables used in the earliest versions of UNIX. Linux used
11283 -diff -urNp linux-2.6.32.28/fs/lockd/svc.c linux-2.6.32.28/fs/lockd/svc.c
11284 ---- linux-2.6.32.28/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
11285 -+++ linux-2.6.32.28/fs/lockd/svc.c 2010-12-31 14:46:53.000000000 -0500
11286 +diff -urNp linux-2.6.32.29/fs/lockd/svc.c linux-2.6.32.29/fs/lockd/svc.c
11287 +--- linux-2.6.32.29/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
11288 ++++ linux-2.6.32.29/fs/lockd/svc.c 2010-12-31 14:46:53.000000000 -0500
11289 @@ -43,7 +43,7 @@
11290
11291 static struct svc_program nlmsvc_program;
11292 @@ -33806,9 +33866,9 @@ diff -urNp linux-2.6.32.28/fs/lockd/svc.c linux-2.6.32.28/fs/lockd/svc.c
11293 EXPORT_SYMBOL_GPL(nlmsvc_ops);
11294
11295 static DEFINE_MUTEX(nlmsvc_mutex);
11296 -diff -urNp linux-2.6.32.28/fs/locks.c linux-2.6.32.28/fs/locks.c
11297 ---- linux-2.6.32.28/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
11298 -+++ linux-2.6.32.28/fs/locks.c 2010-12-31 14:46:53.000000000 -0500
11299 +diff -urNp linux-2.6.32.29/fs/locks.c linux-2.6.32.29/fs/locks.c
11300 +--- linux-2.6.32.29/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
11301 ++++ linux-2.6.32.29/fs/locks.c 2010-12-31 14:46:53.000000000 -0500
11302 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
11303 return;
11304
11305 @@ -33830,9 +33890,9 @@ diff -urNp linux-2.6.32.28/fs/locks.c linux-2.6.32.28/fs/locks.c
11306 }
11307
11308 lock_kernel();
11309 -diff -urNp linux-2.6.32.28/fs/namei.c linux-2.6.32.28/fs/namei.c
11310 ---- linux-2.6.32.28/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
11311 -+++ linux-2.6.32.28/fs/namei.c 2010-12-31 14:46:53.000000000 -0500
11312 +diff -urNp linux-2.6.32.29/fs/namei.c linux-2.6.32.29/fs/namei.c
11313 +--- linux-2.6.32.29/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
11314 ++++ linux-2.6.32.29/fs/namei.c 2010-12-31 14:46:53.000000000 -0500
11315 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
11316 return ret;
11317
11318 @@ -34210,9 +34270,9 @@ diff -urNp linux-2.6.32.28/fs/namei.c linux-2.6.32.28/fs/namei.c
11319 exit6:
11320 mnt_drop_write(oldnd.path.mnt);
11321 exit5:
11322 -diff -urNp linux-2.6.32.28/fs/namespace.c linux-2.6.32.28/fs/namespace.c
11323 ---- linux-2.6.32.28/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
11324 -+++ linux-2.6.32.28/fs/namespace.c 2010-12-31 14:46:53.000000000 -0500
11325 +diff -urNp linux-2.6.32.29/fs/namespace.c linux-2.6.32.29/fs/namespace.c
11326 +--- linux-2.6.32.29/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
11327 ++++ linux-2.6.32.29/fs/namespace.c 2010-12-31 14:46:53.000000000 -0500
11328 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
11329 if (!(sb->s_flags & MS_RDONLY))
11330 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
11331 @@ -34273,9 +34333,9 @@ diff -urNp linux-2.6.32.28/fs/namespace.c linux-2.6.32.28/fs/namespace.c
11332 read_lock(&current->fs->lock);
11333 root = current->fs->root;
11334 path_get(&current->fs->root);
11335 -diff -urNp linux-2.6.32.28/fs/nfs/inode.c linux-2.6.32.28/fs/nfs/inode.c
11336 ---- linux-2.6.32.28/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11337 -+++ linux-2.6.32.28/fs/nfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11338 +diff -urNp linux-2.6.32.29/fs/nfs/inode.c linux-2.6.32.29/fs/nfs/inode.c
11339 +--- linux-2.6.32.29/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
11340 ++++ linux-2.6.32.29/fs/nfs/inode.c 2010-12-31 14:46:53.000000000 -0500
11341 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
11342 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
11343 }
11344 @@ -34296,9 +34356,9 @@ diff -urNp linux-2.6.32.28/fs/nfs/inode.c linux-2.6.32.28/fs/nfs/inode.c
11345 }
11346
11347 void nfs_fattr_init(struct nfs_fattr *fattr)
11348 -diff -urNp linux-2.6.32.28/fs/nfs/nfs4proc.c linux-2.6.32.28/fs/nfs/nfs4proc.c
11349 ---- linux-2.6.32.28/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
11350 -+++ linux-2.6.32.28/fs/nfs/nfs4proc.c 2010-12-31 14:46:53.000000000 -0500
11351 +diff -urNp linux-2.6.32.29/fs/nfs/nfs4proc.c linux-2.6.32.29/fs/nfs/nfs4proc.c
11352 +--- linux-2.6.32.29/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
11353 ++++ linux-2.6.32.29/fs/nfs/nfs4proc.c 2010-12-31 14:46:53.000000000 -0500
11354 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
11355 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
11356 {
11357 @@ -34569,9 +34629,9 @@ diff -urNp linux-2.6.32.28/fs/nfs/nfs4proc.c linux-2.6.32.28/fs/nfs/nfs4proc.c
11358 int err;
11359
11360 err = nfs4_set_lock_state(state, fl);
11361 -diff -urNp linux-2.6.32.28/fs/nfsd/lockd.c linux-2.6.32.28/fs/nfsd/lockd.c
11362 ---- linux-2.6.32.28/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
11363 -+++ linux-2.6.32.28/fs/nfsd/lockd.c 2010-12-31 14:46:53.000000000 -0500
11364 +diff -urNp linux-2.6.32.29/fs/nfsd/lockd.c linux-2.6.32.29/fs/nfsd/lockd.c
11365 +--- linux-2.6.32.29/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
11366 ++++ linux-2.6.32.29/fs/nfsd/lockd.c 2010-12-31 14:46:53.000000000 -0500
11367 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
11368 fput(filp);
11369 }
11370 @@ -34581,9 +34641,9 @@ diff -urNp linux-2.6.32.28/fs/nfsd/lockd.c linux-2.6.32.28/fs/nfsd/lockd.c
11371 .fopen = nlm_fopen, /* open file for locking */
11372 .fclose = nlm_fclose, /* close file */
11373 };
11374 -diff -urNp linux-2.6.32.28/fs/nfsd/vfs.c linux-2.6.32.28/fs/nfsd/vfs.c
11375 ---- linux-2.6.32.28/fs/nfsd/vfs.c 2010-08-13 16:24:37.000000000 -0400
11376 -+++ linux-2.6.32.28/fs/nfsd/vfs.c 2010-12-31 14:46:53.000000000 -0500
11377 +diff -urNp linux-2.6.32.29/fs/nfsd/vfs.c linux-2.6.32.29/fs/nfsd/vfs.c
11378 +--- linux-2.6.32.29/fs/nfsd/vfs.c 2010-08-13 16:24:37.000000000 -0400
11379 ++++ linux-2.6.32.29/fs/nfsd/vfs.c 2010-12-31 14:46:53.000000000 -0500
11380 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
11381 } else {
11382 oldfs = get_fs();
11383 @@ -34611,9 +34671,9 @@ diff -urNp linux-2.6.32.28/fs/nfsd/vfs.c linux-2.6.32.28/fs/nfsd/vfs.c
11384 set_fs(oldfs);
11385
11386 if (host_err < 0)
11387 -diff -urNp linux-2.6.32.28/fs/nls/nls_base.c linux-2.6.32.28/fs/nls/nls_base.c
11388 ---- linux-2.6.32.28/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
11389 -+++ linux-2.6.32.28/fs/nls/nls_base.c 2010-12-31 14:46:53.000000000 -0500
11390 +diff -urNp linux-2.6.32.29/fs/nls/nls_base.c linux-2.6.32.29/fs/nls/nls_base.c
11391 +--- linux-2.6.32.29/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
11392 ++++ linux-2.6.32.29/fs/nls/nls_base.c 2010-12-31 14:46:53.000000000 -0500
11393 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
11394 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
11395 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
11396 @@ -34623,9 +34683,9 @@ diff -urNp linux-2.6.32.28/fs/nls/nls_base.c linux-2.6.32.28/fs/nls/nls_base.c
11397 };
11398
11399 #define UNICODE_MAX 0x0010ffff
11400 -diff -urNp linux-2.6.32.28/fs/ntfs/dir.c linux-2.6.32.28/fs/ntfs/dir.c
11401 ---- linux-2.6.32.28/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400
11402 -+++ linux-2.6.32.28/fs/ntfs/dir.c 2010-12-31 14:46:53.000000000 -0500
11403 +diff -urNp linux-2.6.32.29/fs/ntfs/dir.c linux-2.6.32.29/fs/ntfs/dir.c
11404 +--- linux-2.6.32.29/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400
11405 ++++ linux-2.6.32.29/fs/ntfs/dir.c 2010-12-31 14:46:53.000000000 -0500
11406 @@ -1328,7 +1328,7 @@ find_next_index_buffer:
11407 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
11408 ~(s64)(ndir->itype.index.block_size - 1)));
11409 @@ -34635,9 +34695,9 @@ diff -urNp linux-2.6.32.28/fs/ntfs/dir.c linux-2.6.32.28/fs/ntfs/dir.c
11410 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
11411 "inode 0x%lx or driver bug.", vdir->i_ino);
11412 goto err_out;
11413 -diff -urNp linux-2.6.32.28/fs/ntfs/file.c linux-2.6.32.28/fs/ntfs/file.c
11414 ---- linux-2.6.32.28/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
11415 -+++ linux-2.6.32.28/fs/ntfs/file.c 2010-12-31 14:46:53.000000000 -0500
11416 +diff -urNp linux-2.6.32.29/fs/ntfs/file.c linux-2.6.32.29/fs/ntfs/file.c
11417 +--- linux-2.6.32.29/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
11418 ++++ linux-2.6.32.29/fs/ntfs/file.c 2010-12-31 14:46:53.000000000 -0500
11419 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
11420 #endif /* NTFS_RW */
11421 };
11422 @@ -34647,9 +34707,9 @@ diff -urNp linux-2.6.32.28/fs/ntfs/file.c linux-2.6.32.28/fs/ntfs/file.c
11423
11424 -const struct inode_operations ntfs_empty_inode_ops = {};
11425 +const struct inode_operations ntfs_empty_inode_ops __read_only;
11426 -diff -urNp linux-2.6.32.28/fs/ocfs2/cluster/masklog.c linux-2.6.32.28/fs/ocfs2/cluster/masklog.c
11427 ---- linux-2.6.32.28/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
11428 -+++ linux-2.6.32.28/fs/ocfs2/cluster/masklog.c 2010-12-31 14:46:53.000000000 -0500
11429 +diff -urNp linux-2.6.32.29/fs/ocfs2/cluster/masklog.c linux-2.6.32.29/fs/ocfs2/cluster/masklog.c
11430 +--- linux-2.6.32.29/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
11431 ++++ linux-2.6.32.29/fs/ocfs2/cluster/masklog.c 2010-12-31 14:46:53.000000000 -0500
11432 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
11433 return mlog_mask_store(mlog_attr->mask, buf, count);
11434 }
11435 @@ -34659,9 +34719,9 @@ diff -urNp linux-2.6.32.28/fs/ocfs2/cluster/masklog.c linux-2.6.32.28/fs/ocfs2/c
11436 .show = mlog_show,
11437 .store = mlog_store,
11438 };
11439 -diff -urNp linux-2.6.32.28/fs/ocfs2/localalloc.c linux-2.6.32.28/fs/ocfs2/localalloc.c
11440 ---- linux-2.6.32.28/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
11441 -+++ linux-2.6.32.28/fs/ocfs2/localalloc.c 2010-12-31 14:46:53.000000000 -0500
11442 +diff -urNp linux-2.6.32.29/fs/ocfs2/localalloc.c linux-2.6.32.29/fs/ocfs2/localalloc.c
11443 +--- linux-2.6.32.29/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
11444 ++++ linux-2.6.32.29/fs/ocfs2/localalloc.c 2010-12-31 14:46:53.000000000 -0500
11445 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
11446 goto bail;
11447 }
11448 @@ -34671,9 +34731,9 @@ diff -urNp linux-2.6.32.28/fs/ocfs2/localalloc.c linux-2.6.32.28/fs/ocfs2/locala
11449
11450 status = 0;
11451 bail:
11452 -diff -urNp linux-2.6.32.28/fs/ocfs2/ocfs2.h linux-2.6.32.28/fs/ocfs2/ocfs2.h
11453 ---- linux-2.6.32.28/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
11454 -+++ linux-2.6.32.28/fs/ocfs2/ocfs2.h 2010-12-31 14:46:53.000000000 -0500
11455 +diff -urNp linux-2.6.32.29/fs/ocfs2/ocfs2.h linux-2.6.32.29/fs/ocfs2/ocfs2.h
11456 +--- linux-2.6.32.29/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
11457 ++++ linux-2.6.32.29/fs/ocfs2/ocfs2.h 2010-12-31 14:46:53.000000000 -0500
11458 @@ -217,11 +217,11 @@ enum ocfs2_vol_state
11459
11460 struct ocfs2_alloc_stats
11461 @@ -34691,9 +34751,9 @@ diff -urNp linux-2.6.32.28/fs/ocfs2/ocfs2.h linux-2.6.32.28/fs/ocfs2/ocfs2.h
11462 };
11463
11464 enum ocfs2_local_alloc_state
11465 -diff -urNp linux-2.6.32.28/fs/ocfs2/suballoc.c linux-2.6.32.28/fs/ocfs2/suballoc.c
11466 ---- linux-2.6.32.28/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
11467 -+++ linux-2.6.32.28/fs/ocfs2/suballoc.c 2010-12-31 14:46:53.000000000 -0500
11468 +diff -urNp linux-2.6.32.29/fs/ocfs2/suballoc.c linux-2.6.32.29/fs/ocfs2/suballoc.c
11469 +--- linux-2.6.32.29/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
11470 ++++ linux-2.6.32.29/fs/ocfs2/suballoc.c 2010-12-31 14:46:53.000000000 -0500
11471 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
11472 mlog_errno(status);
11473 goto bail;
11474 @@ -34739,9 +34799,9 @@ diff -urNp linux-2.6.32.28/fs/ocfs2/suballoc.c linux-2.6.32.28/fs/ocfs2/suballoc
11475 }
11476 }
11477 if (status < 0) {
11478 -diff -urNp linux-2.6.32.28/fs/ocfs2/super.c linux-2.6.32.28/fs/ocfs2/super.c
11479 ---- linux-2.6.32.28/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
11480 -+++ linux-2.6.32.28/fs/ocfs2/super.c 2010-12-31 14:46:53.000000000 -0500
11481 +diff -urNp linux-2.6.32.29/fs/ocfs2/super.c linux-2.6.32.29/fs/ocfs2/super.c
11482 +--- linux-2.6.32.29/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
11483 ++++ linux-2.6.32.29/fs/ocfs2/super.c 2010-12-31 14:46:53.000000000 -0500
11484 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
11485 "%10s => GlobalAllocs: %d LocalAllocs: %d "
11486 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
11487 @@ -34776,9 +34836,9 @@ diff -urNp linux-2.6.32.28/fs/ocfs2/super.c linux-2.6.32.28/fs/ocfs2/super.c
11488
11489 /* Copy the blockcheck stats from the superblock probe */
11490 osb->osb_ecc_stats = *stats;
11491 -diff -urNp linux-2.6.32.28/fs/open.c linux-2.6.32.28/fs/open.c
11492 ---- linux-2.6.32.28/fs/open.c 2010-08-13 16:24:37.000000000 -0400
11493 -+++ linux-2.6.32.28/fs/open.c 2011-01-17 02:49:34.000000000 -0500
11494 +diff -urNp linux-2.6.32.29/fs/open.c linux-2.6.32.29/fs/open.c
11495 +--- linux-2.6.32.29/fs/open.c 2010-08-13 16:24:37.000000000 -0400
11496 ++++ linux-2.6.32.29/fs/open.c 2011-01-17 02:49:34.000000000 -0500
11497 @@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
11498 error = locks_verify_truncate(inode, NULL, length);
11499 if (!error)
11500 @@ -34963,9 +35023,57 @@ diff -urNp linux-2.6.32.28/fs/open.c linux-2.6.32.28/fs/open.c
11501 if (IS_ERR(f)) {
11502 put_unused_fd(fd);
11503 fd = PTR_ERR(f);
11504 -diff -urNp linux-2.6.32.28/fs/pipe.c linux-2.6.32.28/fs/pipe.c
11505 ---- linux-2.6.32.28/fs/pipe.c 2010-11-26 18:22:29.000000000 -0500
11506 -+++ linux-2.6.32.28/fs/pipe.c 2010-12-31 14:46:53.000000000 -0500
11507 +diff -urNp linux-2.6.32.29/fs/partitions/mac.c linux-2.6.32.29/fs/partitions/mac.c
11508 +--- linux-2.6.32.29/fs/partitions/mac.c 2010-08-13 16:24:37.000000000 -0400
11509 ++++ linux-2.6.32.29/fs/partitions/mac.c 2011-02-22 16:30:44.000000000 -0500
11510 +@@ -29,10 +29,9 @@ static inline void mac_fix_string(char *
11511 +
11512 + int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
11513 + {
11514 +- int slot = 1;
11515 + Sector sect;
11516 + unsigned char *data;
11517 +- int blk, blocks_in_map;
11518 ++ int slot, blocks_in_map;
11519 + unsigned secsize;
11520 + #ifdef CONFIG_PPC_PMAC
11521 + int found_root = 0;
11522 +@@ -59,10 +58,14 @@ int mac_partition(struct parsed_partitio
11523 + put_dev_sector(sect);
11524 + return 0; /* not a MacOS disk */
11525 + }
11526 +- printk(" [mac]");
11527 + blocks_in_map = be32_to_cpu(part->map_count);
11528 +- for (blk = 1; blk <= blocks_in_map; ++blk) {
11529 +- int pos = blk * secsize;
11530 ++ printk(" [mac]");
11531 ++ if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
11532 ++ put_dev_sector(sect);
11533 ++ return 0;
11534 ++ }
11535 ++ for (slot = 1; slot <= blocks_in_map; ++slot) {
11536 ++ int pos = slot * secsize;
11537 + put_dev_sector(sect);
11538 + data = read_dev_sector(bdev, pos/512, &sect);
11539 + if (!data)
11540 +@@ -113,13 +116,11 @@ int mac_partition(struct parsed_partitio
11541 + }
11542 +
11543 + if (goodness > found_root_goodness) {
11544 +- found_root = blk;
11545 ++ found_root = slot;
11546 + found_root_goodness = goodness;
11547 + }
11548 + }
11549 + #endif /* CONFIG_PPC_PMAC */
11550 +-
11551 +- ++slot;
11552 + }
11553 + #ifdef CONFIG_PPC_PMAC
11554 + if (found_root_goodness)
11555 +diff -urNp linux-2.6.32.29/fs/pipe.c linux-2.6.32.29/fs/pipe.c
11556 +--- linux-2.6.32.29/fs/pipe.c 2010-11-26 18:22:29.000000000 -0500
11557 ++++ linux-2.6.32.29/fs/pipe.c 2010-12-31 14:46:53.000000000 -0500
11558 @@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const stru
11559 error = ops->confirm(pipe, buf);
11560 if (error) {
11561 @@ -35098,9 +35206,9 @@ diff -urNp linux-2.6.32.28/fs/pipe.c linux-2.6.32.28/fs/pipe.c
11562 inode->i_fop = &rdwr_pipefifo_fops;
11563
11564 /*
11565 -diff -urNp linux-2.6.32.28/fs/proc/array.c linux-2.6.32.28/fs/proc/array.c
11566 ---- linux-2.6.32.28/fs/proc/array.c 2010-08-13 16:24:37.000000000 -0400
11567 -+++ linux-2.6.32.28/fs/proc/array.c 2010-12-31 14:46:53.000000000 -0500
11568 +diff -urNp linux-2.6.32.29/fs/proc/array.c linux-2.6.32.29/fs/proc/array.c
11569 +--- linux-2.6.32.29/fs/proc/array.c 2010-08-13 16:24:37.000000000 -0400
11570 ++++ linux-2.6.32.29/fs/proc/array.c 2011-02-22 16:34:24.000000000 -0500
11571 @@ -60,6 +60,7 @@
11572 #include <linux/tty.h>
11573 #include <linux/string.h>
11574 @@ -35131,9 +35239,13 @@ diff -urNp linux-2.6.32.28/fs/proc/array.c linux-2.6.32.28/fs/proc/array.c
11575 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
11576 struct pid *pid, struct task_struct *task)
11577 {
11578 -@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m,
11579 - task_show_regs(m, task);
11580 - #endif
11581 +@@ -336,13 +352,25 @@ int proc_pid_status(struct seq_file *m,
11582 + task_sig(m, task);
11583 + task_cap(m, task);
11584 + cpuset_task_status_allowed(m, task);
11585 +-#if defined(CONFIG_S390)
11586 +- task_show_regs(m, task);
11587 +-#endif
11588 task_context_switch_counts(m, task);
11589 +
11590 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
11591 @@ -35156,7 +35268,7 @@ diff -urNp linux-2.6.32.28/fs/proc/array.c linux-2.6.32.28/fs/proc/array.c
11592 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
11593 struct pid *pid, struct task_struct *task, int whole)
11594 {
11595 -@@ -436,6 +467,19 @@ static int do_task_stat(struct seq_file
11596 +@@ -436,6 +464,19 @@ static int do_task_stat(struct seq_file
11597 gtime = task_gtime(task);
11598 }
11599
11600 @@ -35176,7 +35288,7 @@ diff -urNp linux-2.6.32.28/fs/proc/array.c linux-2.6.32.28/fs/proc/array.c
11601 /* scale priority and nice values from timeslices to -20..20 */
11602 /* to make it look like a "normal" Unix priority/nice value */
11603 priority = task_prio(task);
11604 -@@ -476,9 +520,15 @@ static int do_task_stat(struct seq_file
11605 +@@ -476,9 +517,15 @@ static int do_task_stat(struct seq_file
11606 vsize,
11607 mm ? get_mm_rss(mm) : 0,
11608 rsslim,
11609 @@ -35192,7 +35304,7 @@ diff -urNp linux-2.6.32.28/fs/proc/array.c linux-2.6.32.28/fs/proc/array.c
11610 esp,
11611 eip,
11612 /* The signal information here is obsolete.
11613 -@@ -531,3 +581,10 @@ int proc_pid_statm(struct seq_file *m, s
11614 +@@ -531,3 +578,10 @@ int proc_pid_statm(struct seq_file *m, s
11615
11616 return 0;
11617 }
11618 @@ -35203,9 +35315,9 @@ diff -urNp linux-2.6.32.28/fs/proc/array.c linux-2.6.32.28/fs/proc/array.c
11619 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
11620 +}
11621 +#endif
11622 -diff -urNp linux-2.6.32.28/fs/proc/base.c linux-2.6.32.28/fs/proc/base.c
11623 ---- linux-2.6.32.28/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
11624 -+++ linux-2.6.32.28/fs/proc/base.c 2010-12-31 14:46:53.000000000 -0500
11625 +diff -urNp linux-2.6.32.29/fs/proc/base.c linux-2.6.32.29/fs/proc/base.c
11626 +--- linux-2.6.32.29/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
11627 ++++ linux-2.6.32.29/fs/proc/base.c 2010-12-31 14:46:53.000000000 -0500
11628 @@ -102,6 +102,22 @@ struct pid_entry {
11629 union proc_op op;
11630 };
11631 @@ -35580,9 +35692,9 @@ diff -urNp linux-2.6.32.28/fs/proc/base.c linux-2.6.32.28/fs/proc/base.c
11632 ONE("stack", S_IRUSR, proc_pid_stack),
11633 #endif
11634 #ifdef CONFIG_SCHEDSTATS
11635 -diff -urNp linux-2.6.32.28/fs/proc/cmdline.c linux-2.6.32.28/fs/proc/cmdline.c
11636 ---- linux-2.6.32.28/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
11637 -+++ linux-2.6.32.28/fs/proc/cmdline.c 2010-12-31 14:46:53.000000000 -0500
11638 +diff -urNp linux-2.6.32.29/fs/proc/cmdline.c linux-2.6.32.29/fs/proc/cmdline.c
11639 +--- linux-2.6.32.29/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
11640 ++++ linux-2.6.32.29/fs/proc/cmdline.c 2010-12-31 14:46:53.000000000 -0500
11641 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
11642
11643 static int __init proc_cmdline_init(void)
11644 @@ -35595,9 +35707,9 @@ diff -urNp linux-2.6.32.28/fs/proc/cmdline.c linux-2.6.32.28/fs/proc/cmdline.c
11645 return 0;
11646 }
11647 module_init(proc_cmdline_init);
11648 -diff -urNp linux-2.6.32.28/fs/proc/devices.c linux-2.6.32.28/fs/proc/devices.c
11649 ---- linux-2.6.32.28/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
11650 -+++ linux-2.6.32.28/fs/proc/devices.c 2010-12-31 14:46:53.000000000 -0500
11651 +diff -urNp linux-2.6.32.29/fs/proc/devices.c linux-2.6.32.29/fs/proc/devices.c
11652 +--- linux-2.6.32.29/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
11653 ++++ linux-2.6.32.29/fs/proc/devices.c 2010-12-31 14:46:53.000000000 -0500
11654 @@ -64,7 +64,11 @@ static const struct file_operations proc
11655
11656 static int __init proc_devices_init(void)
11657 @@ -35610,9 +35722,9 @@ diff -urNp linux-2.6.32.28/fs/proc/devices.c linux-2.6.32.28/fs/proc/devices.c
11658 return 0;
11659 }
11660 module_init(proc_devices_init);
11661 -diff -urNp linux-2.6.32.28/fs/proc/inode.c linux-2.6.32.28/fs/proc/inode.c
11662 ---- linux-2.6.32.28/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
11663 -+++ linux-2.6.32.28/fs/proc/inode.c 2010-12-31 14:46:53.000000000 -0500
11664 +diff -urNp linux-2.6.32.29/fs/proc/inode.c linux-2.6.32.29/fs/proc/inode.c
11665 +--- linux-2.6.32.29/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
11666 ++++ linux-2.6.32.29/fs/proc/inode.c 2010-12-31 14:46:53.000000000 -0500
11667 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
11668 if (de->mode) {
11669 inode->i_mode = de->mode;
11670 @@ -35625,9 +35737,9 @@ diff -urNp linux-2.6.32.28/fs/proc/inode.c linux-2.6.32.28/fs/proc/inode.c
11671 }
11672 if (de->size)
11673 inode->i_size = de->size;
11674 -diff -urNp linux-2.6.32.28/fs/proc/internal.h linux-2.6.32.28/fs/proc/internal.h
11675 ---- linux-2.6.32.28/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
11676 -+++ linux-2.6.32.28/fs/proc/internal.h 2010-12-31 14:46:53.000000000 -0500
11677 +diff -urNp linux-2.6.32.29/fs/proc/internal.h linux-2.6.32.29/fs/proc/internal.h
11678 +--- linux-2.6.32.29/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
11679 ++++ linux-2.6.32.29/fs/proc/internal.h 2010-12-31 14:46:53.000000000 -0500
11680 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
11681 struct pid *pid, struct task_struct *task);
11682 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
11683 @@ -35638,9 +35750,9 @@ diff -urNp linux-2.6.32.28/fs/proc/internal.h linux-2.6.32.28/fs/proc/internal.h
11684 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
11685
11686 extern const struct file_operations proc_maps_operations;
11687 -diff -urNp linux-2.6.32.28/fs/proc/Kconfig linux-2.6.32.28/fs/proc/Kconfig
11688 ---- linux-2.6.32.28/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
11689 -+++ linux-2.6.32.28/fs/proc/Kconfig 2010-12-31 14:46:53.000000000 -0500
11690 +diff -urNp linux-2.6.32.29/fs/proc/Kconfig linux-2.6.32.29/fs/proc/Kconfig
11691 +--- linux-2.6.32.29/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
11692 ++++ linux-2.6.32.29/fs/proc/Kconfig 2010-12-31 14:46:53.000000000 -0500
11693 @@ -30,12 +30,12 @@ config PROC_FS
11694
11695 config PROC_KCORE
11696 @@ -35668,9 +35780,9 @@ diff -urNp linux-2.6.32.28/fs/proc/Kconfig linux-2.6.32.28/fs/proc/Kconfig
11697 bool "Enable /proc page monitoring" if EMBEDDED
11698 help
11699 Various /proc files exist to monitor process memory utilization:
11700 -diff -urNp linux-2.6.32.28/fs/proc/kcore.c linux-2.6.32.28/fs/proc/kcore.c
11701 ---- linux-2.6.32.28/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
11702 -+++ linux-2.6.32.28/fs/proc/kcore.c 2010-12-31 14:47:01.000000000 -0500
11703 +diff -urNp linux-2.6.32.29/fs/proc/kcore.c linux-2.6.32.29/fs/proc/kcore.c
11704 +--- linux-2.6.32.29/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
11705 ++++ linux-2.6.32.29/fs/proc/kcore.c 2010-12-31 14:47:01.000000000 -0500
11706 @@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use
11707 * the addresses in the elf_phdr on our list.
11708 */
11709 @@ -35729,9 +35841,9 @@ diff -urNp linux-2.6.32.28/fs/proc/kcore.c linux-2.6.32.28/fs/proc/kcore.c
11710 if (!capable(CAP_SYS_RAWIO))
11711 return -EPERM;
11712 if (kcore_need_update)
11713 -diff -urNp linux-2.6.32.28/fs/proc/meminfo.c linux-2.6.32.28/fs/proc/meminfo.c
11714 ---- linux-2.6.32.28/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
11715 -+++ linux-2.6.32.28/fs/proc/meminfo.c 2010-12-31 14:46:53.000000000 -0500
11716 +diff -urNp linux-2.6.32.29/fs/proc/meminfo.c linux-2.6.32.29/fs/proc/meminfo.c
11717 +--- linux-2.6.32.29/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
11718 ++++ linux-2.6.32.29/fs/proc/meminfo.c 2010-12-31 14:46:53.000000000 -0500
11719 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
11720 vmi.used >> 10,
11721 vmi.largest_chunk >> 10
11722 @@ -35741,9 +35853,9 @@ diff -urNp linux-2.6.32.28/fs/proc/meminfo.c linux-2.6.32.28/fs/proc/meminfo.c
11723 #endif
11724 );
11725
11726 -diff -urNp linux-2.6.32.28/fs/proc/nommu.c linux-2.6.32.28/fs/proc/nommu.c
11727 ---- linux-2.6.32.28/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
11728 -+++ linux-2.6.32.28/fs/proc/nommu.c 2010-12-31 14:46:53.000000000 -0500
11729 +diff -urNp linux-2.6.32.29/fs/proc/nommu.c linux-2.6.32.29/fs/proc/nommu.c
11730 +--- linux-2.6.32.29/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
11731 ++++ linux-2.6.32.29/fs/proc/nommu.c 2010-12-31 14:46:53.000000000 -0500
11732 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
11733 if (len < 1)
11734 len = 1;
11735 @@ -35753,9 +35865,9 @@ diff -urNp linux-2.6.32.28/fs/proc/nommu.c linux-2.6.32.28/fs/proc/nommu.c
11736 }
11737
11738 seq_putc(m, '\n');
11739 -diff -urNp linux-2.6.32.28/fs/proc/proc_net.c linux-2.6.32.28/fs/proc/proc_net.c
11740 ---- linux-2.6.32.28/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
11741 -+++ linux-2.6.32.28/fs/proc/proc_net.c 2010-12-31 14:46:53.000000000 -0500
11742 +diff -urNp linux-2.6.32.29/fs/proc/proc_net.c linux-2.6.32.29/fs/proc/proc_net.c
11743 +--- linux-2.6.32.29/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
11744 ++++ linux-2.6.32.29/fs/proc/proc_net.c 2010-12-31 14:46:53.000000000 -0500
11745 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
11746 struct task_struct *task;
11747 struct nsproxy *ns;
11748 @@ -35774,9 +35886,9 @@ diff -urNp linux-2.6.32.28/fs/proc/proc_net.c linux-2.6.32.28/fs/proc/proc_net.c
11749
11750 rcu_read_lock();
11751 task = pid_task(proc_pid(dir), PIDTYPE_PID);
11752 -diff -urNp linux-2.6.32.28/fs/proc/proc_sysctl.c linux-2.6.32.28/fs/proc/proc_sysctl.c
11753 ---- linux-2.6.32.28/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
11754 -+++ linux-2.6.32.28/fs/proc/proc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
11755 +diff -urNp linux-2.6.32.29/fs/proc/proc_sysctl.c linux-2.6.32.29/fs/proc/proc_sysctl.c
11756 +--- linux-2.6.32.29/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
11757 ++++ linux-2.6.32.29/fs/proc/proc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
11758 @@ -7,6 +7,8 @@
11759 #include <linux/security.h>
11760 #include "internal.h"
11761 @@ -35816,9 +35928,9 @@ diff -urNp linux-2.6.32.28/fs/proc/proc_sysctl.c linux-2.6.32.28/fs/proc/proc_sy
11762 generic_fillattr(inode, stat);
11763 if (table)
11764 stat->mode = (stat->mode & S_IFMT) | table->mode;
11765 -diff -urNp linux-2.6.32.28/fs/proc/root.c linux-2.6.32.28/fs/proc/root.c
11766 ---- linux-2.6.32.28/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
11767 -+++ linux-2.6.32.28/fs/proc/root.c 2010-12-31 14:46:53.000000000 -0500
11768 +diff -urNp linux-2.6.32.29/fs/proc/root.c linux-2.6.32.29/fs/proc/root.c
11769 +--- linux-2.6.32.29/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
11770 ++++ linux-2.6.32.29/fs/proc/root.c 2010-12-31 14:46:53.000000000 -0500
11771 @@ -134,7 +134,15 @@ void __init proc_root_init(void)
11772 #ifdef CONFIG_PROC_DEVICETREE
11773 proc_device_tree_init();
11774 @@ -35835,9 +35947,9 @@ diff -urNp linux-2.6.32.28/fs/proc/root.c linux-2.6.32.28/fs/proc/root.c
11775 proc_sys_init();
11776 }
11777
11778 -diff -urNp linux-2.6.32.28/fs/proc/task_mmu.c linux-2.6.32.28/fs/proc/task_mmu.c
11779 ---- linux-2.6.32.28/fs/proc/task_mmu.c 2010-10-31 16:44:11.000000000 -0400
11780 -+++ linux-2.6.32.28/fs/proc/task_mmu.c 2010-12-31 14:46:53.000000000 -0500
11781 +diff -urNp linux-2.6.32.29/fs/proc/task_mmu.c linux-2.6.32.29/fs/proc/task_mmu.c
11782 +--- linux-2.6.32.29/fs/proc/task_mmu.c 2010-10-31 16:44:11.000000000 -0400
11783 ++++ linux-2.6.32.29/fs/proc/task_mmu.c 2010-12-31 14:46:53.000000000 -0500
11784 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
11785 "VmStk:\t%8lu kB\n"
11786 "VmExe:\t%8lu kB\n"
11787 @@ -35974,9 +36086,9 @@ diff -urNp linux-2.6.32.28/fs/proc/task_mmu.c linux-2.6.32.28/fs/proc/task_mmu.c
11788 mss.resident >> 10,
11789 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
11790 mss.shared_clean >> 10,
11791 -diff -urNp linux-2.6.32.28/fs/proc/task_nommu.c linux-2.6.32.28/fs/proc/task_nommu.c
11792 ---- linux-2.6.32.28/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
11793 -+++ linux-2.6.32.28/fs/proc/task_nommu.c 2010-12-31 14:46:53.000000000 -0500
11794 +diff -urNp linux-2.6.32.29/fs/proc/task_nommu.c linux-2.6.32.29/fs/proc/task_nommu.c
11795 +--- linux-2.6.32.29/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
11796 ++++ linux-2.6.32.29/fs/proc/task_nommu.c 2010-12-31 14:46:53.000000000 -0500
11797 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
11798 else
11799 bytes += kobjsize(mm);
11800 @@ -35995,9 +36107,9 @@ diff -urNp linux-2.6.32.28/fs/proc/task_nommu.c linux-2.6.32.28/fs/proc/task_nom
11801 }
11802
11803 seq_putc(m, '\n');
11804 -diff -urNp linux-2.6.32.28/fs/readdir.c linux-2.6.32.28/fs/readdir.c
11805 ---- linux-2.6.32.28/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
11806 -+++ linux-2.6.32.28/fs/readdir.c 2010-12-31 14:46:53.000000000 -0500
11807 +diff -urNp linux-2.6.32.29/fs/readdir.c linux-2.6.32.29/fs/readdir.c
11808 +--- linux-2.6.32.29/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
11809 ++++ linux-2.6.32.29/fs/readdir.c 2010-12-31 14:46:53.000000000 -0500
11810 @@ -16,6 +16,7 @@
11811 #include <linux/security.h>
11812 #include <linux/syscalls.h>
11813 @@ -36087,9 +36199,9 @@ diff -urNp linux-2.6.32.28/fs/readdir.c linux-2.6.32.28/fs/readdir.c
11814 buf.count = count;
11815 buf.error = 0;
11816
11817 -diff -urNp linux-2.6.32.28/fs/reiserfs/do_balan.c linux-2.6.32.28/fs/reiserfs/do_balan.c
11818 ---- linux-2.6.32.28/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
11819 -+++ linux-2.6.32.28/fs/reiserfs/do_balan.c 2010-12-31 14:46:53.000000000 -0500
11820 +diff -urNp linux-2.6.32.29/fs/reiserfs/do_balan.c linux-2.6.32.29/fs/reiserfs/do_balan.c
11821 +--- linux-2.6.32.29/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
11822 ++++ linux-2.6.32.29/fs/reiserfs/do_balan.c 2010-12-31 14:46:53.000000000 -0500
11823 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
11824 return;
11825 }
11826 @@ -36099,9 +36211,9 @@ diff -urNp linux-2.6.32.28/fs/reiserfs/do_balan.c linux-2.6.32.28/fs/reiserfs/do
11827 do_balance_starts(tb);
11828
11829 /* balance leaf returns 0 except if combining L R and S into
11830 -diff -urNp linux-2.6.32.28/fs/reiserfs/item_ops.c linux-2.6.32.28/fs/reiserfs/item_ops.c
11831 ---- linux-2.6.32.28/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
11832 -+++ linux-2.6.32.28/fs/reiserfs/item_ops.c 2010-12-31 14:46:53.000000000 -0500
11833 +diff -urNp linux-2.6.32.29/fs/reiserfs/item_ops.c linux-2.6.32.29/fs/reiserfs/item_ops.c
11834 +--- linux-2.6.32.29/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
11835 ++++ linux-2.6.32.29/fs/reiserfs/item_ops.c 2010-12-31 14:46:53.000000000 -0500
11836 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
11837 vi->vi_index, vi->vi_type, vi->vi_ih);
11838 }
11839 @@ -36156,9 +36268,9 @@ diff -urNp linux-2.6.32.28/fs/reiserfs/item_ops.c linux-2.6.32.28/fs/reiserfs/it
11840 &stat_data_ops,
11841 &indirect_ops,
11842 &direct_ops,
11843 -diff -urNp linux-2.6.32.28/fs/reiserfs/procfs.c linux-2.6.32.28/fs/reiserfs/procfs.c
11844 ---- linux-2.6.32.28/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
11845 -+++ linux-2.6.32.28/fs/reiserfs/procfs.c 2010-12-31 14:46:53.000000000 -0500
11846 +diff -urNp linux-2.6.32.29/fs/reiserfs/procfs.c linux-2.6.32.29/fs/reiserfs/procfs.c
11847 +--- linux-2.6.32.29/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
11848 ++++ linux-2.6.32.29/fs/reiserfs/procfs.c 2010-12-31 14:46:53.000000000 -0500
11849 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
11850 "SMALL_TAILS " : "NO_TAILS ",
11851 replay_only(sb) ? "REPLAY_ONLY " : "",
11852 @@ -36168,9 +36280,9 @@ diff -urNp linux-2.6.32.28/fs/reiserfs/procfs.c linux-2.6.32.28/fs/reiserfs/proc
11853 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
11854 SF(s_do_balance), SF(s_unneeded_left_neighbor),
11855 SF(s_good_search_by_key_reada), SF(s_bmaps),
11856 -diff -urNp linux-2.6.32.28/fs/select.c linux-2.6.32.28/fs/select.c
11857 ---- linux-2.6.32.28/fs/select.c 2010-08-13 16:24:37.000000000 -0400
11858 -+++ linux-2.6.32.28/fs/select.c 2010-12-31 14:46:53.000000000 -0500
11859 +diff -urNp linux-2.6.32.29/fs/select.c linux-2.6.32.29/fs/select.c
11860 +--- linux-2.6.32.29/fs/select.c 2010-08-13 16:24:37.000000000 -0400
11861 ++++ linux-2.6.32.29/fs/select.c 2010-12-31 14:46:53.000000000 -0500
11862 @@ -20,6 +20,7 @@
11863 #include <linux/module.h>
11864 #include <linux/slab.h>
11865 @@ -36187,9 +36299,9 @@ diff -urNp linux-2.6.32.28/fs/select.c linux-2.6.32.28/fs/select.c
11866 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
11867 return -EINVAL;
11868
11869 -diff -urNp linux-2.6.32.28/fs/seq_file.c linux-2.6.32.28/fs/seq_file.c
11870 ---- linux-2.6.32.28/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
11871 -+++ linux-2.6.32.28/fs/seq_file.c 2010-12-31 14:46:53.000000000 -0500
11872 +diff -urNp linux-2.6.32.29/fs/seq_file.c linux-2.6.32.29/fs/seq_file.c
11873 +--- linux-2.6.32.29/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
11874 ++++ linux-2.6.32.29/fs/seq_file.c 2010-12-31 14:46:53.000000000 -0500
11875 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
11876 return 0;
11877 }
11878 @@ -36230,9 +36342,9 @@ diff -urNp linux-2.6.32.28/fs/seq_file.c linux-2.6.32.28/fs/seq_file.c
11879 if (!m->buf)
11880 goto Enomem;
11881 m->count = 0;
11882 -diff -urNp linux-2.6.32.28/fs/smbfs/symlink.c linux-2.6.32.28/fs/smbfs/symlink.c
11883 ---- linux-2.6.32.28/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
11884 -+++ linux-2.6.32.28/fs/smbfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
11885 +diff -urNp linux-2.6.32.29/fs/smbfs/symlink.c linux-2.6.32.29/fs/smbfs/symlink.c
11886 +--- linux-2.6.32.29/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
11887 ++++ linux-2.6.32.29/fs/smbfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
11888 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
11889
11890 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
11891 @@ -36242,9 +36354,9 @@ diff -urNp linux-2.6.32.28/fs/smbfs/symlink.c linux-2.6.32.28/fs/smbfs/symlink.c
11892 if (!IS_ERR(s))
11893 __putname(s);
11894 }
11895 -diff -urNp linux-2.6.32.28/fs/splice.c linux-2.6.32.28/fs/splice.c
11896 ---- linux-2.6.32.28/fs/splice.c 2010-08-13 16:24:37.000000000 -0400
11897 -+++ linux-2.6.32.28/fs/splice.c 2010-12-31 14:46:53.000000000 -0500
11898 +diff -urNp linux-2.6.32.29/fs/splice.c linux-2.6.32.29/fs/splice.c
11899 +--- linux-2.6.32.29/fs/splice.c 2010-08-13 16:24:37.000000000 -0400
11900 ++++ linux-2.6.32.29/fs/splice.c 2010-12-31 14:46:53.000000000 -0500
11901 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
11902 pipe_lock(pipe);
11903
11904 @@ -36383,9 +36495,9 @@ diff -urNp linux-2.6.32.28/fs/splice.c linux-2.6.32.28/fs/splice.c
11905 ret = -EAGAIN;
11906
11907 pipe_unlock(ipipe);
11908 -diff -urNp linux-2.6.32.28/fs/sysfs/file.c linux-2.6.32.28/fs/sysfs/file.c
11909 ---- linux-2.6.32.28/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
11910 -+++ linux-2.6.32.28/fs/sysfs/file.c 2010-12-31 14:46:53.000000000 -0500
11911 +diff -urNp linux-2.6.32.29/fs/sysfs/file.c linux-2.6.32.29/fs/sysfs/file.c
11912 +--- linux-2.6.32.29/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
11913 ++++ linux-2.6.32.29/fs/sysfs/file.c 2010-12-31 14:46:53.000000000 -0500
11914 @@ -53,7 +53,7 @@ struct sysfs_buffer {
11915 size_t count;
11916 loff_t pos;
11917 @@ -36422,9 +36534,9 @@ diff -urNp linux-2.6.32.28/fs/sysfs/file.c linux-2.6.32.28/fs/sysfs/file.c
11918 int error = -EACCES;
11919 char *p;
11920
11921 -diff -urNp linux-2.6.32.28/fs/sysfs/symlink.c linux-2.6.32.28/fs/sysfs/symlink.c
11922 ---- linux-2.6.32.28/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
11923 -+++ linux-2.6.32.28/fs/sysfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
11924 +diff -urNp linux-2.6.32.29/fs/sysfs/symlink.c linux-2.6.32.29/fs/sysfs/symlink.c
11925 +--- linux-2.6.32.29/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
11926 ++++ linux-2.6.32.29/fs/sysfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
11927 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
11928
11929 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
11930 @@ -36434,9 +36546,9 @@ diff -urNp linux-2.6.32.28/fs/sysfs/symlink.c linux-2.6.32.28/fs/sysfs/symlink.c
11931 if (!IS_ERR(page))
11932 free_page((unsigned long)page);
11933 }
11934 -diff -urNp linux-2.6.32.28/fs/udf/balloc.c linux-2.6.32.28/fs/udf/balloc.c
11935 ---- linux-2.6.32.28/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
11936 -+++ linux-2.6.32.28/fs/udf/balloc.c 2010-12-31 14:46:53.000000000 -0500
11937 +diff -urNp linux-2.6.32.29/fs/udf/balloc.c linux-2.6.32.29/fs/udf/balloc.c
11938 +--- linux-2.6.32.29/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
11939 ++++ linux-2.6.32.29/fs/udf/balloc.c 2010-12-31 14:46:53.000000000 -0500
11940 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
11941
11942 mutex_lock(&sbi->s_alloc_mutex);
11943 @@ -36459,9 +36571,9 @@ diff -urNp linux-2.6.32.28/fs/udf/balloc.c linux-2.6.32.28/fs/udf/balloc.c
11944 udf_debug("%d < %d || %d + %d > %d\n",
11945 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
11946 partmap->s_partition_len);
11947 -diff -urNp linux-2.6.32.28/fs/udf/misc.c linux-2.6.32.28/fs/udf/misc.c
11948 ---- linux-2.6.32.28/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
11949 -+++ linux-2.6.32.28/fs/udf/misc.c 2010-12-31 14:46:53.000000000 -0500
11950 +diff -urNp linux-2.6.32.29/fs/udf/misc.c linux-2.6.32.29/fs/udf/misc.c
11951 +--- linux-2.6.32.29/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
11952 ++++ linux-2.6.32.29/fs/udf/misc.c 2010-12-31 14:46:53.000000000 -0500
11953 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
11954 iinfo->i_lenEAttr += size;
11955 return (struct genericFormat *)&ea[offset];
11956 @@ -36482,9 +36594,9 @@ diff -urNp linux-2.6.32.28/fs/udf/misc.c linux-2.6.32.28/fs/udf/misc.c
11957 u8 checksum = 0;
11958 int i;
11959 for (i = 0; i < sizeof(struct tag); ++i)
11960 -diff -urNp linux-2.6.32.28/fs/udf/udfdecl.h linux-2.6.32.28/fs/udf/udfdecl.h
11961 ---- linux-2.6.32.28/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
11962 -+++ linux-2.6.32.28/fs/udf/udfdecl.h 2010-12-31 14:46:53.000000000 -0500
11963 +diff -urNp linux-2.6.32.29/fs/udf/udfdecl.h linux-2.6.32.29/fs/udf/udfdecl.h
11964 +--- linux-2.6.32.29/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
11965 ++++ linux-2.6.32.29/fs/udf/udfdecl.h 2010-12-31 14:46:53.000000000 -0500
11966 @@ -26,7 +26,7 @@ do { \
11967 printk(f, ##a); \
11968 } while (0)
11969 @@ -36494,9 +36606,9 @@ diff -urNp linux-2.6.32.28/fs/udf/udfdecl.h linux-2.6.32.28/fs/udf/udfdecl.h
11970 #endif
11971
11972 #define udf_info(f, a...) \
11973 -diff -urNp linux-2.6.32.28/fs/utimes.c linux-2.6.32.28/fs/utimes.c
11974 ---- linux-2.6.32.28/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
11975 -+++ linux-2.6.32.28/fs/utimes.c 2010-12-31 14:46:53.000000000 -0500
11976 +diff -urNp linux-2.6.32.29/fs/utimes.c linux-2.6.32.29/fs/utimes.c
11977 +--- linux-2.6.32.29/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
11978 ++++ linux-2.6.32.29/fs/utimes.c 2010-12-31 14:46:53.000000000 -0500
11979 @@ -1,6 +1,7 @@
11980 #include <linux/compiler.h>
11981 #include <linux/file.h>
11982 @@ -36518,9 +36630,9 @@ diff -urNp linux-2.6.32.28/fs/utimes.c linux-2.6.32.28/fs/utimes.c
11983 mutex_lock(&inode->i_mutex);
11984 error = notify_change(path->dentry, &newattrs);
11985 mutex_unlock(&inode->i_mutex);
11986 -diff -urNp linux-2.6.32.28/fs/xattr_acl.c linux-2.6.32.28/fs/xattr_acl.c
11987 ---- linux-2.6.32.28/fs/xattr_acl.c 2010-08-13 16:24:37.000000000 -0400
11988 -+++ linux-2.6.32.28/fs/xattr_acl.c 2010-12-31 14:46:53.000000000 -0500
11989 +diff -urNp linux-2.6.32.29/fs/xattr_acl.c linux-2.6.32.29/fs/xattr_acl.c
11990 +--- linux-2.6.32.29/fs/xattr_acl.c 2010-08-13 16:24:37.000000000 -0400
11991 ++++ linux-2.6.32.29/fs/xattr_acl.c 2010-12-31 14:46:53.000000000 -0500
11992 @@ -17,8 +17,8 @@
11993 struct posix_acl *
11994 posix_acl_from_xattr(const void *value, size_t size)
11995 @@ -36532,9 +36644,9 @@ diff -urNp linux-2.6.32.28/fs/xattr_acl.c linux-2.6.32.28/fs/xattr_acl.c
11996 int count;
11997 struct posix_acl *acl;
11998 struct posix_acl_entry *acl_e;
11999 -diff -urNp linux-2.6.32.28/fs/xattr.c linux-2.6.32.28/fs/xattr.c
12000 ---- linux-2.6.32.28/fs/xattr.c 2010-08-13 16:24:37.000000000 -0400
12001 -+++ linux-2.6.32.28/fs/xattr.c 2010-12-31 14:46:53.000000000 -0500
12002 +diff -urNp linux-2.6.32.29/fs/xattr.c linux-2.6.32.29/fs/xattr.c
12003 +--- linux-2.6.32.29/fs/xattr.c 2010-08-13 16:24:37.000000000 -0400
12004 ++++ linux-2.6.32.29/fs/xattr.c 2010-12-31 14:46:53.000000000 -0500
12005 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
12006 * Extended attribute SET operations
12007 */
12008 @@ -36597,9 +36709,9 @@ diff -urNp linux-2.6.32.28/fs/xattr.c linux-2.6.32.28/fs/xattr.c
12009 mnt_drop_write(f->f_path.mnt);
12010 }
12011 fput(f);
12012 -diff -urNp linux-2.6.32.28/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.28/fs/xfs/linux-2.6/xfs_ioctl.c
12013 ---- linux-2.6.32.28/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:05.000000000 -0400
12014 -+++ linux-2.6.32.28/fs/xfs/linux-2.6/xfs_ioctl.c 2010-12-31 14:46:53.000000000 -0500
12015 +diff -urNp linux-2.6.32.29/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.29/fs/xfs/linux-2.6/xfs_ioctl.c
12016 +--- linux-2.6.32.29/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:05.000000000 -0400
12017 ++++ linux-2.6.32.29/fs/xfs/linux-2.6/xfs_ioctl.c 2010-12-31 14:46:53.000000000 -0500
12018 @@ -134,7 +134,7 @@ xfs_find_handle(
12019 }
12020
12021 @@ -36618,9 +36730,9 @@ diff -urNp linux-2.6.32.28/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.28/fs/xfs/l
12022 if (!kbuf)
12023 goto out_dput;
12024
12025 -diff -urNp linux-2.6.32.28/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.28/fs/xfs/linux-2.6/xfs_iops.c
12026 ---- linux-2.6.32.28/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
12027 -+++ linux-2.6.32.28/fs/xfs/linux-2.6/xfs_iops.c 2010-12-31 14:46:53.000000000 -0500
12028 +diff -urNp linux-2.6.32.29/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.29/fs/xfs/linux-2.6/xfs_iops.c
12029 +--- linux-2.6.32.29/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
12030 ++++ linux-2.6.32.29/fs/xfs/linux-2.6/xfs_iops.c 2010-12-31 14:46:53.000000000 -0500
12031 @@ -468,7 +468,7 @@ xfs_vn_put_link(
12032 struct nameidata *nd,
12033 void *p)
12034 @@ -36630,9 +36742,9 @@ diff -urNp linux-2.6.32.28/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.28/fs/xfs/li
12035
12036 if (!IS_ERR(s))
12037 kfree(s);
12038 -diff -urNp linux-2.6.32.28/fs/xfs/xfs_bmap.c linux-2.6.32.28/fs/xfs/xfs_bmap.c
12039 ---- linux-2.6.32.28/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
12040 -+++ linux-2.6.32.28/fs/xfs/xfs_bmap.c 2010-12-31 14:46:53.000000000 -0500
12041 +diff -urNp linux-2.6.32.29/fs/xfs/xfs_bmap.c linux-2.6.32.29/fs/xfs/xfs_bmap.c
12042 +--- linux-2.6.32.29/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
12043 ++++ linux-2.6.32.29/fs/xfs/xfs_bmap.c 2010-12-31 14:46:53.000000000 -0500
12044 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
12045 int nmap,
12046 int ret_nmap);
12047 @@ -36642,9 +36754,9 @@ diff -urNp linux-2.6.32.28/fs/xfs/xfs_bmap.c linux-2.6.32.28/fs/xfs/xfs_bmap.c
12048 #endif /* DEBUG */
12049
12050 #if defined(XFS_RW_TRACE)
12051 -diff -urNp linux-2.6.32.28/fs/xfs/xfs_fsops.c linux-2.6.32.28/fs/xfs/xfs_fsops.c
12052 ---- linux-2.6.32.28/fs/xfs/xfs_fsops.c 2010-08-13 16:24:37.000000000 -0400
12053 -+++ linux-2.6.32.28/fs/xfs/xfs_fsops.c 2011-02-15 19:44:00.000000000 -0500
12054 +diff -urNp linux-2.6.32.29/fs/xfs/xfs_fsops.c linux-2.6.32.29/fs/xfs/xfs_fsops.c
12055 +--- linux-2.6.32.29/fs/xfs/xfs_fsops.c 2010-08-13 16:24:37.000000000 -0400
12056 ++++ linux-2.6.32.29/fs/xfs/xfs_fsops.c 2011-02-15 19:44:00.000000000 -0500
12057 @@ -56,6 +56,9 @@ xfs_fs_geometry(
12058 xfs_fsop_geom_t *geo,
12059 int new_version)
12060 @@ -36655,9 +36767,9 @@ diff -urNp linux-2.6.32.28/fs/xfs/xfs_fsops.c linux-2.6.32.28/fs/xfs/xfs_fsops.c
12061 geo->blocksize = mp->m_sb.sb_blocksize;
12062 geo->rtextsize = mp->m_sb.sb_rextsize;
12063 geo->agblocks = mp->m_sb.sb_agblocks;
12064 -diff -urNp linux-2.6.32.28/grsecurity/gracl_alloc.c linux-2.6.32.28/grsecurity/gracl_alloc.c
12065 ---- linux-2.6.32.28/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
12066 -+++ linux-2.6.32.28/grsecurity/gracl_alloc.c 2010-12-31 14:46:53.000000000 -0500
12067 +diff -urNp linux-2.6.32.29/grsecurity/gracl_alloc.c linux-2.6.32.29/grsecurity/gracl_alloc.c
12068 +--- linux-2.6.32.29/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
12069 ++++ linux-2.6.32.29/grsecurity/gracl_alloc.c 2010-12-31 14:46:53.000000000 -0500
12070 @@ -0,0 +1,105 @@
12071 +#include <linux/kernel.h>
12072 +#include <linux/mm.h>
12073 @@ -36764,9 +36876,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_alloc.c linux-2.6.32.28/grsecurity/g
12074 + else
12075 + return 1;
12076 +}
12077 -diff -urNp linux-2.6.32.28/grsecurity/gracl.c linux-2.6.32.28/grsecurity/gracl.c
12078 ---- linux-2.6.32.28/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
12079 -+++ linux-2.6.32.28/grsecurity/gracl.c 2011-01-16 22:45:08.000000000 -0500
12080 +diff -urNp linux-2.6.32.29/grsecurity/gracl.c linux-2.6.32.29/grsecurity/gracl.c
12081 +--- linux-2.6.32.29/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
12082 ++++ linux-2.6.32.29/grsecurity/gracl.c 2011-01-16 22:45:08.000000000 -0500
12083 @@ -0,0 +1,3986 @@
12084 +#include <linux/kernel.h>
12085 +#include <linux/module.h>
12086 @@ -40754,9 +40866,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl.c linux-2.6.32.28/grsecurity/gracl.c
12087 +EXPORT_SYMBOL(gr_check_group_change);
12088 +#endif
12089 +
12090 -diff -urNp linux-2.6.32.28/grsecurity/gracl_cap.c linux-2.6.32.28/grsecurity/gracl_cap.c
12091 ---- linux-2.6.32.28/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
12092 -+++ linux-2.6.32.28/grsecurity/gracl_cap.c 2010-12-31 14:46:53.000000000 -0500
12093 +diff -urNp linux-2.6.32.29/grsecurity/gracl_cap.c linux-2.6.32.29/grsecurity/gracl_cap.c
12094 +--- linux-2.6.32.29/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
12095 ++++ linux-2.6.32.29/grsecurity/gracl_cap.c 2010-12-31 14:46:53.000000000 -0500
12096 @@ -0,0 +1,138 @@
12097 +#include <linux/kernel.h>
12098 +#include <linux/module.h>
12099 @@ -40896,9 +41008,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_cap.c linux-2.6.32.28/grsecurity/gra
12100 + return 0;
12101 +}
12102 +
12103 -diff -urNp linux-2.6.32.28/grsecurity/gracl_fs.c linux-2.6.32.28/grsecurity/gracl_fs.c
12104 ---- linux-2.6.32.28/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
12105 -+++ linux-2.6.32.28/grsecurity/gracl_fs.c 2010-12-31 14:46:53.000000000 -0500
12106 +diff -urNp linux-2.6.32.29/grsecurity/gracl_fs.c linux-2.6.32.29/grsecurity/gracl_fs.c
12107 +--- linux-2.6.32.29/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
12108 ++++ linux-2.6.32.29/grsecurity/gracl_fs.c 2010-12-31 14:46:53.000000000 -0500
12109 @@ -0,0 +1,430 @@
12110 +#include <linux/kernel.h>
12111 +#include <linux/sched.h>
12112 @@ -41330,9 +41442,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_fs.c linux-2.6.32.28/grsecurity/grac
12113 +
12114 + return 0;
12115 +}
12116 -diff -urNp linux-2.6.32.28/grsecurity/gracl_ip.c linux-2.6.32.28/grsecurity/gracl_ip.c
12117 ---- linux-2.6.32.28/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
12118 -+++ linux-2.6.32.28/grsecurity/gracl_ip.c 2011-02-15 19:42:10.000000000 -0500
12119 +diff -urNp linux-2.6.32.29/grsecurity/gracl_ip.c linux-2.6.32.29/grsecurity/gracl_ip.c
12120 +--- linux-2.6.32.29/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
12121 ++++ linux-2.6.32.29/grsecurity/gracl_ip.c 2011-02-15 19:42:10.000000000 -0500
12122 @@ -0,0 +1,382 @@
12123 +#include <linux/kernel.h>
12124 +#include <asm/uaccess.h>
12125 @@ -41716,9 +41828,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_ip.c linux-2.6.32.28/grsecurity/grac
12126 +
12127 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
12128 +}
12129 -diff -urNp linux-2.6.32.28/grsecurity/gracl_learn.c linux-2.6.32.28/grsecurity/gracl_learn.c
12130 ---- linux-2.6.32.28/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
12131 -+++ linux-2.6.32.28/grsecurity/gracl_learn.c 2011-01-16 22:44:26.000000000 -0500
12132 +diff -urNp linux-2.6.32.29/grsecurity/gracl_learn.c linux-2.6.32.29/grsecurity/gracl_learn.c
12133 +--- linux-2.6.32.29/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
12134 ++++ linux-2.6.32.29/grsecurity/gracl_learn.c 2011-01-16 22:44:26.000000000 -0500
12135 @@ -0,0 +1,211 @@
12136 +#include <linux/kernel.h>
12137 +#include <linux/mm.h>
12138 @@ -41931,9 +42043,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_learn.c linux-2.6.32.28/grsecurity/g
12139 + .release = close_learn,
12140 + .poll = poll_learn,
12141 +};
12142 -diff -urNp linux-2.6.32.28/grsecurity/gracl_res.c linux-2.6.32.28/grsecurity/gracl_res.c
12143 ---- linux-2.6.32.28/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
12144 -+++ linux-2.6.32.28/grsecurity/gracl_res.c 2010-12-31 14:46:53.000000000 -0500
12145 +diff -urNp linux-2.6.32.29/grsecurity/gracl_res.c linux-2.6.32.29/grsecurity/gracl_res.c
12146 +--- linux-2.6.32.29/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
12147 ++++ linux-2.6.32.29/grsecurity/gracl_res.c 2010-12-31 14:46:53.000000000 -0500
12148 @@ -0,0 +1,67 @@
12149 +#include <linux/kernel.h>
12150 +#include <linux/sched.h>
12151 @@ -42002,9 +42114,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_res.c linux-2.6.32.28/grsecurity/gra
12152 + rcu_read_unlock();
12153 + return;
12154 +}
12155 -diff -urNp linux-2.6.32.28/grsecurity/gracl_segv.c linux-2.6.32.28/grsecurity/gracl_segv.c
12156 ---- linux-2.6.32.28/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
12157 -+++ linux-2.6.32.28/grsecurity/gracl_segv.c 2010-12-31 14:46:53.000000000 -0500
12158 +diff -urNp linux-2.6.32.29/grsecurity/gracl_segv.c linux-2.6.32.29/grsecurity/gracl_segv.c
12159 +--- linux-2.6.32.29/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
12160 ++++ linux-2.6.32.29/grsecurity/gracl_segv.c 2010-12-31 14:46:53.000000000 -0500
12161 @@ -0,0 +1,310 @@
12162 +#include <linux/kernel.h>
12163 +#include <linux/mm.h>
12164 @@ -42316,9 +42428,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_segv.c linux-2.6.32.28/grsecurity/gr
12165 +
12166 + return;
12167 +}
12168 -diff -urNp linux-2.6.32.28/grsecurity/gracl_shm.c linux-2.6.32.28/grsecurity/gracl_shm.c
12169 ---- linux-2.6.32.28/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
12170 -+++ linux-2.6.32.28/grsecurity/gracl_shm.c 2010-12-31 14:46:53.000000000 -0500
12171 +diff -urNp linux-2.6.32.29/grsecurity/gracl_shm.c linux-2.6.32.29/grsecurity/gracl_shm.c
12172 +--- linux-2.6.32.29/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
12173 ++++ linux-2.6.32.29/grsecurity/gracl_shm.c 2010-12-31 14:46:53.000000000 -0500
12174 @@ -0,0 +1,40 @@
12175 +#include <linux/kernel.h>
12176 +#include <linux/mm.h>
12177 @@ -42360,9 +42472,9 @@ diff -urNp linux-2.6.32.28/grsecurity/gracl_shm.c linux-2.6.32.28/grsecurity/gra
12178 +
12179 + return 1;
12180 +}
12181 -diff -urNp linux-2.6.32.28/grsecurity/grsec_chdir.c linux-2.6.32.28/grsecurity/grsec_chdir.c
12182 ---- linux-2.6.32.28/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
12183 -+++ linux-2.6.32.28/grsecurity/grsec_chdir.c 2010-12-31 14:46:53.000000000 -0500
12184 +diff -urNp linux-2.6.32.29/grsecurity/grsec_chdir.c linux-2.6.32.29/grsecurity/grsec_chdir.c
12185 +--- linux-2.6.32.29/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
12186 ++++ linux-2.6.32.29/grsecurity/grsec_chdir.c 2010-12-31 14:46:53.000000000 -0500
12187 @@ -0,0 +1,19 @@
12188 +#include <linux/kernel.h>
12189 +#include <linux/sched.h>
12190 @@ -42383,9 +42495,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_chdir.c linux-2.6.32.28/grsecurity/g
12191 +#endif
12192 + return;
12193 +}
12194 -diff -urNp linux-2.6.32.28/grsecurity/grsec_chroot.c linux-2.6.32.28/grsecurity/grsec_chroot.c
12195 ---- linux-2.6.32.28/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
12196 -+++ linux-2.6.32.28/grsecurity/grsec_chroot.c 2011-01-11 22:46:12.000000000 -0500
12197 +diff -urNp linux-2.6.32.29/grsecurity/grsec_chroot.c linux-2.6.32.29/grsecurity/grsec_chroot.c
12198 +--- linux-2.6.32.29/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
12199 ++++ linux-2.6.32.29/grsecurity/grsec_chroot.c 2011-01-11 22:46:12.000000000 -0500
12200 @@ -0,0 +1,390 @@
12201 +#include <linux/kernel.h>
12202 +#include <linux/module.h>
12203 @@ -42777,9 +42889,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_chroot.c linux-2.6.32.28/grsecurity/
12204 +#ifdef CONFIG_SECURITY
12205 +EXPORT_SYMBOL(gr_handle_chroot_caps);
12206 +#endif
12207 -diff -urNp linux-2.6.32.28/grsecurity/grsec_disabled.c linux-2.6.32.28/grsecurity/grsec_disabled.c
12208 ---- linux-2.6.32.28/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
12209 -+++ linux-2.6.32.28/grsecurity/grsec_disabled.c 2010-12-31 14:46:53.000000000 -0500
12210 +diff -urNp linux-2.6.32.29/grsecurity/grsec_disabled.c linux-2.6.32.29/grsecurity/grsec_disabled.c
12211 +--- linux-2.6.32.29/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
12212 ++++ linux-2.6.32.29/grsecurity/grsec_disabled.c 2010-12-31 14:46:53.000000000 -0500
12213 @@ -0,0 +1,442 @@
12214 +#include <linux/kernel.h>
12215 +#include <linux/module.h>
12216 @@ -43223,9 +43335,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_disabled.c linux-2.6.32.28/grsecurit
12217 +EXPORT_SYMBOL(gr_check_user_change);
12218 +EXPORT_SYMBOL(gr_check_group_change);
12219 +#endif
12220 -diff -urNp linux-2.6.32.28/grsecurity/grsec_exec.c linux-2.6.32.28/grsecurity/grsec_exec.c
12221 ---- linux-2.6.32.28/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
12222 -+++ linux-2.6.32.28/grsecurity/grsec_exec.c 2011-01-16 22:46:10.000000000 -0500
12223 +diff -urNp linux-2.6.32.29/grsecurity/grsec_exec.c linux-2.6.32.29/grsecurity/grsec_exec.c
12224 +--- linux-2.6.32.29/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
12225 ++++ linux-2.6.32.29/grsecurity/grsec_exec.c 2011-01-16 22:46:10.000000000 -0500
12226 @@ -0,0 +1,148 @@
12227 +#include <linux/kernel.h>
12228 +#include <linux/sched.h>
12229 @@ -43375,9 +43487,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_exec.c linux-2.6.32.28/grsecurity/gr
12230 + return;
12231 +}
12232 +#endif
12233 -diff -urNp linux-2.6.32.28/grsecurity/grsec_fifo.c linux-2.6.32.28/grsecurity/grsec_fifo.c
12234 ---- linux-2.6.32.28/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
12235 -+++ linux-2.6.32.28/grsecurity/grsec_fifo.c 2010-12-31 14:46:53.000000000 -0500
12236 +diff -urNp linux-2.6.32.29/grsecurity/grsec_fifo.c linux-2.6.32.29/grsecurity/grsec_fifo.c
12237 +--- linux-2.6.32.29/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
12238 ++++ linux-2.6.32.29/grsecurity/grsec_fifo.c 2010-12-31 14:46:53.000000000 -0500
12239 @@ -0,0 +1,24 @@
12240 +#include <linux/kernel.h>
12241 +#include <linux/sched.h>
12242 @@ -43403,9 +43515,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_fifo.c linux-2.6.32.28/grsecurity/gr
12243 +#endif
12244 + return 0;
12245 +}
12246 -diff -urNp linux-2.6.32.28/grsecurity/grsec_fork.c linux-2.6.32.28/grsecurity/grsec_fork.c
12247 ---- linux-2.6.32.28/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
12248 -+++ linux-2.6.32.28/grsecurity/grsec_fork.c 2010-12-31 14:46:53.000000000 -0500
12249 +diff -urNp linux-2.6.32.29/grsecurity/grsec_fork.c linux-2.6.32.29/grsecurity/grsec_fork.c
12250 +--- linux-2.6.32.29/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
12251 ++++ linux-2.6.32.29/grsecurity/grsec_fork.c 2010-12-31 14:46:53.000000000 -0500
12252 @@ -0,0 +1,23 @@
12253 +#include <linux/kernel.h>
12254 +#include <linux/sched.h>
12255 @@ -43430,9 +43542,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_fork.c linux-2.6.32.28/grsecurity/gr
12256 +#endif
12257 + return;
12258 +}
12259 -diff -urNp linux-2.6.32.28/grsecurity/grsec_init.c linux-2.6.32.28/grsecurity/grsec_init.c
12260 ---- linux-2.6.32.28/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
12261 -+++ linux-2.6.32.28/grsecurity/grsec_init.c 2010-12-31 14:46:53.000000000 -0500
12262 +diff -urNp linux-2.6.32.29/grsecurity/grsec_init.c linux-2.6.32.29/grsecurity/grsec_init.c
12263 +--- linux-2.6.32.29/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
12264 ++++ linux-2.6.32.29/grsecurity/grsec_init.c 2010-12-31 14:46:53.000000000 -0500
12265 @@ -0,0 +1,270 @@
12266 +#include <linux/kernel.h>
12267 +#include <linux/sched.h>
12268 @@ -43704,9 +43816,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_init.c linux-2.6.32.28/grsecurity/gr
12269 +
12270 + return;
12271 +}
12272 -diff -urNp linux-2.6.32.28/grsecurity/grsec_link.c linux-2.6.32.28/grsecurity/grsec_link.c
12273 ---- linux-2.6.32.28/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
12274 -+++ linux-2.6.32.28/grsecurity/grsec_link.c 2010-12-31 14:46:53.000000000 -0500
12275 +diff -urNp linux-2.6.32.29/grsecurity/grsec_link.c linux-2.6.32.29/grsecurity/grsec_link.c
12276 +--- linux-2.6.32.29/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
12277 ++++ linux-2.6.32.29/grsecurity/grsec_link.c 2010-12-31 14:46:53.000000000 -0500
12278 @@ -0,0 +1,43 @@
12279 +#include <linux/kernel.h>
12280 +#include <linux/sched.h>
12281 @@ -43751,9 +43863,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_link.c linux-2.6.32.28/grsecurity/gr
12282 +#endif
12283 + return 0;
12284 +}
12285 -diff -urNp linux-2.6.32.28/grsecurity/grsec_log.c linux-2.6.32.28/grsecurity/grsec_log.c
12286 ---- linux-2.6.32.28/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
12287 -+++ linux-2.6.32.28/grsecurity/grsec_log.c 2010-12-31 14:46:53.000000000 -0500
12288 +diff -urNp linux-2.6.32.29/grsecurity/grsec_log.c linux-2.6.32.29/grsecurity/grsec_log.c
12289 +--- linux-2.6.32.29/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
12290 ++++ linux-2.6.32.29/grsecurity/grsec_log.c 2010-12-31 14:46:53.000000000 -0500
12291 @@ -0,0 +1,310 @@
12292 +#include <linux/kernel.h>
12293 +#include <linux/sched.h>
12294 @@ -44065,9 +44177,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_log.c linux-2.6.32.28/grsecurity/grs
12295 + gr_log_end(audit);
12296 + END_LOCKS(audit);
12297 +}
12298 -diff -urNp linux-2.6.32.28/grsecurity/grsec_mem.c linux-2.6.32.28/grsecurity/grsec_mem.c
12299 ---- linux-2.6.32.28/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
12300 -+++ linux-2.6.32.28/grsecurity/grsec_mem.c 2010-12-31 14:46:53.000000000 -0500
12301 +diff -urNp linux-2.6.32.29/grsecurity/grsec_mem.c linux-2.6.32.29/grsecurity/grsec_mem.c
12302 +--- linux-2.6.32.29/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
12303 ++++ linux-2.6.32.29/grsecurity/grsec_mem.c 2010-12-31 14:46:53.000000000 -0500
12304 @@ -0,0 +1,85 @@
12305 +#include <linux/kernel.h>
12306 +#include <linux/sched.h>
12307 @@ -44154,9 +44266,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_mem.c linux-2.6.32.28/grsecurity/grs
12308 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
12309 + return;
12310 +}
12311 -diff -urNp linux-2.6.32.28/grsecurity/grsec_mount.c linux-2.6.32.28/grsecurity/grsec_mount.c
12312 ---- linux-2.6.32.28/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
12313 -+++ linux-2.6.32.28/grsecurity/grsec_mount.c 2010-12-31 14:46:53.000000000 -0500
12314 +diff -urNp linux-2.6.32.29/grsecurity/grsec_mount.c linux-2.6.32.29/grsecurity/grsec_mount.c
12315 +--- linux-2.6.32.29/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
12316 ++++ linux-2.6.32.29/grsecurity/grsec_mount.c 2010-12-31 14:46:53.000000000 -0500
12317 @@ -0,0 +1,62 @@
12318 +#include <linux/kernel.h>
12319 +#include <linux/sched.h>
12320 @@ -44220,9 +44332,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_mount.c linux-2.6.32.28/grsecurity/g
12321 +#endif
12322 + return 0;
12323 +}
12324 -diff -urNp linux-2.6.32.28/grsecurity/grsec_pax.c linux-2.6.32.28/grsecurity/grsec_pax.c
12325 ---- linux-2.6.32.28/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
12326 -+++ linux-2.6.32.28/grsecurity/grsec_pax.c 2010-12-31 14:46:53.000000000 -0500
12327 +diff -urNp linux-2.6.32.29/grsecurity/grsec_pax.c linux-2.6.32.29/grsecurity/grsec_pax.c
12328 +--- linux-2.6.32.29/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
12329 ++++ linux-2.6.32.29/grsecurity/grsec_pax.c 2010-12-31 14:46:53.000000000 -0500
12330 @@ -0,0 +1,36 @@
12331 +#include <linux/kernel.h>
12332 +#include <linux/sched.h>
12333 @@ -44260,9 +44372,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_pax.c linux-2.6.32.28/grsecurity/grs
12334 +#endif
12335 + return;
12336 +}
12337 -diff -urNp linux-2.6.32.28/grsecurity/grsec_ptrace.c linux-2.6.32.28/grsecurity/grsec_ptrace.c
12338 ---- linux-2.6.32.28/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
12339 -+++ linux-2.6.32.28/grsecurity/grsec_ptrace.c 2010-12-31 14:46:53.000000000 -0500
12340 +diff -urNp linux-2.6.32.29/grsecurity/grsec_ptrace.c linux-2.6.32.29/grsecurity/grsec_ptrace.c
12341 +--- linux-2.6.32.29/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
12342 ++++ linux-2.6.32.29/grsecurity/grsec_ptrace.c 2010-12-31 14:46:53.000000000 -0500
12343 @@ -0,0 +1,14 @@
12344 +#include <linux/kernel.h>
12345 +#include <linux/sched.h>
12346 @@ -44278,9 +44390,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_ptrace.c linux-2.6.32.28/grsecurity/
12347 +#endif
12348 + return;
12349 +}
12350 -diff -urNp linux-2.6.32.28/grsecurity/grsec_sig.c linux-2.6.32.28/grsecurity/grsec_sig.c
12351 ---- linux-2.6.32.28/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
12352 -+++ linux-2.6.32.28/grsecurity/grsec_sig.c 2010-12-31 14:46:53.000000000 -0500
12353 +diff -urNp linux-2.6.32.29/grsecurity/grsec_sig.c linux-2.6.32.29/grsecurity/grsec_sig.c
12354 +--- linux-2.6.32.29/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
12355 ++++ linux-2.6.32.29/grsecurity/grsec_sig.c 2010-12-31 14:46:53.000000000 -0500
12356 @@ -0,0 +1,65 @@
12357 +#include <linux/kernel.h>
12358 +#include <linux/sched.h>
12359 @@ -44347,9 +44459,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_sig.c linux-2.6.32.28/grsecurity/grs
12360 + return;
12361 +}
12362 +
12363 -diff -urNp linux-2.6.32.28/grsecurity/grsec_sock.c linux-2.6.32.28/grsecurity/grsec_sock.c
12364 ---- linux-2.6.32.28/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
12365 -+++ linux-2.6.32.28/grsecurity/grsec_sock.c 2010-12-31 14:46:53.000000000 -0500
12366 +diff -urNp linux-2.6.32.29/grsecurity/grsec_sock.c linux-2.6.32.29/grsecurity/grsec_sock.c
12367 +--- linux-2.6.32.29/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
12368 ++++ linux-2.6.32.29/grsecurity/grsec_sock.c 2010-12-31 14:46:53.000000000 -0500
12369 @@ -0,0 +1,275 @@
12370 +#include <linux/kernel.h>
12371 +#include <linux/module.h>
12372 @@ -44626,9 +44738,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_sock.c linux-2.6.32.28/grsecurity/gr
12373 + return current_cap();
12374 +#endif
12375 +}
12376 -diff -urNp linux-2.6.32.28/grsecurity/grsec_sysctl.c linux-2.6.32.28/grsecurity/grsec_sysctl.c
12377 ---- linux-2.6.32.28/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
12378 -+++ linux-2.6.32.28/grsecurity/grsec_sysctl.c 2010-12-31 14:46:53.000000000 -0500
12379 +diff -urNp linux-2.6.32.29/grsecurity/grsec_sysctl.c linux-2.6.32.29/grsecurity/grsec_sysctl.c
12380 +--- linux-2.6.32.29/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
12381 ++++ linux-2.6.32.29/grsecurity/grsec_sysctl.c 2010-12-31 14:46:53.000000000 -0500
12382 @@ -0,0 +1,479 @@
12383 +#include <linux/kernel.h>
12384 +#include <linux/sched.h>
12385 @@ -45109,9 +45221,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_sysctl.c linux-2.6.32.28/grsecurity/
12386 + { .ctl_name = 0 }
12387 +};
12388 +#endif
12389 -diff -urNp linux-2.6.32.28/grsecurity/grsec_time.c linux-2.6.32.28/grsecurity/grsec_time.c
12390 ---- linux-2.6.32.28/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
12391 -+++ linux-2.6.32.28/grsecurity/grsec_time.c 2011-01-05 19:57:32.000000000 -0500
12392 +diff -urNp linux-2.6.32.29/grsecurity/grsec_time.c linux-2.6.32.29/grsecurity/grsec_time.c
12393 +--- linux-2.6.32.29/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
12394 ++++ linux-2.6.32.29/grsecurity/grsec_time.c 2011-01-05 19:57:32.000000000 -0500
12395 @@ -0,0 +1,16 @@
12396 +#include <linux/kernel.h>
12397 +#include <linux/sched.h>
12398 @@ -45129,9 +45241,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_time.c linux-2.6.32.28/grsecurity/gr
12399 +}
12400 +
12401 +EXPORT_SYMBOL(gr_log_timechange);
12402 -diff -urNp linux-2.6.32.28/grsecurity/grsec_tpe.c linux-2.6.32.28/grsecurity/grsec_tpe.c
12403 ---- linux-2.6.32.28/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
12404 -+++ linux-2.6.32.28/grsecurity/grsec_tpe.c 2010-12-31 14:46:53.000000000 -0500
12405 +diff -urNp linux-2.6.32.29/grsecurity/grsec_tpe.c linux-2.6.32.29/grsecurity/grsec_tpe.c
12406 +--- linux-2.6.32.29/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
12407 ++++ linux-2.6.32.29/grsecurity/grsec_tpe.c 2010-12-31 14:46:53.000000000 -0500
12408 @@ -0,0 +1,39 @@
12409 +#include <linux/kernel.h>
12410 +#include <linux/sched.h>
12411 @@ -45172,9 +45284,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsec_tpe.c linux-2.6.32.28/grsecurity/grs
12412 +#endif
12413 + return 1;
12414 +}
12415 -diff -urNp linux-2.6.32.28/grsecurity/grsum.c linux-2.6.32.28/grsecurity/grsum.c
12416 ---- linux-2.6.32.28/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
12417 -+++ linux-2.6.32.28/grsecurity/grsum.c 2010-12-31 14:46:53.000000000 -0500
12418 +diff -urNp linux-2.6.32.29/grsecurity/grsum.c linux-2.6.32.29/grsecurity/grsum.c
12419 +--- linux-2.6.32.29/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
12420 ++++ linux-2.6.32.29/grsecurity/grsum.c 2010-12-31 14:46:53.000000000 -0500
12421 @@ -0,0 +1,61 @@
12422 +#include <linux/err.h>
12423 +#include <linux/kernel.h>
12424 @@ -45237,9 +45349,9 @@ diff -urNp linux-2.6.32.28/grsecurity/grsum.c linux-2.6.32.28/grsecurity/grsum.c
12425 +
12426 + return retval;
12427 +}
12428 -diff -urNp linux-2.6.32.28/grsecurity/Kconfig linux-2.6.32.28/grsecurity/Kconfig
12429 ---- linux-2.6.32.28/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
12430 -+++ linux-2.6.32.28/grsecurity/Kconfig 2010-12-31 14:46:53.000000000 -0500
12431 +diff -urNp linux-2.6.32.29/grsecurity/Kconfig linux-2.6.32.29/grsecurity/Kconfig
12432 +--- linux-2.6.32.29/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
12433 ++++ linux-2.6.32.29/grsecurity/Kconfig 2010-12-31 14:46:53.000000000 -0500
12434 @@ -0,0 +1,1000 @@
12435 +#
12436 +# grecurity configuration
12437 @@ -46241,9 +46353,9 @@ diff -urNp linux-2.6.32.28/grsecurity/Kconfig linux-2.6.32.28/grsecurity/Kconfig
12438 +endmenu
12439 +
12440 +endmenu
12441 -diff -urNp linux-2.6.32.28/grsecurity/Makefile linux-2.6.32.28/grsecurity/Makefile
12442 ---- linux-2.6.32.28/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
12443 -+++ linux-2.6.32.28/grsecurity/Makefile 2010-12-31 14:46:53.000000000 -0500
12444 +diff -urNp linux-2.6.32.29/grsecurity/Makefile linux-2.6.32.29/grsecurity/Makefile
12445 +--- linux-2.6.32.29/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
12446 ++++ linux-2.6.32.29/grsecurity/Makefile 2010-12-31 14:46:53.000000000 -0500
12447 @@ -0,0 +1,29 @@
12448 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
12449 +# during 2001-2009 it has been completely redesigned by Brad Spengler
12450 @@ -46274,9 +46386,9 @@ diff -urNp linux-2.6.32.28/grsecurity/Makefile linux-2.6.32.28/grsecurity/Makefi
12451 + @-chmod -f 700 .
12452 + @echo ' grsec: protected kernel image paths'
12453 +endif
12454 -diff -urNp linux-2.6.32.28/include/acpi/acoutput.h linux-2.6.32.28/include/acpi/acoutput.h
12455 ---- linux-2.6.32.28/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
12456 -+++ linux-2.6.32.28/include/acpi/acoutput.h 2010-12-31 14:46:53.000000000 -0500
12457 +diff -urNp linux-2.6.32.29/include/acpi/acoutput.h linux-2.6.32.29/include/acpi/acoutput.h
12458 +--- linux-2.6.32.29/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
12459 ++++ linux-2.6.32.29/include/acpi/acoutput.h 2010-12-31 14:46:53.000000000 -0500
12460 @@ -264,8 +264,8 @@
12461 * leaving no executable debug code!
12462 */
12463 @@ -46288,9 +46400,9 @@ diff -urNp linux-2.6.32.28/include/acpi/acoutput.h linux-2.6.32.28/include/acpi/
12464
12465 #endif /* ACPI_DEBUG_OUTPUT */
12466
12467 -diff -urNp linux-2.6.32.28/include/acpi/acpi_drivers.h linux-2.6.32.28/include/acpi/acpi_drivers.h
12468 ---- linux-2.6.32.28/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
12469 -+++ linux-2.6.32.28/include/acpi/acpi_drivers.h 2010-12-31 14:46:53.000000000 -0500
12470 +diff -urNp linux-2.6.32.29/include/acpi/acpi_drivers.h linux-2.6.32.29/include/acpi/acpi_drivers.h
12471 +--- linux-2.6.32.29/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
12472 ++++ linux-2.6.32.29/include/acpi/acpi_drivers.h 2010-12-31 14:46:53.000000000 -0500
12473 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
12474 Dock Station
12475 -------------------------------------------------------------------------- */
12476 @@ -46320,9 +46432,9 @@ diff -urNp linux-2.6.32.28/include/acpi/acpi_drivers.h linux-2.6.32.28/include/a
12477 void *context)
12478 {
12479 return -ENODEV;
12480 -diff -urNp linux-2.6.32.28/include/asm-generic/atomic-long.h linux-2.6.32.28/include/asm-generic/atomic-long.h
12481 ---- linux-2.6.32.28/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
12482 -+++ linux-2.6.32.28/include/asm-generic/atomic-long.h 2010-12-31 14:46:53.000000000 -0500
12483 +diff -urNp linux-2.6.32.29/include/asm-generic/atomic-long.h linux-2.6.32.29/include/asm-generic/atomic-long.h
12484 +--- linux-2.6.32.29/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
12485 ++++ linux-2.6.32.29/include/asm-generic/atomic-long.h 2010-12-31 14:46:53.000000000 -0500
12486 @@ -22,6 +22,12 @@
12487
12488 typedef atomic64_t atomic_long_t;
12489 @@ -46579,9 +46691,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/atomic-long.h linux-2.6.32.28/inc
12490 +#endif
12491 +
12492 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
12493 -diff -urNp linux-2.6.32.28/include/asm-generic/dma-mapping-common.h linux-2.6.32.28/include/asm-generic/dma-mapping-common.h
12494 ---- linux-2.6.32.28/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
12495 -+++ linux-2.6.32.28/include/asm-generic/dma-mapping-common.h 2010-12-31 14:46:53.000000000 -0500
12496 +diff -urNp linux-2.6.32.29/include/asm-generic/dma-mapping-common.h linux-2.6.32.29/include/asm-generic/dma-mapping-common.h
12497 +--- linux-2.6.32.29/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
12498 ++++ linux-2.6.32.29/include/asm-generic/dma-mapping-common.h 2010-12-31 14:46:53.000000000 -0500
12499 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
12500 enum dma_data_direction dir,
12501 struct dma_attrs *attrs)
12502 @@ -46690,9 +46802,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/dma-mapping-common.h linux-2.6.32
12503
12504 BUG_ON(!valid_dma_direction(dir));
12505 if (ops->sync_sg_for_device)
12506 -diff -urNp linux-2.6.32.28/include/asm-generic/futex.h linux-2.6.32.28/include/asm-generic/futex.h
12507 ---- linux-2.6.32.28/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
12508 -+++ linux-2.6.32.28/include/asm-generic/futex.h 2010-12-31 14:46:53.000000000 -0500
12509 +diff -urNp linux-2.6.32.29/include/asm-generic/futex.h linux-2.6.32.29/include/asm-generic/futex.h
12510 +--- linux-2.6.32.29/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
12511 ++++ linux-2.6.32.29/include/asm-generic/futex.h 2010-12-31 14:46:53.000000000 -0500
12512 @@ -6,7 +6,7 @@
12513 #include <asm/errno.h>
12514
12515 @@ -46711,9 +46823,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/futex.h linux-2.6.32.28/include/a
12516 {
12517 return -ENOSYS;
12518 }
12519 -diff -urNp linux-2.6.32.28/include/asm-generic/int-l64.h linux-2.6.32.28/include/asm-generic/int-l64.h
12520 ---- linux-2.6.32.28/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
12521 -+++ linux-2.6.32.28/include/asm-generic/int-l64.h 2010-12-31 14:46:53.000000000 -0500
12522 +diff -urNp linux-2.6.32.29/include/asm-generic/int-l64.h linux-2.6.32.29/include/asm-generic/int-l64.h
12523 +--- linux-2.6.32.29/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
12524 ++++ linux-2.6.32.29/include/asm-generic/int-l64.h 2010-12-31 14:46:53.000000000 -0500
12525 @@ -46,6 +46,8 @@ typedef unsigned int u32;
12526 typedef signed long s64;
12527 typedef unsigned long u64;
12528 @@ -46723,9 +46835,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/int-l64.h linux-2.6.32.28/include
12529 #define S8_C(x) x
12530 #define U8_C(x) x ## U
12531 #define S16_C(x) x
12532 -diff -urNp linux-2.6.32.28/include/asm-generic/int-ll64.h linux-2.6.32.28/include/asm-generic/int-ll64.h
12533 ---- linux-2.6.32.28/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
12534 -+++ linux-2.6.32.28/include/asm-generic/int-ll64.h 2010-12-31 14:46:53.000000000 -0500
12535 +diff -urNp linux-2.6.32.29/include/asm-generic/int-ll64.h linux-2.6.32.29/include/asm-generic/int-ll64.h
12536 +--- linux-2.6.32.29/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
12537 ++++ linux-2.6.32.29/include/asm-generic/int-ll64.h 2010-12-31 14:46:53.000000000 -0500
12538 @@ -51,6 +51,8 @@ typedef unsigned int u32;
12539 typedef signed long long s64;
12540 typedef unsigned long long u64;
12541 @@ -46735,9 +46847,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/int-ll64.h linux-2.6.32.28/includ
12542 #define S8_C(x) x
12543 #define U8_C(x) x ## U
12544 #define S16_C(x) x
12545 -diff -urNp linux-2.6.32.28/include/asm-generic/kmap_types.h linux-2.6.32.28/include/asm-generic/kmap_types.h
12546 ---- linux-2.6.32.28/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
12547 -+++ linux-2.6.32.28/include/asm-generic/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
12548 +diff -urNp linux-2.6.32.29/include/asm-generic/kmap_types.h linux-2.6.32.29/include/asm-generic/kmap_types.h
12549 +--- linux-2.6.32.29/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
12550 ++++ linux-2.6.32.29/include/asm-generic/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
12551 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
12552 KMAP_D(16) KM_IRQ_PTE,
12553 KMAP_D(17) KM_NMI,
12554 @@ -46748,9 +46860,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/kmap_types.h linux-2.6.32.28/incl
12555 };
12556
12557 #undef KMAP_D
12558 -diff -urNp linux-2.6.32.28/include/asm-generic/pgtable.h linux-2.6.32.28/include/asm-generic/pgtable.h
12559 ---- linux-2.6.32.28/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
12560 -+++ linux-2.6.32.28/include/asm-generic/pgtable.h 2010-12-31 14:46:53.000000000 -0500
12561 +diff -urNp linux-2.6.32.29/include/asm-generic/pgtable.h linux-2.6.32.29/include/asm-generic/pgtable.h
12562 +--- linux-2.6.32.29/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
12563 ++++ linux-2.6.32.29/include/asm-generic/pgtable.h 2010-12-31 14:46:53.000000000 -0500
12564 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
12565 unsigned long size);
12566 #endif
12567 @@ -46766,9 +46878,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/pgtable.h linux-2.6.32.28/include
12568 #endif /* !__ASSEMBLY__ */
12569
12570 #endif /* _ASM_GENERIC_PGTABLE_H */
12571 -diff -urNp linux-2.6.32.28/include/asm-generic/pgtable-nopmd.h linux-2.6.32.28/include/asm-generic/pgtable-nopmd.h
12572 ---- linux-2.6.32.28/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
12573 -+++ linux-2.6.32.28/include/asm-generic/pgtable-nopmd.h 2010-12-31 14:46:53.000000000 -0500
12574 +diff -urNp linux-2.6.32.29/include/asm-generic/pgtable-nopmd.h linux-2.6.32.29/include/asm-generic/pgtable-nopmd.h
12575 +--- linux-2.6.32.29/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
12576 ++++ linux-2.6.32.29/include/asm-generic/pgtable-nopmd.h 2010-12-31 14:46:53.000000000 -0500
12577 @@ -1,14 +1,19 @@
12578 #ifndef _PGTABLE_NOPMD_H
12579 #define _PGTABLE_NOPMD_H
12580 @@ -46805,9 +46917,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/pgtable-nopmd.h linux-2.6.32.28/i
12581 /*
12582 * The "pud_xxx()" functions here are trivial for a folded two-level
12583 * setup: the pmd is never bad, and a pmd always exists (as it's folded
12584 -diff -urNp linux-2.6.32.28/include/asm-generic/pgtable-nopud.h linux-2.6.32.28/include/asm-generic/pgtable-nopud.h
12585 ---- linux-2.6.32.28/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
12586 -+++ linux-2.6.32.28/include/asm-generic/pgtable-nopud.h 2010-12-31 14:46:53.000000000 -0500
12587 +diff -urNp linux-2.6.32.29/include/asm-generic/pgtable-nopud.h linux-2.6.32.29/include/asm-generic/pgtable-nopud.h
12588 +--- linux-2.6.32.29/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
12589 ++++ linux-2.6.32.29/include/asm-generic/pgtable-nopud.h 2010-12-31 14:46:53.000000000 -0500
12590 @@ -1,10 +1,15 @@
12591 #ifndef _PGTABLE_NOPUD_H
12592 #define _PGTABLE_NOPUD_H
12593 @@ -46838,9 +46950,9 @@ diff -urNp linux-2.6.32.28/include/asm-generic/pgtable-nopud.h linux-2.6.32.28/i
12594 /*
12595 * The "pgd_xxx()" functions here are trivial for a folded two-level
12596 * setup: the pud is never bad, and a pud always exists (as it's folded
12597 -diff -urNp linux-2.6.32.28/include/asm-generic/vmlinux.lds.h linux-2.6.32.28/include/asm-generic/vmlinux.lds.h
12598 ---- linux-2.6.32.28/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
12599 -+++ linux-2.6.32.28/include/asm-generic/vmlinux.lds.h 2010-12-31 14:46:53.000000000 -0500
12600 +diff -urNp linux-2.6.32.29/include/asm-generic/vmlinux.lds.h linux-2.6.32.29/include/asm-generic/vmlinux.lds.h
12601 +--- linux-2.6.32.29/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
12602 ++++ linux-2.6.32.29/include/asm-generic/vmlinux.lds.h 2010-12-31 14:46:53.000000000 -0500
12603 @@ -199,6 +199,7 @@
12604 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
12605 VMLINUX_SYMBOL(__start_rodata) = .; \
12606 @@ -46879,10 +46991,10 @@ diff -urNp linux-2.6.32.28/include/asm-generic/vmlinux.lds.h linux-2.6.32.28/inc
12607
12608 /**
12609 * PERCPU - define output section for percpu area, simple version
12610 -diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/drm_pciids.h
12611 ---- linux-2.6.32.28/include/drm/drm_pciids.h 2010-10-31 16:44:11.000000000 -0400
12612 -+++ linux-2.6.32.28/include/drm/drm_pciids.h 2010-12-31 14:46:53.000000000 -0500
12613 -@@ -377,7 +377,7 @@
12614 +diff -urNp linux-2.6.32.29/include/drm/drm_pciids.h linux-2.6.32.29/include/drm/drm_pciids.h
12615 +--- linux-2.6.32.29/include/drm/drm_pciids.h 2011-02-22 15:56:54.000000000 -0500
12616 ++++ linux-2.6.32.29/include/drm/drm_pciids.h 2011-02-22 15:57:24.000000000 -0500
12617 +@@ -376,7 +376,7 @@
12618 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
12619 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
12620 {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
12621 @@ -46891,7 +47003,7 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12622
12623 #define r128_PCI_IDS \
12624 {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12625 -@@ -417,14 +417,14 @@
12626 +@@ -416,14 +416,14 @@
12627 {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12628 {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12629 {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12630 @@ -46908,7 +47020,7 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12631
12632 #define mach64_PCI_IDS \
12633 {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12634 -@@ -447,7 +447,7 @@
12635 +@@ -446,7 +446,7 @@
12636 {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12637 {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12638 {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12639 @@ -46917,7 +47029,7 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12640
12641 #define sisdrv_PCI_IDS \
12642 {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12643 -@@ -458,7 +458,7 @@
12644 +@@ -457,7 +457,7 @@
12645 {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12646 {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
12647 {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
12648 @@ -46926,7 +47038,7 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12649
12650 #define tdfx_PCI_IDS \
12651 {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12652 -@@ -467,7 +467,7 @@
12653 +@@ -466,7 +466,7 @@
12654 {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12655 {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12656 {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12657 @@ -46935,7 +47047,7 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12658
12659 #define viadrv_PCI_IDS \
12660 {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12661 -@@ -479,14 +479,14 @@
12662 +@@ -478,14 +478,14 @@
12663 {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12664 {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
12665 {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
12666 @@ -46952,7 +47064,7 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12667
12668 #define i830_PCI_IDS \
12669 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12670 -@@ -494,11 +494,11 @@
12671 +@@ -493,11 +493,11 @@
12672 {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12673 {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12674 {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
12675 @@ -46966,7 +47078,7 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12676
12677 #define savage_PCI_IDS \
12678 {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
12679 -@@ -524,10 +524,10 @@
12680 +@@ -523,10 +523,10 @@
12681 {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
12682 {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
12683 {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
12684 @@ -46979,15 +47091,15 @@ diff -urNp linux-2.6.32.28/include/drm/drm_pciids.h linux-2.6.32.28/include/drm/
12685
12686 #define i915_PCI_IDS \
12687 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
12688 -@@ -560,4 +560,4 @@
12689 +@@ -559,4 +559,4 @@
12690 {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
12691 {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
12692 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
12693 - {0, 0, 0}
12694 + {0, 0, 0, 0, 0, 0}
12695 -diff -urNp linux-2.6.32.28/include/drm/drmP.h linux-2.6.32.28/include/drm/drmP.h
12696 ---- linux-2.6.32.28/include/drm/drmP.h 2010-08-13 16:24:37.000000000 -0400
12697 -+++ linux-2.6.32.28/include/drm/drmP.h 2011-01-24 18:05:37.000000000 -0500
12698 +diff -urNp linux-2.6.32.29/include/drm/drmP.h linux-2.6.32.29/include/drm/drmP.h
12699 +--- linux-2.6.32.29/include/drm/drmP.h 2010-08-13 16:24:37.000000000 -0400
12700 ++++ linux-2.6.32.29/include/drm/drmP.h 2011-01-24 18:05:37.000000000 -0500
12701 @@ -71,6 +71,7 @@
12702 #include <linux/workqueue.h>
12703 #include <linux/poll.h>
12704 @@ -47038,9 +47150,9 @@ diff -urNp linux-2.6.32.28/include/drm/drmP.h linux-2.6.32.28/include/drm/drmP.h
12705 uint32_t gtt_total;
12706 uint32_t invalidate_domains; /* domains pending invalidation */
12707 uint32_t flush_domains; /* domains pending flush */
12708 -diff -urNp linux-2.6.32.28/include/linux/a.out.h linux-2.6.32.28/include/linux/a.out.h
12709 ---- linux-2.6.32.28/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
12710 -+++ linux-2.6.32.28/include/linux/a.out.h 2010-12-31 14:46:53.000000000 -0500
12711 +diff -urNp linux-2.6.32.29/include/linux/a.out.h linux-2.6.32.29/include/linux/a.out.h
12712 +--- linux-2.6.32.29/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
12713 ++++ linux-2.6.32.29/include/linux/a.out.h 2010-12-31 14:46:53.000000000 -0500
12714 @@ -39,6 +39,14 @@ enum machine_type {
12715 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
12716 };
12717 @@ -47056,9 +47168,9 @@ diff -urNp linux-2.6.32.28/include/linux/a.out.h linux-2.6.32.28/include/linux/a
12718 #if !defined (N_MAGIC)
12719 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
12720 #endif
12721 -diff -urNp linux-2.6.32.28/include/linux/atmdev.h linux-2.6.32.28/include/linux/atmdev.h
12722 ---- linux-2.6.32.28/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
12723 -+++ linux-2.6.32.28/include/linux/atmdev.h 2010-12-31 14:46:53.000000000 -0500
12724 +diff -urNp linux-2.6.32.29/include/linux/atmdev.h linux-2.6.32.29/include/linux/atmdev.h
12725 +--- linux-2.6.32.29/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
12726 ++++ linux-2.6.32.29/include/linux/atmdev.h 2010-12-31 14:46:53.000000000 -0500
12727 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
12728 #endif
12729
12730 @@ -47068,9 +47180,9 @@ diff -urNp linux-2.6.32.28/include/linux/atmdev.h linux-2.6.32.28/include/linux/
12731 __AAL_STAT_ITEMS
12732 #undef __HANDLE_ITEM
12733 };
12734 -diff -urNp linux-2.6.32.28/include/linux/backlight.h linux-2.6.32.28/include/linux/backlight.h
12735 ---- linux-2.6.32.28/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
12736 -+++ linux-2.6.32.28/include/linux/backlight.h 2010-12-31 14:46:53.000000000 -0500
12737 +diff -urNp linux-2.6.32.29/include/linux/backlight.h linux-2.6.32.29/include/linux/backlight.h
12738 +--- linux-2.6.32.29/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
12739 ++++ linux-2.6.32.29/include/linux/backlight.h 2010-12-31 14:46:53.000000000 -0500
12740 @@ -36,18 +36,18 @@ struct backlight_device;
12741 struct fb_info;
12742
12743 @@ -47112,9 +47224,9 @@ diff -urNp linux-2.6.32.28/include/linux/backlight.h linux-2.6.32.28/include/lin
12744 extern void backlight_device_unregister(struct backlight_device *bd);
12745 extern void backlight_force_update(struct backlight_device *bd,
12746 enum backlight_update_reason reason);
12747 -diff -urNp linux-2.6.32.28/include/linux/binfmts.h linux-2.6.32.28/include/linux/binfmts.h
12748 ---- linux-2.6.32.28/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
12749 -+++ linux-2.6.32.28/include/linux/binfmts.h 2010-12-31 14:46:53.000000000 -0500
12750 +diff -urNp linux-2.6.32.29/include/linux/binfmts.h linux-2.6.32.29/include/linux/binfmts.h
12751 +--- linux-2.6.32.29/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
12752 ++++ linux-2.6.32.29/include/linux/binfmts.h 2010-12-31 14:46:53.000000000 -0500
12753 @@ -29,6 +29,7 @@ struct linux_binprm{
12754 char buf[BINPRM_BUF_SIZE];
12755 #ifdef CONFIG_MMU
12756 @@ -47142,9 +47254,9 @@ diff -urNp linux-2.6.32.28/include/linux/binfmts.h linux-2.6.32.28/include/linux
12757 unsigned long min_coredump; /* minimal dump size */
12758 int hasvdso;
12759 };
12760 -diff -urNp linux-2.6.32.28/include/linux/blkdev.h linux-2.6.32.28/include/linux/blkdev.h
12761 ---- linux-2.6.32.28/include/linux/blkdev.h 2011-01-11 23:55:35.000000000 -0500
12762 -+++ linux-2.6.32.28/include/linux/blkdev.h 2011-01-11 23:56:03.000000000 -0500
12763 +diff -urNp linux-2.6.32.29/include/linux/blkdev.h linux-2.6.32.29/include/linux/blkdev.h
12764 +--- linux-2.6.32.29/include/linux/blkdev.h 2011-01-11 23:55:35.000000000 -0500
12765 ++++ linux-2.6.32.29/include/linux/blkdev.h 2011-01-11 23:56:03.000000000 -0500
12766 @@ -1265,19 +1265,19 @@ static inline int blk_integrity_rq(struc
12767 #endif /* CONFIG_BLK_DEV_INTEGRITY */
12768
12769 @@ -47176,9 +47288,9 @@ diff -urNp linux-2.6.32.28/include/linux/blkdev.h linux-2.6.32.28/include/linux/
12770 };
12771
12772 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
12773 -diff -urNp linux-2.6.32.28/include/linux/byteorder/little_endian.h linux-2.6.32.28/include/linux/byteorder/little_endian.h
12774 ---- linux-2.6.32.28/include/linux/byteorder/little_endian.h 2010-08-13 16:24:37.000000000 -0400
12775 -+++ linux-2.6.32.28/include/linux/byteorder/little_endian.h 2010-12-31 14:46:53.000000000 -0500
12776 +diff -urNp linux-2.6.32.29/include/linux/byteorder/little_endian.h linux-2.6.32.29/include/linux/byteorder/little_endian.h
12777 +--- linux-2.6.32.29/include/linux/byteorder/little_endian.h 2010-08-13 16:24:37.000000000 -0400
12778 ++++ linux-2.6.32.29/include/linux/byteorder/little_endian.h 2010-12-31 14:46:53.000000000 -0500
12779 @@ -42,51 +42,51 @@
12780
12781 static inline __le64 __cpu_to_le64p(const __u64 *p)
12782 @@ -47243,9 +47355,9 @@ diff -urNp linux-2.6.32.28/include/linux/byteorder/little_endian.h linux-2.6.32.
12783 }
12784 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
12785 #define __le64_to_cpus(x) do { (void)(x); } while (0)
12786 -diff -urNp linux-2.6.32.28/include/linux/cache.h linux-2.6.32.28/include/linux/cache.h
12787 ---- linux-2.6.32.28/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
12788 -+++ linux-2.6.32.28/include/linux/cache.h 2010-12-31 14:46:53.000000000 -0500
12789 +diff -urNp linux-2.6.32.29/include/linux/cache.h linux-2.6.32.29/include/linux/cache.h
12790 +--- linux-2.6.32.29/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
12791 ++++ linux-2.6.32.29/include/linux/cache.h 2010-12-31 14:46:53.000000000 -0500
12792 @@ -16,6 +16,10 @@
12793 #define __read_mostly
12794 #endif
12795 @@ -47257,9 +47369,9 @@ diff -urNp linux-2.6.32.28/include/linux/cache.h linux-2.6.32.28/include/linux/c
12796 #ifndef ____cacheline_aligned
12797 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
12798 #endif
12799 -diff -urNp linux-2.6.32.28/include/linux/capability.h linux-2.6.32.28/include/linux/capability.h
12800 ---- linux-2.6.32.28/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
12801 -+++ linux-2.6.32.28/include/linux/capability.h 2010-12-31 14:46:53.000000000 -0500
12802 +diff -urNp linux-2.6.32.29/include/linux/capability.h linux-2.6.32.29/include/linux/capability.h
12803 +--- linux-2.6.32.29/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
12804 ++++ linux-2.6.32.29/include/linux/capability.h 2010-12-31 14:46:53.000000000 -0500
12805 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
12806 (security_real_capable_noaudit((t), (cap)) == 0)
12807
12808 @@ -47268,9 +47380,9 @@ diff -urNp linux-2.6.32.28/include/linux/capability.h linux-2.6.32.28/include/li
12809
12810 /* audit system wants to get cap info from files as well */
12811 struct dentry;
12812 -diff -urNp linux-2.6.32.28/include/linux/compiler-gcc4.h linux-2.6.32.28/include/linux/compiler-gcc4.h
12813 ---- linux-2.6.32.28/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
12814 -+++ linux-2.6.32.28/include/linux/compiler-gcc4.h 2010-12-31 14:46:53.000000000 -0500
12815 +diff -urNp linux-2.6.32.29/include/linux/compiler-gcc4.h linux-2.6.32.29/include/linux/compiler-gcc4.h
12816 +--- linux-2.6.32.29/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
12817 ++++ linux-2.6.32.29/include/linux/compiler-gcc4.h 2010-12-31 14:46:53.000000000 -0500
12818 @@ -36,4 +36,8 @@
12819 the kernel context */
12820 #define __cold __attribute__((__cold__))
12821 @@ -47280,9 +47392,9 @@ diff -urNp linux-2.6.32.28/include/linux/compiler-gcc4.h linux-2.6.32.28/include
12822 +#define __bos0(ptr) __bos((ptr), 0)
12823 +#define __bos1(ptr) __bos((ptr), 1)
12824 #endif
12825 -diff -urNp linux-2.6.32.28/include/linux/compiler.h linux-2.6.32.28/include/linux/compiler.h
12826 ---- linux-2.6.32.28/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
12827 -+++ linux-2.6.32.28/include/linux/compiler.h 2010-12-31 14:57:30.000000000 -0500
12828 +diff -urNp linux-2.6.32.29/include/linux/compiler.h linux-2.6.32.29/include/linux/compiler.h
12829 +--- linux-2.6.32.29/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
12830 ++++ linux-2.6.32.29/include/linux/compiler.h 2010-12-31 14:57:30.000000000 -0500
12831 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
12832 #define __cold
12833 #endif
12834 @@ -47315,9 +47427,9 @@ diff -urNp linux-2.6.32.28/include/linux/compiler.h linux-2.6.32.28/include/linu
12835 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
12836
12837 #endif /* __LINUX_COMPILER_H */
12838 -diff -urNp linux-2.6.32.28/include/linux/decompress/mm.h linux-2.6.32.28/include/linux/decompress/mm.h
12839 ---- linux-2.6.32.28/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
12840 -+++ linux-2.6.32.28/include/linux/decompress/mm.h 2010-12-31 14:46:53.000000000 -0500
12841 +diff -urNp linux-2.6.32.29/include/linux/decompress/mm.h linux-2.6.32.29/include/linux/decompress/mm.h
12842 +--- linux-2.6.32.29/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
12843 ++++ linux-2.6.32.29/include/linux/decompress/mm.h 2010-12-31 14:46:53.000000000 -0500
12844 @@ -78,7 +78,7 @@ static void free(void *where)
12845 * warnings when not needed (indeed large_malloc / large_free are not
12846 * needed by inflate */
12847 @@ -47327,9 +47439,9 @@ diff -urNp linux-2.6.32.28/include/linux/decompress/mm.h linux-2.6.32.28/include
12848 #define free(a) kfree(a)
12849
12850 #define large_malloc(a) vmalloc(a)
12851 -diff -urNp linux-2.6.32.28/include/linux/dma-mapping.h linux-2.6.32.28/include/linux/dma-mapping.h
12852 ---- linux-2.6.32.28/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
12853 -+++ linux-2.6.32.28/include/linux/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
12854 +diff -urNp linux-2.6.32.29/include/linux/dma-mapping.h linux-2.6.32.29/include/linux/dma-mapping.h
12855 +--- linux-2.6.32.29/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
12856 ++++ linux-2.6.32.29/include/linux/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
12857 @@ -16,50 +16,50 @@ enum dma_data_direction {
12858 };
12859
12860 @@ -47396,9 +47508,9 @@ diff -urNp linux-2.6.32.28/include/linux/dma-mapping.h linux-2.6.32.28/include/l
12861 };
12862
12863 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
12864 -diff -urNp linux-2.6.32.28/include/linux/dst.h linux-2.6.32.28/include/linux/dst.h
12865 ---- linux-2.6.32.28/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
12866 -+++ linux-2.6.32.28/include/linux/dst.h 2010-12-31 14:46:53.000000000 -0500
12867 +diff -urNp linux-2.6.32.29/include/linux/dst.h linux-2.6.32.29/include/linux/dst.h
12868 +--- linux-2.6.32.29/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
12869 ++++ linux-2.6.32.29/include/linux/dst.h 2010-12-31 14:46:53.000000000 -0500
12870 @@ -380,7 +380,7 @@ struct dst_node
12871 struct thread_pool *pool;
12872
12873 @@ -47408,9 +47520,9 @@ diff -urNp linux-2.6.32.28/include/linux/dst.h linux-2.6.32.28/include/linux/dst
12874
12875 /*
12876 * How frequently and how many times transaction
12877 -diff -urNp linux-2.6.32.28/include/linux/elf.h linux-2.6.32.28/include/linux/elf.h
12878 ---- linux-2.6.32.28/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
12879 -+++ linux-2.6.32.28/include/linux/elf.h 2010-12-31 14:46:53.000000000 -0500
12880 +diff -urNp linux-2.6.32.29/include/linux/elf.h linux-2.6.32.29/include/linux/elf.h
12881 +--- linux-2.6.32.29/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
12882 ++++ linux-2.6.32.29/include/linux/elf.h 2010-12-31 14:46:53.000000000 -0500
12883 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
12884 #define PT_GNU_EH_FRAME 0x6474e550
12885
12886 @@ -47483,9 +47595,9 @@ diff -urNp linux-2.6.32.28/include/linux/elf.h linux-2.6.32.28/include/linux/elf
12887
12888 #endif
12889
12890 -diff -urNp linux-2.6.32.28/include/linux/fs.h linux-2.6.32.28/include/linux/fs.h
12891 ---- linux-2.6.32.28/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
12892 -+++ linux-2.6.32.28/include/linux/fs.h 2011-01-17 02:51:02.000000000 -0500
12893 +diff -urNp linux-2.6.32.29/include/linux/fs.h linux-2.6.32.29/include/linux/fs.h
12894 +--- linux-2.6.32.29/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
12895 ++++ linux-2.6.32.29/include/linux/fs.h 2011-01-17 02:51:02.000000000 -0500
12896 @@ -90,6 +90,11 @@ struct inodes_stat_t {
12897 /* Expect random access pattern */
12898 #define FMODE_RANDOM ((__force fmode_t)4096)
12899 @@ -47647,9 +47759,9 @@ diff -urNp linux-2.6.32.28/include/linux/fs.h linux-2.6.32.28/include/linux/fs.h
12900 };
12901
12902 /*
12903 -diff -urNp linux-2.6.32.28/include/linux/fs_struct.h linux-2.6.32.28/include/linux/fs_struct.h
12904 ---- linux-2.6.32.28/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
12905 -+++ linux-2.6.32.28/include/linux/fs_struct.h 2010-12-31 14:46:53.000000000 -0500
12906 +diff -urNp linux-2.6.32.29/include/linux/fs_struct.h linux-2.6.32.29/include/linux/fs_struct.h
12907 +--- linux-2.6.32.29/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
12908 ++++ linux-2.6.32.29/include/linux/fs_struct.h 2010-12-31 14:46:53.000000000 -0500
12909 @@ -4,7 +4,7 @@
12910 #include <linux/path.h>
12911
12912 @@ -47659,9 +47771,9 @@ diff -urNp linux-2.6.32.28/include/linux/fs_struct.h linux-2.6.32.28/include/lin
12913 rwlock_t lock;
12914 int umask;
12915 int in_exec;
12916 -diff -urNp linux-2.6.32.28/include/linux/genhd.h linux-2.6.32.28/include/linux/genhd.h
12917 ---- linux-2.6.32.28/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
12918 -+++ linux-2.6.32.28/include/linux/genhd.h 2010-12-31 14:46:53.000000000 -0500
12919 +diff -urNp linux-2.6.32.29/include/linux/genhd.h linux-2.6.32.29/include/linux/genhd.h
12920 +--- linux-2.6.32.29/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
12921 ++++ linux-2.6.32.29/include/linux/genhd.h 2010-12-31 14:46:53.000000000 -0500
12922 @@ -161,7 +161,7 @@ struct gendisk {
12923
12924 struct timer_rand_state *random;
12925 @@ -47671,9 +47783,9 @@ diff -urNp linux-2.6.32.28/include/linux/genhd.h linux-2.6.32.28/include/linux/g
12926 struct work_struct async_notify;
12927 #ifdef CONFIG_BLK_DEV_INTEGRITY
12928 struct blk_integrity *integrity;
12929 -diff -urNp linux-2.6.32.28/include/linux/gracl.h linux-2.6.32.28/include/linux/gracl.h
12930 ---- linux-2.6.32.28/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
12931 -+++ linux-2.6.32.28/include/linux/gracl.h 2010-12-31 14:46:53.000000000 -0500
12932 +diff -urNp linux-2.6.32.29/include/linux/gracl.h linux-2.6.32.29/include/linux/gracl.h
12933 +--- linux-2.6.32.29/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
12934 ++++ linux-2.6.32.29/include/linux/gracl.h 2010-12-31 14:46:53.000000000 -0500
12935 @@ -0,0 +1,317 @@
12936 +#ifndef GR_ACL_H
12937 +#define GR_ACL_H
12938 @@ -47992,9 +48104,9 @@ diff -urNp linux-2.6.32.28/include/linux/gracl.h linux-2.6.32.28/include/linux/g
12939 +
12940 +#endif
12941 +
12942 -diff -urNp linux-2.6.32.28/include/linux/gralloc.h linux-2.6.32.28/include/linux/gralloc.h
12943 ---- linux-2.6.32.28/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
12944 -+++ linux-2.6.32.28/include/linux/gralloc.h 2010-12-31 14:46:53.000000000 -0500
12945 +diff -urNp linux-2.6.32.29/include/linux/gralloc.h linux-2.6.32.29/include/linux/gralloc.h
12946 +--- linux-2.6.32.29/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
12947 ++++ linux-2.6.32.29/include/linux/gralloc.h 2010-12-31 14:46:53.000000000 -0500
12948 @@ -0,0 +1,9 @@
12949 +#ifndef __GRALLOC_H
12950 +#define __GRALLOC_H
12951 @@ -48005,9 +48117,9 @@ diff -urNp linux-2.6.32.28/include/linux/gralloc.h linux-2.6.32.28/include/linux
12952 +void *acl_alloc_num(unsigned long num, unsigned long len);
12953 +
12954 +#endif
12955 -diff -urNp linux-2.6.32.28/include/linux/grdefs.h linux-2.6.32.28/include/linux/grdefs.h
12956 ---- linux-2.6.32.28/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
12957 -+++ linux-2.6.32.28/include/linux/grdefs.h 2010-12-31 14:46:53.000000000 -0500
12958 +diff -urNp linux-2.6.32.29/include/linux/grdefs.h linux-2.6.32.29/include/linux/grdefs.h
12959 +--- linux-2.6.32.29/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
12960 ++++ linux-2.6.32.29/include/linux/grdefs.h 2010-12-31 14:46:53.000000000 -0500
12961 @@ -0,0 +1,137 @@
12962 +#ifndef GRDEFS_H
12963 +#define GRDEFS_H
12964 @@ -48146,9 +48258,9 @@ diff -urNp linux-2.6.32.28/include/linux/grdefs.h linux-2.6.32.28/include/linux/
12965 +};
12966 +
12967 +#endif
12968 -diff -urNp linux-2.6.32.28/include/linux/grinternal.h linux-2.6.32.28/include/linux/grinternal.h
12969 ---- linux-2.6.32.28/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
12970 -+++ linux-2.6.32.28/include/linux/grinternal.h 2010-12-31 14:46:53.000000000 -0500
12971 +diff -urNp linux-2.6.32.29/include/linux/grinternal.h linux-2.6.32.29/include/linux/grinternal.h
12972 +--- linux-2.6.32.29/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
12973 ++++ linux-2.6.32.29/include/linux/grinternal.h 2010-12-31 14:46:53.000000000 -0500
12974 @@ -0,0 +1,216 @@
12975 +#ifndef __GRINTERNAL_H
12976 +#define __GRINTERNAL_H
12977 @@ -48366,9 +48478,9 @@ diff -urNp linux-2.6.32.28/include/linux/grinternal.h linux-2.6.32.28/include/li
12978 +#endif
12979 +
12980 +#endif
12981 -diff -urNp linux-2.6.32.28/include/linux/grmsg.h linux-2.6.32.28/include/linux/grmsg.h
12982 ---- linux-2.6.32.28/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
12983 -+++ linux-2.6.32.28/include/linux/grmsg.h 2010-12-31 14:46:53.000000000 -0500
12984 +diff -urNp linux-2.6.32.29/include/linux/grmsg.h linux-2.6.32.29/include/linux/grmsg.h
12985 +--- linux-2.6.32.29/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
12986 ++++ linux-2.6.32.29/include/linux/grmsg.h 2010-12-31 14:46:53.000000000 -0500
12987 @@ -0,0 +1,111 @@
12988 +#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"
12989 +#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"
12990 @@ -48481,9 +48593,9 @@ diff -urNp linux-2.6.32.28/include/linux/grmsg.h linux-2.6.32.28/include/linux/g
12991 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
12992 +#define GR_VM86_MSG "denied use of vm86 by "
12993 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
12994 -diff -urNp linux-2.6.32.28/include/linux/grsecurity.h linux-2.6.32.28/include/linux/grsecurity.h
12995 ---- linux-2.6.32.28/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
12996 -+++ linux-2.6.32.28/include/linux/grsecurity.h 2011-01-11 23:11:11.000000000 -0500
12997 +diff -urNp linux-2.6.32.29/include/linux/grsecurity.h linux-2.6.32.29/include/linux/grsecurity.h
12998 +--- linux-2.6.32.29/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
12999 ++++ linux-2.6.32.29/include/linux/grsecurity.h 2011-01-11 23:11:11.000000000 -0500
13000 @@ -0,0 +1,214 @@
13001 +#ifndef GR_SECURITY_H
13002 +#define GR_SECURITY_H
13003 @@ -48699,9 +48811,9 @@ diff -urNp linux-2.6.32.28/include/linux/grsecurity.h linux-2.6.32.28/include/li
13004 +#endif
13005 +
13006 +#endif
13007 -diff -urNp linux-2.6.32.28/include/linux/hdpu_features.h linux-2.6.32.28/include/linux/hdpu_features.h
13008 ---- linux-2.6.32.28/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
13009 -+++ linux-2.6.32.28/include/linux/hdpu_features.h 2010-12-31 14:46:53.000000000 -0500
13010 +diff -urNp linux-2.6.32.29/include/linux/hdpu_features.h linux-2.6.32.29/include/linux/hdpu_features.h
13011 +--- linux-2.6.32.29/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
13012 ++++ linux-2.6.32.29/include/linux/hdpu_features.h 2010-12-31 14:46:53.000000000 -0500
13013 @@ -3,7 +3,7 @@
13014 struct cpustate_t {
13015 spinlock_t lock;
13016 @@ -48711,9 +48823,9 @@ diff -urNp linux-2.6.32.28/include/linux/hdpu_features.h linux-2.6.32.28/include
13017 unsigned char cached_val;
13018 int inited;
13019 unsigned long *set_addr;
13020 -diff -urNp linux-2.6.32.28/include/linux/highmem.h linux-2.6.32.28/include/linux/highmem.h
13021 ---- linux-2.6.32.28/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
13022 -+++ linux-2.6.32.28/include/linux/highmem.h 2010-12-31 14:46:53.000000000 -0500
13023 +diff -urNp linux-2.6.32.29/include/linux/highmem.h linux-2.6.32.29/include/linux/highmem.h
13024 +--- linux-2.6.32.29/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
13025 ++++ linux-2.6.32.29/include/linux/highmem.h 2010-12-31 14:46:53.000000000 -0500
13026 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct
13027 kunmap_atomic(kaddr, KM_USER0);
13028 }
13029 @@ -48733,9 +48845,9 @@ diff -urNp linux-2.6.32.28/include/linux/highmem.h linux-2.6.32.28/include/linux
13030 static inline void zero_user_segments(struct page *page,
13031 unsigned start1, unsigned end1,
13032 unsigned start2, unsigned end2)
13033 -diff -urNp linux-2.6.32.28/include/linux/interrupt.h linux-2.6.32.28/include/linux/interrupt.h
13034 ---- linux-2.6.32.28/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
13035 -+++ linux-2.6.32.28/include/linux/interrupt.h 2010-12-31 14:46:53.000000000 -0500
13036 +diff -urNp linux-2.6.32.29/include/linux/interrupt.h linux-2.6.32.29/include/linux/interrupt.h
13037 +--- linux-2.6.32.29/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
13038 ++++ linux-2.6.32.29/include/linux/interrupt.h 2010-12-31 14:46:53.000000000 -0500
13039 @@ -362,7 +362,7 @@ enum
13040 /* map softirq index to softirq name. update 'softirq_to_name' in
13041 * kernel/softirq.c when adding a new softirq.
13042 @@ -48760,9 +48872,9 @@ diff -urNp linux-2.6.32.28/include/linux/interrupt.h linux-2.6.32.28/include/lin
13043 extern void softirq_init(void);
13044 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
13045 extern void raise_softirq_irqoff(unsigned int nr);
13046 -diff -urNp linux-2.6.32.28/include/linux/irq.h linux-2.6.32.28/include/linux/irq.h
13047 ---- linux-2.6.32.28/include/linux/irq.h 2010-08-13 16:24:37.000000000 -0400
13048 -+++ linux-2.6.32.28/include/linux/irq.h 2011-01-24 18:05:37.000000000 -0500
13049 +diff -urNp linux-2.6.32.29/include/linux/irq.h linux-2.6.32.29/include/linux/irq.h
13050 +--- linux-2.6.32.29/include/linux/irq.h 2010-08-13 16:24:37.000000000 -0400
13051 ++++ linux-2.6.32.29/include/linux/irq.h 2011-01-24 18:05:37.000000000 -0500
13052 @@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq,
13053 static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
13054 bool boot)
13055 @@ -48777,9 +48889,9 @@ diff -urNp linux-2.6.32.28/include/linux/irq.h linux-2.6.32.28/include/linux/irq
13056 if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
13057 return false;
13058
13059 -diff -urNp linux-2.6.32.28/include/linux/jbd2.h linux-2.6.32.28/include/linux/jbd2.h
13060 ---- linux-2.6.32.28/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
13061 -+++ linux-2.6.32.28/include/linux/jbd2.h 2010-12-31 14:46:53.000000000 -0500
13062 +diff -urNp linux-2.6.32.29/include/linux/jbd2.h linux-2.6.32.29/include/linux/jbd2.h
13063 +--- linux-2.6.32.29/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
13064 ++++ linux-2.6.32.29/include/linux/jbd2.h 2010-12-31 14:46:53.000000000 -0500
13065 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
13066 } \
13067 } while (0)
13068 @@ -48789,9 +48901,9 @@ diff -urNp linux-2.6.32.28/include/linux/jbd2.h linux-2.6.32.28/include/linux/jb
13069 #endif
13070
13071 static inline void *jbd2_alloc(size_t size, gfp_t flags)
13072 -diff -urNp linux-2.6.32.28/include/linux/jbd.h linux-2.6.32.28/include/linux/jbd.h
13073 ---- linux-2.6.32.28/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
13074 -+++ linux-2.6.32.28/include/linux/jbd.h 2010-12-31 14:46:53.000000000 -0500
13075 +diff -urNp linux-2.6.32.29/include/linux/jbd.h linux-2.6.32.29/include/linux/jbd.h
13076 +--- linux-2.6.32.29/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
13077 ++++ linux-2.6.32.29/include/linux/jbd.h 2010-12-31 14:46:53.000000000 -0500
13078 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
13079 } \
13080 } while (0)
13081 @@ -48801,9 +48913,9 @@ diff -urNp linux-2.6.32.28/include/linux/jbd.h linux-2.6.32.28/include/linux/jbd
13082 #endif
13083
13084 static inline void *jbd_alloc(size_t size, gfp_t flags)
13085 -diff -urNp linux-2.6.32.28/include/linux/kallsyms.h linux-2.6.32.28/include/linux/kallsyms.h
13086 ---- linux-2.6.32.28/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
13087 -+++ linux-2.6.32.28/include/linux/kallsyms.h 2010-12-31 14:53:51.000000000 -0500
13088 +diff -urNp linux-2.6.32.29/include/linux/kallsyms.h linux-2.6.32.29/include/linux/kallsyms.h
13089 +--- linux-2.6.32.29/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
13090 ++++ linux-2.6.32.29/include/linux/kallsyms.h 2010-12-31 14:53:51.000000000 -0500
13091 @@ -15,7 +15,8 @@
13092
13093 struct module;
13094 @@ -48830,9 +48942,9 @@ diff -urNp linux-2.6.32.28/include/linux/kallsyms.h linux-2.6.32.28/include/linu
13095
13096 /* This macro allows us to keep printk typechecking */
13097 static void __check_printsym_format(const char *fmt, ...)
13098 -diff -urNp linux-2.6.32.28/include/linux/kgdb.h linux-2.6.32.28/include/linux/kgdb.h
13099 ---- linux-2.6.32.28/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
13100 -+++ linux-2.6.32.28/include/linux/kgdb.h 2010-12-31 14:46:53.000000000 -0500
13101 +diff -urNp linux-2.6.32.29/include/linux/kgdb.h linux-2.6.32.29/include/linux/kgdb.h
13102 +--- linux-2.6.32.29/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
13103 ++++ linux-2.6.32.29/include/linux/kgdb.h 2010-12-31 14:46:53.000000000 -0500
13104 @@ -251,20 +251,20 @@ struct kgdb_arch {
13105 */
13106 struct kgdb_io {
13107 @@ -48863,9 +48975,9 @@ diff -urNp linux-2.6.32.28/include/linux/kgdb.h linux-2.6.32.28/include/linux/kg
13108
13109 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
13110 extern int kgdb_mem2hex(char *mem, char *buf, int count);
13111 -diff -urNp linux-2.6.32.28/include/linux/kobject.h linux-2.6.32.28/include/linux/kobject.h
13112 ---- linux-2.6.32.28/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
13113 -+++ linux-2.6.32.28/include/linux/kobject.h 2010-12-31 14:46:53.000000000 -0500
13114 +diff -urNp linux-2.6.32.29/include/linux/kobject.h linux-2.6.32.29/include/linux/kobject.h
13115 +--- linux-2.6.32.29/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
13116 ++++ linux-2.6.32.29/include/linux/kobject.h 2010-12-31 14:46:53.000000000 -0500
13117 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
13118
13119 struct kobj_type {
13120 @@ -48914,9 +49026,9 @@ diff -urNp linux-2.6.32.28/include/linux/kobject.h linux-2.6.32.28/include/linux
13121 struct kobject *parent_kobj);
13122
13123 static inline struct kset *to_kset(struct kobject *kobj)
13124 -diff -urNp linux-2.6.32.28/include/linux/kvm_host.h linux-2.6.32.28/include/linux/kvm_host.h
13125 ---- linux-2.6.32.28/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
13126 -+++ linux-2.6.32.28/include/linux/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
13127 +diff -urNp linux-2.6.32.29/include/linux/kvm_host.h linux-2.6.32.29/include/linux/kvm_host.h
13128 +--- linux-2.6.32.29/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
13129 ++++ linux-2.6.32.29/include/linux/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
13130 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
13131 void vcpu_load(struct kvm_vcpu *vcpu);
13132 void vcpu_put(struct kvm_vcpu *vcpu);
13133 @@ -48935,9 +49047,9 @@ diff -urNp linux-2.6.32.28/include/linux/kvm_host.h linux-2.6.32.28/include/linu
13134 void kvm_arch_exit(void);
13135
13136 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
13137 -diff -urNp linux-2.6.32.28/include/linux/libata.h linux-2.6.32.28/include/linux/libata.h
13138 ---- linux-2.6.32.28/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
13139 -+++ linux-2.6.32.28/include/linux/libata.h 2010-12-31 14:46:53.000000000 -0500
13140 +diff -urNp linux-2.6.32.29/include/linux/libata.h linux-2.6.32.29/include/linux/libata.h
13141 +--- linux-2.6.32.29/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
13142 ++++ linux-2.6.32.29/include/linux/libata.h 2010-12-31 14:46:53.000000000 -0500
13143 @@ -64,11 +64,11 @@
13144 #ifdef ATA_VERBOSE_DEBUG
13145 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
13146 @@ -49003,9 +49115,9 @@ diff -urNp linux-2.6.32.28/include/linux/libata.h linux-2.6.32.28/include/linux/
13147 extern int ata_scsi_detect(struct scsi_host_template *sht);
13148 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
13149 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
13150 -diff -urNp linux-2.6.32.28/include/linux/lockd/bind.h linux-2.6.32.28/include/linux/lockd/bind.h
13151 ---- linux-2.6.32.28/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
13152 -+++ linux-2.6.32.28/include/linux/lockd/bind.h 2010-12-31 14:46:53.000000000 -0500
13153 +diff -urNp linux-2.6.32.29/include/linux/lockd/bind.h linux-2.6.32.29/include/linux/lockd/bind.h
13154 +--- linux-2.6.32.29/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
13155 ++++ linux-2.6.32.29/include/linux/lockd/bind.h 2010-12-31 14:46:53.000000000 -0500
13156 @@ -23,13 +23,13 @@ struct svc_rqst;
13157 * This is the set of functions for lockd->nfsd communication
13158 */
13159 @@ -49023,9 +49135,9 @@ diff -urNp linux-2.6.32.28/include/linux/lockd/bind.h linux-2.6.32.28/include/li
13160
13161 /*
13162 * Similar to nfs_client_initdata, but without the NFS-specific
13163 -diff -urNp linux-2.6.32.28/include/linux/mm.h linux-2.6.32.28/include/linux/mm.h
13164 ---- linux-2.6.32.28/include/linux/mm.h 2010-10-31 16:44:11.000000000 -0400
13165 -+++ linux-2.6.32.28/include/linux/mm.h 2010-12-31 14:46:53.000000000 -0500
13166 +diff -urNp linux-2.6.32.29/include/linux/mm.h linux-2.6.32.29/include/linux/mm.h
13167 +--- linux-2.6.32.29/include/linux/mm.h 2010-10-31 16:44:11.000000000 -0400
13168 ++++ linux-2.6.32.29/include/linux/mm.h 2010-12-31 14:46:53.000000000 -0500
13169 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void
13170
13171 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
13172 @@ -49105,9 +49217,9 @@ diff -urNp linux-2.6.32.28/include/linux/mm.h linux-2.6.32.28/include/linux/mm.h
13173
13174 #endif /* __KERNEL__ */
13175 #endif /* _LINUX_MM_H */
13176 -diff -urNp linux-2.6.32.28/include/linux/mm_types.h linux-2.6.32.28/include/linux/mm_types.h
13177 ---- linux-2.6.32.28/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
13178 -+++ linux-2.6.32.28/include/linux/mm_types.h 2010-12-31 14:46:53.000000000 -0500
13179 +diff -urNp linux-2.6.32.29/include/linux/mm_types.h linux-2.6.32.29/include/linux/mm_types.h
13180 +--- linux-2.6.32.29/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
13181 ++++ linux-2.6.32.29/include/linux/mm_types.h 2010-12-31 14:46:53.000000000 -0500
13182 @@ -186,6 +186,8 @@ struct vm_area_struct {
13183 #ifdef CONFIG_NUMA
13184 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
13185 @@ -49142,9 +49254,9 @@ diff -urNp linux-2.6.32.28/include/linux/mm_types.h linux-2.6.32.28/include/linu
13186 };
13187
13188 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
13189 -diff -urNp linux-2.6.32.28/include/linux/mmu_notifier.h linux-2.6.32.28/include/linux/mmu_notifier.h
13190 ---- linux-2.6.32.28/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
13191 -+++ linux-2.6.32.28/include/linux/mmu_notifier.h 2010-12-31 14:46:53.000000000 -0500
13192 +diff -urNp linux-2.6.32.29/include/linux/mmu_notifier.h linux-2.6.32.29/include/linux/mmu_notifier.h
13193 +--- linux-2.6.32.29/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
13194 ++++ linux-2.6.32.29/include/linux/mmu_notifier.h 2010-12-31 14:46:53.000000000 -0500
13195 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
13196 */
13197 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
13198 @@ -49161,9 +49273,9 @@ diff -urNp linux-2.6.32.28/include/linux/mmu_notifier.h linux-2.6.32.28/include/
13199 })
13200
13201 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
13202 -diff -urNp linux-2.6.32.28/include/linux/mmzone.h linux-2.6.32.28/include/linux/mmzone.h
13203 ---- linux-2.6.32.28/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
13204 -+++ linux-2.6.32.28/include/linux/mmzone.h 2010-12-31 14:46:53.000000000 -0500
13205 +diff -urNp linux-2.6.32.29/include/linux/mmzone.h linux-2.6.32.29/include/linux/mmzone.h
13206 +--- linux-2.6.32.29/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
13207 ++++ linux-2.6.32.29/include/linux/mmzone.h 2010-12-31 14:46:53.000000000 -0500
13208 @@ -350,7 +350,7 @@ struct zone {
13209 unsigned long flags; /* zone flags, see below */
13210
13211 @@ -49173,9 +49285,9 @@ diff -urNp linux-2.6.32.28/include/linux/mmzone.h linux-2.6.32.28/include/linux/
13212
13213 /*
13214 * prev_priority holds the scanning priority for this zone. It is
13215 -diff -urNp linux-2.6.32.28/include/linux/mod_devicetable.h linux-2.6.32.28/include/linux/mod_devicetable.h
13216 ---- linux-2.6.32.28/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
13217 -+++ linux-2.6.32.28/include/linux/mod_devicetable.h 2010-12-31 14:46:53.000000000 -0500
13218 +diff -urNp linux-2.6.32.29/include/linux/mod_devicetable.h linux-2.6.32.29/include/linux/mod_devicetable.h
13219 +--- linux-2.6.32.29/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
13220 ++++ linux-2.6.32.29/include/linux/mod_devicetable.h 2010-12-31 14:46:53.000000000 -0500
13221 @@ -12,7 +12,7 @@
13222 typedef unsigned long kernel_ulong_t;
13223 #endif
13224 @@ -49194,9 +49306,9 @@ diff -urNp linux-2.6.32.28/include/linux/mod_devicetable.h linux-2.6.32.28/inclu
13225
13226 struct hid_device_id {
13227 __u16 bus;
13228 -diff -urNp linux-2.6.32.28/include/linux/module.h linux-2.6.32.28/include/linux/module.h
13229 ---- linux-2.6.32.28/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
13230 -+++ linux-2.6.32.28/include/linux/module.h 2010-12-31 14:46:53.000000000 -0500
13231 +diff -urNp linux-2.6.32.29/include/linux/module.h linux-2.6.32.29/include/linux/module.h
13232 +--- linux-2.6.32.29/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
13233 ++++ linux-2.6.32.29/include/linux/module.h 2010-12-31 14:46:53.000000000 -0500
13234 @@ -287,16 +287,16 @@ struct module
13235 int (*init)(void);
13236
13237 @@ -49269,9 +49381,9 @@ diff -urNp linux-2.6.32.28/include/linux/module.h linux-2.6.32.28/include/linux/
13238 }
13239
13240 /* Search for module by name: must hold module_mutex. */
13241 -diff -urNp linux-2.6.32.28/include/linux/moduleloader.h linux-2.6.32.28/include/linux/moduleloader.h
13242 ---- linux-2.6.32.28/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
13243 -+++ linux-2.6.32.28/include/linux/moduleloader.h 2010-12-31 14:46:53.000000000 -0500
13244 +diff -urNp linux-2.6.32.29/include/linux/moduleloader.h linux-2.6.32.29/include/linux/moduleloader.h
13245 +--- linux-2.6.32.29/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
13246 ++++ linux-2.6.32.29/include/linux/moduleloader.h 2010-12-31 14:46:53.000000000 -0500
13247 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
13248 sections. Returns NULL on failure. */
13249 void *module_alloc(unsigned long size);
13250 @@ -49294,9 +49406,9 @@ diff -urNp linux-2.6.32.28/include/linux/moduleloader.h linux-2.6.32.28/include/
13251 /* Apply the given relocation to the (simplified) ELF. Return -error
13252 or 0. */
13253 int apply_relocate(Elf_Shdr *sechdrs,
13254 -diff -urNp linux-2.6.32.28/include/linux/moduleparam.h linux-2.6.32.28/include/linux/moduleparam.h
13255 ---- linux-2.6.32.28/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400
13256 -+++ linux-2.6.32.28/include/linux/moduleparam.h 2010-12-31 14:46:53.000000000 -0500
13257 +diff -urNp linux-2.6.32.29/include/linux/moduleparam.h linux-2.6.32.29/include/linux/moduleparam.h
13258 +--- linux-2.6.32.29/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400
13259 ++++ linux-2.6.32.29/include/linux/moduleparam.h 2010-12-31 14:46:53.000000000 -0500
13260 @@ -132,7 +132,7 @@ struct kparam_array
13261
13262 /* Actually copy string: maxlen param is usually sizeof(string). */
13263 @@ -49315,9 +49427,9 @@ diff -urNp linux-2.6.32.28/include/linux/moduleparam.h linux-2.6.32.28/include/l
13264 = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
13265 sizeof(array[0]), array }; \
13266 __module_param_call(MODULE_PARAM_PREFIX, name, \
13267 -diff -urNp linux-2.6.32.28/include/linux/namei.h linux-2.6.32.28/include/linux/namei.h
13268 ---- linux-2.6.32.28/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
13269 -+++ linux-2.6.32.28/include/linux/namei.h 2010-12-31 14:46:53.000000000 -0500
13270 +diff -urNp linux-2.6.32.29/include/linux/namei.h linux-2.6.32.29/include/linux/namei.h
13271 +--- linux-2.6.32.29/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
13272 ++++ linux-2.6.32.29/include/linux/namei.h 2010-12-31 14:46:53.000000000 -0500
13273 @@ -22,7 +22,7 @@ struct nameidata {
13274 unsigned int flags;
13275 int last_type;
13276 @@ -49342,9 +49454,9 @@ diff -urNp linux-2.6.32.28/include/linux/namei.h linux-2.6.32.28/include/linux/n
13277 {
13278 return nd->saved_names[nd->depth];
13279 }
13280 -diff -urNp linux-2.6.32.28/include/linux/netfilter/xt_gradm.h linux-2.6.32.28/include/linux/netfilter/xt_gradm.h
13281 ---- linux-2.6.32.28/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
13282 -+++ linux-2.6.32.28/include/linux/netfilter/xt_gradm.h 2010-12-31 14:46:53.000000000 -0500
13283 +diff -urNp linux-2.6.32.29/include/linux/netfilter/xt_gradm.h linux-2.6.32.29/include/linux/netfilter/xt_gradm.h
13284 +--- linux-2.6.32.29/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
13285 ++++ linux-2.6.32.29/include/linux/netfilter/xt_gradm.h 2010-12-31 14:46:53.000000000 -0500
13286 @@ -0,0 +1,9 @@
13287 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
13288 +#define _LINUX_NETFILTER_XT_GRADM_H 1
13289 @@ -49355,9 +49467,9 @@ diff -urNp linux-2.6.32.28/include/linux/netfilter/xt_gradm.h linux-2.6.32.28/in
13290 +};
13291 +
13292 +#endif
13293 -diff -urNp linux-2.6.32.28/include/linux/nodemask.h linux-2.6.32.28/include/linux/nodemask.h
13294 ---- linux-2.6.32.28/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
13295 -+++ linux-2.6.32.28/include/linux/nodemask.h 2010-12-31 14:46:53.000000000 -0500
13296 +diff -urNp linux-2.6.32.29/include/linux/nodemask.h linux-2.6.32.29/include/linux/nodemask.h
13297 +--- linux-2.6.32.29/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
13298 ++++ linux-2.6.32.29/include/linux/nodemask.h 2010-12-31 14:46:53.000000000 -0500
13299 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no
13300
13301 #define any_online_node(mask) \
13302 @@ -49374,9 +49486,9 @@ diff -urNp linux-2.6.32.28/include/linux/nodemask.h linux-2.6.32.28/include/linu
13303 })
13304
13305 #define num_online_nodes() num_node_state(N_ONLINE)
13306 -diff -urNp linux-2.6.32.28/include/linux/oprofile.h linux-2.6.32.28/include/linux/oprofile.h
13307 ---- linux-2.6.32.28/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
13308 -+++ linux-2.6.32.28/include/linux/oprofile.h 2010-12-31 14:46:53.000000000 -0500
13309 +diff -urNp linux-2.6.32.29/include/linux/oprofile.h linux-2.6.32.29/include/linux/oprofile.h
13310 +--- linux-2.6.32.29/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
13311 ++++ linux-2.6.32.29/include/linux/oprofile.h 2010-12-31 14:46:53.000000000 -0500
13312 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
13313 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
13314 char const * name, ulong * val);
13315 @@ -49389,9 +49501,9 @@ diff -urNp linux-2.6.32.28/include/linux/oprofile.h linux-2.6.32.28/include/linu
13316
13317 /** create a directory */
13318 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
13319 -diff -urNp linux-2.6.32.28/include/linux/pipe_fs_i.h linux-2.6.32.28/include/linux/pipe_fs_i.h
13320 ---- linux-2.6.32.28/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
13321 -+++ linux-2.6.32.28/include/linux/pipe_fs_i.h 2010-12-31 14:46:53.000000000 -0500
13322 +diff -urNp linux-2.6.32.29/include/linux/pipe_fs_i.h linux-2.6.32.29/include/linux/pipe_fs_i.h
13323 +--- linux-2.6.32.29/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
13324 ++++ linux-2.6.32.29/include/linux/pipe_fs_i.h 2010-12-31 14:46:53.000000000 -0500
13325 @@ -46,9 +46,9 @@ struct pipe_inode_info {
13326 wait_queue_head_t wait;
13327 unsigned int nrbufs, curbuf;
13328 @@ -49405,9 +49517,9 @@ diff -urNp linux-2.6.32.28/include/linux/pipe_fs_i.h linux-2.6.32.28/include/lin
13329 unsigned int r_counter;
13330 unsigned int w_counter;
13331 struct fasync_struct *fasync_readers;
13332 -diff -urNp linux-2.6.32.28/include/linux/poison.h linux-2.6.32.28/include/linux/poison.h
13333 ---- linux-2.6.32.28/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
13334 -+++ linux-2.6.32.28/include/linux/poison.h 2010-12-31 14:46:53.000000000 -0500
13335 +diff -urNp linux-2.6.32.29/include/linux/poison.h linux-2.6.32.29/include/linux/poison.h
13336 +--- linux-2.6.32.29/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
13337 ++++ linux-2.6.32.29/include/linux/poison.h 2010-12-31 14:46:53.000000000 -0500
13338 @@ -19,8 +19,8 @@
13339 * under normal circumstances, used to verify that nobody uses
13340 * non-initialized list entries.
13341 @@ -49419,9 +49531,9 @@ diff -urNp linux-2.6.32.28/include/linux/poison.h linux-2.6.32.28/include/linux/
13342
13343 /********** include/linux/timer.h **********/
13344 /*
13345 -diff -urNp linux-2.6.32.28/include/linux/proc_fs.h linux-2.6.32.28/include/linux/proc_fs.h
13346 ---- linux-2.6.32.28/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
13347 -+++ linux-2.6.32.28/include/linux/proc_fs.h 2010-12-31 14:46:53.000000000 -0500
13348 +diff -urNp linux-2.6.32.29/include/linux/proc_fs.h linux-2.6.32.29/include/linux/proc_fs.h
13349 +--- linux-2.6.32.29/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
13350 ++++ linux-2.6.32.29/include/linux/proc_fs.h 2010-12-31 14:46:53.000000000 -0500
13351 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
13352 return proc_create_data(name, mode, parent, proc_fops, NULL);
13353 }
13354 @@ -49442,9 +49554,9 @@ diff -urNp linux-2.6.32.28/include/linux/proc_fs.h linux-2.6.32.28/include/linux
13355 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
13356 mode_t mode, struct proc_dir_entry *base,
13357 read_proc_t *read_proc, void * data)
13358 -diff -urNp linux-2.6.32.28/include/linux/random.h linux-2.6.32.28/include/linux/random.h
13359 ---- linux-2.6.32.28/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
13360 -+++ linux-2.6.32.28/include/linux/random.h 2010-12-31 14:46:53.000000000 -0500
13361 +diff -urNp linux-2.6.32.29/include/linux/random.h linux-2.6.32.29/include/linux/random.h
13362 +--- linux-2.6.32.29/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
13363 ++++ linux-2.6.32.29/include/linux/random.h 2010-12-31 14:46:53.000000000 -0500
13364 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
13365 u32 random32(void);
13366 void srandom32(u32 seed);
13367 @@ -49457,9 +49569,9 @@ diff -urNp linux-2.6.32.28/include/linux/random.h linux-2.6.32.28/include/linux/
13368 #endif /* __KERNEL___ */
13369
13370 #endif /* _LINUX_RANDOM_H */
13371 -diff -urNp linux-2.6.32.28/include/linux/reiserfs_fs.h linux-2.6.32.28/include/linux/reiserfs_fs.h
13372 ---- linux-2.6.32.28/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
13373 -+++ linux-2.6.32.28/include/linux/reiserfs_fs.h 2010-12-31 14:46:53.000000000 -0500
13374 +diff -urNp linux-2.6.32.29/include/linux/reiserfs_fs.h linux-2.6.32.29/include/linux/reiserfs_fs.h
13375 +--- linux-2.6.32.29/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
13376 ++++ linux-2.6.32.29/include/linux/reiserfs_fs.h 2010-12-31 14:46:53.000000000 -0500
13377 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
13378 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
13379
13380 @@ -49506,9 +49618,9 @@ diff -urNp linux-2.6.32.28/include/linux/reiserfs_fs.h linux-2.6.32.28/include/l
13381
13382 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
13383 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
13384 -diff -urNp linux-2.6.32.28/include/linux/reiserfs_fs_sb.h linux-2.6.32.28/include/linux/reiserfs_fs_sb.h
13385 ---- linux-2.6.32.28/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
13386 -+++ linux-2.6.32.28/include/linux/reiserfs_fs_sb.h 2010-12-31 14:46:53.000000000 -0500
13387 +diff -urNp linux-2.6.32.29/include/linux/reiserfs_fs_sb.h linux-2.6.32.29/include/linux/reiserfs_fs_sb.h
13388 +--- linux-2.6.32.29/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
13389 ++++ linux-2.6.32.29/include/linux/reiserfs_fs_sb.h 2010-12-31 14:46:53.000000000 -0500
13390 @@ -377,7 +377,7 @@ struct reiserfs_sb_info {
13391 /* Comment? -Hans */
13392 wait_queue_head_t s_wait;
13393 @@ -49518,9 +49630,9 @@ diff -urNp linux-2.6.32.28/include/linux/reiserfs_fs_sb.h linux-2.6.32.28/includ
13394 // tree gets re-balanced
13395 unsigned long s_properties; /* File system properties. Currently holds
13396 on-disk FS format */
13397 -diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/sched.h
13398 ---- linux-2.6.32.28/include/linux/sched.h 2010-09-20 17:26:42.000000000 -0400
13399 -+++ linux-2.6.32.28/include/linux/sched.h 2010-12-31 14:46:53.000000000 -0500
13400 +diff -urNp linux-2.6.32.29/include/linux/sched.h linux-2.6.32.29/include/linux/sched.h
13401 +--- linux-2.6.32.29/include/linux/sched.h 2011-02-22 15:56:54.000000000 -0500
13402 ++++ linux-2.6.32.29/include/linux/sched.h 2011-02-22 15:57:24.000000000 -0500
13403 @@ -101,6 +101,7 @@ struct bio;
13404 struct fs_struct;
13405 struct bts_context;
13406 @@ -49558,7 +49670,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13407 int oom_adj; /* OOM kill score adjustment (bit shift) */
13408 };
13409
13410 -@@ -1223,7 +1236,7 @@ struct rcu_node;
13411 +@@ -1216,7 +1229,7 @@ struct rcu_node;
13412
13413 struct task_struct {
13414 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
13415 @@ -49567,7 +49679,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13416 atomic_t usage;
13417 unsigned int flags; /* per process flags, defined below */
13418 unsigned int ptrace;
13419 -@@ -1335,8 +1348,8 @@ struct task_struct {
13420 +@@ -1328,8 +1341,8 @@ struct task_struct {
13421 struct list_head thread_group;
13422
13423 struct completion *vfork_done; /* for vfork() */
13424 @@ -49578,7 +49690,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13425
13426 cputime_t utime, stime, utimescaled, stimescaled;
13427 cputime_t gtime;
13428 -@@ -1350,16 +1363,6 @@ struct task_struct {
13429 +@@ -1343,16 +1356,6 @@ struct task_struct {
13430 struct task_cputime cputime_expires;
13431 struct list_head cpu_timers[3];
13432
13433 @@ -49595,7 +49707,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13434 char comm[TASK_COMM_LEN]; /* executable name excluding path
13435 - access with [gs]et_task_comm (which lock
13436 it with task_lock())
13437 -@@ -1443,6 +1446,15 @@ struct task_struct {
13438 +@@ -1436,6 +1439,15 @@ struct task_struct {
13439 int hardirq_context;
13440 int softirq_context;
13441 #endif
13442 @@ -49611,7 +49723,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13443 #ifdef CONFIG_LOCKDEP
13444 # define MAX_LOCK_DEPTH 48UL
13445 u64 curr_chain_key;
13446 -@@ -1463,6 +1475,9 @@ struct task_struct {
13447 +@@ -1456,6 +1468,9 @@ struct task_struct {
13448
13449 struct backing_dev_info *backing_dev_info;
13450
13451 @@ -49621,7 +49733,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13452 struct io_context *io_context;
13453
13454 unsigned long ptrace_message;
13455 -@@ -1526,6 +1541,20 @@ struct task_struct {
13456 +@@ -1519,6 +1534,20 @@ struct task_struct {
13457 unsigned long default_timer_slack_ns;
13458
13459 struct list_head *scm_work_list;
13460 @@ -49642,7 +49754,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13461 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
13462 /* Index of current stored adress in ret_stack */
13463 int curr_ret_stack;
13464 -@@ -1549,6 +1578,52 @@ struct task_struct {
13465 +@@ -1542,6 +1571,52 @@ struct task_struct {
13466 #endif /* CONFIG_TRACING */
13467 };
13468
13469 @@ -49695,7 +49807,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13470 /* Future-safe accessor for struct task_struct's cpus_allowed. */
13471 #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
13472
13473 -@@ -2150,7 +2225,7 @@ extern void __cleanup_sighand(struct sig
13474 +@@ -2155,7 +2230,7 @@ extern void __cleanup_sighand(struct sig
13475 extern void exit_itimers(struct signal_struct *);
13476 extern void flush_itimer_signals(void);
13477
13478 @@ -49704,7 +49816,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13479
13480 extern void daemonize(const char *, ...);
13481 extern int allow_signal(int);
13482 -@@ -2263,8 +2338,8 @@ static inline void unlock_task_sighand(s
13483 +@@ -2268,8 +2343,8 @@ static inline void unlock_task_sighand(s
13484
13485 #ifndef __HAVE_THREAD_FUNCTIONS
13486
13487 @@ -49715,7 +49827,7 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13488
13489 static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
13490 {
13491 -@@ -2279,13 +2354,17 @@ static inline unsigned long *end_of_stac
13492 +@@ -2284,13 +2359,17 @@ static inline unsigned long *end_of_stac
13493
13494 #endif
13495
13496 @@ -49735,9 +49847,9 @@ diff -urNp linux-2.6.32.28/include/linux/sched.h linux-2.6.32.28/include/linux/s
13497 extern void thread_info_cache_init(void);
13498
13499 #ifdef CONFIG_DEBUG_STACK_USAGE
13500 -diff -urNp linux-2.6.32.28/include/linux/screen_info.h linux-2.6.32.28/include/linux/screen_info.h
13501 ---- linux-2.6.32.28/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
13502 -+++ linux-2.6.32.28/include/linux/screen_info.h 2010-12-31 14:46:53.000000000 -0500
13503 +diff -urNp linux-2.6.32.29/include/linux/screen_info.h linux-2.6.32.29/include/linux/screen_info.h
13504 +--- linux-2.6.32.29/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
13505 ++++ linux-2.6.32.29/include/linux/screen_info.h 2010-12-31 14:46:53.000000000 -0500
13506 @@ -42,7 +42,8 @@ struct screen_info {
13507 __u16 pages; /* 0x32 */
13508 __u16 vesa_attributes; /* 0x34 */
13509 @@ -49748,9 +49860,9 @@ diff -urNp linux-2.6.32.28/include/linux/screen_info.h linux-2.6.32.28/include/l
13510 } __attribute__((packed));
13511
13512 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
13513 -diff -urNp linux-2.6.32.28/include/linux/security.h linux-2.6.32.28/include/linux/security.h
13514 ---- linux-2.6.32.28/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
13515 -+++ linux-2.6.32.28/include/linux/security.h 2010-12-31 14:46:53.000000000 -0500
13516 +diff -urNp linux-2.6.32.29/include/linux/security.h linux-2.6.32.29/include/linux/security.h
13517 +--- linux-2.6.32.29/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
13518 ++++ linux-2.6.32.29/include/linux/security.h 2010-12-31 14:46:53.000000000 -0500
13519 @@ -34,6 +34,7 @@
13520 #include <linux/key.h>
13521 #include <linux/xfrm.h>
13522 @@ -49759,9 +49871,9 @@ diff -urNp linux-2.6.32.28/include/linux/security.h linux-2.6.32.28/include/linu
13523 #include <net/flow.h>
13524
13525 /* Maximum number of letters for an LSM name string */
13526 -diff -urNp linux-2.6.32.28/include/linux/shm.h linux-2.6.32.28/include/linux/shm.h
13527 ---- linux-2.6.32.28/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
13528 -+++ linux-2.6.32.28/include/linux/shm.h 2010-12-31 14:46:53.000000000 -0500
13529 +diff -urNp linux-2.6.32.29/include/linux/shm.h linux-2.6.32.29/include/linux/shm.h
13530 +--- linux-2.6.32.29/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
13531 ++++ linux-2.6.32.29/include/linux/shm.h 2010-12-31 14:46:53.000000000 -0500
13532 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
13533 pid_t shm_cprid;
13534 pid_t shm_lprid;
13535 @@ -49773,9 +49885,9 @@ diff -urNp linux-2.6.32.28/include/linux/shm.h linux-2.6.32.28/include/linux/shm
13536 };
13537
13538 /* shm_mode upper byte flags */
13539 -diff -urNp linux-2.6.32.28/include/linux/skbuff.h linux-2.6.32.28/include/linux/skbuff.h
13540 ---- linux-2.6.32.28/include/linux/skbuff.h 2010-08-13 16:24:37.000000000 -0400
13541 -+++ linux-2.6.32.28/include/linux/skbuff.h 2010-12-31 14:46:53.000000000 -0500
13542 +diff -urNp linux-2.6.32.29/include/linux/skbuff.h linux-2.6.32.29/include/linux/skbuff.h
13543 +--- linux-2.6.32.29/include/linux/skbuff.h 2010-08-13 16:24:37.000000000 -0400
13544 ++++ linux-2.6.32.29/include/linux/skbuff.h 2010-12-31 14:46:53.000000000 -0500
13545 @@ -544,7 +544,7 @@ static inline union skb_shared_tx *skb_t
13546 */
13547 static inline int skb_queue_empty(const struct sk_buff_head *list)
13548 @@ -49803,9 +49915,9 @@ diff -urNp linux-2.6.32.28/include/linux/skbuff.h linux-2.6.32.28/include/linux/
13549 }
13550
13551 /**
13552 -diff -urNp linux-2.6.32.28/include/linux/slab.h linux-2.6.32.28/include/linux/slab.h
13553 ---- linux-2.6.32.28/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
13554 -+++ linux-2.6.32.28/include/linux/slab.h 2010-12-31 14:46:53.000000000 -0500
13555 +diff -urNp linux-2.6.32.29/include/linux/slab.h linux-2.6.32.29/include/linux/slab.h
13556 +--- linux-2.6.32.29/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
13557 ++++ linux-2.6.32.29/include/linux/slab.h 2010-12-31 14:46:53.000000000 -0500
13558 @@ -11,6 +11,7 @@
13559
13560 #include <linux/gfp.h>
13561 @@ -49877,9 +49989,9 @@ diff -urNp linux-2.6.32.28/include/linux/slab.h linux-2.6.32.28/include/linux/sl
13562 +})
13563 +
13564 #endif /* _LINUX_SLAB_H */
13565 -diff -urNp linux-2.6.32.28/include/linux/slub_def.h linux-2.6.32.28/include/linux/slub_def.h
13566 ---- linux-2.6.32.28/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
13567 -+++ linux-2.6.32.28/include/linux/slub_def.h 2010-12-31 14:46:53.000000000 -0500
13568 +diff -urNp linux-2.6.32.29/include/linux/slub_def.h linux-2.6.32.29/include/linux/slub_def.h
13569 +--- linux-2.6.32.29/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
13570 ++++ linux-2.6.32.29/include/linux/slub_def.h 2010-12-31 14:46:53.000000000 -0500
13571 @@ -86,7 +86,7 @@ struct kmem_cache {
13572 struct kmem_cache_order_objects max;
13573 struct kmem_cache_order_objects min;
13574 @@ -49889,9 +50001,9 @@ diff -urNp linux-2.6.32.28/include/linux/slub_def.h linux-2.6.32.28/include/linu
13575 void (*ctor)(void *);
13576 int inuse; /* Offset to metadata */
13577 int align; /* Alignment */
13578 -diff -urNp linux-2.6.32.28/include/linux/sonet.h linux-2.6.32.28/include/linux/sonet.h
13579 ---- linux-2.6.32.28/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
13580 -+++ linux-2.6.32.28/include/linux/sonet.h 2010-12-31 14:46:53.000000000 -0500
13581 +diff -urNp linux-2.6.32.29/include/linux/sonet.h linux-2.6.32.29/include/linux/sonet.h
13582 +--- linux-2.6.32.29/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
13583 ++++ linux-2.6.32.29/include/linux/sonet.h 2010-12-31 14:46:53.000000000 -0500
13584 @@ -61,7 +61,7 @@ struct sonet_stats {
13585 #include <asm/atomic.h>
13586
13587 @@ -49901,9 +50013,9 @@ diff -urNp linux-2.6.32.28/include/linux/sonet.h linux-2.6.32.28/include/linux/s
13588 __SONET_ITEMS
13589 #undef __HANDLE_ITEM
13590 };
13591 -diff -urNp linux-2.6.32.28/include/linux/sunrpc/clnt.h linux-2.6.32.28/include/linux/sunrpc/clnt.h
13592 ---- linux-2.6.32.28/include/linux/sunrpc/clnt.h 2010-08-13 16:24:37.000000000 -0400
13593 -+++ linux-2.6.32.28/include/linux/sunrpc/clnt.h 2010-12-31 14:46:53.000000000 -0500
13594 +diff -urNp linux-2.6.32.29/include/linux/sunrpc/clnt.h linux-2.6.32.29/include/linux/sunrpc/clnt.h
13595 +--- linux-2.6.32.29/include/linux/sunrpc/clnt.h 2010-08-13 16:24:37.000000000 -0400
13596 ++++ linux-2.6.32.29/include/linux/sunrpc/clnt.h 2010-12-31 14:46:53.000000000 -0500
13597 @@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
13598 {
13599 switch (sap->sa_family) {
13600 @@ -49934,9 +50046,9 @@ diff -urNp linux-2.6.32.28/include/linux/sunrpc/clnt.h linux-2.6.32.28/include/l
13601 }
13602
13603 #endif /* __KERNEL__ */
13604 -diff -urNp linux-2.6.32.28/include/linux/suspend.h linux-2.6.32.28/include/linux/suspend.h
13605 ---- linux-2.6.32.28/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
13606 -+++ linux-2.6.32.28/include/linux/suspend.h 2010-12-31 14:46:53.000000000 -0500
13607 +diff -urNp linux-2.6.32.29/include/linux/suspend.h linux-2.6.32.29/include/linux/suspend.h
13608 +--- linux-2.6.32.29/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
13609 ++++ linux-2.6.32.29/include/linux/suspend.h 2010-12-31 14:46:53.000000000 -0500
13610 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
13611 * which require special recovery actions in that situation.
13612 */
13613 @@ -50025,9 +50137,9 @@ diff -urNp linux-2.6.32.28/include/linux/suspend.h linux-2.6.32.28/include/linux
13614 static inline int hibernate(void) { return -ENOSYS; }
13615 static inline bool system_entering_hibernation(void) { return false; }
13616 #endif /* CONFIG_HIBERNATION */
13617 -diff -urNp linux-2.6.32.28/include/linux/sysctl.h linux-2.6.32.28/include/linux/sysctl.h
13618 ---- linux-2.6.32.28/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
13619 -+++ linux-2.6.32.28/include/linux/sysctl.h 2010-12-31 14:46:53.000000000 -0500
13620 +diff -urNp linux-2.6.32.29/include/linux/sysctl.h linux-2.6.32.29/include/linux/sysctl.h
13621 +--- linux-2.6.32.29/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
13622 ++++ linux-2.6.32.29/include/linux/sysctl.h 2010-12-31 14:46:53.000000000 -0500
13623 @@ -164,7 +164,11 @@ enum
13624 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
13625 };
13626 @@ -50058,9 +50170,9 @@ diff -urNp linux-2.6.32.28/include/linux/sysctl.h linux-2.6.32.28/include/linux/
13627 extern ctl_handler sysctl_intvec;
13628 extern ctl_handler sysctl_jiffies;
13629 extern ctl_handler sysctl_ms_jiffies;
13630 -diff -urNp linux-2.6.32.28/include/linux/sysfs.h linux-2.6.32.28/include/linux/sysfs.h
13631 ---- linux-2.6.32.28/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
13632 -+++ linux-2.6.32.28/include/linux/sysfs.h 2010-12-31 14:46:53.000000000 -0500
13633 +diff -urNp linux-2.6.32.29/include/linux/sysfs.h linux-2.6.32.29/include/linux/sysfs.h
13634 +--- linux-2.6.32.29/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
13635 ++++ linux-2.6.32.29/include/linux/sysfs.h 2010-12-31 14:46:53.000000000 -0500
13636 @@ -75,8 +75,8 @@ struct bin_attribute {
13637 };
13638
13639 @@ -50072,9 +50184,9 @@ diff -urNp linux-2.6.32.28/include/linux/sysfs.h linux-2.6.32.28/include/linux/s
13640 };
13641
13642 struct sysfs_dirent;
13643 -diff -urNp linux-2.6.32.28/include/linux/thread_info.h linux-2.6.32.28/include/linux/thread_info.h
13644 ---- linux-2.6.32.28/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
13645 -+++ linux-2.6.32.28/include/linux/thread_info.h 2010-12-31 14:46:53.000000000 -0500
13646 +diff -urNp linux-2.6.32.29/include/linux/thread_info.h linux-2.6.32.29/include/linux/thread_info.h
13647 +--- linux-2.6.32.29/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
13648 ++++ linux-2.6.32.29/include/linux/thread_info.h 2010-12-31 14:46:53.000000000 -0500
13649 @@ -23,7 +23,7 @@ struct restart_block {
13650 };
13651 /* For futex_wait and futex_wait_requeue_pi */
13652 @@ -50084,9 +50196,9 @@ diff -urNp linux-2.6.32.28/include/linux/thread_info.h linux-2.6.32.28/include/l
13653 u32 val;
13654 u32 flags;
13655 u32 bitset;
13656 -diff -urNp linux-2.6.32.28/include/linux/tty.h linux-2.6.32.28/include/linux/tty.h
13657 ---- linux-2.6.32.28/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
13658 -+++ linux-2.6.32.28/include/linux/tty.h 2010-12-31 14:46:53.000000000 -0500
13659 +diff -urNp linux-2.6.32.29/include/linux/tty.h linux-2.6.32.29/include/linux/tty.h
13660 +--- linux-2.6.32.29/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
13661 ++++ linux-2.6.32.29/include/linux/tty.h 2010-12-31 14:46:53.000000000 -0500
13662 @@ -13,6 +13,7 @@
13663 #include <linux/tty_driver.h>
13664 #include <linux/tty_ldisc.h>
13665 @@ -50122,9 +50234,9 @@ diff -urNp linux-2.6.32.28/include/linux/tty.h linux-2.6.32.28/include/linux/tty
13666
13667 /* n_tty.c */
13668 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
13669 -diff -urNp linux-2.6.32.28/include/linux/tty_ldisc.h linux-2.6.32.28/include/linux/tty_ldisc.h
13670 ---- linux-2.6.32.28/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
13671 -+++ linux-2.6.32.28/include/linux/tty_ldisc.h 2010-12-31 14:46:53.000000000 -0500
13672 +diff -urNp linux-2.6.32.29/include/linux/tty_ldisc.h linux-2.6.32.29/include/linux/tty_ldisc.h
13673 +--- linux-2.6.32.29/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
13674 ++++ linux-2.6.32.29/include/linux/tty_ldisc.h 2010-12-31 14:46:53.000000000 -0500
13675 @@ -139,7 +139,7 @@ struct tty_ldisc_ops {
13676
13677 struct module *owner;
13678 @@ -50134,9 +50246,9 @@ diff -urNp linux-2.6.32.28/include/linux/tty_ldisc.h linux-2.6.32.28/include/lin
13679 };
13680
13681 struct tty_ldisc {
13682 -diff -urNp linux-2.6.32.28/include/linux/types.h linux-2.6.32.28/include/linux/types.h
13683 ---- linux-2.6.32.28/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
13684 -+++ linux-2.6.32.28/include/linux/types.h 2010-12-31 14:46:53.000000000 -0500
13685 +diff -urNp linux-2.6.32.29/include/linux/types.h linux-2.6.32.29/include/linux/types.h
13686 +--- linux-2.6.32.29/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
13687 ++++ linux-2.6.32.29/include/linux/types.h 2010-12-31 14:46:53.000000000 -0500
13688 @@ -191,10 +191,26 @@ typedef struct {
13689 volatile int counter;
13690 } atomic_t;
13691 @@ -50164,9 +50276,9 @@ diff -urNp linux-2.6.32.28/include/linux/types.h linux-2.6.32.28/include/linux/t
13692 #endif
13693
13694 struct ustat {
13695 -diff -urNp linux-2.6.32.28/include/linux/uaccess.h linux-2.6.32.28/include/linux/uaccess.h
13696 ---- linux-2.6.32.28/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
13697 -+++ linux-2.6.32.28/include/linux/uaccess.h 2010-12-31 14:46:53.000000000 -0500
13698 +diff -urNp linux-2.6.32.29/include/linux/uaccess.h linux-2.6.32.29/include/linux/uaccess.h
13699 +--- linux-2.6.32.29/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
13700 ++++ linux-2.6.32.29/include/linux/uaccess.h 2010-12-31 14:46:53.000000000 -0500
13701 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
13702 long ret; \
13703 mm_segment_t old_fs = get_fs(); \
13704 @@ -50198,9 +50310,9 @@ diff -urNp linux-2.6.32.28/include/linux/uaccess.h linux-2.6.32.28/include/linux
13705 +extern long probe_kernel_write(void *dst, const void *src, size_t size);
13706
13707 #endif /* __LINUX_UACCESS_H__ */
13708 -diff -urNp linux-2.6.32.28/include/linux/unaligned/access_ok.h linux-2.6.32.28/include/linux/unaligned/access_ok.h
13709 ---- linux-2.6.32.28/include/linux/unaligned/access_ok.h 2010-08-13 16:24:37.000000000 -0400
13710 -+++ linux-2.6.32.28/include/linux/unaligned/access_ok.h 2010-12-31 14:46:53.000000000 -0500
13711 +diff -urNp linux-2.6.32.29/include/linux/unaligned/access_ok.h linux-2.6.32.29/include/linux/unaligned/access_ok.h
13712 +--- linux-2.6.32.29/include/linux/unaligned/access_ok.h 2010-08-13 16:24:37.000000000 -0400
13713 ++++ linux-2.6.32.29/include/linux/unaligned/access_ok.h 2010-12-31 14:46:53.000000000 -0500
13714 @@ -6,32 +6,32 @@
13715
13716 static inline u16 get_unaligned_le16(const void *p)
13717 @@ -50240,9 +50352,9 @@ diff -urNp linux-2.6.32.28/include/linux/unaligned/access_ok.h linux-2.6.32.28/i
13718 }
13719
13720 static inline void put_unaligned_le16(u16 val, void *p)
13721 -diff -urNp linux-2.6.32.28/include/linux/vmalloc.h linux-2.6.32.28/include/linux/vmalloc.h
13722 ---- linux-2.6.32.28/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
13723 -+++ linux-2.6.32.28/include/linux/vmalloc.h 2010-12-31 14:46:53.000000000 -0500
13724 +diff -urNp linux-2.6.32.29/include/linux/vmalloc.h linux-2.6.32.29/include/linux/vmalloc.h
13725 +--- linux-2.6.32.29/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
13726 ++++ linux-2.6.32.29/include/linux/vmalloc.h 2010-12-31 14:46:53.000000000 -0500
13727 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
13728 #define VM_MAP 0x00000004 /* vmap()ed pages */
13729 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
13730 @@ -50337,9 +50449,9 @@ diff -urNp linux-2.6.32.28/include/linux/vmalloc.h linux-2.6.32.28/include/linux
13731 +})
13732 +
13733 #endif /* _LINUX_VMALLOC_H */
13734 -diff -urNp linux-2.6.32.28/include/linux/vmstat.h linux-2.6.32.28/include/linux/vmstat.h
13735 ---- linux-2.6.32.28/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
13736 -+++ linux-2.6.32.28/include/linux/vmstat.h 2010-12-31 14:46:53.000000000 -0500
13737 +diff -urNp linux-2.6.32.29/include/linux/vmstat.h linux-2.6.32.29/include/linux/vmstat.h
13738 +--- linux-2.6.32.29/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
13739 ++++ linux-2.6.32.29/include/linux/vmstat.h 2010-12-31 14:46:53.000000000 -0500
13740 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
13741 /*
13742 * Zone based page accounting with per cpu differentials.
13743 @@ -50403,9 +50515,9 @@ diff -urNp linux-2.6.32.28/include/linux/vmstat.h linux-2.6.32.28/include/linux/
13744 }
13745
13746 static inline void __dec_zone_page_state(struct page *page,
13747 -diff -urNp linux-2.6.32.28/include/net/inetpeer.h linux-2.6.32.28/include/net/inetpeer.h
13748 ---- linux-2.6.32.28/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400
13749 -+++ linux-2.6.32.28/include/net/inetpeer.h 2010-12-31 14:46:53.000000000 -0500
13750 +diff -urNp linux-2.6.32.29/include/net/inetpeer.h linux-2.6.32.29/include/net/inetpeer.h
13751 +--- linux-2.6.32.29/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400
13752 ++++ linux-2.6.32.29/include/net/inetpeer.h 2010-12-31 14:46:53.000000000 -0500
13753 @@ -24,7 +24,7 @@ struct inet_peer
13754 __u32 dtime; /* the time of last use of not
13755 * referenced entries */
13756 @@ -50415,9 +50527,9 @@ diff -urNp linux-2.6.32.28/include/net/inetpeer.h linux-2.6.32.28/include/net/in
13757 __u32 tcp_ts;
13758 unsigned long tcp_ts_stamp;
13759 };
13760 -diff -urNp linux-2.6.32.28/include/net/irda/ircomm_tty.h linux-2.6.32.28/include/net/irda/ircomm_tty.h
13761 ---- linux-2.6.32.28/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
13762 -+++ linux-2.6.32.28/include/net/irda/ircomm_tty.h 2011-01-25 20:24:47.000000000 -0500
13763 +diff -urNp linux-2.6.32.29/include/net/irda/ircomm_tty.h linux-2.6.32.29/include/net/irda/ircomm_tty.h
13764 +--- linux-2.6.32.29/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
13765 ++++ linux-2.6.32.29/include/net/irda/ircomm_tty.h 2011-01-25 20:24:47.000000000 -0500
13766 @@ -35,6 +35,7 @@
13767 #include <linux/termios.h>
13768 #include <linux/timer.h>
13769 @@ -50437,9 +50549,9 @@ diff -urNp linux-2.6.32.28/include/net/irda/ircomm_tty.h linux-2.6.32.28/include
13770
13771 /* Protect concurent access to :
13772 * o self->open_count
13773 -diff -urNp linux-2.6.32.28/include/net/neighbour.h linux-2.6.32.28/include/net/neighbour.h
13774 ---- linux-2.6.32.28/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
13775 -+++ linux-2.6.32.28/include/net/neighbour.h 2010-12-31 14:46:53.000000000 -0500
13776 +diff -urNp linux-2.6.32.29/include/net/neighbour.h linux-2.6.32.29/include/net/neighbour.h
13777 +--- linux-2.6.32.29/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
13778 ++++ linux-2.6.32.29/include/net/neighbour.h 2010-12-31 14:46:53.000000000 -0500
13779 @@ -125,12 +125,12 @@ struct neighbour
13780 struct neigh_ops
13781 {
13782 @@ -50459,9 +50571,9 @@ diff -urNp linux-2.6.32.28/include/net/neighbour.h linux-2.6.32.28/include/net/n
13783 };
13784
13785 struct pneigh_entry
13786 -diff -urNp linux-2.6.32.28/include/net/netlink.h linux-2.6.32.28/include/net/netlink.h
13787 ---- linux-2.6.32.28/include/net/netlink.h 2010-08-13 16:24:37.000000000 -0400
13788 -+++ linux-2.6.32.28/include/net/netlink.h 2010-12-31 14:46:53.000000000 -0500
13789 +diff -urNp linux-2.6.32.29/include/net/netlink.h linux-2.6.32.29/include/net/netlink.h
13790 +--- linux-2.6.32.29/include/net/netlink.h 2010-08-13 16:24:37.000000000 -0400
13791 ++++ linux-2.6.32.29/include/net/netlink.h 2010-12-31 14:46:53.000000000 -0500
13792 @@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
13793 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
13794 {
13795 @@ -50471,9 +50583,9 @@ diff -urNp linux-2.6.32.28/include/net/netlink.h linux-2.6.32.28/include/net/net
13796 }
13797
13798 /**
13799 -diff -urNp linux-2.6.32.28/include/net/sctp/sctp.h linux-2.6.32.28/include/net/sctp/sctp.h
13800 ---- linux-2.6.32.28/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
13801 -+++ linux-2.6.32.28/include/net/sctp/sctp.h 2010-12-31 14:46:53.000000000 -0500
13802 +diff -urNp linux-2.6.32.29/include/net/sctp/sctp.h linux-2.6.32.29/include/net/sctp/sctp.h
13803 +--- linux-2.6.32.29/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
13804 ++++ linux-2.6.32.29/include/net/sctp/sctp.h 2010-12-31 14:46:53.000000000 -0500
13805 @@ -305,8 +305,8 @@ extern int sctp_debug_flag;
13806
13807 #else /* SCTP_DEBUG */
13808 @@ -50485,9 +50597,9 @@ diff -urNp linux-2.6.32.28/include/net/sctp/sctp.h linux-2.6.32.28/include/net/s
13809 #define SCTP_ENABLE_DEBUG
13810 #define SCTP_DISABLE_DEBUG
13811 #define SCTP_ASSERT(expr, str, func)
13812 -diff -urNp linux-2.6.32.28/include/net/tcp.h linux-2.6.32.28/include/net/tcp.h
13813 ---- linux-2.6.32.28/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
13814 -+++ linux-2.6.32.28/include/net/tcp.h 2010-12-31 14:46:53.000000000 -0500
13815 +diff -urNp linux-2.6.32.29/include/net/tcp.h linux-2.6.32.29/include/net/tcp.h
13816 +--- linux-2.6.32.29/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
13817 ++++ linux-2.6.32.29/include/net/tcp.h 2010-12-31 14:46:53.000000000 -0500
13818 @@ -1444,6 +1444,7 @@ enum tcp_seq_states {
13819 struct tcp_seq_afinfo {
13820 char *name;
13821 @@ -50496,9 +50608,9 @@ diff -urNp linux-2.6.32.28/include/net/tcp.h linux-2.6.32.28/include/net/tcp.h
13822 struct file_operations seq_fops;
13823 struct seq_operations seq_ops;
13824 };
13825 -diff -urNp linux-2.6.32.28/include/net/udp.h linux-2.6.32.28/include/net/udp.h
13826 ---- linux-2.6.32.28/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
13827 -+++ linux-2.6.32.28/include/net/udp.h 2010-12-31 14:46:53.000000000 -0500
13828 +diff -urNp linux-2.6.32.29/include/net/udp.h linux-2.6.32.29/include/net/udp.h
13829 +--- linux-2.6.32.29/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
13830 ++++ linux-2.6.32.29/include/net/udp.h 2010-12-31 14:46:53.000000000 -0500
13831 @@ -187,6 +187,7 @@ struct udp_seq_afinfo {
13832 char *name;
13833 sa_family_t family;
13834 @@ -50507,9 +50619,9 @@ diff -urNp linux-2.6.32.28/include/net/udp.h linux-2.6.32.28/include/net/udp.h
13835 struct file_operations seq_fops;
13836 struct seq_operations seq_ops;
13837 };
13838 -diff -urNp linux-2.6.32.28/include/sound/ac97_codec.h linux-2.6.32.28/include/sound/ac97_codec.h
13839 ---- linux-2.6.32.28/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
13840 -+++ linux-2.6.32.28/include/sound/ac97_codec.h 2010-12-31 14:46:53.000000000 -0500
13841 +diff -urNp linux-2.6.32.29/include/sound/ac97_codec.h linux-2.6.32.29/include/sound/ac97_codec.h
13842 +--- linux-2.6.32.29/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
13843 ++++ linux-2.6.32.29/include/sound/ac97_codec.h 2010-12-31 14:46:53.000000000 -0500
13844 @@ -419,15 +419,15 @@
13845 struct snd_ac97;
13846
13847 @@ -50542,9 +50654,9 @@ diff -urNp linux-2.6.32.28/include/sound/ac97_codec.h linux-2.6.32.28/include/so
13848 void *private_data;
13849 void (*private_free) (struct snd_ac97 *ac97);
13850 /* --- */
13851 -diff -urNp linux-2.6.32.28/include/trace/events/irq.h linux-2.6.32.28/include/trace/events/irq.h
13852 ---- linux-2.6.32.28/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
13853 -+++ linux-2.6.32.28/include/trace/events/irq.h 2010-12-31 14:46:53.000000000 -0500
13854 +diff -urNp linux-2.6.32.29/include/trace/events/irq.h linux-2.6.32.29/include/trace/events/irq.h
13855 +--- linux-2.6.32.29/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
13856 ++++ linux-2.6.32.29/include/trace/events/irq.h 2010-12-31 14:46:53.000000000 -0500
13857 @@ -34,7 +34,7 @@
13858 */
13859 TRACE_EVENT(irq_handler_entry,
13860 @@ -50581,9 +50693,9 @@ diff -urNp linux-2.6.32.28/include/trace/events/irq.h linux-2.6.32.28/include/tr
13861
13862 TP_ARGS(h, vec),
13863
13864 -diff -urNp linux-2.6.32.28/include/video/uvesafb.h linux-2.6.32.28/include/video/uvesafb.h
13865 ---- linux-2.6.32.28/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
13866 -+++ linux-2.6.32.28/include/video/uvesafb.h 2010-12-31 14:46:53.000000000 -0500
13867 +diff -urNp linux-2.6.32.29/include/video/uvesafb.h linux-2.6.32.29/include/video/uvesafb.h
13868 +--- linux-2.6.32.29/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
13869 ++++ linux-2.6.32.29/include/video/uvesafb.h 2010-12-31 14:46:53.000000000 -0500
13870 @@ -177,6 +177,7 @@ struct uvesafb_par {
13871 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
13872 u8 pmi_setpal; /* PMI for palette changes */
13873 @@ -50592,9 +50704,9 @@ diff -urNp linux-2.6.32.28/include/video/uvesafb.h linux-2.6.32.28/include/video
13874 void *pmi_start;
13875 void *pmi_pal;
13876 u8 *vbe_state_orig; /*
13877 -diff -urNp linux-2.6.32.28/init/do_mounts.c linux-2.6.32.28/init/do_mounts.c
13878 ---- linux-2.6.32.28/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
13879 -+++ linux-2.6.32.28/init/do_mounts.c 2011-01-04 17:42:43.000000000 -0500
13880 +diff -urNp linux-2.6.32.29/init/do_mounts.c linux-2.6.32.29/init/do_mounts.c
13881 +--- linux-2.6.32.29/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
13882 ++++ linux-2.6.32.29/init/do_mounts.c 2011-01-04 17:42:43.000000000 -0500
13883 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
13884
13885 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
13886 @@ -50640,9 +50752,9 @@ diff -urNp linux-2.6.32.28/init/do_mounts.c linux-2.6.32.28/init/do_mounts.c
13887 + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
13888 + sys_chroot((__force char __user *)".");
13889 }
13890 -diff -urNp linux-2.6.32.28/init/do_mounts.h linux-2.6.32.28/init/do_mounts.h
13891 ---- linux-2.6.32.28/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
13892 -+++ linux-2.6.32.28/init/do_mounts.h 2010-12-31 14:46:53.000000000 -0500
13893 +diff -urNp linux-2.6.32.29/init/do_mounts.h linux-2.6.32.29/init/do_mounts.h
13894 +--- linux-2.6.32.29/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
13895 ++++ linux-2.6.32.29/init/do_mounts.h 2010-12-31 14:46:53.000000000 -0500
13896 @@ -15,15 +15,15 @@ extern int root_mountflags;
13897
13898 static inline int create_dev(char *name, dev_t dev)
13899 @@ -50662,9 +50774,9 @@ diff -urNp linux-2.6.32.28/init/do_mounts.h linux-2.6.32.28/init/do_mounts.h
13900 return 0;
13901 if (!S_ISBLK(stat.st_mode))
13902 return 0;
13903 -diff -urNp linux-2.6.32.28/init/do_mounts_initrd.c linux-2.6.32.28/init/do_mounts_initrd.c
13904 ---- linux-2.6.32.28/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
13905 -+++ linux-2.6.32.28/init/do_mounts_initrd.c 2010-12-31 14:46:53.000000000 -0500
13906 +diff -urNp linux-2.6.32.29/init/do_mounts_initrd.c linux-2.6.32.29/init/do_mounts_initrd.c
13907 +--- linux-2.6.32.29/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
13908 ++++ linux-2.6.32.29/init/do_mounts_initrd.c 2010-12-31 14:46:53.000000000 -0500
13909 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
13910 sys_close(old_fd);sys_close(root_fd);
13911 sys_close(0);sys_close(1);sys_close(2);
13912 @@ -50748,9 +50860,9 @@ diff -urNp linux-2.6.32.28/init/do_mounts_initrd.c linux-2.6.32.28/init/do_mount
13913 + sys_unlink((__force const char __user *)"/initrd.image");
13914 return 0;
13915 }
13916 -diff -urNp linux-2.6.32.28/init/do_mounts_md.c linux-2.6.32.28/init/do_mounts_md.c
13917 ---- linux-2.6.32.28/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
13918 -+++ linux-2.6.32.28/init/do_mounts_md.c 2010-12-31 14:46:53.000000000 -0500
13919 +diff -urNp linux-2.6.32.29/init/do_mounts_md.c linux-2.6.32.29/init/do_mounts_md.c
13920 +--- linux-2.6.32.29/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
13921 ++++ linux-2.6.32.29/init/do_mounts_md.c 2010-12-31 14:46:53.000000000 -0500
13922 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
13923 partitioned ? "_d" : "", minor,
13924 md_setup_args[ent].device_names);
13925 @@ -50778,9 +50890,9 @@ diff -urNp linux-2.6.32.28/init/do_mounts_md.c linux-2.6.32.28/init/do_mounts_md
13926 if (fd >= 0) {
13927 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
13928 sys_close(fd);
13929 -diff -urNp linux-2.6.32.28/init/initramfs.c linux-2.6.32.28/init/initramfs.c
13930 ---- linux-2.6.32.28/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
13931 -+++ linux-2.6.32.28/init/initramfs.c 2010-12-31 14:46:53.000000000 -0500
13932 +diff -urNp linux-2.6.32.29/init/initramfs.c linux-2.6.32.29/init/initramfs.c
13933 +--- linux-2.6.32.29/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
13934 ++++ linux-2.6.32.29/init/initramfs.c 2010-12-31 14:46:53.000000000 -0500
13935 @@ -74,7 +74,7 @@ static void __init free_hash(void)
13936 }
13937 }
13938 @@ -50889,10 +51001,10 @@ diff -urNp linux-2.6.32.28/init/initramfs.c linux-2.6.32.28/init/initramfs.c
13939 state = SkipIt;
13940 next_state = Reset;
13941 return 0;
13942 -diff -urNp linux-2.6.32.28/init/Kconfig linux-2.6.32.28/init/Kconfig
13943 ---- linux-2.6.32.28/init/Kconfig 2010-08-13 16:24:37.000000000 -0400
13944 -+++ linux-2.6.32.28/init/Kconfig 2010-12-31 14:46:53.000000000 -0500
13945 -@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
13946 +diff -urNp linux-2.6.32.29/init/Kconfig linux-2.6.32.29/init/Kconfig
13947 +--- linux-2.6.32.29/init/Kconfig 2011-02-22 15:56:54.000000000 -0500
13948 ++++ linux-2.6.32.29/init/Kconfig 2011-02-22 15:57:24.000000000 -0500
13949 +@@ -1004,7 +1004,7 @@ config SLUB_DEBUG
13950
13951 config COMPAT_BRK
13952 bool "Disable heap randomization"
13953 @@ -50901,9 +51013,9 @@ diff -urNp linux-2.6.32.28/init/Kconfig linux-2.6.32.28/init/Kconfig
13954 help
13955 Randomizing heap placement makes heap exploits harder, but it
13956 also breaks ancient binaries (including anything libc5 based).
13957 -diff -urNp linux-2.6.32.28/init/main.c linux-2.6.32.28/init/main.c
13958 ---- linux-2.6.32.28/init/main.c 2010-08-13 16:24:37.000000000 -0400
13959 -+++ linux-2.6.32.28/init/main.c 2010-12-31 14:47:01.000000000 -0500
13960 +diff -urNp linux-2.6.32.29/init/main.c linux-2.6.32.29/init/main.c
13961 +--- linux-2.6.32.29/init/main.c 2010-08-13 16:24:37.000000000 -0400
13962 ++++ linux-2.6.32.29/init/main.c 2010-12-31 14:47:01.000000000 -0500
13963 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
13964 #ifdef CONFIG_TC
13965 extern void tc_init(void);
13966 @@ -51045,9 +51157,9 @@ diff -urNp linux-2.6.32.28/init/main.c linux-2.6.32.28/init/main.c
13967 /*
13968 * Ok, we have completed the initial bootup, and
13969 * we're essentially up and running. Get rid of the
13970 -diff -urNp linux-2.6.32.28/init/noinitramfs.c linux-2.6.32.28/init/noinitramfs.c
13971 ---- linux-2.6.32.28/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
13972 -+++ linux-2.6.32.28/init/noinitramfs.c 2010-12-31 14:46:53.000000000 -0500
13973 +diff -urNp linux-2.6.32.29/init/noinitramfs.c linux-2.6.32.29/init/noinitramfs.c
13974 +--- linux-2.6.32.29/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
13975 ++++ linux-2.6.32.29/init/noinitramfs.c 2010-12-31 14:46:53.000000000 -0500
13976 @@ -29,7 +29,7 @@ static int __init default_rootfs(void)
13977 {
13978 int err;
13979 @@ -51066,9 +51178,9 @@ diff -urNp linux-2.6.32.28/init/noinitramfs.c linux-2.6.32.28/init/noinitramfs.c
13980 if (err < 0)
13981 goto out;
13982
13983 -diff -urNp linux-2.6.32.28/ipc/ipc_sysctl.c linux-2.6.32.28/ipc/ipc_sysctl.c
13984 ---- linux-2.6.32.28/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
13985 -+++ linux-2.6.32.28/ipc/ipc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
13986 +diff -urNp linux-2.6.32.29/ipc/ipc_sysctl.c linux-2.6.32.29/ipc/ipc_sysctl.c
13987 +--- linux-2.6.32.29/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
13988 ++++ linux-2.6.32.29/ipc/ipc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
13989 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
13990 .extra1 = &zero,
13991 .extra2 = &one,
13992 @@ -51087,9 +51199,9 @@ diff -urNp linux-2.6.32.28/ipc/ipc_sysctl.c linux-2.6.32.28/ipc/ipc_sysctl.c
13993 };
13994
13995 static int __init ipc_sysctl_init(void)
13996 -diff -urNp linux-2.6.32.28/ipc/mqueue.c linux-2.6.32.28/ipc/mqueue.c
13997 ---- linux-2.6.32.28/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
13998 -+++ linux-2.6.32.28/ipc/mqueue.c 2010-12-31 14:46:53.000000000 -0500
13999 +diff -urNp linux-2.6.32.29/ipc/mqueue.c linux-2.6.32.29/ipc/mqueue.c
14000 +--- linux-2.6.32.29/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
14001 ++++ linux-2.6.32.29/ipc/mqueue.c 2010-12-31 14:46:53.000000000 -0500
14002 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
14003 mq_bytes = (mq_msg_tblsz +
14004 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
14005 @@ -51098,9 +51210,9 @@ diff -urNp linux-2.6.32.28/ipc/mqueue.c linux-2.6.32.28/ipc/mqueue.c
14006 spin_lock(&mq_lock);
14007 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
14008 u->mq_bytes + mq_bytes >
14009 -diff -urNp linux-2.6.32.28/ipc/shm.c linux-2.6.32.28/ipc/shm.c
14010 ---- linux-2.6.32.28/ipc/shm.c 2010-12-09 18:13:03.000000000 -0500
14011 -+++ linux-2.6.32.28/ipc/shm.c 2010-12-31 14:46:53.000000000 -0500
14012 +diff -urNp linux-2.6.32.29/ipc/shm.c linux-2.6.32.29/ipc/shm.c
14013 +--- linux-2.6.32.29/ipc/shm.c 2010-12-09 18:13:03.000000000 -0500
14014 ++++ linux-2.6.32.29/ipc/shm.c 2010-12-31 14:46:53.000000000 -0500
14015 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
14016 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
14017 #endif
14018 @@ -51153,9 +51265,9 @@ diff -urNp linux-2.6.32.28/ipc/shm.c linux-2.6.32.28/ipc/shm.c
14019 size = i_size_read(path.dentry->d_inode);
14020 shm_unlock(shp);
14021
14022 -diff -urNp linux-2.6.32.28/kernel/acct.c linux-2.6.32.28/kernel/acct.c
14023 ---- linux-2.6.32.28/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
14024 -+++ linux-2.6.32.28/kernel/acct.c 2010-12-31 14:46:53.000000000 -0500
14025 +diff -urNp linux-2.6.32.29/kernel/acct.c linux-2.6.32.29/kernel/acct.c
14026 +--- linux-2.6.32.29/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
14027 ++++ linux-2.6.32.29/kernel/acct.c 2010-12-31 14:46:53.000000000 -0500
14028 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
14029 */
14030 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
14031 @@ -51165,9 +51277,9 @@ diff -urNp linux-2.6.32.28/kernel/acct.c linux-2.6.32.28/kernel/acct.c
14032 sizeof(acct_t), &file->f_pos);
14033 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
14034 set_fs(fs);
14035 -diff -urNp linux-2.6.32.28/kernel/audit.c linux-2.6.32.28/kernel/audit.c
14036 ---- linux-2.6.32.28/kernel/audit.c 2010-08-13 16:24:37.000000000 -0400
14037 -+++ linux-2.6.32.28/kernel/audit.c 2010-12-31 14:46:53.000000000 -0500
14038 +diff -urNp linux-2.6.32.29/kernel/audit.c linux-2.6.32.29/kernel/audit.c
14039 +--- linux-2.6.32.29/kernel/audit.c 2010-08-13 16:24:37.000000000 -0400
14040 ++++ linux-2.6.32.29/kernel/audit.c 2010-12-31 14:46:53.000000000 -0500
14041 @@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b
14042 spin_unlock_irq(&tsk->sighand->siglock);
14043 }
14044 @@ -51181,10 +51293,10 @@ diff -urNp linux-2.6.32.28/kernel/audit.c linux-2.6.32.28/kernel/audit.c
14045 break;
14046 }
14047 case AUDIT_TTY_SET: {
14048 -diff -urNp linux-2.6.32.28/kernel/capability.c linux-2.6.32.28/kernel/capability.c
14049 ---- linux-2.6.32.28/kernel/capability.c 2010-08-13 16:24:37.000000000 -0400
14050 -+++ linux-2.6.32.28/kernel/capability.c 2011-01-01 00:05:48.000000000 -0500
14051 -@@ -306,10 +306,26 @@ int capable(int cap)
14052 +diff -urNp linux-2.6.32.29/kernel/capability.c linux-2.6.32.29/kernel/capability.c
14053 +--- linux-2.6.32.29/kernel/capability.c 2011-02-22 15:56:54.000000000 -0500
14054 ++++ linux-2.6.32.29/kernel/capability.c 2011-02-22 15:57:24.000000000 -0500
14055 +@@ -305,10 +305,26 @@ int capable(int cap)
14056 BUG();
14057 }
14058
14059 @@ -51212,9 +51324,9 @@ diff -urNp linux-2.6.32.28/kernel/capability.c linux-2.6.32.28/kernel/capability
14060 +
14061 EXPORT_SYMBOL(capable);
14062 +EXPORT_SYMBOL(capable_nolog);
14063 -diff -urNp linux-2.6.32.28/kernel/configs.c linux-2.6.32.28/kernel/configs.c
14064 ---- linux-2.6.32.28/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
14065 -+++ linux-2.6.32.28/kernel/configs.c 2010-12-31 14:46:53.000000000 -0500
14066 +diff -urNp linux-2.6.32.29/kernel/configs.c linux-2.6.32.29/kernel/configs.c
14067 +--- linux-2.6.32.29/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
14068 ++++ linux-2.6.32.29/kernel/configs.c 2010-12-31 14:46:53.000000000 -0500
14069 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
14070 struct proc_dir_entry *entry;
14071
14072 @@ -51235,9 +51347,9 @@ diff -urNp linux-2.6.32.28/kernel/configs.c linux-2.6.32.28/kernel/configs.c
14073 if (!entry)
14074 return -ENOMEM;
14075
14076 -diff -urNp linux-2.6.32.28/kernel/cpu.c linux-2.6.32.28/kernel/cpu.c
14077 ---- linux-2.6.32.28/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
14078 -+++ linux-2.6.32.28/kernel/cpu.c 2010-12-31 14:46:53.000000000 -0500
14079 +diff -urNp linux-2.6.32.29/kernel/cpu.c linux-2.6.32.29/kernel/cpu.c
14080 +--- linux-2.6.32.29/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
14081 ++++ linux-2.6.32.29/kernel/cpu.c 2010-12-31 14:46:53.000000000 -0500
14082 @@ -19,7 +19,7 @@
14083 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
14084 static DEFINE_MUTEX(cpu_add_remove_lock);
14085 @@ -51247,10 +51359,10 @@ diff -urNp linux-2.6.32.28/kernel/cpu.c linux-2.6.32.28/kernel/cpu.c
14086
14087 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
14088 * Should always be manipulated under cpu_add_remove_lock
14089 -diff -urNp linux-2.6.32.28/kernel/cred.c linux-2.6.32.28/kernel/cred.c
14090 ---- linux-2.6.32.28/kernel/cred.c 2010-08-13 16:24:37.000000000 -0400
14091 -+++ linux-2.6.32.28/kernel/cred.c 2011-02-12 10:44:11.000000000 -0500
14092 -@@ -231,13 +231,13 @@ struct cred *cred_alloc_blank(void)
14093 +diff -urNp linux-2.6.32.29/kernel/cred.c linux-2.6.32.29/kernel/cred.c
14094 +--- linux-2.6.32.29/kernel/cred.c 2011-02-22 15:56:54.000000000 -0500
14095 ++++ linux-2.6.32.29/kernel/cred.c 2011-02-22 15:57:24.000000000 -0500
14096 +@@ -230,13 +230,13 @@ struct cred *cred_alloc_blank(void)
14097 #endif
14098
14099 atomic_set(&new->usage, 1);
14100 @@ -51267,7 +51379,7 @@ diff -urNp linux-2.6.32.28/kernel/cred.c linux-2.6.32.28/kernel/cred.c
14101 return new;
14102
14103 error:
14104 -@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
14105 +@@ -519,6 +519,8 @@ int commit_creds(struct cred *new)
14106
14107 get_cred(new); /* we will require a ref for the subj creds too */
14108
14109 @@ -51276,7 +51388,7 @@ diff -urNp linux-2.6.32.28/kernel/cred.c linux-2.6.32.28/kernel/cred.c
14110 /* dumpability changes */
14111 if (old->euid != new->euid ||
14112 old->egid != new->egid ||
14113 -@@ -696,6 +698,8 @@ struct cred *prepare_kernel_cred(struct
14114 +@@ -693,6 +695,8 @@ struct cred *prepare_kernel_cred(struct
14115 validate_creds(old);
14116
14117 *new = *old;
14118 @@ -51285,7 +51397,7 @@ diff -urNp linux-2.6.32.28/kernel/cred.c linux-2.6.32.28/kernel/cred.c
14119 get_uid(new->user);
14120 get_group_info(new->group_info);
14121
14122 -@@ -713,8 +717,6 @@ struct cred *prepare_kernel_cred(struct
14123 +@@ -710,8 +714,6 @@ struct cred *prepare_kernel_cred(struct
14124 if (security_prepare_creds(new, old, GFP_KERNEL) < 0)
14125 goto error;
14126
14127 @@ -51294,7 +51406,7 @@ diff -urNp linux-2.6.32.28/kernel/cred.c linux-2.6.32.28/kernel/cred.c
14128 put_cred(old);
14129 validate_creds(new);
14130 return new;
14131 -@@ -787,7 +789,11 @@ bool creds_are_invalid(const struct cred
14132 +@@ -784,7 +786,11 @@ bool creds_are_invalid(const struct cred
14133 if (cred->magic != CRED_MAGIC)
14134 return true;
14135 #ifdef CONFIG_SECURITY_SELINUX
14136 @@ -51307,12 +51419,12 @@ diff -urNp linux-2.6.32.28/kernel/cred.c linux-2.6.32.28/kernel/cred.c
14137 if ((unsigned long) cred->security < PAGE_SIZE)
14138 return true;
14139 if ((*(u32 *)cred->security & 0xffffff00) ==
14140 -diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14141 ---- linux-2.6.32.28/kernel/exit.c 2011-01-11 23:55:35.000000000 -0500
14142 -+++ linux-2.6.32.28/kernel/exit.c 2010-12-31 14:46:53.000000000 -0500
14143 -@@ -56,6 +56,10 @@
14144 +diff -urNp linux-2.6.32.29/kernel/exit.c linux-2.6.32.29/kernel/exit.c
14145 +--- linux-2.6.32.29/kernel/exit.c 2011-02-22 15:56:54.000000000 -0500
14146 ++++ linux-2.6.32.29/kernel/exit.c 2011-02-22 15:58:29.000000000 -0500
14147 +@@ -55,6 +55,10 @@
14148 + #include <asm/pgtable.h>
14149 #include <asm/mmu_context.h>
14150 - #include "cred-internals.h"
14151
14152 +#ifdef CONFIG_GRKERNSEC
14153 +extern rwlock_t grsec_exec_file_lock;
14154 @@ -51321,7 +51433,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14155 static void exit_mm(struct task_struct * tsk);
14156
14157 static void __unhash_process(struct task_struct *p)
14158 -@@ -175,6 +179,8 @@ void release_task(struct task_struct * p
14159 +@@ -174,6 +178,8 @@ void release_task(struct task_struct * p
14160 struct task_struct *leader;
14161 int zap_leader;
14162 repeat:
14163 @@ -51330,7 +51442,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14164 tracehook_prepare_release_task(p);
14165 /* don't need to get the RCU readlock here - the process is dead and
14166 * can't be modifying its own credentials */
14167 -@@ -342,11 +348,22 @@ static void reparent_to_kthreadd(void)
14168 +@@ -341,11 +347,22 @@ static void reparent_to_kthreadd(void)
14169 {
14170 write_lock_irq(&tasklist_lock);
14171
14172 @@ -51353,7 +51465,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14173 /* Set the exit signal to SIGCHLD so we signal init on exit */
14174 current->exit_signal = SIGCHLD;
14175
14176 -@@ -398,7 +415,7 @@ int allow_signal(int sig)
14177 +@@ -397,7 +414,7 @@ int allow_signal(int sig)
14178 * know it'll be handled, so that they don't get converted to
14179 * SIGKILL or just silently dropped.
14180 */
14181 @@ -51362,7 +51474,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14182 recalc_sigpending();
14183 spin_unlock_irq(&current->sighand->siglock);
14184 return 0;
14185 -@@ -434,6 +451,17 @@ void daemonize(const char *name, ...)
14186 +@@ -433,6 +450,17 @@ void daemonize(const char *name, ...)
14187 vsnprintf(current->comm, sizeof(current->comm), name, args);
14188 va_end(args);
14189
14190 @@ -51380,7 +51492,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14191 /*
14192 * If we were started as result of loading a module, close all of the
14193 * user space pages. We don't need them, and if we didn't close them
14194 -@@ -898,17 +926,17 @@ NORET_TYPE void do_exit(long code)
14195 +@@ -897,17 +925,17 @@ NORET_TYPE void do_exit(long code)
14196 struct task_struct *tsk = current;
14197 int group_dead;
14198
14199 @@ -51405,7 +51517,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14200 * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
14201 * continuing. Amongst other possible reasons, this is to prevent
14202 * mm_release()->clear_child_tid() from writing to a user-controlled
14203 -@@ -916,6 +944,13 @@ NORET_TYPE void do_exit(long code)
14204 +@@ -915,6 +943,13 @@ NORET_TYPE void do_exit(long code)
14205 */
14206 set_fs(USER_DS);
14207
14208 @@ -51419,7 +51531,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14209 tracehook_report_exit(&code);
14210
14211 validate_creds_for_do_exit(tsk);
14212 -@@ -974,6 +1009,9 @@ NORET_TYPE void do_exit(long code)
14213 +@@ -973,6 +1008,9 @@ NORET_TYPE void do_exit(long code)
14214 tsk->exit_code = code;
14215 taskstats_exit(tsk, group_dead);
14216
14217 @@ -51429,7 +51541,7 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14218 exit_mm(tsk);
14219
14220 if (group_dead)
14221 -@@ -1189,7 +1227,7 @@ static int wait_task_zombie(struct wait_
14222 +@@ -1188,7 +1226,7 @@ static int wait_task_zombie(struct wait_
14223
14224 if (unlikely(wo->wo_flags & WNOWAIT)) {
14225 int exit_code = p->exit_code;
14226 @@ -51438,9 +51550,9 @@ diff -urNp linux-2.6.32.28/kernel/exit.c linux-2.6.32.28/kernel/exit.c
14227
14228 get_task_struct(p);
14229 read_unlock(&tasklist_lock);
14230 -diff -urNp linux-2.6.32.28/kernel/fork.c linux-2.6.32.28/kernel/fork.c
14231 ---- linux-2.6.32.28/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
14232 -+++ linux-2.6.32.28/kernel/fork.c 2010-12-31 14:46:53.000000000 -0500
14233 +diff -urNp linux-2.6.32.29/kernel/fork.c linux-2.6.32.29/kernel/fork.c
14234 +--- linux-2.6.32.29/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
14235 ++++ linux-2.6.32.29/kernel/fork.c 2010-12-31 14:46:53.000000000 -0500
14236 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
14237 *stackend = STACK_END_MAGIC; /* for overflow detection */
14238
14239 @@ -51579,9 +51691,9 @@ diff -urNp linux-2.6.32.28/kernel/fork.c linux-2.6.32.28/kernel/fork.c
14240 new_fs = NULL;
14241 else
14242 new_fs = fs;
14243 -diff -urNp linux-2.6.32.28/kernel/futex.c linux-2.6.32.28/kernel/futex.c
14244 ---- linux-2.6.32.28/kernel/futex.c 2010-11-26 18:22:29.000000000 -0500
14245 -+++ linux-2.6.32.28/kernel/futex.c 2010-12-31 14:47:01.000000000 -0500
14246 +diff -urNp linux-2.6.32.29/kernel/futex.c linux-2.6.32.29/kernel/futex.c
14247 +--- linux-2.6.32.29/kernel/futex.c 2010-11-26 18:22:29.000000000 -0500
14248 ++++ linux-2.6.32.29/kernel/futex.c 2010-12-31 14:47:01.000000000 -0500
14249 @@ -54,6 +54,7 @@
14250 #include <linux/mount.h>
14251 #include <linux/pagemap.h>
14252 @@ -51666,9 +51778,9 @@ diff -urNp linux-2.6.32.28/kernel/futex.c linux-2.6.32.28/kernel/futex.c
14253 if (curval == -EFAULT)
14254 futex_cmpxchg_enabled = 1;
14255
14256 -diff -urNp linux-2.6.32.28/kernel/futex_compat.c linux-2.6.32.28/kernel/futex_compat.c
14257 ---- linux-2.6.32.28/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
14258 -+++ linux-2.6.32.28/kernel/futex_compat.c 2010-12-31 14:46:53.000000000 -0500
14259 +diff -urNp linux-2.6.32.29/kernel/futex_compat.c linux-2.6.32.29/kernel/futex_compat.c
14260 +--- linux-2.6.32.29/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
14261 ++++ linux-2.6.32.29/kernel/futex_compat.c 2010-12-31 14:46:53.000000000 -0500
14262 @@ -10,6 +10,7 @@
14263 #include <linux/compat.h>
14264 #include <linux/nsproxy.h>
14265 @@ -51706,9 +51818,9 @@ diff -urNp linux-2.6.32.28/kernel/futex_compat.c linux-2.6.32.28/kernel/futex_co
14266 head = p->compat_robust_list;
14267 read_unlock(&tasklist_lock);
14268 }
14269 -diff -urNp linux-2.6.32.28/kernel/gcov/base.c linux-2.6.32.28/kernel/gcov/base.c
14270 ---- linux-2.6.32.28/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
14271 -+++ linux-2.6.32.28/kernel/gcov/base.c 2010-12-31 14:46:53.000000000 -0500
14272 +diff -urNp linux-2.6.32.29/kernel/gcov/base.c linux-2.6.32.29/kernel/gcov/base.c
14273 +--- linux-2.6.32.29/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
14274 ++++ linux-2.6.32.29/kernel/gcov/base.c 2010-12-31 14:46:53.000000000 -0500
14275 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
14276 }
14277
14278 @@ -51730,9 +51842,9 @@ diff -urNp linux-2.6.32.28/kernel/gcov/base.c linux-2.6.32.28/kernel/gcov/base.c
14279 if (prev)
14280 prev->next = info->next;
14281 else
14282 -diff -urNp linux-2.6.32.28/kernel/hrtimer.c linux-2.6.32.28/kernel/hrtimer.c
14283 ---- linux-2.6.32.28/kernel/hrtimer.c 2010-10-31 16:44:11.000000000 -0400
14284 -+++ linux-2.6.32.28/kernel/hrtimer.c 2010-12-31 14:46:53.000000000 -0500
14285 +diff -urNp linux-2.6.32.29/kernel/hrtimer.c linux-2.6.32.29/kernel/hrtimer.c
14286 +--- linux-2.6.32.29/kernel/hrtimer.c 2010-10-31 16:44:11.000000000 -0400
14287 ++++ linux-2.6.32.29/kernel/hrtimer.c 2010-12-31 14:46:53.000000000 -0500
14288 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
14289 local_irq_restore(flags);
14290 }
14291 @@ -51742,9 +51854,9 @@ diff -urNp linux-2.6.32.28/kernel/hrtimer.c linux-2.6.32.28/kernel/hrtimer.c
14292 {
14293 hrtimer_peek_ahead_timers();
14294 }
14295 -diff -urNp linux-2.6.32.28/kernel/kallsyms.c linux-2.6.32.28/kernel/kallsyms.c
14296 ---- linux-2.6.32.28/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
14297 -+++ linux-2.6.32.28/kernel/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
14298 +diff -urNp linux-2.6.32.29/kernel/kallsyms.c linux-2.6.32.29/kernel/kallsyms.c
14299 +--- linux-2.6.32.29/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
14300 ++++ linux-2.6.32.29/kernel/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
14301 @@ -11,6 +11,9 @@
14302 * Changed the compression method from stem compression to "table lookup"
14303 * compression (see scripts/kallsyms.c for a more complete description)
14304 @@ -51847,9 +51959,9 @@ diff -urNp linux-2.6.32.28/kernel/kallsyms.c linux-2.6.32.28/kernel/kallsyms.c
14305 if (!iter)
14306 return -ENOMEM;
14307 reset_iter(iter, 0);
14308 -diff -urNp linux-2.6.32.28/kernel/kgdb.c linux-2.6.32.28/kernel/kgdb.c
14309 ---- linux-2.6.32.28/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
14310 -+++ linux-2.6.32.28/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
14311 +diff -urNp linux-2.6.32.29/kernel/kgdb.c linux-2.6.32.29/kernel/kgdb.c
14312 +--- linux-2.6.32.29/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
14313 ++++ linux-2.6.32.29/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
14314 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
14315 /* Guard for recursive entry */
14316 static int exception_level;
14317 @@ -51877,9 +51989,9 @@ diff -urNp linux-2.6.32.28/kernel/kgdb.c linux-2.6.32.28/kernel/kgdb.c
14318 {
14319 BUG_ON(kgdb_connected);
14320
14321 -diff -urNp linux-2.6.32.28/kernel/kmod.c linux-2.6.32.28/kernel/kmod.c
14322 ---- linux-2.6.32.28/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
14323 -+++ linux-2.6.32.28/kernel/kmod.c 2011-02-12 10:58:19.000000000 -0500
14324 +diff -urNp linux-2.6.32.29/kernel/kmod.c linux-2.6.32.29/kernel/kmod.c
14325 +--- linux-2.6.32.29/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
14326 ++++ linux-2.6.32.29/kernel/kmod.c 2011-02-12 10:58:19.000000000 -0500
14327 @@ -90,6 +90,28 @@ int __request_module(bool wait, const ch
14328 if (ret >= MODULE_NAME_LEN)
14329 return -ENAMETOOLONG;
14330 @@ -51909,9 +52021,9 @@ diff -urNp linux-2.6.32.28/kernel/kmod.c linux-2.6.32.28/kernel/kmod.c
14331 /* If modprobe needs a service that is in a module, we get a recursive
14332 * loop. Limit the number of running kmod threads to max_threads/2 or
14333 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
14334 -diff -urNp linux-2.6.32.28/kernel/kprobes.c linux-2.6.32.28/kernel/kprobes.c
14335 ---- linux-2.6.32.28/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
14336 -+++ linux-2.6.32.28/kernel/kprobes.c 2010-12-31 14:46:53.000000000 -0500
14337 +diff -urNp linux-2.6.32.29/kernel/kprobes.c linux-2.6.32.29/kernel/kprobes.c
14338 +--- linux-2.6.32.29/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
14339 ++++ linux-2.6.32.29/kernel/kprobes.c 2010-12-31 14:46:53.000000000 -0500
14340 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
14341 * kernel image and loaded module images reside. This is required
14342 * so x86_64 can correctly handle the %rip-relative fixups.
14343 @@ -51948,9 +52060,9 @@ diff -urNp linux-2.6.32.28/kernel/kprobes.c linux-2.6.32.28/kernel/kprobes.c
14344
14345 head = &kprobe_table[i];
14346 preempt_disable();
14347 -diff -urNp linux-2.6.32.28/kernel/lockdep.c linux-2.6.32.28/kernel/lockdep.c
14348 ---- linux-2.6.32.28/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
14349 -+++ linux-2.6.32.28/kernel/lockdep.c 2010-12-31 14:46:53.000000000 -0500
14350 +diff -urNp linux-2.6.32.29/kernel/lockdep.c linux-2.6.32.29/kernel/lockdep.c
14351 +--- linux-2.6.32.29/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
14352 ++++ linux-2.6.32.29/kernel/lockdep.c 2010-12-31 14:46:53.000000000 -0500
14353 @@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
14354 /*
14355 * Various lockdep statistics:
14356 @@ -52024,9 +52136,9 @@ diff -urNp linux-2.6.32.28/kernel/lockdep.c linux-2.6.32.28/kernel/lockdep.c
14357 if (very_verbose(class)) {
14358 printk("\nacquire class [%p] %s", class->key, class->name);
14359 if (class->name_version > 1)
14360 -diff -urNp linux-2.6.32.28/kernel/lockdep_internals.h linux-2.6.32.28/kernel/lockdep_internals.h
14361 ---- linux-2.6.32.28/kernel/lockdep_internals.h 2010-08-13 16:24:37.000000000 -0400
14362 -+++ linux-2.6.32.28/kernel/lockdep_internals.h 2010-12-31 14:46:53.000000000 -0500
14363 +diff -urNp linux-2.6.32.29/kernel/lockdep_internals.h linux-2.6.32.29/kernel/lockdep_internals.h
14364 +--- linux-2.6.32.29/kernel/lockdep_internals.h 2010-08-13 16:24:37.000000000 -0400
14365 ++++ linux-2.6.32.29/kernel/lockdep_internals.h 2010-12-31 14:46:53.000000000 -0500
14366 @@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
14367 /*
14368 * Various lockdep statistics:
14369 @@ -52074,9 +52186,9 @@ diff -urNp linux-2.6.32.28/kernel/lockdep_internals.h linux-2.6.32.28/kernel/loc
14370 #else
14371 # define debug_atomic_inc(ptr) do { } while (0)
14372 # define debug_atomic_dec(ptr) do { } while (0)
14373 -diff -urNp linux-2.6.32.28/kernel/lockdep_proc.c linux-2.6.32.28/kernel/lockdep_proc.c
14374 ---- linux-2.6.32.28/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
14375 -+++ linux-2.6.32.28/kernel/lockdep_proc.c 2010-12-31 14:46:53.000000000 -0500
14376 +diff -urNp linux-2.6.32.29/kernel/lockdep_proc.c linux-2.6.32.29/kernel/lockdep_proc.c
14377 +--- linux-2.6.32.29/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
14378 ++++ linux-2.6.32.29/kernel/lockdep_proc.c 2010-12-31 14:46:53.000000000 -0500
14379 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
14380
14381 static void print_name(struct seq_file *m, struct lock_class *class)
14382 @@ -52086,9 +52198,9 @@ diff -urNp linux-2.6.32.28/kernel/lockdep_proc.c linux-2.6.32.28/kernel/lockdep_
14383 const char *name = class->name;
14384
14385 if (!name) {
14386 -diff -urNp linux-2.6.32.28/kernel/module.c linux-2.6.32.28/kernel/module.c
14387 ---- linux-2.6.32.28/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
14388 -+++ linux-2.6.32.28/kernel/module.c 2011-02-02 20:27:32.000000000 -0500
14389 +diff -urNp linux-2.6.32.29/kernel/module.c linux-2.6.32.29/kernel/module.c
14390 +--- linux-2.6.32.29/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
14391 ++++ linux-2.6.32.29/kernel/module.c 2011-02-02 20:27:32.000000000 -0500
14392 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
14393 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
14394
14395 @@ -52641,9 +52753,9 @@ diff -urNp linux-2.6.32.28/kernel/module.c linux-2.6.32.28/kernel/module.c
14396 mod = NULL;
14397 }
14398 return mod;
14399 -diff -urNp linux-2.6.32.28/kernel/panic.c linux-2.6.32.28/kernel/panic.c
14400 ---- linux-2.6.32.28/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
14401 -+++ linux-2.6.32.28/kernel/panic.c 2010-12-31 14:46:53.000000000 -0500
14402 +diff -urNp linux-2.6.32.29/kernel/panic.c linux-2.6.32.29/kernel/panic.c
14403 +--- linux-2.6.32.29/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
14404 ++++ linux-2.6.32.29/kernel/panic.c 2010-12-31 14:46:53.000000000 -0500
14405 @@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
14406 const char *board;
14407
14408 @@ -52663,9 +52775,9 @@ diff -urNp linux-2.6.32.28/kernel/panic.c linux-2.6.32.28/kernel/panic.c
14409 __builtin_return_address(0));
14410 }
14411 EXPORT_SYMBOL(__stack_chk_fail);
14412 -diff -urNp linux-2.6.32.28/kernel/params.c linux-2.6.32.28/kernel/params.c
14413 ---- linux-2.6.32.28/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
14414 -+++ linux-2.6.32.28/kernel/params.c 2010-12-31 14:46:53.000000000 -0500
14415 +diff -urNp linux-2.6.32.29/kernel/params.c linux-2.6.32.29/kernel/params.c
14416 +--- linux-2.6.32.29/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
14417 ++++ linux-2.6.32.29/kernel/params.c 2010-12-31 14:46:53.000000000 -0500
14418 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
14419 return ret;
14420 }
14421 @@ -52684,9 +52796,9 @@ diff -urNp linux-2.6.32.28/kernel/params.c linux-2.6.32.28/kernel/params.c
14422 .filter = uevent_filter,
14423 };
14424
14425 -diff -urNp linux-2.6.32.28/kernel/pid.c linux-2.6.32.28/kernel/pid.c
14426 ---- linux-2.6.32.28/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
14427 -+++ linux-2.6.32.28/kernel/pid.c 2010-12-31 14:46:53.000000000 -0500
14428 +diff -urNp linux-2.6.32.29/kernel/pid.c linux-2.6.32.29/kernel/pid.c
14429 +--- linux-2.6.32.29/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
14430 ++++ linux-2.6.32.29/kernel/pid.c 2010-12-31 14:46:53.000000000 -0500
14431 @@ -33,6 +33,7 @@
14432 #include <linux/rculist.h>
14433 #include <linux/bootmem.h>
14434 @@ -52720,9 +52832,9 @@ diff -urNp linux-2.6.32.28/kernel/pid.c linux-2.6.32.28/kernel/pid.c
14435 }
14436
14437 struct task_struct *find_task_by_vpid(pid_t vnr)
14438 -diff -urNp linux-2.6.32.28/kernel/posix-cpu-timers.c linux-2.6.32.28/kernel/posix-cpu-timers.c
14439 ---- linux-2.6.32.28/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
14440 -+++ linux-2.6.32.28/kernel/posix-cpu-timers.c 2010-12-31 14:46:53.000000000 -0500
14441 +diff -urNp linux-2.6.32.29/kernel/posix-cpu-timers.c linux-2.6.32.29/kernel/posix-cpu-timers.c
14442 +--- linux-2.6.32.29/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
14443 ++++ linux-2.6.32.29/kernel/posix-cpu-timers.c 2010-12-31 14:46:53.000000000 -0500
14444 @@ -6,6 +6,7 @@
14445 #include <linux/posix-timers.h>
14446 #include <linux/errno.h>
14447 @@ -52731,9 +52843,9 @@ diff -urNp linux-2.6.32.28/kernel/posix-cpu-timers.c linux-2.6.32.28/kernel/posi
14448 #include <asm/uaccess.h>
14449 #include <linux/kernel_stat.h>
14450 #include <trace/events/timer.h>
14451 -diff -urNp linux-2.6.32.28/kernel/posix-timers.c linux-2.6.32.28/kernel/posix-timers.c
14452 ---- linux-2.6.32.28/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400
14453 -+++ linux-2.6.32.28/kernel/posix-timers.c 2011-01-02 11:29:16.000000000 -0500
14454 +diff -urNp linux-2.6.32.29/kernel/posix-timers.c linux-2.6.32.29/kernel/posix-timers.c
14455 +--- linux-2.6.32.29/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400
14456 ++++ linux-2.6.32.29/kernel/posix-timers.c 2011-01-02 11:29:16.000000000 -0500
14457 @@ -42,6 +42,7 @@
14458 #include <linux/compiler.h>
14459 #include <linux/idr.h>
14460 @@ -52756,9 +52868,9 @@ diff -urNp linux-2.6.32.28/kernel/posix-timers.c linux-2.6.32.28/kernel/posix-ti
14461 return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
14462 }
14463
14464 -diff -urNp linux-2.6.32.28/kernel/power/hibernate.c linux-2.6.32.28/kernel/power/hibernate.c
14465 ---- linux-2.6.32.28/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
14466 -+++ linux-2.6.32.28/kernel/power/hibernate.c 2010-12-31 14:46:53.000000000 -0500
14467 +diff -urNp linux-2.6.32.29/kernel/power/hibernate.c linux-2.6.32.29/kernel/power/hibernate.c
14468 +--- linux-2.6.32.29/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
14469 ++++ linux-2.6.32.29/kernel/power/hibernate.c 2010-12-31 14:46:53.000000000 -0500
14470 @@ -48,14 +48,14 @@ enum {
14471
14472 static int hibernation_mode = HIBERNATION_SHUTDOWN;
14473 @@ -52776,9 +52888,9 @@ diff -urNp linux-2.6.32.28/kernel/power/hibernate.c linux-2.6.32.28/kernel/power
14474 {
14475 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
14476 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
14477 -diff -urNp linux-2.6.32.28/kernel/power/poweroff.c linux-2.6.32.28/kernel/power/poweroff.c
14478 ---- linux-2.6.32.28/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
14479 -+++ linux-2.6.32.28/kernel/power/poweroff.c 2010-12-31 14:46:53.000000000 -0500
14480 +diff -urNp linux-2.6.32.29/kernel/power/poweroff.c linux-2.6.32.29/kernel/power/poweroff.c
14481 +--- linux-2.6.32.29/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
14482 ++++ linux-2.6.32.29/kernel/power/poweroff.c 2010-12-31 14:46:53.000000000 -0500
14483 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
14484 .enable_mask = SYSRQ_ENABLE_BOOT,
14485 };
14486 @@ -52788,9 +52900,9 @@ diff -urNp linux-2.6.32.28/kernel/power/poweroff.c linux-2.6.32.28/kernel/power/
14487 {
14488 register_sysrq_key('o', &sysrq_poweroff_op);
14489 return 0;
14490 -diff -urNp linux-2.6.32.28/kernel/power/process.c linux-2.6.32.28/kernel/power/process.c
14491 ---- linux-2.6.32.28/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
14492 -+++ linux-2.6.32.28/kernel/power/process.c 2010-12-31 14:46:53.000000000 -0500
14493 +diff -urNp linux-2.6.32.29/kernel/power/process.c linux-2.6.32.29/kernel/power/process.c
14494 +--- linux-2.6.32.29/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
14495 ++++ linux-2.6.32.29/kernel/power/process.c 2010-12-31 14:46:53.000000000 -0500
14496 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
14497 struct timeval start, end;
14498 u64 elapsed_csecs64;
14499 @@ -52830,9 +52942,9 @@ diff -urNp linux-2.6.32.28/kernel/power/process.c linux-2.6.32.28/kernel/power/p
14500
14501 do_gettimeofday(&end);
14502 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
14503 -diff -urNp linux-2.6.32.28/kernel/power/suspend.c linux-2.6.32.28/kernel/power/suspend.c
14504 ---- linux-2.6.32.28/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
14505 -+++ linux-2.6.32.28/kernel/power/suspend.c 2010-12-31 14:46:53.000000000 -0500
14506 +diff -urNp linux-2.6.32.29/kernel/power/suspend.c linux-2.6.32.29/kernel/power/suspend.c
14507 +--- linux-2.6.32.29/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
14508 ++++ linux-2.6.32.29/kernel/power/suspend.c 2010-12-31 14:46:53.000000000 -0500
14509 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
14510 [PM_SUSPEND_MEM] = "mem",
14511 };
14512 @@ -52849,9 +52961,9 @@ diff -urNp linux-2.6.32.28/kernel/power/suspend.c linux-2.6.32.28/kernel/power/s
14513 {
14514 mutex_lock(&pm_mutex);
14515 suspend_ops = ops;
14516 -diff -urNp linux-2.6.32.28/kernel/printk.c linux-2.6.32.28/kernel/printk.c
14517 ---- linux-2.6.32.28/kernel/printk.c 2011-01-11 23:55:35.000000000 -0500
14518 -+++ linux-2.6.32.28/kernel/printk.c 2011-01-11 23:56:06.000000000 -0500
14519 +diff -urNp linux-2.6.32.29/kernel/printk.c linux-2.6.32.29/kernel/printk.c
14520 +--- linux-2.6.32.29/kernel/printk.c 2011-01-11 23:55:35.000000000 -0500
14521 ++++ linux-2.6.32.29/kernel/printk.c 2011-01-11 23:56:06.000000000 -0500
14522 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
14523 char c;
14524 int error = 0;
14525 @@ -52864,9 +52976,9 @@ diff -urNp linux-2.6.32.28/kernel/printk.c linux-2.6.32.28/kernel/printk.c
14526 error = security_syslog(type);
14527 if (error)
14528 return error;
14529 -diff -urNp linux-2.6.32.28/kernel/ptrace.c linux-2.6.32.28/kernel/ptrace.c
14530 ---- linux-2.6.32.28/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
14531 -+++ linux-2.6.32.28/kernel/ptrace.c 2011-02-12 10:37:47.000000000 -0500
14532 +diff -urNp linux-2.6.32.29/kernel/ptrace.c linux-2.6.32.29/kernel/ptrace.c
14533 +--- linux-2.6.32.29/kernel/ptrace.c 2011-02-22 15:56:54.000000000 -0500
14534 ++++ linux-2.6.32.29/kernel/ptrace.c 2011-02-12 10:37:47.000000000 -0500
14535 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
14536 cred->gid != tcred->egid ||
14537 cred->gid != tcred->sgid ||
14538 @@ -52894,15 +53006,6 @@ diff -urNp linux-2.6.32.28/kernel/ptrace.c linux-2.6.32.28/kernel/ptrace.c
14539 task->ptrace |= PT_PTRACE_CAP;
14540
14541 __ptrace_link(task, current);
14542 -@@ -314,7 +314,7 @@ int ptrace_detach(struct task_struct *ch
14543 - child->exit_code = data;
14544 - dead = __ptrace_detach(current, child);
14545 - if (!child->exit_state)
14546 -- wake_up_process(child);
14547 -+ wake_up_state(child, TASK_TRACED | TASK_STOPPED);
14548 - }
14549 - write_unlock_irq(&tasklist_lock);
14550 -
14551 @@ -532,18 +532,18 @@ int ptrace_request(struct task_struct *c
14552 ret = ptrace_setoptions(child, data);
14553 break;
14554 @@ -52980,9 +53083,9 @@ diff -urNp linux-2.6.32.28/kernel/ptrace.c linux-2.6.32.28/kernel/ptrace.c
14555 goto out_put_task_struct;
14556 }
14557
14558 -diff -urNp linux-2.6.32.28/kernel/rcutree.c linux-2.6.32.28/kernel/rcutree.c
14559 ---- linux-2.6.32.28/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
14560 -+++ linux-2.6.32.28/kernel/rcutree.c 2010-12-31 14:46:53.000000000 -0500
14561 +diff -urNp linux-2.6.32.29/kernel/rcutree.c linux-2.6.32.29/kernel/rcutree.c
14562 +--- linux-2.6.32.29/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
14563 ++++ linux-2.6.32.29/kernel/rcutree.c 2010-12-31 14:46:53.000000000 -0500
14564 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
14565 /*
14566 * Do softirq processing for the current CPU.
14567 @@ -52992,9 +53095,9 @@ diff -urNp linux-2.6.32.28/kernel/rcutree.c linux-2.6.32.28/kernel/rcutree.c
14568 {
14569 /*
14570 * Memory references from any prior RCU read-side critical sections
14571 -diff -urNp linux-2.6.32.28/kernel/rcutree_plugin.h linux-2.6.32.28/kernel/rcutree_plugin.h
14572 ---- linux-2.6.32.28/kernel/rcutree_plugin.h 2010-08-13 16:24:37.000000000 -0400
14573 -+++ linux-2.6.32.28/kernel/rcutree_plugin.h 2010-12-31 14:47:01.000000000 -0500
14574 +diff -urNp linux-2.6.32.29/kernel/rcutree_plugin.h linux-2.6.32.29/kernel/rcutree_plugin.h
14575 +--- linux-2.6.32.29/kernel/rcutree_plugin.h 2010-08-13 16:24:37.000000000 -0400
14576 ++++ linux-2.6.32.29/kernel/rcutree_plugin.h 2010-12-31 14:47:01.000000000 -0500
14577 @@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
14578 */
14579 void __rcu_read_lock(void)
14580 @@ -53013,9 +53116,9 @@ diff -urNp linux-2.6.32.28/kernel/rcutree_plugin.h linux-2.6.32.28/kernel/rcutre
14581 unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
14582 rcu_read_unlock_special(t);
14583 }
14584 -diff -urNp linux-2.6.32.28/kernel/relay.c linux-2.6.32.28/kernel/relay.c
14585 ---- linux-2.6.32.28/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
14586 -+++ linux-2.6.32.28/kernel/relay.c 2010-12-31 14:46:53.000000000 -0500
14587 +diff -urNp linux-2.6.32.29/kernel/relay.c linux-2.6.32.29/kernel/relay.c
14588 +--- linux-2.6.32.29/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
14589 ++++ linux-2.6.32.29/kernel/relay.c 2010-12-31 14:46:53.000000000 -0500
14590 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
14591 unsigned int flags,
14592 int *nonpad_ret)
14593 @@ -53033,9 +53136,9 @@ diff -urNp linux-2.6.32.28/kernel/relay.c linux-2.6.32.28/kernel/relay.c
14594
14595 if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
14596 return 0;
14597 -diff -urNp linux-2.6.32.28/kernel/resource.c linux-2.6.32.28/kernel/resource.c
14598 ---- linux-2.6.32.28/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
14599 -+++ linux-2.6.32.28/kernel/resource.c 2010-12-31 14:46:53.000000000 -0500
14600 +diff -urNp linux-2.6.32.29/kernel/resource.c linux-2.6.32.29/kernel/resource.c
14601 +--- linux-2.6.32.29/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
14602 ++++ linux-2.6.32.29/kernel/resource.c 2010-12-31 14:46:53.000000000 -0500
14603 @@ -132,8 +132,18 @@ static const struct file_operations proc
14604
14605 static int __init ioresources_init(void)
14606 @@ -53055,9 +53158,9 @@ diff -urNp linux-2.6.32.28/kernel/resource.c linux-2.6.32.28/kernel/resource.c
14607 return 0;
14608 }
14609 __initcall(ioresources_init);
14610 -diff -urNp linux-2.6.32.28/kernel/rtmutex.c linux-2.6.32.28/kernel/rtmutex.c
14611 ---- linux-2.6.32.28/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400
14612 -+++ linux-2.6.32.28/kernel/rtmutex.c 2010-12-31 14:46:53.000000000 -0500
14613 +diff -urNp linux-2.6.32.29/kernel/rtmutex.c linux-2.6.32.29/kernel/rtmutex.c
14614 +--- linux-2.6.32.29/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400
14615 ++++ linux-2.6.32.29/kernel/rtmutex.c 2010-12-31 14:46:53.000000000 -0500
14616 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
14617 */
14618 spin_lock_irqsave(&pendowner->pi_lock, flags);
14619 @@ -53067,10 +53170,10 @@ diff -urNp linux-2.6.32.28/kernel/rtmutex.c linux-2.6.32.28/kernel/rtmutex.c
14620 WARN_ON(pendowner->pi_blocked_on != waiter);
14621 WARN_ON(pendowner->pi_blocked_on->lock != lock);
14622
14623 -diff -urNp linux-2.6.32.28/kernel/sched.c linux-2.6.32.28/kernel/sched.c
14624 ---- linux-2.6.32.28/kernel/sched.c 2010-11-26 18:22:29.000000000 -0500
14625 -+++ linux-2.6.32.28/kernel/sched.c 2010-12-31 14:46:53.000000000 -0500
14626 -@@ -4904,7 +4904,7 @@ out:
14627 +diff -urNp linux-2.6.32.29/kernel/sched.c linux-2.6.32.29/kernel/sched.c
14628 +--- linux-2.6.32.29/kernel/sched.c 2011-02-22 15:56:54.000000000 -0500
14629 ++++ linux-2.6.32.29/kernel/sched.c 2011-02-22 15:57:40.000000000 -0500
14630 +@@ -5043,7 +5043,7 @@ out:
14631 * In CONFIG_NO_HZ case, the idle load balance owner will do the
14632 * rebalancing for all the cpus for whom scheduler ticks are stopped.
14633 */
14634 @@ -53079,7 +53182,7 @@ diff -urNp linux-2.6.32.28/kernel/sched.c linux-2.6.32.28/kernel/sched.c
14635 {
14636 int this_cpu = smp_processor_id();
14637 struct rq *this_rq = cpu_rq(this_cpu);
14638 -@@ -6220,6 +6220,8 @@ int can_nice(const struct task_struct *p
14639 +@@ -6359,6 +6359,8 @@ int can_nice(const struct task_struct *p
14640 /* convert nice value [19,-20] to rlimit style value [1,40] */
14641 int nice_rlim = 20 - nice;
14642
14643 @@ -53088,7 +53191,7 @@ diff -urNp linux-2.6.32.28/kernel/sched.c linux-2.6.32.28/kernel/sched.c
14644 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
14645 capable(CAP_SYS_NICE));
14646 }
14647 -@@ -6253,7 +6255,8 @@ SYSCALL_DEFINE1(nice, int, increment)
14648 +@@ -6392,7 +6394,8 @@ SYSCALL_DEFINE1(nice, int, increment)
14649 if (nice > 19)
14650 nice = 19;
14651
14652 @@ -53098,7 +53201,7 @@ diff -urNp linux-2.6.32.28/kernel/sched.c linux-2.6.32.28/kernel/sched.c
14653 return -EPERM;
14654
14655 retval = security_task_setnice(current, nice);
14656 -@@ -7549,7 +7552,7 @@ static struct ctl_table sd_ctl_dir[] = {
14657 +@@ -7700,7 +7703,7 @@ static struct ctl_table sd_ctl_dir[] = {
14658 .procname = "sched_domain",
14659 .mode = 0555,
14660 },
14661 @@ -53107,7 +53210,7 @@ diff -urNp linux-2.6.32.28/kernel/sched.c linux-2.6.32.28/kernel/sched.c
14662 };
14663
14664 static struct ctl_table sd_ctl_root[] = {
14665 -@@ -7559,7 +7562,7 @@ static struct ctl_table sd_ctl_root[] =
14666 +@@ -7710,7 +7713,7 @@ static struct ctl_table sd_ctl_root[] =
14667 .mode = 0555,
14668 .child = sd_ctl_dir,
14669 },
14670 @@ -53116,7 +53219,7 @@ diff -urNp linux-2.6.32.28/kernel/sched.c linux-2.6.32.28/kernel/sched.c
14671 };
14672
14673 static struct ctl_table *sd_alloc_ctl_entry(int n)
14674 -@@ -8623,7 +8626,7 @@ static void init_sched_groups_power(int
14675 +@@ -8774,7 +8777,7 @@ static void init_sched_groups_power(int
14676 long power;
14677 int weight;
14678
14679 @@ -53125,9 +53228,9 @@ diff -urNp linux-2.6.32.28/kernel/sched.c linux-2.6.32.28/kernel/sched.c
14680
14681 if (cpu != group_first_cpu(sd->groups))
14682 return;
14683 -diff -urNp linux-2.6.32.28/kernel/signal.c linux-2.6.32.28/kernel/signal.c
14684 ---- linux-2.6.32.28/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
14685 -+++ linux-2.6.32.28/kernel/signal.c 2011-02-12 11:22:46.000000000 -0500
14686 +diff -urNp linux-2.6.32.29/kernel/signal.c linux-2.6.32.29/kernel/signal.c
14687 +--- linux-2.6.32.29/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
14688 ++++ linux-2.6.32.29/kernel/signal.c 2011-02-12 11:22:46.000000000 -0500
14689 @@ -41,12 +41,12 @@
14690
14691 static struct kmem_cache *sigqueue_cachep;
14692 @@ -53230,10 +53333,10 @@ diff -urNp linux-2.6.32.28/kernel/signal.c linux-2.6.32.28/kernel/signal.c
14693
14694 return ret;
14695 }
14696 -diff -urNp linux-2.6.32.28/kernel/smp.c linux-2.6.32.28/kernel/smp.c
14697 ---- linux-2.6.32.28/kernel/smp.c 2010-08-13 16:24:37.000000000 -0400
14698 -+++ linux-2.6.32.28/kernel/smp.c 2010-12-31 14:46:53.000000000 -0500
14699 -@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
14700 +diff -urNp linux-2.6.32.29/kernel/smp.c linux-2.6.32.29/kernel/smp.c
14701 +--- linux-2.6.32.29/kernel/smp.c 2011-02-22 15:56:54.000000000 -0500
14702 ++++ linux-2.6.32.29/kernel/smp.c 2011-02-22 15:57:40.000000000 -0500
14703 +@@ -489,22 +489,22 @@ int smp_call_function(void (*func)(void
14704 }
14705 EXPORT_SYMBOL(smp_call_function);
14706
14707 @@ -53260,9 +53363,9 @@ diff -urNp linux-2.6.32.28/kernel/smp.c linux-2.6.32.28/kernel/smp.c
14708 {
14709 spin_unlock_irq(&call_function.lock);
14710 }
14711 -diff -urNp linux-2.6.32.28/kernel/softirq.c linux-2.6.32.28/kernel/softirq.c
14712 ---- linux-2.6.32.28/kernel/softirq.c 2010-08-13 16:24:37.000000000 -0400
14713 -+++ linux-2.6.32.28/kernel/softirq.c 2010-12-31 14:46:53.000000000 -0500
14714 +diff -urNp linux-2.6.32.29/kernel/softirq.c linux-2.6.32.29/kernel/softirq.c
14715 +--- linux-2.6.32.29/kernel/softirq.c 2011-02-22 15:56:54.000000000 -0500
14716 ++++ linux-2.6.32.29/kernel/softirq.c 2011-02-22 15:57:40.000000000 -0500
14717 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
14718
14719 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
14720 @@ -53272,7 +53375,7 @@ diff -urNp linux-2.6.32.28/kernel/softirq.c linux-2.6.32.28/kernel/softirq.c
14721 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
14722 "TASKLET", "SCHED", "HRTIMER", "RCU"
14723 };
14724 -@@ -190,7 +190,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
14725 +@@ -206,7 +206,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
14726
14727 asmlinkage void __do_softirq(void)
14728 {
14729 @@ -53281,7 +53384,7 @@ diff -urNp linux-2.6.32.28/kernel/softirq.c linux-2.6.32.28/kernel/softirq.c
14730 __u32 pending;
14731 int max_restart = MAX_SOFTIRQ_RESTART;
14732 int cpu;
14733 -@@ -216,7 +216,7 @@ restart:
14734 +@@ -233,7 +233,7 @@ restart:
14735 kstat_incr_softirqs_this_cpu(h - softirq_vec);
14736
14737 trace_softirq_entry(h, softirq_vec);
14738 @@ -53290,7 +53393,7 @@ diff -urNp linux-2.6.32.28/kernel/softirq.c linux-2.6.32.28/kernel/softirq.c
14739 trace_softirq_exit(h, softirq_vec);
14740 if (unlikely(prev_count != preempt_count())) {
14741 printk(KERN_ERR "huh, entered softirq %td %s %p"
14742 -@@ -340,7 +340,7 @@ void raise_softirq(unsigned int nr)
14743 +@@ -363,7 +363,7 @@ void raise_softirq(unsigned int nr)
14744 local_irq_restore(flags);
14745 }
14746
14747 @@ -53299,7 +53402,7 @@ diff -urNp linux-2.6.32.28/kernel/softirq.c linux-2.6.32.28/kernel/softirq.c
14748 {
14749 softirq_vec[nr].action = action;
14750 }
14751 -@@ -396,7 +396,7 @@ void __tasklet_hi_schedule_first(struct
14752 +@@ -419,7 +419,7 @@ void __tasklet_hi_schedule_first(struct
14753
14754 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
14755
14756 @@ -53308,7 +53411,7 @@ diff -urNp linux-2.6.32.28/kernel/softirq.c linux-2.6.32.28/kernel/softirq.c
14757 {
14758 struct tasklet_struct *list;
14759
14760 -@@ -431,7 +431,7 @@ static void tasklet_action(struct softir
14761 +@@ -454,7 +454,7 @@ static void tasklet_action(struct softir
14762 }
14763 }
14764
14765 @@ -53317,9 +53420,9 @@ diff -urNp linux-2.6.32.28/kernel/softirq.c linux-2.6.32.28/kernel/softirq.c
14766 {
14767 struct tasklet_struct *list;
14768
14769 -diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14770 ---- linux-2.6.32.28/kernel/sys.c 2010-09-26 17:26:05.000000000 -0400
14771 -+++ linux-2.6.32.28/kernel/sys.c 2010-12-31 14:46:53.000000000 -0500
14772 +diff -urNp linux-2.6.32.29/kernel/sys.c linux-2.6.32.29/kernel/sys.c
14773 +--- linux-2.6.32.29/kernel/sys.c 2011-02-22 15:56:54.000000000 -0500
14774 ++++ linux-2.6.32.29/kernel/sys.c 2011-02-22 15:57:40.000000000 -0500
14775 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
14776 error = -EACCES;
14777 goto out;
14778 @@ -53383,7 +53486,7 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14779 if (capable(CAP_SETGID))
14780 new->gid = new->egid = new->sgid = new->fsgid = gid;
14781 else if (gid == old->gid || gid == old->sgid)
14782 -@@ -632,6 +645,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
14783 +@@ -627,6 +640,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
14784 goto error;
14785 }
14786
14787 @@ -53393,7 +53496,7 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14788 if (new->uid != old->uid) {
14789 retval = set_user(new);
14790 if (retval < 0)
14791 -@@ -680,6 +696,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
14792 +@@ -675,6 +691,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
14793 goto error;
14794
14795 retval = -EPERM;
14796 @@ -53406,7 +53509,7 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14797 if (capable(CAP_SETUID)) {
14798 new->suid = new->uid = uid;
14799 if (uid != old->uid) {
14800 -@@ -737,6 +759,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid,
14801 +@@ -732,6 +754,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid,
14802 goto error;
14803 }
14804
14805 @@ -53416,7 +53519,7 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14806 if (ruid != (uid_t) -1) {
14807 new->uid = ruid;
14808 if (ruid != old->uid) {
14809 -@@ -805,6 +830,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid,
14810 +@@ -800,6 +825,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid,
14811 goto error;
14812 }
14813
14814 @@ -53426,7 +53529,7 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14815 if (rgid != (gid_t) -1)
14816 new->gid = rgid;
14817 if (egid != (gid_t) -1)
14818 -@@ -854,6 +882,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
14819 +@@ -849,6 +877,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
14820 if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
14821 goto error;
14822
14823 @@ -53436,7 +53539,7 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14824 if (uid == old->uid || uid == old->euid ||
14825 uid == old->suid || uid == old->fsuid ||
14826 capable(CAP_SETUID)) {
14827 -@@ -894,6 +925,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
14828 +@@ -889,6 +920,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
14829 if (gid == old->gid || gid == old->egid ||
14830 gid == old->sgid || gid == old->fsgid ||
14831 capable(CAP_SETGID)) {
14832 @@ -53446,7 +53549,7 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14833 if (gid != old_fsgid) {
14834 new->fsgid = gid;
14835 goto change_okay;
14836 -@@ -1459,7 +1493,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
14837 +@@ -1454,7 +1488,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
14838 error = get_dumpable(me->mm);
14839 break;
14840 case PR_SET_DUMPABLE:
14841 @@ -53455,9 +53558,9 @@ diff -urNp linux-2.6.32.28/kernel/sys.c linux-2.6.32.28/kernel/sys.c
14842 error = -EINVAL;
14843 break;
14844 }
14845 -diff -urNp linux-2.6.32.28/kernel/sysctl.c linux-2.6.32.28/kernel/sysctl.c
14846 ---- linux-2.6.32.28/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
14847 -+++ linux-2.6.32.28/kernel/sysctl.c 2010-12-31 14:46:53.000000000 -0500
14848 +diff -urNp linux-2.6.32.29/kernel/sysctl.c linux-2.6.32.29/kernel/sysctl.c
14849 +--- linux-2.6.32.29/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
14850 ++++ linux-2.6.32.29/kernel/sysctl.c 2010-12-31 14:46:53.000000000 -0500
14851 @@ -63,6 +63,13 @@
14852 static int deprecated_sysctl_warning(struct __sysctl_args *args);
14853
14854 @@ -53689,9 +53792,9 @@ diff -urNp linux-2.6.32.28/kernel/sysctl.c linux-2.6.32.28/kernel/sysctl.c
14855 +EXPORT_SYMBOL(sysctl_string_modpriv);
14856 EXPORT_SYMBOL(sysctl_data);
14857 EXPORT_SYMBOL(unregister_sysctl_table);
14858 -diff -urNp linux-2.6.32.28/kernel/sysctl_check.c linux-2.6.32.28/kernel/sysctl_check.c
14859 ---- linux-2.6.32.28/kernel/sysctl_check.c 2010-08-13 16:24:37.000000000 -0400
14860 -+++ linux-2.6.32.28/kernel/sysctl_check.c 2010-12-31 14:46:53.000000000 -0500
14861 +diff -urNp linux-2.6.32.29/kernel/sysctl_check.c linux-2.6.32.29/kernel/sysctl_check.c
14862 +--- linux-2.6.32.29/kernel/sysctl_check.c 2010-08-13 16:24:37.000000000 -0400
14863 ++++ linux-2.6.32.29/kernel/sysctl_check.c 2010-12-31 14:46:53.000000000 -0500
14864 @@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
14865 } else {
14866 if ((table->strategy == sysctl_data) ||
14867 @@ -53705,9 +53808,9 @@ diff -urNp linux-2.6.32.28/kernel/sysctl_check.c linux-2.6.32.28/kernel/sysctl_c
14868 (table->proc_handler == proc_dointvec) ||
14869 (table->proc_handler == proc_dointvec_minmax) ||
14870 (table->proc_handler == proc_dointvec_jiffies) ||
14871 -diff -urNp linux-2.6.32.28/kernel/taskstats.c linux-2.6.32.28/kernel/taskstats.c
14872 ---- linux-2.6.32.28/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
14873 -+++ linux-2.6.32.28/kernel/taskstats.c 2010-12-31 14:46:53.000000000 -0500
14874 +diff -urNp linux-2.6.32.29/kernel/taskstats.c linux-2.6.32.29/kernel/taskstats.c
14875 +--- linux-2.6.32.29/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
14876 ++++ linux-2.6.32.29/kernel/taskstats.c 2010-12-31 14:46:53.000000000 -0500
14877 @@ -26,9 +26,12 @@
14878 #include <linux/cgroup.h>
14879 #include <linux/fs.h>
14880 @@ -53731,9 +53834,9 @@ diff -urNp linux-2.6.32.28/kernel/taskstats.c linux-2.6.32.28/kernel/taskstats.c
14881 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
14882 return -ENOMEM;
14883
14884 -diff -urNp linux-2.6.32.28/kernel/time/tick-broadcast.c linux-2.6.32.28/kernel/time/tick-broadcast.c
14885 ---- linux-2.6.32.28/kernel/time/tick-broadcast.c 2010-08-13 16:24:37.000000000 -0400
14886 -+++ linux-2.6.32.28/kernel/time/tick-broadcast.c 2010-12-31 14:46:53.000000000 -0500
14887 +diff -urNp linux-2.6.32.29/kernel/time/tick-broadcast.c linux-2.6.32.29/kernel/time/tick-broadcast.c
14888 +--- linux-2.6.32.29/kernel/time/tick-broadcast.c 2010-08-13 16:24:37.000000000 -0400
14889 ++++ linux-2.6.32.29/kernel/time/tick-broadcast.c 2010-12-31 14:46:53.000000000 -0500
14890 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
14891 * then clear the broadcast bit.
14892 */
14893 @@ -53743,9 +53846,9 @@ diff -urNp linux-2.6.32.28/kernel/time/tick-broadcast.c linux-2.6.32.28/kernel/t
14894
14895 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
14896 tick_broadcast_clear_oneshot(cpu);
14897 -diff -urNp linux-2.6.32.28/kernel/time/timekeeping.c linux-2.6.32.28/kernel/time/timekeeping.c
14898 ---- linux-2.6.32.28/kernel/time/timekeeping.c 2010-08-13 16:24:37.000000000 -0400
14899 -+++ linux-2.6.32.28/kernel/time/timekeeping.c 2011-01-01 00:15:19.000000000 -0500
14900 +diff -urNp linux-2.6.32.29/kernel/time/timekeeping.c linux-2.6.32.29/kernel/time/timekeeping.c
14901 +--- linux-2.6.32.29/kernel/time/timekeeping.c 2010-08-13 16:24:37.000000000 -0400
14902 ++++ linux-2.6.32.29/kernel/time/timekeeping.c 2011-01-01 00:15:19.000000000 -0500
14903 @@ -14,6 +14,7 @@
14904 #include <linux/init.h>
14905 #include <linux/mm.h>
14906 @@ -53763,9 +53866,9 @@ diff -urNp linux-2.6.32.28/kernel/time/timekeeping.c linux-2.6.32.28/kernel/time
14907 write_seqlock_irqsave(&xtime_lock, flags);
14908
14909 timekeeping_forward_now();
14910 -diff -urNp linux-2.6.32.28/kernel/time/timer_list.c linux-2.6.32.28/kernel/time/timer_list.c
14911 ---- linux-2.6.32.28/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
14912 -+++ linux-2.6.32.28/kernel/time/timer_list.c 2010-12-31 14:46:53.000000000 -0500
14913 +diff -urNp linux-2.6.32.29/kernel/time/timer_list.c linux-2.6.32.29/kernel/time/timer_list.c
14914 +--- linux-2.6.32.29/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
14915 ++++ linux-2.6.32.29/kernel/time/timer_list.c 2010-12-31 14:46:53.000000000 -0500
14916 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
14917
14918 static void print_name_offset(struct seq_file *m, void *sym)
14919 @@ -53807,9 +53910,9 @@ diff -urNp linux-2.6.32.28/kernel/time/timer_list.c linux-2.6.32.28/kernel/time/
14920 if (!pe)
14921 return -ENOMEM;
14922 return 0;
14923 -diff -urNp linux-2.6.32.28/kernel/time/timer_stats.c linux-2.6.32.28/kernel/time/timer_stats.c
14924 ---- linux-2.6.32.28/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
14925 -+++ linux-2.6.32.28/kernel/time/timer_stats.c 2010-12-31 14:46:53.000000000 -0500
14926 +diff -urNp linux-2.6.32.29/kernel/time/timer_stats.c linux-2.6.32.29/kernel/time/timer_stats.c
14927 +--- linux-2.6.32.29/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
14928 ++++ linux-2.6.32.29/kernel/time/timer_stats.c 2010-12-31 14:46:53.000000000 -0500
14929 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
14930
14931 static void print_name_offset(struct seq_file *m, unsigned long addr)
14932 @@ -53839,9 +53942,9 @@ diff -urNp linux-2.6.32.28/kernel/time/timer_stats.c linux-2.6.32.28/kernel/time
14933 if (!pe)
14934 return -ENOMEM;
14935 return 0;
14936 -diff -urNp linux-2.6.32.28/kernel/time.c linux-2.6.32.28/kernel/time.c
14937 ---- linux-2.6.32.28/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
14938 -+++ linux-2.6.32.28/kernel/time.c 2011-01-01 18:50:34.000000000 -0500
14939 +diff -urNp linux-2.6.32.29/kernel/time.c linux-2.6.32.29/kernel/time.c
14940 +--- linux-2.6.32.29/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
14941 ++++ linux-2.6.32.29/kernel/time.c 2011-01-01 18:50:34.000000000 -0500
14942 @@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec
14943 return error;
14944
14945 @@ -53872,9 +53975,9 @@ diff -urNp linux-2.6.32.28/kernel/time.c linux-2.6.32.28/kernel/time.c
14946 {
14947 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
14948 return (USEC_PER_SEC / HZ) * j;
14949 -diff -urNp linux-2.6.32.28/kernel/timer.c linux-2.6.32.28/kernel/timer.c
14950 ---- linux-2.6.32.28/kernel/timer.c 2011-01-11 23:55:35.000000000 -0500
14951 -+++ linux-2.6.32.28/kernel/timer.c 2011-01-11 23:56:06.000000000 -0500
14952 +diff -urNp linux-2.6.32.29/kernel/timer.c linux-2.6.32.29/kernel/timer.c
14953 +--- linux-2.6.32.29/kernel/timer.c 2011-01-11 23:55:35.000000000 -0500
14954 ++++ linux-2.6.32.29/kernel/timer.c 2011-01-11 23:56:06.000000000 -0500
14955 @@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
14956 /*
14957 * This function runs timers and the timer-tq in bottom half context.
14958 @@ -53884,9 +53987,9 @@ diff -urNp linux-2.6.32.28/kernel/timer.c linux-2.6.32.28/kernel/timer.c
14959 {
14960 struct tvec_base *base = __get_cpu_var(tvec_bases);
14961
14962 -diff -urNp linux-2.6.32.28/kernel/trace/ftrace.c linux-2.6.32.28/kernel/trace/ftrace.c
14963 ---- linux-2.6.32.28/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400
14964 -+++ linux-2.6.32.28/kernel/trace/ftrace.c 2010-12-31 14:46:53.000000000 -0500
14965 +diff -urNp linux-2.6.32.29/kernel/trace/ftrace.c linux-2.6.32.29/kernel/trace/ftrace.c
14966 +--- linux-2.6.32.29/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400
14967 ++++ linux-2.6.32.29/kernel/trace/ftrace.c 2010-12-31 14:46:53.000000000 -0500
14968 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,
14969
14970 ip = rec->ip;
14971 @@ -53908,9 +54011,9 @@ diff -urNp linux-2.6.32.28/kernel/trace/ftrace.c linux-2.6.32.28/kernel/trace/ft
14972 }
14973
14974 /*
14975 -diff -urNp linux-2.6.32.28/kernel/trace/ring_buffer.c linux-2.6.32.28/kernel/trace/ring_buffer.c
14976 ---- linux-2.6.32.28/kernel/trace/ring_buffer.c 2010-10-31 16:44:11.000000000 -0400
14977 -+++ linux-2.6.32.28/kernel/trace/ring_buffer.c 2010-12-31 14:46:53.000000000 -0500
14978 +diff -urNp linux-2.6.32.29/kernel/trace/ring_buffer.c linux-2.6.32.29/kernel/trace/ring_buffer.c
14979 +--- linux-2.6.32.29/kernel/trace/ring_buffer.c 2010-10-31 16:44:11.000000000 -0400
14980 ++++ linux-2.6.32.29/kernel/trace/ring_buffer.c 2010-12-31 14:46:53.000000000 -0500
14981 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
14982 * the reader page). But if the next page is a header page,
14983 * its flags will be non zero.
14984 @@ -53920,9 +54023,9 @@ diff -urNp linux-2.6.32.28/kernel/trace/ring_buffer.c linux-2.6.32.28/kernel/tra
14985 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
14986 struct buffer_page *page, struct list_head *list)
14987 {
14988 -diff -urNp linux-2.6.32.28/kernel/trace/trace.c linux-2.6.32.28/kernel/trace/trace.c
14989 ---- linux-2.6.32.28/kernel/trace/trace.c 2011-01-11 23:55:35.000000000 -0500
14990 -+++ linux-2.6.32.28/kernel/trace/trace.c 2011-01-11 23:56:06.000000000 -0500
14991 +diff -urNp linux-2.6.32.29/kernel/trace/trace.c linux-2.6.32.29/kernel/trace/trace.c
14992 +--- linux-2.6.32.29/kernel/trace/trace.c 2011-01-11 23:55:35.000000000 -0500
14993 ++++ linux-2.6.32.29/kernel/trace/trace.c 2011-01-11 23:56:06.000000000 -0500
14994 @@ -3816,10 +3816,9 @@ static const struct file_operations trac
14995 };
14996 #endif
14997 @@ -53947,9 +54050,9 @@ diff -urNp linux-2.6.32.28/kernel/trace/trace.c linux-2.6.32.28/kernel/trace/tra
14998 static int once;
14999 struct dentry *d_tracer;
15000
15001 -diff -urNp linux-2.6.32.28/kernel/trace/trace_events.c linux-2.6.32.28/kernel/trace/trace_events.c
15002 ---- linux-2.6.32.28/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
15003 -+++ linux-2.6.32.28/kernel/trace/trace_events.c 2010-12-31 14:46:53.000000000 -0500
15004 +diff -urNp linux-2.6.32.29/kernel/trace/trace_events.c linux-2.6.32.29/kernel/trace/trace_events.c
15005 +--- linux-2.6.32.29/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
15006 ++++ linux-2.6.32.29/kernel/trace/trace_events.c 2010-12-31 14:46:53.000000000 -0500
15007 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
15008 * Modules must own their file_operations to keep up with
15009 * reference counting.
15010 @@ -53959,9 +54062,9 @@ diff -urNp linux-2.6.32.28/kernel/trace/trace_events.c linux-2.6.32.28/kernel/tr
15011 struct ftrace_module_file_ops {
15012 struct list_head list;
15013 struct module *mod;
15014 -diff -urNp linux-2.6.32.28/kernel/trace/trace_output.c linux-2.6.32.28/kernel/trace/trace_output.c
15015 ---- linux-2.6.32.28/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
15016 -+++ linux-2.6.32.28/kernel/trace/trace_output.c 2010-12-31 14:46:53.000000000 -0500
15017 +diff -urNp linux-2.6.32.29/kernel/trace/trace_output.c linux-2.6.32.29/kernel/trace/trace_output.c
15018 +--- linux-2.6.32.29/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
15019 ++++ linux-2.6.32.29/kernel/trace/trace_output.c 2010-12-31 14:46:53.000000000 -0500
15020 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
15021 return 0;
15022 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
15023 @@ -53971,9 +54074,9 @@ diff -urNp linux-2.6.32.28/kernel/trace/trace_output.c linux-2.6.32.28/kernel/tr
15024 if (p) {
15025 s->len = p - s->buffer;
15026 return 1;
15027 -diff -urNp linux-2.6.32.28/kernel/trace/trace_stack.c linux-2.6.32.28/kernel/trace/trace_stack.c
15028 ---- linux-2.6.32.28/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
15029 -+++ linux-2.6.32.28/kernel/trace/trace_stack.c 2010-12-31 14:46:53.000000000 -0500
15030 +diff -urNp linux-2.6.32.29/kernel/trace/trace_stack.c linux-2.6.32.29/kernel/trace/trace_stack.c
15031 +--- linux-2.6.32.29/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
15032 ++++ linux-2.6.32.29/kernel/trace/trace_stack.c 2010-12-31 14:46:53.000000000 -0500
15033 @@ -50,7 +50,7 @@ static inline void check_stack(void)
15034 return;
15035
15036 @@ -53983,20 +54086,20 @@ diff -urNp linux-2.6.32.28/kernel/trace/trace_stack.c linux-2.6.32.28/kernel/tra
15037 return;
15038
15039 local_irq_save(flags);
15040 -diff -urNp linux-2.6.32.28/kernel/user.c linux-2.6.32.28/kernel/user.c
15041 ---- linux-2.6.32.28/kernel/user.c 2010-08-13 16:24:37.000000000 -0400
15042 -+++ linux-2.6.32.28/kernel/user.c 2010-12-31 15:09:34.000000000 -0500
15043 -@@ -465,6 +465,7 @@ struct user_struct *alloc_uid(struct use
15044 - * uids_mutex. Hence no need to call
15045 - * sched_destroy_user() or remove_user_sysfs_dir().
15046 - */
15047 +diff -urNp linux-2.6.32.29/kernel/user.c linux-2.6.32.29/kernel/user.c
15048 +--- linux-2.6.32.29/kernel/user.c 2011-02-22 15:56:54.000000000 -0500
15049 ++++ linux-2.6.32.29/kernel/user.c 2011-02-22 16:01:02.000000000 -0500
15050 +@@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use
15051 + spin_lock_irq(&uidhash_lock);
15052 + up = uid_hash_find(uid, hashent);
15053 + if (up) {
15054 + put_user_ns(ns);
15055 key_put(new->uid_keyring);
15056 key_put(new->session_keyring);
15057 kmem_cache_free(uid_cachep, new);
15058 -diff -urNp linux-2.6.32.28/kernel/utsname_sysctl.c linux-2.6.32.28/kernel/utsname_sysctl.c
15059 ---- linux-2.6.32.28/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
15060 -+++ linux-2.6.32.28/kernel/utsname_sysctl.c 2010-12-31 14:46:53.000000000 -0500
15061 +diff -urNp linux-2.6.32.29/kernel/utsname_sysctl.c linux-2.6.32.29/kernel/utsname_sysctl.c
15062 +--- linux-2.6.32.29/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
15063 ++++ linux-2.6.32.29/kernel/utsname_sysctl.c 2010-12-31 14:46:53.000000000 -0500
15064 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
15065 .proc_handler = proc_do_uts_string,
15066 .strategy = sysctl_uts_string,
15067 @@ -54015,9 +54118,9 @@ diff -urNp linux-2.6.32.28/kernel/utsname_sysctl.c linux-2.6.32.28/kernel/utsnam
15068 };
15069
15070 static int __init utsname_sysctl_init(void)
15071 -diff -urNp linux-2.6.32.28/lib/bug.c linux-2.6.32.28/lib/bug.c
15072 ---- linux-2.6.32.28/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
15073 -+++ linux-2.6.32.28/lib/bug.c 2010-12-31 14:46:53.000000000 -0500
15074 +diff -urNp linux-2.6.32.29/lib/bug.c linux-2.6.32.29/lib/bug.c
15075 +--- linux-2.6.32.29/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
15076 ++++ linux-2.6.32.29/lib/bug.c 2010-12-31 14:46:53.000000000 -0500
15077 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
15078 return BUG_TRAP_TYPE_NONE;
15079
15080 @@ -54027,9 +54130,9 @@ diff -urNp linux-2.6.32.28/lib/bug.c linux-2.6.32.28/lib/bug.c
15081
15082 printk(KERN_EMERG "------------[ cut here ]------------\n");
15083
15084 -diff -urNp linux-2.6.32.28/lib/debugobjects.c linux-2.6.32.28/lib/debugobjects.c
15085 ---- linux-2.6.32.28/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
15086 -+++ linux-2.6.32.28/lib/debugobjects.c 2010-12-31 14:46:53.000000000 -0500
15087 +diff -urNp linux-2.6.32.29/lib/debugobjects.c linux-2.6.32.29/lib/debugobjects.c
15088 +--- linux-2.6.32.29/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
15089 ++++ linux-2.6.32.29/lib/debugobjects.c 2010-12-31 14:46:53.000000000 -0500
15090 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
15091 if (limit > 4)
15092 return;
15093 @@ -54039,9 +54142,9 @@ diff -urNp linux-2.6.32.28/lib/debugobjects.c linux-2.6.32.28/lib/debugobjects.c
15094 if (is_on_stack == onstack)
15095 return;
15096
15097 -diff -urNp linux-2.6.32.28/lib/dma-debug.c linux-2.6.32.28/lib/dma-debug.c
15098 ---- linux-2.6.32.28/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
15099 -+++ linux-2.6.32.28/lib/dma-debug.c 2010-12-31 14:46:53.000000000 -0500
15100 +diff -urNp linux-2.6.32.29/lib/dma-debug.c linux-2.6.32.29/lib/dma-debug.c
15101 +--- linux-2.6.32.29/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
15102 ++++ linux-2.6.32.29/lib/dma-debug.c 2010-12-31 14:46:53.000000000 -0500
15103 @@ -861,7 +861,7 @@ out:
15104
15105 static void check_for_stack(struct device *dev, void *addr)
15106 @@ -54051,9 +54154,9 @@ diff -urNp linux-2.6.32.28/lib/dma-debug.c linux-2.6.32.28/lib/dma-debug.c
15107 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
15108 "stack [addr=%p]\n", addr);
15109 }
15110 -diff -urNp linux-2.6.32.28/lib/idr.c linux-2.6.32.28/lib/idr.c
15111 ---- linux-2.6.32.28/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
15112 -+++ linux-2.6.32.28/lib/idr.c 2010-12-31 14:46:53.000000000 -0500
15113 +diff -urNp linux-2.6.32.29/lib/idr.c linux-2.6.32.29/lib/idr.c
15114 +--- linux-2.6.32.29/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
15115 ++++ linux-2.6.32.29/lib/idr.c 2010-12-31 14:46:53.000000000 -0500
15116 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
15117 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
15118
15119 @@ -54063,9 +54166,9 @@ diff -urNp linux-2.6.32.28/lib/idr.c linux-2.6.32.28/lib/idr.c
15120 *starting_id = id;
15121 return IDR_NEED_TO_GROW;
15122 }
15123 -diff -urNp linux-2.6.32.28/lib/inflate.c linux-2.6.32.28/lib/inflate.c
15124 ---- linux-2.6.32.28/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
15125 -+++ linux-2.6.32.28/lib/inflate.c 2010-12-31 14:46:53.000000000 -0500
15126 +diff -urNp linux-2.6.32.29/lib/inflate.c linux-2.6.32.29/lib/inflate.c
15127 +--- linux-2.6.32.29/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
15128 ++++ linux-2.6.32.29/lib/inflate.c 2010-12-31 14:46:53.000000000 -0500
15129 @@ -266,7 +266,7 @@ static void free(void *where)
15130 malloc_ptr = free_mem_ptr;
15131 }
15132 @@ -54075,9 +54178,9 @@ diff -urNp linux-2.6.32.28/lib/inflate.c linux-2.6.32.28/lib/inflate.c
15133 #define free(a) kfree(a)
15134 #endif
15135
15136 -diff -urNp linux-2.6.32.28/lib/Kconfig.debug linux-2.6.32.28/lib/Kconfig.debug
15137 ---- linux-2.6.32.28/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
15138 -+++ linux-2.6.32.28/lib/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
15139 +diff -urNp linux-2.6.32.29/lib/Kconfig.debug linux-2.6.32.29/lib/Kconfig.debug
15140 +--- linux-2.6.32.29/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
15141 ++++ linux-2.6.32.29/lib/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
15142 @@ -905,7 +905,7 @@ config LATENCYTOP
15143 select STACKTRACE
15144 select SCHEDSTATS
15145 @@ -54087,9 +54190,9 @@ diff -urNp linux-2.6.32.28/lib/Kconfig.debug linux-2.6.32.28/lib/Kconfig.debug
15146 help
15147 Enable this option if you want to use the LatencyTOP tool
15148 to find out which userspace is blocking on what kernel operations.
15149 -diff -urNp linux-2.6.32.28/lib/kobject.c linux-2.6.32.28/lib/kobject.c
15150 ---- linux-2.6.32.28/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
15151 -+++ linux-2.6.32.28/lib/kobject.c 2010-12-31 14:46:53.000000000 -0500
15152 +diff -urNp linux-2.6.32.29/lib/kobject.c linux-2.6.32.29/lib/kobject.c
15153 +--- linux-2.6.32.29/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
15154 ++++ linux-2.6.32.29/lib/kobject.c 2010-12-31 14:46:53.000000000 -0500
15155 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
15156 return ret;
15157 }
15158 @@ -54117,9 +54220,9 @@ diff -urNp linux-2.6.32.28/lib/kobject.c linux-2.6.32.28/lib/kobject.c
15159 struct kobject *parent_kobj)
15160 {
15161 struct kset *kset;
15162 -diff -urNp linux-2.6.32.28/lib/kobject_uevent.c linux-2.6.32.28/lib/kobject_uevent.c
15163 ---- linux-2.6.32.28/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
15164 -+++ linux-2.6.32.28/lib/kobject_uevent.c 2010-12-31 14:46:53.000000000 -0500
15165 +diff -urNp linux-2.6.32.29/lib/kobject_uevent.c linux-2.6.32.29/lib/kobject_uevent.c
15166 +--- linux-2.6.32.29/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
15167 ++++ linux-2.6.32.29/lib/kobject_uevent.c 2010-12-31 14:46:53.000000000 -0500
15168 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
15169 const char *subsystem;
15170 struct kobject *top_kobj;
15171 @@ -54129,9 +54232,9 @@ diff -urNp linux-2.6.32.28/lib/kobject_uevent.c linux-2.6.32.28/lib/kobject_ueve
15172 u64 seq;
15173 int i = 0;
15174 int retval = 0;
15175 -diff -urNp linux-2.6.32.28/lib/kref.c linux-2.6.32.28/lib/kref.c
15176 ---- linux-2.6.32.28/lib/kref.c 2010-08-13 16:24:37.000000000 -0400
15177 -+++ linux-2.6.32.28/lib/kref.c 2010-12-31 14:46:53.000000000 -0500
15178 +diff -urNp linux-2.6.32.29/lib/kref.c linux-2.6.32.29/lib/kref.c
15179 +--- linux-2.6.32.29/lib/kref.c 2010-08-13 16:24:37.000000000 -0400
15180 ++++ linux-2.6.32.29/lib/kref.c 2010-12-31 14:46:53.000000000 -0500
15181 @@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
15182 */
15183 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
15184 @@ -54141,9 +54244,9 @@ diff -urNp linux-2.6.32.28/lib/kref.c linux-2.6.32.28/lib/kref.c
15185 WARN_ON(release == (void (*)(struct kref *))kfree);
15186
15187 if (atomic_dec_and_test(&kref->refcount)) {
15188 -diff -urNp linux-2.6.32.28/lib/parser.c linux-2.6.32.28/lib/parser.c
15189 ---- linux-2.6.32.28/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
15190 -+++ linux-2.6.32.28/lib/parser.c 2010-12-31 14:46:53.000000000 -0500
15191 +diff -urNp linux-2.6.32.29/lib/parser.c linux-2.6.32.29/lib/parser.c
15192 +--- linux-2.6.32.29/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
15193 ++++ linux-2.6.32.29/lib/parser.c 2010-12-31 14:46:53.000000000 -0500
15194 @@ -126,7 +126,7 @@ static int match_number(substring_t *s,
15195 char *buf;
15196 int ret;
15197 @@ -54153,9 +54256,9 @@ diff -urNp linux-2.6.32.28/lib/parser.c linux-2.6.32.28/lib/parser.c
15198 if (!buf)
15199 return -ENOMEM;
15200 memcpy(buf, s->from, s->to - s->from);
15201 -diff -urNp linux-2.6.32.28/lib/radix-tree.c linux-2.6.32.28/lib/radix-tree.c
15202 ---- linux-2.6.32.28/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
15203 -+++ linux-2.6.32.28/lib/radix-tree.c 2010-12-31 14:46:53.000000000 -0500
15204 +diff -urNp linux-2.6.32.29/lib/radix-tree.c linux-2.6.32.29/lib/radix-tree.c
15205 +--- linux-2.6.32.29/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
15206 ++++ linux-2.6.32.29/lib/radix-tree.c 2010-12-31 14:46:53.000000000 -0500
15207 @@ -81,7 +81,7 @@ struct radix_tree_preload {
15208 int nr;
15209 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
15210 @@ -54165,9 +54268,9 @@ diff -urNp linux-2.6.32.28/lib/radix-tree.c linux-2.6.32.28/lib/radix-tree.c
15211
15212 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
15213 {
15214 -diff -urNp linux-2.6.32.28/lib/random32.c linux-2.6.32.28/lib/random32.c
15215 ---- linux-2.6.32.28/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
15216 -+++ linux-2.6.32.28/lib/random32.c 2010-12-31 14:46:53.000000000 -0500
15217 +diff -urNp linux-2.6.32.29/lib/random32.c linux-2.6.32.29/lib/random32.c
15218 +--- linux-2.6.32.29/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
15219 ++++ linux-2.6.32.29/lib/random32.c 2010-12-31 14:46:53.000000000 -0500
15220 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
15221 */
15222 static inline u32 __seed(u32 x, u32 m)
15223 @@ -54177,9 +54280,9 @@ diff -urNp linux-2.6.32.28/lib/random32.c linux-2.6.32.28/lib/random32.c
15224 }
15225
15226 /**
15227 -diff -urNp linux-2.6.32.28/lib/vsprintf.c linux-2.6.32.28/lib/vsprintf.c
15228 ---- linux-2.6.32.28/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
15229 -+++ linux-2.6.32.28/lib/vsprintf.c 2010-12-31 14:46:53.000000000 -0500
15230 +diff -urNp linux-2.6.32.29/lib/vsprintf.c linux-2.6.32.29/lib/vsprintf.c
15231 +--- linux-2.6.32.29/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
15232 ++++ linux-2.6.32.29/lib/vsprintf.c 2010-12-31 14:46:53.000000000 -0500
15233 @@ -16,6 +16,9 @@
15234 * - scnprintf and vscnprintf
15235 */
15236 @@ -54280,14 +54383,14 @@ diff -urNp linux-2.6.32.28/lib/vsprintf.c linux-2.6.32.28/lib/vsprintf.c
15237 break;
15238 }
15239
15240 -diff -urNp linux-2.6.32.28/localversion-grsec linux-2.6.32.28/localversion-grsec
15241 ---- linux-2.6.32.28/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
15242 -+++ linux-2.6.32.28/localversion-grsec 2010-12-31 14:46:53.000000000 -0500
15243 +diff -urNp linux-2.6.32.29/localversion-grsec linux-2.6.32.29/localversion-grsec
15244 +--- linux-2.6.32.29/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
15245 ++++ linux-2.6.32.29/localversion-grsec 2010-12-31 14:46:53.000000000 -0500
15246 @@ -0,0 +1 @@
15247 +-grsec
15248 -diff -urNp linux-2.6.32.28/Makefile linux-2.6.32.28/Makefile
15249 ---- linux-2.6.32.28/Makefile 2011-01-11 23:55:34.000000000 -0500
15250 -+++ linux-2.6.32.28/Makefile 2011-01-11 23:56:03.000000000 -0500
15251 +diff -urNp linux-2.6.32.29/Makefile linux-2.6.32.29/Makefile
15252 +--- linux-2.6.32.29/Makefile 2011-02-22 15:56:54.000000000 -0500
15253 ++++ linux-2.6.32.29/Makefile 2011-02-22 15:57:23.000000000 -0500
15254 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
15255
15256 HOSTCC = gcc
15257 @@ -54308,9 +54411,9 @@ diff -urNp linux-2.6.32.28/Makefile linux-2.6.32.28/Makefile
15258
15259 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
15260 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
15261 -diff -urNp linux-2.6.32.28/mm/filemap.c linux-2.6.32.28/mm/filemap.c
15262 ---- linux-2.6.32.28/mm/filemap.c 2010-12-09 18:13:03.000000000 -0500
15263 -+++ linux-2.6.32.28/mm/filemap.c 2010-12-31 14:46:53.000000000 -0500
15264 +diff -urNp linux-2.6.32.29/mm/filemap.c linux-2.6.32.29/mm/filemap.c
15265 +--- linux-2.6.32.29/mm/filemap.c 2010-12-09 18:13:03.000000000 -0500
15266 ++++ linux-2.6.32.29/mm/filemap.c 2010-12-31 14:46:53.000000000 -0500
15267 @@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
15268 struct address_space *mapping = file->f_mapping;
15269
15270 @@ -54328,9 +54431,9 @@ diff -urNp linux-2.6.32.28/mm/filemap.c linux-2.6.32.28/mm/filemap.c
15271 if (*pos >= limit) {
15272 send_sig(SIGXFSZ, current, 0);
15273 return -EFBIG;
15274 -diff -urNp linux-2.6.32.28/mm/fremap.c linux-2.6.32.28/mm/fremap.c
15275 ---- linux-2.6.32.28/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
15276 -+++ linux-2.6.32.28/mm/fremap.c 2010-12-31 14:46:53.000000000 -0500
15277 +diff -urNp linux-2.6.32.29/mm/fremap.c linux-2.6.32.29/mm/fremap.c
15278 +--- linux-2.6.32.29/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
15279 ++++ linux-2.6.32.29/mm/fremap.c 2010-12-31 14:46:53.000000000 -0500
15280 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
15281 retry:
15282 vma = find_vma(mm, start);
15283 @@ -54352,9 +54455,9 @@ diff -urNp linux-2.6.32.28/mm/fremap.c linux-2.6.32.28/mm/fremap.c
15284 munlock_vma_pages_range(vma, start, start + size);
15285 vma->vm_flags = saved_flags;
15286 }
15287 -diff -urNp linux-2.6.32.28/mm/highmem.c linux-2.6.32.28/mm/highmem.c
15288 ---- linux-2.6.32.28/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
15289 -+++ linux-2.6.32.28/mm/highmem.c 2010-12-31 14:46:53.000000000 -0500
15290 +diff -urNp linux-2.6.32.29/mm/highmem.c linux-2.6.32.29/mm/highmem.c
15291 +--- linux-2.6.32.29/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
15292 ++++ linux-2.6.32.29/mm/highmem.c 2010-12-31 14:46:53.000000000 -0500
15293 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
15294 * So no dangers, even with speculative execution.
15295 */
15296 @@ -54380,9 +54483,9 @@ diff -urNp linux-2.6.32.28/mm/highmem.c linux-2.6.32.28/mm/highmem.c
15297 pkmap_count[last_pkmap_nr] = 1;
15298 set_page_address(page, (void *)vaddr);
15299
15300 -diff -urNp linux-2.6.32.28/mm/hugetlb.c linux-2.6.32.28/mm/hugetlb.c
15301 ---- linux-2.6.32.28/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
15302 -+++ linux-2.6.32.28/mm/hugetlb.c 2010-12-31 14:46:53.000000000 -0500
15303 +diff -urNp linux-2.6.32.29/mm/hugetlb.c linux-2.6.32.29/mm/hugetlb.c
15304 +--- linux-2.6.32.29/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
15305 ++++ linux-2.6.32.29/mm/hugetlb.c 2010-12-31 14:46:53.000000000 -0500
15306 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
15307 return 1;
15308 }
15309 @@ -54462,9 +54565,9 @@ diff -urNp linux-2.6.32.28/mm/hugetlb.c linux-2.6.32.28/mm/hugetlb.c
15310 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
15311 if (!ptep)
15312 return VM_FAULT_OOM;
15313 -diff -urNp linux-2.6.32.28/mm/Kconfig linux-2.6.32.28/mm/Kconfig
15314 ---- linux-2.6.32.28/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
15315 -+++ linux-2.6.32.28/mm/Kconfig 2010-12-31 14:46:53.000000000 -0500
15316 +diff -urNp linux-2.6.32.29/mm/Kconfig linux-2.6.32.29/mm/Kconfig
15317 +--- linux-2.6.32.29/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
15318 ++++ linux-2.6.32.29/mm/Kconfig 2010-12-31 14:46:53.000000000 -0500
15319 @@ -228,7 +228,7 @@ config KSM
15320 config DEFAULT_MMAP_MIN_ADDR
15321 int "Low address space to protect from user allocation"
15322 @@ -54474,9 +54577,9 @@ diff -urNp linux-2.6.32.28/mm/Kconfig linux-2.6.32.28/mm/Kconfig
15323 help
15324 This is the portion of low virtual memory which should be protected
15325 from userspace allocation. Keeping a user from writing to low pages
15326 -diff -urNp linux-2.6.32.28/mm/kmemleak.c linux-2.6.32.28/mm/kmemleak.c
15327 ---- linux-2.6.32.28/mm/kmemleak.c 2010-08-13 16:24:37.000000000 -0400
15328 -+++ linux-2.6.32.28/mm/kmemleak.c 2010-12-31 14:46:53.000000000 -0500
15329 +diff -urNp linux-2.6.32.29/mm/kmemleak.c linux-2.6.32.29/mm/kmemleak.c
15330 +--- linux-2.6.32.29/mm/kmemleak.c 2010-08-13 16:24:37.000000000 -0400
15331 ++++ linux-2.6.32.29/mm/kmemleak.c 2010-12-31 14:46:53.000000000 -0500
15332 @@ -358,7 +358,7 @@ static void print_unreferenced(struct se
15333
15334 for (i = 0; i < object->trace_len; i++) {
15335 @@ -54486,9 +54589,9 @@ diff -urNp linux-2.6.32.28/mm/kmemleak.c linux-2.6.32.28/mm/kmemleak.c
15336 }
15337 }
15338
15339 -diff -urNp linux-2.6.32.28/mm/maccess.c linux-2.6.32.28/mm/maccess.c
15340 ---- linux-2.6.32.28/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
15341 -+++ linux-2.6.32.28/mm/maccess.c 2010-12-31 14:46:53.000000000 -0500
15342 +diff -urNp linux-2.6.32.29/mm/maccess.c linux-2.6.32.29/mm/maccess.c
15343 +--- linux-2.6.32.29/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
15344 ++++ linux-2.6.32.29/mm/maccess.c 2010-12-31 14:46:53.000000000 -0500
15345 @@ -14,7 +14,7 @@
15346 * Safely read from address @src to the buffer at @dst. If a kernel fault
15347 * happens, handle that and return -EFAULT.
15348 @@ -54507,9 +54610,9 @@ diff -urNp linux-2.6.32.28/mm/maccess.c linux-2.6.32.28/mm/maccess.c
15349 {
15350 long ret;
15351 mm_segment_t old_fs = get_fs();
15352 -diff -urNp linux-2.6.32.28/mm/madvise.c linux-2.6.32.28/mm/madvise.c
15353 ---- linux-2.6.32.28/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
15354 -+++ linux-2.6.32.28/mm/madvise.c 2010-12-31 14:46:53.000000000 -0500
15355 +diff -urNp linux-2.6.32.29/mm/madvise.c linux-2.6.32.29/mm/madvise.c
15356 +--- linux-2.6.32.29/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
15357 ++++ linux-2.6.32.29/mm/madvise.c 2010-12-31 14:46:53.000000000 -0500
15358 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
15359 pgoff_t pgoff;
15360 unsigned long new_flags = vma->vm_flags;
15361 @@ -54586,9 +54689,9 @@ diff -urNp linux-2.6.32.28/mm/madvise.c linux-2.6.32.28/mm/madvise.c
15362 error = 0;
15363 if (end == start)
15364 goto out;
15365 -diff -urNp linux-2.6.32.28/mm/memory.c linux-2.6.32.28/mm/memory.c
15366 ---- linux-2.6.32.28/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
15367 -+++ linux-2.6.32.28/mm/memory.c 2010-12-31 14:46:53.000000000 -0500
15368 +diff -urNp linux-2.6.32.29/mm/memory.c linux-2.6.32.29/mm/memory.c
15369 +--- linux-2.6.32.29/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
15370 ++++ linux-2.6.32.29/mm/memory.c 2010-12-31 14:46:53.000000000 -0500
15371 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
15372 return;
15373
15374 @@ -55118,9 +55221,9 @@ diff -urNp linux-2.6.32.28/mm/memory.c linux-2.6.32.28/mm/memory.c
15375 /*
15376 * Make sure the vDSO gets into every core dump.
15377 * Dumping its contents makes post-mortem fully interpretable later
15378 -diff -urNp linux-2.6.32.28/mm/memory-failure.c linux-2.6.32.28/mm/memory-failure.c
15379 ---- linux-2.6.32.28/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
15380 -+++ linux-2.6.32.28/mm/memory-failure.c 2010-12-31 14:46:53.000000000 -0500
15381 +diff -urNp linux-2.6.32.29/mm/memory-failure.c linux-2.6.32.29/mm/memory-failure.c
15382 +--- linux-2.6.32.29/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
15383 ++++ linux-2.6.32.29/mm/memory-failure.c 2010-12-31 14:46:53.000000000 -0500
15384 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
15385
15386 int sysctl_memory_failure_recovery __read_mostly = 1;
15387 @@ -55139,9 +55242,9 @@ diff -urNp linux-2.6.32.28/mm/memory-failure.c linux-2.6.32.28/mm/memory-failure
15388
15389 /*
15390 * We need/can do nothing about count=0 pages.
15391 -diff -urNp linux-2.6.32.28/mm/mempolicy.c linux-2.6.32.28/mm/mempolicy.c
15392 ---- linux-2.6.32.28/mm/mempolicy.c 2010-12-09 18:13:03.000000000 -0500
15393 -+++ linux-2.6.32.28/mm/mempolicy.c 2010-12-31 14:46:53.000000000 -0500
15394 +diff -urNp linux-2.6.32.29/mm/mempolicy.c linux-2.6.32.29/mm/mempolicy.c
15395 +--- linux-2.6.32.29/mm/mempolicy.c 2010-12-09 18:13:03.000000000 -0500
15396 ++++ linux-2.6.32.29/mm/mempolicy.c 2010-12-31 14:46:53.000000000 -0500
15397 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
15398 struct vm_area_struct *next;
15399 int err;
15400 @@ -55222,9 +55325,9 @@ diff -urNp linux-2.6.32.28/mm/mempolicy.c linux-2.6.32.28/mm/mempolicy.c
15401 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
15402 seq_printf(m, " heap");
15403 } else if (vma->vm_start <= mm->start_stack &&
15404 -diff -urNp linux-2.6.32.28/mm/migrate.c linux-2.6.32.28/mm/migrate.c
15405 ---- linux-2.6.32.28/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
15406 -+++ linux-2.6.32.28/mm/migrate.c 2010-12-31 14:46:53.000000000 -0500
15407 +diff -urNp linux-2.6.32.29/mm/migrate.c linux-2.6.32.29/mm/migrate.c
15408 +--- linux-2.6.32.29/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
15409 ++++ linux-2.6.32.29/mm/migrate.c 2010-12-31 14:46:53.000000000 -0500
15410 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
15411 if (!mm)
15412 return -EINVAL;
15413 @@ -55250,9 +55353,9 @@ diff -urNp linux-2.6.32.28/mm/migrate.c linux-2.6.32.28/mm/migrate.c
15414 rcu_read_unlock();
15415 err = -EPERM;
15416 goto out;
15417 -diff -urNp linux-2.6.32.28/mm/mlock.c linux-2.6.32.28/mm/mlock.c
15418 ---- linux-2.6.32.28/mm/mlock.c 2010-10-31 16:44:11.000000000 -0400
15419 -+++ linux-2.6.32.28/mm/mlock.c 2011-01-24 18:05:37.000000000 -0500
15420 +diff -urNp linux-2.6.32.29/mm/mlock.c linux-2.6.32.29/mm/mlock.c
15421 +--- linux-2.6.32.29/mm/mlock.c 2010-10-31 16:44:11.000000000 -0400
15422 ++++ linux-2.6.32.29/mm/mlock.c 2011-01-24 18:05:37.000000000 -0500
15423 @@ -13,6 +13,7 @@
15424 #include <linux/pagemap.h>
15425 #include <linux/mempolicy.h>
15426 @@ -55363,9 +55466,9 @@ diff -urNp linux-2.6.32.28/mm/mlock.c linux-2.6.32.28/mm/mlock.c
15427 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
15428 capable(CAP_IPC_LOCK))
15429 ret = do_mlockall(flags);
15430 -diff -urNp linux-2.6.32.28/mm/mmap.c linux-2.6.32.28/mm/mmap.c
15431 ---- linux-2.6.32.28/mm/mmap.c 2011-01-11 23:55:35.000000000 -0500
15432 -+++ linux-2.6.32.28/mm/mmap.c 2011-02-12 11:38:46.000000000 -0500
15433 +diff -urNp linux-2.6.32.29/mm/mmap.c linux-2.6.32.29/mm/mmap.c
15434 +--- linux-2.6.32.29/mm/mmap.c 2011-01-11 23:55:35.000000000 -0500
15435 ++++ linux-2.6.32.29/mm/mmap.c 2011-02-12 11:38:46.000000000 -0500
15436 @@ -45,6 +45,16 @@
15437 #define arch_rebalance_pgtables(addr, len) (addr)
15438 #endif
15439 @@ -56560,9 +56663,9 @@ diff -urNp linux-2.6.32.28/mm/mmap.c linux-2.6.32.28/mm/mmap.c
15440 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
15441 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
15442
15443 -diff -urNp linux-2.6.32.28/mm/mprotect.c linux-2.6.32.28/mm/mprotect.c
15444 ---- linux-2.6.32.28/mm/mprotect.c 2010-12-09 18:13:03.000000000 -0500
15445 -+++ linux-2.6.32.28/mm/mprotect.c 2010-12-31 14:46:53.000000000 -0500
15446 +diff -urNp linux-2.6.32.29/mm/mprotect.c linux-2.6.32.29/mm/mprotect.c
15447 +--- linux-2.6.32.29/mm/mprotect.c 2010-12-09 18:13:03.000000000 -0500
15448 ++++ linux-2.6.32.29/mm/mprotect.c 2010-12-31 14:46:53.000000000 -0500
15449 @@ -24,10 +24,16 @@
15450 #include <linux/mmu_notifier.h>
15451 #include <linux/migrate.h>
15452 @@ -56785,9 +56888,9 @@ diff -urNp linux-2.6.32.28/mm/mprotect.c linux-2.6.32.28/mm/mprotect.c
15453 nstart = tmp;
15454
15455 if (nstart < prev->vm_end)
15456 -diff -urNp linux-2.6.32.28/mm/mremap.c linux-2.6.32.28/mm/mremap.c
15457 ---- linux-2.6.32.28/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400
15458 -+++ linux-2.6.32.28/mm/mremap.c 2010-12-31 14:46:53.000000000 -0500
15459 +diff -urNp linux-2.6.32.29/mm/mremap.c linux-2.6.32.29/mm/mremap.c
15460 +--- linux-2.6.32.29/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400
15461 ++++ linux-2.6.32.29/mm/mremap.c 2010-12-31 14:46:53.000000000 -0500
15462 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
15463 continue;
15464 pte = ptep_clear_flush(vma, old_addr, old_pte);
15465 @@ -56892,9 +56995,9 @@ diff -urNp linux-2.6.32.28/mm/mremap.c linux-2.6.32.28/mm/mremap.c
15466 }
15467 out:
15468 if (ret & ~PAGE_MASK)
15469 -diff -urNp linux-2.6.32.28/mm/nommu.c linux-2.6.32.28/mm/nommu.c
15470 ---- linux-2.6.32.28/mm/nommu.c 2010-12-09 18:13:03.000000000 -0500
15471 -+++ linux-2.6.32.28/mm/nommu.c 2010-12-31 14:46:53.000000000 -0500
15472 +diff -urNp linux-2.6.32.29/mm/nommu.c linux-2.6.32.29/mm/nommu.c
15473 +--- linux-2.6.32.29/mm/nommu.c 2010-12-09 18:13:03.000000000 -0500
15474 ++++ linux-2.6.32.29/mm/nommu.c 2010-12-31 14:46:53.000000000 -0500
15475 @@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
15476 int sysctl_overcommit_ratio = 50; /* default is 50% */
15477 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
15478 @@ -56919,9 +57022,9 @@ diff -urNp linux-2.6.32.28/mm/nommu.c linux-2.6.32.28/mm/nommu.c
15479 * expand a stack to a given address
15480 * - not supported under NOMMU conditions
15481 */
15482 -diff -urNp linux-2.6.32.28/mm/page_alloc.c linux-2.6.32.28/mm/page_alloc.c
15483 ---- linux-2.6.32.28/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
15484 -+++ linux-2.6.32.28/mm/page_alloc.c 2010-12-31 14:46:53.000000000 -0500
15485 +diff -urNp linux-2.6.32.29/mm/page_alloc.c linux-2.6.32.29/mm/page_alloc.c
15486 +--- linux-2.6.32.29/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
15487 ++++ linux-2.6.32.29/mm/page_alloc.c 2010-12-31 14:46:53.000000000 -0500
15488 @@ -587,6 +587,10 @@ static void __free_pages_ok(struct page
15489 int bad = 0;
15490 int wasMlocked = __TestClearPageMlocked(page);
15491 @@ -56978,9 +57081,9 @@ diff -urNp linux-2.6.32.28/mm/page_alloc.c linux-2.6.32.28/mm/page_alloc.c
15492 struct zone *zone, unsigned long zonesize) {}
15493 #endif /* CONFIG_SPARSEMEM */
15494
15495 -diff -urNp linux-2.6.32.28/mm/percpu.c linux-2.6.32.28/mm/percpu.c
15496 ---- linux-2.6.32.28/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
15497 -+++ linux-2.6.32.28/mm/percpu.c 2010-12-31 14:46:53.000000000 -0500
15498 +diff -urNp linux-2.6.32.29/mm/percpu.c linux-2.6.32.29/mm/percpu.c
15499 +--- linux-2.6.32.29/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
15500 ++++ linux-2.6.32.29/mm/percpu.c 2010-12-31 14:46:53.000000000 -0500
15501 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
15502 static unsigned int pcpu_last_unit_cpu __read_mostly;
15503
15504 @@ -56990,9 +57093,9 @@ diff -urNp linux-2.6.32.28/mm/percpu.c linux-2.6.32.28/mm/percpu.c
15505 EXPORT_SYMBOL_GPL(pcpu_base_addr);
15506
15507 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
15508 -diff -urNp linux-2.6.32.28/mm/rmap.c linux-2.6.32.28/mm/rmap.c
15509 ---- linux-2.6.32.28/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
15510 -+++ linux-2.6.32.28/mm/rmap.c 2010-12-31 14:46:53.000000000 -0500
15511 +diff -urNp linux-2.6.32.29/mm/rmap.c linux-2.6.32.29/mm/rmap.c
15512 +--- linux-2.6.32.29/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
15513 ++++ linux-2.6.32.29/mm/rmap.c 2010-12-31 14:46:53.000000000 -0500
15514 @@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
15515 /* page_table_lock to protect against threads */
15516 spin_lock(&mm->page_table_lock);
15517 @@ -57011,9 +57114,9 @@ diff -urNp linux-2.6.32.28/mm/rmap.c linux-2.6.32.28/mm/rmap.c
15518 vma->anon_vma = anon_vma;
15519 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
15520 allocated = NULL;
15521 -diff -urNp linux-2.6.32.28/mm/shmem.c linux-2.6.32.28/mm/shmem.c
15522 ---- linux-2.6.32.28/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
15523 -+++ linux-2.6.32.28/mm/shmem.c 2011-01-24 18:05:37.000000000 -0500
15524 +diff -urNp linux-2.6.32.29/mm/shmem.c linux-2.6.32.29/mm/shmem.c
15525 +--- linux-2.6.32.29/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
15526 ++++ linux-2.6.32.29/mm/shmem.c 2011-01-24 18:05:37.000000000 -0500
15527 @@ -31,7 +31,7 @@
15528 #include <linux/swap.h>
15529 #include <linux/ima.h>
15530 @@ -57032,9 +57135,9 @@ diff -urNp linux-2.6.32.28/mm/shmem.c linux-2.6.32.28/mm/shmem.c
15531 if (entry->val) {
15532 /*
15533 * The more uptodate page coming down from a stacked
15534 -diff -urNp linux-2.6.32.28/mm/slab.c linux-2.6.32.28/mm/slab.c
15535 ---- linux-2.6.32.28/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
15536 -+++ linux-2.6.32.28/mm/slab.c 2010-12-31 14:46:53.000000000 -0500
15537 +diff -urNp linux-2.6.32.29/mm/slab.c linux-2.6.32.29/mm/slab.c
15538 +--- linux-2.6.32.29/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
15539 ++++ linux-2.6.32.29/mm/slab.c 2010-12-31 14:46:53.000000000 -0500
15540 @@ -308,7 +308,7 @@ struct kmem_list3 {
15541 * Need this for bootstrapping a per node allocator.
15542 */
15543 @@ -57140,9 +57243,9 @@ diff -urNp linux-2.6.32.28/mm/slab.c linux-2.6.32.28/mm/slab.c
15544 /**
15545 * ksize - get the actual amount of memory allocated for a given object
15546 * @objp: Pointer to the object
15547 -diff -urNp linux-2.6.32.28/mm/slob.c linux-2.6.32.28/mm/slob.c
15548 ---- linux-2.6.32.28/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
15549 -+++ linux-2.6.32.28/mm/slob.c 2010-12-31 14:46:53.000000000 -0500
15550 +diff -urNp linux-2.6.32.29/mm/slob.c linux-2.6.32.29/mm/slob.c
15551 +--- linux-2.6.32.29/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
15552 ++++ linux-2.6.32.29/mm/slob.c 2010-12-31 14:46:53.000000000 -0500
15553 @@ -29,7 +29,7 @@
15554 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
15555 * alloc_pages() directly, allocating compound pages so the page order
15556 @@ -57463,9 +57566,9 @@ diff -urNp linux-2.6.32.28/mm/slob.c linux-2.6.32.28/mm/slob.c
15557 }
15558
15559 trace_kmem_cache_free(_RET_IP_, b);
15560 -diff -urNp linux-2.6.32.28/mm/slub.c linux-2.6.32.28/mm/slub.c
15561 ---- linux-2.6.32.28/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
15562 -+++ linux-2.6.32.28/mm/slub.c 2010-12-31 14:46:53.000000000 -0500
15563 +diff -urNp linux-2.6.32.29/mm/slub.c linux-2.6.32.29/mm/slub.c
15564 +--- linux-2.6.32.29/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
15565 ++++ linux-2.6.32.29/mm/slub.c 2010-12-31 14:46:53.000000000 -0500
15566 @@ -410,7 +410,7 @@ static void print_track(const char *s, s
15567 if (!t->addr)
15568 return;
15569 @@ -57637,9 +57740,9 @@ diff -urNp linux-2.6.32.28/mm/slub.c linux-2.6.32.28/mm/slub.c
15570 return 0;
15571 }
15572 module_init(slab_proc_init);
15573 -diff -urNp linux-2.6.32.28/mm/util.c linux-2.6.32.28/mm/util.c
15574 ---- linux-2.6.32.28/mm/util.c 2010-08-13 16:24:37.000000000 -0400
15575 -+++ linux-2.6.32.28/mm/util.c 2010-12-31 14:46:53.000000000 -0500
15576 +diff -urNp linux-2.6.32.29/mm/util.c linux-2.6.32.29/mm/util.c
15577 +--- linux-2.6.32.29/mm/util.c 2010-08-13 16:24:37.000000000 -0400
15578 ++++ linux-2.6.32.29/mm/util.c 2010-12-31 14:46:53.000000000 -0500
15579 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
15580 void arch_pick_mmap_layout(struct mm_struct *mm)
15581 {
15582 @@ -57653,9 +57756,9 @@ diff -urNp linux-2.6.32.28/mm/util.c linux-2.6.32.28/mm/util.c
15583 mm->get_unmapped_area = arch_get_unmapped_area;
15584 mm->unmap_area = arch_unmap_area;
15585 }
15586 -diff -urNp linux-2.6.32.28/mm/vmalloc.c linux-2.6.32.28/mm/vmalloc.c
15587 ---- linux-2.6.32.28/mm/vmalloc.c 2010-11-26 18:22:29.000000000 -0500
15588 -+++ linux-2.6.32.28/mm/vmalloc.c 2010-12-31 14:46:53.000000000 -0500
15589 +diff -urNp linux-2.6.32.29/mm/vmalloc.c linux-2.6.32.29/mm/vmalloc.c
15590 +--- linux-2.6.32.29/mm/vmalloc.c 2010-11-26 18:22:29.000000000 -0500
15591 ++++ linux-2.6.32.29/mm/vmalloc.c 2010-12-31 14:46:53.000000000 -0500
15592 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
15593
15594 pte = pte_offset_kernel(pmd, addr);
15595 @@ -57892,9 +57995,9 @@ diff -urNp linux-2.6.32.28/mm/vmalloc.c linux-2.6.32.28/mm/vmalloc.c
15596 if ((PAGE_SIZE-1) & (unsigned long)addr)
15597 return -EINVAL;
15598
15599 -diff -urNp linux-2.6.32.28/mm/vmstat.c linux-2.6.32.28/mm/vmstat.c
15600 ---- linux-2.6.32.28/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
15601 -+++ linux-2.6.32.28/mm/vmstat.c 2010-12-31 14:54:42.000000000 -0500
15602 +diff -urNp linux-2.6.32.29/mm/vmstat.c linux-2.6.32.29/mm/vmstat.c
15603 +--- linux-2.6.32.29/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
15604 ++++ linux-2.6.32.29/mm/vmstat.c 2010-12-31 14:54:42.000000000 -0500
15605 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
15606 *
15607 * vm_stat contains the global counters
15608 @@ -57947,9 +58050,9 @@ diff -urNp linux-2.6.32.28/mm/vmstat.c linux-2.6.32.28/mm/vmstat.c
15609 #endif
15610 return 0;
15611 }
15612 -diff -urNp linux-2.6.32.28/net/8021q/vlan.c linux-2.6.32.28/net/8021q/vlan.c
15613 ---- linux-2.6.32.28/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
15614 -+++ linux-2.6.32.28/net/8021q/vlan.c 2010-12-31 14:46:53.000000000 -0500
15615 +diff -urNp linux-2.6.32.29/net/8021q/vlan.c linux-2.6.32.29/net/8021q/vlan.c
15616 +--- linux-2.6.32.29/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
15617 ++++ linux-2.6.32.29/net/8021q/vlan.c 2010-12-31 14:46:53.000000000 -0500
15618 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
15619 err = -EPERM;
15620 if (!capable(CAP_NET_ADMIN))
15621 @@ -57960,9 +58063,9 @@ diff -urNp linux-2.6.32.28/net/8021q/vlan.c linux-2.6.32.28/net/8021q/vlan.c
15622 struct vlan_net *vn;
15623
15624 vn = net_generic(net, vlan_net_id);
15625 -diff -urNp linux-2.6.32.28/net/atm/atm_misc.c linux-2.6.32.28/net/atm/atm_misc.c
15626 ---- linux-2.6.32.28/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
15627 -+++ linux-2.6.32.28/net/atm/atm_misc.c 2010-12-31 14:46:53.000000000 -0500
15628 +diff -urNp linux-2.6.32.29/net/atm/atm_misc.c linux-2.6.32.29/net/atm/atm_misc.c
15629 +--- linux-2.6.32.29/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
15630 ++++ linux-2.6.32.29/net/atm/atm_misc.c 2010-12-31 14:46:53.000000000 -0500
15631 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
15632 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
15633 return 1;
15634 @@ -57999,9 +58102,9 @@ diff -urNp linux-2.6.32.28/net/atm/atm_misc.c linux-2.6.32.28/net/atm/atm_misc.c
15635 __SONET_ITEMS
15636 #undef __HANDLE_ITEM
15637 }
15638 -diff -urNp linux-2.6.32.28/net/atm/proc.c linux-2.6.32.28/net/atm/proc.c
15639 ---- linux-2.6.32.28/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
15640 -+++ linux-2.6.32.28/net/atm/proc.c 2010-12-31 14:46:53.000000000 -0500
15641 +diff -urNp linux-2.6.32.29/net/atm/proc.c linux-2.6.32.29/net/atm/proc.c
15642 +--- linux-2.6.32.29/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
15643 ++++ linux-2.6.32.29/net/atm/proc.c 2010-12-31 14:46:53.000000000 -0500
15644 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
15645 const struct k_atm_aal_stats *stats)
15646 {
15647 @@ -58028,9 +58131,9 @@ diff -urNp linux-2.6.32.28/net/atm/proc.c linux-2.6.32.28/net/atm/proc.c
15648 if (!vcc->dev)
15649 seq_printf(seq, "Unassigned ");
15650 else
15651 -diff -urNp linux-2.6.32.28/net/atm/resources.c linux-2.6.32.28/net/atm/resources.c
15652 ---- linux-2.6.32.28/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
15653 -+++ linux-2.6.32.28/net/atm/resources.c 2010-12-31 14:46:53.000000000 -0500
15654 +diff -urNp linux-2.6.32.29/net/atm/resources.c linux-2.6.32.29/net/atm/resources.c
15655 +--- linux-2.6.32.29/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
15656 ++++ linux-2.6.32.29/net/atm/resources.c 2010-12-31 14:46:53.000000000 -0500
15657 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
15658 static void copy_aal_stats(struct k_atm_aal_stats *from,
15659 struct atm_aal_stats *to)
15660 @@ -58049,9 +58152,9 @@ diff -urNp linux-2.6.32.28/net/atm/resources.c linux-2.6.32.28/net/atm/resources
15661 __AAL_STAT_ITEMS
15662 #undef __HANDLE_ITEM
15663 }
15664 -diff -urNp linux-2.6.32.28/net/ax25/af_ax25.c linux-2.6.32.28/net/ax25/af_ax25.c
15665 ---- linux-2.6.32.28/net/ax25/af_ax25.c 2010-08-13 16:24:37.000000000 -0400
15666 -+++ linux-2.6.32.28/net/ax25/af_ax25.c 2010-12-31 14:46:53.000000000 -0500
15667 +diff -urNp linux-2.6.32.29/net/ax25/af_ax25.c linux-2.6.32.29/net/ax25/af_ax25.c
15668 +--- linux-2.6.32.29/net/ax25/af_ax25.c 2010-08-13 16:24:37.000000000 -0400
15669 ++++ linux-2.6.32.29/net/ax25/af_ax25.c 2010-12-31 14:46:53.000000000 -0500
15670 @@ -1391,6 +1391,7 @@ static int ax25_getname(struct socket *s
15671 ax25_cb *ax25;
15672 int err = 0;
15673 @@ -58068,9 +58171,9 @@ diff -urNp linux-2.6.32.28/net/ax25/af_ax25.c linux-2.6.32.28/net/ax25/af_ax25.c
15674
15675 if (ax25->digipeat != NULL) {
15676 ndigi = ax25->digipeat->ndigi;
15677 -diff -urNp linux-2.6.32.28/net/bridge/br_private.h linux-2.6.32.28/net/bridge/br_private.h
15678 ---- linux-2.6.32.28/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
15679 -+++ linux-2.6.32.28/net/bridge/br_private.h 2010-12-31 14:46:53.000000000 -0500
15680 +diff -urNp linux-2.6.32.29/net/bridge/br_private.h linux-2.6.32.29/net/bridge/br_private.h
15681 +--- linux-2.6.32.29/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
15682 ++++ linux-2.6.32.29/net/bridge/br_private.h 2010-12-31 14:46:53.000000000 -0500
15683 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
15684
15685 #ifdef CONFIG_SYSFS
15686 @@ -58080,9 +58183,9 @@ diff -urNp linux-2.6.32.28/net/bridge/br_private.h linux-2.6.32.28/net/bridge/br
15687 extern int br_sysfs_addif(struct net_bridge_port *p);
15688
15689 /* br_sysfs_br.c */
15690 -diff -urNp linux-2.6.32.28/net/bridge/br_stp_if.c linux-2.6.32.28/net/bridge/br_stp_if.c
15691 ---- linux-2.6.32.28/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
15692 -+++ linux-2.6.32.28/net/bridge/br_stp_if.c 2010-12-31 14:46:53.000000000 -0500
15693 +diff -urNp linux-2.6.32.29/net/bridge/br_stp_if.c linux-2.6.32.29/net/bridge/br_stp_if.c
15694 +--- linux-2.6.32.29/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
15695 ++++ linux-2.6.32.29/net/bridge/br_stp_if.c 2010-12-31 14:46:53.000000000 -0500
15696 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
15697 char *envp[] = { NULL };
15698
15699 @@ -58092,9 +58195,9 @@ diff -urNp linux-2.6.32.28/net/bridge/br_stp_if.c linux-2.6.32.28/net/bridge/br_
15700 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
15701 br->dev->name, r);
15702
15703 -diff -urNp linux-2.6.32.28/net/bridge/br_sysfs_if.c linux-2.6.32.28/net/bridge/br_sysfs_if.c
15704 ---- linux-2.6.32.28/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
15705 -+++ linux-2.6.32.28/net/bridge/br_sysfs_if.c 2010-12-31 14:46:53.000000000 -0500
15706 +diff -urNp linux-2.6.32.29/net/bridge/br_sysfs_if.c linux-2.6.32.29/net/bridge/br_sysfs_if.c
15707 +--- linux-2.6.32.29/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
15708 ++++ linux-2.6.32.29/net/bridge/br_sysfs_if.c 2010-12-31 14:46:53.000000000 -0500
15709 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
15710 return ret;
15711 }
15712 @@ -58104,9 +58207,9 @@ diff -urNp linux-2.6.32.28/net/bridge/br_sysfs_if.c linux-2.6.32.28/net/bridge/b
15713 .show = brport_show,
15714 .store = brport_store,
15715 };
15716 -diff -urNp linux-2.6.32.28/net/core/dev.c linux-2.6.32.28/net/core/dev.c
15717 ---- linux-2.6.32.28/net/core/dev.c 2011-01-11 23:55:35.000000000 -0500
15718 -+++ linux-2.6.32.28/net/core/dev.c 2011-01-11 23:56:07.000000000 -0500
15719 +diff -urNp linux-2.6.32.29/net/core/dev.c linux-2.6.32.29/net/core/dev.c
15720 +--- linux-2.6.32.29/net/core/dev.c 2011-01-11 23:55:35.000000000 -0500
15721 ++++ linux-2.6.32.29/net/core/dev.c 2011-01-11 23:56:07.000000000 -0500
15722 @@ -2055,7 +2055,7 @@ int netif_rx_ni(struct sk_buff *skb)
15723 }
15724 EXPORT_SYMBOL(netif_rx_ni);
15725 @@ -58125,9 +58228,9 @@ diff -urNp linux-2.6.32.28/net/core/dev.c linux-2.6.32.28/net/core/dev.c
15726 {
15727 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
15728 unsigned long time_limit = jiffies + 2;
15729 -diff -urNp linux-2.6.32.28/net/core/flow.c linux-2.6.32.28/net/core/flow.c
15730 ---- linux-2.6.32.28/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
15731 -+++ linux-2.6.32.28/net/core/flow.c 2010-12-31 14:46:53.000000000 -0500
15732 +diff -urNp linux-2.6.32.29/net/core/flow.c linux-2.6.32.29/net/core/flow.c
15733 +--- linux-2.6.32.29/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
15734 ++++ linux-2.6.32.29/net/core/flow.c 2010-12-31 14:46:53.000000000 -0500
15735 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
15736
15737 static u32 flow_hash_shift;
15738 @@ -58155,9 +58258,9 @@ diff -urNp linux-2.6.32.28/net/core/flow.c linux-2.6.32.28/net/core/flow.c
15739
15740 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
15741
15742 -diff -urNp linux-2.6.32.28/net/dccp/ccids/ccid3.c linux-2.6.32.28/net/dccp/ccids/ccid3.c
15743 ---- linux-2.6.32.28/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
15744 -+++ linux-2.6.32.28/net/dccp/ccids/ccid3.c 2010-12-31 14:46:53.000000000 -0500
15745 +diff -urNp linux-2.6.32.29/net/dccp/ccids/ccid3.c linux-2.6.32.29/net/dccp/ccids/ccid3.c
15746 +--- linux-2.6.32.29/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
15747 ++++ linux-2.6.32.29/net/dccp/ccids/ccid3.c 2010-12-31 14:46:53.000000000 -0500
15748 @@ -41,7 +41,7 @@
15749 static int ccid3_debug;
15750 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
15751 @@ -58167,9 +58270,9 @@ diff -urNp linux-2.6.32.28/net/dccp/ccids/ccid3.c linux-2.6.32.28/net/dccp/ccids
15752 #endif
15753
15754 /*
15755 -diff -urNp linux-2.6.32.28/net/dccp/dccp.h linux-2.6.32.28/net/dccp/dccp.h
15756 ---- linux-2.6.32.28/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
15757 -+++ linux-2.6.32.28/net/dccp/dccp.h 2010-12-31 14:46:53.000000000 -0500
15758 +diff -urNp linux-2.6.32.29/net/dccp/dccp.h linux-2.6.32.29/net/dccp/dccp.h
15759 +--- linux-2.6.32.29/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
15760 ++++ linux-2.6.32.29/net/dccp/dccp.h 2010-12-31 14:46:53.000000000 -0500
15761 @@ -44,9 +44,9 @@ extern int dccp_debug;
15762 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
15763 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
15764 @@ -58183,9 +58286,9 @@ diff -urNp linux-2.6.32.28/net/dccp/dccp.h linux-2.6.32.28/net/dccp/dccp.h
15765 #endif
15766
15767 extern struct inet_hashinfo dccp_hashinfo;
15768 -diff -urNp linux-2.6.32.28/net/decnet/sysctl_net_decnet.c linux-2.6.32.28/net/decnet/sysctl_net_decnet.c
15769 ---- linux-2.6.32.28/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
15770 -+++ linux-2.6.32.28/net/decnet/sysctl_net_decnet.c 2010-12-31 14:46:53.000000000 -0500
15771 +diff -urNp linux-2.6.32.29/net/decnet/sysctl_net_decnet.c linux-2.6.32.29/net/decnet/sysctl_net_decnet.c
15772 +--- linux-2.6.32.29/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
15773 ++++ linux-2.6.32.29/net/decnet/sysctl_net_decnet.c 2010-12-31 14:46:53.000000000 -0500
15774 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
15775
15776 if (len > *lenp) len = *lenp;
15777 @@ -58204,9 +58307,9 @@ diff -urNp linux-2.6.32.28/net/decnet/sysctl_net_decnet.c linux-2.6.32.28/net/de
15778 return -EFAULT;
15779
15780 *lenp = len;
15781 -diff -urNp linux-2.6.32.28/net/econet/Kconfig linux-2.6.32.28/net/econet/Kconfig
15782 ---- linux-2.6.32.28/net/econet/Kconfig 2010-08-13 16:24:37.000000000 -0400
15783 -+++ linux-2.6.32.28/net/econet/Kconfig 2010-12-31 14:46:53.000000000 -0500
15784 +diff -urNp linux-2.6.32.29/net/econet/Kconfig linux-2.6.32.29/net/econet/Kconfig
15785 +--- linux-2.6.32.29/net/econet/Kconfig 2010-08-13 16:24:37.000000000 -0400
15786 ++++ linux-2.6.32.29/net/econet/Kconfig 2010-12-31 14:46:53.000000000 -0500
15787 @@ -4,7 +4,7 @@
15788
15789 config ECONET
15790 @@ -58216,9 +58319,9 @@ diff -urNp linux-2.6.32.28/net/econet/Kconfig linux-2.6.32.28/net/econet/Kconfig
15791 ---help---
15792 Econet is a fairly old and slow networking protocol mainly used by
15793 Acorn computers to access file and print servers. It uses native
15794 -diff -urNp linux-2.6.32.28/net/ipv4/inet_diag.c linux-2.6.32.28/net/ipv4/inet_diag.c
15795 ---- linux-2.6.32.28/net/ipv4/inet_diag.c 2010-08-13 16:24:37.000000000 -0400
15796 -+++ linux-2.6.32.28/net/ipv4/inet_diag.c 2010-12-31 14:46:53.000000000 -0500
15797 +diff -urNp linux-2.6.32.29/net/ipv4/inet_diag.c linux-2.6.32.29/net/ipv4/inet_diag.c
15798 +--- linux-2.6.32.29/net/ipv4/inet_diag.c 2010-08-13 16:24:37.000000000 -0400
15799 ++++ linux-2.6.32.29/net/ipv4/inet_diag.c 2010-12-31 14:46:53.000000000 -0500
15800 @@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
15801 r->idiag_retrans = 0;
15802
15803 @@ -58279,9 +58382,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/inet_diag.c linux-2.6.32.28/net/ipv4/inet_di
15804
15805 tmo = req->expires - jiffies;
15806 if (tmo < 0)
15807 -diff -urNp linux-2.6.32.28/net/ipv4/inet_hashtables.c linux-2.6.32.28/net/ipv4/inet_hashtables.c
15808 ---- linux-2.6.32.28/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
15809 -+++ linux-2.6.32.28/net/ipv4/inet_hashtables.c 2010-12-31 14:46:53.000000000 -0500
15810 +diff -urNp linux-2.6.32.29/net/ipv4/inet_hashtables.c linux-2.6.32.29/net/ipv4/inet_hashtables.c
15811 +--- linux-2.6.32.29/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
15812 ++++ linux-2.6.32.29/net/ipv4/inet_hashtables.c 2010-12-31 14:46:53.000000000 -0500
15813 @@ -18,11 +18,14 @@
15814 #include <linux/sched.h>
15815 #include <linux/slab.h>
15816 @@ -58306,9 +58409,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/inet_hashtables.c linux-2.6.32.28/net/ipv4/i
15817 if (tw) {
15818 inet_twsk_deschedule(tw, death_row);
15819 inet_twsk_put(tw);
15820 -diff -urNp linux-2.6.32.28/net/ipv4/inetpeer.c linux-2.6.32.28/net/ipv4/inetpeer.c
15821 ---- linux-2.6.32.28/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400
15822 -+++ linux-2.6.32.28/net/ipv4/inetpeer.c 2010-12-31 14:46:53.000000000 -0500
15823 +diff -urNp linux-2.6.32.29/net/ipv4/inetpeer.c linux-2.6.32.29/net/ipv4/inetpeer.c
15824 +--- linux-2.6.32.29/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400
15825 ++++ linux-2.6.32.29/net/ipv4/inetpeer.c 2010-12-31 14:46:53.000000000 -0500
15826 @@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da
15827 return NULL;
15828 n->v4daddr = daddr;
15829 @@ -58318,9 +58421,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/inetpeer.c linux-2.6.32.28/net/ipv4/inetpeer
15830 n->ip_id_count = secure_ip_id(daddr);
15831 n->tcp_ts_stamp = 0;
15832
15833 -diff -urNp linux-2.6.32.28/net/ipv4/ip_fragment.c linux-2.6.32.28/net/ipv4/ip_fragment.c
15834 ---- linux-2.6.32.28/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400
15835 -+++ linux-2.6.32.28/net/ipv4/ip_fragment.c 2010-12-31 14:46:53.000000000 -0500
15836 +diff -urNp linux-2.6.32.29/net/ipv4/ip_fragment.c linux-2.6.32.29/net/ipv4/ip_fragment.c
15837 +--- linux-2.6.32.29/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400
15838 ++++ linux-2.6.32.29/net/ipv4/ip_fragment.c 2010-12-31 14:46:53.000000000 -0500
15839 @@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
15840 return 0;
15841
15842 @@ -58330,9 +58433,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/ip_fragment.c linux-2.6.32.28/net/ipv4/ip_fr
15843 qp->rid = end;
15844
15845 rc = qp->q.fragments && (end - start) > max;
15846 -diff -urNp linux-2.6.32.28/net/ipv4/netfilter/arp_tables.c linux-2.6.32.28/net/ipv4/netfilter/arp_tables.c
15847 ---- linux-2.6.32.28/net/ipv4/netfilter/arp_tables.c 2010-08-13 16:24:37.000000000 -0400
15848 -+++ linux-2.6.32.28/net/ipv4/netfilter/arp_tables.c 2010-12-31 14:46:53.000000000 -0500
15849 +diff -urNp linux-2.6.32.29/net/ipv4/netfilter/arp_tables.c linux-2.6.32.29/net/ipv4/netfilter/arp_tables.c
15850 +--- linux-2.6.32.29/net/ipv4/netfilter/arp_tables.c 2010-08-13 16:24:37.000000000 -0400
15851 ++++ linux-2.6.32.29/net/ipv4/netfilter/arp_tables.c 2010-12-31 14:46:53.000000000 -0500
15852 @@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
15853 private = &tmp;
15854 }
15855 @@ -58341,9 +58444,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/netfilter/arp_tables.c linux-2.6.32.28/net/i
15856 info.valid_hooks = t->valid_hooks;
15857 memcpy(info.hook_entry, private->hook_entry,
15858 sizeof(info.hook_entry));
15859 -diff -urNp linux-2.6.32.28/net/ipv4/netfilter/ip_tables.c linux-2.6.32.28/net/ipv4/netfilter/ip_tables.c
15860 ---- linux-2.6.32.28/net/ipv4/netfilter/ip_tables.c 2010-08-13 16:24:37.000000000 -0400
15861 -+++ linux-2.6.32.28/net/ipv4/netfilter/ip_tables.c 2010-12-31 14:46:53.000000000 -0500
15862 +diff -urNp linux-2.6.32.29/net/ipv4/netfilter/ip_tables.c linux-2.6.32.29/net/ipv4/netfilter/ip_tables.c
15863 +--- linux-2.6.32.29/net/ipv4/netfilter/ip_tables.c 2010-08-13 16:24:37.000000000 -0400
15864 ++++ linux-2.6.32.29/net/ipv4/netfilter/ip_tables.c 2010-12-31 14:46:53.000000000 -0500
15865 @@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
15866 private = &tmp;
15867 }
15868 @@ -58352,9 +58455,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/netfilter/ip_tables.c linux-2.6.32.28/net/ip
15869 info.valid_hooks = t->valid_hooks;
15870 memcpy(info.hook_entry, private->hook_entry,
15871 sizeof(info.hook_entry));
15872 -diff -urNp linux-2.6.32.28/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.28/net/ipv4/netfilter/nf_nat_snmp_basic.c
15873 ---- linux-2.6.32.28/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
15874 -+++ linux-2.6.32.28/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-31 14:46:53.000000000 -0500
15875 +diff -urNp linux-2.6.32.29/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.29/net/ipv4/netfilter/nf_nat_snmp_basic.c
15876 +--- linux-2.6.32.29/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
15877 ++++ linux-2.6.32.29/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-31 14:46:53.000000000 -0500
15878 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
15879
15880 *len = 0;
15881 @@ -58364,9 +58467,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.2
15882 if (*octets == NULL) {
15883 if (net_ratelimit())
15884 printk("OOM in bsalg (%d)\n", __LINE__);
15885 -diff -urNp linux-2.6.32.28/net/ipv4/tcp.c linux-2.6.32.28/net/ipv4/tcp.c
15886 ---- linux-2.6.32.28/net/ipv4/tcp.c 2010-12-09 18:13:03.000000000 -0500
15887 -+++ linux-2.6.32.28/net/ipv4/tcp.c 2010-12-31 14:46:53.000000000 -0500
15888 +diff -urNp linux-2.6.32.29/net/ipv4/tcp.c linux-2.6.32.29/net/ipv4/tcp.c
15889 +--- linux-2.6.32.29/net/ipv4/tcp.c 2010-12-09 18:13:03.000000000 -0500
15890 ++++ linux-2.6.32.29/net/ipv4/tcp.c 2010-12-31 14:46:53.000000000 -0500
15891 @@ -2117,7 +2117,7 @@ static int do_tcp_setsockopt(struct sock
15892 /* Values greater than interface MTU won't take effect. However
15893 * at the point when this call is done we typically don't yet
15894 @@ -58376,9 +58479,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/tcp.c linux-2.6.32.28/net/ipv4/tcp.c
15895 err = -EINVAL;
15896 break;
15897 }
15898 -diff -urNp linux-2.6.32.28/net/ipv4/tcp_ipv4.c linux-2.6.32.28/net/ipv4/tcp_ipv4.c
15899 ---- linux-2.6.32.28/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
15900 -+++ linux-2.6.32.28/net/ipv4/tcp_ipv4.c 2010-12-31 14:46:53.000000000 -0500
15901 +diff -urNp linux-2.6.32.29/net/ipv4/tcp_ipv4.c linux-2.6.32.29/net/ipv4/tcp_ipv4.c
15902 +--- linux-2.6.32.29/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
15903 ++++ linux-2.6.32.29/net/ipv4/tcp_ipv4.c 2010-12-31 14:46:53.000000000 -0500
15904 @@ -84,6 +84,9 @@
15905 int sysctl_tcp_tw_reuse __read_mostly;
15906 int sysctl_tcp_low_latency __read_mostly;
15907 @@ -58474,9 +58577,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/tcp_ipv4.c linux-2.6.32.28/net/ipv4/tcp_ipv4
15908 }
15909
15910 #define TMPSZ 150
15911 -diff -urNp linux-2.6.32.28/net/ipv4/tcp_minisocks.c linux-2.6.32.28/net/ipv4/tcp_minisocks.c
15912 ---- linux-2.6.32.28/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
15913 -+++ linux-2.6.32.28/net/ipv4/tcp_minisocks.c 2010-12-31 14:46:53.000000000 -0500
15914 +diff -urNp linux-2.6.32.29/net/ipv4/tcp_minisocks.c linux-2.6.32.29/net/ipv4/tcp_minisocks.c
15915 +--- linux-2.6.32.29/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
15916 ++++ linux-2.6.32.29/net/ipv4/tcp_minisocks.c 2010-12-31 14:46:53.000000000 -0500
15917 @@ -26,6 +26,10 @@
15918 #include <net/inet_common.h>
15919 #include <net/xfrm.h>
15920 @@ -58499,9 +58602,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/tcp_minisocks.c linux-2.6.32.28/net/ipv4/tcp
15921 if (!(flg & TCP_FLAG_RST))
15922 req->rsk_ops->send_reset(sk, skb);
15923
15924 -diff -urNp linux-2.6.32.28/net/ipv4/tcp_probe.c linux-2.6.32.28/net/ipv4/tcp_probe.c
15925 ---- linux-2.6.32.28/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
15926 -+++ linux-2.6.32.28/net/ipv4/tcp_probe.c 2010-12-31 14:46:53.000000000 -0500
15927 +diff -urNp linux-2.6.32.29/net/ipv4/tcp_probe.c linux-2.6.32.29/net/ipv4/tcp_probe.c
15928 +--- linux-2.6.32.29/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
15929 ++++ linux-2.6.32.29/net/ipv4/tcp_probe.c 2010-12-31 14:46:53.000000000 -0500
15930 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
15931 if (cnt + width >= len)
15932 break;
15933 @@ -58511,9 +58614,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/tcp_probe.c linux-2.6.32.28/net/ipv4/tcp_pro
15934 return -EFAULT;
15935 cnt += width;
15936 }
15937 -diff -urNp linux-2.6.32.28/net/ipv4/tcp_timer.c linux-2.6.32.28/net/ipv4/tcp_timer.c
15938 ---- linux-2.6.32.28/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
15939 -+++ linux-2.6.32.28/net/ipv4/tcp_timer.c 2010-12-31 14:46:53.000000000 -0500
15940 +diff -urNp linux-2.6.32.29/net/ipv4/tcp_timer.c linux-2.6.32.29/net/ipv4/tcp_timer.c
15941 +--- linux-2.6.32.29/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
15942 ++++ linux-2.6.32.29/net/ipv4/tcp_timer.c 2010-12-31 14:46:53.000000000 -0500
15943 @@ -21,6 +21,10 @@
15944 #include <linux/module.h>
15945 #include <net/tcp.h>
15946 @@ -58539,9 +58642,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/tcp_timer.c linux-2.6.32.28/net/ipv4/tcp_tim
15947 if (retransmits_timed_out(sk, retry_until)) {
15948 /* Has it gone just too far? */
15949 tcp_write_err(sk);
15950 -diff -urNp linux-2.6.32.28/net/ipv4/udp.c linux-2.6.32.28/net/ipv4/udp.c
15951 ---- linux-2.6.32.28/net/ipv4/udp.c 2010-12-09 18:13:03.000000000 -0500
15952 -+++ linux-2.6.32.28/net/ipv4/udp.c 2010-12-31 14:46:53.000000000 -0500
15953 +diff -urNp linux-2.6.32.29/net/ipv4/udp.c linux-2.6.32.29/net/ipv4/udp.c
15954 +--- linux-2.6.32.29/net/ipv4/udp.c 2010-12-09 18:13:03.000000000 -0500
15955 ++++ linux-2.6.32.29/net/ipv4/udp.c 2010-12-31 14:46:53.000000000 -0500
15956 @@ -86,6 +86,7 @@
15957 #include <linux/types.h>
15958 #include <linux/fcntl.h>
15959 @@ -58625,9 +58728,9 @@ diff -urNp linux-2.6.32.28/net/ipv4/udp.c linux-2.6.32.28/net/ipv4/udp.c
15960 atomic_read(&sp->sk_drops), len);
15961 }
15962
15963 -diff -urNp linux-2.6.32.28/net/ipv6/exthdrs.c linux-2.6.32.28/net/ipv6/exthdrs.c
15964 ---- linux-2.6.32.28/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
15965 -+++ linux-2.6.32.28/net/ipv6/exthdrs.c 2010-12-31 14:46:53.000000000 -0500
15966 +diff -urNp linux-2.6.32.29/net/ipv6/exthdrs.c linux-2.6.32.29/net/ipv6/exthdrs.c
15967 +--- linux-2.6.32.29/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
15968 ++++ linux-2.6.32.29/net/ipv6/exthdrs.c 2010-12-31 14:46:53.000000000 -0500
15969 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
15970 .type = IPV6_TLV_JUMBO,
15971 .func = ipv6_hop_jumbo,
15972 @@ -58637,9 +58740,9 @@ diff -urNp linux-2.6.32.28/net/ipv6/exthdrs.c linux-2.6.32.28/net/ipv6/exthdrs.c
15973 };
15974
15975 int ipv6_parse_hopopts(struct sk_buff *skb)
15976 -diff -urNp linux-2.6.32.28/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.28/net/ipv6/netfilter/ip6_tables.c
15977 ---- linux-2.6.32.28/net/ipv6/netfilter/ip6_tables.c 2010-08-13 16:24:37.000000000 -0400
15978 -+++ linux-2.6.32.28/net/ipv6/netfilter/ip6_tables.c 2010-12-31 14:46:53.000000000 -0500
15979 +diff -urNp linux-2.6.32.29/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.29/net/ipv6/netfilter/ip6_tables.c
15980 +--- linux-2.6.32.29/net/ipv6/netfilter/ip6_tables.c 2010-08-13 16:24:37.000000000 -0400
15981 ++++ linux-2.6.32.29/net/ipv6/netfilter/ip6_tables.c 2010-12-31 14:46:53.000000000 -0500
15982 @@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
15983 private = &tmp;
15984 }
15985 @@ -58648,9 +58751,9 @@ diff -urNp linux-2.6.32.28/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.28/net/i
15986 info.valid_hooks = t->valid_hooks;
15987 memcpy(info.hook_entry, private->hook_entry,
15988 sizeof(info.hook_entry));
15989 -diff -urNp linux-2.6.32.28/net/ipv6/raw.c linux-2.6.32.28/net/ipv6/raw.c
15990 ---- linux-2.6.32.28/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
15991 -+++ linux-2.6.32.28/net/ipv6/raw.c 2010-12-31 14:46:53.000000000 -0500
15992 +diff -urNp linux-2.6.32.29/net/ipv6/raw.c linux-2.6.32.29/net/ipv6/raw.c
15993 +--- linux-2.6.32.29/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
15994 ++++ linux-2.6.32.29/net/ipv6/raw.c 2010-12-31 14:46:53.000000000 -0500
15995 @@ -600,7 +600,7 @@ out:
15996 return err;
15997 }
15998 @@ -58675,9 +58778,9 @@ diff -urNp linux-2.6.32.28/net/ipv6/raw.c linux-2.6.32.28/net/ipv6/raw.c
15999 }
16000
16001 static int raw6_seq_show(struct seq_file *seq, void *v)
16002 -diff -urNp linux-2.6.32.28/net/ipv6/tcp_ipv6.c linux-2.6.32.28/net/ipv6/tcp_ipv6.c
16003 ---- linux-2.6.32.28/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
16004 -+++ linux-2.6.32.28/net/ipv6/tcp_ipv6.c 2010-12-31 14:46:53.000000000 -0500
16005 +diff -urNp linux-2.6.32.29/net/ipv6/tcp_ipv6.c linux-2.6.32.29/net/ipv6/tcp_ipv6.c
16006 +--- linux-2.6.32.29/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
16007 ++++ linux-2.6.32.29/net/ipv6/tcp_ipv6.c 2010-12-31 14:46:53.000000000 -0500
16008 @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
16009 }
16010 #endif
16011 @@ -58777,9 +58880,9 @@ diff -urNp linux-2.6.32.28/net/ipv6/tcp_ipv6.c linux-2.6.32.28/net/ipv6/tcp_ipv6
16012 }
16013
16014 static int tcp6_seq_show(struct seq_file *seq, void *v)
16015 -diff -urNp linux-2.6.32.28/net/ipv6/udp.c linux-2.6.32.28/net/ipv6/udp.c
16016 ---- linux-2.6.32.28/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
16017 -+++ linux-2.6.32.28/net/ipv6/udp.c 2010-12-31 14:46:53.000000000 -0500
16018 +diff -urNp linux-2.6.32.29/net/ipv6/udp.c linux-2.6.32.29/net/ipv6/udp.c
16019 +--- linux-2.6.32.29/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
16020 ++++ linux-2.6.32.29/net/ipv6/udp.c 2010-12-31 14:46:53.000000000 -0500
16021 @@ -49,6 +49,10 @@
16022 #include <linux/seq_file.h>
16023 #include "udp_impl.h"
16024 @@ -58815,9 +58918,9 @@ diff -urNp linux-2.6.32.28/net/ipv6/udp.c linux-2.6.32.28/net/ipv6/udp.c
16025 atomic_read(&sp->sk_drops));
16026 }
16027
16028 -diff -urNp linux-2.6.32.28/net/irda/af_irda.c linux-2.6.32.28/net/irda/af_irda.c
16029 ---- linux-2.6.32.28/net/irda/af_irda.c 2010-09-26 17:26:06.000000000 -0400
16030 -+++ linux-2.6.32.28/net/irda/af_irda.c 2011-01-08 13:13:09.000000000 -0500
16031 +diff -urNp linux-2.6.32.29/net/irda/af_irda.c linux-2.6.32.29/net/irda/af_irda.c
16032 +--- linux-2.6.32.29/net/irda/af_irda.c 2010-09-26 17:26:06.000000000 -0400
16033 ++++ linux-2.6.32.29/net/irda/af_irda.c 2011-01-08 13:13:09.000000000 -0500
16034 @@ -2164,6 +2164,13 @@ static int irda_getsockopt(struct socket
16035
16036 switch (optname) {
16037 @@ -58849,9 +58952,9 @@ diff -urNp linux-2.6.32.28/net/irda/af_irda.c linux-2.6.32.28/net/irda/af_irda.c
16038 /* Copy the list itself - watch for overflow */
16039 if(list.len > 2048)
16040 {
16041 -diff -urNp linux-2.6.32.28/net/irda/ircomm/ircomm_tty.c linux-2.6.32.28/net/irda/ircomm/ircomm_tty.c
16042 ---- linux-2.6.32.28/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
16043 -+++ linux-2.6.32.28/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:05:37.000000000 -0500
16044 +diff -urNp linux-2.6.32.29/net/irda/ircomm/ircomm_tty.c linux-2.6.32.29/net/irda/ircomm/ircomm_tty.c
16045 +--- linux-2.6.32.29/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
16046 ++++ linux-2.6.32.29/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:05:37.000000000 -0500
16047 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
16048 add_wait_queue(&self->open_wait, &wait);
16049
16050 @@ -58974,9 +59077,9 @@ diff -urNp linux-2.6.32.28/net/irda/ircomm/ircomm_tty.c linux-2.6.32.28/net/irda
16051 seq_printf(m, "Max data size: %d\n", self->max_data_size);
16052 seq_printf(m, "Max header size: %d\n", self->max_header_size);
16053
16054 -diff -urNp linux-2.6.32.28/net/key/af_key.c linux-2.6.32.28/net/key/af_key.c
16055 ---- linux-2.6.32.28/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
16056 -+++ linux-2.6.32.28/net/key/af_key.c 2010-12-31 14:46:53.000000000 -0500
16057 +diff -urNp linux-2.6.32.29/net/key/af_key.c linux-2.6.32.29/net/key/af_key.c
16058 +--- linux-2.6.32.29/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
16059 ++++ linux-2.6.32.29/net/key/af_key.c 2010-12-31 14:46:53.000000000 -0500
16060 @@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil
16061 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
16062 else
16063 @@ -58989,9 +59092,9 @@ diff -urNp linux-2.6.32.28/net/key/af_key.c linux-2.6.32.28/net/key/af_key.c
16064 atomic_read(&s->sk_refcnt),
16065 sk_rmem_alloc_get(s),
16066 sk_wmem_alloc_get(s),
16067 -diff -urNp linux-2.6.32.28/net/mac80211/debugfs_key.c linux-2.6.32.28/net/mac80211/debugfs_key.c
16068 ---- linux-2.6.32.28/net/mac80211/debugfs_key.c 2010-08-13 16:24:37.000000000 -0400
16069 -+++ linux-2.6.32.28/net/mac80211/debugfs_key.c 2010-12-31 14:46:53.000000000 -0500
16070 +diff -urNp linux-2.6.32.29/net/mac80211/debugfs_key.c linux-2.6.32.29/net/mac80211/debugfs_key.c
16071 +--- linux-2.6.32.29/net/mac80211/debugfs_key.c 2010-08-13 16:24:37.000000000 -0400
16072 ++++ linux-2.6.32.29/net/mac80211/debugfs_key.c 2010-12-31 14:46:53.000000000 -0500
16073 @@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file
16074 size_t count, loff_t *ppos)
16075 {
16076 @@ -59007,9 +59110,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/debugfs_key.c linux-2.6.32.28/net/mac802
16077
16078 for (i = 0; i < key->conf.keylen; i++)
16079 p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
16080 -diff -urNp linux-2.6.32.28/net/mac80211/ieee80211_i.h linux-2.6.32.28/net/mac80211/ieee80211_i.h
16081 ---- linux-2.6.32.28/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
16082 -+++ linux-2.6.32.28/net/mac80211/ieee80211_i.h 2011-01-24 18:05:37.000000000 -0500
16083 +diff -urNp linux-2.6.32.29/net/mac80211/ieee80211_i.h linux-2.6.32.29/net/mac80211/ieee80211_i.h
16084 +--- linux-2.6.32.29/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
16085 ++++ linux-2.6.32.29/net/mac80211/ieee80211_i.h 2011-01-24 18:05:37.000000000 -0500
16086 @@ -25,6 +25,7 @@
16087 #include <linux/etherdevice.h>
16088 #include <net/cfg80211.h>
16089 @@ -59027,9 +59130,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/ieee80211_i.h linux-2.6.32.28/net/mac802
16090 int monitors, cooked_mntrs;
16091 /* number of interfaces with corresponding FIF_ flags */
16092 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
16093 -diff -urNp linux-2.6.32.28/net/mac80211/iface.c linux-2.6.32.28/net/mac80211/iface.c
16094 ---- linux-2.6.32.28/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
16095 -+++ linux-2.6.32.28/net/mac80211/iface.c 2011-01-24 18:05:37.000000000 -0500
16096 +diff -urNp linux-2.6.32.29/net/mac80211/iface.c linux-2.6.32.29/net/mac80211/iface.c
16097 +--- linux-2.6.32.29/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
16098 ++++ linux-2.6.32.29/net/mac80211/iface.c 2011-01-24 18:05:37.000000000 -0500
16099 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
16100 break;
16101 }
16102 @@ -59084,9 +59187,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/iface.c linux-2.6.32.28/net/mac80211/ifa
16103 ieee80211_clear_tx_pending(local);
16104 ieee80211_stop_device(local);
16105
16106 -diff -urNp linux-2.6.32.28/net/mac80211/main.c linux-2.6.32.28/net/mac80211/main.c
16107 ---- linux-2.6.32.28/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
16108 -+++ linux-2.6.32.28/net/mac80211/main.c 2011-01-24 18:05:37.000000000 -0500
16109 +diff -urNp linux-2.6.32.29/net/mac80211/main.c linux-2.6.32.29/net/mac80211/main.c
16110 +--- linux-2.6.32.29/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
16111 ++++ linux-2.6.32.29/net/mac80211/main.c 2011-01-24 18:05:37.000000000 -0500
16112 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
16113 local->hw.conf.power_level = power;
16114 }
16115 @@ -59096,9 +59199,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/main.c linux-2.6.32.28/net/mac80211/main
16116 ret = drv_config(local, changed);
16117 /*
16118 * Goal:
16119 -diff -urNp linux-2.6.32.28/net/mac80211/pm.c linux-2.6.32.28/net/mac80211/pm.c
16120 ---- linux-2.6.32.28/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
16121 -+++ linux-2.6.32.28/net/mac80211/pm.c 2011-01-24 18:05:37.000000000 -0500
16122 +diff -urNp linux-2.6.32.29/net/mac80211/pm.c linux-2.6.32.29/net/mac80211/pm.c
16123 +--- linux-2.6.32.29/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
16124 ++++ linux-2.6.32.29/net/mac80211/pm.c 2011-01-24 18:05:37.000000000 -0500
16125 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
16126 }
16127
16128 @@ -59108,9 +59211,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/pm.c linux-2.6.32.28/net/mac80211/pm.c
16129 ieee80211_stop_device(local);
16130
16131 local->suspended = true;
16132 -diff -urNp linux-2.6.32.28/net/mac80211/rate.c linux-2.6.32.28/net/mac80211/rate.c
16133 ---- linux-2.6.32.28/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
16134 -+++ linux-2.6.32.28/net/mac80211/rate.c 2011-01-24 18:05:37.000000000 -0500
16135 +diff -urNp linux-2.6.32.29/net/mac80211/rate.c linux-2.6.32.29/net/mac80211/rate.c
16136 +--- linux-2.6.32.29/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
16137 ++++ linux-2.6.32.29/net/mac80211/rate.c 2011-01-24 18:05:37.000000000 -0500
16138 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
16139 struct rate_control_ref *ref, *old;
16140
16141 @@ -59120,9 +59223,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/rate.c linux-2.6.32.28/net/mac80211/rate
16142 return -EBUSY;
16143
16144 ref = rate_control_alloc(name, local);
16145 -diff -urNp linux-2.6.32.28/net/mac80211/tx.c linux-2.6.32.28/net/mac80211/tx.c
16146 ---- linux-2.6.32.28/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
16147 -+++ linux-2.6.32.28/net/mac80211/tx.c 2010-12-31 14:46:53.000000000 -0500
16148 +diff -urNp linux-2.6.32.29/net/mac80211/tx.c linux-2.6.32.29/net/mac80211/tx.c
16149 +--- linux-2.6.32.29/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
16150 ++++ linux-2.6.32.29/net/mac80211/tx.c 2010-12-31 14:46:53.000000000 -0500
16151 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
16152 return cpu_to_le16(dur);
16153 }
16154 @@ -59132,9 +59235,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/tx.c linux-2.6.32.28/net/mac80211/tx.c
16155 struct net_device *dev)
16156 {
16157 return local == wdev_priv(dev->ieee80211_ptr);
16158 -diff -urNp linux-2.6.32.28/net/mac80211/util.c linux-2.6.32.28/net/mac80211/util.c
16159 ---- linux-2.6.32.28/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
16160 -+++ linux-2.6.32.28/net/mac80211/util.c 2011-01-24 18:05:37.000000000 -0500
16161 +diff -urNp linux-2.6.32.29/net/mac80211/util.c linux-2.6.32.29/net/mac80211/util.c
16162 +--- linux-2.6.32.29/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
16163 ++++ linux-2.6.32.29/net/mac80211/util.c 2011-01-24 18:05:37.000000000 -0500
16164 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
16165 local->resuming = true;
16166
16167 @@ -59144,9 +59247,9 @@ diff -urNp linux-2.6.32.28/net/mac80211/util.c linux-2.6.32.28/net/mac80211/util
16168 /*
16169 * Upon resume hardware can sometimes be goofy due to
16170 * various platform / driver / bus issues, so restarting
16171 -diff -urNp linux-2.6.32.28/net/netfilter/Kconfig linux-2.6.32.28/net/netfilter/Kconfig
16172 ---- linux-2.6.32.28/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
16173 -+++ linux-2.6.32.28/net/netfilter/Kconfig 2010-12-31 14:46:53.000000000 -0500
16174 +diff -urNp linux-2.6.32.29/net/netfilter/Kconfig linux-2.6.32.29/net/netfilter/Kconfig
16175 +--- linux-2.6.32.29/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
16176 ++++ linux-2.6.32.29/net/netfilter/Kconfig 2010-12-31 14:46:53.000000000 -0500
16177 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
16178
16179 To compile it as a module, choose M here. If unsure, say N.
16180 @@ -59164,9 +59267,9 @@ diff -urNp linux-2.6.32.28/net/netfilter/Kconfig linux-2.6.32.28/net/netfilter/K
16181 config NETFILTER_XT_MATCH_HASHLIMIT
16182 tristate '"hashlimit" match support'
16183 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
16184 -diff -urNp linux-2.6.32.28/net/netfilter/Makefile linux-2.6.32.28/net/netfilter/Makefile
16185 ---- linux-2.6.32.28/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
16186 -+++ linux-2.6.32.28/net/netfilter/Makefile 2010-12-31 14:46:53.000000000 -0500
16187 +diff -urNp linux-2.6.32.29/net/netfilter/Makefile linux-2.6.32.29/net/netfilter/Makefile
16188 +--- linux-2.6.32.29/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
16189 ++++ linux-2.6.32.29/net/netfilter/Makefile 2010-12-31 14:46:53.000000000 -0500
16190 @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
16191 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
16192 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
16193 @@ -59175,9 +59278,9 @@ diff -urNp linux-2.6.32.28/net/netfilter/Makefile linux-2.6.32.28/net/netfilter/
16194 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
16195 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
16196 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
16197 -diff -urNp linux-2.6.32.28/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.28/net/netfilter/nf_conntrack_netlink.c
16198 ---- linux-2.6.32.28/net/netfilter/nf_conntrack_netlink.c 2010-08-13 16:24:37.000000000 -0400
16199 -+++ linux-2.6.32.28/net/netfilter/nf_conntrack_netlink.c 2010-12-31 14:46:53.000000000 -0500
16200 +diff -urNp linux-2.6.32.29/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.29/net/netfilter/nf_conntrack_netlink.c
16201 +--- linux-2.6.32.29/net/netfilter/nf_conntrack_netlink.c 2010-08-13 16:24:37.000000000 -0400
16202 ++++ linux-2.6.32.29/net/netfilter/nf_conntrack_netlink.c 2010-12-31 14:46:53.000000000 -0500
16203 @@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
16204 static int
16205 ctnetlink_parse_tuple(const struct nlattr * const cda[],
16206 @@ -59187,9 +59290,9 @@ diff -urNp linux-2.6.32.28/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.28/
16207 {
16208 struct nlattr *tb[CTA_TUPLE_MAX+1];
16209 int err;
16210 -diff -urNp linux-2.6.32.28/net/netfilter/xt_gradm.c linux-2.6.32.28/net/netfilter/xt_gradm.c
16211 ---- linux-2.6.32.28/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
16212 -+++ linux-2.6.32.28/net/netfilter/xt_gradm.c 2010-12-31 14:46:53.000000000 -0500
16213 +diff -urNp linux-2.6.32.29/net/netfilter/xt_gradm.c linux-2.6.32.29/net/netfilter/xt_gradm.c
16214 +--- linux-2.6.32.29/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
16215 ++++ linux-2.6.32.29/net/netfilter/xt_gradm.c 2010-12-31 14:46:53.000000000 -0500
16216 @@ -0,0 +1,51 @@
16217 +/*
16218 + * gradm match for netfilter
16219 @@ -59242,9 +59345,9 @@ diff -urNp linux-2.6.32.28/net/netfilter/xt_gradm.c linux-2.6.32.28/net/netfilte
16220 +MODULE_LICENSE("GPL");
16221 +MODULE_ALIAS("ipt_gradm");
16222 +MODULE_ALIAS("ip6t_gradm");
16223 -diff -urNp linux-2.6.32.28/net/netlink/af_netlink.c linux-2.6.32.28/net/netlink/af_netlink.c
16224 ---- linux-2.6.32.28/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
16225 -+++ linux-2.6.32.28/net/netlink/af_netlink.c 2010-12-31 14:46:53.000000000 -0500
16226 +diff -urNp linux-2.6.32.29/net/netlink/af_netlink.c linux-2.6.32.29/net/netlink/af_netlink.c
16227 +--- linux-2.6.32.29/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
16228 ++++ linux-2.6.32.29/net/netlink/af_netlink.c 2010-12-31 14:46:53.000000000 -0500
16229 @@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f
16230 struct netlink_sock *nlk = nlk_sk(s);
16231
16232 @@ -59267,9 +59370,9 @@ diff -urNp linux-2.6.32.28/net/netlink/af_netlink.c linux-2.6.32.28/net/netlink/
16233 atomic_read(&s->sk_refcnt),
16234 atomic_read(&s->sk_drops)
16235 );
16236 -diff -urNp linux-2.6.32.28/net/netrom/af_netrom.c linux-2.6.32.28/net/netrom/af_netrom.c
16237 ---- linux-2.6.32.28/net/netrom/af_netrom.c 2010-08-13 16:24:37.000000000 -0400
16238 -+++ linux-2.6.32.28/net/netrom/af_netrom.c 2010-12-31 14:46:53.000000000 -0500
16239 +diff -urNp linux-2.6.32.29/net/netrom/af_netrom.c linux-2.6.32.29/net/netrom/af_netrom.c
16240 +--- linux-2.6.32.29/net/netrom/af_netrom.c 2010-08-13 16:24:37.000000000 -0400
16241 ++++ linux-2.6.32.29/net/netrom/af_netrom.c 2010-12-31 14:46:53.000000000 -0500
16242 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc
16243 struct sock *sk = sock->sk;
16244 struct nr_sock *nr = nr_sk(sk);
16245 @@ -59286,9 +59389,9 @@ diff -urNp linux-2.6.32.28/net/netrom/af_netrom.c linux-2.6.32.28/net/netrom/af_
16246 sax->fsa_ax25.sax25_call = nr->source_addr;
16247 *uaddr_len = sizeof(struct sockaddr_ax25);
16248 }
16249 -diff -urNp linux-2.6.32.28/net/packet/af_packet.c linux-2.6.32.28/net/packet/af_packet.c
16250 ---- linux-2.6.32.28/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
16251 -+++ linux-2.6.32.28/net/packet/af_packet.c 2010-12-31 14:46:53.000000000 -0500
16252 +diff -urNp linux-2.6.32.29/net/packet/af_packet.c linux-2.6.32.29/net/packet/af_packet.c
16253 +--- linux-2.6.32.29/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
16254 ++++ linux-2.6.32.29/net/packet/af_packet.c 2010-12-31 14:46:53.000000000 -0500
16255 @@ -1526,7 +1526,7 @@ static int packet_getname_spkt(struct so
16256 uaddr->sa_family = AF_PACKET;
16257 dev = dev_get_by_index(sock_net(sk), pkt_sk(sk)->ifindex);
16258 @@ -59318,9 +59421,9 @@ diff -urNp linux-2.6.32.28/net/packet/af_packet.c linux-2.6.32.28/net/packet/af_
16259 atomic_read(&s->sk_refcnt),
16260 s->sk_type,
16261 ntohs(po->num),
16262 -diff -urNp linux-2.6.32.28/net/phonet/af_phonet.c linux-2.6.32.28/net/phonet/af_phonet.c
16263 ---- linux-2.6.32.28/net/phonet/af_phonet.c 2010-10-31 16:44:11.000000000 -0400
16264 -+++ linux-2.6.32.28/net/phonet/af_phonet.c 2010-12-31 14:46:53.000000000 -0500
16265 +diff -urNp linux-2.6.32.29/net/phonet/af_phonet.c linux-2.6.32.29/net/phonet/af_phonet.c
16266 +--- linux-2.6.32.29/net/phonet/af_phonet.c 2010-10-31 16:44:11.000000000 -0400
16267 ++++ linux-2.6.32.29/net/phonet/af_phonet.c 2010-12-31 14:46:53.000000000 -0500
16268 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
16269 {
16270 struct phonet_protocol *pp;
16271 @@ -59339,9 +59442,9 @@ diff -urNp linux-2.6.32.28/net/phonet/af_phonet.c linux-2.6.32.28/net/phonet/af_
16272 return -EINVAL;
16273
16274 err = proto_register(pp->prot, 1);
16275 -diff -urNp linux-2.6.32.28/net/phonet/socket.c linux-2.6.32.28/net/phonet/socket.c
16276 ---- linux-2.6.32.28/net/phonet/socket.c 2010-08-13 16:24:37.000000000 -0400
16277 -+++ linux-2.6.32.28/net/phonet/socket.c 2010-12-31 14:46:53.000000000 -0500
16278 +diff -urNp linux-2.6.32.29/net/phonet/socket.c linux-2.6.32.29/net/phonet/socket.c
16279 +--- linux-2.6.32.29/net/phonet/socket.c 2010-08-13 16:24:37.000000000 -0400
16280 ++++ linux-2.6.32.29/net/phonet/socket.c 2010-12-31 14:46:53.000000000 -0500
16281 @@ -482,7 +482,12 @@ static int pn_sock_seq_show(struct seq_f
16282 sk->sk_state,
16283 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
16284 @@ -59356,9 +59459,9 @@ diff -urNp linux-2.6.32.28/net/phonet/socket.c linux-2.6.32.28/net/phonet/socket
16285 atomic_read(&sk->sk_drops), &len);
16286 }
16287 seq_printf(seq, "%*s\n", 127 - len, "");
16288 -diff -urNp linux-2.6.32.28/net/rds/Kconfig linux-2.6.32.28/net/rds/Kconfig
16289 ---- linux-2.6.32.28/net/rds/Kconfig 2010-08-13 16:24:37.000000000 -0400
16290 -+++ linux-2.6.32.28/net/rds/Kconfig 2010-12-31 14:46:53.000000000 -0500
16291 +diff -urNp linux-2.6.32.29/net/rds/Kconfig linux-2.6.32.29/net/rds/Kconfig
16292 +--- linux-2.6.32.29/net/rds/Kconfig 2010-08-13 16:24:37.000000000 -0400
16293 ++++ linux-2.6.32.29/net/rds/Kconfig 2010-12-31 14:46:53.000000000 -0500
16294 @@ -1,7 +1,7 @@
16295
16296 config RDS
16297 @@ -59368,9 +59471,9 @@ diff -urNp linux-2.6.32.28/net/rds/Kconfig linux-2.6.32.28/net/rds/Kconfig
16298 ---help---
16299 The RDS (Reliable Datagram Sockets) protocol provides reliable,
16300 sequenced delivery of datagrams over Infiniband, iWARP,
16301 -diff -urNp linux-2.6.32.28/net/sctp/auth.c linux-2.6.32.28/net/sctp/auth.c
16302 ---- linux-2.6.32.28/net/sctp/auth.c 2010-08-13 16:24:37.000000000 -0400
16303 -+++ linux-2.6.32.28/net/sctp/auth.c 2010-12-31 14:46:53.000000000 -0500
16304 +diff -urNp linux-2.6.32.29/net/sctp/auth.c linux-2.6.32.29/net/sctp/auth.c
16305 +--- linux-2.6.32.29/net/sctp/auth.c 2010-08-13 16:24:37.000000000 -0400
16306 ++++ linux-2.6.32.29/net/sctp/auth.c 2010-12-31 14:46:53.000000000 -0500
16307 @@ -542,16 +542,20 @@ struct sctp_hmac *sctp_auth_asoc_get_hma
16308 id = ntohs(hmacs->hmac_ids[i]);
16309
16310 @@ -59394,9 +59497,9 @@ diff -urNp linux-2.6.32.28/net/sctp/auth.c linux-2.6.32.28/net/sctp/auth.c
16311
16312 break;
16313 }
16314 -diff -urNp linux-2.6.32.28/net/sctp/proc.c linux-2.6.32.28/net/sctp/proc.c
16315 ---- linux-2.6.32.28/net/sctp/proc.c 2010-08-13 16:24:37.000000000 -0400
16316 -+++ linux-2.6.32.28/net/sctp/proc.c 2010-12-31 14:46:53.000000000 -0500
16317 +diff -urNp linux-2.6.32.29/net/sctp/proc.c linux-2.6.32.29/net/sctp/proc.c
16318 +--- linux-2.6.32.29/net/sctp/proc.c 2010-08-13 16:24:37.000000000 -0400
16319 ++++ linux-2.6.32.29/net/sctp/proc.c 2010-12-31 14:46:53.000000000 -0500
16320 @@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_
16321 sctp_for_each_hentry(epb, node, &head->chain) {
16322 ep = sctp_ep(epb);
16323 @@ -59425,9 +59528,9 @@ diff -urNp linux-2.6.32.28/net/sctp/proc.c linux-2.6.32.28/net/sctp/proc.c
16324 assoc->state, hash,
16325 assoc->assoc_id,
16326 assoc->sndbuf_used,
16327 -diff -urNp linux-2.6.32.28/net/sctp/socket.c linux-2.6.32.28/net/sctp/socket.c
16328 ---- linux-2.6.32.28/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
16329 -+++ linux-2.6.32.28/net/sctp/socket.c 2010-12-31 14:46:53.000000000 -0500
16330 +diff -urNp linux-2.6.32.29/net/sctp/socket.c linux-2.6.32.29/net/sctp/socket.c
16331 +--- linux-2.6.32.29/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
16332 ++++ linux-2.6.32.29/net/sctp/socket.c 2010-12-31 14:46:53.000000000 -0500
16333 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
16334 struct sctp_sndrcvinfo *sinfo;
16335 struct sctp_initmsg *sinit;
16336 @@ -59445,9 +59548,9 @@ diff -urNp linux-2.6.32.28/net/sctp/socket.c linux-2.6.32.28/net/sctp/socket.c
16337
16338 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
16339 if (pp->fastreuse && sk->sk_reuse &&
16340 -diff -urNp linux-2.6.32.28/net/socket.c linux-2.6.32.28/net/socket.c
16341 ---- linux-2.6.32.28/net/socket.c 2010-12-09 18:13:03.000000000 -0500
16342 -+++ linux-2.6.32.28/net/socket.c 2010-12-31 14:46:53.000000000 -0500
16343 +diff -urNp linux-2.6.32.29/net/socket.c linux-2.6.32.29/net/socket.c
16344 +--- linux-2.6.32.29/net/socket.c 2010-12-09 18:13:03.000000000 -0500
16345 ++++ linux-2.6.32.29/net/socket.c 2010-12-31 14:46:53.000000000 -0500
16346 @@ -87,6 +87,7 @@
16347 #include <linux/wireless.h>
16348 #include <linux/nsproxy.h>
16349 @@ -59611,9 +59714,9 @@ diff -urNp linux-2.6.32.28/net/socket.c linux-2.6.32.28/net/socket.c
16350 err =
16351 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
16352 if (err)
16353 -diff -urNp linux-2.6.32.28/net/sunrpc/sched.c linux-2.6.32.28/net/sunrpc/sched.c
16354 ---- linux-2.6.32.28/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
16355 -+++ linux-2.6.32.28/net/sunrpc/sched.c 2010-12-31 14:46:53.000000000 -0500
16356 +diff -urNp linux-2.6.32.29/net/sunrpc/sched.c linux-2.6.32.29/net/sunrpc/sched.c
16357 +--- linux-2.6.32.29/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
16358 ++++ linux-2.6.32.29/net/sunrpc/sched.c 2010-12-31 14:46:53.000000000 -0500
16359 @@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
16360 #ifdef RPC_DEBUG
16361 static void rpc_task_set_debuginfo(struct rpc_task *task)
16362 @@ -59627,9 +59730,9 @@ diff -urNp linux-2.6.32.28/net/sunrpc/sched.c linux-2.6.32.28/net/sunrpc/sched.c
16363 }
16364 #else
16365 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
16366 -diff -urNp linux-2.6.32.28/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.28/net/sunrpc/xprtrdma/svc_rdma.c
16367 ---- linux-2.6.32.28/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
16368 -+++ linux-2.6.32.28/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-31 14:46:53.000000000 -0500
16369 +diff -urNp linux-2.6.32.29/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.29/net/sunrpc/xprtrdma/svc_rdma.c
16370 +--- linux-2.6.32.29/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
16371 ++++ linux-2.6.32.29/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-31 14:46:53.000000000 -0500
16372 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
16373 len -= *ppos;
16374 if (len > *lenp)
16375 @@ -59639,9 +59742,9 @@ diff -urNp linux-2.6.32.28/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.28/net/su
16376 return -EFAULT;
16377 *lenp = len;
16378 *ppos += len;
16379 -diff -urNp linux-2.6.32.28/net/sysctl_net.c linux-2.6.32.28/net/sysctl_net.c
16380 ---- linux-2.6.32.28/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
16381 -+++ linux-2.6.32.28/net/sysctl_net.c 2010-12-31 14:46:53.000000000 -0500
16382 +diff -urNp linux-2.6.32.29/net/sysctl_net.c linux-2.6.32.29/net/sysctl_net.c
16383 +--- linux-2.6.32.29/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
16384 ++++ linux-2.6.32.29/net/sysctl_net.c 2010-12-31 14:46:53.000000000 -0500
16385 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
16386 struct ctl_table *table)
16387 {
16388 @@ -59651,9 +59754,9 @@ diff -urNp linux-2.6.32.28/net/sysctl_net.c linux-2.6.32.28/net/sysctl_net.c
16389 int mode = (table->mode >> 6) & 7;
16390 return (mode << 6) | (mode << 3) | mode;
16391 }
16392 -diff -urNp linux-2.6.32.28/net/tipc/socket.c linux-2.6.32.28/net/tipc/socket.c
16393 ---- linux-2.6.32.28/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
16394 -+++ linux-2.6.32.28/net/tipc/socket.c 2010-12-31 14:46:53.000000000 -0500
16395 +diff -urNp linux-2.6.32.29/net/tipc/socket.c linux-2.6.32.29/net/tipc/socket.c
16396 +--- linux-2.6.32.29/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
16397 ++++ linux-2.6.32.29/net/tipc/socket.c 2010-12-31 14:46:53.000000000 -0500
16398 @@ -393,6 +393,7 @@ static int get_name(struct socket *sock,
16399 struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
16400 struct tipc_sock *tsock = tipc_sk(sock->sk);
16401 @@ -59674,9 +59777,9 @@ diff -urNp linux-2.6.32.28/net/tipc/socket.c linux-2.6.32.28/net/tipc/socket.c
16402 sock->state = SS_DISCONNECTING;
16403 }
16404
16405 -diff -urNp linux-2.6.32.28/net/unix/af_unix.c linux-2.6.32.28/net/unix/af_unix.c
16406 ---- linux-2.6.32.28/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
16407 -+++ linux-2.6.32.28/net/unix/af_unix.c 2010-12-31 14:46:53.000000000 -0500
16408 +diff -urNp linux-2.6.32.29/net/unix/af_unix.c linux-2.6.32.29/net/unix/af_unix.c
16409 +--- linux-2.6.32.29/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
16410 ++++ linux-2.6.32.29/net/unix/af_unix.c 2010-12-31 14:46:53.000000000 -0500
16411 @@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru
16412 err = -ECONNREFUSED;
16413 if (!S_ISSOCK(inode->i_mode))
16414 @@ -59746,9 +59849,9 @@ diff -urNp linux-2.6.32.28/net/unix/af_unix.c linux-2.6.32.28/net/unix/af_unix.c
16415 atomic_read(&s->sk_refcnt),
16416 0,
16417 s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
16418 -diff -urNp linux-2.6.32.28/net/wireless/wext.c linux-2.6.32.28/net/wireless/wext.c
16419 ---- linux-2.6.32.28/net/wireless/wext.c 2010-10-31 16:44:11.000000000 -0400
16420 -+++ linux-2.6.32.28/net/wireless/wext.c 2010-12-31 14:46:53.000000000 -0500
16421 +diff -urNp linux-2.6.32.29/net/wireless/wext.c linux-2.6.32.29/net/wireless/wext.c
16422 +--- linux-2.6.32.29/net/wireless/wext.c 2010-10-31 16:44:11.000000000 -0400
16423 ++++ linux-2.6.32.29/net/wireless/wext.c 2010-12-31 14:46:53.000000000 -0500
16424 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
16425 */
16426
16427 @@ -59782,9 +59885,9 @@ diff -urNp linux-2.6.32.28/net/wireless/wext.c linux-2.6.32.28/net/wireless/wext
16428 err = handler(dev, info, (union iwreq_data *) iwp, extra);
16429
16430 iwp->length += essid_compat;
16431 -diff -urNp linux-2.6.32.28/net/x25/x25_in.c linux-2.6.32.28/net/x25/x25_in.c
16432 ---- linux-2.6.32.28/net/x25/x25_in.c 2010-12-09 18:13:03.000000000 -0500
16433 -+++ linux-2.6.32.28/net/x25/x25_in.c 2010-12-31 14:46:53.000000000 -0500
16434 +diff -urNp linux-2.6.32.29/net/x25/x25_in.c linux-2.6.32.29/net/x25/x25_in.c
16435 +--- linux-2.6.32.29/net/x25/x25_in.c 2010-12-09 18:13:03.000000000 -0500
16436 ++++ linux-2.6.32.29/net/x25/x25_in.c 2010-12-31 14:46:53.000000000 -0500
16437 @@ -108,14 +108,13 @@ static int x25_state1_machine(struct soc
16438 */
16439 skb_pull(skb, X25_STD_MIN_LEN);
16440 @@ -59803,9 +59906,9 @@ diff -urNp linux-2.6.32.28/net/x25/x25_in.c linux-2.6.32.28/net/x25/x25_in.c
16441 if (len > 0)
16442 skb_pull(skb, len);
16443 else
16444 -diff -urNp linux-2.6.32.28/net/xfrm/xfrm_policy.c linux-2.6.32.28/net/xfrm/xfrm_policy.c
16445 ---- linux-2.6.32.28/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
16446 -+++ linux-2.6.32.28/net/xfrm/xfrm_policy.c 2010-12-31 14:46:53.000000000 -0500
16447 +diff -urNp linux-2.6.32.29/net/xfrm/xfrm_policy.c linux-2.6.32.29/net/xfrm/xfrm_policy.c
16448 +--- linux-2.6.32.29/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
16449 ++++ linux-2.6.32.29/net/xfrm/xfrm_policy.c 2010-12-31 14:46:53.000000000 -0500
16450 @@ -1477,7 +1477,7 @@ free_dst:
16451 goto out;
16452 }
16453 @@ -59833,9 +59936,9 @@ diff -urNp linux-2.6.32.28/net/xfrm/xfrm_policy.c linux-2.6.32.28/net/xfrm/xfrm_
16454 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
16455 {
16456 #ifdef CONFIG_XFRM_SUB_POLICY
16457 -diff -urNp linux-2.6.32.28/samples/kobject/kset-example.c linux-2.6.32.28/samples/kobject/kset-example.c
16458 ---- linux-2.6.32.28/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
16459 -+++ linux-2.6.32.28/samples/kobject/kset-example.c 2010-12-31 14:46:53.000000000 -0500
16460 +diff -urNp linux-2.6.32.29/samples/kobject/kset-example.c linux-2.6.32.29/samples/kobject/kset-example.c
16461 +--- linux-2.6.32.29/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
16462 ++++ linux-2.6.32.29/samples/kobject/kset-example.c 2010-12-31 14:46:53.000000000 -0500
16463 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
16464 }
16465
16466 @@ -59845,9 +59948,9 @@ diff -urNp linux-2.6.32.28/samples/kobject/kset-example.c linux-2.6.32.28/sample
16467 .show = foo_attr_show,
16468 .store = foo_attr_store,
16469 };
16470 -diff -urNp linux-2.6.32.28/scripts/basic/fixdep.c linux-2.6.32.28/scripts/basic/fixdep.c
16471 ---- linux-2.6.32.28/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
16472 -+++ linux-2.6.32.28/scripts/basic/fixdep.c 2010-12-31 14:46:53.000000000 -0500
16473 +diff -urNp linux-2.6.32.29/scripts/basic/fixdep.c linux-2.6.32.29/scripts/basic/fixdep.c
16474 +--- linux-2.6.32.29/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
16475 ++++ linux-2.6.32.29/scripts/basic/fixdep.c 2010-12-31 14:46:53.000000000 -0500
16476 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
16477
16478 static void parse_config_file(char *map, size_t len)
16479 @@ -59869,9 +59972,9 @@ diff -urNp linux-2.6.32.28/scripts/basic/fixdep.c linux-2.6.32.28/scripts/basic/
16480
16481 if (*p != INT_CONF) {
16482 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
16483 -diff -urNp linux-2.6.32.28/scripts/kallsyms.c linux-2.6.32.28/scripts/kallsyms.c
16484 ---- linux-2.6.32.28/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
16485 -+++ linux-2.6.32.28/scripts/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
16486 +diff -urNp linux-2.6.32.29/scripts/kallsyms.c linux-2.6.32.29/scripts/kallsyms.c
16487 +--- linux-2.6.32.29/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
16488 ++++ linux-2.6.32.29/scripts/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
16489 @@ -43,10 +43,10 @@ struct text_range {
16490
16491 static unsigned long long _text;
16492 @@ -59887,9 +59990,9 @@ diff -urNp linux-2.6.32.28/scripts/kallsyms.c linux-2.6.32.28/scripts/kallsyms.c
16493 };
16494 #define text_range_text (&text_ranges[0])
16495 #define text_range_inittext (&text_ranges[1])
16496 -diff -urNp linux-2.6.32.28/scripts/mod/file2alias.c linux-2.6.32.28/scripts/mod/file2alias.c
16497 ---- linux-2.6.32.28/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
16498 -+++ linux-2.6.32.28/scripts/mod/file2alias.c 2010-12-31 14:46:53.000000000 -0500
16499 +diff -urNp linux-2.6.32.29/scripts/mod/file2alias.c linux-2.6.32.29/scripts/mod/file2alias.c
16500 +--- linux-2.6.32.29/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
16501 ++++ linux-2.6.32.29/scripts/mod/file2alias.c 2010-12-31 14:46:53.000000000 -0500
16502 @@ -72,7 +72,7 @@ static void device_id_check(const char *
16503 unsigned long size, unsigned long id_size,
16504 void *symval)
16505 @@ -59944,9 +60047,9 @@ diff -urNp linux-2.6.32.28/scripts/mod/file2alias.c linux-2.6.32.28/scripts/mod/
16506
16507 sprintf(alias, "dmi*");
16508
16509 -diff -urNp linux-2.6.32.28/scripts/mod/modpost.c linux-2.6.32.28/scripts/mod/modpost.c
16510 ---- linux-2.6.32.28/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
16511 -+++ linux-2.6.32.28/scripts/mod/modpost.c 2010-12-31 14:46:53.000000000 -0500
16512 +diff -urNp linux-2.6.32.29/scripts/mod/modpost.c linux-2.6.32.29/scripts/mod/modpost.c
16513 +--- linux-2.6.32.29/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
16514 ++++ linux-2.6.32.29/scripts/mod/modpost.c 2010-12-31 14:46:53.000000000 -0500
16515 @@ -835,6 +835,7 @@ enum mismatch {
16516 INIT_TO_EXIT,
16517 EXIT_TO_INIT,
16518 @@ -60014,9 +60117,9 @@ diff -urNp linux-2.6.32.28/scripts/mod/modpost.c linux-2.6.32.28/scripts/mod/mod
16519 goto close_write;
16520
16521 tmp = NOFAIL(malloc(b->pos));
16522 -diff -urNp linux-2.6.32.28/scripts/mod/modpost.h linux-2.6.32.28/scripts/mod/modpost.h
16523 ---- linux-2.6.32.28/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
16524 -+++ linux-2.6.32.28/scripts/mod/modpost.h 2010-12-31 14:46:53.000000000 -0500
16525 +diff -urNp linux-2.6.32.29/scripts/mod/modpost.h linux-2.6.32.29/scripts/mod/modpost.h
16526 +--- linux-2.6.32.29/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
16527 ++++ linux-2.6.32.29/scripts/mod/modpost.h 2010-12-31 14:46:53.000000000 -0500
16528 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
16529
16530 struct buffer {
16531 @@ -60036,9 +60139,9 @@ diff -urNp linux-2.6.32.28/scripts/mod/modpost.h linux-2.6.32.28/scripts/mod/mod
16532
16533 struct module {
16534 struct module *next;
16535 -diff -urNp linux-2.6.32.28/scripts/mod/sumversion.c linux-2.6.32.28/scripts/mod/sumversion.c
16536 ---- linux-2.6.32.28/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
16537 -+++ linux-2.6.32.28/scripts/mod/sumversion.c 2010-12-31 14:46:53.000000000 -0500
16538 +diff -urNp linux-2.6.32.29/scripts/mod/sumversion.c linux-2.6.32.29/scripts/mod/sumversion.c
16539 +--- linux-2.6.32.29/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
16540 ++++ linux-2.6.32.29/scripts/mod/sumversion.c 2010-12-31 14:46:53.000000000 -0500
16541 @@ -455,7 +455,7 @@ static void write_version(const char *fi
16542 goto out;
16543 }
16544 @@ -60048,9 +60151,9 @@ diff -urNp linux-2.6.32.28/scripts/mod/sumversion.c linux-2.6.32.28/scripts/mod/
16545 warn("writing sum in %s failed: %s\n",
16546 filename, strerror(errno));
16547 goto out;
16548 -diff -urNp linux-2.6.32.28/scripts/pnmtologo.c linux-2.6.32.28/scripts/pnmtologo.c
16549 ---- linux-2.6.32.28/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
16550 -+++ linux-2.6.32.28/scripts/pnmtologo.c 2010-12-31 14:46:53.000000000 -0500
16551 +diff -urNp linux-2.6.32.29/scripts/pnmtologo.c linux-2.6.32.29/scripts/pnmtologo.c
16552 +--- linux-2.6.32.29/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
16553 ++++ linux-2.6.32.29/scripts/pnmtologo.c 2010-12-31 14:46:53.000000000 -0500
16554 @@ -237,14 +237,14 @@ static void write_header(void)
16555 fprintf(out, " * Linux logo %s\n", logoname);
16556 fputs(" */\n\n", out);
16557 @@ -60077,9 +60180,9 @@ diff -urNp linux-2.6.32.28/scripts/pnmtologo.c linux-2.6.32.28/scripts/pnmtologo
16558 logoname);
16559 write_hex_cnt = 0;
16560 for (i = 0; i < logo_clutsize; i++) {
16561 -diff -urNp linux-2.6.32.28/security/capability.c linux-2.6.32.28/security/capability.c
16562 ---- linux-2.6.32.28/security/capability.c 2010-08-13 16:24:37.000000000 -0400
16563 -+++ linux-2.6.32.28/security/capability.c 2010-12-31 14:46:53.000000000 -0500
16564 +diff -urNp linux-2.6.32.29/security/capability.c linux-2.6.32.29/security/capability.c
16565 +--- linux-2.6.32.29/security/capability.c 2010-08-13 16:24:37.000000000 -0400
16566 ++++ linux-2.6.32.29/security/capability.c 2010-12-31 14:46:53.000000000 -0500
16567 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
16568 }
16569 #endif /* CONFIG_AUDIT */
16570 @@ -60089,9 +60192,9 @@ diff -urNp linux-2.6.32.28/security/capability.c linux-2.6.32.28/security/capabi
16571 .name = "default",
16572 };
16573
16574 -diff -urNp linux-2.6.32.28/security/commoncap.c linux-2.6.32.28/security/commoncap.c
16575 ---- linux-2.6.32.28/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
16576 -+++ linux-2.6.32.28/security/commoncap.c 2010-12-31 14:46:53.000000000 -0500
16577 +diff -urNp linux-2.6.32.29/security/commoncap.c linux-2.6.32.29/security/commoncap.c
16578 +--- linux-2.6.32.29/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
16579 ++++ linux-2.6.32.29/security/commoncap.c 2010-12-31 14:46:53.000000000 -0500
16580 @@ -27,7 +27,7 @@
16581 #include <linux/sched.h>
16582 #include <linux/prctl.h>
16583 @@ -60124,9 +60227,9 @@ diff -urNp linux-2.6.32.28/security/commoncap.c linux-2.6.32.28/security/commonc
16584 if (cred->uid != 0) {
16585 if (bprm->cap_effective)
16586 return 1;
16587 -diff -urNp linux-2.6.32.28/security/integrity/ima/ima_api.c linux-2.6.32.28/security/integrity/ima/ima_api.c
16588 ---- linux-2.6.32.28/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
16589 -+++ linux-2.6.32.28/security/integrity/ima/ima_api.c 2010-12-31 14:46:53.000000000 -0500
16590 +diff -urNp linux-2.6.32.29/security/integrity/ima/ima_api.c linux-2.6.32.29/security/integrity/ima/ima_api.c
16591 +--- linux-2.6.32.29/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
16592 ++++ linux-2.6.32.29/security/integrity/ima/ima_api.c 2010-12-31 14:46:53.000000000 -0500
16593 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
16594 int result;
16595
16596 @@ -60136,9 +60239,9 @@ diff -urNp linux-2.6.32.28/security/integrity/ima/ima_api.c linux-2.6.32.28/secu
16597
16598 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
16599 if (!entry) {
16600 -diff -urNp linux-2.6.32.28/security/integrity/ima/ima_fs.c linux-2.6.32.28/security/integrity/ima/ima_fs.c
16601 ---- linux-2.6.32.28/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
16602 -+++ linux-2.6.32.28/security/integrity/ima/ima_fs.c 2010-12-31 14:46:53.000000000 -0500
16603 +diff -urNp linux-2.6.32.29/security/integrity/ima/ima_fs.c linux-2.6.32.29/security/integrity/ima/ima_fs.c
16604 +--- linux-2.6.32.29/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
16605 ++++ linux-2.6.32.29/security/integrity/ima/ima_fs.c 2010-12-31 14:46:53.000000000 -0500
16606 @@ -27,12 +27,12 @@
16607 static int valid_policy = 1;
16608 #define TMPBUFLEN 12
16609 @@ -60154,9 +60257,9 @@ diff -urNp linux-2.6.32.28/security/integrity/ima/ima_fs.c linux-2.6.32.28/secur
16610 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
16611 }
16612
16613 -diff -urNp linux-2.6.32.28/security/integrity/ima/ima.h linux-2.6.32.28/security/integrity/ima/ima.h
16614 ---- linux-2.6.32.28/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
16615 -+++ linux-2.6.32.28/security/integrity/ima/ima.h 2010-12-31 14:46:53.000000000 -0500
16616 +diff -urNp linux-2.6.32.29/security/integrity/ima/ima.h linux-2.6.32.29/security/integrity/ima/ima.h
16617 +--- linux-2.6.32.29/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
16618 ++++ linux-2.6.32.29/security/integrity/ima/ima.h 2010-12-31 14:46:53.000000000 -0500
16619 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
16620 extern spinlock_t ima_queue_lock;
16621
16622 @@ -60168,9 +60271,9 @@ diff -urNp linux-2.6.32.28/security/integrity/ima/ima.h linux-2.6.32.28/security
16623 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
16624 };
16625 extern struct ima_h_table ima_htable;
16626 -diff -urNp linux-2.6.32.28/security/integrity/ima/ima_queue.c linux-2.6.32.28/security/integrity/ima/ima_queue.c
16627 ---- linux-2.6.32.28/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
16628 -+++ linux-2.6.32.28/security/integrity/ima/ima_queue.c 2010-12-31 14:46:53.000000000 -0500
16629 +diff -urNp linux-2.6.32.29/security/integrity/ima/ima_queue.c linux-2.6.32.29/security/integrity/ima/ima_queue.c
16630 +--- linux-2.6.32.29/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
16631 ++++ linux-2.6.32.29/security/integrity/ima/ima_queue.c 2010-12-31 14:46:53.000000000 -0500
16632 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
16633 INIT_LIST_HEAD(&qe->later);
16634 list_add_tail_rcu(&qe->later, &ima_measurements);
16635 @@ -60180,9 +60283,9 @@ diff -urNp linux-2.6.32.28/security/integrity/ima/ima_queue.c linux-2.6.32.28/se
16636 key = ima_hash_key(entry->digest);
16637 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
16638 return 0;
16639 -diff -urNp linux-2.6.32.28/security/Kconfig linux-2.6.32.28/security/Kconfig
16640 ---- linux-2.6.32.28/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
16641 -+++ linux-2.6.32.28/security/Kconfig 2011-02-12 11:33:55.000000000 -0500
16642 +diff -urNp linux-2.6.32.29/security/Kconfig linux-2.6.32.29/security/Kconfig
16643 +--- linux-2.6.32.29/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
16644 ++++ linux-2.6.32.29/security/Kconfig 2011-02-12 11:33:55.000000000 -0500
16645 @@ -4,6 +4,527 @@
16646
16647 menu "Security options"
16648 @@ -60720,9 +60823,9 @@ diff -urNp linux-2.6.32.28/security/Kconfig linux-2.6.32.28/security/Kconfig
16649 help
16650 This is the portion of low virtual memory which should be protected
16651 from userspace allocation. Keeping a user from writing to low pages
16652 -diff -urNp linux-2.6.32.28/security/min_addr.c linux-2.6.32.28/security/min_addr.c
16653 ---- linux-2.6.32.28/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
16654 -+++ linux-2.6.32.28/security/min_addr.c 2010-12-31 14:46:53.000000000 -0500
16655 +diff -urNp linux-2.6.32.29/security/min_addr.c linux-2.6.32.29/security/min_addr.c
16656 +--- linux-2.6.32.29/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
16657 ++++ linux-2.6.32.29/security/min_addr.c 2010-12-31 14:46:53.000000000 -0500
16658 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
16659 */
16660 static void update_mmap_min_addr(void)
16661 @@ -60739,9 +60842,9 @@ diff -urNp linux-2.6.32.28/security/min_addr.c linux-2.6.32.28/security/min_addr
16662 }
16663
16664 /*
16665 -diff -urNp linux-2.6.32.28/security/root_plug.c linux-2.6.32.28/security/root_plug.c
16666 ---- linux-2.6.32.28/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
16667 -+++ linux-2.6.32.28/security/root_plug.c 2010-12-31 14:46:53.000000000 -0500
16668 +diff -urNp linux-2.6.32.29/security/root_plug.c linux-2.6.32.29/security/root_plug.c
16669 +--- linux-2.6.32.29/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
16670 ++++ linux-2.6.32.29/security/root_plug.c 2010-12-31 14:46:53.000000000 -0500
16671 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security
16672 return 0;
16673 }
16674 @@ -60751,9 +60854,9 @@ diff -urNp linux-2.6.32.28/security/root_plug.c linux-2.6.32.28/security/root_pl
16675 .bprm_check_security = rootplug_bprm_check_security,
16676 };
16677
16678 -diff -urNp linux-2.6.32.28/security/security.c linux-2.6.32.28/security/security.c
16679 ---- linux-2.6.32.28/security/security.c 2010-08-13 16:24:37.000000000 -0400
16680 -+++ linux-2.6.32.28/security/security.c 2010-12-31 14:46:53.000000000 -0500
16681 +diff -urNp linux-2.6.32.29/security/security.c linux-2.6.32.29/security/security.c
16682 +--- linux-2.6.32.29/security/security.c 2010-08-13 16:24:37.000000000 -0400
16683 ++++ linux-2.6.32.29/security/security.c 2010-12-31 14:46:53.000000000 -0500
16684 @@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI
16685 extern struct security_operations default_security_ops;
16686 extern void security_fixup_ops(struct security_operations *ops);
16687 @@ -60772,9 +60875,9 @@ diff -urNp linux-2.6.32.28/security/security.c linux-2.6.32.28/security/security
16688 {
16689 if (verify(ops)) {
16690 printk(KERN_DEBUG "%s could not verify "
16691 -diff -urNp linux-2.6.32.28/security/selinux/hooks.c linux-2.6.32.28/security/selinux/hooks.c
16692 ---- linux-2.6.32.28/security/selinux/hooks.c 2010-08-13 16:24:37.000000000 -0400
16693 -+++ linux-2.6.32.28/security/selinux/hooks.c 2011-02-12 11:03:00.000000000 -0500
16694 +diff -urNp linux-2.6.32.29/security/selinux/hooks.c linux-2.6.32.29/security/selinux/hooks.c
16695 +--- linux-2.6.32.29/security/selinux/hooks.c 2011-02-22 15:56:54.000000000 -0500
16696 ++++ linux-2.6.32.29/security/selinux/hooks.c 2011-02-22 15:57:40.000000000 -0500
16697 @@ -131,7 +131,7 @@ int selinux_enabled = 1;
16698 * Minimal support for a secondary security module,
16699 * just to allow the use of the capability module.
16700 @@ -60784,7 +60887,7 @@ diff -urNp linux-2.6.32.28/security/selinux/hooks.c linux-2.6.32.28/security/sel
16701
16702 /* Lists of inode and superblock security structures initialized
16703 before the policy was loaded. */
16704 -@@ -3259,7 +3259,11 @@ static void selinux_cred_free(struct cre
16705 +@@ -3262,7 +3262,11 @@ static void selinux_cred_free(struct cre
16706 {
16707 struct task_security_struct *tsec = cred->security;
16708
16709 @@ -60797,7 +60900,7 @@ diff -urNp linux-2.6.32.28/security/selinux/hooks.c linux-2.6.32.28/security/sel
16710 cred->security = (void *) 0x7UL;
16711 kfree(tsec);
16712 }
16713 -@@ -5450,7 +5454,7 @@ static int selinux_key_getsecurity(struc
16714 +@@ -5453,7 +5457,7 @@ static int selinux_key_getsecurity(struc
16715
16716 #endif
16717
16718 @@ -60806,7 +60909,7 @@ diff -urNp linux-2.6.32.28/security/selinux/hooks.c linux-2.6.32.28/security/sel
16719 .name = "selinux",
16720
16721 .ptrace_access_check = selinux_ptrace_access_check,
16722 -@@ -5834,7 +5838,9 @@ int selinux_disable(void)
16723 +@@ -5837,7 +5841,9 @@ int selinux_disable(void)
16724 avc_disable();
16725
16726 /* Reset security_ops to the secondary module, dummy or capability. */
16727 @@ -60816,9 +60919,9 @@ diff -urNp linux-2.6.32.28/security/selinux/hooks.c linux-2.6.32.28/security/sel
16728
16729 /* Unregister netfilter hooks. */
16730 selinux_nf_ip_exit();
16731 -diff -urNp linux-2.6.32.28/security/smack/smack_lsm.c linux-2.6.32.28/security/smack/smack_lsm.c
16732 ---- linux-2.6.32.28/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
16733 -+++ linux-2.6.32.28/security/smack/smack_lsm.c 2010-12-31 14:46:53.000000000 -0500
16734 +diff -urNp linux-2.6.32.29/security/smack/smack_lsm.c linux-2.6.32.29/security/smack/smack_lsm.c
16735 +--- linux-2.6.32.29/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
16736 ++++ linux-2.6.32.29/security/smack/smack_lsm.c 2010-12-31 14:46:53.000000000 -0500
16737 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct
16738 return 0;
16739 }
16740 @@ -60828,9 +60931,9 @@ diff -urNp linux-2.6.32.28/security/smack/smack_lsm.c linux-2.6.32.28/security/s
16741 .name = "smack",
16742
16743 .ptrace_access_check = smack_ptrace_access_check,
16744 -diff -urNp linux-2.6.32.28/security/tomoyo/tomoyo.c linux-2.6.32.28/security/tomoyo/tomoyo.c
16745 ---- linux-2.6.32.28/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
16746 -+++ linux-2.6.32.28/security/tomoyo/tomoyo.c 2010-12-31 14:46:53.000000000 -0500
16747 +diff -urNp linux-2.6.32.29/security/tomoyo/tomoyo.c linux-2.6.32.29/security/tomoyo/tomoyo.c
16748 +--- linux-2.6.32.29/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
16749 ++++ linux-2.6.32.29/security/tomoyo/tomoyo.c 2010-12-31 14:46:53.000000000 -0500
16750 @@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil
16751 * tomoyo_security_ops is a "struct security_operations" which is used for
16752 * registering TOMOYO.
16753 @@ -60840,9 +60943,9 @@ diff -urNp linux-2.6.32.28/security/tomoyo/tomoyo.c linux-2.6.32.28/security/tom
16754 .name = "tomoyo",
16755 .cred_alloc_blank = tomoyo_cred_alloc_blank,
16756 .cred_prepare = tomoyo_cred_prepare,
16757 -diff -urNp linux-2.6.32.28/sound/aoa/codecs/onyx.c linux-2.6.32.28/sound/aoa/codecs/onyx.c
16758 ---- linux-2.6.32.28/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
16759 -+++ linux-2.6.32.28/sound/aoa/codecs/onyx.c 2011-01-24 18:05:37.000000000 -0500
16760 +diff -urNp linux-2.6.32.29/sound/aoa/codecs/onyx.c linux-2.6.32.29/sound/aoa/codecs/onyx.c
16761 +--- linux-2.6.32.29/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
16762 ++++ linux-2.6.32.29/sound/aoa/codecs/onyx.c 2011-01-24 18:05:37.000000000 -0500
16763 @@ -53,7 +53,7 @@ struct onyx {
16764 spdif_locked:1,
16765 analog_locked:1,
16766 @@ -60871,9 +60974,9 @@ diff -urNp linux-2.6.32.28/sound/aoa/codecs/onyx.c linux-2.6.32.28/sound/aoa/cod
16767 onyx->spdif_locked = onyx->analog_locked = 0;
16768 mutex_unlock(&onyx->mutex);
16769
16770 -diff -urNp linux-2.6.32.28/sound/aoa/codecs/onyx.h linux-2.6.32.28/sound/aoa/codecs/onyx.h
16771 ---- linux-2.6.32.28/sound/aoa/codecs/onyx.h 2010-08-13 16:24:37.000000000 -0400
16772 -+++ linux-2.6.32.28/sound/aoa/codecs/onyx.h 2011-01-25 20:24:47.000000000 -0500
16773 +diff -urNp linux-2.6.32.29/sound/aoa/codecs/onyx.h linux-2.6.32.29/sound/aoa/codecs/onyx.h
16774 +--- linux-2.6.32.29/sound/aoa/codecs/onyx.h 2010-08-13 16:24:37.000000000 -0400
16775 ++++ linux-2.6.32.29/sound/aoa/codecs/onyx.h 2011-01-25 20:24:47.000000000 -0500
16776 @@ -11,6 +11,7 @@
16777 #include <linux/i2c.h>
16778 #include <asm/pmac_low_i2c.h>
16779 @@ -60882,9 +60985,9 @@ diff -urNp linux-2.6.32.28/sound/aoa/codecs/onyx.h linux-2.6.32.28/sound/aoa/cod
16780
16781 /* PCM3052 register definitions */
16782
16783 -diff -urNp linux-2.6.32.28/sound/core/oss/pcm_oss.c linux-2.6.32.28/sound/core/oss/pcm_oss.c
16784 ---- linux-2.6.32.28/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
16785 -+++ linux-2.6.32.28/sound/core/oss/pcm_oss.c 2010-12-31 14:46:53.000000000 -0500
16786 +diff -urNp linux-2.6.32.29/sound/core/oss/pcm_oss.c linux-2.6.32.29/sound/core/oss/pcm_oss.c
16787 +--- linux-2.6.32.29/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
16788 ++++ linux-2.6.32.29/sound/core/oss/pcm_oss.c 2010-12-31 14:46:53.000000000 -0500
16789 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
16790 }
16791 }
16792 @@ -60896,9 +60999,9 @@ diff -urNp linux-2.6.32.28/sound/core/oss/pcm_oss.c linux-2.6.32.28/sound/core/o
16793 #endif /* CONFIG_SND_VERBOSE_PROCFS */
16794
16795 /*
16796 -diff -urNp linux-2.6.32.28/sound/core/seq/seq_lock.h linux-2.6.32.28/sound/core/seq/seq_lock.h
16797 ---- linux-2.6.32.28/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
16798 -+++ linux-2.6.32.28/sound/core/seq/seq_lock.h 2010-12-31 14:46:53.000000000 -0500
16799 +diff -urNp linux-2.6.32.29/sound/core/seq/seq_lock.h linux-2.6.32.29/sound/core/seq/seq_lock.h
16800 +--- linux-2.6.32.29/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
16801 ++++ linux-2.6.32.29/sound/core/seq/seq_lock.h 2010-12-31 14:46:53.000000000 -0500
16802 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
16803 #else /* SMP || CONFIG_SND_DEBUG */
16804
16805 @@ -60914,9 +61017,9 @@ diff -urNp linux-2.6.32.28/sound/core/seq/seq_lock.h linux-2.6.32.28/sound/core/
16806
16807 #endif /* SMP || CONFIG_SND_DEBUG */
16808
16809 -diff -urNp linux-2.6.32.28/sound/drivers/mts64.c linux-2.6.32.28/sound/drivers/mts64.c
16810 ---- linux-2.6.32.28/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
16811 -+++ linux-2.6.32.28/sound/drivers/mts64.c 2011-01-25 22:35:30.000000000 -0500
16812 +diff -urNp linux-2.6.32.29/sound/drivers/mts64.c linux-2.6.32.29/sound/drivers/mts64.c
16813 +--- linux-2.6.32.29/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
16814 ++++ linux-2.6.32.29/sound/drivers/mts64.c 2011-01-25 22:35:30.000000000 -0500
16815 @@ -27,6 +27,7 @@
16816 #include <sound/initval.h>
16817 #include <sound/rawmidi.h>
16818 @@ -60973,9 +61076,9 @@ diff -urNp linux-2.6.32.28/sound/drivers/mts64.c linux-2.6.32.28/sound/drivers/m
16819
16820 return 0;
16821 }
16822 -diff -urNp linux-2.6.32.28/sound/drivers/portman2x4.c linux-2.6.32.28/sound/drivers/portman2x4.c
16823 ---- linux-2.6.32.28/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
16824 -+++ linux-2.6.32.28/sound/drivers/portman2x4.c 2011-01-25 20:24:47.000000000 -0500
16825 +diff -urNp linux-2.6.32.29/sound/drivers/portman2x4.c linux-2.6.32.29/sound/drivers/portman2x4.c
16826 +--- linux-2.6.32.29/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
16827 ++++ linux-2.6.32.29/sound/drivers/portman2x4.c 2011-01-25 20:24:47.000000000 -0500
16828 @@ -46,6 +46,7 @@
16829 #include <sound/initval.h>
16830 #include <sound/rawmidi.h>
16831 @@ -60993,9 +61096,9 @@ diff -urNp linux-2.6.32.28/sound/drivers/portman2x4.c linux-2.6.32.28/sound/driv
16832 int mode[PORTMAN_NUM_INPUT_PORTS];
16833 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
16834 };
16835 -diff -urNp linux-2.6.32.28/sound/oss/sb_audio.c linux-2.6.32.28/sound/oss/sb_audio.c
16836 ---- linux-2.6.32.28/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
16837 -+++ linux-2.6.32.28/sound/oss/sb_audio.c 2010-12-31 14:46:53.000000000 -0500
16838 +diff -urNp linux-2.6.32.29/sound/oss/sb_audio.c linux-2.6.32.29/sound/oss/sb_audio.c
16839 +--- linux-2.6.32.29/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
16840 ++++ linux-2.6.32.29/sound/oss/sb_audio.c 2010-12-31 14:46:53.000000000 -0500
16841 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
16842 buf16 = (signed short *)(localbuf + localoffs);
16843 while (c)
16844 @@ -61005,9 +61108,9 @@ diff -urNp linux-2.6.32.28/sound/oss/sb_audio.c linux-2.6.32.28/sound/oss/sb_aud
16845 if (copy_from_user(lbuf8,
16846 userbuf+useroffs + p,
16847 locallen))
16848 -diff -urNp linux-2.6.32.28/sound/oss/swarm_cs4297a.c linux-2.6.32.28/sound/oss/swarm_cs4297a.c
16849 ---- linux-2.6.32.28/sound/oss/swarm_cs4297a.c 2010-08-13 16:24:37.000000000 -0400
16850 -+++ linux-2.6.32.28/sound/oss/swarm_cs4297a.c 2010-12-31 14:47:01.000000000 -0500
16851 +diff -urNp linux-2.6.32.29/sound/oss/swarm_cs4297a.c linux-2.6.32.29/sound/oss/swarm_cs4297a.c
16852 +--- linux-2.6.32.29/sound/oss/swarm_cs4297a.c 2010-08-13 16:24:37.000000000 -0400
16853 ++++ linux-2.6.32.29/sound/oss/swarm_cs4297a.c 2010-12-31 14:47:01.000000000 -0500
16854 @@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
16855 {
16856 struct cs4297a_state *s;
16857 @@ -61042,9 +61145,9 @@ diff -urNp linux-2.6.32.28/sound/oss/swarm_cs4297a.c linux-2.6.32.28/sound/oss/s
16858
16859 list_add(&s->list, &cs4297a_devs);
16860
16861 -diff -urNp linux-2.6.32.28/sound/pci/ac97/ac97_codec.c linux-2.6.32.28/sound/pci/ac97/ac97_codec.c
16862 ---- linux-2.6.32.28/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
16863 -+++ linux-2.6.32.28/sound/pci/ac97/ac97_codec.c 2010-12-31 14:46:53.000000000 -0500
16864 +diff -urNp linux-2.6.32.29/sound/pci/ac97/ac97_codec.c linux-2.6.32.29/sound/pci/ac97/ac97_codec.c
16865 +--- linux-2.6.32.29/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
16866 ++++ linux-2.6.32.29/sound/pci/ac97/ac97_codec.c 2010-12-31 14:46:53.000000000 -0500
16867 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
16868 }
16869
16870 @@ -61054,9 +61157,9 @@ diff -urNp linux-2.6.32.28/sound/pci/ac97/ac97_codec.c linux-2.6.32.28/sound/pci
16871
16872 #ifdef CONFIG_SND_AC97_POWER_SAVE
16873 static void do_update_power(struct work_struct *work)
16874 -diff -urNp linux-2.6.32.28/sound/pci/ac97/ac97_patch.c linux-2.6.32.28/sound/pci/ac97/ac97_patch.c
16875 ---- linux-2.6.32.28/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
16876 -+++ linux-2.6.32.28/sound/pci/ac97/ac97_patch.c 2010-12-31 14:46:53.000000000 -0500
16877 +diff -urNp linux-2.6.32.29/sound/pci/ac97/ac97_patch.c linux-2.6.32.29/sound/pci/ac97/ac97_patch.c
16878 +--- linux-2.6.32.29/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
16879 ++++ linux-2.6.32.29/sound/pci/ac97/ac97_patch.c 2010-12-31 14:46:53.000000000 -0500
16880 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
16881 return 0;
16882 }
16883 @@ -61363,9 +61466,9 @@ diff -urNp linux-2.6.32.28/sound/pci/ac97/ac97_patch.c linux-2.6.32.28/sound/pci
16884 .build_specific = patch_ucb1400_specific,
16885 };
16886
16887 -diff -urNp linux-2.6.32.28/sound/pci/ens1370.c linux-2.6.32.28/sound/pci/ens1370.c
16888 ---- linux-2.6.32.28/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
16889 -+++ linux-2.6.32.28/sound/pci/ens1370.c 2010-12-31 14:46:53.000000000 -0500
16890 +diff -urNp linux-2.6.32.29/sound/pci/ens1370.c linux-2.6.32.29/sound/pci/ens1370.c
16891 +--- linux-2.6.32.29/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
16892 ++++ linux-2.6.32.29/sound/pci/ens1370.c 2010-12-31 14:46:53.000000000 -0500
16893 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
16894 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
16895 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
16896 @@ -61375,9 +61478,9 @@ diff -urNp linux-2.6.32.28/sound/pci/ens1370.c linux-2.6.32.28/sound/pci/ens1370
16897 };
16898
16899 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
16900 -diff -urNp linux-2.6.32.28/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.28/sound/pci/hda/patch_intelhdmi.c
16901 ---- linux-2.6.32.28/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
16902 -+++ linux-2.6.32.28/sound/pci/hda/patch_intelhdmi.c 2010-12-31 14:46:53.000000000 -0500
16903 +diff -urNp linux-2.6.32.29/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.29/sound/pci/hda/patch_intelhdmi.c
16904 +--- linux-2.6.32.29/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
16905 ++++ linux-2.6.32.29/sound/pci/hda/patch_intelhdmi.c 2010-12-31 14:46:53.000000000 -0500
16906 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
16907 cp_ready);
16908
16909 @@ -61393,9 +61496,9 @@ diff -urNp linux-2.6.32.28/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.28/sound
16910 }
16911
16912
16913 -diff -urNp linux-2.6.32.28/sound/pci/intel8x0.c linux-2.6.32.28/sound/pci/intel8x0.c
16914 ---- linux-2.6.32.28/sound/pci/intel8x0.c 2010-12-09 18:13:03.000000000 -0500
16915 -+++ linux-2.6.32.28/sound/pci/intel8x0.c 2010-12-31 14:46:53.000000000 -0500
16916 +diff -urNp linux-2.6.32.29/sound/pci/intel8x0.c linux-2.6.32.29/sound/pci/intel8x0.c
16917 +--- linux-2.6.32.29/sound/pci/intel8x0.c 2010-12-09 18:13:03.000000000 -0500
16918 ++++ linux-2.6.32.29/sound/pci/intel8x0.c 2010-12-31 14:46:53.000000000 -0500
16919 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
16920 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
16921 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
16922 @@ -61414,9 +61517,9 @@ diff -urNp linux-2.6.32.28/sound/pci/intel8x0.c linux-2.6.32.28/sound/pci/intel8
16923 };
16924
16925 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
16926 -diff -urNp linux-2.6.32.28/sound/pci/intel8x0m.c linux-2.6.32.28/sound/pci/intel8x0m.c
16927 ---- linux-2.6.32.28/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
16928 -+++ linux-2.6.32.28/sound/pci/intel8x0m.c 2010-12-31 14:46:53.000000000 -0500
16929 +diff -urNp linux-2.6.32.29/sound/pci/intel8x0m.c linux-2.6.32.29/sound/pci/intel8x0m.c
16930 +--- linux-2.6.32.29/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
16931 ++++ linux-2.6.32.29/sound/pci/intel8x0m.c 2010-12-31 14:46:53.000000000 -0500
16932 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
16933 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
16934 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
16935 @@ -61435,9 +61538,33 @@ diff -urNp linux-2.6.32.28/sound/pci/intel8x0m.c linux-2.6.32.28/sound/pci/intel
16936 };
16937
16938 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
16939 -diff -urNp linux-2.6.32.28/usr/gen_init_cpio.c linux-2.6.32.28/usr/gen_init_cpio.c
16940 ---- linux-2.6.32.28/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
16941 -+++ linux-2.6.32.28/usr/gen_init_cpio.c 2010-12-31 14:46:53.000000000 -0500
16942 +diff -urNp linux-2.6.32.29/sound/usb/caiaq/audio.c linux-2.6.32.29/sound/usb/caiaq/audio.c
16943 +--- linux-2.6.32.29/sound/usb/caiaq/audio.c 2010-08-13 16:24:37.000000000 -0400
16944 ++++ linux-2.6.32.29/sound/usb/caiaq/audio.c 2011-02-22 16:32:16.000000000 -0500
16945 +@@ -639,7 +639,7 @@ int snd_usb_caiaq_audio_init(struct snd_
16946 + }
16947 +
16948 + dev->pcm->private_data = dev;
16949 +- strcpy(dev->pcm->name, dev->product_name);
16950 ++ strlcpy(dev->pcm->name, dev->product_name, sizeof(dev->pcm->name));
16951 +
16952 + memset(dev->sub_playback, 0, sizeof(dev->sub_playback));
16953 + memset(dev->sub_capture, 0, sizeof(dev->sub_capture));
16954 +diff -urNp linux-2.6.32.29/sound/usb/caiaq/midi.c linux-2.6.32.29/sound/usb/caiaq/midi.c
16955 +--- linux-2.6.32.29/sound/usb/caiaq/midi.c 2010-08-13 16:24:37.000000000 -0400
16956 ++++ linux-2.6.32.29/sound/usb/caiaq/midi.c 2011-02-22 16:32:35.000000000 -0500
16957 +@@ -135,7 +135,7 @@ int snd_usb_caiaq_midi_init(struct snd_u
16958 + if (ret < 0)
16959 + return ret;
16960 +
16961 +- strcpy(rmidi->name, device->product_name);
16962 ++ strlcpy(rmidi->name, device->product_name, sizeof(rmidi->name));
16963 +
16964 + rmidi->info_flags = SNDRV_RAWMIDI_INFO_DUPLEX;
16965 + rmidi->private_data = device;
16966 +diff -urNp linux-2.6.32.29/usr/gen_init_cpio.c linux-2.6.32.29/usr/gen_init_cpio.c
16967 +--- linux-2.6.32.29/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
16968 ++++ linux-2.6.32.29/usr/gen_init_cpio.c 2010-12-31 14:46:53.000000000 -0500
16969 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
16970 int retval;
16971 int rc = -1;
16972 @@ -61460,9 +61587,9 @@ diff -urNp linux-2.6.32.28/usr/gen_init_cpio.c linux-2.6.32.28/usr/gen_init_cpio
16973 } else
16974 break;
16975 }
16976 -diff -urNp linux-2.6.32.28/virt/kvm/kvm_main.c linux-2.6.32.28/virt/kvm/kvm_main.c
16977 ---- linux-2.6.32.28/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
16978 -+++ linux-2.6.32.28/virt/kvm/kvm_main.c 2010-12-31 14:46:53.000000000 -0500
16979 +diff -urNp linux-2.6.32.29/virt/kvm/kvm_main.c linux-2.6.32.29/virt/kvm/kvm_main.c
16980 +--- linux-2.6.32.29/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
16981 ++++ linux-2.6.32.29/virt/kvm/kvm_main.c 2010-12-31 14:46:53.000000000 -0500
16982 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
16983 return 0;
16984 }
16985
16986 diff --git a/2.6.32/4445_disable-compat_vdso.patch b/2.6.32/4445_disable-compat_vdso.patch
16987 index 338bc61..c8e1aeb 100644
16988 --- a/2.6.32/4445_disable-compat_vdso.patch
16989 +++ b/2.6.32/4445_disable-compat_vdso.patch
16990 @@ -27,7 +27,7 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
16991 diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
16992 --- a/arch/x86/Kconfig 2009-07-31 01:36:57.323857684 +0100
16993 +++ b/arch/x86/Kconfig 2009-07-31 01:51:39.395749681 +0100
16994 -@@ -1605,17 +1605,8 @@
16995 +@@ -1616,17 +1616,8 @@
16996
16997 config COMPAT_VDSO
16998 def_bool n
16999
17000 diff --git a/2.6.37/0000_README b/2.6.37/0000_README
17001 index ec408c7..25c3e3f 100644
17002 --- a/2.6.37/0000_README
17003 +++ b/2.6.37/0000_README
17004 @@ -3,7 +3,7 @@ README
17005
17006 Individual Patch Descriptions:
17007 -----------------------------------------------------------------------------
17008 -Patch: 4420_grsecurity-2.2.1-2.6.37-201102152009.patch
17009 +Patch: 4420_grsecurity-2.2.1-2.6.37.1-201102221638.patch
17010 From: http://www.grsecurity.net
17011 Desc: hardened-sources base patch from upstream grsecurity
17012
17013
17014 diff --git a/2.6.37/4420_grsecurity-2.2.1-2.6.37-201102152009.patch b/2.6.37/4420_grsecurity-2.2.1-2.6.37.1-201102221638.patch
17015 similarity index 86%
17016 rename from 2.6.37/4420_grsecurity-2.2.1-2.6.37-201102152009.patch
17017 rename to 2.6.37/4420_grsecurity-2.2.1-2.6.37.1-201102221638.patch
17018 index 3954df8..ffd2e9f 100644
17019 --- a/2.6.37/4420_grsecurity-2.2.1-2.6.37-201102152009.patch
17020 +++ b/2.6.37/4420_grsecurity-2.2.1-2.6.37.1-201102221638.patch
17021 @@ -1,6 +1,6 @@
17022 -diff -urNp linux-2.6.37/arch/alpha/include/asm/dma-mapping.h linux-2.6.37/arch/alpha/include/asm/dma-mapping.h
17023 ---- linux-2.6.37/arch/alpha/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17024 -+++ linux-2.6.37/arch/alpha/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17025 +diff -urNp linux-2.6.37.1/arch/alpha/include/asm/dma-mapping.h linux-2.6.37.1/arch/alpha/include/asm/dma-mapping.h
17026 +--- linux-2.6.37.1/arch/alpha/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17027 ++++ linux-2.6.37.1/arch/alpha/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17028 @@ -3,9 +3,9 @@
17029
17030 #include <linux/dma-attrs.h>
17031 @@ -13,9 +13,9 @@ diff -urNp linux-2.6.37/arch/alpha/include/asm/dma-mapping.h linux-2.6.37/arch/a
17032 {
17033 return dma_ops;
17034 }
17035 -diff -urNp linux-2.6.37/arch/alpha/include/asm/elf.h linux-2.6.37/arch/alpha/include/asm/elf.h
17036 ---- linux-2.6.37/arch/alpha/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17037 -+++ linux-2.6.37/arch/alpha/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17038 +diff -urNp linux-2.6.37.1/arch/alpha/include/asm/elf.h linux-2.6.37.1/arch/alpha/include/asm/elf.h
17039 +--- linux-2.6.37.1/arch/alpha/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17040 ++++ linux-2.6.37.1/arch/alpha/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17041 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
17042
17043 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
17044 @@ -30,9 +30,9 @@ diff -urNp linux-2.6.37/arch/alpha/include/asm/elf.h linux-2.6.37/arch/alpha/inc
17045 /* $0 is set by ld.so to a pointer to a function which might be
17046 registered using atexit. This provides a mean for the dynamic
17047 linker to call DT_FINI functions for shared libraries that have
17048 -diff -urNp linux-2.6.37/arch/alpha/include/asm/pgtable.h linux-2.6.37/arch/alpha/include/asm/pgtable.h
17049 ---- linux-2.6.37/arch/alpha/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17050 -+++ linux-2.6.37/arch/alpha/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17051 +diff -urNp linux-2.6.37.1/arch/alpha/include/asm/pgtable.h linux-2.6.37.1/arch/alpha/include/asm/pgtable.h
17052 +--- linux-2.6.37.1/arch/alpha/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17053 ++++ linux-2.6.37.1/arch/alpha/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17054 @@ -101,6 +101,17 @@ struct vm_area_struct;
17055 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
17056 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
17057 @@ -51,9 +51,9 @@ diff -urNp linux-2.6.37/arch/alpha/include/asm/pgtable.h linux-2.6.37/arch/alpha
17058 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
17059
17060 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
17061 -diff -urNp linux-2.6.37/arch/alpha/kernel/module.c linux-2.6.37/arch/alpha/kernel/module.c
17062 ---- linux-2.6.37/arch/alpha/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
17063 -+++ linux-2.6.37/arch/alpha/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
17064 +diff -urNp linux-2.6.37.1/arch/alpha/kernel/module.c linux-2.6.37.1/arch/alpha/kernel/module.c
17065 +--- linux-2.6.37.1/arch/alpha/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
17066 ++++ linux-2.6.37.1/arch/alpha/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
17067 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
17068
17069 /* The small sections were sorted to the end of the segment.
17070 @@ -63,9 +63,9 @@ diff -urNp linux-2.6.37/arch/alpha/kernel/module.c linux-2.6.37/arch/alpha/kerne
17071 got = sechdrs[me->arch.gotsecindex].sh_addr;
17072
17073 for (i = 0; i < n; i++) {
17074 -diff -urNp linux-2.6.37/arch/alpha/kernel/osf_sys.c linux-2.6.37/arch/alpha/kernel/osf_sys.c
17075 ---- linux-2.6.37/arch/alpha/kernel/osf_sys.c 2011-01-04 19:50:19.000000000 -0500
17076 -+++ linux-2.6.37/arch/alpha/kernel/osf_sys.c 2011-01-17 02:41:00.000000000 -0500
17077 +diff -urNp linux-2.6.37.1/arch/alpha/kernel/osf_sys.c linux-2.6.37.1/arch/alpha/kernel/osf_sys.c
17078 +--- linux-2.6.37.1/arch/alpha/kernel/osf_sys.c 2011-01-04 19:50:19.000000000 -0500
17079 ++++ linux-2.6.37.1/arch/alpha/kernel/osf_sys.c 2011-01-17 02:41:00.000000000 -0500
17080 @@ -1165,7 +1165,7 @@ arch_get_unmapped_area_1(unsigned long a
17081 /* At this point: (!vma || addr < vma->vm_end). */
17082 if (limit - len < addr)
17083 @@ -97,9 +97,9 @@ diff -urNp linux-2.6.37/arch/alpha/kernel/osf_sys.c linux-2.6.37/arch/alpha/kern
17084 if (addr != (unsigned long) -ENOMEM)
17085 return addr;
17086
17087 -diff -urNp linux-2.6.37/arch/alpha/kernel/pci_iommu.c linux-2.6.37/arch/alpha/kernel/pci_iommu.c
17088 ---- linux-2.6.37/arch/alpha/kernel/pci_iommu.c 2011-01-04 19:50:19.000000000 -0500
17089 -+++ linux-2.6.37/arch/alpha/kernel/pci_iommu.c 2011-01-17 02:41:00.000000000 -0500
17090 +diff -urNp linux-2.6.37.1/arch/alpha/kernel/pci_iommu.c linux-2.6.37.1/arch/alpha/kernel/pci_iommu.c
17091 +--- linux-2.6.37.1/arch/alpha/kernel/pci_iommu.c 2011-01-04 19:50:19.000000000 -0500
17092 ++++ linux-2.6.37.1/arch/alpha/kernel/pci_iommu.c 2011-01-17 02:41:00.000000000 -0500
17093 @@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
17094 return 0;
17095 }
17096 @@ -116,9 +116,9 @@ diff -urNp linux-2.6.37/arch/alpha/kernel/pci_iommu.c linux-2.6.37/arch/alpha/ke
17097 -struct dma_map_ops *dma_ops = &alpha_pci_ops;
17098 +const struct dma_map_ops *dma_ops = &alpha_pci_ops;
17099 EXPORT_SYMBOL(dma_ops);
17100 -diff -urNp linux-2.6.37/arch/alpha/kernel/pci-noop.c linux-2.6.37/arch/alpha/kernel/pci-noop.c
17101 ---- linux-2.6.37/arch/alpha/kernel/pci-noop.c 2011-01-04 19:50:19.000000000 -0500
17102 -+++ linux-2.6.37/arch/alpha/kernel/pci-noop.c 2011-01-17 02:41:00.000000000 -0500
17103 +diff -urNp linux-2.6.37.1/arch/alpha/kernel/pci-noop.c linux-2.6.37.1/arch/alpha/kernel/pci-noop.c
17104 +--- linux-2.6.37.1/arch/alpha/kernel/pci-noop.c 2011-01-04 19:50:19.000000000 -0500
17105 ++++ linux-2.6.37.1/arch/alpha/kernel/pci-noop.c 2011-01-17 02:41:00.000000000 -0500
17106 @@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
17107 return 0;
17108 }
17109 @@ -137,9 +137,9 @@ diff -urNp linux-2.6.37/arch/alpha/kernel/pci-noop.c linux-2.6.37/arch/alpha/ker
17110 EXPORT_SYMBOL(dma_ops);
17111
17112 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
17113 -diff -urNp linux-2.6.37/arch/alpha/mm/fault.c linux-2.6.37/arch/alpha/mm/fault.c
17114 ---- linux-2.6.37/arch/alpha/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17115 -+++ linux-2.6.37/arch/alpha/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17116 +diff -urNp linux-2.6.37.1/arch/alpha/mm/fault.c linux-2.6.37.1/arch/alpha/mm/fault.c
17117 +--- linux-2.6.37.1/arch/alpha/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17118 ++++ linux-2.6.37.1/arch/alpha/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17119 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
17120 __reload_thread(pcb);
17121 }
17122 @@ -296,9 +296,9 @@ diff -urNp linux-2.6.37/arch/alpha/mm/fault.c linux-2.6.37/arch/alpha/mm/fault.c
17123 } else if (!cause) {
17124 /* Allow reads even for write-only mappings */
17125 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
17126 -diff -urNp linux-2.6.37/arch/arm/include/asm/elf.h linux-2.6.37/arch/arm/include/asm/elf.h
17127 ---- linux-2.6.37/arch/arm/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17128 -+++ linux-2.6.37/arch/arm/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17129 +diff -urNp linux-2.6.37.1/arch/arm/include/asm/elf.h linux-2.6.37.1/arch/arm/include/asm/elf.h
17130 +--- linux-2.6.37.1/arch/arm/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17131 ++++ linux-2.6.37.1/arch/arm/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17132 @@ -113,7 +113,14 @@ int dump_task_regs(struct task_struct *t
17133 the loader. We need to make sure that it is out of the way of the program
17134 that it will "exec", and that there is sufficient room for the brk. */
17135 @@ -326,9 +326,9 @@ diff -urNp linux-2.6.37/arch/arm/include/asm/elf.h linux-2.6.37/arch/arm/include
17136 extern int vectors_user_mapping(void);
17137 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
17138 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
17139 -diff -urNp linux-2.6.37/arch/arm/include/asm/kmap_types.h linux-2.6.37/arch/arm/include/asm/kmap_types.h
17140 ---- linux-2.6.37/arch/arm/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17141 -+++ linux-2.6.37/arch/arm/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17142 +diff -urNp linux-2.6.37.1/arch/arm/include/asm/kmap_types.h linux-2.6.37.1/arch/arm/include/asm/kmap_types.h
17143 +--- linux-2.6.37.1/arch/arm/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17144 ++++ linux-2.6.37.1/arch/arm/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17145 @@ -21,6 +21,7 @@ enum km_type {
17146 KM_L1_CACHE,
17147 KM_L2_CACHE,
17148 @@ -337,9 +337,9 @@ diff -urNp linux-2.6.37/arch/arm/include/asm/kmap_types.h linux-2.6.37/arch/arm/
17149 KM_TYPE_NR
17150 };
17151
17152 -diff -urNp linux-2.6.37/arch/arm/include/asm/uaccess.h linux-2.6.37/arch/arm/include/asm/uaccess.h
17153 ---- linux-2.6.37/arch/arm/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
17154 -+++ linux-2.6.37/arch/arm/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
17155 +diff -urNp linux-2.6.37.1/arch/arm/include/asm/uaccess.h linux-2.6.37.1/arch/arm/include/asm/uaccess.h
17156 +--- linux-2.6.37.1/arch/arm/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
17157 ++++ linux-2.6.37.1/arch/arm/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
17158 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
17159
17160 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
17161 @@ -360,9 +360,9 @@ diff -urNp linux-2.6.37/arch/arm/include/asm/uaccess.h linux-2.6.37/arch/arm/inc
17162 if (access_ok(VERIFY_WRITE, to, n))
17163 n = __copy_to_user(to, from, n);
17164 return n;
17165 -diff -urNp linux-2.6.37/arch/arm/kernel/kgdb.c linux-2.6.37/arch/arm/kernel/kgdb.c
17166 ---- linux-2.6.37/arch/arm/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17167 -+++ linux-2.6.37/arch/arm/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17168 +diff -urNp linux-2.6.37.1/arch/arm/kernel/kgdb.c linux-2.6.37.1/arch/arm/kernel/kgdb.c
17169 +--- linux-2.6.37.1/arch/arm/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17170 ++++ linux-2.6.37.1/arch/arm/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17171 @@ -246,7 +246,7 @@ void kgdb_arch_exit(void)
17172 * and we handle the normal undef case within the do_undefinstr
17173 * handler.
17174 @@ -372,9 +372,9 @@ diff -urNp linux-2.6.37/arch/arm/kernel/kgdb.c linux-2.6.37/arch/arm/kernel/kgdb
17175 #ifndef __ARMEB__
17176 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
17177 #else /* ! __ARMEB__ */
17178 -diff -urNp linux-2.6.37/arch/arm/kernel/process.c linux-2.6.37/arch/arm/kernel/process.c
17179 ---- linux-2.6.37/arch/arm/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
17180 -+++ linux-2.6.37/arch/arm/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
17181 +diff -urNp linux-2.6.37.1/arch/arm/kernel/process.c linux-2.6.37.1/arch/arm/kernel/process.c
17182 +--- linux-2.6.37.1/arch/arm/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
17183 ++++ linux-2.6.37.1/arch/arm/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
17184 @@ -28,7 +28,6 @@
17185 #include <linux/tick.h>
17186 #include <linux/utsname.h>
17187 @@ -396,9 +396,9 @@ diff -urNp linux-2.6.37/arch/arm/kernel/process.c linux-2.6.37/arch/arm/kernel/p
17188 /*
17189 * The vectors page is always readable from user space for the
17190 * atomic helpers and the signal restart code. Let's declare a mapping
17191 -diff -urNp linux-2.6.37/arch/arm/mach-at91/pm.c linux-2.6.37/arch/arm/mach-at91/pm.c
17192 ---- linux-2.6.37/arch/arm/mach-at91/pm.c 2011-01-04 19:50:19.000000000 -0500
17193 -+++ linux-2.6.37/arch/arm/mach-at91/pm.c 2011-01-17 02:41:00.000000000 -0500
17194 +diff -urNp linux-2.6.37.1/arch/arm/mach-at91/pm.c linux-2.6.37.1/arch/arm/mach-at91/pm.c
17195 +--- linux-2.6.37.1/arch/arm/mach-at91/pm.c 2011-01-04 19:50:19.000000000 -0500
17196 ++++ linux-2.6.37.1/arch/arm/mach-at91/pm.c 2011-01-17 02:41:00.000000000 -0500
17197 @@ -301,7 +301,7 @@ static void at91_pm_end(void)
17198 }
17199
17200 @@ -408,9 +408,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-at91/pm.c linux-2.6.37/arch/arm/mach-at91/
17201 .valid = at91_pm_valid_state,
17202 .begin = at91_pm_begin,
17203 .enter = at91_pm_enter,
17204 -diff -urNp linux-2.6.37/arch/arm/mach-davinci/pm.c linux-2.6.37/arch/arm/mach-davinci/pm.c
17205 ---- linux-2.6.37/arch/arm/mach-davinci/pm.c 2011-01-04 19:50:19.000000000 -0500
17206 -+++ linux-2.6.37/arch/arm/mach-davinci/pm.c 2011-01-17 02:41:00.000000000 -0500
17207 +diff -urNp linux-2.6.37.1/arch/arm/mach-davinci/pm.c linux-2.6.37.1/arch/arm/mach-davinci/pm.c
17208 +--- linux-2.6.37.1/arch/arm/mach-davinci/pm.c 2011-01-04 19:50:19.000000000 -0500
17209 ++++ linux-2.6.37.1/arch/arm/mach-davinci/pm.c 2011-01-17 02:41:00.000000000 -0500
17210 @@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
17211 return ret;
17212 }
17213 @@ -420,9 +420,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-davinci/pm.c linux-2.6.37/arch/arm/mach-da
17214 .enter = davinci_pm_enter,
17215 .valid = suspend_valid_only_mem,
17216 };
17217 -diff -urNp linux-2.6.37/arch/arm/mach-imx/pm-imx27.c linux-2.6.37/arch/arm/mach-imx/pm-imx27.c
17218 ---- linux-2.6.37/arch/arm/mach-imx/pm-imx27.c 2011-01-04 19:50:19.000000000 -0500
17219 -+++ linux-2.6.37/arch/arm/mach-imx/pm-imx27.c 2011-01-17 02:41:00.000000000 -0500
17220 +diff -urNp linux-2.6.37.1/arch/arm/mach-imx/pm-imx27.c linux-2.6.37.1/arch/arm/mach-imx/pm-imx27.c
17221 +--- linux-2.6.37.1/arch/arm/mach-imx/pm-imx27.c 2011-01-04 19:50:19.000000000 -0500
17222 ++++ linux-2.6.37.1/arch/arm/mach-imx/pm-imx27.c 2011-01-17 02:41:00.000000000 -0500
17223 @@ -32,7 +32,7 @@ static int mx27_suspend_enter(suspend_st
17224 return 0;
17225 }
17226 @@ -432,9 +432,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-imx/pm-imx27.c linux-2.6.37/arch/arm/mach-
17227 .enter = mx27_suspend_enter,
17228 .valid = suspend_valid_only_mem,
17229 };
17230 -diff -urNp linux-2.6.37/arch/arm/mach-lpc32xx/pm.c linux-2.6.37/arch/arm/mach-lpc32xx/pm.c
17231 ---- linux-2.6.37/arch/arm/mach-lpc32xx/pm.c 2011-01-04 19:50:19.000000000 -0500
17232 -+++ linux-2.6.37/arch/arm/mach-lpc32xx/pm.c 2011-01-17 02:41:00.000000000 -0500
17233 +diff -urNp linux-2.6.37.1/arch/arm/mach-lpc32xx/pm.c linux-2.6.37.1/arch/arm/mach-lpc32xx/pm.c
17234 +--- linux-2.6.37.1/arch/arm/mach-lpc32xx/pm.c 2011-01-04 19:50:19.000000000 -0500
17235 ++++ linux-2.6.37.1/arch/arm/mach-lpc32xx/pm.c 2011-01-17 02:41:00.000000000 -0500
17236 @@ -123,7 +123,7 @@ static int lpc32xx_pm_enter(suspend_stat
17237 return 0;
17238 }
17239 @@ -444,9 +444,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-lpc32xx/pm.c linux-2.6.37/arch/arm/mach-lp
17240 .valid = suspend_valid_only_mem,
17241 .enter = lpc32xx_pm_enter,
17242 };
17243 -diff -urNp linux-2.6.37/arch/arm/mach-msm/last_radio_log.c linux-2.6.37/arch/arm/mach-msm/last_radio_log.c
17244 ---- linux-2.6.37/arch/arm/mach-msm/last_radio_log.c 2011-01-04 19:50:19.000000000 -0500
17245 -+++ linux-2.6.37/arch/arm/mach-msm/last_radio_log.c 2011-01-17 02:41:00.000000000 -0500
17246 +diff -urNp linux-2.6.37.1/arch/arm/mach-msm/last_radio_log.c linux-2.6.37.1/arch/arm/mach-msm/last_radio_log.c
17247 +--- linux-2.6.37.1/arch/arm/mach-msm/last_radio_log.c 2011-01-04 19:50:19.000000000 -0500
17248 ++++ linux-2.6.37.1/arch/arm/mach-msm/last_radio_log.c 2011-01-17 02:41:00.000000000 -0500
17249 @@ -47,6 +47,7 @@ static ssize_t last_radio_log_read(struc
17250 return count;
17251 }
17252 @@ -455,9 +455,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-msm/last_radio_log.c linux-2.6.37/arch/arm
17253 static struct file_operations last_radio_log_fops = {
17254 .read = last_radio_log_read,
17255 .llseek = default_llseek,
17256 -diff -urNp linux-2.6.37/arch/arm/mach-omap1/pm.c linux-2.6.37/arch/arm/mach-omap1/pm.c
17257 ---- linux-2.6.37/arch/arm/mach-omap1/pm.c 2011-01-04 19:50:19.000000000 -0500
17258 -+++ linux-2.6.37/arch/arm/mach-omap1/pm.c 2011-01-17 02:41:00.000000000 -0500
17259 +diff -urNp linux-2.6.37.1/arch/arm/mach-omap1/pm.c linux-2.6.37.1/arch/arm/mach-omap1/pm.c
17260 +--- linux-2.6.37.1/arch/arm/mach-omap1/pm.c 2011-01-04 19:50:19.000000000 -0500
17261 ++++ linux-2.6.37.1/arch/arm/mach-omap1/pm.c 2011-01-17 02:41:00.000000000 -0500
17262 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
17263
17264
17265 @@ -467,9 +467,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-omap1/pm.c linux-2.6.37/arch/arm/mach-omap
17266 .prepare = omap_pm_prepare,
17267 .enter = omap_pm_enter,
17268 .finish = omap_pm_finish,
17269 -diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm24xx.c linux-2.6.37/arch/arm/mach-omap2/pm24xx.c
17270 ---- linux-2.6.37/arch/arm/mach-omap2/pm24xx.c 2011-01-04 19:50:19.000000000 -0500
17271 -+++ linux-2.6.37/arch/arm/mach-omap2/pm24xx.c 2011-01-17 02:41:00.000000000 -0500
17272 +diff -urNp linux-2.6.37.1/arch/arm/mach-omap2/pm24xx.c linux-2.6.37.1/arch/arm/mach-omap2/pm24xx.c
17273 +--- linux-2.6.37.1/arch/arm/mach-omap2/pm24xx.c 2011-01-04 19:50:19.000000000 -0500
17274 ++++ linux-2.6.37.1/arch/arm/mach-omap2/pm24xx.c 2011-01-17 02:41:00.000000000 -0500
17275 @@ -359,7 +359,7 @@ static void omap2_pm_end(void)
17276 suspend_state = PM_SUSPEND_ON;
17277 }
17278 @@ -479,9 +479,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm24xx.c linux-2.6.37/arch/arm/mach-
17279 .begin = omap2_pm_begin,
17280 .prepare = omap2_pm_prepare,
17281 .enter = omap2_pm_enter,
17282 -diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm34xx.c linux-2.6.37/arch/arm/mach-omap2/pm34xx.c
17283 ---- linux-2.6.37/arch/arm/mach-omap2/pm34xx.c 2011-01-04 19:50:19.000000000 -0500
17284 -+++ linux-2.6.37/arch/arm/mach-omap2/pm34xx.c 2011-01-17 02:41:00.000000000 -0500
17285 +diff -urNp linux-2.6.37.1/arch/arm/mach-omap2/pm34xx.c linux-2.6.37.1/arch/arm/mach-omap2/pm34xx.c
17286 +--- linux-2.6.37.1/arch/arm/mach-omap2/pm34xx.c 2011-01-04 19:50:19.000000000 -0500
17287 ++++ linux-2.6.37.1/arch/arm/mach-omap2/pm34xx.c 2011-01-17 02:41:00.000000000 -0500
17288 @@ -617,7 +617,7 @@ static void omap3_pm_end(void)
17289 return;
17290 }
17291 @@ -491,9 +491,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm34xx.c linux-2.6.37/arch/arm/mach-
17292 .begin = omap3_pm_begin,
17293 .end = omap3_pm_end,
17294 .prepare = omap3_pm_prepare,
17295 -diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm44xx.c linux-2.6.37/arch/arm/mach-omap2/pm44xx.c
17296 ---- linux-2.6.37/arch/arm/mach-omap2/pm44xx.c 2011-01-04 19:50:19.000000000 -0500
17297 -+++ linux-2.6.37/arch/arm/mach-omap2/pm44xx.c 2011-01-17 02:41:00.000000000 -0500
17298 +diff -urNp linux-2.6.37.1/arch/arm/mach-omap2/pm44xx.c linux-2.6.37.1/arch/arm/mach-omap2/pm44xx.c
17299 +--- linux-2.6.37.1/arch/arm/mach-omap2/pm44xx.c 2011-01-04 19:50:19.000000000 -0500
17300 ++++ linux-2.6.37.1/arch/arm/mach-omap2/pm44xx.c 2011-01-17 02:41:00.000000000 -0500
17301 @@ -75,7 +75,7 @@ static void omap4_pm_end(void)
17302 return;
17303 }
17304 @@ -503,9 +503,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm44xx.c linux-2.6.37/arch/arm/mach-
17305 .begin = omap4_pm_begin,
17306 .end = omap4_pm_end,
17307 .prepare = omap4_pm_prepare,
17308 -diff -urNp linux-2.6.37/arch/arm/mach-pnx4008/pm.c linux-2.6.37/arch/arm/mach-pnx4008/pm.c
17309 ---- linux-2.6.37/arch/arm/mach-pnx4008/pm.c 2011-01-04 19:50:19.000000000 -0500
17310 -+++ linux-2.6.37/arch/arm/mach-pnx4008/pm.c 2011-01-17 02:41:00.000000000 -0500
17311 +diff -urNp linux-2.6.37.1/arch/arm/mach-pnx4008/pm.c linux-2.6.37.1/arch/arm/mach-pnx4008/pm.c
17312 +--- linux-2.6.37.1/arch/arm/mach-pnx4008/pm.c 2011-01-04 19:50:19.000000000 -0500
17313 ++++ linux-2.6.37.1/arch/arm/mach-pnx4008/pm.c 2011-01-17 02:41:00.000000000 -0500
17314 @@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
17315 (state == PM_SUSPEND_MEM);
17316 }
17317 @@ -515,9 +515,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-pnx4008/pm.c linux-2.6.37/arch/arm/mach-pn
17318 .enter = pnx4008_pm_enter,
17319 .valid = pnx4008_pm_valid,
17320 };
17321 -diff -urNp linux-2.6.37/arch/arm/mach-pxa/pm.c linux-2.6.37/arch/arm/mach-pxa/pm.c
17322 ---- linux-2.6.37/arch/arm/mach-pxa/pm.c 2011-01-04 19:50:19.000000000 -0500
17323 -+++ linux-2.6.37/arch/arm/mach-pxa/pm.c 2011-01-17 02:41:00.000000000 -0500
17324 +diff -urNp linux-2.6.37.1/arch/arm/mach-pxa/pm.c linux-2.6.37.1/arch/arm/mach-pxa/pm.c
17325 +--- linux-2.6.37.1/arch/arm/mach-pxa/pm.c 2011-01-04 19:50:19.000000000 -0500
17326 ++++ linux-2.6.37.1/arch/arm/mach-pxa/pm.c 2011-01-17 02:41:00.000000000 -0500
17327 @@ -96,7 +96,7 @@ void pxa_pm_finish(void)
17328 pxa_cpu_pm_fns->finish();
17329 }
17330 @@ -527,9 +527,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-pxa/pm.c linux-2.6.37/arch/arm/mach-pxa/pm
17331 .valid = pxa_pm_valid,
17332 .enter = pxa_pm_enter,
17333 .prepare = pxa_pm_prepare,
17334 -diff -urNp linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c
17335 ---- linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-04 19:50:19.000000000 -0500
17336 -+++ linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-17 02:41:00.000000000 -0500
17337 +diff -urNp linux-2.6.37.1/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37.1/arch/arm/mach-pxa/sharpsl_pm.c
17338 +--- linux-2.6.37.1/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-04 19:50:19.000000000 -0500
17339 ++++ linux-2.6.37.1/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-17 02:41:00.000000000 -0500
17340 @@ -868,7 +868,7 @@ static void sharpsl_apm_get_power_status
17341 }
17342
17343 @@ -539,9 +539,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37/arch/arm/mac
17344 .prepare = pxa_pm_prepare,
17345 .finish = pxa_pm_finish,
17346 .enter = corgi_pxa_pm_enter,
17347 -diff -urNp linux-2.6.37/arch/arm/mach-sa1100/pm.c linux-2.6.37/arch/arm/mach-sa1100/pm.c
17348 ---- linux-2.6.37/arch/arm/mach-sa1100/pm.c 2011-01-04 19:50:19.000000000 -0500
17349 -+++ linux-2.6.37/arch/arm/mach-sa1100/pm.c 2011-01-17 02:41:00.000000000 -0500
17350 +diff -urNp linux-2.6.37.1/arch/arm/mach-sa1100/pm.c linux-2.6.37.1/arch/arm/mach-sa1100/pm.c
17351 +--- linux-2.6.37.1/arch/arm/mach-sa1100/pm.c 2011-01-04 19:50:19.000000000 -0500
17352 ++++ linux-2.6.37.1/arch/arm/mach-sa1100/pm.c 2011-01-17 02:41:00.000000000 -0500
17353 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
17354 return virt_to_phys(sp);
17355 }
17356 @@ -551,9 +551,9 @@ diff -urNp linux-2.6.37/arch/arm/mach-sa1100/pm.c linux-2.6.37/arch/arm/mach-sa1
17357 .enter = sa11x0_pm_enter,
17358 .valid = suspend_valid_only_mem,
17359 };
17360 -diff -urNp linux-2.6.37/arch/arm/mm/fault.c linux-2.6.37/arch/arm/mm/fault.c
17361 ---- linux-2.6.37/arch/arm/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17362 -+++ linux-2.6.37/arch/arm/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17363 +diff -urNp linux-2.6.37.1/arch/arm/mm/fault.c linux-2.6.37.1/arch/arm/mm/fault.c
17364 +--- linux-2.6.37.1/arch/arm/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17365 ++++ linux-2.6.37.1/arch/arm/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17366 @@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
17367 }
17368 #endif
17369 @@ -602,9 +602,9 @@ diff -urNp linux-2.6.37/arch/arm/mm/fault.c linux-2.6.37/arch/arm/mm/fault.c
17370 /*
17371 * First Level Translation Fault Handler
17372 *
17373 -diff -urNp linux-2.6.37/arch/arm/mm/mmap.c linux-2.6.37/arch/arm/mm/mmap.c
17374 ---- linux-2.6.37/arch/arm/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
17375 -+++ linux-2.6.37/arch/arm/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
17376 +diff -urNp linux-2.6.37.1/arch/arm/mm/mmap.c linux-2.6.37.1/arch/arm/mm/mmap.c
17377 +--- linux-2.6.37.1/arch/arm/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
17378 ++++ linux-2.6.37.1/arch/arm/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
17379 @@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
17380 if (len > TASK_SIZE)
17381 return -ENOMEM;
17382 @@ -654,9 +654,9 @@ diff -urNp linux-2.6.37/arch/arm/mm/mmap.c linux-2.6.37/arch/arm/mm/mmap.c
17383 /*
17384 * Remember the place where we stopped the search:
17385 */
17386 -diff -urNp linux-2.6.37/arch/arm/plat-samsung/pm.c linux-2.6.37/arch/arm/plat-samsung/pm.c
17387 ---- linux-2.6.37/arch/arm/plat-samsung/pm.c 2011-01-04 19:50:19.000000000 -0500
17388 -+++ linux-2.6.37/arch/arm/plat-samsung/pm.c 2011-01-17 02:41:00.000000000 -0500
17389 +diff -urNp linux-2.6.37.1/arch/arm/plat-samsung/pm.c linux-2.6.37.1/arch/arm/plat-samsung/pm.c
17390 +--- linux-2.6.37.1/arch/arm/plat-samsung/pm.c 2011-01-04 19:50:19.000000000 -0500
17391 ++++ linux-2.6.37.1/arch/arm/plat-samsung/pm.c 2011-01-17 02:41:00.000000000 -0500
17392 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
17393 s3c_pm_check_cleanup();
17394 }
17395 @@ -666,9 +666,9 @@ diff -urNp linux-2.6.37/arch/arm/plat-samsung/pm.c linux-2.6.37/arch/arm/plat-sa
17396 .enter = s3c_pm_enter,
17397 .prepare = s3c_pm_prepare,
17398 .finish = s3c_pm_finish,
17399 -diff -urNp linux-2.6.37/arch/avr32/include/asm/elf.h linux-2.6.37/arch/avr32/include/asm/elf.h
17400 ---- linux-2.6.37/arch/avr32/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17401 -+++ linux-2.6.37/arch/avr32/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17402 +diff -urNp linux-2.6.37.1/arch/avr32/include/asm/elf.h linux-2.6.37.1/arch/avr32/include/asm/elf.h
17403 +--- linux-2.6.37.1/arch/avr32/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17404 ++++ linux-2.6.37.1/arch/avr32/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17405 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
17406 the loader. We need to make sure that it is out of the way of the program
17407 that it will "exec", and that there is sufficient room for the brk. */
17408 @@ -685,9 +685,9 @@ diff -urNp linux-2.6.37/arch/avr32/include/asm/elf.h linux-2.6.37/arch/avr32/inc
17409
17410 /* This yields a mask that user programs can use to figure out what
17411 instruction set this CPU supports. This could be done in user space,
17412 -diff -urNp linux-2.6.37/arch/avr32/include/asm/kmap_types.h linux-2.6.37/arch/avr32/include/asm/kmap_types.h
17413 ---- linux-2.6.37/arch/avr32/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17414 -+++ linux-2.6.37/arch/avr32/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17415 +diff -urNp linux-2.6.37.1/arch/avr32/include/asm/kmap_types.h linux-2.6.37.1/arch/avr32/include/asm/kmap_types.h
17416 +--- linux-2.6.37.1/arch/avr32/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17417 ++++ linux-2.6.37.1/arch/avr32/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17418 @@ -22,7 +22,8 @@ D(10) KM_IRQ0,
17419 D(11) KM_IRQ1,
17420 D(12) KM_SOFTIRQ0,
17421 @@ -698,9 +698,9 @@ diff -urNp linux-2.6.37/arch/avr32/include/asm/kmap_types.h linux-2.6.37/arch/av
17422 };
17423
17424 #undef D
17425 -diff -urNp linux-2.6.37/arch/avr32/mach-at32ap/pm.c linux-2.6.37/arch/avr32/mach-at32ap/pm.c
17426 ---- linux-2.6.37/arch/avr32/mach-at32ap/pm.c 2011-01-04 19:50:19.000000000 -0500
17427 -+++ linux-2.6.37/arch/avr32/mach-at32ap/pm.c 2011-01-17 02:41:00.000000000 -0500
17428 +diff -urNp linux-2.6.37.1/arch/avr32/mach-at32ap/pm.c linux-2.6.37.1/arch/avr32/mach-at32ap/pm.c
17429 +--- linux-2.6.37.1/arch/avr32/mach-at32ap/pm.c 2011-01-04 19:50:19.000000000 -0500
17430 ++++ linux-2.6.37.1/arch/avr32/mach-at32ap/pm.c 2011-01-17 02:41:00.000000000 -0500
17431 @@ -176,7 +176,7 @@ out:
17432 return 0;
17433 }
17434 @@ -710,9 +710,9 @@ diff -urNp linux-2.6.37/arch/avr32/mach-at32ap/pm.c linux-2.6.37/arch/avr32/mach
17435 .valid = avr32_pm_valid_state,
17436 .enter = avr32_pm_enter,
17437 };
17438 -diff -urNp linux-2.6.37/arch/avr32/mm/fault.c linux-2.6.37/arch/avr32/mm/fault.c
17439 ---- linux-2.6.37/arch/avr32/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17440 -+++ linux-2.6.37/arch/avr32/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17441 +diff -urNp linux-2.6.37.1/arch/avr32/mm/fault.c linux-2.6.37.1/arch/avr32/mm/fault.c
17442 +--- linux-2.6.37.1/arch/avr32/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17443 ++++ linux-2.6.37.1/arch/avr32/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17444 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
17445
17446 int exception_trace = 1;
17447 @@ -754,9 +754,9 @@ diff -urNp linux-2.6.37/arch/avr32/mm/fault.c linux-2.6.37/arch/avr32/mm/fault.c
17448 if (exception_trace && printk_ratelimit())
17449 printk("%s%s[%d]: segfault at %08lx pc %08lx "
17450 "sp %08lx ecr %lu\n",
17451 -diff -urNp linux-2.6.37/arch/blackfin/kernel/kgdb.c linux-2.6.37/arch/blackfin/kernel/kgdb.c
17452 ---- linux-2.6.37/arch/blackfin/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17453 -+++ linux-2.6.37/arch/blackfin/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17454 +diff -urNp linux-2.6.37.1/arch/blackfin/kernel/kgdb.c linux-2.6.37.1/arch/blackfin/kernel/kgdb.c
17455 +--- linux-2.6.37.1/arch/blackfin/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17456 ++++ linux-2.6.37.1/arch/blackfin/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17457 @@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
17458 return -1; /* this means that we do not want to exit from the handler */
17459 }
17460 @@ -766,9 +766,9 @@ diff -urNp linux-2.6.37/arch/blackfin/kernel/kgdb.c linux-2.6.37/arch/blackfin/k
17461 .gdb_bpt_instr = {0xa1},
17462 #ifdef CONFIG_SMP
17463 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
17464 -diff -urNp linux-2.6.37/arch/blackfin/mach-common/pm.c linux-2.6.37/arch/blackfin/mach-common/pm.c
17465 ---- linux-2.6.37/arch/blackfin/mach-common/pm.c 2011-01-04 19:50:19.000000000 -0500
17466 -+++ linux-2.6.37/arch/blackfin/mach-common/pm.c 2011-01-17 02:41:00.000000000 -0500
17467 +diff -urNp linux-2.6.37.1/arch/blackfin/mach-common/pm.c linux-2.6.37.1/arch/blackfin/mach-common/pm.c
17468 +--- linux-2.6.37.1/arch/blackfin/mach-common/pm.c 2011-01-04 19:50:19.000000000 -0500
17469 ++++ linux-2.6.37.1/arch/blackfin/mach-common/pm.c 2011-01-17 02:41:00.000000000 -0500
17470 @@ -233,7 +233,7 @@ static int bfin_pm_enter(suspend_state_t
17471 return 0;
17472 }
17473 @@ -778,9 +778,9 @@ diff -urNp linux-2.6.37/arch/blackfin/mach-common/pm.c linux-2.6.37/arch/blackfi
17474 .enter = bfin_pm_enter,
17475 .valid = bfin_pm_valid,
17476 };
17477 -diff -urNp linux-2.6.37/arch/blackfin/mm/maccess.c linux-2.6.37/arch/blackfin/mm/maccess.c
17478 ---- linux-2.6.37/arch/blackfin/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
17479 -+++ linux-2.6.37/arch/blackfin/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
17480 +diff -urNp linux-2.6.37.1/arch/blackfin/mm/maccess.c linux-2.6.37.1/arch/blackfin/mm/maccess.c
17481 +--- linux-2.6.37.1/arch/blackfin/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
17482 ++++ linux-2.6.37.1/arch/blackfin/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
17483 @@ -16,7 +16,7 @@ static int validate_memory_access_addres
17484 return bfin_mem_access_type(addr, size);
17485 }
17486 @@ -799,9 +799,9 @@ diff -urNp linux-2.6.37/arch/blackfin/mm/maccess.c linux-2.6.37/arch/blackfin/mm
17487 {
17488 unsigned long ldst = (unsigned long)dst;
17489 int mem_type;
17490 -diff -urNp linux-2.6.37/arch/frv/include/asm/kmap_types.h linux-2.6.37/arch/frv/include/asm/kmap_types.h
17491 ---- linux-2.6.37/arch/frv/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17492 -+++ linux-2.6.37/arch/frv/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17493 +diff -urNp linux-2.6.37.1/arch/frv/include/asm/kmap_types.h linux-2.6.37.1/arch/frv/include/asm/kmap_types.h
17494 +--- linux-2.6.37.1/arch/frv/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
17495 ++++ linux-2.6.37.1/arch/frv/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
17496 @@ -23,6 +23,7 @@ enum km_type {
17497 KM_IRQ1,
17498 KM_SOFTIRQ0,
17499 @@ -810,9 +810,9 @@ diff -urNp linux-2.6.37/arch/frv/include/asm/kmap_types.h linux-2.6.37/arch/frv/
17500 KM_TYPE_NR
17501 };
17502
17503 -diff -urNp linux-2.6.37/arch/frv/mm/elf-fdpic.c linux-2.6.37/arch/frv/mm/elf-fdpic.c
17504 ---- linux-2.6.37/arch/frv/mm/elf-fdpic.c 2011-01-04 19:50:19.000000000 -0500
17505 -+++ linux-2.6.37/arch/frv/mm/elf-fdpic.c 2011-01-17 02:41:00.000000000 -0500
17506 +diff -urNp linux-2.6.37.1/arch/frv/mm/elf-fdpic.c linux-2.6.37.1/arch/frv/mm/elf-fdpic.c
17507 +--- linux-2.6.37.1/arch/frv/mm/elf-fdpic.c 2011-01-04 19:50:19.000000000 -0500
17508 ++++ linux-2.6.37.1/arch/frv/mm/elf-fdpic.c 2011-01-17 02:41:00.000000000 -0500
17509 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
17510 if (addr) {
17511 addr = PAGE_ALIGN(addr);
17512 @@ -841,9 +841,9 @@ diff -urNp linux-2.6.37/arch/frv/mm/elf-fdpic.c linux-2.6.37/arch/frv/mm/elf-fdp
17513 goto success;
17514 addr = vma->vm_end;
17515 }
17516 -diff -urNp linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c
17517 ---- linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c 2011-01-04 19:50:19.000000000 -0500
17518 -+++ linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c 2011-01-17 02:41:00.000000000 -0500
17519 +diff -urNp linux-2.6.37.1/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.37.1/arch/ia64/hp/common/hwsw_iommu.c
17520 +--- linux-2.6.37.1/arch/ia64/hp/common/hwsw_iommu.c 2011-01-04 19:50:19.000000000 -0500
17521 ++++ linux-2.6.37.1/arch/ia64/hp/common/hwsw_iommu.c 2011-01-17 02:41:00.000000000 -0500
17522 @@ -17,7 +17,7 @@
17523 #include <linux/swiotlb.h>
17524 #include <asm/machvec.h>
17525 @@ -862,9 +862,9 @@ diff -urNp linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.37/arch/ia64/
17526 {
17527 if (use_swiotlb(dev))
17528 return &swiotlb_dma_ops;
17529 -diff -urNp linux-2.6.37/arch/ia64/hp/common/sba_iommu.c linux-2.6.37/arch/ia64/hp/common/sba_iommu.c
17530 ---- linux-2.6.37/arch/ia64/hp/common/sba_iommu.c 2011-01-04 19:50:19.000000000 -0500
17531 -+++ linux-2.6.37/arch/ia64/hp/common/sba_iommu.c 2011-01-17 02:41:00.000000000 -0500
17532 +diff -urNp linux-2.6.37.1/arch/ia64/hp/common/sba_iommu.c linux-2.6.37.1/arch/ia64/hp/common/sba_iommu.c
17533 +--- linux-2.6.37.1/arch/ia64/hp/common/sba_iommu.c 2011-01-04 19:50:19.000000000 -0500
17534 ++++ linux-2.6.37.1/arch/ia64/hp/common/sba_iommu.c 2011-01-17 02:41:00.000000000 -0500
17535 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
17536 },
17537 };
17538 @@ -883,9 +883,9 @@ diff -urNp linux-2.6.37/arch/ia64/hp/common/sba_iommu.c linux-2.6.37/arch/ia64/h
17539 .alloc_coherent = sba_alloc_coherent,
17540 .free_coherent = sba_free_coherent,
17541 .map_page = sba_map_page,
17542 -diff -urNp linux-2.6.37/arch/ia64/include/asm/dma-mapping.h linux-2.6.37/arch/ia64/include/asm/dma-mapping.h
17543 ---- linux-2.6.37/arch/ia64/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17544 -+++ linux-2.6.37/arch/ia64/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17545 +diff -urNp linux-2.6.37.1/arch/ia64/include/asm/dma-mapping.h linux-2.6.37.1/arch/ia64/include/asm/dma-mapping.h
17546 +--- linux-2.6.37.1/arch/ia64/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17547 ++++ linux-2.6.37.1/arch/ia64/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17548 @@ -12,7 +12,7 @@
17549
17550 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
17551 @@ -929,9 +929,9 @@ diff -urNp linux-2.6.37/arch/ia64/include/asm/dma-mapping.h linux-2.6.37/arch/ia
17552 return ops->dma_supported(dev, mask);
17553 }
17554
17555 -diff -urNp linux-2.6.37/arch/ia64/include/asm/elf.h linux-2.6.37/arch/ia64/include/asm/elf.h
17556 ---- linux-2.6.37/arch/ia64/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17557 -+++ linux-2.6.37/arch/ia64/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17558 +diff -urNp linux-2.6.37.1/arch/ia64/include/asm/elf.h linux-2.6.37.1/arch/ia64/include/asm/elf.h
17559 +--- linux-2.6.37.1/arch/ia64/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17560 ++++ linux-2.6.37.1/arch/ia64/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17561 @@ -42,6 +42,13 @@
17562 */
17563 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
17564 @@ -946,9 +946,9 @@ diff -urNp linux-2.6.37/arch/ia64/include/asm/elf.h linux-2.6.37/arch/ia64/inclu
17565 #define PT_IA_64_UNWIND 0x70000001
17566
17567 /* IA-64 relocations: */
17568 -diff -urNp linux-2.6.37/arch/ia64/include/asm/machvec.h linux-2.6.37/arch/ia64/include/asm/machvec.h
17569 ---- linux-2.6.37/arch/ia64/include/asm/machvec.h 2011-01-04 19:50:19.000000000 -0500
17570 -+++ linux-2.6.37/arch/ia64/include/asm/machvec.h 2011-01-17 02:41:00.000000000 -0500
17571 +diff -urNp linux-2.6.37.1/arch/ia64/include/asm/machvec.h linux-2.6.37.1/arch/ia64/include/asm/machvec.h
17572 +--- linux-2.6.37.1/arch/ia64/include/asm/machvec.h 2011-01-04 19:50:19.000000000 -0500
17573 ++++ linux-2.6.37.1/arch/ia64/include/asm/machvec.h 2011-01-17 02:41:00.000000000 -0500
17574 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
17575 /* DMA-mapping interface: */
17576 typedef void ia64_mv_dma_init (void);
17577 @@ -967,9 +967,9 @@ diff -urNp linux-2.6.37/arch/ia64/include/asm/machvec.h linux-2.6.37/arch/ia64/i
17578
17579 /*
17580 * Define default versions so we can extend machvec for new platforms without having
17581 -diff -urNp linux-2.6.37/arch/ia64/include/asm/pgtable.h linux-2.6.37/arch/ia64/include/asm/pgtable.h
17582 ---- linux-2.6.37/arch/ia64/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17583 -+++ linux-2.6.37/arch/ia64/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17584 +diff -urNp linux-2.6.37.1/arch/ia64/include/asm/pgtable.h linux-2.6.37.1/arch/ia64/include/asm/pgtable.h
17585 +--- linux-2.6.37.1/arch/ia64/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
17586 ++++ linux-2.6.37.1/arch/ia64/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
17587 @@ -12,7 +12,7 @@
17588 * David Mosberger-Tang <davidm@××××××.com>
17589 */
17590 @@ -997,9 +997,9 @@ diff -urNp linux-2.6.37/arch/ia64/include/asm/pgtable.h linux-2.6.37/arch/ia64/i
17591 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
17592 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
17593 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
17594 -diff -urNp linux-2.6.37/arch/ia64/include/asm/uaccess.h linux-2.6.37/arch/ia64/include/asm/uaccess.h
17595 ---- linux-2.6.37/arch/ia64/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
17596 -+++ linux-2.6.37/arch/ia64/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
17597 +diff -urNp linux-2.6.37.1/arch/ia64/include/asm/uaccess.h linux-2.6.37.1/arch/ia64/include/asm/uaccess.h
17598 +--- linux-2.6.37.1/arch/ia64/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
17599 ++++ linux-2.6.37.1/arch/ia64/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
17600 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
17601 const void *__cu_from = (from); \
17602 long __cu_len = (n); \
17603 @@ -1018,9 +1018,9 @@ diff -urNp linux-2.6.37/arch/ia64/include/asm/uaccess.h linux-2.6.37/arch/ia64/i
17604 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
17605 __cu_len; \
17606 })
17607 -diff -urNp linux-2.6.37/arch/ia64/kernel/dma-mapping.c linux-2.6.37/arch/ia64/kernel/dma-mapping.c
17608 ---- linux-2.6.37/arch/ia64/kernel/dma-mapping.c 2011-01-04 19:50:19.000000000 -0500
17609 -+++ linux-2.6.37/arch/ia64/kernel/dma-mapping.c 2011-01-17 02:41:00.000000000 -0500
17610 +diff -urNp linux-2.6.37.1/arch/ia64/kernel/dma-mapping.c linux-2.6.37.1/arch/ia64/kernel/dma-mapping.c
17611 +--- linux-2.6.37.1/arch/ia64/kernel/dma-mapping.c 2011-01-04 19:50:19.000000000 -0500
17612 ++++ linux-2.6.37.1/arch/ia64/kernel/dma-mapping.c 2011-01-17 02:41:00.000000000 -0500
17613 @@ -3,7 +3,7 @@
17614 /* Set this to 1 if there is a HW IOMMU in the system */
17615 int iommu_detected __read_mostly;
17616 @@ -1039,9 +1039,9 @@ diff -urNp linux-2.6.37/arch/ia64/kernel/dma-mapping.c linux-2.6.37/arch/ia64/ke
17617 {
17618 return dma_ops;
17619 }
17620 -diff -urNp linux-2.6.37/arch/ia64/kernel/module.c linux-2.6.37/arch/ia64/kernel/module.c
17621 ---- linux-2.6.37/arch/ia64/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
17622 -+++ linux-2.6.37/arch/ia64/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
17623 +diff -urNp linux-2.6.37.1/arch/ia64/kernel/module.c linux-2.6.37.1/arch/ia64/kernel/module.c
17624 +--- linux-2.6.37.1/arch/ia64/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
17625 ++++ linux-2.6.37.1/arch/ia64/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
17626 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
17627 void
17628 module_free (struct module *mod, void *module_region)
17629 @@ -1130,9 +1130,9 @@ diff -urNp linux-2.6.37/arch/ia64/kernel/module.c linux-2.6.37/arch/ia64/kernel/
17630 mod->arch.gp = gp;
17631 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
17632 }
17633 -diff -urNp linux-2.6.37/arch/ia64/kernel/pci-dma.c linux-2.6.37/arch/ia64/kernel/pci-dma.c
17634 ---- linux-2.6.37/arch/ia64/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
17635 -+++ linux-2.6.37/arch/ia64/kernel/pci-dma.c 2011-01-17 02:41:00.000000000 -0500
17636 +diff -urNp linux-2.6.37.1/arch/ia64/kernel/pci-dma.c linux-2.6.37.1/arch/ia64/kernel/pci-dma.c
17637 +--- linux-2.6.37.1/arch/ia64/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
17638 ++++ linux-2.6.37.1/arch/ia64/kernel/pci-dma.c 2011-01-17 02:41:00.000000000 -0500
17639 @@ -43,7 +43,7 @@ struct device fallback_dev = {
17640 .dma_mask = &fallback_dev.coherent_dma_mask,
17641 };
17642 @@ -1142,9 +1142,9 @@ diff -urNp linux-2.6.37/arch/ia64/kernel/pci-dma.c linux-2.6.37/arch/ia64/kernel
17643
17644 static int __init pci_iommu_init(void)
17645 {
17646 -diff -urNp linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c
17647 ---- linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
17648 -+++ linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
17649 +diff -urNp linux-2.6.37.1/arch/ia64/kernel/pci-swiotlb.c linux-2.6.37.1/arch/ia64/kernel/pci-swiotlb.c
17650 +--- linux-2.6.37.1/arch/ia64/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
17651 ++++ linux-2.6.37.1/arch/ia64/kernel/pci-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
17652 @@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
17653 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
17654 }
17655 @@ -1154,9 +1154,9 @@ diff -urNp linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c linux-2.6.37/arch/ia64/ke
17656 .alloc_coherent = ia64_swiotlb_alloc_coherent,
17657 .free_coherent = swiotlb_free_coherent,
17658 .map_page = swiotlb_map_page,
17659 -diff -urNp linux-2.6.37/arch/ia64/kernel/sys_ia64.c linux-2.6.37/arch/ia64/kernel/sys_ia64.c
17660 ---- linux-2.6.37/arch/ia64/kernel/sys_ia64.c 2011-01-04 19:50:19.000000000 -0500
17661 -+++ linux-2.6.37/arch/ia64/kernel/sys_ia64.c 2011-01-17 02:41:00.000000000 -0500
17662 +diff -urNp linux-2.6.37.1/arch/ia64/kernel/sys_ia64.c linux-2.6.37.1/arch/ia64/kernel/sys_ia64.c
17663 +--- linux-2.6.37.1/arch/ia64/kernel/sys_ia64.c 2011-01-04 19:50:19.000000000 -0500
17664 ++++ linux-2.6.37.1/arch/ia64/kernel/sys_ia64.c 2011-01-17 02:41:00.000000000 -0500
17665 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
17666 if (REGION_NUMBER(addr) == RGN_HPAGE)
17667 addr = 0;
17668 @@ -1189,9 +1189,9 @@ diff -urNp linux-2.6.37/arch/ia64/kernel/sys_ia64.c linux-2.6.37/arch/ia64/kerne
17669 /* Remember the address where we stopped this search: */
17670 mm->free_area_cache = addr + len;
17671 return addr;
17672 -diff -urNp linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S
17673 ---- linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
17674 -+++ linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S 2011-01-17 02:41:00.000000000 -0500
17675 +diff -urNp linux-2.6.37.1/arch/ia64/kernel/vmlinux.lds.S linux-2.6.37.1/arch/ia64/kernel/vmlinux.lds.S
17676 +--- linux-2.6.37.1/arch/ia64/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
17677 ++++ linux-2.6.37.1/arch/ia64/kernel/vmlinux.lds.S 2011-01-17 02:41:00.000000000 -0500
17678 @@ -199,7 +199,7 @@ SECTIONS {
17679 /* Per-cpu data: */
17680 . = ALIGN(PERCPU_PAGE_SIZE);
17681 @@ -1201,9 +1201,9 @@ diff -urNp linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S linux-2.6.37/arch/ia64/ke
17682 /*
17683 * ensure percpu data fits
17684 * into percpu page size
17685 -diff -urNp linux-2.6.37/arch/ia64/mm/fault.c linux-2.6.37/arch/ia64/mm/fault.c
17686 ---- linux-2.6.37/arch/ia64/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17687 -+++ linux-2.6.37/arch/ia64/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17688 +diff -urNp linux-2.6.37.1/arch/ia64/mm/fault.c linux-2.6.37.1/arch/ia64/mm/fault.c
17689 +--- linux-2.6.37.1/arch/ia64/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
17690 ++++ linux-2.6.37.1/arch/ia64/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
17691 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
17692 return pte_present(pte);
17693 }
17694 @@ -1253,9 +1253,9 @@ diff -urNp linux-2.6.37/arch/ia64/mm/fault.c linux-2.6.37/arch/ia64/mm/fault.c
17695 /*
17696 * If for any reason at all we couldn't handle the fault, make
17697 * sure we exit gracefully rather than endlessly redo the
17698 -diff -urNp linux-2.6.37/arch/ia64/mm/hugetlbpage.c linux-2.6.37/arch/ia64/mm/hugetlbpage.c
17699 ---- linux-2.6.37/arch/ia64/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
17700 -+++ linux-2.6.37/arch/ia64/mm/hugetlbpage.c 2011-01-17 02:41:00.000000000 -0500
17701 +diff -urNp linux-2.6.37.1/arch/ia64/mm/hugetlbpage.c linux-2.6.37.1/arch/ia64/mm/hugetlbpage.c
17702 +--- linux-2.6.37.1/arch/ia64/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
17703 ++++ linux-2.6.37.1/arch/ia64/mm/hugetlbpage.c 2011-01-17 02:41:00.000000000 -0500
17704 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
17705 /* At this point: (!vmm || addr < vmm->vm_end). */
17706 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
17707 @@ -1265,9 +1265,9 @@ diff -urNp linux-2.6.37/arch/ia64/mm/hugetlbpage.c linux-2.6.37/arch/ia64/mm/hug
17708 return addr;
17709 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
17710 }
17711 -diff -urNp linux-2.6.37/arch/ia64/mm/init.c linux-2.6.37/arch/ia64/mm/init.c
17712 ---- linux-2.6.37/arch/ia64/mm/init.c 2011-01-04 19:50:19.000000000 -0500
17713 -+++ linux-2.6.37/arch/ia64/mm/init.c 2011-01-17 02:41:00.000000000 -0500
17714 +diff -urNp linux-2.6.37.1/arch/ia64/mm/init.c linux-2.6.37.1/arch/ia64/mm/init.c
17715 +--- linux-2.6.37.1/arch/ia64/mm/init.c 2011-01-04 19:50:19.000000000 -0500
17716 ++++ linux-2.6.37.1/arch/ia64/mm/init.c 2011-01-17 02:41:00.000000000 -0500
17717 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
17718 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
17719 vma->vm_end = vma->vm_start + PAGE_SIZE;
17720 @@ -1288,9 +1288,9 @@ diff -urNp linux-2.6.37/arch/ia64/mm/init.c linux-2.6.37/arch/ia64/mm/init.c
17721 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
17722 down_write(&current->mm->mmap_sem);
17723 if (insert_vm_struct(current->mm, vma)) {
17724 -diff -urNp linux-2.6.37/arch/ia64/sn/pci/pci_dma.c linux-2.6.37/arch/ia64/sn/pci/pci_dma.c
17725 ---- linux-2.6.37/arch/ia64/sn/pci/pci_dma.c 2011-01-04 19:50:19.000000000 -0500
17726 -+++ linux-2.6.37/arch/ia64/sn/pci/pci_dma.c 2011-01-17 02:41:00.000000000 -0500
17727 +diff -urNp linux-2.6.37.1/arch/ia64/sn/pci/pci_dma.c linux-2.6.37.1/arch/ia64/sn/pci/pci_dma.c
17728 +--- linux-2.6.37.1/arch/ia64/sn/pci/pci_dma.c 2011-01-04 19:50:19.000000000 -0500
17729 ++++ linux-2.6.37.1/arch/ia64/sn/pci/pci_dma.c 2011-01-17 02:41:00.000000000 -0500
17730 @@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
17731 return ret;
17732 }
17733 @@ -1300,9 +1300,9 @@ diff -urNp linux-2.6.37/arch/ia64/sn/pci/pci_dma.c linux-2.6.37/arch/ia64/sn/pci
17734 .alloc_coherent = sn_dma_alloc_coherent,
17735 .free_coherent = sn_dma_free_coherent,
17736 .map_page = sn_dma_map_page,
17737 -diff -urNp linux-2.6.37/arch/m32r/lib/usercopy.c linux-2.6.37/arch/m32r/lib/usercopy.c
17738 ---- linux-2.6.37/arch/m32r/lib/usercopy.c 2011-01-04 19:50:19.000000000 -0500
17739 -+++ linux-2.6.37/arch/m32r/lib/usercopy.c 2011-01-17 02:41:00.000000000 -0500
17740 +diff -urNp linux-2.6.37.1/arch/m32r/lib/usercopy.c linux-2.6.37.1/arch/m32r/lib/usercopy.c
17741 +--- linux-2.6.37.1/arch/m32r/lib/usercopy.c 2011-01-04 19:50:19.000000000 -0500
17742 ++++ linux-2.6.37.1/arch/m32r/lib/usercopy.c 2011-01-17 02:41:00.000000000 -0500
17743 @@ -14,6 +14,9 @@
17744 unsigned long
17745 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
17746 @@ -1323,9 +1323,9 @@ diff -urNp linux-2.6.37/arch/m32r/lib/usercopy.c linux-2.6.37/arch/m32r/lib/user
17747 prefetchw(to);
17748 if (access_ok(VERIFY_READ, from, n))
17749 __copy_user_zeroing(to,from,n);
17750 -diff -urNp linux-2.6.37/arch/microblaze/include/asm/device.h linux-2.6.37/arch/microblaze/include/asm/device.h
17751 ---- linux-2.6.37/arch/microblaze/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
17752 -+++ linux-2.6.37/arch/microblaze/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
17753 +diff -urNp linux-2.6.37.1/arch/microblaze/include/asm/device.h linux-2.6.37.1/arch/microblaze/include/asm/device.h
17754 +--- linux-2.6.37.1/arch/microblaze/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
17755 ++++ linux-2.6.37.1/arch/microblaze/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
17756 @@ -13,7 +13,7 @@ struct device_node;
17757
17758 struct dev_archdata {
17759 @@ -1335,9 +1335,9 @@ diff -urNp linux-2.6.37/arch/microblaze/include/asm/device.h linux-2.6.37/arch/m
17760 void *dma_data;
17761 };
17762
17763 -diff -urNp linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h
17764 ---- linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17765 -+++ linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17766 +diff -urNp linux-2.6.37.1/arch/microblaze/include/asm/dma-mapping.h linux-2.6.37.1/arch/microblaze/include/asm/dma-mapping.h
17767 +--- linux-2.6.37.1/arch/microblaze/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17768 ++++ linux-2.6.37.1/arch/microblaze/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17769 @@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
17770 return 0xfffffffful;
17771 }
17772 @@ -1409,9 +1409,9 @@ diff -urNp linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h linux-2.6.37/a
17773
17774 BUG_ON(!ops);
17775 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
17776 -diff -urNp linux-2.6.37/arch/microblaze/include/asm/pci.h linux-2.6.37/arch/microblaze/include/asm/pci.h
17777 ---- linux-2.6.37/arch/microblaze/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
17778 -+++ linux-2.6.37/arch/microblaze/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
17779 +diff -urNp linux-2.6.37.1/arch/microblaze/include/asm/pci.h linux-2.6.37.1/arch/microblaze/include/asm/pci.h
17780 +--- linux-2.6.37.1/arch/microblaze/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
17781 ++++ linux-2.6.37.1/arch/microblaze/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
17782 @@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
17783 }
17784
17785 @@ -1423,9 +1423,9 @@ diff -urNp linux-2.6.37/arch/microblaze/include/asm/pci.h linux-2.6.37/arch/micr
17786 #else /* CONFIG_PCI */
17787 #define set_pci_dma_ops(d)
17788 #define get_pci_dma_ops() NULL
17789 -diff -urNp linux-2.6.37/arch/microblaze/kernel/dma.c linux-2.6.37/arch/microblaze/kernel/dma.c
17790 ---- linux-2.6.37/arch/microblaze/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
17791 -+++ linux-2.6.37/arch/microblaze/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
17792 +diff -urNp linux-2.6.37.1/arch/microblaze/kernel/dma.c linux-2.6.37.1/arch/microblaze/kernel/dma.c
17793 +--- linux-2.6.37.1/arch/microblaze/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
17794 ++++ linux-2.6.37.1/arch/microblaze/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
17795 @@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page
17796 __dma_sync_page(dma_address, 0 , size, direction);
17797 }
17798 @@ -1435,9 +1435,9 @@ diff -urNp linux-2.6.37/arch/microblaze/kernel/dma.c linux-2.6.37/arch/microblaz
17799 .alloc_coherent = dma_direct_alloc_coherent,
17800 .free_coherent = dma_direct_free_coherent,
17801 .map_sg = dma_direct_map_sg,
17802 -diff -urNp linux-2.6.37/arch/microblaze/kernel/kgdb.c linux-2.6.37/arch/microblaze/kernel/kgdb.c
17803 ---- linux-2.6.37/arch/microblaze/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17804 -+++ linux-2.6.37/arch/microblaze/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17805 +diff -urNp linux-2.6.37.1/arch/microblaze/kernel/kgdb.c linux-2.6.37.1/arch/microblaze/kernel/kgdb.c
17806 +--- linux-2.6.37.1/arch/microblaze/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17807 ++++ linux-2.6.37.1/arch/microblaze/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17808 @@ -141,10 +141,11 @@ void kgdb_arch_exit(void)
17809 /*
17810 * Global data
17811 @@ -1451,9 +1451,9 @@ diff -urNp linux-2.6.37/arch/microblaze/kernel/kgdb.c linux-2.6.37/arch/microbla
17812 .gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
17813 #endif
17814 };
17815 -diff -urNp linux-2.6.37/arch/microblaze/pci/pci-common.c linux-2.6.37/arch/microblaze/pci/pci-common.c
17816 ---- linux-2.6.37/arch/microblaze/pci/pci-common.c 2011-01-04 19:50:19.000000000 -0500
17817 -+++ linux-2.6.37/arch/microblaze/pci/pci-common.c 2011-01-17 02:41:00.000000000 -0500
17818 +diff -urNp linux-2.6.37.1/arch/microblaze/pci/pci-common.c linux-2.6.37.1/arch/microblaze/pci/pci-common.c
17819 +--- linux-2.6.37.1/arch/microblaze/pci/pci-common.c 2011-01-04 19:50:19.000000000 -0500
17820 ++++ linux-2.6.37.1/arch/microblaze/pci/pci-common.c 2011-01-17 02:41:00.000000000 -0500
17821 @@ -47,14 +47,14 @@ resource_size_t isa_mem_base;
17822 /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
17823 unsigned int pci_flags;
17824 @@ -1472,9 +1472,9 @@ diff -urNp linux-2.6.37/arch/microblaze/pci/pci-common.c linux-2.6.37/arch/micro
17825 {
17826 return pci_dma_ops;
17827 }
17828 -diff -urNp linux-2.6.37/arch/mips/alchemy/devboards/pm.c linux-2.6.37/arch/mips/alchemy/devboards/pm.c
17829 ---- linux-2.6.37/arch/mips/alchemy/devboards/pm.c 2011-01-04 19:50:19.000000000 -0500
17830 -+++ linux-2.6.37/arch/mips/alchemy/devboards/pm.c 2011-01-17 02:41:00.000000000 -0500
17831 +diff -urNp linux-2.6.37.1/arch/mips/alchemy/devboards/pm.c linux-2.6.37.1/arch/mips/alchemy/devboards/pm.c
17832 +--- linux-2.6.37.1/arch/mips/alchemy/devboards/pm.c 2011-01-04 19:50:19.000000000 -0500
17833 ++++ linux-2.6.37.1/arch/mips/alchemy/devboards/pm.c 2011-01-17 02:41:00.000000000 -0500
17834 @@ -110,7 +110,7 @@ static void db1x_pm_end(void)
17835
17836 }
17837 @@ -1484,9 +1484,9 @@ diff -urNp linux-2.6.37/arch/mips/alchemy/devboards/pm.c linux-2.6.37/arch/mips/
17838 .valid = suspend_valid_only_mem,
17839 .begin = db1x_pm_begin,
17840 .enter = db1x_pm_enter,
17841 -diff -urNp linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c
17842 ---- linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c 2011-01-04 19:50:19.000000000 -0500
17843 -+++ linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c 2011-01-17 02:41:00.000000000 -0500
17844 +diff -urNp linux-2.6.37.1/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.37.1/arch/mips/cavium-octeon/dma-octeon.c
17845 +--- linux-2.6.37.1/arch/mips/cavium-octeon/dma-octeon.c 2011-01-04 19:50:19.000000000 -0500
17846 ++++ linux-2.6.37.1/arch/mips/cavium-octeon/dma-octeon.c 2011-01-17 02:41:00.000000000 -0500
17847 @@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p
17848 }
17849
17850 @@ -1505,9 +1505,9 @@ diff -urNp linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.37/arch/m
17851
17852 void __init octeon_pci_dma_init(void)
17853 {
17854 -diff -urNp linux-2.6.37/arch/mips/include/asm/device.h linux-2.6.37/arch/mips/include/asm/device.h
17855 ---- linux-2.6.37/arch/mips/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
17856 -+++ linux-2.6.37/arch/mips/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
17857 +diff -urNp linux-2.6.37.1/arch/mips/include/asm/device.h linux-2.6.37.1/arch/mips/include/asm/device.h
17858 +--- linux-2.6.37.1/arch/mips/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
17859 ++++ linux-2.6.37.1/arch/mips/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
17860 @@ -10,7 +10,7 @@ struct dma_map_ops;
17861
17862 struct dev_archdata {
17863 @@ -1517,9 +1517,9 @@ diff -urNp linux-2.6.37/arch/mips/include/asm/device.h linux-2.6.37/arch/mips/in
17864 };
17865
17866 struct pdev_archdata {
17867 -diff -urNp linux-2.6.37/arch/mips/include/asm/dma-mapping.h linux-2.6.37/arch/mips/include/asm/dma-mapping.h
17868 ---- linux-2.6.37/arch/mips/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17869 -+++ linux-2.6.37/arch/mips/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17870 +diff -urNp linux-2.6.37.1/arch/mips/include/asm/dma-mapping.h linux-2.6.37.1/arch/mips/include/asm/dma-mapping.h
17871 +--- linux-2.6.37.1/arch/mips/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
17872 ++++ linux-2.6.37.1/arch/mips/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
17873 @@ -7,9 +7,9 @@
17874
17875 #include <dma-coherence.h>
17876 @@ -1566,9 +1566,9 @@ diff -urNp linux-2.6.37/arch/mips/include/asm/dma-mapping.h linux-2.6.37/arch/mi
17877
17878 ops->free_coherent(dev, size, vaddr, dma_handle);
17879
17880 -diff -urNp linux-2.6.37/arch/mips/include/asm/elf.h linux-2.6.37/arch/mips/include/asm/elf.h
17881 ---- linux-2.6.37/arch/mips/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17882 -+++ linux-2.6.37/arch/mips/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17883 +diff -urNp linux-2.6.37.1/arch/mips/include/asm/elf.h linux-2.6.37.1/arch/mips/include/asm/elf.h
17884 +--- linux-2.6.37.1/arch/mips/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
17885 ++++ linux-2.6.37.1/arch/mips/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
17886 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
17887 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
17888 #endif
17889 @@ -1590,9 +1590,9 @@ diff -urNp linux-2.6.37/arch/mips/include/asm/elf.h linux-2.6.37/arch/mips/inclu
17890 -#define arch_randomize_brk arch_randomize_brk
17891 -
17892 #endif /* _ASM_ELF_H */
17893 -diff -urNp linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
17894 ---- linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-04 19:50:19.000000000 -0500
17895 -+++ linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-17 02:41:00.000000000 -0500
17896 +diff -urNp linux-2.6.37.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.37.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
17897 +--- linux-2.6.37.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-04 19:50:19.000000000 -0500
17898 ++++ linux-2.6.37.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-01-17 02:41:00.000000000 -0500
17899 @@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de
17900 phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
17901
17902 @@ -1602,9 +1602,9 @@ diff -urNp linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
17903 extern char *octeon_swiotlb;
17904
17905 #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
17906 -diff -urNp linux-2.6.37/arch/mips/include/asm/page.h linux-2.6.37/arch/mips/include/asm/page.h
17907 ---- linux-2.6.37/arch/mips/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
17908 -+++ linux-2.6.37/arch/mips/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
17909 +diff -urNp linux-2.6.37.1/arch/mips/include/asm/page.h linux-2.6.37.1/arch/mips/include/asm/page.h
17910 +--- linux-2.6.37.1/arch/mips/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
17911 ++++ linux-2.6.37.1/arch/mips/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
17912 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
17913 #ifdef CONFIG_CPU_MIPS32
17914 typedef struct { unsigned long pte_low, pte_high; } pte_t;
17915 @@ -1614,9 +1614,9 @@ diff -urNp linux-2.6.37/arch/mips/include/asm/page.h linux-2.6.37/arch/mips/incl
17916 #else
17917 typedef struct { unsigned long long pte; } pte_t;
17918 #define pte_val(x) ((x).pte)
17919 -diff -urNp linux-2.6.37/arch/mips/include/asm/system.h linux-2.6.37/arch/mips/include/asm/system.h
17920 ---- linux-2.6.37/arch/mips/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
17921 -+++ linux-2.6.37/arch/mips/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
17922 +diff -urNp linux-2.6.37.1/arch/mips/include/asm/system.h linux-2.6.37.1/arch/mips/include/asm/system.h
17923 +--- linux-2.6.37.1/arch/mips/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
17924 ++++ linux-2.6.37.1/arch/mips/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
17925 @@ -23,6 +23,7 @@
17926 #include <asm/dsp.h>
17927 #include <asm/watch.h>
17928 @@ -1633,9 +1633,9 @@ diff -urNp linux-2.6.37/arch/mips/include/asm/system.h linux-2.6.37/arch/mips/in
17929 +#define arch_align_stack(x) ((x) & ALMASK)
17930
17931 #endif /* _ASM_SYSTEM_H */
17932 -diff -urNp linux-2.6.37/arch/mips/jz4740/pm.c linux-2.6.37/arch/mips/jz4740/pm.c
17933 ---- linux-2.6.37/arch/mips/jz4740/pm.c 2011-01-04 19:50:19.000000000 -0500
17934 -+++ linux-2.6.37/arch/mips/jz4740/pm.c 2011-01-17 02:41:00.000000000 -0500
17935 +diff -urNp linux-2.6.37.1/arch/mips/jz4740/pm.c linux-2.6.37.1/arch/mips/jz4740/pm.c
17936 +--- linux-2.6.37.1/arch/mips/jz4740/pm.c 2011-01-04 19:50:19.000000000 -0500
17937 ++++ linux-2.6.37.1/arch/mips/jz4740/pm.c 2011-01-17 02:41:00.000000000 -0500
17938 @@ -42,7 +42,7 @@ static int jz4740_pm_enter(suspend_state
17939 return 0;
17940 }
17941 @@ -1645,9 +1645,9 @@ diff -urNp linux-2.6.37/arch/mips/jz4740/pm.c linux-2.6.37/arch/mips/jz4740/pm.c
17942 .valid = suspend_valid_only_mem,
17943 .enter = jz4740_pm_enter,
17944 };
17945 -diff -urNp linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c
17946 ---- linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c 2011-01-04 19:50:19.000000000 -0500
17947 -+++ linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c 2011-01-17 02:41:00.000000000 -0500
17948 +diff -urNp linux-2.6.37.1/arch/mips/kernel/binfmt_elfn32.c linux-2.6.37.1/arch/mips/kernel/binfmt_elfn32.c
17949 +--- linux-2.6.37.1/arch/mips/kernel/binfmt_elfn32.c 2011-01-04 19:50:19.000000000 -0500
17950 ++++ linux-2.6.37.1/arch/mips/kernel/binfmt_elfn32.c 2011-01-17 02:41:00.000000000 -0500
17951 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
17952 #undef ELF_ET_DYN_BASE
17953 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
17954 @@ -1662,9 +1662,9 @@ diff -urNp linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c linux-2.6.37/arch/mips/
17955 #include <asm/processor.h>
17956 #include <linux/module.h>
17957 #include <linux/elfcore.h>
17958 -diff -urNp linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c
17959 ---- linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c 2011-01-04 19:50:19.000000000 -0500
17960 -+++ linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c 2011-01-17 02:41:00.000000000 -0500
17961 +diff -urNp linux-2.6.37.1/arch/mips/kernel/binfmt_elfo32.c linux-2.6.37.1/arch/mips/kernel/binfmt_elfo32.c
17962 +--- linux-2.6.37.1/arch/mips/kernel/binfmt_elfo32.c 2011-01-04 19:50:19.000000000 -0500
17963 ++++ linux-2.6.37.1/arch/mips/kernel/binfmt_elfo32.c 2011-01-17 02:41:00.000000000 -0500
17964 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
17965 #undef ELF_ET_DYN_BASE
17966 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
17967 @@ -1679,9 +1679,9 @@ diff -urNp linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c linux-2.6.37/arch/mips/
17968 #include <asm/processor.h>
17969
17970 /*
17971 -diff -urNp linux-2.6.37/arch/mips/kernel/kgdb.c linux-2.6.37/arch/mips/kernel/kgdb.c
17972 ---- linux-2.6.37/arch/mips/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17973 -+++ linux-2.6.37/arch/mips/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17974 +diff -urNp linux-2.6.37.1/arch/mips/kernel/kgdb.c linux-2.6.37.1/arch/mips/kernel/kgdb.c
17975 +--- linux-2.6.37.1/arch/mips/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
17976 ++++ linux-2.6.37.1/arch/mips/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
17977 @@ -351,6 +351,7 @@ int kgdb_arch_handle_exception(int vecto
17978 return -1;
17979 }
17980 @@ -1690,9 +1690,9 @@ diff -urNp linux-2.6.37/arch/mips/kernel/kgdb.c linux-2.6.37/arch/mips/kernel/kg
17981 struct kgdb_arch arch_kgdb_ops;
17982
17983 /*
17984 -diff -urNp linux-2.6.37/arch/mips/kernel/process.c linux-2.6.37/arch/mips/kernel/process.c
17985 ---- linux-2.6.37/arch/mips/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
17986 -+++ linux-2.6.37/arch/mips/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
17987 +diff -urNp linux-2.6.37.1/arch/mips/kernel/process.c linux-2.6.37.1/arch/mips/kernel/process.c
17988 +--- linux-2.6.37.1/arch/mips/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
17989 ++++ linux-2.6.37.1/arch/mips/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
17990 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
17991 out:
17992 return pc;
17993 @@ -1709,9 +1709,9 @@ diff -urNp linux-2.6.37/arch/mips/kernel/process.c linux-2.6.37/arch/mips/kernel
17994 -
17995 - return sp & ALMASK;
17996 -}
17997 -diff -urNp linux-2.6.37/arch/mips/kernel/syscall.c linux-2.6.37/arch/mips/kernel/syscall.c
17998 ---- linux-2.6.37/arch/mips/kernel/syscall.c 2011-01-04 19:50:19.000000000 -0500
17999 -+++ linux-2.6.37/arch/mips/kernel/syscall.c 2011-01-17 02:41:00.000000000 -0500
18000 +diff -urNp linux-2.6.37.1/arch/mips/kernel/syscall.c linux-2.6.37.1/arch/mips/kernel/syscall.c
18001 +--- linux-2.6.37.1/arch/mips/kernel/syscall.c 2011-01-04 19:50:19.000000000 -0500
18002 ++++ linux-2.6.37.1/arch/mips/kernel/syscall.c 2011-01-17 02:41:00.000000000 -0500
18003 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
18004 do_color_align = 0;
18005 if (filp || (flags & MAP_SHARED))
18006 @@ -1762,9 +1762,9 @@ diff -urNp linux-2.6.37/arch/mips/kernel/syscall.c linux-2.6.37/arch/mips/kernel
18007 SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
18008 unsigned long, prot, unsigned long, flags, unsigned long,
18009 fd, off_t, offset)
18010 -diff -urNp linux-2.6.37/arch/mips/loongson/common/pm.c linux-2.6.37/arch/mips/loongson/common/pm.c
18011 ---- linux-2.6.37/arch/mips/loongson/common/pm.c 2011-01-04 19:50:19.000000000 -0500
18012 -+++ linux-2.6.37/arch/mips/loongson/common/pm.c 2011-01-17 02:41:00.000000000 -0500
18013 +diff -urNp linux-2.6.37.1/arch/mips/loongson/common/pm.c linux-2.6.37.1/arch/mips/loongson/common/pm.c
18014 +--- linux-2.6.37.1/arch/mips/loongson/common/pm.c 2011-01-04 19:50:19.000000000 -0500
18015 ++++ linux-2.6.37.1/arch/mips/loongson/common/pm.c 2011-01-17 02:41:00.000000000 -0500
18016 @@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspe
18017 }
18018 }
18019 @@ -1774,9 +1774,9 @@ diff -urNp linux-2.6.37/arch/mips/loongson/common/pm.c linux-2.6.37/arch/mips/lo
18020 .valid = loongson_pm_valid_state,
18021 .enter = loongson_pm_enter,
18022 };
18023 -diff -urNp linux-2.6.37/arch/mips/mm/dma-default.c linux-2.6.37/arch/mips/mm/dma-default.c
18024 ---- linux-2.6.37/arch/mips/mm/dma-default.c 2011-01-04 19:50:19.000000000 -0500
18025 -+++ linux-2.6.37/arch/mips/mm/dma-default.c 2011-01-17 02:41:00.000000000 -0500
18026 +diff -urNp linux-2.6.37.1/arch/mips/mm/dma-default.c linux-2.6.37.1/arch/mips/mm/dma-default.c
18027 +--- linux-2.6.37.1/arch/mips/mm/dma-default.c 2011-01-04 19:50:19.000000000 -0500
18028 ++++ linux-2.6.37.1/arch/mips/mm/dma-default.c 2011-01-17 02:41:00.000000000 -0500
18029 @@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev,
18030
18031 EXPORT_SYMBOL(dma_cache_sync);
18032 @@ -1795,9 +1795,9 @@ diff -urNp linux-2.6.37/arch/mips/mm/dma-default.c linux-2.6.37/arch/mips/mm/dma
18033 EXPORT_SYMBOL(mips_dma_map_ops);
18034
18035 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
18036 -diff -urNp linux-2.6.37/arch/mips/mm/fault.c linux-2.6.37/arch/mips/mm/fault.c
18037 ---- linux-2.6.37/arch/mips/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18038 -+++ linux-2.6.37/arch/mips/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18039 +diff -urNp linux-2.6.37.1/arch/mips/mm/fault.c linux-2.6.37.1/arch/mips/mm/fault.c
18040 +--- linux-2.6.37.1/arch/mips/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18041 ++++ linux-2.6.37.1/arch/mips/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18042 @@ -28,6 +28,23 @@
18043 #include <asm/highmem.h> /* For VMALLOC_END */
18044 #include <linux/kdebug.h>
18045 @@ -1822,9 +1822,9 @@ diff -urNp linux-2.6.37/arch/mips/mm/fault.c linux-2.6.37/arch/mips/mm/fault.c
18046 /*
18047 * This routine handles page faults. It determines the address,
18048 * and the problem, and then passes it off to one of the appropriate
18049 -diff -urNp linux-2.6.37/arch/parisc/include/asm/elf.h linux-2.6.37/arch/parisc/include/asm/elf.h
18050 ---- linux-2.6.37/arch/parisc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18051 -+++ linux-2.6.37/arch/parisc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18052 +diff -urNp linux-2.6.37.1/arch/parisc/include/asm/elf.h linux-2.6.37.1/arch/parisc/include/asm/elf.h
18053 +--- linux-2.6.37.1/arch/parisc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18054 ++++ linux-2.6.37.1/arch/parisc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18055 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
18056
18057 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
18058 @@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.37/arch/parisc/include/asm/elf.h linux-2.6.37/arch/parisc/i
18059 /* This yields a mask that user programs can use to figure out what
18060 instruction set this CPU supports. This could be done in user space,
18061 but it's not easy, and we've already done it here. */
18062 -diff -urNp linux-2.6.37/arch/parisc/include/asm/pgtable.h linux-2.6.37/arch/parisc/include/asm/pgtable.h
18063 ---- linux-2.6.37/arch/parisc/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
18064 -+++ linux-2.6.37/arch/parisc/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
18065 +diff -urNp linux-2.6.37.1/arch/parisc/include/asm/pgtable.h linux-2.6.37.1/arch/parisc/include/asm/pgtable.h
18066 +--- linux-2.6.37.1/arch/parisc/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
18067 ++++ linux-2.6.37.1/arch/parisc/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
18068 @@ -207,6 +207,17 @@
18069 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
18070 #define PAGE_COPY PAGE_EXECREAD
18071 @@ -1860,9 +1860,9 @@ diff -urNp linux-2.6.37/arch/parisc/include/asm/pgtable.h linux-2.6.37/arch/pari
18072 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
18073 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
18074 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
18075 -diff -urNp linux-2.6.37/arch/parisc/kernel/module.c linux-2.6.37/arch/parisc/kernel/module.c
18076 ---- linux-2.6.37/arch/parisc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18077 -+++ linux-2.6.37/arch/parisc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18078 +diff -urNp linux-2.6.37.1/arch/parisc/kernel/module.c linux-2.6.37.1/arch/parisc/kernel/module.c
18079 +--- linux-2.6.37.1/arch/parisc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18080 ++++ linux-2.6.37.1/arch/parisc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18081 @@ -96,16 +96,38 @@
18082
18083 /* three functions to determine where in the module core
18084 @@ -1963,9 +1963,9 @@ diff -urNp linux-2.6.37/arch/parisc/kernel/module.c linux-2.6.37/arch/parisc/ker
18085
18086 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
18087 me->arch.unwind_section, table, end, gp);
18088 -diff -urNp linux-2.6.37/arch/parisc/kernel/sys_parisc.c linux-2.6.37/arch/parisc/kernel/sys_parisc.c
18089 ---- linux-2.6.37/arch/parisc/kernel/sys_parisc.c 2011-01-04 19:50:19.000000000 -0500
18090 -+++ linux-2.6.37/arch/parisc/kernel/sys_parisc.c 2011-01-17 02:41:00.000000000 -0500
18091 +diff -urNp linux-2.6.37.1/arch/parisc/kernel/sys_parisc.c linux-2.6.37.1/arch/parisc/kernel/sys_parisc.c
18092 +--- linux-2.6.37.1/arch/parisc/kernel/sys_parisc.c 2011-01-04 19:50:19.000000000 -0500
18093 ++++ linux-2.6.37.1/arch/parisc/kernel/sys_parisc.c 2011-01-17 02:41:00.000000000 -0500
18094 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
18095 /* At this point: (!vma || addr < vma->vm_end). */
18096 if (TASK_SIZE - len < addr)
18097 @@ -1993,9 +1993,9 @@ diff -urNp linux-2.6.37/arch/parisc/kernel/sys_parisc.c linux-2.6.37/arch/parisc
18098
18099 if (filp) {
18100 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
18101 -diff -urNp linux-2.6.37/arch/parisc/kernel/traps.c linux-2.6.37/arch/parisc/kernel/traps.c
18102 ---- linux-2.6.37/arch/parisc/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
18103 -+++ linux-2.6.37/arch/parisc/kernel/traps.c 2011-01-17 02:41:00.000000000 -0500
18104 +diff -urNp linux-2.6.37.1/arch/parisc/kernel/traps.c linux-2.6.37.1/arch/parisc/kernel/traps.c
18105 +--- linux-2.6.37.1/arch/parisc/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
18106 ++++ linux-2.6.37.1/arch/parisc/kernel/traps.c 2011-01-17 02:41:00.000000000 -0500
18107 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
18108
18109 down_read(&current->mm->mmap_sem);
18110 @@ -2007,9 +2007,9 @@ diff -urNp linux-2.6.37/arch/parisc/kernel/traps.c linux-2.6.37/arch/parisc/kern
18111 fault_address = regs->iaoq[0];
18112 fault_space = regs->iasq[0];
18113
18114 -diff -urNp linux-2.6.37/arch/parisc/mm/fault.c linux-2.6.37/arch/parisc/mm/fault.c
18115 ---- linux-2.6.37/arch/parisc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18116 -+++ linux-2.6.37/arch/parisc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18117 +diff -urNp linux-2.6.37.1/arch/parisc/mm/fault.c linux-2.6.37.1/arch/parisc/mm/fault.c
18118 +--- linux-2.6.37.1/arch/parisc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18119 ++++ linux-2.6.37.1/arch/parisc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18120 @@ -15,6 +15,7 @@
18121 #include <linux/sched.h>
18122 #include <linux/interrupt.h>
18123 @@ -2179,9 +2179,9 @@ diff -urNp linux-2.6.37/arch/parisc/mm/fault.c linux-2.6.37/arch/parisc/mm/fault
18124
18125 /*
18126 * If for any reason at all we couldn't handle the fault, make
18127 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/device.h linux-2.6.37/arch/powerpc/include/asm/device.h
18128 ---- linux-2.6.37/arch/powerpc/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18129 -+++ linux-2.6.37/arch/powerpc/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18130 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/device.h linux-2.6.37.1/arch/powerpc/include/asm/device.h
18131 +--- linux-2.6.37.1/arch/powerpc/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
18132 ++++ linux-2.6.37.1/arch/powerpc/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
18133 @@ -11,7 +11,7 @@ struct device_node;
18134
18135 struct dev_archdata {
18136 @@ -2191,9 +2191,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/device.h linux-2.6.37/arch/powe
18137
18138 /*
18139 * When an iommu is in use, dma_data is used as a ptr to the base of the
18140 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h
18141 ---- linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18142 -+++ linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18143 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.37.1/arch/powerpc/include/asm/dma-mapping.h
18144 +--- linux-2.6.37.1/arch/powerpc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18145 ++++ linux-2.6.37.1/arch/powerpc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18146 @@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
18147 /*
18148 * Available generic sets of operations
18149 @@ -2256,9 +2256,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h linux-2.6.37/arch
18150
18151 if (dma_ops->mapping_error)
18152 return dma_ops->mapping_error(dev, dma_addr);
18153 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/elf.h linux-2.6.37/arch/powerpc/include/asm/elf.h
18154 ---- linux-2.6.37/arch/powerpc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18155 -+++ linux-2.6.37/arch/powerpc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18156 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/elf.h linux-2.6.37.1/arch/powerpc/include/asm/elf.h
18157 +--- linux-2.6.37.1/arch/powerpc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18158 ++++ linux-2.6.37.1/arch/powerpc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18159 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
18160 the loader. We need to make sure that it is out of the way of the program
18161 that it will "exec", and that there is sufficient room for the brk. */
18162 @@ -2291,9 +2291,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/elf.h linux-2.6.37/arch/powerpc
18163 #endif /* __KERNEL__ */
18164
18165 /*
18166 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/iommu.h linux-2.6.37/arch/powerpc/include/asm/iommu.h
18167 ---- linux-2.6.37/arch/powerpc/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
18168 -+++ linux-2.6.37/arch/powerpc/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
18169 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/iommu.h linux-2.6.37.1/arch/powerpc/include/asm/iommu.h
18170 +--- linux-2.6.37.1/arch/powerpc/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
18171 ++++ linux-2.6.37.1/arch/powerpc/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
18172 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
18173 extern void iommu_init_early_dart(void);
18174 extern void iommu_init_early_pasemi(void);
18175 @@ -2304,9 +2304,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/iommu.h linux-2.6.37/arch/power
18176 #ifdef CONFIG_PCI
18177 extern void pci_iommu_init(void);
18178 extern void pci_direct_iommu_init(void);
18179 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/kmap_types.h linux-2.6.37/arch/powerpc/include/asm/kmap_types.h
18180 ---- linux-2.6.37/arch/powerpc/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
18181 -+++ linux-2.6.37/arch/powerpc/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
18182 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/kmap_types.h linux-2.6.37.1/arch/powerpc/include/asm/kmap_types.h
18183 +--- linux-2.6.37.1/arch/powerpc/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
18184 ++++ linux-2.6.37.1/arch/powerpc/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
18185 @@ -27,6 +27,7 @@ enum km_type {
18186 KM_PPC_SYNC_PAGE,
18187 KM_PPC_SYNC_ICACHE,
18188 @@ -2315,9 +2315,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/kmap_types.h linux-2.6.37/arch/
18189 KM_TYPE_NR
18190 };
18191
18192 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/page_64.h linux-2.6.37/arch/powerpc/include/asm/page_64.h
18193 ---- linux-2.6.37/arch/powerpc/include/asm/page_64.h 2011-01-04 19:50:19.000000000 -0500
18194 -+++ linux-2.6.37/arch/powerpc/include/asm/page_64.h 2011-01-17 02:41:00.000000000 -0500
18195 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/page_64.h linux-2.6.37.1/arch/powerpc/include/asm/page_64.h
18196 +--- linux-2.6.37.1/arch/powerpc/include/asm/page_64.h 2011-01-04 19:50:19.000000000 -0500
18197 ++++ linux-2.6.37.1/arch/powerpc/include/asm/page_64.h 2011-01-17 02:41:00.000000000 -0500
18198 @@ -172,15 +172,18 @@ do { \
18199 * stack by default, so in the absense of a PT_GNU_STACK program header
18200 * we turn execute permission off.
18201 @@ -2339,9 +2339,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/page_64.h linux-2.6.37/arch/pow
18202
18203 #include <asm-generic/getorder.h>
18204
18205 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/page.h linux-2.6.37/arch/powerpc/include/asm/page.h
18206 ---- linux-2.6.37/arch/powerpc/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
18207 -+++ linux-2.6.37/arch/powerpc/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
18208 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/page.h linux-2.6.37.1/arch/powerpc/include/asm/page.h
18209 +--- linux-2.6.37.1/arch/powerpc/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
18210 ++++ linux-2.6.37.1/arch/powerpc/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
18211 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
18212 * and needs to be executable. This means the whole heap ends
18213 * up being executable.
18214 @@ -2364,9 +2364,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/page.h linux-2.6.37/arch/powerp
18215 #ifndef __ASSEMBLY__
18216
18217 #undef STRICT_MM_TYPECHECKS
18218 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/pci.h linux-2.6.37/arch/powerpc/include/asm/pci.h
18219 ---- linux-2.6.37/arch/powerpc/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
18220 -+++ linux-2.6.37/arch/powerpc/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
18221 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/pci.h linux-2.6.37.1/arch/powerpc/include/asm/pci.h
18222 +--- linux-2.6.37.1/arch/powerpc/include/asm/pci.h 2011-01-04 19:50:19.000000000 -0500
18223 ++++ linux-2.6.37.1/arch/powerpc/include/asm/pci.h 2011-01-17 02:41:00.000000000 -0500
18224 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
18225 }
18226
18227 @@ -2378,9 +2378,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/pci.h linux-2.6.37/arch/powerpc
18228 #else /* CONFIG_PCI */
18229 #define set_pci_dma_ops(d)
18230 #define get_pci_dma_ops() NULL
18231 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h
18232 ---- linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h 2011-01-04 19:50:19.000000000 -0500
18233 -+++ linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h 2011-01-17 02:41:00.000000000 -0500
18234 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/pte-hash32.h linux-2.6.37.1/arch/powerpc/include/asm/pte-hash32.h
18235 +--- linux-2.6.37.1/arch/powerpc/include/asm/pte-hash32.h 2011-01-04 19:50:19.000000000 -0500
18236 ++++ linux-2.6.37.1/arch/powerpc/include/asm/pte-hash32.h 2011-01-17 02:41:00.000000000 -0500
18237 @@ -21,6 +21,7 @@
18238 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
18239 #define _PAGE_USER 0x004 /* usermode access allowed */
18240 @@ -2389,9 +2389,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h linux-2.6.37/arch/
18241 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
18242 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
18243 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
18244 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/reg.h linux-2.6.37/arch/powerpc/include/asm/reg.h
18245 ---- linux-2.6.37/arch/powerpc/include/asm/reg.h 2011-01-04 19:50:19.000000000 -0500
18246 -+++ linux-2.6.37/arch/powerpc/include/asm/reg.h 2011-01-17 02:41:00.000000000 -0500
18247 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/reg.h linux-2.6.37.1/arch/powerpc/include/asm/reg.h
18248 +--- linux-2.6.37.1/arch/powerpc/include/asm/reg.h 2011-01-04 19:50:19.000000000 -0500
18249 ++++ linux-2.6.37.1/arch/powerpc/include/asm/reg.h 2011-01-17 02:41:00.000000000 -0500
18250 @@ -191,6 +191,7 @@
18251 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
18252 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
18253 @@ -2400,9 +2400,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/reg.h linux-2.6.37/arch/powerpc
18254 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
18255 #define DSISR_ISSTORE 0x02000000 /* access was a store */
18256 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
18257 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/swiotlb.h linux-2.6.37/arch/powerpc/include/asm/swiotlb.h
18258 ---- linux-2.6.37/arch/powerpc/include/asm/swiotlb.h 2011-01-04 19:50:19.000000000 -0500
18259 -+++ linux-2.6.37/arch/powerpc/include/asm/swiotlb.h 2011-01-17 02:41:00.000000000 -0500
18260 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/swiotlb.h linux-2.6.37.1/arch/powerpc/include/asm/swiotlb.h
18261 +--- linux-2.6.37.1/arch/powerpc/include/asm/swiotlb.h 2011-01-04 19:50:19.000000000 -0500
18262 ++++ linux-2.6.37.1/arch/powerpc/include/asm/swiotlb.h 2011-01-17 02:41:00.000000000 -0500
18263 @@ -13,7 +13,7 @@
18264
18265 #include <linux/swiotlb.h>
18266 @@ -2412,9 +2412,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/swiotlb.h linux-2.6.37/arch/pow
18267
18268 static inline void dma_mark_clean(void *addr, size_t size) {}
18269
18270 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/system.h linux-2.6.37/arch/powerpc/include/asm/system.h
18271 ---- linux-2.6.37/arch/powerpc/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18272 -+++ linux-2.6.37/arch/powerpc/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18273 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/system.h linux-2.6.37.1/arch/powerpc/include/asm/system.h
18274 +--- linux-2.6.37.1/arch/powerpc/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18275 ++++ linux-2.6.37.1/arch/powerpc/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18276 @@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi
18277 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
18278 #endif
18279 @@ -2424,9 +2424,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/system.h linux-2.6.37/arch/powe
18280
18281 /* Used in very early kernel initialization. */
18282 extern unsigned long reloc_offset(void);
18283 -diff -urNp linux-2.6.37/arch/powerpc/include/asm/uaccess.h linux-2.6.37/arch/powerpc/include/asm/uaccess.h
18284 ---- linux-2.6.37/arch/powerpc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18285 -+++ linux-2.6.37/arch/powerpc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18286 +diff -urNp linux-2.6.37.1/arch/powerpc/include/asm/uaccess.h linux-2.6.37.1/arch/powerpc/include/asm/uaccess.h
18287 +--- linux-2.6.37.1/arch/powerpc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18288 ++++ linux-2.6.37.1/arch/powerpc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18289 @@ -13,6 +13,8 @@
18290 #define VERIFY_READ 0
18291 #define VERIFY_WRITE 1
18292 @@ -2604,9 +2604,9 @@ diff -urNp linux-2.6.37/arch/powerpc/include/asm/uaccess.h linux-2.6.37/arch/pow
18293 extern unsigned long __clear_user(void __user *addr, unsigned long size);
18294
18295 static inline unsigned long clear_user(void __user *addr, unsigned long size)
18296 -diff -urNp linux-2.6.37/arch/powerpc/kernel/dma.c linux-2.6.37/arch/powerpc/kernel/dma.c
18297 ---- linux-2.6.37/arch/powerpc/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
18298 -+++ linux-2.6.37/arch/powerpc/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
18299 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/dma.c linux-2.6.37.1/arch/powerpc/kernel/dma.c
18300 +--- linux-2.6.37.1/arch/powerpc/kernel/dma.c 2011-01-04 19:50:19.000000000 -0500
18301 ++++ linux-2.6.37.1/arch/powerpc/kernel/dma.c 2011-01-17 02:41:00.000000000 -0500
18302 @@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl
18303 }
18304 #endif
18305 @@ -2625,9 +2625,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/dma.c linux-2.6.37/arch/powerpc/kern
18306
18307 if (ppc_md.dma_set_mask)
18308 return ppc_md.dma_set_mask(dev, dma_mask);
18309 -diff -urNp linux-2.6.37/arch/powerpc/kernel/dma-iommu.c linux-2.6.37/arch/powerpc/kernel/dma-iommu.c
18310 ---- linux-2.6.37/arch/powerpc/kernel/dma-iommu.c 2011-01-04 19:50:19.000000000 -0500
18311 -+++ linux-2.6.37/arch/powerpc/kernel/dma-iommu.c 2011-01-17 02:41:00.000000000 -0500
18312 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/dma-iommu.c linux-2.6.37.1/arch/powerpc/kernel/dma-iommu.c
18313 +--- linux-2.6.37.1/arch/powerpc/kernel/dma-iommu.c 2011-01-04 19:50:19.000000000 -0500
18314 ++++ linux-2.6.37.1/arch/powerpc/kernel/dma-iommu.c 2011-01-17 02:41:00.000000000 -0500
18315 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
18316 }
18317
18318 @@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/dma-iommu.c linux-2.6.37/arch/powerp
18319 struct dma_map_ops dma_iommu_ops = {
18320 .alloc_coherent = dma_iommu_alloc_coherent,
18321 .free_coherent = dma_iommu_free_coherent,
18322 -diff -urNp linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c
18323 ---- linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
18324 -+++ linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
18325 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.37.1/arch/powerpc/kernel/dma-swiotlb.c
18326 +--- linux-2.6.37.1/arch/powerpc/kernel/dma-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
18327 ++++ linux-2.6.37.1/arch/powerpc/kernel/dma-swiotlb.c 2011-01-17 02:41:00.000000000 -0500
18328 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
18329 * map_page, and unmap_page on highmem, use normal dma_ops
18330 * for everything else.
18331 @@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.37/arch/powe
18332 .alloc_coherent = dma_direct_alloc_coherent,
18333 .free_coherent = dma_direct_free_coherent,
18334 .map_sg = swiotlb_map_sg_attrs,
18335 -diff -urNp linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S
18336 ---- linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S 2011-01-04 19:50:19.000000000 -0500
18337 -+++ linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S 2011-01-17 02:41:00.000000000 -0500
18338 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/exceptions-64e.S linux-2.6.37.1/arch/powerpc/kernel/exceptions-64e.S
18339 +--- linux-2.6.37.1/arch/powerpc/kernel/exceptions-64e.S 2011-01-04 19:50:19.000000000 -0500
18340 ++++ linux-2.6.37.1/arch/powerpc/kernel/exceptions-64e.S 2011-01-17 02:41:00.000000000 -0500
18341 @@ -495,6 +495,7 @@ storage_fault_common:
18342 std r14,_DAR(r1)
18343 std r15,_DSISR(r1)
18344 @@ -2678,9 +2678,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S linux-2.6.37/arch/p
18345 addi r3,r1,STACK_FRAME_OVERHEAD
18346 ld r4,_DAR(r1)
18347 bl .bad_page_fault
18348 -diff -urNp linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S
18349 ---- linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S 2011-01-04 19:50:19.000000000 -0500
18350 -+++ linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S 2011-01-17 02:41:00.000000000 -0500
18351 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/exceptions-64s.S linux-2.6.37.1/arch/powerpc/kernel/exceptions-64s.S
18352 +--- linux-2.6.37.1/arch/powerpc/kernel/exceptions-64s.S 2011-01-04 19:50:19.000000000 -0500
18353 ++++ linux-2.6.37.1/arch/powerpc/kernel/exceptions-64s.S 2011-01-17 02:41:00.000000000 -0500
18354 @@ -847,10 +847,10 @@ handle_page_fault:
18355 11: ld r4,_DAR(r1)
18356 ld r5,_DSISR(r1)
18357 @@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S linux-2.6.37/arch/p
18358 mr r5,r3
18359 addi r3,r1,STACK_FRAME_OVERHEAD
18360 lwz r4,_DAR(r1)
18361 -diff -urNp linux-2.6.37/arch/powerpc/kernel/ibmebus.c linux-2.6.37/arch/powerpc/kernel/ibmebus.c
18362 ---- linux-2.6.37/arch/powerpc/kernel/ibmebus.c 2011-01-04 19:50:19.000000000 -0500
18363 -+++ linux-2.6.37/arch/powerpc/kernel/ibmebus.c 2011-01-17 02:41:00.000000000 -0500
18364 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/ibmebus.c linux-2.6.37.1/arch/powerpc/kernel/ibmebus.c
18365 +--- linux-2.6.37.1/arch/powerpc/kernel/ibmebus.c 2011-01-04 19:50:19.000000000 -0500
18366 ++++ linux-2.6.37.1/arch/powerpc/kernel/ibmebus.c 2011-01-17 02:41:00.000000000 -0500
18367 @@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct
18368 return 1;
18369 }
18370 @@ -2705,9 +2705,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/ibmebus.c linux-2.6.37/arch/powerpc/
18371 .alloc_coherent = ibmebus_alloc_coherent,
18372 .free_coherent = ibmebus_free_coherent,
18373 .map_sg = ibmebus_map_sg,
18374 -diff -urNp linux-2.6.37/arch/powerpc/kernel/kgdb.c linux-2.6.37/arch/powerpc/kernel/kgdb.c
18375 ---- linux-2.6.37/arch/powerpc/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18376 -+++ linux-2.6.37/arch/powerpc/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18377 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/kgdb.c linux-2.6.37.1/arch/powerpc/kernel/kgdb.c
18378 +--- linux-2.6.37.1/arch/powerpc/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18379 ++++ linux-2.6.37.1/arch/powerpc/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18380 @@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto
18381 /*
18382 * Global data
18383 @@ -2717,9 +2717,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/kgdb.c linux-2.6.37/arch/powerpc/ker
18384 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
18385 };
18386
18387 -diff -urNp linux-2.6.37/arch/powerpc/kernel/module_32.c linux-2.6.37/arch/powerpc/kernel/module_32.c
18388 ---- linux-2.6.37/arch/powerpc/kernel/module_32.c 2011-01-04 19:50:19.000000000 -0500
18389 -+++ linux-2.6.37/arch/powerpc/kernel/module_32.c 2011-01-17 02:41:00.000000000 -0500
18390 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/module_32.c linux-2.6.37.1/arch/powerpc/kernel/module_32.c
18391 +--- linux-2.6.37.1/arch/powerpc/kernel/module_32.c 2011-01-04 19:50:19.000000000 -0500
18392 ++++ linux-2.6.37.1/arch/powerpc/kernel/module_32.c 2011-01-17 02:41:00.000000000 -0500
18393 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
18394 me->arch.core_plt_section = i;
18395 }
18396 @@ -2749,9 +2749,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/module_32.c linux-2.6.37/arch/powerp
18397
18398 /* Find this entry, or if that fails, the next avail. entry */
18399 while (entry->jump[0]) {
18400 -diff -urNp linux-2.6.37/arch/powerpc/kernel/module.c linux-2.6.37/arch/powerpc/kernel/module.c
18401 ---- linux-2.6.37/arch/powerpc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18402 -+++ linux-2.6.37/arch/powerpc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18403 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/module.c linux-2.6.37.1/arch/powerpc/kernel/module.c
18404 +--- linux-2.6.37.1/arch/powerpc/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18405 ++++ linux-2.6.37.1/arch/powerpc/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18406 @@ -31,11 +31,24 @@
18407
18408 LIST_HEAD(module_bug_list);
18409 @@ -2791,9 +2791,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/module.c linux-2.6.37/arch/powerpc/k
18410 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
18411 const Elf_Shdr *sechdrs,
18412 const char *name)
18413 -diff -urNp linux-2.6.37/arch/powerpc/kernel/pci-common.c linux-2.6.37/arch/powerpc/kernel/pci-common.c
18414 ---- linux-2.6.37/arch/powerpc/kernel/pci-common.c 2011-01-04 19:50:19.000000000 -0500
18415 -+++ linux-2.6.37/arch/powerpc/kernel/pci-common.c 2011-01-17 02:41:00.000000000 -0500
18416 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/pci-common.c linux-2.6.37.1/arch/powerpc/kernel/pci-common.c
18417 +--- linux-2.6.37.1/arch/powerpc/kernel/pci-common.c 2011-01-04 19:50:19.000000000 -0500
18418 ++++ linux-2.6.37.1/arch/powerpc/kernel/pci-common.c 2011-01-17 02:41:00.000000000 -0500
18419 @@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
18420 unsigned int ppc_pci_flags = 0;
18421
18422 @@ -2812,9 +2812,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/pci-common.c linux-2.6.37/arch/power
18423 {
18424 return pci_dma_ops;
18425 }
18426 -diff -urNp linux-2.6.37/arch/powerpc/kernel/process.c linux-2.6.37/arch/powerpc/kernel/process.c
18427 ---- linux-2.6.37/arch/powerpc/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18428 -+++ linux-2.6.37/arch/powerpc/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18429 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/process.c linux-2.6.37.1/arch/powerpc/kernel/process.c
18430 +--- linux-2.6.37.1/arch/powerpc/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18431 ++++ linux-2.6.37.1/arch/powerpc/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18432 @@ -653,8 +653,8 @@ void show_regs(struct pt_regs * regs)
18433 * Lookup NIP late so we have the best change of getting the
18434 * above info out without failing
18435 @@ -2907,9 +2907,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/process.c linux-2.6.37/arch/powerpc/
18436 -
18437 - return ret;
18438 -}
18439 -diff -urNp linux-2.6.37/arch/powerpc/kernel/signal_32.c linux-2.6.37/arch/powerpc/kernel/signal_32.c
18440 ---- linux-2.6.37/arch/powerpc/kernel/signal_32.c 2011-01-04 19:50:19.000000000 -0500
18441 -+++ linux-2.6.37/arch/powerpc/kernel/signal_32.c 2011-01-17 02:41:00.000000000 -0500
18442 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/signal_32.c linux-2.6.37.1/arch/powerpc/kernel/signal_32.c
18443 +--- linux-2.6.37.1/arch/powerpc/kernel/signal_32.c 2011-01-04 19:50:19.000000000 -0500
18444 ++++ linux-2.6.37.1/arch/powerpc/kernel/signal_32.c 2011-01-17 02:41:00.000000000 -0500
18445 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig
18446 /* Save user registers on the stack */
18447 frame = &rt_sf->uc.uc_mcontext;
18448 @@ -2919,9 +2919,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/signal_32.c linux-2.6.37/arch/powerp
18449 if (save_user_regs(regs, frame, 0, 1))
18450 goto badframe;
18451 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
18452 -diff -urNp linux-2.6.37/arch/powerpc/kernel/signal_64.c linux-2.6.37/arch/powerpc/kernel/signal_64.c
18453 ---- linux-2.6.37/arch/powerpc/kernel/signal_64.c 2011-01-04 19:50:19.000000000 -0500
18454 -+++ linux-2.6.37/arch/powerpc/kernel/signal_64.c 2011-01-17 02:41:00.000000000 -0500
18455 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/signal_64.c linux-2.6.37.1/arch/powerpc/kernel/signal_64.c
18456 +--- linux-2.6.37.1/arch/powerpc/kernel/signal_64.c 2011-01-04 19:50:19.000000000 -0500
18457 ++++ linux-2.6.37.1/arch/powerpc/kernel/signal_64.c 2011-01-17 02:41:00.000000000 -0500
18458 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
18459 current->thread.fpscr.val = 0;
18460
18461 @@ -2931,9 +2931,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/signal_64.c linux-2.6.37/arch/powerp
18462 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
18463 } else {
18464 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
18465 -diff -urNp linux-2.6.37/arch/powerpc/kernel/vdso.c linux-2.6.37/arch/powerpc/kernel/vdso.c
18466 ---- linux-2.6.37/arch/powerpc/kernel/vdso.c 2011-01-04 19:50:19.000000000 -0500
18467 -+++ linux-2.6.37/arch/powerpc/kernel/vdso.c 2011-01-17 02:41:00.000000000 -0500
18468 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/vdso.c linux-2.6.37.1/arch/powerpc/kernel/vdso.c
18469 +--- linux-2.6.37.1/arch/powerpc/kernel/vdso.c 2011-01-04 19:50:19.000000000 -0500
18470 ++++ linux-2.6.37.1/arch/powerpc/kernel/vdso.c 2011-01-17 02:41:00.000000000 -0500
18471 @@ -36,6 +36,7 @@
18472 #include <asm/firmware.h>
18473 #include <asm/vdso.h>
18474 @@ -2960,9 +2960,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/vdso.c linux-2.6.37/arch/powerpc/ker
18475 if (IS_ERR_VALUE(vdso_base)) {
18476 rc = vdso_base;
18477 goto fail_mmapsem;
18478 -diff -urNp linux-2.6.37/arch/powerpc/kernel/vio.c linux-2.6.37/arch/powerpc/kernel/vio.c
18479 ---- linux-2.6.37/arch/powerpc/kernel/vio.c 2011-01-04 19:50:19.000000000 -0500
18480 -+++ linux-2.6.37/arch/powerpc/kernel/vio.c 2011-01-17 02:41:00.000000000 -0500
18481 +diff -urNp linux-2.6.37.1/arch/powerpc/kernel/vio.c linux-2.6.37.1/arch/powerpc/kernel/vio.c
18482 +--- linux-2.6.37.1/arch/powerpc/kernel/vio.c 2011-01-04 19:50:19.000000000 -0500
18483 ++++ linux-2.6.37.1/arch/powerpc/kernel/vio.c 2011-01-17 02:41:00.000000000 -0500
18484 @@ -600,11 +600,12 @@ static void vio_dma_iommu_unmap_sg(struc
18485 vio_cmo_dealloc(viodev, alloc_size);
18486 }
18487 @@ -2985,9 +2985,9 @@ diff -urNp linux-2.6.37/arch/powerpc/kernel/vio.c linux-2.6.37/arch/powerpc/kern
18488 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
18489 }
18490
18491 -diff -urNp linux-2.6.37/arch/powerpc/lib/usercopy_64.c linux-2.6.37/arch/powerpc/lib/usercopy_64.c
18492 ---- linux-2.6.37/arch/powerpc/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
18493 -+++ linux-2.6.37/arch/powerpc/lib/usercopy_64.c 2011-01-17 02:41:00.000000000 -0500
18494 +diff -urNp linux-2.6.37.1/arch/powerpc/lib/usercopy_64.c linux-2.6.37.1/arch/powerpc/lib/usercopy_64.c
18495 +--- linux-2.6.37.1/arch/powerpc/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
18496 ++++ linux-2.6.37.1/arch/powerpc/lib/usercopy_64.c 2011-01-17 02:41:00.000000000 -0500
18497 @@ -9,22 +9,6 @@
18498 #include <linux/module.h>
18499 #include <asm/uaccess.h>
18500 @@ -3019,9 +3019,9 @@ diff -urNp linux-2.6.37/arch/powerpc/lib/usercopy_64.c linux-2.6.37/arch/powerpc
18501 -EXPORT_SYMBOL(copy_to_user);
18502 EXPORT_SYMBOL(copy_in_user);
18503
18504 -diff -urNp linux-2.6.37/arch/powerpc/mm/fault.c linux-2.6.37/arch/powerpc/mm/fault.c
18505 ---- linux-2.6.37/arch/powerpc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18506 -+++ linux-2.6.37/arch/powerpc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18507 +diff -urNp linux-2.6.37.1/arch/powerpc/mm/fault.c linux-2.6.37.1/arch/powerpc/mm/fault.c
18508 +--- linux-2.6.37.1/arch/powerpc/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
18509 ++++ linux-2.6.37.1/arch/powerpc/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
18510 @@ -31,6 +31,10 @@
18511 #include <linux/kdebug.h>
18512 #include <linux/perf_event.h>
18513 @@ -3126,9 +3126,9 @@ diff -urNp linux-2.6.37/arch/powerpc/mm/fault.c linux-2.6.37/arch/powerpc/mm/fau
18514 _exception(SIGSEGV, regs, code, address);
18515 return 0;
18516 }
18517 -diff -urNp linux-2.6.37/arch/powerpc/mm/mmap_64.c linux-2.6.37/arch/powerpc/mm/mmap_64.c
18518 ---- linux-2.6.37/arch/powerpc/mm/mmap_64.c 2011-01-04 19:50:19.000000000 -0500
18519 -+++ linux-2.6.37/arch/powerpc/mm/mmap_64.c 2011-01-17 02:41:00.000000000 -0500
18520 +diff -urNp linux-2.6.37.1/arch/powerpc/mm/mmap_64.c linux-2.6.37.1/arch/powerpc/mm/mmap_64.c
18521 +--- linux-2.6.37.1/arch/powerpc/mm/mmap_64.c 2011-01-04 19:50:19.000000000 -0500
18522 ++++ linux-2.6.37.1/arch/powerpc/mm/mmap_64.c 2011-01-17 02:41:00.000000000 -0500
18523 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
18524 */
18525 if (mmap_is_legacy()) {
18526 @@ -3152,9 +3152,9 @@ diff -urNp linux-2.6.37/arch/powerpc/mm/mmap_64.c linux-2.6.37/arch/powerpc/mm/m
18527 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
18528 mm->unmap_area = arch_unmap_area_topdown;
18529 }
18530 -diff -urNp linux-2.6.37/arch/powerpc/mm/slice.c linux-2.6.37/arch/powerpc/mm/slice.c
18531 ---- linux-2.6.37/arch/powerpc/mm/slice.c 2011-01-04 19:50:19.000000000 -0500
18532 -+++ linux-2.6.37/arch/powerpc/mm/slice.c 2011-01-17 02:41:00.000000000 -0500
18533 +diff -urNp linux-2.6.37.1/arch/powerpc/mm/slice.c linux-2.6.37.1/arch/powerpc/mm/slice.c
18534 +--- linux-2.6.37.1/arch/powerpc/mm/slice.c 2011-01-04 19:50:19.000000000 -0500
18535 ++++ linux-2.6.37.1/arch/powerpc/mm/slice.c 2011-01-17 02:41:00.000000000 -0500
18536 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
18537 if ((mm->task_size - len) < addr)
18538 return 0;
18539 @@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.37/arch/powerpc/mm/slice.c linux-2.6.37/arch/powerpc/mm/sli
18540 /* If hint, make sure it matches our alignment restrictions */
18541 if (!fixed && addr) {
18542 addr = _ALIGN_UP(addr, 1ul << pshift);
18543 -diff -urNp linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c
18544 ---- linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-04 19:50:19.000000000 -0500
18545 -+++ linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-17 02:41:00.000000000 -0500
18546 +diff -urNp linux-2.6.37.1/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.37.1/arch/powerpc/platforms/52xx/lite5200_pm.c
18547 +--- linux-2.6.37.1/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-04 19:50:19.000000000 -0500
18548 ++++ linux-2.6.37.1/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-01-17 02:41:00.000000000 -0500
18549 @@ -232,7 +232,7 @@ static void lite5200_pm_end(void)
18550 lite5200_pm_target_state = PM_SUSPEND_ON;
18551 }
18552 @@ -3206,9 +3206,9 @@ diff -urNp linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.37/a
18553 .valid = lite5200_pm_valid,
18554 .begin = lite5200_pm_begin,
18555 .prepare = lite5200_pm_prepare,
18556 -diff -urNp linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c
18557 ---- linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-04 19:50:19.000000000 -0500
18558 -+++ linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-17 02:41:00.000000000 -0500
18559 +diff -urNp linux-2.6.37.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.37.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c
18560 +--- linux-2.6.37.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-04 19:50:19.000000000 -0500
18561 ++++ linux-2.6.37.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-01-17 02:41:00.000000000 -0500
18562 @@ -186,7 +186,7 @@ void mpc52xx_pm_finish(void)
18563 iounmap(mbar);
18564 }
18565 @@ -3218,9 +3218,9 @@ diff -urNp linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.37/ar
18566 .valid = mpc52xx_pm_valid,
18567 .prepare = mpc52xx_pm_prepare,
18568 .enter = mpc52xx_pm_enter,
18569 -diff -urNp linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c
18570 ---- linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c 2011-01-04 19:50:19.000000000 -0500
18571 -+++ linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c 2011-01-17 02:41:00.000000000 -0500
18572 +diff -urNp linux-2.6.37.1/arch/powerpc/platforms/83xx/suspend.c linux-2.6.37.1/arch/powerpc/platforms/83xx/suspend.c
18573 +--- linux-2.6.37.1/arch/powerpc/platforms/83xx/suspend.c 2011-01-04 19:50:19.000000000 -0500
18574 ++++ linux-2.6.37.1/arch/powerpc/platforms/83xx/suspend.c 2011-01-17 02:41:00.000000000 -0500
18575 @@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
18576 return ret;
18577 }
18578 @@ -3230,9 +3230,9 @@ diff -urNp linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c linux-2.6.37/arch/
18579 .valid = mpc83xx_suspend_valid,
18580 .begin = mpc83xx_suspend_begin,
18581 .enter = mpc83xx_suspend_enter,
18582 -diff -urNp linux-2.6.37/arch/powerpc/platforms/cell/iommu.c linux-2.6.37/arch/powerpc/platforms/cell/iommu.c
18583 ---- linux-2.6.37/arch/powerpc/platforms/cell/iommu.c 2011-01-04 19:50:19.000000000 -0500
18584 -+++ linux-2.6.37/arch/powerpc/platforms/cell/iommu.c 2011-01-17 02:41:00.000000000 -0500
18585 +diff -urNp linux-2.6.37.1/arch/powerpc/platforms/cell/iommu.c linux-2.6.37.1/arch/powerpc/platforms/cell/iommu.c
18586 +--- linux-2.6.37.1/arch/powerpc/platforms/cell/iommu.c 2011-01-04 19:50:19.000000000 -0500
18587 ++++ linux-2.6.37.1/arch/powerpc/platforms/cell/iommu.c 2011-01-17 02:41:00.000000000 -0500
18588 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
18589
18590 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
18591 @@ -3242,9 +3242,9 @@ diff -urNp linux-2.6.37/arch/powerpc/platforms/cell/iommu.c linux-2.6.37/arch/po
18592 .alloc_coherent = dma_fixed_alloc_coherent,
18593 .free_coherent = dma_fixed_free_coherent,
18594 .map_sg = dma_fixed_map_sg,
18595 -diff -urNp linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c
18596 ---- linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c 2011-01-04 19:50:19.000000000 -0500
18597 -+++ linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c 2011-01-17 02:41:00.000000000 -0500
18598 +diff -urNp linux-2.6.37.1/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.37.1/arch/powerpc/platforms/ps3/system-bus.c
18599 +--- linux-2.6.37.1/arch/powerpc/platforms/ps3/system-bus.c 2011-01-04 19:50:19.000000000 -0500
18600 ++++ linux-2.6.37.1/arch/powerpc/platforms/ps3/system-bus.c 2011-01-17 02:41:00.000000000 -0500
18601 @@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi
18602 return mask >= DMA_BIT_MASK(32);
18603 }
18604 @@ -3263,9 +3263,9 @@ diff -urNp linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.37/arc
18605 .alloc_coherent = ps3_alloc_coherent,
18606 .free_coherent = ps3_free_coherent,
18607 .map_sg = ps3_ioc0_map_sg,
18608 -diff -urNp linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c
18609 ---- linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c 2011-01-04 19:50:19.000000000 -0500
18610 -+++ linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c 2011-01-17 02:41:00.000000000 -0500
18611 +diff -urNp linux-2.6.37.1/arch/powerpc/platforms/pseries/suspend.c linux-2.6.37.1/arch/powerpc/platforms/pseries/suspend.c
18612 +--- linux-2.6.37.1/arch/powerpc/platforms/pseries/suspend.c 2011-01-04 19:50:19.000000000 -0500
18613 ++++ linux-2.6.37.1/arch/powerpc/platforms/pseries/suspend.c 2011-01-17 02:41:00.000000000 -0500
18614 @@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysde
18615 .name = "power",
18616 };
18617 @@ -3275,9 +3275,9 @@ diff -urNp linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c linux-2.6.37/ar
18618 .valid = suspend_valid_only_mem,
18619 .begin = pseries_suspend_begin,
18620 .prepare_late = pseries_prepare_late,
18621 -diff -urNp linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c
18622 ---- linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c 2011-01-04 19:50:19.000000000 -0500
18623 -+++ linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c 2011-01-17 02:41:00.000000000 -0500
18624 +diff -urNp linux-2.6.37.1/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.37.1/arch/powerpc/sysdev/fsl_pmc.c
18625 +--- linux-2.6.37.1/arch/powerpc/sysdev/fsl_pmc.c 2011-01-04 19:50:19.000000000 -0500
18626 ++++ linux-2.6.37.1/arch/powerpc/sysdev/fsl_pmc.c 2011-01-17 02:41:00.000000000 -0500
18627 @@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_sta
18628 return 1;
18629 }
18630 @@ -3287,9 +3287,9 @@ diff -urNp linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.37/arch/powerpc/
18631 .valid = pmc_suspend_valid,
18632 .enter = pmc_suspend_enter,
18633 };
18634 -diff -urNp linux-2.6.37/arch/s390/include/asm/elf.h linux-2.6.37/arch/s390/include/asm/elf.h
18635 ---- linux-2.6.37/arch/s390/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18636 -+++ linux-2.6.37/arch/s390/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18637 +diff -urNp linux-2.6.37.1/arch/s390/include/asm/elf.h linux-2.6.37.1/arch/s390/include/asm/elf.h
18638 +--- linux-2.6.37.1/arch/s390/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
18639 ++++ linux-2.6.37.1/arch/s390/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
18640 @@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
18641 that it will "exec", and that there is sufficient room for the brk. */
18642 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
18643 @@ -3304,9 +3304,24 @@ diff -urNp linux-2.6.37/arch/s390/include/asm/elf.h linux-2.6.37/arch/s390/inclu
18644 /* This yields a mask that user programs can use to figure out what
18645 instruction set this CPU supports. */
18646
18647 -diff -urNp linux-2.6.37/arch/s390/include/asm/uaccess.h linux-2.6.37/arch/s390/include/asm/uaccess.h
18648 ---- linux-2.6.37/arch/s390/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18649 -+++ linux-2.6.37/arch/s390/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18650 +diff -urNp linux-2.6.37.1/arch/s390/include/asm/processor.h linux-2.6.37.1/arch/s390/include/asm/processor.h
18651 +--- linux-2.6.37.1/arch/s390/include/asm/processor.h 2011-01-04 19:50:19.000000000 -0500
18652 ++++ linux-2.6.37.1/arch/s390/include/asm/processor.h 2011-02-22 16:35:05.000000000 -0500
18653 +@@ -148,11 +148,6 @@ extern int kernel_thread(int (*fn)(void
18654 + */
18655 + extern unsigned long thread_saved_pc(struct task_struct *t);
18656 +
18657 +-/*
18658 +- * Print register of task into buffer. Used in fs/proc/array.c.
18659 +- */
18660 +-extern void task_show_regs(struct seq_file *m, struct task_struct *task);
18661 +-
18662 + extern void show_code(struct pt_regs *regs);
18663 +
18664 + unsigned long get_wchan(struct task_struct *p);
18665 +diff -urNp linux-2.6.37.1/arch/s390/include/asm/uaccess.h linux-2.6.37.1/arch/s390/include/asm/uaccess.h
18666 +--- linux-2.6.37.1/arch/s390/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
18667 ++++ linux-2.6.37.1/arch/s390/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
18668 @@ -234,6 +234,10 @@ static inline unsigned long __must_check
18669 copy_to_user(void __user *to, const void *from, unsigned long n)
18670 {
18671 @@ -3339,9 +3354,9 @@ diff -urNp linux-2.6.37/arch/s390/include/asm/uaccess.h linux-2.6.37/arch/s390/i
18672 if (unlikely(sz != -1 && sz < n)) {
18673 copy_from_user_overflow();
18674 return n;
18675 -diff -urNp linux-2.6.37/arch/s390/Kconfig linux-2.6.37/arch/s390/Kconfig
18676 ---- linux-2.6.37/arch/s390/Kconfig 2011-01-04 19:50:19.000000000 -0500
18677 -+++ linux-2.6.37/arch/s390/Kconfig 2011-01-17 02:41:00.000000000 -0500
18678 +diff -urNp linux-2.6.37.1/arch/s390/Kconfig linux-2.6.37.1/arch/s390/Kconfig
18679 +--- linux-2.6.37.1/arch/s390/Kconfig 2011-01-04 19:50:19.000000000 -0500
18680 ++++ linux-2.6.37.1/arch/s390/Kconfig 2011-01-17 02:41:00.000000000 -0500
18681 @@ -242,13 +242,12 @@ config AUDIT_ARCH
18682
18683 config S390_EXEC_PROTECT
18684 @@ -3360,9 +3375,9 @@ diff -urNp linux-2.6.37/arch/s390/Kconfig linux-2.6.37/arch/s390/Kconfig
18685
18686 comment "Code generation options"
18687
18688 -diff -urNp linux-2.6.37/arch/s390/kernel/module.c linux-2.6.37/arch/s390/kernel/module.c
18689 ---- linux-2.6.37/arch/s390/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18690 -+++ linux-2.6.37/arch/s390/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18691 +diff -urNp linux-2.6.37.1/arch/s390/kernel/module.c linux-2.6.37.1/arch/s390/kernel/module.c
18692 +--- linux-2.6.37.1/arch/s390/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
18693 ++++ linux-2.6.37.1/arch/s390/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
18694 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
18695
18696 /* Increase core size by size of got & plt and set start
18697 @@ -3434,9 +3449,9 @@ diff -urNp linux-2.6.37/arch/s390/kernel/module.c linux-2.6.37/arch/s390/kernel/
18698 rela->r_addend - loc;
18699 if (r_type == R_390_GOTPC)
18700 *(unsigned int *) loc = val;
18701 -diff -urNp linux-2.6.37/arch/s390/kernel/setup.c linux-2.6.37/arch/s390/kernel/setup.c
18702 ---- linux-2.6.37/arch/s390/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
18703 -+++ linux-2.6.37/arch/s390/kernel/setup.c 2011-01-17 02:41:00.000000000 -0500
18704 +diff -urNp linux-2.6.37.1/arch/s390/kernel/setup.c linux-2.6.37.1/arch/s390/kernel/setup.c
18705 +--- linux-2.6.37.1/arch/s390/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
18706 ++++ linux-2.6.37.1/arch/s390/kernel/setup.c 2011-01-17 02:41:00.000000000 -0500
18707 @@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
18708 }
18709 early_param("mem", early_parse_mem);
18710 @@ -3485,9 +3500,56 @@ diff -urNp linux-2.6.37/arch/s390/kernel/setup.c linux-2.6.37/arch/s390/kernel/s
18711 static void setup_addressing_mode(void)
18712 {
18713 if (user_mode == SECONDARY_SPACE_MODE) {
18714 -diff -urNp linux-2.6.37/arch/s390/mm/maccess.c linux-2.6.37/arch/s390/mm/maccess.c
18715 ---- linux-2.6.37/arch/s390/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
18716 -+++ linux-2.6.37/arch/s390/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
18717 +diff -urNp linux-2.6.37.1/arch/s390/kernel/traps.c linux-2.6.37.1/arch/s390/kernel/traps.c
18718 +--- linux-2.6.37.1/arch/s390/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
18719 ++++ linux-2.6.37.1/arch/s390/kernel/traps.c 2011-02-22 16:34:54.000000000 -0500
18720 +@@ -237,43 +237,6 @@ void show_regs(struct pt_regs *regs)
18721 + show_last_breaking_event(regs);
18722 + }
18723 +
18724 +-/* This is called from fs/proc/array.c */
18725 +-void task_show_regs(struct seq_file *m, struct task_struct *task)
18726 +-{
18727 +- struct pt_regs *regs;
18728 +-
18729 +- regs = task_pt_regs(task);
18730 +- seq_printf(m, "task: %p, ksp: %p\n",
18731 +- task, (void *)task->thread.ksp);
18732 +- seq_printf(m, "User PSW : %p %p\n",
18733 +- (void *) regs->psw.mask, (void *)regs->psw.addr);
18734 +-
18735 +- seq_printf(m, "User GPRS: " FOURLONG,
18736 +- regs->gprs[0], regs->gprs[1],
18737 +- regs->gprs[2], regs->gprs[3]);
18738 +- seq_printf(m, " " FOURLONG,
18739 +- regs->gprs[4], regs->gprs[5],
18740 +- regs->gprs[6], regs->gprs[7]);
18741 +- seq_printf(m, " " FOURLONG,
18742 +- regs->gprs[8], regs->gprs[9],
18743 +- regs->gprs[10], regs->gprs[11]);
18744 +- seq_printf(m, " " FOURLONG,
18745 +- regs->gprs[12], regs->gprs[13],
18746 +- regs->gprs[14], regs->gprs[15]);
18747 +- seq_printf(m, "User ACRS: %08x %08x %08x %08x\n",
18748 +- task->thread.acrs[0], task->thread.acrs[1],
18749 +- task->thread.acrs[2], task->thread.acrs[3]);
18750 +- seq_printf(m, " %08x %08x %08x %08x\n",
18751 +- task->thread.acrs[4], task->thread.acrs[5],
18752 +- task->thread.acrs[6], task->thread.acrs[7]);
18753 +- seq_printf(m, " %08x %08x %08x %08x\n",
18754 +- task->thread.acrs[8], task->thread.acrs[9],
18755 +- task->thread.acrs[10], task->thread.acrs[11]);
18756 +- seq_printf(m, " %08x %08x %08x %08x\n",
18757 +- task->thread.acrs[12], task->thread.acrs[13],
18758 +- task->thread.acrs[14], task->thread.acrs[15]);
18759 +-}
18760 +-
18761 + static DEFINE_SPINLOCK(die_lock);
18762 +
18763 + void die(const char * str, struct pt_regs * regs, long err)
18764 +diff -urNp linux-2.6.37.1/arch/s390/mm/maccess.c linux-2.6.37.1/arch/s390/mm/maccess.c
18765 +--- linux-2.6.37.1/arch/s390/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
18766 ++++ linux-2.6.37.1/arch/s390/mm/maccess.c 2011-01-17 02:41:00.000000000 -0500
18767 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void
18768 return rc ? rc : count;
18769 }
18770 @@ -3497,9 +3559,9 @@ diff -urNp linux-2.6.37/arch/s390/mm/maccess.c linux-2.6.37/arch/s390/mm/maccess
18771 {
18772 long copied = 0;
18773
18774 -diff -urNp linux-2.6.37/arch/s390/mm/mmap.c linux-2.6.37/arch/s390/mm/mmap.c
18775 ---- linux-2.6.37/arch/s390/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
18776 -+++ linux-2.6.37/arch/s390/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
18777 +diff -urNp linux-2.6.37.1/arch/s390/mm/mmap.c linux-2.6.37.1/arch/s390/mm/mmap.c
18778 +--- linux-2.6.37.1/arch/s390/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
18779 ++++ linux-2.6.37.1/arch/s390/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
18780 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
18781 */
18782 if (mmap_is_legacy()) {
18783 @@ -3546,9 +3608,9 @@ diff -urNp linux-2.6.37/arch/s390/mm/mmap.c linux-2.6.37/arch/s390/mm/mmap.c
18784 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
18785 mm->unmap_area = arch_unmap_area_topdown;
18786 }
18787 -diff -urNp linux-2.6.37/arch/score/include/asm/system.h linux-2.6.37/arch/score/include/asm/system.h
18788 ---- linux-2.6.37/arch/score/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18789 -+++ linux-2.6.37/arch/score/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18790 +diff -urNp linux-2.6.37.1/arch/score/include/asm/system.h linux-2.6.37.1/arch/score/include/asm/system.h
18791 +--- linux-2.6.37.1/arch/score/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
18792 ++++ linux-2.6.37.1/arch/score/include/asm/system.h 2011-01-17 02:41:00.000000000 -0500
18793 @@ -17,7 +17,7 @@ do { \
18794 #define finish_arch_switch(prev) do {} while (0)
18795
18796 @@ -3558,9 +3620,9 @@ diff -urNp linux-2.6.37/arch/score/include/asm/system.h linux-2.6.37/arch/score/
18797
18798 #define mb() barrier()
18799 #define rmb() barrier()
18800 -diff -urNp linux-2.6.37/arch/score/kernel/process.c linux-2.6.37/arch/score/kernel/process.c
18801 ---- linux-2.6.37/arch/score/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18802 -+++ linux-2.6.37/arch/score/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18803 +diff -urNp linux-2.6.37.1/arch/score/kernel/process.c linux-2.6.37.1/arch/score/kernel/process.c
18804 +--- linux-2.6.37.1/arch/score/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
18805 ++++ linux-2.6.37.1/arch/score/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
18806 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
18807
18808 return task_pt_regs(task)->cp0_epc;
18809 @@ -3570,9 +3632,9 @@ diff -urNp linux-2.6.37/arch/score/kernel/process.c linux-2.6.37/arch/score/kern
18810 -{
18811 - return sp;
18812 -}
18813 -diff -urNp linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c
18814 ---- linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c 2011-01-04 19:50:19.000000000 -0500
18815 -+++ linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c 2011-01-17 02:41:00.000000000 -0500
18816 +diff -urNp linux-2.6.37.1/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.37.1/arch/sh/boards/mach-hp6xx/pm.c
18817 +--- linux-2.6.37.1/arch/sh/boards/mach-hp6xx/pm.c 2011-01-04 19:50:19.000000000 -0500
18818 ++++ linux-2.6.37.1/arch/sh/boards/mach-hp6xx/pm.c 2011-01-17 02:41:00.000000000 -0500
18819 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
18820 return 0;
18821 }
18822 @@ -3582,9 +3644,9 @@ diff -urNp linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.37/arch/sh/boar
18823 .enter = hp6x0_pm_enter,
18824 .valid = suspend_valid_only_mem,
18825 };
18826 -diff -urNp linux-2.6.37/arch/sh/include/asm/dma-mapping.h linux-2.6.37/arch/sh/include/asm/dma-mapping.h
18827 ---- linux-2.6.37/arch/sh/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18828 -+++ linux-2.6.37/arch/sh/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18829 +diff -urNp linux-2.6.37.1/arch/sh/include/asm/dma-mapping.h linux-2.6.37.1/arch/sh/include/asm/dma-mapping.h
18830 +--- linux-2.6.37.1/arch/sh/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18831 ++++ linux-2.6.37.1/arch/sh/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18832 @@ -1,10 +1,10 @@
18833 #ifndef __ASM_SH_DMA_MAPPING_H
18834 #define __ASM_SH_DMA_MAPPING_H
18835 @@ -3643,9 +3705,9 @@ diff -urNp linux-2.6.37/arch/sh/include/asm/dma-mapping.h linux-2.6.37/arch/sh/i
18836
18837 if (dma_release_from_coherent(dev, get_order(size), vaddr))
18838 return;
18839 -diff -urNp linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c
18840 ---- linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-04 19:50:19.000000000 -0500
18841 -+++ linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-17 02:41:00.000000000 -0500
18842 +diff -urNp linux-2.6.37.1/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.37.1/arch/sh/kernel/cpu/shmobile/pm.c
18843 +--- linux-2.6.37.1/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-04 19:50:19.000000000 -0500
18844 ++++ linux-2.6.37.1/arch/sh/kernel/cpu/shmobile/pm.c 2011-01-17 02:41:00.000000000 -0500
18845 @@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t s
18846 return 0;
18847 }
18848 @@ -3655,9 +3717,9 @@ diff -urNp linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.37/arch/sh/ke
18849 .enter = sh_pm_enter,
18850 .valid = suspend_valid_only_mem,
18851 };
18852 -diff -urNp linux-2.6.37/arch/sh/kernel/dma-nommu.c linux-2.6.37/arch/sh/kernel/dma-nommu.c
18853 ---- linux-2.6.37/arch/sh/kernel/dma-nommu.c 2011-01-04 19:50:19.000000000 -0500
18854 -+++ linux-2.6.37/arch/sh/kernel/dma-nommu.c 2011-01-17 02:41:00.000000000 -0500
18855 +diff -urNp linux-2.6.37.1/arch/sh/kernel/dma-nommu.c linux-2.6.37.1/arch/sh/kernel/dma-nommu.c
18856 +--- linux-2.6.37.1/arch/sh/kernel/dma-nommu.c 2011-01-04 19:50:19.000000000 -0500
18857 ++++ linux-2.6.37.1/arch/sh/kernel/dma-nommu.c 2011-01-17 02:41:00.000000000 -0500
18858 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device
18859 }
18860 #endif
18861 @@ -3667,9 +3729,9 @@ diff -urNp linux-2.6.37/arch/sh/kernel/dma-nommu.c linux-2.6.37/arch/sh/kernel/d
18862 .alloc_coherent = dma_generic_alloc_coherent,
18863 .free_coherent = dma_generic_free_coherent,
18864 .map_page = nommu_map_page,
18865 -diff -urNp linux-2.6.37/arch/sh/kernel/kgdb.c linux-2.6.37/arch/sh/kernel/kgdb.c
18866 ---- linux-2.6.37/arch/sh/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18867 -+++ linux-2.6.37/arch/sh/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18868 +diff -urNp linux-2.6.37.1/arch/sh/kernel/kgdb.c linux-2.6.37.1/arch/sh/kernel/kgdb.c
18869 +--- linux-2.6.37.1/arch/sh/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
18870 ++++ linux-2.6.37.1/arch/sh/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
18871 @@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
18872 unregister_die_notifier(&kgdb_notifier);
18873 }
18874 @@ -3679,9 +3741,9 @@ diff -urNp linux-2.6.37/arch/sh/kernel/kgdb.c linux-2.6.37/arch/sh/kernel/kgdb.c
18875 /* Breakpoint instruction: trapa #0x3c */
18876 #ifdef CONFIG_CPU_LITTLE_ENDIAN
18877 .gdb_bpt_instr = { 0x3c, 0xc3 },
18878 -diff -urNp linux-2.6.37/arch/sh/mm/consistent.c linux-2.6.37/arch/sh/mm/consistent.c
18879 ---- linux-2.6.37/arch/sh/mm/consistent.c 2011-01-04 19:50:19.000000000 -0500
18880 -+++ linux-2.6.37/arch/sh/mm/consistent.c 2011-01-17 02:41:00.000000000 -0500
18881 +diff -urNp linux-2.6.37.1/arch/sh/mm/consistent.c linux-2.6.37.1/arch/sh/mm/consistent.c
18882 +--- linux-2.6.37.1/arch/sh/mm/consistent.c 2011-01-04 19:50:19.000000000 -0500
18883 ++++ linux-2.6.37.1/arch/sh/mm/consistent.c 2011-01-17 02:41:00.000000000 -0500
18884 @@ -22,7 +22,7 @@
18885
18886 #define PREALLOC_DMA_DEBUG_ENTRIES 4096
18887 @@ -3691,9 +3753,9 @@ diff -urNp linux-2.6.37/arch/sh/mm/consistent.c linux-2.6.37/arch/sh/mm/consiste
18888 EXPORT_SYMBOL(dma_ops);
18889
18890 static int __init dma_init(void)
18891 -diff -urNp linux-2.6.37/arch/sh/mm/mmap.c linux-2.6.37/arch/sh/mm/mmap.c
18892 ---- linux-2.6.37/arch/sh/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
18893 -+++ linux-2.6.37/arch/sh/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
18894 +diff -urNp linux-2.6.37.1/arch/sh/mm/mmap.c linux-2.6.37.1/arch/sh/mm/mmap.c
18895 +--- linux-2.6.37.1/arch/sh/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
18896 ++++ linux-2.6.37.1/arch/sh/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
18897 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
18898 addr = PAGE_ALIGN(addr);
18899
18900 @@ -3741,9 +3803,9 @@ diff -urNp linux-2.6.37/arch/sh/mm/mmap.c linux-2.6.37/arch/sh/mm/mmap.c
18901 /* remember the address as a hint for next time */
18902 return (mm->free_area_cache = addr);
18903 }
18904 -diff -urNp linux-2.6.37/arch/sparc/include/asm/atomic_64.h linux-2.6.37/arch/sparc/include/asm/atomic_64.h
18905 ---- linux-2.6.37/arch/sparc/include/asm/atomic_64.h 2011-01-04 19:50:19.000000000 -0500
18906 -+++ linux-2.6.37/arch/sparc/include/asm/atomic_64.h 2011-01-17 02:41:00.000000000 -0500
18907 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/atomic_64.h linux-2.6.37.1/arch/sparc/include/asm/atomic_64.h
18908 +--- linux-2.6.37.1/arch/sparc/include/asm/atomic_64.h 2011-01-04 19:50:19.000000000 -0500
18909 ++++ linux-2.6.37.1/arch/sparc/include/asm/atomic_64.h 2011-01-17 02:41:00.000000000 -0500
18910 @@ -14,18 +14,40 @@
18911 #define ATOMIC64_INIT(i) { (i) }
18912
18913 @@ -3903,9 +3965,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/atomic_64.h linux-2.6.37/arch/spa
18914 }
18915
18916 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
18917 -diff -urNp linux-2.6.37/arch/sparc/include/asm/dma-mapping.h linux-2.6.37/arch/sparc/include/asm/dma-mapping.h
18918 ---- linux-2.6.37/arch/sparc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18919 -+++ linux-2.6.37/arch/sparc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18920 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/dma-mapping.h linux-2.6.37.1/arch/sparc/include/asm/dma-mapping.h
18921 +--- linux-2.6.37.1/arch/sparc/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
18922 ++++ linux-2.6.37.1/arch/sparc/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
18923 @@ -12,10 +12,10 @@ extern int dma_supported(struct device *
18924 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
18925 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
18926 @@ -3937,9 +3999,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/dma-mapping.h linux-2.6.37/arch/s
18927
18928 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
18929 ops->free_coherent(dev, size, cpu_addr, dma_handle);
18930 -diff -urNp linux-2.6.37/arch/sparc/include/asm/elf_32.h linux-2.6.37/arch/sparc/include/asm/elf_32.h
18931 ---- linux-2.6.37/arch/sparc/include/asm/elf_32.h 2011-01-04 19:50:19.000000000 -0500
18932 -+++ linux-2.6.37/arch/sparc/include/asm/elf_32.h 2011-01-17 02:41:00.000000000 -0500
18933 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/elf_32.h linux-2.6.37.1/arch/sparc/include/asm/elf_32.h
18934 +--- linux-2.6.37.1/arch/sparc/include/asm/elf_32.h 2011-01-04 19:50:19.000000000 -0500
18935 ++++ linux-2.6.37.1/arch/sparc/include/asm/elf_32.h 2011-01-17 02:41:00.000000000 -0500
18936 @@ -114,6 +114,13 @@ typedef struct {
18937
18938 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
18939 @@ -3954,9 +4016,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/elf_32.h linux-2.6.37/arch/sparc/
18940 /* This yields a mask that user programs can use to figure out what
18941 instruction set this cpu supports. This can NOT be done in userspace
18942 on Sparc. */
18943 -diff -urNp linux-2.6.37/arch/sparc/include/asm/elf_64.h linux-2.6.37/arch/sparc/include/asm/elf_64.h
18944 ---- linux-2.6.37/arch/sparc/include/asm/elf_64.h 2011-01-04 19:50:19.000000000 -0500
18945 -+++ linux-2.6.37/arch/sparc/include/asm/elf_64.h 2011-01-17 02:41:00.000000000 -0500
18946 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/elf_64.h linux-2.6.37.1/arch/sparc/include/asm/elf_64.h
18947 +--- linux-2.6.37.1/arch/sparc/include/asm/elf_64.h 2011-01-04 19:50:19.000000000 -0500
18948 ++++ linux-2.6.37.1/arch/sparc/include/asm/elf_64.h 2011-01-17 02:41:00.000000000 -0500
18949 @@ -162,6 +162,12 @@ typedef struct {
18950 #define ELF_ET_DYN_BASE 0x0000010000000000UL
18951 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
18952 @@ -3970,9 +4032,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/elf_64.h linux-2.6.37/arch/sparc/
18953
18954 /* This yields a mask that user programs can use to figure out what
18955 instruction set this cpu supports. */
18956 -diff -urNp linux-2.6.37/arch/sparc/include/asm/pgtable_32.h linux-2.6.37/arch/sparc/include/asm/pgtable_32.h
18957 ---- linux-2.6.37/arch/sparc/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
18958 -+++ linux-2.6.37/arch/sparc/include/asm/pgtable_32.h 2011-01-17 02:41:00.000000000 -0500
18959 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/pgtable_32.h linux-2.6.37.1/arch/sparc/include/asm/pgtable_32.h
18960 +--- linux-2.6.37.1/arch/sparc/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
18961 ++++ linux-2.6.37.1/arch/sparc/include/asm/pgtable_32.h 2011-01-17 02:41:00.000000000 -0500
18962 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
18963 BTFIXUPDEF_INT(page_none)
18964 BTFIXUPDEF_INT(page_copy)
18965 @@ -4004,9 +4066,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/pgtable_32.h linux-2.6.37/arch/sp
18966 extern unsigned long page_kernel;
18967
18968 #ifdef MODULE
18969 -diff -urNp linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h
18970 ---- linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h 2011-01-04 19:50:19.000000000 -0500
18971 -+++ linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h 2011-01-17 02:41:00.000000000 -0500
18972 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.37.1/arch/sparc/include/asm/pgtsrmmu.h
18973 +--- linux-2.6.37.1/arch/sparc/include/asm/pgtsrmmu.h 2011-01-04 19:50:19.000000000 -0500
18974 ++++ linux-2.6.37.1/arch/sparc/include/asm/pgtsrmmu.h 2011-01-17 02:41:00.000000000 -0500
18975 @@ -115,6 +115,13 @@
18976 SRMMU_EXEC | SRMMU_REF)
18977 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
18978 @@ -4021,9 +4083,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.37/arch/spar
18979 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
18980 SRMMU_DIRTY | SRMMU_REF)
18981
18982 -diff -urNp linux-2.6.37/arch/sparc/include/asm/spinlock_64.h linux-2.6.37/arch/sparc/include/asm/spinlock_64.h
18983 ---- linux-2.6.37/arch/sparc/include/asm/spinlock_64.h 2011-01-04 19:50:19.000000000 -0500
18984 -+++ linux-2.6.37/arch/sparc/include/asm/spinlock_64.h 2011-01-17 02:41:00.000000000 -0500
18985 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/spinlock_64.h linux-2.6.37.1/arch/sparc/include/asm/spinlock_64.h
18986 +--- linux-2.6.37.1/arch/sparc/include/asm/spinlock_64.h 2011-01-04 19:50:19.000000000 -0500
18987 ++++ linux-2.6.37.1/arch/sparc/include/asm/spinlock_64.h 2011-01-17 02:41:00.000000000 -0500
18988 @@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r
18989 __asm__ __volatile__ (
18990 "1: ldsw [%2], %0\n"
18991 @@ -4075,9 +4137,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/spinlock_64.h linux-2.6.37/arch/s
18992 " cas [%2], %0, %1\n"
18993 " cmp %0, %1\n"
18994 " bne,pn %%xcc, 1b\n"
18995 -diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess_32.h linux-2.6.37/arch/sparc/include/asm/uaccess_32.h
18996 ---- linux-2.6.37/arch/sparc/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
18997 -+++ linux-2.6.37/arch/sparc/include/asm/uaccess_32.h 2011-01-17 02:41:00.000000000 -0500
18998 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/uaccess_32.h linux-2.6.37.1/arch/sparc/include/asm/uaccess_32.h
18999 +--- linux-2.6.37.1/arch/sparc/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
19000 ++++ linux-2.6.37.1/arch/sparc/include/asm/uaccess_32.h 2011-01-17 02:41:00.000000000 -0500
19001 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
19002
19003 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
19004 @@ -4129,9 +4191,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess_32.h linux-2.6.37/arch/sp
19005 return __copy_user((__force void __user *) to, from, n);
19006 }
19007
19008 -diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess_64.h linux-2.6.37/arch/sparc/include/asm/uaccess_64.h
19009 ---- linux-2.6.37/arch/sparc/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
19010 -+++ linux-2.6.37/arch/sparc/include/asm/uaccess_64.h 2011-01-17 02:41:00.000000000 -0500
19011 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/uaccess_64.h linux-2.6.37.1/arch/sparc/include/asm/uaccess_64.h
19012 +--- linux-2.6.37.1/arch/sparc/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
19013 ++++ linux-2.6.37.1/arch/sparc/include/asm/uaccess_64.h 2011-01-17 02:41:00.000000000 -0500
19014 @@ -10,6 +10,7 @@
19015 #include <linux/compiler.h>
19016 #include <linux/string.h>
19017 @@ -4174,9 +4236,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess_64.h linux-2.6.37/arch/sp
19018 if (unlikely(ret))
19019 ret = copy_to_user_fixup(to, from, size);
19020 return ret;
19021 -diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess.h linux-2.6.37/arch/sparc/include/asm/uaccess.h
19022 ---- linux-2.6.37/arch/sparc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
19023 -+++ linux-2.6.37/arch/sparc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
19024 +diff -urNp linux-2.6.37.1/arch/sparc/include/asm/uaccess.h linux-2.6.37.1/arch/sparc/include/asm/uaccess.h
19025 +--- linux-2.6.37.1/arch/sparc/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
19026 ++++ linux-2.6.37.1/arch/sparc/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
19027 @@ -1,5 +1,13 @@
19028 #ifndef ___ASM_SPARC_UACCESS_H
19029 #define ___ASM_SPARC_UACCESS_H
19030 @@ -4191,9 +4253,9 @@ diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess.h linux-2.6.37/arch/sparc
19031 #if defined(__sparc__) && defined(__arch64__)
19032 #include <asm/uaccess_64.h>
19033 #else
19034 -diff -urNp linux-2.6.37/arch/sparc/kernel/iommu.c linux-2.6.37/arch/sparc/kernel/iommu.c
19035 ---- linux-2.6.37/arch/sparc/kernel/iommu.c 2011-01-04 19:50:19.000000000 -0500
19036 -+++ linux-2.6.37/arch/sparc/kernel/iommu.c 2011-01-17 02:41:00.000000000 -0500
19037 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/iommu.c linux-2.6.37.1/arch/sparc/kernel/iommu.c
19038 +--- linux-2.6.37.1/arch/sparc/kernel/iommu.c 2011-01-04 19:50:19.000000000 -0500
19039 ++++ linux-2.6.37.1/arch/sparc/kernel/iommu.c 2011-01-17 02:41:00.000000000 -0500
19040 @@ -828,7 +828,7 @@ static void dma_4u_sync_sg_for_cpu(struc
19041 spin_unlock_irqrestore(&iommu->lock, flags);
19042 }
19043 @@ -4212,9 +4274,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/iommu.c linux-2.6.37/arch/sparc/kernel
19044 EXPORT_SYMBOL(dma_ops);
19045
19046 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
19047 -diff -urNp linux-2.6.37/arch/sparc/kernel/ioport.c linux-2.6.37/arch/sparc/kernel/ioport.c
19048 ---- linux-2.6.37/arch/sparc/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
19049 -+++ linux-2.6.37/arch/sparc/kernel/ioport.c 2011-01-17 02:41:00.000000000 -0500
19050 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/ioport.c linux-2.6.37.1/arch/sparc/kernel/ioport.c
19051 +--- linux-2.6.37.1/arch/sparc/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
19052 ++++ linux-2.6.37.1/arch/sparc/kernel/ioport.c 2011-01-17 02:41:00.000000000 -0500
19053 @@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
19054 BUG();
19055 }
19056 @@ -4242,9 +4304,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/ioport.c linux-2.6.37/arch/sparc/kerne
19057 .alloc_coherent = pci32_alloc_coherent,
19058 .free_coherent = pci32_free_coherent,
19059 .map_page = pci32_map_page,
19060 -diff -urNp linux-2.6.37/arch/sparc/kernel/kgdb_32.c linux-2.6.37/arch/sparc/kernel/kgdb_32.c
19061 ---- linux-2.6.37/arch/sparc/kernel/kgdb_32.c 2011-01-04 19:50:19.000000000 -0500
19062 -+++ linux-2.6.37/arch/sparc/kernel/kgdb_32.c 2011-01-17 02:41:00.000000000 -0500
19063 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/kgdb_32.c linux-2.6.37.1/arch/sparc/kernel/kgdb_32.c
19064 +--- linux-2.6.37.1/arch/sparc/kernel/kgdb_32.c 2011-01-04 19:50:19.000000000 -0500
19065 ++++ linux-2.6.37.1/arch/sparc/kernel/kgdb_32.c 2011-01-17 02:41:00.000000000 -0500
19066 @@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
19067 regs->npc = regs->pc + 4;
19068 }
19069 @@ -4254,9 +4316,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/kgdb_32.c linux-2.6.37/arch/sparc/kern
19070 /* Breakpoint instruction: ta 0x7d */
19071 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
19072 };
19073 -diff -urNp linux-2.6.37/arch/sparc/kernel/kgdb_64.c linux-2.6.37/arch/sparc/kernel/kgdb_64.c
19074 ---- linux-2.6.37/arch/sparc/kernel/kgdb_64.c 2011-01-04 19:50:19.000000000 -0500
19075 -+++ linux-2.6.37/arch/sparc/kernel/kgdb_64.c 2011-01-17 02:41:00.000000000 -0500
19076 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/kgdb_64.c linux-2.6.37.1/arch/sparc/kernel/kgdb_64.c
19077 +--- linux-2.6.37.1/arch/sparc/kernel/kgdb_64.c 2011-01-04 19:50:19.000000000 -0500
19078 ++++ linux-2.6.37.1/arch/sparc/kernel/kgdb_64.c 2011-01-17 02:41:00.000000000 -0500
19079 @@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
19080 regs->tnpc = regs->tpc + 4;
19081 }
19082 @@ -4266,9 +4328,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/kgdb_64.c linux-2.6.37/arch/sparc/kern
19083 /* Breakpoint instruction: ta 0x72 */
19084 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
19085 };
19086 -diff -urNp linux-2.6.37/arch/sparc/kernel/Makefile linux-2.6.37/arch/sparc/kernel/Makefile
19087 ---- linux-2.6.37/arch/sparc/kernel/Makefile 2011-01-04 19:50:19.000000000 -0500
19088 -+++ linux-2.6.37/arch/sparc/kernel/Makefile 2011-01-17 02:41:00.000000000 -0500
19089 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/Makefile linux-2.6.37.1/arch/sparc/kernel/Makefile
19090 +--- linux-2.6.37.1/arch/sparc/kernel/Makefile 2011-01-04 19:50:19.000000000 -0500
19091 ++++ linux-2.6.37.1/arch/sparc/kernel/Makefile 2011-01-17 02:41:00.000000000 -0500
19092 @@ -3,7 +3,7 @@
19093 #
19094
19095 @@ -4278,9 +4340,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/Makefile linux-2.6.37/arch/sparc/kerne
19096
19097 extra-y := head_$(BITS).o
19098 extra-y += init_task.o
19099 -diff -urNp linux-2.6.37/arch/sparc/kernel/pci_sun4v.c linux-2.6.37/arch/sparc/kernel/pci_sun4v.c
19100 ---- linux-2.6.37/arch/sparc/kernel/pci_sun4v.c 2011-01-04 19:50:19.000000000 -0500
19101 -+++ linux-2.6.37/arch/sparc/kernel/pci_sun4v.c 2011-01-17 02:41:00.000000000 -0500
19102 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/pci_sun4v.c linux-2.6.37.1/arch/sparc/kernel/pci_sun4v.c
19103 +--- linux-2.6.37.1/arch/sparc/kernel/pci_sun4v.c 2011-01-04 19:50:19.000000000 -0500
19104 ++++ linux-2.6.37.1/arch/sparc/kernel/pci_sun4v.c 2011-01-17 02:41:00.000000000 -0500
19105 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
19106 spin_unlock_irqrestore(&iommu->lock, flags);
19107 }
19108 @@ -4290,9 +4352,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/pci_sun4v.c linux-2.6.37/arch/sparc/ke
19109 .alloc_coherent = dma_4v_alloc_coherent,
19110 .free_coherent = dma_4v_free_coherent,
19111 .map_page = dma_4v_map_page,
19112 -diff -urNp linux-2.6.37/arch/sparc/kernel/process_32.c linux-2.6.37/arch/sparc/kernel/process_32.c
19113 ---- linux-2.6.37/arch/sparc/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
19114 -+++ linux-2.6.37/arch/sparc/kernel/process_32.c 2011-01-17 02:41:00.000000000 -0500
19115 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/process_32.c linux-2.6.37.1/arch/sparc/kernel/process_32.c
19116 +--- linux-2.6.37.1/arch/sparc/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
19117 ++++ linux-2.6.37.1/arch/sparc/kernel/process_32.c 2011-01-17 02:41:00.000000000 -0500
19118 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
19119 rw->ins[4], rw->ins[5],
19120 rw->ins[6],
19121 @@ -4328,9 +4390,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/process_32.c linux-2.6.37/arch/sparc/k
19122 fp = rw->ins[6];
19123 } while (++count < 16);
19124 printk("\n");
19125 -diff -urNp linux-2.6.37/arch/sparc/kernel/process_64.c linux-2.6.37/arch/sparc/kernel/process_64.c
19126 ---- linux-2.6.37/arch/sparc/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
19127 -+++ linux-2.6.37/arch/sparc/kernel/process_64.c 2011-01-17 02:41:00.000000000 -0500
19128 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/process_64.c linux-2.6.37.1/arch/sparc/kernel/process_64.c
19129 +--- linux-2.6.37.1/arch/sparc/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
19130 ++++ linux-2.6.37.1/arch/sparc/kernel/process_64.c 2011-01-17 02:41:00.000000000 -0500
19131 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
19132 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
19133 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
19134 @@ -4366,9 +4428,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/process_64.c linux-2.6.37/arch/sparc/k
19135 (void *) gp->tpc,
19136 (void *) gp->o7,
19137 (void *) gp->i7,
19138 -diff -urNp linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c
19139 ---- linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c 2011-01-04 19:50:19.000000000 -0500
19140 -+++ linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c 2011-01-17 02:41:00.000000000 -0500
19141 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/sys_sparc_32.c linux-2.6.37.1/arch/sparc/kernel/sys_sparc_32.c
19142 +--- linux-2.6.37.1/arch/sparc/kernel/sys_sparc_32.c 2011-01-04 19:50:19.000000000 -0500
19143 ++++ linux-2.6.37.1/arch/sparc/kernel/sys_sparc_32.c 2011-01-17 02:41:00.000000000 -0500
19144 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
19145 if (ARCH_SUN4C && len > 0x20000000)
19146 return -ENOMEM;
19147 @@ -4387,9 +4449,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c linux-2.6.37/arch/sparc
19148 return addr;
19149 addr = vmm->vm_end;
19150 if (flags & MAP_SHARED)
19151 -diff -urNp linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c
19152 ---- linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c 2011-01-04 19:50:19.000000000 -0500
19153 -+++ linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c 2011-01-17 02:41:00.000000000 -0500
19154 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37.1/arch/sparc/kernel/sys_sparc_64.c
19155 +--- linux-2.6.37.1/arch/sparc/kernel/sys_sparc_64.c 2011-01-04 19:50:19.000000000 -0500
19156 ++++ linux-2.6.37.1/arch/sparc/kernel/sys_sparc_64.c 2011-01-17 02:41:00.000000000 -0500
19157 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
19158 /* We do not accept a shared mapping if it would violate
19159 * cache aliasing constraints.
19160 @@ -4510,9 +4572,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37/arch/sparc
19161 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
19162 mm->unmap_area = arch_unmap_area_topdown;
19163 }
19164 -diff -urNp linux-2.6.37/arch/sparc/kernel/traps_32.c linux-2.6.37/arch/sparc/kernel/traps_32.c
19165 ---- linux-2.6.37/arch/sparc/kernel/traps_32.c 2011-01-04 19:50:19.000000000 -0500
19166 -+++ linux-2.6.37/arch/sparc/kernel/traps_32.c 2011-01-17 02:41:00.000000000 -0500
19167 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/traps_32.c linux-2.6.37.1/arch/sparc/kernel/traps_32.c
19168 +--- linux-2.6.37.1/arch/sparc/kernel/traps_32.c 2011-01-04 19:50:19.000000000 -0500
19169 ++++ linux-2.6.37.1/arch/sparc/kernel/traps_32.c 2011-01-17 02:41:00.000000000 -0500
19170 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
19171 count++ < 30 &&
19172 (((unsigned long) rw) >= PAGE_OFFSET) &&
19173 @@ -4522,9 +4584,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/traps_32.c linux-2.6.37/arch/sparc/ker
19174 (void *) rw->ins[7]);
19175 rw = (struct reg_window32 *)rw->ins[6];
19176 }
19177 -diff -urNp linux-2.6.37/arch/sparc/kernel/traps_64.c linux-2.6.37/arch/sparc/kernel/traps_64.c
19178 ---- linux-2.6.37/arch/sparc/kernel/traps_64.c 2011-01-04 19:50:19.000000000 -0500
19179 -+++ linux-2.6.37/arch/sparc/kernel/traps_64.c 2011-01-17 02:41:00.000000000 -0500
19180 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/traps_64.c linux-2.6.37.1/arch/sparc/kernel/traps_64.c
19181 +--- linux-2.6.37.1/arch/sparc/kernel/traps_64.c 2011-01-04 19:50:19.000000000 -0500
19182 ++++ linux-2.6.37.1/arch/sparc/kernel/traps_64.c 2011-01-17 02:41:00.000000000 -0500
19183 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
19184 i + 1,
19185 p->trapstack[i].tstate, p->trapstack[i].tpc,
19186 @@ -4641,9 +4703,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/traps_64.c linux-2.6.37/arch/sparc/ker
19187 (void *) rw->ins[7]);
19188
19189 rw = kernel_stack_up(rw);
19190 -diff -urNp linux-2.6.37/arch/sparc/kernel/unaligned_64.c linux-2.6.37/arch/sparc/kernel/unaligned_64.c
19191 ---- linux-2.6.37/arch/sparc/kernel/unaligned_64.c 2011-01-04 19:50:19.000000000 -0500
19192 -+++ linux-2.6.37/arch/sparc/kernel/unaligned_64.c 2011-01-17 02:41:00.000000000 -0500
19193 +diff -urNp linux-2.6.37.1/arch/sparc/kernel/unaligned_64.c linux-2.6.37.1/arch/sparc/kernel/unaligned_64.c
19194 +--- linux-2.6.37.1/arch/sparc/kernel/unaligned_64.c 2011-01-04 19:50:19.000000000 -0500
19195 ++++ linux-2.6.37.1/arch/sparc/kernel/unaligned_64.c 2011-01-17 02:41:00.000000000 -0500
19196 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs
19197 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
19198
19199 @@ -4653,9 +4715,9 @@ diff -urNp linux-2.6.37/arch/sparc/kernel/unaligned_64.c linux-2.6.37/arch/sparc
19200 regs->tpc, (void *) regs->tpc);
19201 }
19202 }
19203 -diff -urNp linux-2.6.37/arch/sparc/lib/atomic_64.S linux-2.6.37/arch/sparc/lib/atomic_64.S
19204 ---- linux-2.6.37/arch/sparc/lib/atomic_64.S 2011-01-04 19:50:19.000000000 -0500
19205 -+++ linux-2.6.37/arch/sparc/lib/atomic_64.S 2011-01-17 02:41:00.000000000 -0500
19206 +diff -urNp linux-2.6.37.1/arch/sparc/lib/atomic_64.S linux-2.6.37.1/arch/sparc/lib/atomic_64.S
19207 +--- linux-2.6.37.1/arch/sparc/lib/atomic_64.S 2011-01-04 19:50:19.000000000 -0500
19208 ++++ linux-2.6.37.1/arch/sparc/lib/atomic_64.S 2011-01-17 02:41:00.000000000 -0500
19209 @@ -18,7 +18,12 @@
19210 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
19211 BACKOFF_SETUP(%o2)
19212 @@ -4890,9 +4952,9 @@ diff -urNp linux-2.6.37/arch/sparc/lib/atomic_64.S linux-2.6.37/arch/sparc/lib/a
19213 casx [%o1], %g1, %g7
19214 cmp %g1, %g7
19215 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
19216 -diff -urNp linux-2.6.37/arch/sparc/lib/ksyms.c linux-2.6.37/arch/sparc/lib/ksyms.c
19217 ---- linux-2.6.37/arch/sparc/lib/ksyms.c 2011-01-04 19:50:19.000000000 -0500
19218 -+++ linux-2.6.37/arch/sparc/lib/ksyms.c 2011-01-17 02:41:00.000000000 -0500
19219 +diff -urNp linux-2.6.37.1/arch/sparc/lib/ksyms.c linux-2.6.37.1/arch/sparc/lib/ksyms.c
19220 +--- linux-2.6.37.1/arch/sparc/lib/ksyms.c 2011-01-04 19:50:19.000000000 -0500
19221 ++++ linux-2.6.37.1/arch/sparc/lib/ksyms.c 2011-01-17 02:41:00.000000000 -0500
19222 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
19223
19224 /* Atomic counter implementation. */
19225 @@ -4911,9 +4973,9 @@ diff -urNp linux-2.6.37/arch/sparc/lib/ksyms.c linux-2.6.37/arch/sparc/lib/ksyms
19226 EXPORT_SYMBOL(atomic64_sub_ret);
19227
19228 /* Atomic bit operations. */
19229 -diff -urNp linux-2.6.37/arch/sparc/Makefile linux-2.6.37/arch/sparc/Makefile
19230 ---- linux-2.6.37/arch/sparc/Makefile 2011-01-04 19:50:19.000000000 -0500
19231 -+++ linux-2.6.37/arch/sparc/Makefile 2011-01-17 02:41:00.000000000 -0500
19232 +diff -urNp linux-2.6.37.1/arch/sparc/Makefile linux-2.6.37.1/arch/sparc/Makefile
19233 +--- linux-2.6.37.1/arch/sparc/Makefile 2011-01-04 19:50:19.000000000 -0500
19234 ++++ linux-2.6.37.1/arch/sparc/Makefile 2011-01-17 02:41:00.000000000 -0500
19235 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
19236 # Export what is needed by arch/sparc/boot/Makefile
19237 export VMLINUX_INIT VMLINUX_MAIN
19238 @@ -4923,9 +4985,9 @@ diff -urNp linux-2.6.37/arch/sparc/Makefile linux-2.6.37/arch/sparc/Makefile
19239 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
19240 VMLINUX_MAIN += $(drivers-y) $(net-y)
19241
19242 -diff -urNp linux-2.6.37/arch/sparc/mm/fault_32.c linux-2.6.37/arch/sparc/mm/fault_32.c
19243 ---- linux-2.6.37/arch/sparc/mm/fault_32.c 2011-01-04 19:50:19.000000000 -0500
19244 -+++ linux-2.6.37/arch/sparc/mm/fault_32.c 2011-01-17 02:41:00.000000000 -0500
19245 +diff -urNp linux-2.6.37.1/arch/sparc/mm/fault_32.c linux-2.6.37.1/arch/sparc/mm/fault_32.c
19246 +--- linux-2.6.37.1/arch/sparc/mm/fault_32.c 2011-01-04 19:50:19.000000000 -0500
19247 ++++ linux-2.6.37.1/arch/sparc/mm/fault_32.c 2011-01-17 02:41:00.000000000 -0500
19248 @@ -22,6 +22,9 @@
19249 #include <linux/interrupt.h>
19250 #include <linux/module.h>
19251 @@ -5230,9 +5292,9 @@ diff -urNp linux-2.6.37/arch/sparc/mm/fault_32.c linux-2.6.37/arch/sparc/mm/faul
19252 /* Allow reads even for write-only mappings */
19253 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
19254 goto bad_area;
19255 -diff -urNp linux-2.6.37/arch/sparc/mm/fault_64.c linux-2.6.37/arch/sparc/mm/fault_64.c
19256 ---- linux-2.6.37/arch/sparc/mm/fault_64.c 2011-01-04 19:50:19.000000000 -0500
19257 -+++ linux-2.6.37/arch/sparc/mm/fault_64.c 2011-01-17 02:41:00.000000000 -0500
19258 +diff -urNp linux-2.6.37.1/arch/sparc/mm/fault_64.c linux-2.6.37.1/arch/sparc/mm/fault_64.c
19259 +--- linux-2.6.37.1/arch/sparc/mm/fault_64.c 2011-01-04 19:50:19.000000000 -0500
19260 ++++ linux-2.6.37.1/arch/sparc/mm/fault_64.c 2011-01-17 02:41:00.000000000 -0500
19261 @@ -21,6 +21,9 @@
19262 #include <linux/kprobes.h>
19263 #include <linux/kdebug.h>
19264 @@ -5740,9 +5802,9 @@ diff -urNp linux-2.6.37/arch/sparc/mm/fault_64.c linux-2.6.37/arch/sparc/mm/faul
19265 /* Pure DTLB misses do not tell us whether the fault causing
19266 * load/store/atomic was a write or not, it only says that there
19267 * was no match. So in such a case we (carefully) read the
19268 -diff -urNp linux-2.6.37/arch/sparc/mm/hugetlbpage.c linux-2.6.37/arch/sparc/mm/hugetlbpage.c
19269 ---- linux-2.6.37/arch/sparc/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
19270 -+++ linux-2.6.37/arch/sparc/mm/hugetlbpage.c 2011-01-17 02:41:00.000000000 -0500
19271 +diff -urNp linux-2.6.37.1/arch/sparc/mm/hugetlbpage.c linux-2.6.37.1/arch/sparc/mm/hugetlbpage.c
19272 +--- linux-2.6.37.1/arch/sparc/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
19273 ++++ linux-2.6.37.1/arch/sparc/mm/hugetlbpage.c 2011-01-17 02:41:00.000000000 -0500
19274 @@ -68,7 +68,7 @@ full_search:
19275 }
19276 return -ENOMEM;
19277 @@ -5780,9 +5842,9 @@ diff -urNp linux-2.6.37/arch/sparc/mm/hugetlbpage.c linux-2.6.37/arch/sparc/mm/h
19278 return addr;
19279 }
19280 if (mm->get_unmapped_area == arch_get_unmapped_area)
19281 -diff -urNp linux-2.6.37/arch/sparc/mm/init_32.c linux-2.6.37/arch/sparc/mm/init_32.c
19282 ---- linux-2.6.37/arch/sparc/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
19283 -+++ linux-2.6.37/arch/sparc/mm/init_32.c 2011-01-17 02:41:00.000000000 -0500
19284 +diff -urNp linux-2.6.37.1/arch/sparc/mm/init_32.c linux-2.6.37.1/arch/sparc/mm/init_32.c
19285 +--- linux-2.6.37.1/arch/sparc/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
19286 ++++ linux-2.6.37.1/arch/sparc/mm/init_32.c 2011-01-17 02:41:00.000000000 -0500
19287 @@ -318,6 +318,9 @@ extern void device_scan(void);
19288 pgprot_t PAGE_SHARED __read_mostly;
19289 EXPORT_SYMBOL(PAGE_SHARED);
19290 @@ -5817,9 +5879,9 @@ diff -urNp linux-2.6.37/arch/sparc/mm/init_32.c linux-2.6.37/arch/sparc/mm/init_
19291 protection_map[12] = PAGE_READONLY;
19292 protection_map[13] = PAGE_READONLY;
19293 protection_map[14] = PAGE_SHARED;
19294 -diff -urNp linux-2.6.37/arch/sparc/mm/Makefile linux-2.6.37/arch/sparc/mm/Makefile
19295 ---- linux-2.6.37/arch/sparc/mm/Makefile 2011-01-04 19:50:19.000000000 -0500
19296 -+++ linux-2.6.37/arch/sparc/mm/Makefile 2011-01-17 02:41:00.000000000 -0500
19297 +diff -urNp linux-2.6.37.1/arch/sparc/mm/Makefile linux-2.6.37.1/arch/sparc/mm/Makefile
19298 +--- linux-2.6.37.1/arch/sparc/mm/Makefile 2011-01-04 19:50:19.000000000 -0500
19299 ++++ linux-2.6.37.1/arch/sparc/mm/Makefile 2011-01-17 02:41:00.000000000 -0500
19300 @@ -2,7 +2,7 @@
19301 #
19302
19303 @@ -5829,9 +5891,9 @@ diff -urNp linux-2.6.37/arch/sparc/mm/Makefile linux-2.6.37/arch/sparc/mm/Makefi
19304
19305 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
19306 obj-y += fault_$(BITS).o
19307 -diff -urNp linux-2.6.37/arch/sparc/mm/srmmu.c linux-2.6.37/arch/sparc/mm/srmmu.c
19308 ---- linux-2.6.37/arch/sparc/mm/srmmu.c 2011-01-04 19:50:19.000000000 -0500
19309 -+++ linux-2.6.37/arch/sparc/mm/srmmu.c 2011-01-17 02:41:00.000000000 -0500
19310 +diff -urNp linux-2.6.37.1/arch/sparc/mm/srmmu.c linux-2.6.37.1/arch/sparc/mm/srmmu.c
19311 +--- linux-2.6.37.1/arch/sparc/mm/srmmu.c 2011-01-04 19:50:19.000000000 -0500
19312 ++++ linux-2.6.37.1/arch/sparc/mm/srmmu.c 2011-01-17 02:41:00.000000000 -0500
19313 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
19314 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
19315 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
19316 @@ -5846,9 +5908,9 @@ diff -urNp linux-2.6.37/arch/sparc/mm/srmmu.c linux-2.6.37/arch/sparc/mm/srmmu.c
19317 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
19318 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
19319
19320 -diff -urNp linux-2.6.37/arch/um/include/asm/kmap_types.h linux-2.6.37/arch/um/include/asm/kmap_types.h
19321 ---- linux-2.6.37/arch/um/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
19322 -+++ linux-2.6.37/arch/um/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
19323 +diff -urNp linux-2.6.37.1/arch/um/include/asm/kmap_types.h linux-2.6.37.1/arch/um/include/asm/kmap_types.h
19324 +--- linux-2.6.37.1/arch/um/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
19325 ++++ linux-2.6.37.1/arch/um/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
19326 @@ -23,6 +23,7 @@ enum km_type {
19327 KM_IRQ1,
19328 KM_SOFTIRQ0,
19329 @@ -5857,9 +5919,9 @@ diff -urNp linux-2.6.37/arch/um/include/asm/kmap_types.h linux-2.6.37/arch/um/in
19330 KM_TYPE_NR
19331 };
19332
19333 -diff -urNp linux-2.6.37/arch/um/include/asm/page.h linux-2.6.37/arch/um/include/asm/page.h
19334 ---- linux-2.6.37/arch/um/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
19335 -+++ linux-2.6.37/arch/um/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
19336 +diff -urNp linux-2.6.37.1/arch/um/include/asm/page.h linux-2.6.37.1/arch/um/include/asm/page.h
19337 +--- linux-2.6.37.1/arch/um/include/asm/page.h 2011-01-04 19:50:19.000000000 -0500
19338 ++++ linux-2.6.37.1/arch/um/include/asm/page.h 2011-01-17 02:41:00.000000000 -0500
19339 @@ -14,6 +14,9 @@
19340 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
19341 #define PAGE_MASK (~(PAGE_SIZE-1))
19342 @@ -5870,9 +5932,9 @@ diff -urNp linux-2.6.37/arch/um/include/asm/page.h linux-2.6.37/arch/um/include/
19343 #ifndef __ASSEMBLY__
19344
19345 struct page;
19346 -diff -urNp linux-2.6.37/arch/um/kernel/process.c linux-2.6.37/arch/um/kernel/process.c
19347 ---- linux-2.6.37/arch/um/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
19348 -+++ linux-2.6.37/arch/um/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
19349 +diff -urNp linux-2.6.37.1/arch/um/kernel/process.c linux-2.6.37.1/arch/um/kernel/process.c
19350 +--- linux-2.6.37.1/arch/um/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
19351 ++++ linux-2.6.37.1/arch/um/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
19352 @@ -404,22 +404,6 @@ int singlestepping(void * t)
19353 return 2;
19354 }
19355 @@ -5896,9 +5958,9 @@ diff -urNp linux-2.6.37/arch/um/kernel/process.c linux-2.6.37/arch/um/kernel/pro
19356 unsigned long get_wchan(struct task_struct *p)
19357 {
19358 unsigned long stack_page, sp, ip;
19359 -diff -urNp linux-2.6.37/arch/um/sys-i386/syscalls.c linux-2.6.37/arch/um/sys-i386/syscalls.c
19360 ---- linux-2.6.37/arch/um/sys-i386/syscalls.c 2011-01-04 19:50:19.000000000 -0500
19361 -+++ linux-2.6.37/arch/um/sys-i386/syscalls.c 2011-01-17 02:41:00.000000000 -0500
19362 +diff -urNp linux-2.6.37.1/arch/um/sys-i386/syscalls.c linux-2.6.37.1/arch/um/sys-i386/syscalls.c
19363 +--- linux-2.6.37.1/arch/um/sys-i386/syscalls.c 2011-01-04 19:50:19.000000000 -0500
19364 ++++ linux-2.6.37.1/arch/um/sys-i386/syscalls.c 2011-01-17 02:41:00.000000000 -0500
19365 @@ -11,6 +11,21 @@
19366 #include "asm/uaccess.h"
19367 #include "asm/unistd.h"
19368 @@ -5921,9 +5983,9 @@ diff -urNp linux-2.6.37/arch/um/sys-i386/syscalls.c linux-2.6.37/arch/um/sys-i38
19369 /*
19370 * The prototype on i386 is:
19371 *
19372 -diff -urNp linux-2.6.37/arch/x86/boot/bitops.h linux-2.6.37/arch/x86/boot/bitops.h
19373 ---- linux-2.6.37/arch/x86/boot/bitops.h 2011-01-04 19:50:19.000000000 -0500
19374 -+++ linux-2.6.37/arch/x86/boot/bitops.h 2011-01-17 02:41:00.000000000 -0500
19375 +diff -urNp linux-2.6.37.1/arch/x86/boot/bitops.h linux-2.6.37.1/arch/x86/boot/bitops.h
19376 +--- linux-2.6.37.1/arch/x86/boot/bitops.h 2011-01-04 19:50:19.000000000 -0500
19377 ++++ linux-2.6.37.1/arch/x86/boot/bitops.h 2011-01-17 02:41:00.000000000 -0500
19378 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int
19379 u8 v;
19380 const u32 *p = (const u32 *)addr;
19381 @@ -5942,9 +6004,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/bitops.h linux-2.6.37/arch/x86/boot/bitops
19382 }
19383
19384 #endif /* BOOT_BITOPS_H */
19385 -diff -urNp linux-2.6.37/arch/x86/boot/boot.h linux-2.6.37/arch/x86/boot/boot.h
19386 ---- linux-2.6.37/arch/x86/boot/boot.h 2011-01-04 19:50:19.000000000 -0500
19387 -+++ linux-2.6.37/arch/x86/boot/boot.h 2011-01-17 02:41:00.000000000 -0500
19388 +diff -urNp linux-2.6.37.1/arch/x86/boot/boot.h linux-2.6.37.1/arch/x86/boot/boot.h
19389 +--- linux-2.6.37.1/arch/x86/boot/boot.h 2011-01-04 19:50:19.000000000 -0500
19390 ++++ linux-2.6.37.1/arch/x86/boot/boot.h 2011-01-17 02:41:00.000000000 -0500
19391 @@ -85,7 +85,7 @@ static inline void io_delay(void)
19392 static inline u16 ds(void)
19393 {
19394 @@ -5963,9 +6025,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/boot.h linux-2.6.37/arch/x86/boot/boot.h
19395 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
19396 return diff;
19397 }
19398 -diff -urNp linux-2.6.37/arch/x86/boot/compressed/head_32.S linux-2.6.37/arch/x86/boot/compressed/head_32.S
19399 ---- linux-2.6.37/arch/x86/boot/compressed/head_32.S 2011-01-04 19:50:19.000000000 -0500
19400 -+++ linux-2.6.37/arch/x86/boot/compressed/head_32.S 2011-01-17 02:41:00.000000000 -0500
19401 +diff -urNp linux-2.6.37.1/arch/x86/boot/compressed/head_32.S linux-2.6.37.1/arch/x86/boot/compressed/head_32.S
19402 +--- linux-2.6.37.1/arch/x86/boot/compressed/head_32.S 2011-01-04 19:50:19.000000000 -0500
19403 ++++ linux-2.6.37.1/arch/x86/boot/compressed/head_32.S 2011-01-17 02:41:00.000000000 -0500
19404 @@ -76,7 +76,7 @@ ENTRY(startup_32)
19405 notl %eax
19406 andl %eax, %ebx
19407 @@ -5994,9 +6056,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/compressed/head_32.S linux-2.6.37/arch/x86
19408 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
19409 jmp 1b
19410 2:
19411 -diff -urNp linux-2.6.37/arch/x86/boot/compressed/head_64.S linux-2.6.37/arch/x86/boot/compressed/head_64.S
19412 ---- linux-2.6.37/arch/x86/boot/compressed/head_64.S 2011-01-04 19:50:19.000000000 -0500
19413 -+++ linux-2.6.37/arch/x86/boot/compressed/head_64.S 2011-01-17 02:41:00.000000000 -0500
19414 +diff -urNp linux-2.6.37.1/arch/x86/boot/compressed/head_64.S linux-2.6.37.1/arch/x86/boot/compressed/head_64.S
19415 +--- linux-2.6.37.1/arch/x86/boot/compressed/head_64.S 2011-01-04 19:50:19.000000000 -0500
19416 ++++ linux-2.6.37.1/arch/x86/boot/compressed/head_64.S 2011-01-17 02:41:00.000000000 -0500
19417 @@ -91,7 +91,7 @@ ENTRY(startup_32)
19418 notl %eax
19419 andl %eax, %ebx
19420 @@ -6015,9 +6077,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/compressed/head_64.S linux-2.6.37/arch/x86
19421 #endif
19422
19423 /* Target address to relocate to for decompression */
19424 -diff -urNp linux-2.6.37/arch/x86/boot/compressed/misc.c linux-2.6.37/arch/x86/boot/compressed/misc.c
19425 ---- linux-2.6.37/arch/x86/boot/compressed/misc.c 2011-01-04 19:50:19.000000000 -0500
19426 -+++ linux-2.6.37/arch/x86/boot/compressed/misc.c 2011-01-17 02:41:00.000000000 -0500
19427 +diff -urNp linux-2.6.37.1/arch/x86/boot/compressed/misc.c linux-2.6.37.1/arch/x86/boot/compressed/misc.c
19428 +--- linux-2.6.37.1/arch/x86/boot/compressed/misc.c 2011-01-04 19:50:19.000000000 -0500
19429 ++++ linux-2.6.37.1/arch/x86/boot/compressed/misc.c 2011-01-17 02:41:00.000000000 -0500
19430 @@ -306,7 +306,7 @@ static void parse_elf(void *output)
19431 case PT_LOAD:
19432 #ifdef CONFIG_RELOCATABLE
19433 @@ -6036,9 +6098,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/compressed/misc.c linux-2.6.37/arch/x86/bo
19434 error("Wrong destination address");
19435 #endif
19436
19437 -diff -urNp linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c
19438 ---- linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c 2011-01-04 19:50:19.000000000 -0500
19439 -+++ linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c 2011-01-17 02:41:00.000000000 -0500
19440 +diff -urNp linux-2.6.37.1/arch/x86/boot/compressed/mkpiggy.c linux-2.6.37.1/arch/x86/boot/compressed/mkpiggy.c
19441 +--- linux-2.6.37.1/arch/x86/boot/compressed/mkpiggy.c 2011-01-04 19:50:19.000000000 -0500
19442 ++++ linux-2.6.37.1/arch/x86/boot/compressed/mkpiggy.c 2011-01-17 02:41:00.000000000 -0500
19443 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
19444
19445 offs = (olen > ilen) ? olen - ilen : 0;
19446 @@ -6048,9 +6110,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c linux-2.6.37/arch/x86
19447 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
19448
19449 printf(".section \".rodata..compressed\",\"a\",@progbits\n");
19450 -diff -urNp linux-2.6.37/arch/x86/boot/compressed/relocs.c linux-2.6.37/arch/x86/boot/compressed/relocs.c
19451 ---- linux-2.6.37/arch/x86/boot/compressed/relocs.c 2011-01-04 19:50:19.000000000 -0500
19452 -+++ linux-2.6.37/arch/x86/boot/compressed/relocs.c 2011-01-17 02:41:00.000000000 -0500
19453 +diff -urNp linux-2.6.37.1/arch/x86/boot/compressed/relocs.c linux-2.6.37.1/arch/x86/boot/compressed/relocs.c
19454 +--- linux-2.6.37.1/arch/x86/boot/compressed/relocs.c 2011-01-04 19:50:19.000000000 -0500
19455 ++++ linux-2.6.37.1/arch/x86/boot/compressed/relocs.c 2011-01-17 02:41:00.000000000 -0500
19456 @@ -13,8 +13,11 @@
19457
19458 static void die(char *fmt, ...);
19459 @@ -6243,9 +6305,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/compressed/relocs.c linux-2.6.37/arch/x86/
19460 read_shdrs(fp);
19461 read_strtabs(fp);
19462 read_symtabs(fp);
19463 -diff -urNp linux-2.6.37/arch/x86/boot/cpucheck.c linux-2.6.37/arch/x86/boot/cpucheck.c
19464 ---- linux-2.6.37/arch/x86/boot/cpucheck.c 2011-01-04 19:50:19.000000000 -0500
19465 -+++ linux-2.6.37/arch/x86/boot/cpucheck.c 2011-01-17 02:41:00.000000000 -0500
19466 +diff -urNp linux-2.6.37.1/arch/x86/boot/cpucheck.c linux-2.6.37.1/arch/x86/boot/cpucheck.c
19467 +--- linux-2.6.37.1/arch/x86/boot/cpucheck.c 2011-01-04 19:50:19.000000000 -0500
19468 ++++ linux-2.6.37.1/arch/x86/boot/cpucheck.c 2011-01-17 02:41:00.000000000 -0500
19469 @@ -74,7 +74,7 @@ static int has_fpu(void)
19470 u16 fcw = -1, fsw = -1;
19471 u32 cr0;
19472 @@ -6341,9 +6403,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/cpucheck.c linux-2.6.37/arch/x86/boot/cpuc
19473
19474 err = check_flags();
19475 }
19476 -diff -urNp linux-2.6.37/arch/x86/boot/header.S linux-2.6.37/arch/x86/boot/header.S
19477 ---- linux-2.6.37/arch/x86/boot/header.S 2011-01-04 19:50:19.000000000 -0500
19478 -+++ linux-2.6.37/arch/x86/boot/header.S 2011-01-17 02:41:00.000000000 -0500
19479 +diff -urNp linux-2.6.37.1/arch/x86/boot/header.S linux-2.6.37.1/arch/x86/boot/header.S
19480 +--- linux-2.6.37.1/arch/x86/boot/header.S 2011-01-04 19:50:19.000000000 -0500
19481 ++++ linux-2.6.37.1/arch/x86/boot/header.S 2011-01-17 02:41:00.000000000 -0500
19482 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
19483 # single linked list of
19484 # struct setup_data
19485 @@ -6353,9 +6415,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/header.S linux-2.6.37/arch/x86/boot/header
19486
19487 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
19488 #define VO_INIT_SIZE (VO__end - VO__text)
19489 -diff -urNp linux-2.6.37/arch/x86/boot/memory.c linux-2.6.37/arch/x86/boot/memory.c
19490 ---- linux-2.6.37/arch/x86/boot/memory.c 2011-01-04 19:50:19.000000000 -0500
19491 -+++ linux-2.6.37/arch/x86/boot/memory.c 2011-01-17 02:41:00.000000000 -0500
19492 +diff -urNp linux-2.6.37.1/arch/x86/boot/memory.c linux-2.6.37.1/arch/x86/boot/memory.c
19493 +--- linux-2.6.37.1/arch/x86/boot/memory.c 2011-01-04 19:50:19.000000000 -0500
19494 ++++ linux-2.6.37.1/arch/x86/boot/memory.c 2011-01-17 02:41:00.000000000 -0500
19495 @@ -19,7 +19,7 @@
19496
19497 static int detect_memory_e820(void)
19498 @@ -6365,9 +6427,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/memory.c linux-2.6.37/arch/x86/boot/memory
19499 struct biosregs ireg, oreg;
19500 struct e820entry *desc = boot_params.e820_map;
19501 static struct e820entry buf; /* static so it is zeroed */
19502 -diff -urNp linux-2.6.37/arch/x86/boot/video.c linux-2.6.37/arch/x86/boot/video.c
19503 ---- linux-2.6.37/arch/x86/boot/video.c 2011-01-04 19:50:19.000000000 -0500
19504 -+++ linux-2.6.37/arch/x86/boot/video.c 2011-01-17 02:41:00.000000000 -0500
19505 +diff -urNp linux-2.6.37.1/arch/x86/boot/video.c linux-2.6.37.1/arch/x86/boot/video.c
19506 +--- linux-2.6.37.1/arch/x86/boot/video.c 2011-01-04 19:50:19.000000000 -0500
19507 ++++ linux-2.6.37.1/arch/x86/boot/video.c 2011-01-17 02:41:00.000000000 -0500
19508 @@ -96,7 +96,7 @@ static void store_mode_params(void)
19509 static unsigned int get_entry(void)
19510 {
19511 @@ -6377,9 +6439,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/video.c linux-2.6.37/arch/x86/boot/video.c
19512 int key;
19513 unsigned int v;
19514
19515 -diff -urNp linux-2.6.37/arch/x86/boot/video-vesa.c linux-2.6.37/arch/x86/boot/video-vesa.c
19516 ---- linux-2.6.37/arch/x86/boot/video-vesa.c 2011-01-04 19:50:19.000000000 -0500
19517 -+++ linux-2.6.37/arch/x86/boot/video-vesa.c 2011-01-17 02:41:00.000000000 -0500
19518 +diff -urNp linux-2.6.37.1/arch/x86/boot/video-vesa.c linux-2.6.37.1/arch/x86/boot/video-vesa.c
19519 +--- linux-2.6.37.1/arch/x86/boot/video-vesa.c 2011-01-04 19:50:19.000000000 -0500
19520 ++++ linux-2.6.37.1/arch/x86/boot/video-vesa.c 2011-01-17 02:41:00.000000000 -0500
19521 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
19522
19523 boot_params.screen_info.vesapm_seg = oreg.es;
19524 @@ -6388,9 +6450,9 @@ diff -urNp linux-2.6.37/arch/x86/boot/video-vesa.c linux-2.6.37/arch/x86/boot/vi
19525 }
19526
19527 /*
19528 -diff -urNp linux-2.6.37/arch/x86/ia32/ia32_aout.c linux-2.6.37/arch/x86/ia32/ia32_aout.c
19529 ---- linux-2.6.37/arch/x86/ia32/ia32_aout.c 2011-01-04 19:50:19.000000000 -0500
19530 -+++ linux-2.6.37/arch/x86/ia32/ia32_aout.c 2011-01-17 02:41:00.000000000 -0500
19531 +diff -urNp linux-2.6.37.1/arch/x86/ia32/ia32_aout.c linux-2.6.37.1/arch/x86/ia32/ia32_aout.c
19532 +--- linux-2.6.37.1/arch/x86/ia32/ia32_aout.c 2011-01-04 19:50:19.000000000 -0500
19533 ++++ linux-2.6.37.1/arch/x86/ia32/ia32_aout.c 2011-01-17 02:41:00.000000000 -0500
19534 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
19535 unsigned long dump_start, dump_size;
19536 struct user32 dump;
19537 @@ -6400,9 +6462,9 @@ diff -urNp linux-2.6.37/arch/x86/ia32/ia32_aout.c linux-2.6.37/arch/x86/ia32/ia3
19538 fs = get_fs();
19539 set_fs(KERNEL_DS);
19540 has_dumped = 1;
19541 -diff -urNp linux-2.6.37/arch/x86/ia32/ia32entry.S linux-2.6.37/arch/x86/ia32/ia32entry.S
19542 ---- linux-2.6.37/arch/x86/ia32/ia32entry.S 2011-01-04 19:50:19.000000000 -0500
19543 -+++ linux-2.6.37/arch/x86/ia32/ia32entry.S 2011-01-17 02:41:00.000000000 -0500
19544 +diff -urNp linux-2.6.37.1/arch/x86/ia32/ia32entry.S linux-2.6.37.1/arch/x86/ia32/ia32entry.S
19545 +--- linux-2.6.37.1/arch/x86/ia32/ia32entry.S 2011-01-04 19:50:19.000000000 -0500
19546 ++++ linux-2.6.37.1/arch/x86/ia32/ia32entry.S 2011-01-17 02:41:00.000000000 -0500
19547 @@ -13,6 +13,7 @@
19548 #include <asm/thread_info.h>
19549 #include <asm/segment.h>
19550 @@ -6497,9 +6559,9 @@ diff -urNp linux-2.6.37/arch/x86/ia32/ia32entry.S linux-2.6.37/arch/x86/ia32/ia3
19551 /*
19552 * No need to follow this irqs on/off section: the syscall
19553 * disabled irqs and here we enable it straight after entry:
19554 -diff -urNp linux-2.6.37/arch/x86/ia32/ia32_signal.c linux-2.6.37/arch/x86/ia32/ia32_signal.c
19555 ---- linux-2.6.37/arch/x86/ia32/ia32_signal.c 2011-01-04 19:50:19.000000000 -0500
19556 -+++ linux-2.6.37/arch/x86/ia32/ia32_signal.c 2011-01-17 02:41:00.000000000 -0500
19557 +diff -urNp linux-2.6.37.1/arch/x86/ia32/ia32_signal.c linux-2.6.37.1/arch/x86/ia32/ia32_signal.c
19558 +--- linux-2.6.37.1/arch/x86/ia32/ia32_signal.c 2011-01-04 19:50:19.000000000 -0500
19559 ++++ linux-2.6.37.1/arch/x86/ia32/ia32_signal.c 2011-01-17 02:41:00.000000000 -0500
19560 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
19561 sp -= frame_size;
19562 /* Align the stack pointer according to the i386 ABI,
19563 @@ -6549,9 +6611,9 @@ diff -urNp linux-2.6.37/arch/x86/ia32/ia32_signal.c linux-2.6.37/arch/x86/ia32/i
19564 } put_user_catch(err);
19565
19566 if (err)
19567 -diff -urNp linux-2.6.37/arch/x86/include/asm/alternative.h linux-2.6.37/arch/x86/include/asm/alternative.h
19568 ---- linux-2.6.37/arch/x86/include/asm/alternative.h 2011-01-04 19:50:19.000000000 -0500
19569 -+++ linux-2.6.37/arch/x86/include/asm/alternative.h 2011-01-17 02:41:00.000000000 -0500
19570 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/alternative.h linux-2.6.37.1/arch/x86/include/asm/alternative.h
19571 +--- linux-2.6.37.1/arch/x86/include/asm/alternative.h 2011-01-04 19:50:19.000000000 -0500
19572 ++++ linux-2.6.37.1/arch/x86/include/asm/alternative.h 2011-01-17 02:41:00.000000000 -0500
19573 @@ -93,7 +93,7 @@ static inline int alternatives_text_rese
19574 ".section .discard,\"aw\",@progbits\n" \
19575 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
19576 @@ -6561,9 +6623,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/alternative.h linux-2.6.37/arch/x86
19577 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
19578 ".previous"
19579
19580 -diff -urNp linux-2.6.37/arch/x86/include/asm/apm.h linux-2.6.37/arch/x86/include/asm/apm.h
19581 ---- linux-2.6.37/arch/x86/include/asm/apm.h 2011-01-04 19:50:19.000000000 -0500
19582 -+++ linux-2.6.37/arch/x86/include/asm/apm.h 2011-01-17 02:41:00.000000000 -0500
19583 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/apm.h linux-2.6.37.1/arch/x86/include/asm/apm.h
19584 +--- linux-2.6.37.1/arch/x86/include/asm/apm.h 2011-01-04 19:50:19.000000000 -0500
19585 ++++ linux-2.6.37.1/arch/x86/include/asm/apm.h 2011-01-17 02:41:00.000000000 -0500
19586 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
19587 __asm__ __volatile__(APM_DO_ZERO_SEGS
19588 "pushl %%edi\n\t"
19589 @@ -6582,9 +6644,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/apm.h linux-2.6.37/arch/x86/include
19590 "setc %%bl\n\t"
19591 "popl %%ebp\n\t"
19592 "popl %%edi\n\t"
19593 -diff -urNp linux-2.6.37/arch/x86/include/asm/atomic64_32.h linux-2.6.37/arch/x86/include/asm/atomic64_32.h
19594 ---- linux-2.6.37/arch/x86/include/asm/atomic64_32.h 2011-01-04 19:50:19.000000000 -0500
19595 -+++ linux-2.6.37/arch/x86/include/asm/atomic64_32.h 2011-01-17 02:41:00.000000000 -0500
19596 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/atomic64_32.h linux-2.6.37.1/arch/x86/include/asm/atomic64_32.h
19597 +--- linux-2.6.37.1/arch/x86/include/asm/atomic64_32.h 2011-01-04 19:50:19.000000000 -0500
19598 ++++ linux-2.6.37.1/arch/x86/include/asm/atomic64_32.h 2011-01-17 02:41:00.000000000 -0500
19599 @@ -12,6 +12,14 @@ typedef struct {
19600 u64 __aligned(8) counter;
19601 } atomic64_t;
19602 @@ -6600,9 +6662,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/atomic64_32.h linux-2.6.37/arch/x86
19603 #define ATOMIC64_INIT(val) { (val) }
19604
19605 #ifdef CONFIG_X86_CMPXCHG64
19606 -diff -urNp linux-2.6.37/arch/x86/include/asm/atomic64_64.h linux-2.6.37/arch/x86/include/asm/atomic64_64.h
19607 ---- linux-2.6.37/arch/x86/include/asm/atomic64_64.h 2011-01-04 19:50:19.000000000 -0500
19608 -+++ linux-2.6.37/arch/x86/include/asm/atomic64_64.h 2011-01-17 02:41:00.000000000 -0500
19609 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/atomic64_64.h linux-2.6.37.1/arch/x86/include/asm/atomic64_64.h
19610 +--- linux-2.6.37.1/arch/x86/include/asm/atomic64_64.h 2011-01-04 19:50:19.000000000 -0500
19611 ++++ linux-2.6.37.1/arch/x86/include/asm/atomic64_64.h 2011-01-17 02:41:00.000000000 -0500
19612 @@ -18,7 +18,19 @@
19613 */
19614 static inline long atomic64_read(const atomic64_t *v)
19615 @@ -6912,9 +6974,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/atomic64_64.h linux-2.6.37/arch/x86
19616 }
19617
19618 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
19619 -diff -urNp linux-2.6.37/arch/x86/include/asm/atomic.h linux-2.6.37/arch/x86/include/asm/atomic.h
19620 ---- linux-2.6.37/arch/x86/include/asm/atomic.h 2011-01-04 19:50:19.000000000 -0500
19621 -+++ linux-2.6.37/arch/x86/include/asm/atomic.h 2011-01-17 02:41:00.000000000 -0500
19622 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/atomic.h linux-2.6.37.1/arch/x86/include/asm/atomic.h
19623 +--- linux-2.6.37.1/arch/x86/include/asm/atomic.h 2011-01-04 19:50:19.000000000 -0500
19624 ++++ linux-2.6.37.1/arch/x86/include/asm/atomic.h 2011-01-17 02:41:00.000000000 -0500
19625 @@ -22,7 +22,18 @@
19626 */
19627 static inline int atomic_read(const atomic_t *v)
19628 @@ -7239,9 +7301,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/atomic.h linux-2.6.37/arch/x86/incl
19629 }
19630
19631 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
19632 -diff -urNp linux-2.6.37/arch/x86/include/asm/bitops.h linux-2.6.37/arch/x86/include/asm/bitops.h
19633 ---- linux-2.6.37/arch/x86/include/asm/bitops.h 2011-01-04 19:50:19.000000000 -0500
19634 -+++ linux-2.6.37/arch/x86/include/asm/bitops.h 2011-01-17 02:41:00.000000000 -0500
19635 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/bitops.h linux-2.6.37.1/arch/x86/include/asm/bitops.h
19636 +--- linux-2.6.37.1/arch/x86/include/asm/bitops.h 2011-01-04 19:50:19.000000000 -0500
19637 ++++ linux-2.6.37.1/arch/x86/include/asm/bitops.h 2011-01-17 02:41:00.000000000 -0500
19638 @@ -38,7 +38,7 @@
19639 * a mask operation on a byte.
19640 */
19641 @@ -7251,9 +7313,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/bitops.h linux-2.6.37/arch/x86/incl
19642 #define CONST_MASK(nr) (1 << ((nr) & 7))
19643
19644 /**
19645 -diff -urNp linux-2.6.37/arch/x86/include/asm/boot.h linux-2.6.37/arch/x86/include/asm/boot.h
19646 ---- linux-2.6.37/arch/x86/include/asm/boot.h 2011-01-04 19:50:19.000000000 -0500
19647 -+++ linux-2.6.37/arch/x86/include/asm/boot.h 2011-01-17 02:41:00.000000000 -0500
19648 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/boot.h linux-2.6.37.1/arch/x86/include/asm/boot.h
19649 +--- linux-2.6.37.1/arch/x86/include/asm/boot.h 2011-01-04 19:50:19.000000000 -0500
19650 ++++ linux-2.6.37.1/arch/x86/include/asm/boot.h 2011-01-17 02:41:00.000000000 -0500
19651 @@ -11,10 +11,15 @@
19652 #include <asm/pgtable_types.h>
19653
19654 @@ -7271,9 +7333,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/boot.h linux-2.6.37/arch/x86/includ
19655 /* Minimum kernel alignment, as a power of two */
19656 #ifdef CONFIG_X86_64
19657 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
19658 -diff -urNp linux-2.6.37/arch/x86/include/asm/cacheflush.h linux-2.6.37/arch/x86/include/asm/cacheflush.h
19659 ---- linux-2.6.37/arch/x86/include/asm/cacheflush.h 2011-01-04 19:50:19.000000000 -0500
19660 -+++ linux-2.6.37/arch/x86/include/asm/cacheflush.h 2011-01-17 02:41:00.000000000 -0500
19661 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/cacheflush.h linux-2.6.37.1/arch/x86/include/asm/cacheflush.h
19662 +--- linux-2.6.37.1/arch/x86/include/asm/cacheflush.h 2011-01-04 19:50:19.000000000 -0500
19663 ++++ linux-2.6.37.1/arch/x86/include/asm/cacheflush.h 2011-01-17 02:41:00.000000000 -0500
19664 @@ -66,7 +66,7 @@ static inline unsigned long get_page_mem
19665 unsigned long pg_flags = pg->flags & _PGMT_MASK;
19666
19667 @@ -7283,9 +7345,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/cacheflush.h linux-2.6.37/arch/x86/
19668 else if (pg_flags == _PGMT_WC)
19669 return _PAGE_CACHE_WC;
19670 else if (pg_flags == _PGMT_UC_MINUS)
19671 -diff -urNp linux-2.6.37/arch/x86/include/asm/cache.h linux-2.6.37/arch/x86/include/asm/cache.h
19672 ---- linux-2.6.37/arch/x86/include/asm/cache.h 2011-01-04 19:50:19.000000000 -0500
19673 -+++ linux-2.6.37/arch/x86/include/asm/cache.h 2011-01-17 02:41:00.000000000 -0500
19674 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/cache.h linux-2.6.37.1/arch/x86/include/asm/cache.h
19675 +--- linux-2.6.37.1/arch/x86/include/asm/cache.h 2011-01-04 19:50:19.000000000 -0500
19676 ++++ linux-2.6.37.1/arch/x86/include/asm/cache.h 2011-01-17 02:41:00.000000000 -0500
19677 @@ -8,6 +8,7 @@
19678 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
19679
19680 @@ -7294,9 +7356,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/cache.h linux-2.6.37/arch/x86/inclu
19681
19682 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
19683 #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
19684 -diff -urNp linux-2.6.37/arch/x86/include/asm/checksum_32.h linux-2.6.37/arch/x86/include/asm/checksum_32.h
19685 ---- linux-2.6.37/arch/x86/include/asm/checksum_32.h 2011-01-04 19:50:19.000000000 -0500
19686 -+++ linux-2.6.37/arch/x86/include/asm/checksum_32.h 2011-01-17 02:41:00.000000000 -0500
19687 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/checksum_32.h linux-2.6.37.1/arch/x86/include/asm/checksum_32.h
19688 +--- linux-2.6.37.1/arch/x86/include/asm/checksum_32.h 2011-01-04 19:50:19.000000000 -0500
19689 ++++ linux-2.6.37.1/arch/x86/include/asm/checksum_32.h 2011-01-17 02:41:00.000000000 -0500
19690 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
19691 int len, __wsum sum,
19692 int *src_err_ptr, int *dst_err_ptr);
19693 @@ -7330,9 +7392,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/checksum_32.h linux-2.6.37/arch/x86
19694 len, sum, NULL, err_ptr);
19695
19696 if (len)
19697 -diff -urNp linux-2.6.37/arch/x86/include/asm/cpufeature.h linux-2.6.37/arch/x86/include/asm/cpufeature.h
19698 ---- linux-2.6.37/arch/x86/include/asm/cpufeature.h 2011-01-04 19:50:19.000000000 -0500
19699 -+++ linux-2.6.37/arch/x86/include/asm/cpufeature.h 2011-01-17 02:41:00.000000000 -0500
19700 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/cpufeature.h linux-2.6.37.1/arch/x86/include/asm/cpufeature.h
19701 +--- linux-2.6.37.1/arch/x86/include/asm/cpufeature.h 2011-01-04 19:50:19.000000000 -0500
19702 ++++ linux-2.6.37.1/arch/x86/include/asm/cpufeature.h 2011-01-17 02:41:00.000000000 -0500
19703 @@ -349,7 +349,7 @@ static __always_inline __pure bool __sta
19704 ".section .discard,\"aw\",@progbits\n"
19705 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
19706 @@ -7342,9 +7404,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/cpufeature.h linux-2.6.37/arch/x86/
19707 "3: movb $1,%0\n"
19708 "4:\n"
19709 ".previous\n"
19710 -diff -urNp linux-2.6.37/arch/x86/include/asm/desc.h linux-2.6.37/arch/x86/include/asm/desc.h
19711 ---- linux-2.6.37/arch/x86/include/asm/desc.h 2011-01-04 19:50:19.000000000 -0500
19712 -+++ linux-2.6.37/arch/x86/include/asm/desc.h 2011-01-17 02:41:00.000000000 -0500
19713 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/desc.h linux-2.6.37.1/arch/x86/include/asm/desc.h
19714 +--- linux-2.6.37.1/arch/x86/include/asm/desc.h 2011-01-04 19:50:19.000000000 -0500
19715 ++++ linux-2.6.37.1/arch/x86/include/asm/desc.h 2011-01-17 02:41:00.000000000 -0500
19716 @@ -4,6 +4,7 @@
19717 #include <asm/desc_defs.h>
19718 #include <asm/ldt.h>
19719 @@ -7514,9 +7576,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/desc.h linux-2.6.37/arch/x86/includ
19720 +#endif
19721 +
19722 #endif /* _ASM_X86_DESC_H */
19723 -diff -urNp linux-2.6.37/arch/x86/include/asm/device.h linux-2.6.37/arch/x86/include/asm/device.h
19724 ---- linux-2.6.37/arch/x86/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
19725 -+++ linux-2.6.37/arch/x86/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
19726 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/device.h linux-2.6.37.1/arch/x86/include/asm/device.h
19727 +--- linux-2.6.37.1/arch/x86/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
19728 ++++ linux-2.6.37.1/arch/x86/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
19729 @@ -6,7 +6,7 @@ struct dev_archdata {
19730 void *acpi_handle;
19731 #endif
19732 @@ -7526,9 +7588,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/device.h linux-2.6.37/arch/x86/incl
19733 #endif
19734 #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
19735 void *iommu; /* hook for IOMMU specific extension */
19736 -diff -urNp linux-2.6.37/arch/x86/include/asm/dma-mapping.h linux-2.6.37/arch/x86/include/asm/dma-mapping.h
19737 ---- linux-2.6.37/arch/x86/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
19738 -+++ linux-2.6.37/arch/x86/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
19739 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/dma-mapping.h linux-2.6.37.1/arch/x86/include/asm/dma-mapping.h
19740 +--- linux-2.6.37.1/arch/x86/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
19741 ++++ linux-2.6.37.1/arch/x86/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
19742 @@ -26,9 +26,9 @@ extern int iommu_merge;
19743 extern struct device x86_dma_fallback_dev;
19744 extern int panic_on_overflow;
19745 @@ -7568,9 +7630,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/dma-mapping.h linux-2.6.37/arch/x86
19746
19747 WARN_ON(irqs_disabled()); /* for portability */
19748
19749 -diff -urNp linux-2.6.37/arch/x86/include/asm/e820.h linux-2.6.37/arch/x86/include/asm/e820.h
19750 ---- linux-2.6.37/arch/x86/include/asm/e820.h 2011-01-04 19:50:19.000000000 -0500
19751 -+++ linux-2.6.37/arch/x86/include/asm/e820.h 2011-01-17 02:41:00.000000000 -0500
19752 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/e820.h linux-2.6.37.1/arch/x86/include/asm/e820.h
19753 +--- linux-2.6.37.1/arch/x86/include/asm/e820.h 2011-01-04 19:50:19.000000000 -0500
19754 ++++ linux-2.6.37.1/arch/x86/include/asm/e820.h 2011-01-17 02:41:00.000000000 -0500
19755 @@ -69,7 +69,7 @@ struct e820map {
19756 #define ISA_START_ADDRESS 0xa0000
19757 #define ISA_END_ADDRESS 0x100000
19758 @@ -7580,9 +7642,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/e820.h linux-2.6.37/arch/x86/includ
19759 #define BIOS_END 0x00100000
19760
19761 #define BIOS_ROM_BASE 0xffe00000
19762 -diff -urNp linux-2.6.37/arch/x86/include/asm/elf.h linux-2.6.37/arch/x86/include/asm/elf.h
19763 ---- linux-2.6.37/arch/x86/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
19764 -+++ linux-2.6.37/arch/x86/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
19765 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/elf.h linux-2.6.37.1/arch/x86/include/asm/elf.h
19766 +--- linux-2.6.37.1/arch/x86/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
19767 ++++ linux-2.6.37.1/arch/x86/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
19768 @@ -237,7 +237,25 @@ extern int force_personality32;
19769 the loader. We need to make sure that it is out of the way of the program
19770 that it will "exec", and that there is sufficient room for the brk. */
19771 @@ -7636,9 +7698,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/elf.h linux-2.6.37/arch/x86/include
19772 -#define arch_randomize_brk arch_randomize_brk
19773 -
19774 #endif /* _ASM_X86_ELF_H */
19775 -diff -urNp linux-2.6.37/arch/x86/include/asm/futex.h linux-2.6.37/arch/x86/include/asm/futex.h
19776 ---- linux-2.6.37/arch/x86/include/asm/futex.h 2011-01-04 19:50:19.000000000 -0500
19777 -+++ linux-2.6.37/arch/x86/include/asm/futex.h 2011-01-25 20:24:56.000000000 -0500
19778 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/futex.h linux-2.6.37.1/arch/x86/include/asm/futex.h
19779 +--- linux-2.6.37.1/arch/x86/include/asm/futex.h 2011-01-04 19:50:19.000000000 -0500
19780 ++++ linux-2.6.37.1/arch/x86/include/asm/futex.h 2011-01-25 20:24:56.000000000 -0500
19781 @@ -12,16 +12,18 @@
19782 #include <asm/system.h>
19783
19784 @@ -7714,9 +7776,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/futex.h linux-2.6.37/arch/x86/inclu
19785 : "i" (-EFAULT), "r" (newval), "0" (oldval)
19786 : "memory"
19787 );
19788 -diff -urNp linux-2.6.37/arch/x86/include/asm/i387.h linux-2.6.37/arch/x86/include/asm/i387.h
19789 ---- linux-2.6.37/arch/x86/include/asm/i387.h 2011-01-04 19:50:19.000000000 -0500
19790 -+++ linux-2.6.37/arch/x86/include/asm/i387.h 2011-01-17 02:41:00.000000000 -0500
19791 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/i387.h linux-2.6.37.1/arch/x86/include/asm/i387.h
19792 +--- linux-2.6.37.1/arch/x86/include/asm/i387.h 2011-01-04 19:50:19.000000000 -0500
19793 ++++ linux-2.6.37.1/arch/x86/include/asm/i387.h 2011-01-17 02:41:00.000000000 -0500
19794 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
19795 {
19796 int err;
19797 @@ -7757,9 +7819,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/i387.h linux-2.6.37/arch/x86/includ
19798
19799 /*
19800 * These must be called with preempt disabled
19801 -diff -urNp linux-2.6.37/arch/x86/include/asm/io.h linux-2.6.37/arch/x86/include/asm/io.h
19802 ---- linux-2.6.37/arch/x86/include/asm/io.h 2011-01-04 19:50:19.000000000 -0500
19803 -+++ linux-2.6.37/arch/x86/include/asm/io.h 2011-01-27 22:37:21.000000000 -0500
19804 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/io.h linux-2.6.37.1/arch/x86/include/asm/io.h
19805 +--- linux-2.6.37.1/arch/x86/include/asm/io.h 2011-01-04 19:50:19.000000000 -0500
19806 ++++ linux-2.6.37.1/arch/x86/include/asm/io.h 2011-01-27 22:37:21.000000000 -0500
19807 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
19808
19809 #include <linux/vmalloc.h>
19810 @@ -7778,9 +7840,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/io.h linux-2.6.37/arch/x86/include/
19811 /*
19812 * Convert a virtual cached pointer to an uncached pointer
19813 */
19814 -diff -urNp linux-2.6.37/arch/x86/include/asm/iommu.h linux-2.6.37/arch/x86/include/asm/iommu.h
19815 ---- linux-2.6.37/arch/x86/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
19816 -+++ linux-2.6.37/arch/x86/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
19817 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/iommu.h linux-2.6.37.1/arch/x86/include/asm/iommu.h
19818 +--- linux-2.6.37.1/arch/x86/include/asm/iommu.h 2011-01-04 19:50:19.000000000 -0500
19819 ++++ linux-2.6.37.1/arch/x86/include/asm/iommu.h 2011-01-17 02:41:00.000000000 -0500
19820 @@ -1,7 +1,7 @@
19821 #ifndef _ASM_X86_IOMMU_H
19822 #define _ASM_X86_IOMMU_H
19823 @@ -7790,9 +7852,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/iommu.h linux-2.6.37/arch/x86/inclu
19824 extern int force_iommu, no_iommu;
19825 extern int iommu_detected;
19826 extern int iommu_pass_through;
19827 -diff -urNp linux-2.6.37/arch/x86/include/asm/irqflags.h linux-2.6.37/arch/x86/include/asm/irqflags.h
19828 ---- linux-2.6.37/arch/x86/include/asm/irqflags.h 2011-01-04 19:50:19.000000000 -0500
19829 -+++ linux-2.6.37/arch/x86/include/asm/irqflags.h 2011-01-17 02:41:00.000000000 -0500
19830 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/irqflags.h linux-2.6.37.1/arch/x86/include/asm/irqflags.h
19831 +--- linux-2.6.37.1/arch/x86/include/asm/irqflags.h 2011-01-04 19:50:19.000000000 -0500
19832 ++++ linux-2.6.37.1/arch/x86/include/asm/irqflags.h 2011-01-17 02:41:00.000000000 -0500
19833 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
19834 sti; \
19835 sysexit
19836 @@ -7805,9 +7867,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/irqflags.h linux-2.6.37/arch/x86/in
19837 #else
19838 #define INTERRUPT_RETURN iret
19839 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
19840 -diff -urNp linux-2.6.37/arch/x86/include/asm/kvm_host.h linux-2.6.37/arch/x86/include/asm/kvm_host.h
19841 ---- linux-2.6.37/arch/x86/include/asm/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
19842 -+++ linux-2.6.37/arch/x86/include/asm/kvm_host.h 2011-01-17 02:41:00.000000000 -0500
19843 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/kvm_host.h linux-2.6.37.1/arch/x86/include/asm/kvm_host.h
19844 +--- linux-2.6.37.1/arch/x86/include/asm/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
19845 ++++ linux-2.6.37.1/arch/x86/include/asm/kvm_host.h 2011-01-17 02:41:00.000000000 -0500
19846 @@ -585,7 +585,7 @@ struct kvm_x86_ops {
19847 const struct trace_print_flags *exit_reasons_str;
19848 };
19849 @@ -7817,9 +7879,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/kvm_host.h linux-2.6.37/arch/x86/in
19850
19851 int kvm_mmu_module_init(void);
19852 void kvm_mmu_module_exit(void);
19853 -diff -urNp linux-2.6.37/arch/x86/include/asm/local.h linux-2.6.37/arch/x86/include/asm/local.h
19854 ---- linux-2.6.37/arch/x86/include/asm/local.h 2011-01-04 19:50:19.000000000 -0500
19855 -+++ linux-2.6.37/arch/x86/include/asm/local.h 2011-01-17 02:41:00.000000000 -0500
19856 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/local.h linux-2.6.37.1/arch/x86/include/asm/local.h
19857 +--- linux-2.6.37.1/arch/x86/include/asm/local.h 2011-01-04 19:50:19.000000000 -0500
19858 ++++ linux-2.6.37.1/arch/x86/include/asm/local.h 2011-01-17 02:41:00.000000000 -0500
19859 @@ -18,26 +18,58 @@ typedef struct {
19860
19861 static inline void local_inc(local_t *l)
19862 @@ -7972,9 +8034,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/local.h linux-2.6.37/arch/x86/inclu
19863 : "+r" (i), "+m" (l->a.counter)
19864 : : "memory");
19865 return i + __i;
19866 -diff -urNp linux-2.6.37/arch/x86/include/asm/mc146818rtc.h linux-2.6.37/arch/x86/include/asm/mc146818rtc.h
19867 ---- linux-2.6.37/arch/x86/include/asm/mc146818rtc.h 2011-01-04 19:50:19.000000000 -0500
19868 -+++ linux-2.6.37/arch/x86/include/asm/mc146818rtc.h 2011-01-17 02:41:00.000000000 -0500
19869 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/mc146818rtc.h linux-2.6.37.1/arch/x86/include/asm/mc146818rtc.h
19870 +--- linux-2.6.37.1/arch/x86/include/asm/mc146818rtc.h 2011-01-04 19:50:19.000000000 -0500
19871 ++++ linux-2.6.37.1/arch/x86/include/asm/mc146818rtc.h 2011-01-17 02:41:00.000000000 -0500
19872 @@ -81,8 +81,8 @@ static inline unsigned char current_lock
19873 #else
19874 #define lock_cmos_prefix(reg) do {} while (0)
19875 @@ -7986,9 +8048,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mc146818rtc.h linux-2.6.37/arch/x86
19876 #define do_i_have_lock_cmos() 0
19877 #define current_lock_cmos_reg() 0
19878 #endif
19879 -diff -urNp linux-2.6.37/arch/x86/include/asm/microcode.h linux-2.6.37/arch/x86/include/asm/microcode.h
19880 ---- linux-2.6.37/arch/x86/include/asm/microcode.h 2011-01-04 19:50:19.000000000 -0500
19881 -+++ linux-2.6.37/arch/x86/include/asm/microcode.h 2011-01-17 02:41:00.000000000 -0500
19882 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/microcode.h linux-2.6.37.1/arch/x86/include/asm/microcode.h
19883 +--- linux-2.6.37.1/arch/x86/include/asm/microcode.h 2011-01-04 19:50:19.000000000 -0500
19884 ++++ linux-2.6.37.1/arch/x86/include/asm/microcode.h 2011-01-17 02:41:00.000000000 -0500
19885 @@ -12,13 +12,13 @@ struct device;
19886 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
19887
19888 @@ -8029,9 +8091,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/microcode.h linux-2.6.37/arch/x86/i
19889 {
19890 return NULL;
19891 }
19892 -diff -urNp linux-2.6.37/arch/x86/include/asm/mman.h linux-2.6.37/arch/x86/include/asm/mman.h
19893 ---- linux-2.6.37/arch/x86/include/asm/mman.h 2011-01-04 19:50:19.000000000 -0500
19894 -+++ linux-2.6.37/arch/x86/include/asm/mman.h 2011-01-17 02:41:00.000000000 -0500
19895 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/mman.h linux-2.6.37.1/arch/x86/include/asm/mman.h
19896 +--- linux-2.6.37.1/arch/x86/include/asm/mman.h 2011-01-04 19:50:19.000000000 -0500
19897 ++++ linux-2.6.37.1/arch/x86/include/asm/mman.h 2011-01-17 02:41:00.000000000 -0500
19898 @@ -5,4 +5,14 @@
19899
19900 #include <asm-generic/mman.h>
19901 @@ -8047,9 +8109,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mman.h linux-2.6.37/arch/x86/includ
19902 +#endif
19903 +
19904 #endif /* _ASM_X86_MMAN_H */
19905 -diff -urNp linux-2.6.37/arch/x86/include/asm/mmu_context.h linux-2.6.37/arch/x86/include/asm/mmu_context.h
19906 ---- linux-2.6.37/arch/x86/include/asm/mmu_context.h 2011-01-04 19:50:19.000000000 -0500
19907 -+++ linux-2.6.37/arch/x86/include/asm/mmu_context.h 2011-02-12 11:04:35.000000000 -0500
19908 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/mmu_context.h linux-2.6.37.1/arch/x86/include/asm/mmu_context.h
19909 +--- linux-2.6.37.1/arch/x86/include/asm/mmu_context.h 2011-02-22 16:05:30.000000000 -0500
19910 ++++ linux-2.6.37.1/arch/x86/include/asm/mmu_context.h 2011-02-22 16:05:42.000000000 -0500
19911 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
19912
19913 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
19914 @@ -8072,7 +8134,7 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mmu_context.h linux-2.6.37/arch/x86
19915 #ifdef CONFIG_SMP
19916 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
19917 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
19918 -@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_s
19919 +@@ -34,17 +49,30 @@ static inline void switch_mm(struct mm_s
19920 struct task_struct *tsk)
19921 {
19922 unsigned cpu = smp_processor_id();
19923 @@ -8081,8 +8143,6 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mmu_context.h linux-2.6.37/arch/x86
19924 +#endif
19925
19926 if (likely(prev != next)) {
19927 -- /* stop flush ipis for the previous mm */
19928 -- cpumask_clear_cpu(cpu, mm_cpumask(prev));
19929 #ifdef CONFIG_SMP
19930 +#ifdef CONFIG_X86_32
19931 + tlbstate = percpu_read(cpu_tlbstate.state);
19932 @@ -8101,12 +8161,12 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mmu_context.h linux-2.6.37/arch/x86
19933 + load_cr3(get_cpu_pgd(cpu));
19934 +#else
19935 load_cr3(next->pgd);
19936 +-
19937 +#endif
19938 -+ /* stop flush ipis for the previous mm */
19939 -+ cpumask_clear_cpu(cpu, mm_cpumask(prev));
19940 + /* stop flush ipis for the previous mm */
19941 + cpumask_clear_cpu(cpu, mm_cpumask(prev));
19942
19943 - /*
19944 - * load the LDT, if the LDT is different:
19945 +@@ -53,9 +81,38 @@ static inline void switch_mm(struct mm_s
19946 */
19947 if (unlikely(prev->context.ldt != next->context.ldt))
19948 load_LDT_nolock(&next->context);
19949 @@ -8146,7 +8206,7 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mmu_context.h linux-2.6.37/arch/x86
19950 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
19951 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
19952
19953 -@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_s
19954 +@@ -64,11 +121,28 @@ static inline void switch_mm(struct mm_s
19955 * tlb flush IPI delivery. We must reload CR3
19956 * to make sure to use no freed page tables.
19957 */
19958 @@ -8176,9 +8236,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mmu_context.h linux-2.6.37/arch/x86
19959 }
19960
19961 #define activate_mm(prev, next) \
19962 -diff -urNp linux-2.6.37/arch/x86/include/asm/mmu.h linux-2.6.37/arch/x86/include/asm/mmu.h
19963 ---- linux-2.6.37/arch/x86/include/asm/mmu.h 2011-01-04 19:50:19.000000000 -0500
19964 -+++ linux-2.6.37/arch/x86/include/asm/mmu.h 2011-01-17 02:41:00.000000000 -0500
19965 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/mmu.h linux-2.6.37.1/arch/x86/include/asm/mmu.h
19966 +--- linux-2.6.37.1/arch/x86/include/asm/mmu.h 2011-01-04 19:50:19.000000000 -0500
19967 ++++ linux-2.6.37.1/arch/x86/include/asm/mmu.h 2011-01-17 02:41:00.000000000 -0500
19968 @@ -9,10 +9,23 @@
19969 * we put the segment information here.
19970 */
19971 @@ -8205,9 +8265,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/mmu.h linux-2.6.37/arch/x86/include
19972 } mm_context_t;
19973
19974 #ifdef CONFIG_SMP
19975 -diff -urNp linux-2.6.37/arch/x86/include/asm/module.h linux-2.6.37/arch/x86/include/asm/module.h
19976 ---- linux-2.6.37/arch/x86/include/asm/module.h 2011-01-04 19:50:19.000000000 -0500
19977 -+++ linux-2.6.37/arch/x86/include/asm/module.h 2011-01-17 02:41:00.000000000 -0500
19978 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/module.h linux-2.6.37.1/arch/x86/include/asm/module.h
19979 +--- linux-2.6.37.1/arch/x86/include/asm/module.h 2011-01-04 19:50:19.000000000 -0500
19980 ++++ linux-2.6.37.1/arch/x86/include/asm/module.h 2011-01-17 02:41:00.000000000 -0500
19981 @@ -59,8 +59,26 @@
19982 #error unknown processor family
19983 #endif
19984 @@ -8236,9 +8296,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/module.h linux-2.6.37/arch/x86/incl
19985 #endif
19986
19987 #endif /* _ASM_X86_MODULE_H */
19988 -diff -urNp linux-2.6.37/arch/x86/include/asm/page_64_types.h linux-2.6.37/arch/x86/include/asm/page_64_types.h
19989 ---- linux-2.6.37/arch/x86/include/asm/page_64_types.h 2011-01-04 19:50:19.000000000 -0500
19990 -+++ linux-2.6.37/arch/x86/include/asm/page_64_types.h 2011-01-17 02:41:00.000000000 -0500
19991 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/page_64_types.h linux-2.6.37.1/arch/x86/include/asm/page_64_types.h
19992 +--- linux-2.6.37.1/arch/x86/include/asm/page_64_types.h 2011-01-04 19:50:19.000000000 -0500
19993 ++++ linux-2.6.37.1/arch/x86/include/asm/page_64_types.h 2011-01-17 02:41:00.000000000 -0500
19994 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
19995
19996 /* duplicated to the one in bootmem.h */
19997 @@ -8248,9 +8308,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/page_64_types.h linux-2.6.37/arch/x
19998
19999 extern unsigned long __phys_addr(unsigned long);
20000 #define __phys_reloc_hide(x) (x)
20001 -diff -urNp linux-2.6.37/arch/x86/include/asm/paravirt.h linux-2.6.37/arch/x86/include/asm/paravirt.h
20002 ---- linux-2.6.37/arch/x86/include/asm/paravirt.h 2011-01-04 19:50:19.000000000 -0500
20003 -+++ linux-2.6.37/arch/x86/include/asm/paravirt.h 2011-01-17 02:41:00.000000000 -0500
20004 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/paravirt.h linux-2.6.37.1/arch/x86/include/asm/paravirt.h
20005 +--- linux-2.6.37.1/arch/x86/include/asm/paravirt.h 2011-01-04 19:50:19.000000000 -0500
20006 ++++ linux-2.6.37.1/arch/x86/include/asm/paravirt.h 2011-01-17 02:41:00.000000000 -0500
20007 @@ -715,6 +715,21 @@ static inline void __set_fixmap(unsigned
20008 pv_mmu_ops.set_fixmap(idx, phys, flags);
20009 }
20010 @@ -8304,9 +8364,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/paravirt.h linux-2.6.37/arch/x86/in
20011 #endif /* CONFIG_X86_32 */
20012
20013 #endif /* __ASSEMBLY__ */
20014 -diff -urNp linux-2.6.37/arch/x86/include/asm/paravirt_types.h linux-2.6.37/arch/x86/include/asm/paravirt_types.h
20015 ---- linux-2.6.37/arch/x86/include/asm/paravirt_types.h 2011-01-04 19:50:19.000000000 -0500
20016 -+++ linux-2.6.37/arch/x86/include/asm/paravirt_types.h 2011-01-17 02:41:00.000000000 -0500
20017 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/paravirt_types.h linux-2.6.37.1/arch/x86/include/asm/paravirt_types.h
20018 +--- linux-2.6.37.1/arch/x86/include/asm/paravirt_types.h 2011-01-04 19:50:19.000000000 -0500
20019 ++++ linux-2.6.37.1/arch/x86/include/asm/paravirt_types.h 2011-01-17 02:41:00.000000000 -0500
20020 @@ -311,6 +311,12 @@ struct pv_mmu_ops {
20021 an mfn. We can tell which is which from the index. */
20022 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
20023 @@ -8320,9 +8380,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/paravirt_types.h linux-2.6.37/arch/
20024 };
20025
20026 struct arch_spinlock;
20027 -diff -urNp linux-2.6.37/arch/x86/include/asm/pci_x86.h linux-2.6.37/arch/x86/include/asm/pci_x86.h
20028 ---- linux-2.6.37/arch/x86/include/asm/pci_x86.h 2011-01-04 19:50:19.000000000 -0500
20029 -+++ linux-2.6.37/arch/x86/include/asm/pci_x86.h 2011-01-17 02:41:01.000000000 -0500
20030 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pci_x86.h linux-2.6.37.1/arch/x86/include/asm/pci_x86.h
20031 +--- linux-2.6.37.1/arch/x86/include/asm/pci_x86.h 2011-01-04 19:50:19.000000000 -0500
20032 ++++ linux-2.6.37.1/arch/x86/include/asm/pci_x86.h 2011-01-17 02:41:01.000000000 -0500
20033 @@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct
20034 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
20035
20036 @@ -8345,9 +8405,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pci_x86.h linux-2.6.37/arch/x86/inc
20037 extern bool port_cf9_safe;
20038
20039 /* arch_initcall level */
20040 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgalloc.h linux-2.6.37/arch/x86/include/asm/pgalloc.h
20041 ---- linux-2.6.37/arch/x86/include/asm/pgalloc.h 2011-01-04 19:50:19.000000000 -0500
20042 -+++ linux-2.6.37/arch/x86/include/asm/pgalloc.h 2011-01-17 02:41:01.000000000 -0500
20043 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgalloc.h linux-2.6.37.1/arch/x86/include/asm/pgalloc.h
20044 +--- linux-2.6.37.1/arch/x86/include/asm/pgalloc.h 2011-01-04 19:50:19.000000000 -0500
20045 ++++ linux-2.6.37.1/arch/x86/include/asm/pgalloc.h 2011-01-17 02:41:01.000000000 -0500
20046 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
20047 pmd_t *pmd, pte_t *pte)
20048 {
20049 @@ -8362,9 +8422,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgalloc.h linux-2.6.37/arch/x86/inc
20050 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
20051 }
20052
20053 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable-2level.h linux-2.6.37/arch/x86/include/asm/pgtable-2level.h
20054 ---- linux-2.6.37/arch/x86/include/asm/pgtable-2level.h 2011-01-04 19:50:19.000000000 -0500
20055 -+++ linux-2.6.37/arch/x86/include/asm/pgtable-2level.h 2011-01-17 02:41:01.000000000 -0500
20056 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable-2level.h linux-2.6.37.1/arch/x86/include/asm/pgtable-2level.h
20057 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable-2level.h 2011-01-04 19:50:19.000000000 -0500
20058 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable-2level.h 2011-01-17 02:41:01.000000000 -0500
20059 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
20060
20061 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
20062 @@ -8375,9 +8435,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable-2level.h linux-2.6.37/arch/
20063 }
20064
20065 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
20066 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_32.h linux-2.6.37/arch/x86/include/asm/pgtable_32.h
20067 ---- linux-2.6.37/arch/x86/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
20068 -+++ linux-2.6.37/arch/x86/include/asm/pgtable_32.h 2011-01-17 02:41:01.000000000 -0500
20069 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable_32.h linux-2.6.37.1/arch/x86/include/asm/pgtable_32.h
20070 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable_32.h 2011-01-04 19:50:19.000000000 -0500
20071 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable_32.h 2011-01-17 02:41:01.000000000 -0500
20072 @@ -25,9 +25,6 @@
20073 struct mm_struct;
20074 struct vm_area_struct;
20075 @@ -8421,9 +8481,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_32.h linux-2.6.37/arch/x86/
20076 /*
20077 * kern_addr_valid() is (1) for FLATMEM and (0) for
20078 * SPARSEMEM and DISCONTIGMEM
20079 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h
20080 ---- linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h 2011-01-04 19:50:19.000000000 -0500
20081 -+++ linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h 2011-01-17 02:41:01.000000000 -0500
20082 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable_32_types.h linux-2.6.37.1/arch/x86/include/asm/pgtable_32_types.h
20083 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable_32_types.h 2011-01-04 19:50:19.000000000 -0500
20084 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable_32_types.h 2011-01-17 02:41:01.000000000 -0500
20085 @@ -8,7 +8,7 @@
20086 */
20087 #ifdef CONFIG_X86_PAE
20088 @@ -8453,9 +8513,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h linux-2.6.37/arc
20089 #define MODULES_VADDR VMALLOC_START
20090 #define MODULES_END VMALLOC_END
20091 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
20092 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable-3level.h linux-2.6.37/arch/x86/include/asm/pgtable-3level.h
20093 ---- linux-2.6.37/arch/x86/include/asm/pgtable-3level.h 2011-01-04 19:50:19.000000000 -0500
20094 -+++ linux-2.6.37/arch/x86/include/asm/pgtable-3level.h 2011-01-17 02:41:01.000000000 -0500
20095 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable-3level.h linux-2.6.37.1/arch/x86/include/asm/pgtable-3level.h
20096 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable-3level.h 2011-01-04 19:50:19.000000000 -0500
20097 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable-3level.h 2011-01-17 02:41:01.000000000 -0500
20098 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
20099
20100 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
20101 @@ -8473,9 +8533,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable-3level.h linux-2.6.37/arch/
20102 }
20103
20104 /*
20105 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_64.h linux-2.6.37/arch/x86/include/asm/pgtable_64.h
20106 ---- linux-2.6.37/arch/x86/include/asm/pgtable_64.h 2011-01-04 19:50:19.000000000 -0500
20107 -+++ linux-2.6.37/arch/x86/include/asm/pgtable_64.h 2011-01-17 02:41:01.000000000 -0500
20108 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable_64.h linux-2.6.37.1/arch/x86/include/asm/pgtable_64.h
20109 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable_64.h 2011-01-04 19:50:19.000000000 -0500
20110 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable_64.h 2011-01-17 02:41:01.000000000 -0500
20111 @@ -16,10 +16,13 @@
20112
20113 extern pud_t level3_kernel_pgt[512];
20114 @@ -8512,9 +8572,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_64.h linux-2.6.37/arch/x86/
20115 }
20116
20117 static inline void native_pgd_clear(pgd_t *pgd)
20118 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h
20119 ---- linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h 2011-01-04 19:50:19.000000000 -0500
20120 -+++ linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h 2011-01-17 02:41:01.000000000 -0500
20121 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable_64_types.h linux-2.6.37.1/arch/x86/include/asm/pgtable_64_types.h
20122 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable_64_types.h 2011-01-04 19:50:19.000000000 -0500
20123 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable_64_types.h 2011-01-17 02:41:01.000000000 -0500
20124 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
20125 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
20126 #define MODULES_END _AC(0xffffffffff000000, UL)
20127 @@ -8526,9 +8586,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h linux-2.6.37/arc
20128 +#define ktva_ktla(addr) (addr)
20129
20130 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
20131 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable.h linux-2.6.37/arch/x86/include/asm/pgtable.h
20132 ---- linux-2.6.37/arch/x86/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
20133 -+++ linux-2.6.37/arch/x86/include/asm/pgtable.h 2011-01-17 02:41:01.000000000 -0500
20134 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable.h linux-2.6.37.1/arch/x86/include/asm/pgtable.h
20135 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
20136 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable.h 2011-01-17 02:41:01.000000000 -0500
20137 @@ -78,12 +78,51 @@ extern struct mm_struct *pgd_page_get_mm
20138
20139 #define arch_end_context_switch(prev) do {} while(0)
20140 @@ -8698,9 +8758,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable.h linux-2.6.37/arch/x86/inc
20141
20142 #include <asm-generic/pgtable.h>
20143 #endif /* __ASSEMBLY__ */
20144 -diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_types.h linux-2.6.37/arch/x86/include/asm/pgtable_types.h
20145 ---- linux-2.6.37/arch/x86/include/asm/pgtable_types.h 2011-01-04 19:50:19.000000000 -0500
20146 -+++ linux-2.6.37/arch/x86/include/asm/pgtable_types.h 2011-01-17 02:41:01.000000000 -0500
20147 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/pgtable_types.h linux-2.6.37.1/arch/x86/include/asm/pgtable_types.h
20148 +--- linux-2.6.37.1/arch/x86/include/asm/pgtable_types.h 2011-01-04 19:50:19.000000000 -0500
20149 ++++ linux-2.6.37.1/arch/x86/include/asm/pgtable_types.h 2011-01-17 02:41:01.000000000 -0500
20150 @@ -16,12 +16,11 @@
20151 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
20152 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
20153 @@ -8812,9 +8872,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_types.h linux-2.6.37/arch/x
20154
20155 #define pgprot_writecombine pgprot_writecombine
20156 extern pgprot_t pgprot_writecombine(pgprot_t prot);
20157 -diff -urNp linux-2.6.37/arch/x86/include/asm/processor.h linux-2.6.37/arch/x86/include/asm/processor.h
20158 ---- linux-2.6.37/arch/x86/include/asm/processor.h 2011-01-04 19:50:19.000000000 -0500
20159 -+++ linux-2.6.37/arch/x86/include/asm/processor.h 2011-01-17 02:41:01.000000000 -0500
20160 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/processor.h linux-2.6.37.1/arch/x86/include/asm/processor.h
20161 +--- linux-2.6.37.1/arch/x86/include/asm/processor.h 2011-01-04 19:50:19.000000000 -0500
20162 ++++ linux-2.6.37.1/arch/x86/include/asm/processor.h 2011-01-17 02:41:01.000000000 -0500
20163 @@ -271,7 +271,7 @@ struct tss_struct {
20164
20165 } ____cacheline_aligned;
20166 @@ -8899,9 +8959,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/processor.h linux-2.6.37/arch/x86/i
20167 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
20168
20169 /* Get/set a process' ability to use the timestamp counter instruction */
20170 -diff -urNp linux-2.6.37/arch/x86/include/asm/ptrace.h linux-2.6.37/arch/x86/include/asm/ptrace.h
20171 ---- linux-2.6.37/arch/x86/include/asm/ptrace.h 2011-01-04 19:50:19.000000000 -0500
20172 -+++ linux-2.6.37/arch/x86/include/asm/ptrace.h 2011-01-17 02:41:01.000000000 -0500
20173 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/ptrace.h linux-2.6.37.1/arch/x86/include/asm/ptrace.h
20174 +--- linux-2.6.37.1/arch/x86/include/asm/ptrace.h 2011-01-04 19:50:19.000000000 -0500
20175 ++++ linux-2.6.37.1/arch/x86/include/asm/ptrace.h 2011-01-17 02:41:01.000000000 -0500
20176 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_
20177 }
20178
20179 @@ -8938,9 +8998,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/ptrace.h linux-2.6.37/arch/x86/incl
20180 #endif
20181 }
20182
20183 -diff -urNp linux-2.6.37/arch/x86/include/asm/reboot.h linux-2.6.37/arch/x86/include/asm/reboot.h
20184 ---- linux-2.6.37/arch/x86/include/asm/reboot.h 2011-01-04 19:50:19.000000000 -0500
20185 -+++ linux-2.6.37/arch/x86/include/asm/reboot.h 2011-01-17 02:41:01.000000000 -0500
20186 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/reboot.h linux-2.6.37.1/arch/x86/include/asm/reboot.h
20187 +--- linux-2.6.37.1/arch/x86/include/asm/reboot.h 2011-01-04 19:50:19.000000000 -0500
20188 ++++ linux-2.6.37.1/arch/x86/include/asm/reboot.h 2011-01-17 02:41:01.000000000 -0500
20189 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
20190
20191 void native_machine_crash_shutdown(struct pt_regs *regs);
20192 @@ -8950,9 +9010,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/reboot.h linux-2.6.37/arch/x86/incl
20193
20194 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
20195 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
20196 -diff -urNp linux-2.6.37/arch/x86/include/asm/rwsem.h linux-2.6.37/arch/x86/include/asm/rwsem.h
20197 ---- linux-2.6.37/arch/x86/include/asm/rwsem.h 2011-01-04 19:50:19.000000000 -0500
20198 -+++ linux-2.6.37/arch/x86/include/asm/rwsem.h 2011-01-17 02:41:01.000000000 -0500
20199 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/rwsem.h linux-2.6.37.1/arch/x86/include/asm/rwsem.h
20200 +--- linux-2.6.37.1/arch/x86/include/asm/rwsem.h 2011-01-04 19:50:19.000000000 -0500
20201 ++++ linux-2.6.37.1/arch/x86/include/asm/rwsem.h 2011-01-17 02:41:01.000000000 -0500
20202 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw
20203 {
20204 asm volatile("# beginning down_read\n\t"
20205 @@ -9077,9 +9137,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/rwsem.h linux-2.6.37/arch/x86/inclu
20206 : "+r" (tmp), "+m" (sem->count)
20207 : : "memory");
20208
20209 -diff -urNp linux-2.6.37/arch/x86/include/asm/segment.h linux-2.6.37/arch/x86/include/asm/segment.h
20210 ---- linux-2.6.37/arch/x86/include/asm/segment.h 2011-01-04 19:50:19.000000000 -0500
20211 -+++ linux-2.6.37/arch/x86/include/asm/segment.h 2011-01-17 02:41:01.000000000 -0500
20212 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/segment.h linux-2.6.37.1/arch/x86/include/asm/segment.h
20213 +--- linux-2.6.37.1/arch/x86/include/asm/segment.h 2011-01-04 19:50:19.000000000 -0500
20214 ++++ linux-2.6.37.1/arch/x86/include/asm/segment.h 2011-01-17 02:41:01.000000000 -0500
20215 @@ -62,8 +62,8 @@
20216 * 26 - ESPFIX small SS
20217 * 27 - per-cpu [ offset to per-cpu data area ]
20218 @@ -9139,9 +9199,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/segment.h linux-2.6.37/arch/x86/inc
20219 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
20220 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
20221 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
20222 -diff -urNp linux-2.6.37/arch/x86/include/asm/smp.h linux-2.6.37/arch/x86/include/asm/smp.h
20223 ---- linux-2.6.37/arch/x86/include/asm/smp.h 2011-01-04 19:50:19.000000000 -0500
20224 -+++ linux-2.6.37/arch/x86/include/asm/smp.h 2011-01-17 02:41:01.000000000 -0500
20225 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/smp.h linux-2.6.37.1/arch/x86/include/asm/smp.h
20226 +--- linux-2.6.37.1/arch/x86/include/asm/smp.h 2011-01-04 19:50:19.000000000 -0500
20227 ++++ linux-2.6.37.1/arch/x86/include/asm/smp.h 2011-01-17 02:41:01.000000000 -0500
20228 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
20229 DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
20230 DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
20231 @@ -9151,9 +9211,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/smp.h linux-2.6.37/arch/x86/include
20232
20233 static inline struct cpumask *cpu_sibling_mask(int cpu)
20234 {
20235 -diff -urNp linux-2.6.37/arch/x86/include/asm/spinlock.h linux-2.6.37/arch/x86/include/asm/spinlock.h
20236 ---- linux-2.6.37/arch/x86/include/asm/spinlock.h 2011-01-04 19:50:19.000000000 -0500
20237 -+++ linux-2.6.37/arch/x86/include/asm/spinlock.h 2011-01-17 02:41:01.000000000 -0500
20238 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/spinlock.h linux-2.6.37.1/arch/x86/include/asm/spinlock.h
20239 +--- linux-2.6.37.1/arch/x86/include/asm/spinlock.h 2011-01-04 19:50:19.000000000 -0500
20240 ++++ linux-2.6.37.1/arch/x86/include/asm/spinlock.h 2011-01-17 02:41:01.000000000 -0500
20241 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
20242 static inline void arch_read_lock(arch_rwlock_t *rw)
20243 {
20244 @@ -9216,9 +9276,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/spinlock.h linux-2.6.37/arch/x86/in
20245 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
20246 }
20247
20248 -diff -urNp linux-2.6.37/arch/x86/include/asm/stackprotector.h linux-2.6.37/arch/x86/include/asm/stackprotector.h
20249 ---- linux-2.6.37/arch/x86/include/asm/stackprotector.h 2011-01-04 19:50:19.000000000 -0500
20250 -+++ linux-2.6.37/arch/x86/include/asm/stackprotector.h 2011-01-17 02:41:01.000000000 -0500
20251 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/stackprotector.h linux-2.6.37.1/arch/x86/include/asm/stackprotector.h
20252 +--- linux-2.6.37.1/arch/x86/include/asm/stackprotector.h 2011-01-04 19:50:19.000000000 -0500
20253 ++++ linux-2.6.37.1/arch/x86/include/asm/stackprotector.h 2011-01-17 02:41:01.000000000 -0500
20254 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
20255
20256 static inline void load_stack_canary_segment(void)
20257 @@ -9228,9 +9288,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/stackprotector.h linux-2.6.37/arch/
20258 asm volatile ("mov %0, %%gs" : : "r" (0));
20259 #endif
20260 }
20261 -diff -urNp linux-2.6.37/arch/x86/include/asm/system.h linux-2.6.37/arch/x86/include/asm/system.h
20262 ---- linux-2.6.37/arch/x86/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
20263 -+++ linux-2.6.37/arch/x86/include/asm/system.h 2011-01-17 02:41:01.000000000 -0500
20264 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/system.h linux-2.6.37.1/arch/x86/include/asm/system.h
20265 +--- linux-2.6.37.1/arch/x86/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
20266 ++++ linux-2.6.37.1/arch/x86/include/asm/system.h 2011-01-17 02:41:01.000000000 -0500
20267 @@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
20268 {
20269 unsigned long __limit;
20270 @@ -9249,9 +9309,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/system.h linux-2.6.37/arch/x86/incl
20271 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
20272
20273 void default_idle(void);
20274 -diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess_32.h linux-2.6.37/arch/x86/include/asm/uaccess_32.h
20275 ---- linux-2.6.37/arch/x86/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
20276 -+++ linux-2.6.37/arch/x86/include/asm/uaccess_32.h 2011-01-17 02:41:01.000000000 -0500
20277 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/uaccess_32.h linux-2.6.37.1/arch/x86/include/asm/uaccess_32.h
20278 +--- linux-2.6.37.1/arch/x86/include/asm/uaccess_32.h 2011-01-04 19:50:19.000000000 -0500
20279 ++++ linux-2.6.37.1/arch/x86/include/asm/uaccess_32.h 2011-01-17 02:41:01.000000000 -0500
20280 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
20281 static __always_inline unsigned long __must_check
20282 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20283 @@ -9408,9 +9468,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess_32.h linux-2.6.37/arch/x86/
20284 return n;
20285 }
20286
20287 -diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess_64.h linux-2.6.37/arch/x86/include/asm/uaccess_64.h
20288 ---- linux-2.6.37/arch/x86/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
20289 -+++ linux-2.6.37/arch/x86/include/asm/uaccess_64.h 2011-01-17 02:41:01.000000000 -0500
20290 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/uaccess_64.h linux-2.6.37.1/arch/x86/include/asm/uaccess_64.h
20291 +--- linux-2.6.37.1/arch/x86/include/asm/uaccess_64.h 2011-01-04 19:50:19.000000000 -0500
20292 ++++ linux-2.6.37.1/arch/x86/include/asm/uaccess_64.h 2011-01-17 02:41:01.000000000 -0500
20293 @@ -11,6 +11,9 @@
20294 #include <asm/alternative.h>
20295 #include <asm/cpufeature.h>
20296 @@ -9783,9 +9843,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess_64.h linux-2.6.37/arch/x86/
20297 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20298
20299 #endif /* _ASM_X86_UACCESS_64_H */
20300 -diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess.h linux-2.6.37/arch/x86/include/asm/uaccess.h
20301 ---- linux-2.6.37/arch/x86/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
20302 -+++ linux-2.6.37/arch/x86/include/asm/uaccess.h 2011-01-17 02:41:01.000000000 -0500
20303 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/uaccess.h linux-2.6.37.1/arch/x86/include/asm/uaccess.h
20304 +--- linux-2.6.37.1/arch/x86/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
20305 ++++ linux-2.6.37.1/arch/x86/include/asm/uaccess.h 2011-01-17 02:41:01.000000000 -0500
20306 @@ -8,12 +8,15 @@
20307 #include <linux/thread_info.h>
20308 #include <linux/prefetch.h>
20309 @@ -10004,9 +10064,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess.h linux-2.6.37/arch/x86/inc
20310 #ifdef CONFIG_X86_32
20311 # include "uaccess_32.h"
20312 #else
20313 -diff -urNp linux-2.6.37/arch/x86/include/asm/vgtod.h linux-2.6.37/arch/x86/include/asm/vgtod.h
20314 ---- linux-2.6.37/arch/x86/include/asm/vgtod.h 2011-01-04 19:50:19.000000000 -0500
20315 -+++ linux-2.6.37/arch/x86/include/asm/vgtod.h 2011-01-17 02:41:01.000000000 -0500
20316 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/vgtod.h linux-2.6.37.1/arch/x86/include/asm/vgtod.h
20317 +--- linux-2.6.37.1/arch/x86/include/asm/vgtod.h 2011-01-04 19:50:19.000000000 -0500
20318 ++++ linux-2.6.37.1/arch/x86/include/asm/vgtod.h 2011-01-17 02:41:01.000000000 -0500
20319 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
20320 int sysctl_enabled;
20321 struct timezone sys_tz;
20322 @@ -10015,9 +10075,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/vgtod.h linux-2.6.37/arch/x86/inclu
20323 cycle_t (*vread)(void);
20324 cycle_t cycle_last;
20325 cycle_t mask;
20326 -diff -urNp linux-2.6.37/arch/x86/include/asm/vsyscall.h linux-2.6.37/arch/x86/include/asm/vsyscall.h
20327 ---- linux-2.6.37/arch/x86/include/asm/vsyscall.h 2011-01-04 19:50:19.000000000 -0500
20328 -+++ linux-2.6.37/arch/x86/include/asm/vsyscall.h 2011-01-17 02:41:01.000000000 -0500
20329 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/vsyscall.h linux-2.6.37.1/arch/x86/include/asm/vsyscall.h
20330 +--- linux-2.6.37.1/arch/x86/include/asm/vsyscall.h 2011-01-04 19:50:19.000000000 -0500
20331 ++++ linux-2.6.37.1/arch/x86/include/asm/vsyscall.h 2011-01-17 02:41:01.000000000 -0500
20332 @@ -15,9 +15,10 @@ enum vsyscall_num {
20333
20334 #ifdef __KERNEL__
20335 @@ -10048,9 +10108,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/vsyscall.h linux-2.6.37/arch/x86/in
20336 #endif /* __KERNEL__ */
20337
20338 #endif /* _ASM_X86_VSYSCALL_H */
20339 -diff -urNp linux-2.6.37/arch/x86/include/asm/xsave.h linux-2.6.37/arch/x86/include/asm/xsave.h
20340 ---- linux-2.6.37/arch/x86/include/asm/xsave.h 2011-01-04 19:50:19.000000000 -0500
20341 -+++ linux-2.6.37/arch/x86/include/asm/xsave.h 2011-01-17 02:41:01.000000000 -0500
20342 +diff -urNp linux-2.6.37.1/arch/x86/include/asm/xsave.h linux-2.6.37.1/arch/x86/include/asm/xsave.h
20343 +--- linux-2.6.37.1/arch/x86/include/asm/xsave.h 2011-01-04 19:50:19.000000000 -0500
20344 ++++ linux-2.6.37.1/arch/x86/include/asm/xsave.h 2011-01-17 02:41:01.000000000 -0500
20345 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
20346 {
20347 int err;
20348 @@ -10075,9 +10135,9 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/xsave.h linux-2.6.37/arch/x86/inclu
20349 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20350 "2:\n"
20351 ".section .fixup,\"ax\"\n"
20352 -diff -urNp linux-2.6.37/arch/x86/Kconfig linux-2.6.37/arch/x86/Kconfig
20353 ---- linux-2.6.37/arch/x86/Kconfig 2011-01-04 19:50:19.000000000 -0500
20354 -+++ linux-2.6.37/arch/x86/Kconfig 2011-01-17 02:41:01.000000000 -0500
20355 +diff -urNp linux-2.6.37.1/arch/x86/Kconfig linux-2.6.37.1/arch/x86/Kconfig
20356 +--- linux-2.6.37.1/arch/x86/Kconfig 2011-02-22 16:05:30.000000000 -0500
20357 ++++ linux-2.6.37.1/arch/x86/Kconfig 2011-02-22 16:05:42.000000000 -0500
20358 @@ -225,7 +225,7 @@ config X86_TRAMPOLINE
20359
20360 config X86_32_LAZY_GS
20361 @@ -10159,9 +10219,9 @@ diff -urNp linux-2.6.37/arch/x86/Kconfig linux-2.6.37/arch/x86/Kconfig
20362 ---help---
20363 Map the 32-bit VDSO to the predictable old-style address too.
20364
20365 -diff -urNp linux-2.6.37/arch/x86/Kconfig.cpu linux-2.6.37/arch/x86/Kconfig.cpu
20366 ---- linux-2.6.37/arch/x86/Kconfig.cpu 2011-01-04 19:50:19.000000000 -0500
20367 -+++ linux-2.6.37/arch/x86/Kconfig.cpu 2011-01-17 02:41:01.000000000 -0500
20368 +diff -urNp linux-2.6.37.1/arch/x86/Kconfig.cpu linux-2.6.37.1/arch/x86/Kconfig.cpu
20369 +--- linux-2.6.37.1/arch/x86/Kconfig.cpu 2011-01-04 19:50:19.000000000 -0500
20370 ++++ linux-2.6.37.1/arch/x86/Kconfig.cpu 2011-01-17 02:41:01.000000000 -0500
20371 @@ -336,7 +336,7 @@ config X86_PPRO_FENCE
20372
20373 config X86_F00F_BUG
20374 @@ -10189,9 +10249,9 @@ diff -urNp linux-2.6.37/arch/x86/Kconfig.cpu linux-2.6.37/arch/x86/Kconfig.cpu
20375
20376 config X86_MINIMUM_CPU_FAMILY
20377 int
20378 -diff -urNp linux-2.6.37/arch/x86/Kconfig.debug linux-2.6.37/arch/x86/Kconfig.debug
20379 ---- linux-2.6.37/arch/x86/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
20380 -+++ linux-2.6.37/arch/x86/Kconfig.debug 2011-01-17 02:41:01.000000000 -0500
20381 +diff -urNp linux-2.6.37.1/arch/x86/Kconfig.debug linux-2.6.37.1/arch/x86/Kconfig.debug
20382 +--- linux-2.6.37.1/arch/x86/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
20383 ++++ linux-2.6.37.1/arch/x86/Kconfig.debug 2011-01-17 02:41:01.000000000 -0500
20384 @@ -101,7 +101,7 @@ config X86_PTDUMP
20385 config DEBUG_RODATA
20386 bool "Write protect kernel read-only data structures"
20387 @@ -10201,9 +10261,9 @@ diff -urNp linux-2.6.37/arch/x86/Kconfig.debug linux-2.6.37/arch/x86/Kconfig.deb
20388 ---help---
20389 Mark the kernel read-only data as write-protected in the pagetables,
20390 in order to catch accidental (and incorrect) writes to such const
20391 -diff -urNp linux-2.6.37/arch/x86/kernel/acpi/boot.c linux-2.6.37/arch/x86/kernel/acpi/boot.c
20392 ---- linux-2.6.37/arch/x86/kernel/acpi/boot.c 2011-01-04 19:50:19.000000000 -0500
20393 -+++ linux-2.6.37/arch/x86/kernel/acpi/boot.c 2011-01-17 02:41:01.000000000 -0500
20394 +diff -urNp linux-2.6.37.1/arch/x86/kernel/acpi/boot.c linux-2.6.37.1/arch/x86/kernel/acpi/boot.c
20395 +--- linux-2.6.37.1/arch/x86/kernel/acpi/boot.c 2011-01-04 19:50:19.000000000 -0500
20396 ++++ linux-2.6.37.1/arch/x86/kernel/acpi/boot.c 2011-01-17 02:41:01.000000000 -0500
20397 @@ -1498,7 +1498,7 @@ static struct dmi_system_id __initdata a
20398 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
20399 },
20400 @@ -10213,9 +10273,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/acpi/boot.c linux-2.6.37/arch/x86/kernel
20401 };
20402
20403 /*
20404 -diff -urNp linux-2.6.37/arch/x86/kernel/acpi/sleep.c linux-2.6.37/arch/x86/kernel/acpi/sleep.c
20405 ---- linux-2.6.37/arch/x86/kernel/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
20406 -+++ linux-2.6.37/arch/x86/kernel/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
20407 +diff -urNp linux-2.6.37.1/arch/x86/kernel/acpi/sleep.c linux-2.6.37.1/arch/x86/kernel/acpi/sleep.c
20408 +--- linux-2.6.37.1/arch/x86/kernel/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
20409 ++++ linux-2.6.37.1/arch/x86/kernel/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
20410 @@ -12,6 +12,7 @@
20411 #include <linux/cpumask.h>
20412 #include <asm/segment.h>
20413 @@ -10246,9 +10306,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/acpi/sleep.c linux-2.6.37/arch/x86/kerne
20414 initial_gs = per_cpu_offset(smp_processor_id());
20415 #endif
20416 initial_code = (unsigned long)wakeup_long64;
20417 -diff -urNp linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S
20418 ---- linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S 2011-01-04 19:50:19.000000000 -0500
20419 -+++ linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S 2011-01-17 02:41:01.000000000 -0500
20420 +diff -urNp linux-2.6.37.1/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.37.1/arch/x86/kernel/acpi/wakeup_32.S
20421 +--- linux-2.6.37.1/arch/x86/kernel/acpi/wakeup_32.S 2011-01-04 19:50:19.000000000 -0500
20422 ++++ linux-2.6.37.1/arch/x86/kernel/acpi/wakeup_32.S 2011-01-17 02:41:01.000000000 -0500
20423 @@ -30,13 +30,11 @@ wakeup_pmode_return:
20424 # and restore the stack ... but you need gdt for this to work
20425 movl saved_context_esp, %esp
20426 @@ -10265,9 +10325,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.37/arch/x86/k
20427
20428 bogus_magic:
20429 jmp bogus_magic
20430 -diff -urNp linux-2.6.37/arch/x86/kernel/alternative.c linux-2.6.37/arch/x86/kernel/alternative.c
20431 ---- linux-2.6.37/arch/x86/kernel/alternative.c 2011-01-04 19:50:19.000000000 -0500
20432 -+++ linux-2.6.37/arch/x86/kernel/alternative.c 2011-01-17 02:41:01.000000000 -0500
20433 +diff -urNp linux-2.6.37.1/arch/x86/kernel/alternative.c linux-2.6.37.1/arch/x86/kernel/alternative.c
20434 +--- linux-2.6.37.1/arch/x86/kernel/alternative.c 2011-01-04 19:50:19.000000000 -0500
20435 ++++ linux-2.6.37.1/arch/x86/kernel/alternative.c 2011-01-17 02:41:01.000000000 -0500
20436 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const
20437 if (!*poff || ptr < text || ptr >= text_end)
20438 continue;
20439 @@ -10381,9 +10441,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/alternative.c linux-2.6.37/arch/x86/kern
20440 #endif
20441
20442 void __init arch_init_ideal_nop5(void)
20443 -diff -urNp linux-2.6.37/arch/x86/kernel/amd_iommu.c linux-2.6.37/arch/x86/kernel/amd_iommu.c
20444 ---- linux-2.6.37/arch/x86/kernel/amd_iommu.c 2011-01-04 19:50:19.000000000 -0500
20445 -+++ linux-2.6.37/arch/x86/kernel/amd_iommu.c 2011-01-17 02:41:01.000000000 -0500
20446 +diff -urNp linux-2.6.37.1/arch/x86/kernel/amd_iommu.c linux-2.6.37.1/arch/x86/kernel/amd_iommu.c
20447 +--- linux-2.6.37.1/arch/x86/kernel/amd_iommu.c 2011-01-04 19:50:19.000000000 -0500
20448 ++++ linux-2.6.37.1/arch/x86/kernel/amd_iommu.c 2011-01-17 02:41:01.000000000 -0500
20449 @@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(
20450 }
20451 }
20452 @@ -10393,9 +10453,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/amd_iommu.c linux-2.6.37/arch/x86/kernel
20453 .alloc_coherent = alloc_coherent,
20454 .free_coherent = free_coherent,
20455 .map_page = map_page,
20456 -diff -urNp linux-2.6.37/arch/x86/kernel/apic/io_apic.c linux-2.6.37/arch/x86/kernel/apic/io_apic.c
20457 ---- linux-2.6.37/arch/x86/kernel/apic/io_apic.c 2011-01-04 19:50:19.000000000 -0500
20458 -+++ linux-2.6.37/arch/x86/kernel/apic/io_apic.c 2011-01-17 02:41:01.000000000 -0500
20459 +diff -urNp linux-2.6.37.1/arch/x86/kernel/apic/io_apic.c linux-2.6.37.1/arch/x86/kernel/apic/io_apic.c
20460 +--- linux-2.6.37.1/arch/x86/kernel/apic/io_apic.c 2011-01-04 19:50:19.000000000 -0500
20461 ++++ linux-2.6.37.1/arch/x86/kernel/apic/io_apic.c 2011-01-17 02:41:01.000000000 -0500
20462 @@ -597,7 +597,7 @@ struct IO_APIC_route_entry **alloc_ioapi
20463 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
20464 GFP_KERNEL);
20465 @@ -10432,9 +10492,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/apic/io_apic.c linux-2.6.37/arch/x86/ker
20466 {
20467 raw_spin_unlock(&vector_lock);
20468 }
20469 -diff -urNp linux-2.6.37/arch/x86/kernel/apm_32.c linux-2.6.37/arch/x86/kernel/apm_32.c
20470 ---- linux-2.6.37/arch/x86/kernel/apm_32.c 2011-01-04 19:50:19.000000000 -0500
20471 -+++ linux-2.6.37/arch/x86/kernel/apm_32.c 2011-01-17 02:41:01.000000000 -0500
20472 +diff -urNp linux-2.6.37.1/arch/x86/kernel/apm_32.c linux-2.6.37.1/arch/x86/kernel/apm_32.c
20473 +--- linux-2.6.37.1/arch/x86/kernel/apm_32.c 2011-01-04 19:50:19.000000000 -0500
20474 ++++ linux-2.6.37.1/arch/x86/kernel/apm_32.c 2011-01-17 02:41:01.000000000 -0500
20475 @@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
20476 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20477 * even though they are called in protected mode.
20478 @@ -10536,9 +10596,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/apm_32.c linux-2.6.37/arch/x86/kernel/ap
20479
20480 proc_create("apm", 0, NULL, &apm_file_ops);
20481
20482 -diff -urNp linux-2.6.37/arch/x86/kernel/asm-offsets_32.c linux-2.6.37/arch/x86/kernel/asm-offsets_32.c
20483 ---- linux-2.6.37/arch/x86/kernel/asm-offsets_32.c 2011-01-04 19:50:19.000000000 -0500
20484 -+++ linux-2.6.37/arch/x86/kernel/asm-offsets_32.c 2011-01-17 02:41:01.000000000 -0500
20485 +diff -urNp linux-2.6.37.1/arch/x86/kernel/asm-offsets_32.c linux-2.6.37.1/arch/x86/kernel/asm-offsets_32.c
20486 +--- linux-2.6.37.1/arch/x86/kernel/asm-offsets_32.c 2011-01-04 19:50:19.000000000 -0500
20487 ++++ linux-2.6.37.1/arch/x86/kernel/asm-offsets_32.c 2011-01-17 02:41:01.000000000 -0500
20488 @@ -113,6 +113,11 @@ void foo(void)
20489 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
20490 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
20491 @@ -10551,9 +10611,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/asm-offsets_32.c linux-2.6.37/arch/x86/k
20492 #endif
20493
20494 #ifdef CONFIG_XEN
20495 -diff -urNp linux-2.6.37/arch/x86/kernel/asm-offsets_64.c linux-2.6.37/arch/x86/kernel/asm-offsets_64.c
20496 ---- linux-2.6.37/arch/x86/kernel/asm-offsets_64.c 2011-01-04 19:50:19.000000000 -0500
20497 -+++ linux-2.6.37/arch/x86/kernel/asm-offsets_64.c 2011-01-17 02:41:01.000000000 -0500
20498 +diff -urNp linux-2.6.37.1/arch/x86/kernel/asm-offsets_64.c linux-2.6.37.1/arch/x86/kernel/asm-offsets_64.c
20499 +--- linux-2.6.37.1/arch/x86/kernel/asm-offsets_64.c 2011-01-04 19:50:19.000000000 -0500
20500 ++++ linux-2.6.37.1/arch/x86/kernel/asm-offsets_64.c 2011-01-17 02:41:01.000000000 -0500
20501 @@ -63,6 +63,18 @@ int main(void)
20502 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
20503 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
20504 @@ -10581,9 +10641,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/asm-offsets_64.c linux-2.6.37/arch/x86/k
20505 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
20506 BLANK();
20507 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
20508 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/common.c linux-2.6.37/arch/x86/kernel/cpu/common.c
20509 ---- linux-2.6.37/arch/x86/kernel/cpu/common.c 2011-01-04 19:50:19.000000000 -0500
20510 -+++ linux-2.6.37/arch/x86/kernel/cpu/common.c 2011-01-17 02:41:01.000000000 -0500
20511 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/common.c linux-2.6.37.1/arch/x86/kernel/cpu/common.c
20512 +--- linux-2.6.37.1/arch/x86/kernel/cpu/common.c 2011-01-04 19:50:19.000000000 -0500
20513 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/common.c 2011-01-17 02:41:01.000000000 -0500
20514 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
20515
20516 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
20517 @@ -10709,9 +10769,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/common.c linux-2.6.37/arch/x86/kerne
20518 struct thread_struct *thread = &curr->thread;
20519
20520 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
20521 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
20522 ---- linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-04 19:50:19.000000000 -0500
20523 -+++ linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-17 02:41:01.000000000 -0500
20524 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
20525 +--- linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-04 19:50:19.000000000 -0500
20526 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-01-17 02:41:01.000000000 -0500
20527 @@ -481,7 +481,7 @@ static const struct dmi_system_id sw_any
20528 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
20529 },
20530 @@ -10721,9 +10781,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.37/
20531 };
20532
20533 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
20534 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
20535 ---- linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-04 19:50:19.000000000 -0500
20536 -+++ linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-17 02:41:01.000000000 -0500
20537 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
20538 +--- linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-04 19:50:19.000000000 -0500
20539 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-01-17 02:41:01.000000000 -0500
20540 @@ -226,7 +226,7 @@ static struct cpu_model models[] =
20541 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
20542 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
20543 @@ -10733,9 +10793,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2
20544 };
20545 #undef _BANIAS
20546 #undef BANIAS
20547 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/intel.c linux-2.6.37/arch/x86/kernel/cpu/intel.c
20548 ---- linux-2.6.37/arch/x86/kernel/cpu/intel.c 2011-01-04 19:50:19.000000000 -0500
20549 -+++ linux-2.6.37/arch/x86/kernel/cpu/intel.c 2011-01-17 02:41:01.000000000 -0500
20550 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/intel.c linux-2.6.37.1/arch/x86/kernel/cpu/intel.c
20551 +--- linux-2.6.37.1/arch/x86/kernel/cpu/intel.c 2011-01-04 19:50:19.000000000 -0500
20552 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/intel.c 2011-01-17 02:41:01.000000000 -0500
20553 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
20554 * Update the IDT descriptor and reload the IDT so that
20555 * it uses the read-only mapped virtual address.
20556 @@ -10745,9 +10805,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/intel.c linux-2.6.37/arch/x86/kernel
20557 load_idt(&idt_descr);
20558 }
20559 #endif
20560 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/Makefile linux-2.6.37/arch/x86/kernel/cpu/Makefile
20561 ---- linux-2.6.37/arch/x86/kernel/cpu/Makefile 2011-01-04 19:50:19.000000000 -0500
20562 -+++ linux-2.6.37/arch/x86/kernel/cpu/Makefile 2011-01-17 02:41:01.000000000 -0500
20563 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/Makefile linux-2.6.37.1/arch/x86/kernel/cpu/Makefile
20564 +--- linux-2.6.37.1/arch/x86/kernel/cpu/Makefile 2011-01-04 19:50:19.000000000 -0500
20565 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/Makefile 2011-01-17 02:41:01.000000000 -0500
20566 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
20567 CFLAGS_REMOVE_perf_event.o = -pg
20568 endif
20569 @@ -10759,9 +10819,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/Makefile linux-2.6.37/arch/x86/kerne
20570 obj-y := intel_cacheinfo.o scattered.o topology.o
20571 obj-y += proc.o capflags.o powerflags.o common.o
20572 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
20573 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c
20574 ---- linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-04 19:50:19.000000000 -0500
20575 -+++ linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:56.000000000 -0500
20576 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37.1/arch/x86/kernel/cpu/mcheck/mce.c
20577 +--- linux-2.6.37.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-04 19:50:19.000000000 -0500
20578 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:56.000000000 -0500
20579 @@ -45,6 +45,7 @@
20580 #include <asm/ipi.h>
20581 #include <asm/mce.h>
20582 @@ -10822,9 +10882,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37/arch/x86/k
20583 };
20584
20585 /*
20586 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c
20587 ---- linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-04 19:50:19.000000000 -0500
20588 -+++ linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-17 02:41:01.000000000 -0500
20589 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/generic.c
20590 +--- linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-04 19:50:19.000000000 -0500
20591 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/generic.c 2011-01-17 02:41:01.000000000 -0500
20592 @@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra
20593 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
20594 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
20595 @@ -10834,9 +10894,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.37/arch/x86
20596 };
20597
20598 static unsigned long smp_changes_mask;
20599 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c
20600 ---- linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c 2011-01-04 19:50:19.000000000 -0500
20601 -+++ linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c 2011-01-17 02:41:01.000000000 -0500
20602 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/main.c
20603 +--- linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 16:05:30.000000000 -0500
20604 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 16:05:42.000000000 -0500
20605 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
20606 u64 size_or_mask, size_and_mask;
20607 static bool mtrr_aps_delayed_init;
20608 @@ -10846,9 +10906,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.37/arch/x86/ke
20609
20610 const struct mtrr_ops *mtrr_if;
20611
20612 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h
20613 ---- linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-04 19:50:19.000000000 -0500
20614 -+++ linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-17 02:41:01.000000000 -0500
20615 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/mtrr.h
20616 +--- linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-04 19:50:19.000000000 -0500
20617 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-01-17 02:41:01.000000000 -0500
20618 @@ -12,19 +12,19 @@
20619 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
20620
20621 @@ -10877,9 +10937,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.37/arch/x86/ke
20622 };
20623
20624 extern int generic_get_free_region(unsigned long base, unsigned long size,
20625 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c
20626 ---- linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-04 19:50:19.000000000 -0500
20627 -+++ linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-17 02:41:01.000000000 -0500
20628 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.37.1/arch/x86/kernel/cpu/perfctr-watchdog.c
20629 +--- linux-2.6.37.1/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-04 19:50:19.000000000 -0500
20630 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-01-17 02:41:01.000000000 -0500
20631 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
20632
20633 /* Interface defining a CPU specific perfctr watchdog */
20634 @@ -10913,9 +10973,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.37/arch
20635 static struct wd_ops intel_arch_wd_ops __read_mostly = {
20636 .reserve = single_msr_reserve,
20637 .unreserve = single_msr_unreserve,
20638 -diff -urNp linux-2.6.37/arch/x86/kernel/cpu/perf_event.c linux-2.6.37/arch/x86/kernel/cpu/perf_event.c
20639 ---- linux-2.6.37/arch/x86/kernel/cpu/perf_event.c 2011-01-04 19:50:19.000000000 -0500
20640 -+++ linux-2.6.37/arch/x86/kernel/cpu/perf_event.c 2011-01-17 02:41:01.000000000 -0500
20641 +diff -urNp linux-2.6.37.1/arch/x86/kernel/cpu/perf_event.c linux-2.6.37.1/arch/x86/kernel/cpu/perf_event.c
20642 +--- linux-2.6.37.1/arch/x86/kernel/cpu/perf_event.c 2011-01-04 19:50:19.000000000 -0500
20643 ++++ linux-2.6.37.1/arch/x86/kernel/cpu/perf_event.c 2011-01-17 02:41:01.000000000 -0500
20644 @@ -1757,7 +1757,7 @@ perf_callchain_user(struct perf_callchai
20645 break;
20646
20647 @@ -10925,9 +10985,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/cpu/perf_event.c linux-2.6.37/arch/x86/k
20648 }
20649 }
20650
20651 -diff -urNp linux-2.6.37/arch/x86/kernel/crash.c linux-2.6.37/arch/x86/kernel/crash.c
20652 ---- linux-2.6.37/arch/x86/kernel/crash.c 2011-01-04 19:50:19.000000000 -0500
20653 -+++ linux-2.6.37/arch/x86/kernel/crash.c 2011-01-17 02:41:01.000000000 -0500
20654 +diff -urNp linux-2.6.37.1/arch/x86/kernel/crash.c linux-2.6.37.1/arch/x86/kernel/crash.c
20655 +--- linux-2.6.37.1/arch/x86/kernel/crash.c 2011-01-04 19:50:19.000000000 -0500
20656 ++++ linux-2.6.37.1/arch/x86/kernel/crash.c 2011-01-17 02:41:01.000000000 -0500
20657 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
20658 regs = args->regs;
20659
20660 @@ -10937,9 +10997,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/crash.c linux-2.6.37/arch/x86/kernel/cra
20661 crash_fixup_ss_esp(&fixed_regs, regs);
20662 regs = &fixed_regs;
20663 }
20664 -diff -urNp linux-2.6.37/arch/x86/kernel/doublefault_32.c linux-2.6.37/arch/x86/kernel/doublefault_32.c
20665 ---- linux-2.6.37/arch/x86/kernel/doublefault_32.c 2011-01-04 19:50:19.000000000 -0500
20666 -+++ linux-2.6.37/arch/x86/kernel/doublefault_32.c 2011-01-17 02:41:01.000000000 -0500
20667 +diff -urNp linux-2.6.37.1/arch/x86/kernel/doublefault_32.c linux-2.6.37.1/arch/x86/kernel/doublefault_32.c
20668 +--- linux-2.6.37.1/arch/x86/kernel/doublefault_32.c 2011-01-04 19:50:19.000000000 -0500
20669 ++++ linux-2.6.37.1/arch/x86/kernel/doublefault_32.c 2011-01-17 02:41:01.000000000 -0500
20670 @@ -11,7 +11,7 @@
20671
20672 #define DOUBLEFAULT_STACKSIZE (1024)
20673 @@ -10971,9 +11031,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/doublefault_32.c linux-2.6.37/arch/x86/k
20674 .fs = __KERNEL_PERCPU,
20675
20676 .__cr3 = __pa_nodebug(swapper_pg_dir),
20677 -diff -urNp linux-2.6.37/arch/x86/kernel/dumpstack_32.c linux-2.6.37/arch/x86/kernel/dumpstack_32.c
20678 ---- linux-2.6.37/arch/x86/kernel/dumpstack_32.c 2011-01-04 19:50:19.000000000 -0500
20679 -+++ linux-2.6.37/arch/x86/kernel/dumpstack_32.c 2011-01-17 02:41:01.000000000 -0500
20680 +diff -urNp linux-2.6.37.1/arch/x86/kernel/dumpstack_32.c linux-2.6.37.1/arch/x86/kernel/dumpstack_32.c
20681 +--- linux-2.6.37.1/arch/x86/kernel/dumpstack_32.c 2011-01-04 19:50:19.000000000 -0500
20682 ++++ linux-2.6.37.1/arch/x86/kernel/dumpstack_32.c 2011-01-17 02:41:01.000000000 -0500
20683 @@ -105,11 +105,12 @@ void show_registers(struct pt_regs *regs
20684 * When in-kernel, we also print out the stack and code at the
20685 * time of the fault..
20686 @@ -11018,9 +11078,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/dumpstack_32.c linux-2.6.37/arch/x86/ker
20687 if (ip < PAGE_OFFSET)
20688 return 0;
20689 if (probe_kernel_address((unsigned short *)ip, ud2))
20690 -diff -urNp linux-2.6.37/arch/x86/kernel/dumpstack.c linux-2.6.37/arch/x86/kernel/dumpstack.c
20691 ---- linux-2.6.37/arch/x86/kernel/dumpstack.c 2011-01-04 19:50:19.000000000 -0500
20692 -+++ linux-2.6.37/arch/x86/kernel/dumpstack.c 2011-01-17 02:41:01.000000000 -0500
20693 +diff -urNp linux-2.6.37.1/arch/x86/kernel/dumpstack.c linux-2.6.37.1/arch/x86/kernel/dumpstack.c
20694 +--- linux-2.6.37.1/arch/x86/kernel/dumpstack.c 2011-01-04 19:50:19.000000000 -0500
20695 ++++ linux-2.6.37.1/arch/x86/kernel/dumpstack.c 2011-01-17 02:41:01.000000000 -0500
20696 @@ -2,6 +2,9 @@
20697 * Copyright (C) 1991, 1992 Linus Torvalds
20698 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
20699 @@ -11076,9 +11136,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/dumpstack.c linux-2.6.37/arch/x86/kernel
20700 report_bug(regs->ip, regs);
20701
20702 if (__die(str, regs, err))
20703 -diff -urNp linux-2.6.37/arch/x86/kernel/entry_32.S linux-2.6.37/arch/x86/kernel/entry_32.S
20704 ---- linux-2.6.37/arch/x86/kernel/entry_32.S 2011-01-04 19:50:19.000000000 -0500
20705 -+++ linux-2.6.37/arch/x86/kernel/entry_32.S 2011-01-17 02:41:01.000000000 -0500
20706 +diff -urNp linux-2.6.37.1/arch/x86/kernel/entry_32.S linux-2.6.37.1/arch/x86/kernel/entry_32.S
20707 +--- linux-2.6.37.1/arch/x86/kernel/entry_32.S 2011-01-04 19:50:19.000000000 -0500
20708 ++++ linux-2.6.37.1/arch/x86/kernel/entry_32.S 2011-01-17 02:41:01.000000000 -0500
20709 @@ -183,13 +183,81 @@
20710 /*CFI_REL_OFFSET gs, PT_GS*/
20711 .endm
20712 @@ -11451,9 +11511,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/entry_32.S linux-2.6.37/arch/x86/kernel/
20713 RESTORE_REGS
20714 lss 12+4(%esp), %esp # back to espfix stack
20715 CFI_ADJUST_CFA_OFFSET -24
20716 -diff -urNp linux-2.6.37/arch/x86/kernel/entry_64.S linux-2.6.37/arch/x86/kernel/entry_64.S
20717 ---- linux-2.6.37/arch/x86/kernel/entry_64.S 2011-01-04 19:50:19.000000000 -0500
20718 -+++ linux-2.6.37/arch/x86/kernel/entry_64.S 2011-01-17 02:41:01.000000000 -0500
20719 +diff -urNp linux-2.6.37.1/arch/x86/kernel/entry_64.S linux-2.6.37.1/arch/x86/kernel/entry_64.S
20720 +--- linux-2.6.37.1/arch/x86/kernel/entry_64.S 2011-01-04 19:50:19.000000000 -0500
20721 ++++ linux-2.6.37.1/arch/x86/kernel/entry_64.S 2011-01-17 02:41:01.000000000 -0500
20722 @@ -53,6 +53,7 @@
20723 #include <asm/paravirt.h>
20724 #include <asm/ftrace.h>
20725 @@ -11919,9 +11979,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/entry_64.S linux-2.6.37/arch/x86/kernel/
20726 RESTORE_ALL 8
20727 jmp irq_return
20728 nmi_userspace:
20729 -diff -urNp linux-2.6.37/arch/x86/kernel/ftrace.c linux-2.6.37/arch/x86/kernel/ftrace.c
20730 ---- linux-2.6.37/arch/x86/kernel/ftrace.c 2011-01-04 19:50:19.000000000 -0500
20731 -+++ linux-2.6.37/arch/x86/kernel/ftrace.c 2011-01-17 02:41:01.000000000 -0500
20732 +diff -urNp linux-2.6.37.1/arch/x86/kernel/ftrace.c linux-2.6.37.1/arch/x86/kernel/ftrace.c
20733 +--- linux-2.6.37.1/arch/x86/kernel/ftrace.c 2011-01-04 19:50:19.000000000 -0500
20734 ++++ linux-2.6.37.1/arch/x86/kernel/ftrace.c 2011-01-17 02:41:01.000000000 -0500
20735 @@ -174,7 +174,9 @@ void ftrace_nmi_enter(void)
20736
20737 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
20738 @@ -11959,9 +12019,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/ftrace.c linux-2.6.37/arch/x86/kernel/ft
20739 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
20740 return -EFAULT;
20741
20742 -diff -urNp linux-2.6.37/arch/x86/kernel/head32.c linux-2.6.37/arch/x86/kernel/head32.c
20743 ---- linux-2.6.37/arch/x86/kernel/head32.c 2011-01-04 19:50:19.000000000 -0500
20744 -+++ linux-2.6.37/arch/x86/kernel/head32.c 2011-01-17 02:41:01.000000000 -0500
20745 +diff -urNp linux-2.6.37.1/arch/x86/kernel/head32.c linux-2.6.37.1/arch/x86/kernel/head32.c
20746 +--- linux-2.6.37.1/arch/x86/kernel/head32.c 2011-01-04 19:50:19.000000000 -0500
20747 ++++ linux-2.6.37.1/arch/x86/kernel/head32.c 2011-01-17 02:41:01.000000000 -0500
20748 @@ -19,6 +19,7 @@
20749 #include <asm/io_apic.h>
20750 #include <asm/bios_ebda.h>
20751 @@ -11979,9 +12039,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/head32.c linux-2.6.37/arch/x86/kernel/he
20752
20753 #ifdef CONFIG_BLK_DEV_INITRD
20754 /* Reserve INITRD */
20755 -diff -urNp linux-2.6.37/arch/x86/kernel/head_32.S linux-2.6.37/arch/x86/kernel/head_32.S
20756 ---- linux-2.6.37/arch/x86/kernel/head_32.S 2011-01-04 19:50:19.000000000 -0500
20757 -+++ linux-2.6.37/arch/x86/kernel/head_32.S 2011-01-25 20:24:56.000000000 -0500
20758 +diff -urNp linux-2.6.37.1/arch/x86/kernel/head_32.S linux-2.6.37.1/arch/x86/kernel/head_32.S
20759 +--- linux-2.6.37.1/arch/x86/kernel/head_32.S 2011-01-04 19:50:19.000000000 -0500
20760 ++++ linux-2.6.37.1/arch/x86/kernel/head_32.S 2011-01-25 20:24:56.000000000 -0500
20761 @@ -25,6 +25,12 @@
20762 /* Physical address */
20763 #define pa(X) ((X) - __PAGE_OFFSET)
20764 @@ -12433,9 +12493,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/head_32.S linux-2.6.37/arch/x86/kernel/h
20765 + /* Be sure this is zeroed to avoid false validations in Xen */
20766 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
20767 + .endr
20768 -diff -urNp linux-2.6.37/arch/x86/kernel/head_64.S linux-2.6.37/arch/x86/kernel/head_64.S
20769 ---- linux-2.6.37/arch/x86/kernel/head_64.S 2011-01-04 19:50:19.000000000 -0500
20770 -+++ linux-2.6.37/arch/x86/kernel/head_64.S 2011-01-17 02:41:01.000000000 -0500
20771 +diff -urNp linux-2.6.37.1/arch/x86/kernel/head_64.S linux-2.6.37.1/arch/x86/kernel/head_64.S
20772 +--- linux-2.6.37.1/arch/x86/kernel/head_64.S 2011-01-04 19:50:19.000000000 -0500
20773 ++++ linux-2.6.37.1/arch/x86/kernel/head_64.S 2011-01-17 02:41:01.000000000 -0500
20774 @@ -19,6 +19,7 @@
20775 #include <asm/cache.h>
20776 #include <asm/processor-flags.h>
20777 @@ -12705,9 +12765,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/head_64.S linux-2.6.37/arch/x86/kernel/h
20778
20779 __PAGE_ALIGNED_BSS
20780 .align PAGE_SIZE
20781 -diff -urNp linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c
20782 ---- linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c 2011-01-04 19:50:19.000000000 -0500
20783 -+++ linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c 2011-01-17 02:41:01.000000000 -0500
20784 +diff -urNp linux-2.6.37.1/arch/x86/kernel/i386_ksyms_32.c linux-2.6.37.1/arch/x86/kernel/i386_ksyms_32.c
20785 +--- linux-2.6.37.1/arch/x86/kernel/i386_ksyms_32.c 2011-01-04 19:50:19.000000000 -0500
20786 ++++ linux-2.6.37.1/arch/x86/kernel/i386_ksyms_32.c 2011-01-17 02:41:01.000000000 -0500
20787 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
20788 EXPORT_SYMBOL(cmpxchg8b_emu);
20789 #endif
20790 @@ -12729,9 +12789,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c linux-2.6.37/arch/x86/ke
20791 +#ifdef CONFIG_PAX_KERNEXEC
20792 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
20793 +#endif
20794 -diff -urNp linux-2.6.37/arch/x86/kernel/init_task.c linux-2.6.37/arch/x86/kernel/init_task.c
20795 ---- linux-2.6.37/arch/x86/kernel/init_task.c 2011-01-04 19:50:19.000000000 -0500
20796 -+++ linux-2.6.37/arch/x86/kernel/init_task.c 2011-01-17 02:41:01.000000000 -0500
20797 +diff -urNp linux-2.6.37.1/arch/x86/kernel/init_task.c linux-2.6.37.1/arch/x86/kernel/init_task.c
20798 +--- linux-2.6.37.1/arch/x86/kernel/init_task.c 2011-01-04 19:50:19.000000000 -0500
20799 ++++ linux-2.6.37.1/arch/x86/kernel/init_task.c 2011-01-17 02:41:01.000000000 -0500
20800 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
20801 * section. Since TSS's are completely CPU-local, we want them
20802 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
20803 @@ -12740,9 +12800,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/init_task.c linux-2.6.37/arch/x86/kernel
20804 -
20805 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
20806 +EXPORT_SYMBOL(init_tss);
20807 -diff -urNp linux-2.6.37/arch/x86/kernel/ioport.c linux-2.6.37/arch/x86/kernel/ioport.c
20808 ---- linux-2.6.37/arch/x86/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
20809 -+++ linux-2.6.37/arch/x86/kernel/ioport.c 2011-01-17 02:41:01.000000000 -0500
20810 +diff -urNp linux-2.6.37.1/arch/x86/kernel/ioport.c linux-2.6.37.1/arch/x86/kernel/ioport.c
20811 +--- linux-2.6.37.1/arch/x86/kernel/ioport.c 2011-01-04 19:50:19.000000000 -0500
20812 ++++ linux-2.6.37.1/arch/x86/kernel/ioport.c 2011-01-17 02:41:01.000000000 -0500
20813 @@ -6,6 +6,7 @@
20814 #include <linux/sched.h>
20815 #include <linux/kernel.h>
20816 @@ -12786,9 +12846,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/ioport.c linux-2.6.37/arch/x86/kernel/io
20817 if (!capable(CAP_SYS_RAWIO))
20818 return -EPERM;
20819 }
20820 -diff -urNp linux-2.6.37/arch/x86/kernel/irq_32.c linux-2.6.37/arch/x86/kernel/irq_32.c
20821 ---- linux-2.6.37/arch/x86/kernel/irq_32.c 2011-01-04 19:50:19.000000000 -0500
20822 -+++ linux-2.6.37/arch/x86/kernel/irq_32.c 2011-01-24 18:04:15.000000000 -0500
20823 +diff -urNp linux-2.6.37.1/arch/x86/kernel/irq_32.c linux-2.6.37.1/arch/x86/kernel/irq_32.c
20824 +--- linux-2.6.37.1/arch/x86/kernel/irq_32.c 2011-01-04 19:50:19.000000000 -0500
20825 ++++ linux-2.6.37.1/arch/x86/kernel/irq_32.c 2011-01-24 18:04:15.000000000 -0500
20826 @@ -91,7 +91,7 @@ execute_on_irq_stack(int overflow, struc
20827 return 0;
20828
20829 @@ -12863,9 +12923,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/irq_32.c linux-2.6.37/arch/x86/kernel/ir
20830 /*
20831 * Shouldnt happen, we returned above if in_interrupt():
20832 */
20833 -diff -urNp linux-2.6.37/arch/x86/kernel/kgdb.c linux-2.6.37/arch/x86/kernel/kgdb.c
20834 ---- linux-2.6.37/arch/x86/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
20835 -+++ linux-2.6.37/arch/x86/kernel/kgdb.c 2011-01-17 02:41:01.000000000 -0500
20836 +diff -urNp linux-2.6.37.1/arch/x86/kernel/kgdb.c linux-2.6.37.1/arch/x86/kernel/kgdb.c
20837 +--- linux-2.6.37.1/arch/x86/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
20838 ++++ linux-2.6.37.1/arch/x86/kernel/kgdb.c 2011-01-17 02:41:01.000000000 -0500
20839 @@ -123,11 +123,11 @@ char *dbg_get_reg(int regno, void *mem,
20840 switch (regno) {
20841 #ifdef CONFIG_X86_32
20842 @@ -12889,9 +12949,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/kgdb.c linux-2.6.37/arch/x86/kernel/kgdb
20843 /* Breakpoint instruction: */
20844 .gdb_bpt_instr = { 0xcc },
20845 .flags = KGDB_HW_BREAKPOINT,
20846 -diff -urNp linux-2.6.37/arch/x86/kernel/kprobes.c linux-2.6.37/arch/x86/kernel/kprobes.c
20847 ---- linux-2.6.37/arch/x86/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
20848 -+++ linux-2.6.37/arch/x86/kernel/kprobes.c 2011-01-17 02:41:01.000000000 -0500
20849 +diff -urNp linux-2.6.37.1/arch/x86/kernel/kprobes.c linux-2.6.37.1/arch/x86/kernel/kprobes.c
20850 +--- linux-2.6.37.1/arch/x86/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
20851 ++++ linux-2.6.37.1/arch/x86/kernel/kprobes.c 2011-01-17 02:41:01.000000000 -0500
20852 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
20853 } __attribute__((packed)) *insn;
20854
20855 @@ -13025,9 +13085,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/kprobes.c linux-2.6.37/arch/x86/kernel/k
20856 RELATIVE_ADDR_SIZE);
20857
20858 jmp_code[0] = RELATIVEJUMP_OPCODE;
20859 -diff -urNp linux-2.6.37/arch/x86/kernel/ldt.c linux-2.6.37/arch/x86/kernel/ldt.c
20860 ---- linux-2.6.37/arch/x86/kernel/ldt.c 2011-01-04 19:50:19.000000000 -0500
20861 -+++ linux-2.6.37/arch/x86/kernel/ldt.c 2011-01-17 02:41:01.000000000 -0500
20862 +diff -urNp linux-2.6.37.1/arch/x86/kernel/ldt.c linux-2.6.37.1/arch/x86/kernel/ldt.c
20863 +--- linux-2.6.37.1/arch/x86/kernel/ldt.c 2011-01-04 19:50:19.000000000 -0500
20864 ++++ linux-2.6.37.1/arch/x86/kernel/ldt.c 2011-01-17 02:41:01.000000000 -0500
20865 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
20866 if (reload) {
20867 #ifdef CONFIG_SMP
20868 @@ -13092,9 +13152,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/ldt.c linux-2.6.37/arch/x86/kernel/ldt.c
20869 fill_ldt(&ldt, &ldt_info);
20870 if (oldmode)
20871 ldt.avl = 0;
20872 -diff -urNp linux-2.6.37/arch/x86/kernel/machine_kexec_32.c linux-2.6.37/arch/x86/kernel/machine_kexec_32.c
20873 ---- linux-2.6.37/arch/x86/kernel/machine_kexec_32.c 2011-01-04 19:50:19.000000000 -0500
20874 -+++ linux-2.6.37/arch/x86/kernel/machine_kexec_32.c 2011-01-17 02:41:01.000000000 -0500
20875 +diff -urNp linux-2.6.37.1/arch/x86/kernel/machine_kexec_32.c linux-2.6.37.1/arch/x86/kernel/machine_kexec_32.c
20876 +--- linux-2.6.37.1/arch/x86/kernel/machine_kexec_32.c 2011-01-04 19:50:19.000000000 -0500
20877 ++++ linux-2.6.37.1/arch/x86/kernel/machine_kexec_32.c 2011-01-17 02:41:01.000000000 -0500
20878 @@ -27,7 +27,7 @@
20879 #include <asm/cacheflush.h>
20880 #include <asm/debugreg.h>
20881 @@ -13122,9 +13182,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/machine_kexec_32.c linux-2.6.37/arch/x86
20882
20883 relocate_kernel_ptr = control_page;
20884 page_list[PA_CONTROL_PAGE] = __pa(control_page);
20885 -diff -urNp linux-2.6.37/arch/x86/kernel/microcode_amd.c linux-2.6.37/arch/x86/kernel/microcode_amd.c
20886 ---- linux-2.6.37/arch/x86/kernel/microcode_amd.c 2011-01-04 19:50:19.000000000 -0500
20887 -+++ linux-2.6.37/arch/x86/kernel/microcode_amd.c 2011-01-17 02:41:01.000000000 -0500
20888 +diff -urNp linux-2.6.37.1/arch/x86/kernel/microcode_amd.c linux-2.6.37.1/arch/x86/kernel/microcode_amd.c
20889 +--- linux-2.6.37.1/arch/x86/kernel/microcode_amd.c 2011-01-04 19:50:19.000000000 -0500
20890 ++++ linux-2.6.37.1/arch/x86/kernel/microcode_amd.c 2011-01-17 02:41:01.000000000 -0500
20891 @@ -331,7 +331,7 @@ static void microcode_fini_cpu_amd(int c
20892 uci->mc = NULL;
20893 }
20894 @@ -13143,9 +13203,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/microcode_amd.c linux-2.6.37/arch/x86/ke
20895 {
20896 return &microcode_amd_ops;
20897 }
20898 -diff -urNp linux-2.6.37/arch/x86/kernel/microcode_core.c linux-2.6.37/arch/x86/kernel/microcode_core.c
20899 ---- linux-2.6.37/arch/x86/kernel/microcode_core.c 2011-01-04 19:50:19.000000000 -0500
20900 -+++ linux-2.6.37/arch/x86/kernel/microcode_core.c 2011-01-17 02:41:01.000000000 -0500
20901 +diff -urNp linux-2.6.37.1/arch/x86/kernel/microcode_core.c linux-2.6.37.1/arch/x86/kernel/microcode_core.c
20902 +--- linux-2.6.37.1/arch/x86/kernel/microcode_core.c 2011-01-04 19:50:19.000000000 -0500
20903 ++++ linux-2.6.37.1/arch/x86/kernel/microcode_core.c 2011-01-17 02:41:01.000000000 -0500
20904 @@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
20905
20906 #define MICROCODE_VERSION "2.00"
20907 @@ -13155,9 +13215,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/microcode_core.c linux-2.6.37/arch/x86/k
20908
20909 /*
20910 * Synchronization.
20911 -diff -urNp linux-2.6.37/arch/x86/kernel/microcode_intel.c linux-2.6.37/arch/x86/kernel/microcode_intel.c
20912 ---- linux-2.6.37/arch/x86/kernel/microcode_intel.c 2011-01-04 19:50:19.000000000 -0500
20913 -+++ linux-2.6.37/arch/x86/kernel/microcode_intel.c 2011-01-17 02:41:01.000000000 -0500
20914 +diff -urNp linux-2.6.37.1/arch/x86/kernel/microcode_intel.c linux-2.6.37.1/arch/x86/kernel/microcode_intel.c
20915 +--- linux-2.6.37.1/arch/x86/kernel/microcode_intel.c 2011-01-04 19:50:19.000000000 -0500
20916 ++++ linux-2.6.37.1/arch/x86/kernel/microcode_intel.c 2011-01-17 02:41:01.000000000 -0500
20917 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
20918
20919 static int get_ucode_user(void *to, const void *from, size_t n)
20920 @@ -13192,9 +13252,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/microcode_intel.c linux-2.6.37/arch/x86/
20921 {
20922 return &microcode_intel_ops;
20923 }
20924 -diff -urNp linux-2.6.37/arch/x86/kernel/module.c linux-2.6.37/arch/x86/kernel/module.c
20925 ---- linux-2.6.37/arch/x86/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
20926 -+++ linux-2.6.37/arch/x86/kernel/module.c 2011-01-17 02:41:01.000000000 -0500
20927 +diff -urNp linux-2.6.37.1/arch/x86/kernel/module.c linux-2.6.37.1/arch/x86/kernel/module.c
20928 +--- linux-2.6.37.1/arch/x86/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
20929 ++++ linux-2.6.37.1/arch/x86/kernel/module.c 2011-01-17 02:41:01.000000000 -0500
20930 @@ -35,7 +35,7 @@
20931 #define DEBUGP(fmt...)
20932 #endif
20933 @@ -13335,9 +13395,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/module.c linux-2.6.37/arch/x86/kernel/mo
20934 #if 0
20935 if ((s64)val != *(s32 *)loc)
20936 goto overflow;
20937 -diff -urNp linux-2.6.37/arch/x86/kernel/paravirt.c linux-2.6.37/arch/x86/kernel/paravirt.c
20938 ---- linux-2.6.37/arch/x86/kernel/paravirt.c 2011-01-04 19:50:19.000000000 -0500
20939 -+++ linux-2.6.37/arch/x86/kernel/paravirt.c 2011-01-17 02:41:01.000000000 -0500
20940 +diff -urNp linux-2.6.37.1/arch/x86/kernel/paravirt.c linux-2.6.37.1/arch/x86/kernel/paravirt.c
20941 +--- linux-2.6.37.1/arch/x86/kernel/paravirt.c 2011-01-04 19:50:19.000000000 -0500
20942 ++++ linux-2.6.37.1/arch/x86/kernel/paravirt.c 2011-01-17 02:41:01.000000000 -0500
20943 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
20944 * corresponding structure. */
20945 static void *get_call_destination(u8 type)
20946 @@ -13441,9 +13501,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/paravirt.c linux-2.6.37/arch/x86/kernel/
20947 };
20948
20949 EXPORT_SYMBOL_GPL(pv_time_ops);
20950 -diff -urNp linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c
20951 ---- linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c 2011-01-04 19:50:19.000000000 -0500
20952 -+++ linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c 2011-01-17 02:41:01.000000000 -0500
20953 +diff -urNp linux-2.6.37.1/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.37.1/arch/x86/kernel/paravirt-spinlocks.c
20954 +--- linux-2.6.37.1/arch/x86/kernel/paravirt-spinlocks.c 2011-01-04 19:50:19.000000000 -0500
20955 ++++ linux-2.6.37.1/arch/x86/kernel/paravirt-spinlocks.c 2011-01-17 02:41:01.000000000 -0500
20956 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
20957 arch_spin_lock(lock);
20958 }
20959 @@ -13453,9 +13513,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.37/arch/x
20960 #ifdef CONFIG_SMP
20961 .spin_is_locked = __ticket_spin_is_locked,
20962 .spin_is_contended = __ticket_spin_is_contended,
20963 -diff -urNp linux-2.6.37/arch/x86/kernel/pci-calgary_64.c linux-2.6.37/arch/x86/kernel/pci-calgary_64.c
20964 ---- linux-2.6.37/arch/x86/kernel/pci-calgary_64.c 2011-01-04 19:50:19.000000000 -0500
20965 -+++ linux-2.6.37/arch/x86/kernel/pci-calgary_64.c 2011-01-17 02:41:01.000000000 -0500
20966 +diff -urNp linux-2.6.37.1/arch/x86/kernel/pci-calgary_64.c linux-2.6.37.1/arch/x86/kernel/pci-calgary_64.c
20967 +--- linux-2.6.37.1/arch/x86/kernel/pci-calgary_64.c 2011-01-04 19:50:19.000000000 -0500
20968 ++++ linux-2.6.37.1/arch/x86/kernel/pci-calgary_64.c 2011-01-17 02:41:01.000000000 -0500
20969 @@ -476,7 +476,7 @@ static void calgary_free_coherent(struct
20970 free_pages((unsigned long)vaddr, get_order(size));
20971 }
20972 @@ -13465,9 +13525,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/pci-calgary_64.c linux-2.6.37/arch/x86/k
20973 .alloc_coherent = calgary_alloc_coherent,
20974 .free_coherent = calgary_free_coherent,
20975 .map_sg = calgary_map_sg,
20976 -diff -urNp linux-2.6.37/arch/x86/kernel/pci-dma.c linux-2.6.37/arch/x86/kernel/pci-dma.c
20977 ---- linux-2.6.37/arch/x86/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
20978 -+++ linux-2.6.37/arch/x86/kernel/pci-dma.c 2011-01-17 02:41:01.000000000 -0500
20979 +diff -urNp linux-2.6.37.1/arch/x86/kernel/pci-dma.c linux-2.6.37.1/arch/x86/kernel/pci-dma.c
20980 +--- linux-2.6.37.1/arch/x86/kernel/pci-dma.c 2011-01-04 19:50:19.000000000 -0500
20981 ++++ linux-2.6.37.1/arch/x86/kernel/pci-dma.c 2011-01-17 02:41:01.000000000 -0500
20982 @@ -16,7 +16,7 @@
20983
20984 static int forbid_dac __read_mostly;
20985 @@ -13486,9 +13546,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/pci-dma.c linux-2.6.37/arch/x86/kernel/p
20986
20987 #ifdef CONFIG_PCI
20988 if (mask > 0xffffffff && forbid_dac > 0) {
20989 -diff -urNp linux-2.6.37/arch/x86/kernel/pci-gart_64.c linux-2.6.37/arch/x86/kernel/pci-gart_64.c
20990 ---- linux-2.6.37/arch/x86/kernel/pci-gart_64.c 2011-01-04 19:50:19.000000000 -0500
20991 -+++ linux-2.6.37/arch/x86/kernel/pci-gart_64.c 2011-01-17 02:41:01.000000000 -0500
20992 +diff -urNp linux-2.6.37.1/arch/x86/kernel/pci-gart_64.c linux-2.6.37.1/arch/x86/kernel/pci-gart_64.c
20993 +--- linux-2.6.37.1/arch/x86/kernel/pci-gart_64.c 2011-01-04 19:50:19.000000000 -0500
20994 ++++ linux-2.6.37.1/arch/x86/kernel/pci-gart_64.c 2011-01-17 02:41:01.000000000 -0500
20995 @@ -706,7 +706,7 @@ static __init int init_k8_gatt(struct ag
20996 return -1;
20997 }
20998 @@ -13498,9 +13558,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/pci-gart_64.c linux-2.6.37/arch/x86/kern
20999 .map_sg = gart_map_sg,
21000 .unmap_sg = gart_unmap_sg,
21001 .map_page = gart_map_page,
21002 -diff -urNp linux-2.6.37/arch/x86/kernel/pci-nommu.c linux-2.6.37/arch/x86/kernel/pci-nommu.c
21003 ---- linux-2.6.37/arch/x86/kernel/pci-nommu.c 2011-01-04 19:50:19.000000000 -0500
21004 -+++ linux-2.6.37/arch/x86/kernel/pci-nommu.c 2011-01-17 02:41:01.000000000 -0500
21005 +diff -urNp linux-2.6.37.1/arch/x86/kernel/pci-nommu.c linux-2.6.37.1/arch/x86/kernel/pci-nommu.c
21006 +--- linux-2.6.37.1/arch/x86/kernel/pci-nommu.c 2011-01-04 19:50:19.000000000 -0500
21007 ++++ linux-2.6.37.1/arch/x86/kernel/pci-nommu.c 2011-01-17 02:41:01.000000000 -0500
21008 @@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
21009 flush_write_buffers();
21010 }
21011 @@ -13510,9 +13570,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/pci-nommu.c linux-2.6.37/arch/x86/kernel
21012 .alloc_coherent = dma_generic_alloc_coherent,
21013 .free_coherent = nommu_free_coherent,
21014 .map_sg = nommu_map_sg,
21015 -diff -urNp linux-2.6.37/arch/x86/kernel/pci-swiotlb.c linux-2.6.37/arch/x86/kernel/pci-swiotlb.c
21016 ---- linux-2.6.37/arch/x86/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
21017 -+++ linux-2.6.37/arch/x86/kernel/pci-swiotlb.c 2011-01-17 02:41:01.000000000 -0500
21018 +diff -urNp linux-2.6.37.1/arch/x86/kernel/pci-swiotlb.c linux-2.6.37.1/arch/x86/kernel/pci-swiotlb.c
21019 +--- linux-2.6.37.1/arch/x86/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
21020 ++++ linux-2.6.37.1/arch/x86/kernel/pci-swiotlb.c 2011-01-17 02:41:01.000000000 -0500
21021 @@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(
21022 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
21023 }
21024 @@ -13522,9 +13582,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/pci-swiotlb.c linux-2.6.37/arch/x86/kern
21025 .mapping_error = swiotlb_dma_mapping_error,
21026 .alloc_coherent = x86_swiotlb_alloc_coherent,
21027 .free_coherent = swiotlb_free_coherent,
21028 -diff -urNp linux-2.6.37/arch/x86/kernel/process_32.c linux-2.6.37/arch/x86/kernel/process_32.c
21029 ---- linux-2.6.37/arch/x86/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
21030 -+++ linux-2.6.37/arch/x86/kernel/process_32.c 2011-01-17 02:41:01.000000000 -0500
21031 +diff -urNp linux-2.6.37.1/arch/x86/kernel/process_32.c linux-2.6.37.1/arch/x86/kernel/process_32.c
21032 +--- linux-2.6.37.1/arch/x86/kernel/process_32.c 2011-01-04 19:50:19.000000000 -0500
21033 ++++ linux-2.6.37.1/arch/x86/kernel/process_32.c 2011-01-17 02:41:01.000000000 -0500
21034 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
21035 unsigned long thread_saved_pc(struct task_struct *tsk)
21036 {
21037 @@ -13608,9 +13668,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/process_32.c linux-2.6.37/arch/x86/kerne
21038 + load_sp0(init_tss + smp_processor_id(), thread);
21039 +}
21040 +#endif
21041 -diff -urNp linux-2.6.37/arch/x86/kernel/process_64.c linux-2.6.37/arch/x86/kernel/process_64.c
21042 ---- linux-2.6.37/arch/x86/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
21043 -+++ linux-2.6.37/arch/x86/kernel/process_64.c 2011-01-17 02:41:01.000000000 -0500
21044 +diff -urNp linux-2.6.37.1/arch/x86/kernel/process_64.c linux-2.6.37.1/arch/x86/kernel/process_64.c
21045 +--- linux-2.6.37.1/arch/x86/kernel/process_64.c 2011-01-04 19:50:19.000000000 -0500
21046 ++++ linux-2.6.37.1/arch/x86/kernel/process_64.c 2011-01-17 02:41:01.000000000 -0500
21047 @@ -89,7 +89,7 @@ static void __exit_idle(void)
21048 void exit_idle(void)
21049 {
21050 @@ -13644,9 +13704,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/process_64.c linux-2.6.37/arch/x86/kerne
21051 return 0;
21052 ip = *(u64 *)(fp+8);
21053 if (!in_sched_functions(ip))
21054 -diff -urNp linux-2.6.37/arch/x86/kernel/process.c linux-2.6.37/arch/x86/kernel/process.c
21055 ---- linux-2.6.37/arch/x86/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
21056 -+++ linux-2.6.37/arch/x86/kernel/process.c 2011-01-17 02:41:01.000000000 -0500
21057 +diff -urNp linux-2.6.37.1/arch/x86/kernel/process.c linux-2.6.37.1/arch/x86/kernel/process.c
21058 +--- linux-2.6.37.1/arch/x86/kernel/process.c 2011-02-22 16:05:30.000000000 -0500
21059 ++++ linux-2.6.37.1/arch/x86/kernel/process.c 2011-02-22 16:09:31.000000000 -0500
21060 @@ -74,7 +74,7 @@ void exit_thread(void)
21061 unsigned long *bp = t->io_bitmap_ptr;
21062
21063 @@ -13656,16 +13716,26 @@ diff -urNp linux-2.6.37/arch/x86/kernel/process.c linux-2.6.37/arch/x86/kernel/p
21064
21065 t->io_bitmap_ptr = NULL;
21066 clear_thread_flag(TIF_IO_BITMAP);
21067 -@@ -108,7 +108,7 @@ void show_regs_common(void)
21068 +@@ -102,6 +102,7 @@ void show_regs_common(void)
21069 + vendor = dmi_get_system_info(DMI_SYS_VENDOR);
21070 + if (!vendor)
21071 + vendor = "";
21072 ++
21073 + product = dmi_get_system_info(DMI_PRODUCT_NAME);
21074 + if (!product)
21075 + product = "";
21076 +@@ -110,8 +111,8 @@ void show_regs_common(void)
21077 + board = dmi_get_system_info(DMI_BOARD_NAME);
21078
21079 printk(KERN_CONT "\n");
21080 - printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
21081 +- printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
21082 - current->pid, current->comm, print_tainted(),
21083 ++ printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s\n",
21084 + task_pid_nr(current), current->comm, print_tainted(),
21085 init_utsname()->release,
21086 (int)strcspn(init_utsname()->version, " "),
21087 - init_utsname()->version, board, product);
21088 -@@ -118,6 +118,9 @@ void flush_thread(void)
21089 + init_utsname()->version);
21090 +@@ -128,6 +129,9 @@ void flush_thread(void)
21091 {
21092 struct task_struct *tsk = current;
21093
21094 @@ -13675,7 +13745,7 @@ diff -urNp linux-2.6.37/arch/x86/kernel/process.c linux-2.6.37/arch/x86/kernel/p
21095 flush_ptrace_hw_breakpoint(tsk);
21096 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
21097 /*
21098 -@@ -280,10 +283,10 @@ int kernel_thread(int (*fn)(void *), voi
21099 +@@ -290,10 +294,10 @@ int kernel_thread(int (*fn)(void *), voi
21100 regs.di = (unsigned long) arg;
21101
21102 #ifdef CONFIG_X86_32
21103 @@ -13689,7 +13759,7 @@ diff -urNp linux-2.6.37/arch/x86/kernel/process.c linux-2.6.37/arch/x86/kernel/p
21104 #else
21105 regs.ss = __KERNEL_DS;
21106 #endif
21107 -@@ -658,17 +661,3 @@ static int __init idle_setup(char *str)
21108 +@@ -668,17 +672,3 @@ static int __init idle_setup(char *str)
21109 return 0;
21110 }
21111 early_param("idle", idle_setup);
21112 @@ -13707,9 +13777,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/process.c linux-2.6.37/arch/x86/kernel/p
21113 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
21114 -}
21115 -
21116 -diff -urNp linux-2.6.37/arch/x86/kernel/ptrace.c linux-2.6.37/arch/x86/kernel/ptrace.c
21117 ---- linux-2.6.37/arch/x86/kernel/ptrace.c 2011-01-04 19:50:19.000000000 -0500
21118 -+++ linux-2.6.37/arch/x86/kernel/ptrace.c 2011-01-17 02:41:01.000000000 -0500
21119 +diff -urNp linux-2.6.37.1/arch/x86/kernel/ptrace.c linux-2.6.37.1/arch/x86/kernel/ptrace.c
21120 +--- linux-2.6.37.1/arch/x86/kernel/ptrace.c 2011-01-04 19:50:19.000000000 -0500
21121 ++++ linux-2.6.37.1/arch/x86/kernel/ptrace.c 2011-01-17 02:41:01.000000000 -0500
21122 @@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi
21123 unsigned long addr, unsigned long data)
21124 {
21125 @@ -13745,9 +13815,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/ptrace.c linux-2.6.37/arch/x86/kernel/pt
21126 }
21127
21128 void user_single_step_siginfo(struct task_struct *tsk,
21129 -diff -urNp linux-2.6.37/arch/x86/kernel/reboot.c linux-2.6.37/arch/x86/kernel/reboot.c
21130 ---- linux-2.6.37/arch/x86/kernel/reboot.c 2011-01-04 19:50:19.000000000 -0500
21131 -+++ linux-2.6.37/arch/x86/kernel/reboot.c 2011-01-17 02:41:01.000000000 -0500
21132 +diff -urNp linux-2.6.37.1/arch/x86/kernel/reboot.c linux-2.6.37.1/arch/x86/kernel/reboot.c
21133 +--- linux-2.6.37.1/arch/x86/kernel/reboot.c 2011-01-04 19:50:19.000000000 -0500
21134 ++++ linux-2.6.37.1/arch/x86/kernel/reboot.c 2011-01-17 02:41:01.000000000 -0500
21135 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
21136 EXPORT_SYMBOL(pm_power_off);
21137
21138 @@ -13813,9 +13883,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/reboot.c linux-2.6.37/arch/x86/kernel/re
21139
21140 /* Set up the IDT for real mode. */
21141 load_idt(&real_mode_idt);
21142 -diff -urNp linux-2.6.37/arch/x86/kernel/setup.c linux-2.6.37/arch/x86/kernel/setup.c
21143 ---- linux-2.6.37/arch/x86/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
21144 -+++ linux-2.6.37/arch/x86/kernel/setup.c 2011-01-17 02:41:01.000000000 -0500
21145 +diff -urNp linux-2.6.37.1/arch/x86/kernel/setup.c linux-2.6.37.1/arch/x86/kernel/setup.c
21146 +--- linux-2.6.37.1/arch/x86/kernel/setup.c 2011-01-04 19:50:19.000000000 -0500
21147 ++++ linux-2.6.37.1/arch/x86/kernel/setup.c 2011-01-17 02:41:01.000000000 -0500
21148 @@ -654,7 +654,7 @@ static void __init trim_bios_range(void)
21149 * area (640->1Mb) as ram even though it is not.
21150 * take them out.
21151 @@ -13845,9 +13915,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/setup.c linux-2.6.37/arch/x86/kernel/set
21152 data_resource.end = virt_to_phys(_edata)-1;
21153 bss_resource.start = virt_to_phys(&__bss_start);
21154 bss_resource.end = virt_to_phys(&__bss_stop)-1;
21155 -diff -urNp linux-2.6.37/arch/x86/kernel/setup_percpu.c linux-2.6.37/arch/x86/kernel/setup_percpu.c
21156 ---- linux-2.6.37/arch/x86/kernel/setup_percpu.c 2011-01-04 19:50:19.000000000 -0500
21157 -+++ linux-2.6.37/arch/x86/kernel/setup_percpu.c 2011-01-17 02:41:01.000000000 -0500
21158 +diff -urNp linux-2.6.37.1/arch/x86/kernel/setup_percpu.c linux-2.6.37.1/arch/x86/kernel/setup_percpu.c
21159 +--- linux-2.6.37.1/arch/x86/kernel/setup_percpu.c 2011-01-04 19:50:19.000000000 -0500
21160 ++++ linux-2.6.37.1/arch/x86/kernel/setup_percpu.c 2011-01-17 02:41:01.000000000 -0500
21161 @@ -21,19 +21,17 @@
21162 #include <asm/cpu.h>
21163 #include <asm/stackprotector.h>
21164 @@ -13911,9 +13981,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/setup_percpu.c linux-2.6.37/arch/x86/ker
21165 /*
21166 * Up to this point, the boot CPU has been using .init.data
21167 * area. Reload any changed state for the boot CPU.
21168 -diff -urNp linux-2.6.37/arch/x86/kernel/signal.c linux-2.6.37/arch/x86/kernel/signal.c
21169 ---- linux-2.6.37/arch/x86/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
21170 -+++ linux-2.6.37/arch/x86/kernel/signal.c 2011-01-17 02:41:01.000000000 -0500
21171 +diff -urNp linux-2.6.37.1/arch/x86/kernel/signal.c linux-2.6.37.1/arch/x86/kernel/signal.c
21172 +--- linux-2.6.37.1/arch/x86/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
21173 ++++ linux-2.6.37.1/arch/x86/kernel/signal.c 2011-01-17 02:41:01.000000000 -0500
21174 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
21175 * Align the stack pointer according to the i386 ABI,
21176 * i.e. so that on function entry ((sp + 4) & 15) == 0.
21177 @@ -13988,9 +14058,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/signal.c linux-2.6.37/arch/x86/kernel/si
21178 return;
21179
21180 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
21181 -diff -urNp linux-2.6.37/arch/x86/kernel/smpboot.c linux-2.6.37/arch/x86/kernel/smpboot.c
21182 ---- linux-2.6.37/arch/x86/kernel/smpboot.c 2011-01-04 19:50:19.000000000 -0500
21183 -+++ linux-2.6.37/arch/x86/kernel/smpboot.c 2011-01-17 02:41:01.000000000 -0500
21184 +diff -urNp linux-2.6.37.1/arch/x86/kernel/smpboot.c linux-2.6.37.1/arch/x86/kernel/smpboot.c
21185 +--- linux-2.6.37.1/arch/x86/kernel/smpboot.c 2011-01-04 19:50:19.000000000 -0500
21186 ++++ linux-2.6.37.1/arch/x86/kernel/smpboot.c 2011-01-17 02:41:01.000000000 -0500
21187 @@ -786,7 +786,11 @@ do_rest:
21188 (unsigned long)task_stack_page(c_idle.idle) -
21189 KERNEL_STACK_OFFSET + THREAD_SIZE;
21190 @@ -14016,9 +14086,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/smpboot.c linux-2.6.37/arch/x86/kernel/s
21191 err = do_boot_cpu(apicid, cpu);
21192 if (err) {
21193 pr_debug("do_boot_cpu failed %d\n", err);
21194 -diff -urNp linux-2.6.37/arch/x86/kernel/step.c linux-2.6.37/arch/x86/kernel/step.c
21195 ---- linux-2.6.37/arch/x86/kernel/step.c 2011-01-04 19:50:19.000000000 -0500
21196 -+++ linux-2.6.37/arch/x86/kernel/step.c 2011-01-17 02:41:01.000000000 -0500
21197 +diff -urNp linux-2.6.37.1/arch/x86/kernel/step.c linux-2.6.37.1/arch/x86/kernel/step.c
21198 +--- linux-2.6.37.1/arch/x86/kernel/step.c 2011-01-04 19:50:19.000000000 -0500
21199 ++++ linux-2.6.37.1/arch/x86/kernel/step.c 2011-01-17 02:41:01.000000000 -0500
21200 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
21201 struct desc_struct *desc;
21202 unsigned long base;
21203 @@ -14061,17 +14131,17 @@ diff -urNp linux-2.6.37/arch/x86/kernel/step.c linux-2.6.37/arch/x86/kernel/step
21204 /* 32-bit mode: register increment */
21205 return 0;
21206 /* 64-bit mode: REX prefix */
21207 -diff -urNp linux-2.6.37/arch/x86/kernel/syscall_table_32.S linux-2.6.37/arch/x86/kernel/syscall_table_32.S
21208 ---- linux-2.6.37/arch/x86/kernel/syscall_table_32.S 2011-01-04 19:50:19.000000000 -0500
21209 -+++ linux-2.6.37/arch/x86/kernel/syscall_table_32.S 2011-01-17 02:41:01.000000000 -0500
21210 +diff -urNp linux-2.6.37.1/arch/x86/kernel/syscall_table_32.S linux-2.6.37.1/arch/x86/kernel/syscall_table_32.S
21211 +--- linux-2.6.37.1/arch/x86/kernel/syscall_table_32.S 2011-01-04 19:50:19.000000000 -0500
21212 ++++ linux-2.6.37.1/arch/x86/kernel/syscall_table_32.S 2011-01-17 02:41:01.000000000 -0500
21213 @@ -1,3 +1,4 @@
21214 +.section .rodata,"a",@progbits
21215 ENTRY(sys_call_table)
21216 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
21217 .long sys_exit
21218 -diff -urNp linux-2.6.37/arch/x86/kernel/sys_i386_32.c linux-2.6.37/arch/x86/kernel/sys_i386_32.c
21219 ---- linux-2.6.37/arch/x86/kernel/sys_i386_32.c 2011-01-04 19:50:19.000000000 -0500
21220 -+++ linux-2.6.37/arch/x86/kernel/sys_i386_32.c 2011-01-17 02:41:01.000000000 -0500
21221 +diff -urNp linux-2.6.37.1/arch/x86/kernel/sys_i386_32.c linux-2.6.37.1/arch/x86/kernel/sys_i386_32.c
21222 +--- linux-2.6.37.1/arch/x86/kernel/sys_i386_32.c 2011-01-04 19:50:19.000000000 -0500
21223 ++++ linux-2.6.37.1/arch/x86/kernel/sys_i386_32.c 2011-01-17 02:41:01.000000000 -0500
21224 @@ -24,17 +24,224 @@
21225
21226 #include <asm/syscalls.h>
21227 @@ -14309,9 +14379,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/sys_i386_32.c linux-2.6.37/arch/x86/kern
21228 +
21229 + return addr;
21230 }
21231 -diff -urNp linux-2.6.37/arch/x86/kernel/sys_x86_64.c linux-2.6.37/arch/x86/kernel/sys_x86_64.c
21232 ---- linux-2.6.37/arch/x86/kernel/sys_x86_64.c 2011-01-04 19:50:19.000000000 -0500
21233 -+++ linux-2.6.37/arch/x86/kernel/sys_x86_64.c 2011-01-17 02:41:01.000000000 -0500
21234 +diff -urNp linux-2.6.37.1/arch/x86/kernel/sys_x86_64.c linux-2.6.37.1/arch/x86/kernel/sys_x86_64.c
21235 +--- linux-2.6.37.1/arch/x86/kernel/sys_x86_64.c 2011-01-04 19:50:19.000000000 -0500
21236 ++++ linux-2.6.37.1/arch/x86/kernel/sys_x86_64.c 2011-01-17 02:41:01.000000000 -0500
21237 @@ -32,8 +32,8 @@ out:
21238 return error;
21239 }
21240 @@ -14433,9 +14503,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/sys_x86_64.c linux-2.6.37/arch/x86/kerne
21241 mm->cached_hole_size = ~0UL;
21242
21243 return addr;
21244 -diff -urNp linux-2.6.37/arch/x86/kernel/time.c linux-2.6.37/arch/x86/kernel/time.c
21245 ---- linux-2.6.37/arch/x86/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
21246 -+++ linux-2.6.37/arch/x86/kernel/time.c 2011-01-17 02:41:01.000000000 -0500
21247 +diff -urNp linux-2.6.37.1/arch/x86/kernel/time.c linux-2.6.37.1/arch/x86/kernel/time.c
21248 +--- linux-2.6.37.1/arch/x86/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
21249 ++++ linux-2.6.37.1/arch/x86/kernel/time.c 2011-01-17 02:41:01.000000000 -0500
21250 @@ -26,17 +26,13 @@
21251 int timer_ack;
21252 #endif
21253 @@ -14474,9 +14544,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/time.c linux-2.6.37/arch/x86/kernel/time
21254 }
21255 return pc;
21256 }
21257 -diff -urNp linux-2.6.37/arch/x86/kernel/tls.c linux-2.6.37/arch/x86/kernel/tls.c
21258 ---- linux-2.6.37/arch/x86/kernel/tls.c 2011-01-04 19:50:19.000000000 -0500
21259 -+++ linux-2.6.37/arch/x86/kernel/tls.c 2011-01-17 02:41:01.000000000 -0500
21260 +diff -urNp linux-2.6.37.1/arch/x86/kernel/tls.c linux-2.6.37.1/arch/x86/kernel/tls.c
21261 +--- linux-2.6.37.1/arch/x86/kernel/tls.c 2011-01-04 19:50:19.000000000 -0500
21262 ++++ linux-2.6.37.1/arch/x86/kernel/tls.c 2011-01-17 02:41:01.000000000 -0500
21263 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
21264 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
21265 return -EINVAL;
21266 @@ -14489,9 +14559,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/tls.c linux-2.6.37/arch/x86/kernel/tls.c
21267 set_tls_desc(p, idx, &info, 1);
21268
21269 return 0;
21270 -diff -urNp linux-2.6.37/arch/x86/kernel/trampoline_32.S linux-2.6.37/arch/x86/kernel/trampoline_32.S
21271 ---- linux-2.6.37/arch/x86/kernel/trampoline_32.S 2011-01-04 19:50:19.000000000 -0500
21272 -+++ linux-2.6.37/arch/x86/kernel/trampoline_32.S 2011-01-17 02:41:01.000000000 -0500
21273 +diff -urNp linux-2.6.37.1/arch/x86/kernel/trampoline_32.S linux-2.6.37.1/arch/x86/kernel/trampoline_32.S
21274 +--- linux-2.6.37.1/arch/x86/kernel/trampoline_32.S 2011-01-04 19:50:19.000000000 -0500
21275 ++++ linux-2.6.37.1/arch/x86/kernel/trampoline_32.S 2011-01-17 02:41:01.000000000 -0500
21276 @@ -32,6 +32,12 @@
21277 #include <asm/segment.h>
21278 #include <asm/page_types.h>
21279 @@ -14514,9 +14584,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/trampoline_32.S linux-2.6.37/arch/x86/ke
21280
21281 # These need to be in the same 64K segment as the above;
21282 # hence we don't use the boot_gdt_descr defined in head.S
21283 -diff -urNp linux-2.6.37/arch/x86/kernel/trampoline_64.S linux-2.6.37/arch/x86/kernel/trampoline_64.S
21284 ---- linux-2.6.37/arch/x86/kernel/trampoline_64.S 2011-01-04 19:50:19.000000000 -0500
21285 -+++ linux-2.6.37/arch/x86/kernel/trampoline_64.S 2011-01-17 02:41:01.000000000 -0500
21286 +diff -urNp linux-2.6.37.1/arch/x86/kernel/trampoline_64.S linux-2.6.37.1/arch/x86/kernel/trampoline_64.S
21287 +--- linux-2.6.37.1/arch/x86/kernel/trampoline_64.S 2011-01-04 19:50:19.000000000 -0500
21288 ++++ linux-2.6.37.1/arch/x86/kernel/trampoline_64.S 2011-01-17 02:41:01.000000000 -0500
21289 @@ -91,7 +91,7 @@ startup_32:
21290 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
21291 movl %eax, %ds
21292 @@ -14535,9 +14605,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/trampoline_64.S linux-2.6.37/arch/x86/ke
21293 .long tgdt - r_base
21294 .short 0
21295 .quad 0x00cf9b000000ffff # __KERNEL32_CS
21296 -diff -urNp linux-2.6.37/arch/x86/kernel/traps.c linux-2.6.37/arch/x86/kernel/traps.c
21297 ---- linux-2.6.37/arch/x86/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
21298 -+++ linux-2.6.37/arch/x86/kernel/traps.c 2011-01-17 02:41:01.000000000 -0500
21299 +diff -urNp linux-2.6.37.1/arch/x86/kernel/traps.c linux-2.6.37.1/arch/x86/kernel/traps.c
21300 +--- linux-2.6.37.1/arch/x86/kernel/traps.c 2011-01-04 19:50:19.000000000 -0500
21301 ++++ linux-2.6.37.1/arch/x86/kernel/traps.c 2011-01-17 02:41:01.000000000 -0500
21302 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
21303
21304 /* Do we ignore FPU interrupts ? */
21305 @@ -14680,9 +14750,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/traps.c linux-2.6.37/arch/x86/kernel/tra
21306 {
21307 if (!fixup_exception(regs)) {
21308 task->thread.error_code = error_code;
21309 -diff -urNp linux-2.6.37/arch/x86/kernel/tsc.c linux-2.6.37/arch/x86/kernel/tsc.c
21310 ---- linux-2.6.37/arch/x86/kernel/tsc.c 2011-01-04 19:50:19.000000000 -0500
21311 -+++ linux-2.6.37/arch/x86/kernel/tsc.c 2011-01-17 02:41:01.000000000 -0500
21312 +diff -urNp linux-2.6.37.1/arch/x86/kernel/tsc.c linux-2.6.37.1/arch/x86/kernel/tsc.c
21313 +--- linux-2.6.37.1/arch/x86/kernel/tsc.c 2011-01-04 19:50:19.000000000 -0500
21314 ++++ linux-2.6.37.1/arch/x86/kernel/tsc.c 2011-01-17 02:41:01.000000000 -0500
21315 @@ -837,7 +837,7 @@ static struct dmi_system_id __initdata b
21316 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
21317 },
21318 @@ -14692,9 +14762,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/tsc.c linux-2.6.37/arch/x86/kernel/tsc.c
21319 };
21320
21321 static void __init check_system_tsc_reliable(void)
21322 -diff -urNp linux-2.6.37/arch/x86/kernel/vm86_32.c linux-2.6.37/arch/x86/kernel/vm86_32.c
21323 ---- linux-2.6.37/arch/x86/kernel/vm86_32.c 2011-01-04 19:50:19.000000000 -0500
21324 -+++ linux-2.6.37/arch/x86/kernel/vm86_32.c 2011-01-17 02:41:01.000000000 -0500
21325 +diff -urNp linux-2.6.37.1/arch/x86/kernel/vm86_32.c linux-2.6.37.1/arch/x86/kernel/vm86_32.c
21326 +--- linux-2.6.37.1/arch/x86/kernel/vm86_32.c 2011-01-04 19:50:19.000000000 -0500
21327 ++++ linux-2.6.37.1/arch/x86/kernel/vm86_32.c 2011-01-17 02:41:01.000000000 -0500
21328 @@ -41,6 +41,7 @@
21329 #include <linux/ptrace.h>
21330 #include <linux/audit.h>
21331 @@ -14759,9 +14829,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/vm86_32.c linux-2.6.37/arch/x86/kernel/v
21332 if (get_user(segoffs, intr_ptr))
21333 goto cannot_handle;
21334 if ((segoffs >> 16) == BIOSSEG)
21335 -diff -urNp linux-2.6.37/arch/x86/kernel/vmlinux.lds.S linux-2.6.37/arch/x86/kernel/vmlinux.lds.S
21336 ---- linux-2.6.37/arch/x86/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
21337 -+++ linux-2.6.37/arch/x86/kernel/vmlinux.lds.S 2011-01-17 02:41:01.000000000 -0500
21338 +diff -urNp linux-2.6.37.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.37.1/arch/x86/kernel/vmlinux.lds.S
21339 +--- linux-2.6.37.1/arch/x86/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
21340 ++++ linux-2.6.37.1/arch/x86/kernel/vmlinux.lds.S 2011-01-17 02:41:01.000000000 -0500
21341 @@ -26,6 +26,13 @@
21342 #include <asm/page_types.h>
21343 #include <asm/cache.h>
21344 @@ -15059,9 +15129,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/vmlinux.lds.S linux-2.6.37/arch/x86/kern
21345 "kernel image bigger than KERNEL_IMAGE_SIZE");
21346
21347 #ifdef CONFIG_SMP
21348 -diff -urNp linux-2.6.37/arch/x86/kernel/vsyscall_64.c linux-2.6.37/arch/x86/kernel/vsyscall_64.c
21349 ---- linux-2.6.37/arch/x86/kernel/vsyscall_64.c 2011-01-04 19:50:19.000000000 -0500
21350 -+++ linux-2.6.37/arch/x86/kernel/vsyscall_64.c 2011-01-17 02:41:01.000000000 -0500
21351 +diff -urNp linux-2.6.37.1/arch/x86/kernel/vsyscall_64.c linux-2.6.37.1/arch/x86/kernel/vsyscall_64.c
21352 +--- linux-2.6.37.1/arch/x86/kernel/vsyscall_64.c 2011-01-04 19:50:19.000000000 -0500
21353 ++++ linux-2.6.37.1/arch/x86/kernel/vsyscall_64.c 2011-01-17 02:41:01.000000000 -0500
21354 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
21355
21356 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
21357 @@ -15079,9 +15149,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/vsyscall_64.c linux-2.6.37/arch/x86/kern
21358 p = tcache->blob[1];
21359 } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
21360 /* Load per CPU data from RDTSCP */
21361 -diff -urNp linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c
21362 ---- linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c 2011-01-04 19:50:19.000000000 -0500
21363 -+++ linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c 2011-01-17 02:41:01.000000000 -0500
21364 +diff -urNp linux-2.6.37.1/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.37.1/arch/x86/kernel/x8664_ksyms_64.c
21365 +--- linux-2.6.37.1/arch/x86/kernel/x8664_ksyms_64.c 2011-01-04 19:50:19.000000000 -0500
21366 ++++ linux-2.6.37.1/arch/x86/kernel/x8664_ksyms_64.c 2011-01-17 02:41:01.000000000 -0500
21367 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
21368 EXPORT_SYMBOL(copy_user_generic_string);
21369 EXPORT_SYMBOL(copy_user_generic_unrolled);
21370 @@ -15091,9 +15161,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.37/arch/x86/k
21371
21372 EXPORT_SYMBOL(copy_page);
21373 EXPORT_SYMBOL(clear_page);
21374 -diff -urNp linux-2.6.37/arch/x86/kernel/xsave.c linux-2.6.37/arch/x86/kernel/xsave.c
21375 ---- linux-2.6.37/arch/x86/kernel/xsave.c 2011-01-04 19:50:19.000000000 -0500
21376 -+++ linux-2.6.37/arch/x86/kernel/xsave.c 2011-01-17 02:41:01.000000000 -0500
21377 +diff -urNp linux-2.6.37.1/arch/x86/kernel/xsave.c linux-2.6.37.1/arch/x86/kernel/xsave.c
21378 +--- linux-2.6.37.1/arch/x86/kernel/xsave.c 2011-01-04 19:50:19.000000000 -0500
21379 ++++ linux-2.6.37.1/arch/x86/kernel/xsave.c 2011-01-17 02:41:01.000000000 -0500
21380 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
21381 fx_sw_user->xstate_size > fx_sw_user->extended_size)
21382 return -EINVAL;
21383 @@ -15121,9 +15191,9 @@ diff -urNp linux-2.6.37/arch/x86/kernel/xsave.c linux-2.6.37/arch/x86/kernel/xsa
21384 buf);
21385 if (unlikely(err)) {
21386 /*
21387 -diff -urNp linux-2.6.37/arch/x86/kvm/emulate.c linux-2.6.37/arch/x86/kvm/emulate.c
21388 ---- linux-2.6.37/arch/x86/kvm/emulate.c 2011-01-04 19:50:19.000000000 -0500
21389 -+++ linux-2.6.37/arch/x86/kvm/emulate.c 2011-01-17 02:41:01.000000000 -0500
21390 +diff -urNp linux-2.6.37.1/arch/x86/kvm/emulate.c linux-2.6.37.1/arch/x86/kvm/emulate.c
21391 +--- linux-2.6.37.1/arch/x86/kvm/emulate.c 2011-01-04 19:50:19.000000000 -0500
21392 ++++ linux-2.6.37.1/arch/x86/kvm/emulate.c 2011-01-17 02:41:01.000000000 -0500
21393 @@ -96,7 +96,7 @@
21394 #define Src2ImmByte (2<<29)
21395 #define Src2One (3<<29)
21396 @@ -15158,9 +15228,9 @@ diff -urNp linux-2.6.37/arch/x86/kvm/emulate.c linux-2.6.37/arch/x86/kvm/emulate
21397 switch ((_dst).bytes) { \
21398 case 1: \
21399 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
21400 -diff -urNp linux-2.6.37/arch/x86/kvm/lapic.c linux-2.6.37/arch/x86/kvm/lapic.c
21401 ---- linux-2.6.37/arch/x86/kvm/lapic.c 2011-01-04 19:50:19.000000000 -0500
21402 -+++ linux-2.6.37/arch/x86/kvm/lapic.c 2011-01-17 02:41:01.000000000 -0500
21403 +diff -urNp linux-2.6.37.1/arch/x86/kvm/lapic.c linux-2.6.37.1/arch/x86/kvm/lapic.c
21404 +--- linux-2.6.37.1/arch/x86/kvm/lapic.c 2011-01-04 19:50:19.000000000 -0500
21405 ++++ linux-2.6.37.1/arch/x86/kvm/lapic.c 2011-01-17 02:41:01.000000000 -0500
21406 @@ -53,7 +53,7 @@
21407 #define APIC_BUS_CYCLE_NS 1
21408
21409 @@ -15170,9 +15240,9 @@ diff -urNp linux-2.6.37/arch/x86/kvm/lapic.c linux-2.6.37/arch/x86/kvm/lapic.c
21410
21411 #define APIC_LVT_NUM 6
21412 /* 14 is the version for Xeon and Pentium 8.4.8*/
21413 -diff -urNp linux-2.6.37/arch/x86/kvm/svm.c linux-2.6.37/arch/x86/kvm/svm.c
21414 ---- linux-2.6.37/arch/x86/kvm/svm.c 2011-01-04 19:50:19.000000000 -0500
21415 -+++ linux-2.6.37/arch/x86/kvm/svm.c 2011-01-17 02:41:01.000000000 -0500
21416 +diff -urNp linux-2.6.37.1/arch/x86/kvm/svm.c linux-2.6.37.1/arch/x86/kvm/svm.c
21417 +--- linux-2.6.37.1/arch/x86/kvm/svm.c 2011-01-04 19:50:19.000000000 -0500
21418 ++++ linux-2.6.37.1/arch/x86/kvm/svm.c 2011-01-17 02:41:01.000000000 -0500
21419 @@ -3023,7 +3023,11 @@ static void reload_tss(struct kvm_vcpu *
21420 int cpu = raw_smp_processor_id();
21421
21422 @@ -15194,9 +15264,9 @@ diff -urNp linux-2.6.37/arch/x86/kvm/svm.c linux-2.6.37/arch/x86/kvm/svm.c
21423 .cpu_has_kvm_support = has_svm,
21424 .disabled_by_bios = is_disabled,
21425 .hardware_setup = svm_hardware_setup,
21426 -diff -urNp linux-2.6.37/arch/x86/kvm/vmx.c linux-2.6.37/arch/x86/kvm/vmx.c
21427 ---- linux-2.6.37/arch/x86/kvm/vmx.c 2011-01-04 19:50:19.000000000 -0500
21428 -+++ linux-2.6.37/arch/x86/kvm/vmx.c 2011-01-17 02:41:01.000000000 -0500
21429 +diff -urNp linux-2.6.37.1/arch/x86/kvm/vmx.c linux-2.6.37.1/arch/x86/kvm/vmx.c
21430 +--- linux-2.6.37.1/arch/x86/kvm/vmx.c 2011-01-04 19:50:19.000000000 -0500
21431 ++++ linux-2.6.37.1/arch/x86/kvm/vmx.c 2011-01-17 02:41:01.000000000 -0500
21432 @@ -705,7 +705,11 @@ static void reload_tss(void)
21433 struct desc_struct *descs;
21434
21435 @@ -15275,9 +15345,9 @@ diff -urNp linux-2.6.37/arch/x86/kvm/vmx.c linux-2.6.37/arch/x86/kvm/vmx.c
21436 .cpu_has_kvm_support = cpu_has_kvm_support,
21437 .disabled_by_bios = vmx_disabled_by_bios,
21438 .hardware_setup = hardware_setup,
21439 -diff -urNp linux-2.6.37/arch/x86/kvm/x86.c linux-2.6.37/arch/x86/kvm/x86.c
21440 ---- linux-2.6.37/arch/x86/kvm/x86.c 2011-01-04 19:50:19.000000000 -0500
21441 -+++ linux-2.6.37/arch/x86/kvm/x86.c 2011-01-17 02:41:01.000000000 -0500
21442 +diff -urNp linux-2.6.37.1/arch/x86/kvm/x86.c linux-2.6.37.1/arch/x86/kvm/x86.c
21443 +--- linux-2.6.37.1/arch/x86/kvm/x86.c 2011-01-04 19:50:19.000000000 -0500
21444 ++++ linux-2.6.37.1/arch/x86/kvm/x86.c 2011-01-17 02:41:01.000000000 -0500
21445 @@ -92,7 +92,7 @@ static void update_cr8_intercept(struct
21446 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
21447 struct kvm_cpuid_entry2 __user *entries);
21448 @@ -15389,9 +15459,9 @@ diff -urNp linux-2.6.37/arch/x86/kvm/x86.c linux-2.6.37/arch/x86/kvm/x86.c
21449
21450 if (kvm_x86_ops) {
21451 printk(KERN_ERR "kvm: already loaded the other module\n");
21452 -diff -urNp linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S
21453 ---- linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S 2011-01-04 19:50:19.000000000 -0500
21454 -+++ linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S 2011-01-17 02:41:01.000000000 -0500
21455 +diff -urNp linux-2.6.37.1/arch/x86/lib/atomic64_cx8_32.S linux-2.6.37.1/arch/x86/lib/atomic64_cx8_32.S
21456 +--- linux-2.6.37.1/arch/x86/lib/atomic64_cx8_32.S 2011-01-04 19:50:19.000000000 -0500
21457 ++++ linux-2.6.37.1/arch/x86/lib/atomic64_cx8_32.S 2011-01-17 02:41:01.000000000 -0500
21458 @@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8)
21459 movl %edx, %ecx
21460 \ins\()l %esi, %ebx
21461 @@ -15472,9 +15542,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S linux-2.6.37/arch/x86/lib
21462 LOCK_PREFIX
21463 cmpxchg8b (%esi)
21464 jne 1b
21465 -diff -urNp linux-2.6.37/arch/x86/lib/checksum_32.S linux-2.6.37/arch/x86/lib/checksum_32.S
21466 ---- linux-2.6.37/arch/x86/lib/checksum_32.S 2011-01-04 19:50:19.000000000 -0500
21467 -+++ linux-2.6.37/arch/x86/lib/checksum_32.S 2011-01-17 02:41:01.000000000 -0500
21468 +diff -urNp linux-2.6.37.1/arch/x86/lib/checksum_32.S linux-2.6.37.1/arch/x86/lib/checksum_32.S
21469 +--- linux-2.6.37.1/arch/x86/lib/checksum_32.S 2011-01-04 19:50:19.000000000 -0500
21470 ++++ linux-2.6.37.1/arch/x86/lib/checksum_32.S 2011-01-17 02:41:01.000000000 -0500
21471 @@ -28,7 +28,8 @@
21472 #include <linux/linkage.h>
21473 #include <asm/dwarf2.h>
21474 @@ -15735,9 +15805,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/checksum_32.S linux-2.6.37/arch/x86/lib/che
21475
21476 #undef ROUND
21477 #undef ROUND1
21478 -diff -urNp linux-2.6.37/arch/x86/lib/clear_page_64.S linux-2.6.37/arch/x86/lib/clear_page_64.S
21479 ---- linux-2.6.37/arch/x86/lib/clear_page_64.S 2011-01-04 19:50:19.000000000 -0500
21480 -+++ linux-2.6.37/arch/x86/lib/clear_page_64.S 2011-01-17 02:41:01.000000000 -0500
21481 +diff -urNp linux-2.6.37.1/arch/x86/lib/clear_page_64.S linux-2.6.37.1/arch/x86/lib/clear_page_64.S
21482 +--- linux-2.6.37.1/arch/x86/lib/clear_page_64.S 2011-01-04 19:50:19.000000000 -0500
21483 ++++ linux-2.6.37.1/arch/x86/lib/clear_page_64.S 2011-01-17 02:41:01.000000000 -0500
21484 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
21485
21486 #include <asm/cpufeature.h>
21487 @@ -15747,9 +15817,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/clear_page_64.S linux-2.6.37/arch/x86/lib/c
21488 1: .byte 0xeb /* jmp <disp8> */
21489 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21490 2:
21491 -diff -urNp linux-2.6.37/arch/x86/lib/copy_page_64.S linux-2.6.37/arch/x86/lib/copy_page_64.S
21492 ---- linux-2.6.37/arch/x86/lib/copy_page_64.S 2011-01-04 19:50:19.000000000 -0500
21493 -+++ linux-2.6.37/arch/x86/lib/copy_page_64.S 2011-01-17 02:41:01.000000000 -0500
21494 +diff -urNp linux-2.6.37.1/arch/x86/lib/copy_page_64.S linux-2.6.37.1/arch/x86/lib/copy_page_64.S
21495 +--- linux-2.6.37.1/arch/x86/lib/copy_page_64.S 2011-01-04 19:50:19.000000000 -0500
21496 ++++ linux-2.6.37.1/arch/x86/lib/copy_page_64.S 2011-01-17 02:41:01.000000000 -0500
21497 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
21498
21499 #include <asm/cpufeature.h>
21500 @@ -15759,9 +15829,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/copy_page_64.S linux-2.6.37/arch/x86/lib/co
21501 1: .byte 0xeb /* jmp <disp8> */
21502 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21503 2:
21504 -diff -urNp linux-2.6.37/arch/x86/lib/copy_user_64.S linux-2.6.37/arch/x86/lib/copy_user_64.S
21505 ---- linux-2.6.37/arch/x86/lib/copy_user_64.S 2011-01-04 19:50:19.000000000 -0500
21506 -+++ linux-2.6.37/arch/x86/lib/copy_user_64.S 2011-01-17 02:41:01.000000000 -0500
21507 +diff -urNp linux-2.6.37.1/arch/x86/lib/copy_user_64.S linux-2.6.37.1/arch/x86/lib/copy_user_64.S
21508 +--- linux-2.6.37.1/arch/x86/lib/copy_user_64.S 2011-01-04 19:50:19.000000000 -0500
21509 ++++ linux-2.6.37.1/arch/x86/lib/copy_user_64.S 2011-01-17 02:41:01.000000000 -0500
21510 @@ -15,13 +15,14 @@
21511 #include <asm/asm-offsets.h>
21512 #include <asm/thread_info.h>
21513 @@ -15818,9 +15888,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/copy_user_64.S linux-2.6.37/arch/x86/lib/co
21514 movl %edx,%ecx
21515 xorl %eax,%eax
21516 rep
21517 -diff -urNp linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S
21518 ---- linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S 2011-01-04 19:50:19.000000000 -0500
21519 -+++ linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S 2011-01-17 02:41:01.000000000 -0500
21520 +diff -urNp linux-2.6.37.1/arch/x86/lib/copy_user_nocache_64.S linux-2.6.37.1/arch/x86/lib/copy_user_nocache_64.S
21521 +--- linux-2.6.37.1/arch/x86/lib/copy_user_nocache_64.S 2011-01-04 19:50:19.000000000 -0500
21522 ++++ linux-2.6.37.1/arch/x86/lib/copy_user_nocache_64.S 2011-01-17 02:41:01.000000000 -0500
21523 @@ -14,6 +14,7 @@
21524 #include <asm/current.h>
21525 #include <asm/asm-offsets.h>
21526 @@ -15845,9 +15915,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S linux-2.6.37/arch/x8
21527 cmpl $8,%edx
21528 jb 20f /* less then 8 bytes, go to byte copy loop */
21529 ALIGN_DESTINATION
21530 -diff -urNp linux-2.6.37/arch/x86/lib/csum-wrappers_64.c linux-2.6.37/arch/x86/lib/csum-wrappers_64.c
21531 ---- linux-2.6.37/arch/x86/lib/csum-wrappers_64.c 2011-01-04 19:50:19.000000000 -0500
21532 -+++ linux-2.6.37/arch/x86/lib/csum-wrappers_64.c 2011-01-17 02:41:01.000000000 -0500
21533 +diff -urNp linux-2.6.37.1/arch/x86/lib/csum-wrappers_64.c linux-2.6.37.1/arch/x86/lib/csum-wrappers_64.c
21534 +--- linux-2.6.37.1/arch/x86/lib/csum-wrappers_64.c 2011-01-04 19:50:19.000000000 -0500
21535 ++++ linux-2.6.37.1/arch/x86/lib/csum-wrappers_64.c 2011-01-17 02:41:01.000000000 -0500
21536 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
21537 len -= 2;
21538 }
21539 @@ -15866,9 +15936,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/csum-wrappers_64.c linux-2.6.37/arch/x86/li
21540 return csum_partial_copy_generic(src, (void __force *)dst,
21541 len, isum, NULL, errp);
21542 }
21543 -diff -urNp linux-2.6.37/arch/x86/lib/getuser.S linux-2.6.37/arch/x86/lib/getuser.S
21544 ---- linux-2.6.37/arch/x86/lib/getuser.S 2011-01-04 19:50:19.000000000 -0500
21545 -+++ linux-2.6.37/arch/x86/lib/getuser.S 2011-01-17 02:41:01.000000000 -0500
21546 +diff -urNp linux-2.6.37.1/arch/x86/lib/getuser.S linux-2.6.37.1/arch/x86/lib/getuser.S
21547 +--- linux-2.6.37.1/arch/x86/lib/getuser.S 2011-01-04 19:50:19.000000000 -0500
21548 ++++ linux-2.6.37.1/arch/x86/lib/getuser.S 2011-01-17 02:41:01.000000000 -0500
21549 @@ -33,14 +33,35 @@
21550 #include <asm/asm-offsets.h>
21551 #include <asm/thread_info.h>
21552 @@ -15974,9 +16044,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/getuser.S linux-2.6.37/arch/x86/lib/getuser
21553 4: movq -7(%_ASM_AX),%_ASM_DX
21554 xor %eax,%eax
21555 ret
21556 -diff -urNp linux-2.6.37/arch/x86/lib/insn.c linux-2.6.37/arch/x86/lib/insn.c
21557 ---- linux-2.6.37/arch/x86/lib/insn.c 2011-01-04 19:50:19.000000000 -0500
21558 -+++ linux-2.6.37/arch/x86/lib/insn.c 2011-01-24 18:04:15.000000000 -0500
21559 +diff -urNp linux-2.6.37.1/arch/x86/lib/insn.c linux-2.6.37.1/arch/x86/lib/insn.c
21560 +--- linux-2.6.37.1/arch/x86/lib/insn.c 2011-01-04 19:50:19.000000000 -0500
21561 ++++ linux-2.6.37.1/arch/x86/lib/insn.c 2011-01-24 18:04:15.000000000 -0500
21562 @@ -21,6 +21,11 @@
21563 #include <linux/string.h>
21564 #include <asm/inat.h>
21565 @@ -16000,9 +16070,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/insn.c linux-2.6.37/arch/x86/lib/insn.c
21566 insn->x86_64 = x86_64 ? 1 : 0;
21567 insn->opnd_bytes = 4;
21568 if (x86_64)
21569 -diff -urNp linux-2.6.37/arch/x86/lib/mmx_32.c linux-2.6.37/arch/x86/lib/mmx_32.c
21570 ---- linux-2.6.37/arch/x86/lib/mmx_32.c 2011-01-04 19:50:19.000000000 -0500
21571 -+++ linux-2.6.37/arch/x86/lib/mmx_32.c 2011-01-17 02:41:01.000000000 -0500
21572 +diff -urNp linux-2.6.37.1/arch/x86/lib/mmx_32.c linux-2.6.37.1/arch/x86/lib/mmx_32.c
21573 +--- linux-2.6.37.1/arch/x86/lib/mmx_32.c 2011-01-04 19:50:19.000000000 -0500
21574 ++++ linux-2.6.37.1/arch/x86/lib/mmx_32.c 2011-01-17 02:41:01.000000000 -0500
21575 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
21576 {
21577 void *p;
21578 @@ -16318,9 +16388,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/mmx_32.c linux-2.6.37/arch/x86/lib/mmx_32.c
21579
21580 from += 64;
21581 to += 64;
21582 -diff -urNp linux-2.6.37/arch/x86/lib/putuser.S linux-2.6.37/arch/x86/lib/putuser.S
21583 ---- linux-2.6.37/arch/x86/lib/putuser.S 2011-01-04 19:50:19.000000000 -0500
21584 -+++ linux-2.6.37/arch/x86/lib/putuser.S 2011-01-17 02:41:01.000000000 -0500
21585 +diff -urNp linux-2.6.37.1/arch/x86/lib/putuser.S linux-2.6.37.1/arch/x86/lib/putuser.S
21586 +--- linux-2.6.37.1/arch/x86/lib/putuser.S 2011-01-04 19:50:19.000000000 -0500
21587 ++++ linux-2.6.37.1/arch/x86/lib/putuser.S 2011-01-17 02:41:01.000000000 -0500
21588 @@ -15,7 +15,8 @@
21589 #include <asm/thread_info.h>
21590 #include <asm/errno.h>
21591 @@ -16458,9 +16528,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/putuser.S linux-2.6.37/arch/x86/lib/putuser
21592 #endif
21593 xor %eax,%eax
21594 EXIT
21595 -diff -urNp linux-2.6.37/arch/x86/lib/usercopy_32.c linux-2.6.37/arch/x86/lib/usercopy_32.c
21596 ---- linux-2.6.37/arch/x86/lib/usercopy_32.c 2011-01-04 19:50:19.000000000 -0500
21597 -+++ linux-2.6.37/arch/x86/lib/usercopy_32.c 2011-01-17 02:41:01.000000000 -0500
21598 +diff -urNp linux-2.6.37.1/arch/x86/lib/usercopy_32.c linux-2.6.37.1/arch/x86/lib/usercopy_32.c
21599 +--- linux-2.6.37.1/arch/x86/lib/usercopy_32.c 2011-01-04 19:50:19.000000000 -0500
21600 ++++ linux-2.6.37.1/arch/x86/lib/usercopy_32.c 2011-01-17 02:41:01.000000000 -0500
21601 @@ -43,7 +43,7 @@ do { \
21602 __asm__ __volatile__( \
21603 " testl %1,%1\n" \
21604 @@ -17080,9 +17150,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/usercopy_32.c linux-2.6.37/arch/x86/lib/use
21605 +}
21606 +EXPORT_SYMBOL(set_fs);
21607 +#endif
21608 -diff -urNp linux-2.6.37/arch/x86/lib/usercopy_64.c linux-2.6.37/arch/x86/lib/usercopy_64.c
21609 ---- linux-2.6.37/arch/x86/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
21610 -+++ linux-2.6.37/arch/x86/lib/usercopy_64.c 2011-01-17 02:41:01.000000000 -0500
21611 +diff -urNp linux-2.6.37.1/arch/x86/lib/usercopy_64.c linux-2.6.37.1/arch/x86/lib/usercopy_64.c
21612 +--- linux-2.6.37.1/arch/x86/lib/usercopy_64.c 2011-01-04 19:50:19.000000000 -0500
21613 ++++ linux-2.6.37.1/arch/x86/lib/usercopy_64.c 2011-01-17 02:41:01.000000000 -0500
21614 @@ -42,6 +42,8 @@ long
21615 __strncpy_from_user(char *dst, const char __user *src, long count)
21616 {
21617 @@ -17119,9 +17189,9 @@ diff -urNp linux-2.6.37/arch/x86/lib/usercopy_64.c linux-2.6.37/arch/x86/lib/use
21618 }
21619 EXPORT_SYMBOL(copy_in_user);
21620
21621 -diff -urNp linux-2.6.37/arch/x86/Makefile linux-2.6.37/arch/x86/Makefile
21622 ---- linux-2.6.37/arch/x86/Makefile 2011-01-04 19:50:19.000000000 -0500
21623 -+++ linux-2.6.37/arch/x86/Makefile 2011-01-17 02:41:01.000000000 -0500
21624 +diff -urNp linux-2.6.37.1/arch/x86/Makefile linux-2.6.37.1/arch/x86/Makefile
21625 +--- linux-2.6.37.1/arch/x86/Makefile 2011-01-04 19:50:19.000000000 -0500
21626 ++++ linux-2.6.37.1/arch/x86/Makefile 2011-01-17 02:41:01.000000000 -0500
21627 @@ -195,3 +195,12 @@ define archhelp
21628 echo ' FDARGS="..." arguments for the booted kernel'
21629 echo ' FDINITRD=file initrd for the booted kernel'
21630 @@ -17135,9 +17205,9 @@ diff -urNp linux-2.6.37/arch/x86/Makefile linux-2.6.37/arch/x86/Makefile
21631 +
21632 +archprepare:
21633 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
21634 -diff -urNp linux-2.6.37/arch/x86/mm/extable.c linux-2.6.37/arch/x86/mm/extable.c
21635 ---- linux-2.6.37/arch/x86/mm/extable.c 2011-01-04 19:50:19.000000000 -0500
21636 -+++ linux-2.6.37/arch/x86/mm/extable.c 2011-01-17 02:41:01.000000000 -0500
21637 +diff -urNp linux-2.6.37.1/arch/x86/mm/extable.c linux-2.6.37.1/arch/x86/mm/extable.c
21638 +--- linux-2.6.37.1/arch/x86/mm/extable.c 2011-01-04 19:50:19.000000000 -0500
21639 ++++ linux-2.6.37.1/arch/x86/mm/extable.c 2011-01-17 02:41:01.000000000 -0500
21640 @@ -1,14 +1,71 @@
21641 #include <linux/module.h>
21642 #include <linux/spinlock.h>
21643 @@ -17211,9 +17281,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/extable.c linux-2.6.37/arch/x86/mm/extable.c
21644 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
21645 extern u32 pnp_bios_is_utter_crap;
21646 pnp_bios_is_utter_crap = 1;
21647 -diff -urNp linux-2.6.37/arch/x86/mm/fault.c linux-2.6.37/arch/x86/mm/fault.c
21648 ---- linux-2.6.37/arch/x86/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
21649 -+++ linux-2.6.37/arch/x86/mm/fault.c 2011-01-17 02:41:01.000000000 -0500
21650 +diff -urNp linux-2.6.37.1/arch/x86/mm/fault.c linux-2.6.37.1/arch/x86/mm/fault.c
21651 +--- linux-2.6.37.1/arch/x86/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
21652 ++++ linux-2.6.37.1/arch/x86/mm/fault.c 2011-01-17 02:41:01.000000000 -0500
21653 @@ -12,10 +12,18 @@
21654 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
21655 #include <linux/perf_event.h> /* perf_sw_event */
21656 @@ -17882,9 +17952,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/fault.c linux-2.6.37/arch/x86/mm/fault.c
21657 +
21658 + return ret ? -EFAULT : 0;
21659 +}
21660 -diff -urNp linux-2.6.37/arch/x86/mm/gup.c linux-2.6.37/arch/x86/mm/gup.c
21661 ---- linux-2.6.37/arch/x86/mm/gup.c 2011-01-04 19:50:19.000000000 -0500
21662 -+++ linux-2.6.37/arch/x86/mm/gup.c 2011-01-17 02:41:01.000000000 -0500
21663 +diff -urNp linux-2.6.37.1/arch/x86/mm/gup.c linux-2.6.37.1/arch/x86/mm/gup.c
21664 +--- linux-2.6.37.1/arch/x86/mm/gup.c 2011-01-04 19:50:19.000000000 -0500
21665 ++++ linux-2.6.37.1/arch/x86/mm/gup.c 2011-01-17 02:41:01.000000000 -0500
21666 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
21667 addr = start;
21668 len = (unsigned long) nr_pages << PAGE_SHIFT;
21669 @@ -17894,9 +17964,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/gup.c linux-2.6.37/arch/x86/mm/gup.c
21670 (void __user *)start, len)))
21671 return 0;
21672
21673 -diff -urNp linux-2.6.37/arch/x86/mm/highmem_32.c linux-2.6.37/arch/x86/mm/highmem_32.c
21674 ---- linux-2.6.37/arch/x86/mm/highmem_32.c 2011-01-04 19:50:19.000000000 -0500
21675 -+++ linux-2.6.37/arch/x86/mm/highmem_32.c 2011-01-17 02:41:01.000000000 -0500
21676 +diff -urNp linux-2.6.37.1/arch/x86/mm/highmem_32.c linux-2.6.37.1/arch/x86/mm/highmem_32.c
21677 +--- linux-2.6.37.1/arch/x86/mm/highmem_32.c 2011-01-04 19:50:19.000000000 -0500
21678 ++++ linux-2.6.37.1/arch/x86/mm/highmem_32.c 2011-01-17 02:41:01.000000000 -0500
21679 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
21680 idx = type + KM_TYPE_NR*smp_processor_id();
21681 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
21682 @@ -17908,9 +17978,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/highmem_32.c linux-2.6.37/arch/x86/mm/highme
21683
21684 return (void *)vaddr;
21685 }
21686 -diff -urNp linux-2.6.37/arch/x86/mm/hugetlbpage.c linux-2.6.37/arch/x86/mm/hugetlbpage.c
21687 ---- linux-2.6.37/arch/x86/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
21688 -+++ linux-2.6.37/arch/x86/mm/hugetlbpage.c 2011-01-17 02:41:01.000000000 -0500
21689 +diff -urNp linux-2.6.37.1/arch/x86/mm/hugetlbpage.c linux-2.6.37.1/arch/x86/mm/hugetlbpage.c
21690 +--- linux-2.6.37.1/arch/x86/mm/hugetlbpage.c 2011-01-04 19:50:19.000000000 -0500
21691 ++++ linux-2.6.37.1/arch/x86/mm/hugetlbpage.c 2011-01-17 02:41:01.000000000 -0500
21692 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
21693 struct hstate *h = hstate_file(file);
21694 struct mm_struct *mm = current->mm;
21695 @@ -18114,9 +18184,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/hugetlbpage.c linux-2.6.37/arch/x86/mm/huget
21696 return addr;
21697 }
21698 if (mm->get_unmapped_area == arch_get_unmapped_area)
21699 -diff -urNp linux-2.6.37/arch/x86/mm/init_32.c linux-2.6.37/arch/x86/mm/init_32.c
21700 ---- linux-2.6.37/arch/x86/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
21701 -+++ linux-2.6.37/arch/x86/mm/init_32.c 2011-01-17 02:41:01.000000000 -0500
21702 +diff -urNp linux-2.6.37.1/arch/x86/mm/init_32.c linux-2.6.37.1/arch/x86/mm/init_32.c
21703 +--- linux-2.6.37.1/arch/x86/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
21704 ++++ linux-2.6.37.1/arch/x86/mm/init_32.c 2011-01-17 02:41:01.000000000 -0500
21705 @@ -73,36 +73,6 @@ static __init void *alloc_low_page(void)
21706 }
21707
21708 @@ -18391,9 +18461,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/init_32.c linux-2.6.37/arch/x86/mm/init_32.c
21709 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
21710 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
21711 size >> 10);
21712 -diff -urNp linux-2.6.37/arch/x86/mm/init_64.c linux-2.6.37/arch/x86/mm/init_64.c
21713 ---- linux-2.6.37/arch/x86/mm/init_64.c 2011-01-04 19:50:19.000000000 -0500
21714 -+++ linux-2.6.37/arch/x86/mm/init_64.c 2011-01-17 02:41:01.000000000 -0500
21715 +diff -urNp linux-2.6.37.1/arch/x86/mm/init_64.c linux-2.6.37.1/arch/x86/mm/init_64.c
21716 +--- linux-2.6.37.1/arch/x86/mm/init_64.c 2011-01-04 19:50:19.000000000 -0500
21717 ++++ linux-2.6.37.1/arch/x86/mm/init_64.c 2011-01-17 02:41:01.000000000 -0500
21718 @@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa
21719 * around without checking the pgd every time.
21720 */
21721 @@ -18505,9 +18575,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/init_64.c linux-2.6.37/arch/x86/mm/init_64.c
21722 return "[vdso]";
21723 if (vma == &gate_vma)
21724 return "[vsyscall]";
21725 -diff -urNp linux-2.6.37/arch/x86/mm/init.c linux-2.6.37/arch/x86/mm/init.c
21726 ---- linux-2.6.37/arch/x86/mm/init.c 2011-01-04 19:50:19.000000000 -0500
21727 -+++ linux-2.6.37/arch/x86/mm/init.c 2011-01-17 02:41:01.000000000 -0500
21728 +diff -urNp linux-2.6.37.1/arch/x86/mm/init.c linux-2.6.37.1/arch/x86/mm/init.c
21729 +--- linux-2.6.37.1/arch/x86/mm/init.c 2011-01-04 19:50:19.000000000 -0500
21730 ++++ linux-2.6.37.1/arch/x86/mm/init.c 2011-01-17 02:41:01.000000000 -0500
21731 @@ -72,11 +72,7 @@ static void __init find_early_table_spac
21732 * cause a hotspot and fill up ZONE_DMA. The page tables
21733 * need roughly 0.5KB per GB.
21734 @@ -18623,9 +18693,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/init.c linux-2.6.37/arch/x86/mm/init.c
21735 free_init_pages("unused kernel memory",
21736 (unsigned long)(&__init_begin),
21737 (unsigned long)(&__init_end));
21738 -diff -urNp linux-2.6.37/arch/x86/mm/iomap_32.c linux-2.6.37/arch/x86/mm/iomap_32.c
21739 ---- linux-2.6.37/arch/x86/mm/iomap_32.c 2011-01-04 19:50:19.000000000 -0500
21740 -+++ linux-2.6.37/arch/x86/mm/iomap_32.c 2011-01-17 02:41:01.000000000 -0500
21741 +diff -urNp linux-2.6.37.1/arch/x86/mm/iomap_32.c linux-2.6.37.1/arch/x86/mm/iomap_32.c
21742 +--- linux-2.6.37.1/arch/x86/mm/iomap_32.c 2011-01-04 19:50:19.000000000 -0500
21743 ++++ linux-2.6.37.1/arch/x86/mm/iomap_32.c 2011-01-17 02:41:01.000000000 -0500
21744 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
21745 type = kmap_atomic_idx_push();
21746 idx = type + KM_TYPE_NR * smp_processor_id();
21747 @@ -18638,9 +18708,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/iomap_32.c linux-2.6.37/arch/x86/mm/iomap_32
21748 arch_flush_lazy_mmu_mode();
21749
21750 return (void *)vaddr;
21751 -diff -urNp linux-2.6.37/arch/x86/mm/ioremap.c linux-2.6.37/arch/x86/mm/ioremap.c
21752 ---- linux-2.6.37/arch/x86/mm/ioremap.c 2011-01-04 19:50:19.000000000 -0500
21753 -+++ linux-2.6.37/arch/x86/mm/ioremap.c 2011-01-17 02:41:01.000000000 -0500
21754 +diff -urNp linux-2.6.37.1/arch/x86/mm/ioremap.c linux-2.6.37.1/arch/x86/mm/ioremap.c
21755 +--- linux-2.6.37.1/arch/x86/mm/ioremap.c 2011-01-04 19:50:19.000000000 -0500
21756 ++++ linux-2.6.37.1/arch/x86/mm/ioremap.c 2011-01-17 02:41:01.000000000 -0500
21757 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re
21758 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
21759 int is_ram = page_is_ram(pfn);
21760 @@ -18669,9 +18739,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/ioremap.c linux-2.6.37/arch/x86/mm/ioremap.c
21761
21762 /*
21763 * The boot-ioremap range spans multiple pmds, for which
21764 -diff -urNp linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c
21765 ---- linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-04 19:50:19.000000000 -0500
21766 -+++ linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-17 02:41:01.000000000 -0500
21767 +diff -urNp linux-2.6.37.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.37.1/arch/x86/mm/kmemcheck/kmemcheck.c
21768 +--- linux-2.6.37.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-04 19:50:19.000000000 -0500
21769 ++++ linux-2.6.37.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-01-17 02:41:01.000000000 -0500
21770 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
21771 * memory (e.g. tracked pages)? For now, we need this to avoid
21772 * invoking kmemcheck for PnP BIOS calls.
21773 @@ -18684,9 +18754,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.37/arch/x86/
21774 return false;
21775
21776 pte = kmemcheck_pte_lookup(address);
21777 -diff -urNp linux-2.6.37/arch/x86/mm/mmap.c linux-2.6.37/arch/x86/mm/mmap.c
21778 ---- linux-2.6.37/arch/x86/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
21779 -+++ linux-2.6.37/arch/x86/mm/mmap.c 2011-01-17 02:41:01.000000000 -0500
21780 +diff -urNp linux-2.6.37.1/arch/x86/mm/mmap.c linux-2.6.37.1/arch/x86/mm/mmap.c
21781 +--- linux-2.6.37.1/arch/x86/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
21782 ++++ linux-2.6.37.1/arch/x86/mm/mmap.c 2011-01-17 02:41:01.000000000 -0500
21783 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
21784 * Leave an at least ~128 MB hole with possible stack randomization.
21785 */
21786 @@ -18768,9 +18838,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/mmap.c linux-2.6.37/arch/x86/mm/mmap.c
21787 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
21788 mm->unmap_area = arch_unmap_area_topdown;
21789 }
21790 -diff -urNp linux-2.6.37/arch/x86/mm/numa_32.c linux-2.6.37/arch/x86/mm/numa_32.c
21791 ---- linux-2.6.37/arch/x86/mm/numa_32.c 2011-01-04 19:50:19.000000000 -0500
21792 -+++ linux-2.6.37/arch/x86/mm/numa_32.c 2011-01-17 02:41:01.000000000 -0500
21793 +diff -urNp linux-2.6.37.1/arch/x86/mm/numa_32.c linux-2.6.37.1/arch/x86/mm/numa_32.c
21794 +--- linux-2.6.37.1/arch/x86/mm/numa_32.c 2011-01-04 19:50:19.000000000 -0500
21795 ++++ linux-2.6.37.1/arch/x86/mm/numa_32.c 2011-01-17 02:41:01.000000000 -0500
21796 @@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int
21797 }
21798 #endif
21799 @@ -18779,9 +18849,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/numa_32.c linux-2.6.37/arch/x86/mm/numa_32.c
21800 extern unsigned long highend_pfn, highstart_pfn;
21801
21802 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
21803 -diff -urNp linux-2.6.37/arch/x86/mm/pageattr.c linux-2.6.37/arch/x86/mm/pageattr.c
21804 ---- linux-2.6.37/arch/x86/mm/pageattr.c 2011-01-04 19:50:19.000000000 -0500
21805 -+++ linux-2.6.37/arch/x86/mm/pageattr.c 2011-01-17 02:41:01.000000000 -0500
21806 +diff -urNp linux-2.6.37.1/arch/x86/mm/pageattr.c linux-2.6.37.1/arch/x86/mm/pageattr.c
21807 +--- linux-2.6.37.1/arch/x86/mm/pageattr.c 2011-01-04 19:50:19.000000000 -0500
21808 ++++ linux-2.6.37.1/arch/x86/mm/pageattr.c 2011-01-17 02:41:01.000000000 -0500
21809 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection
21810 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
21811 */
21812 @@ -18865,9 +18935,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/pageattr.c linux-2.6.37/arch/x86/mm/pageattr
21813 }
21814
21815 static int
21816 -diff -urNp linux-2.6.37/arch/x86/mm/pageattr-test.c linux-2.6.37/arch/x86/mm/pageattr-test.c
21817 ---- linux-2.6.37/arch/x86/mm/pageattr-test.c 2011-01-04 19:50:19.000000000 -0500
21818 -+++ linux-2.6.37/arch/x86/mm/pageattr-test.c 2011-01-17 02:41:01.000000000 -0500
21819 +diff -urNp linux-2.6.37.1/arch/x86/mm/pageattr-test.c linux-2.6.37.1/arch/x86/mm/pageattr-test.c
21820 +--- linux-2.6.37.1/arch/x86/mm/pageattr-test.c 2011-01-04 19:50:19.000000000 -0500
21821 ++++ linux-2.6.37.1/arch/x86/mm/pageattr-test.c 2011-01-17 02:41:01.000000000 -0500
21822 @@ -36,7 +36,7 @@ enum {
21823
21824 static int pte_testbit(pte_t pte)
21825 @@ -18877,9 +18947,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/pageattr-test.c linux-2.6.37/arch/x86/mm/pag
21826 }
21827
21828 struct split_state {
21829 -diff -urNp linux-2.6.37/arch/x86/mm/pat.c linux-2.6.37/arch/x86/mm/pat.c
21830 ---- linux-2.6.37/arch/x86/mm/pat.c 2011-01-04 19:50:19.000000000 -0500
21831 -+++ linux-2.6.37/arch/x86/mm/pat.c 2011-01-17 02:41:01.000000000 -0500
21832 +diff -urNp linux-2.6.37.1/arch/x86/mm/pat.c linux-2.6.37.1/arch/x86/mm/pat.c
21833 +--- linux-2.6.37.1/arch/x86/mm/pat.c 2011-01-04 19:50:19.000000000 -0500
21834 ++++ linux-2.6.37.1/arch/x86/mm/pat.c 2011-01-17 02:41:01.000000000 -0500
21835 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
21836
21837 if (!entry) {
21838 @@ -18927,9 +18997,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/pat.c linux-2.6.37/arch/x86/mm/pat.c
21839 cattr_name(want_flags),
21840 (unsigned long long)paddr,
21841 (unsigned long long)(paddr + size),
21842 -diff -urNp linux-2.6.37/arch/x86/mm/pgtable_32.c linux-2.6.37/arch/x86/mm/pgtable_32.c
21843 ---- linux-2.6.37/arch/x86/mm/pgtable_32.c 2011-01-04 19:50:19.000000000 -0500
21844 -+++ linux-2.6.37/arch/x86/mm/pgtable_32.c 2011-01-17 02:41:01.000000000 -0500
21845 +diff -urNp linux-2.6.37.1/arch/x86/mm/pgtable_32.c linux-2.6.37.1/arch/x86/mm/pgtable_32.c
21846 +--- linux-2.6.37.1/arch/x86/mm/pgtable_32.c 2011-01-04 19:50:19.000000000 -0500
21847 ++++ linux-2.6.37.1/arch/x86/mm/pgtable_32.c 2011-01-17 02:41:01.000000000 -0500
21848 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
21849 return;
21850 }
21851 @@ -18944,9 +19014,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/pgtable_32.c linux-2.6.37/arch/x86/mm/pgtabl
21852
21853 /*
21854 * It's enough to flush this one mapping.
21855 -diff -urNp linux-2.6.37/arch/x86/mm/pgtable.c linux-2.6.37/arch/x86/mm/pgtable.c
21856 ---- linux-2.6.37/arch/x86/mm/pgtable.c 2011-01-04 19:50:19.000000000 -0500
21857 -+++ linux-2.6.37/arch/x86/mm/pgtable.c 2011-01-17 02:41:01.000000000 -0500
21858 +diff -urNp linux-2.6.37.1/arch/x86/mm/pgtable.c linux-2.6.37.1/arch/x86/mm/pgtable.c
21859 +--- linux-2.6.37.1/arch/x86/mm/pgtable.c 2011-01-04 19:50:19.000000000 -0500
21860 ++++ linux-2.6.37.1/arch/x86/mm/pgtable.c 2011-01-17 02:41:01.000000000 -0500
21861 @@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p
21862 list_del(&page->lru);
21863 }
21864 @@ -19199,9 +19269,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/pgtable.c linux-2.6.37/arch/x86/mm/pgtable.c
21865 pgd_dtor(pgd);
21866 paravirt_pgd_free(mm, pgd);
21867 free_page((unsigned long)pgd);
21868 -diff -urNp linux-2.6.37/arch/x86/mm/setup_nx.c linux-2.6.37/arch/x86/mm/setup_nx.c
21869 ---- linux-2.6.37/arch/x86/mm/setup_nx.c 2011-01-04 19:50:19.000000000 -0500
21870 -+++ linux-2.6.37/arch/x86/mm/setup_nx.c 2011-01-17 02:41:01.000000000 -0500
21871 +diff -urNp linux-2.6.37.1/arch/x86/mm/setup_nx.c linux-2.6.37.1/arch/x86/mm/setup_nx.c
21872 +--- linux-2.6.37.1/arch/x86/mm/setup_nx.c 2011-01-04 19:50:19.000000000 -0500
21873 ++++ linux-2.6.37.1/arch/x86/mm/setup_nx.c 2011-01-17 02:41:01.000000000 -0500
21874 @@ -5,8 +5,10 @@
21875 #include <asm/pgtable.h>
21876 #include <asm/proto.h>
21877 @@ -19231,9 +19301,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/setup_nx.c linux-2.6.37/arch/x86/mm/setup_nx
21878 __supported_pte_mask &= ~_PAGE_NX;
21879 }
21880
21881 -diff -urNp linux-2.6.37/arch/x86/mm/tlb.c linux-2.6.37/arch/x86/mm/tlb.c
21882 ---- linux-2.6.37/arch/x86/mm/tlb.c 2011-01-04 19:50:19.000000000 -0500
21883 -+++ linux-2.6.37/arch/x86/mm/tlb.c 2011-01-17 02:41:01.000000000 -0500
21884 +diff -urNp linux-2.6.37.1/arch/x86/mm/tlb.c linux-2.6.37.1/arch/x86/mm/tlb.c
21885 +--- linux-2.6.37.1/arch/x86/mm/tlb.c 2011-01-04 19:50:19.000000000 -0500
21886 ++++ linux-2.6.37.1/arch/x86/mm/tlb.c 2011-01-17 02:41:01.000000000 -0500
21887 @@ -14,7 +14,7 @@
21888 #include <asm/uv/uv.h>
21889
21890 @@ -19255,9 +19325,9 @@ diff -urNp linux-2.6.37/arch/x86/mm/tlb.c linux-2.6.37/arch/x86/mm/tlb.c
21891 }
21892 EXPORT_SYMBOL_GPL(leave_mm);
21893
21894 -diff -urNp linux-2.6.37/arch/x86/oprofile/backtrace.c linux-2.6.37/arch/x86/oprofile/backtrace.c
21895 ---- linux-2.6.37/arch/x86/oprofile/backtrace.c 2011-01-04 19:50:19.000000000 -0500
21896 -+++ linux-2.6.37/arch/x86/oprofile/backtrace.c 2011-01-17 02:41:01.000000000 -0500
21897 +diff -urNp linux-2.6.37.1/arch/x86/oprofile/backtrace.c linux-2.6.37.1/arch/x86/oprofile/backtrace.c
21898 +--- linux-2.6.37.1/arch/x86/oprofile/backtrace.c 2011-01-04 19:50:19.000000000 -0500
21899 ++++ linux-2.6.37.1/arch/x86/oprofile/backtrace.c 2011-01-17 02:41:01.000000000 -0500
21900 @@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram
21901 struct stack_frame_ia32 *fp;
21902
21903 @@ -19276,9 +19346,9 @@ diff -urNp linux-2.6.37/arch/x86/oprofile/backtrace.c linux-2.6.37/arch/x86/opro
21904 unsigned long stack = kernel_stack_pointer(regs);
21905 if (depth)
21906 dump_trace(NULL, regs, (unsigned long *)stack, 0,
21907 -diff -urNp linux-2.6.37/arch/x86/oprofile/op_model_p4.c linux-2.6.37/arch/x86/oprofile/op_model_p4.c
21908 ---- linux-2.6.37/arch/x86/oprofile/op_model_p4.c 2011-01-04 19:50:19.000000000 -0500
21909 -+++ linux-2.6.37/arch/x86/oprofile/op_model_p4.c 2011-01-17 02:41:01.000000000 -0500
21910 +diff -urNp linux-2.6.37.1/arch/x86/oprofile/op_model_p4.c linux-2.6.37.1/arch/x86/oprofile/op_model_p4.c
21911 +--- linux-2.6.37.1/arch/x86/oprofile/op_model_p4.c 2011-01-04 19:50:19.000000000 -0500
21912 ++++ linux-2.6.37.1/arch/x86/oprofile/op_model_p4.c 2011-01-17 02:41:01.000000000 -0500
21913 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
21914 #endif
21915 }
21916 @@ -19288,9 +19358,9 @@ diff -urNp linux-2.6.37/arch/x86/oprofile/op_model_p4.c linux-2.6.37/arch/x86/op
21917 {
21918 #ifdef CONFIG_SMP
21919 return smp_num_siblings == 2 ? 2 : 1;
21920 -diff -urNp linux-2.6.37/arch/x86/pci/common.c linux-2.6.37/arch/x86/pci/common.c
21921 ---- linux-2.6.37/arch/x86/pci/common.c 2011-01-04 19:50:19.000000000 -0500
21922 -+++ linux-2.6.37/arch/x86/pci/common.c 2011-01-17 02:41:01.000000000 -0500
21923 +diff -urNp linux-2.6.37.1/arch/x86/pci/common.c linux-2.6.37.1/arch/x86/pci/common.c
21924 +--- linux-2.6.37.1/arch/x86/pci/common.c 2011-01-04 19:50:19.000000000 -0500
21925 ++++ linux-2.6.37.1/arch/x86/pci/common.c 2011-01-17 02:41:01.000000000 -0500
21926 @@ -32,8 +32,8 @@ int noioapicreroute = 1;
21927 int pcibios_last_bus = -1;
21928 unsigned long pirq_table_addr;
21929 @@ -19311,9 +19381,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/common.c linux-2.6.37/arch/x86/pci/common.c
21930 };
21931
21932 void __init dmi_check_pciprobe(void)
21933 -diff -urNp linux-2.6.37/arch/x86/pci/direct.c linux-2.6.37/arch/x86/pci/direct.c
21934 ---- linux-2.6.37/arch/x86/pci/direct.c 2011-01-04 19:50:19.000000000 -0500
21935 -+++ linux-2.6.37/arch/x86/pci/direct.c 2011-01-17 02:41:01.000000000 -0500
21936 +diff -urNp linux-2.6.37.1/arch/x86/pci/direct.c linux-2.6.37.1/arch/x86/pci/direct.c
21937 +--- linux-2.6.37.1/arch/x86/pci/direct.c 2011-01-04 19:50:19.000000000 -0500
21938 ++++ linux-2.6.37.1/arch/x86/pci/direct.c 2011-01-17 02:41:01.000000000 -0500
21939 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
21940
21941 #undef PCI_CONF1_ADDRESS
21942 @@ -19341,9 +19411,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/direct.c linux-2.6.37/arch/x86/pci/direct.c
21943 {
21944 u32 x = 0;
21945 int year, devfn;
21946 -diff -urNp linux-2.6.37/arch/x86/pci/fixup.c linux-2.6.37/arch/x86/pci/fixup.c
21947 ---- linux-2.6.37/arch/x86/pci/fixup.c 2011-01-04 19:50:19.000000000 -0500
21948 -+++ linux-2.6.37/arch/x86/pci/fixup.c 2011-01-17 02:41:01.000000000 -0500
21949 +diff -urNp linux-2.6.37.1/arch/x86/pci/fixup.c linux-2.6.37.1/arch/x86/pci/fixup.c
21950 +--- linux-2.6.37.1/arch/x86/pci/fixup.c 2011-01-04 19:50:19.000000000 -0500
21951 ++++ linux-2.6.37.1/arch/x86/pci/fixup.c 2011-01-17 02:41:01.000000000 -0500
21952 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
21953 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
21954 },
21955 @@ -19362,9 +19432,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/fixup.c linux-2.6.37/arch/x86/pci/fixup.c
21956 };
21957
21958 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
21959 -diff -urNp linux-2.6.37/arch/x86/pci/irq.c linux-2.6.37/arch/x86/pci/irq.c
21960 ---- linux-2.6.37/arch/x86/pci/irq.c 2011-01-04 19:50:19.000000000 -0500
21961 -+++ linux-2.6.37/arch/x86/pci/irq.c 2011-01-17 02:41:01.000000000 -0500
21962 +diff -urNp linux-2.6.37.1/arch/x86/pci/irq.c linux-2.6.37.1/arch/x86/pci/irq.c
21963 +--- linux-2.6.37.1/arch/x86/pci/irq.c 2011-01-04 19:50:19.000000000 -0500
21964 ++++ linux-2.6.37.1/arch/x86/pci/irq.c 2011-01-17 02:41:01.000000000 -0500
21965 @@ -542,7 +542,7 @@ static __init int intel_router_probe(str
21966 static struct pci_device_id __initdata pirq_440gx[] = {
21967 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
21968 @@ -19383,9 +19453,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/irq.c linux-2.6.37/arch/x86/pci/irq.c
21969 };
21970
21971 void __init pcibios_irq_init(void)
21972 -diff -urNp linux-2.6.37/arch/x86/pci/mmconfig_32.c linux-2.6.37/arch/x86/pci/mmconfig_32.c
21973 ---- linux-2.6.37/arch/x86/pci/mmconfig_32.c 2011-01-04 19:50:19.000000000 -0500
21974 -+++ linux-2.6.37/arch/x86/pci/mmconfig_32.c 2011-01-17 02:41:01.000000000 -0500
21975 +diff -urNp linux-2.6.37.1/arch/x86/pci/mmconfig_32.c linux-2.6.37.1/arch/x86/pci/mmconfig_32.c
21976 +--- linux-2.6.37.1/arch/x86/pci/mmconfig_32.c 2011-01-04 19:50:19.000000000 -0500
21977 ++++ linux-2.6.37.1/arch/x86/pci/mmconfig_32.c 2011-01-17 02:41:01.000000000 -0500
21978 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int
21979 return 0;
21980 }
21981 @@ -19395,9 +19465,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/mmconfig_32.c linux-2.6.37/arch/x86/pci/mmc
21982 .read = pci_mmcfg_read,
21983 .write = pci_mmcfg_write,
21984 };
21985 -diff -urNp linux-2.6.37/arch/x86/pci/mmconfig_64.c linux-2.6.37/arch/x86/pci/mmconfig_64.c
21986 ---- linux-2.6.37/arch/x86/pci/mmconfig_64.c 2011-01-04 19:50:19.000000000 -0500
21987 -+++ linux-2.6.37/arch/x86/pci/mmconfig_64.c 2011-01-17 02:41:01.000000000 -0500
21988 +diff -urNp linux-2.6.37.1/arch/x86/pci/mmconfig_64.c linux-2.6.37.1/arch/x86/pci/mmconfig_64.c
21989 +--- linux-2.6.37.1/arch/x86/pci/mmconfig_64.c 2011-01-04 19:50:19.000000000 -0500
21990 ++++ linux-2.6.37.1/arch/x86/pci/mmconfig_64.c 2011-01-17 02:41:01.000000000 -0500
21991 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int
21992 return 0;
21993 }
21994 @@ -19407,9 +19477,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/mmconfig_64.c linux-2.6.37/arch/x86/pci/mmc
21995 .read = pci_mmcfg_read,
21996 .write = pci_mmcfg_write,
21997 };
21998 -diff -urNp linux-2.6.37/arch/x86/pci/numaq_32.c linux-2.6.37/arch/x86/pci/numaq_32.c
21999 ---- linux-2.6.37/arch/x86/pci/numaq_32.c 2011-01-04 19:50:19.000000000 -0500
22000 -+++ linux-2.6.37/arch/x86/pci/numaq_32.c 2011-01-17 02:41:01.000000000 -0500
22001 +diff -urNp linux-2.6.37.1/arch/x86/pci/numaq_32.c linux-2.6.37.1/arch/x86/pci/numaq_32.c
22002 +--- linux-2.6.37.1/arch/x86/pci/numaq_32.c 2011-01-04 19:50:19.000000000 -0500
22003 ++++ linux-2.6.37.1/arch/x86/pci/numaq_32.c 2011-01-17 02:41:01.000000000 -0500
22004 @@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
22005
22006 #undef PCI_CONF1_MQ_ADDRESS
22007 @@ -19419,9 +19489,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/numaq_32.c linux-2.6.37/arch/x86/pci/numaq_
22008 .read = pci_conf1_mq_read,
22009 .write = pci_conf1_mq_write
22010 };
22011 -diff -urNp linux-2.6.37/arch/x86/pci/olpc.c linux-2.6.37/arch/x86/pci/olpc.c
22012 ---- linux-2.6.37/arch/x86/pci/olpc.c 2011-01-04 19:50:19.000000000 -0500
22013 -+++ linux-2.6.37/arch/x86/pci/olpc.c 2011-01-17 02:41:01.000000000 -0500
22014 +diff -urNp linux-2.6.37.1/arch/x86/pci/olpc.c linux-2.6.37.1/arch/x86/pci/olpc.c
22015 +--- linux-2.6.37.1/arch/x86/pci/olpc.c 2011-01-04 19:50:19.000000000 -0500
22016 ++++ linux-2.6.37.1/arch/x86/pci/olpc.c 2011-01-17 02:41:01.000000000 -0500
22017 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
22018 return 0;
22019 }
22020 @@ -19431,9 +19501,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/olpc.c linux-2.6.37/arch/x86/pci/olpc.c
22021 .read = pci_olpc_read,
22022 .write = pci_olpc_write,
22023 };
22024 -diff -urNp linux-2.6.37/arch/x86/pci/pcbios.c linux-2.6.37/arch/x86/pci/pcbios.c
22025 ---- linux-2.6.37/arch/x86/pci/pcbios.c 2011-01-04 19:50:19.000000000 -0500
22026 -+++ linux-2.6.37/arch/x86/pci/pcbios.c 2011-01-17 02:41:01.000000000 -0500
22027 +diff -urNp linux-2.6.37.1/arch/x86/pci/pcbios.c linux-2.6.37.1/arch/x86/pci/pcbios.c
22028 +--- linux-2.6.37.1/arch/x86/pci/pcbios.c 2011-01-04 19:50:19.000000000 -0500
22029 ++++ linux-2.6.37.1/arch/x86/pci/pcbios.c 2011-01-17 02:41:01.000000000 -0500
22030 @@ -57,50 +57,93 @@ union bios32 {
22031 static struct {
22032 unsigned long address;
22033 @@ -19756,9 +19826,9 @@ diff -urNp linux-2.6.37/arch/x86/pci/pcbios.c linux-2.6.37/arch/x86/pci/pcbios.c
22034 return !(ret & 0xff00);
22035 }
22036 EXPORT_SYMBOL(pcibios_set_irq_routing);
22037 -diff -urNp linux-2.6.37/arch/x86/platform/efi/efi_32.c linux-2.6.37/arch/x86/platform/efi/efi_32.c
22038 ---- linux-2.6.37/arch/x86/platform/efi/efi_32.c 2011-01-04 19:50:19.000000000 -0500
22039 -+++ linux-2.6.37/arch/x86/platform/efi/efi_32.c 2011-01-17 02:41:01.000000000 -0500
22040 +diff -urNp linux-2.6.37.1/arch/x86/platform/efi/efi_32.c linux-2.6.37.1/arch/x86/platform/efi/efi_32.c
22041 +--- linux-2.6.37.1/arch/x86/platform/efi/efi_32.c 2011-01-04 19:50:19.000000000 -0500
22042 ++++ linux-2.6.37.1/arch/x86/platform/efi/efi_32.c 2011-01-17 02:41:01.000000000 -0500
22043 @@ -38,70 +38,37 @@
22044 */
22045
22046 @@ -19839,9 +19909,9 @@ diff -urNp linux-2.6.37/arch/x86/platform/efi/efi_32.c linux-2.6.37/arch/x86/pla
22047
22048 /*
22049 * After the lock is released, the original page table is restored.
22050 -diff -urNp linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S
22051 ---- linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S 2011-01-04 19:50:19.000000000 -0500
22052 -+++ linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S 2011-01-17 02:41:01.000000000 -0500
22053 +diff -urNp linux-2.6.37.1/arch/x86/platform/efi/efi_stub_32.S linux-2.6.37.1/arch/x86/platform/efi/efi_stub_32.S
22054 +--- linux-2.6.37.1/arch/x86/platform/efi/efi_stub_32.S 2011-01-04 19:50:19.000000000 -0500
22055 ++++ linux-2.6.37.1/arch/x86/platform/efi/efi_stub_32.S 2011-01-17 02:41:01.000000000 -0500
22056 @@ -6,6 +6,7 @@
22057 */
22058
22059 @@ -19940,9 +20010,9 @@ diff -urNp linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S linux-2.6.37/arch/x8
22060 saved_return_addr:
22061 .long 0
22062 efi_rt_function_ptr:
22063 -diff -urNp linux-2.6.37/arch/x86/power/cpu.c linux-2.6.37/arch/x86/power/cpu.c
22064 ---- linux-2.6.37/arch/x86/power/cpu.c 2011-01-04 19:50:19.000000000 -0500
22065 -+++ linux-2.6.37/arch/x86/power/cpu.c 2011-01-17 02:41:01.000000000 -0500
22066 +diff -urNp linux-2.6.37.1/arch/x86/power/cpu.c linux-2.6.37.1/arch/x86/power/cpu.c
22067 +--- linux-2.6.37.1/arch/x86/power/cpu.c 2011-01-04 19:50:19.000000000 -0500
22068 ++++ linux-2.6.37.1/arch/x86/power/cpu.c 2011-01-17 02:41:01.000000000 -0500
22069 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
22070 static void fix_processor_context(void)
22071 {
22072 @@ -19962,9 +20032,9 @@ diff -urNp linux-2.6.37/arch/x86/power/cpu.c linux-2.6.37/arch/x86/power/cpu.c
22073
22074 syscall_init(); /* This sets MSR_*STAR and related */
22075 #endif
22076 -diff -urNp linux-2.6.37/arch/x86/vdso/Makefile linux-2.6.37/arch/x86/vdso/Makefile
22077 ---- linux-2.6.37/arch/x86/vdso/Makefile 2011-01-04 19:50:19.000000000 -0500
22078 -+++ linux-2.6.37/arch/x86/vdso/Makefile 2011-01-17 02:41:01.000000000 -0500
22079 +diff -urNp linux-2.6.37.1/arch/x86/vdso/Makefile linux-2.6.37.1/arch/x86/vdso/Makefile
22080 +--- linux-2.6.37.1/arch/x86/vdso/Makefile 2011-01-04 19:50:19.000000000 -0500
22081 ++++ linux-2.6.37.1/arch/x86/vdso/Makefile 2011-01-17 02:41:01.000000000 -0500
22082 @@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@
22083 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
22084 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
22085 @@ -19974,9 +20044,9 @@ diff -urNp linux-2.6.37/arch/x86/vdso/Makefile linux-2.6.37/arch/x86/vdso/Makefi
22086 GCOV_PROFILE := n
22087
22088 #
22089 -diff -urNp linux-2.6.37/arch/x86/vdso/vclock_gettime.c linux-2.6.37/arch/x86/vdso/vclock_gettime.c
22090 ---- linux-2.6.37/arch/x86/vdso/vclock_gettime.c 2011-01-04 19:50:19.000000000 -0500
22091 -+++ linux-2.6.37/arch/x86/vdso/vclock_gettime.c 2011-01-17 02:41:01.000000000 -0500
22092 +diff -urNp linux-2.6.37.1/arch/x86/vdso/vclock_gettime.c linux-2.6.37.1/arch/x86/vdso/vclock_gettime.c
22093 +--- linux-2.6.37.1/arch/x86/vdso/vclock_gettime.c 2011-01-04 19:50:19.000000000 -0500
22094 ++++ linux-2.6.37.1/arch/x86/vdso/vclock_gettime.c 2011-01-17 02:41:01.000000000 -0500
22095 @@ -22,24 +22,48 @@
22096 #include <asm/hpet.h>
22097 #include <asm/unistd.h>
22098 @@ -20075,9 +20145,9 @@ diff -urNp linux-2.6.37/arch/x86/vdso/vclock_gettime.c linux-2.6.37/arch/x86/vds
22099 }
22100 int gettimeofday(struct timeval *, struct timezone *)
22101 __attribute__((weak, alias("__vdso_gettimeofday")));
22102 -diff -urNp linux-2.6.37/arch/x86/vdso/vdso32-setup.c linux-2.6.37/arch/x86/vdso/vdso32-setup.c
22103 ---- linux-2.6.37/arch/x86/vdso/vdso32-setup.c 2011-01-04 19:50:19.000000000 -0500
22104 -+++ linux-2.6.37/arch/x86/vdso/vdso32-setup.c 2011-01-17 02:41:01.000000000 -0500
22105 +diff -urNp linux-2.6.37.1/arch/x86/vdso/vdso32-setup.c linux-2.6.37.1/arch/x86/vdso/vdso32-setup.c
22106 +--- linux-2.6.37.1/arch/x86/vdso/vdso32-setup.c 2011-01-04 19:50:19.000000000 -0500
22107 ++++ linux-2.6.37.1/arch/x86/vdso/vdso32-setup.c 2011-01-17 02:41:01.000000000 -0500
22108 @@ -25,6 +25,7 @@
22109 #include <asm/tlbflush.h>
22110 #include <asm/vdso.h>
22111 @@ -20160,9 +20230,9 @@ diff -urNp linux-2.6.37/arch/x86/vdso/vdso32-setup.c linux-2.6.37/arch/x86/vdso/
22112 return &gate_vma;
22113 return NULL;
22114 }
22115 -diff -urNp linux-2.6.37/arch/x86/vdso/vdso.lds.S linux-2.6.37/arch/x86/vdso/vdso.lds.S
22116 ---- linux-2.6.37/arch/x86/vdso/vdso.lds.S 2011-01-04 19:50:19.000000000 -0500
22117 -+++ linux-2.6.37/arch/x86/vdso/vdso.lds.S 2011-01-17 02:41:01.000000000 -0500
22118 +diff -urNp linux-2.6.37.1/arch/x86/vdso/vdso.lds.S linux-2.6.37.1/arch/x86/vdso/vdso.lds.S
22119 +--- linux-2.6.37.1/arch/x86/vdso/vdso.lds.S 2011-01-04 19:50:19.000000000 -0500
22120 ++++ linux-2.6.37.1/arch/x86/vdso/vdso.lds.S 2011-01-17 02:41:01.000000000 -0500
22121 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
22122 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
22123 #include "vextern.h"
22124 @@ -20173,9 +20243,9 @@ diff -urNp linux-2.6.37/arch/x86/vdso/vdso.lds.S linux-2.6.37/arch/x86/vdso/vdso
22125 +VEXTERN(fallback_time)
22126 +VEXTERN(getcpu)
22127 +#undef VEXTERN
22128 -diff -urNp linux-2.6.37/arch/x86/vdso/vextern.h linux-2.6.37/arch/x86/vdso/vextern.h
22129 ---- linux-2.6.37/arch/x86/vdso/vextern.h 2011-01-04 19:50:19.000000000 -0500
22130 -+++ linux-2.6.37/arch/x86/vdso/vextern.h 2011-01-17 02:41:01.000000000 -0500
22131 +diff -urNp linux-2.6.37.1/arch/x86/vdso/vextern.h linux-2.6.37.1/arch/x86/vdso/vextern.h
22132 +--- linux-2.6.37.1/arch/x86/vdso/vextern.h 2011-01-04 19:50:19.000000000 -0500
22133 ++++ linux-2.6.37.1/arch/x86/vdso/vextern.h 2011-01-17 02:41:01.000000000 -0500
22134 @@ -11,6 +11,5 @@
22135 put into vextern.h and be referenced as a pointer with vdso prefix.
22136 The main kernel later fills in the values. */
22137 @@ -20183,9 +20253,9 @@ diff -urNp linux-2.6.37/arch/x86/vdso/vextern.h linux-2.6.37/arch/x86/vdso/vexte
22138 -VEXTERN(jiffies)
22139 VEXTERN(vgetcpu_mode)
22140 VEXTERN(vsyscall_gtod_data)
22141 -diff -urNp linux-2.6.37/arch/x86/vdso/vma.c linux-2.6.37/arch/x86/vdso/vma.c
22142 ---- linux-2.6.37/arch/x86/vdso/vma.c 2011-01-04 19:50:19.000000000 -0500
22143 -+++ linux-2.6.37/arch/x86/vdso/vma.c 2011-01-17 02:41:01.000000000 -0500
22144 +diff -urNp linux-2.6.37.1/arch/x86/vdso/vma.c linux-2.6.37.1/arch/x86/vdso/vma.c
22145 +--- linux-2.6.37.1/arch/x86/vdso/vma.c 2011-01-04 19:50:19.000000000 -0500
22146 ++++ linux-2.6.37.1/arch/x86/vdso/vma.c 2011-01-17 02:41:01.000000000 -0500
22147 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
22148 if (!vbase)
22149 goto oom;
22150 @@ -20224,9 +20294,9 @@ diff -urNp linux-2.6.37/arch/x86/vdso/vma.c linux-2.6.37/arch/x86/vdso/vma.c
22151 - return 0;
22152 -}
22153 -__setup("vdso=", vdso_setup);
22154 -diff -urNp linux-2.6.37/arch/x86/xen/enlighten.c linux-2.6.37/arch/x86/xen/enlighten.c
22155 ---- linux-2.6.37/arch/x86/xen/enlighten.c 2011-01-04 19:50:19.000000000 -0500
22156 -+++ linux-2.6.37/arch/x86/xen/enlighten.c 2011-01-17 02:41:01.000000000 -0500
22157 +diff -urNp linux-2.6.37.1/arch/x86/xen/enlighten.c linux-2.6.37.1/arch/x86/xen/enlighten.c
22158 +--- linux-2.6.37.1/arch/x86/xen/enlighten.c 2011-01-04 19:50:19.000000000 -0500
22159 ++++ linux-2.6.37.1/arch/x86/xen/enlighten.c 2011-01-17 02:41:01.000000000 -0500
22160 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
22161
22162 struct shared_info xen_dummy_shared_info;
22163 @@ -20278,9 +20348,9 @@ diff -urNp linux-2.6.37/arch/x86/xen/enlighten.c linux-2.6.37/arch/x86/xen/enlig
22164 xen_smp_init();
22165
22166 pgd = (pgd_t *)xen_start_info->pt_base;
22167 -diff -urNp linux-2.6.37/arch/x86/xen/mmu.c linux-2.6.37/arch/x86/xen/mmu.c
22168 ---- linux-2.6.37/arch/x86/xen/mmu.c 2011-01-04 19:50:19.000000000 -0500
22169 -+++ linux-2.6.37/arch/x86/xen/mmu.c 2011-01-17 02:41:01.000000000 -0500
22170 +diff -urNp linux-2.6.37.1/arch/x86/xen/mmu.c linux-2.6.37.1/arch/x86/xen/mmu.c
22171 +--- linux-2.6.37.1/arch/x86/xen/mmu.c 2011-01-04 19:50:19.000000000 -0500
22172 ++++ linux-2.6.37.1/arch/x86/xen/mmu.c 2011-01-17 02:41:01.000000000 -0500
22173 @@ -2084,6 +2084,8 @@ __init pgd_t *xen_setup_kernel_pagetable
22174 convert_pfn_mfn(init_level4_pgt);
22175 convert_pfn_mfn(level3_ident_pgt);
22176 @@ -20301,9 +20371,9 @@ diff -urNp linux-2.6.37/arch/x86/xen/mmu.c linux-2.6.37/arch/x86/xen/mmu.c
22177 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
22178 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
22179
22180 -diff -urNp linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c
22181 ---- linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c 2011-01-04 19:50:19.000000000 -0500
22182 -+++ linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c 2011-01-17 02:41:01.000000000 -0500
22183 +diff -urNp linux-2.6.37.1/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.37.1/arch/x86/xen/pci-swiotlb-xen.c
22184 +--- linux-2.6.37.1/arch/x86/xen/pci-swiotlb-xen.c 2011-01-04 19:50:19.000000000 -0500
22185 ++++ linux-2.6.37.1/arch/x86/xen/pci-swiotlb-xen.c 2011-01-17 02:41:01.000000000 -0500
22186 @@ -10,7 +10,7 @@
22187
22188 int xen_swiotlb __read_mostly;
22189 @@ -20313,9 +20383,9 @@ diff -urNp linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.37/arch/x86/xen
22190 .mapping_error = xen_swiotlb_dma_mapping_error,
22191 .alloc_coherent = xen_swiotlb_alloc_coherent,
22192 .free_coherent = xen_swiotlb_free_coherent,
22193 -diff -urNp linux-2.6.37/arch/x86/xen/smp.c linux-2.6.37/arch/x86/xen/smp.c
22194 ---- linux-2.6.37/arch/x86/xen/smp.c 2011-01-04 19:50:19.000000000 -0500
22195 -+++ linux-2.6.37/arch/x86/xen/smp.c 2011-01-17 02:41:01.000000000 -0500
22196 +diff -urNp linux-2.6.37.1/arch/x86/xen/smp.c linux-2.6.37.1/arch/x86/xen/smp.c
22197 +--- linux-2.6.37.1/arch/x86/xen/smp.c 2011-01-04 19:50:19.000000000 -0500
22198 ++++ linux-2.6.37.1/arch/x86/xen/smp.c 2011-01-17 02:41:01.000000000 -0500
22199 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
22200 {
22201 BUG_ON(smp_processor_id() != 0);
22202 @@ -20344,9 +20414,9 @@ diff -urNp linux-2.6.37/arch/x86/xen/smp.c linux-2.6.37/arch/x86/xen/smp.c
22203 #else
22204 ctxt->gs_base_kernel = per_cpu_offset(cpu);
22205 #endif
22206 -diff -urNp linux-2.6.37/arch/x86/xen/xen-head.S linux-2.6.37/arch/x86/xen/xen-head.S
22207 ---- linux-2.6.37/arch/x86/xen/xen-head.S 2011-01-04 19:50:19.000000000 -0500
22208 -+++ linux-2.6.37/arch/x86/xen/xen-head.S 2011-01-17 02:41:01.000000000 -0500
22209 +diff -urNp linux-2.6.37.1/arch/x86/xen/xen-head.S linux-2.6.37.1/arch/x86/xen/xen-head.S
22210 +--- linux-2.6.37.1/arch/x86/xen/xen-head.S 2011-01-04 19:50:19.000000000 -0500
22211 ++++ linux-2.6.37.1/arch/x86/xen/xen-head.S 2011-01-17 02:41:01.000000000 -0500
22212 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
22213 #ifdef CONFIG_X86_32
22214 mov %esi,xen_start_info
22215 @@ -20365,9 +20435,9 @@ diff -urNp linux-2.6.37/arch/x86/xen/xen-head.S linux-2.6.37/arch/x86/xen/xen-he
22216 #else
22217 mov %rsi,xen_start_info
22218 mov $init_thread_union+THREAD_SIZE,%rsp
22219 -diff -urNp linux-2.6.37/arch/x86/xen/xen-ops.h linux-2.6.37/arch/x86/xen/xen-ops.h
22220 ---- linux-2.6.37/arch/x86/xen/xen-ops.h 2011-01-04 19:50:19.000000000 -0500
22221 -+++ linux-2.6.37/arch/x86/xen/xen-ops.h 2011-01-17 02:41:01.000000000 -0500
22222 +diff -urNp linux-2.6.37.1/arch/x86/xen/xen-ops.h linux-2.6.37.1/arch/x86/xen/xen-ops.h
22223 +--- linux-2.6.37.1/arch/x86/xen/xen-ops.h 2011-01-04 19:50:19.000000000 -0500
22224 ++++ linux-2.6.37.1/arch/x86/xen/xen-ops.h 2011-01-17 02:41:01.000000000 -0500
22225 @@ -10,8 +10,6 @@
22226 extern const char xen_hypervisor_callback[];
22227 extern const char xen_failsafe_callback[];
22228 @@ -20377,9 +20447,9 @@ diff -urNp linux-2.6.37/arch/x86/xen/xen-ops.h linux-2.6.37/arch/x86/xen/xen-ops
22229 struct trap_info;
22230 void xen_copy_trap_info(struct trap_info *traps);
22231
22232 -diff -urNp linux-2.6.37/block/blk-iopoll.c linux-2.6.37/block/blk-iopoll.c
22233 ---- linux-2.6.37/block/blk-iopoll.c 2011-01-04 19:50:19.000000000 -0500
22234 -+++ linux-2.6.37/block/blk-iopoll.c 2011-01-17 02:41:01.000000000 -0500
22235 +diff -urNp linux-2.6.37.1/block/blk-iopoll.c linux-2.6.37.1/block/blk-iopoll.c
22236 +--- linux-2.6.37.1/block/blk-iopoll.c 2011-01-04 19:50:19.000000000 -0500
22237 ++++ linux-2.6.37.1/block/blk-iopoll.c 2011-01-17 02:41:01.000000000 -0500
22238 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
22239 }
22240 EXPORT_SYMBOL(blk_iopoll_complete);
22241 @@ -20389,9 +20459,9 @@ diff -urNp linux-2.6.37/block/blk-iopoll.c linux-2.6.37/block/blk-iopoll.c
22242 {
22243 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
22244 int rearm = 0, budget = blk_iopoll_budget;
22245 -diff -urNp linux-2.6.37/block/blk-map.c linux-2.6.37/block/blk-map.c
22246 ---- linux-2.6.37/block/blk-map.c 2011-01-04 19:50:19.000000000 -0500
22247 -+++ linux-2.6.37/block/blk-map.c 2011-01-17 02:41:01.000000000 -0500
22248 +diff -urNp linux-2.6.37.1/block/blk-map.c linux-2.6.37.1/block/blk-map.c
22249 +--- linux-2.6.37.1/block/blk-map.c 2011-01-04 19:50:19.000000000 -0500
22250 ++++ linux-2.6.37.1/block/blk-map.c 2011-01-17 02:41:01.000000000 -0500
22251 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
22252 if (!len || !kbuf)
22253 return -EINVAL;
22254 @@ -20401,9 +20471,9 @@ diff -urNp linux-2.6.37/block/blk-map.c linux-2.6.37/block/blk-map.c
22255 if (do_copy)
22256 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
22257 else
22258 -diff -urNp linux-2.6.37/block/blk-softirq.c linux-2.6.37/block/blk-softirq.c
22259 ---- linux-2.6.37/block/blk-softirq.c 2011-01-04 19:50:19.000000000 -0500
22260 -+++ linux-2.6.37/block/blk-softirq.c 2011-01-17 02:41:01.000000000 -0500
22261 +diff -urNp linux-2.6.37.1/block/blk-softirq.c linux-2.6.37.1/block/blk-softirq.c
22262 +--- linux-2.6.37.1/block/blk-softirq.c 2011-01-04 19:50:19.000000000 -0500
22263 ++++ linux-2.6.37.1/block/blk-softirq.c 2011-01-17 02:41:01.000000000 -0500
22264 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
22265 * Softirq action handler - move entries to local list and loop over them
22266 * while passing them to the queue registered handler.
22267 @@ -20413,9 +20483,9 @@ diff -urNp linux-2.6.37/block/blk-softirq.c linux-2.6.37/block/blk-softirq.c
22268 {
22269 struct list_head *cpu_list, local_list;
22270
22271 -diff -urNp linux-2.6.37/crypto/lrw.c linux-2.6.37/crypto/lrw.c
22272 ---- linux-2.6.37/crypto/lrw.c 2011-01-04 19:50:19.000000000 -0500
22273 -+++ linux-2.6.37/crypto/lrw.c 2011-01-17 02:41:01.000000000 -0500
22274 +diff -urNp linux-2.6.37.1/crypto/lrw.c linux-2.6.37.1/crypto/lrw.c
22275 +--- linux-2.6.37.1/crypto/lrw.c 2011-01-04 19:50:19.000000000 -0500
22276 ++++ linux-2.6.37.1/crypto/lrw.c 2011-01-17 02:41:01.000000000 -0500
22277 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
22278 struct priv *ctx = crypto_tfm_ctx(parent);
22279 struct crypto_cipher *child = ctx->child;
22280 @@ -20425,9 +20495,9 @@ diff -urNp linux-2.6.37/crypto/lrw.c linux-2.6.37/crypto/lrw.c
22281 int bsize = crypto_cipher_blocksize(child);
22282
22283 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
22284 -diff -urNp linux-2.6.37/Documentation/dontdiff linux-2.6.37/Documentation/dontdiff
22285 ---- linux-2.6.37/Documentation/dontdiff 2011-01-04 19:50:19.000000000 -0500
22286 -+++ linux-2.6.37/Documentation/dontdiff 2011-01-17 02:41:01.000000000 -0500
22287 +diff -urNp linux-2.6.37.1/Documentation/dontdiff linux-2.6.37.1/Documentation/dontdiff
22288 +--- linux-2.6.37.1/Documentation/dontdiff 2011-01-04 19:50:19.000000000 -0500
22289 ++++ linux-2.6.37.1/Documentation/dontdiff 2011-01-17 02:41:01.000000000 -0500
22290 @@ -3,6 +3,7 @@
22291 *.bin
22292 *.cpio
22293 @@ -20572,9 +20642,9 @@ diff -urNp linux-2.6.37/Documentation/dontdiff linux-2.6.37/Documentation/dontdi
22294 zImage*
22295 zconf.hash.c
22296 +zoffset.h
22297 -diff -urNp linux-2.6.37/Documentation/filesystems/sysfs.txt linux-2.6.37/Documentation/filesystems/sysfs.txt
22298 ---- linux-2.6.37/Documentation/filesystems/sysfs.txt 2011-01-04 19:50:19.000000000 -0500
22299 -+++ linux-2.6.37/Documentation/filesystems/sysfs.txt 2011-01-17 02:41:01.000000000 -0500
22300 +diff -urNp linux-2.6.37.1/Documentation/filesystems/sysfs.txt linux-2.6.37.1/Documentation/filesystems/sysfs.txt
22301 +--- linux-2.6.37.1/Documentation/filesystems/sysfs.txt 2011-01-04 19:50:19.000000000 -0500
22302 ++++ linux-2.6.37.1/Documentation/filesystems/sysfs.txt 2011-01-17 02:41:01.000000000 -0500
22303 @@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
22304 show and store methods of the attribute owners.
22305
22306 @@ -20586,10 +20656,10 @@ diff -urNp linux-2.6.37/Documentation/filesystems/sysfs.txt linux-2.6.37/Documen
22307 };
22308
22309 [ Subsystems should have already defined a struct kobj_type as a
22310 -diff -urNp linux-2.6.37/Documentation/kernel-parameters.txt linux-2.6.37/Documentation/kernel-parameters.txt
22311 ---- linux-2.6.37/Documentation/kernel-parameters.txt 2011-01-04 19:50:19.000000000 -0500
22312 -+++ linux-2.6.37/Documentation/kernel-parameters.txt 2011-01-17 02:41:01.000000000 -0500
22313 -@@ -1849,6 +1849,13 @@ and is between 256 and 4096 characters.
22314 +diff -urNp linux-2.6.37.1/Documentation/kernel-parameters.txt linux-2.6.37.1/Documentation/kernel-parameters.txt
22315 +--- linux-2.6.37.1/Documentation/kernel-parameters.txt 2011-02-22 16:05:30.000000000 -0500
22316 ++++ linux-2.6.37.1/Documentation/kernel-parameters.txt 2011-02-22 16:05:42.000000000 -0500
22317 +@@ -1850,6 +1850,13 @@ and is between 256 and 4096 characters.
22318 the specified number of seconds. This is to be used if
22319 your oopses keep scrolling off the screen.
22320
22321 @@ -20603,9 +20673,9 @@ diff -urNp linux-2.6.37/Documentation/kernel-parameters.txt linux-2.6.37/Documen
22322 pcbit= [HW,ISDN]
22323
22324 pcd. [PARIDE]
22325 -diff -urNp linux-2.6.37/drivers/acpi/battery.c linux-2.6.37/drivers/acpi/battery.c
22326 ---- linux-2.6.37/drivers/acpi/battery.c 2011-01-04 19:50:19.000000000 -0500
22327 -+++ linux-2.6.37/drivers/acpi/battery.c 2011-01-17 02:41:01.000000000 -0500
22328 +diff -urNp linux-2.6.37.1/drivers/acpi/battery.c linux-2.6.37.1/drivers/acpi/battery.c
22329 +--- linux-2.6.37.1/drivers/acpi/battery.c 2011-01-04 19:50:19.000000000 -0500
22330 ++++ linux-2.6.37.1/drivers/acpi/battery.c 2011-01-17 02:41:01.000000000 -0500
22331 @@ -851,7 +851,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
22332 }
22333
22334 @@ -20615,9 +20685,9 @@ diff -urNp linux-2.6.37/drivers/acpi/battery.c linux-2.6.37/drivers/acpi/battery
22335 mode_t mode;
22336 const char *name;
22337 } acpi_battery_file[] = {
22338 -diff -urNp linux-2.6.37/drivers/acpi/blacklist.c linux-2.6.37/drivers/acpi/blacklist.c
22339 ---- linux-2.6.37/drivers/acpi/blacklist.c 2011-01-04 19:50:19.000000000 -0500
22340 -+++ linux-2.6.37/drivers/acpi/blacklist.c 2011-01-17 02:41:01.000000000 -0500
22341 +diff -urNp linux-2.6.37.1/drivers/acpi/blacklist.c linux-2.6.37.1/drivers/acpi/blacklist.c
22342 +--- linux-2.6.37.1/drivers/acpi/blacklist.c 2011-01-04 19:50:19.000000000 -0500
22343 ++++ linux-2.6.37.1/drivers/acpi/blacklist.c 2011-01-17 02:41:01.000000000 -0500
22344 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
22345 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
22346 "Incorrect _ADR", 1},
22347 @@ -20627,9 +20697,9 @@ diff -urNp linux-2.6.37/drivers/acpi/blacklist.c linux-2.6.37/drivers/acpi/black
22348 };
22349
22350 #if CONFIG_ACPI_BLACKLIST_YEAR
22351 -diff -urNp linux-2.6.37/drivers/acpi/dock.c linux-2.6.37/drivers/acpi/dock.c
22352 ---- linux-2.6.37/drivers/acpi/dock.c 2011-01-04 19:50:19.000000000 -0500
22353 -+++ linux-2.6.37/drivers/acpi/dock.c 2011-01-17 02:41:01.000000000 -0500
22354 +diff -urNp linux-2.6.37.1/drivers/acpi/dock.c linux-2.6.37.1/drivers/acpi/dock.c
22355 +--- linux-2.6.37.1/drivers/acpi/dock.c 2011-01-04 19:50:19.000000000 -0500
22356 ++++ linux-2.6.37.1/drivers/acpi/dock.c 2011-01-17 02:41:01.000000000 -0500
22357 @@ -77,7 +77,7 @@ struct dock_dependent_device {
22358 struct list_head list;
22359 struct list_head hotplug_list;
22360 @@ -20648,9 +20718,9 @@ diff -urNp linux-2.6.37/drivers/acpi/dock.c linux-2.6.37/drivers/acpi/dock.c
22361 void *context)
22362 {
22363 struct dock_dependent_device *dd;
22364 -diff -urNp linux-2.6.37/drivers/acpi/ec_sys.c linux-2.6.37/drivers/acpi/ec_sys.c
22365 ---- linux-2.6.37/drivers/acpi/ec_sys.c 2011-01-04 19:50:19.000000000 -0500
22366 -+++ linux-2.6.37/drivers/acpi/ec_sys.c 2011-01-17 02:41:01.000000000 -0500
22367 +diff -urNp linux-2.6.37.1/drivers/acpi/ec_sys.c linux-2.6.37.1/drivers/acpi/ec_sys.c
22368 +--- linux-2.6.37.1/drivers/acpi/ec_sys.c 2011-01-04 19:50:19.000000000 -0500
22369 ++++ linux-2.6.37.1/drivers/acpi/ec_sys.c 2011-01-17 02:41:01.000000000 -0500
22370 @@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f
22371 return count;
22372 }
22373 @@ -20660,9 +20730,9 @@ diff -urNp linux-2.6.37/drivers/acpi/ec_sys.c linux-2.6.37/drivers/acpi/ec_sys.c
22374 .owner = THIS_MODULE,
22375 .open = acpi_ec_open_io,
22376 .read = acpi_ec_read_io,
22377 -diff -urNp linux-2.6.37/drivers/acpi/osl.c linux-2.6.37/drivers/acpi/osl.c
22378 ---- linux-2.6.37/drivers/acpi/osl.c 2011-01-04 19:50:19.000000000 -0500
22379 -+++ linux-2.6.37/drivers/acpi/osl.c 2011-01-17 02:41:01.000000000 -0500
22380 +diff -urNp linux-2.6.37.1/drivers/acpi/osl.c linux-2.6.37.1/drivers/acpi/osl.c
22381 +--- linux-2.6.37.1/drivers/acpi/osl.c 2011-01-04 19:50:19.000000000 -0500
22382 ++++ linux-2.6.37.1/drivers/acpi/osl.c 2011-01-17 02:41:01.000000000 -0500
22383 @@ -643,6 +643,8 @@ acpi_os_read_memory(acpi_physical_addres
22384 rcu_read_unlock();
22385 if (!virt_addr) {
22386 @@ -20681,9 +20751,9 @@ diff -urNp linux-2.6.37/drivers/acpi/osl.c linux-2.6.37/drivers/acpi/osl.c
22387 unmap = 1;
22388 }
22389
22390 -diff -urNp linux-2.6.37/drivers/acpi/power_meter.c linux-2.6.37/drivers/acpi/power_meter.c
22391 ---- linux-2.6.37/drivers/acpi/power_meter.c 2011-01-04 19:50:19.000000000 -0500
22392 -+++ linux-2.6.37/drivers/acpi/power_meter.c 2011-01-17 02:41:01.000000000 -0500
22393 +diff -urNp linux-2.6.37.1/drivers/acpi/power_meter.c linux-2.6.37.1/drivers/acpi/power_meter.c
22394 +--- linux-2.6.37.1/drivers/acpi/power_meter.c 2011-01-04 19:50:19.000000000 -0500
22395 ++++ linux-2.6.37.1/drivers/acpi/power_meter.c 2011-01-17 02:41:01.000000000 -0500
22396 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
22397 return res;
22398
22399 @@ -20693,9 +20763,9 @@ diff -urNp linux-2.6.37/drivers/acpi/power_meter.c linux-2.6.37/drivers/acpi/pow
22400
22401 mutex_lock(&resource->lock);
22402 resource->trip[attr->index - 7] = temp;
22403 -diff -urNp linux-2.6.37/drivers/acpi/proc.c linux-2.6.37/drivers/acpi/proc.c
22404 ---- linux-2.6.37/drivers/acpi/proc.c 2011-01-04 19:50:19.000000000 -0500
22405 -+++ linux-2.6.37/drivers/acpi/proc.c 2011-01-17 02:41:01.000000000 -0500
22406 +diff -urNp linux-2.6.37.1/drivers/acpi/proc.c linux-2.6.37.1/drivers/acpi/proc.c
22407 +--- linux-2.6.37.1/drivers/acpi/proc.c 2011-01-04 19:50:19.000000000 -0500
22408 ++++ linux-2.6.37.1/drivers/acpi/proc.c 2011-01-17 02:41:01.000000000 -0500
22409 @@ -338,20 +338,15 @@ acpi_system_write_wakeup_device(struct f
22410 size_t count, loff_t * ppos)
22411 {
22412 @@ -20731,9 +20801,9 @@ diff -urNp linux-2.6.37/drivers/acpi/proc.c linux-2.6.37/drivers/acpi/proc.c
22413 dev->wakeup.state.enabled =
22414 dev->wakeup.state.enabled ? 0 : 1;
22415 found_dev = dev;
22416 -diff -urNp linux-2.6.37/drivers/acpi/processor_driver.c linux-2.6.37/drivers/acpi/processor_driver.c
22417 ---- linux-2.6.37/drivers/acpi/processor_driver.c 2011-01-04 19:50:19.000000000 -0500
22418 -+++ linux-2.6.37/drivers/acpi/processor_driver.c 2011-01-17 02:41:01.000000000 -0500
22419 +diff -urNp linux-2.6.37.1/drivers/acpi/processor_driver.c linux-2.6.37.1/drivers/acpi/processor_driver.c
22420 +--- linux-2.6.37.1/drivers/acpi/processor_driver.c 2011-01-04 19:50:19.000000000 -0500
22421 ++++ linux-2.6.37.1/drivers/acpi/processor_driver.c 2011-01-17 02:41:01.000000000 -0500
22422 @@ -519,7 +519,7 @@ static int __cpuinit acpi_processor_add(
22423 return 0;
22424 #endif
22425 @@ -20743,9 +20813,9 @@ diff -urNp linux-2.6.37/drivers/acpi/processor_driver.c linux-2.6.37/drivers/acp
22426
22427 /*
22428 * Buggy BIOS check
22429 -diff -urNp linux-2.6.37/drivers/acpi/processor_idle.c linux-2.6.37/drivers/acpi/processor_idle.c
22430 ---- linux-2.6.37/drivers/acpi/processor_idle.c 2011-01-04 19:50:19.000000000 -0500
22431 -+++ linux-2.6.37/drivers/acpi/processor_idle.c 2011-01-17 02:41:01.000000000 -0500
22432 +diff -urNp linux-2.6.37.1/drivers/acpi/processor_idle.c linux-2.6.37.1/drivers/acpi/processor_idle.c
22433 +--- linux-2.6.37.1/drivers/acpi/processor_idle.c 2011-01-04 19:50:19.000000000 -0500
22434 ++++ linux-2.6.37.1/drivers/acpi/processor_idle.c 2011-01-17 02:41:01.000000000 -0500
22435 @@ -114,7 +114,7 @@ static struct dmi_system_id __cpuinitdat
22436 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
22437 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
22438 @@ -20755,9 +20825,9 @@ diff -urNp linux-2.6.37/drivers/acpi/processor_idle.c linux-2.6.37/drivers/acpi/
22439 };
22440
22441
22442 -diff -urNp linux-2.6.37/drivers/acpi/sleep.c linux-2.6.37/drivers/acpi/sleep.c
22443 ---- linux-2.6.37/drivers/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
22444 -+++ linux-2.6.37/drivers/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
22445 +diff -urNp linux-2.6.37.1/drivers/acpi/sleep.c linux-2.6.37.1/drivers/acpi/sleep.c
22446 +--- linux-2.6.37.1/drivers/acpi/sleep.c 2011-01-04 19:50:19.000000000 -0500
22447 ++++ linux-2.6.37.1/drivers/acpi/sleep.c 2011-01-17 02:41:01.000000000 -0500
22448 @@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(susp
22449 }
22450 }
22451 @@ -20794,9 +20864,9 @@ diff -urNp linux-2.6.37/drivers/acpi/sleep.c linux-2.6.37/drivers/acpi/sleep.c
22452 .begin = acpi_hibernation_begin_old,
22453 .end = acpi_pm_end,
22454 .pre_snapshot = acpi_pm_pre_suspend,
22455 -diff -urNp linux-2.6.37/drivers/acpi/video.c linux-2.6.37/drivers/acpi/video.c
22456 ---- linux-2.6.37/drivers/acpi/video.c 2011-01-04 19:50:19.000000000 -0500
22457 -+++ linux-2.6.37/drivers/acpi/video.c 2011-01-17 02:41:01.000000000 -0500
22458 +diff -urNp linux-2.6.37.1/drivers/acpi/video.c linux-2.6.37.1/drivers/acpi/video.c
22459 +--- linux-2.6.37.1/drivers/acpi/video.c 2011-01-04 19:50:19.000000000 -0500
22460 ++++ linux-2.6.37.1/drivers/acpi/video.c 2011-01-17 02:41:01.000000000 -0500
22461 @@ -260,7 +260,7 @@ static int acpi_video_set_brightness(str
22462 vd->brightness->levels[request_level]);
22463 }
22464 @@ -20806,9 +20876,9 @@ diff -urNp linux-2.6.37/drivers/acpi/video.c linux-2.6.37/drivers/acpi/video.c
22465 .get_brightness = acpi_video_get_brightness,
22466 .update_status = acpi_video_set_brightness,
22467 };
22468 -diff -urNp linux-2.6.37/drivers/ata/ahci.c linux-2.6.37/drivers/ata/ahci.c
22469 ---- linux-2.6.37/drivers/ata/ahci.c 2011-01-04 19:50:19.000000000 -0500
22470 -+++ linux-2.6.37/drivers/ata/ahci.c 2011-01-17 02:41:01.000000000 -0500
22471 +diff -urNp linux-2.6.37.1/drivers/ata/ahci.c linux-2.6.37.1/drivers/ata/ahci.c
22472 +--- linux-2.6.37.1/drivers/ata/ahci.c 2011-01-04 19:50:19.000000000 -0500
22473 ++++ linux-2.6.37.1/drivers/ata/ahci.c 2011-01-17 02:41:01.000000000 -0500
22474 @@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
22475 AHCI_SHT("ahci"),
22476 };
22477 @@ -20839,9 +20909,9 @@ diff -urNp linux-2.6.37/drivers/ata/ahci.c linux-2.6.37/drivers/ata/ahci.c
22478 };
22479
22480
22481 -diff -urNp linux-2.6.37/drivers/ata/ahci.h linux-2.6.37/drivers/ata/ahci.h
22482 ---- linux-2.6.37/drivers/ata/ahci.h 2011-01-04 19:50:19.000000000 -0500
22483 -+++ linux-2.6.37/drivers/ata/ahci.h 2011-01-17 02:41:01.000000000 -0500
22484 +diff -urNp linux-2.6.37.1/drivers/ata/ahci.h linux-2.6.37.1/drivers/ata/ahci.h
22485 +--- linux-2.6.37.1/drivers/ata/ahci.h 2011-01-04 19:50:19.000000000 -0500
22486 ++++ linux-2.6.37.1/drivers/ata/ahci.h 2011-01-17 02:41:01.000000000 -0500
22487 @@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde
22488 .shost_attrs = ahci_shost_attrs, \
22489 .sdev_attrs = ahci_sdev_attrs
22490 @@ -20851,9 +20921,9 @@ diff -urNp linux-2.6.37/drivers/ata/ahci.h linux-2.6.37/drivers/ata/ahci.h
22491
22492 void ahci_save_initial_config(struct device *dev,
22493 struct ahci_host_priv *hpriv,
22494 -diff -urNp linux-2.6.37/drivers/ata/ata_generic.c linux-2.6.37/drivers/ata/ata_generic.c
22495 ---- linux-2.6.37/drivers/ata/ata_generic.c 2011-01-04 19:50:19.000000000 -0500
22496 -+++ linux-2.6.37/drivers/ata/ata_generic.c 2011-01-17 02:41:01.000000000 -0500
22497 +diff -urNp linux-2.6.37.1/drivers/ata/ata_generic.c linux-2.6.37.1/drivers/ata/ata_generic.c
22498 +--- linux-2.6.37.1/drivers/ata/ata_generic.c 2011-01-04 19:50:19.000000000 -0500
22499 ++++ linux-2.6.37.1/drivers/ata/ata_generic.c 2011-01-17 02:41:01.000000000 -0500
22500 @@ -101,7 +101,7 @@ static struct scsi_host_template generic
22501 ATA_BMDMA_SHT(DRV_NAME),
22502 };
22503 @@ -20863,9 +20933,9 @@ diff -urNp linux-2.6.37/drivers/ata/ata_generic.c linux-2.6.37/drivers/ata/ata_g
22504 .inherits = &ata_bmdma_port_ops,
22505 .cable_detect = ata_cable_unknown,
22506 .set_mode = generic_set_mode,
22507 -diff -urNp linux-2.6.37/drivers/ata/ata_piix.c linux-2.6.37/drivers/ata/ata_piix.c
22508 ---- linux-2.6.37/drivers/ata/ata_piix.c 2011-01-04 19:50:19.000000000 -0500
22509 -+++ linux-2.6.37/drivers/ata/ata_piix.c 2011-01-17 02:41:01.000000000 -0500
22510 +diff -urNp linux-2.6.37.1/drivers/ata/ata_piix.c linux-2.6.37.1/drivers/ata/ata_piix.c
22511 +--- linux-2.6.37.1/drivers/ata/ata_piix.c 2011-01-04 19:50:19.000000000 -0500
22512 ++++ linux-2.6.37.1/drivers/ata/ata_piix.c 2011-01-17 02:41:01.000000000 -0500
22513 @@ -309,7 +309,7 @@ static const struct pci_device_id piix_p
22514 { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
22515 /* SATA Controller IDE (PBG) */
22516 @@ -20932,9 +21002,9 @@ diff -urNp linux-2.6.37/drivers/ata/ata_piix.c linux-2.6.37/drivers/ata/ata_piix
22517 };
22518 static const char *oemstrs[] = {
22519 "Tecra M3,",
22520 -diff -urNp linux-2.6.37/drivers/ata/libahci.c linux-2.6.37/drivers/ata/libahci.c
22521 ---- linux-2.6.37/drivers/ata/libahci.c 2011-01-04 19:50:19.000000000 -0500
22522 -+++ linux-2.6.37/drivers/ata/libahci.c 2011-01-17 02:41:01.000000000 -0500
22523 +diff -urNp linux-2.6.37.1/drivers/ata/libahci.c linux-2.6.37.1/drivers/ata/libahci.c
22524 +--- linux-2.6.37.1/drivers/ata/libahci.c 2011-01-04 19:50:19.000000000 -0500
22525 ++++ linux-2.6.37.1/drivers/ata/libahci.c 2011-01-17 02:41:01.000000000 -0500
22526 @@ -140,7 +140,7 @@ struct device_attribute *ahci_sdev_attrs
22527 };
22528 EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
22529 @@ -20944,9 +21014,9 @@ diff -urNp linux-2.6.37/drivers/ata/libahci.c linux-2.6.37/drivers/ata/libahci.c
22530 .inherits = &sata_pmp_port_ops,
22531
22532 .qc_defer = ahci_pmp_qc_defer,
22533 -diff -urNp linux-2.6.37/drivers/ata/libata-acpi.c linux-2.6.37/drivers/ata/libata-acpi.c
22534 ---- linux-2.6.37/drivers/ata/libata-acpi.c 2011-01-04 19:50:19.000000000 -0500
22535 -+++ linux-2.6.37/drivers/ata/libata-acpi.c 2011-01-17 02:41:01.000000000 -0500
22536 +diff -urNp linux-2.6.37.1/drivers/ata/libata-acpi.c linux-2.6.37.1/drivers/ata/libata-acpi.c
22537 +--- linux-2.6.37.1/drivers/ata/libata-acpi.c 2011-01-04 19:50:19.000000000 -0500
22538 ++++ linux-2.6.37.1/drivers/ata/libata-acpi.c 2011-01-17 02:41:01.000000000 -0500
22539 @@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han
22540 ata_acpi_uevent(dev->link->ap, dev, event);
22541 }
22542 @@ -20962,9 +21032,9 @@ diff -urNp linux-2.6.37/drivers/ata/libata-acpi.c linux-2.6.37/drivers/ata/libat
22543 .handler = ata_acpi_ap_notify_dock,
22544 .uevent = ata_acpi_ap_uevent,
22545 };
22546 -diff -urNp linux-2.6.37/drivers/ata/libata-core.c linux-2.6.37/drivers/ata/libata-core.c
22547 ---- linux-2.6.37/drivers/ata/libata-core.c 2011-01-04 19:50:19.000000000 -0500
22548 -+++ linux-2.6.37/drivers/ata/libata-core.c 2011-01-17 02:41:01.000000000 -0500
22549 +diff -urNp linux-2.6.37.1/drivers/ata/libata-core.c linux-2.6.37.1/drivers/ata/libata-core.c
22550 +--- linux-2.6.37.1/drivers/ata/libata-core.c 2011-01-04 19:50:19.000000000 -0500
22551 ++++ linux-2.6.37.1/drivers/ata/libata-core.c 2011-01-17 02:41:01.000000000 -0500
22552 @@ -897,7 +897,7 @@ static const struct ata_xfer_ent {
22553 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
22554 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
22555 @@ -21056,9 +21126,9 @@ diff -urNp linux-2.6.37/drivers/ata/libata-core.c linux-2.6.37/drivers/ata/libat
22556 .qc_prep = ata_noop_qc_prep,
22557 .qc_issue = ata_dummy_qc_issue,
22558 .error_handler = ata_dummy_error_handler,
22559 -diff -urNp linux-2.6.37/drivers/ata/libata-eh.c linux-2.6.37/drivers/ata/libata-eh.c
22560 ---- linux-2.6.37/drivers/ata/libata-eh.c 2011-01-04 19:50:19.000000000 -0500
22561 -+++ linux-2.6.37/drivers/ata/libata-eh.c 2011-01-17 02:41:01.000000000 -0500
22562 +diff -urNp linux-2.6.37.1/drivers/ata/libata-eh.c linux-2.6.37.1/drivers/ata/libata-eh.c
22563 +--- linux-2.6.37.1/drivers/ata/libata-eh.c 2011-01-04 19:50:19.000000000 -0500
22564 ++++ linux-2.6.37.1/drivers/ata/libata-eh.c 2011-01-17 02:41:01.000000000 -0500
22565 @@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_
22566 */
22567 void ata_std_error_handler(struct ata_port *ap)
22568 @@ -21068,9 +21138,9 @@ diff -urNp linux-2.6.37/drivers/ata/libata-eh.c linux-2.6.37/drivers/ata/libata-
22569 ata_reset_fn_t hardreset = ops->hardreset;
22570
22571 /* ignore built-in hardreset if SCR access is not available */
22572 -diff -urNp linux-2.6.37/drivers/ata/libata-pmp.c linux-2.6.37/drivers/ata/libata-pmp.c
22573 ---- linux-2.6.37/drivers/ata/libata-pmp.c 2011-01-04 19:50:19.000000000 -0500
22574 -+++ linux-2.6.37/drivers/ata/libata-pmp.c 2011-01-17 02:41:01.000000000 -0500
22575 +diff -urNp linux-2.6.37.1/drivers/ata/libata-pmp.c linux-2.6.37.1/drivers/ata/libata-pmp.c
22576 +--- linux-2.6.37.1/drivers/ata/libata-pmp.c 2011-01-04 19:50:19.000000000 -0500
22577 ++++ linux-2.6.37.1/drivers/ata/libata-pmp.c 2011-01-17 02:41:01.000000000 -0500
22578 @@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str
22579 */
22580 static int sata_pmp_eh_recover(struct ata_port *ap)
22581 @@ -21080,9 +21150,9 @@ diff -urNp linux-2.6.37/drivers/ata/libata-pmp.c linux-2.6.37/drivers/ata/libata
22582 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
22583 struct ata_link *pmp_link = &ap->link;
22584 struct ata_device *pmp_dev = pmp_link->device;
22585 -diff -urNp linux-2.6.37/drivers/ata/pata_acpi.c linux-2.6.37/drivers/ata/pata_acpi.c
22586 ---- linux-2.6.37/drivers/ata/pata_acpi.c 2011-01-04 19:50:19.000000000 -0500
22587 -+++ linux-2.6.37/drivers/ata/pata_acpi.c 2011-01-17 02:41:01.000000000 -0500
22588 +diff -urNp linux-2.6.37.1/drivers/ata/pata_acpi.c linux-2.6.37.1/drivers/ata/pata_acpi.c
22589 +--- linux-2.6.37.1/drivers/ata/pata_acpi.c 2011-01-04 19:50:19.000000000 -0500
22590 ++++ linux-2.6.37.1/drivers/ata/pata_acpi.c 2011-01-17 02:41:01.000000000 -0500
22591 @@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
22592 ATA_BMDMA_SHT(DRV_NAME),
22593 };
22594 @@ -21092,9 +21162,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_acpi.c linux-2.6.37/drivers/ata/pata_ac
22595 .inherits = &ata_bmdma_port_ops,
22596 .qc_issue = pacpi_qc_issue,
22597 .cable_detect = pacpi_cable_detect,
22598 -diff -urNp linux-2.6.37/drivers/ata/pata_ali.c linux-2.6.37/drivers/ata/pata_ali.c
22599 ---- linux-2.6.37/drivers/ata/pata_ali.c 2011-01-04 19:50:19.000000000 -0500
22600 -+++ linux-2.6.37/drivers/ata/pata_ali.c 2011-01-17 02:41:01.000000000 -0500
22601 +diff -urNp linux-2.6.37.1/drivers/ata/pata_ali.c linux-2.6.37.1/drivers/ata/pata_ali.c
22602 +--- linux-2.6.37.1/drivers/ata/pata_ali.c 2011-01-04 19:50:19.000000000 -0500
22603 ++++ linux-2.6.37.1/drivers/ata/pata_ali.c 2011-01-17 02:41:01.000000000 -0500
22604 @@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht
22605 * Port operations for PIO only ALi
22606 */
22607 @@ -21140,9 +21210,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_ali.c linux-2.6.37/drivers/ata/pata_ali
22608 .inherits = &ali_dma_base_ops,
22609 .check_atapi_dma = ali_check_atapi_dma,
22610 .dev_config = ali_warn_atapi_dma,
22611 -diff -urNp linux-2.6.37/drivers/ata/pata_amd.c linux-2.6.37/drivers/ata/pata_amd.c
22612 ---- linux-2.6.37/drivers/ata/pata_amd.c 2011-01-04 19:50:19.000000000 -0500
22613 -+++ linux-2.6.37/drivers/ata/pata_amd.c 2011-01-17 02:41:01.000000000 -0500
22614 +diff -urNp linux-2.6.37.1/drivers/ata/pata_amd.c linux-2.6.37.1/drivers/ata/pata_amd.c
22615 +--- linux-2.6.37.1/drivers/ata/pata_amd.c 2011-01-04 19:50:19.000000000 -0500
22616 ++++ linux-2.6.37.1/drivers/ata/pata_amd.c 2011-01-17 02:41:01.000000000 -0500
22617 @@ -397,28 +397,28 @@ static const struct ata_port_operations
22618 .prereset = amd_pre_reset,
22619 };
22620 @@ -21192,9 +21262,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_amd.c linux-2.6.37/drivers/ata/pata_amd
22621 .inherits = &nv_base_port_ops,
22622 .set_piomode = nv133_set_piomode,
22623 .set_dmamode = nv133_set_dmamode,
22624 -diff -urNp linux-2.6.37/drivers/ata/pata_artop.c linux-2.6.37/drivers/ata/pata_artop.c
22625 ---- linux-2.6.37/drivers/ata/pata_artop.c 2011-01-04 19:50:19.000000000 -0500
22626 -+++ linux-2.6.37/drivers/ata/pata_artop.c 2011-01-17 02:41:01.000000000 -0500
22627 +diff -urNp linux-2.6.37.1/drivers/ata/pata_artop.c linux-2.6.37.1/drivers/ata/pata_artop.c
22628 +--- linux-2.6.37.1/drivers/ata/pata_artop.c 2011-01-04 19:50:19.000000000 -0500
22629 ++++ linux-2.6.37.1/drivers/ata/pata_artop.c 2011-01-17 02:41:01.000000000 -0500
22630 @@ -312,7 +312,7 @@ static struct scsi_host_template artop_s
22631 ATA_BMDMA_SHT(DRV_NAME),
22632 };
22633 @@ -21213,9 +21283,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_artop.c linux-2.6.37/drivers/ata/pata_a
22634 .inherits = &ata_bmdma_port_ops,
22635 .cable_detect = artop6260_cable_detect,
22636 .set_piomode = artop6260_set_piomode,
22637 -diff -urNp linux-2.6.37/drivers/ata/pata_at32.c linux-2.6.37/drivers/ata/pata_at32.c
22638 ---- linux-2.6.37/drivers/ata/pata_at32.c 2011-01-04 19:50:19.000000000 -0500
22639 -+++ linux-2.6.37/drivers/ata/pata_at32.c 2011-01-17 02:41:01.000000000 -0500
22640 +diff -urNp linux-2.6.37.1/drivers/ata/pata_at32.c linux-2.6.37.1/drivers/ata/pata_at32.c
22641 +--- linux-2.6.37.1/drivers/ata/pata_at32.c 2011-01-04 19:50:19.000000000 -0500
22642 ++++ linux-2.6.37.1/drivers/ata/pata_at32.c 2011-01-17 02:41:01.000000000 -0500
22643 @@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
22644 ATA_PIO_SHT(DRV_NAME),
22645 };
22646 @@ -21225,9 +21295,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_at32.c linux-2.6.37/drivers/ata/pata_at
22647 .inherits = &ata_sff_port_ops,
22648 .cable_detect = ata_cable_40wire,
22649 .set_piomode = pata_at32_set_piomode,
22650 -diff -urNp linux-2.6.37/drivers/ata/pata_at91.c linux-2.6.37/drivers/ata/pata_at91.c
22651 ---- linux-2.6.37/drivers/ata/pata_at91.c 2011-01-04 19:50:19.000000000 -0500
22652 -+++ linux-2.6.37/drivers/ata/pata_at91.c 2011-01-17 02:41:01.000000000 -0500
22653 +diff -urNp linux-2.6.37.1/drivers/ata/pata_at91.c linux-2.6.37.1/drivers/ata/pata_at91.c
22654 +--- linux-2.6.37.1/drivers/ata/pata_at91.c 2011-01-04 19:50:19.000000000 -0500
22655 ++++ linux-2.6.37.1/drivers/ata/pata_at91.c 2011-01-17 02:41:01.000000000 -0500
22656 @@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
22657 ATA_PIO_SHT(DRV_NAME),
22658 };
22659 @@ -21237,9 +21307,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_at91.c linux-2.6.37/drivers/ata/pata_at
22660 .inherits = &ata_sff_port_ops,
22661
22662 .sff_data_xfer = pata_at91_data_xfer_noirq,
22663 -diff -urNp linux-2.6.37/drivers/ata/pata_atiixp.c linux-2.6.37/drivers/ata/pata_atiixp.c
22664 ---- linux-2.6.37/drivers/ata/pata_atiixp.c 2011-01-04 19:50:19.000000000 -0500
22665 -+++ linux-2.6.37/drivers/ata/pata_atiixp.c 2011-01-17 02:41:01.000000000 -0500
22666 +diff -urNp linux-2.6.37.1/drivers/ata/pata_atiixp.c linux-2.6.37.1/drivers/ata/pata_atiixp.c
22667 +--- linux-2.6.37.1/drivers/ata/pata_atiixp.c 2011-01-04 19:50:19.000000000 -0500
22668 ++++ linux-2.6.37.1/drivers/ata/pata_atiixp.c 2011-01-17 02:41:01.000000000 -0500
22669 @@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
22670 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
22671 };
22672 @@ -21249,9 +21319,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_atiixp.c linux-2.6.37/drivers/ata/pata_
22673 .inherits = &ata_bmdma_port_ops,
22674
22675 .qc_prep = ata_bmdma_dumb_qc_prep,
22676 -diff -urNp linux-2.6.37/drivers/ata/pata_atp867x.c linux-2.6.37/drivers/ata/pata_atp867x.c
22677 ---- linux-2.6.37/drivers/ata/pata_atp867x.c 2011-01-04 19:50:19.000000000 -0500
22678 -+++ linux-2.6.37/drivers/ata/pata_atp867x.c 2011-01-17 02:41:01.000000000 -0500
22679 +diff -urNp linux-2.6.37.1/drivers/ata/pata_atp867x.c linux-2.6.37.1/drivers/ata/pata_atp867x.c
22680 +--- linux-2.6.37.1/drivers/ata/pata_atp867x.c 2011-01-04 19:50:19.000000000 -0500
22681 ++++ linux-2.6.37.1/drivers/ata/pata_atp867x.c 2011-01-17 02:41:01.000000000 -0500
22682 @@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
22683 ATA_BMDMA_SHT(DRV_NAME),
22684 };
22685 @@ -21261,9 +21331,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_atp867x.c linux-2.6.37/drivers/ata/pata
22686 .inherits = &ata_bmdma_port_ops,
22687 .cable_detect = atp867x_cable_detect,
22688 .set_piomode = atp867x_set_piomode,
22689 -diff -urNp linux-2.6.37/drivers/ata/pata_bf54x.c linux-2.6.37/drivers/ata/pata_bf54x.c
22690 ---- linux-2.6.37/drivers/ata/pata_bf54x.c 2011-01-04 19:50:19.000000000 -0500
22691 -+++ linux-2.6.37/drivers/ata/pata_bf54x.c 2011-01-17 02:41:01.000000000 -0500
22692 +diff -urNp linux-2.6.37.1/drivers/ata/pata_bf54x.c linux-2.6.37.1/drivers/ata/pata_bf54x.c
22693 +--- linux-2.6.37.1/drivers/ata/pata_bf54x.c 2011-01-04 19:50:19.000000000 -0500
22694 ++++ linux-2.6.37.1/drivers/ata/pata_bf54x.c 2011-01-17 02:41:01.000000000 -0500
22695 @@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
22696 .dma_boundary = ATA_DMA_BOUNDARY,
22697 };
22698 @@ -21273,9 +21343,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_bf54x.c linux-2.6.37/drivers/ata/pata_b
22699 .inherits = &ata_bmdma_port_ops,
22700
22701 .set_piomode = bfin_set_piomode,
22702 -diff -urNp linux-2.6.37/drivers/ata/pata_cmd640.c linux-2.6.37/drivers/ata/pata_cmd640.c
22703 ---- linux-2.6.37/drivers/ata/pata_cmd640.c 2011-01-04 19:50:19.000000000 -0500
22704 -+++ linux-2.6.37/drivers/ata/pata_cmd640.c 2011-01-17 02:41:01.000000000 -0500
22705 +diff -urNp linux-2.6.37.1/drivers/ata/pata_cmd640.c linux-2.6.37.1/drivers/ata/pata_cmd640.c
22706 +--- linux-2.6.37.1/drivers/ata/pata_cmd640.c 2011-01-04 19:50:19.000000000 -0500
22707 ++++ linux-2.6.37.1/drivers/ata/pata_cmd640.c 2011-01-17 02:41:01.000000000 -0500
22708 @@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_
22709 ATA_PIO_SHT(DRV_NAME),
22710 };
22711 @@ -21285,9 +21355,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_cmd640.c linux-2.6.37/drivers/ata/pata_
22712 .inherits = &ata_sff_port_ops,
22713 /* In theory xfer_noirq is not needed once we kill the prefetcher */
22714 .sff_data_xfer = ata_sff_data_xfer_noirq,
22715 -diff -urNp linux-2.6.37/drivers/ata/pata_cmd64x.c linux-2.6.37/drivers/ata/pata_cmd64x.c
22716 ---- linux-2.6.37/drivers/ata/pata_cmd64x.c 2011-01-04 19:50:19.000000000 -0500
22717 -+++ linux-2.6.37/drivers/ata/pata_cmd64x.c 2011-01-17 02:41:01.000000000 -0500
22718 +diff -urNp linux-2.6.37.1/drivers/ata/pata_cmd64x.c linux-2.6.37.1/drivers/ata/pata_cmd64x.c
22719 +--- linux-2.6.37.1/drivers/ata/pata_cmd64x.c 2011-01-04 19:50:19.000000000 -0500
22720 ++++ linux-2.6.37.1/drivers/ata/pata_cmd64x.c 2011-01-17 02:41:01.000000000 -0500
22721 @@ -268,18 +268,18 @@ static const struct ata_port_operations
22722 .set_dmamode = cmd64x_set_dmamode,
22723 };
22724 @@ -21310,9 +21380,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_cmd64x.c linux-2.6.37/drivers/ata/pata_
22725 .inherits = &cmd64x_base_ops,
22726 .bmdma_stop = cmd648_bmdma_stop,
22727 .cable_detect = cmd648_cable_detect,
22728 -diff -urNp linux-2.6.37/drivers/ata/pata_cs5520.c linux-2.6.37/drivers/ata/pata_cs5520.c
22729 ---- linux-2.6.37/drivers/ata/pata_cs5520.c 2011-01-04 19:50:19.000000000 -0500
22730 -+++ linux-2.6.37/drivers/ata/pata_cs5520.c 2011-01-17 02:41:01.000000000 -0500
22731 +diff -urNp linux-2.6.37.1/drivers/ata/pata_cs5520.c linux-2.6.37.1/drivers/ata/pata_cs5520.c
22732 +--- linux-2.6.37.1/drivers/ata/pata_cs5520.c 2011-01-04 19:50:19.000000000 -0500
22733 ++++ linux-2.6.37.1/drivers/ata/pata_cs5520.c 2011-01-17 02:41:01.000000000 -0500
22734 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
22735 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
22736 };
22737 @@ -21322,9 +21392,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_cs5520.c linux-2.6.37/drivers/ata/pata_
22738 .inherits = &ata_bmdma_port_ops,
22739 .qc_prep = ata_bmdma_dumb_qc_prep,
22740 .cable_detect = ata_cable_40wire,
22741 -diff -urNp linux-2.6.37/drivers/ata/pata_cs5530.c linux-2.6.37/drivers/ata/pata_cs5530.c
22742 ---- linux-2.6.37/drivers/ata/pata_cs5530.c 2011-01-04 19:50:19.000000000 -0500
22743 -+++ linux-2.6.37/drivers/ata/pata_cs5530.c 2011-01-17 02:41:01.000000000 -0500
22744 +diff -urNp linux-2.6.37.1/drivers/ata/pata_cs5530.c linux-2.6.37.1/drivers/ata/pata_cs5530.c
22745 +--- linux-2.6.37.1/drivers/ata/pata_cs5530.c 2011-01-04 19:50:19.000000000 -0500
22746 ++++ linux-2.6.37.1/drivers/ata/pata_cs5530.c 2011-01-17 02:41:01.000000000 -0500
22747 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
22748 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
22749 };
22750 @@ -21334,9 +21404,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_cs5530.c linux-2.6.37/drivers/ata/pata_
22751 .inherits = &ata_bmdma_port_ops,
22752
22753 .qc_prep = ata_bmdma_dumb_qc_prep,
22754 -diff -urNp linux-2.6.37/drivers/ata/pata_cs5535.c linux-2.6.37/drivers/ata/pata_cs5535.c
22755 ---- linux-2.6.37/drivers/ata/pata_cs5535.c 2011-01-04 19:50:19.000000000 -0500
22756 -+++ linux-2.6.37/drivers/ata/pata_cs5535.c 2011-01-17 02:41:01.000000000 -0500
22757 +diff -urNp linux-2.6.37.1/drivers/ata/pata_cs5535.c linux-2.6.37.1/drivers/ata/pata_cs5535.c
22758 +--- linux-2.6.37.1/drivers/ata/pata_cs5535.c 2011-01-04 19:50:19.000000000 -0500
22759 ++++ linux-2.6.37.1/drivers/ata/pata_cs5535.c 2011-01-17 02:41:01.000000000 -0500
22760 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
22761 ATA_BMDMA_SHT(DRV_NAME),
22762 };
22763 @@ -21346,9 +21416,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_cs5535.c linux-2.6.37/drivers/ata/pata_
22764 .inherits = &ata_bmdma_port_ops,
22765 .cable_detect = cs5535_cable_detect,
22766 .set_piomode = cs5535_set_piomode,
22767 -diff -urNp linux-2.6.37/drivers/ata/pata_cs5536.c linux-2.6.37/drivers/ata/pata_cs5536.c
22768 ---- linux-2.6.37/drivers/ata/pata_cs5536.c 2011-01-04 19:50:19.000000000 -0500
22769 -+++ linux-2.6.37/drivers/ata/pata_cs5536.c 2011-01-17 02:41:01.000000000 -0500
22770 +diff -urNp linux-2.6.37.1/drivers/ata/pata_cs5536.c linux-2.6.37.1/drivers/ata/pata_cs5536.c
22771 +--- linux-2.6.37.1/drivers/ata/pata_cs5536.c 2011-01-04 19:50:19.000000000 -0500
22772 ++++ linux-2.6.37.1/drivers/ata/pata_cs5536.c 2011-01-17 02:41:01.000000000 -0500
22773 @@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_
22774 ATA_BMDMA_SHT(DRV_NAME),
22775 };
22776 @@ -21358,9 +21428,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_cs5536.c linux-2.6.37/drivers/ata/pata_
22777 .inherits = &ata_bmdma32_port_ops,
22778 .cable_detect = cs5536_cable_detect,
22779 .set_piomode = cs5536_set_piomode,
22780 -diff -urNp linux-2.6.37/drivers/ata/pata_cypress.c linux-2.6.37/drivers/ata/pata_cypress.c
22781 ---- linux-2.6.37/drivers/ata/pata_cypress.c 2011-01-04 19:50:19.000000000 -0500
22782 -+++ linux-2.6.37/drivers/ata/pata_cypress.c 2011-01-17 02:41:01.000000000 -0500
22783 +diff -urNp linux-2.6.37.1/drivers/ata/pata_cypress.c linux-2.6.37.1/drivers/ata/pata_cypress.c
22784 +--- linux-2.6.37.1/drivers/ata/pata_cypress.c 2011-01-04 19:50:19.000000000 -0500
22785 ++++ linux-2.6.37.1/drivers/ata/pata_cypress.c 2011-01-17 02:41:01.000000000 -0500
22786 @@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
22787 ATA_BMDMA_SHT(DRV_NAME),
22788 };
22789 @@ -21370,9 +21440,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_cypress.c linux-2.6.37/drivers/ata/pata
22790 .inherits = &ata_bmdma_port_ops,
22791 .cable_detect = ata_cable_40wire,
22792 .set_piomode = cy82c693_set_piomode,
22793 -diff -urNp linux-2.6.37/drivers/ata/pata_efar.c linux-2.6.37/drivers/ata/pata_efar.c
22794 ---- linux-2.6.37/drivers/ata/pata_efar.c 2011-01-04 19:50:19.000000000 -0500
22795 -+++ linux-2.6.37/drivers/ata/pata_efar.c 2011-01-17 02:41:01.000000000 -0500
22796 +diff -urNp linux-2.6.37.1/drivers/ata/pata_efar.c linux-2.6.37.1/drivers/ata/pata_efar.c
22797 +--- linux-2.6.37.1/drivers/ata/pata_efar.c 2011-01-04 19:50:19.000000000 -0500
22798 ++++ linux-2.6.37.1/drivers/ata/pata_efar.c 2011-01-17 02:41:01.000000000 -0500
22799 @@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
22800 ATA_BMDMA_SHT(DRV_NAME),
22801 };
22802 @@ -21382,9 +21452,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_efar.c linux-2.6.37/drivers/ata/pata_ef
22803 .inherits = &ata_bmdma_port_ops,
22804 .cable_detect = efar_cable_detect,
22805 .set_piomode = efar_set_piomode,
22806 -diff -urNp linux-2.6.37/drivers/ata/pata_hpt366.c linux-2.6.37/drivers/ata/pata_hpt366.c
22807 ---- linux-2.6.37/drivers/ata/pata_hpt366.c 2011-01-04 19:50:19.000000000 -0500
22808 -+++ linux-2.6.37/drivers/ata/pata_hpt366.c 2011-01-17 02:41:01.000000000 -0500
22809 +diff -urNp linux-2.6.37.1/drivers/ata/pata_hpt366.c linux-2.6.37.1/drivers/ata/pata_hpt366.c
22810 +--- linux-2.6.37.1/drivers/ata/pata_hpt366.c 2011-01-04 19:50:19.000000000 -0500
22811 ++++ linux-2.6.37.1/drivers/ata/pata_hpt366.c 2011-01-17 02:41:01.000000000 -0500
22812 @@ -269,7 +269,7 @@ static struct scsi_host_template hpt36x_
22813 * Configuration for HPT366/68
22814 */
22815 @@ -21394,9 +21464,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_hpt366.c linux-2.6.37/drivers/ata/pata_
22816 .inherits = &ata_bmdma_port_ops,
22817 .cable_detect = hpt36x_cable_detect,
22818 .mode_filter = hpt366_filter,
22819 -diff -urNp linux-2.6.37/drivers/ata/pata_hpt37x.c linux-2.6.37/drivers/ata/pata_hpt37x.c
22820 ---- linux-2.6.37/drivers/ata/pata_hpt37x.c 2011-01-04 19:50:19.000000000 -0500
22821 -+++ linux-2.6.37/drivers/ata/pata_hpt37x.c 2011-01-17 02:41:01.000000000 -0500
22822 +diff -urNp linux-2.6.37.1/drivers/ata/pata_hpt37x.c linux-2.6.37.1/drivers/ata/pata_hpt37x.c
22823 +--- linux-2.6.37.1/drivers/ata/pata_hpt37x.c 2011-01-04 19:50:19.000000000 -0500
22824 ++++ linux-2.6.37.1/drivers/ata/pata_hpt37x.c 2011-01-17 02:41:01.000000000 -0500
22825 @@ -564,7 +564,7 @@ static struct scsi_host_template hpt37x_
22826 * Configuration for HPT370
22827 */
22828 @@ -21433,9 +21503,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_hpt37x.c linux-2.6.37/drivers/ata/pata_
22829 .inherits = &hpt372_port_ops,
22830 .cable_detect = hpt374_fn1_cable_detect,
22831 .prereset = hpt37x_pre_reset,
22832 -diff -urNp linux-2.6.37/drivers/ata/pata_hpt3x2n.c linux-2.6.37/drivers/ata/pata_hpt3x2n.c
22833 ---- linux-2.6.37/drivers/ata/pata_hpt3x2n.c 2011-01-04 19:50:19.000000000 -0500
22834 -+++ linux-2.6.37/drivers/ata/pata_hpt3x2n.c 2011-01-17 02:41:01.000000000 -0500
22835 +diff -urNp linux-2.6.37.1/drivers/ata/pata_hpt3x2n.c linux-2.6.37.1/drivers/ata/pata_hpt3x2n.c
22836 +--- linux-2.6.37.1/drivers/ata/pata_hpt3x2n.c 2011-01-04 19:50:19.000000000 -0500
22837 ++++ linux-2.6.37.1/drivers/ata/pata_hpt3x2n.c 2011-01-17 02:41:01.000000000 -0500
22838 @@ -331,7 +331,7 @@ static struct scsi_host_template hpt3x2n
22839 * Configuration for HPT3x2n.
22840 */
22841 @@ -21445,9 +21515,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_hpt3x2n.c linux-2.6.37/drivers/ata/pata
22842 .inherits = &ata_bmdma_port_ops,
22843
22844 .bmdma_stop = hpt3x2n_bmdma_stop,
22845 -diff -urNp linux-2.6.37/drivers/ata/pata_hpt3x3.c linux-2.6.37/drivers/ata/pata_hpt3x3.c
22846 ---- linux-2.6.37/drivers/ata/pata_hpt3x3.c 2011-01-04 19:50:19.000000000 -0500
22847 -+++ linux-2.6.37/drivers/ata/pata_hpt3x3.c 2011-01-17 02:41:01.000000000 -0500
22848 +diff -urNp linux-2.6.37.1/drivers/ata/pata_hpt3x3.c linux-2.6.37.1/drivers/ata/pata_hpt3x3.c
22849 +--- linux-2.6.37.1/drivers/ata/pata_hpt3x3.c 2011-01-04 19:50:19.000000000 -0500
22850 ++++ linux-2.6.37.1/drivers/ata/pata_hpt3x3.c 2011-01-17 02:41:01.000000000 -0500
22851 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
22852 ATA_BMDMA_SHT(DRV_NAME),
22853 };
22854 @@ -21457,9 +21527,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_hpt3x3.c linux-2.6.37/drivers/ata/pata_
22855 .inherits = &ata_bmdma_port_ops,
22856 .cable_detect = ata_cable_40wire,
22857 .set_piomode = hpt3x3_set_piomode,
22858 -diff -urNp linux-2.6.37/drivers/ata/pata_icside.c linux-2.6.37/drivers/ata/pata_icside.c
22859 ---- linux-2.6.37/drivers/ata/pata_icside.c 2011-01-04 19:50:19.000000000 -0500
22860 -+++ linux-2.6.37/drivers/ata/pata_icside.c 2011-01-17 02:41:01.000000000 -0500
22861 +diff -urNp linux-2.6.37.1/drivers/ata/pata_icside.c linux-2.6.37.1/drivers/ata/pata_icside.c
22862 +--- linux-2.6.37.1/drivers/ata/pata_icside.c 2011-01-04 19:50:19.000000000 -0500
22863 ++++ linux-2.6.37.1/drivers/ata/pata_icside.c 2011-01-17 02:41:01.000000000 -0500
22864 @@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
22865 }
22866 }
22867 @@ -21469,9 +21539,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_icside.c linux-2.6.37/drivers/ata/pata_
22868 .inherits = &ata_bmdma_port_ops,
22869 /* no need to build any PRD tables for DMA */
22870 .qc_prep = ata_noop_qc_prep,
22871 -diff -urNp linux-2.6.37/drivers/ata/pata_isapnp.c linux-2.6.37/drivers/ata/pata_isapnp.c
22872 ---- linux-2.6.37/drivers/ata/pata_isapnp.c 2011-01-04 19:50:19.000000000 -0500
22873 -+++ linux-2.6.37/drivers/ata/pata_isapnp.c 2011-01-17 02:41:01.000000000 -0500
22874 +diff -urNp linux-2.6.37.1/drivers/ata/pata_isapnp.c linux-2.6.37.1/drivers/ata/pata_isapnp.c
22875 +--- linux-2.6.37.1/drivers/ata/pata_isapnp.c 2011-01-04 19:50:19.000000000 -0500
22876 ++++ linux-2.6.37.1/drivers/ata/pata_isapnp.c 2011-01-17 02:41:01.000000000 -0500
22877 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
22878 ATA_PIO_SHT(DRV_NAME),
22879 };
22880 @@ -21487,9 +21557,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_isapnp.c linux-2.6.37/drivers/ata/pata_
22881 .inherits = &ata_sff_port_ops,
22882 .cable_detect = ata_cable_40wire,
22883 /* No altstatus so we don't want to use the lost interrupt poll */
22884 -diff -urNp linux-2.6.37/drivers/ata/pata_it8213.c linux-2.6.37/drivers/ata/pata_it8213.c
22885 ---- linux-2.6.37/drivers/ata/pata_it8213.c 2011-01-04 19:50:19.000000000 -0500
22886 -+++ linux-2.6.37/drivers/ata/pata_it8213.c 2011-01-17 02:41:01.000000000 -0500
22887 +diff -urNp linux-2.6.37.1/drivers/ata/pata_it8213.c linux-2.6.37.1/drivers/ata/pata_it8213.c
22888 +--- linux-2.6.37.1/drivers/ata/pata_it8213.c 2011-01-04 19:50:19.000000000 -0500
22889 ++++ linux-2.6.37.1/drivers/ata/pata_it8213.c 2011-01-17 02:41:01.000000000 -0500
22890 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
22891 };
22892
22893 @@ -21499,9 +21569,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_it8213.c linux-2.6.37/drivers/ata/pata_
22894 .inherits = &ata_bmdma_port_ops,
22895 .cable_detect = it8213_cable_detect,
22896 .set_piomode = it8213_set_piomode,
22897 -diff -urNp linux-2.6.37/drivers/ata/pata_it821x.c linux-2.6.37/drivers/ata/pata_it821x.c
22898 ---- linux-2.6.37/drivers/ata/pata_it821x.c 2011-01-04 19:50:19.000000000 -0500
22899 -+++ linux-2.6.37/drivers/ata/pata_it821x.c 2011-01-17 02:41:01.000000000 -0500
22900 +diff -urNp linux-2.6.37.1/drivers/ata/pata_it821x.c linux-2.6.37.1/drivers/ata/pata_it821x.c
22901 +--- linux-2.6.37.1/drivers/ata/pata_it821x.c 2011-01-04 19:50:19.000000000 -0500
22902 ++++ linux-2.6.37.1/drivers/ata/pata_it821x.c 2011-01-17 02:41:01.000000000 -0500
22903 @@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
22904 ATA_BMDMA_SHT(DRV_NAME),
22905 };
22906 @@ -21529,9 +21599,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_it821x.c linux-2.6.37/drivers/ata/pata_
22907 .inherits = &ata_bmdma_port_ops,
22908
22909 .check_atapi_dma= it821x_check_atapi_dma,
22910 -diff -urNp linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c
22911 ---- linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c 2011-01-04 19:50:19.000000000 -0500
22912 -+++ linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c 2011-01-17 02:41:01.000000000 -0500
22913 +diff -urNp linux-2.6.37.1/drivers/ata/pata_ixp4xx_cf.c linux-2.6.37.1/drivers/ata/pata_ixp4xx_cf.c
22914 +--- linux-2.6.37.1/drivers/ata/pata_ixp4xx_cf.c 2011-01-04 19:50:19.000000000 -0500
22915 ++++ linux-2.6.37.1/drivers/ata/pata_ixp4xx_cf.c 2011-01-17 02:41:01.000000000 -0500
22916 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
22917 ATA_PIO_SHT(DRV_NAME),
22918 };
22919 @@ -21541,9 +21611,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c linux-2.6.37/drivers/ata/pa
22920 .inherits = &ata_sff_port_ops,
22921 .sff_data_xfer = ixp4xx_mmio_data_xfer,
22922 .cable_detect = ata_cable_40wire,
22923 -diff -urNp linux-2.6.37/drivers/ata/pata_jmicron.c linux-2.6.37/drivers/ata/pata_jmicron.c
22924 ---- linux-2.6.37/drivers/ata/pata_jmicron.c 2011-01-04 19:50:19.000000000 -0500
22925 -+++ linux-2.6.37/drivers/ata/pata_jmicron.c 2011-01-17 02:41:01.000000000 -0500
22926 +diff -urNp linux-2.6.37.1/drivers/ata/pata_jmicron.c linux-2.6.37.1/drivers/ata/pata_jmicron.c
22927 +--- linux-2.6.37.1/drivers/ata/pata_jmicron.c 2011-01-04 19:50:19.000000000 -0500
22928 ++++ linux-2.6.37.1/drivers/ata/pata_jmicron.c 2011-01-17 02:41:01.000000000 -0500
22929 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
22930 ATA_BMDMA_SHT(DRV_NAME),
22931 };
22932 @@ -21553,9 +21623,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_jmicron.c linux-2.6.37/drivers/ata/pata
22933 .inherits = &ata_bmdma_port_ops,
22934 .prereset = jmicron_pre_reset,
22935 };
22936 -diff -urNp linux-2.6.37/drivers/ata/pata_legacy.c linux-2.6.37/drivers/ata/pata_legacy.c
22937 ---- linux-2.6.37/drivers/ata/pata_legacy.c 2011-01-04 19:50:19.000000000 -0500
22938 -+++ linux-2.6.37/drivers/ata/pata_legacy.c 2011-01-17 02:41:01.000000000 -0500
22939 +diff -urNp linux-2.6.37.1/drivers/ata/pata_legacy.c linux-2.6.37.1/drivers/ata/pata_legacy.c
22940 +--- linux-2.6.37.1/drivers/ata/pata_legacy.c 2011-01-04 19:50:19.000000000 -0500
22941 ++++ linux-2.6.37.1/drivers/ata/pata_legacy.c 2011-01-17 02:41:01.000000000 -0500
22942 @@ -116,7 +116,7 @@ struct legacy_probe {
22943
22944 struct legacy_controller {
22945 @@ -21667,9 +21737,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_legacy.c linux-2.6.37/drivers/ata/pata_
22946 struct legacy_data *ld = &legacy_data[probe->slot];
22947 struct ata_host *host = NULL;
22948 struct ata_port *ap;
22949 -diff -urNp linux-2.6.37/drivers/ata/pata_macio.c linux-2.6.37/drivers/ata/pata_macio.c
22950 ---- linux-2.6.37/drivers/ata/pata_macio.c 2011-01-04 19:50:19.000000000 -0500
22951 -+++ linux-2.6.37/drivers/ata/pata_macio.c 2011-01-17 02:41:01.000000000 -0500
22952 +diff -urNp linux-2.6.37.1/drivers/ata/pata_macio.c linux-2.6.37.1/drivers/ata/pata_macio.c
22953 +--- linux-2.6.37.1/drivers/ata/pata_macio.c 2011-01-04 19:50:19.000000000 -0500
22954 ++++ linux-2.6.37.1/drivers/ata/pata_macio.c 2011-01-17 02:41:01.000000000 -0500
22955 @@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
22956 .slave_configure = pata_macio_slave_config,
22957 };
22958 @@ -21681,9 +21751,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_macio.c linux-2.6.37/drivers/ata/pata_m
22959 .freeze = pata_macio_freeze,
22960 .set_piomode = pata_macio_set_timings,
22961 .set_dmamode = pata_macio_set_timings,
22962 -diff -urNp linux-2.6.37/drivers/ata/pata_marvell.c linux-2.6.37/drivers/ata/pata_marvell.c
22963 ---- linux-2.6.37/drivers/ata/pata_marvell.c 2011-01-04 19:50:19.000000000 -0500
22964 -+++ linux-2.6.37/drivers/ata/pata_marvell.c 2011-01-17 02:41:01.000000000 -0500
22965 +diff -urNp linux-2.6.37.1/drivers/ata/pata_marvell.c linux-2.6.37.1/drivers/ata/pata_marvell.c
22966 +--- linux-2.6.37.1/drivers/ata/pata_marvell.c 2011-01-04 19:50:19.000000000 -0500
22967 ++++ linux-2.6.37.1/drivers/ata/pata_marvell.c 2011-01-17 02:41:01.000000000 -0500
22968 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
22969 ATA_BMDMA_SHT(DRV_NAME),
22970 };
22971 @@ -21693,21 +21763,21 @@ diff -urNp linux-2.6.37/drivers/ata/pata_marvell.c linux-2.6.37/drivers/ata/pata
22972 .inherits = &ata_bmdma_port_ops,
22973 .cable_detect = marvell_cable_detect,
22974 .prereset = marvell_pre_reset,
22975 -diff -urNp linux-2.6.37/drivers/ata/pata_mpc52xx.c linux-2.6.37/drivers/ata/pata_mpc52xx.c
22976 ---- linux-2.6.37/drivers/ata/pata_mpc52xx.c 2011-01-04 19:50:19.000000000 -0500
22977 -+++ linux-2.6.37/drivers/ata/pata_mpc52xx.c 2011-01-17 02:41:01.000000000 -0500
22978 +diff -urNp linux-2.6.37.1/drivers/ata/pata_mpc52xx.c linux-2.6.37.1/drivers/ata/pata_mpc52xx.c
22979 +--- linux-2.6.37.1/drivers/ata/pata_mpc52xx.c 2011-02-22 16:05:30.000000000 -0500
22980 ++++ linux-2.6.37.1/drivers/ata/pata_mpc52xx.c 2011-02-22 16:12:20.000000000 -0500
22981 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
22982 ATA_PIO_SHT(DRV_NAME),
22983 };
22984
22985 -static struct ata_port_operations mpc52xx_ata_port_ops = {
22986 +static const struct ata_port_operations mpc52xx_ata_port_ops = {
22987 - .inherits = &ata_sff_port_ops,
22988 + .inherits = &ata_bmdma_port_ops,
22989 .sff_dev_select = mpc52xx_ata_dev_select,
22990 .set_piomode = mpc52xx_ata_set_piomode,
22991 -diff -urNp linux-2.6.37/drivers/ata/pata_mpiix.c linux-2.6.37/drivers/ata/pata_mpiix.c
22992 ---- linux-2.6.37/drivers/ata/pata_mpiix.c 2011-01-04 19:50:19.000000000 -0500
22993 -+++ linux-2.6.37/drivers/ata/pata_mpiix.c 2011-01-17 02:41:01.000000000 -0500
22994 +diff -urNp linux-2.6.37.1/drivers/ata/pata_mpiix.c linux-2.6.37.1/drivers/ata/pata_mpiix.c
22995 +--- linux-2.6.37.1/drivers/ata/pata_mpiix.c 2011-01-04 19:50:19.000000000 -0500
22996 ++++ linux-2.6.37.1/drivers/ata/pata_mpiix.c 2011-01-17 02:41:01.000000000 -0500
22997 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
22998 ATA_PIO_SHT(DRV_NAME),
22999 };
23000 @@ -21717,9 +21787,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_mpiix.c linux-2.6.37/drivers/ata/pata_m
23001 .inherits = &ata_sff_port_ops,
23002 .qc_issue = mpiix_qc_issue,
23003 .cable_detect = ata_cable_40wire,
23004 -diff -urNp linux-2.6.37/drivers/ata/pata_netcell.c linux-2.6.37/drivers/ata/pata_netcell.c
23005 ---- linux-2.6.37/drivers/ata/pata_netcell.c 2011-01-04 19:50:19.000000000 -0500
23006 -+++ linux-2.6.37/drivers/ata/pata_netcell.c 2011-01-17 02:41:01.000000000 -0500
23007 +diff -urNp linux-2.6.37.1/drivers/ata/pata_netcell.c linux-2.6.37.1/drivers/ata/pata_netcell.c
23008 +--- linux-2.6.37.1/drivers/ata/pata_netcell.c 2011-01-04 19:50:19.000000000 -0500
23009 ++++ linux-2.6.37.1/drivers/ata/pata_netcell.c 2011-01-17 02:41:01.000000000 -0500
23010 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
23011 ATA_BMDMA_SHT(DRV_NAME),
23012 };
23013 @@ -21729,9 +21799,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_netcell.c linux-2.6.37/drivers/ata/pata
23014 .inherits = &ata_bmdma_port_ops,
23015 .cable_detect = ata_cable_80wire,
23016 .read_id = netcell_read_id,
23017 -diff -urNp linux-2.6.37/drivers/ata/pata_ninja32.c linux-2.6.37/drivers/ata/pata_ninja32.c
23018 ---- linux-2.6.37/drivers/ata/pata_ninja32.c 2011-01-04 19:50:19.000000000 -0500
23019 -+++ linux-2.6.37/drivers/ata/pata_ninja32.c 2011-01-17 02:41:01.000000000 -0500
23020 +diff -urNp linux-2.6.37.1/drivers/ata/pata_ninja32.c linux-2.6.37.1/drivers/ata/pata_ninja32.c
23021 +--- linux-2.6.37.1/drivers/ata/pata_ninja32.c 2011-01-04 19:50:19.000000000 -0500
23022 ++++ linux-2.6.37.1/drivers/ata/pata_ninja32.c 2011-01-17 02:41:01.000000000 -0500
23023 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
23024 ATA_BMDMA_SHT(DRV_NAME),
23025 };
23026 @@ -21741,9 +21811,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_ninja32.c linux-2.6.37/drivers/ata/pata
23027 .inherits = &ata_bmdma_port_ops,
23028 .sff_dev_select = ninja32_dev_select,
23029 .cable_detect = ata_cable_40wire,
23030 -diff -urNp linux-2.6.37/drivers/ata/pata_ns87410.c linux-2.6.37/drivers/ata/pata_ns87410.c
23031 ---- linux-2.6.37/drivers/ata/pata_ns87410.c 2011-01-04 19:50:19.000000000 -0500
23032 -+++ linux-2.6.37/drivers/ata/pata_ns87410.c 2011-01-17 02:41:01.000000000 -0500
23033 +diff -urNp linux-2.6.37.1/drivers/ata/pata_ns87410.c linux-2.6.37.1/drivers/ata/pata_ns87410.c
23034 +--- linux-2.6.37.1/drivers/ata/pata_ns87410.c 2011-01-04 19:50:19.000000000 -0500
23035 ++++ linux-2.6.37.1/drivers/ata/pata_ns87410.c 2011-01-17 02:41:01.000000000 -0500
23036 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
23037 ATA_PIO_SHT(DRV_NAME),
23038 };
23039 @@ -21753,9 +21823,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_ns87410.c linux-2.6.37/drivers/ata/pata
23040 .inherits = &ata_sff_port_ops,
23041 .qc_issue = ns87410_qc_issue,
23042 .cable_detect = ata_cable_40wire,
23043 -diff -urNp linux-2.6.37/drivers/ata/pata_ns87415.c linux-2.6.37/drivers/ata/pata_ns87415.c
23044 ---- linux-2.6.37/drivers/ata/pata_ns87415.c 2011-01-04 19:50:19.000000000 -0500
23045 -+++ linux-2.6.37/drivers/ata/pata_ns87415.c 2011-01-17 02:41:01.000000000 -0500
23046 +diff -urNp linux-2.6.37.1/drivers/ata/pata_ns87415.c linux-2.6.37.1/drivers/ata/pata_ns87415.c
23047 +--- linux-2.6.37.1/drivers/ata/pata_ns87415.c 2011-01-04 19:50:19.000000000 -0500
23048 ++++ linux-2.6.37.1/drivers/ata/pata_ns87415.c 2011-01-17 02:41:01.000000000 -0500
23049 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
23050 }
23051 #endif /* 87560 SuperIO Support */
23052 @@ -21774,9 +21844,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_ns87415.c linux-2.6.37/drivers/ata/pata
23053 .inherits = &ns87415_pata_ops,
23054 .sff_tf_read = ns87560_tf_read,
23055 .sff_check_status = ns87560_check_status,
23056 -diff -urNp linux-2.6.37/drivers/ata/pata_octeon_cf.c linux-2.6.37/drivers/ata/pata_octeon_cf.c
23057 ---- linux-2.6.37/drivers/ata/pata_octeon_cf.c 2011-01-04 19:50:19.000000000 -0500
23058 -+++ linux-2.6.37/drivers/ata/pata_octeon_cf.c 2011-01-17 02:41:01.000000000 -0500
23059 +diff -urNp linux-2.6.37.1/drivers/ata/pata_octeon_cf.c linux-2.6.37.1/drivers/ata/pata_octeon_cf.c
23060 +--- linux-2.6.37.1/drivers/ata/pata_octeon_cf.c 2011-01-04 19:50:19.000000000 -0500
23061 ++++ linux-2.6.37.1/drivers/ata/pata_octeon_cf.c 2011-01-17 02:41:01.000000000 -0500
23062 @@ -780,6 +780,7 @@ static unsigned int octeon_cf_qc_issue(s
23063 return 0;
23064 }
23065 @@ -21785,9 +21855,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_octeon_cf.c linux-2.6.37/drivers/ata/pa
23066 static struct ata_port_operations octeon_cf_ops = {
23067 .inherits = &ata_sff_port_ops,
23068 .check_atapi_dma = octeon_cf_check_atapi_dma,
23069 -diff -urNp linux-2.6.37/drivers/ata/pata_oldpiix.c linux-2.6.37/drivers/ata/pata_oldpiix.c
23070 ---- linux-2.6.37/drivers/ata/pata_oldpiix.c 2011-01-04 19:50:19.000000000 -0500
23071 -+++ linux-2.6.37/drivers/ata/pata_oldpiix.c 2011-01-17 02:41:01.000000000 -0500
23072 +diff -urNp linux-2.6.37.1/drivers/ata/pata_oldpiix.c linux-2.6.37.1/drivers/ata/pata_oldpiix.c
23073 +--- linux-2.6.37.1/drivers/ata/pata_oldpiix.c 2011-01-04 19:50:19.000000000 -0500
23074 ++++ linux-2.6.37.1/drivers/ata/pata_oldpiix.c 2011-01-17 02:41:01.000000000 -0500
23075 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
23076 ATA_BMDMA_SHT(DRV_NAME),
23077 };
23078 @@ -21797,9 +21867,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_oldpiix.c linux-2.6.37/drivers/ata/pata
23079 .inherits = &ata_bmdma_port_ops,
23080 .qc_issue = oldpiix_qc_issue,
23081 .cable_detect = ata_cable_40wire,
23082 -diff -urNp linux-2.6.37/drivers/ata/pata_opti.c linux-2.6.37/drivers/ata/pata_opti.c
23083 ---- linux-2.6.37/drivers/ata/pata_opti.c 2011-01-04 19:50:19.000000000 -0500
23084 -+++ linux-2.6.37/drivers/ata/pata_opti.c 2011-01-17 02:41:01.000000000 -0500
23085 +diff -urNp linux-2.6.37.1/drivers/ata/pata_opti.c linux-2.6.37.1/drivers/ata/pata_opti.c
23086 +--- linux-2.6.37.1/drivers/ata/pata_opti.c 2011-01-04 19:50:19.000000000 -0500
23087 ++++ linux-2.6.37.1/drivers/ata/pata_opti.c 2011-01-17 02:41:01.000000000 -0500
23088 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
23089 ATA_PIO_SHT(DRV_NAME),
23090 };
23091 @@ -21809,9 +21879,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_opti.c linux-2.6.37/drivers/ata/pata_op
23092 .inherits = &ata_sff_port_ops,
23093 .cable_detect = ata_cable_40wire,
23094 .set_piomode = opti_set_piomode,
23095 -diff -urNp linux-2.6.37/drivers/ata/pata_optidma.c linux-2.6.37/drivers/ata/pata_optidma.c
23096 ---- linux-2.6.37/drivers/ata/pata_optidma.c 2011-01-04 19:50:19.000000000 -0500
23097 -+++ linux-2.6.37/drivers/ata/pata_optidma.c 2011-01-17 02:41:01.000000000 -0500
23098 +diff -urNp linux-2.6.37.1/drivers/ata/pata_optidma.c linux-2.6.37.1/drivers/ata/pata_optidma.c
23099 +--- linux-2.6.37.1/drivers/ata/pata_optidma.c 2011-01-04 19:50:19.000000000 -0500
23100 ++++ linux-2.6.37.1/drivers/ata/pata_optidma.c 2011-01-17 02:41:01.000000000 -0500
23101 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
23102 ATA_BMDMA_SHT(DRV_NAME),
23103 };
23104 @@ -21830,9 +21900,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_optidma.c linux-2.6.37/drivers/ata/pata
23105 .inherits = &optidma_port_ops,
23106 .set_piomode = optiplus_set_pio_mode,
23107 .set_dmamode = optiplus_set_dma_mode,
23108 -diff -urNp linux-2.6.37/drivers/ata/pata_palmld.c linux-2.6.37/drivers/ata/pata_palmld.c
23109 ---- linux-2.6.37/drivers/ata/pata_palmld.c 2011-01-04 19:50:19.000000000 -0500
23110 -+++ linux-2.6.37/drivers/ata/pata_palmld.c 2011-01-17 02:41:01.000000000 -0500
23111 +diff -urNp linux-2.6.37.1/drivers/ata/pata_palmld.c linux-2.6.37.1/drivers/ata/pata_palmld.c
23112 +--- linux-2.6.37.1/drivers/ata/pata_palmld.c 2011-01-04 19:50:19.000000000 -0500
23113 ++++ linux-2.6.37.1/drivers/ata/pata_palmld.c 2011-01-17 02:41:01.000000000 -0500
23114 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
23115 ATA_PIO_SHT(DRV_NAME),
23116 };
23117 @@ -21842,9 +21912,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_palmld.c linux-2.6.37/drivers/ata/pata_
23118 .inherits = &ata_sff_port_ops,
23119 .sff_data_xfer = ata_sff_data_xfer_noirq,
23120 .cable_detect = ata_cable_40wire,
23121 -diff -urNp linux-2.6.37/drivers/ata/pata_pcmcia.c linux-2.6.37/drivers/ata/pata_pcmcia.c
23122 ---- linux-2.6.37/drivers/ata/pata_pcmcia.c 2011-01-04 19:50:19.000000000 -0500
23123 -+++ linux-2.6.37/drivers/ata/pata_pcmcia.c 2011-01-17 02:41:01.000000000 -0500
23124 +diff -urNp linux-2.6.37.1/drivers/ata/pata_pcmcia.c linux-2.6.37.1/drivers/ata/pata_pcmcia.c
23125 +--- linux-2.6.37.1/drivers/ata/pata_pcmcia.c 2011-01-04 19:50:19.000000000 -0500
23126 ++++ linux-2.6.37.1/drivers/ata/pata_pcmcia.c 2011-01-17 02:41:01.000000000 -0500
23127 @@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_
23128 ATA_PIO_SHT(DRV_NAME),
23129 };
23130 @@ -21871,9 +21941,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_pcmcia.c linux-2.6.37/drivers/ata/pata_
23131
23132 /* Set up attributes in order to probe card and get resources */
23133 pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |
23134 -diff -urNp linux-2.6.37/drivers/ata/pata_pdc2027x.c linux-2.6.37/drivers/ata/pata_pdc2027x.c
23135 ---- linux-2.6.37/drivers/ata/pata_pdc2027x.c 2011-01-04 19:50:19.000000000 -0500
23136 -+++ linux-2.6.37/drivers/ata/pata_pdc2027x.c 2011-01-17 02:41:01.000000000 -0500
23137 +diff -urNp linux-2.6.37.1/drivers/ata/pata_pdc2027x.c linux-2.6.37.1/drivers/ata/pata_pdc2027x.c
23138 +--- linux-2.6.37.1/drivers/ata/pata_pdc2027x.c 2011-01-04 19:50:19.000000000 -0500
23139 ++++ linux-2.6.37.1/drivers/ata/pata_pdc2027x.c 2011-01-17 02:41:01.000000000 -0500
23140 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
23141 ATA_BMDMA_SHT(DRV_NAME),
23142 };
23143 @@ -21891,9 +21961,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_pdc2027x.c linux-2.6.37/drivers/ata/pat
23144 .inherits = &pdc2027x_pata100_ops,
23145 .mode_filter = pdc2027x_mode_filter,
23146 .set_piomode = pdc2027x_set_piomode,
23147 -diff -urNp linux-2.6.37/drivers/ata/pata_pdc202xx_old.c linux-2.6.37/drivers/ata/pata_pdc202xx_old.c
23148 ---- linux-2.6.37/drivers/ata/pata_pdc202xx_old.c 2011-01-04 19:50:19.000000000 -0500
23149 -+++ linux-2.6.37/drivers/ata/pata_pdc202xx_old.c 2011-01-17 02:41:01.000000000 -0500
23150 +diff -urNp linux-2.6.37.1/drivers/ata/pata_pdc202xx_old.c linux-2.6.37.1/drivers/ata/pata_pdc202xx_old.c
23151 +--- linux-2.6.37.1/drivers/ata/pata_pdc202xx_old.c 2011-01-04 19:50:19.000000000 -0500
23152 ++++ linux-2.6.37.1/drivers/ata/pata_pdc202xx_old.c 2011-01-17 02:41:01.000000000 -0500
23153 @@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x
23154 ATA_BMDMA_SHT(DRV_NAME),
23155 };
23156 @@ -21912,9 +21982,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_pdc202xx_old.c linux-2.6.37/drivers/ata
23157 .inherits = &pdc2024x_port_ops,
23158
23159 .check_atapi_dma = pdc2026x_check_atapi_dma,
23160 -diff -urNp linux-2.6.37/drivers/ata/pata_piccolo.c linux-2.6.37/drivers/ata/pata_piccolo.c
23161 ---- linux-2.6.37/drivers/ata/pata_piccolo.c 2011-01-04 19:50:19.000000000 -0500
23162 -+++ linux-2.6.37/drivers/ata/pata_piccolo.c 2011-01-17 02:41:01.000000000 -0500
23163 +diff -urNp linux-2.6.37.1/drivers/ata/pata_piccolo.c linux-2.6.37.1/drivers/ata/pata_piccolo.c
23164 +--- linux-2.6.37.1/drivers/ata/pata_piccolo.c 2011-01-04 19:50:19.000000000 -0500
23165 ++++ linux-2.6.37.1/drivers/ata/pata_piccolo.c 2011-01-17 02:41:01.000000000 -0500
23166 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
23167 ATA_BMDMA_SHT(DRV_NAME),
23168 };
23169 @@ -21924,9 +21994,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_piccolo.c linux-2.6.37/drivers/ata/pata
23170 .inherits = &ata_bmdma_port_ops,
23171 .cable_detect = ata_cable_unknown,
23172 .set_piomode = tosh_set_piomode,
23173 -diff -urNp linux-2.6.37/drivers/ata/pata_platform.c linux-2.6.37/drivers/ata/pata_platform.c
23174 ---- linux-2.6.37/drivers/ata/pata_platform.c 2011-01-04 19:50:19.000000000 -0500
23175 -+++ linux-2.6.37/drivers/ata/pata_platform.c 2011-01-17 02:41:01.000000000 -0500
23176 +diff -urNp linux-2.6.37.1/drivers/ata/pata_platform.c linux-2.6.37.1/drivers/ata/pata_platform.c
23177 +--- linux-2.6.37.1/drivers/ata/pata_platform.c 2011-01-04 19:50:19.000000000 -0500
23178 ++++ linux-2.6.37.1/drivers/ata/pata_platform.c 2011-01-17 02:41:01.000000000 -0500
23179 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
23180 ATA_PIO_SHT(DRV_NAME),
23181 };
23182 @@ -21936,9 +22006,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_platform.c linux-2.6.37/drivers/ata/pat
23183 .inherits = &ata_sff_port_ops,
23184 .sff_data_xfer = ata_sff_data_xfer_noirq,
23185 .cable_detect = ata_cable_unknown,
23186 -diff -urNp linux-2.6.37/drivers/ata/pata_pxa.c linux-2.6.37/drivers/ata/pata_pxa.c
23187 ---- linux-2.6.37/drivers/ata/pata_pxa.c 2011-01-04 19:50:19.000000000 -0500
23188 -+++ linux-2.6.37/drivers/ata/pata_pxa.c 2011-01-17 02:41:01.000000000 -0500
23189 +diff -urNp linux-2.6.37.1/drivers/ata/pata_pxa.c linux-2.6.37.1/drivers/ata/pata_pxa.c
23190 +--- linux-2.6.37.1/drivers/ata/pata_pxa.c 2011-01-04 19:50:19.000000000 -0500
23191 ++++ linux-2.6.37.1/drivers/ata/pata_pxa.c 2011-01-17 02:41:01.000000000 -0500
23192 @@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata
23193 ATA_BMDMA_SHT(DRV_NAME),
23194 };
23195 @@ -21948,9 +22018,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_pxa.c linux-2.6.37/drivers/ata/pata_pxa
23196 .inherits = &ata_bmdma_port_ops,
23197 .cable_detect = ata_cable_40wire,
23198
23199 -diff -urNp linux-2.6.37/drivers/ata/pata_qdi.c linux-2.6.37/drivers/ata/pata_qdi.c
23200 ---- linux-2.6.37/drivers/ata/pata_qdi.c 2011-01-04 19:50:19.000000000 -0500
23201 -+++ linux-2.6.37/drivers/ata/pata_qdi.c 2011-01-17 02:41:01.000000000 -0500
23202 +diff -urNp linux-2.6.37.1/drivers/ata/pata_qdi.c linux-2.6.37.1/drivers/ata/pata_qdi.c
23203 +--- linux-2.6.37.1/drivers/ata/pata_qdi.c 2011-01-04 19:50:19.000000000 -0500
23204 ++++ linux-2.6.37.1/drivers/ata/pata_qdi.c 2011-01-17 02:41:01.000000000 -0500
23205 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
23206 ATA_PIO_SHT(DRV_NAME),
23207 };
23208 @@ -21969,9 +22039,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_qdi.c linux-2.6.37/drivers/ata/pata_qdi
23209 .inherits = &qdi6500_port_ops,
23210 .set_piomode = qdi6580_set_piomode,
23211 };
23212 -diff -urNp linux-2.6.37/drivers/ata/pata_radisys.c linux-2.6.37/drivers/ata/pata_radisys.c
23213 ---- linux-2.6.37/drivers/ata/pata_radisys.c 2011-01-04 19:50:19.000000000 -0500
23214 -+++ linux-2.6.37/drivers/ata/pata_radisys.c 2011-01-17 02:41:01.000000000 -0500
23215 +diff -urNp linux-2.6.37.1/drivers/ata/pata_radisys.c linux-2.6.37.1/drivers/ata/pata_radisys.c
23216 +--- linux-2.6.37.1/drivers/ata/pata_radisys.c 2011-01-04 19:50:19.000000000 -0500
23217 ++++ linux-2.6.37.1/drivers/ata/pata_radisys.c 2011-01-17 02:41:01.000000000 -0500
23218 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
23219 ATA_BMDMA_SHT(DRV_NAME),
23220 };
23221 @@ -21981,9 +22051,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_radisys.c linux-2.6.37/drivers/ata/pata
23222 .inherits = &ata_bmdma_port_ops,
23223 .qc_issue = radisys_qc_issue,
23224 .cable_detect = ata_cable_unknown,
23225 -diff -urNp linux-2.6.37/drivers/ata/pata_rb532_cf.c linux-2.6.37/drivers/ata/pata_rb532_cf.c
23226 ---- linux-2.6.37/drivers/ata/pata_rb532_cf.c 2011-01-04 19:50:19.000000000 -0500
23227 -+++ linux-2.6.37/drivers/ata/pata_rb532_cf.c 2011-01-17 02:41:01.000000000 -0500
23228 +diff -urNp linux-2.6.37.1/drivers/ata/pata_rb532_cf.c linux-2.6.37.1/drivers/ata/pata_rb532_cf.c
23229 +--- linux-2.6.37.1/drivers/ata/pata_rb532_cf.c 2011-01-04 19:50:19.000000000 -0500
23230 ++++ linux-2.6.37.1/drivers/ata/pata_rb532_cf.c 2011-01-17 02:41:01.000000000 -0500
23231 @@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
23232 return IRQ_HANDLED;
23233 }
23234 @@ -21993,9 +22063,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_rb532_cf.c linux-2.6.37/drivers/ata/pat
23235 .inherits = &ata_sff_port_ops,
23236 .sff_data_xfer = ata_sff_data_xfer32,
23237 };
23238 -diff -urNp linux-2.6.37/drivers/ata/pata_rdc.c linux-2.6.37/drivers/ata/pata_rdc.c
23239 ---- linux-2.6.37/drivers/ata/pata_rdc.c 2011-01-04 19:50:19.000000000 -0500
23240 -+++ linux-2.6.37/drivers/ata/pata_rdc.c 2011-01-17 02:41:01.000000000 -0500
23241 +diff -urNp linux-2.6.37.1/drivers/ata/pata_rdc.c linux-2.6.37.1/drivers/ata/pata_rdc.c
23242 +--- linux-2.6.37.1/drivers/ata/pata_rdc.c 2011-01-04 19:50:19.000000000 -0500
23243 ++++ linux-2.6.37.1/drivers/ata/pata_rdc.c 2011-01-17 02:41:01.000000000 -0500
23244 @@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p
23245 pci_write_config_byte(dev, 0x48, udma_enable);
23246 }
23247 @@ -22005,9 +22075,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_rdc.c linux-2.6.37/drivers/ata/pata_rdc
23248 .inherits = &ata_bmdma32_port_ops,
23249 .cable_detect = rdc_pata_cable_detect,
23250 .set_piomode = rdc_set_piomode,
23251 -diff -urNp linux-2.6.37/drivers/ata/pata_rz1000.c linux-2.6.37/drivers/ata/pata_rz1000.c
23252 ---- linux-2.6.37/drivers/ata/pata_rz1000.c 2011-01-04 19:50:19.000000000 -0500
23253 -+++ linux-2.6.37/drivers/ata/pata_rz1000.c 2011-01-17 02:41:01.000000000 -0500
23254 +diff -urNp linux-2.6.37.1/drivers/ata/pata_rz1000.c linux-2.6.37.1/drivers/ata/pata_rz1000.c
23255 +--- linux-2.6.37.1/drivers/ata/pata_rz1000.c 2011-01-04 19:50:19.000000000 -0500
23256 ++++ linux-2.6.37.1/drivers/ata/pata_rz1000.c 2011-01-17 02:41:01.000000000 -0500
23257 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
23258 ATA_PIO_SHT(DRV_NAME),
23259 };
23260 @@ -22017,9 +22087,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_rz1000.c linux-2.6.37/drivers/ata/pata_
23261 .inherits = &ata_sff_port_ops,
23262 .cable_detect = ata_cable_40wire,
23263 .set_mode = rz1000_set_mode,
23264 -diff -urNp linux-2.6.37/drivers/ata/pata_samsung_cf.c linux-2.6.37/drivers/ata/pata_samsung_cf.c
23265 ---- linux-2.6.37/drivers/ata/pata_samsung_cf.c 2011-01-04 19:50:19.000000000 -0500
23266 -+++ linux-2.6.37/drivers/ata/pata_samsung_cf.c 2011-01-17 02:41:01.000000000 -0500
23267 +diff -urNp linux-2.6.37.1/drivers/ata/pata_samsung_cf.c linux-2.6.37.1/drivers/ata/pata_samsung_cf.c
23268 +--- linux-2.6.37.1/drivers/ata/pata_samsung_cf.c 2011-01-04 19:50:19.000000000 -0500
23269 ++++ linux-2.6.37.1/drivers/ata/pata_samsung_cf.c 2011-01-17 02:41:01.000000000 -0500
23270 @@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3
23271 ATA_PIO_SHT(DRV_NAME),
23272 };
23273 @@ -22038,9 +22108,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_samsung_cf.c linux-2.6.37/drivers/ata/p
23274 .inherits = &ata_sff_port_ops,
23275 .set_piomode = pata_s3c_set_piomode,
23276 };
23277 -diff -urNp linux-2.6.37/drivers/ata/pata_sc1200.c linux-2.6.37/drivers/ata/pata_sc1200.c
23278 ---- linux-2.6.37/drivers/ata/pata_sc1200.c 2011-01-04 19:50:19.000000000 -0500
23279 -+++ linux-2.6.37/drivers/ata/pata_sc1200.c 2011-01-17 02:41:01.000000000 -0500
23280 +diff -urNp linux-2.6.37.1/drivers/ata/pata_sc1200.c linux-2.6.37.1/drivers/ata/pata_sc1200.c
23281 +--- linux-2.6.37.1/drivers/ata/pata_sc1200.c 2011-01-04 19:50:19.000000000 -0500
23282 ++++ linux-2.6.37.1/drivers/ata/pata_sc1200.c 2011-01-17 02:41:01.000000000 -0500
23283 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
23284 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
23285 };
23286 @@ -22050,9 +22120,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_sc1200.c linux-2.6.37/drivers/ata/pata_
23287 .inherits = &ata_bmdma_port_ops,
23288 .qc_prep = ata_bmdma_dumb_qc_prep,
23289 .qc_issue = sc1200_qc_issue,
23290 -diff -urNp linux-2.6.37/drivers/ata/pata_scc.c linux-2.6.37/drivers/ata/pata_scc.c
23291 ---- linux-2.6.37/drivers/ata/pata_scc.c 2011-01-04 19:50:19.000000000 -0500
23292 -+++ linux-2.6.37/drivers/ata/pata_scc.c 2011-01-17 02:41:01.000000000 -0500
23293 +diff -urNp linux-2.6.37.1/drivers/ata/pata_scc.c linux-2.6.37.1/drivers/ata/pata_scc.c
23294 +--- linux-2.6.37.1/drivers/ata/pata_scc.c 2011-01-04 19:50:19.000000000 -0500
23295 ++++ linux-2.6.37.1/drivers/ata/pata_scc.c 2011-01-17 02:41:01.000000000 -0500
23296 @@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht
23297 ATA_BMDMA_SHT(DRV_NAME),
23298 };
23299 @@ -22062,9 +22132,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_scc.c linux-2.6.37/drivers/ata/pata_scc
23300 .inherits = &ata_bmdma_port_ops,
23301
23302 .set_piomode = scc_set_piomode,
23303 -diff -urNp linux-2.6.37/drivers/ata/pata_sch.c linux-2.6.37/drivers/ata/pata_sch.c
23304 ---- linux-2.6.37/drivers/ata/pata_sch.c 2011-01-04 19:50:19.000000000 -0500
23305 -+++ linux-2.6.37/drivers/ata/pata_sch.c 2011-01-17 02:41:01.000000000 -0500
23306 +diff -urNp linux-2.6.37.1/drivers/ata/pata_sch.c linux-2.6.37.1/drivers/ata/pata_sch.c
23307 +--- linux-2.6.37.1/drivers/ata/pata_sch.c 2011-01-04 19:50:19.000000000 -0500
23308 ++++ linux-2.6.37.1/drivers/ata/pata_sch.c 2011-01-17 02:41:01.000000000 -0500
23309 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
23310 ATA_BMDMA_SHT(DRV_NAME),
23311 };
23312 @@ -22074,9 +22144,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_sch.c linux-2.6.37/drivers/ata/pata_sch
23313 .inherits = &ata_bmdma_port_ops,
23314 .cable_detect = ata_cable_unknown,
23315 .set_piomode = sch_set_piomode,
23316 -diff -urNp linux-2.6.37/drivers/ata/pata_serverworks.c linux-2.6.37/drivers/ata/pata_serverworks.c
23317 ---- linux-2.6.37/drivers/ata/pata_serverworks.c 2011-01-04 19:50:19.000000000 -0500
23318 -+++ linux-2.6.37/drivers/ata/pata_serverworks.c 2011-01-17 02:41:01.000000000 -0500
23319 +diff -urNp linux-2.6.37.1/drivers/ata/pata_serverworks.c linux-2.6.37.1/drivers/ata/pata_serverworks.c
23320 +--- linux-2.6.37.1/drivers/ata/pata_serverworks.c 2011-01-04 19:50:19.000000000 -0500
23321 ++++ linux-2.6.37.1/drivers/ata/pata_serverworks.c 2011-01-17 02:41:01.000000000 -0500
23322 @@ -300,7 +300,7 @@ static struct scsi_host_template serverw
23323 ATA_BMDMA_SHT(DRV_NAME),
23324 };
23325 @@ -22095,9 +22165,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_serverworks.c linux-2.6.37/drivers/ata/
23326 .inherits = &serverworks_osb4_port_ops,
23327 .mode_filter = serverworks_csb_filter,
23328 };
23329 -diff -urNp linux-2.6.37/drivers/ata/pata_sil680.c linux-2.6.37/drivers/ata/pata_sil680.c
23330 ---- linux-2.6.37/drivers/ata/pata_sil680.c 2011-01-04 19:50:19.000000000 -0500
23331 -+++ linux-2.6.37/drivers/ata/pata_sil680.c 2011-01-17 02:41:01.000000000 -0500
23332 +diff -urNp linux-2.6.37.1/drivers/ata/pata_sil680.c linux-2.6.37.1/drivers/ata/pata_sil680.c
23333 +--- linux-2.6.37.1/drivers/ata/pata_sil680.c 2011-01-04 19:50:19.000000000 -0500
23334 ++++ linux-2.6.37.1/drivers/ata/pata_sil680.c 2011-01-17 02:41:01.000000000 -0500
23335 @@ -225,8 +225,7 @@ static struct scsi_host_template sil680_
23336 ATA_BMDMA_SHT(DRV_NAME),
23337 };
23338 @@ -22108,9 +22178,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_sil680.c linux-2.6.37/drivers/ata/pata_
23339 .inherits = &ata_bmdma32_port_ops,
23340 .sff_exec_command = sil680_sff_exec_command,
23341 .sff_irq_check = sil680_sff_irq_check,
23342 -diff -urNp linux-2.6.37/drivers/ata/pata_sis.c linux-2.6.37/drivers/ata/pata_sis.c
23343 ---- linux-2.6.37/drivers/ata/pata_sis.c 2011-01-04 19:50:19.000000000 -0500
23344 -+++ linux-2.6.37/drivers/ata/pata_sis.c 2011-01-17 02:41:01.000000000 -0500
23345 +diff -urNp linux-2.6.37.1/drivers/ata/pata_sis.c linux-2.6.37.1/drivers/ata/pata_sis.c
23346 +--- linux-2.6.37.1/drivers/ata/pata_sis.c 2011-01-04 19:50:19.000000000 -0500
23347 ++++ linux-2.6.37.1/drivers/ata/pata_sis.c 2011-01-17 02:41:01.000000000 -0500
23348 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
23349 ATA_BMDMA_SHT(DRV_NAME),
23350 };
23351 @@ -22166,9 +22236,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_sis.c linux-2.6.37/drivers/ata/pata_sis
23352 .inherits = &sis_base_ops,
23353 .set_piomode = sis_old_set_piomode,
23354 .set_dmamode = sis_old_set_dmamode,
23355 -diff -urNp linux-2.6.37/drivers/ata/pata_sl82c105.c linux-2.6.37/drivers/ata/pata_sl82c105.c
23356 ---- linux-2.6.37/drivers/ata/pata_sl82c105.c 2011-01-04 19:50:19.000000000 -0500
23357 -+++ linux-2.6.37/drivers/ata/pata_sl82c105.c 2011-01-17 02:41:01.000000000 -0500
23358 +diff -urNp linux-2.6.37.1/drivers/ata/pata_sl82c105.c linux-2.6.37.1/drivers/ata/pata_sl82c105.c
23359 +--- linux-2.6.37.1/drivers/ata/pata_sl82c105.c 2011-01-04 19:50:19.000000000 -0500
23360 ++++ linux-2.6.37.1/drivers/ata/pata_sl82c105.c 2011-01-17 02:41:01.000000000 -0500
23361 @@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10
23362 ATA_BMDMA_SHT(DRV_NAME),
23363 };
23364 @@ -22178,9 +22248,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_sl82c105.c linux-2.6.37/drivers/ata/pat
23365 .inherits = &ata_bmdma_port_ops,
23366 .qc_defer = sl82c105_qc_defer,
23367 .bmdma_start = sl82c105_bmdma_start,
23368 -diff -urNp linux-2.6.37/drivers/ata/pata_triflex.c linux-2.6.37/drivers/ata/pata_triflex.c
23369 ---- linux-2.6.37/drivers/ata/pata_triflex.c 2011-01-04 19:50:19.000000000 -0500
23370 -+++ linux-2.6.37/drivers/ata/pata_triflex.c 2011-01-17 02:41:01.000000000 -0500
23371 +diff -urNp linux-2.6.37.1/drivers/ata/pata_triflex.c linux-2.6.37.1/drivers/ata/pata_triflex.c
23372 +--- linux-2.6.37.1/drivers/ata/pata_triflex.c 2011-01-04 19:50:19.000000000 -0500
23373 ++++ linux-2.6.37.1/drivers/ata/pata_triflex.c 2011-01-17 02:41:01.000000000 -0500
23374 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
23375 ATA_BMDMA_SHT(DRV_NAME),
23376 };
23377 @@ -22190,9 +22260,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_triflex.c linux-2.6.37/drivers/ata/pata
23378 .inherits = &ata_bmdma_port_ops,
23379 .bmdma_start = triflex_bmdma_start,
23380 .bmdma_stop = triflex_bmdma_stop,
23381 -diff -urNp linux-2.6.37/drivers/ata/pata_via.c linux-2.6.37/drivers/ata/pata_via.c
23382 ---- linux-2.6.37/drivers/ata/pata_via.c 2011-01-04 19:50:19.000000000 -0500
23383 -+++ linux-2.6.37/drivers/ata/pata_via.c 2011-01-17 02:41:01.000000000 -0500
23384 +diff -urNp linux-2.6.37.1/drivers/ata/pata_via.c linux-2.6.37.1/drivers/ata/pata_via.c
23385 +--- linux-2.6.37.1/drivers/ata/pata_via.c 2011-01-04 19:50:19.000000000 -0500
23386 ++++ linux-2.6.37.1/drivers/ata/pata_via.c 2011-01-17 02:41:01.000000000 -0500
23387 @@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
23388 ATA_BMDMA_SHT(DRV_NAME),
23389 };
23390 @@ -22211,9 +22281,9 @@ diff -urNp linux-2.6.37/drivers/ata/pata_via.c linux-2.6.37/drivers/ata/pata_via
23391 .inherits = &via_port_ops,
23392 .sff_data_xfer = ata_sff_data_xfer_noirq,
23393 };
23394 -diff -urNp linux-2.6.37/drivers/ata/pdc_adma.c linux-2.6.37/drivers/ata/pdc_adma.c
23395 ---- linux-2.6.37/drivers/ata/pdc_adma.c 2011-01-04 19:50:19.000000000 -0500
23396 -+++ linux-2.6.37/drivers/ata/pdc_adma.c 2011-01-17 02:41:01.000000000 -0500
23397 +diff -urNp linux-2.6.37.1/drivers/ata/pdc_adma.c linux-2.6.37.1/drivers/ata/pdc_adma.c
23398 +--- linux-2.6.37.1/drivers/ata/pdc_adma.c 2011-01-04 19:50:19.000000000 -0500
23399 ++++ linux-2.6.37.1/drivers/ata/pdc_adma.c 2011-01-17 02:41:01.000000000 -0500
23400 @@ -146,7 +146,7 @@ static struct scsi_host_template adma_at
23401 .dma_boundary = ADMA_DMA_BOUNDARY,
23402 };
23403 @@ -22223,9 +22293,9 @@ diff -urNp linux-2.6.37/drivers/ata/pdc_adma.c linux-2.6.37/drivers/ata/pdc_adma
23404 .inherits = &ata_sff_port_ops,
23405
23406 .lost_interrupt = ATA_OP_NULL,
23407 -diff -urNp linux-2.6.37/drivers/ata/sata_dwc_460ex.c linux-2.6.37/drivers/ata/sata_dwc_460ex.c
23408 ---- linux-2.6.37/drivers/ata/sata_dwc_460ex.c 2011-01-04 19:50:19.000000000 -0500
23409 -+++ linux-2.6.37/drivers/ata/sata_dwc_460ex.c 2011-01-17 02:41:01.000000000 -0500
23410 +diff -urNp linux-2.6.37.1/drivers/ata/sata_dwc_460ex.c linux-2.6.37.1/drivers/ata/sata_dwc_460ex.c
23411 +--- linux-2.6.37.1/drivers/ata/sata_dwc_460ex.c 2011-01-04 19:50:19.000000000 -0500
23412 ++++ linux-2.6.37.1/drivers/ata/sata_dwc_460ex.c 2011-01-17 02:41:01.000000000 -0500
23413 @@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw
23414 .dma_boundary = ATA_DMA_BOUNDARY,
23415 };
23416 @@ -22235,9 +22305,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_dwc_460ex.c linux-2.6.37/drivers/ata/sa
23417 .inherits = &ata_sff_port_ops,
23418
23419 .error_handler = sata_dwc_error_handler,
23420 -diff -urNp linux-2.6.37/drivers/ata/sata_fsl.c linux-2.6.37/drivers/ata/sata_fsl.c
23421 ---- linux-2.6.37/drivers/ata/sata_fsl.c 2011-01-04 19:50:19.000000000 -0500
23422 -+++ linux-2.6.37/drivers/ata/sata_fsl.c 2011-01-17 02:41:01.000000000 -0500
23423 +diff -urNp linux-2.6.37.1/drivers/ata/sata_fsl.c linux-2.6.37.1/drivers/ata/sata_fsl.c
23424 +--- linux-2.6.37.1/drivers/ata/sata_fsl.c 2011-01-04 19:50:19.000000000 -0500
23425 ++++ linux-2.6.37.1/drivers/ata/sata_fsl.c 2011-01-17 02:41:01.000000000 -0500
23426 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
23427 .dma_boundary = ATA_DMA_BOUNDARY,
23428 };
23429 @@ -22247,9 +22317,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_fsl.c linux-2.6.37/drivers/ata/sata_fsl
23430 .inherits = &sata_pmp_port_ops,
23431
23432 .qc_defer = ata_std_qc_defer,
23433 -diff -urNp linux-2.6.37/drivers/ata/sata_inic162x.c linux-2.6.37/drivers/ata/sata_inic162x.c
23434 ---- linux-2.6.37/drivers/ata/sata_inic162x.c 2011-01-04 19:50:19.000000000 -0500
23435 -+++ linux-2.6.37/drivers/ata/sata_inic162x.c 2011-01-17 02:41:01.000000000 -0500
23436 +diff -urNp linux-2.6.37.1/drivers/ata/sata_inic162x.c linux-2.6.37.1/drivers/ata/sata_inic162x.c
23437 +--- linux-2.6.37.1/drivers/ata/sata_inic162x.c 2011-01-04 19:50:19.000000000 -0500
23438 ++++ linux-2.6.37.1/drivers/ata/sata_inic162x.c 2011-01-17 02:41:01.000000000 -0500
23439 @@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po
23440 return 0;
23441 }
23442 @@ -22259,9 +22329,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_inic162x.c linux-2.6.37/drivers/ata/sat
23443 .inherits = &sata_port_ops,
23444
23445 .check_atapi_dma = inic_check_atapi_dma,
23446 -diff -urNp linux-2.6.37/drivers/ata/sata_mv.c linux-2.6.37/drivers/ata/sata_mv.c
23447 ---- linux-2.6.37/drivers/ata/sata_mv.c 2011-01-04 19:50:19.000000000 -0500
23448 -+++ linux-2.6.37/drivers/ata/sata_mv.c 2011-01-17 02:41:01.000000000 -0500
23449 +diff -urNp linux-2.6.37.1/drivers/ata/sata_mv.c linux-2.6.37.1/drivers/ata/sata_mv.c
23450 +--- linux-2.6.37.1/drivers/ata/sata_mv.c 2011-01-04 19:50:19.000000000 -0500
23451 ++++ linux-2.6.37.1/drivers/ata/sata_mv.c 2011-01-17 02:41:01.000000000 -0500
23452 @@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
23453 .dma_boundary = MV_DMA_BOUNDARY,
23454 };
23455 @@ -22289,9 +22359,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_mv.c linux-2.6.37/drivers/ata/sata_mv.c
23456 .inherits = &mv6_ops,
23457 .dev_config = ATA_OP_NULL,
23458 .qc_prep = mv_qc_prep_iie,
23459 -diff -urNp linux-2.6.37/drivers/ata/sata_nv.c linux-2.6.37/drivers/ata/sata_nv.c
23460 ---- linux-2.6.37/drivers/ata/sata_nv.c 2011-01-04 19:50:19.000000000 -0500
23461 -+++ linux-2.6.37/drivers/ata/sata_nv.c 2011-01-17 02:41:01.000000000 -0500
23462 +diff -urNp linux-2.6.37.1/drivers/ata/sata_nv.c linux-2.6.37.1/drivers/ata/sata_nv.c
23463 +--- linux-2.6.37.1/drivers/ata/sata_nv.c 2011-01-04 19:50:19.000000000 -0500
23464 ++++ linux-2.6.37.1/drivers/ata/sata_nv.c 2011-01-17 02:41:01.000000000 -0500
23465 @@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc
23466 * cases. Define nv_hardreset() which only kicks in for post-boot
23467 * probing and use it for all variants.
23468 @@ -22334,9 +22404,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_nv.c linux-2.6.37/drivers/ata/sata_nv.c
23469 .inherits = &nv_generic_ops,
23470
23471 .qc_defer = ata_std_qc_defer,
23472 -diff -urNp linux-2.6.37/drivers/ata/sata_promise.c linux-2.6.37/drivers/ata/sata_promise.c
23473 ---- linux-2.6.37/drivers/ata/sata_promise.c 2011-01-04 19:50:19.000000000 -0500
23474 -+++ linux-2.6.37/drivers/ata/sata_promise.c 2011-01-17 02:41:01.000000000 -0500
23475 +diff -urNp linux-2.6.37.1/drivers/ata/sata_promise.c linux-2.6.37.1/drivers/ata/sata_promise.c
23476 +--- linux-2.6.37.1/drivers/ata/sata_promise.c 2011-01-04 19:50:19.000000000 -0500
23477 ++++ linux-2.6.37.1/drivers/ata/sata_promise.c 2011-01-17 02:41:01.000000000 -0500
23478 @@ -196,7 +196,7 @@ static const struct ata_port_operations
23479 .error_handler = pdc_error_handler,
23480 };
23481 @@ -22363,9 +22433,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_promise.c linux-2.6.37/drivers/ata/sata
23482 .inherits = &pdc_common_ops,
23483 .cable_detect = pdc_pata_cable_detect,
23484 .freeze = pdc_freeze,
23485 -diff -urNp linux-2.6.37/drivers/ata/sata_qstor.c linux-2.6.37/drivers/ata/sata_qstor.c
23486 ---- linux-2.6.37/drivers/ata/sata_qstor.c 2011-01-04 19:50:19.000000000 -0500
23487 -+++ linux-2.6.37/drivers/ata/sata_qstor.c 2011-01-17 02:41:01.000000000 -0500
23488 +diff -urNp linux-2.6.37.1/drivers/ata/sata_qstor.c linux-2.6.37.1/drivers/ata/sata_qstor.c
23489 +--- linux-2.6.37.1/drivers/ata/sata_qstor.c 2011-01-04 19:50:19.000000000 -0500
23490 ++++ linux-2.6.37.1/drivers/ata/sata_qstor.c 2011-01-17 02:41:01.000000000 -0500
23491 @@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
23492 .dma_boundary = QS_DMA_BOUNDARY,
23493 };
23494 @@ -22375,9 +22445,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_qstor.c linux-2.6.37/drivers/ata/sata_q
23495 .inherits = &ata_sff_port_ops,
23496
23497 .check_atapi_dma = qs_check_atapi_dma,
23498 -diff -urNp linux-2.6.37/drivers/ata/sata_sil24.c linux-2.6.37/drivers/ata/sata_sil24.c
23499 ---- linux-2.6.37/drivers/ata/sata_sil24.c 2011-01-04 19:50:19.000000000 -0500
23500 -+++ linux-2.6.37/drivers/ata/sata_sil24.c 2011-01-17 02:41:01.000000000 -0500
23501 +diff -urNp linux-2.6.37.1/drivers/ata/sata_sil24.c linux-2.6.37.1/drivers/ata/sata_sil24.c
23502 +--- linux-2.6.37.1/drivers/ata/sata_sil24.c 2011-01-04 19:50:19.000000000 -0500
23503 ++++ linux-2.6.37.1/drivers/ata/sata_sil24.c 2011-01-17 02:41:01.000000000 -0500
23504 @@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
23505 .dma_boundary = ATA_DMA_BOUNDARY,
23506 };
23507 @@ -22387,9 +22457,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_sil24.c linux-2.6.37/drivers/ata/sata_s
23508 .inherits = &sata_pmp_port_ops,
23509
23510 .qc_defer = sil24_qc_defer,
23511 -diff -urNp linux-2.6.37/drivers/ata/sata_sil.c linux-2.6.37/drivers/ata/sata_sil.c
23512 ---- linux-2.6.37/drivers/ata/sata_sil.c 2011-01-04 19:50:19.000000000 -0500
23513 -+++ linux-2.6.37/drivers/ata/sata_sil.c 2011-01-17 02:41:01.000000000 -0500
23514 +diff -urNp linux-2.6.37.1/drivers/ata/sata_sil.c linux-2.6.37.1/drivers/ata/sata_sil.c
23515 +--- linux-2.6.37.1/drivers/ata/sata_sil.c 2011-01-04 19:50:19.000000000 -0500
23516 ++++ linux-2.6.37.1/drivers/ata/sata_sil.c 2011-01-17 02:41:01.000000000 -0500
23517 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
23518 .sg_tablesize = ATA_MAX_PRD
23519 };
23520 @@ -22399,9 +22469,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_sil.c linux-2.6.37/drivers/ata/sata_sil
23521 .inherits = &ata_bmdma32_port_ops,
23522 .dev_config = sil_dev_config,
23523 .set_mode = sil_set_mode,
23524 -diff -urNp linux-2.6.37/drivers/ata/sata_sis.c linux-2.6.37/drivers/ata/sata_sis.c
23525 ---- linux-2.6.37/drivers/ata/sata_sis.c 2011-01-04 19:50:19.000000000 -0500
23526 -+++ linux-2.6.37/drivers/ata/sata_sis.c 2011-01-17 02:41:01.000000000 -0500
23527 +diff -urNp linux-2.6.37.1/drivers/ata/sata_sis.c linux-2.6.37.1/drivers/ata/sata_sis.c
23528 +--- linux-2.6.37.1/drivers/ata/sata_sis.c 2011-01-04 19:50:19.000000000 -0500
23529 ++++ linux-2.6.37.1/drivers/ata/sata_sis.c 2011-01-17 02:41:01.000000000 -0500
23530 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
23531 ATA_BMDMA_SHT(DRV_NAME),
23532 };
23533 @@ -22411,9 +22481,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_sis.c linux-2.6.37/drivers/ata/sata_sis
23534 .inherits = &ata_bmdma_port_ops,
23535 .scr_read = sis_scr_read,
23536 .scr_write = sis_scr_write,
23537 -diff -urNp linux-2.6.37/drivers/ata/sata_svw.c linux-2.6.37/drivers/ata/sata_svw.c
23538 ---- linux-2.6.37/drivers/ata/sata_svw.c 2011-01-04 19:50:19.000000000 -0500
23539 -+++ linux-2.6.37/drivers/ata/sata_svw.c 2011-01-17 02:41:01.000000000 -0500
23540 +diff -urNp linux-2.6.37.1/drivers/ata/sata_svw.c linux-2.6.37.1/drivers/ata/sata_svw.c
23541 +--- linux-2.6.37.1/drivers/ata/sata_svw.c 2011-01-04 19:50:19.000000000 -0500
23542 ++++ linux-2.6.37.1/drivers/ata/sata_svw.c 2011-01-17 02:41:01.000000000 -0500
23543 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
23544 };
23545
23546 @@ -22423,9 +22493,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_svw.c linux-2.6.37/drivers/ata/sata_svw
23547 .inherits = &ata_bmdma_port_ops,
23548 .sff_tf_load = k2_sata_tf_load,
23549 .sff_tf_read = k2_sata_tf_read,
23550 -diff -urNp linux-2.6.37/drivers/ata/sata_sx4.c linux-2.6.37/drivers/ata/sata_sx4.c
23551 ---- linux-2.6.37/drivers/ata/sata_sx4.c 2011-01-04 19:50:19.000000000 -0500
23552 -+++ linux-2.6.37/drivers/ata/sata_sx4.c 2011-01-17 02:41:01.000000000 -0500
23553 +diff -urNp linux-2.6.37.1/drivers/ata/sata_sx4.c linux-2.6.37.1/drivers/ata/sata_sx4.c
23554 +--- linux-2.6.37.1/drivers/ata/sata_sx4.c 2011-01-04 19:50:19.000000000 -0500
23555 ++++ linux-2.6.37.1/drivers/ata/sata_sx4.c 2011-01-17 02:41:01.000000000 -0500
23556 @@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
23557 };
23558
23559 @@ -22435,9 +22505,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_sx4.c linux-2.6.37/drivers/ata/sata_sx4
23560 .inherits = &ata_sff_port_ops,
23561
23562 .check_atapi_dma = pdc_check_atapi_dma,
23563 -diff -urNp linux-2.6.37/drivers/ata/sata_uli.c linux-2.6.37/drivers/ata/sata_uli.c
23564 ---- linux-2.6.37/drivers/ata/sata_uli.c 2011-01-04 19:50:19.000000000 -0500
23565 -+++ linux-2.6.37/drivers/ata/sata_uli.c 2011-01-17 02:41:01.000000000 -0500
23566 +diff -urNp linux-2.6.37.1/drivers/ata/sata_uli.c linux-2.6.37.1/drivers/ata/sata_uli.c
23567 +--- linux-2.6.37.1/drivers/ata/sata_uli.c 2011-01-04 19:50:19.000000000 -0500
23568 ++++ linux-2.6.37.1/drivers/ata/sata_uli.c 2011-01-17 02:41:01.000000000 -0500
23569 @@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht
23570 ATA_BMDMA_SHT(DRV_NAME),
23571 };
23572 @@ -22447,9 +22517,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_uli.c linux-2.6.37/drivers/ata/sata_uli
23573 .inherits = &ata_bmdma_port_ops,
23574 .scr_read = uli_scr_read,
23575 .scr_write = uli_scr_write,
23576 -diff -urNp linux-2.6.37/drivers/ata/sata_via.c linux-2.6.37/drivers/ata/sata_via.c
23577 ---- linux-2.6.37/drivers/ata/sata_via.c 2011-01-04 19:50:19.000000000 -0500
23578 -+++ linux-2.6.37/drivers/ata/sata_via.c 2011-01-17 02:41:01.000000000 -0500
23579 +diff -urNp linux-2.6.37.1/drivers/ata/sata_via.c linux-2.6.37.1/drivers/ata/sata_via.c
23580 +--- linux-2.6.37.1/drivers/ata/sata_via.c 2011-01-04 19:50:19.000000000 -0500
23581 ++++ linux-2.6.37.1/drivers/ata/sata_via.c 2011-01-17 02:41:01.000000000 -0500
23582 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
23583 ATA_BMDMA_SHT(DRV_NAME),
23584 };
23585 @@ -22488,9 +22558,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_via.c linux-2.6.37/drivers/ata/sata_via
23586 .inherits = &svia_base_ops,
23587 .hardreset = sata_std_hardreset,
23588 .scr_read = vt8251_scr_read,
23589 -diff -urNp linux-2.6.37/drivers/ata/sata_vsc.c linux-2.6.37/drivers/ata/sata_vsc.c
23590 ---- linux-2.6.37/drivers/ata/sata_vsc.c 2011-01-04 19:50:19.000000000 -0500
23591 -+++ linux-2.6.37/drivers/ata/sata_vsc.c 2011-01-17 02:41:01.000000000 -0500
23592 +diff -urNp linux-2.6.37.1/drivers/ata/sata_vsc.c linux-2.6.37.1/drivers/ata/sata_vsc.c
23593 +--- linux-2.6.37.1/drivers/ata/sata_vsc.c 2011-01-04 19:50:19.000000000 -0500
23594 ++++ linux-2.6.37.1/drivers/ata/sata_vsc.c 2011-01-17 02:41:01.000000000 -0500
23595 @@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
23596 };
23597
23598 @@ -22500,9 +22570,9 @@ diff -urNp linux-2.6.37/drivers/ata/sata_vsc.c linux-2.6.37/drivers/ata/sata_vsc
23599 .inherits = &ata_bmdma_port_ops,
23600 /* The IRQ handling is not quite standard SFF behaviour so we
23601 cannot use the default lost interrupt handler */
23602 -diff -urNp linux-2.6.37/drivers/atm/adummy.c linux-2.6.37/drivers/atm/adummy.c
23603 ---- linux-2.6.37/drivers/atm/adummy.c 2011-01-04 19:50:19.000000000 -0500
23604 -+++ linux-2.6.37/drivers/atm/adummy.c 2011-01-17 02:41:01.000000000 -0500
23605 +diff -urNp linux-2.6.37.1/drivers/atm/adummy.c linux-2.6.37.1/drivers/atm/adummy.c
23606 +--- linux-2.6.37.1/drivers/atm/adummy.c 2011-01-04 19:50:19.000000000 -0500
23607 ++++ linux-2.6.37.1/drivers/atm/adummy.c 2011-01-17 02:41:01.000000000 -0500
23608 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
23609 vcc->pop(vcc, skb);
23610 else
23611 @@ -22512,9 +22582,9 @@ diff -urNp linux-2.6.37/drivers/atm/adummy.c linux-2.6.37/drivers/atm/adummy.c
23612
23613 return 0;
23614 }
23615 -diff -urNp linux-2.6.37/drivers/atm/ambassador.c linux-2.6.37/drivers/atm/ambassador.c
23616 ---- linux-2.6.37/drivers/atm/ambassador.c 2011-01-04 19:50:19.000000000 -0500
23617 -+++ linux-2.6.37/drivers/atm/ambassador.c 2011-01-17 02:41:01.000000000 -0500
23618 +diff -urNp linux-2.6.37.1/drivers/atm/ambassador.c linux-2.6.37.1/drivers/atm/ambassador.c
23619 +--- linux-2.6.37.1/drivers/atm/ambassador.c 2011-01-04 19:50:19.000000000 -0500
23620 ++++ linux-2.6.37.1/drivers/atm/ambassador.c 2011-01-17 02:41:01.000000000 -0500
23621 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
23622 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
23623
23624 @@ -22551,9 +22621,9 @@ diff -urNp linux-2.6.37/drivers/atm/ambassador.c linux-2.6.37/drivers/atm/ambass
23625 return -ENOMEM; // ?
23626 }
23627
23628 -diff -urNp linux-2.6.37/drivers/atm/atmtcp.c linux-2.6.37/drivers/atm/atmtcp.c
23629 ---- linux-2.6.37/drivers/atm/atmtcp.c 2011-01-04 19:50:19.000000000 -0500
23630 -+++ linux-2.6.37/drivers/atm/atmtcp.c 2011-01-17 02:41:01.000000000 -0500
23631 +diff -urNp linux-2.6.37.1/drivers/atm/atmtcp.c linux-2.6.37.1/drivers/atm/atmtcp.c
23632 +--- linux-2.6.37.1/drivers/atm/atmtcp.c 2011-01-04 19:50:19.000000000 -0500
23633 ++++ linux-2.6.37.1/drivers/atm/atmtcp.c 2011-01-17 02:41:01.000000000 -0500
23634 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc
23635 if (vcc->pop) vcc->pop(vcc,skb);
23636 else dev_kfree_skb(skb);
23637 @@ -22603,9 +22673,9 @@ diff -urNp linux-2.6.37/drivers/atm/atmtcp.c linux-2.6.37/drivers/atm/atmtcp.c
23638 done:
23639 if (vcc->pop) vcc->pop(vcc,skb);
23640 else dev_kfree_skb(skb);
23641 -diff -urNp linux-2.6.37/drivers/atm/eni.c linux-2.6.37/drivers/atm/eni.c
23642 ---- linux-2.6.37/drivers/atm/eni.c 2011-01-04 19:50:19.000000000 -0500
23643 -+++ linux-2.6.37/drivers/atm/eni.c 2011-01-17 02:41:01.000000000 -0500
23644 +diff -urNp linux-2.6.37.1/drivers/atm/eni.c linux-2.6.37.1/drivers/atm/eni.c
23645 +--- linux-2.6.37.1/drivers/atm/eni.c 2011-01-04 19:50:19.000000000 -0500
23646 ++++ linux-2.6.37.1/drivers/atm/eni.c 2011-01-17 02:41:01.000000000 -0500
23647 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
23648 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
23649 vcc->dev->number);
23650 @@ -22651,9 +22721,9 @@ diff -urNp linux-2.6.37/drivers/atm/eni.c linux-2.6.37/drivers/atm/eni.c
23651 wake_up(&eni_dev->tx_wait);
23652 dma_complete++;
23653 }
23654 -diff -urNp linux-2.6.37/drivers/atm/firestream.c linux-2.6.37/drivers/atm/firestream.c
23655 ---- linux-2.6.37/drivers/atm/firestream.c 2011-01-04 19:50:19.000000000 -0500
23656 -+++ linux-2.6.37/drivers/atm/firestream.c 2011-01-17 02:41:01.000000000 -0500
23657 +diff -urNp linux-2.6.37.1/drivers/atm/firestream.c linux-2.6.37.1/drivers/atm/firestream.c
23658 +--- linux-2.6.37.1/drivers/atm/firestream.c 2011-01-04 19:50:19.000000000 -0500
23659 ++++ linux-2.6.37.1/drivers/atm/firestream.c 2011-01-17 02:41:01.000000000 -0500
23660 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
23661 }
23662 }
23663 @@ -22687,9 +22757,9 @@ diff -urNp linux-2.6.37/drivers/atm/firestream.c linux-2.6.37/drivers/atm/firest
23664 break;
23665 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
23666 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
23667 -diff -urNp linux-2.6.37/drivers/atm/fore200e.c linux-2.6.37/drivers/atm/fore200e.c
23668 ---- linux-2.6.37/drivers/atm/fore200e.c 2011-01-04 19:50:19.000000000 -0500
23669 -+++ linux-2.6.37/drivers/atm/fore200e.c 2011-01-17 02:41:01.000000000 -0500
23670 +diff -urNp linux-2.6.37.1/drivers/atm/fore200e.c linux-2.6.37.1/drivers/atm/fore200e.c
23671 +--- linux-2.6.37.1/drivers/atm/fore200e.c 2011-01-04 19:50:19.000000000 -0500
23672 ++++ linux-2.6.37.1/drivers/atm/fore200e.c 2011-01-17 02:41:01.000000000 -0500
23673 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
23674 #endif
23675 /* check error condition */
23676 @@ -22746,9 +22816,9 @@ diff -urNp linux-2.6.37/drivers/atm/fore200e.c linux-2.6.37/drivers/atm/fore200e
23677
23678 fore200e->tx_sat++;
23679 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
23680 -diff -urNp linux-2.6.37/drivers/atm/he.c linux-2.6.37/drivers/atm/he.c
23681 ---- linux-2.6.37/drivers/atm/he.c 2011-01-04 19:50:19.000000000 -0500
23682 -+++ linux-2.6.37/drivers/atm/he.c 2011-01-17 02:41:01.000000000 -0500
23683 +diff -urNp linux-2.6.37.1/drivers/atm/he.c linux-2.6.37.1/drivers/atm/he.c
23684 +--- linux-2.6.37.1/drivers/atm/he.c 2011-01-04 19:50:19.000000000 -0500
23685 ++++ linux-2.6.37.1/drivers/atm/he.c 2011-01-17 02:41:01.000000000 -0500
23686 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
23687
23688 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
23689 @@ -22830,9 +22900,9 @@ diff -urNp linux-2.6.37/drivers/atm/he.c linux-2.6.37/drivers/atm/he.c
23690
23691 return 0;
23692 }
23693 -diff -urNp linux-2.6.37/drivers/atm/horizon.c linux-2.6.37/drivers/atm/horizon.c
23694 ---- linux-2.6.37/drivers/atm/horizon.c 2011-01-04 19:50:19.000000000 -0500
23695 -+++ linux-2.6.37/drivers/atm/horizon.c 2011-01-17 02:41:01.000000000 -0500
23696 +diff -urNp linux-2.6.37.1/drivers/atm/horizon.c linux-2.6.37.1/drivers/atm/horizon.c
23697 +--- linux-2.6.37.1/drivers/atm/horizon.c 2011-01-04 19:50:19.000000000 -0500
23698 ++++ linux-2.6.37.1/drivers/atm/horizon.c 2011-01-17 02:41:01.000000000 -0500
23699 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,
23700 {
23701 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
23702 @@ -22851,9 +22921,9 @@ diff -urNp linux-2.6.37/drivers/atm/horizon.c linux-2.6.37/drivers/atm/horizon.c
23703
23704 // free the skb
23705 hrz_kfree_skb (skb);
23706 -diff -urNp linux-2.6.37/drivers/atm/idt77252.c linux-2.6.37/drivers/atm/idt77252.c
23707 ---- linux-2.6.37/drivers/atm/idt77252.c 2011-01-04 19:50:19.000000000 -0500
23708 -+++ linux-2.6.37/drivers/atm/idt77252.c 2011-01-17 02:41:01.000000000 -0500
23709 +diff -urNp linux-2.6.37.1/drivers/atm/idt77252.c linux-2.6.37.1/drivers/atm/idt77252.c
23710 +--- linux-2.6.37.1/drivers/atm/idt77252.c 2011-01-04 19:50:19.000000000 -0500
23711 ++++ linux-2.6.37.1/drivers/atm/idt77252.c 2011-01-17 02:41:01.000000000 -0500
23712 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
23713 else
23714 dev_kfree_skb(skb);
23715 @@ -23008,9 +23078,9 @@ diff -urNp linux-2.6.37/drivers/atm/idt77252.c linux-2.6.37/drivers/atm/idt77252
23716 return -ENOMEM;
23717 }
23718 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
23719 -diff -urNp linux-2.6.37/drivers/atm/iphase.c linux-2.6.37/drivers/atm/iphase.c
23720 ---- linux-2.6.37/drivers/atm/iphase.c 2011-01-04 19:50:19.000000000 -0500
23721 -+++ linux-2.6.37/drivers/atm/iphase.c 2011-01-17 02:41:01.000000000 -0500
23722 +diff -urNp linux-2.6.37.1/drivers/atm/iphase.c linux-2.6.37.1/drivers/atm/iphase.c
23723 +--- linux-2.6.37.1/drivers/atm/iphase.c 2011-01-04 19:50:19.000000000 -0500
23724 ++++ linux-2.6.37.1/drivers/atm/iphase.c 2011-01-17 02:41:01.000000000 -0500
23725 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)
23726 status = (u_short) (buf_desc_ptr->desc_mode);
23727 if (status & (RX_CER | RX_PTE | RX_OFL))
23728 @@ -23107,9 +23177,9 @@ diff -urNp linux-2.6.37/drivers/atm/iphase.c linux-2.6.37/drivers/atm/iphase.c
23729 if (iavcc->vc_desc_cnt > 10) {
23730 vcc->tx_quota = vcc->tx_quota * 3 / 4;
23731 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
23732 -diff -urNp linux-2.6.37/drivers/atm/lanai.c linux-2.6.37/drivers/atm/lanai.c
23733 ---- linux-2.6.37/drivers/atm/lanai.c 2011-01-04 19:50:19.000000000 -0500
23734 -+++ linux-2.6.37/drivers/atm/lanai.c 2011-01-17 02:41:01.000000000 -0500
23735 +diff -urNp linux-2.6.37.1/drivers/atm/lanai.c linux-2.6.37.1/drivers/atm/lanai.c
23736 +--- linux-2.6.37.1/drivers/atm/lanai.c 2011-01-04 19:50:19.000000000 -0500
23737 ++++ linux-2.6.37.1/drivers/atm/lanai.c 2011-01-17 02:41:01.000000000 -0500
23738 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
23739 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
23740 lanai_endtx(lanai, lvcc);
23741 @@ -23164,9 +23234,9 @@ diff -urNp linux-2.6.37/drivers/atm/lanai.c linux-2.6.37/drivers/atm/lanai.c
23742 lvcc->stats.x.aal5.service_rxcrc++;
23743 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
23744 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
23745 -diff -urNp linux-2.6.37/drivers/atm/nicstar.c linux-2.6.37/drivers/atm/nicstar.c
23746 ---- linux-2.6.37/drivers/atm/nicstar.c 2011-01-04 19:50:19.000000000 -0500
23747 -+++ linux-2.6.37/drivers/atm/nicstar.c 2011-01-17 02:41:01.000000000 -0500
23748 +diff -urNp linux-2.6.37.1/drivers/atm/nicstar.c linux-2.6.37.1/drivers/atm/nicstar.c
23749 +--- linux-2.6.37.1/drivers/atm/nicstar.c 2011-01-04 19:50:19.000000000 -0500
23750 ++++ linux-2.6.37.1/drivers/atm/nicstar.c 2011-01-17 02:41:01.000000000 -0500
23751 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,
23752 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
23753 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
23754 @@ -23368,9 +23438,9 @@ diff -urNp linux-2.6.37/drivers/atm/nicstar.c linux-2.6.37/drivers/atm/nicstar.c
23755 }
23756 }
23757
23758 -diff -urNp linux-2.6.37/drivers/atm/solos-pci.c linux-2.6.37/drivers/atm/solos-pci.c
23759 ---- linux-2.6.37/drivers/atm/solos-pci.c 2011-01-04 19:50:19.000000000 -0500
23760 -+++ linux-2.6.37/drivers/atm/solos-pci.c 2011-01-17 02:41:01.000000000 -0500
23761 +diff -urNp linux-2.6.37.1/drivers/atm/solos-pci.c linux-2.6.37.1/drivers/atm/solos-pci.c
23762 +--- linux-2.6.37.1/drivers/atm/solos-pci.c 2011-01-04 19:50:19.000000000 -0500
23763 ++++ linux-2.6.37.1/drivers/atm/solos-pci.c 2011-01-17 02:41:01.000000000 -0500
23764 @@ -717,7 +717,7 @@ void solos_bh(unsigned long card_arg)
23765 }
23766 atm_charge(vcc, skb->truesize);
23767 @@ -23389,9 +23459,9 @@ diff -urNp linux-2.6.37/drivers/atm/solos-pci.c linux-2.6.37/drivers/atm/solos-p
23768 solos_pop(vcc, oldskb);
23769 } else
23770 dev_kfree_skb_irq(oldskb);
23771 -diff -urNp linux-2.6.37/drivers/atm/suni.c linux-2.6.37/drivers/atm/suni.c
23772 ---- linux-2.6.37/drivers/atm/suni.c 2011-01-04 19:50:19.000000000 -0500
23773 -+++ linux-2.6.37/drivers/atm/suni.c 2011-01-17 02:41:01.000000000 -0500
23774 +diff -urNp linux-2.6.37.1/drivers/atm/suni.c linux-2.6.37.1/drivers/atm/suni.c
23775 +--- linux-2.6.37.1/drivers/atm/suni.c 2011-01-04 19:50:19.000000000 -0500
23776 ++++ linux-2.6.37.1/drivers/atm/suni.c 2011-01-17 02:41:01.000000000 -0500
23777 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
23778
23779
23780 @@ -23403,9 +23473,9 @@ diff -urNp linux-2.6.37/drivers/atm/suni.c linux-2.6.37/drivers/atm/suni.c
23781
23782
23783 static void suni_hz(unsigned long from_timer)
23784 -diff -urNp linux-2.6.37/drivers/atm/uPD98402.c linux-2.6.37/drivers/atm/uPD98402.c
23785 ---- linux-2.6.37/drivers/atm/uPD98402.c 2011-01-04 19:50:19.000000000 -0500
23786 -+++ linux-2.6.37/drivers/atm/uPD98402.c 2011-01-17 02:41:01.000000000 -0500
23787 +diff -urNp linux-2.6.37.1/drivers/atm/uPD98402.c linux-2.6.37.1/drivers/atm/uPD98402.c
23788 +--- linux-2.6.37.1/drivers/atm/uPD98402.c 2011-01-04 19:50:19.000000000 -0500
23789 ++++ linux-2.6.37.1/drivers/atm/uPD98402.c 2011-01-17 02:41:01.000000000 -0500
23790 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
23791 struct sonet_stats tmp;
23792 int error = 0;
23793 @@ -23450,9 +23520,9 @@ diff -urNp linux-2.6.37/drivers/atm/uPD98402.c linux-2.6.37/drivers/atm/uPD98402
23794 return 0;
23795 }
23796
23797 -diff -urNp linux-2.6.37/drivers/atm/zatm.c linux-2.6.37/drivers/atm/zatm.c
23798 ---- linux-2.6.37/drivers/atm/zatm.c 2011-01-04 19:50:19.000000000 -0500
23799 -+++ linux-2.6.37/drivers/atm/zatm.c 2011-01-17 02:41:01.000000000 -0500
23800 +diff -urNp linux-2.6.37.1/drivers/atm/zatm.c linux-2.6.37.1/drivers/atm/zatm.c
23801 +--- linux-2.6.37.1/drivers/atm/zatm.c 2011-01-04 19:50:19.000000000 -0500
23802 ++++ linux-2.6.37.1/drivers/atm/zatm.c 2011-01-17 02:41:01.000000000 -0500
23803 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
23804 }
23805 if (!size) {
23806 @@ -23480,9 +23550,9 @@ diff -urNp linux-2.6.37/drivers/atm/zatm.c linux-2.6.37/drivers/atm/zatm.c
23807 wake_up(&zatm_vcc->tx_wait);
23808 }
23809
23810 -diff -urNp linux-2.6.37/drivers/block/cciss.c linux-2.6.37/drivers/block/cciss.c
23811 ---- linux-2.6.37/drivers/block/cciss.c 2011-01-04 19:50:19.000000000 -0500
23812 -+++ linux-2.6.37/drivers/block/cciss.c 2011-01-17 02:41:01.000000000 -0500
23813 +diff -urNp linux-2.6.37.1/drivers/block/cciss.c linux-2.6.37.1/drivers/block/cciss.c
23814 +--- linux-2.6.37.1/drivers/block/cciss.c 2011-01-04 19:50:19.000000000 -0500
23815 ++++ linux-2.6.37.1/drivers/block/cciss.c 2011-01-17 02:41:01.000000000 -0500
23816 @@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct
23817 int err;
23818 u32 cp;
23819 @@ -23492,9 +23562,9 @@ diff -urNp linux-2.6.37/drivers/block/cciss.c linux-2.6.37/drivers/block/cciss.c
23820 err = 0;
23821 err |=
23822 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
23823 -diff -urNp linux-2.6.37/drivers/char/agp/frontend.c linux-2.6.37/drivers/char/agp/frontend.c
23824 ---- linux-2.6.37/drivers/char/agp/frontend.c 2011-01-04 19:50:19.000000000 -0500
23825 -+++ linux-2.6.37/drivers/char/agp/frontend.c 2011-01-17 02:41:01.000000000 -0500
23826 +diff -urNp linux-2.6.37.1/drivers/char/agp/frontend.c linux-2.6.37.1/drivers/char/agp/frontend.c
23827 +--- linux-2.6.37.1/drivers/char/agp/frontend.c 2011-01-04 19:50:19.000000000 -0500
23828 ++++ linux-2.6.37.1/drivers/char/agp/frontend.c 2011-01-17 02:41:01.000000000 -0500
23829 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
23830 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
23831 return -EFAULT;
23832 @@ -23504,10 +23574,10 @@ diff -urNp linux-2.6.37/drivers/char/agp/frontend.c linux-2.6.37/drivers/char/ag
23833 return -EFAULT;
23834
23835 client = agp_find_client_by_pid(reserve.pid);
23836 -diff -urNp linux-2.6.37/drivers/char/agp/intel-agp.c linux-2.6.37/drivers/char/agp/intel-agp.c
23837 ---- linux-2.6.37/drivers/char/agp/intel-agp.c 2011-01-04 19:50:19.000000000 -0500
23838 -+++ linux-2.6.37/drivers/char/agp/intel-agp.c 2011-01-17 02:41:01.000000000 -0500
23839 -@@ -903,7 +903,7 @@ static struct pci_device_id agp_intel_pc
23840 +diff -urNp linux-2.6.37.1/drivers/char/agp/intel-agp.c linux-2.6.37.1/drivers/char/agp/intel-agp.c
23841 +--- linux-2.6.37.1/drivers/char/agp/intel-agp.c 2011-02-22 16:05:30.000000000 -0500
23842 ++++ linux-2.6.37.1/drivers/char/agp/intel-agp.c 2011-02-22 16:05:42.000000000 -0500
23843 +@@ -908,7 +908,7 @@ static struct pci_device_id agp_intel_pc
23844 ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
23845 ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
23846 ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB),
23847 @@ -23516,9 +23586,9 @@ diff -urNp linux-2.6.37/drivers/char/agp/intel-agp.c linux-2.6.37/drivers/char/a
23848 };
23849
23850 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
23851 -diff -urNp linux-2.6.37/drivers/char/hpet.c linux-2.6.37/drivers/char/hpet.c
23852 ---- linux-2.6.37/drivers/char/hpet.c 2011-01-04 19:50:19.000000000 -0500
23853 -+++ linux-2.6.37/drivers/char/hpet.c 2011-01-17 02:41:01.000000000 -0500
23854 +diff -urNp linux-2.6.37.1/drivers/char/hpet.c linux-2.6.37.1/drivers/char/hpet.c
23855 +--- linux-2.6.37.1/drivers/char/hpet.c 2011-01-04 19:50:19.000000000 -0500
23856 ++++ linux-2.6.37.1/drivers/char/hpet.c 2011-01-17 02:41:01.000000000 -0500
23857 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di
23858 }
23859
23860 @@ -23537,9 +23607,9 @@ diff -urNp linux-2.6.37/drivers/char/hpet.c linux-2.6.37/drivers/char/hpet.c
23861
23862 static int __init hpet_init(void)
23863 {
23864 -diff -urNp linux-2.6.37/drivers/char/hvc_console.h linux-2.6.37/drivers/char/hvc_console.h
23865 ---- linux-2.6.37/drivers/char/hvc_console.h 2011-01-04 19:50:19.000000000 -0500
23866 -+++ linux-2.6.37/drivers/char/hvc_console.h 2011-01-17 02:41:01.000000000 -0500
23867 +diff -urNp linux-2.6.37.1/drivers/char/hvc_console.h linux-2.6.37.1/drivers/char/hvc_console.h
23868 +--- linux-2.6.37.1/drivers/char/hvc_console.h 2011-01-04 19:50:19.000000000 -0500
23869 ++++ linux-2.6.37.1/drivers/char/hvc_console.h 2011-01-17 02:41:01.000000000 -0500
23870 @@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter
23871 /* register a vterm for hvc tty operation (module_init or hotplug add) */
23872 extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
23873 @@ -23548,9 +23618,9 @@ diff -urNp linux-2.6.37/drivers/char/hvc_console.h linux-2.6.37/drivers/char/hvc
23874 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
23875 extern int hvc_remove(struct hvc_struct *hp);
23876
23877 -diff -urNp linux-2.6.37/drivers/char/hvcs.c linux-2.6.37/drivers/char/hvcs.c
23878 ---- linux-2.6.37/drivers/char/hvcs.c 2011-01-04 19:50:19.000000000 -0500
23879 -+++ linux-2.6.37/drivers/char/hvcs.c 2011-01-25 20:24:56.000000000 -0500
23880 +diff -urNp linux-2.6.37.1/drivers/char/hvcs.c linux-2.6.37.1/drivers/char/hvcs.c
23881 +--- linux-2.6.37.1/drivers/char/hvcs.c 2011-01-04 19:50:19.000000000 -0500
23882 ++++ linux-2.6.37.1/drivers/char/hvcs.c 2011-01-25 20:24:56.000000000 -0500
23883 @@ -83,6 +83,7 @@
23884 #include <asm/hvcserver.h>
23885 #include <asm/uaccess.h>
23886 @@ -23653,9 +23723,9 @@ diff -urNp linux-2.6.37/drivers/char/hvcs.c linux-2.6.37/drivers/char/hvcs.c
23887 return 0;
23888
23889 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
23890 -diff -urNp linux-2.6.37/drivers/char/hvc_xen.c linux-2.6.37/drivers/char/hvc_xen.c
23891 ---- linux-2.6.37/drivers/char/hvc_xen.c 2011-01-04 19:50:19.000000000 -0500
23892 -+++ linux-2.6.37/drivers/char/hvc_xen.c 2011-01-17 02:41:01.000000000 -0500
23893 +diff -urNp linux-2.6.37.1/drivers/char/hvc_xen.c linux-2.6.37.1/drivers/char/hvc_xen.c
23894 +--- linux-2.6.37.1/drivers/char/hvc_xen.c 2011-01-04 19:50:19.000000000 -0500
23895 ++++ linux-2.6.37.1/drivers/char/hvc_xen.c 2011-01-17 02:41:01.000000000 -0500
23896 @@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt
23897 return recv;
23898 }
23899 @@ -23692,9 +23762,9 @@ diff -urNp linux-2.6.37/drivers/char/hvc_xen.c linux-2.6.37/drivers/char/hvc_xen
23900
23901 if (!xen_pv_domain())
23902 return 0;
23903 -diff -urNp linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c
23904 ---- linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c 2011-01-04 19:50:19.000000000 -0500
23905 -+++ linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c 2011-01-17 02:41:01.000000000 -0500
23906 +diff -urNp linux-2.6.37.1/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.37.1/drivers/char/ipmi/ipmi_msghandler.c
23907 +--- linux-2.6.37.1/drivers/char/ipmi/ipmi_msghandler.c 2011-01-04 19:50:19.000000000 -0500
23908 ++++ linux-2.6.37.1/drivers/char/ipmi/ipmi_msghandler.c 2011-01-17 02:41:01.000000000 -0500
23909 @@ -414,7 +414,7 @@ struct ipmi_smi {
23910 struct proc_dir_entry *proc_dir;
23911 char proc_dir_name[10];
23912 @@ -23725,9 +23795,9 @@ diff -urNp linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.37/drivers
23913
23914 intf->proc_dir = NULL;
23915
23916 -diff -urNp linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c
23917 ---- linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c 2011-01-04 19:50:19.000000000 -0500
23918 -+++ linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c 2011-01-17 02:41:01.000000000 -0500
23919 +diff -urNp linux-2.6.37.1/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37.1/drivers/char/ipmi/ipmi_si_intf.c
23920 +--- linux-2.6.37.1/drivers/char/ipmi/ipmi_si_intf.c 2011-02-22 16:05:30.000000000 -0500
23921 ++++ linux-2.6.37.1/drivers/char/ipmi/ipmi_si_intf.c 2011-02-22 16:05:42.000000000 -0500
23922 @@ -286,7 +286,7 @@ struct smi_info {
23923 unsigned char slave_addr;
23924
23925 @@ -23749,7 +23819,7 @@ diff -urNp linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37/drivers/ch
23926
23927 #define SI_MAX_PARMS 4
23928
23929 -@@ -3178,7 +3178,7 @@ static int try_smi_init(struct smi_info
23930 +@@ -3179,7 +3179,7 @@ static int try_smi_init(struct smi_info
23931 atomic_set(&new_smi->req_events, 0);
23932 new_smi->run_to_completion = 0;
23933 for (i = 0; i < SI_NUM_STATS; i++)
23934 @@ -23758,9 +23828,9 @@ diff -urNp linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37/drivers/ch
23935
23936 new_smi->interrupt_disabled = 1;
23937 atomic_set(&new_smi->stop_operation, 0);
23938 -diff -urNp linux-2.6.37/drivers/char/mem.c linux-2.6.37/drivers/char/mem.c
23939 ---- linux-2.6.37/drivers/char/mem.c 2011-01-04 19:50:19.000000000 -0500
23940 -+++ linux-2.6.37/drivers/char/mem.c 2011-01-17 02:41:01.000000000 -0500
23941 +diff -urNp linux-2.6.37.1/drivers/char/mem.c linux-2.6.37.1/drivers/char/mem.c
23942 +--- linux-2.6.37.1/drivers/char/mem.c 2011-01-04 19:50:19.000000000 -0500
23943 ++++ linux-2.6.37.1/drivers/char/mem.c 2011-01-17 02:41:01.000000000 -0500
23944 @@ -18,6 +18,7 @@
23945 #include <linux/raw.h>
23946 #include <linux/tty.h>
23947 @@ -23928,9 +23998,9 @@ diff -urNp linux-2.6.37/drivers/char/mem.c linux-2.6.37/drivers/char/mem.c
23948 };
23949
23950 static int memory_open(struct inode *inode, struct file *filp)
23951 -diff -urNp linux-2.6.37/drivers/char/nvram.c linux-2.6.37/drivers/char/nvram.c
23952 ---- linux-2.6.37/drivers/char/nvram.c 2011-01-04 19:50:19.000000000 -0500
23953 -+++ linux-2.6.37/drivers/char/nvram.c 2011-01-17 02:41:01.000000000 -0500
23954 +diff -urNp linux-2.6.37.1/drivers/char/nvram.c linux-2.6.37.1/drivers/char/nvram.c
23955 +--- linux-2.6.37.1/drivers/char/nvram.c 2011-01-04 19:50:19.000000000 -0500
23956 ++++ linux-2.6.37.1/drivers/char/nvram.c 2011-01-17 02:41:01.000000000 -0500
23957 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
23958
23959 spin_unlock_irq(&rtc_lock);
23960 @@ -23952,9 +24022,9 @@ diff -urNp linux-2.6.37/drivers/char/nvram.c linux-2.6.37/drivers/char/nvram.c
23961 };
23962
23963 static int __init nvram_init(void)
23964 -diff -urNp linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c
23965 ---- linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c 2011-01-04 19:50:19.000000000 -0500
23966 -+++ linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:56.000000000 -0500
23967 +diff -urNp linux-2.6.37.1/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37.1/drivers/char/pcmcia/ipwireless/tty.c
23968 +--- linux-2.6.37.1/drivers/char/pcmcia/ipwireless/tty.c 2011-01-04 19:50:19.000000000 -0500
23969 ++++ linux-2.6.37.1/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:56.000000000 -0500
23970 @@ -29,6 +29,7 @@
23971 #include <linux/tty_driver.h>
23972 #include <linux/tty_flip.h>
23973 @@ -24077,9 +24147,9 @@ diff -urNp linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37/driver
23974 do_ipw_close(ttyj);
23975 ipwireless_disassociate_network_ttys(network,
23976 ttyj->channel_idx);
23977 -diff -urNp linux-2.6.37/drivers/char/random.c linux-2.6.37/drivers/char/random.c
23978 ---- linux-2.6.37/drivers/char/random.c 2011-01-04 19:50:19.000000000 -0500
23979 -+++ linux-2.6.37/drivers/char/random.c 2011-01-17 02:41:01.000000000 -0500
23980 +diff -urNp linux-2.6.37.1/drivers/char/random.c linux-2.6.37.1/drivers/char/random.c
23981 +--- linux-2.6.37.1/drivers/char/random.c 2011-01-04 19:50:19.000000000 -0500
23982 ++++ linux-2.6.37.1/drivers/char/random.c 2011-01-17 02:41:01.000000000 -0500
23983 @@ -254,8 +254,13 @@
23984 /*
23985 * Configuration information
23986 @@ -24130,9 +24200,9 @@ diff -urNp linux-2.6.37/drivers/char/random.c linux-2.6.37/drivers/char/random.c
23987 static int max_write_thresh = INPUT_POOL_WORDS * 32;
23988 static char sysctl_bootid[16];
23989
23990 -diff -urNp linux-2.6.37/drivers/char/sonypi.c linux-2.6.37/drivers/char/sonypi.c
23991 ---- linux-2.6.37/drivers/char/sonypi.c 2011-01-04 19:50:19.000000000 -0500
23992 -+++ linux-2.6.37/drivers/char/sonypi.c 2011-01-25 20:24:56.000000000 -0500
23993 +diff -urNp linux-2.6.37.1/drivers/char/sonypi.c linux-2.6.37.1/drivers/char/sonypi.c
23994 +--- linux-2.6.37.1/drivers/char/sonypi.c 2011-01-04 19:50:19.000000000 -0500
23995 ++++ linux-2.6.37.1/drivers/char/sonypi.c 2011-01-25 20:24:56.000000000 -0500
23996 @@ -55,6 +55,7 @@
23997 #include <asm/uaccess.h>
23998 #include <asm/io.h>
23999 @@ -24171,9 +24241,9 @@ diff -urNp linux-2.6.37/drivers/char/sonypi.c linux-2.6.37/drivers/char/sonypi.c
24000 mutex_unlock(&sonypi_device.lock);
24001
24002 return 0;
24003 -diff -urNp linux-2.6.37/drivers/char/tpm/tpm_bios.c linux-2.6.37/drivers/char/tpm/tpm_bios.c
24004 ---- linux-2.6.37/drivers/char/tpm/tpm_bios.c 2011-01-04 19:50:19.000000000 -0500
24005 -+++ linux-2.6.37/drivers/char/tpm/tpm_bios.c 2011-01-17 02:41:01.000000000 -0500
24006 +diff -urNp linux-2.6.37.1/drivers/char/tpm/tpm_bios.c linux-2.6.37.1/drivers/char/tpm/tpm_bios.c
24007 +--- linux-2.6.37.1/drivers/char/tpm/tpm_bios.c 2011-01-04 19:50:19.000000000 -0500
24008 ++++ linux-2.6.37.1/drivers/char/tpm/tpm_bios.c 2011-01-17 02:41:01.000000000 -0500
24009 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
24010 event = addr;
24011
24012 @@ -24214,9 +24284,9 @@ diff -urNp linux-2.6.37/drivers/char/tpm/tpm_bios.c linux-2.6.37/drivers/char/tp
24013
24014 memcpy(log->bios_event_log, virt, len);
24015
24016 -diff -urNp linux-2.6.37/drivers/cpuidle/sysfs.c linux-2.6.37/drivers/cpuidle/sysfs.c
24017 ---- linux-2.6.37/drivers/cpuidle/sysfs.c 2011-01-04 19:50:19.000000000 -0500
24018 -+++ linux-2.6.37/drivers/cpuidle/sysfs.c 2011-01-17 02:41:01.000000000 -0500
24019 +diff -urNp linux-2.6.37.1/drivers/cpuidle/sysfs.c linux-2.6.37.1/drivers/cpuidle/sysfs.c
24020 +--- linux-2.6.37.1/drivers/cpuidle/sysfs.c 2011-01-04 19:50:19.000000000 -0500
24021 ++++ linux-2.6.37.1/drivers/cpuidle/sysfs.c 2011-01-17 02:41:01.000000000 -0500
24022 @@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
24023 .release = cpuidle_state_sysfs_release,
24024 };
24025 @@ -24226,9 +24296,9 @@ diff -urNp linux-2.6.37/drivers/cpuidle/sysfs.c linux-2.6.37/drivers/cpuidle/sys
24026 {
24027 kobject_put(&device->kobjs[i]->kobj);
24028 wait_for_completion(&device->kobjs[i]->kobj_unregister);
24029 -diff -urNp linux-2.6.37/drivers/edac/edac_core.h linux-2.6.37/drivers/edac/edac_core.h
24030 ---- linux-2.6.37/drivers/edac/edac_core.h 2011-01-04 19:50:19.000000000 -0500
24031 -+++ linux-2.6.37/drivers/edac/edac_core.h 2011-01-17 02:41:01.000000000 -0500
24032 +diff -urNp linux-2.6.37.1/drivers/edac/edac_core.h linux-2.6.37.1/drivers/edac/edac_core.h
24033 +--- linux-2.6.37.1/drivers/edac/edac_core.h 2011-01-04 19:50:19.000000000 -0500
24034 ++++ linux-2.6.37.1/drivers/edac/edac_core.h 2011-01-17 02:41:01.000000000 -0500
24035 @@ -87,11 +87,11 @@ extern const char *edac_mem_types[];
24036
24037 #else /* !CONFIG_EDAC_DEBUG */
24038 @@ -24246,9 +24316,9 @@ diff -urNp linux-2.6.37/drivers/edac/edac_core.h linux-2.6.37/drivers/edac/edac_
24039
24040 #endif /* !CONFIG_EDAC_DEBUG */
24041
24042 -diff -urNp linux-2.6.37/drivers/edac/edac_mc_sysfs.c linux-2.6.37/drivers/edac/edac_mc_sysfs.c
24043 ---- linux-2.6.37/drivers/edac/edac_mc_sysfs.c 2011-01-04 19:50:19.000000000 -0500
24044 -+++ linux-2.6.37/drivers/edac/edac_mc_sysfs.c 2011-01-17 02:41:01.000000000 -0500
24045 +diff -urNp linux-2.6.37.1/drivers/edac/edac_mc_sysfs.c linux-2.6.37.1/drivers/edac/edac_mc_sysfs.c
24046 +--- linux-2.6.37.1/drivers/edac/edac_mc_sysfs.c 2011-01-04 19:50:19.000000000 -0500
24047 ++++ linux-2.6.37.1/drivers/edac/edac_mc_sysfs.c 2011-01-17 02:41:01.000000000 -0500
24048 @@ -762,7 +762,7 @@ static void edac_inst_grp_release(struct
24049 }
24050
24051 @@ -24258,9 +24328,9 @@ diff -urNp linux-2.6.37/drivers/edac/edac_mc_sysfs.c linux-2.6.37/drivers/edac/e
24052 .show = inst_grp_show,
24053 .store = inst_grp_store
24054 };
24055 -diff -urNp linux-2.6.37/drivers/firewire/core-cdev.c linux-2.6.37/drivers/firewire/core-cdev.c
24056 ---- linux-2.6.37/drivers/firewire/core-cdev.c 2011-01-04 19:50:19.000000000 -0500
24057 -+++ linux-2.6.37/drivers/firewire/core-cdev.c 2011-01-17 02:41:01.000000000 -0500
24058 +diff -urNp linux-2.6.37.1/drivers/firewire/core-cdev.c linux-2.6.37.1/drivers/firewire/core-cdev.c
24059 +--- linux-2.6.37.1/drivers/firewire/core-cdev.c 2011-01-04 19:50:19.000000000 -0500
24060 ++++ linux-2.6.37.1/drivers/firewire/core-cdev.c 2011-01-17 02:41:01.000000000 -0500
24061 @@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie
24062 int ret;
24063
24064 @@ -24271,10 +24341,10 @@ diff -urNp linux-2.6.37/drivers/firewire/core-cdev.c linux-2.6.37/drivers/firewi
24065 return -EINVAL;
24066
24067 r = kmalloc(sizeof(*r), GFP_KERNEL);
24068 -diff -urNp linux-2.6.37/drivers/firmware/dmi_scan.c linux-2.6.37/drivers/firmware/dmi_scan.c
24069 ---- linux-2.6.37/drivers/firmware/dmi_scan.c 2011-01-04 19:50:19.000000000 -0500
24070 -+++ linux-2.6.37/drivers/firmware/dmi_scan.c 2011-01-17 02:41:01.000000000 -0500
24071 -@@ -442,11 +442,6 @@ void __init dmi_scan_machine(void)
24072 +diff -urNp linux-2.6.37.1/drivers/firmware/dmi_scan.c linux-2.6.37.1/drivers/firmware/dmi_scan.c
24073 +--- linux-2.6.37.1/drivers/firmware/dmi_scan.c 2011-02-22 16:05:30.000000000 -0500
24074 ++++ linux-2.6.37.1/drivers/firmware/dmi_scan.c 2011-02-22 16:05:42.000000000 -0500
24075 +@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
24076 }
24077 }
24078 else {
24079 @@ -24286,9 +24356,9 @@ diff -urNp linux-2.6.37/drivers/firmware/dmi_scan.c linux-2.6.37/drivers/firmwar
24080 p = dmi_ioremap(0xF0000, 0x10000);
24081 if (p == NULL)
24082 goto error;
24083 -diff -urNp linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c
24084 ---- linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c 2011-01-04 19:50:19.000000000 -0500
24085 -+++ linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c 2011-01-17 02:41:01.000000000 -0500
24086 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.37.1/drivers/gpu/drm/drm_crtc_helper.c
24087 +--- linux-2.6.37.1/drivers/gpu/drm/drm_crtc_helper.c 2011-02-22 16:05:30.000000000 -0500
24088 ++++ linux-2.6.37.1/drivers/gpu/drm/drm_crtc_helper.c 2011-02-22 16:05:42.000000000 -0500
24089 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
24090 struct drm_crtc *tmp;
24091 int crtc_mask = 1;
24092 @@ -24298,9 +24368,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.37/drivers/g
24093
24094 dev = crtc->dev;
24095
24096 -diff -urNp linux-2.6.37/drivers/gpu/drm/drm_drv.c linux-2.6.37/drivers/gpu/drm/drm_drv.c
24097 ---- linux-2.6.37/drivers/gpu/drm/drm_drv.c 2011-01-04 19:50:19.000000000 -0500
24098 -+++ linux-2.6.37/drivers/gpu/drm/drm_drv.c 2011-01-17 02:41:01.000000000 -0500
24099 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/drm_drv.c linux-2.6.37.1/drivers/gpu/drm/drm_drv.c
24100 +--- linux-2.6.37.1/drivers/gpu/drm/drm_drv.c 2011-01-04 19:50:19.000000000 -0500
24101 ++++ linux-2.6.37.1/drivers/gpu/drm/drm_drv.c 2011-01-17 02:41:01.000000000 -0500
24102 @@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp,
24103
24104 dev = file_priv->minor->dev;
24105 @@ -24310,9 +24380,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/drm_drv.c linux-2.6.37/drivers/gpu/drm/d
24106 ++file_priv->ioctl_count;
24107
24108 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
24109 -diff -urNp linux-2.6.37/drivers/gpu/drm/drm_fops.c linux-2.6.37/drivers/gpu/drm/drm_fops.c
24110 ---- linux-2.6.37/drivers/gpu/drm/drm_fops.c 2011-01-04 19:50:19.000000000 -0500
24111 -+++ linux-2.6.37/drivers/gpu/drm/drm_fops.c 2011-01-24 18:04:15.000000000 -0500
24112 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/drm_fops.c linux-2.6.37.1/drivers/gpu/drm/drm_fops.c
24113 +--- linux-2.6.37.1/drivers/gpu/drm/drm_fops.c 2011-01-04 19:50:19.000000000 -0500
24114 ++++ linux-2.6.37.1/drivers/gpu/drm/drm_fops.c 2011-01-24 18:04:15.000000000 -0500
24115 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
24116 }
24117
24118 @@ -24362,9 +24432,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/drm_fops.c linux-2.6.37/drivers/gpu/drm/
24119 if (atomic_read(&dev->ioctl_count)) {
24120 DRM_ERROR("Device busy: %d\n",
24121 atomic_read(&dev->ioctl_count));
24122 -diff -urNp linux-2.6.37/drivers/gpu/drm/drm_global.c linux-2.6.37/drivers/gpu/drm/drm_global.c
24123 ---- linux-2.6.37/drivers/gpu/drm/drm_global.c 2011-01-04 19:50:19.000000000 -0500
24124 -+++ linux-2.6.37/drivers/gpu/drm/drm_global.c 2011-01-17 02:41:01.000000000 -0500
24125 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/drm_global.c linux-2.6.37.1/drivers/gpu/drm/drm_global.c
24126 +--- linux-2.6.37.1/drivers/gpu/drm/drm_global.c 2011-01-04 19:50:19.000000000 -0500
24127 ++++ linux-2.6.37.1/drivers/gpu/drm/drm_global.c 2011-01-17 02:41:01.000000000 -0500
24128 @@ -36,7 +36,7 @@
24129 struct drm_global_item {
24130 struct mutex mutex;
24131 @@ -24422,9 +24492,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/drm_global.c linux-2.6.37/drivers/gpu/dr
24132 ref->release(ref);
24133 item->object = NULL;
24134 }
24135 -diff -urNp linux-2.6.37/drivers/gpu/drm/drm_info.c linux-2.6.37/drivers/gpu/drm/drm_info.c
24136 ---- linux-2.6.37/drivers/gpu/drm/drm_info.c 2011-01-04 19:50:19.000000000 -0500
24137 -+++ linux-2.6.37/drivers/gpu/drm/drm_info.c 2011-01-17 02:41:01.000000000 -0500
24138 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/drm_info.c linux-2.6.37.1/drivers/gpu/drm/drm_info.c
24139 +--- linux-2.6.37.1/drivers/gpu/drm/drm_info.c 2011-01-04 19:50:19.000000000 -0500
24140 ++++ linux-2.6.37.1/drivers/gpu/drm/drm_info.c 2011-01-17 02:41:01.000000000 -0500
24141 @@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
24142 struct drm_local_map *map;
24143 struct drm_map_list *r_list;
24144 @@ -24453,9 +24523,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/drm_info.c linux-2.6.37/drivers/gpu/drm/
24145 type = "??";
24146 else
24147 type = types[map->type];
24148 -diff -urNp linux-2.6.37/drivers/gpu/drm/drm_ioctl.c linux-2.6.37/drivers/gpu/drm/drm_ioctl.c
24149 ---- linux-2.6.37/drivers/gpu/drm/drm_ioctl.c 2011-01-04 19:50:19.000000000 -0500
24150 -+++ linux-2.6.37/drivers/gpu/drm/drm_ioctl.c 2011-01-17 02:41:01.000000000 -0500
24151 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/drm_ioctl.c linux-2.6.37.1/drivers/gpu/drm/drm_ioctl.c
24152 +--- linux-2.6.37.1/drivers/gpu/drm/drm_ioctl.c 2011-01-04 19:50:19.000000000 -0500
24153 ++++ linux-2.6.37.1/drivers/gpu/drm/drm_ioctl.c 2011-01-17 02:41:01.000000000 -0500
24154 @@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev,
24155 stats->data[i].value =
24156 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
24157 @@ -24465,9 +24535,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/drm_ioctl.c linux-2.6.37/drivers/gpu/drm
24158 stats->data[i].type = dev->types[i];
24159 }
24160
24161 -diff -urNp linux-2.6.37/drivers/gpu/drm/drm_lock.c linux-2.6.37/drivers/gpu/drm/drm_lock.c
24162 ---- linux-2.6.37/drivers/gpu/drm/drm_lock.c 2011-01-04 19:50:19.000000000 -0500
24163 -+++ linux-2.6.37/drivers/gpu/drm/drm_lock.c 2011-01-17 02:41:01.000000000 -0500
24164 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/drm_lock.c linux-2.6.37.1/drivers/gpu/drm/drm_lock.c
24165 +--- linux-2.6.37.1/drivers/gpu/drm/drm_lock.c 2011-01-04 19:50:19.000000000 -0500
24166 ++++ linux-2.6.37.1/drivers/gpu/drm/drm_lock.c 2011-01-17 02:41:01.000000000 -0500
24167 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
24168 if (drm_lock_take(&master->lock, lock->context)) {
24169 master->lock.file_priv = file_priv;
24170 @@ -24486,9 +24556,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/drm_lock.c linux-2.6.37/drivers/gpu/drm/
24171
24172 if (drm_lock_free(&master->lock, lock->context)) {
24173 /* FIXME: Should really bail out here. */
24174 -diff -urNp linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c
24175 ---- linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c 2011-01-04 19:50:19.000000000 -0500
24176 -+++ linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c 2011-01-17 02:41:01.000000000 -0500
24177 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i810/i810_dma.c linux-2.6.37.1/drivers/gpu/drm/i810/i810_dma.c
24178 +--- linux-2.6.37.1/drivers/gpu/drm/i810/i810_dma.c 2011-01-04 19:50:19.000000000 -0500
24179 ++++ linux-2.6.37.1/drivers/gpu/drm/i810/i810_dma.c 2011-01-17 02:41:01.000000000 -0500
24180 @@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
24181 dma->buflist[vertex->idx],
24182 vertex->discard, vertex->used);
24183 @@ -24511,9 +24581,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c linux-2.6.37/drivers/gpu
24184 sarea_priv->last_enqueue = dev_priv->counter - 1;
24185 sarea_priv->last_dispatch = (int)hw_status[5];
24186
24187 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c
24188 ---- linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-04 19:50:19.000000000 -0500
24189 -+++ linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-17 02:41:01.000000000 -0500
24190 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7017.c
24191 +--- linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-04 19:50:19.000000000 -0500
24192 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7017.c 2011-01-17 02:41:01.000000000 -0500
24193 @@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_
24194 }
24195 }
24196 @@ -24523,9 +24593,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.37/drivers/g
24197 .init = ch7017_init,
24198 .detect = ch7017_detect,
24199 .mode_valid = ch7017_mode_valid,
24200 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c
24201 ---- linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-04 19:50:19.000000000 -0500
24202 -+++ linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-17 02:41:01.000000000 -0500
24203 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7xxx.c
24204 +--- linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-04 19:50:19.000000000 -0500
24205 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-01-17 02:41:01.000000000 -0500
24206 @@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_
24207 }
24208 }
24209 @@ -24535,9 +24605,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.37/drivers/g
24210 .init = ch7xxx_init,
24211 .detect = ch7xxx_detect,
24212 .mode_valid = ch7xxx_mode_valid,
24213 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo.h linux-2.6.37/drivers/gpu/drm/i915/dvo.h
24214 ---- linux-2.6.37/drivers/gpu/drm/i915/dvo.h 2011-01-04 19:50:19.000000000 -0500
24215 -+++ linux-2.6.37/drivers/gpu/drm/i915/dvo.h 2011-01-17 02:41:01.000000000 -0500
24216 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/dvo.h linux-2.6.37.1/drivers/gpu/drm/i915/dvo.h
24217 +--- linux-2.6.37.1/drivers/gpu/drm/i915/dvo.h 2011-01-04 19:50:19.000000000 -0500
24218 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/dvo.h 2011-01-17 02:41:01.000000000 -0500
24219 @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops {
24220 *
24221 * \return singly-linked list of modes or NULL if no modes found.
24222 @@ -24570,9 +24640,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo.h linux-2.6.37/drivers/gpu/drm/
24223 +extern const struct intel_dvo_dev_ops ch7017_ops;
24224
24225 #endif /* _INTEL_DVO_H */
24226 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c
24227 ---- linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-04 19:50:19.000000000 -0500
24228 -+++ linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-17 02:41:01.000000000 -0500
24229 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ivch.c
24230 +--- linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-04 19:50:19.000000000 -0500
24231 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/dvo_ivch.c 2011-01-17 02:41:01.000000000 -0500
24232 @@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv
24233 }
24234 }
24235 @@ -24582,9 +24652,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.37/drivers/gpu
24236 .init = ivch_init,
24237 .dpms = ivch_dpms,
24238 .mode_valid = ivch_mode_valid,
24239 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c
24240 ---- linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-04 19:50:19.000000000 -0500
24241 -+++ linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-17 02:41:01.000000000 -0500
24242 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.37.1/drivers/gpu/drm/i915/dvo_sil164.c
24243 +--- linux-2.6.37.1/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-04 19:50:19.000000000 -0500
24244 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/dvo_sil164.c 2011-01-17 02:41:01.000000000 -0500
24245 @@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_
24246 }
24247 }
24248 @@ -24594,9 +24664,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.37/drivers/g
24249 .init = sil164_init,
24250 .detect = sil164_detect,
24251 .mode_valid = sil164_mode_valid,
24252 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c
24253 ---- linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-04 19:50:19.000000000 -0500
24254 -+++ linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-17 02:41:01.000000000 -0500
24255 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.37.1/drivers/gpu/drm/i915/dvo_tfp410.c
24256 +--- linux-2.6.37.1/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-04 19:50:19.000000000 -0500
24257 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/dvo_tfp410.c 2011-01-17 02:41:01.000000000 -0500
24258 @@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_
24259 }
24260 }
24261 @@ -24606,9 +24676,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.37/drivers/g
24262 .init = tfp410_init,
24263 .detect = tfp410_detect,
24264 .mode_valid = tfp410_mode_valid,
24265 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c
24266 ---- linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c 2011-01-04 19:50:19.000000000 -0500
24267 -+++ linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c 2011-01-24 18:04:15.000000000 -0500
24268 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/i915_dma.c linux-2.6.37.1/drivers/gpu/drm/i915/i915_dma.c
24269 +--- linux-2.6.37.1/drivers/gpu/drm/i915/i915_dma.c 2011-02-22 16:05:30.000000000 -0500
24270 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/i915_dma.c 2011-02-22 16:05:42.000000000 -0500
24271 @@ -1191,7 +1191,7 @@ static bool i915_switcheroo_can_switch(s
24272 bool can_switch;
24273
24274 @@ -24618,10 +24688,10 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c linux-2.6.37/drivers/gpu
24275 spin_unlock(&dev->count_lock);
24276 return can_switch;
24277 }
24278 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c
24279 ---- linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c 2011-01-04 19:50:19.000000000 -0500
24280 -+++ linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c 2011-01-17 02:41:01.000000000 -0500
24281 -@@ -579,7 +579,7 @@ static const struct dev_pm_ops i915_pm_o
24282 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/i915_drv.c linux-2.6.37.1/drivers/gpu/drm/i915/i915_drv.c
24283 +--- linux-2.6.37.1/drivers/gpu/drm/i915/i915_drv.c 2011-02-22 16:05:30.000000000 -0500
24284 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/i915_drv.c 2011-02-22 16:05:42.000000000 -0500
24285 +@@ -587,7 +587,7 @@ static const struct dev_pm_ops i915_pm_o
24286 .restore = i915_pm_resume,
24287 };
24288
24289 @@ -24630,9 +24700,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c linux-2.6.37/drivers/gpu
24290 .fault = i915_gem_fault,
24291 .open = drm_gem_vm_open,
24292 .close = drm_gem_vm_close,
24293 -diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c
24294 ---- linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c 2011-01-04 19:50:19.000000000 -0500
24295 -+++ linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c 2011-01-17 02:41:01.000000000 -0500
24296 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/i915/i915_gem.c linux-2.6.37.1/drivers/gpu/drm/i915/i915_gem.c
24297 +--- linux-2.6.37.1/drivers/gpu/drm/i915/i915_gem.c 2011-01-04 19:50:19.000000000 -0500
24298 ++++ linux-2.6.37.1/drivers/gpu/drm/i915/i915_gem.c 2011-01-17 02:41:01.000000000 -0500
24299 @@ -587,6 +587,7 @@ i915_gem_pread_ioctl(struct drm_device *
24300 goto out_put;
24301
24302 @@ -24641,9 +24711,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c linux-2.6.37/drivers/gpu
24303 if (!i915_gem_object_needs_bit17_swizzle(obj))
24304 ret = i915_gem_shmem_pread_fast(dev, obj, args, file_priv);
24305 if (ret == -EFAULT)
24306 -diff -urNp linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c
24307 ---- linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-04 19:50:19.000000000 -0500
24308 -+++ linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-17 02:41:01.000000000 -0500
24309 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_backlight.c
24310 +--- linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-04 19:50:19.000000000 -0500
24311 ++++ linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_backlight.c 2011-01-17 02:41:01.000000000 -0500
24312 @@ -59,7 +59,7 @@ static int nv40_set_intensity(struct bac
24313 return 0;
24314 }
24315 @@ -24662,9 +24732,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.37
24316 .options = BL_CORE_SUSPENDRESUME,
24317 .get_brightness = nv50_get_intensity,
24318 .update_status = nv50_set_intensity,
24319 -diff -urNp linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c
24320 ---- linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-04 19:50:19.000000000 -0500
24321 -+++ linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-24 18:04:15.000000000 -0500
24322 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_state.c
24323 +--- linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-04 19:50:19.000000000 -0500
24324 ++++ linux-2.6.37.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-01-24 18:04:15.000000000 -0500
24325 @@ -546,7 +546,7 @@ static bool nouveau_switcheroo_can_switc
24326 bool can_switch;
24327
24328 @@ -24674,9 +24744,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.37/dri
24329 spin_unlock(&dev->count_lock);
24330 return can_switch;
24331 }
24332 -diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c
24333 ---- linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c 2011-01-04 19:50:19.000000000 -0500
24334 -+++ linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c 2011-01-17 02:41:01.000000000 -0500
24335 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.37.1/drivers/gpu/drm/radeon/mkregtable.c
24336 +--- linux-2.6.37.1/drivers/gpu/drm/radeon/mkregtable.c 2011-01-04 19:50:19.000000000 -0500
24337 ++++ linux-2.6.37.1/drivers/gpu/drm/radeon/mkregtable.c 2011-01-17 02:41:01.000000000 -0500
24338 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
24339 regex_t mask_rex;
24340 regmatch_t match[4];
24341 @@ -24694,9 +24764,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.37/drivers
24342
24343 if (regcomp
24344 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
24345 -diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c
24346 ---- linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c 2011-01-04 19:50:19.000000000 -0500
24347 -+++ linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c 2011-01-24 18:04:15.000000000 -0500
24348 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_device.c
24349 +--- linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_device.c 2011-01-04 19:50:19.000000000 -0500
24350 ++++ linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_device.c 2011-01-24 18:04:15.000000000 -0500
24351 @@ -659,7 +659,7 @@ static bool radeon_switcheroo_can_switch
24352 bool can_switch;
24353
24354 @@ -24706,9 +24776,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.37/driv
24355 spin_unlock(&dev->count_lock);
24356 return can_switch;
24357 }
24358 -diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c
24359 ---- linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c 2011-01-04 19:50:19.000000000 -0500
24360 -+++ linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c 2011-01-17 02:41:01.000000000 -0500
24361 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_state.c
24362 +--- linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_state.c 2011-01-04 19:50:19.000000000 -0500
24363 ++++ linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_state.c 2011-01-17 02:41:01.000000000 -0500
24364 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
24365 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
24366 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
24367 @@ -24727,9 +24797,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.37/drive
24368
24369 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
24370
24371 -diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c
24372 ---- linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c 2011-01-04 19:50:19.000000000 -0500
24373 -+++ linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c 2011-01-17 02:41:01.000000000 -0500
24374 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_ttm.c
24375 +--- linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-01-04 19:50:19.000000000 -0500
24376 ++++ linux-2.6.37.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-01-17 02:41:01.000000000 -0500
24377 @@ -589,8 +589,9 @@ void radeon_ttm_fini(struct radeon_devic
24378 DRM_INFO("radeon: ttm finalized\n");
24379 }
24380 @@ -24790,9 +24860,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.37/drivers
24381 vma->vm_ops = &radeon_ttm_vm_ops;
24382 return 0;
24383 }
24384 -diff -urNp linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c
24385 ---- linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-04 19:50:19.000000000 -0500
24386 -+++ linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-17 02:41:01.000000000 -0500
24387 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo.c
24388 +--- linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-04 19:50:19.000000000 -0500
24389 ++++ linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo.c 2011-01-17 02:41:01.000000000 -0500
24390 @@ -40,7 +40,7 @@
24391 #include <asm/atomic.h>
24392
24393 @@ -24802,9 +24872,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.37/drivers/gpu/dr
24394 #define TTM_BO_HASH_ORDER 13
24395
24396 static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
24397 -diff -urNp linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c
24398 ---- linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-04 19:50:19.000000000 -0500
24399 -+++ linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-17 02:41:01.000000000 -0500
24400 +diff -urNp linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo_vm.c
24401 +--- linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-04 19:50:19.000000000 -0500
24402 ++++ linux-2.6.37.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-01-17 02:41:01.000000000 -0500
24403 @@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
24404 return best_bo;
24405 }
24406 @@ -24858,9 +24928,9 @@ diff -urNp linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.37/drivers/gpu
24407
24408 static const struct vm_operations_struct ttm_bo_vm_ops = {
24409 .fault = ttm_bo_vm_fault,
24410 -diff -urNp linux-2.6.37/drivers/hid/usbhid/hiddev.c linux-2.6.37/drivers/hid/usbhid/hiddev.c
24411 ---- linux-2.6.37/drivers/hid/usbhid/hiddev.c 2011-01-04 19:50:19.000000000 -0500
24412 -+++ linux-2.6.37/drivers/hid/usbhid/hiddev.c 2011-01-17 02:41:01.000000000 -0500
24413 +diff -urNp linux-2.6.37.1/drivers/hid/usbhid/hiddev.c linux-2.6.37.1/drivers/hid/usbhid/hiddev.c
24414 +--- linux-2.6.37.1/drivers/hid/usbhid/hiddev.c 2011-01-04 19:50:19.000000000 -0500
24415 ++++ linux-2.6.37.1/drivers/hid/usbhid/hiddev.c 2011-01-17 02:41:01.000000000 -0500
24416 @@ -611,7 +611,7 @@ static long hiddev_ioctl(struct file *fi
24417 return put_user(HID_VERSION, (int __user *)arg);
24418
24419 @@ -24870,9 +24940,9 @@ diff -urNp linux-2.6.37/drivers/hid/usbhid/hiddev.c linux-2.6.37/drivers/hid/usb
24420 return -EINVAL;
24421
24422 for (i = 0; i < hid->maxcollection; i++)
24423 -diff -urNp linux-2.6.37/drivers/hwmon/k8temp.c linux-2.6.37/drivers/hwmon/k8temp.c
24424 ---- linux-2.6.37/drivers/hwmon/k8temp.c 2011-01-04 19:50:19.000000000 -0500
24425 -+++ linux-2.6.37/drivers/hwmon/k8temp.c 2011-01-17 02:41:01.000000000 -0500
24426 +diff -urNp linux-2.6.37.1/drivers/hwmon/k8temp.c linux-2.6.37.1/drivers/hwmon/k8temp.c
24427 +--- linux-2.6.37.1/drivers/hwmon/k8temp.c 2011-01-04 19:50:19.000000000 -0500
24428 ++++ linux-2.6.37.1/drivers/hwmon/k8temp.c 2011-01-17 02:41:01.000000000 -0500
24429 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
24430
24431 static const struct pci_device_id k8temp_ids[] = {
24432 @@ -24882,9 +24952,9 @@ diff -urNp linux-2.6.37/drivers/hwmon/k8temp.c linux-2.6.37/drivers/hwmon/k8temp
24433 };
24434
24435 MODULE_DEVICE_TABLE(pci, k8temp_ids);
24436 -diff -urNp linux-2.6.37/drivers/hwmon/sis5595.c linux-2.6.37/drivers/hwmon/sis5595.c
24437 ---- linux-2.6.37/drivers/hwmon/sis5595.c 2011-01-04 19:50:19.000000000 -0500
24438 -+++ linux-2.6.37/drivers/hwmon/sis5595.c 2011-01-17 02:41:01.000000000 -0500
24439 +diff -urNp linux-2.6.37.1/drivers/hwmon/sis5595.c linux-2.6.37.1/drivers/hwmon/sis5595.c
24440 +--- linux-2.6.37.1/drivers/hwmon/sis5595.c 2011-01-04 19:50:19.000000000 -0500
24441 ++++ linux-2.6.37.1/drivers/hwmon/sis5595.c 2011-01-17 02:41:01.000000000 -0500
24442 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
24443
24444 static const struct pci_device_id sis5595_pci_ids[] = {
24445 @@ -24894,10 +24964,10 @@ diff -urNp linux-2.6.37/drivers/hwmon/sis5595.c linux-2.6.37/drivers/hwmon/sis55
24446 };
24447
24448 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
24449 -diff -urNp linux-2.6.37/drivers/hwmon/via686a.c linux-2.6.37/drivers/hwmon/via686a.c
24450 ---- linux-2.6.37/drivers/hwmon/via686a.c 2011-01-04 19:50:19.000000000 -0500
24451 -+++ linux-2.6.37/drivers/hwmon/via686a.c 2011-01-17 02:41:01.000000000 -0500
24452 -@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
24453 +diff -urNp linux-2.6.37.1/drivers/hwmon/via686a.c linux-2.6.37.1/drivers/hwmon/via686a.c
24454 +--- linux-2.6.37.1/drivers/hwmon/via686a.c 2011-02-22 16:05:30.000000000 -0500
24455 ++++ linux-2.6.37.1/drivers/hwmon/via686a.c 2011-02-22 16:05:42.000000000 -0500
24456 +@@ -777,7 +777,7 @@ static struct via686a_data *via686a_upda
24457
24458 static const struct pci_device_id via686a_pci_ids[] = {
24459 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
24460 @@ -24906,9 +24976,9 @@ diff -urNp linux-2.6.37/drivers/hwmon/via686a.c linux-2.6.37/drivers/hwmon/via68
24461 };
24462
24463 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
24464 -diff -urNp linux-2.6.37/drivers/hwmon/vt8231.c linux-2.6.37/drivers/hwmon/vt8231.c
24465 ---- linux-2.6.37/drivers/hwmon/vt8231.c 2011-01-04 19:50:19.000000000 -0500
24466 -+++ linux-2.6.37/drivers/hwmon/vt8231.c 2011-01-17 02:41:01.000000000 -0500
24467 +diff -urNp linux-2.6.37.1/drivers/hwmon/vt8231.c linux-2.6.37.1/drivers/hwmon/vt8231.c
24468 +--- linux-2.6.37.1/drivers/hwmon/vt8231.c 2011-01-04 19:50:19.000000000 -0500
24469 ++++ linux-2.6.37.1/drivers/hwmon/vt8231.c 2011-01-17 02:41:01.000000000 -0500
24470 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
24471
24472 static const struct pci_device_id vt8231_pci_ids[] = {
24473 @@ -24918,9 +24988,9 @@ diff -urNp linux-2.6.37/drivers/hwmon/vt8231.c linux-2.6.37/drivers/hwmon/vt8231
24474 };
24475
24476 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
24477 -diff -urNp linux-2.6.37/drivers/hwmon/w83791d.c linux-2.6.37/drivers/hwmon/w83791d.c
24478 ---- linux-2.6.37/drivers/hwmon/w83791d.c 2011-01-04 19:50:19.000000000 -0500
24479 -+++ linux-2.6.37/drivers/hwmon/w83791d.c 2011-01-17 02:41:01.000000000 -0500
24480 +diff -urNp linux-2.6.37.1/drivers/hwmon/w83791d.c linux-2.6.37.1/drivers/hwmon/w83791d.c
24481 +--- linux-2.6.37.1/drivers/hwmon/w83791d.c 2011-01-04 19:50:19.000000000 -0500
24482 ++++ linux-2.6.37.1/drivers/hwmon/w83791d.c 2011-01-17 02:41:01.000000000 -0500
24483 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
24484 struct i2c_board_info *info);
24485 static int w83791d_remove(struct i2c_client *client);
24486 @@ -24932,9 +25002,9 @@ diff -urNp linux-2.6.37/drivers/hwmon/w83791d.c linux-2.6.37/drivers/hwmon/w8379
24487 static struct w83791d_data *w83791d_update_device(struct device *dev);
24488
24489 #ifdef DEBUG
24490 -diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-i801.c linux-2.6.37/drivers/i2c/busses/i2c-i801.c
24491 ---- linux-2.6.37/drivers/i2c/busses/i2c-i801.c 2011-01-04 19:50:19.000000000 -0500
24492 -+++ linux-2.6.37/drivers/i2c/busses/i2c-i801.c 2011-01-17 02:41:01.000000000 -0500
24493 +diff -urNp linux-2.6.37.1/drivers/i2c/busses/i2c-i801.c linux-2.6.37.1/drivers/i2c/busses/i2c-i801.c
24494 +--- linux-2.6.37.1/drivers/i2c/busses/i2c-i801.c 2011-01-04 19:50:19.000000000 -0500
24495 ++++ linux-2.6.37.1/drivers/i2c/busses/i2c-i801.c 2011-01-17 02:41:01.000000000 -0500
24496 @@ -620,7 +620,7 @@ static const struct pci_device_id i801_i
24497 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) },
24498 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
24499 @@ -24944,9 +25014,9 @@ diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-i801.c linux-2.6.37/drivers/i2c/b
24500 };
24501
24502 MODULE_DEVICE_TABLE(pci, i801_ids);
24503 -diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-piix4.c linux-2.6.37/drivers/i2c/busses/i2c-piix4.c
24504 ---- linux-2.6.37/drivers/i2c/busses/i2c-piix4.c 2011-01-04 19:50:19.000000000 -0500
24505 -+++ linux-2.6.37/drivers/i2c/busses/i2c-piix4.c 2011-01-17 02:41:01.000000000 -0500
24506 +diff -urNp linux-2.6.37.1/drivers/i2c/busses/i2c-piix4.c linux-2.6.37.1/drivers/i2c/busses/i2c-piix4.c
24507 +--- linux-2.6.37.1/drivers/i2c/busses/i2c-piix4.c 2011-01-04 19:50:19.000000000 -0500
24508 ++++ linux-2.6.37.1/drivers/i2c/busses/i2c-piix4.c 2011-01-17 02:41:01.000000000 -0500
24509 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
24510 .ident = "IBM",
24511 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
24512 @@ -24965,9 +25035,9 @@ diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-piix4.c linux-2.6.37/drivers/i2c/
24513 };
24514
24515 MODULE_DEVICE_TABLE (pci, piix4_ids);
24516 -diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-sis630.c linux-2.6.37/drivers/i2c/busses/i2c-sis630.c
24517 ---- linux-2.6.37/drivers/i2c/busses/i2c-sis630.c 2011-01-04 19:50:19.000000000 -0500
24518 -+++ linux-2.6.37/drivers/i2c/busses/i2c-sis630.c 2011-01-17 02:41:01.000000000 -0500
24519 +diff -urNp linux-2.6.37.1/drivers/i2c/busses/i2c-sis630.c linux-2.6.37.1/drivers/i2c/busses/i2c-sis630.c
24520 +--- linux-2.6.37.1/drivers/i2c/busses/i2c-sis630.c 2011-01-04 19:50:19.000000000 -0500
24521 ++++ linux-2.6.37.1/drivers/i2c/busses/i2c-sis630.c 2011-01-17 02:41:01.000000000 -0500
24522 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
24523 static const struct pci_device_id sis630_ids[] __devinitconst = {
24524 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
24525 @@ -24977,9 +25047,9 @@ diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-sis630.c linux-2.6.37/drivers/i2c
24526 };
24527
24528 MODULE_DEVICE_TABLE (pci, sis630_ids);
24529 -diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c
24530 ---- linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c 2011-01-04 19:50:19.000000000 -0500
24531 -+++ linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c 2011-01-17 02:41:01.000000000 -0500
24532 +diff -urNp linux-2.6.37.1/drivers/i2c/busses/i2c-sis96x.c linux-2.6.37.1/drivers/i2c/busses/i2c-sis96x.c
24533 +--- linux-2.6.37.1/drivers/i2c/busses/i2c-sis96x.c 2011-01-04 19:50:19.000000000 -0500
24534 ++++ linux-2.6.37.1/drivers/i2c/busses/i2c-sis96x.c 2011-01-17 02:41:01.000000000 -0500
24535 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
24536
24537 static const struct pci_device_id sis96x_ids[] = {
24538 @@ -24989,9 +25059,9 @@ diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c linux-2.6.37/drivers/i2c
24539 };
24540
24541 MODULE_DEVICE_TABLE (pci, sis96x_ids);
24542 -diff -urNp linux-2.6.37/drivers/ide/ide-cd.c linux-2.6.37/drivers/ide/ide-cd.c
24543 ---- linux-2.6.37/drivers/ide/ide-cd.c 2011-01-04 19:50:19.000000000 -0500
24544 -+++ linux-2.6.37/drivers/ide/ide-cd.c 2011-01-17 02:41:01.000000000 -0500
24545 +diff -urNp linux-2.6.37.1/drivers/ide/ide-cd.c linux-2.6.37.1/drivers/ide/ide-cd.c
24546 +--- linux-2.6.37.1/drivers/ide/ide-cd.c 2011-01-04 19:50:19.000000000 -0500
24547 ++++ linux-2.6.37.1/drivers/ide/ide-cd.c 2011-01-17 02:41:01.000000000 -0500
24548 @@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_
24549 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
24550 if ((unsigned long)buf & alignment
24551 @@ -25001,9 +25071,9 @@ diff -urNp linux-2.6.37/drivers/ide/ide-cd.c linux-2.6.37/drivers/ide/ide-cd.c
24552 drive->dma = 0;
24553 }
24554 }
24555 -diff -urNp linux-2.6.37/drivers/infiniband/core/cm.c linux-2.6.37/drivers/infiniband/core/cm.c
24556 ---- linux-2.6.37/drivers/infiniband/core/cm.c 2011-01-04 19:50:19.000000000 -0500
24557 -+++ linux-2.6.37/drivers/infiniband/core/cm.c 2011-01-17 02:41:01.000000000 -0500
24558 +diff -urNp linux-2.6.37.1/drivers/infiniband/core/cm.c linux-2.6.37.1/drivers/infiniband/core/cm.c
24559 +--- linux-2.6.37.1/drivers/infiniband/core/cm.c 2011-01-04 19:50:19.000000000 -0500
24560 ++++ linux-2.6.37.1/drivers/infiniband/core/cm.c 2011-01-17 02:41:01.000000000 -0500
24561 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
24562
24563 struct cm_counter_group {
24564 @@ -25143,9 +25213,9 @@ diff -urNp linux-2.6.37/drivers/infiniband/core/cm.c linux-2.6.37/drivers/infini
24565 }
24566
24567 static const struct sysfs_ops cm_counter_ops = {
24568 -diff -urNp linux-2.6.37/drivers/infiniband/hw/qib/qib.h linux-2.6.37/drivers/infiniband/hw/qib/qib.h
24569 ---- linux-2.6.37/drivers/infiniband/hw/qib/qib.h 2011-01-04 19:50:19.000000000 -0500
24570 -+++ linux-2.6.37/drivers/infiniband/hw/qib/qib.h 2011-01-17 02:41:01.000000000 -0500
24571 +diff -urNp linux-2.6.37.1/drivers/infiniband/hw/qib/qib.h linux-2.6.37.1/drivers/infiniband/hw/qib/qib.h
24572 +--- linux-2.6.37.1/drivers/infiniband/hw/qib/qib.h 2011-01-04 19:50:19.000000000 -0500
24573 ++++ linux-2.6.37.1/drivers/infiniband/hw/qib/qib.h 2011-01-17 02:41:01.000000000 -0500
24574 @@ -51,6 +51,7 @@
24575 #include <linux/completion.h>
24576 #include <linux/kref.h>
24577 @@ -25154,9 +25224,9 @@ diff -urNp linux-2.6.37/drivers/infiniband/hw/qib/qib.h linux-2.6.37/drivers/inf
24578
24579 #include "qib_common.h"
24580 #include "qib_verbs.h"
24581 -diff -urNp linux-2.6.37/drivers/input/keyboard/atkbd.c linux-2.6.37/drivers/input/keyboard/atkbd.c
24582 ---- linux-2.6.37/drivers/input/keyboard/atkbd.c 2011-01-04 19:50:19.000000000 -0500
24583 -+++ linux-2.6.37/drivers/input/keyboard/atkbd.c 2011-01-17 02:41:01.000000000 -0500
24584 +diff -urNp linux-2.6.37.1/drivers/input/keyboard/atkbd.c linux-2.6.37.1/drivers/input/keyboard/atkbd.c
24585 +--- linux-2.6.37.1/drivers/input/keyboard/atkbd.c 2011-01-04 19:50:19.000000000 -0500
24586 ++++ linux-2.6.37.1/drivers/input/keyboard/atkbd.c 2011-01-17 02:41:01.000000000 -0500
24587 @@ -1250,7 +1250,7 @@ static struct serio_device_id atkbd_seri
24588 .id = SERIO_ANY,
24589 .extra = SERIO_ANY,
24590 @@ -25166,9 +25236,9 @@ diff -urNp linux-2.6.37/drivers/input/keyboard/atkbd.c linux-2.6.37/drivers/inpu
24591 };
24592
24593 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
24594 -diff -urNp linux-2.6.37/drivers/input/mouse/lifebook.c linux-2.6.37/drivers/input/mouse/lifebook.c
24595 ---- linux-2.6.37/drivers/input/mouse/lifebook.c 2011-01-04 19:50:19.000000000 -0500
24596 -+++ linux-2.6.37/drivers/input/mouse/lifebook.c 2011-01-17 02:41:01.000000000 -0500
24597 +diff -urNp linux-2.6.37.1/drivers/input/mouse/lifebook.c linux-2.6.37.1/drivers/input/mouse/lifebook.c
24598 +--- linux-2.6.37.1/drivers/input/mouse/lifebook.c 2011-01-04 19:50:19.000000000 -0500
24599 ++++ linux-2.6.37.1/drivers/input/mouse/lifebook.c 2011-01-17 02:41:01.000000000 -0500
24600 @@ -123,7 +123,7 @@ static const struct dmi_system_id __init
24601 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
24602 },
24603 @@ -25178,9 +25248,9 @@ diff -urNp linux-2.6.37/drivers/input/mouse/lifebook.c linux-2.6.37/drivers/inpu
24604 };
24605
24606 void __init lifebook_module_init(void)
24607 -diff -urNp linux-2.6.37/drivers/input/mouse/psmouse-base.c linux-2.6.37/drivers/input/mouse/psmouse-base.c
24608 ---- linux-2.6.37/drivers/input/mouse/psmouse-base.c 2011-01-04 19:50:19.000000000 -0500
24609 -+++ linux-2.6.37/drivers/input/mouse/psmouse-base.c 2011-01-17 02:41:01.000000000 -0500
24610 +diff -urNp linux-2.6.37.1/drivers/input/mouse/psmouse-base.c linux-2.6.37.1/drivers/input/mouse/psmouse-base.c
24611 +--- linux-2.6.37.1/drivers/input/mouse/psmouse-base.c 2011-01-04 19:50:19.000000000 -0500
24612 ++++ linux-2.6.37.1/drivers/input/mouse/psmouse-base.c 2011-01-17 02:41:01.000000000 -0500
24613 @@ -1462,7 +1462,7 @@ static struct serio_device_id psmouse_se
24614 .id = SERIO_ANY,
24615 .extra = SERIO_ANY,
24616 @@ -25190,9 +25260,9 @@ diff -urNp linux-2.6.37/drivers/input/mouse/psmouse-base.c linux-2.6.37/drivers/
24617 };
24618
24619 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
24620 -diff -urNp linux-2.6.37/drivers/input/mouse/synaptics.c linux-2.6.37/drivers/input/mouse/synaptics.c
24621 ---- linux-2.6.37/drivers/input/mouse/synaptics.c 2011-01-04 19:50:19.000000000 -0500
24622 -+++ linux-2.6.37/drivers/input/mouse/synaptics.c 2011-01-17 02:41:01.000000000 -0500
24623 +diff -urNp linux-2.6.37.1/drivers/input/mouse/synaptics.c linux-2.6.37.1/drivers/input/mouse/synaptics.c
24624 +--- linux-2.6.37.1/drivers/input/mouse/synaptics.c 2011-01-04 19:50:19.000000000 -0500
24625 ++++ linux-2.6.37.1/drivers/input/mouse/synaptics.c 2011-01-17 02:41:01.000000000 -0500
24626 @@ -499,7 +499,7 @@ static void synaptics_process_packet(str
24627 break;
24628 case 2:
24629 @@ -25221,9 +25291,9 @@ diff -urNp linux-2.6.37/drivers/input/mouse/synaptics.c linux-2.6.37/drivers/inp
24630 #endif
24631 };
24632
24633 -diff -urNp linux-2.6.37/drivers/input/mousedev.c linux-2.6.37/drivers/input/mousedev.c
24634 ---- linux-2.6.37/drivers/input/mousedev.c 2011-01-04 19:50:19.000000000 -0500
24635 -+++ linux-2.6.37/drivers/input/mousedev.c 2011-01-17 02:41:01.000000000 -0500
24636 +diff -urNp linux-2.6.37.1/drivers/input/mousedev.c linux-2.6.37.1/drivers/input/mousedev.c
24637 +--- linux-2.6.37.1/drivers/input/mousedev.c 2011-01-04 19:50:19.000000000 -0500
24638 ++++ linux-2.6.37.1/drivers/input/mousedev.c 2011-01-17 02:41:01.000000000 -0500
24639 @@ -762,7 +762,7 @@ static ssize_t mousedev_read(struct file
24640
24641 spin_unlock_irq(&client->packet_lock);
24642 @@ -25242,9 +25312,9 @@ diff -urNp linux-2.6.37/drivers/input/mousedev.c linux-2.6.37/drivers/input/mous
24643 };
24644 static int psaux_registered;
24645 #endif
24646 -diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h
24647 ---- linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h 2011-01-04 19:50:19.000000000 -0500
24648 -+++ linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h 2011-01-17 02:41:01.000000000 -0500
24649 +diff -urNp linux-2.6.37.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37.1/drivers/input/serio/i8042-x86ia64io.h
24650 +--- linux-2.6.37.1/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:05:30.000000000 -0500
24651 ++++ linux-2.6.37.1/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:11:44.000000000 -0500
24652 @@ -183,7 +183,7 @@ static const struct dmi_system_id __init
24653 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
24654 },
24655 @@ -25254,8 +25324,8 @@ diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drive
24656 };
24657
24658 /*
24659 -@@ -424,7 +424,7 @@ static const struct dmi_system_id __init
24660 - DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
24661 +@@ -431,7 +431,7 @@ static const struct dmi_system_id __init
24662 + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),
24663 },
24664 },
24665 - { }
24666 @@ -25263,7 +25333,7 @@ diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drive
24667 };
24668
24669 static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
24670 -@@ -498,7 +498,7 @@ static const struct dmi_system_id __init
24671 +@@ -505,7 +505,7 @@ static const struct dmi_system_id __init
24672 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
24673 },
24674 },
24675 @@ -25272,7 +25342,7 @@ diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drive
24676 };
24677
24678 #ifdef CONFIG_PNP
24679 -@@ -517,7 +517,7 @@ static const struct dmi_system_id __init
24680 +@@ -524,7 +524,7 @@ static const struct dmi_system_id __init
24681 DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
24682 },
24683 },
24684 @@ -25281,7 +25351,7 @@ diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drive
24685 };
24686
24687 static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
24688 -@@ -541,7 +541,7 @@ static const struct dmi_system_id __init
24689 +@@ -548,7 +548,7 @@ static const struct dmi_system_id __init
24690 DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
24691 },
24692 },
24693 @@ -25290,7 +25360,7 @@ diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drive
24694 };
24695 #endif
24696
24697 -@@ -615,7 +615,7 @@ static const struct dmi_system_id __init
24698 +@@ -633,7 +633,7 @@ static const struct dmi_system_id __init
24699 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
24700 },
24701 },
24702 @@ -25299,9 +25369,9 @@ diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drive
24703 };
24704
24705 #endif /* CONFIG_X86 */
24706 -diff -urNp linux-2.6.37/drivers/input/serio/serio_raw.c linux-2.6.37/drivers/input/serio/serio_raw.c
24707 ---- linux-2.6.37/drivers/input/serio/serio_raw.c 2011-01-04 19:50:19.000000000 -0500
24708 -+++ linux-2.6.37/drivers/input/serio/serio_raw.c 2011-01-17 02:41:01.000000000 -0500
24709 +diff -urNp linux-2.6.37.1/drivers/input/serio/serio_raw.c linux-2.6.37.1/drivers/input/serio/serio_raw.c
24710 +--- linux-2.6.37.1/drivers/input/serio/serio_raw.c 2011-01-04 19:50:19.000000000 -0500
24711 ++++ linux-2.6.37.1/drivers/input/serio/serio_raw.c 2011-01-17 02:41:01.000000000 -0500
24712 @@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_
24713 .id = SERIO_ANY,
24714 .extra = SERIO_ANY,
24715 @@ -25311,9 +25381,9 @@ diff -urNp linux-2.6.37/drivers/input/serio/serio_raw.c linux-2.6.37/drivers/inp
24716 };
24717
24718 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
24719 -diff -urNp linux-2.6.37/drivers/isdn/gigaset/common.c linux-2.6.37/drivers/isdn/gigaset/common.c
24720 ---- linux-2.6.37/drivers/isdn/gigaset/common.c 2011-01-04 19:50:19.000000000 -0500
24721 -+++ linux-2.6.37/drivers/isdn/gigaset/common.c 2011-01-24 18:04:15.000000000 -0500
24722 +diff -urNp linux-2.6.37.1/drivers/isdn/gigaset/common.c linux-2.6.37.1/drivers/isdn/gigaset/common.c
24723 +--- linux-2.6.37.1/drivers/isdn/gigaset/common.c 2011-01-04 19:50:19.000000000 -0500
24724 ++++ linux-2.6.37.1/drivers/isdn/gigaset/common.c 2011-01-24 18:04:15.000000000 -0500
24725 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
24726 cs->commands_pending = 0;
24727 cs->cur_at_seq = 0;
24728 @@ -25323,9 +25393,9 @@ diff -urNp linux-2.6.37/drivers/isdn/gigaset/common.c linux-2.6.37/drivers/isdn/
24729 cs->dev = NULL;
24730 cs->tty = NULL;
24731 cs->tty_dev = NULL;
24732 -diff -urNp linux-2.6.37/drivers/isdn/gigaset/gigaset.h linux-2.6.37/drivers/isdn/gigaset/gigaset.h
24733 ---- linux-2.6.37/drivers/isdn/gigaset/gigaset.h 2011-01-04 19:50:19.000000000 -0500
24734 -+++ linux-2.6.37/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:56.000000000 -0500
24735 +diff -urNp linux-2.6.37.1/drivers/isdn/gigaset/gigaset.h linux-2.6.37.1/drivers/isdn/gigaset/gigaset.h
24736 +--- linux-2.6.37.1/drivers/isdn/gigaset/gigaset.h 2011-01-04 19:50:19.000000000 -0500
24737 ++++ linux-2.6.37.1/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:56.000000000 -0500
24738 @@ -35,6 +35,7 @@
24739 #include <linux/tty_driver.h>
24740 #include <linux/list.h>
24741 @@ -25343,9 +25413,9 @@ diff -urNp linux-2.6.37/drivers/isdn/gigaset/gigaset.h linux-2.6.37/drivers/isdn
24742 struct tty_struct *tty;
24743 struct tasklet_struct if_wake_tasklet;
24744 unsigned control_state;
24745 -diff -urNp linux-2.6.37/drivers/isdn/gigaset/interface.c linux-2.6.37/drivers/isdn/gigaset/interface.c
24746 ---- linux-2.6.37/drivers/isdn/gigaset/interface.c 2011-01-04 19:50:19.000000000 -0500
24747 -+++ linux-2.6.37/drivers/isdn/gigaset/interface.c 2011-01-24 18:04:15.000000000 -0500
24748 +diff -urNp linux-2.6.37.1/drivers/isdn/gigaset/interface.c linux-2.6.37.1/drivers/isdn/gigaset/interface.c
24749 +--- linux-2.6.37.1/drivers/isdn/gigaset/interface.c 2011-01-04 19:50:19.000000000 -0500
24750 ++++ linux-2.6.37.1/drivers/isdn/gigaset/interface.c 2011-01-24 18:04:15.000000000 -0500
24751 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
24752 return -ERESTARTSYS;
24753 tty->driver_data = cs;
24754 @@ -25433,9 +25503,9 @@ diff -urNp linux-2.6.37/drivers/isdn/gigaset/interface.c linux-2.6.37/drivers/is
24755 dev_warn(cs->dev, "%s: device not opened\n", __func__);
24756 goto out;
24757 }
24758 -diff -urNp linux-2.6.37/drivers/isdn/hardware/avm/b1.c linux-2.6.37/drivers/isdn/hardware/avm/b1.c
24759 ---- linux-2.6.37/drivers/isdn/hardware/avm/b1.c 2011-01-04 19:50:19.000000000 -0500
24760 -+++ linux-2.6.37/drivers/isdn/hardware/avm/b1.c 2011-01-17 02:41:01.000000000 -0500
24761 +diff -urNp linux-2.6.37.1/drivers/isdn/hardware/avm/b1.c linux-2.6.37.1/drivers/isdn/hardware/avm/b1.c
24762 +--- linux-2.6.37.1/drivers/isdn/hardware/avm/b1.c 2011-01-04 19:50:19.000000000 -0500
24763 ++++ linux-2.6.37.1/drivers/isdn/hardware/avm/b1.c 2011-01-17 02:41:01.000000000 -0500
24764 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
24765 }
24766 if (left) {
24767 @@ -25454,9 +25524,9 @@ diff -urNp linux-2.6.37/drivers/isdn/hardware/avm/b1.c linux-2.6.37/drivers/isdn
24768 return -EFAULT;
24769 } else {
24770 memcpy(buf, dp, left);
24771 -diff -urNp linux-2.6.37/drivers/isdn/icn/icn.c linux-2.6.37/drivers/isdn/icn/icn.c
24772 ---- linux-2.6.37/drivers/isdn/icn/icn.c 2011-01-04 19:50:19.000000000 -0500
24773 -+++ linux-2.6.37/drivers/isdn/icn/icn.c 2011-01-17 02:41:01.000000000 -0500
24774 +diff -urNp linux-2.6.37.1/drivers/isdn/icn/icn.c linux-2.6.37.1/drivers/isdn/icn/icn.c
24775 +--- linux-2.6.37.1/drivers/isdn/icn/icn.c 2011-01-04 19:50:19.000000000 -0500
24776 ++++ linux-2.6.37.1/drivers/isdn/icn/icn.c 2011-01-17 02:41:01.000000000 -0500
24777 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
24778 if (count > len)
24779 count = len;
24780 @@ -25466,9 +25536,9 @@ diff -urNp linux-2.6.37/drivers/isdn/icn/icn.c linux-2.6.37/drivers/isdn/icn/icn
24781 return -EFAULT;
24782 } else
24783 memcpy(msg, buf, count);
24784 -diff -urNp linux-2.6.37/drivers/lguest/core.c linux-2.6.37/drivers/lguest/core.c
24785 ---- linux-2.6.37/drivers/lguest/core.c 2011-01-04 19:50:19.000000000 -0500
24786 -+++ linux-2.6.37/drivers/lguest/core.c 2011-01-17 02:41:01.000000000 -0500
24787 +diff -urNp linux-2.6.37.1/drivers/lguest/core.c linux-2.6.37.1/drivers/lguest/core.c
24788 +--- linux-2.6.37.1/drivers/lguest/core.c 2011-01-04 19:50:19.000000000 -0500
24789 ++++ linux-2.6.37.1/drivers/lguest/core.c 2011-01-17 02:41:01.000000000 -0500
24790 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
24791 * it's worked so far. The end address needs +1 because __get_vm_area
24792 * allocates an extra guard page, so we need space for that.
24793 @@ -25496,9 +25566,9 @@ diff -urNp linux-2.6.37/drivers/lguest/core.c linux-2.6.37/drivers/lguest/core.c
24794 end_switcher_text - start_switcher_text);
24795
24796 printk(KERN_INFO "lguest: mapped switcher at %p\n",
24797 -diff -urNp linux-2.6.37/drivers/lguest/x86/core.c linux-2.6.37/drivers/lguest/x86/core.c
24798 ---- linux-2.6.37/drivers/lguest/x86/core.c 2011-01-04 19:50:19.000000000 -0500
24799 -+++ linux-2.6.37/drivers/lguest/x86/core.c 2011-01-17 02:41:01.000000000 -0500
24800 +diff -urNp linux-2.6.37.1/drivers/lguest/x86/core.c linux-2.6.37.1/drivers/lguest/x86/core.c
24801 +--- linux-2.6.37.1/drivers/lguest/x86/core.c 2011-01-04 19:50:19.000000000 -0500
24802 ++++ linux-2.6.37.1/drivers/lguest/x86/core.c 2011-01-17 02:41:01.000000000 -0500
24803 @@ -59,7 +59,7 @@ static struct {
24804 /* Offset from where switcher.S was compiled to where we've copied it */
24805 static unsigned long switcher_offset(void)
24806 @@ -25540,9 +25610,9 @@ diff -urNp linux-2.6.37/drivers/lguest/x86/core.c linux-2.6.37/drivers/lguest/x8
24807 lguest_entry.segment = LGUEST_CS;
24808
24809 /*
24810 -diff -urNp linux-2.6.37/drivers/lguest/x86/switcher_32.S linux-2.6.37/drivers/lguest/x86/switcher_32.S
24811 ---- linux-2.6.37/drivers/lguest/x86/switcher_32.S 2011-01-04 19:50:19.000000000 -0500
24812 -+++ linux-2.6.37/drivers/lguest/x86/switcher_32.S 2011-01-17 02:41:01.000000000 -0500
24813 +diff -urNp linux-2.6.37.1/drivers/lguest/x86/switcher_32.S linux-2.6.37.1/drivers/lguest/x86/switcher_32.S
24814 +--- linux-2.6.37.1/drivers/lguest/x86/switcher_32.S 2011-01-04 19:50:19.000000000 -0500
24815 ++++ linux-2.6.37.1/drivers/lguest/x86/switcher_32.S 2011-01-17 02:41:01.000000000 -0500
24816 @@ -87,6 +87,7 @@
24817 #include <asm/page.h>
24818 #include <asm/segment.h>
24819 @@ -25601,9 +25671,9 @@ diff -urNp linux-2.6.37/drivers/lguest/x86/switcher_32.S linux-2.6.37/drivers/lg
24820
24821 // Every interrupt can come to us here
24822 // But we must truly tell each apart.
24823 -diff -urNp linux-2.6.37/drivers/macintosh/via-pmu-backlight.c linux-2.6.37/drivers/macintosh/via-pmu-backlight.c
24824 ---- linux-2.6.37/drivers/macintosh/via-pmu-backlight.c 2011-01-04 19:50:19.000000000 -0500
24825 -+++ linux-2.6.37/drivers/macintosh/via-pmu-backlight.c 2011-01-17 02:41:01.000000000 -0500
24826 +diff -urNp linux-2.6.37.1/drivers/macintosh/via-pmu-backlight.c linux-2.6.37.1/drivers/macintosh/via-pmu-backlight.c
24827 +--- linux-2.6.37.1/drivers/macintosh/via-pmu-backlight.c 2011-01-04 19:50:19.000000000 -0500
24828 ++++ linux-2.6.37.1/drivers/macintosh/via-pmu-backlight.c 2011-01-17 02:41:01.000000000 -0500
24829 @@ -15,7 +15,7 @@
24830
24831 #define MAX_PMU_LEVEL 0xFF
24832 @@ -25622,9 +25692,9 @@ diff -urNp linux-2.6.37/drivers/macintosh/via-pmu-backlight.c linux-2.6.37/drive
24833 .get_brightness = pmu_backlight_get_brightness,
24834 .update_status = pmu_backlight_update_status,
24835
24836 -diff -urNp linux-2.6.37/drivers/macintosh/via-pmu.c linux-2.6.37/drivers/macintosh/via-pmu.c
24837 ---- linux-2.6.37/drivers/macintosh/via-pmu.c 2011-01-04 19:50:19.000000000 -0500
24838 -+++ linux-2.6.37/drivers/macintosh/via-pmu.c 2011-01-17 02:41:01.000000000 -0500
24839 +diff -urNp linux-2.6.37.1/drivers/macintosh/via-pmu.c linux-2.6.37.1/drivers/macintosh/via-pmu.c
24840 +--- linux-2.6.37.1/drivers/macintosh/via-pmu.c 2011-01-04 19:50:19.000000000 -0500
24841 ++++ linux-2.6.37.1/drivers/macintosh/via-pmu.c 2011-01-17 02:41:01.000000000 -0500
24842 @@ -2257,7 +2257,7 @@ static int pmu_sleep_valid(suspend_state
24843 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
24844 }
24845 @@ -25634,9 +25704,9 @@ diff -urNp linux-2.6.37/drivers/macintosh/via-pmu.c linux-2.6.37/drivers/macinto
24846 .enter = powerbook_sleep,
24847 .valid = pmu_sleep_valid,
24848 };
24849 -diff -urNp linux-2.6.37/drivers/md/bitmap.c linux-2.6.37/drivers/md/bitmap.c
24850 ---- linux-2.6.37/drivers/md/bitmap.c 2011-01-04 19:50:19.000000000 -0500
24851 -+++ linux-2.6.37/drivers/md/bitmap.c 2011-01-17 02:41:01.000000000 -0500
24852 +diff -urNp linux-2.6.37.1/drivers/md/bitmap.c linux-2.6.37.1/drivers/md/bitmap.c
24853 +--- linux-2.6.37.1/drivers/md/bitmap.c 2011-01-04 19:50:19.000000000 -0500
24854 ++++ linux-2.6.37.1/drivers/md/bitmap.c 2011-01-17 02:41:01.000000000 -0500
24855 @@ -55,7 +55,7 @@
24856 # if DEBUG > 0
24857 # define PRINTK(x...) printk(KERN_DEBUG x)
24858 @@ -25646,9 +25716,9 @@ diff -urNp linux-2.6.37/drivers/md/bitmap.c linux-2.6.37/drivers/md/bitmap.c
24859 # endif
24860 #endif
24861
24862 -diff -urNp linux-2.6.37/drivers/md/dm-table.c linux-2.6.37/drivers/md/dm-table.c
24863 ---- linux-2.6.37/drivers/md/dm-table.c 2011-01-04 19:50:19.000000000 -0500
24864 -+++ linux-2.6.37/drivers/md/dm-table.c 2011-01-17 02:41:01.000000000 -0500
24865 +diff -urNp linux-2.6.37.1/drivers/md/dm-table.c linux-2.6.37.1/drivers/md/dm-table.c
24866 +--- linux-2.6.37.1/drivers/md/dm-table.c 2011-01-04 19:50:19.000000000 -0500
24867 ++++ linux-2.6.37.1/drivers/md/dm-table.c 2011-01-17 02:41:01.000000000 -0500
24868 @@ -366,7 +366,7 @@ static int device_area_is_invalid(struct
24869 if (!dev_size)
24870 return 0;
24871 @@ -25658,10 +25728,10 @@ diff -urNp linux-2.6.37/drivers/md/dm-table.c linux-2.6.37/drivers/md/dm-table.c
24872 DMWARN("%s: %s too small for target: "
24873 "start=%llu, len=%llu, dev_size=%llu",
24874 dm_device_name(ti->table->md), bdevname(bdev, b),
24875 -diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
24876 ---- linux-2.6.37/drivers/md/md.c 2011-01-04 19:50:19.000000000 -0500
24877 -+++ linux-2.6.37/drivers/md/md.c 2011-01-17 02:41:01.000000000 -0500
24878 -@@ -1875,7 +1875,7 @@ static int bind_rdev_to_array(mdk_rdev_t
24879 +diff -urNp linux-2.6.37.1/drivers/md/md.c linux-2.6.37.1/drivers/md/md.c
24880 +--- linux-2.6.37.1/drivers/md/md.c 2011-02-22 16:05:30.000000000 -0500
24881 ++++ linux-2.6.37.1/drivers/md/md.c 2011-02-22 16:05:42.000000000 -0500
24882 +@@ -1882,7 +1882,7 @@ static int bind_rdev_to_array(mdk_rdev_t
24883
24884 ko = &part_to_dev(rdev->bdev->bd_part)->kobj;
24885 if (sysfs_create_link(&rdev->kobj, ko, "block"))
24886 @@ -25670,7 +25740,7 @@ diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
24887 rdev->sysfs_state = sysfs_get_dirent_safe(rdev->kobj.sd, "state");
24888
24889 list_add_rcu(&rdev->same_set, &mddev->disks);
24890 -@@ -2487,7 +2487,7 @@ slot_store(mdk_rdev_t *rdev, const char
24891 +@@ -2494,7 +2494,7 @@ slot_store(mdk_rdev_t *rdev, const char
24892 sysfs_notify_dirent_safe(rdev->sysfs_state);
24893 sprintf(nm, "rd%d", rdev->raid_disk);
24894 if (sysfs_create_link(&rdev->mddev->kobj, &rdev->kobj, nm))
24895 @@ -25679,7 +25749,7 @@ diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
24896 /* don't wakeup anyone, leave that to userspace. */
24897 } else {
24898 if (slot >= rdev->mddev->raid_disks)
24899 -@@ -4570,7 +4570,7 @@ int md_run(mddev_t *mddev)
24900 +@@ -4578,7 +4578,7 @@ int md_run(mddev_t *mddev)
24901 char nm[20];
24902 sprintf(nm, "rd%d", rdev->raid_disk);
24903 if (sysfs_create_link(&mddev->kobj, &rdev->kobj, nm))
24904 @@ -25688,7 +25758,7 @@ diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
24905 }
24906
24907 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
24908 -@@ -6408,7 +6408,7 @@ static int md_seq_show(struct seq_file *
24909 +@@ -6419,7 +6419,7 @@ static int md_seq_show(struct seq_file *
24910 chunk_kb ? "KB" : "B");
24911 if (bitmap->file) {
24912 seq_printf(seq, ", file: ");
24913 @@ -25697,7 +25767,7 @@ diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
24914 }
24915
24916 seq_printf(seq, "\n");
24917 -@@ -6502,7 +6502,7 @@ static int is_mddev_idle(mddev_t *mddev,
24918 +@@ -6513,7 +6513,7 @@ static int is_mddev_idle(mddev_t *mddev,
24919 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
24920 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
24921 (int)part_stat_read(&disk->part0, sectors[1]) -
24922 @@ -25706,7 +25776,7 @@ diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
24923 /* sync IO will cause sync_io to increase before the disk_stats
24924 * as sync_io is counted when a request starts, and
24925 * disk_stats is counted when it completes.
24926 -@@ -7020,7 +7020,7 @@ static int remove_and_add_spares(mddev_t
24927 +@@ -7031,7 +7031,7 @@ static int remove_and_add_spares(mddev_t
24928 sprintf(nm, "rd%d", rdev->raid_disk);
24929 if (sysfs_create_link(&mddev->kobj,
24930 &rdev->kobj, nm))
24931 @@ -25715,10 +25785,10 @@ diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
24932 spares++;
24933 md_new_event(mddev);
24934 set_bit(MD_CHANGE_DEVS, &mddev->flags);
24935 -diff -urNp linux-2.6.37/drivers/md/md.h linux-2.6.37/drivers/md/md.h
24936 ---- linux-2.6.37/drivers/md/md.h 2011-01-04 19:50:19.000000000 -0500
24937 -+++ linux-2.6.37/drivers/md/md.h 2011-01-17 02:41:01.000000000 -0500
24938 -@@ -353,7 +353,7 @@ static inline void rdev_dec_pending(mdk_
24939 +diff -urNp linux-2.6.37.1/drivers/md/md.h linux-2.6.37.1/drivers/md/md.h
24940 +--- linux-2.6.37.1/drivers/md/md.h 2011-02-22 16:05:30.000000000 -0500
24941 ++++ linux-2.6.37.1/drivers/md/md.h 2011-02-22 16:05:42.000000000 -0500
24942 +@@ -354,7 +354,7 @@ static inline void rdev_dec_pending(mdk_
24943
24944 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
24945 {
24946 @@ -25727,9 +25797,9 @@ diff -urNp linux-2.6.37/drivers/md/md.h linux-2.6.37/drivers/md/md.h
24947 }
24948
24949 struct mdk_personality
24950 -diff -urNp linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c
24951 ---- linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-04 19:50:19.000000000 -0500
24952 -+++ linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-17 02:41:01.000000000 -0500
24953 +diff -urNp linux-2.6.37.1/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.37.1/drivers/media/dvb/dvb-core/dvbdev.c
24954 +--- linux-2.6.37.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-04 19:50:19.000000000 -0500
24955 ++++ linux-2.6.37.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-01-17 02:41:01.000000000 -0500
24956 @@ -192,6 +192,7 @@ int dvb_register_device(struct dvb_adapt
24957 const struct dvb_device *template, void *priv, int type)
24958 {
24959 @@ -25738,9 +25808,9 @@ diff -urNp linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.37/drivers
24960 struct file_operations *dvbdevfops;
24961 struct device *clsdev;
24962 int minor;
24963 -diff -urNp linux-2.6.37/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.37/drivers/media/dvb/ttpci/av7110_ca.c
24964 ---- linux-2.6.37/drivers/media/dvb/ttpci/av7110_ca.c 2011-01-04 19:50:19.000000000 -0500
24965 -+++ linux-2.6.37/drivers/media/dvb/ttpci/av7110_ca.c 2011-01-24 18:13:05.000000000 -0500
24966 +diff -urNp linux-2.6.37.1/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.37.1/drivers/media/dvb/ttpci/av7110_ca.c
24967 +--- linux-2.6.37.1/drivers/media/dvb/ttpci/av7110_ca.c 2011-01-04 19:50:19.000000000 -0500
24968 ++++ linux-2.6.37.1/drivers/media/dvb/ttpci/av7110_ca.c 2011-01-24 18:13:05.000000000 -0500
24969 @@ -277,7 +277,7 @@ static int dvb_ca_ioctl(struct file *fil
24970 {
24971 ca_slot_info_t *info=(ca_slot_info_t *)parg;
24972 @@ -25750,9 +25820,9 @@ diff -urNp linux-2.6.37/drivers/media/dvb/ttpci/av7110_ca.c linux-2.6.37/drivers
24973 return -EINVAL;
24974 av7110->ci_slot[info->num].num = info->num;
24975 av7110->ci_slot[info->num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ?
24976 -diff -urNp linux-2.6.37/drivers/media/IR/ir-lirc-codec.c linux-2.6.37/drivers/media/IR/ir-lirc-codec.c
24977 ---- linux-2.6.37/drivers/media/IR/ir-lirc-codec.c 2011-01-04 19:50:19.000000000 -0500
24978 -+++ linux-2.6.37/drivers/media/IR/ir-lirc-codec.c 2011-01-17 02:41:01.000000000 -0500
24979 +diff -urNp linux-2.6.37.1/drivers/media/IR/ir-lirc-codec.c linux-2.6.37.1/drivers/media/IR/ir-lirc-codec.c
24980 +--- linux-2.6.37.1/drivers/media/IR/ir-lirc-codec.c 2011-01-04 19:50:19.000000000 -0500
24981 ++++ linux-2.6.37.1/drivers/media/IR/ir-lirc-codec.c 2011-01-17 02:41:01.000000000 -0500
24982 @@ -275,7 +275,7 @@ static void ir_lirc_close(void *data)
24983 return;
24984 }
24985 @@ -25762,9 +25832,9 @@ diff -urNp linux-2.6.37/drivers/media/IR/ir-lirc-codec.c linux-2.6.37/drivers/me
24986 .owner = THIS_MODULE,
24987 .write = ir_lirc_transmit_ir,
24988 .unlocked_ioctl = ir_lirc_ioctl,
24989 -diff -urNp linux-2.6.37/drivers/media/IR/lirc_dev.c linux-2.6.37/drivers/media/IR/lirc_dev.c
24990 ---- linux-2.6.37/drivers/media/IR/lirc_dev.c 2011-01-04 19:50:19.000000000 -0500
24991 -+++ linux-2.6.37/drivers/media/IR/lirc_dev.c 2011-01-17 02:41:01.000000000 -0500
24992 +diff -urNp linux-2.6.37.1/drivers/media/IR/lirc_dev.c linux-2.6.37.1/drivers/media/IR/lirc_dev.c
24993 +--- linux-2.6.37.1/drivers/media/IR/lirc_dev.c 2011-01-04 19:50:19.000000000 -0500
24994 ++++ linux-2.6.37.1/drivers/media/IR/lirc_dev.c 2011-01-17 02:41:01.000000000 -0500
24995 @@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
24996 }
24997
24998 @@ -25774,9 +25844,9 @@ diff -urNp linux-2.6.37/drivers/media/IR/lirc_dev.c linux-2.6.37/drivers/media/I
24999 .owner = THIS_MODULE,
25000 .read = lirc_dev_fop_read,
25001 .write = lirc_dev_fop_write,
25002 -diff -urNp linux-2.6.37/drivers/media/radio/radio-cadet.c linux-2.6.37/drivers/media/radio/radio-cadet.c
25003 ---- linux-2.6.37/drivers/media/radio/radio-cadet.c 2011-01-04 19:50:19.000000000 -0500
25004 -+++ linux-2.6.37/drivers/media/radio/radio-cadet.c 2011-01-17 02:41:01.000000000 -0500
25005 +diff -urNp linux-2.6.37.1/drivers/media/radio/radio-cadet.c linux-2.6.37.1/drivers/media/radio/radio-cadet.c
25006 +--- linux-2.6.37.1/drivers/media/radio/radio-cadet.c 2011-01-04 19:50:19.000000000 -0500
25007 ++++ linux-2.6.37.1/drivers/media/radio/radio-cadet.c 2011-01-17 02:41:01.000000000 -0500
25008 @@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f
25009 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
25010 mutex_unlock(&dev->lock);
25011 @@ -25786,9 +25856,9 @@ diff -urNp linux-2.6.37/drivers/media/radio/radio-cadet.c linux-2.6.37/drivers/m
25012 return -EFAULT;
25013 return i;
25014 }
25015 -diff -urNp linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c
25016 ---- linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c 2011-01-04 19:50:19.000000000 -0500
25017 -+++ linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c 2011-01-17 02:41:01.000000000 -0500
25018 +diff -urNp linux-2.6.37.1/drivers/media/video/saa7164/saa7164-core.c linux-2.6.37.1/drivers/media/video/saa7164/saa7164-core.c
25019 +--- linux-2.6.37.1/drivers/media/video/saa7164/saa7164-core.c 2011-01-04 19:50:19.000000000 -0500
25020 ++++ linux-2.6.37.1/drivers/media/video/saa7164/saa7164-core.c 2011-01-17 02:41:01.000000000 -0500
25021 @@ -1169,7 +1169,7 @@ static int saa7164_proc_open(struct inod
25022 return single_open(filp, saa7164_proc_show, NULL);
25023 }
25024 @@ -25798,9 +25868,9 @@ diff -urNp linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c linux-2.6.37/
25025 .open = saa7164_proc_open,
25026 .read = seq_read,
25027 .llseek = seq_lseek,
25028 -diff -urNp linux-2.6.37/drivers/message/fusion/mptbase.c linux-2.6.37/drivers/message/fusion/mptbase.c
25029 ---- linux-2.6.37/drivers/message/fusion/mptbase.c 2011-01-04 19:50:19.000000000 -0500
25030 -+++ linux-2.6.37/drivers/message/fusion/mptbase.c 2011-01-17 02:41:01.000000000 -0500
25031 +diff -urNp linux-2.6.37.1/drivers/message/fusion/mptbase.c linux-2.6.37.1/drivers/message/fusion/mptbase.c
25032 +--- linux-2.6.37.1/drivers/message/fusion/mptbase.c 2011-01-04 19:50:19.000000000 -0500
25033 ++++ linux-2.6.37.1/drivers/message/fusion/mptbase.c 2011-01-17 02:41:01.000000000 -0500
25034 @@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct
25035 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
25036 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
25037 @@ -25815,9 +25885,9 @@ diff -urNp linux-2.6.37/drivers/message/fusion/mptbase.c linux-2.6.37/drivers/me
25038 /*
25039 * Rounding UP to nearest 4-kB boundary here...
25040 */
25041 -diff -urNp linux-2.6.37/drivers/message/fusion/mptdebug.h linux-2.6.37/drivers/message/fusion/mptdebug.h
25042 ---- linux-2.6.37/drivers/message/fusion/mptdebug.h 2011-01-04 19:50:19.000000000 -0500
25043 -+++ linux-2.6.37/drivers/message/fusion/mptdebug.h 2011-01-17 02:41:01.000000000 -0500
25044 +diff -urNp linux-2.6.37.1/drivers/message/fusion/mptdebug.h linux-2.6.37.1/drivers/message/fusion/mptdebug.h
25045 +--- linux-2.6.37.1/drivers/message/fusion/mptdebug.h 2011-01-04 19:50:19.000000000 -0500
25046 ++++ linux-2.6.37.1/drivers/message/fusion/mptdebug.h 2011-01-17 02:41:01.000000000 -0500
25047 @@ -71,7 +71,7 @@
25048 CMD; \
25049 }
25050 @@ -25827,9 +25897,9 @@ diff -urNp linux-2.6.37/drivers/message/fusion/mptdebug.h linux-2.6.37/drivers/m
25051 #endif
25052
25053
25054 -diff -urNp linux-2.6.37/drivers/message/fusion/mptsas.c linux-2.6.37/drivers/message/fusion/mptsas.c
25055 ---- linux-2.6.37/drivers/message/fusion/mptsas.c 2011-01-04 19:50:19.000000000 -0500
25056 -+++ linux-2.6.37/drivers/message/fusion/mptsas.c 2011-01-17 02:41:01.000000000 -0500
25057 +diff -urNp linux-2.6.37.1/drivers/message/fusion/mptsas.c linux-2.6.37.1/drivers/message/fusion/mptsas.c
25058 +--- linux-2.6.37.1/drivers/message/fusion/mptsas.c 2011-01-04 19:50:19.000000000 -0500
25059 ++++ linux-2.6.37.1/drivers/message/fusion/mptsas.c 2011-01-17 02:41:01.000000000 -0500
25060 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
25061 return 0;
25062 }
25063 @@ -25878,9 +25948,9 @@ diff -urNp linux-2.6.37/drivers/message/fusion/mptsas.c linux-2.6.37/drivers/mes
25064 static inline struct sas_port *
25065 mptsas_get_port(struct mptsas_phyinfo *phy_info)
25066 {
25067 -diff -urNp linux-2.6.37/drivers/message/fusion/mptscsih.c linux-2.6.37/drivers/message/fusion/mptscsih.c
25068 ---- linux-2.6.37/drivers/message/fusion/mptscsih.c 2011-01-04 19:50:19.000000000 -0500
25069 -+++ linux-2.6.37/drivers/message/fusion/mptscsih.c 2011-01-17 02:41:01.000000000 -0500
25070 +diff -urNp linux-2.6.37.1/drivers/message/fusion/mptscsih.c linux-2.6.37.1/drivers/message/fusion/mptscsih.c
25071 +--- linux-2.6.37.1/drivers/message/fusion/mptscsih.c 2011-01-04 19:50:19.000000000 -0500
25072 ++++ linux-2.6.37.1/drivers/message/fusion/mptscsih.c 2011-01-17 02:41:01.000000000 -0500
25073 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
25074
25075 h = shost_priv(SChost);
25076 @@ -25906,9 +25976,9 @@ diff -urNp linux-2.6.37/drivers/message/fusion/mptscsih.c linux-2.6.37/drivers/m
25077
25078 return h->info_kbuf;
25079 }
25080 -diff -urNp linux-2.6.37/drivers/message/i2o/i2o_proc.c linux-2.6.37/drivers/message/i2o/i2o_proc.c
25081 ---- linux-2.6.37/drivers/message/i2o/i2o_proc.c 2011-01-04 19:50:19.000000000 -0500
25082 -+++ linux-2.6.37/drivers/message/i2o/i2o_proc.c 2011-01-17 02:41:01.000000000 -0500
25083 +diff -urNp linux-2.6.37.1/drivers/message/i2o/i2o_proc.c linux-2.6.37.1/drivers/message/i2o/i2o_proc.c
25084 +--- linux-2.6.37.1/drivers/message/i2o/i2o_proc.c 2011-01-04 19:50:19.000000000 -0500
25085 ++++ linux-2.6.37.1/drivers/message/i2o/i2o_proc.c 2011-01-17 02:41:01.000000000 -0500
25086 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
25087 "Array Controller Device"
25088 };
25089 @@ -25995,9 +26065,9 @@ diff -urNp linux-2.6.37/drivers/message/i2o/i2o_proc.c linux-2.6.37/drivers/mess
25090
25091 return 0;
25092 }
25093 -diff -urNp linux-2.6.37/drivers/mfd/janz-cmodio.c linux-2.6.37/drivers/mfd/janz-cmodio.c
25094 ---- linux-2.6.37/drivers/mfd/janz-cmodio.c 2011-01-04 19:50:19.000000000 -0500
25095 -+++ linux-2.6.37/drivers/mfd/janz-cmodio.c 2011-01-17 02:41:01.000000000 -0500
25096 +diff -urNp linux-2.6.37.1/drivers/mfd/janz-cmodio.c linux-2.6.37.1/drivers/mfd/janz-cmodio.c
25097 +--- linux-2.6.37.1/drivers/mfd/janz-cmodio.c 2011-01-04 19:50:19.000000000 -0500
25098 ++++ linux-2.6.37.1/drivers/mfd/janz-cmodio.c 2011-01-17 02:41:01.000000000 -0500
25099 @@ -13,6 +13,7 @@
25100
25101 #include <linux/kernel.h>
25102 @@ -26006,9 +26076,9 @@ diff -urNp linux-2.6.37/drivers/mfd/janz-cmodio.c linux-2.6.37/drivers/mfd/janz-
25103 #include <linux/init.h>
25104 #include <linux/pci.h>
25105 #include <linux/interrupt.h>
25106 -diff -urNp linux-2.6.37/drivers/misc/kgdbts.c linux-2.6.37/drivers/misc/kgdbts.c
25107 ---- linux-2.6.37/drivers/misc/kgdbts.c 2011-01-04 19:50:19.000000000 -0500
25108 -+++ linux-2.6.37/drivers/misc/kgdbts.c 2011-01-17 02:41:01.000000000 -0500
25109 +diff -urNp linux-2.6.37.1/drivers/misc/kgdbts.c linux-2.6.37.1/drivers/misc/kgdbts.c
25110 +--- linux-2.6.37.1/drivers/misc/kgdbts.c 2011-01-04 19:50:19.000000000 -0500
25111 ++++ linux-2.6.37.1/drivers/misc/kgdbts.c 2011-01-17 02:41:01.000000000 -0500
25112 @@ -118,7 +118,7 @@
25113 } while (0)
25114 #define MAX_CONFIG_LEN 40
25115 @@ -26027,9 +26097,9 @@ diff -urNp linux-2.6.37/drivers/misc/kgdbts.c linux-2.6.37/drivers/misc/kgdbts.c
25116 .name = "kgdbts",
25117 .read_char = kgdbts_get_char,
25118 .write_char = kgdbts_put_char,
25119 -diff -urNp linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c
25120 ---- linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c 2011-01-04 19:50:19.000000000 -0500
25121 -+++ linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c 2011-01-17 02:41:01.000000000 -0500
25122 +diff -urNp linux-2.6.37.1/drivers/misc/sgi-gru/gruhandles.c linux-2.6.37.1/drivers/misc/sgi-gru/gruhandles.c
25123 +--- linux-2.6.37.1/drivers/misc/sgi-gru/gruhandles.c 2011-01-04 19:50:19.000000000 -0500
25124 ++++ linux-2.6.37.1/drivers/misc/sgi-gru/gruhandles.c 2011-01-17 02:41:01.000000000 -0500
25125 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
25126 unsigned long nsec;
25127
25128 @@ -26041,9 +26111,9 @@ diff -urNp linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c linux-2.6.37/drivers/m
25129 if (mcs_op_statistics[op].max < nsec)
25130 mcs_op_statistics[op].max = nsec;
25131 }
25132 -diff -urNp linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c
25133 ---- linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c 2011-01-04 19:50:19.000000000 -0500
25134 -+++ linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c 2011-01-17 02:41:01.000000000 -0500
25135 +diff -urNp linux-2.6.37.1/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.37.1/drivers/misc/sgi-gru/gruprocfs.c
25136 +--- linux-2.6.37.1/drivers/misc/sgi-gru/gruprocfs.c 2011-01-04 19:50:19.000000000 -0500
25137 ++++ linux-2.6.37.1/drivers/misc/sgi-gru/gruprocfs.c 2011-01-17 02:41:01.000000000 -0500
25138 @@ -32,9 +32,9 @@
25139
25140 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
25141 @@ -26067,9 +26137,9 @@ diff -urNp linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.37/drivers/mi
25142 max = mcs_op_statistics[op].max;
25143 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
25144 count ? total / count : 0, max);
25145 -diff -urNp linux-2.6.37/drivers/misc/sgi-gru/grutables.h linux-2.6.37/drivers/misc/sgi-gru/grutables.h
25146 ---- linux-2.6.37/drivers/misc/sgi-gru/grutables.h 2011-01-04 19:50:19.000000000 -0500
25147 -+++ linux-2.6.37/drivers/misc/sgi-gru/grutables.h 2011-01-17 02:41:01.000000000 -0500
25148 +diff -urNp linux-2.6.37.1/drivers/misc/sgi-gru/grutables.h linux-2.6.37.1/drivers/misc/sgi-gru/grutables.h
25149 +--- linux-2.6.37.1/drivers/misc/sgi-gru/grutables.h 2011-01-04 19:50:19.000000000 -0500
25150 ++++ linux-2.6.37.1/drivers/misc/sgi-gru/grutables.h 2011-01-17 02:41:01.000000000 -0500
25151 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
25152 * GRU statistics.
25153 */
25154 @@ -26249,9 +26319,9 @@ diff -urNp linux-2.6.37/drivers/misc/sgi-gru/grutables.h linux-2.6.37/drivers/mi
25155 } while (0)
25156
25157 #ifdef CONFIG_SGI_GRU_DEBUG
25158 -diff -urNp linux-2.6.37/drivers/mtd/devices/doc2000.c linux-2.6.37/drivers/mtd/devices/doc2000.c
25159 ---- linux-2.6.37/drivers/mtd/devices/doc2000.c 2011-01-04 19:50:19.000000000 -0500
25160 -+++ linux-2.6.37/drivers/mtd/devices/doc2000.c 2011-01-17 02:41:01.000000000 -0500
25161 +diff -urNp linux-2.6.37.1/drivers/mtd/devices/doc2000.c linux-2.6.37.1/drivers/mtd/devices/doc2000.c
25162 +--- linux-2.6.37.1/drivers/mtd/devices/doc2000.c 2011-01-04 19:50:19.000000000 -0500
25163 ++++ linux-2.6.37.1/drivers/mtd/devices/doc2000.c 2011-01-17 02:41:01.000000000 -0500
25164 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
25165
25166 /* The ECC will not be calculated correctly if less than 512 is written */
25167 @@ -26261,9 +26331,9 @@ diff -urNp linux-2.6.37/drivers/mtd/devices/doc2000.c linux-2.6.37/drivers/mtd/d
25168 printk(KERN_WARNING
25169 "ECC needs a full sector write (adr: %lx size %lx)\n",
25170 (long) to, (long) len);
25171 -diff -urNp linux-2.6.37/drivers/mtd/devices/doc2001.c linux-2.6.37/drivers/mtd/devices/doc2001.c
25172 ---- linux-2.6.37/drivers/mtd/devices/doc2001.c 2011-01-04 19:50:19.000000000 -0500
25173 -+++ linux-2.6.37/drivers/mtd/devices/doc2001.c 2011-01-17 02:41:01.000000000 -0500
25174 +diff -urNp linux-2.6.37.1/drivers/mtd/devices/doc2001.c linux-2.6.37.1/drivers/mtd/devices/doc2001.c
25175 +--- linux-2.6.37.1/drivers/mtd/devices/doc2001.c 2011-01-04 19:50:19.000000000 -0500
25176 ++++ linux-2.6.37.1/drivers/mtd/devices/doc2001.c 2011-01-17 02:41:01.000000000 -0500
25177 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
25178 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
25179
25180 @@ -26273,9 +26343,9 @@ diff -urNp linux-2.6.37/drivers/mtd/devices/doc2001.c linux-2.6.37/drivers/mtd/d
25181 return -EINVAL;
25182
25183 /* Don't allow a single read to cross a 512-byte block boundary */
25184 -diff -urNp linux-2.6.37/drivers/mtd/nand/denali.c linux-2.6.37/drivers/mtd/nand/denali.c
25185 ---- linux-2.6.37/drivers/mtd/nand/denali.c 2011-01-04 19:50:19.000000000 -0500
25186 -+++ linux-2.6.37/drivers/mtd/nand/denali.c 2011-01-17 02:41:01.000000000 -0500
25187 +diff -urNp linux-2.6.37.1/drivers/mtd/nand/denali.c linux-2.6.37.1/drivers/mtd/nand/denali.c
25188 +--- linux-2.6.37.1/drivers/mtd/nand/denali.c 2011-01-04 19:50:19.000000000 -0500
25189 ++++ linux-2.6.37.1/drivers/mtd/nand/denali.c 2011-01-17 02:41:01.000000000 -0500
25190 @@ -25,6 +25,7 @@
25191 #include <linux/pci.h>
25192 #include <linux/mtd/mtd.h>
25193 @@ -26284,9 +26354,9 @@ diff -urNp linux-2.6.37/drivers/mtd/nand/denali.c linux-2.6.37/drivers/mtd/nand/
25194
25195 #include "denali.h"
25196
25197 -diff -urNp linux-2.6.37/drivers/mtd/ubi/build.c linux-2.6.37/drivers/mtd/ubi/build.c
25198 ---- linux-2.6.37/drivers/mtd/ubi/build.c 2011-01-04 19:50:19.000000000 -0500
25199 -+++ linux-2.6.37/drivers/mtd/ubi/build.c 2011-01-17 02:41:01.000000000 -0500
25200 +diff -urNp linux-2.6.37.1/drivers/mtd/ubi/build.c linux-2.6.37.1/drivers/mtd/ubi/build.c
25201 +--- linux-2.6.37.1/drivers/mtd/ubi/build.c 2011-01-04 19:50:19.000000000 -0500
25202 ++++ linux-2.6.37.1/drivers/mtd/ubi/build.c 2011-01-17 02:41:01.000000000 -0500
25203 @@ -1285,7 +1285,7 @@ module_exit(ubi_exit);
25204 static int __init bytes_str_to_int(const char *str)
25205 {
25206 @@ -26326,9 +26396,9 @@ diff -urNp linux-2.6.37/drivers/mtd/ubi/build.c linux-2.6.37/drivers/mtd/ubi/bui
25207 }
25208
25209 /**
25210 -diff -urNp linux-2.6.37/drivers/net/e1000e/82571.c linux-2.6.37/drivers/net/e1000e/82571.c
25211 ---- linux-2.6.37/drivers/net/e1000e/82571.c 2011-01-04 19:50:19.000000000 -0500
25212 -+++ linux-2.6.37/drivers/net/e1000e/82571.c 2011-01-17 02:41:01.000000000 -0500
25213 +diff -urNp linux-2.6.37.1/drivers/net/e1000e/82571.c linux-2.6.37.1/drivers/net/e1000e/82571.c
25214 +--- linux-2.6.37.1/drivers/net/e1000e/82571.c 2011-01-04 19:50:19.000000000 -0500
25215 ++++ linux-2.6.37.1/drivers/net/e1000e/82571.c 2011-01-17 02:41:01.000000000 -0500
25216 @@ -211,6 +211,7 @@ static s32 e1000_init_mac_params_82571(s
25217 {
25218 struct e1000_hw *hw = &adapter->hw;
25219 @@ -26382,9 +26452,9 @@ diff -urNp linux-2.6.37/drivers/net/e1000e/82571.c linux-2.6.37/drivers/net/e100
25220 .acquire = e1000_acquire_nvm_82571,
25221 .read = e1000e_read_nvm_eerd,
25222 .release = e1000_release_nvm_82571,
25223 -diff -urNp linux-2.6.37/drivers/net/e1000e/e1000.h linux-2.6.37/drivers/net/e1000e/e1000.h
25224 ---- linux-2.6.37/drivers/net/e1000e/e1000.h 2011-01-04 19:50:19.000000000 -0500
25225 -+++ linux-2.6.37/drivers/net/e1000e/e1000.h 2011-01-17 02:41:01.000000000 -0500
25226 +diff -urNp linux-2.6.37.1/drivers/net/e1000e/e1000.h linux-2.6.37.1/drivers/net/e1000e/e1000.h
25227 +--- linux-2.6.37.1/drivers/net/e1000e/e1000.h 2011-01-04 19:50:19.000000000 -0500
25228 ++++ linux-2.6.37.1/drivers/net/e1000e/e1000.h 2011-01-17 02:41:01.000000000 -0500
25229 @@ -407,9 +407,9 @@ struct e1000_info {
25230 u32 pba;
25231 u32 max_hw_frame_size;
25232 @@ -26398,9 +26468,9 @@ diff -urNp linux-2.6.37/drivers/net/e1000e/e1000.h linux-2.6.37/drivers/net/e100
25233 };
25234
25235 /* hardware capability, feature, and workaround flags */
25236 -diff -urNp linux-2.6.37/drivers/net/e1000e/es2lan.c linux-2.6.37/drivers/net/e1000e/es2lan.c
25237 ---- linux-2.6.37/drivers/net/e1000e/es2lan.c 2011-01-04 19:50:19.000000000 -0500
25238 -+++ linux-2.6.37/drivers/net/e1000e/es2lan.c 2011-01-17 02:41:01.000000000 -0500
25239 +diff -urNp linux-2.6.37.1/drivers/net/e1000e/es2lan.c linux-2.6.37.1/drivers/net/e1000e/es2lan.c
25240 +--- linux-2.6.37.1/drivers/net/e1000e/es2lan.c 2011-01-04 19:50:19.000000000 -0500
25241 ++++ linux-2.6.37.1/drivers/net/e1000e/es2lan.c 2011-01-17 02:41:01.000000000 -0500
25242 @@ -205,6 +205,7 @@ static s32 e1000_init_mac_params_80003es
25243 {
25244 struct e1000_hw *hw = &adapter->hw;
25245 @@ -26436,9 +26506,9 @@ diff -urNp linux-2.6.37/drivers/net/e1000e/es2lan.c linux-2.6.37/drivers/net/e10
25246 .acquire = e1000_acquire_nvm_80003es2lan,
25247 .read = e1000e_read_nvm_eerd,
25248 .release = e1000_release_nvm_80003es2lan,
25249 -diff -urNp linux-2.6.37/drivers/net/e1000e/hw.h linux-2.6.37/drivers/net/e1000e/hw.h
25250 ---- linux-2.6.37/drivers/net/e1000e/hw.h 2011-01-04 19:50:19.000000000 -0500
25251 -+++ linux-2.6.37/drivers/net/e1000e/hw.h 2011-01-17 02:41:01.000000000 -0500
25252 +diff -urNp linux-2.6.37.1/drivers/net/e1000e/hw.h linux-2.6.37.1/drivers/net/e1000e/hw.h
25253 +--- linux-2.6.37.1/drivers/net/e1000e/hw.h 2011-01-04 19:50:19.000000000 -0500
25254 ++++ linux-2.6.37.1/drivers/net/e1000e/hw.h 2011-01-17 02:41:01.000000000 -0500
25255 @@ -800,16 +800,17 @@ struct e1000_phy_operations {
25256
25257 /* Function pointers for the NVM. */
25258 @@ -26480,9 +26550,9 @@ diff -urNp linux-2.6.37/drivers/net/e1000e/hw.h linux-2.6.37/drivers/net/e1000e/
25259 struct e1000_nvm_operations ops;
25260
25261 enum e1000_nvm_type type;
25262 -diff -urNp linux-2.6.37/drivers/net/e1000e/ich8lan.c linux-2.6.37/drivers/net/e1000e/ich8lan.c
25263 ---- linux-2.6.37/drivers/net/e1000e/ich8lan.c 2011-01-04 19:50:19.000000000 -0500
25264 -+++ linux-2.6.37/drivers/net/e1000e/ich8lan.c 2011-01-17 02:41:01.000000000 -0500
25265 +diff -urNp linux-2.6.37.1/drivers/net/e1000e/ich8lan.c linux-2.6.37.1/drivers/net/e1000e/ich8lan.c
25266 +--- linux-2.6.37.1/drivers/net/e1000e/ich8lan.c 2011-01-04 19:50:19.000000000 -0500
25267 ++++ linux-2.6.37.1/drivers/net/e1000e/ich8lan.c 2011-01-17 02:41:01.000000000 -0500
25268 @@ -3856,7 +3856,7 @@ static void e1000_clear_hw_cntrs_ich8lan
25269 }
25270 }
25271 @@ -26510,9 +26580,9 @@ diff -urNp linux-2.6.37/drivers/net/e1000e/ich8lan.c linux-2.6.37/drivers/net/e1
25272 .acquire = e1000_acquire_nvm_ich8lan,
25273 .read = e1000_read_nvm_ich8lan,
25274 .release = e1000_release_nvm_ich8lan,
25275 -diff -urNp linux-2.6.37/drivers/net/igb/e1000_82575.c linux-2.6.37/drivers/net/igb/e1000_82575.c
25276 ---- linux-2.6.37/drivers/net/igb/e1000_82575.c 2011-01-04 19:50:19.000000000 -0500
25277 -+++ linux-2.6.37/drivers/net/igb/e1000_82575.c 2011-01-17 02:41:01.000000000 -0500
25278 +diff -urNp linux-2.6.37.1/drivers/net/igb/e1000_82575.c linux-2.6.37.1/drivers/net/igb/e1000_82575.c
25279 +--- linux-2.6.37.1/drivers/net/igb/e1000_82575.c 2011-01-04 19:50:19.000000000 -0500
25280 ++++ linux-2.6.37.1/drivers/net/igb/e1000_82575.c 2011-01-17 02:41:01.000000000 -0500
25281 @@ -1712,7 +1712,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
25282 return ret_val;
25283 }
25284 @@ -26538,9 +26608,9 @@ diff -urNp linux-2.6.37/drivers/net/igb/e1000_82575.c linux-2.6.37/drivers/net/i
25285 .acquire = igb_acquire_nvm_82575,
25286 .read = igb_read_nvm_eerd,
25287 .release = igb_release_nvm_82575,
25288 -diff -urNp linux-2.6.37/drivers/net/igb/e1000_hw.h linux-2.6.37/drivers/net/igb/e1000_hw.h
25289 ---- linux-2.6.37/drivers/net/igb/e1000_hw.h 2011-01-04 19:50:19.000000000 -0500
25290 -+++ linux-2.6.37/drivers/net/igb/e1000_hw.h 2011-01-17 02:41:01.000000000 -0500
25291 +diff -urNp linux-2.6.37.1/drivers/net/igb/e1000_hw.h linux-2.6.37.1/drivers/net/igb/e1000_hw.h
25292 +--- linux-2.6.37.1/drivers/net/igb/e1000_hw.h 2011-01-04 19:50:19.000000000 -0500
25293 ++++ linux-2.6.37.1/drivers/net/igb/e1000_hw.h 2011-01-17 02:41:01.000000000 -0500
25294 @@ -325,22 +325,23 @@ struct e1000_phy_operations {
25295 };
25296
25297 @@ -26588,9 +26658,9 @@ diff -urNp linux-2.6.37/drivers/net/igb/e1000_hw.h linux-2.6.37/drivers/net/igb/
25298 struct e1000_nvm_operations ops;
25299
25300 enum e1000_nvm_type type;
25301 -diff -urNp linux-2.6.37/drivers/net/igbvf/vf.h linux-2.6.37/drivers/net/igbvf/vf.h
25302 ---- linux-2.6.37/drivers/net/igbvf/vf.h 2011-01-04 19:50:19.000000000 -0500
25303 -+++ linux-2.6.37/drivers/net/igbvf/vf.h 2011-01-17 02:41:01.000000000 -0500
25304 +diff -urNp linux-2.6.37.1/drivers/net/igbvf/vf.h linux-2.6.37.1/drivers/net/igbvf/vf.h
25305 +--- linux-2.6.37.1/drivers/net/igbvf/vf.h 2011-01-04 19:50:19.000000000 -0500
25306 ++++ linux-2.6.37.1/drivers/net/igbvf/vf.h 2011-01-17 02:41:01.000000000 -0500
25307 @@ -189,6 +189,7 @@ struct e1000_mac_operations {
25308 };
25309
25310 @@ -26599,9 +26669,9 @@ diff -urNp linux-2.6.37/drivers/net/igbvf/vf.h linux-2.6.37/drivers/net/igbvf/vf
25311 struct e1000_mac_operations ops;
25312 u8 addr[6];
25313 u8 perm_addr[6];
25314 -diff -urNp linux-2.6.37/drivers/net/irda/vlsi_ir.c linux-2.6.37/drivers/net/irda/vlsi_ir.c
25315 ---- linux-2.6.37/drivers/net/irda/vlsi_ir.c 2011-01-04 19:50:19.000000000 -0500
25316 -+++ linux-2.6.37/drivers/net/irda/vlsi_ir.c 2011-01-17 02:41:01.000000000 -0500
25317 +diff -urNp linux-2.6.37.1/drivers/net/irda/vlsi_ir.c linux-2.6.37.1/drivers/net/irda/vlsi_ir.c
25318 +--- linux-2.6.37.1/drivers/net/irda/vlsi_ir.c 2011-01-04 19:50:19.000000000 -0500
25319 ++++ linux-2.6.37.1/drivers/net/irda/vlsi_ir.c 2011-01-17 02:41:01.000000000 -0500
25320 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
25321 /* no race - tx-ring already empty */
25322 vlsi_set_baud(idev, iobase);
25323 @@ -26618,9 +26688,9 @@ diff -urNp linux-2.6.37/drivers/net/irda/vlsi_ir.c linux-2.6.37/drivers/net/irda
25324 spin_unlock_irqrestore(&idev->lock, flags);
25325 dev_kfree_skb_any(skb);
25326 return NETDEV_TX_OK;
25327 -diff -urNp linux-2.6.37/drivers/net/macvtap.c linux-2.6.37/drivers/net/macvtap.c
25328 ---- linux-2.6.37/drivers/net/macvtap.c 2011-01-04 19:50:19.000000000 -0500
25329 -+++ linux-2.6.37/drivers/net/macvtap.c 2011-01-17 02:41:01.000000000 -0500
25330 +diff -urNp linux-2.6.37.1/drivers/net/macvtap.c linux-2.6.37.1/drivers/net/macvtap.c
25331 +--- linux-2.6.37.1/drivers/net/macvtap.c 2011-01-04 19:50:19.000000000 -0500
25332 ++++ linux-2.6.37.1/drivers/net/macvtap.c 2011-01-17 02:41:01.000000000 -0500
25333 @@ -529,8 +529,9 @@ static ssize_t macvtap_get_user(struct m
25334 vnet_hdr_len = q->vnet_hdr_sz;
25335
25336 @@ -26632,9 +26702,9 @@ diff -urNp linux-2.6.37/drivers/net/macvtap.c linux-2.6.37/drivers/net/macvtap.c
25337
25338 err = memcpy_fromiovecend((void *)&vnet_hdr, iv, 0,
25339 sizeof(vnet_hdr));
25340 -diff -urNp linux-2.6.37/drivers/net/pcnet32.c linux-2.6.37/drivers/net/pcnet32.c
25341 ---- linux-2.6.37/drivers/net/pcnet32.c 2011-01-04 19:50:19.000000000 -0500
25342 -+++ linux-2.6.37/drivers/net/pcnet32.c 2011-01-17 02:41:01.000000000 -0500
25343 +diff -urNp linux-2.6.37.1/drivers/net/pcnet32.c linux-2.6.37.1/drivers/net/pcnet32.c
25344 +--- linux-2.6.37.1/drivers/net/pcnet32.c 2011-01-04 19:50:19.000000000 -0500
25345 ++++ linux-2.6.37.1/drivers/net/pcnet32.c 2011-01-17 02:41:01.000000000 -0500
25346 @@ -82,7 +82,7 @@ static int cards_found;
25347 /*
25348 * VLB I/O addresses
25349 @@ -26644,9 +26714,9 @@ diff -urNp linux-2.6.37/drivers/net/pcnet32.c linux-2.6.37/drivers/net/pcnet32.c
25350 { 0x300, 0x320, 0x340, 0x360, 0 };
25351
25352 static int pcnet32_debug;
25353 -diff -urNp linux-2.6.37/drivers/net/ppp_generic.c linux-2.6.37/drivers/net/ppp_generic.c
25354 ---- linux-2.6.37/drivers/net/ppp_generic.c 2011-01-04 19:50:19.000000000 -0500
25355 -+++ linux-2.6.37/drivers/net/ppp_generic.c 2011-01-17 02:41:01.000000000 -0500
25356 +diff -urNp linux-2.6.37.1/drivers/net/ppp_generic.c linux-2.6.37.1/drivers/net/ppp_generic.c
25357 +--- linux-2.6.37.1/drivers/net/ppp_generic.c 2011-01-04 19:50:19.000000000 -0500
25358 ++++ linux-2.6.37.1/drivers/net/ppp_generic.c 2011-01-17 02:41:01.000000000 -0500
25359 @@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st
25360 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
25361 struct ppp_stats stats;
25362 @@ -26665,9 +26735,9 @@ diff -urNp linux-2.6.37/drivers/net/ppp_generic.c linux-2.6.37/drivers/net/ppp_g
25363 break;
25364 err = 0;
25365 break;
25366 -diff -urNp linux-2.6.37/drivers/net/tg3.h linux-2.6.37/drivers/net/tg3.h
25367 ---- linux-2.6.37/drivers/net/tg3.h 2011-01-04 19:50:19.000000000 -0500
25368 -+++ linux-2.6.37/drivers/net/tg3.h 2011-01-17 02:41:01.000000000 -0500
25369 +diff -urNp linux-2.6.37.1/drivers/net/tg3.h linux-2.6.37.1/drivers/net/tg3.h
25370 +--- linux-2.6.37.1/drivers/net/tg3.h 2011-01-04 19:50:19.000000000 -0500
25371 ++++ linux-2.6.37.1/drivers/net/tg3.h 2011-01-17 02:41:01.000000000 -0500
25372 @@ -131,6 +131,7 @@
25373 #define CHIPREV_ID_5750_A0 0x4000
25374 #define CHIPREV_ID_5750_A1 0x4001
25375 @@ -26676,9 +26746,9 @@ diff -urNp linux-2.6.37/drivers/net/tg3.h linux-2.6.37/drivers/net/tg3.h
25376 #define CHIPREV_ID_5750_C2 0x4202
25377 #define CHIPREV_ID_5752_A0_HW 0x5000
25378 #define CHIPREV_ID_5752_A0 0x6000
25379 -diff -urNp linux-2.6.37/drivers/net/tulip/de4x5.c linux-2.6.37/drivers/net/tulip/de4x5.c
25380 ---- linux-2.6.37/drivers/net/tulip/de4x5.c 2011-01-04 19:50:19.000000000 -0500
25381 -+++ linux-2.6.37/drivers/net/tulip/de4x5.c 2011-01-17 02:41:01.000000000 -0500
25382 +diff -urNp linux-2.6.37.1/drivers/net/tulip/de4x5.c linux-2.6.37.1/drivers/net/tulip/de4x5.c
25383 +--- linux-2.6.37.1/drivers/net/tulip/de4x5.c 2011-01-04 19:50:19.000000000 -0500
25384 ++++ linux-2.6.37.1/drivers/net/tulip/de4x5.c 2011-01-17 02:41:01.000000000 -0500
25385 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
25386 for (i=0; i<ETH_ALEN; i++) {
25387 tmp.addr[i] = dev->dev_addr[i];
25388 @@ -26697,9 +26767,9 @@ diff -urNp linux-2.6.37/drivers/net/tulip/de4x5.c linux-2.6.37/drivers/net/tulip
25389 return -EFAULT;
25390 break;
25391 }
25392 -diff -urNp linux-2.6.37/drivers/net/usb/hso.c linux-2.6.37/drivers/net/usb/hso.c
25393 ---- linux-2.6.37/drivers/net/usb/hso.c 2011-01-04 19:50:19.000000000 -0500
25394 -+++ linux-2.6.37/drivers/net/usb/hso.c 2011-01-24 18:04:15.000000000 -0500
25395 +diff -urNp linux-2.6.37.1/drivers/net/usb/hso.c linux-2.6.37.1/drivers/net/usb/hso.c
25396 +--- linux-2.6.37.1/drivers/net/usb/hso.c 2011-01-04 19:50:19.000000000 -0500
25397 ++++ linux-2.6.37.1/drivers/net/usb/hso.c 2011-01-24 18:04:15.000000000 -0500
25398 @@ -71,7 +71,7 @@
25399 #include <asm/byteorder.h>
25400 #include <linux/serial_core.h>
25401 @@ -26796,9 +26866,9 @@ diff -urNp linux-2.6.37/drivers/net/usb/hso.c linux-2.6.37/drivers/net/usb/hso.c
25402 result =
25403 hso_start_serial_device(serial_table[i], GFP_NOIO);
25404 hso_kick_transmit(dev2ser(serial_table[i]));
25405 -diff -urNp linux-2.6.37/drivers/net/wireless/b43/debugfs.c linux-2.6.37/drivers/net/wireless/b43/debugfs.c
25406 ---- linux-2.6.37/drivers/net/wireless/b43/debugfs.c 2011-01-04 19:50:19.000000000 -0500
25407 -+++ linux-2.6.37/drivers/net/wireless/b43/debugfs.c 2011-01-17 02:41:01.000000000 -0500
25408 +diff -urNp linux-2.6.37.1/drivers/net/wireless/b43/debugfs.c linux-2.6.37.1/drivers/net/wireless/b43/debugfs.c
25409 +--- linux-2.6.37.1/drivers/net/wireless/b43/debugfs.c 2011-01-04 19:50:19.000000000 -0500
25410 ++++ linux-2.6.37.1/drivers/net/wireless/b43/debugfs.c 2011-01-17 02:41:01.000000000 -0500
25411 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
25412 struct b43_debugfs_fops {
25413 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
25414 @@ -26808,9 +26878,9 @@ diff -urNp linux-2.6.37/drivers/net/wireless/b43/debugfs.c linux-2.6.37/drivers/
25415 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
25416 size_t file_struct_offset;
25417 };
25418 -diff -urNp linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c
25419 ---- linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c 2011-01-04 19:50:19.000000000 -0500
25420 -+++ linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c 2011-01-17 02:41:01.000000000 -0500
25421 +diff -urNp linux-2.6.37.1/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.37.1/drivers/net/wireless/b43legacy/debugfs.c
25422 +--- linux-2.6.37.1/drivers/net/wireless/b43legacy/debugfs.c 2011-01-04 19:50:19.000000000 -0500
25423 ++++ linux-2.6.37.1/drivers/net/wireless/b43legacy/debugfs.c 2011-01-17 02:41:01.000000000 -0500
25424 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
25425 struct b43legacy_debugfs_fops {
25426 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
25427 @@ -26820,9 +26890,9 @@ diff -urNp linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.37/dr
25428 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
25429 size_t file_struct_offset;
25430 /* Take wl->irq_lock before calling read/write? */
25431 -diff -urNp linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h
25432 ---- linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-04 19:50:19.000000000 -0500
25433 -+++ linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-17 02:41:01.000000000 -0500
25434 +diff -urNp linux-2.6.37.1/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.37.1/drivers/net/wireless/iwlwifi/iwl-debug.h
25435 +--- linux-2.6.37.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-04 19:50:19.000000000 -0500
25436 ++++ linux-2.6.37.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-01-17 02:41:01.000000000 -0500
25437 @@ -68,8 +68,8 @@ do {
25438 } while (0)
25439
25440 @@ -26834,9 +26904,9 @@ diff -urNp linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.37/dr
25441 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
25442 const void *p, u32 len)
25443 {}
25444 -diff -urNp linux-2.6.37/drivers/net/wireless/libertas/debugfs.c linux-2.6.37/drivers/net/wireless/libertas/debugfs.c
25445 ---- linux-2.6.37/drivers/net/wireless/libertas/debugfs.c 2011-01-04 19:50:19.000000000 -0500
25446 -+++ linux-2.6.37/drivers/net/wireless/libertas/debugfs.c 2011-01-17 02:41:01.000000000 -0500
25447 +diff -urNp linux-2.6.37.1/drivers/net/wireless/libertas/debugfs.c linux-2.6.37.1/drivers/net/wireless/libertas/debugfs.c
25448 +--- linux-2.6.37.1/drivers/net/wireless/libertas/debugfs.c 2011-01-04 19:50:19.000000000 -0500
25449 ++++ linux-2.6.37.1/drivers/net/wireless/libertas/debugfs.c 2011-01-17 02:41:01.000000000 -0500
25450 @@ -702,7 +702,7 @@ out_unlock:
25451 struct lbs_debugfs_files {
25452 const char *name;
25453 @@ -26846,9 +26916,9 @@ diff -urNp linux-2.6.37/drivers/net/wireless/libertas/debugfs.c linux-2.6.37/dri
25454 };
25455
25456 static const struct lbs_debugfs_files debugfs_files[] = {
25457 -diff -urNp linux-2.6.37/drivers/net/wireless/rndis_wlan.c linux-2.6.37/drivers/net/wireless/rndis_wlan.c
25458 ---- linux-2.6.37/drivers/net/wireless/rndis_wlan.c 2011-01-04 19:50:19.000000000 -0500
25459 -+++ linux-2.6.37/drivers/net/wireless/rndis_wlan.c 2011-01-17 02:41:01.000000000 -0500
25460 +diff -urNp linux-2.6.37.1/drivers/net/wireless/rndis_wlan.c linux-2.6.37.1/drivers/net/wireless/rndis_wlan.c
25461 +--- linux-2.6.37.1/drivers/net/wireless/rndis_wlan.c 2011-01-04 19:50:19.000000000 -0500
25462 ++++ linux-2.6.37.1/drivers/net/wireless/rndis_wlan.c 2011-01-17 02:41:01.000000000 -0500
25463 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbn
25464
25465 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
25466 @@ -26858,9 +26928,9 @@ diff -urNp linux-2.6.37/drivers/net/wireless/rndis_wlan.c linux-2.6.37/drivers/n
25467 rts_threshold = 2347;
25468
25469 tmp = cpu_to_le32(rts_threshold);
25470 -diff -urNp linux-2.6.37/drivers/oprofile/buffer_sync.c linux-2.6.37/drivers/oprofile/buffer_sync.c
25471 ---- linux-2.6.37/drivers/oprofile/buffer_sync.c 2011-01-04 19:50:19.000000000 -0500
25472 -+++ linux-2.6.37/drivers/oprofile/buffer_sync.c 2011-01-17 02:41:01.000000000 -0500
25473 +diff -urNp linux-2.6.37.1/drivers/oprofile/buffer_sync.c linux-2.6.37.1/drivers/oprofile/buffer_sync.c
25474 +--- linux-2.6.37.1/drivers/oprofile/buffer_sync.c 2011-01-04 19:50:19.000000000 -0500
25475 ++++ linux-2.6.37.1/drivers/oprofile/buffer_sync.c 2011-01-17 02:41:01.000000000 -0500
25476 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
25477 if (cookie == NO_COOKIE)
25478 offset = pc;
25479 @@ -26896,9 +26966,9 @@ diff -urNp linux-2.6.37/drivers/oprofile/buffer_sync.c linux-2.6.37/drivers/opro
25480 }
25481 }
25482 release_mm(mm);
25483 -diff -urNp linux-2.6.37/drivers/oprofile/event_buffer.c linux-2.6.37/drivers/oprofile/event_buffer.c
25484 ---- linux-2.6.37/drivers/oprofile/event_buffer.c 2011-01-04 19:50:19.000000000 -0500
25485 -+++ linux-2.6.37/drivers/oprofile/event_buffer.c 2011-01-17 02:41:01.000000000 -0500
25486 +diff -urNp linux-2.6.37.1/drivers/oprofile/event_buffer.c linux-2.6.37.1/drivers/oprofile/event_buffer.c
25487 +--- linux-2.6.37.1/drivers/oprofile/event_buffer.c 2011-01-04 19:50:19.000000000 -0500
25488 ++++ linux-2.6.37.1/drivers/oprofile/event_buffer.c 2011-01-17 02:41:01.000000000 -0500
25489 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
25490 }
25491
25492 @@ -26908,9 +26978,9 @@ diff -urNp linux-2.6.37/drivers/oprofile/event_buffer.c linux-2.6.37/drivers/opr
25493 return;
25494 }
25495
25496 -diff -urNp linux-2.6.37/drivers/oprofile/oprof.c linux-2.6.37/drivers/oprofile/oprof.c
25497 ---- linux-2.6.37/drivers/oprofile/oprof.c 2011-01-04 19:50:19.000000000 -0500
25498 -+++ linux-2.6.37/drivers/oprofile/oprof.c 2011-01-17 02:41:01.000000000 -0500
25499 +diff -urNp linux-2.6.37.1/drivers/oprofile/oprof.c linux-2.6.37.1/drivers/oprofile/oprof.c
25500 +--- linux-2.6.37.1/drivers/oprofile/oprof.c 2011-01-04 19:50:19.000000000 -0500
25501 ++++ linux-2.6.37.1/drivers/oprofile/oprof.c 2011-01-17 02:41:01.000000000 -0500
25502 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
25503 if (oprofile_ops.switch_events())
25504 return;
25505 @@ -26920,9 +26990,9 @@ diff -urNp linux-2.6.37/drivers/oprofile/oprof.c linux-2.6.37/drivers/oprofile/o
25506 start_switch_worker();
25507 }
25508
25509 -diff -urNp linux-2.6.37/drivers/oprofile/oprofilefs.c linux-2.6.37/drivers/oprofile/oprofilefs.c
25510 ---- linux-2.6.37/drivers/oprofile/oprofilefs.c 2011-01-04 19:50:19.000000000 -0500
25511 -+++ linux-2.6.37/drivers/oprofile/oprofilefs.c 2011-01-17 02:41:01.000000000 -0500
25512 +diff -urNp linux-2.6.37.1/drivers/oprofile/oprofilefs.c linux-2.6.37.1/drivers/oprofile/oprofilefs.c
25513 +--- linux-2.6.37.1/drivers/oprofile/oprofilefs.c 2011-01-04 19:50:19.000000000 -0500
25514 ++++ linux-2.6.37.1/drivers/oprofile/oprofilefs.c 2011-01-17 02:41:01.000000000 -0500
25515 @@ -186,7 +186,7 @@ static const struct file_operations atom
25516
25517
25518 @@ -26932,9 +27002,9 @@ diff -urNp linux-2.6.37/drivers/oprofile/oprofilefs.c linux-2.6.37/drivers/oprof
25519 {
25520 return __oprofilefs_create_file(sb, root, name,
25521 &atomic_ro_fops, 0444, val);
25522 -diff -urNp linux-2.6.37/drivers/oprofile/oprofile_stats.c linux-2.6.37/drivers/oprofile/oprofile_stats.c
25523 ---- linux-2.6.37/drivers/oprofile/oprofile_stats.c 2011-01-04 19:50:19.000000000 -0500
25524 -+++ linux-2.6.37/drivers/oprofile/oprofile_stats.c 2011-01-17 02:41:01.000000000 -0500
25525 +diff -urNp linux-2.6.37.1/drivers/oprofile/oprofile_stats.c linux-2.6.37.1/drivers/oprofile/oprofile_stats.c
25526 +--- linux-2.6.37.1/drivers/oprofile/oprofile_stats.c 2011-01-04 19:50:19.000000000 -0500
25527 ++++ linux-2.6.37.1/drivers/oprofile/oprofile_stats.c 2011-01-17 02:41:01.000000000 -0500
25528 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
25529 cpu_buf->sample_invalid_eip = 0;
25530 }
25531 @@ -26952,9 +27022,9 @@ diff -urNp linux-2.6.37/drivers/oprofile/oprofile_stats.c linux-2.6.37/drivers/o
25532 }
25533
25534
25535 -diff -urNp linux-2.6.37/drivers/oprofile/oprofile_stats.h linux-2.6.37/drivers/oprofile/oprofile_stats.h
25536 ---- linux-2.6.37/drivers/oprofile/oprofile_stats.h 2011-01-04 19:50:19.000000000 -0500
25537 -+++ linux-2.6.37/drivers/oprofile/oprofile_stats.h 2011-01-17 02:41:01.000000000 -0500
25538 +diff -urNp linux-2.6.37.1/drivers/oprofile/oprofile_stats.h linux-2.6.37.1/drivers/oprofile/oprofile_stats.h
25539 +--- linux-2.6.37.1/drivers/oprofile/oprofile_stats.h 2011-01-04 19:50:19.000000000 -0500
25540 ++++ linux-2.6.37.1/drivers/oprofile/oprofile_stats.h 2011-01-17 02:41:01.000000000 -0500
25541 @@ -13,11 +13,11 @@
25542 #include <asm/atomic.h>
25543
25544 @@ -26972,9 +27042,9 @@ diff -urNp linux-2.6.37/drivers/oprofile/oprofile_stats.h linux-2.6.37/drivers/o
25545 };
25546
25547 extern struct oprofile_stat_struct oprofile_stats;
25548 -diff -urNp linux-2.6.37/drivers/parport/procfs.c linux-2.6.37/drivers/parport/procfs.c
25549 ---- linux-2.6.37/drivers/parport/procfs.c 2011-01-04 19:50:19.000000000 -0500
25550 -+++ linux-2.6.37/drivers/parport/procfs.c 2011-01-17 02:41:01.000000000 -0500
25551 +diff -urNp linux-2.6.37.1/drivers/parport/procfs.c linux-2.6.37.1/drivers/parport/procfs.c
25552 +--- linux-2.6.37.1/drivers/parport/procfs.c 2011-01-04 19:50:19.000000000 -0500
25553 ++++ linux-2.6.37.1/drivers/parport/procfs.c 2011-01-17 02:41:01.000000000 -0500
25554 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
25555
25556 *ppos += len;
25557 @@ -26993,9 +27063,9 @@ diff -urNp linux-2.6.37/drivers/parport/procfs.c linux-2.6.37/drivers/parport/pr
25558 }
25559 #endif /* IEEE1284.3 support. */
25560
25561 -diff -urNp linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c
25562 ---- linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c 2011-01-04 19:50:19.000000000 -0500
25563 -+++ linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c 2011-01-17 02:41:01.000000000 -0500
25564 +diff -urNp linux-2.6.37.1/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.37.1/drivers/pci/hotplug/acpiphp_glue.c
25565 +--- linux-2.6.37.1/drivers/pci/hotplug/acpiphp_glue.c 2011-01-04 19:50:19.000000000 -0500
25566 ++++ linux-2.6.37.1/drivers/pci/hotplug/acpiphp_glue.c 2011-01-17 02:41:01.000000000 -0500
25567 @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
25568 }
25569
25570 @@ -27005,9 +27075,9 @@ diff -urNp linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.37/drivers/
25571 .handler = handle_hotplug_event_func,
25572 };
25573
25574 -diff -urNp linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c
25575 ---- linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-04 19:50:19.000000000 -0500
25576 -+++ linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-17 02:41:01.000000000 -0500
25577 +diff -urNp linux-2.6.37.1/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.37.1/drivers/pci/hotplug/cpqphp_nvram.c
25578 +--- linux-2.6.37.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-04 19:50:19.000000000 -0500
25579 ++++ linux-2.6.37.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-01-17 02:41:01.000000000 -0500
25580 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
25581
25582 void compaq_nvram_init (void __iomem *rom_start)
25583 @@ -27022,9 +27092,9 @@ diff -urNp linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.37/drivers/
25584 dbg("int15 entry = %p\n", compaq_int15_entry_point);
25585
25586 /* initialize our int15 lock */
25587 -diff -urNp linux-2.6.37/drivers/pci/intel-iommu.c linux-2.6.37/drivers/pci/intel-iommu.c
25588 ---- linux-2.6.37/drivers/pci/intel-iommu.c 2011-01-04 19:50:19.000000000 -0500
25589 -+++ linux-2.6.37/drivers/pci/intel-iommu.c 2011-01-17 02:41:01.000000000 -0500
25590 +diff -urNp linux-2.6.37.1/drivers/pci/intel-iommu.c linux-2.6.37.1/drivers/pci/intel-iommu.c
25591 +--- linux-2.6.37.1/drivers/pci/intel-iommu.c 2011-01-04 19:50:19.000000000 -0500
25592 ++++ linux-2.6.37.1/drivers/pci/intel-iommu.c 2011-01-17 02:41:01.000000000 -0500
25593 @@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de
25594 return !dma_addr;
25595 }
25596 @@ -27034,9 +27104,9 @@ diff -urNp linux-2.6.37/drivers/pci/intel-iommu.c linux-2.6.37/drivers/pci/intel
25597 .alloc_coherent = intel_alloc_coherent,
25598 .free_coherent = intel_free_coherent,
25599 .map_sg = intel_map_sg,
25600 -diff -urNp linux-2.6.37/drivers/pci/pcie/portdrv_pci.c linux-2.6.37/drivers/pci/pcie/portdrv_pci.c
25601 ---- linux-2.6.37/drivers/pci/pcie/portdrv_pci.c 2011-01-04 19:50:19.000000000 -0500
25602 -+++ linux-2.6.37/drivers/pci/pcie/portdrv_pci.c 2011-01-17 02:41:01.000000000 -0500
25603 +diff -urNp linux-2.6.37.1/drivers/pci/pcie/portdrv_pci.c linux-2.6.37.1/drivers/pci/pcie/portdrv_pci.c
25604 +--- linux-2.6.37.1/drivers/pci/pcie/portdrv_pci.c 2011-01-04 19:50:19.000000000 -0500
25605 ++++ linux-2.6.37.1/drivers/pci/pcie/portdrv_pci.c 2011-01-17 02:41:01.000000000 -0500
25606 @@ -276,7 +276,7 @@ static void pcie_portdrv_err_resume(stru
25607 static const struct pci_device_id port_pci_ids[] = { {
25608 /* handle any PCI-Express port */
25609 @@ -27046,9 +27116,9 @@ diff -urNp linux-2.6.37/drivers/pci/pcie/portdrv_pci.c linux-2.6.37/drivers/pci/
25610 };
25611 MODULE_DEVICE_TABLE(pci, port_pci_ids);
25612
25613 -diff -urNp linux-2.6.37/drivers/pci/pci-sysfs.c linux-2.6.37/drivers/pci/pci-sysfs.c
25614 ---- linux-2.6.37/drivers/pci/pci-sysfs.c 2011-01-04 19:50:19.000000000 -0500
25615 -+++ linux-2.6.37/drivers/pci/pci-sysfs.c 2011-02-15 20:09:35.000000000 -0500
25616 +diff -urNp linux-2.6.37.1/drivers/pci/pci-sysfs.c linux-2.6.37.1/drivers/pci/pci-sysfs.c
25617 +--- linux-2.6.37.1/drivers/pci/pci-sysfs.c 2011-01-04 19:50:19.000000000 -0500
25618 ++++ linux-2.6.37.1/drivers/pci/pci-sysfs.c 2011-02-15 20:09:35.000000000 -0500
25619 @@ -23,6 +23,7 @@
25620 #include <linux/mm.h>
25621 #include <linux/fs.h>
25622 @@ -27066,9 +27136,9 @@ diff -urNp linux-2.6.37/drivers/pci/pci-sysfs.c linux-2.6.37/drivers/pci/pci-sys
25623 size = dev->cfg_size;
25624 } else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
25625 size = 128;
25626 -diff -urNp linux-2.6.37/drivers/pci/probe.c linux-2.6.37/drivers/pci/probe.c
25627 ---- linux-2.6.37/drivers/pci/probe.c 2011-01-04 19:50:19.000000000 -0500
25628 -+++ linux-2.6.37/drivers/pci/probe.c 2011-01-17 02:41:01.000000000 -0500
25629 +diff -urNp linux-2.6.37.1/drivers/pci/probe.c linux-2.6.37.1/drivers/pci/probe.c
25630 +--- linux-2.6.37.1/drivers/pci/probe.c 2011-01-04 19:50:19.000000000 -0500
25631 ++++ linux-2.6.37.1/drivers/pci/probe.c 2011-01-17 02:41:01.000000000 -0500
25632 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
25633 return ret;
25634 }
25635 @@ -27095,9 +27165,9 @@ diff -urNp linux-2.6.37/drivers/pci/probe.c linux-2.6.37/drivers/pci/probe.c
25636
25637 if (!dev->mmio_always_on) {
25638 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
25639 -diff -urNp linux-2.6.37/drivers/pci/proc.c linux-2.6.37/drivers/pci/proc.c
25640 ---- linux-2.6.37/drivers/pci/proc.c 2011-01-04 19:50:19.000000000 -0500
25641 -+++ linux-2.6.37/drivers/pci/proc.c 2011-01-17 02:41:01.000000000 -0500
25642 +diff -urNp linux-2.6.37.1/drivers/pci/proc.c linux-2.6.37.1/drivers/pci/proc.c
25643 +--- linux-2.6.37.1/drivers/pci/proc.c 2011-01-04 19:50:19.000000000 -0500
25644 ++++ linux-2.6.37.1/drivers/pci/proc.c 2011-01-17 02:41:01.000000000 -0500
25645 @@ -476,7 +476,16 @@ static const struct file_operations proc
25646 static int __init pci_proc_init(void)
25647 {
25648 @@ -27115,9 +27185,9 @@ diff -urNp linux-2.6.37/drivers/pci/proc.c linux-2.6.37/drivers/pci/proc.c
25649 proc_create("devices", 0, proc_bus_pci_dir,
25650 &proc_bus_pci_dev_operations);
25651 proc_initialized = 1;
25652 -diff -urNp linux-2.6.37/drivers/pcmcia/ti113x.h linux-2.6.37/drivers/pcmcia/ti113x.h
25653 ---- linux-2.6.37/drivers/pcmcia/ti113x.h 2011-01-04 19:50:19.000000000 -0500
25654 -+++ linux-2.6.37/drivers/pcmcia/ti113x.h 2011-01-17 02:41:01.000000000 -0500
25655 +diff -urNp linux-2.6.37.1/drivers/pcmcia/ti113x.h linux-2.6.37.1/drivers/pcmcia/ti113x.h
25656 +--- linux-2.6.37.1/drivers/pcmcia/ti113x.h 2011-01-04 19:50:19.000000000 -0500
25657 ++++ linux-2.6.37.1/drivers/pcmcia/ti113x.h 2011-01-17 02:41:01.000000000 -0500
25658 @@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl
25659 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
25660 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
25661 @@ -27127,9 +27197,9 @@ diff -urNp linux-2.6.37/drivers/pcmcia/ti113x.h linux-2.6.37/drivers/pcmcia/ti11
25662 };
25663
25664 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
25665 -diff -urNp linux-2.6.37/drivers/pcmcia/yenta_socket.c linux-2.6.37/drivers/pcmcia/yenta_socket.c
25666 ---- linux-2.6.37/drivers/pcmcia/yenta_socket.c 2011-01-04 19:50:19.000000000 -0500
25667 -+++ linux-2.6.37/drivers/pcmcia/yenta_socket.c 2011-01-17 02:41:01.000000000 -0500
25668 +diff -urNp linux-2.6.37.1/drivers/pcmcia/yenta_socket.c linux-2.6.37.1/drivers/pcmcia/yenta_socket.c
25669 +--- linux-2.6.37.1/drivers/pcmcia/yenta_socket.c 2011-01-04 19:50:19.000000000 -0500
25670 ++++ linux-2.6.37.1/drivers/pcmcia/yenta_socket.c 2011-01-17 02:41:01.000000000 -0500
25671 @@ -1426,7 +1426,7 @@ static struct pci_device_id yenta_table[
25672
25673 /* match any cardbus bridge */
25674 @@ -27139,9 +27209,9 @@ diff -urNp linux-2.6.37/drivers/pcmcia/yenta_socket.c linux-2.6.37/drivers/pcmci
25675 };
25676 MODULE_DEVICE_TABLE(pci, yenta_table);
25677
25678 -diff -urNp linux-2.6.37/drivers/platform/x86/acer-wmi.c linux-2.6.37/drivers/platform/x86/acer-wmi.c
25679 ---- linux-2.6.37/drivers/platform/x86/acer-wmi.c 2011-01-04 19:50:19.000000000 -0500
25680 -+++ linux-2.6.37/drivers/platform/x86/acer-wmi.c 2011-01-17 02:41:01.000000000 -0500
25681 +diff -urNp linux-2.6.37.1/drivers/platform/x86/acer-wmi.c linux-2.6.37.1/drivers/platform/x86/acer-wmi.c
25682 +--- linux-2.6.37.1/drivers/platform/x86/acer-wmi.c 2011-01-04 19:50:19.000000000 -0500
25683 ++++ linux-2.6.37.1/drivers/platform/x86/acer-wmi.c 2011-01-17 02:41:01.000000000 -0500
25684 @@ -915,7 +915,7 @@ static int update_bl_status(struct backl
25685 return 0;
25686 }
25687 @@ -27151,9 +27221,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/acer-wmi.c linux-2.6.37/drivers/pla
25688 .get_brightness = read_brightness,
25689 .update_status = update_bl_status,
25690 };
25691 -diff -urNp linux-2.6.37/drivers/platform/x86/asus_acpi.c linux-2.6.37/drivers/platform/x86/asus_acpi.c
25692 ---- linux-2.6.37/drivers/platform/x86/asus_acpi.c 2011-01-04 19:50:19.000000000 -0500
25693 -+++ linux-2.6.37/drivers/platform/x86/asus_acpi.c 2011-01-17 02:41:01.000000000 -0500
25694 +diff -urNp linux-2.6.37.1/drivers/platform/x86/asus_acpi.c linux-2.6.37.1/drivers/platform/x86/asus_acpi.c
25695 +--- linux-2.6.37.1/drivers/platform/x86/asus_acpi.c 2011-01-04 19:50:19.000000000 -0500
25696 ++++ linux-2.6.37.1/drivers/platform/x86/asus_acpi.c 2011-01-17 02:41:01.000000000 -0500
25697 @@ -1467,7 +1467,7 @@ static int asus_hotk_remove(struct acpi_
25698 return 0;
25699 }
25700 @@ -27163,9 +27233,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/asus_acpi.c linux-2.6.37/drivers/pl
25701 .get_brightness = read_brightness,
25702 .update_status = set_brightness_status,
25703 };
25704 -diff -urNp linux-2.6.37/drivers/platform/x86/asus-laptop.c linux-2.6.37/drivers/platform/x86/asus-laptop.c
25705 ---- linux-2.6.37/drivers/platform/x86/asus-laptop.c 2011-01-04 19:50:19.000000000 -0500
25706 -+++ linux-2.6.37/drivers/platform/x86/asus-laptop.c 2011-01-17 02:41:01.000000000 -0500
25707 +diff -urNp linux-2.6.37.1/drivers/platform/x86/asus-laptop.c linux-2.6.37.1/drivers/platform/x86/asus-laptop.c
25708 +--- linux-2.6.37.1/drivers/platform/x86/asus-laptop.c 2011-01-04 19:50:19.000000000 -0500
25709 ++++ linux-2.6.37.1/drivers/platform/x86/asus-laptop.c 2011-01-17 02:41:01.000000000 -0500
25710 @@ -243,7 +243,6 @@ struct asus_laptop {
25711 struct asus_led gled;
25712 struct asus_led kled;
25713 @@ -27183,9 +27253,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/asus-laptop.c linux-2.6.37/drivers/
25714 .get_brightness = asus_read_brightness,
25715 .update_status = update_bl_status,
25716 };
25717 -diff -urNp linux-2.6.37/drivers/platform/x86/dell-laptop.c linux-2.6.37/drivers/platform/x86/dell-laptop.c
25718 ---- linux-2.6.37/drivers/platform/x86/dell-laptop.c 2011-01-04 19:50:19.000000000 -0500
25719 -+++ linux-2.6.37/drivers/platform/x86/dell-laptop.c 2011-01-17 02:41:01.000000000 -0500
25720 +diff -urNp linux-2.6.37.1/drivers/platform/x86/dell-laptop.c linux-2.6.37.1/drivers/platform/x86/dell-laptop.c
25721 +--- linux-2.6.37.1/drivers/platform/x86/dell-laptop.c 2011-01-04 19:50:19.000000000 -0500
25722 ++++ linux-2.6.37.1/drivers/platform/x86/dell-laptop.c 2011-01-17 02:41:01.000000000 -0500
25723 @@ -546,7 +546,7 @@ out:
25724 return buffer->output[1];
25725 }
25726 @@ -27195,9 +27265,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/dell-laptop.c linux-2.6.37/drivers/
25727 .get_brightness = dell_get_intensity,
25728 .update_status = dell_send_intensity,
25729 };
25730 -diff -urNp linux-2.6.37/drivers/platform/x86/eeepc-laptop.c linux-2.6.37/drivers/platform/x86/eeepc-laptop.c
25731 ---- linux-2.6.37/drivers/platform/x86/eeepc-laptop.c 2011-01-04 19:50:19.000000000 -0500
25732 -+++ linux-2.6.37/drivers/platform/x86/eeepc-laptop.c 2011-01-17 02:41:01.000000000 -0500
25733 +diff -urNp linux-2.6.37.1/drivers/platform/x86/eeepc-laptop.c linux-2.6.37.1/drivers/platform/x86/eeepc-laptop.c
25734 +--- linux-2.6.37.1/drivers/platform/x86/eeepc-laptop.c 2011-01-04 19:50:19.000000000 -0500
25735 ++++ linux-2.6.37.1/drivers/platform/x86/eeepc-laptop.c 2011-01-17 02:41:01.000000000 -0500
25736 @@ -1115,7 +1115,7 @@ static int update_bl_status(struct backl
25737 return set_brightness(bd, bd->props.brightness);
25738 }
25739 @@ -27207,9 +27277,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/eeepc-laptop.c linux-2.6.37/drivers
25740 .get_brightness = read_brightness,
25741 .update_status = update_bl_status,
25742 };
25743 -diff -urNp linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c
25744 ---- linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c 2011-01-04 19:50:19.000000000 -0500
25745 -+++ linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c 2011-01-17 02:41:01.000000000 -0500
25746 +diff -urNp linux-2.6.37.1/drivers/platform/x86/fujitsu-laptop.c linux-2.6.37.1/drivers/platform/x86/fujitsu-laptop.c
25747 +--- linux-2.6.37.1/drivers/platform/x86/fujitsu-laptop.c 2011-01-04 19:50:19.000000000 -0500
25748 ++++ linux-2.6.37.1/drivers/platform/x86/fujitsu-laptop.c 2011-01-17 02:41:01.000000000 -0500
25749 @@ -437,7 +437,7 @@ static int bl_update_status(struct backl
25750 return ret;
25751 }
25752 @@ -27219,9 +27289,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c linux-2.6.37/drive
25753 .get_brightness = bl_get_brightness,
25754 .update_status = bl_update_status,
25755 };
25756 -diff -urNp linux-2.6.37/drivers/platform/x86/sony-laptop.c linux-2.6.37/drivers/platform/x86/sony-laptop.c
25757 ---- linux-2.6.37/drivers/platform/x86/sony-laptop.c 2011-01-04 19:50:19.000000000 -0500
25758 -+++ linux-2.6.37/drivers/platform/x86/sony-laptop.c 2011-01-17 02:41:01.000000000 -0500
25759 +diff -urNp linux-2.6.37.1/drivers/platform/x86/sony-laptop.c linux-2.6.37.1/drivers/platform/x86/sony-laptop.c
25760 +--- linux-2.6.37.1/drivers/platform/x86/sony-laptop.c 2011-01-04 19:50:19.000000000 -0500
25761 ++++ linux-2.6.37.1/drivers/platform/x86/sony-laptop.c 2011-01-17 02:41:01.000000000 -0500
25762 @@ -856,7 +856,7 @@ static int sony_backlight_get_brightness
25763 }
25764
25765 @@ -27231,9 +27301,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/sony-laptop.c linux-2.6.37/drivers/
25766 .update_status = sony_backlight_update_status,
25767 .get_brightness = sony_backlight_get_brightness,
25768 };
25769 -diff -urNp linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c
25770 ---- linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c 2011-01-04 19:50:19.000000000 -0500
25771 -+++ linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c 2011-01-17 02:41:01.000000000 -0500
25772 +diff -urNp linux-2.6.37.1/drivers/platform/x86/thinkpad_acpi.c linux-2.6.37.1/drivers/platform/x86/thinkpad_acpi.c
25773 +--- linux-2.6.37.1/drivers/platform/x86/thinkpad_acpi.c 2011-01-04 19:50:19.000000000 -0500
25774 ++++ linux-2.6.37.1/drivers/platform/x86/thinkpad_acpi.c 2011-01-17 02:41:01.000000000 -0500
25775 @@ -6109,7 +6109,7 @@ static void tpacpi_brightness_notify_cha
25776 BACKLIGHT_UPDATE_HOTKEY);
25777 }
25778 @@ -27243,9 +27313,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c linux-2.6.37/driver
25779 .get_brightness = brightness_get,
25780 .update_status = brightness_update_status,
25781 };
25782 -diff -urNp linux-2.6.37/drivers/platform/x86/toshiba_acpi.c linux-2.6.37/drivers/platform/x86/toshiba_acpi.c
25783 ---- linux-2.6.37/drivers/platform/x86/toshiba_acpi.c 2011-01-04 19:50:19.000000000 -0500
25784 -+++ linux-2.6.37/drivers/platform/x86/toshiba_acpi.c 2011-01-17 02:41:01.000000000 -0500
25785 +diff -urNp linux-2.6.37.1/drivers/platform/x86/toshiba_acpi.c linux-2.6.37.1/drivers/platform/x86/toshiba_acpi.c
25786 +--- linux-2.6.37.1/drivers/platform/x86/toshiba_acpi.c 2011-01-04 19:50:19.000000000 -0500
25787 ++++ linux-2.6.37.1/drivers/platform/x86/toshiba_acpi.c 2011-01-17 02:41:01.000000000 -0500
25788 @@ -841,7 +841,7 @@ static void remove_toshiba_proc_entries(
25789 remove_proc_entry("version", toshiba_proc_dir);
25790 }
25791 @@ -27255,9 +27325,9 @@ diff -urNp linux-2.6.37/drivers/platform/x86/toshiba_acpi.c linux-2.6.37/drivers
25792 .get_brightness = get_lcd,
25793 .update_status = set_lcd_status,
25794 };
25795 -diff -urNp linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c
25796 ---- linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c 2011-01-04 19:50:19.000000000 -0500
25797 -+++ linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c 2011-01-17 02:41:01.000000000 -0500
25798 +diff -urNp linux-2.6.37.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.37.1/drivers/pnp/pnpbios/bioscalls.c
25799 +--- linux-2.6.37.1/drivers/pnp/pnpbios/bioscalls.c 2011-01-04 19:50:19.000000000 -0500
25800 ++++ linux-2.6.37.1/drivers/pnp/pnpbios/bioscalls.c 2011-01-17 02:41:01.000000000 -0500
25801 @@ -59,7 +59,7 @@ do { \
25802 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
25803 } while(0)
25804 @@ -27314,9 +27384,9 @@ diff -urNp linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c linux-2.6.37/drivers/pnp
25805 +
25806 + pax_close_kernel();
25807 }
25808 -diff -urNp linux-2.6.37/drivers/pnp/quirks.c linux-2.6.37/drivers/pnp/quirks.c
25809 ---- linux-2.6.37/drivers/pnp/quirks.c 2011-01-04 19:50:19.000000000 -0500
25810 -+++ linux-2.6.37/drivers/pnp/quirks.c 2011-01-17 02:41:01.000000000 -0500
25811 +diff -urNp linux-2.6.37.1/drivers/pnp/quirks.c linux-2.6.37.1/drivers/pnp/quirks.c
25812 +--- linux-2.6.37.1/drivers/pnp/quirks.c 2011-01-04 19:50:19.000000000 -0500
25813 ++++ linux-2.6.37.1/drivers/pnp/quirks.c 2011-01-17 02:41:01.000000000 -0500
25814 @@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
25815 /* PnP resources that might overlap PCI BARs */
25816 {"PNP0c01", quirk_system_pci_resources},
25817 @@ -27326,9 +27396,9 @@ diff -urNp linux-2.6.37/drivers/pnp/quirks.c linux-2.6.37/drivers/pnp/quirks.c
25818 };
25819
25820 void pnp_fixup_device(struct pnp_dev *dev)
25821 -diff -urNp linux-2.6.37/drivers/pnp/resource.c linux-2.6.37/drivers/pnp/resource.c
25822 ---- linux-2.6.37/drivers/pnp/resource.c 2011-01-04 19:50:19.000000000 -0500
25823 -+++ linux-2.6.37/drivers/pnp/resource.c 2011-01-17 02:41:01.000000000 -0500
25824 +diff -urNp linux-2.6.37.1/drivers/pnp/resource.c linux-2.6.37.1/drivers/pnp/resource.c
25825 +--- linux-2.6.37.1/drivers/pnp/resource.c 2011-01-04 19:50:19.000000000 -0500
25826 ++++ linux-2.6.37.1/drivers/pnp/resource.c 2011-01-17 02:41:01.000000000 -0500
25827 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
25828 return 1;
25829
25830 @@ -27347,9 +27417,9 @@ diff -urNp linux-2.6.37/drivers/pnp/resource.c linux-2.6.37/drivers/pnp/resource
25831 return 0;
25832
25833 /* check if the resource is reserved */
25834 -diff -urNp linux-2.6.37/drivers/rtc/rtc-dev.c linux-2.6.37/drivers/rtc/rtc-dev.c
25835 ---- linux-2.6.37/drivers/rtc/rtc-dev.c 2011-01-04 19:50:19.000000000 -0500
25836 -+++ linux-2.6.37/drivers/rtc/rtc-dev.c 2011-01-17 02:41:01.000000000 -0500
25837 +diff -urNp linux-2.6.37.1/drivers/rtc/rtc-dev.c linux-2.6.37.1/drivers/rtc/rtc-dev.c
25838 +--- linux-2.6.37.1/drivers/rtc/rtc-dev.c 2011-01-04 19:50:19.000000000 -0500
25839 ++++ linux-2.6.37.1/drivers/rtc/rtc-dev.c 2011-01-17 02:41:01.000000000 -0500
25840 @@ -14,6 +14,7 @@
25841 #include <linux/module.h>
25842 #include <linux/rtc.h>
25843 @@ -27367,9 +27437,9 @@ diff -urNp linux-2.6.37/drivers/rtc/rtc-dev.c linux-2.6.37/drivers/rtc/rtc-dev.c
25844 return rtc_set_time(rtc, &tm);
25845
25846 case RTC_PIE_ON:
25847 -diff -urNp linux-2.6.37/drivers/s390/cio/qdio_debug.c linux-2.6.37/drivers/s390/cio/qdio_debug.c
25848 ---- linux-2.6.37/drivers/s390/cio/qdio_debug.c 2011-01-04 19:50:19.000000000 -0500
25849 -+++ linux-2.6.37/drivers/s390/cio/qdio_debug.c 2011-01-17 02:41:01.000000000 -0500
25850 +diff -urNp linux-2.6.37.1/drivers/s390/cio/qdio_debug.c linux-2.6.37.1/drivers/s390/cio/qdio_debug.c
25851 +--- linux-2.6.37.1/drivers/s390/cio/qdio_debug.c 2011-01-04 19:50:19.000000000 -0500
25852 ++++ linux-2.6.37.1/drivers/s390/cio/qdio_debug.c 2011-01-17 02:41:01.000000000 -0500
25853 @@ -224,7 +224,7 @@ static int qperf_seq_open(struct inode *
25854 filp->f_path.dentry->d_inode->i_private);
25855 }
25856 @@ -27379,9 +27449,9 @@ diff -urNp linux-2.6.37/drivers/s390/cio/qdio_debug.c linux-2.6.37/drivers/s390/
25857 .owner = THIS_MODULE,
25858 .open = qperf_seq_open,
25859 .read = seq_read,
25860 -diff -urNp linux-2.6.37/drivers/scsi/hpsa.c linux-2.6.37/drivers/scsi/hpsa.c
25861 ---- linux-2.6.37/drivers/scsi/hpsa.c 2011-01-04 19:50:19.000000000 -0500
25862 -+++ linux-2.6.37/drivers/scsi/hpsa.c 2011-01-17 02:41:01.000000000 -0500
25863 +diff -urNp linux-2.6.37.1/drivers/scsi/hpsa.c linux-2.6.37.1/drivers/scsi/hpsa.c
25864 +--- linux-2.6.37.1/drivers/scsi/hpsa.c 2011-01-04 19:50:19.000000000 -0500
25865 ++++ linux-2.6.37.1/drivers/scsi/hpsa.c 2011-01-17 02:41:01.000000000 -0500
25866 @@ -2292,6 +2292,8 @@ static int hpsa_ioctl32_passthru(struct
25867 int err;
25868 u32 cp;
25869 @@ -27391,9 +27461,9 @@ diff -urNp linux-2.6.37/drivers/scsi/hpsa.c linux-2.6.37/drivers/scsi/hpsa.c
25870 err = 0;
25871 err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
25872 sizeof(arg64.LUN_info));
25873 -diff -urNp linux-2.6.37/drivers/scsi/ipr.c linux-2.6.37/drivers/scsi/ipr.c
25874 ---- linux-2.6.37/drivers/scsi/ipr.c 2011-01-04 19:50:19.000000000 -0500
25875 -+++ linux-2.6.37/drivers/scsi/ipr.c 2011-01-17 02:41:01.000000000 -0500
25876 +diff -urNp linux-2.6.37.1/drivers/scsi/ipr.c linux-2.6.37.1/drivers/scsi/ipr.c
25877 +--- linux-2.6.37.1/drivers/scsi/ipr.c 2011-01-04 19:50:19.000000000 -0500
25878 ++++ linux-2.6.37.1/drivers/scsi/ipr.c 2011-01-17 02:41:01.000000000 -0500
25879 @@ -6202,7 +6202,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
25880 return true;
25881 }
25882 @@ -27403,9 +27473,9 @@ diff -urNp linux-2.6.37/drivers/scsi/ipr.c linux-2.6.37/drivers/scsi/ipr.c
25883 .phy_reset = ipr_ata_phy_reset,
25884 .hardreset = ipr_sata_reset,
25885 .post_internal_cmd = ipr_ata_post_internal,
25886 -diff -urNp linux-2.6.37/drivers/scsi/libfc/fc_exch.c linux-2.6.37/drivers/scsi/libfc/fc_exch.c
25887 ---- linux-2.6.37/drivers/scsi/libfc/fc_exch.c 2011-01-04 19:50:19.000000000 -0500
25888 -+++ linux-2.6.37/drivers/scsi/libfc/fc_exch.c 2011-01-17 02:41:01.000000000 -0500
25889 +diff -urNp linux-2.6.37.1/drivers/scsi/libfc/fc_exch.c linux-2.6.37.1/drivers/scsi/libfc/fc_exch.c
25890 +--- linux-2.6.37.1/drivers/scsi/libfc/fc_exch.c 2011-01-04 19:50:19.000000000 -0500
25891 ++++ linux-2.6.37.1/drivers/scsi/libfc/fc_exch.c 2011-01-17 02:41:01.000000000 -0500
25892 @@ -100,12 +100,12 @@ struct fc_exch_mgr {
25893 * all together if not used XXX
25894 */
25895 @@ -27527,9 +27597,9 @@ diff -urNp linux-2.6.37/drivers/scsi/libfc/fc_exch.c linux-2.6.37/drivers/scsi/l
25896
25897 fc_frame_free(fp);
25898 }
25899 -diff -urNp linux-2.6.37/drivers/scsi/libsas/sas_ata.c linux-2.6.37/drivers/scsi/libsas/sas_ata.c
25900 ---- linux-2.6.37/drivers/scsi/libsas/sas_ata.c 2011-01-04 19:50:19.000000000 -0500
25901 -+++ linux-2.6.37/drivers/scsi/libsas/sas_ata.c 2011-01-17 02:41:01.000000000 -0500
25902 +diff -urNp linux-2.6.37.1/drivers/scsi/libsas/sas_ata.c linux-2.6.37.1/drivers/scsi/libsas/sas_ata.c
25903 +--- linux-2.6.37.1/drivers/scsi/libsas/sas_ata.c 2011-01-04 19:50:19.000000000 -0500
25904 ++++ linux-2.6.37.1/drivers/scsi/libsas/sas_ata.c 2011-01-17 02:41:01.000000000 -0500
25905 @@ -348,10 +348,10 @@ static int sas_ata_scr_read(struct ata_l
25906 }
25907 }
25908 @@ -27543,9 +27613,9 @@ diff -urNp linux-2.6.37/drivers/scsi/libsas/sas_ata.c linux-2.6.37/drivers/scsi/
25909 .qc_prep = ata_noop_qc_prep,
25910 .qc_issue = sas_ata_qc_issue,
25911 .qc_fill_rtf = sas_ata_qc_fill_rtf,
25912 -diff -urNp linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h
25913 ---- linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-04 19:50:19.000000000 -0500
25914 -+++ linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-17 02:41:01.000000000 -0500
25915 +diff -urNp linux-2.6.37.1/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.37.1/drivers/scsi/mpt2sas/mpt2sas_debug.h
25916 +--- linux-2.6.37.1/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-04 19:50:19.000000000 -0500
25917 ++++ linux-2.6.37.1/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-01-17 02:41:01.000000000 -0500
25918 @@ -79,7 +79,7 @@
25919 CMD; \
25920 }
25921 @@ -27555,9 +27625,9 @@ diff -urNp linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.37/driver
25922 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
25923
25924
25925 -diff -urNp linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c
25926 ---- linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c 2011-01-04 19:50:19.000000000 -0500
25927 -+++ linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c 2011-01-17 02:41:01.000000000 -0500
25928 +diff -urNp linux-2.6.37.1/drivers/scsi/qla2xxx/qla_os.c linux-2.6.37.1/drivers/scsi/qla2xxx/qla_os.c
25929 +--- linux-2.6.37.1/drivers/scsi/qla2xxx/qla_os.c 2011-01-04 19:50:19.000000000 -0500
25930 ++++ linux-2.6.37.1/drivers/scsi/qla2xxx/qla_os.c 2011-01-17 02:41:01.000000000 -0500
25931 @@ -4083,7 +4083,7 @@ static struct pci_driver qla2xxx_pci_dri
25932 .err_handler = &qla2xxx_err_handler,
25933 };
25934 @@ -27567,9 +27637,9 @@ diff -urNp linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c linux-2.6.37/drivers/scsi/
25935 .owner = THIS_MODULE,
25936 .llseek = noop_llseek,
25937 };
25938 -diff -urNp linux-2.6.37/drivers/scsi/scsi_logging.h linux-2.6.37/drivers/scsi/scsi_logging.h
25939 ---- linux-2.6.37/drivers/scsi/scsi_logging.h 2011-01-04 19:50:19.000000000 -0500
25940 -+++ linux-2.6.37/drivers/scsi/scsi_logging.h 2011-01-17 02:41:01.000000000 -0500
25941 +diff -urNp linux-2.6.37.1/drivers/scsi/scsi_logging.h linux-2.6.37.1/drivers/scsi/scsi_logging.h
25942 +--- linux-2.6.37.1/drivers/scsi/scsi_logging.h 2011-01-04 19:50:19.000000000 -0500
25943 ++++ linux-2.6.37.1/drivers/scsi/scsi_logging.h 2011-01-17 02:41:01.000000000 -0500
25944 @@ -51,7 +51,7 @@ do { \
25945 } while (0); \
25946 } while (0)
25947 @@ -27579,9 +27649,9 @@ diff -urNp linux-2.6.37/drivers/scsi/scsi_logging.h linux-2.6.37/drivers/scsi/sc
25948 #endif /* CONFIG_SCSI_LOGGING */
25949
25950 /*
25951 -diff -urNp linux-2.6.37/drivers/scsi/sg.c linux-2.6.37/drivers/scsi/sg.c
25952 ---- linux-2.6.37/drivers/scsi/sg.c 2011-01-04 19:50:19.000000000 -0500
25953 -+++ linux-2.6.37/drivers/scsi/sg.c 2011-01-17 02:41:01.000000000 -0500
25954 +diff -urNp linux-2.6.37.1/drivers/scsi/sg.c linux-2.6.37.1/drivers/scsi/sg.c
25955 +--- linux-2.6.37.1/drivers/scsi/sg.c 2011-01-04 19:50:19.000000000 -0500
25956 ++++ linux-2.6.37.1/drivers/scsi/sg.c 2011-01-17 02:41:01.000000000 -0500
25957 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
25958 const struct file_operations * fops;
25959 };
25960 @@ -27600,9 +27670,9 @@ diff -urNp linux-2.6.37/drivers/scsi/sg.c linux-2.6.37/drivers/scsi/sg.c
25961
25962 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
25963 if (!sg_proc_sgp)
25964 -diff -urNp linux-2.6.37/drivers/serial/8250_pci.c linux-2.6.37/drivers/serial/8250_pci.c
25965 ---- linux-2.6.37/drivers/serial/8250_pci.c 2011-01-04 19:50:19.000000000 -0500
25966 -+++ linux-2.6.37/drivers/serial/8250_pci.c 2011-01-17 02:41:01.000000000 -0500
25967 +diff -urNp linux-2.6.37.1/drivers/serial/8250_pci.c linux-2.6.37.1/drivers/serial/8250_pci.c
25968 +--- linux-2.6.37.1/drivers/serial/8250_pci.c 2011-01-04 19:50:19.000000000 -0500
25969 ++++ linux-2.6.37.1/drivers/serial/8250_pci.c 2011-01-17 02:41:01.000000000 -0500
25970 @@ -3782,7 +3782,7 @@ static struct pci_device_id serial_pci_t
25971 PCI_ANY_ID, PCI_ANY_ID,
25972 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
25973 @@ -27612,9 +27682,9 @@ diff -urNp linux-2.6.37/drivers/serial/8250_pci.c linux-2.6.37/drivers/serial/82
25974 };
25975
25976 static struct pci_driver serial_pci_driver = {
25977 -diff -urNp linux-2.6.37/drivers/serial/kgdboc.c linux-2.6.37/drivers/serial/kgdboc.c
25978 ---- linux-2.6.37/drivers/serial/kgdboc.c 2011-01-04 19:50:19.000000000 -0500
25979 -+++ linux-2.6.37/drivers/serial/kgdboc.c 2011-01-17 02:41:01.000000000 -0500
25980 +diff -urNp linux-2.6.37.1/drivers/serial/kgdboc.c linux-2.6.37.1/drivers/serial/kgdboc.c
25981 +--- linux-2.6.37.1/drivers/serial/kgdboc.c 2011-01-04 19:50:19.000000000 -0500
25982 ++++ linux-2.6.37.1/drivers/serial/kgdboc.c 2011-01-17 02:41:01.000000000 -0500
25983 @@ -22,7 +22,8 @@
25984
25985 #define MAX_CONFIG_LEN 40
25986 @@ -27633,9 +27703,9 @@ diff -urNp linux-2.6.37/drivers/serial/kgdboc.c linux-2.6.37/drivers/serial/kgdb
25987 static struct kgdb_io kgdboc_io_ops = {
25988 .name = "kgdboc",
25989 .read_char = kgdboc_get_char,
25990 -diff -urNp linux-2.6.37/drivers/staging/autofs/root.c linux-2.6.37/drivers/staging/autofs/root.c
25991 ---- linux-2.6.37/drivers/staging/autofs/root.c 2011-01-04 19:50:19.000000000 -0500
25992 -+++ linux-2.6.37/drivers/staging/autofs/root.c 2011-01-24 18:04:18.000000000 -0500
25993 +diff -urNp linux-2.6.37.1/drivers/staging/autofs/root.c linux-2.6.37.1/drivers/staging/autofs/root.c
25994 +--- linux-2.6.37.1/drivers/staging/autofs/root.c 2011-01-04 19:50:19.000000000 -0500
25995 ++++ linux-2.6.37.1/drivers/staging/autofs/root.c 2011-01-24 18:04:18.000000000 -0500
25996 @@ -308,7 +308,8 @@ static int autofs_root_symlink(struct in
25997 set_bit(n,sbi->symlink_bitmap);
25998 sl = &sbi->symlink[n];
25999 @@ -27646,9 +27716,9 @@ diff -urNp linux-2.6.37/drivers/staging/autofs/root.c linux-2.6.37/drivers/stagi
26000 if (!sl->data) {
26001 clear_bit(n,sbi->symlink_bitmap);
26002 unlock_kernel();
26003 -diff -urNp linux-2.6.37/drivers/staging/bcm/Bcmchar.c linux-2.6.37/drivers/staging/bcm/Bcmchar.c
26004 ---- linux-2.6.37/drivers/staging/bcm/Bcmchar.c 2011-01-04 19:50:19.000000000 -0500
26005 -+++ linux-2.6.37/drivers/staging/bcm/Bcmchar.c 2011-01-17 02:41:01.000000000 -0500
26006 +diff -urNp linux-2.6.37.1/drivers/staging/bcm/Bcmchar.c linux-2.6.37.1/drivers/staging/bcm/Bcmchar.c
26007 +--- linux-2.6.37.1/drivers/staging/bcm/Bcmchar.c 2011-01-04 19:50:19.000000000 -0500
26008 ++++ linux-2.6.37.1/drivers/staging/bcm/Bcmchar.c 2011-01-17 02:41:01.000000000 -0500
26009 @@ -2386,7 +2386,7 @@ static long bcm_char_ioctl(struct file *
26010 }
26011
26012 @@ -27658,10 +27728,10 @@ diff -urNp linux-2.6.37/drivers/staging/bcm/Bcmchar.c linux-2.6.37/drivers/stagi
26013 .owner = THIS_MODULE,
26014 .open = bcm_char_open,
26015 .release = bcm_char_release,
26016 -diff -urNp linux-2.6.37/drivers/staging/bcm/InterfaceInit.c linux-2.6.37/drivers/staging/bcm/InterfaceInit.c
26017 ---- linux-2.6.37/drivers/staging/bcm/InterfaceInit.c 2011-01-04 19:50:19.000000000 -0500
26018 -+++ linux-2.6.37/drivers/staging/bcm/InterfaceInit.c 2011-01-17 02:41:01.000000000 -0500
26019 -@@ -157,7 +157,7 @@ VOID ConfigureEndPointTypesThroughEEPROM
26020 +diff -urNp linux-2.6.37.1/drivers/staging/bcm/InterfaceInit.c linux-2.6.37.1/drivers/staging/bcm/InterfaceInit.c
26021 +--- linux-2.6.37.1/drivers/staging/bcm/InterfaceInit.c 2011-02-22 16:05:31.000000000 -0500
26022 ++++ linux-2.6.37.1/drivers/staging/bcm/InterfaceInit.c 2011-02-22 16:05:42.000000000 -0500
26023 +@@ -158,7 +158,7 @@ VOID ConfigureEndPointTypesThroughEEPROM
26024
26025 }
26026
26027 @@ -27670,9 +27740,9 @@ diff -urNp linux-2.6.37/drivers/staging/bcm/InterfaceInit.c linux-2.6.37/drivers
26028 .open = usbbcm_open,
26029 .release = usbbcm_release,
26030 .read = usbbcm_read,
26031 -diff -urNp linux-2.6.37/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.37/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
26032 ---- linux-2.6.37/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-04 19:50:19.000000000 -0500
26033 -+++ linux-2.6.37/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-24 18:04:18.000000000 -0500
26034 +diff -urNp linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
26035 +--- linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-04 19:50:19.000000000 -0500
26036 ++++ linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-01-24 18:04:18.000000000 -0500
26037 @@ -864,14 +864,14 @@ static void dhd_op_if(dhd_if_t *ifp)
26038 free_netdev(ifp->net);
26039 }
26040 @@ -27728,9 +27798,9 @@ diff -urNp linux-2.6.37/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6
26041
26042 #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
26043 g_bus = bus;
26044 -diff -urNp linux-2.6.37/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.37/drivers/staging/brcm80211/brcmfmac/wl_iw.c
26045 ---- linux-2.6.37/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-04 19:50:19.000000000 -0500
26046 -+++ linux-2.6.37/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-24 18:04:18.000000000 -0500
26047 +diff -urNp linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c
26048 +--- linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-04 19:50:19.000000000 -0500
26049 ++++ linux-2.6.37.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-01-24 18:04:18.000000000 -0500
26050 @@ -514,7 +514,7 @@ wl_iw_get_range(struct net_device *dev,
26051 list = (wl_u32_list_t *) channels;
26052
26053 @@ -27740,9 +27810,9 @@ diff -urNp linux-2.6.37/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.37/
26054
26055 range->min_nwid = range->max_nwid = 0;
26056
26057 -diff -urNp linux-2.6.37/drivers/staging/comedi/comedi_fops.c linux-2.6.37/drivers/staging/comedi/comedi_fops.c
26058 ---- linux-2.6.37/drivers/staging/comedi/comedi_fops.c 2011-01-04 19:50:19.000000000 -0500
26059 -+++ linux-2.6.37/drivers/staging/comedi/comedi_fops.c 2011-01-17 02:41:01.000000000 -0500
26060 +diff -urNp linux-2.6.37.1/drivers/staging/comedi/comedi_fops.c linux-2.6.37.1/drivers/staging/comedi/comedi_fops.c
26061 +--- linux-2.6.37.1/drivers/staging/comedi/comedi_fops.c 2011-01-04 19:50:19.000000000 -0500
26062 ++++ linux-2.6.37.1/drivers/staging/comedi/comedi_fops.c 2011-01-17 02:41:01.000000000 -0500
26063 @@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_
26064 mutex_unlock(&dev->mutex);
26065 }
26066 @@ -27752,9 +27822,9 @@ diff -urNp linux-2.6.37/drivers/staging/comedi/comedi_fops.c linux-2.6.37/driver
26067 .close = comedi_unmap,
26068 };
26069
26070 -diff -urNp linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
26071 ---- linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-04 19:50:19.000000000 -0500
26072 -+++ linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-17 02:41:01.000000000 -0500
26073 +diff -urNp linux-2.6.37.1/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c linux-2.6.37.1/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
26074 +--- linux-2.6.37.1/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-04 19:50:19.000000000 -0500
26075 ++++ linux-2.6.37.1/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c 2011-01-17 02:41:01.000000000 -0500
26076 @@ -69,7 +69,7 @@ int numofmsgbuf = 0;
26077 //
26078 // Table of entry-point routines for char device
26079 @@ -27764,9 +27834,9 @@ diff -urNp linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c linux-2
26080 {
26081 .unlocked_ioctl = ft1000_ChIoctl,
26082 .poll = ft1000_ChPoll,
26083 -diff -urNp linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c
26084 ---- linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c 2011-01-04 19:50:19.000000000 -0500
26085 -+++ linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c 2011-01-17 02:41:01.000000000 -0500
26086 +diff -urNp linux-2.6.37.1/drivers/staging/go7007/go7007-v4l2.c linux-2.6.37.1/drivers/staging/go7007/go7007-v4l2.c
26087 +--- linux-2.6.37.1/drivers/staging/go7007/go7007-v4l2.c 2011-01-04 19:50:19.000000000 -0500
26088 ++++ linux-2.6.37.1/drivers/staging/go7007/go7007-v4l2.c 2011-01-17 02:41:01.000000000 -0500
26089 @@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are
26090 return 0;
26091 }
26092 @@ -27776,9 +27846,9 @@ diff -urNp linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c linux-2.6.37/driver
26093 .open = go7007_vm_open,
26094 .close = go7007_vm_close,
26095 .fault = go7007_vm_fault,
26096 -diff -urNp linux-2.6.37/drivers/staging/hv/hv.c linux-2.6.37/drivers/staging/hv/hv.c
26097 ---- linux-2.6.37/drivers/staging/hv/hv.c 2011-01-04 19:50:19.000000000 -0500
26098 -+++ linux-2.6.37/drivers/staging/hv/hv.c 2011-01-17 02:41:01.000000000 -0500
26099 +diff -urNp linux-2.6.37.1/drivers/staging/hv/hv.c linux-2.6.37.1/drivers/staging/hv/hv.c
26100 +--- linux-2.6.37.1/drivers/staging/hv/hv.c 2011-01-04 19:50:19.000000000 -0500
26101 ++++ linux-2.6.37.1/drivers/staging/hv/hv.c 2011-01-17 02:41:01.000000000 -0500
26102 @@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, vo
26103 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
26104 u32 outputAddressHi = outputAddress >> 32;
26105 @@ -27788,9 +27858,9 @@ diff -urNp linux-2.6.37/drivers/staging/hv/hv.c linux-2.6.37/drivers/staging/hv/
26106
26107 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
26108 Control, Input, Output);
26109 -diff -urNp linux-2.6.37/drivers/staging/msm/msm_fb_bl.c linux-2.6.37/drivers/staging/msm/msm_fb_bl.c
26110 ---- linux-2.6.37/drivers/staging/msm/msm_fb_bl.c 2011-01-04 19:50:19.000000000 -0500
26111 -+++ linux-2.6.37/drivers/staging/msm/msm_fb_bl.c 2011-01-17 02:41:01.000000000 -0500
26112 +diff -urNp linux-2.6.37.1/drivers/staging/msm/msm_fb_bl.c linux-2.6.37.1/drivers/staging/msm/msm_fb_bl.c
26113 +--- linux-2.6.37.1/drivers/staging/msm/msm_fb_bl.c 2011-01-04 19:50:19.000000000 -0500
26114 ++++ linux-2.6.37.1/drivers/staging/msm/msm_fb_bl.c 2011-01-17 02:41:01.000000000 -0500
26115 @@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struc
26116 return 0;
26117 }
26118 @@ -27800,9 +27870,9 @@ diff -urNp linux-2.6.37/drivers/staging/msm/msm_fb_bl.c linux-2.6.37/drivers/sta
26119 .get_brightness = msm_fb_bl_get_brightness,
26120 .update_status = msm_fb_bl_update_status,
26121 };
26122 -diff -urNp linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c
26123 ---- linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-04 19:50:19.000000000 -0500
26124 -+++ linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-17 02:41:01.000000000 -0500
26125 +diff -urNp linux-2.6.37.1/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.37.1/drivers/staging/olpc_dcon/olpc_dcon.c
26126 +--- linux-2.6.37.1/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-04 19:50:19.000000000 -0500
26127 ++++ linux-2.6.37.1/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-17 02:41:01.000000000 -0500
26128 @@ -615,7 +615,7 @@ static struct device_attribute dcon_devi
26129 __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store),
26130 };
26131 @@ -27812,9 +27882,9 @@ diff -urNp linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.37/drive
26132 .get_brightness = dconbl_get,
26133 .update_status = dconbl_set
26134 };
26135 -diff -urNp linux-2.6.37/drivers/staging/phison/phison.c linux-2.6.37/drivers/staging/phison/phison.c
26136 ---- linux-2.6.37/drivers/staging/phison/phison.c 2011-01-04 19:50:19.000000000 -0500
26137 -+++ linux-2.6.37/drivers/staging/phison/phison.c 2011-01-17 02:41:01.000000000 -0500
26138 +diff -urNp linux-2.6.37.1/drivers/staging/phison/phison.c linux-2.6.37.1/drivers/staging/phison/phison.c
26139 +--- linux-2.6.37.1/drivers/staging/phison/phison.c 2011-01-04 19:50:19.000000000 -0500
26140 ++++ linux-2.6.37.1/drivers/staging/phison/phison.c 2011-01-17 02:41:01.000000000 -0500
26141 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
26142 ATA_BMDMA_SHT(DRV_NAME),
26143 };
26144 @@ -27824,9 +27894,9 @@ diff -urNp linux-2.6.37/drivers/staging/phison/phison.c linux-2.6.37/drivers/sta
26145 .inherits = &ata_bmdma_port_ops,
26146 .prereset = phison_pre_reset,
26147 };
26148 -diff -urNp linux-2.6.37/drivers/staging/pohmelfs/inode.c linux-2.6.37/drivers/staging/pohmelfs/inode.c
26149 ---- linux-2.6.37/drivers/staging/pohmelfs/inode.c 2011-01-04 19:50:19.000000000 -0500
26150 -+++ linux-2.6.37/drivers/staging/pohmelfs/inode.c 2011-01-17 02:41:01.000000000 -0500
26151 +diff -urNp linux-2.6.37.1/drivers/staging/pohmelfs/inode.c linux-2.6.37.1/drivers/staging/pohmelfs/inode.c
26152 +--- linux-2.6.37.1/drivers/staging/pohmelfs/inode.c 2011-01-04 19:50:19.000000000 -0500
26153 ++++ linux-2.6.37.1/drivers/staging/pohmelfs/inode.c 2011-01-17 02:41:01.000000000 -0500
26154 @@ -1848,7 +1848,7 @@ static int pohmelfs_fill_super(struct su
26155 mutex_init(&psb->mcache_lock);
26156 psb->mcache_root = RB_ROOT;
26157 @@ -27836,9 +27906,9 @@ diff -urNp linux-2.6.37/drivers/staging/pohmelfs/inode.c linux-2.6.37/drivers/st
26158
26159 psb->trans_max_pages = 100;
26160
26161 -diff -urNp linux-2.6.37/drivers/staging/pohmelfs/mcache.c linux-2.6.37/drivers/staging/pohmelfs/mcache.c
26162 ---- linux-2.6.37/drivers/staging/pohmelfs/mcache.c 2011-01-04 19:50:19.000000000 -0500
26163 -+++ linux-2.6.37/drivers/staging/pohmelfs/mcache.c 2011-01-17 02:41:01.000000000 -0500
26164 +diff -urNp linux-2.6.37.1/drivers/staging/pohmelfs/mcache.c linux-2.6.37.1/drivers/staging/pohmelfs/mcache.c
26165 +--- linux-2.6.37.1/drivers/staging/pohmelfs/mcache.c 2011-01-04 19:50:19.000000000 -0500
26166 ++++ linux-2.6.37.1/drivers/staging/pohmelfs/mcache.c 2011-01-17 02:41:01.000000000 -0500
26167 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
26168 m->data = data;
26169 m->start = start;
26170 @@ -27848,9 +27918,9 @@ diff -urNp linux-2.6.37/drivers/staging/pohmelfs/mcache.c linux-2.6.37/drivers/s
26171
26172 mutex_lock(&psb->mcache_lock);
26173 err = pohmelfs_mcache_insert(psb, m);
26174 -diff -urNp linux-2.6.37/drivers/staging/pohmelfs/netfs.h linux-2.6.37/drivers/staging/pohmelfs/netfs.h
26175 ---- linux-2.6.37/drivers/staging/pohmelfs/netfs.h 2011-01-04 19:50:19.000000000 -0500
26176 -+++ linux-2.6.37/drivers/staging/pohmelfs/netfs.h 2011-01-17 02:41:01.000000000 -0500
26177 +diff -urNp linux-2.6.37.1/drivers/staging/pohmelfs/netfs.h linux-2.6.37.1/drivers/staging/pohmelfs/netfs.h
26178 +--- linux-2.6.37.1/drivers/staging/pohmelfs/netfs.h 2011-01-04 19:50:19.000000000 -0500
26179 ++++ linux-2.6.37.1/drivers/staging/pohmelfs/netfs.h 2011-01-17 02:41:01.000000000 -0500
26180 @@ -571,7 +571,7 @@ struct pohmelfs_config;
26181 struct pohmelfs_sb {
26182 struct rb_root mcache_root;
26183 @@ -27860,9 +27930,9 @@ diff -urNp linux-2.6.37/drivers/staging/pohmelfs/netfs.h linux-2.6.37/drivers/st
26184 unsigned long mcache_timeout;
26185
26186 unsigned int idx;
26187 -diff -urNp linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c
26188 ---- linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-04 19:50:19.000000000 -0500
26189 -+++ linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-17 02:41:01.000000000 -0500
26190 +diff -urNp linux-2.6.37.1/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.37.1/drivers/staging/rtl8192u/ieee80211/proc.c
26191 +--- linux-2.6.37.1/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-04 19:50:19.000000000 -0500
26192 ++++ linux-2.6.37.1/drivers/staging/rtl8192u/ieee80211/proc.c 2011-01-17 02:41:01.000000000 -0500
26193 @@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
26194 return seq_open(file, &crypto_seq_ops);
26195 }
26196 @@ -27872,9 +27942,9 @@ diff -urNp linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.37/d
26197 .open = crypto_info_open,
26198 .read = seq_read,
26199 .llseek = seq_lseek,
26200 -diff -urNp linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c
26201 ---- linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-04 19:50:19.000000000 -0500
26202 -+++ linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-17 02:41:01.000000000 -0500
26203 +diff -urNp linux-2.6.37.1/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.37.1/drivers/staging/samsung-laptop/samsung-laptop.c
26204 +--- linux-2.6.37.1/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-04 19:50:19.000000000 -0500
26205 ++++ linux-2.6.37.1/drivers/staging/samsung-laptop/samsung-laptop.c 2011-01-17 02:41:01.000000000 -0500
26206 @@ -269,7 +269,7 @@ static int update_status(struct backligh
26207 return 0;
26208 }
26209 @@ -27884,9 +27954,9 @@ diff -urNp linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.
26210 .get_brightness = get_brightness,
26211 .update_status = update_status,
26212 };
26213 -diff -urNp linux-2.6.37/drivers/staging/spectra/ffsport.c linux-2.6.37/drivers/staging/spectra/ffsport.c
26214 ---- linux-2.6.37/drivers/staging/spectra/ffsport.c 2011-01-04 19:50:19.000000000 -0500
26215 -+++ linux-2.6.37/drivers/staging/spectra/ffsport.c 2011-01-17 02:41:01.000000000 -0500
26216 +diff -urNp linux-2.6.37.1/drivers/staging/spectra/ffsport.c linux-2.6.37.1/drivers/staging/spectra/ffsport.c
26217 +--- linux-2.6.37.1/drivers/staging/spectra/ffsport.c 2011-01-04 19:50:19.000000000 -0500
26218 ++++ linux-2.6.37.1/drivers/staging/spectra/ffsport.c 2011-01-17 02:41:01.000000000 -0500
26219 @@ -603,7 +603,7 @@ int GLOB_SBD_unlocked_ioctl(struct block
26220 return ret;
26221 }
26222 @@ -27896,9 +27966,9 @@ diff -urNp linux-2.6.37/drivers/staging/spectra/ffsport.c linux-2.6.37/drivers/s
26223 .owner = THIS_MODULE,
26224 .open = GLOB_SBD_open,
26225 .release = GLOB_SBD_release,
26226 -diff -urNp linux-2.6.37/drivers/staging/vme/devices/vme_user.c linux-2.6.37/drivers/staging/vme/devices/vme_user.c
26227 ---- linux-2.6.37/drivers/staging/vme/devices/vme_user.c 2011-01-04 19:50:19.000000000 -0500
26228 -+++ linux-2.6.37/drivers/staging/vme/devices/vme_user.c 2011-01-17 02:41:01.000000000 -0500
26229 +diff -urNp linux-2.6.37.1/drivers/staging/vme/devices/vme_user.c linux-2.6.37.1/drivers/staging/vme/devices/vme_user.c
26230 +--- linux-2.6.37.1/drivers/staging/vme/devices/vme_user.c 2011-01-04 19:50:19.000000000 -0500
26231 ++++ linux-2.6.37.1/drivers/staging/vme/devices/vme_user.c 2011-01-17 02:41:01.000000000 -0500
26232 @@ -137,7 +137,7 @@ static long vme_user_unlocked_ioctl(stru
26233 static int __init vme_user_probe(struct device *, int, int);
26234 static int __exit vme_user_remove(struct device *, int, int);
26235 @@ -27908,9 +27978,9 @@ diff -urNp linux-2.6.37/drivers/staging/vme/devices/vme_user.c linux-2.6.37/driv
26236 .open = vme_user_open,
26237 .release = vme_user_release,
26238 .read = vme_user_read,
26239 -diff -urNp linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
26240 ---- linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-04 19:50:19.000000000 -0500
26241 -+++ linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-17 02:41:01.000000000 -0500
26242 +diff -urNp linux-2.6.37.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.37.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
26243 +--- linux-2.6.37.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-04 19:50:19.000000000 -0500
26244 ++++ linux-2.6.37.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-01-17 02:41:01.000000000 -0500
26245 @@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge
26246
26247
26248 @@ -27920,9 +27990,9 @@ diff -urNp linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_bloc
26249 .open = cyasblkdev_blk_open,
26250 .release = cyasblkdev_blk_release,
26251 .ioctl = cyasblkdev_blk_ioctl,
26252 -diff -urNp linux-2.6.37/drivers/tty/n_gsm.c linux-2.6.37/drivers/tty/n_gsm.c
26253 ---- linux-2.6.37/drivers/tty/n_gsm.c 2011-01-04 19:50:19.000000000 -0500
26254 -+++ linux-2.6.37/drivers/tty/n_gsm.c 2011-01-17 02:41:01.000000000 -0500
26255 +diff -urNp linux-2.6.37.1/drivers/tty/n_gsm.c linux-2.6.37.1/drivers/tty/n_gsm.c
26256 +--- linux-2.6.37.1/drivers/tty/n_gsm.c 2011-02-22 16:05:31.000000000 -0500
26257 ++++ linux-2.6.37.1/drivers/tty/n_gsm.c 2011-02-22 16:05:42.000000000 -0500
26258 @@ -1579,7 +1579,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
26259 return NULL;
26260 spin_lock_init(&dlci->lock);
26261 @@ -27932,9 +28002,9 @@ diff -urNp linux-2.6.37/drivers/tty/n_gsm.c linux-2.6.37/drivers/tty/n_gsm.c
26262 kfree(dlci);
26263 return NULL;
26264 }
26265 -diff -urNp linux-2.6.37/drivers/tty/n_tty.c linux-2.6.37/drivers/tty/n_tty.c
26266 ---- linux-2.6.37/drivers/tty/n_tty.c 2011-01-04 19:50:19.000000000 -0500
26267 -+++ linux-2.6.37/drivers/tty/n_tty.c 2011-01-17 02:41:01.000000000 -0500
26268 +diff -urNp linux-2.6.37.1/drivers/tty/n_tty.c linux-2.6.37.1/drivers/tty/n_tty.c
26269 +--- linux-2.6.37.1/drivers/tty/n_tty.c 2011-01-04 19:50:19.000000000 -0500
26270 ++++ linux-2.6.37.1/drivers/tty/n_tty.c 2011-01-17 02:41:01.000000000 -0500
26271 @@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
26272 {
26273 *ops = tty_ldisc_N_TTY;
26274 @@ -27944,9 +28014,9 @@ diff -urNp linux-2.6.37/drivers/tty/n_tty.c linux-2.6.37/drivers/tty/n_tty.c
26275 + ops->flags = 0;
26276 }
26277 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
26278 -diff -urNp linux-2.6.37/drivers/tty/pty.c linux-2.6.37/drivers/tty/pty.c
26279 ---- linux-2.6.37/drivers/tty/pty.c 2011-01-04 19:50:19.000000000 -0500
26280 -+++ linux-2.6.37/drivers/tty/pty.c 2011-01-17 02:41:01.000000000 -0500
26281 +diff -urNp linux-2.6.37.1/drivers/tty/pty.c linux-2.6.37.1/drivers/tty/pty.c
26282 +--- linux-2.6.37.1/drivers/tty/pty.c 2011-01-04 19:50:19.000000000 -0500
26283 ++++ linux-2.6.37.1/drivers/tty/pty.c 2011-01-17 02:41:01.000000000 -0500
26284 @@ -700,7 +700,18 @@ out:
26285 return retval;
26286 }
26287 @@ -27978,9 +28048,9 @@ diff -urNp linux-2.6.37/drivers/tty/pty.c linux-2.6.37/drivers/tty/pty.c
26288 cdev_init(&ptmx_cdev, &ptmx_fops);
26289 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
26290 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
26291 -diff -urNp linux-2.6.37/drivers/tty/tty_io.c linux-2.6.37/drivers/tty/tty_io.c
26292 ---- linux-2.6.37/drivers/tty/tty_io.c 2011-01-04 19:50:19.000000000 -0500
26293 -+++ linux-2.6.37/drivers/tty/tty_io.c 2011-01-17 02:41:01.000000000 -0500
26294 +diff -urNp linux-2.6.37.1/drivers/tty/tty_io.c linux-2.6.37.1/drivers/tty/tty_io.c
26295 +--- linux-2.6.37.1/drivers/tty/tty_io.c 2011-01-04 19:50:19.000000000 -0500
26296 ++++ linux-2.6.37.1/drivers/tty/tty_io.c 2011-01-17 02:41:01.000000000 -0500
26297 @@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex);
26298 /* Spinlock to protect the tty->tty_files list */
26299 DEFINE_SPINLOCK(tty_files_lock);
26300 @@ -28118,9 +28188,9 @@ diff -urNp linux-2.6.37/drivers/tty/tty_io.c linux-2.6.37/drivers/tty/tty_io.c
26301 /*
26302 * Initialize the console device. This is called *early*, so
26303 * we can't necessarily depend on lots of kernel help here.
26304 -diff -urNp linux-2.6.37/drivers/tty/tty_ldisc.c linux-2.6.37/drivers/tty/tty_ldisc.c
26305 ---- linux-2.6.37/drivers/tty/tty_ldisc.c 2011-01-04 19:50:19.000000000 -0500
26306 -+++ linux-2.6.37/drivers/tty/tty_ldisc.c 2011-01-17 02:41:01.000000000 -0500
26307 +diff -urNp linux-2.6.37.1/drivers/tty/tty_ldisc.c linux-2.6.37.1/drivers/tty/tty_ldisc.c
26308 +--- linux-2.6.37.1/drivers/tty/tty_ldisc.c 2011-01-04 19:50:19.000000000 -0500
26309 ++++ linux-2.6.37.1/drivers/tty/tty_ldisc.c 2011-01-17 02:41:01.000000000 -0500
26310 @@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *
26311 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
26312 struct tty_ldisc_ops *ldo = ld->ops;
26313 @@ -28166,9 +28236,9 @@ diff -urNp linux-2.6.37/drivers/tty/tty_ldisc.c linux-2.6.37/drivers/tty/tty_ldi
26314 module_put(ldops->owner);
26315 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
26316 }
26317 -diff -urNp linux-2.6.37/drivers/tty/vt/keyboard.c linux-2.6.37/drivers/tty/vt/keyboard.c
26318 ---- linux-2.6.37/drivers/tty/vt/keyboard.c 2011-01-04 19:50:19.000000000 -0500
26319 -+++ linux-2.6.37/drivers/tty/vt/keyboard.c 2011-01-17 02:41:01.000000000 -0500
26320 +diff -urNp linux-2.6.37.1/drivers/tty/vt/keyboard.c linux-2.6.37.1/drivers/tty/vt/keyboard.c
26321 +--- linux-2.6.37.1/drivers/tty/vt/keyboard.c 2011-01-04 19:50:19.000000000 -0500
26322 ++++ linux-2.6.37.1/drivers/tty/vt/keyboard.c 2011-01-17 02:41:01.000000000 -0500
26323 @@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u
26324 kbd->kbdmode == VC_MEDIUMRAW) &&
26325 value != KVAL(K_SAK))
26326 @@ -28195,9 +28265,9 @@ diff -urNp linux-2.6.37/drivers/tty/vt/keyboard.c linux-2.6.37/drivers/tty/vt/ke
26327 };
26328
26329 MODULE_DEVICE_TABLE(input, kbd_ids);
26330 -diff -urNp linux-2.6.37/drivers/tty/vt/vt_ioctl.c linux-2.6.37/drivers/tty/vt/vt_ioctl.c
26331 ---- linux-2.6.37/drivers/tty/vt/vt_ioctl.c 2011-01-04 19:50:19.000000000 -0500
26332 -+++ linux-2.6.37/drivers/tty/vt/vt_ioctl.c 2011-01-17 02:41:01.000000000 -0500
26333 +diff -urNp linux-2.6.37.1/drivers/tty/vt/vt_ioctl.c linux-2.6.37.1/drivers/tty/vt/vt_ioctl.c
26334 +--- linux-2.6.37.1/drivers/tty/vt/vt_ioctl.c 2011-01-04 19:50:19.000000000 -0500
26335 ++++ linux-2.6.37.1/drivers/tty/vt/vt_ioctl.c 2011-01-17 02:41:01.000000000 -0500
26336 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
26337 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
26338 return -EFAULT;
26339 @@ -28238,9 +28308,9 @@ diff -urNp linux-2.6.37/drivers/tty/vt/vt_ioctl.c linux-2.6.37/drivers/tty/vt/vt
26340 if (!perm) {
26341 ret = -EPERM;
26342 goto reterr;
26343 -diff -urNp linux-2.6.37/drivers/uio/uio.c linux-2.6.37/drivers/uio/uio.c
26344 ---- linux-2.6.37/drivers/uio/uio.c 2011-01-04 19:50:19.000000000 -0500
26345 -+++ linux-2.6.37/drivers/uio/uio.c 2011-01-24 18:04:18.000000000 -0500
26346 +diff -urNp linux-2.6.37.1/drivers/uio/uio.c linux-2.6.37.1/drivers/uio/uio.c
26347 +--- linux-2.6.37.1/drivers/uio/uio.c 2011-01-04 19:50:19.000000000 -0500
26348 ++++ linux-2.6.37.1/drivers/uio/uio.c 2011-01-24 18:04:18.000000000 -0500
26349 @@ -25,6 +25,7 @@
26350 #include <linux/kobject.h>
26351 #include <linux/cdev.h>
26352 @@ -28274,9 +28344,9 @@ diff -urNp linux-2.6.37/drivers/uio/uio.c linux-2.6.37/drivers/uio/uio.c
26353 }
26354
26355 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
26356 -diff -urNp linux-2.6.37/drivers/usb/atm/cxacru.c linux-2.6.37/drivers/usb/atm/cxacru.c
26357 ---- linux-2.6.37/drivers/usb/atm/cxacru.c 2011-01-04 19:50:19.000000000 -0500
26358 -+++ linux-2.6.37/drivers/usb/atm/cxacru.c 2011-01-17 02:41:01.000000000 -0500
26359 +diff -urNp linux-2.6.37.1/drivers/usb/atm/cxacru.c linux-2.6.37.1/drivers/usb/atm/cxacru.c
26360 +--- linux-2.6.37.1/drivers/usb/atm/cxacru.c 2011-01-04 19:50:19.000000000 -0500
26361 ++++ linux-2.6.37.1/drivers/usb/atm/cxacru.c 2011-01-17 02:41:01.000000000 -0500
26362 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
26363 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
26364 if (ret < 2)
26365 @@ -28286,9 +28356,9 @@ diff -urNp linux-2.6.37/drivers/usb/atm/cxacru.c linux-2.6.37/drivers/usb/atm/cx
26366 return -EINVAL;
26367 pos += tmp;
26368
26369 -diff -urNp linux-2.6.37/drivers/usb/atm/usbatm.c linux-2.6.37/drivers/usb/atm/usbatm.c
26370 ---- linux-2.6.37/drivers/usb/atm/usbatm.c 2011-01-04 19:50:19.000000000 -0500
26371 -+++ linux-2.6.37/drivers/usb/atm/usbatm.c 2011-01-17 02:41:01.000000000 -0500
26372 +diff -urNp linux-2.6.37.1/drivers/usb/atm/usbatm.c linux-2.6.37.1/drivers/usb/atm/usbatm.c
26373 +--- linux-2.6.37.1/drivers/usb/atm/usbatm.c 2011-01-04 19:50:19.000000000 -0500
26374 ++++ linux-2.6.37.1/drivers/usb/atm/usbatm.c 2011-01-17 02:41:01.000000000 -0500
26375 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
26376 if (printk_ratelimit())
26377 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
26378 @@ -28368,10 +28438,10 @@ diff -urNp linux-2.6.37/drivers/usb/atm/usbatm.c linux-2.6.37/drivers/usb/atm/us
26379
26380 if (!left--) {
26381 if (instance->disconnected)
26382 -diff -urNp linux-2.6.37/drivers/usb/class/cdc-acm.c linux-2.6.37/drivers/usb/class/cdc-acm.c
26383 ---- linux-2.6.37/drivers/usb/class/cdc-acm.c 2011-01-04 19:50:19.000000000 -0500
26384 -+++ linux-2.6.37/drivers/usb/class/cdc-acm.c 2011-01-17 02:41:01.000000000 -0500
26385 -@@ -1634,7 +1634,7 @@ static const struct usb_device_id acm_id
26386 +diff -urNp linux-2.6.37.1/drivers/usb/class/cdc-acm.c linux-2.6.37.1/drivers/usb/class/cdc-acm.c
26387 +--- linux-2.6.37.1/drivers/usb/class/cdc-acm.c 2011-02-22 16:05:31.000000000 -0500
26388 ++++ linux-2.6.37.1/drivers/usb/class/cdc-acm.c 2011-02-22 16:05:42.000000000 -0500
26389 +@@ -1635,7 +1635,7 @@ static const struct usb_device_id acm_id
26390 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
26391 USB_CDC_ACM_PROTO_AT_CDMA) },
26392
26393 @@ -28380,9 +28450,9 @@ diff -urNp linux-2.6.37/drivers/usb/class/cdc-acm.c linux-2.6.37/drivers/usb/cla
26394 };
26395
26396 MODULE_DEVICE_TABLE(usb, acm_ids);
26397 -diff -urNp linux-2.6.37/drivers/usb/class/cdc-wdm.c linux-2.6.37/drivers/usb/class/cdc-wdm.c
26398 ---- linux-2.6.37/drivers/usb/class/cdc-wdm.c 2011-01-04 19:50:19.000000000 -0500
26399 -+++ linux-2.6.37/drivers/usb/class/cdc-wdm.c 2011-01-17 02:41:01.000000000 -0500
26400 +diff -urNp linux-2.6.37.1/drivers/usb/class/cdc-wdm.c linux-2.6.37.1/drivers/usb/class/cdc-wdm.c
26401 +--- linux-2.6.37.1/drivers/usb/class/cdc-wdm.c 2011-01-04 19:50:19.000000000 -0500
26402 ++++ linux-2.6.37.1/drivers/usb/class/cdc-wdm.c 2011-01-17 02:41:01.000000000 -0500
26403 @@ -342,7 +342,7 @@ static ssize_t wdm_write
26404 goto outnp;
26405 }
26406 @@ -28392,9 +28462,9 @@ diff -urNp linux-2.6.37/drivers/usb/class/cdc-wdm.c linux-2.6.37/drivers/usb/cla
26407 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
26408 &desc->flags));
26409 else
26410 -diff -urNp linux-2.6.37/drivers/usb/class/usblp.c linux-2.6.37/drivers/usb/class/usblp.c
26411 ---- linux-2.6.37/drivers/usb/class/usblp.c 2011-01-04 19:50:19.000000000 -0500
26412 -+++ linux-2.6.37/drivers/usb/class/usblp.c 2011-01-17 02:41:01.000000000 -0500
26413 +diff -urNp linux-2.6.37.1/drivers/usb/class/usblp.c linux-2.6.37.1/drivers/usb/class/usblp.c
26414 +--- linux-2.6.37.1/drivers/usb/class/usblp.c 2011-01-04 19:50:19.000000000 -0500
26415 ++++ linux-2.6.37.1/drivers/usb/class/usblp.c 2011-01-17 02:41:01.000000000 -0500
26416 @@ -227,7 +227,7 @@ static const struct quirk_printer_struct
26417 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@×××.de> */
26418 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
26419 @@ -28413,9 +28483,9 @@ diff -urNp linux-2.6.37/drivers/usb/class/usblp.c linux-2.6.37/drivers/usb/class
26420 };
26421
26422 MODULE_DEVICE_TABLE(usb, usblp_ids);
26423 -diff -urNp linux-2.6.37/drivers/usb/core/hcd.c linux-2.6.37/drivers/usb/core/hcd.c
26424 ---- linux-2.6.37/drivers/usb/core/hcd.c 2011-01-04 19:50:19.000000000 -0500
26425 -+++ linux-2.6.37/drivers/usb/core/hcd.c 2011-01-17 02:41:01.000000000 -0500
26426 +diff -urNp linux-2.6.37.1/drivers/usb/core/hcd.c linux-2.6.37.1/drivers/usb/core/hcd.c
26427 +--- linux-2.6.37.1/drivers/usb/core/hcd.c 2011-02-22 16:05:31.000000000 -0500
26428 ++++ linux-2.6.37.1/drivers/usb/core/hcd.c 2011-02-22 16:05:42.000000000 -0500
26429 @@ -2431,7 +2431,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
26430
26431 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
26432 @@ -28434,10 +28504,10 @@ diff -urNp linux-2.6.37/drivers/usb/core/hcd.c linux-2.6.37/drivers/usb/core/hcd
26433 {
26434
26435 if (mon_ops)
26436 -diff -urNp linux-2.6.37/drivers/usb/core/hub.c linux-2.6.37/drivers/usb/core/hub.c
26437 ---- linux-2.6.37/drivers/usb/core/hub.c 2011-01-04 19:50:19.000000000 -0500
26438 -+++ linux-2.6.37/drivers/usb/core/hub.c 2011-01-17 02:41:01.000000000 -0500
26439 -@@ -3461,7 +3461,7 @@ static const struct usb_device_id hub_id
26440 +diff -urNp linux-2.6.37.1/drivers/usb/core/hub.c linux-2.6.37.1/drivers/usb/core/hub.c
26441 +--- linux-2.6.37.1/drivers/usb/core/hub.c 2011-02-22 16:05:31.000000000 -0500
26442 ++++ linux-2.6.37.1/drivers/usb/core/hub.c 2011-02-22 16:05:42.000000000 -0500
26443 +@@ -3487,7 +3487,7 @@ static const struct usb_device_id hub_id
26444 .bDeviceClass = USB_CLASS_HUB},
26445 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
26446 .bInterfaceClass = USB_CLASS_HUB},
26447 @@ -28446,9 +28516,9 @@ diff -urNp linux-2.6.37/drivers/usb/core/hub.c linux-2.6.37/drivers/usb/core/hub
26448 };
26449
26450 MODULE_DEVICE_TABLE (usb, hub_id_table);
26451 -diff -urNp linux-2.6.37/drivers/usb/core/message.c linux-2.6.37/drivers/usb/core/message.c
26452 ---- linux-2.6.37/drivers/usb/core/message.c 2011-01-04 19:50:19.000000000 -0500
26453 -+++ linux-2.6.37/drivers/usb/core/message.c 2011-01-17 02:41:01.000000000 -0500
26454 +diff -urNp linux-2.6.37.1/drivers/usb/core/message.c linux-2.6.37.1/drivers/usb/core/message.c
26455 +--- linux-2.6.37.1/drivers/usb/core/message.c 2011-01-04 19:50:19.000000000 -0500
26456 ++++ linux-2.6.37.1/drivers/usb/core/message.c 2011-01-17 02:41:01.000000000 -0500
26457 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
26458 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
26459 if (buf) {
26460 @@ -28460,9 +28530,9 @@ diff -urNp linux-2.6.37/drivers/usb/core/message.c linux-2.6.37/drivers/usb/core
26461 if (!smallbuf)
26462 return buf;
26463 memcpy(smallbuf, buf, len);
26464 -diff -urNp linux-2.6.37/drivers/usb/early/ehci-dbgp.c linux-2.6.37/drivers/usb/early/ehci-dbgp.c
26465 ---- linux-2.6.37/drivers/usb/early/ehci-dbgp.c 2011-01-04 19:50:19.000000000 -0500
26466 -+++ linux-2.6.37/drivers/usb/early/ehci-dbgp.c 2011-01-17 02:41:01.000000000 -0500
26467 +diff -urNp linux-2.6.37.1/drivers/usb/early/ehci-dbgp.c linux-2.6.37.1/drivers/usb/early/ehci-dbgp.c
26468 +--- linux-2.6.37.1/drivers/usb/early/ehci-dbgp.c 2011-01-04 19:50:19.000000000 -0500
26469 ++++ linux-2.6.37.1/drivers/usb/early/ehci-dbgp.c 2011-01-17 02:41:01.000000000 -0500
26470 @@ -96,6 +96,7 @@ static inline u32 dbgp_len_update(u32 x,
26471 }
26472
26473 @@ -28479,10 +28549,10 @@ diff -urNp linux-2.6.37/drivers/usb/early/ehci-dbgp.c linux-2.6.37/drivers/usb/e
26474 static struct kgdb_io kgdbdbgp_io_ops = {
26475 .name = "kgdbdbgp",
26476 .read_char = kgdbdbgp_read_char,
26477 -diff -urNp linux-2.6.37/drivers/usb/host/ehci-pci.c linux-2.6.37/drivers/usb/host/ehci-pci.c
26478 ---- linux-2.6.37/drivers/usb/host/ehci-pci.c 2011-01-04 19:50:19.000000000 -0500
26479 -+++ linux-2.6.37/drivers/usb/host/ehci-pci.c 2011-01-17 02:41:01.000000000 -0500
26480 -@@ -470,7 +470,7 @@ static const struct pci_device_id pci_id
26481 +diff -urNp linux-2.6.37.1/drivers/usb/host/ehci-pci.c linux-2.6.37.1/drivers/usb/host/ehci-pci.c
26482 +--- linux-2.6.37.1/drivers/usb/host/ehci-pci.c 2011-02-22 16:05:31.000000000 -0500
26483 ++++ linux-2.6.37.1/drivers/usb/host/ehci-pci.c 2011-02-22 16:05:42.000000000 -0500
26484 +@@ -509,7 +509,7 @@ static const struct pci_device_id pci_id
26485 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
26486 .driver_data = (unsigned long) &ehci_pci_hc_driver,
26487 },
26488 @@ -28491,9 +28561,9 @@ diff -urNp linux-2.6.37/drivers/usb/host/ehci-pci.c linux-2.6.37/drivers/usb/hos
26489 };
26490 MODULE_DEVICE_TABLE(pci, pci_ids);
26491
26492 -diff -urNp linux-2.6.37/drivers/usb/host/uhci-hcd.c linux-2.6.37/drivers/usb/host/uhci-hcd.c
26493 ---- linux-2.6.37/drivers/usb/host/uhci-hcd.c 2011-01-04 19:50:19.000000000 -0500
26494 -+++ linux-2.6.37/drivers/usb/host/uhci-hcd.c 2011-01-17 02:41:01.000000000 -0500
26495 +diff -urNp linux-2.6.37.1/drivers/usb/host/uhci-hcd.c linux-2.6.37.1/drivers/usb/host/uhci-hcd.c
26496 +--- linux-2.6.37.1/drivers/usb/host/uhci-hcd.c 2011-01-04 19:50:19.000000000 -0500
26497 ++++ linux-2.6.37.1/drivers/usb/host/uhci-hcd.c 2011-01-17 02:41:01.000000000 -0500
26498 @@ -948,7 +948,7 @@ static const struct pci_device_id uhci_p
26499 /* handle any USB UHCI controller */
26500 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
26501 @@ -28503,9 +28573,9 @@ diff -urNp linux-2.6.37/drivers/usb/host/uhci-hcd.c linux-2.6.37/drivers/usb/hos
26502 };
26503
26504 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
26505 -diff -urNp linux-2.6.37/drivers/usb/mon/mon_main.c linux-2.6.37/drivers/usb/mon/mon_main.c
26506 ---- linux-2.6.37/drivers/usb/mon/mon_main.c 2011-01-04 19:50:19.000000000 -0500
26507 -+++ linux-2.6.37/drivers/usb/mon/mon_main.c 2011-01-17 02:41:01.000000000 -0500
26508 +diff -urNp linux-2.6.37.1/drivers/usb/mon/mon_main.c linux-2.6.37.1/drivers/usb/mon/mon_main.c
26509 +--- linux-2.6.37.1/drivers/usb/mon/mon_main.c 2011-01-04 19:50:19.000000000 -0500
26510 ++++ linux-2.6.37.1/drivers/usb/mon/mon_main.c 2011-01-17 02:41:01.000000000 -0500
26511 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
26512 /*
26513 * Ops
26514 @@ -28515,9 +28585,9 @@ diff -urNp linux-2.6.37/drivers/usb/mon/mon_main.c linux-2.6.37/drivers/usb/mon/
26515 .urb_submit = mon_submit,
26516 .urb_submit_error = mon_submit_error,
26517 .urb_complete = mon_complete,
26518 -diff -urNp linux-2.6.37/drivers/usb/storage/debug.h linux-2.6.37/drivers/usb/storage/debug.h
26519 ---- linux-2.6.37/drivers/usb/storage/debug.h 2011-01-04 19:50:19.000000000 -0500
26520 -+++ linux-2.6.37/drivers/usb/storage/debug.h 2011-01-17 02:41:01.000000000 -0500
26521 +diff -urNp linux-2.6.37.1/drivers/usb/storage/debug.h linux-2.6.37.1/drivers/usb/storage/debug.h
26522 +--- linux-2.6.37.1/drivers/usb/storage/debug.h 2011-01-04 19:50:19.000000000 -0500
26523 ++++ linux-2.6.37.1/drivers/usb/storage/debug.h 2011-01-17 02:41:01.000000000 -0500
26524 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
26525 #define US_DEBUGPX(x...) printk( x )
26526 #define US_DEBUG(x) x
26527 @@ -28531,9 +28601,9 @@ diff -urNp linux-2.6.37/drivers/usb/storage/debug.h linux-2.6.37/drivers/usb/sto
26528 #endif
26529
26530 #endif
26531 -diff -urNp linux-2.6.37/drivers/usb/storage/usb.c linux-2.6.37/drivers/usb/storage/usb.c
26532 ---- linux-2.6.37/drivers/usb/storage/usb.c 2011-01-04 19:50:19.000000000 -0500
26533 -+++ linux-2.6.37/drivers/usb/storage/usb.c 2011-01-17 02:41:01.000000000 -0500
26534 +diff -urNp linux-2.6.37.1/drivers/usb/storage/usb.c linux-2.6.37.1/drivers/usb/storage/usb.c
26535 +--- linux-2.6.37.1/drivers/usb/storage/usb.c 2011-01-04 19:50:19.000000000 -0500
26536 ++++ linux-2.6.37.1/drivers/usb/storage/usb.c 2011-01-17 02:41:01.000000000 -0500
26537 @@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
26538
26539 static struct us_unusual_dev us_unusual_dev_list[] = {
26540 @@ -28543,9 +28613,9 @@ diff -urNp linux-2.6.37/drivers/usb/storage/usb.c linux-2.6.37/drivers/usb/stora
26541 };
26542
26543 #undef UNUSUAL_DEV
26544 -diff -urNp linux-2.6.37/drivers/usb/storage/usual-tables.c linux-2.6.37/drivers/usb/storage/usual-tables.c
26545 ---- linux-2.6.37/drivers/usb/storage/usual-tables.c 2011-01-04 19:50:19.000000000 -0500
26546 -+++ linux-2.6.37/drivers/usb/storage/usual-tables.c 2011-01-17 02:41:01.000000000 -0500
26547 +diff -urNp linux-2.6.37.1/drivers/usb/storage/usual-tables.c linux-2.6.37.1/drivers/usb/storage/usual-tables.c
26548 +--- linux-2.6.37.1/drivers/usb/storage/usual-tables.c 2011-01-04 19:50:19.000000000 -0500
26549 ++++ linux-2.6.37.1/drivers/usb/storage/usual-tables.c 2011-01-17 02:41:01.000000000 -0500
26550 @@ -48,7 +48,7 @@
26551
26552 struct usb_device_id usb_storage_usb_ids[] = {
26553 @@ -28555,9 +28625,9 @@ diff -urNp linux-2.6.37/drivers/usb/storage/usual-tables.c linux-2.6.37/drivers/
26554 };
26555 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
26556
26557 -diff -urNp linux-2.6.37/drivers/vhost/vhost.c linux-2.6.37/drivers/vhost/vhost.c
26558 ---- linux-2.6.37/drivers/vhost/vhost.c 2011-01-04 19:50:19.000000000 -0500
26559 -+++ linux-2.6.37/drivers/vhost/vhost.c 2011-01-17 02:41:01.000000000 -0500
26560 +diff -urNp linux-2.6.37.1/drivers/vhost/vhost.c linux-2.6.37.1/drivers/vhost/vhost.c
26561 +--- linux-2.6.37.1/drivers/vhost/vhost.c 2011-01-04 19:50:19.000000000 -0500
26562 ++++ linux-2.6.37.1/drivers/vhost/vhost.c 2011-01-17 02:41:01.000000000 -0500
26563 @@ -560,7 +560,7 @@ static int init_used(struct vhost_virtqu
26564 return get_user(vq->last_used_idx, &used->idx);
26565 }
26566 @@ -28567,9 +28637,9 @@ diff -urNp linux-2.6.37/drivers/vhost/vhost.c linux-2.6.37/drivers/vhost/vhost.c
26567 {
26568 struct file *eventfp, *filep = NULL,
26569 *pollstart = NULL, *pollstop = NULL;
26570 -diff -urNp linux-2.6.37/drivers/video/atmel_lcdfb.c linux-2.6.37/drivers/video/atmel_lcdfb.c
26571 ---- linux-2.6.37/drivers/video/atmel_lcdfb.c 2011-01-04 19:50:19.000000000 -0500
26572 -+++ linux-2.6.37/drivers/video/atmel_lcdfb.c 2011-01-17 02:41:01.000000000 -0500
26573 +diff -urNp linux-2.6.37.1/drivers/video/atmel_lcdfb.c linux-2.6.37.1/drivers/video/atmel_lcdfb.c
26574 +--- linux-2.6.37.1/drivers/video/atmel_lcdfb.c 2011-01-04 19:50:19.000000000 -0500
26575 ++++ linux-2.6.37.1/drivers/video/atmel_lcdfb.c 2011-01-17 02:41:01.000000000 -0500
26576 @@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struc
26577 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
26578 }
26579 @@ -28579,9 +28649,9 @@ diff -urNp linux-2.6.37/drivers/video/atmel_lcdfb.c linux-2.6.37/drivers/video/a
26580 .update_status = atmel_bl_update_status,
26581 .get_brightness = atmel_bl_get_brightness,
26582 };
26583 -diff -urNp linux-2.6.37/drivers/video/aty/aty128fb.c linux-2.6.37/drivers/video/aty/aty128fb.c
26584 ---- linux-2.6.37/drivers/video/aty/aty128fb.c 2011-01-04 19:50:19.000000000 -0500
26585 -+++ linux-2.6.37/drivers/video/aty/aty128fb.c 2011-01-17 02:41:01.000000000 -0500
26586 +diff -urNp linux-2.6.37.1/drivers/video/aty/aty128fb.c linux-2.6.37.1/drivers/video/aty/aty128fb.c
26587 +--- linux-2.6.37.1/drivers/video/aty/aty128fb.c 2011-01-04 19:50:19.000000000 -0500
26588 ++++ linux-2.6.37.1/drivers/video/aty/aty128fb.c 2011-01-17 02:41:01.000000000 -0500
26589 @@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(stru
26590 return bd->props.brightness;
26591 }
26592 @@ -28591,9 +28661,9 @@ diff -urNp linux-2.6.37/drivers/video/aty/aty128fb.c linux-2.6.37/drivers/video/
26593 .get_brightness = aty128_bl_get_brightness,
26594 .update_status = aty128_bl_update_status,
26595 };
26596 -diff -urNp linux-2.6.37/drivers/video/aty/atyfb_base.c linux-2.6.37/drivers/video/aty/atyfb_base.c
26597 ---- linux-2.6.37/drivers/video/aty/atyfb_base.c 2011-01-04 19:50:19.000000000 -0500
26598 -+++ linux-2.6.37/drivers/video/aty/atyfb_base.c 2011-01-17 02:41:01.000000000 -0500
26599 +diff -urNp linux-2.6.37.1/drivers/video/aty/atyfb_base.c linux-2.6.37.1/drivers/video/aty/atyfb_base.c
26600 +--- linux-2.6.37.1/drivers/video/aty/atyfb_base.c 2011-02-22 16:05:31.000000000 -0500
26601 ++++ linux-2.6.37.1/drivers/video/aty/atyfb_base.c 2011-02-22 16:05:42.000000000 -0500
26602 @@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct
26603 return bd->props.brightness;
26604 }
26605 @@ -28603,9 +28673,9 @@ diff -urNp linux-2.6.37/drivers/video/aty/atyfb_base.c linux-2.6.37/drivers/vide
26606 .get_brightness = aty_bl_get_brightness,
26607 .update_status = aty_bl_update_status,
26608 };
26609 -diff -urNp linux-2.6.37/drivers/video/aty/radeon_backlight.c linux-2.6.37/drivers/video/aty/radeon_backlight.c
26610 ---- linux-2.6.37/drivers/video/aty/radeon_backlight.c 2011-01-04 19:50:19.000000000 -0500
26611 -+++ linux-2.6.37/drivers/video/aty/radeon_backlight.c 2011-01-17 02:41:01.000000000 -0500
26612 +diff -urNp linux-2.6.37.1/drivers/video/aty/radeon_backlight.c linux-2.6.37.1/drivers/video/aty/radeon_backlight.c
26613 +--- linux-2.6.37.1/drivers/video/aty/radeon_backlight.c 2011-01-04 19:50:19.000000000 -0500
26614 ++++ linux-2.6.37.1/drivers/video/aty/radeon_backlight.c 2011-01-17 02:41:01.000000000 -0500
26615 @@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(stru
26616 return bd->props.brightness;
26617 }
26618 @@ -28615,9 +28685,9 @@ diff -urNp linux-2.6.37/drivers/video/aty/radeon_backlight.c linux-2.6.37/driver
26619 .get_brightness = radeon_bl_get_brightness,
26620 .update_status = radeon_bl_update_status,
26621 };
26622 -diff -urNp linux-2.6.37/drivers/video/backlight/88pm860x_bl.c linux-2.6.37/drivers/video/backlight/88pm860x_bl.c
26623 ---- linux-2.6.37/drivers/video/backlight/88pm860x_bl.c 2011-01-04 19:50:19.000000000 -0500
26624 -+++ linux-2.6.37/drivers/video/backlight/88pm860x_bl.c 2011-01-17 02:41:01.000000000 -0500
26625 +diff -urNp linux-2.6.37.1/drivers/video/backlight/88pm860x_bl.c linux-2.6.37.1/drivers/video/backlight/88pm860x_bl.c
26626 +--- linux-2.6.37.1/drivers/video/backlight/88pm860x_bl.c 2011-02-22 16:05:31.000000000 -0500
26627 ++++ linux-2.6.37.1/drivers/video/backlight/88pm860x_bl.c 2011-02-22 16:05:42.000000000 -0500
26628 @@ -155,7 +155,7 @@ out:
26629 return -EINVAL;
26630 }
26631 @@ -28627,9 +28697,9 @@ diff -urNp linux-2.6.37/drivers/video/backlight/88pm860x_bl.c linux-2.6.37/drive
26632 .options = BL_CORE_SUSPENDRESUME,
26633 .update_status = pm860x_backlight_update_status,
26634 .get_brightness = pm860x_backlight_get_brightness,
26635 -diff -urNp linux-2.6.37/drivers/video/backlight/max8925_bl.c linux-2.6.37/drivers/video/backlight/max8925_bl.c
26636 ---- linux-2.6.37/drivers/video/backlight/max8925_bl.c 2011-01-04 19:50:19.000000000 -0500
26637 -+++ linux-2.6.37/drivers/video/backlight/max8925_bl.c 2011-01-17 02:41:01.000000000 -0500
26638 +diff -urNp linux-2.6.37.1/drivers/video/backlight/max8925_bl.c linux-2.6.37.1/drivers/video/backlight/max8925_bl.c
26639 +--- linux-2.6.37.1/drivers/video/backlight/max8925_bl.c 2011-01-04 19:50:19.000000000 -0500
26640 ++++ linux-2.6.37.1/drivers/video/backlight/max8925_bl.c 2011-01-17 02:41:01.000000000 -0500
26641 @@ -92,7 +92,7 @@ static int max8925_backlight_get_brightn
26642 return ret;
26643 }
26644 @@ -28639,9 +28709,9 @@ diff -urNp linux-2.6.37/drivers/video/backlight/max8925_bl.c linux-2.6.37/driver
26645 .options = BL_CORE_SUSPENDRESUME,
26646 .update_status = max8925_backlight_update_status,
26647 .get_brightness = max8925_backlight_get_brightness,
26648 -diff -urNp linux-2.6.37/drivers/video/fbcmap.c linux-2.6.37/drivers/video/fbcmap.c
26649 ---- linux-2.6.37/drivers/video/fbcmap.c 2011-01-04 19:50:19.000000000 -0500
26650 -+++ linux-2.6.37/drivers/video/fbcmap.c 2011-01-17 02:41:01.000000000 -0500
26651 +diff -urNp linux-2.6.37.1/drivers/video/fbcmap.c linux-2.6.37.1/drivers/video/fbcmap.c
26652 +--- linux-2.6.37.1/drivers/video/fbcmap.c 2011-01-04 19:50:19.000000000 -0500
26653 ++++ linux-2.6.37.1/drivers/video/fbcmap.c 2011-01-17 02:41:01.000000000 -0500
26654 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
26655 rc = -ENODEV;
26656 goto out;
26657 @@ -28652,9 +28722,9 @@ diff -urNp linux-2.6.37/drivers/video/fbcmap.c linux-2.6.37/drivers/video/fbcmap
26658 rc = -EINVAL;
26659 goto out1;
26660 }
26661 -diff -urNp linux-2.6.37/drivers/video/fbmem.c linux-2.6.37/drivers/video/fbmem.c
26662 ---- linux-2.6.37/drivers/video/fbmem.c 2011-01-04 19:50:19.000000000 -0500
26663 -+++ linux-2.6.37/drivers/video/fbmem.c 2011-01-17 02:41:01.000000000 -0500
26664 +diff -urNp linux-2.6.37.1/drivers/video/fbmem.c linux-2.6.37.1/drivers/video/fbmem.c
26665 +--- linux-2.6.37.1/drivers/video/fbmem.c 2011-01-04 19:50:19.000000000 -0500
26666 ++++ linux-2.6.37.1/drivers/video/fbmem.c 2011-01-17 02:41:01.000000000 -0500
26667 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
26668 image->dx += image->width + 8;
26669 }
26670 @@ -28682,9 +28752,9 @@ diff -urNp linux-2.6.37/drivers/video/fbmem.c linux-2.6.37/drivers/video/fbmem.c
26671 return -EINVAL;
26672 if (!registered_fb[con2fb.framebuffer])
26673 request_module("fb%d", con2fb.framebuffer);
26674 -diff -urNp linux-2.6.37/drivers/video/fbmon.c linux-2.6.37/drivers/video/fbmon.c
26675 ---- linux-2.6.37/drivers/video/fbmon.c 2011-01-04 19:50:19.000000000 -0500
26676 -+++ linux-2.6.37/drivers/video/fbmon.c 2011-01-17 02:41:01.000000000 -0500
26677 +diff -urNp linux-2.6.37.1/drivers/video/fbmon.c linux-2.6.37.1/drivers/video/fbmon.c
26678 +--- linux-2.6.37.1/drivers/video/fbmon.c 2011-01-04 19:50:19.000000000 -0500
26679 ++++ linux-2.6.37.1/drivers/video/fbmon.c 2011-01-17 02:41:01.000000000 -0500
26680 @@ -46,7 +46,7 @@
26681 #ifdef DEBUG
26682 #define DPRINTK(fmt, args...) printk(fmt,## args)
26683 @@ -28694,9 +28764,9 @@ diff -urNp linux-2.6.37/drivers/video/fbmon.c linux-2.6.37/drivers/video/fbmon.c
26684 #endif
26685
26686 #define FBMON_FIX_HEADER 1
26687 -diff -urNp linux-2.6.37/drivers/video/i810/i810_accel.c linux-2.6.37/drivers/video/i810/i810_accel.c
26688 ---- linux-2.6.37/drivers/video/i810/i810_accel.c 2011-01-04 19:50:19.000000000 -0500
26689 -+++ linux-2.6.37/drivers/video/i810/i810_accel.c 2011-01-17 02:41:01.000000000 -0500
26690 +diff -urNp linux-2.6.37.1/drivers/video/i810/i810_accel.c linux-2.6.37.1/drivers/video/i810/i810_accel.c
26691 +--- linux-2.6.37.1/drivers/video/i810/i810_accel.c 2011-01-04 19:50:19.000000000 -0500
26692 ++++ linux-2.6.37.1/drivers/video/i810/i810_accel.c 2011-01-17 02:41:01.000000000 -0500
26693 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct
26694 }
26695 }
26696 @@ -28705,9 +28775,9 @@ diff -urNp linux-2.6.37/drivers/video/i810/i810_accel.c linux-2.6.37/drivers/vid
26697 i810_report_error(mmio);
26698 par->dev_flags |= LOCKUP;
26699 info->pixmap.scan_align = 1;
26700 -diff -urNp linux-2.6.37/drivers/video/i810/i810_main.c linux-2.6.37/drivers/video/i810/i810_main.c
26701 ---- linux-2.6.37/drivers/video/i810/i810_main.c 2011-01-04 19:50:19.000000000 -0500
26702 -+++ linux-2.6.37/drivers/video/i810/i810_main.c 2011-01-17 02:41:01.000000000 -0500
26703 +diff -urNp linux-2.6.37.1/drivers/video/i810/i810_main.c linux-2.6.37.1/drivers/video/i810/i810_main.c
26704 +--- linux-2.6.37.1/drivers/video/i810/i810_main.c 2011-01-04 19:50:19.000000000 -0500
26705 ++++ linux-2.6.37.1/drivers/video/i810/i810_main.c 2011-01-17 02:41:01.000000000 -0500
26706 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
26707 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
26708 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
26709 @@ -28717,9 +28787,9 @@ diff -urNp linux-2.6.37/drivers/video/i810/i810_main.c linux-2.6.37/drivers/vide
26710 };
26711
26712 static struct pci_driver i810fb_driver = {
26713 -diff -urNp linux-2.6.37/drivers/video/modedb.c linux-2.6.37/drivers/video/modedb.c
26714 ---- linux-2.6.37/drivers/video/modedb.c 2011-01-04 19:50:19.000000000 -0500
26715 -+++ linux-2.6.37/drivers/video/modedb.c 2011-01-17 02:41:01.000000000 -0500
26716 +diff -urNp linux-2.6.37.1/drivers/video/modedb.c linux-2.6.37.1/drivers/video/modedb.c
26717 +--- linux-2.6.37.1/drivers/video/modedb.c 2011-01-04 19:50:19.000000000 -0500
26718 ++++ linux-2.6.37.1/drivers/video/modedb.c 2011-01-17 02:41:01.000000000 -0500
26719 @@ -40,240 +40,240 @@ static const struct fb_videomode modedb[
26720 {
26721 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
26722 @@ -29020,9 +29090,9 @@ diff -urNp linux-2.6.37/drivers/video/modedb.c linux-2.6.37/drivers/video/modedb
26723 },
26724 };
26725
26726 -diff -urNp linux-2.6.37/drivers/video/nvidia/nv_backlight.c linux-2.6.37/drivers/video/nvidia/nv_backlight.c
26727 ---- linux-2.6.37/drivers/video/nvidia/nv_backlight.c 2011-01-04 19:50:19.000000000 -0500
26728 -+++ linux-2.6.37/drivers/video/nvidia/nv_backlight.c 2011-01-17 02:41:01.000000000 -0500
26729 +diff -urNp linux-2.6.37.1/drivers/video/nvidia/nv_backlight.c linux-2.6.37.1/drivers/video/nvidia/nv_backlight.c
26730 +--- linux-2.6.37.1/drivers/video/nvidia/nv_backlight.c 2011-01-04 19:50:19.000000000 -0500
26731 ++++ linux-2.6.37.1/drivers/video/nvidia/nv_backlight.c 2011-01-17 02:41:01.000000000 -0500
26732 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
26733 return bd->props.brightness;
26734 }
26735 @@ -29032,9 +29102,9 @@ diff -urNp linux-2.6.37/drivers/video/nvidia/nv_backlight.c linux-2.6.37/drivers
26736 .get_brightness = nvidia_bl_get_brightness,
26737 .update_status = nvidia_bl_update_status,
26738 };
26739 -diff -urNp linux-2.6.37/drivers/video/omap2/displays/panel-taal.c linux-2.6.37/drivers/video/omap2/displays/panel-taal.c
26740 ---- linux-2.6.37/drivers/video/omap2/displays/panel-taal.c 2011-01-04 19:50:19.000000000 -0500
26741 -+++ linux-2.6.37/drivers/video/omap2/displays/panel-taal.c 2011-01-17 02:41:01.000000000 -0500
26742 +diff -urNp linux-2.6.37.1/drivers/video/omap2/displays/panel-taal.c linux-2.6.37.1/drivers/video/omap2/displays/panel-taal.c
26743 +--- linux-2.6.37.1/drivers/video/omap2/displays/panel-taal.c 2011-01-04 19:50:19.000000000 -0500
26744 ++++ linux-2.6.37.1/drivers/video/omap2/displays/panel-taal.c 2011-01-17 02:41:01.000000000 -0500
26745 @@ -465,7 +465,7 @@ static int taal_bl_get_intensity(struct
26746 return 0;
26747 }
26748 @@ -29044,9 +29114,9 @@ diff -urNp linux-2.6.37/drivers/video/omap2/displays/panel-taal.c linux-2.6.37/d
26749 .get_brightness = taal_bl_get_intensity,
26750 .update_status = taal_bl_update_status,
26751 };
26752 -diff -urNp linux-2.6.37/drivers/video/riva/fbdev.c linux-2.6.37/drivers/video/riva/fbdev.c
26753 ---- linux-2.6.37/drivers/video/riva/fbdev.c 2011-01-04 19:50:19.000000000 -0500
26754 -+++ linux-2.6.37/drivers/video/riva/fbdev.c 2011-01-17 02:41:01.000000000 -0500
26755 +diff -urNp linux-2.6.37.1/drivers/video/riva/fbdev.c linux-2.6.37.1/drivers/video/riva/fbdev.c
26756 +--- linux-2.6.37.1/drivers/video/riva/fbdev.c 2011-01-04 19:50:19.000000000 -0500
26757 ++++ linux-2.6.37.1/drivers/video/riva/fbdev.c 2011-01-17 02:41:01.000000000 -0500
26758 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
26759 return bd->props.brightness;
26760 }
26761 @@ -29056,9 +29126,9 @@ diff -urNp linux-2.6.37/drivers/video/riva/fbdev.c linux-2.6.37/drivers/video/ri
26762 .get_brightness = riva_bl_get_brightness,
26763 .update_status = riva_bl_update_status,
26764 };
26765 -diff -urNp linux-2.6.37/drivers/video/uvesafb.c linux-2.6.37/drivers/video/uvesafb.c
26766 ---- linux-2.6.37/drivers/video/uvesafb.c 2011-01-04 19:50:19.000000000 -0500
26767 -+++ linux-2.6.37/drivers/video/uvesafb.c 2011-01-17 02:41:01.000000000 -0500
26768 +diff -urNp linux-2.6.37.1/drivers/video/uvesafb.c linux-2.6.37.1/drivers/video/uvesafb.c
26769 +--- linux-2.6.37.1/drivers/video/uvesafb.c 2011-01-04 19:50:19.000000000 -0500
26770 ++++ linux-2.6.37.1/drivers/video/uvesafb.c 2011-01-17 02:41:01.000000000 -0500
26771 @@ -19,6 +19,7 @@
26772 #include <linux/io.h>
26773 #include <linux/mutex.h>
26774 @@ -29134,9 +29204,9 @@ diff -urNp linux-2.6.37/drivers/video/uvesafb.c linux-2.6.37/drivers/video/uvesa
26775 }
26776
26777 framebuffer_release(info);
26778 -diff -urNp linux-2.6.37/drivers/video/vesafb.c linux-2.6.37/drivers/video/vesafb.c
26779 ---- linux-2.6.37/drivers/video/vesafb.c 2011-01-04 19:50:19.000000000 -0500
26780 -+++ linux-2.6.37/drivers/video/vesafb.c 2011-01-17 02:41:01.000000000 -0500
26781 +diff -urNp linux-2.6.37.1/drivers/video/vesafb.c linux-2.6.37.1/drivers/video/vesafb.c
26782 +--- linux-2.6.37.1/drivers/video/vesafb.c 2011-01-04 19:50:19.000000000 -0500
26783 ++++ linux-2.6.37.1/drivers/video/vesafb.c 2011-01-17 02:41:01.000000000 -0500
26784 @@ -9,6 +9,7 @@
26785 */
26786
26787 @@ -29240,9 +29310,9 @@ diff -urNp linux-2.6.37/drivers/video/vesafb.c linux-2.6.37/drivers/video/vesafb
26788 if (info->screen_base)
26789 iounmap(info->screen_base);
26790 framebuffer_release(info);
26791 -diff -urNp linux-2.6.37/fs/9p/vfs_inode.c linux-2.6.37/fs/9p/vfs_inode.c
26792 ---- linux-2.6.37/fs/9p/vfs_inode.c 2011-01-04 19:50:19.000000000 -0500
26793 -+++ linux-2.6.37/fs/9p/vfs_inode.c 2011-01-17 02:41:01.000000000 -0500
26794 +diff -urNp linux-2.6.37.1/fs/9p/vfs_inode.c linux-2.6.37.1/fs/9p/vfs_inode.c
26795 +--- linux-2.6.37.1/fs/9p/vfs_inode.c 2011-01-04 19:50:19.000000000 -0500
26796 ++++ linux-2.6.37.1/fs/9p/vfs_inode.c 2011-01-17 02:41:01.000000000 -0500
26797 @@ -1598,7 +1598,7 @@ static void *v9fs_vfs_follow_link(struct
26798 static void
26799 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
26800 @@ -29252,9 +29322,9 @@ diff -urNp linux-2.6.37/fs/9p/vfs_inode.c linux-2.6.37/fs/9p/vfs_inode.c
26801
26802 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
26803 IS_ERR(s) ? "<error>" : s);
26804 -diff -urNp linux-2.6.37/fs/aio.c linux-2.6.37/fs/aio.c
26805 ---- linux-2.6.37/fs/aio.c 2011-01-04 19:50:19.000000000 -0500
26806 -+++ linux-2.6.37/fs/aio.c 2011-01-17 02:41:01.000000000 -0500
26807 +diff -urNp linux-2.6.37.1/fs/aio.c linux-2.6.37.1/fs/aio.c
26808 +--- linux-2.6.37.1/fs/aio.c 2011-01-04 19:50:19.000000000 -0500
26809 ++++ linux-2.6.37.1/fs/aio.c 2011-01-17 02:41:01.000000000 -0500
26810 @@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx
26811 size += sizeof(struct io_event) * nr_events;
26812 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
26813 @@ -29264,9 +29334,9 @@ diff -urNp linux-2.6.37/fs/aio.c linux-2.6.37/fs/aio.c
26814 return -EINVAL;
26815
26816 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
26817 -diff -urNp linux-2.6.37/fs/attr.c linux-2.6.37/fs/attr.c
26818 ---- linux-2.6.37/fs/attr.c 2011-01-04 19:50:19.000000000 -0500
26819 -+++ linux-2.6.37/fs/attr.c 2011-01-17 02:41:01.000000000 -0500
26820 +diff -urNp linux-2.6.37.1/fs/attr.c linux-2.6.37.1/fs/attr.c
26821 +--- linux-2.6.37.1/fs/attr.c 2011-01-04 19:50:19.000000000 -0500
26822 ++++ linux-2.6.37.1/fs/attr.c 2011-01-17 02:41:01.000000000 -0500
26823 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
26824 unsigned long limit;
26825
26826 @@ -29275,9 +29345,9 @@ diff -urNp linux-2.6.37/fs/attr.c linux-2.6.37/fs/attr.c
26827 if (limit != RLIM_INFINITY && offset > limit)
26828 goto out_sig;
26829 if (offset > inode->i_sb->s_maxbytes)
26830 -diff -urNp linux-2.6.37/fs/autofs4/symlink.c linux-2.6.37/fs/autofs4/symlink.c
26831 ---- linux-2.6.37/fs/autofs4/symlink.c 2011-01-04 19:50:19.000000000 -0500
26832 -+++ linux-2.6.37/fs/autofs4/symlink.c 2011-01-17 02:41:01.000000000 -0500
26833 +diff -urNp linux-2.6.37.1/fs/autofs4/symlink.c linux-2.6.37.1/fs/autofs4/symlink.c
26834 +--- linux-2.6.37.1/fs/autofs4/symlink.c 2011-01-04 19:50:19.000000000 -0500
26835 ++++ linux-2.6.37.1/fs/autofs4/symlink.c 2011-01-17 02:41:01.000000000 -0500
26836 @@ -15,7 +15,7 @@
26837 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
26838 {
26839 @@ -29287,9 +29357,9 @@ diff -urNp linux-2.6.37/fs/autofs4/symlink.c linux-2.6.37/fs/autofs4/symlink.c
26840 return NULL;
26841 }
26842
26843 -diff -urNp linux-2.6.37/fs/befs/linuxvfs.c linux-2.6.37/fs/befs/linuxvfs.c
26844 ---- linux-2.6.37/fs/befs/linuxvfs.c 2011-01-04 19:50:19.000000000 -0500
26845 -+++ linux-2.6.37/fs/befs/linuxvfs.c 2011-01-17 02:41:01.000000000 -0500
26846 +diff -urNp linux-2.6.37.1/fs/befs/linuxvfs.c linux-2.6.37.1/fs/befs/linuxvfs.c
26847 +--- linux-2.6.37.1/fs/befs/linuxvfs.c 2011-01-04 19:50:19.000000000 -0500
26848 ++++ linux-2.6.37.1/fs/befs/linuxvfs.c 2011-01-17 02:41:01.000000000 -0500
26849 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
26850 {
26851 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
26852 @@ -29299,9 +29369,9 @@ diff -urNp linux-2.6.37/fs/befs/linuxvfs.c linux-2.6.37/fs/befs/linuxvfs.c
26853 if (!IS_ERR(link))
26854 kfree(link);
26855 }
26856 -diff -urNp linux-2.6.37/fs/binfmt_aout.c linux-2.6.37/fs/binfmt_aout.c
26857 ---- linux-2.6.37/fs/binfmt_aout.c 2011-01-04 19:50:19.000000000 -0500
26858 -+++ linux-2.6.37/fs/binfmt_aout.c 2011-01-17 02:41:01.000000000 -0500
26859 +diff -urNp linux-2.6.37.1/fs/binfmt_aout.c linux-2.6.37.1/fs/binfmt_aout.c
26860 +--- linux-2.6.37.1/fs/binfmt_aout.c 2011-01-04 19:50:19.000000000 -0500
26861 ++++ linux-2.6.37.1/fs/binfmt_aout.c 2011-01-17 02:41:01.000000000 -0500
26862 @@ -16,6 +16,7 @@
26863 #include <linux/string.h>
26864 #include <linux/fs.h>
26865 @@ -29378,9 +29448,9 @@ diff -urNp linux-2.6.37/fs/binfmt_aout.c linux-2.6.37/fs/binfmt_aout.c
26866 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
26867 fd_offset + ex.a_text);
26868 up_write(&current->mm->mmap_sem);
26869 -diff -urNp linux-2.6.37/fs/binfmt_elf.c linux-2.6.37/fs/binfmt_elf.c
26870 ---- linux-2.6.37/fs/binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
26871 -+++ linux-2.6.37/fs/binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
26872 +diff -urNp linux-2.6.37.1/fs/binfmt_elf.c linux-2.6.37.1/fs/binfmt_elf.c
26873 +--- linux-2.6.37.1/fs/binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
26874 ++++ linux-2.6.37.1/fs/binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
26875 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
26876 #define elf_core_dump NULL
26877 #endif
26878 @@ -30046,9 +30116,9 @@ diff -urNp linux-2.6.37/fs/binfmt_elf.c linux-2.6.37/fs/binfmt_elf.c
26879 static int __init init_elf_binfmt(void)
26880 {
26881 return register_binfmt(&elf_format);
26882 -diff -urNp linux-2.6.37/fs/binfmt_flat.c linux-2.6.37/fs/binfmt_flat.c
26883 ---- linux-2.6.37/fs/binfmt_flat.c 2011-01-04 19:50:19.000000000 -0500
26884 -+++ linux-2.6.37/fs/binfmt_flat.c 2011-01-17 02:41:01.000000000 -0500
26885 +diff -urNp linux-2.6.37.1/fs/binfmt_flat.c linux-2.6.37.1/fs/binfmt_flat.c
26886 +--- linux-2.6.37.1/fs/binfmt_flat.c 2011-01-04 19:50:19.000000000 -0500
26887 ++++ linux-2.6.37.1/fs/binfmt_flat.c 2011-01-17 02:41:01.000000000 -0500
26888 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
26889 realdatastart = (unsigned long) -ENOMEM;
26890 printk("Unable to allocate RAM for process data, errno %d\n",
26891 @@ -30081,9 +30151,9 @@ diff -urNp linux-2.6.37/fs/binfmt_flat.c linux-2.6.37/fs/binfmt_flat.c
26892 ret = result;
26893 goto err;
26894 }
26895 -diff -urNp linux-2.6.37/fs/binfmt_misc.c linux-2.6.37/fs/binfmt_misc.c
26896 ---- linux-2.6.37/fs/binfmt_misc.c 2011-01-04 19:50:19.000000000 -0500
26897 -+++ linux-2.6.37/fs/binfmt_misc.c 2011-01-17 02:41:01.000000000 -0500
26898 +diff -urNp linux-2.6.37.1/fs/binfmt_misc.c linux-2.6.37.1/fs/binfmt_misc.c
26899 +--- linux-2.6.37.1/fs/binfmt_misc.c 2011-01-04 19:50:19.000000000 -0500
26900 ++++ linux-2.6.37.1/fs/binfmt_misc.c 2011-01-17 02:41:01.000000000 -0500
26901 @@ -698,7 +698,7 @@ static int bm_fill_super(struct super_bl
26902 static struct tree_descr bm_files[] = {
26903 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
26904 @@ -30093,9 +30163,9 @@ diff -urNp linux-2.6.37/fs/binfmt_misc.c linux-2.6.37/fs/binfmt_misc.c
26905 };
26906 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
26907 if (!err)
26908 -diff -urNp linux-2.6.37/fs/bio.c linux-2.6.37/fs/bio.c
26909 ---- linux-2.6.37/fs/bio.c 2011-01-04 19:50:19.000000000 -0500
26910 -+++ linux-2.6.37/fs/bio.c 2011-01-17 02:41:01.000000000 -0500
26911 +diff -urNp linux-2.6.37.1/fs/bio.c linux-2.6.37.1/fs/bio.c
26912 +--- linux-2.6.37.1/fs/bio.c 2011-01-04 19:50:19.000000000 -0500
26913 ++++ linux-2.6.37.1/fs/bio.c 2011-01-17 02:41:01.000000000 -0500
26914 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
26915 const int read = bio_data_dir(bio) == READ;
26916 struct bio_map_data *bmd = bio->bi_private;
26917 @@ -30105,9 +30175,9 @@ diff -urNp linux-2.6.37/fs/bio.c linux-2.6.37/fs/bio.c
26918
26919 __bio_for_each_segment(bvec, bio, i, 0) {
26920 char *addr = page_address(bvec->bv_page);
26921 -diff -urNp linux-2.6.37/fs/block_dev.c linux-2.6.37/fs/block_dev.c
26922 ---- linux-2.6.37/fs/block_dev.c 2011-01-04 19:50:19.000000000 -0500
26923 -+++ linux-2.6.37/fs/block_dev.c 2011-01-17 02:41:01.000000000 -0500
26924 +diff -urNp linux-2.6.37.1/fs/block_dev.c linux-2.6.37.1/fs/block_dev.c
26925 +--- linux-2.6.37.1/fs/block_dev.c 2011-01-04 19:50:19.000000000 -0500
26926 ++++ linux-2.6.37.1/fs/block_dev.c 2011-01-17 02:41:01.000000000 -0500
26927 @@ -662,7 +662,7 @@ static bool bd_may_claim(struct block_de
26928 else if (bdev->bd_contains == bdev)
26929 return true; /* is a whole device which isn't held */
26930 @@ -30117,9 +30187,9 @@ diff -urNp linux-2.6.37/fs/block_dev.c linux-2.6.37/fs/block_dev.c
26931 return true; /* is a partition of a device that is being partitioned */
26932 else if (whole->bd_holder != NULL)
26933 return false; /* is a partition of a held device */
26934 -diff -urNp linux-2.6.37/fs/btrfs/ctree.c linux-2.6.37/fs/btrfs/ctree.c
26935 ---- linux-2.6.37/fs/btrfs/ctree.c 2011-01-04 19:50:19.000000000 -0500
26936 -+++ linux-2.6.37/fs/btrfs/ctree.c 2011-01-17 02:41:01.000000000 -0500
26937 +diff -urNp linux-2.6.37.1/fs/btrfs/ctree.c linux-2.6.37.1/fs/btrfs/ctree.c
26938 +--- linux-2.6.37.1/fs/btrfs/ctree.c 2011-01-04 19:50:19.000000000 -0500
26939 ++++ linux-2.6.37.1/fs/btrfs/ctree.c 2011-01-17 02:41:01.000000000 -0500
26940 @@ -466,9 +466,12 @@ static noinline int __btrfs_cow_block(st
26941 free_extent_buffer(buf);
26942 add_root_to_dirty_list(root);
26943 @@ -30144,9 +30214,9 @@ diff -urNp linux-2.6.37/fs/btrfs/ctree.c linux-2.6.37/fs/btrfs/ctree.c
26944 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
26945 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
26946 }
26947 -diff -urNp linux-2.6.37/fs/btrfs/disk-io.c linux-2.6.37/fs/btrfs/disk-io.c
26948 ---- linux-2.6.37/fs/btrfs/disk-io.c 2011-01-04 19:50:19.000000000 -0500
26949 -+++ linux-2.6.37/fs/btrfs/disk-io.c 2011-01-17 02:41:01.000000000 -0500
26950 +diff -urNp linux-2.6.37.1/fs/btrfs/disk-io.c linux-2.6.37.1/fs/btrfs/disk-io.c
26951 +--- linux-2.6.37.1/fs/btrfs/disk-io.c 2011-01-04 19:50:19.000000000 -0500
26952 ++++ linux-2.6.37.1/fs/btrfs/disk-io.c 2011-01-17 02:41:01.000000000 -0500
26953 @@ -41,7 +41,7 @@
26954 #include "tree-log.h"
26955 #include "free-space-cache.h"
26956 @@ -30165,9 +30235,9 @@ diff -urNp linux-2.6.37/fs/btrfs/disk-io.c linux-2.6.37/fs/btrfs/disk-io.c
26957 .write_cache_pages_lock_hook = btree_lock_page_hook,
26958 .readpage_end_io_hook = btree_readpage_end_io_hook,
26959 .submit_bio_hook = btree_submit_bio_hook,
26960 -diff -urNp linux-2.6.37/fs/btrfs/extent_io.h linux-2.6.37/fs/btrfs/extent_io.h
26961 ---- linux-2.6.37/fs/btrfs/extent_io.h 2011-01-04 19:50:19.000000000 -0500
26962 -+++ linux-2.6.37/fs/btrfs/extent_io.h 2011-01-17 02:41:01.000000000 -0500
26963 +diff -urNp linux-2.6.37.1/fs/btrfs/extent_io.h linux-2.6.37.1/fs/btrfs/extent_io.h
26964 +--- linux-2.6.37.1/fs/btrfs/extent_io.h 2011-01-04 19:50:19.000000000 -0500
26965 ++++ linux-2.6.37.1/fs/btrfs/extent_io.h 2011-01-17 02:41:01.000000000 -0500
26966 @@ -51,36 +51,36 @@ typedef int (extent_submit_bio_hook_t)(s
26967 struct bio *bio, int mirror_num,
26968 unsigned long bio_flags, u64 bio_offset);
26969 @@ -30228,9 +30298,9 @@ diff -urNp linux-2.6.37/fs/btrfs/extent_io.h linux-2.6.37/fs/btrfs/extent_io.h
26970 };
26971
26972 struct extent_state {
26973 -diff -urNp linux-2.6.37/fs/btrfs/free-space-cache.c linux-2.6.37/fs/btrfs/free-space-cache.c
26974 ---- linux-2.6.37/fs/btrfs/free-space-cache.c 2011-01-04 19:50:19.000000000 -0500
26975 -+++ linux-2.6.37/fs/btrfs/free-space-cache.c 2011-01-17 02:41:01.000000000 -0500
26976 +diff -urNp linux-2.6.37.1/fs/btrfs/free-space-cache.c linux-2.6.37.1/fs/btrfs/free-space-cache.c
26977 +--- linux-2.6.37.1/fs/btrfs/free-space-cache.c 2011-01-04 19:50:19.000000000 -0500
26978 ++++ linux-2.6.37.1/fs/btrfs/free-space-cache.c 2011-01-17 02:41:01.000000000 -0500
26979 @@ -1828,8 +1828,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
26980
26981 while(1) {
26982 @@ -30249,9 +30319,9 @@ diff -urNp linux-2.6.37/fs/btrfs/free-space-cache.c linux-2.6.37/fs/btrfs/free-s
26983
26984 if (entry->bitmap && entry->bytes > bytes + empty_size) {
26985 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
26986 -diff -urNp linux-2.6.37/fs/btrfs/inode.c linux-2.6.37/fs/btrfs/inode.c
26987 ---- linux-2.6.37/fs/btrfs/inode.c 2011-01-04 19:50:19.000000000 -0500
26988 -+++ linux-2.6.37/fs/btrfs/inode.c 2011-01-17 02:41:01.000000000 -0500
26989 +diff -urNp linux-2.6.37.1/fs/btrfs/inode.c linux-2.6.37.1/fs/btrfs/inode.c
26990 +--- linux-2.6.37.1/fs/btrfs/inode.c 2011-01-04 19:50:19.000000000 -0500
26991 ++++ linux-2.6.37.1/fs/btrfs/inode.c 2011-01-17 02:41:01.000000000 -0500
26992 @@ -64,7 +64,7 @@ static const struct inode_operations btr
26993 static const struct address_space_operations btrfs_aops;
26994 static const struct address_space_operations btrfs_symlink_aops;
26995 @@ -30270,9 +30340,9 @@ diff -urNp linux-2.6.37/fs/btrfs/inode.c linux-2.6.37/fs/btrfs/inode.c
26996 .fill_delalloc = run_delalloc_range,
26997 .submit_bio_hook = btrfs_submit_bio_hook,
26998 .merge_bio_hook = btrfs_merge_bio_hook,
26999 -diff -urNp linux-2.6.37/fs/btrfs/ioctl.c linux-2.6.37/fs/btrfs/ioctl.c
27000 ---- linux-2.6.37/fs/btrfs/ioctl.c 2011-01-04 19:50:19.000000000 -0500
27001 -+++ linux-2.6.37/fs/btrfs/ioctl.c 2011-02-12 10:29:31.000000000 -0500
27002 +diff -urNp linux-2.6.37.1/fs/btrfs/ioctl.c linux-2.6.37.1/fs/btrfs/ioctl.c
27003 +--- linux-2.6.37.1/fs/btrfs/ioctl.c 2011-01-04 19:50:19.000000000 -0500
27004 ++++ linux-2.6.37.1/fs/btrfs/ioctl.c 2011-02-12 10:29:31.000000000 -0500
27005 @@ -2087,7 +2087,7 @@ long btrfs_ioctl_space_info(struct btrfs
27006 int num_types = 4;
27007 int alloc_size;
27008 @@ -30304,9 +30374,9 @@ diff -urNp linux-2.6.37/fs/btrfs/ioctl.c linux-2.6.37/fs/btrfs/ioctl.c
27009 info = NULL;
27010 rcu_read_lock();
27011 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
27012 -diff -urNp linux-2.6.37/fs/btrfs/relocation.c linux-2.6.37/fs/btrfs/relocation.c
27013 ---- linux-2.6.37/fs/btrfs/relocation.c 2011-01-04 19:50:19.000000000 -0500
27014 -+++ linux-2.6.37/fs/btrfs/relocation.c 2011-01-17 02:41:01.000000000 -0500
27015 +diff -urNp linux-2.6.37.1/fs/btrfs/relocation.c linux-2.6.37.1/fs/btrfs/relocation.c
27016 +--- linux-2.6.37.1/fs/btrfs/relocation.c 2011-01-04 19:50:19.000000000 -0500
27017 ++++ linux-2.6.37.1/fs/btrfs/relocation.c 2011-01-17 02:41:01.000000000 -0500
27018 @@ -1238,7 +1238,7 @@ static int __update_reloc_root(struct bt
27019 }
27020 spin_unlock(&rc->reloc_root_tree.lock);
27021 @@ -30316,9 +30386,9 @@ diff -urNp linux-2.6.37/fs/btrfs/relocation.c linux-2.6.37/fs/btrfs/relocation.c
27022
27023 if (!del) {
27024 spin_lock(&rc->reloc_root_tree.lock);
27025 -diff -urNp linux-2.6.37/fs/cachefiles/bind.c linux-2.6.37/fs/cachefiles/bind.c
27026 ---- linux-2.6.37/fs/cachefiles/bind.c 2011-01-04 19:50:19.000000000 -0500
27027 -+++ linux-2.6.37/fs/cachefiles/bind.c 2011-01-17 02:41:01.000000000 -0500
27028 +diff -urNp linux-2.6.37.1/fs/cachefiles/bind.c linux-2.6.37.1/fs/cachefiles/bind.c
27029 +--- linux-2.6.37.1/fs/cachefiles/bind.c 2011-01-04 19:50:19.000000000 -0500
27030 ++++ linux-2.6.37.1/fs/cachefiles/bind.c 2011-01-17 02:41:01.000000000 -0500
27031 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
27032 args);
27033
27034 @@ -30335,9 +30405,9 @@ diff -urNp linux-2.6.37/fs/cachefiles/bind.c linux-2.6.37/fs/cachefiles/bind.c
27035 cache->bcull_percent < cache->brun_percent &&
27036 cache->brun_percent < 100);
27037
27038 -diff -urNp linux-2.6.37/fs/cachefiles/daemon.c linux-2.6.37/fs/cachefiles/daemon.c
27039 ---- linux-2.6.37/fs/cachefiles/daemon.c 2011-01-04 19:50:19.000000000 -0500
27040 -+++ linux-2.6.37/fs/cachefiles/daemon.c 2011-01-17 02:41:01.000000000 -0500
27041 +diff -urNp linux-2.6.37.1/fs/cachefiles/daemon.c linux-2.6.37.1/fs/cachefiles/daemon.c
27042 +--- linux-2.6.37.1/fs/cachefiles/daemon.c 2011-01-04 19:50:19.000000000 -0500
27043 ++++ linux-2.6.37.1/fs/cachefiles/daemon.c 2011-01-17 02:41:01.000000000 -0500
27044 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
27045 if (n > buflen)
27046 return -EMSGSIZE;
27047 @@ -30374,9 +30444,9 @@ diff -urNp linux-2.6.37/fs/cachefiles/daemon.c linux-2.6.37/fs/cachefiles/daemon
27048 return cachefiles_daemon_range_error(cache, args);
27049
27050 cache->bstop_percent = bstop;
27051 -diff -urNp linux-2.6.37/fs/cachefiles/rdwr.c linux-2.6.37/fs/cachefiles/rdwr.c
27052 ---- linux-2.6.37/fs/cachefiles/rdwr.c 2011-01-04 19:50:19.000000000 -0500
27053 -+++ linux-2.6.37/fs/cachefiles/rdwr.c 2011-01-17 02:41:01.000000000 -0500
27054 +diff -urNp linux-2.6.37.1/fs/cachefiles/rdwr.c linux-2.6.37.1/fs/cachefiles/rdwr.c
27055 +--- linux-2.6.37.1/fs/cachefiles/rdwr.c 2011-01-04 19:50:19.000000000 -0500
27056 ++++ linux-2.6.37.1/fs/cachefiles/rdwr.c 2011-01-17 02:41:01.000000000 -0500
27057 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
27058 old_fs = get_fs();
27059 set_fs(KERNEL_DS);
27060 @@ -30386,9 +30456,9 @@ diff -urNp linux-2.6.37/fs/cachefiles/rdwr.c linux-2.6.37/fs/cachefiles/rdwr.c
27061 set_fs(old_fs);
27062 kunmap(page);
27063 if (ret != len)
27064 -diff -urNp linux-2.6.37/fs/ceph/dir.c linux-2.6.37/fs/ceph/dir.c
27065 ---- linux-2.6.37/fs/ceph/dir.c 2011-01-04 19:50:19.000000000 -0500
27066 -+++ linux-2.6.37/fs/ceph/dir.c 2011-01-17 02:41:01.000000000 -0500
27067 +diff -urNp linux-2.6.37.1/fs/ceph/dir.c linux-2.6.37.1/fs/ceph/dir.c
27068 +--- linux-2.6.37.1/fs/ceph/dir.c 2011-01-04 19:50:19.000000000 -0500
27069 ++++ linux-2.6.37.1/fs/ceph/dir.c 2011-01-17 02:41:01.000000000 -0500
27070 @@ -223,7 +223,7 @@ static int ceph_readdir(struct file *fil
27071 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
27072 struct ceph_mds_client *mdsc = fsc->mdsc;
27073 @@ -30407,9 +30477,9 @@ diff -urNp linux-2.6.37/fs/ceph/dir.c linux-2.6.37/fs/ceph/dir.c
27074 u64 pos = ceph_make_fpos(frag, off);
27075 struct ceph_mds_reply_inode *in =
27076 rinfo->dir_in[off - fi->offset].in;
27077 -diff -urNp linux-2.6.37/fs/cifs/cifs_uniupr.h linux-2.6.37/fs/cifs/cifs_uniupr.h
27078 ---- linux-2.6.37/fs/cifs/cifs_uniupr.h 2011-01-04 19:50:19.000000000 -0500
27079 -+++ linux-2.6.37/fs/cifs/cifs_uniupr.h 2011-01-17 02:41:01.000000000 -0500
27080 +diff -urNp linux-2.6.37.1/fs/cifs/cifs_uniupr.h linux-2.6.37.1/fs/cifs/cifs_uniupr.h
27081 +--- linux-2.6.37.1/fs/cifs/cifs_uniupr.h 2011-01-04 19:50:19.000000000 -0500
27082 ++++ linux-2.6.37.1/fs/cifs/cifs_uniupr.h 2011-01-17 02:41:01.000000000 -0500
27083 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
27084 {0x0490, 0x04cc, UniCaseRangeU0490},
27085 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
27086 @@ -30419,9 +30489,9 @@ diff -urNp linux-2.6.37/fs/cifs/cifs_uniupr.h linux-2.6.37/fs/cifs/cifs_uniupr.h
27087 };
27088 #endif
27089
27090 -diff -urNp linux-2.6.37/fs/cifs/link.c linux-2.6.37/fs/cifs/link.c
27091 ---- linux-2.6.37/fs/cifs/link.c 2011-01-04 19:50:19.000000000 -0500
27092 -+++ linux-2.6.37/fs/cifs/link.c 2011-01-17 02:41:01.000000000 -0500
27093 +diff -urNp linux-2.6.37.1/fs/cifs/link.c linux-2.6.37.1/fs/cifs/link.c
27094 +--- linux-2.6.37.1/fs/cifs/link.c 2011-01-04 19:50:19.000000000 -0500
27095 ++++ linux-2.6.37.1/fs/cifs/link.c 2011-01-17 02:41:01.000000000 -0500
27096 @@ -540,7 +540,7 @@ symlink_exit:
27097
27098 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
27099 @@ -30431,9 +30501,9 @@ diff -urNp linux-2.6.37/fs/cifs/link.c linux-2.6.37/fs/cifs/link.c
27100 if (!IS_ERR(p))
27101 kfree(p);
27102 }
27103 -diff -urNp linux-2.6.37/fs/compat_binfmt_elf.c linux-2.6.37/fs/compat_binfmt_elf.c
27104 ---- linux-2.6.37/fs/compat_binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
27105 -+++ linux-2.6.37/fs/compat_binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
27106 +diff -urNp linux-2.6.37.1/fs/compat_binfmt_elf.c linux-2.6.37.1/fs/compat_binfmt_elf.c
27107 +--- linux-2.6.37.1/fs/compat_binfmt_elf.c 2011-01-04 19:50:19.000000000 -0500
27108 ++++ linux-2.6.37.1/fs/compat_binfmt_elf.c 2011-01-17 02:41:01.000000000 -0500
27109 @@ -30,11 +30,13 @@
27110 #undef elf_phdr
27111 #undef elf_shdr
27112 @@ -30448,9 +30518,9 @@ diff -urNp linux-2.6.37/fs/compat_binfmt_elf.c linux-2.6.37/fs/compat_binfmt_elf
27113 #define elf_addr_t Elf32_Addr
27114
27115 /*
27116 -diff -urNp linux-2.6.37/fs/compat.c linux-2.6.37/fs/compat.c
27117 ---- linux-2.6.37/fs/compat.c 2011-01-04 19:50:19.000000000 -0500
27118 -+++ linux-2.6.37/fs/compat.c 2011-01-17 02:41:01.000000000 -0500
27119 +diff -urNp linux-2.6.37.1/fs/compat.c linux-2.6.37.1/fs/compat.c
27120 +--- linux-2.6.37.1/fs/compat.c 2011-01-04 19:50:19.000000000 -0500
27121 ++++ linux-2.6.37.1/fs/compat.c 2011-01-17 02:41:01.000000000 -0500
27122 @@ -592,7 +592,7 @@ ssize_t compat_rw_copy_check_uvector(int
27123 goto out;
27124
27125 @@ -30633,9 +30703,9 @@ diff -urNp linux-2.6.37/fs/compat.c linux-2.6.37/fs/compat.c
27126 out:
27127 if (bprm->mm) {
27128 acct_arg_size(bprm, 0);
27129 -diff -urNp linux-2.6.37/fs/compat_ioctl.c linux-2.6.37/fs/compat_ioctl.c
27130 ---- linux-2.6.37/fs/compat_ioctl.c 2011-01-04 19:50:19.000000000 -0500
27131 -+++ linux-2.6.37/fs/compat_ioctl.c 2011-01-17 02:41:01.000000000 -0500
27132 +diff -urNp linux-2.6.37.1/fs/compat_ioctl.c linux-2.6.37.1/fs/compat_ioctl.c
27133 +--- linux-2.6.37.1/fs/compat_ioctl.c 2011-01-04 19:50:19.000000000 -0500
27134 ++++ linux-2.6.37.1/fs/compat_ioctl.c 2011-01-17 02:41:01.000000000 -0500
27135 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
27136
27137 err = get_user(palp, &up->palette);
27138 @@ -30656,9 +30726,9 @@ diff -urNp linux-2.6.37/fs/compat_ioctl.c linux-2.6.37/fs/compat_ioctl.c
27139 if (a > b)
27140 return 1;
27141 if (a < b)
27142 -diff -urNp linux-2.6.37/fs/debugfs/inode.c linux-2.6.37/fs/debugfs/inode.c
27143 ---- linux-2.6.37/fs/debugfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27144 -+++ linux-2.6.37/fs/debugfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27145 +diff -urNp linux-2.6.37.1/fs/debugfs/inode.c linux-2.6.37.1/fs/debugfs/inode.c
27146 +--- linux-2.6.37.1/fs/debugfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27147 ++++ linux-2.6.37.1/fs/debugfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27148 @@ -130,7 +130,7 @@ static inline int debugfs_positive(struc
27149
27150 static int debug_fill_super(struct super_block *sb, void *data, int silent)
27151 @@ -30668,9 +30738,9 @@ diff -urNp linux-2.6.37/fs/debugfs/inode.c linux-2.6.37/fs/debugfs/inode.c
27152
27153 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
27154 }
27155 -diff -urNp linux-2.6.37/fs/dlm/lockspace.c linux-2.6.37/fs/dlm/lockspace.c
27156 ---- linux-2.6.37/fs/dlm/lockspace.c 2011-01-04 19:50:19.000000000 -0500
27157 -+++ linux-2.6.37/fs/dlm/lockspace.c 2011-01-17 02:41:01.000000000 -0500
27158 +diff -urNp linux-2.6.37.1/fs/dlm/lockspace.c linux-2.6.37.1/fs/dlm/lockspace.c
27159 +--- linux-2.6.37.1/fs/dlm/lockspace.c 2011-01-04 19:50:19.000000000 -0500
27160 ++++ linux-2.6.37.1/fs/dlm/lockspace.c 2011-01-17 02:41:01.000000000 -0500
27161 @@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
27162 return 0;
27163 }
27164 @@ -30680,9 +30750,9 @@ diff -urNp linux-2.6.37/fs/dlm/lockspace.c linux-2.6.37/fs/dlm/lockspace.c
27165 .uevent = dlm_uevent,
27166 };
27167
27168 -diff -urNp linux-2.6.37/fs/ecryptfs/inode.c linux-2.6.37/fs/ecryptfs/inode.c
27169 ---- linux-2.6.37/fs/ecryptfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27170 -+++ linux-2.6.37/fs/ecryptfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27171 +diff -urNp linux-2.6.37.1/fs/ecryptfs/inode.c linux-2.6.37.1/fs/ecryptfs/inode.c
27172 +--- linux-2.6.37.1/fs/ecryptfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27173 ++++ linux-2.6.37.1/fs/ecryptfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27174 @@ -745,7 +745,7 @@ static int ecryptfs_readlink_lower(struc
27175 old_fs = get_fs();
27176 set_fs(get_ds());
27177 @@ -30710,9 +30780,9 @@ diff -urNp linux-2.6.37/fs/ecryptfs/inode.c linux-2.6.37/fs/ecryptfs/inode.c
27178 if (!IS_ERR(buf)) {
27179 /* Free the char* */
27180 kfree(buf);
27181 -diff -urNp linux-2.6.37/fs/ecryptfs/miscdev.c linux-2.6.37/fs/ecryptfs/miscdev.c
27182 ---- linux-2.6.37/fs/ecryptfs/miscdev.c 2011-01-04 19:50:19.000000000 -0500
27183 -+++ linux-2.6.37/fs/ecryptfs/miscdev.c 2011-01-17 02:41:01.000000000 -0500
27184 +diff -urNp linux-2.6.37.1/fs/ecryptfs/miscdev.c linux-2.6.37.1/fs/ecryptfs/miscdev.c
27185 +--- linux-2.6.37.1/fs/ecryptfs/miscdev.c 2011-01-04 19:50:19.000000000 -0500
27186 ++++ linux-2.6.37.1/fs/ecryptfs/miscdev.c 2011-01-17 02:41:01.000000000 -0500
27187 @@ -328,7 +328,7 @@ check_list:
27188 goto out_unlock_msg_ctx;
27189 i = 5;
27190 @@ -30722,9 +30792,9 @@ diff -urNp linux-2.6.37/fs/ecryptfs/miscdev.c linux-2.6.37/fs/ecryptfs/miscdev.c
27191 goto out_unlock_msg_ctx;
27192 i += packet_length_size;
27193 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
27194 -diff -urNp linux-2.6.37/fs/exec.c linux-2.6.37/fs/exec.c
27195 ---- linux-2.6.37/fs/exec.c 2011-01-04 19:50:19.000000000 -0500
27196 -+++ linux-2.6.37/fs/exec.c 2011-02-12 11:21:04.000000000 -0500
27197 +diff -urNp linux-2.6.37.1/fs/exec.c linux-2.6.37.1/fs/exec.c
27198 +--- linux-2.6.37.1/fs/exec.c 2011-01-04 19:50:19.000000000 -0500
27199 ++++ linux-2.6.37.1/fs/exec.c 2011-02-12 11:21:04.000000000 -0500
27200 @@ -55,12 +55,24 @@
27201 #include <linux/fs_struct.h>
27202 #include <linux/pipe_fs_i.h>
27203 @@ -31257,9 +31327,9 @@ diff -urNp linux-2.6.37/fs/exec.c linux-2.6.37/fs/exec.c
27204 if (ispipe) {
27205 int dump_count;
27206 char **helper_argv;
27207 -diff -urNp linux-2.6.37/fs/ext2/balloc.c linux-2.6.37/fs/ext2/balloc.c
27208 ---- linux-2.6.37/fs/ext2/balloc.c 2011-01-04 19:50:19.000000000 -0500
27209 -+++ linux-2.6.37/fs/ext2/balloc.c 2011-01-17 02:41:01.000000000 -0500
27210 +diff -urNp linux-2.6.37.1/fs/ext2/balloc.c linux-2.6.37.1/fs/ext2/balloc.c
27211 +--- linux-2.6.37.1/fs/ext2/balloc.c 2011-01-04 19:50:19.000000000 -0500
27212 ++++ linux-2.6.37.1/fs/ext2/balloc.c 2011-01-17 02:41:01.000000000 -0500
27213 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
27214
27215 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
27216 @@ -31269,9 +31339,9 @@ diff -urNp linux-2.6.37/fs/ext2/balloc.c linux-2.6.37/fs/ext2/balloc.c
27217 sbi->s_resuid != current_fsuid() &&
27218 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
27219 return 0;
27220 -diff -urNp linux-2.6.37/fs/ext2/xattr.c linux-2.6.37/fs/ext2/xattr.c
27221 ---- linux-2.6.37/fs/ext2/xattr.c 2011-01-04 19:50:19.000000000 -0500
27222 -+++ linux-2.6.37/fs/ext2/xattr.c 2011-01-17 02:41:01.000000000 -0500
27223 +diff -urNp linux-2.6.37.1/fs/ext2/xattr.c linux-2.6.37.1/fs/ext2/xattr.c
27224 +--- linux-2.6.37.1/fs/ext2/xattr.c 2011-01-04 19:50:19.000000000 -0500
27225 ++++ linux-2.6.37.1/fs/ext2/xattr.c 2011-01-17 02:41:01.000000000 -0500
27226 @@ -86,8 +86,8 @@
27227 printk("\n"); \
27228 } while (0)
27229 @@ -31283,9 +31353,9 @@ diff -urNp linux-2.6.37/fs/ext2/xattr.c linux-2.6.37/fs/ext2/xattr.c
27230 #endif
27231
27232 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
27233 -diff -urNp linux-2.6.37/fs/ext3/balloc.c linux-2.6.37/fs/ext3/balloc.c
27234 ---- linux-2.6.37/fs/ext3/balloc.c 2011-01-04 19:50:19.000000000 -0500
27235 -+++ linux-2.6.37/fs/ext3/balloc.c 2011-01-17 02:41:01.000000000 -0500
27236 +diff -urNp linux-2.6.37.1/fs/ext3/balloc.c linux-2.6.37.1/fs/ext3/balloc.c
27237 +--- linux-2.6.37.1/fs/ext3/balloc.c 2011-01-04 19:50:19.000000000 -0500
27238 ++++ linux-2.6.37.1/fs/ext3/balloc.c 2011-01-17 02:41:01.000000000 -0500
27239 @@ -1425,7 +1425,7 @@ static int ext3_has_free_blocks(struct e
27240
27241 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
27242 @@ -31295,9 +31365,9 @@ diff -urNp linux-2.6.37/fs/ext3/balloc.c linux-2.6.37/fs/ext3/balloc.c
27243 sbi->s_resuid != current_fsuid() &&
27244 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
27245 return 0;
27246 -diff -urNp linux-2.6.37/fs/ext3/namei.c linux-2.6.37/fs/ext3/namei.c
27247 ---- linux-2.6.37/fs/ext3/namei.c 2011-01-04 19:50:19.000000000 -0500
27248 -+++ linux-2.6.37/fs/ext3/namei.c 2011-01-17 02:41:01.000000000 -0500
27249 +diff -urNp linux-2.6.37.1/fs/ext3/namei.c linux-2.6.37.1/fs/ext3/namei.c
27250 +--- linux-2.6.37.1/fs/ext3/namei.c 2011-01-04 19:50:19.000000000 -0500
27251 ++++ linux-2.6.37.1/fs/ext3/namei.c 2011-01-17 02:41:01.000000000 -0500
27252 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
27253 char *data1 = (*bh)->b_data, *data2;
27254 unsigned split, move, size;
27255 @@ -31307,9 +31377,9 @@ diff -urNp linux-2.6.37/fs/ext3/namei.c linux-2.6.37/fs/ext3/namei.c
27256
27257 bh2 = ext3_append (handle, dir, &newblock, &err);
27258 if (!(bh2)) {
27259 -diff -urNp linux-2.6.37/fs/ext3/xattr.c linux-2.6.37/fs/ext3/xattr.c
27260 ---- linux-2.6.37/fs/ext3/xattr.c 2011-01-04 19:50:19.000000000 -0500
27261 -+++ linux-2.6.37/fs/ext3/xattr.c 2011-01-17 02:41:01.000000000 -0500
27262 +diff -urNp linux-2.6.37.1/fs/ext3/xattr.c linux-2.6.37.1/fs/ext3/xattr.c
27263 +--- linux-2.6.37.1/fs/ext3/xattr.c 2011-01-04 19:50:19.000000000 -0500
27264 ++++ linux-2.6.37.1/fs/ext3/xattr.c 2011-01-17 02:41:01.000000000 -0500
27265 @@ -89,8 +89,8 @@
27266 printk("\n"); \
27267 } while (0)
27268 @@ -31321,9 +31391,9 @@ diff -urNp linux-2.6.37/fs/ext3/xattr.c linux-2.6.37/fs/ext3/xattr.c
27269 #endif
27270
27271 static void ext3_xattr_cache_insert(struct buffer_head *);
27272 -diff -urNp linux-2.6.37/fs/ext4/balloc.c linux-2.6.37/fs/ext4/balloc.c
27273 ---- linux-2.6.37/fs/ext4/balloc.c 2011-01-04 19:50:19.000000000 -0500
27274 -+++ linux-2.6.37/fs/ext4/balloc.c 2011-01-17 02:41:01.000000000 -0500
27275 +diff -urNp linux-2.6.37.1/fs/ext4/balloc.c linux-2.6.37.1/fs/ext4/balloc.c
27276 +--- linux-2.6.37.1/fs/ext4/balloc.c 2011-01-04 19:50:19.000000000 -0500
27277 ++++ linux-2.6.37.1/fs/ext4/balloc.c 2011-01-17 02:41:01.000000000 -0500
27278 @@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e
27279 /* Hm, nope. Are (enough) root reserved blocks available? */
27280 if (sbi->s_resuid == current_fsuid() ||
27281 @@ -31333,9 +31403,9 @@ diff -urNp linux-2.6.37/fs/ext4/balloc.c linux-2.6.37/fs/ext4/balloc.c
27282 if (free_blocks >= (nblocks + dirty_blocks))
27283 return 1;
27284 }
27285 -diff -urNp linux-2.6.37/fs/ext4/ext4.h linux-2.6.37/fs/ext4/ext4.h
27286 ---- linux-2.6.37/fs/ext4/ext4.h 2011-01-04 19:50:19.000000000 -0500
27287 -+++ linux-2.6.37/fs/ext4/ext4.h 2011-01-17 02:41:01.000000000 -0500
27288 +diff -urNp linux-2.6.37.1/fs/ext4/ext4.h linux-2.6.37.1/fs/ext4/ext4.h
27289 +--- linux-2.6.37.1/fs/ext4/ext4.h 2011-01-04 19:50:19.000000000 -0500
27290 ++++ linux-2.6.37.1/fs/ext4/ext4.h 2011-01-17 02:41:01.000000000 -0500
27291 @@ -1164,19 +1164,19 @@ struct ext4_sb_info {
27292 unsigned long s_mb_last_start;
27293
27294 @@ -31366,10 +31436,10 @@ diff -urNp linux-2.6.37/fs/ext4/ext4.h linux-2.6.37/fs/ext4/ext4.h
27295 atomic_t s_lock_busy;
27296
27297 /* locality groups */
27298 -diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27299 ---- linux-2.6.37/fs/ext4/mballoc.c 2011-01-04 19:50:19.000000000 -0500
27300 -+++ linux-2.6.37/fs/ext4/mballoc.c 2011-01-17 02:41:01.000000000 -0500
27301 -@@ -1841,7 +1841,7 @@ void ext4_mb_simple_scan_group(struct ex
27302 +diff -urNp linux-2.6.37.1/fs/ext4/mballoc.c linux-2.6.37.1/fs/ext4/mballoc.c
27303 +--- linux-2.6.37.1/fs/ext4/mballoc.c 2011-02-22 16:05:31.000000000 -0500
27304 ++++ linux-2.6.37.1/fs/ext4/mballoc.c 2011-02-22 16:05:42.000000000 -0500
27305 +@@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex
27306 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
27307
27308 if (EXT4_SB(sb)->s_mb_stats)
27309 @@ -31378,7 +31448,7 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27310
27311 break;
27312 }
27313 -@@ -2135,7 +2135,7 @@ repeat:
27314 +@@ -2140,7 +2140,7 @@ repeat:
27315 ac->ac_status = AC_STATUS_CONTINUE;
27316 ac->ac_flags |= EXT4_MB_HINT_FIRST;
27317 cr = 3;
27318 @@ -31387,7 +31457,7 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27319 goto repeat;
27320 }
27321 }
27322 -@@ -2577,25 +2577,25 @@ int ext4_mb_release(struct super_block *
27323 +@@ -2606,25 +2606,25 @@ int ext4_mb_release(struct super_block *
27324 if (sbi->s_mb_stats) {
27325 printk(KERN_INFO
27326 "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
27327 @@ -31423,7 +31493,7 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27328 }
27329
27330 free_percpu(sbi->s_locality_groups);
27331 -@@ -3080,16 +3080,16 @@ static void ext4_mb_collect_stats(struct
27332 +@@ -3100,16 +3100,16 @@ static void ext4_mb_collect_stats(struct
27333 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
27334
27335 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
27336 @@ -31446,7 +31516,7 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27337 }
27338
27339 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
27340 -@@ -3487,7 +3487,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
27341 +@@ -3507,7 +3507,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
27342 trace_ext4_mb_new_inode_pa(ac, pa);
27343
27344 ext4_mb_use_inode_pa(ac, pa);
27345 @@ -31455,7 +31525,7 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27346
27347 ei = EXT4_I(ac->ac_inode);
27348 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
27349 -@@ -3547,7 +3547,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
27350 +@@ -3567,7 +3567,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
27351 trace_ext4_mb_new_group_pa(ac, pa);
27352
27353 ext4_mb_use_group_pa(ac, pa);
27354 @@ -31464,7 +31534,7 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27355
27356 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
27357 lg = ac->ac_lg;
27358 -@@ -3634,7 +3634,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
27359 +@@ -3654,7 +3654,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
27360 * from the bitmap and continue.
27361 */
27362 }
27363 @@ -31473,7 +31543,7 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27364
27365 return err;
27366 }
27367 -@@ -3652,7 +3652,7 @@ ext4_mb_release_group_pa(struct ext4_bud
27368 +@@ -3672,7 +3672,7 @@ ext4_mb_release_group_pa(struct ext4_bud
27369 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
27370 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
27371 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
27372 @@ -31482,9 +31552,9 @@ diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
27373 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
27374
27375 return 0;
27376 -diff -urNp linux-2.6.37/fs/ext4/namei.c linux-2.6.37/fs/ext4/namei.c
27377 ---- linux-2.6.37/fs/ext4/namei.c 2011-01-04 19:50:19.000000000 -0500
27378 -+++ linux-2.6.37/fs/ext4/namei.c 2011-01-17 02:41:01.000000000 -0500
27379 +diff -urNp linux-2.6.37.1/fs/ext4/namei.c linux-2.6.37.1/fs/ext4/namei.c
27380 +--- linux-2.6.37.1/fs/ext4/namei.c 2011-01-04 19:50:19.000000000 -0500
27381 ++++ linux-2.6.37.1/fs/ext4/namei.c 2011-01-17 02:41:01.000000000 -0500
27382 @@ -1161,7 +1161,7 @@ static struct ext4_dir_entry_2 *do_split
27383 char *data1 = (*bh)->b_data, *data2;
27384 unsigned split, move, size;
27385 @@ -31494,9 +31564,9 @@ diff -urNp linux-2.6.37/fs/ext4/namei.c linux-2.6.37/fs/ext4/namei.c
27386
27387 bh2 = ext4_append (handle, dir, &newblock, &err);
27388 if (!(bh2)) {
27389 -diff -urNp linux-2.6.37/fs/ext4/xattr.c linux-2.6.37/fs/ext4/xattr.c
27390 ---- linux-2.6.37/fs/ext4/xattr.c 2011-01-04 19:50:19.000000000 -0500
27391 -+++ linux-2.6.37/fs/ext4/xattr.c 2011-01-17 02:41:01.000000000 -0500
27392 +diff -urNp linux-2.6.37.1/fs/ext4/xattr.c linux-2.6.37.1/fs/ext4/xattr.c
27393 +--- linux-2.6.37.1/fs/ext4/xattr.c 2011-01-04 19:50:19.000000000 -0500
27394 ++++ linux-2.6.37.1/fs/ext4/xattr.c 2011-01-17 02:41:01.000000000 -0500
27395 @@ -82,8 +82,8 @@
27396 printk("\n"); \
27397 } while (0)
27398 @@ -31508,9 +31578,9 @@ diff -urNp linux-2.6.37/fs/ext4/xattr.c linux-2.6.37/fs/ext4/xattr.c
27399 #endif
27400
27401 static void ext4_xattr_cache_insert(struct buffer_head *);
27402 -diff -urNp linux-2.6.37/fs/fcntl.c linux-2.6.37/fs/fcntl.c
27403 ---- linux-2.6.37/fs/fcntl.c 2011-01-04 19:50:19.000000000 -0500
27404 -+++ linux-2.6.37/fs/fcntl.c 2011-01-17 02:53:49.000000000 -0500
27405 +diff -urNp linux-2.6.37.1/fs/fcntl.c linux-2.6.37.1/fs/fcntl.c
27406 +--- linux-2.6.37.1/fs/fcntl.c 2011-01-04 19:50:19.000000000 -0500
27407 ++++ linux-2.6.37.1/fs/fcntl.c 2011-01-17 02:53:49.000000000 -0500
27408 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
27409 if (err)
27410 return err;
27411 @@ -31548,9 +31618,9 @@ diff -urNp linux-2.6.37/fs/fcntl.c linux-2.6.37/fs/fcntl.c
27412 ));
27413
27414 fasync_cache = kmem_cache_create("fasync_cache",
27415 -diff -urNp linux-2.6.37/fs/fifo.c linux-2.6.37/fs/fifo.c
27416 ---- linux-2.6.37/fs/fifo.c 2011-01-04 19:50:19.000000000 -0500
27417 -+++ linux-2.6.37/fs/fifo.c 2011-01-17 02:41:01.000000000 -0500
27418 +diff -urNp linux-2.6.37.1/fs/fifo.c linux-2.6.37.1/fs/fifo.c
27419 +--- linux-2.6.37.1/fs/fifo.c 2011-01-04 19:50:19.000000000 -0500
27420 ++++ linux-2.6.37.1/fs/fifo.c 2011-01-17 02:41:01.000000000 -0500
27421 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
27422 */
27423 filp->f_op = &read_pipefifo_fops;
27424 @@ -31621,9 +31691,9 @@ diff -urNp linux-2.6.37/fs/fifo.c linux-2.6.37/fs/fifo.c
27425 free_pipe_info(inode);
27426
27427 err_nocleanup:
27428 -diff -urNp linux-2.6.37/fs/file.c linux-2.6.37/fs/file.c
27429 ---- linux-2.6.37/fs/file.c 2011-01-04 19:50:19.000000000 -0500
27430 -+++ linux-2.6.37/fs/file.c 2011-01-17 02:41:01.000000000 -0500
27431 +diff -urNp linux-2.6.37.1/fs/file.c linux-2.6.37.1/fs/file.c
27432 +--- linux-2.6.37.1/fs/file.c 2011-01-04 19:50:19.000000000 -0500
27433 ++++ linux-2.6.37.1/fs/file.c 2011-01-17 02:41:01.000000000 -0500
27434 @@ -14,6 +14,7 @@
27435 #include <linux/slab.h>
27436 #include <linux/vmalloc.h>
27437 @@ -31640,9 +31710,9 @@ diff -urNp linux-2.6.37/fs/file.c linux-2.6.37/fs/file.c
27438 if (nr >= rlimit(RLIMIT_NOFILE))
27439 return -EMFILE;
27440
27441 -diff -urNp linux-2.6.37/fs/fs_struct.c linux-2.6.37/fs/fs_struct.c
27442 ---- linux-2.6.37/fs/fs_struct.c 2011-01-04 19:50:19.000000000 -0500
27443 -+++ linux-2.6.37/fs/fs_struct.c 2011-01-17 02:41:01.000000000 -0500
27444 +diff -urNp linux-2.6.37.1/fs/fs_struct.c linux-2.6.37.1/fs/fs_struct.c
27445 +--- linux-2.6.37.1/fs/fs_struct.c 2011-01-04 19:50:19.000000000 -0500
27446 ++++ linux-2.6.37.1/fs/fs_struct.c 2011-01-17 02:41:01.000000000 -0500
27447 @@ -4,6 +4,7 @@
27448 #include <linux/path.h>
27449 #include <linux/slab.h>
27450 @@ -31722,9 +31792,9 @@ diff -urNp linux-2.6.37/fs/fs_struct.c linux-2.6.37/fs/fs_struct.c
27451 spin_unlock(&fs->lock);
27452
27453 task_unlock(current);
27454 -diff -urNp linux-2.6.37/fs/fuse/control.c linux-2.6.37/fs/fuse/control.c
27455 ---- linux-2.6.37/fs/fuse/control.c 2011-01-04 19:50:19.000000000 -0500
27456 -+++ linux-2.6.37/fs/fuse/control.c 2011-01-17 02:41:01.000000000 -0500
27457 +diff -urNp linux-2.6.37.1/fs/fuse/control.c linux-2.6.37.1/fs/fuse/control.c
27458 +--- linux-2.6.37.1/fs/fuse/control.c 2011-01-04 19:50:19.000000000 -0500
27459 ++++ linux-2.6.37.1/fs/fuse/control.c 2011-01-17 02:41:01.000000000 -0500
27460 @@ -298,7 +298,7 @@ void fuse_ctl_remove_conn(struct fuse_co
27461
27462 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
27463 @@ -31734,9 +31804,9 @@ diff -urNp linux-2.6.37/fs/fuse/control.c linux-2.6.37/fs/fuse/control.c
27464 struct fuse_conn *fc;
27465 int err;
27466
27467 -diff -urNp linux-2.6.37/fs/fuse/cuse.c linux-2.6.37/fs/fuse/cuse.c
27468 ---- linux-2.6.37/fs/fuse/cuse.c 2011-01-04 19:50:19.000000000 -0500
27469 -+++ linux-2.6.37/fs/fuse/cuse.c 2011-01-17 02:41:01.000000000 -0500
27470 +diff -urNp linux-2.6.37.1/fs/fuse/cuse.c linux-2.6.37.1/fs/fuse/cuse.c
27471 +--- linux-2.6.37.1/fs/fuse/cuse.c 2011-01-04 19:50:19.000000000 -0500
27472 ++++ linux-2.6.37.1/fs/fuse/cuse.c 2011-01-17 02:41:01.000000000 -0500
27473 @@ -530,8 +530,18 @@ static int cuse_channel_release(struct i
27474 return rc;
27475 }
27476 @@ -31771,9 +31841,9 @@ diff -urNp linux-2.6.37/fs/fuse/cuse.c linux-2.6.37/fs/fuse/cuse.c
27477 cuse_class = class_create(THIS_MODULE, "cuse");
27478 if (IS_ERR(cuse_class))
27479 return PTR_ERR(cuse_class);
27480 -diff -urNp linux-2.6.37/fs/fuse/dev.c linux-2.6.37/fs/fuse/dev.c
27481 ---- linux-2.6.37/fs/fuse/dev.c 2011-01-04 19:50:19.000000000 -0500
27482 -+++ linux-2.6.37/fs/fuse/dev.c 2011-01-17 02:41:01.000000000 -0500
27483 +diff -urNp linux-2.6.37.1/fs/fuse/dev.c linux-2.6.37.1/fs/fuse/dev.c
27484 +--- linux-2.6.37.1/fs/fuse/dev.c 2011-01-04 19:50:19.000000000 -0500
27485 ++++ linux-2.6.37.1/fs/fuse/dev.c 2011-01-17 02:41:01.000000000 -0500
27486 @@ -1047,7 +1047,7 @@ static ssize_t fuse_dev_do_read(struct f
27487 return err;
27488 }
27489 @@ -31855,9 +31925,9 @@ diff -urNp linux-2.6.37/fs/fuse/dev.c linux-2.6.37/fs/fuse/dev.c
27490 const struct file_operations fuse_dev_operations = {
27491 .owner = THIS_MODULE,
27492 .llseek = no_llseek,
27493 -diff -urNp linux-2.6.37/fs/fuse/dir.c linux-2.6.37/fs/fuse/dir.c
27494 ---- linux-2.6.37/fs/fuse/dir.c 2011-01-04 19:50:19.000000000 -0500
27495 -+++ linux-2.6.37/fs/fuse/dir.c 2011-01-17 02:41:01.000000000 -0500
27496 +diff -urNp linux-2.6.37.1/fs/fuse/dir.c linux-2.6.37.1/fs/fuse/dir.c
27497 +--- linux-2.6.37.1/fs/fuse/dir.c 2011-01-04 19:50:19.000000000 -0500
27498 ++++ linux-2.6.37.1/fs/fuse/dir.c 2011-01-17 02:41:01.000000000 -0500
27499 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
27500 return link;
27501 }
27502 @@ -31867,9 +31937,9 @@ diff -urNp linux-2.6.37/fs/fuse/dir.c linux-2.6.37/fs/fuse/dir.c
27503 {
27504 if (!IS_ERR(link))
27505 free_page((unsigned long) link);
27506 -diff -urNp linux-2.6.37/fs/fuse/fuse_i.h linux-2.6.37/fs/fuse/fuse_i.h
27507 ---- linux-2.6.37/fs/fuse/fuse_i.h 2011-01-04 19:50:19.000000000 -0500
27508 -+++ linux-2.6.37/fs/fuse/fuse_i.h 2011-01-17 02:41:01.000000000 -0500
27509 +diff -urNp linux-2.6.37.1/fs/fuse/fuse_i.h linux-2.6.37.1/fs/fuse/fuse_i.h
27510 +--- linux-2.6.37.1/fs/fuse/fuse_i.h 2011-01-04 19:50:19.000000000 -0500
27511 ++++ linux-2.6.37.1/fs/fuse/fuse_i.h 2011-01-17 02:41:01.000000000 -0500
27512 @@ -525,6 +525,16 @@ extern const struct file_operations fuse
27513
27514 extern const struct dentry_operations fuse_dentry_operations;
27515 @@ -31887,9 +31957,9 @@ diff -urNp linux-2.6.37/fs/fuse/fuse_i.h linux-2.6.37/fs/fuse/fuse_i.h
27516 /**
27517 * Inode to nodeid comparison.
27518 */
27519 -diff -urNp linux-2.6.37/fs/hfs/inode.c linux-2.6.37/fs/hfs/inode.c
27520 ---- linux-2.6.37/fs/hfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27521 -+++ linux-2.6.37/fs/hfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27522 +diff -urNp linux-2.6.37.1/fs/hfs/inode.c linux-2.6.37.1/fs/hfs/inode.c
27523 +--- linux-2.6.37.1/fs/hfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27524 ++++ linux-2.6.37.1/fs/hfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27525 @@ -447,7 +447,7 @@ int hfs_write_inode(struct inode *inode,
27526
27527 if (S_ISDIR(main_inode->i_mode)) {
27528 @@ -31908,9 +31978,9 @@ diff -urNp linux-2.6.37/fs/hfs/inode.c linux-2.6.37/fs/hfs/inode.c
27529 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
27530 sizeof(struct hfs_cat_file));
27531 if (rec.type != HFS_CDR_FIL ||
27532 -diff -urNp linux-2.6.37/fs/hfsplus/inode.c linux-2.6.37/fs/hfsplus/inode.c
27533 ---- linux-2.6.37/fs/hfsplus/inode.c 2011-01-04 19:50:19.000000000 -0500
27534 -+++ linux-2.6.37/fs/hfsplus/inode.c 2011-01-17 02:41:01.000000000 -0500
27535 +diff -urNp linux-2.6.37.1/fs/hfsplus/inode.c linux-2.6.37.1/fs/hfsplus/inode.c
27536 +--- linux-2.6.37.1/fs/hfsplus/inode.c 2011-01-04 19:50:19.000000000 -0500
27537 ++++ linux-2.6.37.1/fs/hfsplus/inode.c 2011-01-17 02:41:01.000000000 -0500
27538 @@ -478,7 +478,7 @@ int hfsplus_cat_read_inode(struct inode
27539 struct hfsplus_cat_folder *folder = &entry.folder;
27540
27541 @@ -31947,9 +32017,9 @@ diff -urNp linux-2.6.37/fs/hfsplus/inode.c linux-2.6.37/fs/hfsplus/inode.c
27542 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
27543 sizeof(struct hfsplus_cat_file));
27544 hfsplus_inode_write_fork(inode, &file->data_fork);
27545 -diff -urNp linux-2.6.37/fs/hugetlbfs/inode.c linux-2.6.37/fs/hugetlbfs/inode.c
27546 ---- linux-2.6.37/fs/hugetlbfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27547 -+++ linux-2.6.37/fs/hugetlbfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27548 +diff -urNp linux-2.6.37.1/fs/hugetlbfs/inode.c linux-2.6.37.1/fs/hugetlbfs/inode.c
27549 +--- linux-2.6.37.1/fs/hugetlbfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27550 ++++ linux-2.6.37.1/fs/hugetlbfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27551 @@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs
27552 .kill_sb = kill_litter_super,
27553 };
27554 @@ -31959,9 +32029,9 @@ diff -urNp linux-2.6.37/fs/hugetlbfs/inode.c linux-2.6.37/fs/hugetlbfs/inode.c
27555
27556 static int can_do_hugetlb_shm(void)
27557 {
27558 -diff -urNp linux-2.6.37/fs/ioctl.c linux-2.6.37/fs/ioctl.c
27559 ---- linux-2.6.37/fs/ioctl.c 2011-01-04 19:50:19.000000000 -0500
27560 -+++ linux-2.6.37/fs/ioctl.c 2011-01-17 02:41:01.000000000 -0500
27561 +diff -urNp linux-2.6.37.1/fs/ioctl.c linux-2.6.37.1/fs/ioctl.c
27562 +--- linux-2.6.37.1/fs/ioctl.c 2011-01-04 19:50:19.000000000 -0500
27563 ++++ linux-2.6.37.1/fs/ioctl.c 2011-01-17 02:41:01.000000000 -0500
27564 @@ -86,7 +86,7 @@ int fiemap_fill_next_extent(struct fiema
27565 u64 phys, u64 len, u32 flags)
27566 {
27567 @@ -31989,9 +32059,9 @@ diff -urNp linux-2.6.37/fs/ioctl.c linux-2.6.37/fs/ioctl.c
27568 error = -EFAULT;
27569
27570 return error;
27571 -diff -urNp linux-2.6.37/fs/jffs2/debug.h linux-2.6.37/fs/jffs2/debug.h
27572 ---- linux-2.6.37/fs/jffs2/debug.h 2011-01-04 19:50:19.000000000 -0500
27573 -+++ linux-2.6.37/fs/jffs2/debug.h 2011-01-17 02:41:01.000000000 -0500
27574 +diff -urNp linux-2.6.37.1/fs/jffs2/debug.h linux-2.6.37.1/fs/jffs2/debug.h
27575 +--- linux-2.6.37.1/fs/jffs2/debug.h 2011-01-04 19:50:19.000000000 -0500
27576 ++++ linux-2.6.37.1/fs/jffs2/debug.h 2011-01-17 02:41:01.000000000 -0500
27577 @@ -53,13 +53,13 @@
27578 #if CONFIG_JFFS2_FS_DEBUG > 0
27579 #define D1(x) x
27580 @@ -32093,9 +32163,9 @@ diff -urNp linux-2.6.37/fs/jffs2/debug.h linux-2.6.37/fs/jffs2/debug.h
27581 #endif
27582
27583 /* "Sanity" checks */
27584 -diff -urNp linux-2.6.37/fs/jffs2/erase.c linux-2.6.37/fs/jffs2/erase.c
27585 ---- linux-2.6.37/fs/jffs2/erase.c 2011-01-04 19:50:19.000000000 -0500
27586 -+++ linux-2.6.37/fs/jffs2/erase.c 2011-01-17 02:41:01.000000000 -0500
27587 +diff -urNp linux-2.6.37.1/fs/jffs2/erase.c linux-2.6.37.1/fs/jffs2/erase.c
27588 +--- linux-2.6.37.1/fs/jffs2/erase.c 2011-01-04 19:50:19.000000000 -0500
27589 ++++ linux-2.6.37.1/fs/jffs2/erase.c 2011-01-17 02:41:01.000000000 -0500
27590 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
27591 struct jffs2_unknown_node marker = {
27592 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
27593 @@ -32106,9 +32176,9 @@ diff -urNp linux-2.6.37/fs/jffs2/erase.c linux-2.6.37/fs/jffs2/erase.c
27594 };
27595
27596 jffs2_prealloc_raw_node_refs(c, jeb, 1);
27597 -diff -urNp linux-2.6.37/fs/jffs2/summary.h linux-2.6.37/fs/jffs2/summary.h
27598 ---- linux-2.6.37/fs/jffs2/summary.h 2011-01-04 19:50:19.000000000 -0500
27599 -+++ linux-2.6.37/fs/jffs2/summary.h 2011-01-17 02:41:01.000000000 -0500
27600 +diff -urNp linux-2.6.37.1/fs/jffs2/summary.h linux-2.6.37.1/fs/jffs2/summary.h
27601 +--- linux-2.6.37.1/fs/jffs2/summary.h 2011-01-04 19:50:19.000000000 -0500
27602 ++++ linux-2.6.37.1/fs/jffs2/summary.h 2011-01-17 02:41:01.000000000 -0500
27603 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
27604
27605 #define jffs2_sum_active() (0)
27606 @@ -32137,9 +32207,9 @@ diff -urNp linux-2.6.37/fs/jffs2/summary.h linux-2.6.37/fs/jffs2/summary.h
27607 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
27608
27609 #endif /* CONFIG_JFFS2_SUMMARY */
27610 -diff -urNp linux-2.6.37/fs/jffs2/wbuf.c linux-2.6.37/fs/jffs2/wbuf.c
27611 ---- linux-2.6.37/fs/jffs2/wbuf.c 2011-01-04 19:50:19.000000000 -0500
27612 -+++ linux-2.6.37/fs/jffs2/wbuf.c 2011-01-17 02:41:01.000000000 -0500
27613 +diff -urNp linux-2.6.37.1/fs/jffs2/wbuf.c linux-2.6.37.1/fs/jffs2/wbuf.c
27614 +--- linux-2.6.37.1/fs/jffs2/wbuf.c 2011-01-04 19:50:19.000000000 -0500
27615 ++++ linux-2.6.37.1/fs/jffs2/wbuf.c 2011-01-17 02:41:01.000000000 -0500
27616 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
27617 {
27618 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
27619 @@ -32150,9 +32220,9 @@ diff -urNp linux-2.6.37/fs/jffs2/wbuf.c linux-2.6.37/fs/jffs2/wbuf.c
27620 };
27621
27622 /*
27623 -diff -urNp linux-2.6.37/fs/Kconfig.binfmt linux-2.6.37/fs/Kconfig.binfmt
27624 ---- linux-2.6.37/fs/Kconfig.binfmt 2011-01-04 19:50:19.000000000 -0500
27625 -+++ linux-2.6.37/fs/Kconfig.binfmt 2011-01-17 02:41:01.000000000 -0500
27626 +diff -urNp linux-2.6.37.1/fs/Kconfig.binfmt linux-2.6.37.1/fs/Kconfig.binfmt
27627 +--- linux-2.6.37.1/fs/Kconfig.binfmt 2011-01-04 19:50:19.000000000 -0500
27628 ++++ linux-2.6.37.1/fs/Kconfig.binfmt 2011-01-17 02:41:01.000000000 -0500
27629 @@ -86,7 +86,7 @@ config HAVE_AOUT
27630
27631 config BINFMT_AOUT
27632 @@ -32162,9 +32232,9 @@ diff -urNp linux-2.6.37/fs/Kconfig.binfmt linux-2.6.37/fs/Kconfig.binfmt
27633 ---help---
27634 A.out (Assembler.OUTput) is a set of formats for libraries and
27635 executables used in the earliest versions of UNIX. Linux used
27636 -diff -urNp linux-2.6.37/fs/lockd/svc.c linux-2.6.37/fs/lockd/svc.c
27637 ---- linux-2.6.37/fs/lockd/svc.c 2011-01-04 19:50:19.000000000 -0500
27638 -+++ linux-2.6.37/fs/lockd/svc.c 2011-01-17 02:41:01.000000000 -0500
27639 +diff -urNp linux-2.6.37.1/fs/lockd/svc.c linux-2.6.37.1/fs/lockd/svc.c
27640 +--- linux-2.6.37.1/fs/lockd/svc.c 2011-01-04 19:50:19.000000000 -0500
27641 ++++ linux-2.6.37.1/fs/lockd/svc.c 2011-01-17 02:41:01.000000000 -0500
27642 @@ -41,7 +41,7 @@
27643
27644 static struct svc_program nlmsvc_program;
27645 @@ -32174,9 +32244,9 @@ diff -urNp linux-2.6.37/fs/lockd/svc.c linux-2.6.37/fs/lockd/svc.c
27646 EXPORT_SYMBOL_GPL(nlmsvc_ops);
27647
27648 static DEFINE_MUTEX(nlmsvc_mutex);
27649 -diff -urNp linux-2.6.37/fs/locks.c linux-2.6.37/fs/locks.c
27650 ---- linux-2.6.37/fs/locks.c 2011-01-04 19:50:19.000000000 -0500
27651 -+++ linux-2.6.37/fs/locks.c 2011-01-17 02:41:01.000000000 -0500
27652 +diff -urNp linux-2.6.37.1/fs/locks.c linux-2.6.37.1/fs/locks.c
27653 +--- linux-2.6.37.1/fs/locks.c 2011-01-04 19:50:19.000000000 -0500
27654 ++++ linux-2.6.37.1/fs/locks.c 2011-01-17 02:41:01.000000000 -0500
27655 @@ -2050,16 +2050,16 @@ void locks_remove_flock(struct file *fil
27656 return;
27657
27658 @@ -32198,9 +32268,9 @@ diff -urNp linux-2.6.37/fs/locks.c linux-2.6.37/fs/locks.c
27659 }
27660
27661 lock_flocks();
27662 -diff -urNp linux-2.6.37/fs/namei.c linux-2.6.37/fs/namei.c
27663 ---- linux-2.6.37/fs/namei.c 2011-01-04 19:50:19.000000000 -0500
27664 -+++ linux-2.6.37/fs/namei.c 2011-01-17 11:57:48.000000000 -0500
27665 +diff -urNp linux-2.6.37.1/fs/namei.c linux-2.6.37.1/fs/namei.c
27666 +--- linux-2.6.37.1/fs/namei.c 2011-01-04 19:50:19.000000000 -0500
27667 ++++ linux-2.6.37.1/fs/namei.c 2011-01-17 11:57:48.000000000 -0500
27668 @@ -221,14 +221,6 @@ int generic_permission(struct inode *ino
27669 return ret;
27670
27671 @@ -32630,9 +32700,9 @@ diff -urNp linux-2.6.37/fs/namei.c linux-2.6.37/fs/namei.c
27672 exit6:
27673 mnt_drop_write(oldnd.path.mnt);
27674 exit5:
27675 -diff -urNp linux-2.6.37/fs/namespace.c linux-2.6.37/fs/namespace.c
27676 ---- linux-2.6.37/fs/namespace.c 2011-01-04 19:50:19.000000000 -0500
27677 -+++ linux-2.6.37/fs/namespace.c 2011-01-17 02:41:01.000000000 -0500
27678 +diff -urNp linux-2.6.37.1/fs/namespace.c linux-2.6.37.1/fs/namespace.c
27679 +--- linux-2.6.37.1/fs/namespace.c 2011-01-04 19:50:19.000000000 -0500
27680 ++++ linux-2.6.37.1/fs/namespace.c 2011-01-17 02:41:01.000000000 -0500
27681 @@ -1141,6 +1141,9 @@ static int do_umount(struct vfsmount *mn
27682 if (!(sb->s_flags & MS_RDONLY))
27683 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
27684 @@ -32693,9 +32763,9 @@ diff -urNp linux-2.6.37/fs/namespace.c linux-2.6.37/fs/namespace.c
27685 get_fs_root(current->fs, &root);
27686 down_write(&namespace_sem);
27687 mutex_lock(&old.dentry->d_inode->i_mutex);
27688 -diff -urNp linux-2.6.37/fs/nfs/inode.c linux-2.6.37/fs/nfs/inode.c
27689 ---- linux-2.6.37/fs/nfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27690 -+++ linux-2.6.37/fs/nfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27691 +diff -urNp linux-2.6.37.1/fs/nfs/inode.c linux-2.6.37.1/fs/nfs/inode.c
27692 +--- linux-2.6.37.1/fs/nfs/inode.c 2011-01-04 19:50:19.000000000 -0500
27693 ++++ linux-2.6.37.1/fs/nfs/inode.c 2011-01-17 02:41:01.000000000 -0500
27694 @@ -985,16 +985,16 @@ static int nfs_size_need_update(const st
27695 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
27696 }
27697 @@ -32716,9 +32786,9 @@ diff -urNp linux-2.6.37/fs/nfs/inode.c linux-2.6.37/fs/nfs/inode.c
27698 }
27699
27700 void nfs_fattr_init(struct nfs_fattr *fattr)
27701 -diff -urNp linux-2.6.37/fs/nfs/nfs4proc.c linux-2.6.37/fs/nfs/nfs4proc.c
27702 ---- linux-2.6.37/fs/nfs/nfs4proc.c 2011-01-04 19:50:19.000000000 -0500
27703 -+++ linux-2.6.37/fs/nfs/nfs4proc.c 2011-01-17 02:41:01.000000000 -0500
27704 +diff -urNp linux-2.6.37.1/fs/nfs/nfs4proc.c linux-2.6.37.1/fs/nfs/nfs4proc.c
27705 +--- linux-2.6.37.1/fs/nfs/nfs4proc.c 2011-01-04 19:50:19.000000000 -0500
27706 ++++ linux-2.6.37.1/fs/nfs/nfs4proc.c 2011-01-17 02:41:01.000000000 -0500
27707 @@ -1184,7 +1184,7 @@ static int _nfs4_do_open_reclaim(struct
27708 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
27709 {
27710 @@ -32989,9 +33059,9 @@ diff -urNp linux-2.6.37/fs/nfs/nfs4proc.c linux-2.6.37/fs/nfs/nfs4proc.c
27711 int err;
27712
27713 err = nfs4_set_lock_state(state, fl);
27714 -diff -urNp linux-2.6.37/fs/nfsd/lockd.c linux-2.6.37/fs/nfsd/lockd.c
27715 ---- linux-2.6.37/fs/nfsd/lockd.c 2011-01-04 19:50:19.000000000 -0500
27716 -+++ linux-2.6.37/fs/nfsd/lockd.c 2011-01-17 02:41:01.000000000 -0500
27717 +diff -urNp linux-2.6.37.1/fs/nfsd/lockd.c linux-2.6.37.1/fs/nfsd/lockd.c
27718 +--- linux-2.6.37.1/fs/nfsd/lockd.c 2011-01-04 19:50:19.000000000 -0500
27719 ++++ linux-2.6.37.1/fs/nfsd/lockd.c 2011-01-17 02:41:01.000000000 -0500
27720 @@ -61,7 +61,7 @@ nlm_fclose(struct file *filp)
27721 fput(filp);
27722 }
27723 @@ -33001,9 +33071,9 @@ diff -urNp linux-2.6.37/fs/nfsd/lockd.c linux-2.6.37/fs/nfsd/lockd.c
27724 .fopen = nlm_fopen, /* open file for locking */
27725 .fclose = nlm_fclose, /* close file */
27726 };
27727 -diff -urNp linux-2.6.37/fs/nfsd/nfsctl.c linux-2.6.37/fs/nfsd/nfsctl.c
27728 ---- linux-2.6.37/fs/nfsd/nfsctl.c 2011-01-04 19:50:19.000000000 -0500
27729 -+++ linux-2.6.37/fs/nfsd/nfsctl.c 2011-01-17 02:41:01.000000000 -0500
27730 +diff -urNp linux-2.6.37.1/fs/nfsd/nfsctl.c linux-2.6.37.1/fs/nfsd/nfsctl.c
27731 +--- linux-2.6.37.1/fs/nfsd/nfsctl.c 2011-01-04 19:50:19.000000000 -0500
27732 ++++ linux-2.6.37.1/fs/nfsd/nfsctl.c 2011-01-17 02:41:01.000000000 -0500
27733 @@ -178,7 +178,7 @@ static int export_features_open(struct i
27734 return single_open(file, export_features_show, NULL);
27735 }
27736 @@ -33013,9 +33083,9 @@ diff -urNp linux-2.6.37/fs/nfsd/nfsctl.c linux-2.6.37/fs/nfsd/nfsctl.c
27737 .open = export_features_open,
27738 .read = seq_read,
27739 .llseek = seq_lseek,
27740 -diff -urNp linux-2.6.37/fs/nfsd/vfs.c linux-2.6.37/fs/nfsd/vfs.c
27741 ---- linux-2.6.37/fs/nfsd/vfs.c 2011-01-04 19:50:19.000000000 -0500
27742 -+++ linux-2.6.37/fs/nfsd/vfs.c 2011-01-17 02:41:01.000000000 -0500
27743 +diff -urNp linux-2.6.37.1/fs/nfsd/vfs.c linux-2.6.37.1/fs/nfsd/vfs.c
27744 +--- linux-2.6.37.1/fs/nfsd/vfs.c 2011-01-04 19:50:19.000000000 -0500
27745 ++++ linux-2.6.37.1/fs/nfsd/vfs.c 2011-01-17 02:41:01.000000000 -0500
27746 @@ -916,7 +916,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
27747 } else {
27748 oldfs = get_fs();
27749 @@ -33043,9 +33113,9 @@ diff -urNp linux-2.6.37/fs/nfsd/vfs.c linux-2.6.37/fs/nfsd/vfs.c
27750 set_fs(oldfs);
27751
27752 if (host_err < 0)
27753 -diff -urNp linux-2.6.37/fs/nls/nls_base.c linux-2.6.37/fs/nls/nls_base.c
27754 ---- linux-2.6.37/fs/nls/nls_base.c 2011-01-04 19:50:19.000000000 -0500
27755 -+++ linux-2.6.37/fs/nls/nls_base.c 2011-01-17 02:41:01.000000000 -0500
27756 +diff -urNp linux-2.6.37.1/fs/nls/nls_base.c linux-2.6.37.1/fs/nls/nls_base.c
27757 +--- linux-2.6.37.1/fs/nls/nls_base.c 2011-01-04 19:50:19.000000000 -0500
27758 ++++ linux-2.6.37.1/fs/nls/nls_base.c 2011-01-17 02:41:01.000000000 -0500
27759 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
27760 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
27761 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
27762 @@ -33055,9 +33125,9 @@ diff -urNp linux-2.6.37/fs/nls/nls_base.c linux-2.6.37/fs/nls/nls_base.c
27763 };
27764
27765 #define UNICODE_MAX 0x0010ffff
27766 -diff -urNp linux-2.6.37/fs/ntfs/dir.c linux-2.6.37/fs/ntfs/dir.c
27767 ---- linux-2.6.37/fs/ntfs/dir.c 2011-01-04 19:50:19.000000000 -0500
27768 -+++ linux-2.6.37/fs/ntfs/dir.c 2011-01-17 02:41:01.000000000 -0500
27769 +diff -urNp linux-2.6.37.1/fs/ntfs/dir.c linux-2.6.37.1/fs/ntfs/dir.c
27770 +--- linux-2.6.37.1/fs/ntfs/dir.c 2011-01-04 19:50:19.000000000 -0500
27771 ++++ linux-2.6.37.1/fs/ntfs/dir.c 2011-01-17 02:41:01.000000000 -0500
27772 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
27773 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
27774 ~(s64)(ndir->itype.index.block_size - 1)));
27775 @@ -33067,9 +33137,9 @@ diff -urNp linux-2.6.37/fs/ntfs/dir.c linux-2.6.37/fs/ntfs/dir.c
27776 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
27777 "inode 0x%lx or driver bug.", vdir->i_ino);
27778 goto err_out;
27779 -diff -urNp linux-2.6.37/fs/ntfs/file.c linux-2.6.37/fs/ntfs/file.c
27780 ---- linux-2.6.37/fs/ntfs/file.c 2011-01-04 19:50:19.000000000 -0500
27781 -+++ linux-2.6.37/fs/ntfs/file.c 2011-01-17 02:41:01.000000000 -0500
27782 +diff -urNp linux-2.6.37.1/fs/ntfs/file.c linux-2.6.37.1/fs/ntfs/file.c
27783 +--- linux-2.6.37.1/fs/ntfs/file.c 2011-01-04 19:50:19.000000000 -0500
27784 ++++ linux-2.6.37.1/fs/ntfs/file.c 2011-01-17 02:41:01.000000000 -0500
27785 @@ -2223,6 +2223,6 @@ const struct inode_operations ntfs_file_
27786 #endif /* NTFS_RW */
27787 };
27788 @@ -33079,9 +33149,9 @@ diff -urNp linux-2.6.37/fs/ntfs/file.c linux-2.6.37/fs/ntfs/file.c
27789
27790 -const struct inode_operations ntfs_empty_inode_ops = {};
27791 +const struct inode_operations ntfs_empty_inode_ops __read_only;
27792 -diff -urNp linux-2.6.37/fs/ocfs2/localalloc.c linux-2.6.37/fs/ocfs2/localalloc.c
27793 ---- linux-2.6.37/fs/ocfs2/localalloc.c 2011-01-04 19:50:19.000000000 -0500
27794 -+++ linux-2.6.37/fs/ocfs2/localalloc.c 2011-01-17 02:41:01.000000000 -0500
27795 +diff -urNp linux-2.6.37.1/fs/ocfs2/localalloc.c linux-2.6.37.1/fs/ocfs2/localalloc.c
27796 +--- linux-2.6.37.1/fs/ocfs2/localalloc.c 2011-01-04 19:50:19.000000000 -0500
27797 ++++ linux-2.6.37.1/fs/ocfs2/localalloc.c 2011-01-17 02:41:01.000000000 -0500
27798 @@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
27799 goto bail;
27800 }
27801 @@ -33091,9 +33161,9 @@ diff -urNp linux-2.6.37/fs/ocfs2/localalloc.c linux-2.6.37/fs/ocfs2/localalloc.c
27802
27803 bail:
27804 if (handle)
27805 -diff -urNp linux-2.6.37/fs/ocfs2/ocfs2.h linux-2.6.37/fs/ocfs2/ocfs2.h
27806 ---- linux-2.6.37/fs/ocfs2/ocfs2.h 2011-01-04 19:50:19.000000000 -0500
27807 -+++ linux-2.6.37/fs/ocfs2/ocfs2.h 2011-01-17 02:41:01.000000000 -0500
27808 +diff -urNp linux-2.6.37.1/fs/ocfs2/ocfs2.h linux-2.6.37.1/fs/ocfs2/ocfs2.h
27809 +--- linux-2.6.37.1/fs/ocfs2/ocfs2.h 2011-01-04 19:50:19.000000000 -0500
27810 ++++ linux-2.6.37.1/fs/ocfs2/ocfs2.h 2011-01-17 02:41:01.000000000 -0500
27811 @@ -230,11 +230,11 @@ enum ocfs2_vol_state
27812
27813 struct ocfs2_alloc_stats
27814 @@ -33111,9 +33181,9 @@ diff -urNp linux-2.6.37/fs/ocfs2/ocfs2.h linux-2.6.37/fs/ocfs2/ocfs2.h
27815 };
27816
27817 enum ocfs2_local_alloc_state
27818 -diff -urNp linux-2.6.37/fs/ocfs2/suballoc.c linux-2.6.37/fs/ocfs2/suballoc.c
27819 ---- linux-2.6.37/fs/ocfs2/suballoc.c 2011-01-04 19:50:19.000000000 -0500
27820 -+++ linux-2.6.37/fs/ocfs2/suballoc.c 2011-01-17 02:41:01.000000000 -0500
27821 +diff -urNp linux-2.6.37.1/fs/ocfs2/suballoc.c linux-2.6.37.1/fs/ocfs2/suballoc.c
27822 +--- linux-2.6.37.1/fs/ocfs2/suballoc.c 2011-01-04 19:50:19.000000000 -0500
27823 ++++ linux-2.6.37.1/fs/ocfs2/suballoc.c 2011-01-17 02:41:01.000000000 -0500
27824 @@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s
27825 mlog_errno(status);
27826 goto bail;
27827 @@ -33159,9 +33229,9 @@ diff -urNp linux-2.6.37/fs/ocfs2/suballoc.c linux-2.6.37/fs/ocfs2/suballoc.c
27828 *num_clusters = res.sr_bits;
27829 }
27830 }
27831 -diff -urNp linux-2.6.37/fs/ocfs2/super.c linux-2.6.37/fs/ocfs2/super.c
27832 ---- linux-2.6.37/fs/ocfs2/super.c 2011-01-04 19:50:19.000000000 -0500
27833 -+++ linux-2.6.37/fs/ocfs2/super.c 2011-01-17 02:41:01.000000000 -0500
27834 +diff -urNp linux-2.6.37.1/fs/ocfs2/super.c linux-2.6.37.1/fs/ocfs2/super.c
27835 +--- linux-2.6.37.1/fs/ocfs2/super.c 2011-01-04 19:50:19.000000000 -0500
27836 ++++ linux-2.6.37.1/fs/ocfs2/super.c 2011-01-17 02:41:01.000000000 -0500
27837 @@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
27838 "%10s => GlobalAllocs: %d LocalAllocs: %d "
27839 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
27840 @@ -33196,9 +33266,9 @@ diff -urNp linux-2.6.37/fs/ocfs2/super.c linux-2.6.37/fs/ocfs2/super.c
27841
27842 /* Copy the blockcheck stats from the superblock probe */
27843 osb->osb_ecc_stats = *stats;
27844 -diff -urNp linux-2.6.37/fs/ocfs2/symlink.c linux-2.6.37/fs/ocfs2/symlink.c
27845 ---- linux-2.6.37/fs/ocfs2/symlink.c 2011-01-04 19:50:19.000000000 -0500
27846 -+++ linux-2.6.37/fs/ocfs2/symlink.c 2011-01-17 02:41:01.000000000 -0500
27847 +diff -urNp linux-2.6.37.1/fs/ocfs2/symlink.c linux-2.6.37.1/fs/ocfs2/symlink.c
27848 +--- linux-2.6.37.1/fs/ocfs2/symlink.c 2011-01-04 19:50:19.000000000 -0500
27849 ++++ linux-2.6.37.1/fs/ocfs2/symlink.c 2011-01-17 02:41:01.000000000 -0500
27850 @@ -148,7 +148,7 @@ bail:
27851
27852 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
27853 @@ -33208,9 +33278,9 @@ diff -urNp linux-2.6.37/fs/ocfs2/symlink.c linux-2.6.37/fs/ocfs2/symlink.c
27854 if (!IS_ERR(link))
27855 kfree(link);
27856 }
27857 -diff -urNp linux-2.6.37/fs/open.c linux-2.6.37/fs/open.c
27858 ---- linux-2.6.37/fs/open.c 2011-01-04 19:50:19.000000000 -0500
27859 -+++ linux-2.6.37/fs/open.c 2011-01-17 02:49:14.000000000 -0500
27860 +diff -urNp linux-2.6.37.1/fs/open.c linux-2.6.37.1/fs/open.c
27861 +--- linux-2.6.37.1/fs/open.c 2011-01-04 19:50:19.000000000 -0500
27862 ++++ linux-2.6.37.1/fs/open.c 2011-01-17 02:49:14.000000000 -0500
27863 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
27864 error = locks_verify_truncate(inode, NULL, length);
27865 if (!error)
27866 @@ -33348,9 +33418,57 @@ diff -urNp linux-2.6.37/fs/open.c linux-2.6.37/fs/open.c
27867 if (IS_ERR(f)) {
27868 put_unused_fd(fd);
27869 fd = PTR_ERR(f);
27870 -diff -urNp linux-2.6.37/fs/pipe.c linux-2.6.37/fs/pipe.c
27871 ---- linux-2.6.37/fs/pipe.c 2011-01-04 19:50:19.000000000 -0500
27872 -+++ linux-2.6.37/fs/pipe.c 2011-01-17 02:41:01.000000000 -0500
27873 +diff -urNp linux-2.6.37.1/fs/partitions/mac.c linux-2.6.37.1/fs/partitions/mac.c
27874 +--- linux-2.6.37.1/fs/partitions/mac.c 2011-01-04 19:50:19.000000000 -0500
27875 ++++ linux-2.6.37.1/fs/partitions/mac.c 2011-02-22 16:26:29.000000000 -0500
27876 +@@ -29,10 +29,9 @@ static inline void mac_fix_string(char *
27877 +
27878 + int mac_partition(struct parsed_partitions *state)
27879 + {
27880 +- int slot = 1;
27881 + Sector sect;
27882 + unsigned char *data;
27883 +- int blk, blocks_in_map;
27884 ++ int slot, blocks_in_map;
27885 + unsigned secsize;
27886 + #ifdef CONFIG_PPC_PMAC
27887 + int found_root = 0;
27888 +@@ -59,10 +58,14 @@ int mac_partition(struct parsed_partitio
27889 + put_dev_sector(sect);
27890 + return 0; /* not a MacOS disk */
27891 + }
27892 +- strlcat(state->pp_buf, " [mac]", PAGE_SIZE);
27893 + blocks_in_map = be32_to_cpu(part->map_count);
27894 +- for (blk = 1; blk <= blocks_in_map; ++blk) {
27895 +- int pos = blk * secsize;
27896 ++ if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
27897 ++ put_dev_sector(sect);
27898 ++ return 0;
27899 ++ }
27900 ++ strlcat(state->pp_buf, " [mac]", PAGE_SIZE);
27901 ++ for (slot = 1; slot <= blocks_in_map; ++slot) {
27902 ++ int pos = slot * secsize;
27903 + put_dev_sector(sect);
27904 + data = read_part_sector(state, pos/512, &sect);
27905 + if (!data)
27906 +@@ -113,13 +116,11 @@ int mac_partition(struct parsed_partitio
27907 + }
27908 +
27909 + if (goodness > found_root_goodness) {
27910 +- found_root = blk;
27911 ++ found_root = slot;
27912 + found_root_goodness = goodness;
27913 + }
27914 + }
27915 + #endif /* CONFIG_PPC_PMAC */
27916 +-
27917 +- ++slot;
27918 + }
27919 + #ifdef CONFIG_PPC_PMAC
27920 + if (found_root_goodness)
27921 +diff -urNp linux-2.6.37.1/fs/pipe.c linux-2.6.37.1/fs/pipe.c
27922 +--- linux-2.6.37.1/fs/pipe.c 2011-01-04 19:50:19.000000000 -0500
27923 ++++ linux-2.6.37.1/fs/pipe.c 2011-01-17 02:41:01.000000000 -0500
27924 @@ -420,9 +420,9 @@ redo:
27925 }
27926 if (bufs) /* More to do? */
27927 @@ -33474,9 +33592,9 @@ diff -urNp linux-2.6.37/fs/pipe.c linux-2.6.37/fs/pipe.c
27928 inode->i_fop = &rdwr_pipefifo_fops;
27929
27930 /*
27931 -diff -urNp linux-2.6.37/fs/proc/array.c linux-2.6.37/fs/proc/array.c
27932 ---- linux-2.6.37/fs/proc/array.c 2011-01-04 19:50:19.000000000 -0500
27933 -+++ linux-2.6.37/fs/proc/array.c 2011-01-17 02:41:01.000000000 -0500
27934 +diff -urNp linux-2.6.37.1/fs/proc/array.c linux-2.6.37.1/fs/proc/array.c
27935 +--- linux-2.6.37.1/fs/proc/array.c 2011-01-04 19:50:19.000000000 -0500
27936 ++++ linux-2.6.37.1/fs/proc/array.c 2011-02-22 16:34:38.000000000 -0500
27937 @@ -60,6 +60,7 @@
27938 #include <linux/tty.h>
27939 #include <linux/string.h>
27940 @@ -33507,9 +33625,13 @@ diff -urNp linux-2.6.37/fs/proc/array.c linux-2.6.37/fs/proc/array.c
27941 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
27942 struct pid *pid, struct task_struct *task)
27943 {
27944 -@@ -357,9 +373,24 @@ int proc_pid_status(struct seq_file *m,
27945 - task_show_regs(m, task);
27946 - #endif
27947 +@@ -353,13 +369,25 @@ int proc_pid_status(struct seq_file *m,
27948 + task_cap(m, task);
27949 + task_cpus_allowed(m, task);
27950 + cpuset_task_status_allowed(m, task);
27951 +-#if defined(CONFIG_S390)
27952 +- task_show_regs(m, task);
27953 +-#endif
27954 task_context_switch_counts(m, task);
27955 +
27956 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
27957 @@ -33532,7 +33654,7 @@ diff -urNp linux-2.6.37/fs/proc/array.c linux-2.6.37/fs/proc/array.c
27958 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
27959 struct pid *pid, struct task_struct *task, int whole)
27960 {
27961 -@@ -452,6 +483,19 @@ static int do_task_stat(struct seq_file
27962 +@@ -452,6 +480,19 @@ static int do_task_stat(struct seq_file
27963 gtime = task->gtime;
27964 }
27965
27966 @@ -33552,7 +33674,7 @@ diff -urNp linux-2.6.37/fs/proc/array.c linux-2.6.37/fs/proc/array.c
27967 /* scale priority and nice values from timeslices to -20..20 */
27968 /* to make it look like a "normal" Unix priority/nice value */
27969 priority = task_prio(task);
27970 -@@ -492,9 +536,15 @@ static int do_task_stat(struct seq_file
27971 +@@ -492,9 +533,15 @@ static int do_task_stat(struct seq_file
27972 vsize,
27973 mm ? get_mm_rss(mm) : 0,
27974 rsslim,
27975 @@ -33568,7 +33690,7 @@ diff -urNp linux-2.6.37/fs/proc/array.c linux-2.6.37/fs/proc/array.c
27976 esp,
27977 eip,
27978 /* The signal information here is obsolete.
27979 -@@ -547,3 +597,10 @@ int proc_pid_statm(struct seq_file *m, s
27980 +@@ -547,3 +594,10 @@ int proc_pid_statm(struct seq_file *m, s
27981
27982 return 0;
27983 }
27984 @@ -33579,9 +33701,9 @@ diff -urNp linux-2.6.37/fs/proc/array.c linux-2.6.37/fs/proc/array.c
27985 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
27986 +}
27987 +#endif
27988 -diff -urNp linux-2.6.37/fs/proc/base.c linux-2.6.37/fs/proc/base.c
27989 ---- linux-2.6.37/fs/proc/base.c 2011-01-04 19:50:19.000000000 -0500
27990 -+++ linux-2.6.37/fs/proc/base.c 2011-01-17 02:41:01.000000000 -0500
27991 +diff -urNp linux-2.6.37.1/fs/proc/base.c linux-2.6.37.1/fs/proc/base.c
27992 +--- linux-2.6.37.1/fs/proc/base.c 2011-01-04 19:50:19.000000000 -0500
27993 ++++ linux-2.6.37.1/fs/proc/base.c 2011-01-17 02:41:01.000000000 -0500
27994 @@ -104,6 +104,22 @@ struct pid_entry {
27995 union proc_op op;
27996 };
27997 @@ -33956,9 +34078,9 @@ diff -urNp linux-2.6.37/fs/proc/base.c linux-2.6.37/fs/proc/base.c
27998 ONE("stack", S_IRUSR, proc_pid_stack),
27999 #endif
28000 #ifdef CONFIG_SCHEDSTATS
28001 -diff -urNp linux-2.6.37/fs/proc/cmdline.c linux-2.6.37/fs/proc/cmdline.c
28002 ---- linux-2.6.37/fs/proc/cmdline.c 2011-01-04 19:50:19.000000000 -0500
28003 -+++ linux-2.6.37/fs/proc/cmdline.c 2011-01-17 02:41:01.000000000 -0500
28004 +diff -urNp linux-2.6.37.1/fs/proc/cmdline.c linux-2.6.37.1/fs/proc/cmdline.c
28005 +--- linux-2.6.37.1/fs/proc/cmdline.c 2011-01-04 19:50:19.000000000 -0500
28006 ++++ linux-2.6.37.1/fs/proc/cmdline.c 2011-01-17 02:41:01.000000000 -0500
28007 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
28008
28009 static int __init proc_cmdline_init(void)
28010 @@ -33971,9 +34093,9 @@ diff -urNp linux-2.6.37/fs/proc/cmdline.c linux-2.6.37/fs/proc/cmdline.c
28011 return 0;
28012 }
28013 module_init(proc_cmdline_init);
28014 -diff -urNp linux-2.6.37/fs/proc/devices.c linux-2.6.37/fs/proc/devices.c
28015 ---- linux-2.6.37/fs/proc/devices.c 2011-01-04 19:50:19.000000000 -0500
28016 -+++ linux-2.6.37/fs/proc/devices.c 2011-01-17 02:41:01.000000000 -0500
28017 +diff -urNp linux-2.6.37.1/fs/proc/devices.c linux-2.6.37.1/fs/proc/devices.c
28018 +--- linux-2.6.37.1/fs/proc/devices.c 2011-01-04 19:50:19.000000000 -0500
28019 ++++ linux-2.6.37.1/fs/proc/devices.c 2011-01-17 02:41:01.000000000 -0500
28020 @@ -64,7 +64,11 @@ static const struct file_operations proc
28021
28022 static int __init proc_devices_init(void)
28023 @@ -33986,9 +34108,9 @@ diff -urNp linux-2.6.37/fs/proc/devices.c linux-2.6.37/fs/proc/devices.c
28024 return 0;
28025 }
28026 module_init(proc_devices_init);
28027 -diff -urNp linux-2.6.37/fs/proc/inode.c linux-2.6.37/fs/proc/inode.c
28028 ---- linux-2.6.37/fs/proc/inode.c 2011-01-04 19:50:19.000000000 -0500
28029 -+++ linux-2.6.37/fs/proc/inode.c 2011-01-17 02:41:01.000000000 -0500
28030 +diff -urNp linux-2.6.37.1/fs/proc/inode.c linux-2.6.37.1/fs/proc/inode.c
28031 +--- linux-2.6.37.1/fs/proc/inode.c 2011-01-04 19:50:19.000000000 -0500
28032 ++++ linux-2.6.37.1/fs/proc/inode.c 2011-01-17 02:41:01.000000000 -0500
28033 @@ -425,7 +425,11 @@ struct inode *proc_get_inode(struct supe
28034 if (de->mode) {
28035 inode->i_mode = de->mode;
28036 @@ -34001,9 +34123,9 @@ diff -urNp linux-2.6.37/fs/proc/inode.c linux-2.6.37/fs/proc/inode.c
28037 }
28038 if (de->size)
28039 inode->i_size = de->size;
28040 -diff -urNp linux-2.6.37/fs/proc/internal.h linux-2.6.37/fs/proc/internal.h
28041 ---- linux-2.6.37/fs/proc/internal.h 2011-01-04 19:50:19.000000000 -0500
28042 -+++ linux-2.6.37/fs/proc/internal.h 2011-01-17 02:41:01.000000000 -0500
28043 +diff -urNp linux-2.6.37.1/fs/proc/internal.h linux-2.6.37.1/fs/proc/internal.h
28044 +--- linux-2.6.37.1/fs/proc/internal.h 2011-01-04 19:50:19.000000000 -0500
28045 ++++ linux-2.6.37.1/fs/proc/internal.h 2011-01-17 02:41:01.000000000 -0500
28046 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
28047 struct pid *pid, struct task_struct *task);
28048 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
28049 @@ -34014,9 +34136,9 @@ diff -urNp linux-2.6.37/fs/proc/internal.h linux-2.6.37/fs/proc/internal.h
28050 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
28051
28052 extern const struct file_operations proc_maps_operations;
28053 -diff -urNp linux-2.6.37/fs/proc/Kconfig linux-2.6.37/fs/proc/Kconfig
28054 ---- linux-2.6.37/fs/proc/Kconfig 2011-01-04 19:50:19.000000000 -0500
28055 -+++ linux-2.6.37/fs/proc/Kconfig 2011-01-17 02:41:01.000000000 -0500
28056 +diff -urNp linux-2.6.37.1/fs/proc/Kconfig linux-2.6.37.1/fs/proc/Kconfig
28057 +--- linux-2.6.37.1/fs/proc/Kconfig 2011-01-04 19:50:19.000000000 -0500
28058 ++++ linux-2.6.37.1/fs/proc/Kconfig 2011-01-17 02:41:01.000000000 -0500
28059 @@ -30,12 +30,12 @@ config PROC_FS
28060
28061 config PROC_KCORE
28062 @@ -34044,9 +34166,9 @@ diff -urNp linux-2.6.37/fs/proc/Kconfig linux-2.6.37/fs/proc/Kconfig
28063 bool "Enable /proc page monitoring" if EMBEDDED
28064 help
28065 Various /proc files exist to monitor process memory utilization:
28066 -diff -urNp linux-2.6.37/fs/proc/kcore.c linux-2.6.37/fs/proc/kcore.c
28067 ---- linux-2.6.37/fs/proc/kcore.c 2011-01-04 19:50:19.000000000 -0500
28068 -+++ linux-2.6.37/fs/proc/kcore.c 2011-01-17 02:41:01.000000000 -0500
28069 +diff -urNp linux-2.6.37.1/fs/proc/kcore.c linux-2.6.37.1/fs/proc/kcore.c
28070 +--- linux-2.6.37.1/fs/proc/kcore.c 2011-02-22 16:05:31.000000000 -0500
28071 ++++ linux-2.6.37.1/fs/proc/kcore.c 2011-02-22 16:05:42.000000000 -0500
28072 @@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
28073 * the addresses in the elf_phdr on our list.
28074 */
28075 @@ -34105,9 +34227,9 @@ diff -urNp linux-2.6.37/fs/proc/kcore.c linux-2.6.37/fs/proc/kcore.c
28076 if (!capable(CAP_SYS_RAWIO))
28077 return -EPERM;
28078 if (kcore_need_update)
28079 -diff -urNp linux-2.6.37/fs/proc/meminfo.c linux-2.6.37/fs/proc/meminfo.c
28080 ---- linux-2.6.37/fs/proc/meminfo.c 2011-01-04 19:50:19.000000000 -0500
28081 -+++ linux-2.6.37/fs/proc/meminfo.c 2011-01-17 02:41:01.000000000 -0500
28082 +diff -urNp linux-2.6.37.1/fs/proc/meminfo.c linux-2.6.37.1/fs/proc/meminfo.c
28083 +--- linux-2.6.37.1/fs/proc/meminfo.c 2011-01-04 19:50:19.000000000 -0500
28084 ++++ linux-2.6.37.1/fs/proc/meminfo.c 2011-01-17 02:41:01.000000000 -0500
28085 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
28086 vmi.used >> 10,
28087 vmi.largest_chunk >> 10
28088 @@ -34117,9 +34239,9 @@ diff -urNp linux-2.6.37/fs/proc/meminfo.c linux-2.6.37/fs/proc/meminfo.c
28089 #endif
28090 );
28091
28092 -diff -urNp linux-2.6.37/fs/proc/nommu.c linux-2.6.37/fs/proc/nommu.c
28093 ---- linux-2.6.37/fs/proc/nommu.c 2011-01-04 19:50:19.000000000 -0500
28094 -+++ linux-2.6.37/fs/proc/nommu.c 2011-01-17 02:41:01.000000000 -0500
28095 +diff -urNp linux-2.6.37.1/fs/proc/nommu.c linux-2.6.37.1/fs/proc/nommu.c
28096 +--- linux-2.6.37.1/fs/proc/nommu.c 2011-01-04 19:50:19.000000000 -0500
28097 ++++ linux-2.6.37.1/fs/proc/nommu.c 2011-01-17 02:41:01.000000000 -0500
28098 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
28099 if (len < 1)
28100 len = 1;
28101 @@ -34129,9 +34251,9 @@ diff -urNp linux-2.6.37/fs/proc/nommu.c linux-2.6.37/fs/proc/nommu.c
28102 }
28103
28104 seq_putc(m, '\n');
28105 -diff -urNp linux-2.6.37/fs/proc/proc_net.c linux-2.6.37/fs/proc/proc_net.c
28106 ---- linux-2.6.37/fs/proc/proc_net.c 2011-01-04 19:50:19.000000000 -0500
28107 -+++ linux-2.6.37/fs/proc/proc_net.c 2011-01-17 02:41:01.000000000 -0500
28108 +diff -urNp linux-2.6.37.1/fs/proc/proc_net.c linux-2.6.37.1/fs/proc/proc_net.c
28109 +--- linux-2.6.37.1/fs/proc/proc_net.c 2011-01-04 19:50:19.000000000 -0500
28110 ++++ linux-2.6.37.1/fs/proc/proc_net.c 2011-01-17 02:41:01.000000000 -0500
28111 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
28112 struct task_struct *task;
28113 struct nsproxy *ns;
28114 @@ -34150,9 +34272,9 @@ diff -urNp linux-2.6.37/fs/proc/proc_net.c linux-2.6.37/fs/proc/proc_net.c
28115
28116 rcu_read_lock();
28117 task = pid_task(proc_pid(dir), PIDTYPE_PID);
28118 -diff -urNp linux-2.6.37/fs/proc/proc_sysctl.c linux-2.6.37/fs/proc/proc_sysctl.c
28119 ---- linux-2.6.37/fs/proc/proc_sysctl.c 2011-01-04 19:50:19.000000000 -0500
28120 -+++ linux-2.6.37/fs/proc/proc_sysctl.c 2011-01-17 02:41:01.000000000 -0500
28121 +diff -urNp linux-2.6.37.1/fs/proc/proc_sysctl.c linux-2.6.37.1/fs/proc/proc_sysctl.c
28122 +--- linux-2.6.37.1/fs/proc/proc_sysctl.c 2011-01-04 19:50:19.000000000 -0500
28123 ++++ linux-2.6.37.1/fs/proc/proc_sysctl.c 2011-01-17 02:41:01.000000000 -0500
28124 @@ -7,6 +7,8 @@
28125 #include <linux/security.h>
28126 #include "internal.h"
28127 @@ -34192,9 +34314,9 @@ diff -urNp linux-2.6.37/fs/proc/proc_sysctl.c linux-2.6.37/fs/proc/proc_sysctl.c
28128 generic_fillattr(inode, stat);
28129 if (table)
28130 stat->mode = (stat->mode & S_IFMT) | table->mode;
28131 -diff -urNp linux-2.6.37/fs/proc/root.c linux-2.6.37/fs/proc/root.c
28132 ---- linux-2.6.37/fs/proc/root.c 2011-01-04 19:50:19.000000000 -0500
28133 -+++ linux-2.6.37/fs/proc/root.c 2011-01-17 02:41:01.000000000 -0500
28134 +diff -urNp linux-2.6.37.1/fs/proc/root.c linux-2.6.37.1/fs/proc/root.c
28135 +--- linux-2.6.37.1/fs/proc/root.c 2011-01-04 19:50:19.000000000 -0500
28136 ++++ linux-2.6.37.1/fs/proc/root.c 2011-01-17 02:41:01.000000000 -0500
28137 @@ -132,7 +132,15 @@ void __init proc_root_init(void)
28138 #ifdef CONFIG_PROC_DEVICETREE
28139 proc_device_tree_init();
28140 @@ -34211,9 +34333,9 @@ diff -urNp linux-2.6.37/fs/proc/root.c linux-2.6.37/fs/proc/root.c
28141 proc_sys_init();
28142 }
28143
28144 -diff -urNp linux-2.6.37/fs/proc/task_mmu.c linux-2.6.37/fs/proc/task_mmu.c
28145 ---- linux-2.6.37/fs/proc/task_mmu.c 2011-01-04 19:50:19.000000000 -0500
28146 -+++ linux-2.6.37/fs/proc/task_mmu.c 2011-01-17 02:41:01.000000000 -0500
28147 +diff -urNp linux-2.6.37.1/fs/proc/task_mmu.c linux-2.6.37.1/fs/proc/task_mmu.c
28148 +--- linux-2.6.37.1/fs/proc/task_mmu.c 2011-01-04 19:50:19.000000000 -0500
28149 ++++ linux-2.6.37.1/fs/proc/task_mmu.c 2011-01-17 02:41:01.000000000 -0500
28150 @@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
28151 "VmExe:\t%8lu kB\n"
28152 "VmLib:\t%8lu kB\n"
28153 @@ -34353,9 +34475,9 @@ diff -urNp linux-2.6.37/fs/proc/task_mmu.c linux-2.6.37/fs/proc/task_mmu.c
28154 mss.resident >> 10,
28155 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
28156 mss.shared_clean >> 10,
28157 -diff -urNp linux-2.6.37/fs/proc/task_nommu.c linux-2.6.37/fs/proc/task_nommu.c
28158 ---- linux-2.6.37/fs/proc/task_nommu.c 2011-01-04 19:50:19.000000000 -0500
28159 -+++ linux-2.6.37/fs/proc/task_nommu.c 2011-01-17 02:41:01.000000000 -0500
28160 +diff -urNp linux-2.6.37.1/fs/proc/task_nommu.c linux-2.6.37.1/fs/proc/task_nommu.c
28161 +--- linux-2.6.37.1/fs/proc/task_nommu.c 2011-01-04 19:50:19.000000000 -0500
28162 ++++ linux-2.6.37.1/fs/proc/task_nommu.c 2011-01-17 02:41:01.000000000 -0500
28163 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
28164 else
28165 bytes += kobjsize(mm);
28166 @@ -34374,9 +34496,9 @@ diff -urNp linux-2.6.37/fs/proc/task_nommu.c linux-2.6.37/fs/proc/task_nommu.c
28167 } else if (mm) {
28168 if (vma->vm_start <= mm->start_stack &&
28169 vma->vm_end >= mm->start_stack) {
28170 -diff -urNp linux-2.6.37/fs/readdir.c linux-2.6.37/fs/readdir.c
28171 ---- linux-2.6.37/fs/readdir.c 2011-01-04 19:50:19.000000000 -0500
28172 -+++ linux-2.6.37/fs/readdir.c 2011-01-17 02:41:01.000000000 -0500
28173 +diff -urNp linux-2.6.37.1/fs/readdir.c linux-2.6.37.1/fs/readdir.c
28174 +--- linux-2.6.37.1/fs/readdir.c 2011-01-04 19:50:19.000000000 -0500
28175 ++++ linux-2.6.37.1/fs/readdir.c 2011-01-17 02:41:01.000000000 -0500
28176 @@ -17,6 +17,7 @@
28177 #include <linux/security.h>
28178 #include <linux/syscalls.h>
28179 @@ -34466,9 +34588,9 @@ diff -urNp linux-2.6.37/fs/readdir.c linux-2.6.37/fs/readdir.c
28180 buf.count = count;
28181 buf.error = 0;
28182
28183 -diff -urNp linux-2.6.37/fs/reiserfs/do_balan.c linux-2.6.37/fs/reiserfs/do_balan.c
28184 ---- linux-2.6.37/fs/reiserfs/do_balan.c 2011-01-04 19:50:19.000000000 -0500
28185 -+++ linux-2.6.37/fs/reiserfs/do_balan.c 2011-01-17 02:41:02.000000000 -0500
28186 +diff -urNp linux-2.6.37.1/fs/reiserfs/do_balan.c linux-2.6.37.1/fs/reiserfs/do_balan.c
28187 +--- linux-2.6.37.1/fs/reiserfs/do_balan.c 2011-01-04 19:50:19.000000000 -0500
28188 ++++ linux-2.6.37.1/fs/reiserfs/do_balan.c 2011-01-17 02:41:02.000000000 -0500
28189 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
28190 return;
28191 }
28192 @@ -34478,9 +34600,9 @@ diff -urNp linux-2.6.37/fs/reiserfs/do_balan.c linux-2.6.37/fs/reiserfs/do_balan
28193 do_balance_starts(tb);
28194
28195 /* balance leaf returns 0 except if combining L R and S into
28196 -diff -urNp linux-2.6.37/fs/reiserfs/item_ops.c linux-2.6.37/fs/reiserfs/item_ops.c
28197 ---- linux-2.6.37/fs/reiserfs/item_ops.c 2011-01-04 19:50:19.000000000 -0500
28198 -+++ linux-2.6.37/fs/reiserfs/item_ops.c 2011-01-17 02:41:02.000000000 -0500
28199 +diff -urNp linux-2.6.37.1/fs/reiserfs/item_ops.c linux-2.6.37.1/fs/reiserfs/item_ops.c
28200 +--- linux-2.6.37.1/fs/reiserfs/item_ops.c 2011-01-04 19:50:19.000000000 -0500
28201 ++++ linux-2.6.37.1/fs/reiserfs/item_ops.c 2011-01-17 02:41:02.000000000 -0500
28202 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
28203 vi->vi_index, vi->vi_type, vi->vi_ih);
28204 }
28205 @@ -34535,9 +34657,9 @@ diff -urNp linux-2.6.37/fs/reiserfs/item_ops.c linux-2.6.37/fs/reiserfs/item_ops
28206 &stat_data_ops,
28207 &indirect_ops,
28208 &direct_ops,
28209 -diff -urNp linux-2.6.37/fs/reiserfs/procfs.c linux-2.6.37/fs/reiserfs/procfs.c
28210 ---- linux-2.6.37/fs/reiserfs/procfs.c 2011-01-04 19:50:19.000000000 -0500
28211 -+++ linux-2.6.37/fs/reiserfs/procfs.c 2011-01-17 02:41:02.000000000 -0500
28212 +diff -urNp linux-2.6.37.1/fs/reiserfs/procfs.c linux-2.6.37.1/fs/reiserfs/procfs.c
28213 +--- linux-2.6.37.1/fs/reiserfs/procfs.c 2011-01-04 19:50:19.000000000 -0500
28214 ++++ linux-2.6.37.1/fs/reiserfs/procfs.c 2011-01-17 02:41:02.000000000 -0500
28215 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
28216 "SMALL_TAILS " : "NO_TAILS ",
28217 replay_only(sb) ? "REPLAY_ONLY " : "",
28218 @@ -34547,9 +34669,9 @@ diff -urNp linux-2.6.37/fs/reiserfs/procfs.c linux-2.6.37/fs/reiserfs/procfs.c
28219 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
28220 SF(s_do_balance), SF(s_unneeded_left_neighbor),
28221 SF(s_good_search_by_key_reada), SF(s_bmaps),
28222 -diff -urNp linux-2.6.37/fs/select.c linux-2.6.37/fs/select.c
28223 ---- linux-2.6.37/fs/select.c 2011-01-04 19:50:19.000000000 -0500
28224 -+++ linux-2.6.37/fs/select.c 2011-01-17 02:41:02.000000000 -0500
28225 +diff -urNp linux-2.6.37.1/fs/select.c linux-2.6.37.1/fs/select.c
28226 +--- linux-2.6.37.1/fs/select.c 2011-01-04 19:50:19.000000000 -0500
28227 ++++ linux-2.6.37.1/fs/select.c 2011-01-17 02:41:02.000000000 -0500
28228 @@ -20,6 +20,7 @@
28229 #include <linux/module.h>
28230 #include <linux/slab.h>
28231 @@ -34566,9 +34688,9 @@ diff -urNp linux-2.6.37/fs/select.c linux-2.6.37/fs/select.c
28232 if (nfds > rlimit(RLIMIT_NOFILE))
28233 return -EINVAL;
28234
28235 -diff -urNp linux-2.6.37/fs/seq_file.c linux-2.6.37/fs/seq_file.c
28236 ---- linux-2.6.37/fs/seq_file.c 2011-01-04 19:50:19.000000000 -0500
28237 -+++ linux-2.6.37/fs/seq_file.c 2011-01-17 02:41:02.000000000 -0500
28238 +diff -urNp linux-2.6.37.1/fs/seq_file.c linux-2.6.37.1/fs/seq_file.c
28239 +--- linux-2.6.37.1/fs/seq_file.c 2011-01-04 19:50:19.000000000 -0500
28240 ++++ linux-2.6.37.1/fs/seq_file.c 2011-01-17 02:41:02.000000000 -0500
28241 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
28242 return 0;
28243 }
28244 @@ -34609,9 +34731,9 @@ diff -urNp linux-2.6.37/fs/seq_file.c linux-2.6.37/fs/seq_file.c
28245 if (!m->buf)
28246 goto Enomem;
28247 m->count = 0;
28248 -diff -urNp linux-2.6.37/fs/splice.c linux-2.6.37/fs/splice.c
28249 ---- linux-2.6.37/fs/splice.c 2011-01-04 19:50:19.000000000 -0500
28250 -+++ linux-2.6.37/fs/splice.c 2011-01-17 02:41:02.000000000 -0500
28251 +diff -urNp linux-2.6.37.1/fs/splice.c linux-2.6.37.1/fs/splice.c
28252 +--- linux-2.6.37.1/fs/splice.c 2011-01-04 19:50:19.000000000 -0500
28253 ++++ linux-2.6.37.1/fs/splice.c 2011-01-17 02:41:02.000000000 -0500
28254 @@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
28255 pipe_lock(pipe);
28256
28257 @@ -34750,9 +34872,9 @@ diff -urNp linux-2.6.37/fs/splice.c linux-2.6.37/fs/splice.c
28258 ret = -EAGAIN;
28259
28260 pipe_unlock(ipipe);
28261 -diff -urNp linux-2.6.37/fs/sysfs/symlink.c linux-2.6.37/fs/sysfs/symlink.c
28262 ---- linux-2.6.37/fs/sysfs/symlink.c 2011-01-04 19:50:19.000000000 -0500
28263 -+++ linux-2.6.37/fs/sysfs/symlink.c 2011-01-17 02:41:02.000000000 -0500
28264 +diff -urNp linux-2.6.37.1/fs/sysfs/symlink.c linux-2.6.37.1/fs/sysfs/symlink.c
28265 +--- linux-2.6.37.1/fs/sysfs/symlink.c 2011-01-04 19:50:19.000000000 -0500
28266 ++++ linux-2.6.37.1/fs/sysfs/symlink.c 2011-01-17 02:41:02.000000000 -0500
28267 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
28268
28269 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
28270 @@ -34762,9 +34884,9 @@ diff -urNp linux-2.6.37/fs/sysfs/symlink.c linux-2.6.37/fs/sysfs/symlink.c
28271 if (!IS_ERR(page))
28272 free_page((unsigned long)page);
28273 }
28274 -diff -urNp linux-2.6.37/fs/udf/misc.c linux-2.6.37/fs/udf/misc.c
28275 ---- linux-2.6.37/fs/udf/misc.c 2011-01-04 19:50:19.000000000 -0500
28276 -+++ linux-2.6.37/fs/udf/misc.c 2011-01-17 02:41:02.000000000 -0500
28277 +diff -urNp linux-2.6.37.1/fs/udf/misc.c linux-2.6.37.1/fs/udf/misc.c
28278 +--- linux-2.6.37.1/fs/udf/misc.c 2011-01-04 19:50:19.000000000 -0500
28279 ++++ linux-2.6.37.1/fs/udf/misc.c 2011-01-17 02:41:02.000000000 -0500
28280 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
28281 iinfo->i_lenEAttr += size;
28282 return (struct genericFormat *)&ea[offset];
28283 @@ -34785,9 +34907,9 @@ diff -urNp linux-2.6.37/fs/udf/misc.c linux-2.6.37/fs/udf/misc.c
28284 u8 checksum = 0;
28285 int i;
28286 for (i = 0; i < sizeof(struct tag); ++i)
28287 -diff -urNp linux-2.6.37/fs/udf/udfdecl.h linux-2.6.37/fs/udf/udfdecl.h
28288 ---- linux-2.6.37/fs/udf/udfdecl.h 2011-01-04 19:50:19.000000000 -0500
28289 -+++ linux-2.6.37/fs/udf/udfdecl.h 2011-01-17 02:41:02.000000000 -0500
28290 +diff -urNp linux-2.6.37.1/fs/udf/udfdecl.h linux-2.6.37.1/fs/udf/udfdecl.h
28291 +--- linux-2.6.37.1/fs/udf/udfdecl.h 2011-01-04 19:50:19.000000000 -0500
28292 ++++ linux-2.6.37.1/fs/udf/udfdecl.h 2011-01-17 02:41:02.000000000 -0500
28293 @@ -26,7 +26,7 @@ do { \
28294 printk(f, ##a); \
28295 } while (0)
28296 @@ -34797,9 +34919,9 @@ diff -urNp linux-2.6.37/fs/udf/udfdecl.h linux-2.6.37/fs/udf/udfdecl.h
28297 #endif
28298
28299 #define udf_info(f, a...) \
28300 -diff -urNp linux-2.6.37/fs/utimes.c linux-2.6.37/fs/utimes.c
28301 ---- linux-2.6.37/fs/utimes.c 2011-01-04 19:50:19.000000000 -0500
28302 -+++ linux-2.6.37/fs/utimes.c 2011-01-17 02:41:02.000000000 -0500
28303 +diff -urNp linux-2.6.37.1/fs/utimes.c linux-2.6.37.1/fs/utimes.c
28304 +--- linux-2.6.37.1/fs/utimes.c 2011-01-04 19:50:19.000000000 -0500
28305 ++++ linux-2.6.37.1/fs/utimes.c 2011-01-17 02:41:02.000000000 -0500
28306 @@ -1,6 +1,7 @@
28307 #include <linux/compiler.h>
28308 #include <linux/file.h>
28309 @@ -34821,9 +34943,9 @@ diff -urNp linux-2.6.37/fs/utimes.c linux-2.6.37/fs/utimes.c
28310 mutex_lock(&inode->i_mutex);
28311 error = notify_change(path->dentry, &newattrs);
28312 mutex_unlock(&inode->i_mutex);
28313 -diff -urNp linux-2.6.37/fs/xattr_acl.c linux-2.6.37/fs/xattr_acl.c
28314 ---- linux-2.6.37/fs/xattr_acl.c 2011-01-04 19:50:19.000000000 -0500
28315 -+++ linux-2.6.37/fs/xattr_acl.c 2011-01-17 02:41:02.000000000 -0500
28316 +diff -urNp linux-2.6.37.1/fs/xattr_acl.c linux-2.6.37.1/fs/xattr_acl.c
28317 +--- linux-2.6.37.1/fs/xattr_acl.c 2011-01-04 19:50:19.000000000 -0500
28318 ++++ linux-2.6.37.1/fs/xattr_acl.c 2011-01-17 02:41:02.000000000 -0500
28319 @@ -17,8 +17,8 @@
28320 struct posix_acl *
28321 posix_acl_from_xattr(const void *value, size_t size)
28322 @@ -34835,9 +34957,9 @@ diff -urNp linux-2.6.37/fs/xattr_acl.c linux-2.6.37/fs/xattr_acl.c
28323 int count;
28324 struct posix_acl *acl;
28325 struct posix_acl_entry *acl_e;
28326 -diff -urNp linux-2.6.37/fs/xattr.c linux-2.6.37/fs/xattr.c
28327 ---- linux-2.6.37/fs/xattr.c 2011-01-04 19:50:19.000000000 -0500
28328 -+++ linux-2.6.37/fs/xattr.c 2011-01-17 02:41:02.000000000 -0500
28329 +diff -urNp linux-2.6.37.1/fs/xattr.c linux-2.6.37.1/fs/xattr.c
28330 +--- linux-2.6.37.1/fs/xattr.c 2011-01-04 19:50:19.000000000 -0500
28331 ++++ linux-2.6.37.1/fs/xattr.c 2011-01-17 02:41:02.000000000 -0500
28332 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
28333 * Extended attribute SET operations
28334 */
28335 @@ -34900,9 +35022,9 @@ diff -urNp linux-2.6.37/fs/xattr.c linux-2.6.37/fs/xattr.c
28336 mnt_drop_write(f->f_path.mnt);
28337 }
28338 fput(f);
28339 -diff -urNp linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c
28340 ---- linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c 2011-01-04 19:50:19.000000000 -0500
28341 -+++ linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c 2011-01-17 02:41:02.000000000 -0500
28342 +diff -urNp linux-2.6.37.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37.1/fs/xfs/linux-2.6/xfs_ioctl.c
28343 +--- linux-2.6.37.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-01-04 19:50:19.000000000 -0500
28344 ++++ linux-2.6.37.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-01-17 02:41:02.000000000 -0500
28345 @@ -127,7 +127,7 @@ xfs_find_handle(
28346 }
28347
28348 @@ -34912,9 +35034,9 @@ diff -urNp linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37/fs/xfs/linux-2
28349 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
28350 goto out_put;
28351
28352 -diff -urNp linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c
28353 ---- linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c 2011-01-04 19:50:19.000000000 -0500
28354 -+++ linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c 2011-01-17 02:41:02.000000000 -0500
28355 +diff -urNp linux-2.6.37.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37.1/fs/xfs/linux-2.6/xfs_iops.c
28356 +--- linux-2.6.37.1/fs/xfs/linux-2.6/xfs_iops.c 2011-01-04 19:50:19.000000000 -0500
28357 ++++ linux-2.6.37.1/fs/xfs/linux-2.6/xfs_iops.c 2011-01-17 02:41:02.000000000 -0500
28358 @@ -437,7 +437,7 @@ xfs_vn_put_link(
28359 struct nameidata *nd,
28360 void *p)
28361 @@ -34924,9 +35046,9 @@ diff -urNp linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37/fs/xfs/linux-2.
28362
28363 if (!IS_ERR(s))
28364 kfree(s);
28365 -diff -urNp linux-2.6.37/fs/xfs/xfs_bmap.c linux-2.6.37/fs/xfs/xfs_bmap.c
28366 ---- linux-2.6.37/fs/xfs/xfs_bmap.c 2011-01-04 19:50:19.000000000 -0500
28367 -+++ linux-2.6.37/fs/xfs/xfs_bmap.c 2011-01-17 02:41:02.000000000 -0500
28368 +diff -urNp linux-2.6.37.1/fs/xfs/xfs_bmap.c linux-2.6.37.1/fs/xfs/xfs_bmap.c
28369 +--- linux-2.6.37.1/fs/xfs/xfs_bmap.c 2011-01-04 19:50:19.000000000 -0500
28370 ++++ linux-2.6.37.1/fs/xfs/xfs_bmap.c 2011-01-17 02:41:02.000000000 -0500
28371 @@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
28372 int nmap,
28373 int ret_nmap);
28374 @@ -34936,9 +35058,9 @@ diff -urNp linux-2.6.37/fs/xfs/xfs_bmap.c linux-2.6.37/fs/xfs/xfs_bmap.c
28375 #endif /* DEBUG */
28376
28377 STATIC int
28378 -diff -urNp linux-2.6.37/fs/xfs/xfs_fsops.c linux-2.6.37/fs/xfs/xfs_fsops.c
28379 ---- linux-2.6.37/fs/xfs/xfs_fsops.c 2011-01-04 19:50:19.000000000 -0500
28380 -+++ linux-2.6.37/fs/xfs/xfs_fsops.c 2011-02-15 19:43:38.000000000 -0500
28381 +diff -urNp linux-2.6.37.1/fs/xfs/xfs_fsops.c linux-2.6.37.1/fs/xfs/xfs_fsops.c
28382 +--- linux-2.6.37.1/fs/xfs/xfs_fsops.c 2011-01-04 19:50:19.000000000 -0500
28383 ++++ linux-2.6.37.1/fs/xfs/xfs_fsops.c 2011-02-15 19:43:38.000000000 -0500
28384 @@ -53,6 +53,9 @@ xfs_fs_geometry(
28385 xfs_fsop_geom_t *geo,
28386 int new_version)
28387 @@ -34949,9 +35071,9 @@ diff -urNp linux-2.6.37/fs/xfs/xfs_fsops.c linux-2.6.37/fs/xfs/xfs_fsops.c
28388 geo->blocksize = mp->m_sb.sb_blocksize;
28389 geo->rtextsize = mp->m_sb.sb_rextsize;
28390 geo->agblocks = mp->m_sb.sb_agblocks;
28391 -diff -urNp linux-2.6.37/grsecurity/gracl_alloc.c linux-2.6.37/grsecurity/gracl_alloc.c
28392 ---- linux-2.6.37/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
28393 -+++ linux-2.6.37/grsecurity/gracl_alloc.c 2011-01-17 02:41:02.000000000 -0500
28394 +diff -urNp linux-2.6.37.1/grsecurity/gracl_alloc.c linux-2.6.37.1/grsecurity/gracl_alloc.c
28395 +--- linux-2.6.37.1/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
28396 ++++ linux-2.6.37.1/grsecurity/gracl_alloc.c 2011-01-17 02:41:02.000000000 -0500
28397 @@ -0,0 +1,105 @@
28398 +#include <linux/kernel.h>
28399 +#include <linux/mm.h>
28400 @@ -35058,9 +35180,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_alloc.c linux-2.6.37/grsecurity/gracl_a
28401 + else
28402 + return 1;
28403 +}
28404 -diff -urNp linux-2.6.37/grsecurity/gracl.c linux-2.6.37/grsecurity/gracl.c
28405 ---- linux-2.6.37/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
28406 -+++ linux-2.6.37/grsecurity/gracl.c 2011-01-17 20:20:28.000000000 -0500
28407 +diff -urNp linux-2.6.37.1/grsecurity/gracl.c linux-2.6.37.1/grsecurity/gracl.c
28408 +--- linux-2.6.37.1/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
28409 ++++ linux-2.6.37.1/grsecurity/gracl.c 2011-01-17 20:20:28.000000000 -0500
28410 @@ -0,0 +1,3991 @@
28411 +#include <linux/kernel.h>
28412 +#include <linux/module.h>
28413 @@ -39053,9 +39175,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl.c linux-2.6.37/grsecurity/gracl.c
28414 +EXPORT_SYMBOL(gr_check_group_change);
28415 +#endif
28416 +
28417 -diff -urNp linux-2.6.37/grsecurity/gracl_cap.c linux-2.6.37/grsecurity/gracl_cap.c
28418 ---- linux-2.6.37/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
28419 -+++ linux-2.6.37/grsecurity/gracl_cap.c 2011-01-17 02:41:02.000000000 -0500
28420 +diff -urNp linux-2.6.37.1/grsecurity/gracl_cap.c linux-2.6.37.1/grsecurity/gracl_cap.c
28421 +--- linux-2.6.37.1/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
28422 ++++ linux-2.6.37.1/grsecurity/gracl_cap.c 2011-01-17 02:41:02.000000000 -0500
28423 @@ -0,0 +1,138 @@
28424 +#include <linux/kernel.h>
28425 +#include <linux/module.h>
28426 @@ -39195,9 +39317,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_cap.c linux-2.6.37/grsecurity/gracl_cap
28427 + return 0;
28428 +}
28429 +
28430 -diff -urNp linux-2.6.37/grsecurity/gracl_fs.c linux-2.6.37/grsecurity/gracl_fs.c
28431 ---- linux-2.6.37/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
28432 -+++ linux-2.6.37/grsecurity/gracl_fs.c 2011-01-17 02:41:02.000000000 -0500
28433 +diff -urNp linux-2.6.37.1/grsecurity/gracl_fs.c linux-2.6.37.1/grsecurity/gracl_fs.c
28434 +--- linux-2.6.37.1/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
28435 ++++ linux-2.6.37.1/grsecurity/gracl_fs.c 2011-01-17 02:41:02.000000000 -0500
28436 @@ -0,0 +1,430 @@
28437 +#include <linux/kernel.h>
28438 +#include <linux/sched.h>
28439 @@ -39629,9 +39751,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_fs.c linux-2.6.37/grsecurity/gracl_fs.c
28440 +
28441 + return 0;
28442 +}
28443 -diff -urNp linux-2.6.37/grsecurity/gracl_ip.c linux-2.6.37/grsecurity/gracl_ip.c
28444 ---- linux-2.6.37/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
28445 -+++ linux-2.6.37/grsecurity/gracl_ip.c 2011-02-15 19:42:06.000000000 -0500
28446 +diff -urNp linux-2.6.37.1/grsecurity/gracl_ip.c linux-2.6.37.1/grsecurity/gracl_ip.c
28447 +--- linux-2.6.37.1/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
28448 ++++ linux-2.6.37.1/grsecurity/gracl_ip.c 2011-02-15 19:42:06.000000000 -0500
28449 @@ -0,0 +1,382 @@
28450 +#include <linux/kernel.h>
28451 +#include <asm/uaccess.h>
28452 @@ -40015,9 +40137,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_ip.c linux-2.6.37/grsecurity/gracl_ip.c
28453 +
28454 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
28455 +}
28456 -diff -urNp linux-2.6.37/grsecurity/gracl_learn.c linux-2.6.37/grsecurity/gracl_learn.c
28457 ---- linux-2.6.37/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
28458 -+++ linux-2.6.37/grsecurity/gracl_learn.c 2011-01-17 02:41:02.000000000 -0500
28459 +diff -urNp linux-2.6.37.1/grsecurity/gracl_learn.c linux-2.6.37.1/grsecurity/gracl_learn.c
28460 +--- linux-2.6.37.1/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
28461 ++++ linux-2.6.37.1/grsecurity/gracl_learn.c 2011-01-17 02:41:02.000000000 -0500
28462 @@ -0,0 +1,211 @@
28463 +#include <linux/kernel.h>
28464 +#include <linux/mm.h>
28465 @@ -40230,9 +40352,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_learn.c linux-2.6.37/grsecurity/gracl_l
28466 + .release = close_learn,
28467 + .poll = poll_learn,
28468 +};
28469 -diff -urNp linux-2.6.37/grsecurity/gracl_res.c linux-2.6.37/grsecurity/gracl_res.c
28470 ---- linux-2.6.37/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
28471 -+++ linux-2.6.37/grsecurity/gracl_res.c 2011-01-17 02:41:02.000000000 -0500
28472 +diff -urNp linux-2.6.37.1/grsecurity/gracl_res.c linux-2.6.37.1/grsecurity/gracl_res.c
28473 +--- linux-2.6.37.1/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
28474 ++++ linux-2.6.37.1/grsecurity/gracl_res.c 2011-01-17 02:41:02.000000000 -0500
28475 @@ -0,0 +1,68 @@
28476 +#include <linux/kernel.h>
28477 +#include <linux/sched.h>
28478 @@ -40302,9 +40424,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_res.c linux-2.6.37/grsecurity/gracl_res
28479 + rcu_read_unlock();
28480 + return;
28481 +}
28482 -diff -urNp linux-2.6.37/grsecurity/gracl_segv.c linux-2.6.37/grsecurity/gracl_segv.c
28483 ---- linux-2.6.37/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
28484 -+++ linux-2.6.37/grsecurity/gracl_segv.c 2011-01-17 02:41:02.000000000 -0500
28485 +diff -urNp linux-2.6.37.1/grsecurity/gracl_segv.c linux-2.6.37.1/grsecurity/gracl_segv.c
28486 +--- linux-2.6.37.1/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
28487 ++++ linux-2.6.37.1/grsecurity/gracl_segv.c 2011-01-17 02:41:02.000000000 -0500
28488 @@ -0,0 +1,310 @@
28489 +#include <linux/kernel.h>
28490 +#include <linux/mm.h>
28491 @@ -40616,9 +40738,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_segv.c linux-2.6.37/grsecurity/gracl_se
28492 +
28493 + return;
28494 +}
28495 -diff -urNp linux-2.6.37/grsecurity/gracl_shm.c linux-2.6.37/grsecurity/gracl_shm.c
28496 ---- linux-2.6.37/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
28497 -+++ linux-2.6.37/grsecurity/gracl_shm.c 2011-01-17 02:41:02.000000000 -0500
28498 +diff -urNp linux-2.6.37.1/grsecurity/gracl_shm.c linux-2.6.37.1/grsecurity/gracl_shm.c
28499 +--- linux-2.6.37.1/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
28500 ++++ linux-2.6.37.1/grsecurity/gracl_shm.c 2011-01-17 02:41:02.000000000 -0500
28501 @@ -0,0 +1,40 @@
28502 +#include <linux/kernel.h>
28503 +#include <linux/mm.h>
28504 @@ -40660,9 +40782,9 @@ diff -urNp linux-2.6.37/grsecurity/gracl_shm.c linux-2.6.37/grsecurity/gracl_shm
28505 +
28506 + return 1;
28507 +}
28508 -diff -urNp linux-2.6.37/grsecurity/grsec_chdir.c linux-2.6.37/grsecurity/grsec_chdir.c
28509 ---- linux-2.6.37/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
28510 -+++ linux-2.6.37/grsecurity/grsec_chdir.c 2011-01-17 02:41:02.000000000 -0500
28511 +diff -urNp linux-2.6.37.1/grsecurity/grsec_chdir.c linux-2.6.37.1/grsecurity/grsec_chdir.c
28512 +--- linux-2.6.37.1/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
28513 ++++ linux-2.6.37.1/grsecurity/grsec_chdir.c 2011-01-17 02:41:02.000000000 -0500
28514 @@ -0,0 +1,19 @@
28515 +#include <linux/kernel.h>
28516 +#include <linux/sched.h>
28517 @@ -40683,9 +40805,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_chdir.c linux-2.6.37/grsecurity/grsec_c
28518 +#endif
28519 + return;
28520 +}
28521 -diff -urNp linux-2.6.37/grsecurity/grsec_chroot.c linux-2.6.37/grsecurity/grsec_chroot.c
28522 ---- linux-2.6.37/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
28523 -+++ linux-2.6.37/grsecurity/grsec_chroot.c 2011-01-17 02:41:02.000000000 -0500
28524 +diff -urNp linux-2.6.37.1/grsecurity/grsec_chroot.c linux-2.6.37.1/grsecurity/grsec_chroot.c
28525 +--- linux-2.6.37.1/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
28526 ++++ linux-2.6.37.1/grsecurity/grsec_chroot.c 2011-01-17 02:41:02.000000000 -0500
28527 @@ -0,0 +1,373 @@
28528 +#include <linux/kernel.h>
28529 +#include <linux/module.h>
28530 @@ -41060,9 +41182,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_chroot.c linux-2.6.37/grsecurity/grsec_
28531 +#ifdef CONFIG_SECURITY
28532 +EXPORT_SYMBOL(gr_handle_chroot_caps);
28533 +#endif
28534 -diff -urNp linux-2.6.37/grsecurity/grsec_disabled.c linux-2.6.37/grsecurity/grsec_disabled.c
28535 ---- linux-2.6.37/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
28536 -+++ linux-2.6.37/grsecurity/grsec_disabled.c 2011-01-17 02:41:02.000000000 -0500
28537 +diff -urNp linux-2.6.37.1/grsecurity/grsec_disabled.c linux-2.6.37.1/grsecurity/grsec_disabled.c
28538 +--- linux-2.6.37.1/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
28539 ++++ linux-2.6.37.1/grsecurity/grsec_disabled.c 2011-01-17 02:41:02.000000000 -0500
28540 @@ -0,0 +1,442 @@
28541 +#include <linux/kernel.h>
28542 +#include <linux/module.h>
28543 @@ -41506,9 +41628,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_disabled.c linux-2.6.37/grsecurity/grse
28544 +EXPORT_SYMBOL(gr_check_user_change);
28545 +EXPORT_SYMBOL(gr_check_group_change);
28546 +#endif
28547 -diff -urNp linux-2.6.37/grsecurity/grsec_exec.c linux-2.6.37/grsecurity/grsec_exec.c
28548 ---- linux-2.6.37/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
28549 -+++ linux-2.6.37/grsecurity/grsec_exec.c 2011-01-17 02:41:02.000000000 -0500
28550 +diff -urNp linux-2.6.37.1/grsecurity/grsec_exec.c linux-2.6.37.1/grsecurity/grsec_exec.c
28551 +--- linux-2.6.37.1/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
28552 ++++ linux-2.6.37.1/grsecurity/grsec_exec.c 2011-01-17 02:41:02.000000000 -0500
28553 @@ -0,0 +1,147 @@
28554 +#include <linux/kernel.h>
28555 +#include <linux/sched.h>
28556 @@ -41657,9 +41779,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_exec.c linux-2.6.37/grsecurity/grsec_ex
28557 + return;
28558 +}
28559 +#endif
28560 -diff -urNp linux-2.6.37/grsecurity/grsec_fifo.c linux-2.6.37/grsecurity/grsec_fifo.c
28561 ---- linux-2.6.37/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
28562 -+++ linux-2.6.37/grsecurity/grsec_fifo.c 2011-01-17 02:41:02.000000000 -0500
28563 +diff -urNp linux-2.6.37.1/grsecurity/grsec_fifo.c linux-2.6.37.1/grsecurity/grsec_fifo.c
28564 +--- linux-2.6.37.1/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
28565 ++++ linux-2.6.37.1/grsecurity/grsec_fifo.c 2011-01-17 02:41:02.000000000 -0500
28566 @@ -0,0 +1,24 @@
28567 +#include <linux/kernel.h>
28568 +#include <linux/sched.h>
28569 @@ -41685,9 +41807,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_fifo.c linux-2.6.37/grsecurity/grsec_fi
28570 +#endif
28571 + return 0;
28572 +}
28573 -diff -urNp linux-2.6.37/grsecurity/grsec_fork.c linux-2.6.37/grsecurity/grsec_fork.c
28574 ---- linux-2.6.37/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
28575 -+++ linux-2.6.37/grsecurity/grsec_fork.c 2011-01-17 02:41:02.000000000 -0500
28576 +diff -urNp linux-2.6.37.1/grsecurity/grsec_fork.c linux-2.6.37.1/grsecurity/grsec_fork.c
28577 +--- linux-2.6.37.1/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
28578 ++++ linux-2.6.37.1/grsecurity/grsec_fork.c 2011-01-17 02:41:02.000000000 -0500
28579 @@ -0,0 +1,23 @@
28580 +#include <linux/kernel.h>
28581 +#include <linux/sched.h>
28582 @@ -41712,9 +41834,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_fork.c linux-2.6.37/grsecurity/grsec_fo
28583 +#endif
28584 + return;
28585 +}
28586 -diff -urNp linux-2.6.37/grsecurity/grsec_init.c linux-2.6.37/grsecurity/grsec_init.c
28587 ---- linux-2.6.37/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
28588 -+++ linux-2.6.37/grsecurity/grsec_init.c 2011-01-17 02:41:02.000000000 -0500
28589 +diff -urNp linux-2.6.37.1/grsecurity/grsec_init.c linux-2.6.37.1/grsecurity/grsec_init.c
28590 +--- linux-2.6.37.1/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
28591 ++++ linux-2.6.37.1/grsecurity/grsec_init.c 2011-01-17 02:41:02.000000000 -0500
28592 @@ -0,0 +1,270 @@
28593 +#include <linux/kernel.h>
28594 +#include <linux/sched.h>
28595 @@ -41986,9 +42108,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_init.c linux-2.6.37/grsecurity/grsec_in
28596 +
28597 + return;
28598 +}
28599 -diff -urNp linux-2.6.37/grsecurity/grsec_link.c linux-2.6.37/grsecurity/grsec_link.c
28600 ---- linux-2.6.37/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
28601 -+++ linux-2.6.37/grsecurity/grsec_link.c 2011-01-17 02:41:02.000000000 -0500
28602 +diff -urNp linux-2.6.37.1/grsecurity/grsec_link.c linux-2.6.37.1/grsecurity/grsec_link.c
28603 +--- linux-2.6.37.1/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
28604 ++++ linux-2.6.37.1/grsecurity/grsec_link.c 2011-01-17 02:41:02.000000000 -0500
28605 @@ -0,0 +1,43 @@
28606 +#include <linux/kernel.h>
28607 +#include <linux/sched.h>
28608 @@ -42033,9 +42155,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_link.c linux-2.6.37/grsecurity/grsec_li
28609 +#endif
28610 + return 0;
28611 +}
28612 -diff -urNp linux-2.6.37/grsecurity/grsec_log.c linux-2.6.37/grsecurity/grsec_log.c
28613 ---- linux-2.6.37/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
28614 -+++ linux-2.6.37/grsecurity/grsec_log.c 2011-01-17 02:41:02.000000000 -0500
28615 +diff -urNp linux-2.6.37.1/grsecurity/grsec_log.c linux-2.6.37.1/grsecurity/grsec_log.c
28616 +--- linux-2.6.37.1/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
28617 ++++ linux-2.6.37.1/grsecurity/grsec_log.c 2011-01-17 02:41:02.000000000 -0500
28618 @@ -0,0 +1,310 @@
28619 +#include <linux/kernel.h>
28620 +#include <linux/sched.h>
28621 @@ -42347,9 +42469,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_log.c linux-2.6.37/grsecurity/grsec_log
28622 + gr_log_end(audit);
28623 + END_LOCKS(audit);
28624 +}
28625 -diff -urNp linux-2.6.37/grsecurity/grsec_mem.c linux-2.6.37/grsecurity/grsec_mem.c
28626 ---- linux-2.6.37/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
28627 -+++ linux-2.6.37/grsecurity/grsec_mem.c 2011-01-17 02:41:02.000000000 -0500
28628 +diff -urNp linux-2.6.37.1/grsecurity/grsec_mem.c linux-2.6.37.1/grsecurity/grsec_mem.c
28629 +--- linux-2.6.37.1/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
28630 ++++ linux-2.6.37.1/grsecurity/grsec_mem.c 2011-01-17 02:41:02.000000000 -0500
28631 @@ -0,0 +1,85 @@
28632 +#include <linux/kernel.h>
28633 +#include <linux/sched.h>
28634 @@ -42436,9 +42558,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_mem.c linux-2.6.37/grsecurity/grsec_mem
28635 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
28636 + return;
28637 +}
28638 -diff -urNp linux-2.6.37/grsecurity/grsec_mount.c linux-2.6.37/grsecurity/grsec_mount.c
28639 ---- linux-2.6.37/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
28640 -+++ linux-2.6.37/grsecurity/grsec_mount.c 2011-01-17 02:41:02.000000000 -0500
28641 +diff -urNp linux-2.6.37.1/grsecurity/grsec_mount.c linux-2.6.37.1/grsecurity/grsec_mount.c
28642 +--- linux-2.6.37.1/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
28643 ++++ linux-2.6.37.1/grsecurity/grsec_mount.c 2011-01-17 02:41:02.000000000 -0500
28644 @@ -0,0 +1,62 @@
28645 +#include <linux/kernel.h>
28646 +#include <linux/sched.h>
28647 @@ -42502,9 +42624,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_mount.c linux-2.6.37/grsecurity/grsec_m
28648 +#endif
28649 + return 0;
28650 +}
28651 -diff -urNp linux-2.6.37/grsecurity/grsec_pax.c linux-2.6.37/grsecurity/grsec_pax.c
28652 ---- linux-2.6.37/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
28653 -+++ linux-2.6.37/grsecurity/grsec_pax.c 2011-01-17 02:41:02.000000000 -0500
28654 +diff -urNp linux-2.6.37.1/grsecurity/grsec_pax.c linux-2.6.37.1/grsecurity/grsec_pax.c
28655 +--- linux-2.6.37.1/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
28656 ++++ linux-2.6.37.1/grsecurity/grsec_pax.c 2011-01-17 02:41:02.000000000 -0500
28657 @@ -0,0 +1,36 @@
28658 +#include <linux/kernel.h>
28659 +#include <linux/sched.h>
28660 @@ -42542,9 +42664,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_pax.c linux-2.6.37/grsecurity/grsec_pax
28661 +#endif
28662 + return;
28663 +}
28664 -diff -urNp linux-2.6.37/grsecurity/grsec_ptrace.c linux-2.6.37/grsecurity/grsec_ptrace.c
28665 ---- linux-2.6.37/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
28666 -+++ linux-2.6.37/grsecurity/grsec_ptrace.c 2011-01-17 02:41:02.000000000 -0500
28667 +diff -urNp linux-2.6.37.1/grsecurity/grsec_ptrace.c linux-2.6.37.1/grsecurity/grsec_ptrace.c
28668 +--- linux-2.6.37.1/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
28669 ++++ linux-2.6.37.1/grsecurity/grsec_ptrace.c 2011-01-17 02:41:02.000000000 -0500
28670 @@ -0,0 +1,14 @@
28671 +#include <linux/kernel.h>
28672 +#include <linux/sched.h>
28673 @@ -42560,9 +42682,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_ptrace.c linux-2.6.37/grsecurity/grsec_
28674 +#endif
28675 + return;
28676 +}
28677 -diff -urNp linux-2.6.37/grsecurity/grsec_sig.c linux-2.6.37/grsecurity/grsec_sig.c
28678 ---- linux-2.6.37/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
28679 -+++ linux-2.6.37/grsecurity/grsec_sig.c 2011-01-17 02:41:02.000000000 -0500
28680 +diff -urNp linux-2.6.37.1/grsecurity/grsec_sig.c linux-2.6.37.1/grsecurity/grsec_sig.c
28681 +--- linux-2.6.37.1/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
28682 ++++ linux-2.6.37.1/grsecurity/grsec_sig.c 2011-01-17 02:41:02.000000000 -0500
28683 @@ -0,0 +1,65 @@
28684 +#include <linux/kernel.h>
28685 +#include <linux/sched.h>
28686 @@ -42629,9 +42751,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_sig.c linux-2.6.37/grsecurity/grsec_sig
28687 + return;
28688 +}
28689 +
28690 -diff -urNp linux-2.6.37/grsecurity/grsec_sock.c linux-2.6.37/grsecurity/grsec_sock.c
28691 ---- linux-2.6.37/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
28692 -+++ linux-2.6.37/grsecurity/grsec_sock.c 2011-01-17 02:41:02.000000000 -0500
28693 +diff -urNp linux-2.6.37.1/grsecurity/grsec_sock.c linux-2.6.37.1/grsecurity/grsec_sock.c
28694 +--- linux-2.6.37.1/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
28695 ++++ linux-2.6.37.1/grsecurity/grsec_sock.c 2011-01-17 02:41:02.000000000 -0500
28696 @@ -0,0 +1,275 @@
28697 +#include <linux/kernel.h>
28698 +#include <linux/module.h>
28699 @@ -42908,9 +43030,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_sock.c linux-2.6.37/grsecurity/grsec_so
28700 + return current_cap();
28701 +#endif
28702 +}
28703 -diff -urNp linux-2.6.37/grsecurity/grsec_sysctl.c linux-2.6.37/grsecurity/grsec_sysctl.c
28704 ---- linux-2.6.37/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
28705 -+++ linux-2.6.37/grsecurity/grsec_sysctl.c 2011-01-17 02:41:02.000000000 -0500
28706 +diff -urNp linux-2.6.37.1/grsecurity/grsec_sysctl.c linux-2.6.37.1/grsecurity/grsec_sysctl.c
28707 +--- linux-2.6.37.1/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
28708 ++++ linux-2.6.37.1/grsecurity/grsec_sysctl.c 2011-01-17 02:41:02.000000000 -0500
28709 @@ -0,0 +1,433 @@
28710 +#include <linux/kernel.h>
28711 +#include <linux/sched.h>
28712 @@ -43345,9 +43467,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_sysctl.c linux-2.6.37/grsecurity/grsec_
28713 + { }
28714 +};
28715 +#endif
28716 -diff -urNp linux-2.6.37/grsecurity/grsec_time.c linux-2.6.37/grsecurity/grsec_time.c
28717 ---- linux-2.6.37/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
28718 -+++ linux-2.6.37/grsecurity/grsec_time.c 2011-01-17 02:41:02.000000000 -0500
28719 +diff -urNp linux-2.6.37.1/grsecurity/grsec_time.c linux-2.6.37.1/grsecurity/grsec_time.c
28720 +--- linux-2.6.37.1/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
28721 ++++ linux-2.6.37.1/grsecurity/grsec_time.c 2011-01-17 02:41:02.000000000 -0500
28722 @@ -0,0 +1,16 @@
28723 +#include <linux/kernel.h>
28724 +#include <linux/sched.h>
28725 @@ -43365,9 +43487,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_time.c linux-2.6.37/grsecurity/grsec_ti
28726 +}
28727 +
28728 +EXPORT_SYMBOL(gr_log_timechange);
28729 -diff -urNp linux-2.6.37/grsecurity/grsec_tpe.c linux-2.6.37/grsecurity/grsec_tpe.c
28730 ---- linux-2.6.37/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
28731 -+++ linux-2.6.37/grsecurity/grsec_tpe.c 2011-01-17 02:41:02.000000000 -0500
28732 +diff -urNp linux-2.6.37.1/grsecurity/grsec_tpe.c linux-2.6.37.1/grsecurity/grsec_tpe.c
28733 +--- linux-2.6.37.1/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
28734 ++++ linux-2.6.37.1/grsecurity/grsec_tpe.c 2011-01-17 02:41:02.000000000 -0500
28735 @@ -0,0 +1,39 @@
28736 +#include <linux/kernel.h>
28737 +#include <linux/sched.h>
28738 @@ -43408,9 +43530,9 @@ diff -urNp linux-2.6.37/grsecurity/grsec_tpe.c linux-2.6.37/grsecurity/grsec_tpe
28739 +#endif
28740 + return 1;
28741 +}
28742 -diff -urNp linux-2.6.37/grsecurity/grsum.c linux-2.6.37/grsecurity/grsum.c
28743 ---- linux-2.6.37/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
28744 -+++ linux-2.6.37/grsecurity/grsum.c 2011-01-17 02:41:02.000000000 -0500
28745 +diff -urNp linux-2.6.37.1/grsecurity/grsum.c linux-2.6.37.1/grsecurity/grsum.c
28746 +--- linux-2.6.37.1/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
28747 ++++ linux-2.6.37.1/grsecurity/grsum.c 2011-01-17 02:41:02.000000000 -0500
28748 @@ -0,0 +1,61 @@
28749 +#include <linux/err.h>
28750 +#include <linux/kernel.h>
28751 @@ -43473,9 +43595,9 @@ diff -urNp linux-2.6.37/grsecurity/grsum.c linux-2.6.37/grsecurity/grsum.c
28752 +
28753 + return retval;
28754 +}
28755 -diff -urNp linux-2.6.37/grsecurity/Kconfig linux-2.6.37/grsecurity/Kconfig
28756 ---- linux-2.6.37/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
28757 -+++ linux-2.6.37/grsecurity/Kconfig 2011-01-17 02:41:02.000000000 -0500
28758 +diff -urNp linux-2.6.37.1/grsecurity/Kconfig linux-2.6.37.1/grsecurity/Kconfig
28759 +--- linux-2.6.37.1/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
28760 ++++ linux-2.6.37.1/grsecurity/Kconfig 2011-01-17 02:41:02.000000000 -0500
28761 @@ -0,0 +1,1000 @@
28762 +#
28763 +# grecurity configuration
28764 @@ -44477,9 +44599,9 @@ diff -urNp linux-2.6.37/grsecurity/Kconfig linux-2.6.37/grsecurity/Kconfig
28765 +endmenu
28766 +
28767 +endmenu
28768 -diff -urNp linux-2.6.37/grsecurity/Makefile linux-2.6.37/grsecurity/Makefile
28769 ---- linux-2.6.37/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
28770 -+++ linux-2.6.37/grsecurity/Makefile 2011-01-17 02:41:02.000000000 -0500
28771 +diff -urNp linux-2.6.37.1/grsecurity/Makefile linux-2.6.37.1/grsecurity/Makefile
28772 +--- linux-2.6.37.1/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
28773 ++++ linux-2.6.37.1/grsecurity/Makefile 2011-01-17 02:41:02.000000000 -0500
28774 @@ -0,0 +1,29 @@
28775 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
28776 +# during 2001-2009 it has been completely redesigned by Brad Spengler
28777 @@ -44510,9 +44632,9 @@ diff -urNp linux-2.6.37/grsecurity/Makefile linux-2.6.37/grsecurity/Makefile
28778 + @-chmod -f 700 .
28779 + @echo ' grsec: protected kernel image paths'
28780 +endif
28781 -diff -urNp linux-2.6.37/include/acpi/acoutput.h linux-2.6.37/include/acpi/acoutput.h
28782 ---- linux-2.6.37/include/acpi/acoutput.h 2011-01-04 19:50:19.000000000 -0500
28783 -+++ linux-2.6.37/include/acpi/acoutput.h 2011-01-17 02:41:02.000000000 -0500
28784 +diff -urNp linux-2.6.37.1/include/acpi/acoutput.h linux-2.6.37.1/include/acpi/acoutput.h
28785 +--- linux-2.6.37.1/include/acpi/acoutput.h 2011-01-04 19:50:19.000000000 -0500
28786 ++++ linux-2.6.37.1/include/acpi/acoutput.h 2011-01-17 02:41:02.000000000 -0500
28787 @@ -269,8 +269,8 @@
28788 * leaving no executable debug code!
28789 */
28790 @@ -44524,9 +44646,9 @@ diff -urNp linux-2.6.37/include/acpi/acoutput.h linux-2.6.37/include/acpi/acoutp
28791
28792 #endif /* ACPI_DEBUG_OUTPUT */
28793
28794 -diff -urNp linux-2.6.37/include/acpi/acpi_drivers.h linux-2.6.37/include/acpi/acpi_drivers.h
28795 ---- linux-2.6.37/include/acpi/acpi_drivers.h 2011-01-04 19:50:19.000000000 -0500
28796 -+++ linux-2.6.37/include/acpi/acpi_drivers.h 2011-01-17 02:41:02.000000000 -0500
28797 +diff -urNp linux-2.6.37.1/include/acpi/acpi_drivers.h linux-2.6.37.1/include/acpi/acpi_drivers.h
28798 +--- linux-2.6.37.1/include/acpi/acpi_drivers.h 2011-01-04 19:50:19.000000000 -0500
28799 ++++ linux-2.6.37.1/include/acpi/acpi_drivers.h 2011-01-17 02:41:02.000000000 -0500
28800 @@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void);
28801 Dock Station
28802 -------------------------------------------------------------------------- */
28803 @@ -44556,9 +44678,9 @@ diff -urNp linux-2.6.37/include/acpi/acpi_drivers.h linux-2.6.37/include/acpi/ac
28804 void *context)
28805 {
28806 return -ENODEV;
28807 -diff -urNp linux-2.6.37/include/asm-generic/atomic-long.h linux-2.6.37/include/asm-generic/atomic-long.h
28808 ---- linux-2.6.37/include/asm-generic/atomic-long.h 2011-01-04 19:50:19.000000000 -0500
28809 -+++ linux-2.6.37/include/asm-generic/atomic-long.h 2011-01-17 02:41:02.000000000 -0500
28810 +diff -urNp linux-2.6.37.1/include/asm-generic/atomic-long.h linux-2.6.37.1/include/asm-generic/atomic-long.h
28811 +--- linux-2.6.37.1/include/asm-generic/atomic-long.h 2011-01-04 19:50:19.000000000 -0500
28812 ++++ linux-2.6.37.1/include/asm-generic/atomic-long.h 2011-01-17 02:41:02.000000000 -0500
28813 @@ -22,6 +22,12 @@
28814
28815 typedef atomic64_t atomic_long_t;
28816 @@ -44851,9 +44973,9 @@ diff -urNp linux-2.6.37/include/asm-generic/atomic-long.h linux-2.6.37/include/a
28817 +#endif
28818 +
28819 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
28820 -diff -urNp linux-2.6.37/include/asm-generic/dma-mapping-common.h linux-2.6.37/include/asm-generic/dma-mapping-common.h
28821 ---- linux-2.6.37/include/asm-generic/dma-mapping-common.h 2011-01-04 19:50:19.000000000 -0500
28822 -+++ linux-2.6.37/include/asm-generic/dma-mapping-common.h 2011-01-17 02:41:02.000000000 -0500
28823 +diff -urNp linux-2.6.37.1/include/asm-generic/dma-mapping-common.h linux-2.6.37.1/include/asm-generic/dma-mapping-common.h
28824 +--- linux-2.6.37.1/include/asm-generic/dma-mapping-common.h 2011-01-04 19:50:19.000000000 -0500
28825 ++++ linux-2.6.37.1/include/asm-generic/dma-mapping-common.h 2011-01-17 02:41:02.000000000 -0500
28826 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
28827 enum dma_data_direction dir,
28828 struct dma_attrs *attrs)
28829 @@ -44944,9 +45066,9 @@ diff -urNp linux-2.6.37/include/asm-generic/dma-mapping-common.h linux-2.6.37/in
28830
28831 BUG_ON(!valid_dma_direction(dir));
28832 if (ops->sync_sg_for_device)
28833 -diff -urNp linux-2.6.37/include/asm-generic/futex.h linux-2.6.37/include/asm-generic/futex.h
28834 ---- linux-2.6.37/include/asm-generic/futex.h 2011-01-04 19:50:19.000000000 -0500
28835 -+++ linux-2.6.37/include/asm-generic/futex.h 2011-01-17 02:41:02.000000000 -0500
28836 +diff -urNp linux-2.6.37.1/include/asm-generic/futex.h linux-2.6.37.1/include/asm-generic/futex.h
28837 +--- linux-2.6.37.1/include/asm-generic/futex.h 2011-01-04 19:50:19.000000000 -0500
28838 ++++ linux-2.6.37.1/include/asm-generic/futex.h 2011-01-17 02:41:02.000000000 -0500
28839 @@ -6,7 +6,7 @@
28840 #include <asm/errno.h>
28841
28842 @@ -44965,9 +45087,9 @@ diff -urNp linux-2.6.37/include/asm-generic/futex.h linux-2.6.37/include/asm-gen
28843 {
28844 return -ENOSYS;
28845 }
28846 -diff -urNp linux-2.6.37/include/asm-generic/int-l64.h linux-2.6.37/include/asm-generic/int-l64.h
28847 ---- linux-2.6.37/include/asm-generic/int-l64.h 2011-01-04 19:50:19.000000000 -0500
28848 -+++ linux-2.6.37/include/asm-generic/int-l64.h 2011-01-17 02:41:02.000000000 -0500
28849 +diff -urNp linux-2.6.37.1/include/asm-generic/int-l64.h linux-2.6.37.1/include/asm-generic/int-l64.h
28850 +--- linux-2.6.37.1/include/asm-generic/int-l64.h 2011-01-04 19:50:19.000000000 -0500
28851 ++++ linux-2.6.37.1/include/asm-generic/int-l64.h 2011-01-17 02:41:02.000000000 -0500
28852 @@ -46,6 +46,8 @@ typedef unsigned int u32;
28853 typedef signed long s64;
28854 typedef unsigned long u64;
28855 @@ -44977,9 +45099,9 @@ diff -urNp linux-2.6.37/include/asm-generic/int-l64.h linux-2.6.37/include/asm-g
28856 #define S8_C(x) x
28857 #define U8_C(x) x ## U
28858 #define S16_C(x) x
28859 -diff -urNp linux-2.6.37/include/asm-generic/int-ll64.h linux-2.6.37/include/asm-generic/int-ll64.h
28860 ---- linux-2.6.37/include/asm-generic/int-ll64.h 2011-01-04 19:50:19.000000000 -0500
28861 -+++ linux-2.6.37/include/asm-generic/int-ll64.h 2011-01-17 02:41:02.000000000 -0500
28862 +diff -urNp linux-2.6.37.1/include/asm-generic/int-ll64.h linux-2.6.37.1/include/asm-generic/int-ll64.h
28863 +--- linux-2.6.37.1/include/asm-generic/int-ll64.h 2011-01-04 19:50:19.000000000 -0500
28864 ++++ linux-2.6.37.1/include/asm-generic/int-ll64.h 2011-01-17 02:41:02.000000000 -0500
28865 @@ -51,6 +51,8 @@ typedef unsigned int u32;
28866 typedef signed long long s64;
28867 typedef unsigned long long u64;
28868 @@ -44989,9 +45111,9 @@ diff -urNp linux-2.6.37/include/asm-generic/int-ll64.h linux-2.6.37/include/asm-
28869 #define S8_C(x) x
28870 #define U8_C(x) x ## U
28871 #define S16_C(x) x
28872 -diff -urNp linux-2.6.37/include/asm-generic/kmap_types.h linux-2.6.37/include/asm-generic/kmap_types.h
28873 ---- linux-2.6.37/include/asm-generic/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
28874 -+++ linux-2.6.37/include/asm-generic/kmap_types.h 2011-01-17 02:41:02.000000000 -0500
28875 +diff -urNp linux-2.6.37.1/include/asm-generic/kmap_types.h linux-2.6.37.1/include/asm-generic/kmap_types.h
28876 +--- linux-2.6.37.1/include/asm-generic/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
28877 ++++ linux-2.6.37.1/include/asm-generic/kmap_types.h 2011-01-17 02:41:02.000000000 -0500
28878 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
28879 KMAP_D(17) KM_NMI,
28880 KMAP_D(18) KM_NMI_PTE,
28881 @@ -45005,9 +45127,9 @@ diff -urNp linux-2.6.37/include/asm-generic/kmap_types.h linux-2.6.37/include/as
28882 };
28883
28884 #undef KMAP_D
28885 -diff -urNp linux-2.6.37/include/asm-generic/pgtable.h linux-2.6.37/include/asm-generic/pgtable.h
28886 ---- linux-2.6.37/include/asm-generic/pgtable.h 2011-01-04 19:50:19.000000000 -0500
28887 -+++ linux-2.6.37/include/asm-generic/pgtable.h 2011-01-17 02:41:02.000000000 -0500
28888 +diff -urNp linux-2.6.37.1/include/asm-generic/pgtable.h linux-2.6.37.1/include/asm-generic/pgtable.h
28889 +--- linux-2.6.37.1/include/asm-generic/pgtable.h 2011-01-04 19:50:19.000000000 -0500
28890 ++++ linux-2.6.37.1/include/asm-generic/pgtable.h 2011-01-17 02:41:02.000000000 -0500
28891 @@ -348,6 +348,14 @@ extern void untrack_pfn_vma(struct vm_ar
28892 unsigned long size);
28893 #endif
28894 @@ -45023,9 +45145,9 @@ diff -urNp linux-2.6.37/include/asm-generic/pgtable.h linux-2.6.37/include/asm-g
28895 #endif /* !__ASSEMBLY__ */
28896
28897 #endif /* _ASM_GENERIC_PGTABLE_H */
28898 -diff -urNp linux-2.6.37/include/asm-generic/pgtable-nopmd.h linux-2.6.37/include/asm-generic/pgtable-nopmd.h
28899 ---- linux-2.6.37/include/asm-generic/pgtable-nopmd.h 2011-01-04 19:50:19.000000000 -0500
28900 -+++ linux-2.6.37/include/asm-generic/pgtable-nopmd.h 2011-01-17 02:41:02.000000000 -0500
28901 +diff -urNp linux-2.6.37.1/include/asm-generic/pgtable-nopmd.h linux-2.6.37.1/include/asm-generic/pgtable-nopmd.h
28902 +--- linux-2.6.37.1/include/asm-generic/pgtable-nopmd.h 2011-01-04 19:50:19.000000000 -0500
28903 ++++ linux-2.6.37.1/include/asm-generic/pgtable-nopmd.h 2011-01-17 02:41:02.000000000 -0500
28904 @@ -1,14 +1,19 @@
28905 #ifndef _PGTABLE_NOPMD_H
28906 #define _PGTABLE_NOPMD_H
28907 @@ -45062,9 +45184,9 @@ diff -urNp linux-2.6.37/include/asm-generic/pgtable-nopmd.h linux-2.6.37/include
28908 /*
28909 * The "pud_xxx()" functions here are trivial for a folded two-level
28910 * setup: the pmd is never bad, and a pmd always exists (as it's folded
28911 -diff -urNp linux-2.6.37/include/asm-generic/pgtable-nopud.h linux-2.6.37/include/asm-generic/pgtable-nopud.h
28912 ---- linux-2.6.37/include/asm-generic/pgtable-nopud.h 2011-01-04 19:50:19.000000000 -0500
28913 -+++ linux-2.6.37/include/asm-generic/pgtable-nopud.h 2011-01-17 02:41:02.000000000 -0500
28914 +diff -urNp linux-2.6.37.1/include/asm-generic/pgtable-nopud.h linux-2.6.37.1/include/asm-generic/pgtable-nopud.h
28915 +--- linux-2.6.37.1/include/asm-generic/pgtable-nopud.h 2011-01-04 19:50:19.000000000 -0500
28916 ++++ linux-2.6.37.1/include/asm-generic/pgtable-nopud.h 2011-01-17 02:41:02.000000000 -0500
28917 @@ -1,10 +1,15 @@
28918 #ifndef _PGTABLE_NOPUD_H
28919 #define _PGTABLE_NOPUD_H
28920 @@ -45095,9 +45217,9 @@ diff -urNp linux-2.6.37/include/asm-generic/pgtable-nopud.h linux-2.6.37/include
28921 /*
28922 * The "pgd_xxx()" functions here are trivial for a folded two-level
28923 * setup: the pud is never bad, and a pud always exists (as it's folded
28924 -diff -urNp linux-2.6.37/include/asm-generic/vmlinux.lds.h linux-2.6.37/include/asm-generic/vmlinux.lds.h
28925 ---- linux-2.6.37/include/asm-generic/vmlinux.lds.h 2011-01-04 19:50:19.000000000 -0500
28926 -+++ linux-2.6.37/include/asm-generic/vmlinux.lds.h 2011-01-17 02:41:02.000000000 -0500
28927 +diff -urNp linux-2.6.37.1/include/asm-generic/vmlinux.lds.h linux-2.6.37.1/include/asm-generic/vmlinux.lds.h
28928 +--- linux-2.6.37.1/include/asm-generic/vmlinux.lds.h 2011-01-04 19:50:19.000000000 -0500
28929 ++++ linux-2.6.37.1/include/asm-generic/vmlinux.lds.h 2011-01-17 02:41:02.000000000 -0500
28930 @@ -210,6 +210,7 @@
28931 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
28932 VMLINUX_SYMBOL(__start_rodata) = .; \
28933 @@ -45134,10 +45256,10 @@ diff -urNp linux-2.6.37/include/asm-generic/vmlinux.lds.h linux-2.6.37/include/a
28934
28935 /**
28936 * PERCPU - define output section for percpu area, simple version
28937 -diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pciids.h
28938 ---- linux-2.6.37/include/drm/drm_pciids.h 2011-01-04 19:50:19.000000000 -0500
28939 -+++ linux-2.6.37/include/drm/drm_pciids.h 2011-01-17 02:41:02.000000000 -0500
28940 -@@ -419,7 +419,7 @@
28941 +diff -urNp linux-2.6.37.1/include/drm/drm_pciids.h linux-2.6.37.1/include/drm/drm_pciids.h
28942 +--- linux-2.6.37.1/include/drm/drm_pciids.h 2011-02-22 16:05:31.000000000 -0500
28943 ++++ linux-2.6.37.1/include/drm/drm_pciids.h 2011-02-22 16:05:42.000000000 -0500
28944 +@@ -418,7 +418,7 @@
28945 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
28946 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
28947 {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
28948 @@ -45146,7 +45268,7 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
28949
28950 #define r128_PCI_IDS \
28951 {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28952 -@@ -459,14 +459,14 @@
28953 +@@ -458,14 +458,14 @@
28954 {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28955 {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28956 {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28957 @@ -45163,7 +45285,7 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
28958
28959 #define mach64_PCI_IDS \
28960 {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28961 -@@ -489,7 +489,7 @@
28962 +@@ -488,7 +488,7 @@
28963 {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28964 {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28965 {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28966 @@ -45172,7 +45294,7 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
28967
28968 #define sisdrv_PCI_IDS \
28969 {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28970 -@@ -500,7 +500,7 @@
28971 +@@ -499,7 +499,7 @@
28972 {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28973 {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
28974 {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
28975 @@ -45181,7 +45303,7 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
28976
28977 #define tdfx_PCI_IDS \
28978 {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28979 -@@ -509,7 +509,7 @@
28980 +@@ -508,7 +508,7 @@
28981 {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28982 {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28983 {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28984 @@ -45190,7 +45312,7 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
28985
28986 #define viadrv_PCI_IDS \
28987 {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28988 -@@ -521,14 +521,14 @@
28989 +@@ -520,14 +520,14 @@
28990 {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28991 {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
28992 {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
28993 @@ -45207,7 +45329,7 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
28994
28995 #define i830_PCI_IDS \
28996 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
28997 -@@ -536,11 +536,11 @@
28998 +@@ -535,11 +535,11 @@
28999 {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
29000 {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
29001 {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
29002 @@ -45221,7 +45343,7 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
29003
29004 #define savage_PCI_IDS \
29005 {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
29006 -@@ -566,10 +566,10 @@
29007 +@@ -565,10 +565,10 @@
29008 {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
29009 {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
29010 {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
29011 @@ -45234,15 +45356,15 @@ diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pc
29012
29013 #define i915_PCI_IDS \
29014 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
29015 -@@ -603,4 +603,4 @@
29016 +@@ -602,4 +602,4 @@
29017 {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
29018 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
29019 {0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
29020 - {0, 0, 0}
29021 + {0, 0, 0, 0, 0, 0}
29022 -diff -urNp linux-2.6.37/include/drm/drmP.h linux-2.6.37/include/drm/drmP.h
29023 ---- linux-2.6.37/include/drm/drmP.h 2011-01-04 19:50:19.000000000 -0500
29024 -+++ linux-2.6.37/include/drm/drmP.h 2011-01-24 18:04:18.000000000 -0500
29025 +diff -urNp linux-2.6.37.1/include/drm/drmP.h linux-2.6.37.1/include/drm/drmP.h
29026 +--- linux-2.6.37.1/include/drm/drmP.h 2011-01-04 19:50:19.000000000 -0500
29027 ++++ linux-2.6.37.1/include/drm/drmP.h 2011-01-24 18:04:18.000000000 -0500
29028 @@ -73,6 +73,7 @@
29029 #include <linux/workqueue.h>
29030 #include <linux/poll.h>
29031 @@ -45287,9 +45409,9 @@ diff -urNp linux-2.6.37/include/drm/drmP.h linux-2.6.37/include/drm/drmP.h
29032 /*@} */
29033
29034 struct list_head filelist;
29035 -diff -urNp linux-2.6.37/include/linux/a.out.h linux-2.6.37/include/linux/a.out.h
29036 ---- linux-2.6.37/include/linux/a.out.h 2011-01-04 19:50:19.000000000 -0500
29037 -+++ linux-2.6.37/include/linux/a.out.h 2011-01-17 02:41:02.000000000 -0500
29038 +diff -urNp linux-2.6.37.1/include/linux/a.out.h linux-2.6.37.1/include/linux/a.out.h
29039 +--- linux-2.6.37.1/include/linux/a.out.h 2011-01-04 19:50:19.000000000 -0500
29040 ++++ linux-2.6.37.1/include/linux/a.out.h 2011-01-17 02:41:02.000000000 -0500
29041 @@ -39,6 +39,14 @@ enum machine_type {
29042 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
29043 };
29044 @@ -45305,9 +45427,9 @@ diff -urNp linux-2.6.37/include/linux/a.out.h linux-2.6.37/include/linux/a.out.h
29045 #if !defined (N_MAGIC)
29046 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
29047 #endif
29048 -diff -urNp linux-2.6.37/include/linux/atmdev.h linux-2.6.37/include/linux/atmdev.h
29049 ---- linux-2.6.37/include/linux/atmdev.h 2011-01-04 19:50:19.000000000 -0500
29050 -+++ linux-2.6.37/include/linux/atmdev.h 2011-01-17 02:41:02.000000000 -0500
29051 +diff -urNp linux-2.6.37.1/include/linux/atmdev.h linux-2.6.37.1/include/linux/atmdev.h
29052 +--- linux-2.6.37.1/include/linux/atmdev.h 2011-01-04 19:50:19.000000000 -0500
29053 ++++ linux-2.6.37.1/include/linux/atmdev.h 2011-01-17 02:41:02.000000000 -0500
29054 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
29055 #endif
29056
29057 @@ -45317,9 +45439,9 @@ diff -urNp linux-2.6.37/include/linux/atmdev.h linux-2.6.37/include/linux/atmdev
29058 __AAL_STAT_ITEMS
29059 #undef __HANDLE_ITEM
29060 };
29061 -diff -urNp linux-2.6.37/include/linux/binfmts.h linux-2.6.37/include/linux/binfmts.h
29062 ---- linux-2.6.37/include/linux/binfmts.h 2011-01-04 19:50:19.000000000 -0500
29063 -+++ linux-2.6.37/include/linux/binfmts.h 2011-01-17 02:41:02.000000000 -0500
29064 +diff -urNp linux-2.6.37.1/include/linux/binfmts.h linux-2.6.37.1/include/linux/binfmts.h
29065 +--- linux-2.6.37.1/include/linux/binfmts.h 2011-01-04 19:50:19.000000000 -0500
29066 ++++ linux-2.6.37.1/include/linux/binfmts.h 2011-01-17 02:41:02.000000000 -0500
29067 @@ -92,6 +92,7 @@ struct linux_binfmt {
29068 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
29069 int (*load_shlib)(struct file *);
29070 @@ -45328,10 +45450,10 @@ diff -urNp linux-2.6.37/include/linux/binfmts.h linux-2.6.37/include/linux/binfm
29071 unsigned long min_coredump; /* minimal dump size */
29072 int hasvdso;
29073 };
29074 -diff -urNp linux-2.6.37/include/linux/blkdev.h linux-2.6.37/include/linux/blkdev.h
29075 ---- linux-2.6.37/include/linux/blkdev.h 2011-01-04 19:50:19.000000000 -0500
29076 -+++ linux-2.6.37/include/linux/blkdev.h 2011-01-17 02:41:02.000000000 -0500
29077 -@@ -1250,19 +1250,19 @@ queue_max_integrity_segments(struct requ
29078 +diff -urNp linux-2.6.37.1/include/linux/blkdev.h linux-2.6.37.1/include/linux/blkdev.h
29079 +--- linux-2.6.37.1/include/linux/blkdev.h 2011-02-22 16:05:31.000000000 -0500
29080 ++++ linux-2.6.37.1/include/linux/blkdev.h 2011-02-22 16:05:42.000000000 -0500
29081 +@@ -1251,19 +1251,19 @@ queue_max_integrity_segments(struct requ
29082 #endif /* CONFIG_BLK_DEV_INTEGRITY */
29083
29084 struct block_device_operations {
29085 @@ -45362,9 +45484,9 @@ diff -urNp linux-2.6.37/include/linux/blkdev.h linux-2.6.37/include/linux/blkdev
29086 };
29087
29088 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
29089 -diff -urNp linux-2.6.37/include/linux/byteorder/little_endian.h linux-2.6.37/include/linux/byteorder/little_endian.h
29090 ---- linux-2.6.37/include/linux/byteorder/little_endian.h 2011-01-04 19:50:19.000000000 -0500
29091 -+++ linux-2.6.37/include/linux/byteorder/little_endian.h 2011-01-17 02:41:02.000000000 -0500
29092 +diff -urNp linux-2.6.37.1/include/linux/byteorder/little_endian.h linux-2.6.37.1/include/linux/byteorder/little_endian.h
29093 +--- linux-2.6.37.1/include/linux/byteorder/little_endian.h 2011-01-04 19:50:19.000000000 -0500
29094 ++++ linux-2.6.37.1/include/linux/byteorder/little_endian.h 2011-01-17 02:41:02.000000000 -0500
29095 @@ -42,51 +42,51 @@
29096
29097 static inline __le64 __cpu_to_le64p(const __u64 *p)
29098 @@ -45429,9 +45551,9 @@ diff -urNp linux-2.6.37/include/linux/byteorder/little_endian.h linux-2.6.37/inc
29099 }
29100 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
29101 #define __le64_to_cpus(x) do { (void)(x); } while (0)
29102 -diff -urNp linux-2.6.37/include/linux/cache.h linux-2.6.37/include/linux/cache.h
29103 ---- linux-2.6.37/include/linux/cache.h 2011-01-04 19:50:19.000000000 -0500
29104 -+++ linux-2.6.37/include/linux/cache.h 2011-01-17 02:41:02.000000000 -0500
29105 +diff -urNp linux-2.6.37.1/include/linux/cache.h linux-2.6.37.1/include/linux/cache.h
29106 +--- linux-2.6.37.1/include/linux/cache.h 2011-01-04 19:50:19.000000000 -0500
29107 ++++ linux-2.6.37.1/include/linux/cache.h 2011-01-17 02:41:02.000000000 -0500
29108 @@ -16,6 +16,10 @@
29109 #define __read_mostly
29110 #endif
29111 @@ -45443,9 +45565,9 @@ diff -urNp linux-2.6.37/include/linux/cache.h linux-2.6.37/include/linux/cache.h
29112 #ifndef ____cacheline_aligned
29113 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
29114 #endif
29115 -diff -urNp linux-2.6.37/include/linux/capability.h linux-2.6.37/include/linux/capability.h
29116 ---- linux-2.6.37/include/linux/capability.h 2011-01-04 19:50:19.000000000 -0500
29117 -+++ linux-2.6.37/include/linux/capability.h 2011-01-17 02:41:02.000000000 -0500
29118 +diff -urNp linux-2.6.37.1/include/linux/capability.h linux-2.6.37.1/include/linux/capability.h
29119 +--- linux-2.6.37.1/include/linux/capability.h 2011-01-04 19:50:19.000000000 -0500
29120 ++++ linux-2.6.37.1/include/linux/capability.h 2011-01-17 02:41:02.000000000 -0500
29121 @@ -558,6 +558,7 @@ extern const kernel_cap_t __cap_init_eff
29122 (security_real_capable_noaudit((t), (cap)) == 0)
29123
29124 @@ -45454,9 +45576,9 @@ diff -urNp linux-2.6.37/include/linux/capability.h linux-2.6.37/include/linux/ca
29125
29126 /* audit system wants to get cap info from files as well */
29127 struct dentry;
29128 -diff -urNp linux-2.6.37/include/linux/compiler-gcc4.h linux-2.6.37/include/linux/compiler-gcc4.h
29129 ---- linux-2.6.37/include/linux/compiler-gcc4.h 2011-01-04 19:50:19.000000000 -0500
29130 -+++ linux-2.6.37/include/linux/compiler-gcc4.h 2011-01-17 02:41:02.000000000 -0500
29131 +diff -urNp linux-2.6.37.1/include/linux/compiler-gcc4.h linux-2.6.37.1/include/linux/compiler-gcc4.h
29132 +--- linux-2.6.37.1/include/linux/compiler-gcc4.h 2011-01-04 19:50:19.000000000 -0500
29133 ++++ linux-2.6.37.1/include/linux/compiler-gcc4.h 2011-01-17 02:41:02.000000000 -0500
29134 @@ -54,6 +54,10 @@
29135
29136 #endif
29137 @@ -45468,9 +45590,9 @@ diff -urNp linux-2.6.37/include/linux/compiler-gcc4.h linux-2.6.37/include/linux
29138 #endif
29139
29140 #if __GNUC_MINOR__ > 0
29141 -diff -urNp linux-2.6.37/include/linux/compiler.h linux-2.6.37/include/linux/compiler.h
29142 ---- linux-2.6.37/include/linux/compiler.h 2011-01-04 19:50:19.000000000 -0500
29143 -+++ linux-2.6.37/include/linux/compiler.h 2011-01-17 02:41:02.000000000 -0500
29144 +diff -urNp linux-2.6.37.1/include/linux/compiler.h linux-2.6.37.1/include/linux/compiler.h
29145 +--- linux-2.6.37.1/include/linux/compiler.h 2011-01-04 19:50:19.000000000 -0500
29146 ++++ linux-2.6.37.1/include/linux/compiler.h 2011-01-17 02:41:02.000000000 -0500
29147 @@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_
29148 #define __cold
29149 #endif
29150 @@ -45503,9 +45625,9 @@ diff -urNp linux-2.6.37/include/linux/compiler.h linux-2.6.37/include/linux/comp
29151 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
29152
29153 #endif /* __LINUX_COMPILER_H */
29154 -diff -urNp linux-2.6.37/include/linux/cpuset.h linux-2.6.37/include/linux/cpuset.h
29155 ---- linux-2.6.37/include/linux/cpuset.h 2011-01-04 19:50:19.000000000 -0500
29156 -+++ linux-2.6.37/include/linux/cpuset.h 2011-01-17 02:41:02.000000000 -0500
29157 +diff -urNp linux-2.6.37.1/include/linux/cpuset.h linux-2.6.37.1/include/linux/cpuset.h
29158 +--- linux-2.6.37.1/include/linux/cpuset.h 2011-01-04 19:50:19.000000000 -0500
29159 ++++ linux-2.6.37.1/include/linux/cpuset.h 2011-01-17 02:41:02.000000000 -0500
29160 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
29161 * nodemask.
29162 */
29163 @@ -45515,9 +45637,9 @@ diff -urNp linux-2.6.37/include/linux/cpuset.h linux-2.6.37/include/linux/cpuset
29164 }
29165
29166 static inline void set_mems_allowed(nodemask_t nodemask)
29167 -diff -urNp linux-2.6.37/include/linux/decompress/mm.h linux-2.6.37/include/linux/decompress/mm.h
29168 ---- linux-2.6.37/include/linux/decompress/mm.h 2011-01-04 19:50:19.000000000 -0500
29169 -+++ linux-2.6.37/include/linux/decompress/mm.h 2011-01-17 02:41:02.000000000 -0500
29170 +diff -urNp linux-2.6.37.1/include/linux/decompress/mm.h linux-2.6.37.1/include/linux/decompress/mm.h
29171 +--- linux-2.6.37.1/include/linux/decompress/mm.h 2011-01-04 19:50:19.000000000 -0500
29172 ++++ linux-2.6.37.1/include/linux/decompress/mm.h 2011-01-17 02:41:02.000000000 -0500
29173 @@ -78,7 +78,7 @@ static void free(void *where)
29174 * warnings when not needed (indeed large_malloc / large_free are not
29175 * needed by inflate */
29176 @@ -45527,9 +45649,9 @@ diff -urNp linux-2.6.37/include/linux/decompress/mm.h linux-2.6.37/include/linux
29177 #define free(a) kfree(a)
29178
29179 #define large_malloc(a) vmalloc(a)
29180 -diff -urNp linux-2.6.37/include/linux/dma-mapping.h linux-2.6.37/include/linux/dma-mapping.h
29181 ---- linux-2.6.37/include/linux/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
29182 -+++ linux-2.6.37/include/linux/dma-mapping.h 2011-01-17 02:41:02.000000000 -0500
29183 +diff -urNp linux-2.6.37.1/include/linux/dma-mapping.h linux-2.6.37.1/include/linux/dma-mapping.h
29184 +--- linux-2.6.37.1/include/linux/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
29185 ++++ linux-2.6.37.1/include/linux/dma-mapping.h 2011-01-17 02:41:02.000000000 -0500
29186 @@ -16,40 +16,40 @@ enum dma_data_direction {
29187 };
29188
29189 @@ -45585,9 +45707,9 @@ diff -urNp linux-2.6.37/include/linux/dma-mapping.h linux-2.6.37/include/linux/d
29190 };
29191
29192 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
29193 -diff -urNp linux-2.6.37/include/linux/elf.h linux-2.6.37/include/linux/elf.h
29194 ---- linux-2.6.37/include/linux/elf.h 2011-01-04 19:50:19.000000000 -0500
29195 -+++ linux-2.6.37/include/linux/elf.h 2011-01-17 02:41:02.000000000 -0500
29196 +diff -urNp linux-2.6.37.1/include/linux/elf.h linux-2.6.37.1/include/linux/elf.h
29197 +--- linux-2.6.37.1/include/linux/elf.h 2011-01-04 19:50:19.000000000 -0500
29198 ++++ linux-2.6.37.1/include/linux/elf.h 2011-01-17 02:41:02.000000000 -0500
29199 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
29200 #define PT_GNU_EH_FRAME 0x6474e550
29201
29202 @@ -45660,9 +45782,9 @@ diff -urNp linux-2.6.37/include/linux/elf.h linux-2.6.37/include/linux/elf.h
29203
29204 #endif
29205
29206 -diff -urNp linux-2.6.37/include/linux/fs.h linux-2.6.37/include/linux/fs.h
29207 ---- linux-2.6.37/include/linux/fs.h 2011-01-04 19:50:19.000000000 -0500
29208 -+++ linux-2.6.37/include/linux/fs.h 2011-01-17 02:43:32.000000000 -0500
29209 +diff -urNp linux-2.6.37.1/include/linux/fs.h linux-2.6.37.1/include/linux/fs.h
29210 +--- linux-2.6.37.1/include/linux/fs.h 2011-01-04 19:50:19.000000000 -0500
29211 ++++ linux-2.6.37.1/include/linux/fs.h 2011-01-17 02:43:32.000000000 -0500
29212 @@ -105,6 +105,11 @@ struct inodes_stat_t {
29213 /* File was opened by fanotify and shouldn't generate fanotify events */
29214 #define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
29215 @@ -45822,9 +45944,9 @@ diff -urNp linux-2.6.37/include/linux/fs.h linux-2.6.37/include/linux/fs.h
29216 };
29217
29218 /*
29219 -diff -urNp linux-2.6.37/include/linux/fs_struct.h linux-2.6.37/include/linux/fs_struct.h
29220 ---- linux-2.6.37/include/linux/fs_struct.h 2011-01-04 19:50:19.000000000 -0500
29221 -+++ linux-2.6.37/include/linux/fs_struct.h 2011-01-17 02:41:02.000000000 -0500
29222 +diff -urNp linux-2.6.37.1/include/linux/fs_struct.h linux-2.6.37.1/include/linux/fs_struct.h
29223 +--- linux-2.6.37.1/include/linux/fs_struct.h 2011-01-04 19:50:19.000000000 -0500
29224 ++++ linux-2.6.37.1/include/linux/fs_struct.h 2011-01-17 02:41:02.000000000 -0500
29225 @@ -4,7 +4,7 @@
29226 #include <linux/path.h>
29227
29228 @@ -45834,10 +45956,10 @@ diff -urNp linux-2.6.37/include/linux/fs_struct.h linux-2.6.37/include/linux/fs_
29229 spinlock_t lock;
29230 int umask;
29231 int in_exec;
29232 -diff -urNp linux-2.6.37/include/linux/genhd.h linux-2.6.37/include/linux/genhd.h
29233 ---- linux-2.6.37/include/linux/genhd.h 2011-01-04 19:50:19.000000000 -0500
29234 -+++ linux-2.6.37/include/linux/genhd.h 2011-01-17 02:41:02.000000000 -0500
29235 -@@ -172,7 +172,7 @@ struct gendisk {
29236 +diff -urNp linux-2.6.37.1/include/linux/genhd.h linux-2.6.37.1/include/linux/genhd.h
29237 +--- linux-2.6.37.1/include/linux/genhd.h 2011-02-22 16:05:31.000000000 -0500
29238 ++++ linux-2.6.37.1/include/linux/genhd.h 2011-02-22 16:05:42.000000000 -0500
29239 +@@ -173,7 +173,7 @@ struct gendisk {
29240
29241 struct timer_rand_state *random;
29242
29243 @@ -45846,9 +45968,9 @@ diff -urNp linux-2.6.37/include/linux/genhd.h linux-2.6.37/include/linux/genhd.h
29244 struct work_struct async_notify;
29245 #ifdef CONFIG_BLK_DEV_INTEGRITY
29246 struct blk_integrity *integrity;
29247 -diff -urNp linux-2.6.37/include/linux/gracl.h linux-2.6.37/include/linux/gracl.h
29248 ---- linux-2.6.37/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
29249 -+++ linux-2.6.37/include/linux/gracl.h 2011-01-17 02:41:02.000000000 -0500
29250 +diff -urNp linux-2.6.37.1/include/linux/gracl.h linux-2.6.37.1/include/linux/gracl.h
29251 +--- linux-2.6.37.1/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
29252 ++++ linux-2.6.37.1/include/linux/gracl.h 2011-01-17 02:41:02.000000000 -0500
29253 @@ -0,0 +1,317 @@
29254 +#ifndef GR_ACL_H
29255 +#define GR_ACL_H
29256 @@ -46167,9 +46289,9 @@ diff -urNp linux-2.6.37/include/linux/gracl.h linux-2.6.37/include/linux/gracl.h
29257 +
29258 +#endif
29259 +
29260 -diff -urNp linux-2.6.37/include/linux/gralloc.h linux-2.6.37/include/linux/gralloc.h
29261 ---- linux-2.6.37/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
29262 -+++ linux-2.6.37/include/linux/gralloc.h 2011-01-17 02:41:02.000000000 -0500
29263 +diff -urNp linux-2.6.37.1/include/linux/gralloc.h linux-2.6.37.1/include/linux/gralloc.h
29264 +--- linux-2.6.37.1/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
29265 ++++ linux-2.6.37.1/include/linux/gralloc.h 2011-01-17 02:41:02.000000000 -0500
29266 @@ -0,0 +1,9 @@
29267 +#ifndef __GRALLOC_H
29268 +#define __GRALLOC_H
29269 @@ -46180,9 +46302,9 @@ diff -urNp linux-2.6.37/include/linux/gralloc.h linux-2.6.37/include/linux/grall
29270 +void *acl_alloc_num(unsigned long num, unsigned long len);
29271 +
29272 +#endif
29273 -diff -urNp linux-2.6.37/include/linux/grdefs.h linux-2.6.37/include/linux/grdefs.h
29274 ---- linux-2.6.37/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
29275 -+++ linux-2.6.37/include/linux/grdefs.h 2011-01-17 02:41:02.000000000 -0500
29276 +diff -urNp linux-2.6.37.1/include/linux/grdefs.h linux-2.6.37.1/include/linux/grdefs.h
29277 +--- linux-2.6.37.1/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
29278 ++++ linux-2.6.37.1/include/linux/grdefs.h 2011-01-17 02:41:02.000000000 -0500
29279 @@ -0,0 +1,137 @@
29280 +#ifndef GRDEFS_H
29281 +#define GRDEFS_H
29282 @@ -46321,9 +46443,9 @@ diff -urNp linux-2.6.37/include/linux/grdefs.h linux-2.6.37/include/linux/grdefs
29283 +};
29284 +
29285 +#endif
29286 -diff -urNp linux-2.6.37/include/linux/grinternal.h linux-2.6.37/include/linux/grinternal.h
29287 ---- linux-2.6.37/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
29288 -+++ linux-2.6.37/include/linux/grinternal.h 2011-01-17 02:41:02.000000000 -0500
29289 +diff -urNp linux-2.6.37.1/include/linux/grinternal.h linux-2.6.37.1/include/linux/grinternal.h
29290 +--- linux-2.6.37.1/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
29291 ++++ linux-2.6.37.1/include/linux/grinternal.h 2011-01-17 02:41:02.000000000 -0500
29292 @@ -0,0 +1,216 @@
29293 +#ifndef __GRINTERNAL_H
29294 +#define __GRINTERNAL_H
29295 @@ -46541,9 +46663,9 @@ diff -urNp linux-2.6.37/include/linux/grinternal.h linux-2.6.37/include/linux/gr
29296 +#endif
29297 +
29298 +#endif
29299 -diff -urNp linux-2.6.37/include/linux/grmsg.h linux-2.6.37/include/linux/grmsg.h
29300 ---- linux-2.6.37/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
29301 -+++ linux-2.6.37/include/linux/grmsg.h 2011-01-17 02:41:02.000000000 -0500
29302 +diff -urNp linux-2.6.37.1/include/linux/grmsg.h linux-2.6.37.1/include/linux/grmsg.h
29303 +--- linux-2.6.37.1/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
29304 ++++ linux-2.6.37.1/include/linux/grmsg.h 2011-01-17 02:41:02.000000000 -0500
29305 @@ -0,0 +1,111 @@
29306 +#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"
29307 +#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"
29308 @@ -46656,9 +46778,9 @@ diff -urNp linux-2.6.37/include/linux/grmsg.h linux-2.6.37/include/linux/grmsg.h
29309 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
29310 +#define GR_VM86_MSG "denied use of vm86 by "
29311 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
29312 -diff -urNp linux-2.6.37/include/linux/grsecurity.h linux-2.6.37/include/linux/grsecurity.h
29313 ---- linux-2.6.37/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
29314 -+++ linux-2.6.37/include/linux/grsecurity.h 2011-01-17 02:41:02.000000000 -0500
29315 +diff -urNp linux-2.6.37.1/include/linux/grsecurity.h linux-2.6.37.1/include/linux/grsecurity.h
29316 +--- linux-2.6.37.1/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
29317 ++++ linux-2.6.37.1/include/linux/grsecurity.h 2011-01-17 02:41:02.000000000 -0500
29318 @@ -0,0 +1,214 @@
29319 +#ifndef GR_SECURITY_H
29320 +#define GR_SECURITY_H
29321 @@ -46874,9 +46996,9 @@ diff -urNp linux-2.6.37/include/linux/grsecurity.h linux-2.6.37/include/linux/gr
29322 +#endif
29323 +
29324 +#endif
29325 -diff -urNp linux-2.6.37/include/linux/grsock.h linux-2.6.37/include/linux/grsock.h
29326 ---- linux-2.6.37/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
29327 -+++ linux-2.6.37/include/linux/grsock.h 2011-01-17 02:41:02.000000000 -0500
29328 +diff -urNp linux-2.6.37.1/include/linux/grsock.h linux-2.6.37.1/include/linux/grsock.h
29329 +--- linux-2.6.37.1/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
29330 ++++ linux-2.6.37.1/include/linux/grsock.h 2011-01-17 02:41:02.000000000 -0500
29331 @@ -0,0 +1,19 @@
29332 +#ifndef __GRSOCK_H
29333 +#define __GRSOCK_H
29334 @@ -46897,9 +47019,9 @@ diff -urNp linux-2.6.37/include/linux/grsock.h linux-2.6.37/include/linux/grsock
29335 + const int protocol);
29336 +
29337 +#endif
29338 -diff -urNp linux-2.6.37/include/linux/highmem.h linux-2.6.37/include/linux/highmem.h
29339 ---- linux-2.6.37/include/linux/highmem.h 2011-01-04 19:50:19.000000000 -0500
29340 -+++ linux-2.6.37/include/linux/highmem.h 2011-01-17 02:41:02.000000000 -0500
29341 +diff -urNp linux-2.6.37.1/include/linux/highmem.h linux-2.6.37.1/include/linux/highmem.h
29342 +--- linux-2.6.37.1/include/linux/highmem.h 2011-01-04 19:50:19.000000000 -0500
29343 ++++ linux-2.6.37.1/include/linux/highmem.h 2011-01-17 02:41:02.000000000 -0500
29344 @@ -182,6 +182,18 @@ static inline void clear_highpage(struct
29345 kunmap_atomic(kaddr, KM_USER0);
29346 }
29347 @@ -46919,9 +47041,9 @@ diff -urNp linux-2.6.37/include/linux/highmem.h linux-2.6.37/include/linux/highm
29348 static inline void zero_user_segments(struct page *page,
29349 unsigned start1, unsigned end1,
29350 unsigned start2, unsigned end2)
29351 -diff -urNp linux-2.6.37/include/linux/init.h linux-2.6.37/include/linux/init.h
29352 ---- linux-2.6.37/include/linux/init.h 2011-01-04 19:50:19.000000000 -0500
29353 -+++ linux-2.6.37/include/linux/init.h 2011-01-17 02:41:02.000000000 -0500
29354 +diff -urNp linux-2.6.37.1/include/linux/init.h linux-2.6.37.1/include/linux/init.h
29355 +--- linux-2.6.37.1/include/linux/init.h 2011-01-04 19:50:19.000000000 -0500
29356 ++++ linux-2.6.37.1/include/linux/init.h 2011-01-17 02:41:02.000000000 -0500
29357 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
29358
29359 /* Each module must use one module_init(). */
29360 @@ -46938,9 +47060,9 @@ diff -urNp linux-2.6.37/include/linux/init.h linux-2.6.37/include/linux/init.h
29361 { return exitfn; } \
29362 void cleanup_module(void) __attribute__((alias(#exitfn)));
29363
29364 -diff -urNp linux-2.6.37/include/linux/interrupt.h linux-2.6.37/include/linux/interrupt.h
29365 ---- linux-2.6.37/include/linux/interrupt.h 2011-01-04 19:50:19.000000000 -0500
29366 -+++ linux-2.6.37/include/linux/interrupt.h 2011-01-17 02:41:02.000000000 -0500
29367 +diff -urNp linux-2.6.37.1/include/linux/interrupt.h linux-2.6.37.1/include/linux/interrupt.h
29368 +--- linux-2.6.37.1/include/linux/interrupt.h 2011-01-04 19:50:19.000000000 -0500
29369 ++++ linux-2.6.37.1/include/linux/interrupt.h 2011-01-17 02:41:02.000000000 -0500
29370 @@ -393,7 +393,7 @@ enum
29371 /* map softirq index to softirq name. update 'softirq_to_name' in
29372 * kernel/softirq.c when adding a new softirq.
29373 @@ -46965,9 +47087,9 @@ diff -urNp linux-2.6.37/include/linux/interrupt.h linux-2.6.37/include/linux/int
29374 extern void softirq_init(void);
29375 static inline void __raise_softirq_irqoff(unsigned int nr)
29376 {
29377 -diff -urNp linux-2.6.37/include/linux/jbd2.h linux-2.6.37/include/linux/jbd2.h
29378 ---- linux-2.6.37/include/linux/jbd2.h 2011-01-04 19:50:19.000000000 -0500
29379 -+++ linux-2.6.37/include/linux/jbd2.h 2011-01-17 02:41:02.000000000 -0500
29380 +diff -urNp linux-2.6.37.1/include/linux/jbd2.h linux-2.6.37.1/include/linux/jbd2.h
29381 +--- linux-2.6.37.1/include/linux/jbd2.h 2011-01-04 19:50:19.000000000 -0500
29382 ++++ linux-2.6.37.1/include/linux/jbd2.h 2011-01-17 02:41:02.000000000 -0500
29383 @@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
29384 } \
29385 } while (0)
29386 @@ -46977,9 +47099,9 @@ diff -urNp linux-2.6.37/include/linux/jbd2.h linux-2.6.37/include/linux/jbd2.h
29387 #endif
29388
29389 extern void *jbd2_alloc(size_t size, gfp_t flags);
29390 -diff -urNp linux-2.6.37/include/linux/jbd.h linux-2.6.37/include/linux/jbd.h
29391 ---- linux-2.6.37/include/linux/jbd.h 2011-01-04 19:50:19.000000000 -0500
29392 -+++ linux-2.6.37/include/linux/jbd.h 2011-01-17 02:41:02.000000000 -0500
29393 +diff -urNp linux-2.6.37.1/include/linux/jbd.h linux-2.6.37.1/include/linux/jbd.h
29394 +--- linux-2.6.37.1/include/linux/jbd.h 2011-01-04 19:50:19.000000000 -0500
29395 ++++ linux-2.6.37.1/include/linux/jbd.h 2011-01-17 02:41:02.000000000 -0500
29396 @@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
29397 } \
29398 } while (0)
29399 @@ -46989,9 +47111,9 @@ diff -urNp linux-2.6.37/include/linux/jbd.h linux-2.6.37/include/linux/jbd.h
29400 #endif
29401
29402 static inline void *jbd_alloc(size_t size, gfp_t flags)
29403 -diff -urNp linux-2.6.37/include/linux/kallsyms.h linux-2.6.37/include/linux/kallsyms.h
29404 ---- linux-2.6.37/include/linux/kallsyms.h 2011-01-04 19:50:19.000000000 -0500
29405 -+++ linux-2.6.37/include/linux/kallsyms.h 2011-01-17 02:41:02.000000000 -0500
29406 +diff -urNp linux-2.6.37.1/include/linux/kallsyms.h linux-2.6.37.1/include/linux/kallsyms.h
29407 +--- linux-2.6.37.1/include/linux/kallsyms.h 2011-01-04 19:50:19.000000000 -0500
29408 ++++ linux-2.6.37.1/include/linux/kallsyms.h 2011-01-17 02:41:02.000000000 -0500
29409 @@ -15,7 +15,8 @@
29410
29411 struct module;
29412 @@ -47018,9 +47140,9 @@ diff -urNp linux-2.6.37/include/linux/kallsyms.h linux-2.6.37/include/linux/kall
29413
29414 /* This macro allows us to keep printk typechecking */
29415 static void __check_printsym_format(const char *fmt, ...)
29416 -diff -urNp linux-2.6.37/include/linux/kgdb.h linux-2.6.37/include/linux/kgdb.h
29417 ---- linux-2.6.37/include/linux/kgdb.h 2011-01-04 19:50:19.000000000 -0500
29418 -+++ linux-2.6.37/include/linux/kgdb.h 2011-01-17 02:41:02.000000000 -0500
29419 +diff -urNp linux-2.6.37.1/include/linux/kgdb.h linux-2.6.37.1/include/linux/kgdb.h
29420 +--- linux-2.6.37.1/include/linux/kgdb.h 2011-01-04 19:50:19.000000000 -0500
29421 ++++ linux-2.6.37.1/include/linux/kgdb.h 2011-01-17 02:41:02.000000000 -0500
29422 @@ -269,22 +269,22 @@ struct kgdb_arch {
29423 */
29424 struct kgdb_io {
29425 @@ -47054,9 +47176,9 @@ diff -urNp linux-2.6.37/include/linux/kgdb.h linux-2.6.37/include/linux/kgdb.h
29426
29427 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
29428 extern char *kgdb_mem2hex(char *mem, char *buf, int count);
29429 -diff -urNp linux-2.6.37/include/linux/kvm_host.h linux-2.6.37/include/linux/kvm_host.h
29430 ---- linux-2.6.37/include/linux/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
29431 -+++ linux-2.6.37/include/linux/kvm_host.h 2011-01-17 02:41:02.000000000 -0500
29432 +diff -urNp linux-2.6.37.1/include/linux/kvm_host.h linux-2.6.37.1/include/linux/kvm_host.h
29433 +--- linux-2.6.37.1/include/linux/kvm_host.h 2011-01-04 19:50:19.000000000 -0500
29434 ++++ linux-2.6.37.1/include/linux/kvm_host.h 2011-01-17 02:41:02.000000000 -0500
29435 @@ -246,7 +246,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
29436 void vcpu_load(struct kvm_vcpu *vcpu);
29437 void vcpu_put(struct kvm_vcpu *vcpu);
29438 @@ -47075,9 +47197,9 @@ diff -urNp linux-2.6.37/include/linux/kvm_host.h linux-2.6.37/include/linux/kvm_
29439 void kvm_arch_exit(void);
29440
29441 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
29442 -diff -urNp linux-2.6.37/include/linux/libata.h linux-2.6.37/include/linux/libata.h
29443 ---- linux-2.6.37/include/linux/libata.h 2011-01-04 19:50:19.000000000 -0500
29444 -+++ linux-2.6.37/include/linux/libata.h 2011-01-17 02:41:02.000000000 -0500
29445 +diff -urNp linux-2.6.37.1/include/linux/libata.h linux-2.6.37.1/include/linux/libata.h
29446 +--- linux-2.6.37.1/include/linux/libata.h 2011-01-04 19:50:19.000000000 -0500
29447 ++++ linux-2.6.37.1/include/linux/libata.h 2011-01-17 02:41:02.000000000 -0500
29448 @@ -65,11 +65,11 @@
29449 #ifdef ATA_VERBOSE_DEBUG
29450 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
29451 @@ -47143,9 +47265,9 @@ diff -urNp linux-2.6.37/include/linux/libata.h linux-2.6.37/include/linux/libata
29452 extern int ata_scsi_detect(struct scsi_host_template *sht);
29453 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
29454 extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
29455 -diff -urNp linux-2.6.37/include/linux/lockd/bind.h linux-2.6.37/include/linux/lockd/bind.h
29456 ---- linux-2.6.37/include/linux/lockd/bind.h 2011-01-04 19:50:19.000000000 -0500
29457 -+++ linux-2.6.37/include/linux/lockd/bind.h 2011-01-17 02:41:02.000000000 -0500
29458 +diff -urNp linux-2.6.37.1/include/linux/lockd/bind.h linux-2.6.37.1/include/linux/lockd/bind.h
29459 +--- linux-2.6.37.1/include/linux/lockd/bind.h 2011-01-04 19:50:19.000000000 -0500
29460 ++++ linux-2.6.37.1/include/linux/lockd/bind.h 2011-01-17 02:41:02.000000000 -0500
29461 @@ -23,13 +23,13 @@ struct svc_rqst;
29462 * This is the set of functions for lockd->nfsd communication
29463 */
29464 @@ -47163,9 +47285,9 @@ diff -urNp linux-2.6.37/include/linux/lockd/bind.h linux-2.6.37/include/linux/lo
29465
29466 /*
29467 * Similar to nfs_client_initdata, but without the NFS-specific
29468 -diff -urNp linux-2.6.37/include/linux/mm.h linux-2.6.37/include/linux/mm.h
29469 ---- linux-2.6.37/include/linux/mm.h 2011-01-04 19:50:19.000000000 -0500
29470 -+++ linux-2.6.37/include/linux/mm.h 2011-01-17 02:41:02.000000000 -0500
29471 +diff -urNp linux-2.6.37.1/include/linux/mm.h linux-2.6.37.1/include/linux/mm.h
29472 +--- linux-2.6.37.1/include/linux/mm.h 2011-01-04 19:50:19.000000000 -0500
29473 ++++ linux-2.6.37.1/include/linux/mm.h 2011-01-17 02:41:02.000000000 -0500
29474 @@ -107,7 +107,14 @@ extern unsigned int kobjsize(const void
29475
29476 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
29477 @@ -47266,9 +47388,9 @@ diff -urNp linux-2.6.37/include/linux/mm.h linux-2.6.37/include/linux/mm.h
29478 +
29479 #endif /* __KERNEL__ */
29480 #endif /* _LINUX_MM_H */
29481 -diff -urNp linux-2.6.37/include/linux/mm_types.h linux-2.6.37/include/linux/mm_types.h
29482 ---- linux-2.6.37/include/linux/mm_types.h 2011-01-04 19:50:19.000000000 -0500
29483 -+++ linux-2.6.37/include/linux/mm_types.h 2011-01-17 02:41:02.000000000 -0500
29484 +diff -urNp linux-2.6.37.1/include/linux/mm_types.h linux-2.6.37.1/include/linux/mm_types.h
29485 +--- linux-2.6.37.1/include/linux/mm_types.h 2011-01-04 19:50:19.000000000 -0500
29486 ++++ linux-2.6.37.1/include/linux/mm_types.h 2011-01-17 02:41:02.000000000 -0500
29487 @@ -183,6 +183,8 @@ struct vm_area_struct {
29488 #ifdef CONFIG_NUMA
29489 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
29490 @@ -47303,9 +47425,9 @@ diff -urNp linux-2.6.37/include/linux/mm_types.h linux-2.6.37/include/linux/mm_t
29491 };
29492
29493 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
29494 -diff -urNp linux-2.6.37/include/linux/mmu_notifier.h linux-2.6.37/include/linux/mmu_notifier.h
29495 ---- linux-2.6.37/include/linux/mmu_notifier.h 2011-01-04 19:50:19.000000000 -0500
29496 -+++ linux-2.6.37/include/linux/mmu_notifier.h 2011-01-17 02:41:02.000000000 -0500
29497 +diff -urNp linux-2.6.37.1/include/linux/mmu_notifier.h linux-2.6.37.1/include/linux/mmu_notifier.h
29498 +--- linux-2.6.37.1/include/linux/mmu_notifier.h 2011-01-04 19:50:19.000000000 -0500
29499 ++++ linux-2.6.37.1/include/linux/mmu_notifier.h 2011-01-17 02:41:02.000000000 -0500
29500 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
29501 */
29502 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
29503 @@ -47322,9 +47444,9 @@ diff -urNp linux-2.6.37/include/linux/mmu_notifier.h linux-2.6.37/include/linux/
29504 })
29505
29506 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
29507 -diff -urNp linux-2.6.37/include/linux/mmzone.h linux-2.6.37/include/linux/mmzone.h
29508 ---- linux-2.6.37/include/linux/mmzone.h 2011-01-04 19:50:19.000000000 -0500
29509 -+++ linux-2.6.37/include/linux/mmzone.h 2011-01-17 02:41:02.000000000 -0500
29510 +diff -urNp linux-2.6.37.1/include/linux/mmzone.h linux-2.6.37.1/include/linux/mmzone.h
29511 +--- linux-2.6.37.1/include/linux/mmzone.h 2011-02-22 16:05:31.000000000 -0500
29512 ++++ linux-2.6.37.1/include/linux/mmzone.h 2011-02-22 16:05:42.000000000 -0500
29513 @@ -354,7 +354,7 @@ struct zone {
29514 unsigned long flags; /* zone flags, see below */
29515
29516 @@ -47334,9 +47456,9 @@ diff -urNp linux-2.6.37/include/linux/mmzone.h linux-2.6.37/include/linux/mmzone
29517
29518 /*
29519 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
29520 -diff -urNp linux-2.6.37/include/linux/mod_devicetable.h linux-2.6.37/include/linux/mod_devicetable.h
29521 ---- linux-2.6.37/include/linux/mod_devicetable.h 2011-01-04 19:50:19.000000000 -0500
29522 -+++ linux-2.6.37/include/linux/mod_devicetable.h 2011-01-17 02:41:02.000000000 -0500
29523 +diff -urNp linux-2.6.37.1/include/linux/mod_devicetable.h linux-2.6.37.1/include/linux/mod_devicetable.h
29524 +--- linux-2.6.37.1/include/linux/mod_devicetable.h 2011-01-04 19:50:19.000000000 -0500
29525 ++++ linux-2.6.37.1/include/linux/mod_devicetable.h 2011-01-17 02:41:02.000000000 -0500
29526 @@ -12,7 +12,7 @@
29527 typedef unsigned long kernel_ulong_t;
29528 #endif
29529 @@ -47355,9 +47477,9 @@ diff -urNp linux-2.6.37/include/linux/mod_devicetable.h linux-2.6.37/include/lin
29530
29531 struct hid_device_id {
29532 __u16 bus;
29533 -diff -urNp linux-2.6.37/include/linux/module.h linux-2.6.37/include/linux/module.h
29534 ---- linux-2.6.37/include/linux/module.h 2011-01-04 19:50:19.000000000 -0500
29535 -+++ linux-2.6.37/include/linux/module.h 2011-01-17 02:41:02.000000000 -0500
29536 +diff -urNp linux-2.6.37.1/include/linux/module.h linux-2.6.37.1/include/linux/module.h
29537 +--- linux-2.6.37.1/include/linux/module.h 2011-01-04 19:50:19.000000000 -0500
29538 ++++ linux-2.6.37.1/include/linux/module.h 2011-01-17 02:41:02.000000000 -0500
29539 @@ -297,16 +297,16 @@ struct module
29540 int (*init)(void);
29541
29542 @@ -47430,9 +47552,9 @@ diff -urNp linux-2.6.37/include/linux/module.h linux-2.6.37/include/linux/module
29543 }
29544
29545 /* Search for module by name: must hold module_mutex. */
29546 -diff -urNp linux-2.6.37/include/linux/moduleloader.h linux-2.6.37/include/linux/moduleloader.h
29547 ---- linux-2.6.37/include/linux/moduleloader.h 2011-01-04 19:50:19.000000000 -0500
29548 -+++ linux-2.6.37/include/linux/moduleloader.h 2011-01-17 02:41:02.000000000 -0500
29549 +diff -urNp linux-2.6.37.1/include/linux/moduleloader.h linux-2.6.37.1/include/linux/moduleloader.h
29550 +--- linux-2.6.37.1/include/linux/moduleloader.h 2011-01-04 19:50:19.000000000 -0500
29551 ++++ linux-2.6.37.1/include/linux/moduleloader.h 2011-01-17 02:41:02.000000000 -0500
29552 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
29553 sections. Returns NULL on failure. */
29554 void *module_alloc(unsigned long size);
29555 @@ -47455,9 +47577,9 @@ diff -urNp linux-2.6.37/include/linux/moduleloader.h linux-2.6.37/include/linux/
29556 /* Apply the given relocation to the (simplified) ELF. Return -error
29557 or 0. */
29558 int apply_relocate(Elf_Shdr *sechdrs,
29559 -diff -urNp linux-2.6.37/include/linux/moduleparam.h linux-2.6.37/include/linux/moduleparam.h
29560 ---- linux-2.6.37/include/linux/moduleparam.h 2011-01-04 19:50:19.000000000 -0500
29561 -+++ linux-2.6.37/include/linux/moduleparam.h 2011-01-17 02:41:02.000000000 -0500
29562 +diff -urNp linux-2.6.37.1/include/linux/moduleparam.h linux-2.6.37.1/include/linux/moduleparam.h
29563 +--- linux-2.6.37.1/include/linux/moduleparam.h 2011-01-04 19:50:19.000000000 -0500
29564 ++++ linux-2.6.37.1/include/linux/moduleparam.h 2011-01-17 02:41:02.000000000 -0500
29565 @@ -253,7 +253,7 @@ static inline void __kernel_param_unlock
29566 * @len is usually just sizeof(string).
29567 */
29568 @@ -47476,9 +47598,9 @@ diff -urNp linux-2.6.37/include/linux/moduleparam.h linux-2.6.37/include/linux/m
29569 = { ARRAY_SIZE(array), nump, &param_ops_##type, \
29570 sizeof(array[0]), array }; \
29571 __module_param_call(MODULE_PARAM_PREFIX, name, \
29572 -diff -urNp linux-2.6.37/include/linux/namei.h linux-2.6.37/include/linux/namei.h
29573 ---- linux-2.6.37/include/linux/namei.h 2011-01-04 19:50:19.000000000 -0500
29574 -+++ linux-2.6.37/include/linux/namei.h 2011-01-17 02:41:02.000000000 -0500
29575 +diff -urNp linux-2.6.37.1/include/linux/namei.h linux-2.6.37.1/include/linux/namei.h
29576 +--- linux-2.6.37.1/include/linux/namei.h 2011-01-04 19:50:19.000000000 -0500
29577 ++++ linux-2.6.37.1/include/linux/namei.h 2011-01-17 02:41:02.000000000 -0500
29578 @@ -22,7 +22,7 @@ struct nameidata {
29579 unsigned int flags;
29580 int last_type;
29581 @@ -47503,9 +47625,9 @@ diff -urNp linux-2.6.37/include/linux/namei.h linux-2.6.37/include/linux/namei.h
29582 {
29583 return nd->saved_names[nd->depth];
29584 }
29585 -diff -urNp linux-2.6.37/include/linux/netfilter/xt_gradm.h linux-2.6.37/include/linux/netfilter/xt_gradm.h
29586 ---- linux-2.6.37/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
29587 -+++ linux-2.6.37/include/linux/netfilter/xt_gradm.h 2011-01-17 02:41:02.000000000 -0500
29588 +diff -urNp linux-2.6.37.1/include/linux/netfilter/xt_gradm.h linux-2.6.37.1/include/linux/netfilter/xt_gradm.h
29589 +--- linux-2.6.37.1/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
29590 ++++ linux-2.6.37.1/include/linux/netfilter/xt_gradm.h 2011-01-17 02:41:02.000000000 -0500
29591 @@ -0,0 +1,9 @@
29592 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
29593 +#define _LINUX_NETFILTER_XT_GRADM_H 1
29594 @@ -47516,10 +47638,10 @@ diff -urNp linux-2.6.37/include/linux/netfilter/xt_gradm.h linux-2.6.37/include/
29595 +};
29596 +
29597 +#endif
29598 -diff -urNp linux-2.6.37/include/linux/oprofile.h linux-2.6.37/include/linux/oprofile.h
29599 ---- linux-2.6.37/include/linux/oprofile.h 2011-01-04 19:50:19.000000000 -0500
29600 -+++ linux-2.6.37/include/linux/oprofile.h 2011-01-17 02:41:02.000000000 -0500
29601 -@@ -130,9 +130,9 @@ int oprofilefs_create_ulong(struct super
29602 +diff -urNp linux-2.6.37.1/include/linux/oprofile.h linux-2.6.37.1/include/linux/oprofile.h
29603 +--- linux-2.6.37.1/include/linux/oprofile.h 2011-02-22 16:05:31.000000000 -0500
29604 ++++ linux-2.6.37.1/include/linux/oprofile.h 2011-02-22 16:05:42.000000000 -0500
29605 +@@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super
29606 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
29607 char const * name, ulong * val);
29608
29609 @@ -47531,9 +47653,9 @@ diff -urNp linux-2.6.37/include/linux/oprofile.h linux-2.6.37/include/linux/opro
29610
29611 /** create a directory */
29612 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
29613 -diff -urNp linux-2.6.37/include/linux/pipe_fs_i.h linux-2.6.37/include/linux/pipe_fs_i.h
29614 ---- linux-2.6.37/include/linux/pipe_fs_i.h 2011-01-04 19:50:19.000000000 -0500
29615 -+++ linux-2.6.37/include/linux/pipe_fs_i.h 2011-01-17 02:41:02.000000000 -0500
29616 +diff -urNp linux-2.6.37.1/include/linux/pipe_fs_i.h linux-2.6.37.1/include/linux/pipe_fs_i.h
29617 +--- linux-2.6.37.1/include/linux/pipe_fs_i.h 2011-01-04 19:50:19.000000000 -0500
29618 ++++ linux-2.6.37.1/include/linux/pipe_fs_i.h 2011-01-17 02:41:02.000000000 -0500
29619 @@ -45,9 +45,9 @@ struct pipe_buffer {
29620 struct pipe_inode_info {
29621 wait_queue_head_t wait;
29622 @@ -47547,9 +47669,9 @@ diff -urNp linux-2.6.37/include/linux/pipe_fs_i.h linux-2.6.37/include/linux/pip
29623 unsigned int r_counter;
29624 unsigned int w_counter;
29625 struct page *tmp_page;
29626 -diff -urNp linux-2.6.37/include/linux/pm_runtime.h linux-2.6.37/include/linux/pm_runtime.h
29627 ---- linux-2.6.37/include/linux/pm_runtime.h 2011-01-04 19:50:19.000000000 -0500
29628 -+++ linux-2.6.37/include/linux/pm_runtime.h 2011-01-17 02:41:02.000000000 -0500
29629 +diff -urNp linux-2.6.37.1/include/linux/pm_runtime.h linux-2.6.37.1/include/linux/pm_runtime.h
29630 +--- linux-2.6.37.1/include/linux/pm_runtime.h 2011-01-04 19:50:19.000000000 -0500
29631 ++++ linux-2.6.37.1/include/linux/pm_runtime.h 2011-01-17 02:41:02.000000000 -0500
29632 @@ -83,7 +83,7 @@ static inline bool pm_runtime_suspended(
29633
29634 static inline void pm_runtime_mark_last_busy(struct device *dev)
29635 @@ -47559,9 +47681,9 @@ diff -urNp linux-2.6.37/include/linux/pm_runtime.h linux-2.6.37/include/linux/pm
29636 }
29637
29638 #else /* !CONFIG_PM_RUNTIME */
29639 -diff -urNp linux-2.6.37/include/linux/poison.h linux-2.6.37/include/linux/poison.h
29640 ---- linux-2.6.37/include/linux/poison.h 2011-01-04 19:50:19.000000000 -0500
29641 -+++ linux-2.6.37/include/linux/poison.h 2011-01-17 02:41:02.000000000 -0500
29642 +diff -urNp linux-2.6.37.1/include/linux/poison.h linux-2.6.37.1/include/linux/poison.h
29643 +--- linux-2.6.37.1/include/linux/poison.h 2011-01-04 19:50:19.000000000 -0500
29644 ++++ linux-2.6.37.1/include/linux/poison.h 2011-01-17 02:41:02.000000000 -0500
29645 @@ -19,8 +19,8 @@
29646 * under normal circumstances, used to verify that nobody uses
29647 * non-initialized list entries.
29648 @@ -47573,9 +47695,9 @@ diff -urNp linux-2.6.37/include/linux/poison.h linux-2.6.37/include/linux/poison
29649
29650 /********** include/linux/timer.h **********/
29651 /*
29652 -diff -urNp linux-2.6.37/include/linux/proc_fs.h linux-2.6.37/include/linux/proc_fs.h
29653 ---- linux-2.6.37/include/linux/proc_fs.h 2011-01-04 19:50:19.000000000 -0500
29654 -+++ linux-2.6.37/include/linux/proc_fs.h 2011-01-17 02:41:02.000000000 -0500
29655 +diff -urNp linux-2.6.37.1/include/linux/proc_fs.h linux-2.6.37.1/include/linux/proc_fs.h
29656 +--- linux-2.6.37.1/include/linux/proc_fs.h 2011-01-04 19:50:19.000000000 -0500
29657 ++++ linux-2.6.37.1/include/linux/proc_fs.h 2011-01-17 02:41:02.000000000 -0500
29658 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
29659 return proc_create_data(name, mode, parent, proc_fops, NULL);
29660 }
29661 @@ -47596,9 +47718,9 @@ diff -urNp linux-2.6.37/include/linux/proc_fs.h linux-2.6.37/include/linux/proc_
29662 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
29663 mode_t mode, struct proc_dir_entry *base,
29664 read_proc_t *read_proc, void * data)
29665 -diff -urNp linux-2.6.37/include/linux/random.h linux-2.6.37/include/linux/random.h
29666 ---- linux-2.6.37/include/linux/random.h 2011-01-04 19:50:19.000000000 -0500
29667 -+++ linux-2.6.37/include/linux/random.h 2011-01-17 02:41:02.000000000 -0500
29668 +diff -urNp linux-2.6.37.1/include/linux/random.h linux-2.6.37.1/include/linux/random.h
29669 +--- linux-2.6.37.1/include/linux/random.h 2011-01-04 19:50:19.000000000 -0500
29670 ++++ linux-2.6.37.1/include/linux/random.h 2011-01-17 02:41:02.000000000 -0500
29671 @@ -80,12 +80,17 @@ void srandom32(u32 seed);
29672
29673 u32 prandom32(struct rnd_state *);
29674 @@ -47618,9 +47740,9 @@ diff -urNp linux-2.6.37/include/linux/random.h linux-2.6.37/include/linux/random
29675 }
29676
29677 /**
29678 -diff -urNp linux-2.6.37/include/linux/reiserfs_fs.h linux-2.6.37/include/linux/reiserfs_fs.h
29679 ---- linux-2.6.37/include/linux/reiserfs_fs.h 2011-01-04 19:50:19.000000000 -0500
29680 -+++ linux-2.6.37/include/linux/reiserfs_fs.h 2011-01-17 02:41:02.000000000 -0500
29681 +diff -urNp linux-2.6.37.1/include/linux/reiserfs_fs.h linux-2.6.37.1/include/linux/reiserfs_fs.h
29682 +--- linux-2.6.37.1/include/linux/reiserfs_fs.h 2011-01-04 19:50:19.000000000 -0500
29683 ++++ linux-2.6.37.1/include/linux/reiserfs_fs.h 2011-01-17 02:41:02.000000000 -0500
29684 @@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset
29685 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
29686
29687 @@ -47667,9 +47789,9 @@ diff -urNp linux-2.6.37/include/linux/reiserfs_fs.h linux-2.6.37/include/linux/r
29688
29689 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
29690 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
29691 -diff -urNp linux-2.6.37/include/linux/reiserfs_fs_sb.h linux-2.6.37/include/linux/reiserfs_fs_sb.h
29692 ---- linux-2.6.37/include/linux/reiserfs_fs_sb.h 2011-01-04 19:50:19.000000000 -0500
29693 -+++ linux-2.6.37/include/linux/reiserfs_fs_sb.h 2011-01-17 02:41:02.000000000 -0500
29694 +diff -urNp linux-2.6.37.1/include/linux/reiserfs_fs_sb.h linux-2.6.37.1/include/linux/reiserfs_fs_sb.h
29695 +--- linux-2.6.37.1/include/linux/reiserfs_fs_sb.h 2011-01-04 19:50:19.000000000 -0500
29696 ++++ linux-2.6.37.1/include/linux/reiserfs_fs_sb.h 2011-01-17 02:41:02.000000000 -0500
29697 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
29698 /* Comment? -Hans */
29699 wait_queue_head_t s_wait;
29700 @@ -47679,9 +47801,9 @@ diff -urNp linux-2.6.37/include/linux/reiserfs_fs_sb.h linux-2.6.37/include/linu
29701 // tree gets re-balanced
29702 unsigned long s_properties; /* File system properties. Currently holds
29703 on-disk FS format */
29704 -diff -urNp linux-2.6.37/include/linux/rmap.h linux-2.6.37/include/linux/rmap.h
29705 ---- linux-2.6.37/include/linux/rmap.h 2011-01-04 19:50:19.000000000 -0500
29706 -+++ linux-2.6.37/include/linux/rmap.h 2011-01-17 02:41:02.000000000 -0500
29707 +diff -urNp linux-2.6.37.1/include/linux/rmap.h linux-2.6.37.1/include/linux/rmap.h
29708 +--- linux-2.6.37.1/include/linux/rmap.h 2011-01-04 19:50:19.000000000 -0500
29709 ++++ linux-2.6.37.1/include/linux/rmap.h 2011-01-17 02:41:02.000000000 -0500
29710 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc
29711 void anon_vma_init(void); /* create anon_vma_cachep */
29712 int anon_vma_prepare(struct vm_area_struct *);
29713 @@ -47693,9 +47815,9 @@ diff -urNp linux-2.6.37/include/linux/rmap.h linux-2.6.37/include/linux/rmap.h
29714 void __anon_vma_link(struct vm_area_struct *);
29715 void anon_vma_free(struct anon_vma *);
29716
29717 -diff -urNp linux-2.6.37/include/linux/sched.h linux-2.6.37/include/linux/sched.h
29718 ---- linux-2.6.37/include/linux/sched.h 2011-01-04 19:50:19.000000000 -0500
29719 -+++ linux-2.6.37/include/linux/sched.h 2011-01-17 02:41:02.000000000 -0500
29720 +diff -urNp linux-2.6.37.1/include/linux/sched.h linux-2.6.37.1/include/linux/sched.h
29721 +--- linux-2.6.37.1/include/linux/sched.h 2011-01-04 19:50:19.000000000 -0500
29722 ++++ linux-2.6.37.1/include/linux/sched.h 2011-01-17 02:41:02.000000000 -0500
29723 @@ -100,6 +100,7 @@ struct robust_list_head;
29724 struct bio_list;
29725 struct fs_struct;
29726 @@ -47905,9 +48027,9 @@ diff -urNp linux-2.6.37/include/linux/sched.h linux-2.6.37/include/linux/sched.h
29727 extern void thread_info_cache_init(void);
29728
29729 #ifdef CONFIG_DEBUG_STACK_USAGE
29730 -diff -urNp linux-2.6.37/include/linux/screen_info.h linux-2.6.37/include/linux/screen_info.h
29731 ---- linux-2.6.37/include/linux/screen_info.h 2011-01-04 19:50:19.000000000 -0500
29732 -+++ linux-2.6.37/include/linux/screen_info.h 2011-01-17 02:41:02.000000000 -0500
29733 +diff -urNp linux-2.6.37.1/include/linux/screen_info.h linux-2.6.37.1/include/linux/screen_info.h
29734 +--- linux-2.6.37.1/include/linux/screen_info.h 2011-01-04 19:50:19.000000000 -0500
29735 ++++ linux-2.6.37.1/include/linux/screen_info.h 2011-01-17 02:41:02.000000000 -0500
29736 @@ -43,7 +43,8 @@ struct screen_info {
29737 __u16 pages; /* 0x32 */
29738 __u16 vesa_attributes; /* 0x34 */
29739 @@ -47918,9 +48040,9 @@ diff -urNp linux-2.6.37/include/linux/screen_info.h linux-2.6.37/include/linux/s
29740 } __attribute__((packed));
29741
29742 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
29743 -diff -urNp linux-2.6.37/include/linux/security.h linux-2.6.37/include/linux/security.h
29744 ---- linux-2.6.37/include/linux/security.h 2011-01-04 19:50:19.000000000 -0500
29745 -+++ linux-2.6.37/include/linux/security.h 2011-02-12 10:34:03.000000000 -0500
29746 +diff -urNp linux-2.6.37.1/include/linux/security.h linux-2.6.37.1/include/linux/security.h
29747 +--- linux-2.6.37.1/include/linux/security.h 2011-02-22 16:05:31.000000000 -0500
29748 ++++ linux-2.6.37.1/include/linux/security.h 2011-02-22 16:05:42.000000000 -0500
29749 @@ -35,6 +35,7 @@
29750 #include <linux/key.h>
29751 #include <linux/xfrm.h>
29752 @@ -47950,9 +48072,9 @@ diff -urNp linux-2.6.37/include/linux/security.h linux-2.6.37/include/linux/secu
29753 }
29754
29755 static inline int security_real_capable(struct task_struct *tsk, int cap)
29756 -diff -urNp linux-2.6.37/include/linux/shm.h linux-2.6.37/include/linux/shm.h
29757 ---- linux-2.6.37/include/linux/shm.h 2011-01-04 19:50:19.000000000 -0500
29758 -+++ linux-2.6.37/include/linux/shm.h 2011-01-17 02:41:02.000000000 -0500
29759 +diff -urNp linux-2.6.37.1/include/linux/shm.h linux-2.6.37.1/include/linux/shm.h
29760 +--- linux-2.6.37.1/include/linux/shm.h 2011-01-04 19:50:19.000000000 -0500
29761 ++++ linux-2.6.37.1/include/linux/shm.h 2011-01-17 02:41:02.000000000 -0500
29762 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
29763 pid_t shm_cprid;
29764 pid_t shm_lprid;
29765 @@ -47964,9 +48086,9 @@ diff -urNp linux-2.6.37/include/linux/shm.h linux-2.6.37/include/linux/shm.h
29766 };
29767
29768 /* shm_mode upper byte flags */
29769 -diff -urNp linux-2.6.37/include/linux/skbuff.h linux-2.6.37/include/linux/skbuff.h
29770 ---- linux-2.6.37/include/linux/skbuff.h 2011-01-04 19:50:19.000000000 -0500
29771 -+++ linux-2.6.37/include/linux/skbuff.h 2011-01-17 02:41:02.000000000 -0500
29772 +diff -urNp linux-2.6.37.1/include/linux/skbuff.h linux-2.6.37.1/include/linux/skbuff.h
29773 +--- linux-2.6.37.1/include/linux/skbuff.h 2011-01-04 19:50:19.000000000 -0500
29774 ++++ linux-2.6.37.1/include/linux/skbuff.h 2011-01-17 02:41:02.000000000 -0500
29775 @@ -581,7 +581,7 @@ static inline struct skb_shared_hwtstamp
29776 */
29777 static inline int skb_queue_empty(const struct sk_buff_head *list)
29778 @@ -47994,9 +48116,9 @@ diff -urNp linux-2.6.37/include/linux/skbuff.h linux-2.6.37/include/linux/skbuff
29779 }
29780
29781 /**
29782 -diff -urNp linux-2.6.37/include/linux/slab.h linux-2.6.37/include/linux/slab.h
29783 ---- linux-2.6.37/include/linux/slab.h 2011-01-04 19:50:19.000000000 -0500
29784 -+++ linux-2.6.37/include/linux/slab.h 2011-01-17 02:41:02.000000000 -0500
29785 +diff -urNp linux-2.6.37.1/include/linux/slab.h linux-2.6.37.1/include/linux/slab.h
29786 +--- linux-2.6.37.1/include/linux/slab.h 2011-01-04 19:50:19.000000000 -0500
29787 ++++ linux-2.6.37.1/include/linux/slab.h 2011-01-17 02:41:02.000000000 -0500
29788 @@ -11,6 +11,7 @@
29789
29790 #include <linux/gfp.h>
29791 @@ -48068,9 +48190,9 @@ diff -urNp linux-2.6.37/include/linux/slab.h linux-2.6.37/include/linux/slab.h
29792 +})
29793 +
29794 #endif /* _LINUX_SLAB_H */
29795 -diff -urNp linux-2.6.37/include/linux/slub_def.h linux-2.6.37/include/linux/slub_def.h
29796 ---- linux-2.6.37/include/linux/slub_def.h 2011-01-04 19:50:19.000000000 -0500
29797 -+++ linux-2.6.37/include/linux/slub_def.h 2011-01-17 02:41:02.000000000 -0500
29798 +diff -urNp linux-2.6.37.1/include/linux/slub_def.h linux-2.6.37.1/include/linux/slub_def.h
29799 +--- linux-2.6.37.1/include/linux/slub_def.h 2011-01-04 19:50:19.000000000 -0500
29800 ++++ linux-2.6.37.1/include/linux/slub_def.h 2011-01-17 02:41:02.000000000 -0500
29801 @@ -80,7 +80,7 @@ struct kmem_cache {
29802 struct kmem_cache_order_objects max;
29803 struct kmem_cache_order_objects min;
29804 @@ -48080,9 +48202,9 @@ diff -urNp linux-2.6.37/include/linux/slub_def.h linux-2.6.37/include/linux/slub
29805 void (*ctor)(void *);
29806 int inuse; /* Offset to metadata */
29807 int align; /* Alignment */
29808 -diff -urNp linux-2.6.37/include/linux/sonet.h linux-2.6.37/include/linux/sonet.h
29809 ---- linux-2.6.37/include/linux/sonet.h 2011-01-04 19:50:19.000000000 -0500
29810 -+++ linux-2.6.37/include/linux/sonet.h 2011-01-17 02:41:02.000000000 -0500
29811 +diff -urNp linux-2.6.37.1/include/linux/sonet.h linux-2.6.37.1/include/linux/sonet.h
29812 +--- linux-2.6.37.1/include/linux/sonet.h 2011-01-04 19:50:19.000000000 -0500
29813 ++++ linux-2.6.37.1/include/linux/sonet.h 2011-01-17 02:41:02.000000000 -0500
29814 @@ -61,7 +61,7 @@ struct sonet_stats {
29815 #include <asm/atomic.h>
29816
29817 @@ -48092,9 +48214,9 @@ diff -urNp linux-2.6.37/include/linux/sonet.h linux-2.6.37/include/linux/sonet.h
29818 __SONET_ITEMS
29819 #undef __HANDLE_ITEM
29820 };
29821 -diff -urNp linux-2.6.37/include/linux/sunrpc/clnt.h linux-2.6.37/include/linux/sunrpc/clnt.h
29822 ---- linux-2.6.37/include/linux/sunrpc/clnt.h 2011-01-04 19:50:19.000000000 -0500
29823 -+++ linux-2.6.37/include/linux/sunrpc/clnt.h 2011-01-17 02:41:02.000000000 -0500
29824 +diff -urNp linux-2.6.37.1/include/linux/sunrpc/clnt.h linux-2.6.37.1/include/linux/sunrpc/clnt.h
29825 +--- linux-2.6.37.1/include/linux/sunrpc/clnt.h 2011-01-04 19:50:19.000000000 -0500
29826 ++++ linux-2.6.37.1/include/linux/sunrpc/clnt.h 2011-01-17 02:41:02.000000000 -0500
29827 @@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por
29828 {
29829 switch (sap->sa_family) {
29830 @@ -48125,9 +48247,9 @@ diff -urNp linux-2.6.37/include/linux/sunrpc/clnt.h linux-2.6.37/include/linux/s
29831 }
29832
29833 #endif /* __KERNEL__ */
29834 -diff -urNp linux-2.6.37/include/linux/suspend.h linux-2.6.37/include/linux/suspend.h
29835 ---- linux-2.6.37/include/linux/suspend.h 2011-01-04 19:50:19.000000000 -0500
29836 -+++ linux-2.6.37/include/linux/suspend.h 2011-01-17 02:41:02.000000000 -0500
29837 +diff -urNp linux-2.6.37.1/include/linux/suspend.h linux-2.6.37.1/include/linux/suspend.h
29838 +--- linux-2.6.37.1/include/linux/suspend.h 2011-01-04 19:50:19.000000000 -0500
29839 ++++ linux-2.6.37.1/include/linux/suspend.h 2011-01-17 02:41:02.000000000 -0500
29840 @@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
29841 * which require special recovery actions in that situation.
29842 */
29843 @@ -48216,9 +48338,9 @@ diff -urNp linux-2.6.37/include/linux/suspend.h linux-2.6.37/include/linux/suspe
29844 static inline int hibernate(void) { return -ENOSYS; }
29845 static inline bool system_entering_hibernation(void) { return false; }
29846 #endif /* CONFIG_HIBERNATION */
29847 -diff -urNp linux-2.6.37/include/linux/sysctl.h linux-2.6.37/include/linux/sysctl.h
29848 ---- linux-2.6.37/include/linux/sysctl.h 2011-01-04 19:50:19.000000000 -0500
29849 -+++ linux-2.6.37/include/linux/sysctl.h 2011-01-17 02:41:02.000000000 -0500
29850 +diff -urNp linux-2.6.37.1/include/linux/sysctl.h linux-2.6.37.1/include/linux/sysctl.h
29851 +--- linux-2.6.37.1/include/linux/sysctl.h 2011-01-04 19:50:19.000000000 -0500
29852 ++++ linux-2.6.37.1/include/linux/sysctl.h 2011-01-17 02:41:02.000000000 -0500
29853 @@ -155,7 +155,11 @@ enum
29854 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
29855 };
29856 @@ -48241,9 +48363,9 @@ diff -urNp linux-2.6.37/include/linux/sysctl.h linux-2.6.37/include/linux/sysctl
29857 extern int proc_dointvec(struct ctl_table *, int,
29858 void __user *, size_t *, loff_t *);
29859 extern int proc_dointvec_minmax(struct ctl_table *, int,
29860 -diff -urNp linux-2.6.37/include/linux/sysfs.h linux-2.6.37/include/linux/sysfs.h
29861 ---- linux-2.6.37/include/linux/sysfs.h 2011-01-04 19:50:19.000000000 -0500
29862 -+++ linux-2.6.37/include/linux/sysfs.h 2011-01-17 02:41:02.000000000 -0500
29863 +diff -urNp linux-2.6.37.1/include/linux/sysfs.h linux-2.6.37.1/include/linux/sysfs.h
29864 +--- linux-2.6.37.1/include/linux/sysfs.h 2011-01-04 19:50:19.000000000 -0500
29865 ++++ linux-2.6.37.1/include/linux/sysfs.h 2011-01-17 02:41:02.000000000 -0500
29866 @@ -110,8 +110,8 @@ struct bin_attribute {
29867 #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
29868
29869 @@ -48255,9 +48377,9 @@ diff -urNp linux-2.6.37/include/linux/sysfs.h linux-2.6.37/include/linux/sysfs.h
29870 };
29871
29872 struct sysfs_dirent;
29873 -diff -urNp linux-2.6.37/include/linux/tty.h linux-2.6.37/include/linux/tty.h
29874 ---- linux-2.6.37/include/linux/tty.h 2011-01-04 19:50:19.000000000 -0500
29875 -+++ linux-2.6.37/include/linux/tty.h 2011-01-17 02:41:02.000000000 -0500
29876 +diff -urNp linux-2.6.37.1/include/linux/tty.h linux-2.6.37.1/include/linux/tty.h
29877 +--- linux-2.6.37.1/include/linux/tty.h 2011-01-04 19:50:19.000000000 -0500
29878 ++++ linux-2.6.37.1/include/linux/tty.h 2011-01-17 02:41:02.000000000 -0500
29879 @@ -13,6 +13,8 @@
29880 #include <linux/tty_driver.h>
29881 #include <linux/tty_ldisc.h>
29882 @@ -48294,9 +48416,9 @@ diff -urNp linux-2.6.37/include/linux/tty.h linux-2.6.37/include/linux/tty.h
29883
29884 /* n_tty.c */
29885 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
29886 -diff -urNp linux-2.6.37/include/linux/tty_ldisc.h linux-2.6.37/include/linux/tty_ldisc.h
29887 ---- linux-2.6.37/include/linux/tty_ldisc.h 2011-01-04 19:50:19.000000000 -0500
29888 -+++ linux-2.6.37/include/linux/tty_ldisc.h 2011-01-17 02:41:02.000000000 -0500
29889 +diff -urNp linux-2.6.37.1/include/linux/tty_ldisc.h linux-2.6.37.1/include/linux/tty_ldisc.h
29890 +--- linux-2.6.37.1/include/linux/tty_ldisc.h 2011-01-04 19:50:19.000000000 -0500
29891 ++++ linux-2.6.37.1/include/linux/tty_ldisc.h 2011-01-17 02:41:02.000000000 -0500
29892 @@ -147,7 +147,7 @@ struct tty_ldisc_ops {
29893
29894 struct module *owner;
29895 @@ -48306,9 +48428,9 @@ diff -urNp linux-2.6.37/include/linux/tty_ldisc.h linux-2.6.37/include/linux/tty
29896 };
29897
29898 struct tty_ldisc {
29899 -diff -urNp linux-2.6.37/include/linux/types.h linux-2.6.37/include/linux/types.h
29900 ---- linux-2.6.37/include/linux/types.h 2011-01-04 19:50:19.000000000 -0500
29901 -+++ linux-2.6.37/include/linux/types.h 2011-01-17 02:41:02.000000000 -0500
29902 +diff -urNp linux-2.6.37.1/include/linux/types.h linux-2.6.37.1/include/linux/types.h
29903 +--- linux-2.6.37.1/include/linux/types.h 2011-01-04 19:50:19.000000000 -0500
29904 ++++ linux-2.6.37.1/include/linux/types.h 2011-01-17 02:41:02.000000000 -0500
29905 @@ -207,10 +207,26 @@ typedef struct {
29906 int counter;
29907 } atomic_t;
29908 @@ -48336,9 +48458,9 @@ diff -urNp linux-2.6.37/include/linux/types.h linux-2.6.37/include/linux/types.h
29909 #endif
29910
29911 struct list_head {
29912 -diff -urNp linux-2.6.37/include/linux/u64_stats_sync.h linux-2.6.37/include/linux/u64_stats_sync.h
29913 ---- linux-2.6.37/include/linux/u64_stats_sync.h 2011-01-04 19:50:19.000000000 -0500
29914 -+++ linux-2.6.37/include/linux/u64_stats_sync.h 2011-01-17 02:41:02.000000000 -0500
29915 +diff -urNp linux-2.6.37.1/include/linux/u64_stats_sync.h linux-2.6.37.1/include/linux/u64_stats_sync.h
29916 +--- linux-2.6.37.1/include/linux/u64_stats_sync.h 2011-01-04 19:50:19.000000000 -0500
29917 ++++ linux-2.6.37.1/include/linux/u64_stats_sync.h 2011-01-17 02:41:02.000000000 -0500
29918 @@ -67,21 +67,21 @@ struct u64_stats_sync {
29919 #endif
29920 };
29921 @@ -48391,9 +48513,9 @@ diff -urNp linux-2.6.37/include/linux/u64_stats_sync.h linux-2.6.37/include/linu
29922 unsigned int start)
29923 {
29924 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
29925 -diff -urNp linux-2.6.37/include/linux/uaccess.h linux-2.6.37/include/linux/uaccess.h
29926 ---- linux-2.6.37/include/linux/uaccess.h 2011-01-04 19:50:19.000000000 -0500
29927 -+++ linux-2.6.37/include/linux/uaccess.h 2011-01-17 02:41:02.000000000 -0500
29928 +diff -urNp linux-2.6.37.1/include/linux/uaccess.h linux-2.6.37.1/include/linux/uaccess.h
29929 +--- linux-2.6.37.1/include/linux/uaccess.h 2011-01-04 19:50:19.000000000 -0500
29930 ++++ linux-2.6.37.1/include/linux/uaccess.h 2011-01-17 02:41:02.000000000 -0500
29931 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
29932 long ret; \
29933 mm_segment_t old_fs = get_fs(); \
29934 @@ -48429,9 +48551,9 @@ diff -urNp linux-2.6.37/include/linux/uaccess.h linux-2.6.37/include/linux/uacce
29935 +extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
29936
29937 #endif /* __LINUX_UACCESS_H__ */
29938 -diff -urNp linux-2.6.37/include/linux/unaligned/access_ok.h linux-2.6.37/include/linux/unaligned/access_ok.h
29939 ---- linux-2.6.37/include/linux/unaligned/access_ok.h 2011-01-04 19:50:19.000000000 -0500
29940 -+++ linux-2.6.37/include/linux/unaligned/access_ok.h 2011-01-17 02:41:02.000000000 -0500
29941 +diff -urNp linux-2.6.37.1/include/linux/unaligned/access_ok.h linux-2.6.37.1/include/linux/unaligned/access_ok.h
29942 +--- linux-2.6.37.1/include/linux/unaligned/access_ok.h 2011-01-04 19:50:19.000000000 -0500
29943 ++++ linux-2.6.37.1/include/linux/unaligned/access_ok.h 2011-01-17 02:41:02.000000000 -0500
29944 @@ -6,32 +6,32 @@
29945
29946 static inline u16 get_unaligned_le16(const void *p)
29947 @@ -48471,10 +48593,10 @@ diff -urNp linux-2.6.37/include/linux/unaligned/access_ok.h linux-2.6.37/include
29948 }
29949
29950 static inline void put_unaligned_le16(u16 val, void *p)
29951 -diff -urNp linux-2.6.37/include/linux/usb/hcd.h linux-2.6.37/include/linux/usb/hcd.h
29952 ---- linux-2.6.37/include/linux/usb/hcd.h 2011-01-04 19:50:19.000000000 -0500
29953 -+++ linux-2.6.37/include/linux/usb/hcd.h 2011-01-17 02:41:02.000000000 -0500
29954 -@@ -580,7 +580,7 @@ struct usb_mon_operations {
29955 +diff -urNp linux-2.6.37.1/include/linux/usb/hcd.h linux-2.6.37.1/include/linux/usb/hcd.h
29956 +--- linux-2.6.37.1/include/linux/usb/hcd.h 2011-02-22 16:05:31.000000000 -0500
29957 ++++ linux-2.6.37.1/include/linux/usb/hcd.h 2011-02-22 16:05:42.000000000 -0500
29958 +@@ -581,7 +581,7 @@ struct usb_mon_operations {
29959 /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
29960 };
29961
29962 @@ -48483,7 +48605,7 @@ diff -urNp linux-2.6.37/include/linux/usb/hcd.h linux-2.6.37/include/linux/usb/h
29963
29964 static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
29965 {
29966 -@@ -602,7 +602,7 @@ static inline void usbmon_urb_complete(s
29967 +@@ -603,7 +603,7 @@ static inline void usbmon_urb_complete(s
29968 (*mon_ops->urb_complete)(bus, urb, status);
29969 }
29970
29971 @@ -48492,9 +48614,9 @@ diff -urNp linux-2.6.37/include/linux/usb/hcd.h linux-2.6.37/include/linux/usb/h
29972 void usb_mon_deregister(void);
29973
29974 #else
29975 -diff -urNp linux-2.6.37/include/linux/vmalloc.h linux-2.6.37/include/linux/vmalloc.h
29976 ---- linux-2.6.37/include/linux/vmalloc.h 2011-01-04 19:50:19.000000000 -0500
29977 -+++ linux-2.6.37/include/linux/vmalloc.h 2011-01-17 02:41:02.000000000 -0500
29978 +diff -urNp linux-2.6.37.1/include/linux/vmalloc.h linux-2.6.37.1/include/linux/vmalloc.h
29979 +--- linux-2.6.37.1/include/linux/vmalloc.h 2011-01-04 19:50:19.000000000 -0500
29980 ++++ linux-2.6.37.1/include/linux/vmalloc.h 2011-01-17 02:41:02.000000000 -0500
29981 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
29982 #define VM_MAP 0x00000004 /* vmap()ed pages */
29983 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
29984 @@ -48611,9 +48733,9 @@ diff -urNp linux-2.6.37/include/linux/vmalloc.h linux-2.6.37/include/linux/vmall
29985 +})
29986 +
29987 #endif /* _LINUX_VMALLOC_H */
29988 -diff -urNp linux-2.6.37/include/linux/vmstat.h linux-2.6.37/include/linux/vmstat.h
29989 ---- linux-2.6.37/include/linux/vmstat.h 2011-01-04 19:50:19.000000000 -0500
29990 -+++ linux-2.6.37/include/linux/vmstat.h 2011-01-17 02:41:02.000000000 -0500
29991 +diff -urNp linux-2.6.37.1/include/linux/vmstat.h linux-2.6.37.1/include/linux/vmstat.h
29992 +--- linux-2.6.37.1/include/linux/vmstat.h 2011-02-22 16:05:31.000000000 -0500
29993 ++++ linux-2.6.37.1/include/linux/vmstat.h 2011-02-22 16:05:42.000000000 -0500
29994 @@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in
29995 /*
29996 * Zone based page accounting with per cpu differentials.
29997 @@ -48655,7 +48777,7 @@ diff -urNp linux-2.6.37/include/linux/vmstat.h linux-2.6.37/include/linux/vmstat
29998
29999 #ifdef CONFIG_SMP
30000 int cpu;
30001 -@@ -268,8 +268,8 @@ static inline void __mod_zone_page_state
30002 +@@ -270,8 +270,8 @@ static inline void __mod_zone_page_state
30003
30004 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
30005 {
30006 @@ -48666,7 +48788,7 @@ diff -urNp linux-2.6.37/include/linux/vmstat.h linux-2.6.37/include/linux/vmstat
30007 }
30008
30009 static inline void __inc_zone_page_state(struct page *page,
30010 -@@ -280,8 +280,8 @@ static inline void __inc_zone_page_state
30011 +@@ -282,8 +282,8 @@ static inline void __inc_zone_page_state
30012
30013 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
30014 {
30015 @@ -48677,9 +48799,9 @@ diff -urNp linux-2.6.37/include/linux/vmstat.h linux-2.6.37/include/linux/vmstat
30016 }
30017
30018 static inline void __dec_zone_page_state(struct page *page,
30019 -diff -urNp linux-2.6.37/include/net/inetpeer.h linux-2.6.37/include/net/inetpeer.h
30020 ---- linux-2.6.37/include/net/inetpeer.h 2011-01-04 19:50:19.000000000 -0500
30021 -+++ linux-2.6.37/include/net/inetpeer.h 2011-01-17 02:41:02.000000000 -0500
30022 +diff -urNp linux-2.6.37.1/include/net/inetpeer.h linux-2.6.37.1/include/net/inetpeer.h
30023 +--- linux-2.6.37.1/include/net/inetpeer.h 2011-01-04 19:50:19.000000000 -0500
30024 ++++ linux-2.6.37.1/include/net/inetpeer.h 2011-01-17 02:41:02.000000000 -0500
30025 @@ -30,8 +30,8 @@ struct inet_peer {
30026 */
30027 union {
30028 @@ -48700,9 +48822,9 @@ diff -urNp linux-2.6.37/include/net/inetpeer.h linux-2.6.37/include/net/inetpeer
30029 }
30030
30031 #endif /* _NET_INETPEER_H */
30032 -diff -urNp linux-2.6.37/include/net/irda/ircomm_tty.h linux-2.6.37/include/net/irda/ircomm_tty.h
30033 ---- linux-2.6.37/include/net/irda/ircomm_tty.h 2011-01-04 19:50:19.000000000 -0500
30034 -+++ linux-2.6.37/include/net/irda/ircomm_tty.h 2011-01-25 20:24:56.000000000 -0500
30035 +diff -urNp linux-2.6.37.1/include/net/irda/ircomm_tty.h linux-2.6.37.1/include/net/irda/ircomm_tty.h
30036 +--- linux-2.6.37.1/include/net/irda/ircomm_tty.h 2011-01-04 19:50:19.000000000 -0500
30037 ++++ linux-2.6.37.1/include/net/irda/ircomm_tty.h 2011-01-25 20:24:56.000000000 -0500
30038 @@ -35,6 +35,7 @@
30039 #include <linux/termios.h>
30040 #include <linux/timer.h>
30041 @@ -48722,9 +48844,9 @@ diff -urNp linux-2.6.37/include/net/irda/ircomm_tty.h linux-2.6.37/include/net/i
30042
30043 /* Protect concurent access to :
30044 * o self->open_count
30045 -diff -urNp linux-2.6.37/include/net/neighbour.h linux-2.6.37/include/net/neighbour.h
30046 ---- linux-2.6.37/include/net/neighbour.h 2011-01-04 19:50:19.000000000 -0500
30047 -+++ linux-2.6.37/include/net/neighbour.h 2011-01-17 02:41:02.000000000 -0500
30048 +diff -urNp linux-2.6.37.1/include/net/neighbour.h linux-2.6.37.1/include/net/neighbour.h
30049 +--- linux-2.6.37.1/include/net/neighbour.h 2011-01-04 19:50:19.000000000 -0500
30050 ++++ linux-2.6.37.1/include/net/neighbour.h 2011-01-17 02:41:02.000000000 -0500
30051 @@ -118,12 +118,12 @@ struct neighbour {
30052
30053 struct neigh_ops {
30054 @@ -48744,9 +48866,9 @@ diff -urNp linux-2.6.37/include/net/neighbour.h linux-2.6.37/include/net/neighbo
30055 };
30056
30057 struct pneigh_entry {
30058 -diff -urNp linux-2.6.37/include/net/netlink.h linux-2.6.37/include/net/netlink.h
30059 ---- linux-2.6.37/include/net/netlink.h 2011-01-04 19:50:19.000000000 -0500
30060 -+++ linux-2.6.37/include/net/netlink.h 2011-01-17 02:41:02.000000000 -0500
30061 +diff -urNp linux-2.6.37.1/include/net/netlink.h linux-2.6.37.1/include/net/netlink.h
30062 +--- linux-2.6.37.1/include/net/netlink.h 2011-01-04 19:50:19.000000000 -0500
30063 ++++ linux-2.6.37.1/include/net/netlink.h 2011-01-17 02:41:02.000000000 -0500
30064 @@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
30065 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
30066 {
30067 @@ -48756,9 +48878,9 @@ diff -urNp linux-2.6.37/include/net/netlink.h linux-2.6.37/include/net/netlink.h
30068 }
30069
30070 /**
30071 -diff -urNp linux-2.6.37/include/net/sctp/sctp.h linux-2.6.37/include/net/sctp/sctp.h
30072 ---- linux-2.6.37/include/net/sctp/sctp.h 2011-01-04 19:50:19.000000000 -0500
30073 -+++ linux-2.6.37/include/net/sctp/sctp.h 2011-01-17 02:41:02.000000000 -0500
30074 +diff -urNp linux-2.6.37.1/include/net/sctp/sctp.h linux-2.6.37.1/include/net/sctp/sctp.h
30075 +--- linux-2.6.37.1/include/net/sctp/sctp.h 2011-01-04 19:50:19.000000000 -0500
30076 ++++ linux-2.6.37.1/include/net/sctp/sctp.h 2011-01-17 02:41:02.000000000 -0500
30077 @@ -316,9 +316,9 @@ do { \
30078
30079 #else /* SCTP_DEBUG */
30080 @@ -48772,9 +48894,9 @@ diff -urNp linux-2.6.37/include/net/sctp/sctp.h linux-2.6.37/include/net/sctp/sc
30081 #define SCTP_ENABLE_DEBUG
30082 #define SCTP_DISABLE_DEBUG
30083 #define SCTP_ASSERT(expr, str, func)
30084 -diff -urNp linux-2.6.37/include/net/tcp.h linux-2.6.37/include/net/tcp.h
30085 ---- linux-2.6.37/include/net/tcp.h 2011-01-04 19:50:19.000000000 -0500
30086 -+++ linux-2.6.37/include/net/tcp.h 2011-01-17 02:41:02.000000000 -0500
30087 +diff -urNp linux-2.6.37.1/include/net/tcp.h linux-2.6.37.1/include/net/tcp.h
30088 +--- linux-2.6.37.1/include/net/tcp.h 2011-01-04 19:50:19.000000000 -0500
30089 ++++ linux-2.6.37.1/include/net/tcp.h 2011-01-17 02:41:02.000000000 -0500
30090 @@ -1380,6 +1380,7 @@ enum tcp_seq_states {
30091 struct tcp_seq_afinfo {
30092 char *name;
30093 @@ -48783,9 +48905,9 @@ diff -urNp linux-2.6.37/include/net/tcp.h linux-2.6.37/include/net/tcp.h
30094 struct file_operations seq_fops;
30095 struct seq_operations seq_ops;
30096 };
30097 -diff -urNp linux-2.6.37/include/net/udp.h linux-2.6.37/include/net/udp.h
30098 ---- linux-2.6.37/include/net/udp.h 2011-01-04 19:50:19.000000000 -0500
30099 -+++ linux-2.6.37/include/net/udp.h 2011-01-17 02:41:02.000000000 -0500
30100 +diff -urNp linux-2.6.37.1/include/net/udp.h linux-2.6.37.1/include/net/udp.h
30101 +--- linux-2.6.37.1/include/net/udp.h 2011-01-04 19:50:19.000000000 -0500
30102 ++++ linux-2.6.37.1/include/net/udp.h 2011-01-17 02:41:02.000000000 -0500
30103 @@ -223,6 +223,7 @@ struct udp_seq_afinfo {
30104 char *name;
30105 sa_family_t family;
30106 @@ -48794,9 +48916,9 @@ diff -urNp linux-2.6.37/include/net/udp.h linux-2.6.37/include/net/udp.h
30107 struct file_operations seq_fops;
30108 struct seq_operations seq_ops;
30109 };
30110 -diff -urNp linux-2.6.37/include/sound/ac97_codec.h linux-2.6.37/include/sound/ac97_codec.h
30111 ---- linux-2.6.37/include/sound/ac97_codec.h 2011-01-04 19:50:19.000000000 -0500
30112 -+++ linux-2.6.37/include/sound/ac97_codec.h 2011-01-17 02:41:02.000000000 -0500
30113 +diff -urNp linux-2.6.37.1/include/sound/ac97_codec.h linux-2.6.37.1/include/sound/ac97_codec.h
30114 +--- linux-2.6.37.1/include/sound/ac97_codec.h 2011-01-04 19:50:19.000000000 -0500
30115 ++++ linux-2.6.37.1/include/sound/ac97_codec.h 2011-01-17 02:41:02.000000000 -0500
30116 @@ -419,15 +419,15 @@
30117 struct snd_ac97;
30118
30119 @@ -48829,9 +48951,9 @@ diff -urNp linux-2.6.37/include/sound/ac97_codec.h linux-2.6.37/include/sound/ac
30120 void *private_data;
30121 void (*private_free) (struct snd_ac97 *ac97);
30122 /* --- */
30123 -diff -urNp linux-2.6.37/include/trace/events/irq.h linux-2.6.37/include/trace/events/irq.h
30124 ---- linux-2.6.37/include/trace/events/irq.h 2011-01-04 19:50:19.000000000 -0500
30125 -+++ linux-2.6.37/include/trace/events/irq.h 2011-01-17 02:41:02.000000000 -0500
30126 +diff -urNp linux-2.6.37.1/include/trace/events/irq.h linux-2.6.37.1/include/trace/events/irq.h
30127 +--- linux-2.6.37.1/include/trace/events/irq.h 2011-01-04 19:50:19.000000000 -0500
30128 ++++ linux-2.6.37.1/include/trace/events/irq.h 2011-01-17 02:41:02.000000000 -0500
30129 @@ -36,7 +36,7 @@ struct softirq_action;
30130 */
30131 TRACE_EVENT(irq_handler_entry,
30132 @@ -48850,9 +48972,9 @@ diff -urNp linux-2.6.37/include/trace/events/irq.h linux-2.6.37/include/trace/ev
30133
30134 TP_ARGS(irq, action, ret),
30135
30136 -diff -urNp linux-2.6.37/include/video/uvesafb.h linux-2.6.37/include/video/uvesafb.h
30137 ---- linux-2.6.37/include/video/uvesafb.h 2011-01-04 19:50:19.000000000 -0500
30138 -+++ linux-2.6.37/include/video/uvesafb.h 2011-01-17 02:41:02.000000000 -0500
30139 +diff -urNp linux-2.6.37.1/include/video/uvesafb.h linux-2.6.37.1/include/video/uvesafb.h
30140 +--- linux-2.6.37.1/include/video/uvesafb.h 2011-01-04 19:50:19.000000000 -0500
30141 ++++ linux-2.6.37.1/include/video/uvesafb.h 2011-01-17 02:41:02.000000000 -0500
30142 @@ -177,6 +177,7 @@ struct uvesafb_par {
30143 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
30144 u8 pmi_setpal; /* PMI for palette changes */
30145 @@ -48861,9 +48983,9 @@ diff -urNp linux-2.6.37/include/video/uvesafb.h linux-2.6.37/include/video/uvesa
30146 void *pmi_start;
30147 void *pmi_pal;
30148 u8 *vbe_state_orig; /*
30149 -diff -urNp linux-2.6.37/init/do_mounts.c linux-2.6.37/init/do_mounts.c
30150 ---- linux-2.6.37/init/do_mounts.c 2011-01-04 19:50:19.000000000 -0500
30151 -+++ linux-2.6.37/init/do_mounts.c 2011-01-17 02:41:02.000000000 -0500
30152 +diff -urNp linux-2.6.37.1/init/do_mounts.c linux-2.6.37.1/init/do_mounts.c
30153 +--- linux-2.6.37.1/init/do_mounts.c 2011-01-04 19:50:19.000000000 -0500
30154 ++++ linux-2.6.37.1/init/do_mounts.c 2011-01-17 02:41:02.000000000 -0500
30155 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
30156
30157 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
30158 @@ -48903,9 +49025,9 @@ diff -urNp linux-2.6.37/init/do_mounts.c linux-2.6.37/init/do_mounts.c
30159 + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
30160 sys_chroot((const char __user __force *)".");
30161 }
30162 -diff -urNp linux-2.6.37/init/do_mounts.h linux-2.6.37/init/do_mounts.h
30163 ---- linux-2.6.37/init/do_mounts.h 2011-01-04 19:50:19.000000000 -0500
30164 -+++ linux-2.6.37/init/do_mounts.h 2011-01-17 02:41:02.000000000 -0500
30165 +diff -urNp linux-2.6.37.1/init/do_mounts.h linux-2.6.37.1/init/do_mounts.h
30166 +--- linux-2.6.37.1/init/do_mounts.h 2011-01-04 19:50:19.000000000 -0500
30167 ++++ linux-2.6.37.1/init/do_mounts.h 2011-01-17 02:41:02.000000000 -0500
30168 @@ -15,15 +15,15 @@ extern int root_mountflags;
30169
30170 static inline int create_dev(char *name, dev_t dev)
30171 @@ -48925,9 +49047,9 @@ diff -urNp linux-2.6.37/init/do_mounts.h linux-2.6.37/init/do_mounts.h
30172 return 0;
30173 if (!S_ISBLK(stat.st_mode))
30174 return 0;
30175 -diff -urNp linux-2.6.37/init/do_mounts_initrd.c linux-2.6.37/init/do_mounts_initrd.c
30176 ---- linux-2.6.37/init/do_mounts_initrd.c 2011-01-04 19:50:19.000000000 -0500
30177 -+++ linux-2.6.37/init/do_mounts_initrd.c 2011-01-17 02:41:02.000000000 -0500
30178 +diff -urNp linux-2.6.37.1/init/do_mounts_initrd.c linux-2.6.37.1/init/do_mounts_initrd.c
30179 +--- linux-2.6.37.1/init/do_mounts_initrd.c 2011-01-04 19:50:19.000000000 -0500
30180 ++++ linux-2.6.37.1/init/do_mounts_initrd.c 2011-01-17 02:41:02.000000000 -0500
30181 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
30182 create_dev("/dev/root.old", Root_RAM0);
30183 /* mount initrd on rootfs' /root */
30184 @@ -49002,9 +49124,9 @@ diff -urNp linux-2.6.37/init/do_mounts_initrd.c linux-2.6.37/init/do_mounts_init
30185 + sys_unlink((__force const char __user *)"/initrd.image");
30186 return 0;
30187 }
30188 -diff -urNp linux-2.6.37/init/do_mounts_md.c linux-2.6.37/init/do_mounts_md.c
30189 ---- linux-2.6.37/init/do_mounts_md.c 2011-01-04 19:50:19.000000000 -0500
30190 -+++ linux-2.6.37/init/do_mounts_md.c 2011-01-17 02:41:02.000000000 -0500
30191 +diff -urNp linux-2.6.37.1/init/do_mounts_md.c linux-2.6.37.1/init/do_mounts_md.c
30192 +--- linux-2.6.37.1/init/do_mounts_md.c 2011-01-04 19:50:19.000000000 -0500
30193 ++++ linux-2.6.37.1/init/do_mounts_md.c 2011-01-17 02:41:02.000000000 -0500
30194 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
30195 partitioned ? "_d" : "", minor,
30196 md_setup_args[ent].device_names);
30197 @@ -49023,9 +49145,9 @@ diff -urNp linux-2.6.37/init/do_mounts_md.c linux-2.6.37/init/do_mounts_md.c
30198 sys_ioctl(fd, BLKRRPART, 0);
30199 }
30200 sys_close(fd);
30201 -diff -urNp linux-2.6.37/init/initramfs.c linux-2.6.37/init/initramfs.c
30202 ---- linux-2.6.37/init/initramfs.c 2011-01-04 19:50:19.000000000 -0500
30203 -+++ linux-2.6.37/init/initramfs.c 2011-01-17 02:41:02.000000000 -0500
30204 +diff -urNp linux-2.6.37.1/init/initramfs.c linux-2.6.37.1/init/initramfs.c
30205 +--- linux-2.6.37.1/init/initramfs.c 2011-01-04 19:50:19.000000000 -0500
30206 ++++ linux-2.6.37.1/init/initramfs.c 2011-01-17 02:41:02.000000000 -0500
30207 @@ -74,7 +74,7 @@ static void __init free_hash(void)
30208 }
30209 }
30210 @@ -49134,9 +49256,9 @@ diff -urNp linux-2.6.37/init/initramfs.c linux-2.6.37/init/initramfs.c
30211 state = SkipIt;
30212 next_state = Reset;
30213 return 0;
30214 -diff -urNp linux-2.6.37/init/Kconfig linux-2.6.37/init/Kconfig
30215 ---- linux-2.6.37/init/Kconfig 2011-01-04 19:50:19.000000000 -0500
30216 -+++ linux-2.6.37/init/Kconfig 2011-01-17 02:41:02.000000000 -0500
30217 +diff -urNp linux-2.6.37.1/init/Kconfig linux-2.6.37.1/init/Kconfig
30218 +--- linux-2.6.37.1/init/Kconfig 2011-01-04 19:50:19.000000000 -0500
30219 ++++ linux-2.6.37.1/init/Kconfig 2011-01-17 02:41:02.000000000 -0500
30220 @@ -1108,7 +1108,7 @@ config SLUB_DEBUG
30221
30222 config COMPAT_BRK
30223 @@ -49146,9 +49268,9 @@ diff -urNp linux-2.6.37/init/Kconfig linux-2.6.37/init/Kconfig
30224 help
30225 Randomizing heap placement makes heap exploits harder, but it
30226 also breaks ancient binaries (including anything libc5 based).
30227 -diff -urNp linux-2.6.37/init/main.c linux-2.6.37/init/main.c
30228 ---- linux-2.6.37/init/main.c 2011-01-04 19:50:19.000000000 -0500
30229 -+++ linux-2.6.37/init/main.c 2011-01-17 02:41:02.000000000 -0500
30230 +diff -urNp linux-2.6.37.1/init/main.c linux-2.6.37.1/init/main.c
30231 +--- linux-2.6.37.1/init/main.c 2011-01-04 19:50:19.000000000 -0500
30232 ++++ linux-2.6.37.1/init/main.c 2011-01-17 02:41:02.000000000 -0500
30233 @@ -94,6 +94,7 @@ static inline void mark_rodata_ro(void)
30234 #ifdef CONFIG_TC
30235 extern void tc_init(void);
30236 @@ -49257,9 +49379,9 @@ diff -urNp linux-2.6.37/init/main.c linux-2.6.37/init/main.c
30237 /*
30238 * Ok, we have completed the initial bootup, and
30239 * we're essentially up and running. Get rid of the
30240 -diff -urNp linux-2.6.37/ipc/mqueue.c linux-2.6.37/ipc/mqueue.c
30241 ---- linux-2.6.37/ipc/mqueue.c 2011-01-04 19:50:19.000000000 -0500
30242 -+++ linux-2.6.37/ipc/mqueue.c 2011-01-17 02:41:02.000000000 -0500
30243 +diff -urNp linux-2.6.37.1/ipc/mqueue.c linux-2.6.37.1/ipc/mqueue.c
30244 +--- linux-2.6.37.1/ipc/mqueue.c 2011-01-04 19:50:19.000000000 -0500
30245 ++++ linux-2.6.37.1/ipc/mqueue.c 2011-01-17 02:41:02.000000000 -0500
30246 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
30247 mq_bytes = (mq_msg_tblsz +
30248 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
30249 @@ -49268,9 +49390,9 @@ diff -urNp linux-2.6.37/ipc/mqueue.c linux-2.6.37/ipc/mqueue.c
30250 spin_lock(&mq_lock);
30251 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
30252 u->mq_bytes + mq_bytes >
30253 -diff -urNp linux-2.6.37/ipc/shm.c linux-2.6.37/ipc/shm.c
30254 ---- linux-2.6.37/ipc/shm.c 2011-01-04 19:50:19.000000000 -0500
30255 -+++ linux-2.6.37/ipc/shm.c 2011-01-17 02:41:02.000000000 -0500
30256 +diff -urNp linux-2.6.37.1/ipc/shm.c linux-2.6.37.1/ipc/shm.c
30257 +--- linux-2.6.37.1/ipc/shm.c 2011-01-04 19:50:19.000000000 -0500
30258 ++++ linux-2.6.37.1/ipc/shm.c 2011-01-17 02:41:02.000000000 -0500
30259 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
30260 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
30261 #endif
30262 @@ -49323,9 +49445,9 @@ diff -urNp linux-2.6.37/ipc/shm.c linux-2.6.37/ipc/shm.c
30263 size = i_size_read(path.dentry->d_inode);
30264 shm_unlock(shp);
30265
30266 -diff -urNp linux-2.6.37/kernel/acct.c linux-2.6.37/kernel/acct.c
30267 ---- linux-2.6.37/kernel/acct.c 2011-01-04 19:50:19.000000000 -0500
30268 -+++ linux-2.6.37/kernel/acct.c 2011-01-17 02:41:02.000000000 -0500
30269 +diff -urNp linux-2.6.37.1/kernel/acct.c linux-2.6.37.1/kernel/acct.c
30270 +--- linux-2.6.37.1/kernel/acct.c 2011-01-04 19:50:19.000000000 -0500
30271 ++++ linux-2.6.37.1/kernel/acct.c 2011-01-17 02:41:02.000000000 -0500
30272 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
30273 */
30274 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
30275 @@ -49335,9 +49457,9 @@ diff -urNp linux-2.6.37/kernel/acct.c linux-2.6.37/kernel/acct.c
30276 sizeof(acct_t), &file->f_pos);
30277 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
30278 set_fs(fs);
30279 -diff -urNp linux-2.6.37/kernel/capability.c linux-2.6.37/kernel/capability.c
30280 ---- linux-2.6.37/kernel/capability.c 2011-01-04 19:50:19.000000000 -0500
30281 -+++ linux-2.6.37/kernel/capability.c 2011-02-12 11:48:20.000000000 -0500
30282 +diff -urNp linux-2.6.37.1/kernel/capability.c linux-2.6.37.1/kernel/capability.c
30283 +--- linux-2.6.37.1/kernel/capability.c 2011-01-04 19:50:19.000000000 -0500
30284 ++++ linux-2.6.37.1/kernel/capability.c 2011-02-12 11:48:20.000000000 -0500
30285 @@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
30286 * before modification is attempted and the application
30287 * fails.
30288 @@ -49376,9 +49498,9 @@ diff -urNp linux-2.6.37/kernel/capability.c linux-2.6.37/kernel/capability.c
30289 +
30290 EXPORT_SYMBOL(capable);
30291 +EXPORT_SYMBOL(capable_nolog);
30292 -diff -urNp linux-2.6.37/kernel/compat.c linux-2.6.37/kernel/compat.c
30293 ---- linux-2.6.37/kernel/compat.c 2011-01-04 19:50:19.000000000 -0500
30294 -+++ linux-2.6.37/kernel/compat.c 2011-01-17 02:41:02.000000000 -0500
30295 +diff -urNp linux-2.6.37.1/kernel/compat.c linux-2.6.37.1/kernel/compat.c
30296 +--- linux-2.6.37.1/kernel/compat.c 2011-01-04 19:50:19.000000000 -0500
30297 ++++ linux-2.6.37.1/kernel/compat.c 2011-01-17 02:41:02.000000000 -0500
30298 @@ -13,6 +13,7 @@
30299
30300 #include <linux/linkage.h>
30301 @@ -49387,9 +49509,9 @@ diff -urNp linux-2.6.37/kernel/compat.c linux-2.6.37/kernel/compat.c
30302 #include <linux/errno.h>
30303 #include <linux/time.h>
30304 #include <linux/signal.h>
30305 -diff -urNp linux-2.6.37/kernel/configs.c linux-2.6.37/kernel/configs.c
30306 ---- linux-2.6.37/kernel/configs.c 2011-01-04 19:50:19.000000000 -0500
30307 -+++ linux-2.6.37/kernel/configs.c 2011-01-17 02:41:02.000000000 -0500
30308 +diff -urNp linux-2.6.37.1/kernel/configs.c linux-2.6.37.1/kernel/configs.c
30309 +--- linux-2.6.37.1/kernel/configs.c 2011-01-04 19:50:19.000000000 -0500
30310 ++++ linux-2.6.37.1/kernel/configs.c 2011-01-17 02:41:02.000000000 -0500
30311 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
30312 struct proc_dir_entry *entry;
30313
30314 @@ -49410,9 +49532,9 @@ diff -urNp linux-2.6.37/kernel/configs.c linux-2.6.37/kernel/configs.c
30315 if (!entry)
30316 return -ENOMEM;
30317
30318 -diff -urNp linux-2.6.37/kernel/cred.c linux-2.6.37/kernel/cred.c
30319 ---- linux-2.6.37/kernel/cred.c 2011-01-04 19:50:19.000000000 -0500
30320 -+++ linux-2.6.37/kernel/cred.c 2011-02-12 11:03:34.000000000 -0500
30321 +diff -urNp linux-2.6.37.1/kernel/cred.c linux-2.6.37.1/kernel/cred.c
30322 +--- linux-2.6.37.1/kernel/cred.c 2011-01-04 19:50:19.000000000 -0500
30323 ++++ linux-2.6.37.1/kernel/cred.c 2011-02-12 11:03:34.000000000 -0500
30324 @@ -252,13 +252,13 @@ struct cred *cred_alloc_blank(void)
30325 #endif
30326
30327 @@ -49470,9 +49592,9 @@ diff -urNp linux-2.6.37/kernel/cred.c linux-2.6.37/kernel/cred.c
30328 if ((unsigned long) cred->security < PAGE_SIZE)
30329 return true;
30330 if ((*(u32 *)cred->security & 0xffffff00) ==
30331 -diff -urNp linux-2.6.37/kernel/debug/debug_core.c linux-2.6.37/kernel/debug/debug_core.c
30332 ---- linux-2.6.37/kernel/debug/debug_core.c 2011-01-04 19:50:19.000000000 -0500
30333 -+++ linux-2.6.37/kernel/debug/debug_core.c 2011-01-17 02:41:02.000000000 -0500
30334 +diff -urNp linux-2.6.37.1/kernel/debug/debug_core.c linux-2.6.37.1/kernel/debug/debug_core.c
30335 +--- linux-2.6.37.1/kernel/debug/debug_core.c 2011-01-04 19:50:19.000000000 -0500
30336 ++++ linux-2.6.37.1/kernel/debug/debug_core.c 2011-01-17 02:41:02.000000000 -0500
30337 @@ -72,7 +72,7 @@ int kgdb_io_module_registered;
30338 /* Guard for recursive entry */
30339 static int exception_level;
30340 @@ -49500,9 +49622,9 @@ diff -urNp linux-2.6.37/kernel/debug/debug_core.c linux-2.6.37/kernel/debug/debu
30341 {
30342 BUG_ON(kgdb_connected);
30343
30344 -diff -urNp linux-2.6.37/kernel/debug/kdb/kdb_main.c linux-2.6.37/kernel/debug/kdb/kdb_main.c
30345 ---- linux-2.6.37/kernel/debug/kdb/kdb_main.c 2011-01-04 19:50:19.000000000 -0500
30346 -+++ linux-2.6.37/kernel/debug/kdb/kdb_main.c 2011-01-17 02:41:02.000000000 -0500
30347 +diff -urNp linux-2.6.37.1/kernel/debug/kdb/kdb_main.c linux-2.6.37.1/kernel/debug/kdb/kdb_main.c
30348 +--- linux-2.6.37.1/kernel/debug/kdb/kdb_main.c 2011-01-04 19:50:19.000000000 -0500
30349 ++++ linux-2.6.37.1/kernel/debug/kdb/kdb_main.c 2011-01-17 02:41:02.000000000 -0500
30350 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
30351 list_for_each_entry(mod, kdb_modules, list) {
30352
30353 @@ -49521,9 +49643,9 @@ diff -urNp linux-2.6.37/kernel/debug/kdb/kdb_main.c linux-2.6.37/kernel/debug/kd
30354
30355 #ifdef CONFIG_MODULE_UNLOAD
30356 {
30357 -diff -urNp linux-2.6.37/kernel/exit.c linux-2.6.37/kernel/exit.c
30358 ---- linux-2.6.37/kernel/exit.c 2011-01-04 19:50:19.000000000 -0500
30359 -+++ linux-2.6.37/kernel/exit.c 2011-01-17 02:41:02.000000000 -0500
30360 +diff -urNp linux-2.6.37.1/kernel/exit.c linux-2.6.37.1/kernel/exit.c
30361 +--- linux-2.6.37.1/kernel/exit.c 2011-01-04 19:50:19.000000000 -0500
30362 ++++ linux-2.6.37.1/kernel/exit.c 2011-01-17 02:41:02.000000000 -0500
30363 @@ -57,6 +57,10 @@
30364 #include <asm/pgtable.h>
30365 #include <asm/mmu_context.h>
30366 @@ -49643,9 +49765,9 @@ diff -urNp linux-2.6.37/kernel/exit.c linux-2.6.37/kernel/exit.c
30367 exit_mm(tsk);
30368
30369 if (group_dead)
30370 -diff -urNp linux-2.6.37/kernel/fork.c linux-2.6.37/kernel/fork.c
30371 ---- linux-2.6.37/kernel/fork.c 2011-01-04 19:50:19.000000000 -0500
30372 -+++ linux-2.6.37/kernel/fork.c 2011-01-17 02:41:02.000000000 -0500
30373 +diff -urNp linux-2.6.37.1/kernel/fork.c linux-2.6.37.1/kernel/fork.c
30374 +--- linux-2.6.37.1/kernel/fork.c 2011-01-04 19:50:19.000000000 -0500
30375 ++++ linux-2.6.37.1/kernel/fork.c 2011-01-17 02:41:02.000000000 -0500
30376 @@ -278,7 +278,7 @@ static struct task_struct *dup_task_stru
30377 *stackend = STACK_END_MAGIC; /* for overflow detection */
30378
30379 @@ -49942,9 +50064,9 @@ diff -urNp linux-2.6.37/kernel/fork.c linux-2.6.37/kernel/fork.c
30380 new_fs = NULL;
30381 else
30382 new_fs = fs;
30383 -diff -urNp linux-2.6.37/kernel/futex.c linux-2.6.37/kernel/futex.c
30384 ---- linux-2.6.37/kernel/futex.c 2011-01-04 19:50:19.000000000 -0500
30385 -+++ linux-2.6.37/kernel/futex.c 2011-01-17 02:41:02.000000000 -0500
30386 +diff -urNp linux-2.6.37.1/kernel/futex.c linux-2.6.37.1/kernel/futex.c
30387 +--- linux-2.6.37.1/kernel/futex.c 2011-01-04 19:50:19.000000000 -0500
30388 ++++ linux-2.6.37.1/kernel/futex.c 2011-01-17 02:41:02.000000000 -0500
30389 @@ -54,6 +54,7 @@
30390 #include <linux/mount.h>
30391 #include <linux/pagemap.h>
30392 @@ -50011,9 +50133,9 @@ diff -urNp linux-2.6.37/kernel/futex.c linux-2.6.37/kernel/futex.c
30393 if (curval == -EFAULT)
30394 futex_cmpxchg_enabled = 1;
30395
30396 -diff -urNp linux-2.6.37/kernel/futex_compat.c linux-2.6.37/kernel/futex_compat.c
30397 ---- linux-2.6.37/kernel/futex_compat.c 2011-01-04 19:50:19.000000000 -0500
30398 -+++ linux-2.6.37/kernel/futex_compat.c 2011-01-17 02:41:02.000000000 -0500
30399 +diff -urNp linux-2.6.37.1/kernel/futex_compat.c linux-2.6.37.1/kernel/futex_compat.c
30400 +--- linux-2.6.37.1/kernel/futex_compat.c 2011-01-04 19:50:19.000000000 -0500
30401 ++++ linux-2.6.37.1/kernel/futex_compat.c 2011-01-17 02:41:02.000000000 -0500
30402 @@ -10,6 +10,7 @@
30403 #include <linux/compat.h>
30404 #include <linux/nsproxy.h>
30405 @@ -50051,9 +50173,9 @@ diff -urNp linux-2.6.37/kernel/futex_compat.c linux-2.6.37/kernel/futex_compat.c
30406 head = p->compat_robust_list;
30407 rcu_read_unlock();
30408 }
30409 -diff -urNp linux-2.6.37/kernel/gcov/base.c linux-2.6.37/kernel/gcov/base.c
30410 ---- linux-2.6.37/kernel/gcov/base.c 2011-01-04 19:50:19.000000000 -0500
30411 -+++ linux-2.6.37/kernel/gcov/base.c 2011-01-17 02:41:02.000000000 -0500
30412 +diff -urNp linux-2.6.37.1/kernel/gcov/base.c linux-2.6.37.1/kernel/gcov/base.c
30413 +--- linux-2.6.37.1/kernel/gcov/base.c 2011-01-04 19:50:19.000000000 -0500
30414 ++++ linux-2.6.37.1/kernel/gcov/base.c 2011-01-17 02:41:02.000000000 -0500
30415 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
30416 }
30417
30418 @@ -50075,9 +50197,9 @@ diff -urNp linux-2.6.37/kernel/gcov/base.c linux-2.6.37/kernel/gcov/base.c
30419 if (prev)
30420 prev->next = info->next;
30421 else
30422 -diff -urNp linux-2.6.37/kernel/hrtimer.c linux-2.6.37/kernel/hrtimer.c
30423 ---- linux-2.6.37/kernel/hrtimer.c 2011-01-04 19:50:19.000000000 -0500
30424 -+++ linux-2.6.37/kernel/hrtimer.c 2011-01-17 02:41:02.000000000 -0500
30425 +diff -urNp linux-2.6.37.1/kernel/hrtimer.c linux-2.6.37.1/kernel/hrtimer.c
30426 +--- linux-2.6.37.1/kernel/hrtimer.c 2011-01-04 19:50:19.000000000 -0500
30427 ++++ linux-2.6.37.1/kernel/hrtimer.c 2011-01-17 02:41:02.000000000 -0500
30428 @@ -1401,7 +1401,7 @@ void hrtimer_peek_ahead_timers(void)
30429 local_irq_restore(flags);
30430 }
30431 @@ -50087,9 +50209,9 @@ diff -urNp linux-2.6.37/kernel/hrtimer.c linux-2.6.37/kernel/hrtimer.c
30432 {
30433 hrtimer_peek_ahead_timers();
30434 }
30435 -diff -urNp linux-2.6.37/kernel/jump_label.c linux-2.6.37/kernel/jump_label.c
30436 ---- linux-2.6.37/kernel/jump_label.c 2011-01-04 19:50:19.000000000 -0500
30437 -+++ linux-2.6.37/kernel/jump_label.c 2011-01-17 02:41:02.000000000 -0500
30438 +diff -urNp linux-2.6.37.1/kernel/jump_label.c linux-2.6.37.1/kernel/jump_label.c
30439 +--- linux-2.6.37.1/kernel/jump_label.c 2011-01-04 19:50:19.000000000 -0500
30440 ++++ linux-2.6.37.1/kernel/jump_label.c 2011-01-17 02:41:02.000000000 -0500
30441 @@ -49,6 +49,17 @@ void jump_label_unlock(void)
30442 mutex_unlock(&jump_label_mutex);
30443 }
30444 @@ -50130,9 +50252,9 @@ diff -urNp linux-2.6.37/kernel/jump_label.c linux-2.6.37/kernel/jump_label.c
30445 iter++;
30446 }
30447 }
30448 -diff -urNp linux-2.6.37/kernel/kallsyms.c linux-2.6.37/kernel/kallsyms.c
30449 ---- linux-2.6.37/kernel/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
30450 -+++ linux-2.6.37/kernel/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
30451 +diff -urNp linux-2.6.37.1/kernel/kallsyms.c linux-2.6.37.1/kernel/kallsyms.c
30452 +--- linux-2.6.37.1/kernel/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
30453 ++++ linux-2.6.37.1/kernel/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
30454 @@ -11,6 +11,9 @@
30455 * Changed the compression method from stem compression to "table lookup"
30456 * compression (see scripts/kallsyms.c for a more complete description)
30457 @@ -50235,9 +50357,9 @@ diff -urNp linux-2.6.37/kernel/kallsyms.c linux-2.6.37/kernel/kallsyms.c
30458 if (!iter)
30459 return -ENOMEM;
30460 reset_iter(iter, 0);
30461 -diff -urNp linux-2.6.37/kernel/kmod.c linux-2.6.37/kernel/kmod.c
30462 ---- linux-2.6.37/kernel/kmod.c 2011-01-04 19:50:19.000000000 -0500
30463 -+++ linux-2.6.37/kernel/kmod.c 2011-02-12 10:56:18.000000000 -0500
30464 +diff -urNp linux-2.6.37.1/kernel/kmod.c linux-2.6.37.1/kernel/kmod.c
30465 +--- linux-2.6.37.1/kernel/kmod.c 2011-01-04 19:50:19.000000000 -0500
30466 ++++ linux-2.6.37.1/kernel/kmod.c 2011-02-12 10:56:18.000000000 -0500
30467 @@ -90,6 +90,28 @@ int __request_module(bool wait, const ch
30468 if (ret)
30469 return ret;
30470 @@ -50267,9 +50389,9 @@ diff -urNp linux-2.6.37/kernel/kmod.c linux-2.6.37/kernel/kmod.c
30471 /* If modprobe needs a service that is in a module, we get a recursive
30472 * loop. Limit the number of running kmod threads to max_threads/2 or
30473 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
30474 -diff -urNp linux-2.6.37/kernel/kprobes.c linux-2.6.37/kernel/kprobes.c
30475 ---- linux-2.6.37/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
30476 -+++ linux-2.6.37/kernel/kprobes.c 2011-01-17 02:41:02.000000000 -0500
30477 +diff -urNp linux-2.6.37.1/kernel/kprobes.c linux-2.6.37.1/kernel/kprobes.c
30478 +--- linux-2.6.37.1/kernel/kprobes.c 2011-01-04 19:50:19.000000000 -0500
30479 ++++ linux-2.6.37.1/kernel/kprobes.c 2011-01-17 02:41:02.000000000 -0500
30480 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
30481 * kernel image and loaded module images reside. This is required
30482 * so x86_64 can correctly handle the %rip-relative fixups.
30483 @@ -50306,9 +50428,9 @@ diff -urNp linux-2.6.37/kernel/kprobes.c linux-2.6.37/kernel/kprobes.c
30484
30485 head = &kprobe_table[i];
30486 preempt_disable();
30487 -diff -urNp linux-2.6.37/kernel/lockdep.c linux-2.6.37/kernel/lockdep.c
30488 ---- linux-2.6.37/kernel/lockdep.c 2011-01-04 19:50:19.000000000 -0500
30489 -+++ linux-2.6.37/kernel/lockdep.c 2011-01-17 02:41:02.000000000 -0500
30490 +diff -urNp linux-2.6.37.1/kernel/lockdep.c linux-2.6.37.1/kernel/lockdep.c
30491 +--- linux-2.6.37.1/kernel/lockdep.c 2011-01-04 19:50:19.000000000 -0500
30492 ++++ linux-2.6.37.1/kernel/lockdep.c 2011-01-17 02:41:02.000000000 -0500
30493 @@ -571,6 +571,10 @@ static int static_obj(void *obj)
30494 end = (unsigned long) &_end,
30495 addr = (unsigned long) obj;
30496 @@ -50337,9 +50459,9 @@ diff -urNp linux-2.6.37/kernel/lockdep.c linux-2.6.37/kernel/lockdep.c
30497 if (very_verbose(class)) {
30498 printk("\nacquire class [%p] %s", class->key, class->name);
30499 if (class->name_version > 1)
30500 -diff -urNp linux-2.6.37/kernel/lockdep_proc.c linux-2.6.37/kernel/lockdep_proc.c
30501 ---- linux-2.6.37/kernel/lockdep_proc.c 2011-01-04 19:50:19.000000000 -0500
30502 -+++ linux-2.6.37/kernel/lockdep_proc.c 2011-01-17 02:41:02.000000000 -0500
30503 +diff -urNp linux-2.6.37.1/kernel/lockdep_proc.c linux-2.6.37.1/kernel/lockdep_proc.c
30504 +--- linux-2.6.37.1/kernel/lockdep_proc.c 2011-01-04 19:50:19.000000000 -0500
30505 ++++ linux-2.6.37.1/kernel/lockdep_proc.c 2011-01-17 02:41:02.000000000 -0500
30506 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
30507
30508 static void print_name(struct seq_file *m, struct lock_class *class)
30509 @@ -50349,9 +50471,9 @@ diff -urNp linux-2.6.37/kernel/lockdep_proc.c linux-2.6.37/kernel/lockdep_proc.c
30510 const char *name = class->name;
30511
30512 if (!name) {
30513 -diff -urNp linux-2.6.37/kernel/module.c linux-2.6.37/kernel/module.c
30514 ---- linux-2.6.37/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
30515 -+++ linux-2.6.37/kernel/module.c 2011-02-02 20:28:40.000000000 -0500
30516 +diff -urNp linux-2.6.37.1/kernel/module.c linux-2.6.37.1/kernel/module.c
30517 +--- linux-2.6.37.1/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
30518 ++++ linux-2.6.37.1/kernel/module.c 2011-02-02 20:28:40.000000000 -0500
30519 @@ -97,7 +97,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not
30520
30521 /* Bounds of module allocation, for speeding __module_address.
30522 @@ -50842,9 +50964,9 @@ diff -urNp linux-2.6.37/kernel/module.c linux-2.6.37/kernel/module.c
30523 mod = NULL;
30524 }
30525 return mod;
30526 -diff -urNp linux-2.6.37/kernel/panic.c linux-2.6.37/kernel/panic.c
30527 ---- linux-2.6.37/kernel/panic.c 2011-01-04 19:50:19.000000000 -0500
30528 -+++ linux-2.6.37/kernel/panic.c 2011-01-17 02:41:02.000000000 -0500
30529 +diff -urNp linux-2.6.37.1/kernel/panic.c linux-2.6.37.1/kernel/panic.c
30530 +--- linux-2.6.37.1/kernel/panic.c 2011-01-04 19:50:19.000000000 -0500
30531 ++++ linux-2.6.37.1/kernel/panic.c 2011-01-17 02:41:02.000000000 -0500
30532 @@ -368,7 +368,7 @@ static void warn_slowpath_common(const c
30533 const char *board;
30534
30535 @@ -50864,9 +50986,9 @@ diff -urNp linux-2.6.37/kernel/panic.c linux-2.6.37/kernel/panic.c
30536 __builtin_return_address(0));
30537 }
30538 EXPORT_SYMBOL(__stack_chk_fail);
30539 -diff -urNp linux-2.6.37/kernel/pid.c linux-2.6.37/kernel/pid.c
30540 ---- linux-2.6.37/kernel/pid.c 2011-01-04 19:50:19.000000000 -0500
30541 -+++ linux-2.6.37/kernel/pid.c 2011-01-17 02:41:02.000000000 -0500
30542 +diff -urNp linux-2.6.37.1/kernel/pid.c linux-2.6.37.1/kernel/pid.c
30543 +--- linux-2.6.37.1/kernel/pid.c 2011-01-04 19:50:19.000000000 -0500
30544 ++++ linux-2.6.37.1/kernel/pid.c 2011-01-17 02:41:02.000000000 -0500
30545 @@ -33,6 +33,7 @@
30546 #include <linux/rculist.h>
30547 #include <linux/bootmem.h>
30548 @@ -50901,9 +51023,9 @@ diff -urNp linux-2.6.37/kernel/pid.c linux-2.6.37/kernel/pid.c
30549 }
30550
30551 struct task_struct *find_task_by_vpid(pid_t vnr)
30552 -diff -urNp linux-2.6.37/kernel/posix-cpu-timers.c linux-2.6.37/kernel/posix-cpu-timers.c
30553 ---- linux-2.6.37/kernel/posix-cpu-timers.c 2011-01-04 19:50:19.000000000 -0500
30554 -+++ linux-2.6.37/kernel/posix-cpu-timers.c 2011-01-17 02:41:02.000000000 -0500
30555 +diff -urNp linux-2.6.37.1/kernel/posix-cpu-timers.c linux-2.6.37.1/kernel/posix-cpu-timers.c
30556 +--- linux-2.6.37.1/kernel/posix-cpu-timers.c 2011-01-04 19:50:19.000000000 -0500
30557 ++++ linux-2.6.37.1/kernel/posix-cpu-timers.c 2011-01-17 02:41:02.000000000 -0500
30558 @@ -6,6 +6,7 @@
30559 #include <linux/posix-timers.h>
30560 #include <linux/errno.h>
30561 @@ -50912,9 +51034,9 @@ diff -urNp linux-2.6.37/kernel/posix-cpu-timers.c linux-2.6.37/kernel/posix-cpu-
30562 #include <asm/uaccess.h>
30563 #include <linux/kernel_stat.h>
30564 #include <trace/events/timer.h>
30565 -diff -urNp linux-2.6.37/kernel/posix-timers.c linux-2.6.37/kernel/posix-timers.c
30566 ---- linux-2.6.37/kernel/posix-timers.c 2011-01-04 19:50:19.000000000 -0500
30567 -+++ linux-2.6.37/kernel/posix-timers.c 2011-01-17 02:41:02.000000000 -0500
30568 +diff -urNp linux-2.6.37.1/kernel/posix-timers.c linux-2.6.37.1/kernel/posix-timers.c
30569 +--- linux-2.6.37.1/kernel/posix-timers.c 2011-01-04 19:50:19.000000000 -0500
30570 ++++ linux-2.6.37.1/kernel/posix-timers.c 2011-01-17 02:41:02.000000000 -0500
30571 @@ -42,6 +42,7 @@
30572 #include <linux/compiler.h>
30573 #include <linux/idr.h>
30574 @@ -50937,9 +51059,9 @@ diff -urNp linux-2.6.37/kernel/posix-timers.c linux-2.6.37/kernel/posix-timers.c
30575 return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
30576 }
30577
30578 -diff -urNp linux-2.6.37/kernel/power/hibernate.c linux-2.6.37/kernel/power/hibernate.c
30579 ---- linux-2.6.37/kernel/power/hibernate.c 2011-01-04 19:50:19.000000000 -0500
30580 -+++ linux-2.6.37/kernel/power/hibernate.c 2011-01-17 02:41:02.000000000 -0500
30581 +diff -urNp linux-2.6.37.1/kernel/power/hibernate.c linux-2.6.37.1/kernel/power/hibernate.c
30582 +--- linux-2.6.37.1/kernel/power/hibernate.c 2011-01-04 19:50:19.000000000 -0500
30583 ++++ linux-2.6.37.1/kernel/power/hibernate.c 2011-01-17 02:41:02.000000000 -0500
30584 @@ -51,14 +51,14 @@ enum {
30585
30586 static int hibernation_mode = HIBERNATION_SHUTDOWN;
30587 @@ -50957,9 +51079,9 @@ diff -urNp linux-2.6.37/kernel/power/hibernate.c linux-2.6.37/kernel/power/hiber
30588 {
30589 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
30590 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
30591 -diff -urNp linux-2.6.37/kernel/power/poweroff.c linux-2.6.37/kernel/power/poweroff.c
30592 ---- linux-2.6.37/kernel/power/poweroff.c 2011-01-04 19:50:19.000000000 -0500
30593 -+++ linux-2.6.37/kernel/power/poweroff.c 2011-01-17 02:41:02.000000000 -0500
30594 +diff -urNp linux-2.6.37.1/kernel/power/poweroff.c linux-2.6.37.1/kernel/power/poweroff.c
30595 +--- linux-2.6.37.1/kernel/power/poweroff.c 2011-01-04 19:50:19.000000000 -0500
30596 ++++ linux-2.6.37.1/kernel/power/poweroff.c 2011-01-17 02:41:02.000000000 -0500
30597 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
30598 .enable_mask = SYSRQ_ENABLE_BOOT,
30599 };
30600 @@ -50969,9 +51091,9 @@ diff -urNp linux-2.6.37/kernel/power/poweroff.c linux-2.6.37/kernel/power/powero
30601 {
30602 register_sysrq_key('o', &sysrq_poweroff_op);
30603 return 0;
30604 -diff -urNp linux-2.6.37/kernel/power/process.c linux-2.6.37/kernel/power/process.c
30605 ---- linux-2.6.37/kernel/power/process.c 2011-01-04 19:50:19.000000000 -0500
30606 -+++ linux-2.6.37/kernel/power/process.c 2011-01-17 02:41:02.000000000 -0500
30607 +diff -urNp linux-2.6.37.1/kernel/power/process.c linux-2.6.37.1/kernel/power/process.c
30608 +--- linux-2.6.37.1/kernel/power/process.c 2011-01-04 19:50:19.000000000 -0500
30609 ++++ linux-2.6.37.1/kernel/power/process.c 2011-01-17 02:41:02.000000000 -0500
30610 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
30611 u64 elapsed_csecs64;
30612 unsigned int elapsed_csecs;
30613 @@ -51014,9 +51136,9 @@ diff -urNp linux-2.6.37/kernel/power/process.c linux-2.6.37/kernel/power/process
30614 break;
30615
30616 if (!pm_check_wakeup_events()) {
30617 -diff -urNp linux-2.6.37/kernel/power/suspend.c linux-2.6.37/kernel/power/suspend.c
30618 ---- linux-2.6.37/kernel/power/suspend.c 2011-01-04 19:50:19.000000000 -0500
30619 -+++ linux-2.6.37/kernel/power/suspend.c 2011-01-17 02:41:02.000000000 -0500
30620 +diff -urNp linux-2.6.37.1/kernel/power/suspend.c linux-2.6.37.1/kernel/power/suspend.c
30621 +--- linux-2.6.37.1/kernel/power/suspend.c 2011-01-04 19:50:19.000000000 -0500
30622 ++++ linux-2.6.37.1/kernel/power/suspend.c 2011-01-17 02:41:02.000000000 -0500
30623 @@ -30,13 +30,13 @@ const char *const pm_states[PM_SUSPEND_M
30624 [PM_SUSPEND_MEM] = "mem",
30625 };
30626 @@ -51033,9 +51155,9 @@ diff -urNp linux-2.6.37/kernel/power/suspend.c linux-2.6.37/kernel/power/suspend
30627 {
30628 mutex_lock(&pm_mutex);
30629 suspend_ops = ops;
30630 -diff -urNp linux-2.6.37/kernel/printk.c linux-2.6.37/kernel/printk.c
30631 ---- linux-2.6.37/kernel/printk.c 2011-01-04 19:50:19.000000000 -0500
30632 -+++ linux-2.6.37/kernel/printk.c 2011-01-17 02:41:02.000000000 -0500
30633 +diff -urNp linux-2.6.37.1/kernel/printk.c linux-2.6.37.1/kernel/printk.c
30634 +--- linux-2.6.37.1/kernel/printk.c 2011-01-04 19:50:19.000000000 -0500
30635 ++++ linux-2.6.37.1/kernel/printk.c 2011-01-17 02:41:02.000000000 -0500
30636 @@ -274,6 +274,11 @@ int do_syslog(int type, char __user *buf
30637 char c;
30638 int error = 0;
30639 @@ -51048,9 +51170,9 @@ diff -urNp linux-2.6.37/kernel/printk.c linux-2.6.37/kernel/printk.c
30640 /*
30641 * If this is from /proc/kmsg we only do the capabilities checks
30642 * at open time.
30643 -diff -urNp linux-2.6.37/kernel/ptrace.c linux-2.6.37/kernel/ptrace.c
30644 ---- linux-2.6.37/kernel/ptrace.c 2011-01-04 19:50:19.000000000 -0500
30645 -+++ linux-2.6.37/kernel/ptrace.c 2011-02-12 10:37:18.000000000 -0500
30646 +diff -urNp linux-2.6.37.1/kernel/ptrace.c linux-2.6.37.1/kernel/ptrace.c
30647 +--- linux-2.6.37.1/kernel/ptrace.c 2011-02-22 16:05:31.000000000 -0500
30648 ++++ linux-2.6.37.1/kernel/ptrace.c 2011-02-12 10:37:18.000000000 -0500
30649 @@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_stru
30650 cred->gid != tcred->egid ||
30651 cred->gid != tcred->sgid ||
30652 @@ -51078,15 +51200,6 @@ diff -urNp linux-2.6.37/kernel/ptrace.c linux-2.6.37/kernel/ptrace.c
30653 task->ptrace |= PT_PTRACE_CAP;
30654
30655 __ptrace_link(task, current);
30656 -@@ -313,7 +313,7 @@ int ptrace_detach(struct task_struct *ch
30657 - child->exit_code = data;
30658 - dead = __ptrace_detach(current, child);
30659 - if (!child->exit_state)
30660 -- wake_up_process(child);
30661 -+ wake_up_state(child, TASK_TRACED | TASK_STOPPED);
30662 - }
30663 - write_unlock_irq(&tasklist_lock);
30664 -
30665 @@ -369,7 +369,7 @@ int ptrace_readdata(struct task_struct *
30666 break;
30667 return -EIO;
30668 @@ -51160,9 +51273,9 @@ diff -urNp linux-2.6.37/kernel/ptrace.c linux-2.6.37/kernel/ptrace.c
30669 goto out_put_task_struct;
30670 }
30671
30672 -diff -urNp linux-2.6.37/kernel/rcutree.c linux-2.6.37/kernel/rcutree.c
30673 ---- linux-2.6.37/kernel/rcutree.c 2011-01-04 19:50:19.000000000 -0500
30674 -+++ linux-2.6.37/kernel/rcutree.c 2011-01-17 02:41:02.000000000 -0500
30675 +diff -urNp linux-2.6.37.1/kernel/rcutree.c linux-2.6.37.1/kernel/rcutree.c
30676 +--- linux-2.6.37.1/kernel/rcutree.c 2011-01-04 19:50:19.000000000 -0500
30677 ++++ linux-2.6.37.1/kernel/rcutree.c 2011-01-17 02:41:02.000000000 -0500
30678 @@ -1394,7 +1394,7 @@ __rcu_process_callbacks(struct rcu_state
30679 /*
30680 * Do softirq processing for the current CPU.
30681 @@ -51172,9 +51285,9 @@ diff -urNp linux-2.6.37/kernel/rcutree.c linux-2.6.37/kernel/rcutree.c
30682 {
30683 /*
30684 * Memory references from any prior RCU read-side critical sections
30685 -diff -urNp linux-2.6.37/kernel/rcutree_plugin.h linux-2.6.37/kernel/rcutree_plugin.h
30686 ---- linux-2.6.37/kernel/rcutree_plugin.h 2011-01-04 19:50:19.000000000 -0500
30687 -+++ linux-2.6.37/kernel/rcutree_plugin.h 2011-01-17 02:41:02.000000000 -0500
30688 +diff -urNp linux-2.6.37.1/kernel/rcutree_plugin.h linux-2.6.37.1/kernel/rcutree_plugin.h
30689 +--- linux-2.6.37.1/kernel/rcutree_plugin.h 2011-01-04 19:50:19.000000000 -0500
30690 ++++ linux-2.6.37.1/kernel/rcutree_plugin.h 2011-01-17 02:41:02.000000000 -0500
30691 @@ -729,7 +729,7 @@ void synchronize_rcu_expedited(void)
30692
30693 /* Clean up and exit. */
30694 @@ -51184,9 +51297,9 @@ diff -urNp linux-2.6.37/kernel/rcutree_plugin.h linux-2.6.37/kernel/rcutree_plug
30695 unlock_mb_ret:
30696 mutex_unlock(&sync_rcu_preempt_exp_mutex);
30697 mb_ret:
30698 -diff -urNp linux-2.6.37/kernel/resource.c linux-2.6.37/kernel/resource.c
30699 ---- linux-2.6.37/kernel/resource.c 2011-01-04 19:50:19.000000000 -0500
30700 -+++ linux-2.6.37/kernel/resource.c 2011-01-17 02:41:02.000000000 -0500
30701 +diff -urNp linux-2.6.37.1/kernel/resource.c linux-2.6.37.1/kernel/resource.c
30702 +--- linux-2.6.37.1/kernel/resource.c 2011-01-04 19:50:19.000000000 -0500
30703 ++++ linux-2.6.37.1/kernel/resource.c 2011-01-17 02:41:02.000000000 -0500
30704 @@ -133,8 +133,18 @@ static const struct file_operations proc
30705
30706 static int __init ioresources_init(void)
30707 @@ -51206,9 +51319,9 @@ diff -urNp linux-2.6.37/kernel/resource.c linux-2.6.37/kernel/resource.c
30708 return 0;
30709 }
30710 __initcall(ioresources_init);
30711 -diff -urNp linux-2.6.37/kernel/rtmutex.c linux-2.6.37/kernel/rtmutex.c
30712 ---- linux-2.6.37/kernel/rtmutex.c 2011-01-04 19:50:19.000000000 -0500
30713 -+++ linux-2.6.37/kernel/rtmutex.c 2011-01-17 02:41:02.000000000 -0500
30714 +diff -urNp linux-2.6.37.1/kernel/rtmutex.c linux-2.6.37.1/kernel/rtmutex.c
30715 +--- linux-2.6.37.1/kernel/rtmutex.c 2011-01-04 19:50:19.000000000 -0500
30716 ++++ linux-2.6.37.1/kernel/rtmutex.c 2011-01-17 02:41:02.000000000 -0500
30717 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
30718 */
30719 raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
30720 @@ -51218,10 +51331,10 @@ diff -urNp linux-2.6.37/kernel/rtmutex.c linux-2.6.37/kernel/rtmutex.c
30721 WARN_ON(pendowner->pi_blocked_on != waiter);
30722 WARN_ON(pendowner->pi_blocked_on->lock != lock);
30723
30724 -diff -urNp linux-2.6.37/kernel/sched.c linux-2.6.37/kernel/sched.c
30725 ---- linux-2.6.37/kernel/sched.c 2011-01-04 19:50:19.000000000 -0500
30726 -+++ linux-2.6.37/kernel/sched.c 2011-01-17 02:41:02.000000000 -0500
30727 -@@ -4770,6 +4770,8 @@ int can_nice(const struct task_struct *p
30728 +diff -urNp linux-2.6.37.1/kernel/sched.c linux-2.6.37.1/kernel/sched.c
30729 +--- linux-2.6.37.1/kernel/sched.c 2011-02-22 16:05:31.000000000 -0500
30730 ++++ linux-2.6.37.1/kernel/sched.c 2011-02-22 16:05:44.000000000 -0500
30731 +@@ -4773,6 +4773,8 @@ int can_nice(const struct task_struct *p
30732 /* convert nice value [19,-20] to rlimit style value [1,40] */
30733 int nice_rlim = 20 - nice;
30734
30735 @@ -51230,7 +51343,7 @@ diff -urNp linux-2.6.37/kernel/sched.c linux-2.6.37/kernel/sched.c
30736 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
30737 capable(CAP_SYS_NICE));
30738 }
30739 -@@ -4803,7 +4805,8 @@ SYSCALL_DEFINE1(nice, int, increment)
30740 +@@ -4806,7 +4808,8 @@ SYSCALL_DEFINE1(nice, int, increment)
30741 if (nice > 19)
30742 nice = 19;
30743
30744 @@ -51240,7 +51353,7 @@ diff -urNp linux-2.6.37/kernel/sched.c linux-2.6.37/kernel/sched.c
30745 return -EPERM;
30746
30747 retval = security_task_setnice(current, nice);
30748 -@@ -4946,6 +4949,7 @@ recheck:
30749 +@@ -4949,6 +4952,7 @@ recheck:
30750 unsigned long rlim_rtprio =
30751 task_rlimit(p, RLIMIT_RTPRIO);
30752
30753 @@ -51248,7 +51361,7 @@ diff -urNp linux-2.6.37/kernel/sched.c linux-2.6.37/kernel/sched.c
30754 /* can't set/change the rt policy */
30755 if (policy != p->policy && !rlim_rtprio)
30756 return -EPERM;
30757 -@@ -7155,7 +7159,7 @@ static void init_sched_groups_power(int
30758 +@@ -7158,7 +7162,7 @@ static void init_sched_groups_power(int
30759 long power;
30760 int weight;
30761
30762 @@ -51257,9 +51370,9 @@ diff -urNp linux-2.6.37/kernel/sched.c linux-2.6.37/kernel/sched.c
30763
30764 if (cpu != group_first_cpu(sd->groups))
30765 return;
30766 -diff -urNp linux-2.6.37/kernel/sched_fair.c linux-2.6.37/kernel/sched_fair.c
30767 ---- linux-2.6.37/kernel/sched_fair.c 2011-01-04 19:50:19.000000000 -0500
30768 -+++ linux-2.6.37/kernel/sched_fair.c 2011-01-17 02:41:02.000000000 -0500
30769 +diff -urNp linux-2.6.37.1/kernel/sched_fair.c linux-2.6.37.1/kernel/sched_fair.c
30770 +--- linux-2.6.37.1/kernel/sched_fair.c 2011-01-04 19:50:19.000000000 -0500
30771 ++++ linux-2.6.37.1/kernel/sched_fair.c 2011-01-17 02:41:02.000000000 -0500
30772 @@ -3724,7 +3724,7 @@ static void nohz_idle_balance(int this_c
30773 * run_rebalance_domains is triggered when needed from the scheduler tick.
30774 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
30775 @@ -51269,9 +51382,9 @@ diff -urNp linux-2.6.37/kernel/sched_fair.c linux-2.6.37/kernel/sched_fair.c
30776 {
30777 int this_cpu = smp_processor_id();
30778 struct rq *this_rq = cpu_rq(this_cpu);
30779 -diff -urNp linux-2.6.37/kernel/signal.c linux-2.6.37/kernel/signal.c
30780 ---- linux-2.6.37/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
30781 -+++ linux-2.6.37/kernel/signal.c 2011-02-12 11:22:39.000000000 -0500
30782 +diff -urNp linux-2.6.37.1/kernel/signal.c linux-2.6.37.1/kernel/signal.c
30783 +--- linux-2.6.37.1/kernel/signal.c 2011-01-04 19:50:19.000000000 -0500
30784 ++++ linux-2.6.37.1/kernel/signal.c 2011-02-12 11:22:39.000000000 -0500
30785 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
30786
30787 int print_fatal_signals __read_mostly;
30788 @@ -51374,10 +51487,10 @@ diff -urNp linux-2.6.37/kernel/signal.c linux-2.6.37/kernel/signal.c
30789
30790 return ret;
30791 }
30792 -diff -urNp linux-2.6.37/kernel/smp.c linux-2.6.37/kernel/smp.c
30793 ---- linux-2.6.37/kernel/smp.c 2011-01-04 19:50:19.000000000 -0500
30794 -+++ linux-2.6.37/kernel/smp.c 2011-01-17 02:41:02.000000000 -0500
30795 -@@ -510,22 +510,22 @@ int smp_call_function(smp_call_func_t fu
30796 +diff -urNp linux-2.6.37.1/kernel/smp.c linux-2.6.37.1/kernel/smp.c
30797 +--- linux-2.6.37.1/kernel/smp.c 2011-02-22 16:05:31.000000000 -0500
30798 ++++ linux-2.6.37.1/kernel/smp.c 2011-02-22 16:05:44.000000000 -0500
30799 +@@ -540,22 +540,22 @@ int smp_call_function(smp_call_func_t fu
30800 }
30801 EXPORT_SYMBOL(smp_call_function);
30802
30803 @@ -51404,9 +51517,9 @@ diff -urNp linux-2.6.37/kernel/smp.c linux-2.6.37/kernel/smp.c
30804 {
30805 raw_spin_unlock_irq(&call_function.lock);
30806 }
30807 -diff -urNp linux-2.6.37/kernel/softirq.c linux-2.6.37/kernel/softirq.c
30808 ---- linux-2.6.37/kernel/softirq.c 2011-01-04 19:50:19.000000000 -0500
30809 -+++ linux-2.6.37/kernel/softirq.c 2011-01-17 02:41:02.000000000 -0500
30810 +diff -urNp linux-2.6.37.1/kernel/softirq.c linux-2.6.37.1/kernel/softirq.c
30811 +--- linux-2.6.37.1/kernel/softirq.c 2011-01-04 19:50:19.000000000 -0500
30812 ++++ linux-2.6.37.1/kernel/softirq.c 2011-01-17 02:41:02.000000000 -0500
30813 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
30814
30815 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
30816 @@ -51461,9 +51574,9 @@ diff -urNp linux-2.6.37/kernel/softirq.c linux-2.6.37/kernel/softirq.c
30817 {
30818 struct tasklet_struct *list;
30819
30820 -diff -urNp linux-2.6.37/kernel/sys.c linux-2.6.37/kernel/sys.c
30821 ---- linux-2.6.37/kernel/sys.c 2011-01-04 19:50:19.000000000 -0500
30822 -+++ linux-2.6.37/kernel/sys.c 2011-01-17 02:41:02.000000000 -0500
30823 +diff -urNp linux-2.6.37.1/kernel/sys.c linux-2.6.37.1/kernel/sys.c
30824 +--- linux-2.6.37.1/kernel/sys.c 2011-02-22 16:05:31.000000000 -0500
30825 ++++ linux-2.6.37.1/kernel/sys.c 2011-02-22 16:05:44.000000000 -0500
30826 @@ -134,6 +134,12 @@ static int set_one_prio(struct task_stru
30827 error = -EACCES;
30828 goto out;
30829 @@ -51576,7 +51689,7 @@ diff -urNp linux-2.6.37/kernel/sys.c linux-2.6.37/kernel/sys.c
30830 abort_creds(new);
30831 return old_fsgid;
30832
30833 -@@ -1607,7 +1643,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
30834 +@@ -1608,7 +1644,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
30835 error = get_dumpable(me->mm);
30836 break;
30837 case PR_SET_DUMPABLE:
30838 @@ -51585,9 +51698,9 @@ diff -urNp linux-2.6.37/kernel/sys.c linux-2.6.37/kernel/sys.c
30839 error = -EINVAL;
30840 break;
30841 }
30842 -diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30843 ---- linux-2.6.37/kernel/sysctl.c 2011-01-04 19:50:19.000000000 -0500
30844 -+++ linux-2.6.37/kernel/sysctl.c 2011-01-17 02:41:02.000000000 -0500
30845 +diff -urNp linux-2.6.37.1/kernel/sysctl.c linux-2.6.37.1/kernel/sysctl.c
30846 +--- linux-2.6.37.1/kernel/sysctl.c 2011-02-22 16:05:31.000000000 -0500
30847 ++++ linux-2.6.37.1/kernel/sysctl.c 2011-02-22 16:05:44.000000000 -0500
30848 @@ -83,6 +83,13 @@
30849
30850
30851 @@ -51602,7 +51715,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30852
30853 /* External variables not in a header file. */
30854 extern int sysctl_overcommit_memory;
30855 -@@ -188,6 +195,7 @@ static int sysrq_sysctl_handler(ctl_tabl
30856 +@@ -189,6 +196,7 @@ static int sysrq_sysctl_handler(ctl_tabl
30857 }
30858
30859 #endif
30860 @@ -51610,7 +51723,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30861
30862 static struct ctl_table root_table[];
30863 static struct ctl_table_root sysctl_table_root;
30864 -@@ -217,6 +225,20 @@ extern struct ctl_table epoll_table[];
30865 +@@ -218,6 +226,20 @@ extern struct ctl_table epoll_table[];
30866 int sysctl_legacy_va_layout;
30867 #endif
30868
30869 @@ -51631,7 +51744,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30870 /* The default sysctl tables: */
30871
30872 static struct ctl_table root_table[] = {
30873 -@@ -269,6 +291,22 @@ static int max_extfrag_threshold = 1000;
30874 +@@ -270,6 +292,22 @@ static int max_extfrag_threshold = 1000;
30875 #endif
30876
30877 static struct ctl_table kern_table[] = {
30878 @@ -51654,7 +51767,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30879 {
30880 .procname = "sched_child_runs_first",
30881 .data = &sysctl_sched_child_runs_first,
30882 -@@ -549,7 +587,7 @@ static struct ctl_table kern_table[] = {
30883 +@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
30884 .data = &modprobe_path,
30885 .maxlen = KMOD_PATH_LEN,
30886 .mode = 0644,
30887 @@ -51663,7 +51776,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30888 },
30889 {
30890 .procname = "modules_disabled",
30891 -@@ -1180,6 +1218,13 @@ static struct ctl_table vm_table[] = {
30892 +@@ -1181,6 +1219,13 @@ static struct ctl_table vm_table[] = {
30893 .proc_handler = proc_dointvec_minmax,
30894 .extra1 = &zero,
30895 },
30896 @@ -51677,7 +51790,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30897 #else
30898 {
30899 .procname = "nr_trim_pages",
30900 -@@ -1695,6 +1740,16 @@ int sysctl_perm(struct ctl_table_root *r
30901 +@@ -1696,6 +1741,16 @@ int sysctl_perm(struct ctl_table_root *r
30902 int error;
30903 int mode;
30904
30905 @@ -51694,7 +51807,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30906 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
30907 if (error)
30908 return error;
30909 -@@ -2102,6 +2157,16 @@ int proc_dostring(struct ctl_table *tabl
30910 +@@ -2103,6 +2158,16 @@ int proc_dostring(struct ctl_table *tabl
30911 buffer, lenp, ppos);
30912 }
30913
30914 @@ -51711,7 +51824,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30915 static size_t proc_skip_spaces(char **buf)
30916 {
30917 size_t ret;
30918 -@@ -2207,6 +2272,8 @@ static int proc_put_long(void __user **b
30919 +@@ -2208,6 +2273,8 @@ static int proc_put_long(void __user **b
30920 len = strlen(tmp);
30921 if (len > *size)
30922 len = *size;
30923 @@ -51720,7 +51833,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30924 if (copy_to_user(*buf, tmp, len))
30925 return -EFAULT;
30926 *size -= len;
30927 -@@ -2512,8 +2579,11 @@ static int __do_proc_doulongvec_minmax(v
30928 +@@ -2513,8 +2580,11 @@ static int __do_proc_doulongvec_minmax(v
30929 *i = val;
30930 } else {
30931 val = convdiv * (*i) / convmul;
30932 @@ -51733,7 +51846,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30933 err = proc_put_long(&buffer, &left, val, false);
30934 if (err)
30935 break;
30936 -@@ -2908,6 +2978,12 @@ int proc_dostring(struct ctl_table *tabl
30937 +@@ -2909,6 +2979,12 @@ int proc_dostring(struct ctl_table *tabl
30938 return -ENOSYS;
30939 }
30940
30941 @@ -51746,7 +51859,7 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30942 int proc_dointvec(struct ctl_table *table, int write,
30943 void __user *buffer, size_t *lenp, loff_t *ppos)
30944 {
30945 -@@ -2964,6 +3040,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
30946 +@@ -2965,6 +3041,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
30947 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
30948 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
30949 EXPORT_SYMBOL(proc_dostring);
30950 @@ -51754,9 +51867,9 @@ diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
30951 EXPORT_SYMBOL(proc_doulongvec_minmax);
30952 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
30953 EXPORT_SYMBOL(register_sysctl_table);
30954 -diff -urNp linux-2.6.37/kernel/sysctl_check.c linux-2.6.37/kernel/sysctl_check.c
30955 ---- linux-2.6.37/kernel/sysctl_check.c 2011-01-04 19:50:19.000000000 -0500
30956 -+++ linux-2.6.37/kernel/sysctl_check.c 2011-01-17 02:41:02.000000000 -0500
30957 +diff -urNp linux-2.6.37.1/kernel/sysctl_check.c linux-2.6.37.1/kernel/sysctl_check.c
30958 +--- linux-2.6.37.1/kernel/sysctl_check.c 2011-01-04 19:50:19.000000000 -0500
30959 ++++ linux-2.6.37.1/kernel/sysctl_check.c 2011-01-17 02:41:02.000000000 -0500
30960 @@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n
30961 set_fail(&fail, table, "Directory with extra2");
30962 } else {
30963 @@ -51765,9 +51878,9 @@ diff -urNp linux-2.6.37/kernel/sysctl_check.c linux-2.6.37/kernel/sysctl_check.c
30964 (table->proc_handler == proc_dointvec) ||
30965 (table->proc_handler == proc_dointvec_minmax) ||
30966 (table->proc_handler == proc_dointvec_jiffies) ||
30967 -diff -urNp linux-2.6.37/kernel/taskstats.c linux-2.6.37/kernel/taskstats.c
30968 ---- linux-2.6.37/kernel/taskstats.c 2011-01-04 19:50:19.000000000 -0500
30969 -+++ linux-2.6.37/kernel/taskstats.c 2011-01-17 02:41:02.000000000 -0500
30970 +diff -urNp linux-2.6.37.1/kernel/taskstats.c linux-2.6.37.1/kernel/taskstats.c
30971 +--- linux-2.6.37.1/kernel/taskstats.c 2011-01-04 19:50:19.000000000 -0500
30972 ++++ linux-2.6.37.1/kernel/taskstats.c 2011-01-17 02:41:02.000000000 -0500
30973 @@ -27,9 +27,12 @@
30974 #include <linux/cgroup.h>
30975 #include <linux/fs.h>
30976 @@ -51791,9 +51904,9 @@ diff -urNp linux-2.6.37/kernel/taskstats.c linux-2.6.37/kernel/taskstats.c
30977 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
30978 return cmd_attr_register_cpumask(info);
30979 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
30980 -diff -urNp linux-2.6.37/kernel/time/tick-broadcast.c linux-2.6.37/kernel/time/tick-broadcast.c
30981 ---- linux-2.6.37/kernel/time/tick-broadcast.c 2011-01-04 19:50:19.000000000 -0500
30982 -+++ linux-2.6.37/kernel/time/tick-broadcast.c 2011-01-17 02:41:02.000000000 -0500
30983 +diff -urNp linux-2.6.37.1/kernel/time/tick-broadcast.c linux-2.6.37.1/kernel/time/tick-broadcast.c
30984 +--- linux-2.6.37.1/kernel/time/tick-broadcast.c 2011-01-04 19:50:19.000000000 -0500
30985 ++++ linux-2.6.37.1/kernel/time/tick-broadcast.c 2011-01-17 02:41:02.000000000 -0500
30986 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
30987 * then clear the broadcast bit.
30988 */
30989 @@ -51803,9 +51916,9 @@ diff -urNp linux-2.6.37/kernel/time/tick-broadcast.c linux-2.6.37/kernel/time/ti
30990
30991 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
30992 tick_broadcast_clear_oneshot(cpu);
30993 -diff -urNp linux-2.6.37/kernel/time/timekeeping.c linux-2.6.37/kernel/time/timekeeping.c
30994 ---- linux-2.6.37/kernel/time/timekeeping.c 2011-01-04 19:50:19.000000000 -0500
30995 -+++ linux-2.6.37/kernel/time/timekeeping.c 2011-01-17 02:41:02.000000000 -0500
30996 +diff -urNp linux-2.6.37.1/kernel/time/timekeeping.c linux-2.6.37.1/kernel/time/timekeeping.c
30997 +--- linux-2.6.37.1/kernel/time/timekeeping.c 2011-01-04 19:50:19.000000000 -0500
30998 ++++ linux-2.6.37.1/kernel/time/timekeeping.c 2011-01-17 02:41:02.000000000 -0500
30999 @@ -14,6 +14,7 @@
31000 #include <linux/init.h>
31001 #include <linux/mm.h>
31002 @@ -51823,9 +51936,9 @@ diff -urNp linux-2.6.37/kernel/time/timekeeping.c linux-2.6.37/kernel/time/timek
31003 write_seqlock_irqsave(&xtime_lock, flags);
31004
31005 timekeeping_forward_now();
31006 -diff -urNp linux-2.6.37/kernel/time/timer_list.c linux-2.6.37/kernel/time/timer_list.c
31007 ---- linux-2.6.37/kernel/time/timer_list.c 2011-01-04 19:50:19.000000000 -0500
31008 -+++ linux-2.6.37/kernel/time/timer_list.c 2011-01-17 02:41:02.000000000 -0500
31009 +diff -urNp linux-2.6.37.1/kernel/time/timer_list.c linux-2.6.37.1/kernel/time/timer_list.c
31010 +--- linux-2.6.37.1/kernel/time/timer_list.c 2011-01-04 19:50:19.000000000 -0500
31011 ++++ linux-2.6.37.1/kernel/time/timer_list.c 2011-01-17 02:41:02.000000000 -0500
31012 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
31013
31014 static void print_name_offset(struct seq_file *m, void *sym)
31015 @@ -51867,9 +51980,9 @@ diff -urNp linux-2.6.37/kernel/time/timer_list.c linux-2.6.37/kernel/time/timer_
31016 if (!pe)
31017 return -ENOMEM;
31018 return 0;
31019 -diff -urNp linux-2.6.37/kernel/time/timer_stats.c linux-2.6.37/kernel/time/timer_stats.c
31020 ---- linux-2.6.37/kernel/time/timer_stats.c 2011-01-04 19:50:19.000000000 -0500
31021 -+++ linux-2.6.37/kernel/time/timer_stats.c 2011-01-17 02:41:02.000000000 -0500
31022 +diff -urNp linux-2.6.37.1/kernel/time/timer_stats.c linux-2.6.37.1/kernel/time/timer_stats.c
31023 +--- linux-2.6.37.1/kernel/time/timer_stats.c 2011-01-04 19:50:19.000000000 -0500
31024 ++++ linux-2.6.37.1/kernel/time/timer_stats.c 2011-01-17 02:41:02.000000000 -0500
31025 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
31026
31027 static void print_name_offset(struct seq_file *m, unsigned long addr)
31028 @@ -51899,9 +52012,9 @@ diff -urNp linux-2.6.37/kernel/time/timer_stats.c linux-2.6.37/kernel/time/timer
31029 if (!pe)
31030 return -ENOMEM;
31031 return 0;
31032 -diff -urNp linux-2.6.37/kernel/time.c linux-2.6.37/kernel/time.c
31033 ---- linux-2.6.37/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
31034 -+++ linux-2.6.37/kernel/time.c 2011-01-17 02:41:02.000000000 -0500
31035 +diff -urNp linux-2.6.37.1/kernel/time.c linux-2.6.37.1/kernel/time.c
31036 +--- linux-2.6.37.1/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
31037 ++++ linux-2.6.37.1/kernel/time.c 2011-01-17 02:41:02.000000000 -0500
31038 @@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec
31039 return error;
31040
31041 @@ -51932,9 +52045,9 @@ diff -urNp linux-2.6.37/kernel/time.c linux-2.6.37/kernel/time.c
31042 {
31043 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
31044 return (USEC_PER_SEC / HZ) * j;
31045 -diff -urNp linux-2.6.37/kernel/timer.c linux-2.6.37/kernel/timer.c
31046 ---- linux-2.6.37/kernel/timer.c 2011-01-04 19:50:19.000000000 -0500
31047 -+++ linux-2.6.37/kernel/timer.c 2011-01-17 02:41:02.000000000 -0500
31048 +diff -urNp linux-2.6.37.1/kernel/timer.c linux-2.6.37.1/kernel/timer.c
31049 +--- linux-2.6.37.1/kernel/timer.c 2011-01-04 19:50:19.000000000 -0500
31050 ++++ linux-2.6.37.1/kernel/timer.c 2011-01-17 02:41:02.000000000 -0500
31051 @@ -1296,7 +1296,7 @@ void update_process_times(int user_tick)
31052 /*
31053 * This function runs timers and the timer-tq in bottom half context.
31054 @@ -51944,9 +52057,9 @@ diff -urNp linux-2.6.37/kernel/timer.c linux-2.6.37/kernel/timer.c
31055 {
31056 struct tvec_base *base = __get_cpu_var(tvec_bases);
31057
31058 -diff -urNp linux-2.6.37/kernel/trace/ftrace.c linux-2.6.37/kernel/trace/ftrace.c
31059 ---- linux-2.6.37/kernel/trace/ftrace.c 2011-01-04 19:50:19.000000000 -0500
31060 -+++ linux-2.6.37/kernel/trace/ftrace.c 2011-01-17 02:41:02.000000000 -0500
31061 +diff -urNp linux-2.6.37.1/kernel/trace/ftrace.c linux-2.6.37.1/kernel/trace/ftrace.c
31062 +--- linux-2.6.37.1/kernel/trace/ftrace.c 2011-01-04 19:50:19.000000000 -0500
31063 ++++ linux-2.6.37.1/kernel/trace/ftrace.c 2011-01-17 02:41:02.000000000 -0500
31064 @@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod,
31065
31066 ip = rec->ip;
31067 @@ -51968,9 +52081,9 @@ diff -urNp linux-2.6.37/kernel/trace/ftrace.c linux-2.6.37/kernel/trace/ftrace.c
31068 }
31069
31070 /*
31071 -diff -urNp linux-2.6.37/kernel/trace/ring_buffer.c linux-2.6.37/kernel/trace/ring_buffer.c
31072 ---- linux-2.6.37/kernel/trace/ring_buffer.c 2011-01-04 19:50:19.000000000 -0500
31073 -+++ linux-2.6.37/kernel/trace/ring_buffer.c 2011-01-17 02:41:02.000000000 -0500
31074 +diff -urNp linux-2.6.37.1/kernel/trace/ring_buffer.c linux-2.6.37.1/kernel/trace/ring_buffer.c
31075 +--- linux-2.6.37.1/kernel/trace/ring_buffer.c 2011-01-04 19:50:19.000000000 -0500
31076 ++++ linux-2.6.37.1/kernel/trace/ring_buffer.c 2011-01-17 02:41:02.000000000 -0500
31077 @@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st
31078 * the reader page). But if the next page is a header page,
31079 * its flags will be non zero.
31080 @@ -51980,10 +52093,10 @@ diff -urNp linux-2.6.37/kernel/trace/ring_buffer.c linux-2.6.37/kernel/trace/rin
31081 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
31082 struct buffer_page *page, struct list_head *list)
31083 {
31084 -diff -urNp linux-2.6.37/kernel/trace/trace.c linux-2.6.37/kernel/trace/trace.c
31085 ---- linux-2.6.37/kernel/trace/trace.c 2011-01-04 19:50:19.000000000 -0500
31086 -+++ linux-2.6.37/kernel/trace/trace.c 2011-01-17 02:41:02.000000000 -0500
31087 -@@ -3969,10 +3969,9 @@ static const struct file_operations trac
31088 +diff -urNp linux-2.6.37.1/kernel/trace/trace.c linux-2.6.37.1/kernel/trace/trace.c
31089 +--- linux-2.6.37.1/kernel/trace/trace.c 2011-02-22 16:05:31.000000000 -0500
31090 ++++ linux-2.6.37.1/kernel/trace/trace.c 2011-02-22 16:05:44.000000000 -0500
31091 +@@ -3967,10 +3967,9 @@ static const struct file_operations trac
31092 };
31093 #endif
31094
31095 @@ -51995,7 +52108,7 @@ diff -urNp linux-2.6.37/kernel/trace/trace.c linux-2.6.37/kernel/trace/trace.c
31096 static int once;
31097
31098 if (d_tracer)
31099 -@@ -3992,10 +3991,9 @@ struct dentry *tracing_init_dentry(void)
31100 +@@ -3990,10 +3989,9 @@ struct dentry *tracing_init_dentry(void)
31101 return d_tracer;
31102 }
31103
31104 @@ -52007,9 +52120,9 @@ diff -urNp linux-2.6.37/kernel/trace/trace.c linux-2.6.37/kernel/trace/trace.c
31105 static int once;
31106 struct dentry *d_tracer;
31107
31108 -diff -urNp linux-2.6.37/kernel/trace/trace_events.c linux-2.6.37/kernel/trace/trace_events.c
31109 ---- linux-2.6.37/kernel/trace/trace_events.c 2011-01-04 19:50:19.000000000 -0500
31110 -+++ linux-2.6.37/kernel/trace/trace_events.c 2011-01-17 02:41:02.000000000 -0500
31111 +diff -urNp linux-2.6.37.1/kernel/trace/trace_events.c linux-2.6.37.1/kernel/trace/trace_events.c
31112 +--- linux-2.6.37.1/kernel/trace/trace_events.c 2011-01-04 19:50:19.000000000 -0500
31113 ++++ linux-2.6.37.1/kernel/trace/trace_events.c 2011-01-17 02:41:02.000000000 -0500
31114 @@ -1231,6 +1231,7 @@ static LIST_HEAD(ftrace_module_file_list
31115 * Modules must own their file_operations to keep up with
31116 * reference counting.
31117 @@ -52018,9 +52131,9 @@ diff -urNp linux-2.6.37/kernel/trace/trace_events.c linux-2.6.37/kernel/trace/tr
31118 struct ftrace_module_file_ops {
31119 struct list_head list;
31120 struct module *mod;
31121 -diff -urNp linux-2.6.37/kernel/trace/trace_output.c linux-2.6.37/kernel/trace/trace_output.c
31122 ---- linux-2.6.37/kernel/trace/trace_output.c 2011-01-04 19:50:19.000000000 -0500
31123 -+++ linux-2.6.37/kernel/trace/trace_output.c 2011-01-17 02:41:02.000000000 -0500
31124 +diff -urNp linux-2.6.37.1/kernel/trace/trace_output.c linux-2.6.37.1/kernel/trace/trace_output.c
31125 +--- linux-2.6.37.1/kernel/trace/trace_output.c 2011-01-04 19:50:19.000000000 -0500
31126 ++++ linux-2.6.37.1/kernel/trace/trace_output.c 2011-01-17 02:41:02.000000000 -0500
31127 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,
31128
31129 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
31130 @@ -52030,9 +52143,9 @@ diff -urNp linux-2.6.37/kernel/trace/trace_output.c linux-2.6.37/kernel/trace/tr
31131 if (p) {
31132 s->len = p - s->buffer;
31133 return 1;
31134 -diff -urNp linux-2.6.37/kernel/trace/trace_stack.c linux-2.6.37/kernel/trace/trace_stack.c
31135 ---- linux-2.6.37/kernel/trace/trace_stack.c 2011-01-04 19:50:19.000000000 -0500
31136 -+++ linux-2.6.37/kernel/trace/trace_stack.c 2011-01-17 02:41:02.000000000 -0500
31137 +diff -urNp linux-2.6.37.1/kernel/trace/trace_stack.c linux-2.6.37.1/kernel/trace/trace_stack.c
31138 +--- linux-2.6.37.1/kernel/trace/trace_stack.c 2011-01-04 19:50:19.000000000 -0500
31139 ++++ linux-2.6.37.1/kernel/trace/trace_stack.c 2011-01-17 02:41:02.000000000 -0500
31140 @@ -50,7 +50,7 @@ static inline void check_stack(void)
31141 return;
31142
31143 @@ -52042,9 +52155,9 @@ diff -urNp linux-2.6.37/kernel/trace/trace_stack.c linux-2.6.37/kernel/trace/tra
31144 return;
31145
31146 local_irq_save(flags);
31147 -diff -urNp linux-2.6.37/lib/bug.c linux-2.6.37/lib/bug.c
31148 ---- linux-2.6.37/lib/bug.c 2011-01-04 19:50:19.000000000 -0500
31149 -+++ linux-2.6.37/lib/bug.c 2011-01-17 02:41:02.000000000 -0500
31150 +diff -urNp linux-2.6.37.1/lib/bug.c linux-2.6.37.1/lib/bug.c
31151 +--- linux-2.6.37.1/lib/bug.c 2011-01-04 19:50:19.000000000 -0500
31152 ++++ linux-2.6.37.1/lib/bug.c 2011-01-17 02:41:02.000000000 -0500
31153 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
31154 return BUG_TRAP_TYPE_NONE;
31155
31156 @@ -52054,9 +52167,9 @@ diff -urNp linux-2.6.37/lib/bug.c linux-2.6.37/lib/bug.c
31157
31158 file = NULL;
31159 line = 0;
31160 -diff -urNp linux-2.6.37/lib/debugobjects.c linux-2.6.37/lib/debugobjects.c
31161 ---- linux-2.6.37/lib/debugobjects.c 2011-01-04 19:50:19.000000000 -0500
31162 -+++ linux-2.6.37/lib/debugobjects.c 2011-01-17 02:41:02.000000000 -0500
31163 +diff -urNp linux-2.6.37.1/lib/debugobjects.c linux-2.6.37.1/lib/debugobjects.c
31164 +--- linux-2.6.37.1/lib/debugobjects.c 2011-01-04 19:50:19.000000000 -0500
31165 ++++ linux-2.6.37.1/lib/debugobjects.c 2011-01-17 02:41:02.000000000 -0500
31166 @@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi
31167 if (limit > 4)
31168 return;
31169 @@ -52066,9 +52179,9 @@ diff -urNp linux-2.6.37/lib/debugobjects.c linux-2.6.37/lib/debugobjects.c
31170 if (is_on_stack == onstack)
31171 return;
31172
31173 -diff -urNp linux-2.6.37/lib/dma-debug.c linux-2.6.37/lib/dma-debug.c
31174 ---- linux-2.6.37/lib/dma-debug.c 2011-01-04 19:50:19.000000000 -0500
31175 -+++ linux-2.6.37/lib/dma-debug.c 2011-01-17 02:41:02.000000000 -0500
31176 +diff -urNp linux-2.6.37.1/lib/dma-debug.c linux-2.6.37.1/lib/dma-debug.c
31177 +--- linux-2.6.37.1/lib/dma-debug.c 2011-01-04 19:50:19.000000000 -0500
31178 ++++ linux-2.6.37.1/lib/dma-debug.c 2011-01-17 02:41:02.000000000 -0500
31179 @@ -862,7 +862,7 @@ out:
31180
31181 static void check_for_stack(struct device *dev, void *addr)
31182 @@ -52078,9 +52191,9 @@ diff -urNp linux-2.6.37/lib/dma-debug.c linux-2.6.37/lib/dma-debug.c
31183 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
31184 "stack [addr=%p]\n", addr);
31185 }
31186 -diff -urNp linux-2.6.37/lib/inflate.c linux-2.6.37/lib/inflate.c
31187 ---- linux-2.6.37/lib/inflate.c 2011-01-04 19:50:19.000000000 -0500
31188 -+++ linux-2.6.37/lib/inflate.c 2011-01-17 02:41:02.000000000 -0500
31189 +diff -urNp linux-2.6.37.1/lib/inflate.c linux-2.6.37.1/lib/inflate.c
31190 +--- linux-2.6.37.1/lib/inflate.c 2011-01-04 19:50:19.000000000 -0500
31191 ++++ linux-2.6.37.1/lib/inflate.c 2011-01-17 02:41:02.000000000 -0500
31192 @@ -269,7 +269,7 @@ static void free(void *where)
31193 malloc_ptr = free_mem_ptr;
31194 }
31195 @@ -52090,9 +52203,9 @@ diff -urNp linux-2.6.37/lib/inflate.c linux-2.6.37/lib/inflate.c
31196 #define free(a) kfree(a)
31197 #endif
31198
31199 -diff -urNp linux-2.6.37/lib/Kconfig.debug linux-2.6.37/lib/Kconfig.debug
31200 ---- linux-2.6.37/lib/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
31201 -+++ linux-2.6.37/lib/Kconfig.debug 2011-01-17 02:41:02.000000000 -0500
31202 +diff -urNp linux-2.6.37.1/lib/Kconfig.debug linux-2.6.37.1/lib/Kconfig.debug
31203 +--- linux-2.6.37.1/lib/Kconfig.debug 2011-01-04 19:50:19.000000000 -0500
31204 ++++ linux-2.6.37.1/lib/Kconfig.debug 2011-01-17 02:41:02.000000000 -0500
31205 @@ -1065,6 +1065,7 @@ config LATENCYTOP
31206 depends on DEBUG_KERNEL
31207 depends on STACKTRACE_SUPPORT
31208 @@ -52101,10 +52214,10 @@ diff -urNp linux-2.6.37/lib/Kconfig.debug linux-2.6.37/lib/Kconfig.debug
31209 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
31210 select KALLSYMS
31211 select KALLSYMS_ALL
31212 -diff -urNp linux-2.6.37/lib/kref.c linux-2.6.37/lib/kref.c
31213 ---- linux-2.6.37/lib/kref.c 2011-01-04 19:50:19.000000000 -0500
31214 -+++ linux-2.6.37/lib/kref.c 2011-01-17 02:41:02.000000000 -0500
31215 -@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
31216 +diff -urNp linux-2.6.37.1/lib/kref.c linux-2.6.37.1/lib/kref.c
31217 +--- linux-2.6.37.1/lib/kref.c 2011-02-22 16:05:31.000000000 -0500
31218 ++++ linux-2.6.37.1/lib/kref.c 2011-02-22 16:05:44.000000000 -0500
31219 +@@ -64,7 +64,7 @@ int kref_test_and_get(struct kref *kref)
31220 */
31221 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
31222 {
31223 @@ -52113,9 +52226,9 @@ diff -urNp linux-2.6.37/lib/kref.c linux-2.6.37/lib/kref.c
31224 WARN_ON(release == (void (*)(struct kref *))kfree);
31225
31226 if (atomic_dec_and_test(&kref->refcount)) {
31227 -diff -urNp linux-2.6.37/lib/radix-tree.c linux-2.6.37/lib/radix-tree.c
31228 ---- linux-2.6.37/lib/radix-tree.c 2011-01-04 19:50:19.000000000 -0500
31229 -+++ linux-2.6.37/lib/radix-tree.c 2011-01-17 02:41:02.000000000 -0500
31230 +diff -urNp linux-2.6.37.1/lib/radix-tree.c linux-2.6.37.1/lib/radix-tree.c
31231 +--- linux-2.6.37.1/lib/radix-tree.c 2011-01-04 19:50:19.000000000 -0500
31232 ++++ linux-2.6.37.1/lib/radix-tree.c 2011-01-17 02:41:02.000000000 -0500
31233 @@ -80,7 +80,7 @@ struct radix_tree_preload {
31234 int nr;
31235 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
31236 @@ -52125,9 +52238,9 @@ diff -urNp linux-2.6.37/lib/radix-tree.c linux-2.6.37/lib/radix-tree.c
31237
31238 static inline void *ptr_to_indirect(void *ptr)
31239 {
31240 -diff -urNp linux-2.6.37/lib/vsprintf.c linux-2.6.37/lib/vsprintf.c
31241 ---- linux-2.6.37/lib/vsprintf.c 2011-01-04 19:50:19.000000000 -0500
31242 -+++ linux-2.6.37/lib/vsprintf.c 2011-01-17 02:41:02.000000000 -0500
31243 +diff -urNp linux-2.6.37.1/lib/vsprintf.c linux-2.6.37.1/lib/vsprintf.c
31244 +--- linux-2.6.37.1/lib/vsprintf.c 2011-01-04 19:50:19.000000000 -0500
31245 ++++ linux-2.6.37.1/lib/vsprintf.c 2011-01-17 02:41:02.000000000 -0500
31246 @@ -16,6 +16,9 @@
31247 * - scnprintf and vscnprintf
31248 */
31249 @@ -52209,14 +52322,14 @@ diff -urNp linux-2.6.37/lib/vsprintf.c linux-2.6.37/lib/vsprintf.c
31250 break;
31251 }
31252
31253 -diff -urNp linux-2.6.37/localversion-grsec linux-2.6.37/localversion-grsec
31254 ---- linux-2.6.37/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
31255 -+++ linux-2.6.37/localversion-grsec 2011-01-17 02:41:02.000000000 -0500
31256 +diff -urNp linux-2.6.37.1/localversion-grsec linux-2.6.37.1/localversion-grsec
31257 +--- linux-2.6.37.1/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
31258 ++++ linux-2.6.37.1/localversion-grsec 2011-01-17 02:41:02.000000000 -0500
31259 @@ -0,0 +1 @@
31260 +-grsec
31261 -diff -urNp linux-2.6.37/Makefile linux-2.6.37/Makefile
31262 ---- linux-2.6.37/Makefile 2011-01-04 19:50:19.000000000 -0500
31263 -+++ linux-2.6.37/Makefile 2011-01-17 02:41:02.000000000 -0500
31264 +diff -urNp linux-2.6.37.1/Makefile linux-2.6.37.1/Makefile
31265 +--- linux-2.6.37.1/Makefile 2011-02-22 16:05:30.000000000 -0500
31266 ++++ linux-2.6.37.1/Makefile 2011-02-22 16:05:42.000000000 -0500
31267 @@ -232,8 +232,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
31268
31269 HOSTCC = gcc
31270 @@ -52237,9 +52350,9 @@ diff -urNp linux-2.6.37/Makefile linux-2.6.37/Makefile
31271
31272 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
31273 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
31274 -diff -urNp linux-2.6.37/mm/bootmem.c linux-2.6.37/mm/bootmem.c
31275 ---- linux-2.6.37/mm/bootmem.c 2011-01-04 19:50:19.000000000 -0500
31276 -+++ linux-2.6.37/mm/bootmem.c 2011-01-17 02:41:02.000000000 -0500
31277 +diff -urNp linux-2.6.37.1/mm/bootmem.c linux-2.6.37.1/mm/bootmem.c
31278 +--- linux-2.6.37.1/mm/bootmem.c 2011-01-04 19:50:19.000000000 -0500
31279 ++++ linux-2.6.37.1/mm/bootmem.c 2011-01-17 02:41:02.000000000 -0500
31280 @@ -201,19 +201,30 @@ static void __init __free_pages_memory(u
31281 unsigned long __init free_all_memory_core_early(int nodeid)
31282 {
31283 @@ -52273,9 +52386,9 @@ diff -urNp linux-2.6.37/mm/bootmem.c linux-2.6.37/mm/bootmem.c
31284
31285 return count;
31286 }
31287 -diff -urNp linux-2.6.37/mm/filemap.c linux-2.6.37/mm/filemap.c
31288 ---- linux-2.6.37/mm/filemap.c 2011-01-04 19:50:19.000000000 -0500
31289 -+++ linux-2.6.37/mm/filemap.c 2011-01-17 02:41:02.000000000 -0500
31290 +diff -urNp linux-2.6.37.1/mm/filemap.c linux-2.6.37.1/mm/filemap.c
31291 +--- linux-2.6.37.1/mm/filemap.c 2011-01-04 19:50:19.000000000 -0500
31292 ++++ linux-2.6.37.1/mm/filemap.c 2011-01-17 02:41:02.000000000 -0500
31293 @@ -1660,7 +1660,7 @@ int generic_file_mmap(struct file * file
31294 struct address_space *mapping = file->f_mapping;
31295
31296 @@ -52293,9 +52406,9 @@ diff -urNp linux-2.6.37/mm/filemap.c linux-2.6.37/mm/filemap.c
31297 if (*pos >= limit) {
31298 send_sig(SIGXFSZ, current, 0);
31299 return -EFBIG;
31300 -diff -urNp linux-2.6.37/mm/fremap.c linux-2.6.37/mm/fremap.c
31301 ---- linux-2.6.37/mm/fremap.c 2011-01-04 19:50:19.000000000 -0500
31302 -+++ linux-2.6.37/mm/fremap.c 2011-01-17 02:41:02.000000000 -0500
31303 +diff -urNp linux-2.6.37.1/mm/fremap.c linux-2.6.37.1/mm/fremap.c
31304 +--- linux-2.6.37.1/mm/fremap.c 2011-01-04 19:50:19.000000000 -0500
31305 ++++ linux-2.6.37.1/mm/fremap.c 2011-01-17 02:41:02.000000000 -0500
31306 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
31307 retry:
31308 vma = find_vma(mm, start);
31309 @@ -52317,9 +52430,9 @@ diff -urNp linux-2.6.37/mm/fremap.c linux-2.6.37/mm/fremap.c
31310 munlock_vma_pages_range(vma, start, start + size);
31311 vma->vm_flags = saved_flags;
31312 }
31313 -diff -urNp linux-2.6.37/mm/highmem.c linux-2.6.37/mm/highmem.c
31314 ---- linux-2.6.37/mm/highmem.c 2011-01-04 19:50:19.000000000 -0500
31315 -+++ linux-2.6.37/mm/highmem.c 2011-01-17 02:41:02.000000000 -0500
31316 +diff -urNp linux-2.6.37.1/mm/highmem.c linux-2.6.37.1/mm/highmem.c
31317 +--- linux-2.6.37.1/mm/highmem.c 2011-01-04 19:50:19.000000000 -0500
31318 ++++ linux-2.6.37.1/mm/highmem.c 2011-01-17 02:41:02.000000000 -0500
31319 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
31320 * So no dangers, even with speculative execution.
31321 */
31322 @@ -52345,9 +52458,9 @@ diff -urNp linux-2.6.37/mm/highmem.c linux-2.6.37/mm/highmem.c
31323 pkmap_count[last_pkmap_nr] = 1;
31324 set_page_address(page, (void *)vaddr);
31325
31326 -diff -urNp linux-2.6.37/mm/hugetlb.c linux-2.6.37/mm/hugetlb.c
31327 ---- linux-2.6.37/mm/hugetlb.c 2011-01-04 19:50:19.000000000 -0500
31328 -+++ linux-2.6.37/mm/hugetlb.c 2011-01-17 02:41:02.000000000 -0500
31329 +diff -urNp linux-2.6.37.1/mm/hugetlb.c linux-2.6.37.1/mm/hugetlb.c
31330 +--- linux-2.6.37.1/mm/hugetlb.c 2011-01-04 19:50:19.000000000 -0500
31331 ++++ linux-2.6.37.1/mm/hugetlb.c 2011-01-17 02:41:02.000000000 -0500
31332 @@ -2373,6 +2373,27 @@ static int unmap_ref_private(struct mm_s
31333 return 1;
31334 }
31335 @@ -52437,9 +52550,9 @@ diff -urNp linux-2.6.37/mm/hugetlb.c linux-2.6.37/mm/hugetlb.c
31336 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
31337 if (!ptep)
31338 return VM_FAULT_OOM;
31339 -diff -urNp linux-2.6.37/mm/Kconfig linux-2.6.37/mm/Kconfig
31340 ---- linux-2.6.37/mm/Kconfig 2011-01-04 19:50:19.000000000 -0500
31341 -+++ linux-2.6.37/mm/Kconfig 2011-01-17 02:41:02.000000000 -0500
31342 +diff -urNp linux-2.6.37.1/mm/Kconfig linux-2.6.37.1/mm/Kconfig
31343 +--- linux-2.6.37.1/mm/Kconfig 2011-01-04 19:50:19.000000000 -0500
31344 ++++ linux-2.6.37.1/mm/Kconfig 2011-01-17 02:41:02.000000000 -0500
31345 @@ -240,7 +240,7 @@ config KSM
31346 config DEFAULT_MMAP_MIN_ADDR
31347 int "Low address space to protect from user allocation"
31348 @@ -52449,9 +52562,9 @@ diff -urNp linux-2.6.37/mm/Kconfig linux-2.6.37/mm/Kconfig
31349 help
31350 This is the portion of low virtual memory which should be protected
31351 from userspace allocation. Keeping a user from writing to low pages
31352 -diff -urNp linux-2.6.37/mm/kmemleak.c linux-2.6.37/mm/kmemleak.c
31353 ---- linux-2.6.37/mm/kmemleak.c 2011-01-04 19:50:19.000000000 -0500
31354 -+++ linux-2.6.37/mm/kmemleak.c 2011-01-17 02:41:02.000000000 -0500
31355 +diff -urNp linux-2.6.37.1/mm/kmemleak.c linux-2.6.37.1/mm/kmemleak.c
31356 +--- linux-2.6.37.1/mm/kmemleak.c 2011-01-04 19:50:19.000000000 -0500
31357 ++++ linux-2.6.37.1/mm/kmemleak.c 2011-01-17 02:41:02.000000000 -0500
31358 @@ -355,7 +355,7 @@ static void print_unreferenced(struct se
31359
31360 for (i = 0; i < object->trace_len; i++) {
31361 @@ -52461,9 +52574,9 @@ diff -urNp linux-2.6.37/mm/kmemleak.c linux-2.6.37/mm/kmemleak.c
31362 }
31363 }
31364
31365 -diff -urNp linux-2.6.37/mm/maccess.c linux-2.6.37/mm/maccess.c
31366 ---- linux-2.6.37/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
31367 -+++ linux-2.6.37/mm/maccess.c 2011-01-17 02:41:02.000000000 -0500
31368 +diff -urNp linux-2.6.37.1/mm/maccess.c linux-2.6.37.1/mm/maccess.c
31369 +--- linux-2.6.37.1/mm/maccess.c 2011-01-04 19:50:19.000000000 -0500
31370 ++++ linux-2.6.37.1/mm/maccess.c 2011-01-17 02:41:02.000000000 -0500
31371 @@ -15,10 +15,10 @@
31372 * happens, handle that and return -EFAULT.
31373 */
31374 @@ -52490,9 +52603,9 @@ diff -urNp linux-2.6.37/mm/maccess.c linux-2.6.37/mm/maccess.c
31375 {
31376 long ret;
31377 mm_segment_t old_fs = get_fs();
31378 -diff -urNp linux-2.6.37/mm/madvise.c linux-2.6.37/mm/madvise.c
31379 ---- linux-2.6.37/mm/madvise.c 2011-01-04 19:50:19.000000000 -0500
31380 -+++ linux-2.6.37/mm/madvise.c 2011-01-17 02:41:02.000000000 -0500
31381 +diff -urNp linux-2.6.37.1/mm/madvise.c linux-2.6.37.1/mm/madvise.c
31382 +--- linux-2.6.37.1/mm/madvise.c 2011-01-04 19:50:19.000000000 -0500
31383 ++++ linux-2.6.37.1/mm/madvise.c 2011-01-17 02:41:02.000000000 -0500
31384 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
31385 pgoff_t pgoff;
31386 unsigned long new_flags = vma->vm_flags;
31387 @@ -52569,9 +52682,9 @@ diff -urNp linux-2.6.37/mm/madvise.c linux-2.6.37/mm/madvise.c
31388 error = 0;
31389 if (end == start)
31390 goto out;
31391 -diff -urNp linux-2.6.37/mm/memory.c linux-2.6.37/mm/memory.c
31392 ---- linux-2.6.37/mm/memory.c 2011-01-04 19:50:19.000000000 -0500
31393 -+++ linux-2.6.37/mm/memory.c 2011-01-17 02:41:02.000000000 -0500
31394 +diff -urNp linux-2.6.37.1/mm/memory.c linux-2.6.37.1/mm/memory.c
31395 +--- linux-2.6.37.1/mm/memory.c 2011-01-04 19:50:19.000000000 -0500
31396 ++++ linux-2.6.37.1/mm/memory.c 2011-01-17 02:41:02.000000000 -0500
31397 @@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
31398 return;
31399
31400 @@ -53101,9 +53214,9 @@ diff -urNp linux-2.6.37/mm/memory.c linux-2.6.37/mm/memory.c
31401 /*
31402 * Make sure the vDSO gets into every core dump.
31403 * Dumping its contents makes post-mortem fully interpretable later
31404 -diff -urNp linux-2.6.37/mm/memory-failure.c linux-2.6.37/mm/memory-failure.c
31405 ---- linux-2.6.37/mm/memory-failure.c 2011-01-04 19:50:19.000000000 -0500
31406 -+++ linux-2.6.37/mm/memory-failure.c 2011-01-17 02:41:02.000000000 -0500
31407 +diff -urNp linux-2.6.37.1/mm/memory-failure.c linux-2.6.37.1/mm/memory-failure.c
31408 +--- linux-2.6.37.1/mm/memory-failure.c 2011-01-04 19:50:19.000000000 -0500
31409 ++++ linux-2.6.37.1/mm/memory-failure.c 2011-01-17 02:41:02.000000000 -0500
31410 @@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r
31411
31412 int sysctl_memory_failure_recovery __read_mostly = 1;
31413 @@ -53176,9 +53289,9 @@ diff -urNp linux-2.6.37/mm/memory-failure.c linux-2.6.37/mm/memory-failure.c
31414 SetPageHWPoison(page);
31415 /* keep elevated page count for bad page */
31416 return ret;
31417 -diff -urNp linux-2.6.37/mm/mempolicy.c linux-2.6.37/mm/mempolicy.c
31418 ---- linux-2.6.37/mm/mempolicy.c 2011-01-04 19:50:19.000000000 -0500
31419 -+++ linux-2.6.37/mm/mempolicy.c 2011-01-17 02:41:02.000000000 -0500
31420 +diff -urNp linux-2.6.37.1/mm/mempolicy.c linux-2.6.37.1/mm/mempolicy.c
31421 +--- linux-2.6.37.1/mm/mempolicy.c 2011-01-04 19:50:19.000000000 -0500
31422 ++++ linux-2.6.37.1/mm/mempolicy.c 2011-01-17 02:41:02.000000000 -0500
31423 @@ -642,6 +642,10 @@ static int mbind_range(struct mm_struct
31424 unsigned long vmstart;
31425 unsigned long vmend;
31426 @@ -53259,10 +53372,10 @@ diff -urNp linux-2.6.37/mm/mempolicy.c linux-2.6.37/mm/mempolicy.c
31427 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
31428 seq_printf(m, " heap");
31429 } else if (vma->vm_start <= mm->start_stack &&
31430 -diff -urNp linux-2.6.37/mm/migrate.c linux-2.6.37/mm/migrate.c
31431 ---- linux-2.6.37/mm/migrate.c 2011-01-04 19:50:19.000000000 -0500
31432 -+++ linux-2.6.37/mm/migrate.c 2011-01-17 02:41:02.000000000 -0500
31433 -@@ -1299,6 +1299,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
31434 +diff -urNp linux-2.6.37.1/mm/migrate.c linux-2.6.37.1/mm/migrate.c
31435 +--- linux-2.6.37.1/mm/migrate.c 2011-02-22 16:05:31.000000000 -0500
31436 ++++ linux-2.6.37.1/mm/migrate.c 2011-02-22 16:05:44.000000000 -0500
31437 +@@ -1278,6 +1278,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
31438 if (!mm)
31439 return -EINVAL;
31440
31441 @@ -53277,7 +53390,7 @@ diff -urNp linux-2.6.37/mm/migrate.c linux-2.6.37/mm/migrate.c
31442 /*
31443 * Check if this process has the right to modify the specified
31444 * process. The right exists if the process has administrative
31445 -@@ -1308,8 +1316,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
31446 +@@ -1287,8 +1295,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
31447 rcu_read_lock();
31448 tcred = __task_cred(task);
31449 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
31450 @@ -53287,9 +53400,9 @@ diff -urNp linux-2.6.37/mm/migrate.c linux-2.6.37/mm/migrate.c
31451 rcu_read_unlock();
31452 err = -EPERM;
31453 goto out;
31454 -diff -urNp linux-2.6.37/mm/mlock.c linux-2.6.37/mm/mlock.c
31455 ---- linux-2.6.37/mm/mlock.c 2011-01-04 19:50:19.000000000 -0500
31456 -+++ linux-2.6.37/mm/mlock.c 2011-01-24 18:04:18.000000000 -0500
31457 +diff -urNp linux-2.6.37.1/mm/mlock.c linux-2.6.37.1/mm/mlock.c
31458 +--- linux-2.6.37.1/mm/mlock.c 2011-01-04 19:50:19.000000000 -0500
31459 ++++ linux-2.6.37.1/mm/mlock.c 2011-01-24 18:04:18.000000000 -0500
31460 @@ -13,6 +13,7 @@
31461 #include <linux/pagemap.h>
31462 #include <linux/mempolicy.h>
31463 @@ -53400,9 +53513,9 @@ diff -urNp linux-2.6.37/mm/mlock.c linux-2.6.37/mm/mlock.c
31464 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
31465 capable(CAP_IPC_LOCK))
31466 ret = do_mlockall(flags);
31467 -diff -urNp linux-2.6.37/mm/mmap.c linux-2.6.37/mm/mmap.c
31468 ---- linux-2.6.37/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
31469 -+++ linux-2.6.37/mm/mmap.c 2011-02-12 11:36:29.000000000 -0500
31470 +diff -urNp linux-2.6.37.1/mm/mmap.c linux-2.6.37.1/mm/mmap.c
31471 +--- linux-2.6.37.1/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
31472 ++++ linux-2.6.37.1/mm/mmap.c 2011-02-12 11:36:29.000000000 -0500
31473 @@ -45,6 +45,16 @@
31474 #define arch_rebalance_pgtables(addr, len) (addr)
31475 #endif
31476 @@ -54641,9 +54754,9 @@ diff -urNp linux-2.6.37/mm/mmap.c linux-2.6.37/mm/mmap.c
31477 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
31478 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
31479
31480 -diff -urNp linux-2.6.37/mm/mprotect.c linux-2.6.37/mm/mprotect.c
31481 ---- linux-2.6.37/mm/mprotect.c 2011-01-04 19:50:19.000000000 -0500
31482 -+++ linux-2.6.37/mm/mprotect.c 2011-01-17 02:41:02.000000000 -0500
31483 +diff -urNp linux-2.6.37.1/mm/mprotect.c linux-2.6.37.1/mm/mprotect.c
31484 +--- linux-2.6.37.1/mm/mprotect.c 2011-01-04 19:50:19.000000000 -0500
31485 ++++ linux-2.6.37.1/mm/mprotect.c 2011-01-17 02:41:02.000000000 -0500
31486 @@ -23,10 +23,16 @@
31487 #include <linux/mmu_notifier.h>
31488 #include <linux/migrate.h>
31489 @@ -54870,9 +54983,9 @@ diff -urNp linux-2.6.37/mm/mprotect.c linux-2.6.37/mm/mprotect.c
31490 nstart = tmp;
31491
31492 if (nstart < prev->vm_end)
31493 -diff -urNp linux-2.6.37/mm/mremap.c linux-2.6.37/mm/mremap.c
31494 ---- linux-2.6.37/mm/mremap.c 2011-01-04 19:50:19.000000000 -0500
31495 -+++ linux-2.6.37/mm/mremap.c 2011-01-17 02:41:02.000000000 -0500
31496 +diff -urNp linux-2.6.37.1/mm/mremap.c linux-2.6.37.1/mm/mremap.c
31497 +--- linux-2.6.37.1/mm/mremap.c 2011-01-04 19:50:19.000000000 -0500
31498 ++++ linux-2.6.37.1/mm/mremap.c 2011-01-17 02:41:02.000000000 -0500
31499 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
31500 continue;
31501 pte = ptep_clear_flush(vma, old_addr, old_pte);
31502 @@ -54977,9 +55090,9 @@ diff -urNp linux-2.6.37/mm/mremap.c linux-2.6.37/mm/mremap.c
31503 }
31504 out:
31505 if (ret & ~PAGE_MASK)
31506 -diff -urNp linux-2.6.37/mm/nommu.c linux-2.6.37/mm/nommu.c
31507 ---- linux-2.6.37/mm/nommu.c 2011-01-04 19:50:19.000000000 -0500
31508 -+++ linux-2.6.37/mm/nommu.c 2011-01-17 02:41:02.000000000 -0500
31509 +diff -urNp linux-2.6.37.1/mm/nommu.c linux-2.6.37.1/mm/nommu.c
31510 +--- linux-2.6.37.1/mm/nommu.c 2011-01-04 19:50:19.000000000 -0500
31511 ++++ linux-2.6.37.1/mm/nommu.c 2011-01-17 02:41:02.000000000 -0500
31512 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
31513 int sysctl_overcommit_ratio = 50; /* default is 50% */
31514 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
31515 @@ -55012,9 +55125,9 @@ diff -urNp linux-2.6.37/mm/nommu.c linux-2.6.37/mm/nommu.c
31516 *region = *vma->vm_region;
31517 new->vm_region = region;
31518
31519 -diff -urNp linux-2.6.37/mm/page_alloc.c linux-2.6.37/mm/page_alloc.c
31520 ---- linux-2.6.37/mm/page_alloc.c 2011-01-04 19:50:19.000000000 -0500
31521 -+++ linux-2.6.37/mm/page_alloc.c 2011-01-17 02:41:02.000000000 -0500
31522 +diff -urNp linux-2.6.37.1/mm/page_alloc.c linux-2.6.37.1/mm/page_alloc.c
31523 +--- linux-2.6.37.1/mm/page_alloc.c 2011-02-22 16:05:31.000000000 -0500
31524 ++++ linux-2.6.37.1/mm/page_alloc.c 2011-02-22 16:05:44.000000000 -0500
31525 @@ -648,6 +648,10 @@ static bool free_pages_prepare(struct pa
31526 int i;
31527 int bad = 0;
31528 @@ -55050,7 +55163,7 @@ diff -urNp linux-2.6.37/mm/page_alloc.c linux-2.6.37/mm/page_alloc.c
31529
31530 if (order && (gfp_flags & __GFP_COMP))
31531 prep_compound_page(page, order);
31532 -@@ -4014,7 +4026,7 @@ static void __init setup_usemap(struct p
31533 +@@ -4033,7 +4045,7 @@ static void __init setup_usemap(struct p
31534 zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
31535 }
31536 #else
31537 @@ -55059,9 +55172,9 @@ diff -urNp linux-2.6.37/mm/page_alloc.c linux-2.6.37/mm/page_alloc.c
31538 struct zone *zone, unsigned long zonesize) {}
31539 #endif /* CONFIG_SPARSEMEM */
31540
31541 -diff -urNp linux-2.6.37/mm/percpu.c linux-2.6.37/mm/percpu.c
31542 ---- linux-2.6.37/mm/percpu.c 2011-01-04 19:50:19.000000000 -0500
31543 -+++ linux-2.6.37/mm/percpu.c 2011-01-17 02:41:02.000000000 -0500
31544 +diff -urNp linux-2.6.37.1/mm/percpu.c linux-2.6.37.1/mm/percpu.c
31545 +--- linux-2.6.37.1/mm/percpu.c 2011-01-04 19:50:19.000000000 -0500
31546 ++++ linux-2.6.37.1/mm/percpu.c 2011-01-17 02:41:02.000000000 -0500
31547 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu
31548 static unsigned int pcpu_last_unit_cpu __read_mostly;
31549
31550 @@ -55071,9 +55184,9 @@ diff -urNp linux-2.6.37/mm/percpu.c linux-2.6.37/mm/percpu.c
31551 EXPORT_SYMBOL_GPL(pcpu_base_addr);
31552
31553 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
31554 -diff -urNp linux-2.6.37/mm/rmap.c linux-2.6.37/mm/rmap.c
31555 ---- linux-2.6.37/mm/rmap.c 2011-01-04 19:50:19.000000000 -0500
31556 -+++ linux-2.6.37/mm/rmap.c 2011-01-17 02:41:02.000000000 -0500
31557 +diff -urNp linux-2.6.37.1/mm/rmap.c linux-2.6.37.1/mm/rmap.c
31558 +--- linux-2.6.37.1/mm/rmap.c 2011-01-04 19:50:19.000000000 -0500
31559 ++++ linux-2.6.37.1/mm/rmap.c 2011-01-17 02:41:02.000000000 -0500
31560 @@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru
31561 struct anon_vma *anon_vma = vma->anon_vma;
31562 struct anon_vma_chain *avc;
31563 @@ -55163,9 +55276,9 @@ diff -urNp linux-2.6.37/mm/rmap.c linux-2.6.37/mm/rmap.c
31564 {
31565 struct anon_vma_chain *avc;
31566 struct anon_vma *anon_vma;
31567 -diff -urNp linux-2.6.37/mm/shmem.c linux-2.6.37/mm/shmem.c
31568 ---- linux-2.6.37/mm/shmem.c 2011-01-04 19:50:19.000000000 -0500
31569 -+++ linux-2.6.37/mm/shmem.c 2011-01-24 18:04:18.000000000 -0500
31570 +diff -urNp linux-2.6.37.1/mm/shmem.c linux-2.6.37.1/mm/shmem.c
31571 +--- linux-2.6.37.1/mm/shmem.c 2011-01-04 19:50:19.000000000 -0500
31572 ++++ linux-2.6.37.1/mm/shmem.c 2011-01-24 18:04:18.000000000 -0500
31573 @@ -31,7 +31,7 @@
31574 #include <linux/percpu_counter.h>
31575 #include <linux/swap.h>
31576 @@ -55184,9 +55297,9 @@ diff -urNp linux-2.6.37/mm/shmem.c linux-2.6.37/mm/shmem.c
31577 if (entry->val) {
31578 /*
31579 * The more uptodate page coming down from a stacked
31580 -diff -urNp linux-2.6.37/mm/slab.c linux-2.6.37/mm/slab.c
31581 ---- linux-2.6.37/mm/slab.c 2011-01-04 19:50:19.000000000 -0500
31582 -+++ linux-2.6.37/mm/slab.c 2011-01-17 02:41:02.000000000 -0500
31583 +diff -urNp linux-2.6.37.1/mm/slab.c linux-2.6.37.1/mm/slab.c
31584 +--- linux-2.6.37.1/mm/slab.c 2011-01-04 19:50:19.000000000 -0500
31585 ++++ linux-2.6.37.1/mm/slab.c 2011-01-17 02:41:02.000000000 -0500
31586 @@ -284,7 +284,7 @@ struct kmem_list3 {
31587 * Need this for bootstrapping a per node allocator.
31588 */
31589 @@ -55292,9 +55405,9 @@ diff -urNp linux-2.6.37/mm/slab.c linux-2.6.37/mm/slab.c
31590 /**
31591 * ksize - get the actual amount of memory allocated for a given object
31592 * @objp: Pointer to the object
31593 -diff -urNp linux-2.6.37/mm/slob.c linux-2.6.37/mm/slob.c
31594 ---- linux-2.6.37/mm/slob.c 2011-01-04 19:50:19.000000000 -0500
31595 -+++ linux-2.6.37/mm/slob.c 2011-01-17 02:41:02.000000000 -0500
31596 +diff -urNp linux-2.6.37.1/mm/slob.c linux-2.6.37.1/mm/slob.c
31597 +--- linux-2.6.37.1/mm/slob.c 2011-01-04 19:50:19.000000000 -0500
31598 ++++ linux-2.6.37.1/mm/slob.c 2011-01-17 02:41:02.000000000 -0500
31599 @@ -29,7 +29,7 @@
31600 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
31601 * alloc_pages() directly, allocating compound pages so the page order
31602 @@ -55614,9 +55727,9 @@ diff -urNp linux-2.6.37/mm/slob.c linux-2.6.37/mm/slob.c
31603 }
31604
31605 trace_kmem_cache_free(_RET_IP_, b);
31606 -diff -urNp linux-2.6.37/mm/slub.c linux-2.6.37/mm/slub.c
31607 ---- linux-2.6.37/mm/slub.c 2011-01-04 19:50:19.000000000 -0500
31608 -+++ linux-2.6.37/mm/slub.c 2011-01-17 02:41:02.000000000 -0500
31609 +diff -urNp linux-2.6.37.1/mm/slub.c linux-2.6.37.1/mm/slub.c
31610 +--- linux-2.6.37.1/mm/slub.c 2011-02-22 16:05:31.000000000 -0500
31611 ++++ linux-2.6.37.1/mm/slub.c 2011-02-22 16:05:44.000000000 -0500
31612 @@ -388,7 +388,7 @@ static void print_track(const char *s, s
31613 if (!t->addr)
31614 return;
31615 @@ -55770,9 +55883,9 @@ diff -urNp linux-2.6.37/mm/slub.c linux-2.6.37/mm/slub.c
31616 return 0;
31617 }
31618 module_init(slab_proc_init);
31619 -diff -urNp linux-2.6.37/mm/util.c linux-2.6.37/mm/util.c
31620 ---- linux-2.6.37/mm/util.c 2011-01-04 19:50:19.000000000 -0500
31621 -+++ linux-2.6.37/mm/util.c 2011-01-17 02:41:02.000000000 -0500
31622 +diff -urNp linux-2.6.37.1/mm/util.c linux-2.6.37.1/mm/util.c
31623 +--- linux-2.6.37.1/mm/util.c 2011-01-04 19:50:19.000000000 -0500
31624 ++++ linux-2.6.37.1/mm/util.c 2011-01-17 02:41:02.000000000 -0500
31625 @@ -240,6 +240,12 @@ EXPORT_SYMBOL(strndup_user);
31626 void arch_pick_mmap_layout(struct mm_struct *mm)
31627 {
31628 @@ -55786,9 +55899,9 @@ diff -urNp linux-2.6.37/mm/util.c linux-2.6.37/mm/util.c
31629 mm->get_unmapped_area = arch_get_unmapped_area;
31630 mm->unmap_area = arch_unmap_area;
31631 }
31632 -diff -urNp linux-2.6.37/mm/vmalloc.c linux-2.6.37/mm/vmalloc.c
31633 ---- linux-2.6.37/mm/vmalloc.c 2011-01-04 19:50:19.000000000 -0500
31634 -+++ linux-2.6.37/mm/vmalloc.c 2011-01-17 02:41:02.000000000 -0500
31635 +diff -urNp linux-2.6.37.1/mm/vmalloc.c linux-2.6.37.1/mm/vmalloc.c
31636 +--- linux-2.6.37.1/mm/vmalloc.c 2011-01-04 19:50:19.000000000 -0500
31637 ++++ linux-2.6.37.1/mm/vmalloc.c 2011-01-17 02:41:02.000000000 -0500
31638 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
31639
31640 pte = pte_offset_kernel(pmd, addr);
31641 @@ -56021,9 +56134,9 @@ diff -urNp linux-2.6.37/mm/vmalloc.c linux-2.6.37/mm/vmalloc.c
31642 if ((PAGE_SIZE-1) & (unsigned long)addr)
31643 return -EINVAL;
31644
31645 -diff -urNp linux-2.6.37/mm/vmstat.c linux-2.6.37/mm/vmstat.c
31646 ---- linux-2.6.37/mm/vmstat.c 2011-01-04 19:50:19.000000000 -0500
31647 -+++ linux-2.6.37/mm/vmstat.c 2011-01-17 02:41:02.000000000 -0500
31648 +diff -urNp linux-2.6.37.1/mm/vmstat.c linux-2.6.37.1/mm/vmstat.c
31649 +--- linux-2.6.37.1/mm/vmstat.c 2011-02-22 16:05:31.000000000 -0500
31650 ++++ linux-2.6.37.1/mm/vmstat.c 2011-02-22 16:05:44.000000000 -0500
31651 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
31652 *
31653 * vm_stat contains the global counters
31654 @@ -56033,7 +56146,7 @@ diff -urNp linux-2.6.37/mm/vmstat.c linux-2.6.37/mm/vmstat.c
31655 EXPORT_SYMBOL(vm_stat);
31656
31657 #ifdef CONFIG_SMP
31658 -@@ -330,7 +330,7 @@ void refresh_cpu_vm_stats(int cpu)
31659 +@@ -396,7 +396,7 @@ void refresh_cpu_vm_stats(int cpu)
31660 v = p->vm_stat_diff[i];
31661 p->vm_stat_diff[i] = 0;
31662 local_irq_restore(flags);
31663 @@ -56042,7 +56155,7 @@ diff -urNp linux-2.6.37/mm/vmstat.c linux-2.6.37/mm/vmstat.c
31664 global_diff[i] += v;
31665 #ifdef CONFIG_NUMA
31666 /* 3 seconds idle till flush */
31667 -@@ -368,7 +368,7 @@ void refresh_cpu_vm_stats(int cpu)
31668 +@@ -434,7 +434,7 @@ void refresh_cpu_vm_stats(int cpu)
31669
31670 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
31671 if (global_diff[i])
31672 @@ -56051,7 +56164,7 @@ diff -urNp linux-2.6.37/mm/vmstat.c linux-2.6.37/mm/vmstat.c
31673 }
31674
31675 #endif
31676 -@@ -1066,10 +1066,20 @@ static int __init setup_vmstat(void)
31677 +@@ -1132,10 +1132,20 @@ static int __init setup_vmstat(void)
31678 start_cpu_timer(cpu);
31679 #endif
31680 #ifdef CONFIG_PROC_FS
31681 @@ -56076,9 +56189,9 @@ diff -urNp linux-2.6.37/mm/vmstat.c linux-2.6.37/mm/vmstat.c
31682 #endif
31683 return 0;
31684 }
31685 -diff -urNp linux-2.6.37/net/8021q/vlan.c linux-2.6.37/net/8021q/vlan.c
31686 ---- linux-2.6.37/net/8021q/vlan.c 2011-01-04 19:50:19.000000000 -0500
31687 -+++ linux-2.6.37/net/8021q/vlan.c 2011-01-17 02:41:02.000000000 -0500
31688 +diff -urNp linux-2.6.37.1/net/8021q/vlan.c linux-2.6.37.1/net/8021q/vlan.c
31689 +--- linux-2.6.37.1/net/8021q/vlan.c 2011-01-04 19:50:19.000000000 -0500
31690 ++++ linux-2.6.37.1/net/8021q/vlan.c 2011-01-17 02:41:02.000000000 -0500
31691 @@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net
31692 err = -EPERM;
31693 if (!capable(CAP_NET_ADMIN))
31694 @@ -56089,9 +56202,9 @@ diff -urNp linux-2.6.37/net/8021q/vlan.c linux-2.6.37/net/8021q/vlan.c
31695 struct vlan_net *vn;
31696
31697 vn = net_generic(net, vlan_net_id);
31698 -diff -urNp linux-2.6.37/net/atm/atm_misc.c linux-2.6.37/net/atm/atm_misc.c
31699 ---- linux-2.6.37/net/atm/atm_misc.c 2011-01-04 19:50:19.000000000 -0500
31700 -+++ linux-2.6.37/net/atm/atm_misc.c 2011-01-17 02:41:02.000000000 -0500
31701 +diff -urNp linux-2.6.37.1/net/atm/atm_misc.c linux-2.6.37.1/net/atm/atm_misc.c
31702 +--- linux-2.6.37.1/net/atm/atm_misc.c 2011-01-04 19:50:19.000000000 -0500
31703 ++++ linux-2.6.37.1/net/atm/atm_misc.c 2011-01-17 02:41:02.000000000 -0500
31704 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int
31705 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
31706 return 1;
31707 @@ -56128,9 +56241,9 @@ diff -urNp linux-2.6.37/net/atm/atm_misc.c linux-2.6.37/net/atm/atm_misc.c
31708 __SONET_ITEMS
31709 #undef __HANDLE_ITEM
31710 }
31711 -diff -urNp linux-2.6.37/net/atm/proc.c linux-2.6.37/net/atm/proc.c
31712 ---- linux-2.6.37/net/atm/proc.c 2011-01-04 19:50:19.000000000 -0500
31713 -+++ linux-2.6.37/net/atm/proc.c 2011-01-17 02:41:02.000000000 -0500
31714 +diff -urNp linux-2.6.37.1/net/atm/proc.c linux-2.6.37.1/net/atm/proc.c
31715 +--- linux-2.6.37.1/net/atm/proc.c 2011-01-04 19:50:19.000000000 -0500
31716 ++++ linux-2.6.37.1/net/atm/proc.c 2011-01-17 02:41:02.000000000 -0500
31717 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
31718 const struct k_atm_aal_stats *stats)
31719 {
31720 @@ -56157,9 +56270,9 @@ diff -urNp linux-2.6.37/net/atm/proc.c linux-2.6.37/net/atm/proc.c
31721 if (!vcc->dev)
31722 seq_printf(seq, "Unassigned ");
31723 else
31724 -diff -urNp linux-2.6.37/net/atm/resources.c linux-2.6.37/net/atm/resources.c
31725 ---- linux-2.6.37/net/atm/resources.c 2011-01-04 19:50:19.000000000 -0500
31726 -+++ linux-2.6.37/net/atm/resources.c 2011-01-17 02:41:02.000000000 -0500
31727 +diff -urNp linux-2.6.37.1/net/atm/resources.c linux-2.6.37.1/net/atm/resources.c
31728 +--- linux-2.6.37.1/net/atm/resources.c 2011-01-04 19:50:19.000000000 -0500
31729 ++++ linux-2.6.37.1/net/atm/resources.c 2011-01-17 02:41:02.000000000 -0500
31730 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
31731 static void copy_aal_stats(struct k_atm_aal_stats *from,
31732 struct atm_aal_stats *to)
31733 @@ -56178,22 +56291,20 @@ diff -urNp linux-2.6.37/net/atm/resources.c linux-2.6.37/net/atm/resources.c
31734 __AAL_STAT_ITEMS
31735 #undef __HANDLE_ITEM
31736 }
31737 -diff -urNp linux-2.6.37/net/ax25/af_ax25.c linux-2.6.37/net/ax25/af_ax25.c
31738 ---- linux-2.6.37/net/ax25/af_ax25.c 2011-01-04 19:50:19.000000000 -0500
31739 -+++ linux-2.6.37/net/ax25/af_ax25.c 2011-01-17 02:41:02.000000000 -0500
31740 -@@ -1392,7 +1392,7 @@ static int ax25_getname(struct socket *s
31741 - ax25_cb *ax25;
31742 - int err = 0;
31743 -
31744 -- memset(fsa, 0, sizeof(fsa));
31745 -+ memset(fsa, 0, sizeof(*fsa));
31746 - lock_sock(sk);
31747 - ax25 = ax25_sk(sk);
31748 -
31749 -diff -urNp linux-2.6.37/net/bridge/br_multicast.c linux-2.6.37/net/bridge/br_multicast.c
31750 ---- linux-2.6.37/net/bridge/br_multicast.c 2011-01-04 19:50:19.000000000 -0500
31751 -+++ linux-2.6.37/net/bridge/br_multicast.c 2011-01-17 02:41:02.000000000 -0500
31752 -@@ -1461,7 +1461,7 @@ static int br_multicast_ipv6_rcv(struct
31753 +diff -urNp linux-2.6.37.1/net/bridge/br_multicast.c linux-2.6.37.1/net/bridge/br_multicast.c
31754 +--- linux-2.6.37.1/net/bridge/br_multicast.c 2011-01-04 19:50:19.000000000 -0500
31755 ++++ linux-2.6.37.1/net/bridge/br_multicast.c 2011-02-22 16:37:28.000000000 -0500
31756 +@@ -707,7 +707,8 @@ static int br_multicast_add_group(struct
31757 + goto err;
31758 +
31759 + if (!port) {
31760 +- hlist_add_head(&mp->mglist, &br->mglist);
31761 ++ if (hlist_unhashed(&mp->mglist))
31762 ++ hlist_add_head(&mp->mglist, &br->mglist);
31763 + mod_timer(&mp->timer, now + br->multicast_membership_interval);
31764 + goto out;
31765 + }
31766 +@@ -1461,7 +1462,7 @@ static int br_multicast_ipv6_rcv(struct
31767 nexthdr = ip6h->nexthdr;
31768 offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
31769
31770 @@ -56202,9 +56313,9 @@ diff -urNp linux-2.6.37/net/bridge/br_multicast.c linux-2.6.37/net/bridge/br_mul
31771 return 0;
31772
31773 /* Okay, we found ICMPv6 header */
31774 -diff -urNp linux-2.6.37/net/bridge/br_stp_if.c linux-2.6.37/net/bridge/br_stp_if.c
31775 ---- linux-2.6.37/net/bridge/br_stp_if.c 2011-01-04 19:50:19.000000000 -0500
31776 -+++ linux-2.6.37/net/bridge/br_stp_if.c 2011-01-17 02:41:02.000000000 -0500
31777 +diff -urNp linux-2.6.37.1/net/bridge/br_stp_if.c linux-2.6.37.1/net/bridge/br_stp_if.c
31778 +--- linux-2.6.37.1/net/bridge/br_stp_if.c 2011-01-04 19:50:19.000000000 -0500
31779 ++++ linux-2.6.37.1/net/bridge/br_stp_if.c 2011-01-17 02:41:02.000000000 -0500
31780 @@ -145,7 +145,7 @@ static void br_stp_stop(struct net_bridg
31781 char *envp[] = { NULL };
31782
31783 @@ -56214,9 +56325,9 @@ diff -urNp linux-2.6.37/net/bridge/br_stp_if.c linux-2.6.37/net/bridge/br_stp_if
31784 br_info(br, "userspace STP stopped, return code %d\n", r);
31785
31786 /* To start timers on any ports left in blocking */
31787 -diff -urNp linux-2.6.37/net/bridge/netfilter/ebtables.c linux-2.6.37/net/bridge/netfilter/ebtables.c
31788 ---- linux-2.6.37/net/bridge/netfilter/ebtables.c 2011-01-04 19:50:19.000000000 -0500
31789 -+++ linux-2.6.37/net/bridge/netfilter/ebtables.c 2011-01-17 02:41:02.000000000 -0500
31790 +diff -urNp linux-2.6.37.1/net/bridge/netfilter/ebtables.c linux-2.6.37.1/net/bridge/netfilter/ebtables.c
31791 +--- linux-2.6.37.1/net/bridge/netfilter/ebtables.c 2011-01-04 19:50:19.000000000 -0500
31792 ++++ linux-2.6.37.1/net/bridge/netfilter/ebtables.c 2011-01-17 02:41:02.000000000 -0500
31793 @@ -1511,7 +1511,7 @@ static int do_ebt_get_ctl(struct sock *s
31794 tmp.valid_hooks = t->table->valid_hooks;
31795 }
31796 @@ -56226,9 +56337,9 @@ diff -urNp linux-2.6.37/net/bridge/netfilter/ebtables.c linux-2.6.37/net/bridge/
31797 BUGPRINT("c2u Didn't work\n");
31798 ret = -EFAULT;
31799 break;
31800 -diff -urNp linux-2.6.37/net/core/dev.c linux-2.6.37/net/core/dev.c
31801 ---- linux-2.6.37/net/core/dev.c 2011-01-04 19:50:19.000000000 -0500
31802 -+++ linux-2.6.37/net/core/dev.c 2011-01-17 02:41:02.000000000 -0500
31803 +diff -urNp linux-2.6.37.1/net/core/dev.c linux-2.6.37.1/net/core/dev.c
31804 +--- linux-2.6.37.1/net/core/dev.c 2011-01-04 19:50:19.000000000 -0500
31805 ++++ linux-2.6.37.1/net/core/dev.c 2011-01-17 02:41:02.000000000 -0500
31806 @@ -2654,7 +2654,7 @@ int netif_rx_ni(struct sk_buff *skb)
31807 }
31808 EXPORT_SYMBOL(netif_rx_ni);
31809 @@ -56247,9 +56358,9 @@ diff -urNp linux-2.6.37/net/core/dev.c linux-2.6.37/net/core/dev.c
31810 {
31811 struct softnet_data *sd = &__get_cpu_var(softnet_data);
31812 unsigned long time_limit = jiffies + 2;
31813 -diff -urNp linux-2.6.37/net/core/sock.c linux-2.6.37/net/core/sock.c
31814 ---- linux-2.6.37/net/core/sock.c 2011-01-04 19:50:19.000000000 -0500
31815 -+++ linux-2.6.37/net/core/sock.c 2011-01-17 02:41:02.000000000 -0500
31816 +diff -urNp linux-2.6.37.1/net/core/sock.c linux-2.6.37.1/net/core/sock.c
31817 +--- linux-2.6.37.1/net/core/sock.c 2011-02-22 16:05:31.000000000 -0500
31818 ++++ linux-2.6.37.1/net/core/sock.c 2011-02-22 16:05:49.000000000 -0500
31819 @@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
31820 return -ENOTCONN;
31821 if (lv < len)
31822 @@ -56268,9 +56379,9 @@ diff -urNp linux-2.6.37/net/core/sock.c linux-2.6.37/net/core/sock.c
31823 return -EFAULT;
31824 lenout:
31825 if (put_user(len, optlen))
31826 -diff -urNp linux-2.6.37/net/dccp/ccids/ccid3.c linux-2.6.37/net/dccp/ccids/ccid3.c
31827 ---- linux-2.6.37/net/dccp/ccids/ccid3.c 2011-01-04 19:50:19.000000000 -0500
31828 -+++ linux-2.6.37/net/dccp/ccids/ccid3.c 2011-01-17 02:41:02.000000000 -0500
31829 +diff -urNp linux-2.6.37.1/net/dccp/ccids/ccid3.c linux-2.6.37.1/net/dccp/ccids/ccid3.c
31830 +--- linux-2.6.37.1/net/dccp/ccids/ccid3.c 2011-01-04 19:50:19.000000000 -0500
31831 ++++ linux-2.6.37.1/net/dccp/ccids/ccid3.c 2011-01-17 02:41:02.000000000 -0500
31832 @@ -41,7 +41,7 @@
31833 static int ccid3_debug;
31834 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
31835 @@ -56280,9 +56391,9 @@ diff -urNp linux-2.6.37/net/dccp/ccids/ccid3.c linux-2.6.37/net/dccp/ccids/ccid3
31836 #endif
31837
31838 /*
31839 -diff -urNp linux-2.6.37/net/dccp/dccp.h linux-2.6.37/net/dccp/dccp.h
31840 ---- linux-2.6.37/net/dccp/dccp.h 2011-01-04 19:50:19.000000000 -0500
31841 -+++ linux-2.6.37/net/dccp/dccp.h 2011-01-17 02:41:02.000000000 -0500
31842 +diff -urNp linux-2.6.37.1/net/dccp/dccp.h linux-2.6.37.1/net/dccp/dccp.h
31843 +--- linux-2.6.37.1/net/dccp/dccp.h 2011-01-04 19:50:19.000000000 -0500
31844 ++++ linux-2.6.37.1/net/dccp/dccp.h 2011-01-17 02:41:02.000000000 -0500
31845 @@ -44,9 +44,9 @@ extern int dccp_debug;
31846 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
31847 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
31848 @@ -56296,9 +56407,9 @@ diff -urNp linux-2.6.37/net/dccp/dccp.h linux-2.6.37/net/dccp/dccp.h
31849 #endif
31850
31851 extern struct inet_hashinfo dccp_hashinfo;
31852 -diff -urNp linux-2.6.37/net/decnet/sysctl_net_decnet.c linux-2.6.37/net/decnet/sysctl_net_decnet.c
31853 ---- linux-2.6.37/net/decnet/sysctl_net_decnet.c 2011-01-04 19:50:19.000000000 -0500
31854 -+++ linux-2.6.37/net/decnet/sysctl_net_decnet.c 2011-01-17 02:41:02.000000000 -0500
31855 +diff -urNp linux-2.6.37.1/net/decnet/sysctl_net_decnet.c linux-2.6.37.1/net/decnet/sysctl_net_decnet.c
31856 +--- linux-2.6.37.1/net/decnet/sysctl_net_decnet.c 2011-01-04 19:50:19.000000000 -0500
31857 ++++ linux-2.6.37.1/net/decnet/sysctl_net_decnet.c 2011-01-17 02:41:02.000000000 -0500
31858 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
31859
31860 if (len > *lenp) len = *lenp;
31861 @@ -56317,9 +56428,9 @@ diff -urNp linux-2.6.37/net/decnet/sysctl_net_decnet.c linux-2.6.37/net/decnet/s
31862 return -EFAULT;
31863
31864 *lenp = len;
31865 -diff -urNp linux-2.6.37/net/econet/Kconfig linux-2.6.37/net/econet/Kconfig
31866 ---- linux-2.6.37/net/econet/Kconfig 2011-01-04 19:50:19.000000000 -0500
31867 -+++ linux-2.6.37/net/econet/Kconfig 2011-01-17 02:41:02.000000000 -0500
31868 +diff -urNp linux-2.6.37.1/net/econet/Kconfig linux-2.6.37.1/net/econet/Kconfig
31869 +--- linux-2.6.37.1/net/econet/Kconfig 2011-01-04 19:50:19.000000000 -0500
31870 ++++ linux-2.6.37.1/net/econet/Kconfig 2011-01-17 02:41:02.000000000 -0500
31871 @@ -4,7 +4,7 @@
31872
31873 config ECONET
31874 @@ -56329,9 +56440,9 @@ diff -urNp linux-2.6.37/net/econet/Kconfig linux-2.6.37/net/econet/Kconfig
31875 ---help---
31876 Econet is a fairly old and slow networking protocol mainly used by
31877 Acorn computers to access file and print servers. It uses native
31878 -diff -urNp linux-2.6.37/net/ipv4/inet_diag.c linux-2.6.37/net/ipv4/inet_diag.c
31879 ---- linux-2.6.37/net/ipv4/inet_diag.c 2011-01-04 19:50:19.000000000 -0500
31880 -+++ linux-2.6.37/net/ipv4/inet_diag.c 2011-01-17 02:41:02.000000000 -0500
31881 +diff -urNp linux-2.6.37.1/net/ipv4/inet_diag.c linux-2.6.37.1/net/ipv4/inet_diag.c
31882 +--- linux-2.6.37.1/net/ipv4/inet_diag.c 2011-01-04 19:50:19.000000000 -0500
31883 ++++ linux-2.6.37.1/net/ipv4/inet_diag.c 2011-01-17 02:41:02.000000000 -0500
31884 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
31885 r->idiag_retrans = 0;
31886
31887 @@ -56393,9 +56504,9 @@ diff -urNp linux-2.6.37/net/ipv4/inet_diag.c linux-2.6.37/net/ipv4/inet_diag.c
31888
31889 tmo = req->expires - jiffies;
31890 if (tmo < 0)
31891 -diff -urNp linux-2.6.37/net/ipv4/inet_hashtables.c linux-2.6.37/net/ipv4/inet_hashtables.c
31892 ---- linux-2.6.37/net/ipv4/inet_hashtables.c 2011-01-04 19:50:19.000000000 -0500
31893 -+++ linux-2.6.37/net/ipv4/inet_hashtables.c 2011-01-17 02:41:02.000000000 -0500
31894 +diff -urNp linux-2.6.37.1/net/ipv4/inet_hashtables.c linux-2.6.37.1/net/ipv4/inet_hashtables.c
31895 +--- linux-2.6.37.1/net/ipv4/inet_hashtables.c 2011-01-04 19:50:19.000000000 -0500
31896 ++++ linux-2.6.37.1/net/ipv4/inet_hashtables.c 2011-01-17 02:41:02.000000000 -0500
31897 @@ -18,11 +18,14 @@
31898 #include <linux/sched.h>
31899 #include <linux/slab.h>
31900 @@ -56420,9 +56531,9 @@ diff -urNp linux-2.6.37/net/ipv4/inet_hashtables.c linux-2.6.37/net/ipv4/inet_ha
31901 if (tw) {
31902 inet_twsk_deschedule(tw, death_row);
31903 while (twrefcnt) {
31904 -diff -urNp linux-2.6.37/net/ipv4/inetpeer.c linux-2.6.37/net/ipv4/inetpeer.c
31905 ---- linux-2.6.37/net/ipv4/inetpeer.c 2011-01-04 19:50:19.000000000 -0500
31906 -+++ linux-2.6.37/net/ipv4/inetpeer.c 2011-01-17 02:41:02.000000000 -0500
31907 +diff -urNp linux-2.6.37.1/net/ipv4/inetpeer.c linux-2.6.37.1/net/ipv4/inetpeer.c
31908 +--- linux-2.6.37.1/net/ipv4/inetpeer.c 2011-01-04 19:50:19.000000000 -0500
31909 ++++ linux-2.6.37.1/net/ipv4/inetpeer.c 2011-01-17 02:41:02.000000000 -0500
31910 @@ -469,8 +469,8 @@ struct inet_peer *inet_getpeer(__be32 da
31911 if (p) {
31912 p->v4daddr = daddr;
31913 @@ -56434,10 +56545,10 @@ diff -urNp linux-2.6.37/net/ipv4/inetpeer.c linux-2.6.37/net/ipv4/inetpeer.c
31914 p->tcp_ts_stamp = 0;
31915 INIT_LIST_HEAD(&p->unused);
31916
31917 -diff -urNp linux-2.6.37/net/ipv4/ip_fragment.c linux-2.6.37/net/ipv4/ip_fragment.c
31918 ---- linux-2.6.37/net/ipv4/ip_fragment.c 2011-01-04 19:50:19.000000000 -0500
31919 -+++ linux-2.6.37/net/ipv4/ip_fragment.c 2011-01-17 02:41:02.000000000 -0500
31920 -@@ -279,7 +279,7 @@ static inline int ip_frag_too_far(struct
31921 +diff -urNp linux-2.6.37.1/net/ipv4/ip_fragment.c linux-2.6.37.1/net/ipv4/ip_fragment.c
31922 +--- linux-2.6.37.1/net/ipv4/ip_fragment.c 2011-02-22 16:05:31.000000000 -0500
31923 ++++ linux-2.6.37.1/net/ipv4/ip_fragment.c 2011-02-22 16:05:49.000000000 -0500
31924 +@@ -298,7 +298,7 @@ static inline int ip_frag_too_far(struct
31925 return 0;
31926
31927 start = qp->rid;
31928 @@ -56446,9 +56557,9 @@ diff -urNp linux-2.6.37/net/ipv4/ip_fragment.c linux-2.6.37/net/ipv4/ip_fragment
31929 qp->rid = end;
31930
31931 rc = qp->q.fragments && (end - start) > max;
31932 -diff -urNp linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c
31933 ---- linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-04 19:50:19.000000000 -0500
31934 -+++ linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-17 02:41:02.000000000 -0500
31935 +diff -urNp linux-2.6.37.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.37.1/net/ipv4/netfilter/nf_nat_snmp_basic.c
31936 +--- linux-2.6.37.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-04 19:50:19.000000000 -0500
31937 ++++ linux-2.6.37.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-01-17 02:41:02.000000000 -0500
31938 @@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
31939
31940 *len = 0;
31941 @@ -56458,9 +56569,9 @@ diff -urNp linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.37/net/
31942 if (*octets == NULL) {
31943 if (net_ratelimit())
31944 pr_notice("OOM in bsalg (%d)\n", __LINE__);
31945 -diff -urNp linux-2.6.37/net/ipv4/route.c linux-2.6.37/net/ipv4/route.c
31946 ---- linux-2.6.37/net/ipv4/route.c 2011-01-04 19:50:19.000000000 -0500
31947 -+++ linux-2.6.37/net/ipv4/route.c 2011-01-17 02:41:02.000000000 -0500
31948 +diff -urNp linux-2.6.37.1/net/ipv4/route.c linux-2.6.37.1/net/ipv4/route.c
31949 +--- linux-2.6.37.1/net/ipv4/route.c 2011-01-04 19:50:19.000000000 -0500
31950 ++++ linux-2.6.37.1/net/ipv4/route.c 2011-01-17 02:41:02.000000000 -0500
31951 @@ -2876,7 +2876,7 @@ static int rt_fill_info(struct net *net,
31952 expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
31953 if (rt->peer) {
31954 @@ -56470,9 +56581,9 @@ diff -urNp linux-2.6.37/net/ipv4/route.c linux-2.6.37/net/ipv4/route.c
31955 if (rt->peer->tcp_ts_stamp) {
31956 ts = rt->peer->tcp_ts;
31957 tsage = get_seconds() - rt->peer->tcp_ts_stamp;
31958 -diff -urNp linux-2.6.37/net/ipv4/tcp_ipv4.c linux-2.6.37/net/ipv4/tcp_ipv4.c
31959 ---- linux-2.6.37/net/ipv4/tcp_ipv4.c 2011-01-04 19:50:19.000000000 -0500
31960 -+++ linux-2.6.37/net/ipv4/tcp_ipv4.c 2011-01-17 02:41:02.000000000 -0500
31961 +diff -urNp linux-2.6.37.1/net/ipv4/tcp_ipv4.c linux-2.6.37.1/net/ipv4/tcp_ipv4.c
31962 +--- linux-2.6.37.1/net/ipv4/tcp_ipv4.c 2011-01-04 19:50:19.000000000 -0500
31963 ++++ linux-2.6.37.1/net/ipv4/tcp_ipv4.c 2011-01-17 02:41:02.000000000 -0500
31964 @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
31965 int sysctl_tcp_low_latency __read_mostly;
31966 EXPORT_SYMBOL(sysctl_tcp_low_latency);
31967 @@ -56568,9 +56679,9 @@ diff -urNp linux-2.6.37/net/ipv4/tcp_ipv4.c linux-2.6.37/net/ipv4/tcp_ipv4.c
31968 }
31969
31970 #define TMPSZ 150
31971 -diff -urNp linux-2.6.37/net/ipv4/tcp_minisocks.c linux-2.6.37/net/ipv4/tcp_minisocks.c
31972 ---- linux-2.6.37/net/ipv4/tcp_minisocks.c 2011-01-04 19:50:19.000000000 -0500
31973 -+++ linux-2.6.37/net/ipv4/tcp_minisocks.c 2011-01-17 02:41:02.000000000 -0500
31974 +diff -urNp linux-2.6.37.1/net/ipv4/tcp_minisocks.c linux-2.6.37.1/net/ipv4/tcp_minisocks.c
31975 +--- linux-2.6.37.1/net/ipv4/tcp_minisocks.c 2011-01-04 19:50:19.000000000 -0500
31976 ++++ linux-2.6.37.1/net/ipv4/tcp_minisocks.c 2011-01-17 02:41:02.000000000 -0500
31977 @@ -27,6 +27,10 @@
31978 #include <net/inet_common.h>
31979 #include <net/xfrm.h>
31980 @@ -56593,9 +56704,9 @@ diff -urNp linux-2.6.37/net/ipv4/tcp_minisocks.c linux-2.6.37/net/ipv4/tcp_minis
31981 if (!(flg & TCP_FLAG_RST))
31982 req->rsk_ops->send_reset(sk, skb);
31983
31984 -diff -urNp linux-2.6.37/net/ipv4/tcp_probe.c linux-2.6.37/net/ipv4/tcp_probe.c
31985 ---- linux-2.6.37/net/ipv4/tcp_probe.c 2011-01-04 19:50:19.000000000 -0500
31986 -+++ linux-2.6.37/net/ipv4/tcp_probe.c 2011-01-17 02:41:02.000000000 -0500
31987 +diff -urNp linux-2.6.37.1/net/ipv4/tcp_probe.c linux-2.6.37.1/net/ipv4/tcp_probe.c
31988 +--- linux-2.6.37.1/net/ipv4/tcp_probe.c 2011-01-04 19:50:19.000000000 -0500
31989 ++++ linux-2.6.37.1/net/ipv4/tcp_probe.c 2011-01-17 02:41:02.000000000 -0500
31990 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
31991 if (cnt + width >= len)
31992 break;
31993 @@ -56605,9 +56716,9 @@ diff -urNp linux-2.6.37/net/ipv4/tcp_probe.c linux-2.6.37/net/ipv4/tcp_probe.c
31994 return -EFAULT;
31995 cnt += width;
31996 }
31997 -diff -urNp linux-2.6.37/net/ipv4/tcp_timer.c linux-2.6.37/net/ipv4/tcp_timer.c
31998 ---- linux-2.6.37/net/ipv4/tcp_timer.c 2011-01-04 19:50:19.000000000 -0500
31999 -+++ linux-2.6.37/net/ipv4/tcp_timer.c 2011-01-17 02:41:02.000000000 -0500
32000 +diff -urNp linux-2.6.37.1/net/ipv4/tcp_timer.c linux-2.6.37.1/net/ipv4/tcp_timer.c
32001 +--- linux-2.6.37.1/net/ipv4/tcp_timer.c 2011-01-04 19:50:19.000000000 -0500
32002 ++++ linux-2.6.37.1/net/ipv4/tcp_timer.c 2011-01-17 02:41:02.000000000 -0500
32003 @@ -22,6 +22,10 @@
32004 #include <linux/gfp.h>
32005 #include <net/tcp.h>
32006 @@ -56633,9 +56744,9 @@ diff -urNp linux-2.6.37/net/ipv4/tcp_timer.c linux-2.6.37/net/ipv4/tcp_timer.c
32007 if (retransmits_timed_out(sk, retry_until,
32008 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
32009 /* Has it gone just too far? */
32010 -diff -urNp linux-2.6.37/net/ipv4/udp.c linux-2.6.37/net/ipv4/udp.c
32011 ---- linux-2.6.37/net/ipv4/udp.c 2011-01-04 19:50:19.000000000 -0500
32012 -+++ linux-2.6.37/net/ipv4/udp.c 2011-01-17 02:41:02.000000000 -0500
32013 +diff -urNp linux-2.6.37.1/net/ipv4/udp.c linux-2.6.37.1/net/ipv4/udp.c
32014 +--- linux-2.6.37.1/net/ipv4/udp.c 2011-01-04 19:50:19.000000000 -0500
32015 ++++ linux-2.6.37.1/net/ipv4/udp.c 2011-01-17 02:41:02.000000000 -0500
32016 @@ -86,6 +86,7 @@
32017 #include <linux/types.h>
32018 #include <linux/fcntl.h>
32019 @@ -56719,9 +56830,9 @@ diff -urNp linux-2.6.37/net/ipv4/udp.c linux-2.6.37/net/ipv4/udp.c
32020 atomic_read(&sp->sk_drops), len);
32021 }
32022
32023 -diff -urNp linux-2.6.37/net/ipv6/exthdrs.c linux-2.6.37/net/ipv6/exthdrs.c
32024 ---- linux-2.6.37/net/ipv6/exthdrs.c 2011-01-04 19:50:19.000000000 -0500
32025 -+++ linux-2.6.37/net/ipv6/exthdrs.c 2011-01-17 02:41:02.000000000 -0500
32026 +diff -urNp linux-2.6.37.1/net/ipv6/exthdrs.c linux-2.6.37.1/net/ipv6/exthdrs.c
32027 +--- linux-2.6.37.1/net/ipv6/exthdrs.c 2011-01-04 19:50:19.000000000 -0500
32028 ++++ linux-2.6.37.1/net/ipv6/exthdrs.c 2011-01-17 02:41:02.000000000 -0500
32029 @@ -634,7 +634,7 @@ static struct tlvtype_proc tlvprochopopt
32030 .type = IPV6_TLV_JUMBO,
32031 .func = ipv6_hop_jumbo,
32032 @@ -56731,9 +56842,9 @@ diff -urNp linux-2.6.37/net/ipv6/exthdrs.c linux-2.6.37/net/ipv6/exthdrs.c
32033 };
32034
32035 int ipv6_parse_hopopts(struct sk_buff *skb)
32036 -diff -urNp linux-2.6.37/net/ipv6/raw.c linux-2.6.37/net/ipv6/raw.c
32037 ---- linux-2.6.37/net/ipv6/raw.c 2011-01-04 19:50:19.000000000 -0500
32038 -+++ linux-2.6.37/net/ipv6/raw.c 2011-01-17 02:41:02.000000000 -0500
32039 +diff -urNp linux-2.6.37.1/net/ipv6/raw.c linux-2.6.37.1/net/ipv6/raw.c
32040 +--- linux-2.6.37.1/net/ipv6/raw.c 2011-01-04 19:50:19.000000000 -0500
32041 ++++ linux-2.6.37.1/net/ipv6/raw.c 2011-01-17 02:41:02.000000000 -0500
32042 @@ -601,7 +601,7 @@ out:
32043 return err;
32044 }
32045 @@ -56758,9 +56869,9 @@ diff -urNp linux-2.6.37/net/ipv6/raw.c linux-2.6.37/net/ipv6/raw.c
32046 }
32047
32048 static int raw6_seq_show(struct seq_file *seq, void *v)
32049 -diff -urNp linux-2.6.37/net/ipv6/tcp_ipv6.c linux-2.6.37/net/ipv6/tcp_ipv6.c
32050 ---- linux-2.6.37/net/ipv6/tcp_ipv6.c 2011-01-04 19:50:19.000000000 -0500
32051 -+++ linux-2.6.37/net/ipv6/tcp_ipv6.c 2011-01-17 02:41:02.000000000 -0500
32052 +diff -urNp linux-2.6.37.1/net/ipv6/tcp_ipv6.c linux-2.6.37.1/net/ipv6/tcp_ipv6.c
32053 +--- linux-2.6.37.1/net/ipv6/tcp_ipv6.c 2011-01-04 19:50:19.000000000 -0500
32054 ++++ linux-2.6.37.1/net/ipv6/tcp_ipv6.c 2011-01-17 02:41:02.000000000 -0500
32055 @@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
32056 }
32057 #endif
32058 @@ -56860,9 +56971,9 @@ diff -urNp linux-2.6.37/net/ipv6/tcp_ipv6.c linux-2.6.37/net/ipv6/tcp_ipv6.c
32059 }
32060
32061 static int tcp6_seq_show(struct seq_file *seq, void *v)
32062 -diff -urNp linux-2.6.37/net/ipv6/udp.c linux-2.6.37/net/ipv6/udp.c
32063 ---- linux-2.6.37/net/ipv6/udp.c 2011-01-04 19:50:19.000000000 -0500
32064 -+++ linux-2.6.37/net/ipv6/udp.c 2011-01-17 02:41:02.000000000 -0500
32065 +diff -urNp linux-2.6.37.1/net/ipv6/udp.c linux-2.6.37.1/net/ipv6/udp.c
32066 +--- linux-2.6.37.1/net/ipv6/udp.c 2011-01-04 19:50:19.000000000 -0500
32067 ++++ linux-2.6.37.1/net/ipv6/udp.c 2011-01-17 02:41:02.000000000 -0500
32068 @@ -50,6 +50,10 @@
32069 #include <linux/seq_file.h>
32070 #include "udp_impl.h"
32071 @@ -56898,9 +57009,9 @@ diff -urNp linux-2.6.37/net/ipv6/udp.c linux-2.6.37/net/ipv6/udp.c
32072 atomic_read(&sp->sk_drops));
32073 }
32074
32075 -diff -urNp linux-2.6.37/net/irda/ircomm/ircomm_tty.c linux-2.6.37/net/irda/ircomm/ircomm_tty.c
32076 ---- linux-2.6.37/net/irda/ircomm/ircomm_tty.c 2011-01-04 19:50:19.000000000 -0500
32077 -+++ linux-2.6.37/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:04:18.000000000 -0500
32078 +diff -urNp linux-2.6.37.1/net/irda/ircomm/ircomm_tty.c linux-2.6.37.1/net/irda/ircomm/ircomm_tty.c
32079 +--- linux-2.6.37.1/net/irda/ircomm/ircomm_tty.c 2011-01-04 19:50:19.000000000 -0500
32080 ++++ linux-2.6.37.1/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:04:18.000000000 -0500
32081 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
32082 add_wait_queue(&self->open_wait, &wait);
32083
32084 @@ -57023,9 +57134,9 @@ diff -urNp linux-2.6.37/net/irda/ircomm/ircomm_tty.c linux-2.6.37/net/irda/ircom
32085 seq_printf(m, "Max data size: %d\n", self->max_data_size);
32086 seq_printf(m, "Max header size: %d\n", self->max_header_size);
32087
32088 -diff -urNp linux-2.6.37/net/key/af_key.c linux-2.6.37/net/key/af_key.c
32089 ---- linux-2.6.37/net/key/af_key.c 2011-01-04 19:50:19.000000000 -0500
32090 -+++ linux-2.6.37/net/key/af_key.c 2011-01-17 02:41:02.000000000 -0500
32091 +diff -urNp linux-2.6.37.1/net/key/af_key.c linux-2.6.37.1/net/key/af_key.c
32092 +--- linux-2.6.37.1/net/key/af_key.c 2011-01-04 19:50:19.000000000 -0500
32093 ++++ linux-2.6.37.1/net/key/af_key.c 2011-01-17 02:41:02.000000000 -0500
32094 @@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil
32095 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
32096 else
32097 @@ -57038,9 +57149,9 @@ diff -urNp linux-2.6.37/net/key/af_key.c linux-2.6.37/net/key/af_key.c
32098 atomic_read(&s->sk_refcnt),
32099 sk_rmem_alloc_get(s),
32100 sk_wmem_alloc_get(s),
32101 -diff -urNp linux-2.6.37/net/mac80211/ieee80211_i.h linux-2.6.37/net/mac80211/ieee80211_i.h
32102 ---- linux-2.6.37/net/mac80211/ieee80211_i.h 2011-01-04 19:50:19.000000000 -0500
32103 -+++ linux-2.6.37/net/mac80211/ieee80211_i.h 2011-01-24 18:04:18.000000000 -0500
32104 +diff -urNp linux-2.6.37.1/net/mac80211/ieee80211_i.h linux-2.6.37.1/net/mac80211/ieee80211_i.h
32105 +--- linux-2.6.37.1/net/mac80211/ieee80211_i.h 2011-01-04 19:50:19.000000000 -0500
32106 ++++ linux-2.6.37.1/net/mac80211/ieee80211_i.h 2011-01-24 18:04:18.000000000 -0500
32107 @@ -26,6 +26,7 @@
32108 #include <net/ieee80211_radiotap.h>
32109 #include <net/cfg80211.h>
32110 @@ -57058,9 +57169,9 @@ diff -urNp linux-2.6.37/net/mac80211/ieee80211_i.h linux-2.6.37/net/mac80211/iee
32111 int monitors, cooked_mntrs;
32112 /* number of interfaces with corresponding FIF_ flags */
32113 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
32114 -diff -urNp linux-2.6.37/net/mac80211/iface.c linux-2.6.37/net/mac80211/iface.c
32115 ---- linux-2.6.37/net/mac80211/iface.c 2011-01-04 19:50:19.000000000 -0500
32116 -+++ linux-2.6.37/net/mac80211/iface.c 2011-01-24 18:04:18.000000000 -0500
32117 +diff -urNp linux-2.6.37.1/net/mac80211/iface.c linux-2.6.37.1/net/mac80211/iface.c
32118 +--- linux-2.6.37.1/net/mac80211/iface.c 2011-01-04 19:50:19.000000000 -0500
32119 ++++ linux-2.6.37.1/net/mac80211/iface.c 2011-01-24 18:04:18.000000000 -0500
32120 @@ -216,7 +216,7 @@ static int ieee80211_do_open(struct net_
32121 break;
32122 }
32123 @@ -57115,9 +57226,9 @@ diff -urNp linux-2.6.37/net/mac80211/iface.c linux-2.6.37/net/mac80211/iface.c
32124 if (local->ops->napi_poll)
32125 napi_disable(&local->napi);
32126 ieee80211_clear_tx_pending(local);
32127 -diff -urNp linux-2.6.37/net/mac80211/main.c linux-2.6.37/net/mac80211/main.c
32128 ---- linux-2.6.37/net/mac80211/main.c 2011-01-04 19:50:19.000000000 -0500
32129 -+++ linux-2.6.37/net/mac80211/main.c 2011-01-24 18:04:18.000000000 -0500
32130 +diff -urNp linux-2.6.37.1/net/mac80211/main.c linux-2.6.37.1/net/mac80211/main.c
32131 +--- linux-2.6.37.1/net/mac80211/main.c 2011-01-04 19:50:19.000000000 -0500
32132 ++++ linux-2.6.37.1/net/mac80211/main.c 2011-01-24 18:04:18.000000000 -0500
32133 @@ -159,7 +159,7 @@ int ieee80211_hw_config(struct ieee80211
32134 local->hw.conf.power_level = power;
32135 }
32136 @@ -57127,9 +57238,9 @@ diff -urNp linux-2.6.37/net/mac80211/main.c linux-2.6.37/net/mac80211/main.c
32137 ret = drv_config(local, changed);
32138 /*
32139 * Goal:
32140 -diff -urNp linux-2.6.37/net/mac80211/pm.c linux-2.6.37/net/mac80211/pm.c
32141 ---- linux-2.6.37/net/mac80211/pm.c 2011-01-04 19:50:19.000000000 -0500
32142 -+++ linux-2.6.37/net/mac80211/pm.c 2011-01-24 18:04:18.000000000 -0500
32143 +diff -urNp linux-2.6.37.1/net/mac80211/pm.c linux-2.6.37.1/net/mac80211/pm.c
32144 +--- linux-2.6.37.1/net/mac80211/pm.c 2011-01-04 19:50:19.000000000 -0500
32145 ++++ linux-2.6.37.1/net/mac80211/pm.c 2011-01-24 18:04:18.000000000 -0500
32146 @@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
32147 }
32148
32149 @@ -57139,9 +57250,9 @@ diff -urNp linux-2.6.37/net/mac80211/pm.c linux-2.6.37/net/mac80211/pm.c
32150 ieee80211_stop_device(local);
32151
32152 local->suspended = true;
32153 -diff -urNp linux-2.6.37/net/mac80211/rate.c linux-2.6.37/net/mac80211/rate.c
32154 ---- linux-2.6.37/net/mac80211/rate.c 2011-01-04 19:50:19.000000000 -0500
32155 -+++ linux-2.6.37/net/mac80211/rate.c 2011-01-24 18:04:18.000000000 -0500
32156 +diff -urNp linux-2.6.37.1/net/mac80211/rate.c linux-2.6.37.1/net/mac80211/rate.c
32157 +--- linux-2.6.37.1/net/mac80211/rate.c 2011-01-04 19:50:19.000000000 -0500
32158 ++++ linux-2.6.37.1/net/mac80211/rate.c 2011-01-24 18:04:18.000000000 -0500
32159 @@ -361,7 +361,7 @@ int ieee80211_init_rate_ctrl_alg(struct
32160
32161 ASSERT_RTNL();
32162 @@ -57151,9 +57262,9 @@ diff -urNp linux-2.6.37/net/mac80211/rate.c linux-2.6.37/net/mac80211/rate.c
32163 return -EBUSY;
32164
32165 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
32166 -diff -urNp linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c
32167 ---- linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c 2011-01-04 19:50:19.000000000 -0500
32168 -+++ linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c 2011-01-17 02:41:02.000000000 -0500
32169 +diff -urNp linux-2.6.37.1/net/mac80211/rc80211_pid_debugfs.c linux-2.6.37.1/net/mac80211/rc80211_pid_debugfs.c
32170 +--- linux-2.6.37.1/net/mac80211/rc80211_pid_debugfs.c 2011-01-04 19:50:19.000000000 -0500
32171 ++++ linux-2.6.37.1/net/mac80211/rc80211_pid_debugfs.c 2011-01-17 02:41:02.000000000 -0500
32172 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
32173
32174 spin_unlock_irqrestore(&events->lock, status);
32175 @@ -57163,9 +57274,9 @@ diff -urNp linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c linux-2.6.37/net/mac8
32176 return -EFAULT;
32177
32178 return p;
32179 -diff -urNp linux-2.6.37/net/mac80211/tx.c linux-2.6.37/net/mac80211/tx.c
32180 ---- linux-2.6.37/net/mac80211/tx.c 2011-01-04 19:50:19.000000000 -0500
32181 -+++ linux-2.6.37/net/mac80211/tx.c 2011-01-17 02:41:02.000000000 -0500
32182 +diff -urNp linux-2.6.37.1/net/mac80211/tx.c linux-2.6.37.1/net/mac80211/tx.c
32183 +--- linux-2.6.37.1/net/mac80211/tx.c 2011-02-22 16:05:31.000000000 -0500
32184 ++++ linux-2.6.37.1/net/mac80211/tx.c 2011-02-22 16:05:49.000000000 -0500
32185 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
32186 return cpu_to_le16(dur);
32187 }
32188 @@ -57175,9 +57286,9 @@ diff -urNp linux-2.6.37/net/mac80211/tx.c linux-2.6.37/net/mac80211/tx.c
32189 struct net_device *dev)
32190 {
32191 return local == wdev_priv(dev->ieee80211_ptr);
32192 -diff -urNp linux-2.6.37/net/mac80211/util.c linux-2.6.37/net/mac80211/util.c
32193 ---- linux-2.6.37/net/mac80211/util.c 2011-01-04 19:50:19.000000000 -0500
32194 -+++ linux-2.6.37/net/mac80211/util.c 2011-01-24 18:04:18.000000000 -0500
32195 +diff -urNp linux-2.6.37.1/net/mac80211/util.c linux-2.6.37.1/net/mac80211/util.c
32196 +--- linux-2.6.37.1/net/mac80211/util.c 2011-01-04 19:50:19.000000000 -0500
32197 ++++ linux-2.6.37.1/net/mac80211/util.c 2011-01-24 18:04:18.000000000 -0500
32198 @@ -1111,7 +1111,7 @@ int ieee80211_reconfig(struct ieee80211_
32199 local->resuming = true;
32200
32201 @@ -57187,9 +57298,9 @@ diff -urNp linux-2.6.37/net/mac80211/util.c linux-2.6.37/net/mac80211/util.c
32202 /*
32203 * Upon resume hardware can sometimes be goofy due to
32204 * various platform / driver / bus issues, so restarting
32205 -diff -urNp linux-2.6.37/net/netfilter/Kconfig linux-2.6.37/net/netfilter/Kconfig
32206 ---- linux-2.6.37/net/netfilter/Kconfig 2011-01-04 19:50:19.000000000 -0500
32207 -+++ linux-2.6.37/net/netfilter/Kconfig 2011-01-17 02:41:02.000000000 -0500
32208 +diff -urNp linux-2.6.37.1/net/netfilter/Kconfig linux-2.6.37.1/net/netfilter/Kconfig
32209 +--- linux-2.6.37.1/net/netfilter/Kconfig 2011-01-04 19:50:19.000000000 -0500
32210 ++++ linux-2.6.37.1/net/netfilter/Kconfig 2011-01-17 02:41:02.000000000 -0500
32211 @@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP
32212
32213 To compile it as a module, choose M here. If unsure, say N.
32214 @@ -57207,9 +57318,9 @@ diff -urNp linux-2.6.37/net/netfilter/Kconfig linux-2.6.37/net/netfilter/Kconfig
32215 config NETFILTER_XT_MATCH_HASHLIMIT
32216 tristate '"hashlimit" match support'
32217 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
32218 -diff -urNp linux-2.6.37/net/netfilter/Makefile linux-2.6.37/net/netfilter/Makefile
32219 ---- linux-2.6.37/net/netfilter/Makefile 2011-01-04 19:50:19.000000000 -0500
32220 -+++ linux-2.6.37/net/netfilter/Makefile 2011-01-17 02:41:02.000000000 -0500
32221 +diff -urNp linux-2.6.37.1/net/netfilter/Makefile linux-2.6.37.1/net/netfilter/Makefile
32222 +--- linux-2.6.37.1/net/netfilter/Makefile 2011-01-04 19:50:19.000000000 -0500
32223 ++++ linux-2.6.37.1/net/netfilter/Makefile 2011-01-17 02:41:02.000000000 -0500
32224 @@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) +=
32225 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
32226 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
32227 @@ -57218,9 +57329,9 @@ diff -urNp linux-2.6.37/net/netfilter/Makefile linux-2.6.37/net/netfilter/Makefi
32228 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
32229 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
32230 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
32231 -diff -urNp linux-2.6.37/net/netfilter/nf_conntrack_netlink.c linux-2.6.37/net/netfilter/nf_conntrack_netlink.c
32232 ---- linux-2.6.37/net/netfilter/nf_conntrack_netlink.c 2011-01-04 19:50:19.000000000 -0500
32233 -+++ linux-2.6.37/net/netfilter/nf_conntrack_netlink.c 2011-01-17 02:41:02.000000000 -0500
32234 +diff -urNp linux-2.6.37.1/net/netfilter/nf_conntrack_netlink.c linux-2.6.37.1/net/netfilter/nf_conntrack_netlink.c
32235 +--- linux-2.6.37.1/net/netfilter/nf_conntrack_netlink.c 2011-01-04 19:50:19.000000000 -0500
32236 ++++ linux-2.6.37.1/net/netfilter/nf_conntrack_netlink.c 2011-01-17 02:41:02.000000000 -0500
32237 @@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla
32238 static int
32239 ctnetlink_parse_tuple(const struct nlattr * const cda[],
32240 @@ -57230,9 +57341,9 @@ diff -urNp linux-2.6.37/net/netfilter/nf_conntrack_netlink.c linux-2.6.37/net/ne
32241 {
32242 struct nlattr *tb[CTA_TUPLE_MAX+1];
32243 int err;
32244 -diff -urNp linux-2.6.37/net/netfilter/xt_gradm.c linux-2.6.37/net/netfilter/xt_gradm.c
32245 ---- linux-2.6.37/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
32246 -+++ linux-2.6.37/net/netfilter/xt_gradm.c 2011-01-17 02:41:02.000000000 -0500
32247 +diff -urNp linux-2.6.37.1/net/netfilter/xt_gradm.c linux-2.6.37.1/net/netfilter/xt_gradm.c
32248 +--- linux-2.6.37.1/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
32249 ++++ linux-2.6.37.1/net/netfilter/xt_gradm.c 2011-01-17 02:41:02.000000000 -0500
32250 @@ -0,0 +1,51 @@
32251 +/*
32252 + * gradm match for netfilter
32253 @@ -57285,9 +57396,9 @@ diff -urNp linux-2.6.37/net/netfilter/xt_gradm.c linux-2.6.37/net/netfilter/xt_g
32254 +MODULE_LICENSE("GPL");
32255 +MODULE_ALIAS("ipt_gradm");
32256 +MODULE_ALIAS("ip6t_gradm");
32257 -diff -urNp linux-2.6.37/net/netlink/af_netlink.c linux-2.6.37/net/netlink/af_netlink.c
32258 ---- linux-2.6.37/net/netlink/af_netlink.c 2011-01-04 19:50:19.000000000 -0500
32259 -+++ linux-2.6.37/net/netlink/af_netlink.c 2011-01-17 02:41:02.000000000 -0500
32260 +diff -urNp linux-2.6.37.1/net/netlink/af_netlink.c linux-2.6.37.1/net/netlink/af_netlink.c
32261 +--- linux-2.6.37.1/net/netlink/af_netlink.c 2011-01-04 19:50:19.000000000 -0500
32262 ++++ linux-2.6.37.1/net/netlink/af_netlink.c 2011-01-17 02:41:02.000000000 -0500
32263 @@ -1991,13 +1991,21 @@ static int netlink_seq_show(struct seq_f
32264 struct netlink_sock *nlk = nlk_sk(s);
32265
32266 @@ -57310,9 +57421,9 @@ diff -urNp linux-2.6.37/net/netlink/af_netlink.c linux-2.6.37/net/netlink/af_net
32267 atomic_read(&s->sk_refcnt),
32268 atomic_read(&s->sk_drops),
32269 sock_i_ino(s)
32270 -diff -urNp linux-2.6.37/net/netrom/af_netrom.c linux-2.6.37/net/netrom/af_netrom.c
32271 ---- linux-2.6.37/net/netrom/af_netrom.c 2011-01-04 19:50:19.000000000 -0500
32272 -+++ linux-2.6.37/net/netrom/af_netrom.c 2011-01-17 02:41:02.000000000 -0500
32273 +diff -urNp linux-2.6.37.1/net/netrom/af_netrom.c linux-2.6.37.1/net/netrom/af_netrom.c
32274 +--- linux-2.6.37.1/net/netrom/af_netrom.c 2011-01-04 19:50:19.000000000 -0500
32275 ++++ linux-2.6.37.1/net/netrom/af_netrom.c 2011-01-17 02:41:02.000000000 -0500
32276 @@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc
32277 struct sock *sk = sock->sk;
32278 struct nr_sock *nr = nr_sk(sk);
32279 @@ -57329,9 +57440,9 @@ diff -urNp linux-2.6.37/net/netrom/af_netrom.c linux-2.6.37/net/netrom/af_netrom
32280 sax->fsa_ax25.sax25_call = nr->source_addr;
32281 *uaddr_len = sizeof(struct sockaddr_ax25);
32282 }
32283 -diff -urNp linux-2.6.37/net/packet/af_packet.c linux-2.6.37/net/packet/af_packet.c
32284 ---- linux-2.6.37/net/packet/af_packet.c 2011-01-04 19:50:19.000000000 -0500
32285 -+++ linux-2.6.37/net/packet/af_packet.c 2011-01-17 02:41:02.000000000 -0500
32286 +diff -urNp linux-2.6.37.1/net/packet/af_packet.c linux-2.6.37.1/net/packet/af_packet.c
32287 +--- linux-2.6.37.1/net/packet/af_packet.c 2011-01-04 19:50:19.000000000 -0500
32288 ++++ linux-2.6.37.1/net/packet/af_packet.c 2011-01-17 02:41:02.000000000 -0500
32289 @@ -2123,7 +2123,7 @@ static int packet_getsockopt(struct sock
32290 case PACKET_HDRLEN:
32291 if (len > sizeof(int))
32292 @@ -57362,9 +57473,9 @@ diff -urNp linux-2.6.37/net/packet/af_packet.c linux-2.6.37/net/packet/af_packet
32293 atomic_read(&s->sk_refcnt),
32294 s->sk_type,
32295 ntohs(po->num),
32296 -diff -urNp linux-2.6.37/net/phonet/af_phonet.c linux-2.6.37/net/phonet/af_phonet.c
32297 ---- linux-2.6.37/net/phonet/af_phonet.c 2011-01-04 19:50:19.000000000 -0500
32298 -+++ linux-2.6.37/net/phonet/af_phonet.c 2011-01-17 02:41:02.000000000 -0500
32299 +diff -urNp linux-2.6.37.1/net/phonet/af_phonet.c linux-2.6.37.1/net/phonet/af_phonet.c
32300 +--- linux-2.6.37.1/net/phonet/af_phonet.c 2011-01-04 19:50:19.000000000 -0500
32301 ++++ linux-2.6.37.1/net/phonet/af_phonet.c 2011-01-17 02:41:02.000000000 -0500
32302 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
32303 {
32304 struct phonet_protocol *pp;
32305 @@ -57383,9 +57494,9 @@ diff -urNp linux-2.6.37/net/phonet/af_phonet.c linux-2.6.37/net/phonet/af_phonet
32306 return -EINVAL;
32307
32308 err = proto_register(pp->prot, 1);
32309 -diff -urNp linux-2.6.37/net/phonet/socket.c linux-2.6.37/net/phonet/socket.c
32310 ---- linux-2.6.37/net/phonet/socket.c 2011-01-04 19:50:19.000000000 -0500
32311 -+++ linux-2.6.37/net/phonet/socket.c 2011-01-17 02:41:02.000000000 -0500
32312 +diff -urNp linux-2.6.37.1/net/phonet/socket.c linux-2.6.37.1/net/phonet/socket.c
32313 +--- linux-2.6.37.1/net/phonet/socket.c 2011-01-04 19:50:19.000000000 -0500
32314 ++++ linux-2.6.37.1/net/phonet/socket.c 2011-01-17 02:41:02.000000000 -0500
32315 @@ -637,7 +637,12 @@ static int pn_sock_seq_show(struct seq_f
32316 sk->sk_state,
32317 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
32318 @@ -57400,9 +57511,9 @@ diff -urNp linux-2.6.37/net/phonet/socket.c linux-2.6.37/net/phonet/socket.c
32319 atomic_read(&sk->sk_drops), &len);
32320 }
32321 seq_printf(seq, "%*s\n", 127 - len, "");
32322 -diff -urNp linux-2.6.37/net/sctp/proc.c linux-2.6.37/net/sctp/proc.c
32323 ---- linux-2.6.37/net/sctp/proc.c 2011-01-04 19:50:19.000000000 -0500
32324 -+++ linux-2.6.37/net/sctp/proc.c 2011-01-17 02:41:02.000000000 -0500
32325 +diff -urNp linux-2.6.37.1/net/sctp/proc.c linux-2.6.37.1/net/sctp/proc.c
32326 +--- linux-2.6.37.1/net/sctp/proc.c 2011-01-04 19:50:19.000000000 -0500
32327 ++++ linux-2.6.37.1/net/sctp/proc.c 2011-01-17 02:41:02.000000000 -0500
32328 @@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_
32329 sctp_for_each_hentry(epb, node, &head->chain) {
32330 ep = sctp_ep(epb);
32331 @@ -57431,9 +57542,9 @@ diff -urNp linux-2.6.37/net/sctp/proc.c linux-2.6.37/net/sctp/proc.c
32332 assoc->state, hash,
32333 assoc->assoc_id,
32334 assoc->sndbuf_used,
32335 -diff -urNp linux-2.6.37/net/sctp/socket.c linux-2.6.37/net/sctp/socket.c
32336 ---- linux-2.6.37/net/sctp/socket.c 2011-01-04 19:50:19.000000000 -0500
32337 -+++ linux-2.6.37/net/sctp/socket.c 2011-01-17 02:41:02.000000000 -0500
32338 +diff -urNp linux-2.6.37.1/net/sctp/socket.c linux-2.6.37.1/net/sctp/socket.c
32339 +--- linux-2.6.37.1/net/sctp/socket.c 2011-01-04 19:50:19.000000000 -0500
32340 ++++ linux-2.6.37.1/net/sctp/socket.c 2011-01-17 02:41:02.000000000 -0500
32341 @@ -1496,7 +1496,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
32342 struct sctp_sndrcvinfo *sinfo;
32343 struct sctp_initmsg *sinit;
32344 @@ -57452,9 +57563,9 @@ diff -urNp linux-2.6.37/net/sctp/socket.c linux-2.6.37/net/sctp/socket.c
32345 return -EFAULT;
32346 to += addrlen;
32347 cnt++;
32348 -diff -urNp linux-2.6.37/net/socket.c linux-2.6.37/net/socket.c
32349 ---- linux-2.6.37/net/socket.c 2011-01-04 19:50:19.000000000 -0500
32350 -+++ linux-2.6.37/net/socket.c 2011-01-17 02:41:02.000000000 -0500
32351 +diff -urNp linux-2.6.37.1/net/socket.c linux-2.6.37.1/net/socket.c
32352 +--- linux-2.6.37.1/net/socket.c 2011-01-04 19:50:19.000000000 -0500
32353 ++++ linux-2.6.37.1/net/socket.c 2011-01-17 02:41:02.000000000 -0500
32354 @@ -88,6 +88,7 @@
32355 #include <linux/nsproxy.h>
32356 #include <linux/magic.h>
32357 @@ -57605,9 +57716,9 @@ diff -urNp linux-2.6.37/net/socket.c linux-2.6.37/net/socket.c
32358 err =
32359 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
32360 if (err)
32361 -diff -urNp linux-2.6.37/net/sunrpc/sched.c linux-2.6.37/net/sunrpc/sched.c
32362 ---- linux-2.6.37/net/sunrpc/sched.c 2011-01-04 19:50:19.000000000 -0500
32363 -+++ linux-2.6.37/net/sunrpc/sched.c 2011-01-17 02:41:02.000000000 -0500
32364 +diff -urNp linux-2.6.37.1/net/sunrpc/sched.c linux-2.6.37.1/net/sunrpc/sched.c
32365 +--- linux-2.6.37.1/net/sunrpc/sched.c 2011-01-04 19:50:19.000000000 -0500
32366 ++++ linux-2.6.37.1/net/sunrpc/sched.c 2011-01-17 02:41:02.000000000 -0500
32367 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
32368 #ifdef RPC_DEBUG
32369 static void rpc_task_set_debuginfo(struct rpc_task *task)
32370 @@ -57620,9 +57731,9 @@ diff -urNp linux-2.6.37/net/sunrpc/sched.c linux-2.6.37/net/sunrpc/sched.c
32371 }
32372 #else
32373 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
32374 -diff -urNp linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c
32375 ---- linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-04 19:50:19.000000000 -0500
32376 -+++ linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-17 02:41:02.000000000 -0500
32377 +diff -urNp linux-2.6.37.1/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.37.1/net/sunrpc/xprtrdma/svc_rdma.c
32378 +--- linux-2.6.37.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-04 19:50:19.000000000 -0500
32379 ++++ linux-2.6.37.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-01-17 02:41:02.000000000 -0500
32380 @@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta
32381 len -= *ppos;
32382 if (len > *lenp)
32383 @@ -57632,9 +57743,9 @@ diff -urNp linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.37/net/sunrpc/x
32384 return -EFAULT;
32385 *lenp = len;
32386 *ppos += len;
32387 -diff -urNp linux-2.6.37/net/sysctl_net.c linux-2.6.37/net/sysctl_net.c
32388 ---- linux-2.6.37/net/sysctl_net.c 2011-01-04 19:50:19.000000000 -0500
32389 -+++ linux-2.6.37/net/sysctl_net.c 2011-01-17 02:41:02.000000000 -0500
32390 +diff -urNp linux-2.6.37.1/net/sysctl_net.c linux-2.6.37.1/net/sysctl_net.c
32391 +--- linux-2.6.37.1/net/sysctl_net.c 2011-01-04 19:50:19.000000000 -0500
32392 ++++ linux-2.6.37.1/net/sysctl_net.c 2011-01-17 02:41:02.000000000 -0500
32393 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
32394 struct ctl_table *table)
32395 {
32396 @@ -57644,9 +57755,9 @@ diff -urNp linux-2.6.37/net/sysctl_net.c linux-2.6.37/net/sysctl_net.c
32397 int mode = (table->mode >> 6) & 7;
32398 return (mode << 6) | (mode << 3) | mode;
32399 }
32400 -diff -urNp linux-2.6.37/net/tipc/socket.c linux-2.6.37/net/tipc/socket.c
32401 ---- linux-2.6.37/net/tipc/socket.c 2011-01-04 19:50:19.000000000 -0500
32402 -+++ linux-2.6.37/net/tipc/socket.c 2011-01-17 02:41:02.000000000 -0500
32403 +diff -urNp linux-2.6.37.1/net/tipc/socket.c linux-2.6.37.1/net/tipc/socket.c
32404 +--- linux-2.6.37.1/net/tipc/socket.c 2011-01-04 19:50:19.000000000 -0500
32405 ++++ linux-2.6.37.1/net/tipc/socket.c 2011-01-17 02:41:02.000000000 -0500
32406 @@ -1475,8 +1475,9 @@ static int connect(struct socket *sock,
32407 } else {
32408 if (res == 0)
32409 @@ -57659,9 +57770,9 @@ diff -urNp linux-2.6.37/net/tipc/socket.c linux-2.6.37/net/tipc/socket.c
32410 sock->state = SS_DISCONNECTING;
32411 }
32412
32413 -diff -urNp linux-2.6.37/net/unix/af_unix.c linux-2.6.37/net/unix/af_unix.c
32414 ---- linux-2.6.37/net/unix/af_unix.c 2011-01-04 19:50:19.000000000 -0500
32415 -+++ linux-2.6.37/net/unix/af_unix.c 2011-01-17 02:41:02.000000000 -0500
32416 +diff -urNp linux-2.6.37.1/net/unix/af_unix.c linux-2.6.37.1/net/unix/af_unix.c
32417 +--- linux-2.6.37.1/net/unix/af_unix.c 2011-02-22 16:05:31.000000000 -0500
32418 ++++ linux-2.6.37.1/net/unix/af_unix.c 2011-02-22 16:05:49.000000000 -0500
32419 @@ -764,6 +764,12 @@ static struct sock *unix_find_other(stru
32420 err = -ECONNREFUSED;
32421 if (!S_ISSOCK(inode->i_mode))
32422 @@ -57732,9 +57843,9 @@ diff -urNp linux-2.6.37/net/unix/af_unix.c linux-2.6.37/net/unix/af_unix.c
32423 atomic_read(&s->sk_refcnt),
32424 0,
32425 s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
32426 -diff -urNp linux-2.6.37/net/wireless/reg.c linux-2.6.37/net/wireless/reg.c
32427 ---- linux-2.6.37/net/wireless/reg.c 2011-01-04 19:50:19.000000000 -0500
32428 -+++ linux-2.6.37/net/wireless/reg.c 2011-01-17 02:41:02.000000000 -0500
32429 +diff -urNp linux-2.6.37.1/net/wireless/reg.c linux-2.6.37.1/net/wireless/reg.c
32430 +--- linux-2.6.37.1/net/wireless/reg.c 2011-02-22 16:05:31.000000000 -0500
32431 ++++ linux-2.6.37.1/net/wireless/reg.c 2011-02-22 16:05:49.000000000 -0500
32432 @@ -51,7 +51,7 @@
32433 printk(KERN_DEBUG format , ## args); \
32434 } while (0)
32435 @@ -57744,9 +57855,9 @@ diff -urNp linux-2.6.37/net/wireless/reg.c linux-2.6.37/net/wireless/reg.c
32436 #endif
32437
32438 /* Receipt of information from last regulatory request */
32439 -diff -urNp linux-2.6.37/net/wireless/wext-core.c linux-2.6.37/net/wireless/wext-core.c
32440 ---- linux-2.6.37/net/wireless/wext-core.c 2011-01-04 19:50:19.000000000 -0500
32441 -+++ linux-2.6.37/net/wireless/wext-core.c 2011-01-17 02:41:02.000000000 -0500
32442 +diff -urNp linux-2.6.37.1/net/wireless/wext-core.c linux-2.6.37.1/net/wireless/wext-core.c
32443 +--- linux-2.6.37.1/net/wireless/wext-core.c 2011-01-04 19:50:19.000000000 -0500
32444 ++++ linux-2.6.37.1/net/wireless/wext-core.c 2011-01-17 02:41:02.000000000 -0500
32445 @@ -744,8 +744,7 @@ static int ioctl_standard_iw_point(struc
32446 */
32447
32448 @@ -57780,9 +57891,9 @@ diff -urNp linux-2.6.37/net/wireless/wext-core.c linux-2.6.37/net/wireless/wext-
32449 err = handler(dev, info, (union iwreq_data *) iwp, extra);
32450
32451 iwp->length += essid_compat;
32452 -diff -urNp linux-2.6.37/net/x25/x25_facilities.c linux-2.6.37/net/x25/x25_facilities.c
32453 ---- linux-2.6.37/net/x25/x25_facilities.c 2011-01-04 19:50:19.000000000 -0500
32454 -+++ linux-2.6.37/net/x25/x25_facilities.c 2011-01-17 02:41:02.000000000 -0500
32455 +diff -urNp linux-2.6.37.1/net/x25/x25_facilities.c linux-2.6.37.1/net/x25/x25_facilities.c
32456 +--- linux-2.6.37.1/net/x25/x25_facilities.c 2011-01-04 19:50:19.000000000 -0500
32457 ++++ linux-2.6.37.1/net/x25/x25_facilities.c 2011-01-17 02:41:02.000000000 -0500
32458 @@ -157,7 +157,8 @@ int x25_parse_facilities(struct sk_buff
32459 break;
32460 default:
32461 @@ -57793,9 +57904,9 @@ diff -urNp linux-2.6.37/net/x25/x25_facilities.c linux-2.6.37/net/x25/x25_facili
32462 break;
32463 }
32464 len -= p[1] + 2;
32465 -diff -urNp linux-2.6.37/net/xfrm/xfrm_policy.c linux-2.6.37/net/xfrm/xfrm_policy.c
32466 ---- linux-2.6.37/net/xfrm/xfrm_policy.c 2011-01-04 19:50:19.000000000 -0500
32467 -+++ linux-2.6.37/net/xfrm/xfrm_policy.c 2011-01-17 02:41:02.000000000 -0500
32468 +diff -urNp linux-2.6.37.1/net/xfrm/xfrm_policy.c linux-2.6.37.1/net/xfrm/xfrm_policy.c
32469 +--- linux-2.6.37.1/net/xfrm/xfrm_policy.c 2011-01-04 19:50:19.000000000 -0500
32470 ++++ linux-2.6.37.1/net/xfrm/xfrm_policy.c 2011-01-17 02:41:02.000000000 -0500
32471 @@ -1504,7 +1504,7 @@ free_dst:
32472 goto out;
32473 }
32474 @@ -57823,9 +57934,9 @@ diff -urNp linux-2.6.37/net/xfrm/xfrm_policy.c linux-2.6.37/net/xfrm/xfrm_policy
32475 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
32476 {
32477 #ifdef CONFIG_XFRM_SUB_POLICY
32478 -diff -urNp linux-2.6.37/scripts/basic/fixdep.c linux-2.6.37/scripts/basic/fixdep.c
32479 ---- linux-2.6.37/scripts/basic/fixdep.c 2011-01-04 19:50:19.000000000 -0500
32480 -+++ linux-2.6.37/scripts/basic/fixdep.c 2011-01-17 02:41:02.000000000 -0500
32481 +diff -urNp linux-2.6.37.1/scripts/basic/fixdep.c linux-2.6.37.1/scripts/basic/fixdep.c
32482 +--- linux-2.6.37.1/scripts/basic/fixdep.c 2011-01-04 19:50:19.000000000 -0500
32483 ++++ linux-2.6.37.1/scripts/basic/fixdep.c 2011-01-17 02:41:02.000000000 -0500
32484 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
32485
32486 static void parse_config_file(char *map, size_t len)
32487 @@ -57847,9 +57958,9 @@ diff -urNp linux-2.6.37/scripts/basic/fixdep.c linux-2.6.37/scripts/basic/fixdep
32488
32489 if (*p != INT_CONF) {
32490 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
32491 -diff -urNp linux-2.6.37/scripts/kallsyms.c linux-2.6.37/scripts/kallsyms.c
32492 ---- linux-2.6.37/scripts/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
32493 -+++ linux-2.6.37/scripts/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
32494 +diff -urNp linux-2.6.37.1/scripts/kallsyms.c linux-2.6.37.1/scripts/kallsyms.c
32495 +--- linux-2.6.37.1/scripts/kallsyms.c 2011-01-04 19:50:19.000000000 -0500
32496 ++++ linux-2.6.37.1/scripts/kallsyms.c 2011-01-17 02:41:02.000000000 -0500
32497 @@ -43,10 +43,10 @@ struct text_range {
32498
32499 static unsigned long long _text;
32500 @@ -57865,9 +57976,9 @@ diff -urNp linux-2.6.37/scripts/kallsyms.c linux-2.6.37/scripts/kallsyms.c
32501 };
32502 #define text_range_text (&text_ranges[0])
32503 #define text_range_inittext (&text_ranges[1])
32504 -diff -urNp linux-2.6.37/scripts/mod/file2alias.c linux-2.6.37/scripts/mod/file2alias.c
32505 ---- linux-2.6.37/scripts/mod/file2alias.c 2011-01-04 19:50:19.000000000 -0500
32506 -+++ linux-2.6.37/scripts/mod/file2alias.c 2011-01-17 02:41:02.000000000 -0500
32507 +diff -urNp linux-2.6.37.1/scripts/mod/file2alias.c linux-2.6.37.1/scripts/mod/file2alias.c
32508 +--- linux-2.6.37.1/scripts/mod/file2alias.c 2011-01-04 19:50:19.000000000 -0500
32509 ++++ linux-2.6.37.1/scripts/mod/file2alias.c 2011-01-17 02:41:02.000000000 -0500
32510 @@ -72,7 +72,7 @@ static void device_id_check(const char *
32511 unsigned long size, unsigned long id_size,
32512 void *symval)
32513 @@ -57922,9 +58033,9 @@ diff -urNp linux-2.6.37/scripts/mod/file2alias.c linux-2.6.37/scripts/mod/file2a
32514
32515 sprintf(alias, "dmi*");
32516
32517 -diff -urNp linux-2.6.37/scripts/mod/modpost.c linux-2.6.37/scripts/mod/modpost.c
32518 ---- linux-2.6.37/scripts/mod/modpost.c 2011-01-04 19:50:19.000000000 -0500
32519 -+++ linux-2.6.37/scripts/mod/modpost.c 2011-01-17 02:41:02.000000000 -0500
32520 +diff -urNp linux-2.6.37.1/scripts/mod/modpost.c linux-2.6.37.1/scripts/mod/modpost.c
32521 +--- linux-2.6.37.1/scripts/mod/modpost.c 2011-01-04 19:50:19.000000000 -0500
32522 ++++ linux-2.6.37.1/scripts/mod/modpost.c 2011-01-17 02:41:02.000000000 -0500
32523 @@ -895,6 +895,7 @@ enum mismatch {
32524 ANY_INIT_TO_ANY_EXIT,
32525 ANY_EXIT_TO_ANY_INIT,
32526 @@ -57992,9 +58103,9 @@ diff -urNp linux-2.6.37/scripts/mod/modpost.c linux-2.6.37/scripts/mod/modpost.c
32527 goto close_write;
32528
32529 tmp = NOFAIL(malloc(b->pos));
32530 -diff -urNp linux-2.6.37/scripts/mod/modpost.h linux-2.6.37/scripts/mod/modpost.h
32531 ---- linux-2.6.37/scripts/mod/modpost.h 2011-01-04 19:50:19.000000000 -0500
32532 -+++ linux-2.6.37/scripts/mod/modpost.h 2011-01-17 02:41:02.000000000 -0500
32533 +diff -urNp linux-2.6.37.1/scripts/mod/modpost.h linux-2.6.37.1/scripts/mod/modpost.h
32534 +--- linux-2.6.37.1/scripts/mod/modpost.h 2011-01-04 19:50:19.000000000 -0500
32535 ++++ linux-2.6.37.1/scripts/mod/modpost.h 2011-01-17 02:41:02.000000000 -0500
32536 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
32537
32538 struct buffer {
32539 @@ -58014,9 +58125,9 @@ diff -urNp linux-2.6.37/scripts/mod/modpost.h linux-2.6.37/scripts/mod/modpost.h
32540
32541 struct module {
32542 struct module *next;
32543 -diff -urNp linux-2.6.37/scripts/mod/sumversion.c linux-2.6.37/scripts/mod/sumversion.c
32544 ---- linux-2.6.37/scripts/mod/sumversion.c 2011-01-04 19:50:19.000000000 -0500
32545 -+++ linux-2.6.37/scripts/mod/sumversion.c 2011-01-17 02:41:02.000000000 -0500
32546 +diff -urNp linux-2.6.37.1/scripts/mod/sumversion.c linux-2.6.37.1/scripts/mod/sumversion.c
32547 +--- linux-2.6.37.1/scripts/mod/sumversion.c 2011-01-04 19:50:19.000000000 -0500
32548 ++++ linux-2.6.37.1/scripts/mod/sumversion.c 2011-01-17 02:41:02.000000000 -0500
32549 @@ -455,7 +455,7 @@ static void write_version(const char *fi
32550 goto out;
32551 }
32552 @@ -58026,9 +58137,9 @@ diff -urNp linux-2.6.37/scripts/mod/sumversion.c linux-2.6.37/scripts/mod/sumver
32553 warn("writing sum in %s failed: %s\n",
32554 filename, strerror(errno));
32555 goto out;
32556 -diff -urNp linux-2.6.37/scripts/pnmtologo.c linux-2.6.37/scripts/pnmtologo.c
32557 ---- linux-2.6.37/scripts/pnmtologo.c 2011-01-04 19:50:19.000000000 -0500
32558 -+++ linux-2.6.37/scripts/pnmtologo.c 2011-01-17 02:41:02.000000000 -0500
32559 +diff -urNp linux-2.6.37.1/scripts/pnmtologo.c linux-2.6.37.1/scripts/pnmtologo.c
32560 +--- linux-2.6.37.1/scripts/pnmtologo.c 2011-01-04 19:50:19.000000000 -0500
32561 ++++ linux-2.6.37.1/scripts/pnmtologo.c 2011-01-17 02:41:02.000000000 -0500
32562 @@ -237,14 +237,14 @@ static void write_header(void)
32563 fprintf(out, " * Linux logo %s\n", logoname);
32564 fputs(" */\n\n", out);
32565 @@ -58055,9 +58166,9 @@ diff -urNp linux-2.6.37/scripts/pnmtologo.c linux-2.6.37/scripts/pnmtologo.c
32566 logoname);
32567 write_hex_cnt = 0;
32568 for (i = 0; i < logo_clutsize; i++) {
32569 -diff -urNp linux-2.6.37/security/apparmor/lsm.c linux-2.6.37/security/apparmor/lsm.c
32570 ---- linux-2.6.37/security/apparmor/lsm.c 2011-01-04 19:50:19.000000000 -0500
32571 -+++ linux-2.6.37/security/apparmor/lsm.c 2011-01-17 02:41:02.000000000 -0500
32572 +diff -urNp linux-2.6.37.1/security/apparmor/lsm.c linux-2.6.37.1/security/apparmor/lsm.c
32573 +--- linux-2.6.37.1/security/apparmor/lsm.c 2011-01-04 19:50:19.000000000 -0500
32574 ++++ linux-2.6.37.1/security/apparmor/lsm.c 2011-01-17 02:41:02.000000000 -0500
32575 @@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc
32576 return error;
32577 }
32578 @@ -58067,9 +58178,9 @@ diff -urNp linux-2.6.37/security/apparmor/lsm.c linux-2.6.37/security/apparmor/l
32579 .name = "apparmor",
32580
32581 .ptrace_access_check = apparmor_ptrace_access_check,
32582 -diff -urNp linux-2.6.37/security/commoncap.c linux-2.6.37/security/commoncap.c
32583 ---- linux-2.6.37/security/commoncap.c 2011-01-04 19:50:19.000000000 -0500
32584 -+++ linux-2.6.37/security/commoncap.c 2011-01-17 02:41:02.000000000 -0500
32585 +diff -urNp linux-2.6.37.1/security/commoncap.c linux-2.6.37.1/security/commoncap.c
32586 +--- linux-2.6.37.1/security/commoncap.c 2011-01-04 19:50:19.000000000 -0500
32587 ++++ linux-2.6.37.1/security/commoncap.c 2011-01-17 02:41:02.000000000 -0500
32588 @@ -27,6 +27,7 @@
32589 #include <linux/sched.h>
32590 #include <linux/prctl.h>
32591 @@ -58101,9 +58212,9 @@ diff -urNp linux-2.6.37/security/commoncap.c linux-2.6.37/security/commoncap.c
32592 if (cred->uid != 0) {
32593 if (bprm->cap_effective)
32594 return 1;
32595 -diff -urNp linux-2.6.37/security/integrity/ima/ima_api.c linux-2.6.37/security/integrity/ima/ima_api.c
32596 ---- linux-2.6.37/security/integrity/ima/ima_api.c 2011-01-04 19:50:19.000000000 -0500
32597 -+++ linux-2.6.37/security/integrity/ima/ima_api.c 2011-01-17 02:41:02.000000000 -0500
32598 +diff -urNp linux-2.6.37.1/security/integrity/ima/ima_api.c linux-2.6.37.1/security/integrity/ima/ima_api.c
32599 +--- linux-2.6.37.1/security/integrity/ima/ima_api.c 2011-01-04 19:50:19.000000000 -0500
32600 ++++ linux-2.6.37.1/security/integrity/ima/ima_api.c 2011-01-17 02:41:02.000000000 -0500
32601 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
32602 int result;
32603
32604 @@ -58113,9 +58224,9 @@ diff -urNp linux-2.6.37/security/integrity/ima/ima_api.c linux-2.6.37/security/i
32605
32606 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
32607 if (!entry) {
32608 -diff -urNp linux-2.6.37/security/integrity/ima/ima_fs.c linux-2.6.37/security/integrity/ima/ima_fs.c
32609 ---- linux-2.6.37/security/integrity/ima/ima_fs.c 2011-01-04 19:50:19.000000000 -0500
32610 -+++ linux-2.6.37/security/integrity/ima/ima_fs.c 2011-01-17 02:41:02.000000000 -0500
32611 +diff -urNp linux-2.6.37.1/security/integrity/ima/ima_fs.c linux-2.6.37.1/security/integrity/ima/ima_fs.c
32612 +--- linux-2.6.37.1/security/integrity/ima/ima_fs.c 2011-01-04 19:50:19.000000000 -0500
32613 ++++ linux-2.6.37.1/security/integrity/ima/ima_fs.c 2011-01-17 02:41:02.000000000 -0500
32614 @@ -28,12 +28,12 @@
32615 static int valid_policy = 1;
32616 #define TMPBUFLEN 12
32617 @@ -58131,9 +58242,9 @@ diff -urNp linux-2.6.37/security/integrity/ima/ima_fs.c linux-2.6.37/security/in
32618 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
32619 }
32620
32621 -diff -urNp linux-2.6.37/security/integrity/ima/ima.h linux-2.6.37/security/integrity/ima/ima.h
32622 ---- linux-2.6.37/security/integrity/ima/ima.h 2011-01-04 19:50:19.000000000 -0500
32623 -+++ linux-2.6.37/security/integrity/ima/ima.h 2011-01-17 02:41:02.000000000 -0500
32624 +diff -urNp linux-2.6.37.1/security/integrity/ima/ima.h linux-2.6.37.1/security/integrity/ima/ima.h
32625 +--- linux-2.6.37.1/security/integrity/ima/ima.h 2011-01-04 19:50:19.000000000 -0500
32626 ++++ linux-2.6.37.1/security/integrity/ima/ima.h 2011-01-17 02:41:02.000000000 -0500
32627 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
32628 extern spinlock_t ima_queue_lock;
32629
32630 @@ -58145,9 +58256,9 @@ diff -urNp linux-2.6.37/security/integrity/ima/ima.h linux-2.6.37/security/integ
32631 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
32632 };
32633 extern struct ima_h_table ima_htable;
32634 -diff -urNp linux-2.6.37/security/integrity/ima/ima_queue.c linux-2.6.37/security/integrity/ima/ima_queue.c
32635 ---- linux-2.6.37/security/integrity/ima/ima_queue.c 2011-01-04 19:50:19.000000000 -0500
32636 -+++ linux-2.6.37/security/integrity/ima/ima_queue.c 2011-01-17 02:41:02.000000000 -0500
32637 +diff -urNp linux-2.6.37.1/security/integrity/ima/ima_queue.c linux-2.6.37.1/security/integrity/ima/ima_queue.c
32638 +--- linux-2.6.37.1/security/integrity/ima/ima_queue.c 2011-01-04 19:50:19.000000000 -0500
32639 ++++ linux-2.6.37.1/security/integrity/ima/ima_queue.c 2011-01-17 02:41:02.000000000 -0500
32640 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
32641 INIT_LIST_HEAD(&qe->later);
32642 list_add_tail_rcu(&qe->later, &ima_measurements);
32643 @@ -58157,9 +58268,9 @@ diff -urNp linux-2.6.37/security/integrity/ima/ima_queue.c linux-2.6.37/security
32644 key = ima_hash_key(entry->digest);
32645 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
32646 return 0;
32647 -diff -urNp linux-2.6.37/security/Kconfig linux-2.6.37/security/Kconfig
32648 ---- linux-2.6.37/security/Kconfig 2011-01-04 19:50:19.000000000 -0500
32649 -+++ linux-2.6.37/security/Kconfig 2011-02-12 11:32:56.000000000 -0500
32650 +diff -urNp linux-2.6.37.1/security/Kconfig linux-2.6.37.1/security/Kconfig
32651 +--- linux-2.6.37.1/security/Kconfig 2011-01-04 19:50:19.000000000 -0500
32652 ++++ linux-2.6.37.1/security/Kconfig 2011-02-12 11:32:56.000000000 -0500
32653 @@ -4,6 +4,527 @@
32654
32655 menu "Security options"
32656 @@ -58697,9 +58808,9 @@ diff -urNp linux-2.6.37/security/Kconfig linux-2.6.37/security/Kconfig
32657 help
32658 This is the portion of low virtual memory which should be protected
32659 from userspace allocation. Keeping a user from writing to low pages
32660 -diff -urNp linux-2.6.37/security/min_addr.c linux-2.6.37/security/min_addr.c
32661 ---- linux-2.6.37/security/min_addr.c 2011-01-04 19:50:19.000000000 -0500
32662 -+++ linux-2.6.37/security/min_addr.c 2011-01-17 02:41:02.000000000 -0500
32663 +diff -urNp linux-2.6.37.1/security/min_addr.c linux-2.6.37.1/security/min_addr.c
32664 +--- linux-2.6.37.1/security/min_addr.c 2011-01-04 19:50:19.000000000 -0500
32665 ++++ linux-2.6.37.1/security/min_addr.c 2011-01-17 02:41:02.000000000 -0500
32666 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
32667 */
32668 static void update_mmap_min_addr(void)
32669 @@ -58716,9 +58827,9 @@ diff -urNp linux-2.6.37/security/min_addr.c linux-2.6.37/security/min_addr.c
32670 }
32671
32672 /*
32673 -diff -urNp linux-2.6.37/security/security.c linux-2.6.37/security/security.c
32674 ---- linux-2.6.37/security/security.c 2011-01-04 19:50:19.000000000 -0500
32675 -+++ linux-2.6.37/security/security.c 2011-02-12 10:36:34.000000000 -0500
32676 +diff -urNp linux-2.6.37.1/security/security.c linux-2.6.37.1/security/security.c
32677 +--- linux-2.6.37.1/security/security.c 2011-02-22 16:05:31.000000000 -0500
32678 ++++ linux-2.6.37.1/security/security.c 2011-02-22 16:05:49.000000000 -0500
32679 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
32680 /* things that live in capability.c */
32681 extern void __init security_fixup_ops(struct security_operations *ops);
32682 @@ -58753,9 +58864,9 @@ diff -urNp linux-2.6.37/security/security.c linux-2.6.37/security/security.c
32683 }
32684
32685 int security_real_capable(struct task_struct *tsk, int cap)
32686 -diff -urNp linux-2.6.37/security/selinux/hooks.c linux-2.6.37/security/selinux/hooks.c
32687 ---- linux-2.6.37/security/selinux/hooks.c 2011-01-04 19:50:19.000000000 -0500
32688 -+++ linux-2.6.37/security/selinux/hooks.c 2011-02-12 11:02:14.000000000 -0500
32689 +diff -urNp linux-2.6.37.1/security/selinux/hooks.c linux-2.6.37.1/security/selinux/hooks.c
32690 +--- linux-2.6.37.1/security/selinux/hooks.c 2011-02-22 16:05:31.000000000 -0500
32691 ++++ linux-2.6.37.1/security/selinux/hooks.c 2011-02-22 16:05:49.000000000 -0500
32692 @@ -90,7 +90,6 @@
32693 #define NUM_SEL_MNT_OPTS 5
32694
32695 @@ -58764,7 +58875,7 @@ diff -urNp linux-2.6.37/security/selinux/hooks.c linux-2.6.37/security/selinux/h
32696
32697 /* SECMARK reference count */
32698 atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
32699 -@@ -3195,7 +3194,11 @@ static void selinux_cred_free(struct cre
32700 +@@ -3198,7 +3197,11 @@ static void selinux_cred_free(struct cre
32701 {
32702 struct task_security_struct *tsec = cred->security;
32703
32704 @@ -58777,7 +58888,7 @@ diff -urNp linux-2.6.37/security/selinux/hooks.c linux-2.6.37/security/selinux/h
32705 cred->security = (void *) 0x7UL;
32706 kfree(tsec);
32707 }
32708 -@@ -5388,7 +5391,7 @@ static int selinux_key_getsecurity(struc
32709 +@@ -5391,7 +5394,7 @@ static int selinux_key_getsecurity(struc
32710
32711 #endif
32712
32713 @@ -58786,9 +58897,9 @@ diff -urNp linux-2.6.37/security/selinux/hooks.c linux-2.6.37/security/selinux/h
32714 .name = "selinux",
32715
32716 .ptrace_access_check = selinux_ptrace_access_check,
32717 -diff -urNp linux-2.6.37/security/smack/smack_lsm.c linux-2.6.37/security/smack/smack_lsm.c
32718 ---- linux-2.6.37/security/smack/smack_lsm.c 2011-01-04 19:50:19.000000000 -0500
32719 -+++ linux-2.6.37/security/smack/smack_lsm.c 2011-01-17 02:41:02.000000000 -0500
32720 +diff -urNp linux-2.6.37.1/security/smack/smack_lsm.c linux-2.6.37.1/security/smack/smack_lsm.c
32721 +--- linux-2.6.37.1/security/smack/smack_lsm.c 2011-02-22 16:05:31.000000000 -0500
32722 ++++ linux-2.6.37.1/security/smack/smack_lsm.c 2011-02-22 16:05:49.000000000 -0500
32723 @@ -3052,7 +3052,7 @@ static int smack_inode_getsecctx(struct
32724 return 0;
32725 }
32726 @@ -58798,9 +58909,9 @@ diff -urNp linux-2.6.37/security/smack/smack_lsm.c linux-2.6.37/security/smack/s
32727 .name = "smack",
32728
32729 .ptrace_access_check = smack_ptrace_access_check,
32730 -diff -urNp linux-2.6.37/security/tomoyo/tomoyo.c linux-2.6.37/security/tomoyo/tomoyo.c
32731 ---- linux-2.6.37/security/tomoyo/tomoyo.c 2011-01-04 19:50:19.000000000 -0500
32732 -+++ linux-2.6.37/security/tomoyo/tomoyo.c 2011-01-17 02:41:02.000000000 -0500
32733 +diff -urNp linux-2.6.37.1/security/tomoyo/tomoyo.c linux-2.6.37.1/security/tomoyo/tomoyo.c
32734 +--- linux-2.6.37.1/security/tomoyo/tomoyo.c 2011-01-04 19:50:19.000000000 -0500
32735 ++++ linux-2.6.37.1/security/tomoyo/tomoyo.c 2011-01-17 02:41:02.000000000 -0500
32736 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
32737 * tomoyo_security_ops is a "struct security_operations" which is used for
32738 * registering TOMOYO.
32739 @@ -58810,9 +58921,9 @@ diff -urNp linux-2.6.37/security/tomoyo/tomoyo.c linux-2.6.37/security/tomoyo/to
32740 .name = "tomoyo",
32741 .cred_alloc_blank = tomoyo_cred_alloc_blank,
32742 .cred_prepare = tomoyo_cred_prepare,
32743 -diff -urNp linux-2.6.37/sound/aoa/codecs/onyx.c linux-2.6.37/sound/aoa/codecs/onyx.c
32744 ---- linux-2.6.37/sound/aoa/codecs/onyx.c 2011-01-04 19:50:19.000000000 -0500
32745 -+++ linux-2.6.37/sound/aoa/codecs/onyx.c 2011-01-24 18:04:18.000000000 -0500
32746 +diff -urNp linux-2.6.37.1/sound/aoa/codecs/onyx.c linux-2.6.37.1/sound/aoa/codecs/onyx.c
32747 +--- linux-2.6.37.1/sound/aoa/codecs/onyx.c 2011-01-04 19:50:19.000000000 -0500
32748 ++++ linux-2.6.37.1/sound/aoa/codecs/onyx.c 2011-01-24 18:04:18.000000000 -0500
32749 @@ -54,7 +54,7 @@ struct onyx {
32750 spdif_locked:1,
32751 analog_locked:1,
32752 @@ -58841,9 +58952,9 @@ diff -urNp linux-2.6.37/sound/aoa/codecs/onyx.c linux-2.6.37/sound/aoa/codecs/on
32753 onyx->spdif_locked = onyx->analog_locked = 0;
32754 mutex_unlock(&onyx->mutex);
32755
32756 -diff -urNp linux-2.6.37/sound/aoa/codecs/onyx.h linux-2.6.37/sound/aoa/codecs/onyx.h
32757 ---- linux-2.6.37/sound/aoa/codecs/onyx.h 2011-01-04 19:50:19.000000000 -0500
32758 -+++ linux-2.6.37/sound/aoa/codecs/onyx.h 2011-01-25 20:24:56.000000000 -0500
32759 +diff -urNp linux-2.6.37.1/sound/aoa/codecs/onyx.h linux-2.6.37.1/sound/aoa/codecs/onyx.h
32760 +--- linux-2.6.37.1/sound/aoa/codecs/onyx.h 2011-01-04 19:50:19.000000000 -0500
32761 ++++ linux-2.6.37.1/sound/aoa/codecs/onyx.h 2011-01-25 20:24:56.000000000 -0500
32762 @@ -11,6 +11,7 @@
32763 #include <linux/i2c.h>
32764 #include <asm/pmac_low_i2c.h>
32765 @@ -58852,9 +58963,9 @@ diff -urNp linux-2.6.37/sound/aoa/codecs/onyx.h linux-2.6.37/sound/aoa/codecs/on
32766
32767 /* PCM3052 register definitions */
32768
32769 -diff -urNp linux-2.6.37/sound/core/oss/pcm_oss.c linux-2.6.37/sound/core/oss/pcm_oss.c
32770 ---- linux-2.6.37/sound/core/oss/pcm_oss.c 2011-01-04 19:50:19.000000000 -0500
32771 -+++ linux-2.6.37/sound/core/oss/pcm_oss.c 2011-01-17 02:41:02.000000000 -0500
32772 +diff -urNp linux-2.6.37.1/sound/core/oss/pcm_oss.c linux-2.6.37.1/sound/core/oss/pcm_oss.c
32773 +--- linux-2.6.37.1/sound/core/oss/pcm_oss.c 2011-01-04 19:50:19.000000000 -0500
32774 ++++ linux-2.6.37.1/sound/core/oss/pcm_oss.c 2011-01-17 02:41:02.000000000 -0500
32775 @@ -2969,8 +2969,8 @@ static void snd_pcm_oss_proc_done(struct
32776 }
32777 }
32778 @@ -58866,9 +58977,9 @@ diff -urNp linux-2.6.37/sound/core/oss/pcm_oss.c linux-2.6.37/sound/core/oss/pcm
32779 #endif /* CONFIG_SND_VERBOSE_PROCFS */
32780
32781 /*
32782 -diff -urNp linux-2.6.37/sound/core/seq/seq_lock.h linux-2.6.37/sound/core/seq/seq_lock.h
32783 ---- linux-2.6.37/sound/core/seq/seq_lock.h 2011-01-04 19:50:19.000000000 -0500
32784 -+++ linux-2.6.37/sound/core/seq/seq_lock.h 2011-01-17 02:41:02.000000000 -0500
32785 +diff -urNp linux-2.6.37.1/sound/core/seq/seq_lock.h linux-2.6.37.1/sound/core/seq/seq_lock.h
32786 +--- linux-2.6.37.1/sound/core/seq/seq_lock.h 2011-01-04 19:50:19.000000000 -0500
32787 ++++ linux-2.6.37.1/sound/core/seq/seq_lock.h 2011-01-17 02:41:02.000000000 -0500
32788 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
32789 #else /* SMP || CONFIG_SND_DEBUG */
32790
32791 @@ -58884,9 +58995,9 @@ diff -urNp linux-2.6.37/sound/core/seq/seq_lock.h linux-2.6.37/sound/core/seq/se
32792
32793 #endif /* SMP || CONFIG_SND_DEBUG */
32794
32795 -diff -urNp linux-2.6.37/sound/drivers/mts64.c linux-2.6.37/sound/drivers/mts64.c
32796 ---- linux-2.6.37/sound/drivers/mts64.c 2011-01-04 19:50:19.000000000 -0500
32797 -+++ linux-2.6.37/sound/drivers/mts64.c 2011-01-25 22:35:55.000000000 -0500
32798 +diff -urNp linux-2.6.37.1/sound/drivers/mts64.c linux-2.6.37.1/sound/drivers/mts64.c
32799 +--- linux-2.6.37.1/sound/drivers/mts64.c 2011-01-04 19:50:19.000000000 -0500
32800 ++++ linux-2.6.37.1/sound/drivers/mts64.c 2011-01-25 22:35:55.000000000 -0500
32801 @@ -28,6 +28,7 @@
32802 #include <sound/initval.h>
32803 #include <sound/rawmidi.h>
32804 @@ -58943,9 +59054,9 @@ diff -urNp linux-2.6.37/sound/drivers/mts64.c linux-2.6.37/sound/drivers/mts64.c
32805
32806 return 0;
32807 }
32808 -diff -urNp linux-2.6.37/sound/drivers/portman2x4.c linux-2.6.37/sound/drivers/portman2x4.c
32809 ---- linux-2.6.37/sound/drivers/portman2x4.c 2011-01-04 19:50:19.000000000 -0500
32810 -+++ linux-2.6.37/sound/drivers/portman2x4.c 2011-01-25 20:24:56.000000000 -0500
32811 +diff -urNp linux-2.6.37.1/sound/drivers/portman2x4.c linux-2.6.37.1/sound/drivers/portman2x4.c
32812 +--- linux-2.6.37.1/sound/drivers/portman2x4.c 2011-01-04 19:50:19.000000000 -0500
32813 ++++ linux-2.6.37.1/sound/drivers/portman2x4.c 2011-01-25 20:24:56.000000000 -0500
32814 @@ -47,6 +47,7 @@
32815 #include <sound/initval.h>
32816 #include <sound/rawmidi.h>
32817 @@ -58963,9 +59074,9 @@ diff -urNp linux-2.6.37/sound/drivers/portman2x4.c linux-2.6.37/sound/drivers/po
32818 int mode[PORTMAN_NUM_INPUT_PORTS];
32819 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
32820 };
32821 -diff -urNp linux-2.6.37/sound/oss/sb_audio.c linux-2.6.37/sound/oss/sb_audio.c
32822 ---- linux-2.6.37/sound/oss/sb_audio.c 2011-01-04 19:50:19.000000000 -0500
32823 -+++ linux-2.6.37/sound/oss/sb_audio.c 2011-01-17 02:41:02.000000000 -0500
32824 +diff -urNp linux-2.6.37.1/sound/oss/sb_audio.c linux-2.6.37.1/sound/oss/sb_audio.c
32825 +--- linux-2.6.37.1/sound/oss/sb_audio.c 2011-01-04 19:50:19.000000000 -0500
32826 ++++ linux-2.6.37.1/sound/oss/sb_audio.c 2011-01-17 02:41:02.000000000 -0500
32827 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
32828 buf16 = (signed short *)(localbuf + localoffs);
32829 while (c)
32830 @@ -58975,9 +59086,9 @@ diff -urNp linux-2.6.37/sound/oss/sb_audio.c linux-2.6.37/sound/oss/sb_audio.c
32831 if (copy_from_user(lbuf8,
32832 userbuf+useroffs + p,
32833 locallen))
32834 -diff -urNp linux-2.6.37/sound/oss/swarm_cs4297a.c linux-2.6.37/sound/oss/swarm_cs4297a.c
32835 ---- linux-2.6.37/sound/oss/swarm_cs4297a.c 2011-01-04 19:50:19.000000000 -0500
32836 -+++ linux-2.6.37/sound/oss/swarm_cs4297a.c 2011-01-17 02:41:02.000000000 -0500
32837 +diff -urNp linux-2.6.37.1/sound/oss/swarm_cs4297a.c linux-2.6.37.1/sound/oss/swarm_cs4297a.c
32838 +--- linux-2.6.37.1/sound/oss/swarm_cs4297a.c 2011-01-04 19:50:19.000000000 -0500
32839 ++++ linux-2.6.37.1/sound/oss/swarm_cs4297a.c 2011-01-17 02:41:02.000000000 -0500
32840 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
32841 {
32842 struct cs4297a_state *s;
32843 @@ -59012,9 +59123,9 @@ diff -urNp linux-2.6.37/sound/oss/swarm_cs4297a.c linux-2.6.37/sound/oss/swarm_c
32844
32845 list_add(&s->list, &cs4297a_devs);
32846
32847 -diff -urNp linux-2.6.37/sound/pci/ac97/ac97_codec.c linux-2.6.37/sound/pci/ac97/ac97_codec.c
32848 ---- linux-2.6.37/sound/pci/ac97/ac97_codec.c 2011-01-04 19:50:19.000000000 -0500
32849 -+++ linux-2.6.37/sound/pci/ac97/ac97_codec.c 2011-01-17 02:41:02.000000000 -0500
32850 +diff -urNp linux-2.6.37.1/sound/pci/ac97/ac97_codec.c linux-2.6.37.1/sound/pci/ac97/ac97_codec.c
32851 +--- linux-2.6.37.1/sound/pci/ac97/ac97_codec.c 2011-01-04 19:50:19.000000000 -0500
32852 ++++ linux-2.6.37.1/sound/pci/ac97/ac97_codec.c 2011-01-17 02:41:02.000000000 -0500
32853 @@ -1962,7 +1962,7 @@ static int snd_ac97_dev_disconnect(struc
32854 }
32855
32856 @@ -59024,9 +59135,9 @@ diff -urNp linux-2.6.37/sound/pci/ac97/ac97_codec.c linux-2.6.37/sound/pci/ac97/
32857
32858 #ifdef CONFIG_SND_AC97_POWER_SAVE
32859 static void do_update_power(struct work_struct *work)
32860 -diff -urNp linux-2.6.37/sound/pci/ac97/ac97_patch.c linux-2.6.37/sound/pci/ac97/ac97_patch.c
32861 ---- linux-2.6.37/sound/pci/ac97/ac97_patch.c 2011-01-04 19:50:19.000000000 -0500
32862 -+++ linux-2.6.37/sound/pci/ac97/ac97_patch.c 2011-01-17 02:41:02.000000000 -0500
32863 +diff -urNp linux-2.6.37.1/sound/pci/ac97/ac97_patch.c linux-2.6.37.1/sound/pci/ac97/ac97_patch.c
32864 +--- linux-2.6.37.1/sound/pci/ac97/ac97_patch.c 2011-01-04 19:50:19.000000000 -0500
32865 ++++ linux-2.6.37.1/sound/pci/ac97/ac97_patch.c 2011-01-17 02:41:02.000000000 -0500
32866 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
32867 return 0;
32868 }
32869 @@ -59324,9 +59435,9 @@ diff -urNp linux-2.6.37/sound/pci/ac97/ac97_patch.c linux-2.6.37/sound/pci/ac97/
32870 .build_specific = patch_ucb1400_specific,
32871 };
32872
32873 -diff -urNp linux-2.6.37/sound/pci/ens1370.c linux-2.6.37/sound/pci/ens1370.c
32874 ---- linux-2.6.37/sound/pci/ens1370.c 2011-01-04 19:50:19.000000000 -0500
32875 -+++ linux-2.6.37/sound/pci/ens1370.c 2011-01-17 02:41:02.000000000 -0500
32876 +diff -urNp linux-2.6.37.1/sound/pci/ens1370.c linux-2.6.37.1/sound/pci/ens1370.c
32877 +--- linux-2.6.37.1/sound/pci/ens1370.c 2011-01-04 19:50:19.000000000 -0500
32878 ++++ linux-2.6.37.1/sound/pci/ens1370.c 2011-01-17 02:41:02.000000000 -0500
32879 @@ -452,7 +452,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio
32880 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
32881 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
32882 @@ -59336,10 +59447,10 @@ diff -urNp linux-2.6.37/sound/pci/ens1370.c linux-2.6.37/sound/pci/ens1370.c
32883 };
32884
32885 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
32886 -diff -urNp linux-2.6.37/sound/pci/hda/patch_hdmi.c linux-2.6.37/sound/pci/hda/patch_hdmi.c
32887 ---- linux-2.6.37/sound/pci/hda/patch_hdmi.c 2011-01-04 19:50:19.000000000 -0500
32888 -+++ linux-2.6.37/sound/pci/hda/patch_hdmi.c 2011-01-17 02:41:02.000000000 -0500
32889 -@@ -726,10 +726,10 @@ static void hdmi_non_intrinsic_event(str
32890 +diff -urNp linux-2.6.37.1/sound/pci/hda/patch_hdmi.c linux-2.6.37.1/sound/pci/hda/patch_hdmi.c
32891 +--- linux-2.6.37.1/sound/pci/hda/patch_hdmi.c 2011-02-22 16:05:31.000000000 -0500
32892 ++++ linux-2.6.37.1/sound/pci/hda/patch_hdmi.c 2011-02-22 16:05:49.000000000 -0500
32893 +@@ -733,10 +733,10 @@ static void hdmi_non_intrinsic_event(str
32894 cp_ready);
32895
32896 /* TODO */
32897 @@ -59354,9 +59465,9 @@ diff -urNp linux-2.6.37/sound/pci/hda/patch_hdmi.c linux-2.6.37/sound/pci/hda/pa
32898 }
32899
32900
32901 -diff -urNp linux-2.6.37/sound/pci/intel8x0.c linux-2.6.37/sound/pci/intel8x0.c
32902 ---- linux-2.6.37/sound/pci/intel8x0.c 2011-01-04 19:50:19.000000000 -0500
32903 -+++ linux-2.6.37/sound/pci/intel8x0.c 2011-01-17 02:41:02.000000000 -0500
32904 +diff -urNp linux-2.6.37.1/sound/pci/intel8x0.c linux-2.6.37.1/sound/pci/intel8x0.c
32905 +--- linux-2.6.37.1/sound/pci/intel8x0.c 2011-01-04 19:50:19.000000000 -0500
32906 ++++ linux-2.6.37.1/sound/pci/intel8x0.c 2011-01-17 02:41:02.000000000 -0500
32907 @@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
32908 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
32909 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
32910 @@ -59375,9 +59486,9 @@ diff -urNp linux-2.6.37/sound/pci/intel8x0.c linux-2.6.37/sound/pci/intel8x0.c
32911 };
32912
32913 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
32914 -diff -urNp linux-2.6.37/sound/pci/intel8x0m.c linux-2.6.37/sound/pci/intel8x0m.c
32915 ---- linux-2.6.37/sound/pci/intel8x0m.c 2011-01-04 19:50:19.000000000 -0500
32916 -+++ linux-2.6.37/sound/pci/intel8x0m.c 2011-01-17 02:41:02.000000000 -0500
32917 +diff -urNp linux-2.6.37.1/sound/pci/intel8x0m.c linux-2.6.37.1/sound/pci/intel8x0m.c
32918 +--- linux-2.6.37.1/sound/pci/intel8x0m.c 2011-01-04 19:50:19.000000000 -0500
32919 ++++ linux-2.6.37.1/sound/pci/intel8x0m.c 2011-01-17 02:41:02.000000000 -0500
32920 @@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
32921 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
32922 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
32923 @@ -59396,9 +59507,33 @@ diff -urNp linux-2.6.37/sound/pci/intel8x0m.c linux-2.6.37/sound/pci/intel8x0m.c
32924 };
32925
32926 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
32927 -diff -urNp linux-2.6.37/usr/gen_init_cpio.c linux-2.6.37/usr/gen_init_cpio.c
32928 ---- linux-2.6.37/usr/gen_init_cpio.c 2011-01-04 19:50:19.000000000 -0500
32929 -+++ linux-2.6.37/usr/gen_init_cpio.c 2011-01-17 02:41:02.000000000 -0500
32930 +diff -urNp linux-2.6.37.1/sound/usb/caiaq/audio.c linux-2.6.37.1/sound/usb/caiaq/audio.c
32931 +--- linux-2.6.37.1/sound/usb/caiaq/audio.c 2011-01-04 19:50:19.000000000 -0500
32932 ++++ linux-2.6.37.1/sound/usb/caiaq/audio.c 2011-02-22 16:33:01.000000000 -0500
32933 +@@ -785,7 +785,7 @@ int snd_usb_caiaq_audio_init(struct snd_
32934 + }
32935 +
32936 + dev->pcm->private_data = dev;
32937 +- strcpy(dev->pcm->name, dev->product_name);
32938 ++ strlcpy(dev->pcm->name, dev->product_name, sizeof(dev->pcm->name));
32939 +
32940 + memset(dev->sub_playback, 0, sizeof(dev->sub_playback));
32941 + memset(dev->sub_capture, 0, sizeof(dev->sub_capture));
32942 +diff -urNp linux-2.6.37.1/sound/usb/caiaq/midi.c linux-2.6.37.1/sound/usb/caiaq/midi.c
32943 +--- linux-2.6.37.1/sound/usb/caiaq/midi.c 2011-01-04 19:50:19.000000000 -0500
32944 ++++ linux-2.6.37.1/sound/usb/caiaq/midi.c 2011-02-22 16:33:13.000000000 -0500
32945 +@@ -136,7 +136,7 @@ int snd_usb_caiaq_midi_init(struct snd_u
32946 + if (ret < 0)
32947 + return ret;
32948 +
32949 +- strcpy(rmidi->name, device->product_name);
32950 ++ strlcpy(rmidi->name, device->product_name, sizeof(rmidi->name));
32951 +
32952 + rmidi->info_flags = SNDRV_RAWMIDI_INFO_DUPLEX;
32953 + rmidi->private_data = device;
32954 +diff -urNp linux-2.6.37.1/usr/gen_init_cpio.c linux-2.6.37.1/usr/gen_init_cpio.c
32955 +--- linux-2.6.37.1/usr/gen_init_cpio.c 2011-01-04 19:50:19.000000000 -0500
32956 ++++ linux-2.6.37.1/usr/gen_init_cpio.c 2011-01-17 02:41:02.000000000 -0500
32957 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
32958 int retval;
32959 int rc = -1;
32960 @@ -59421,9 +59556,9 @@ diff -urNp linux-2.6.37/usr/gen_init_cpio.c linux-2.6.37/usr/gen_init_cpio.c
32961 } else
32962 break;
32963 }
32964 -diff -urNp linux-2.6.37/virt/kvm/kvm_main.c linux-2.6.37/virt/kvm/kvm_main.c
32965 ---- linux-2.6.37/virt/kvm/kvm_main.c 2011-01-04 19:50:19.000000000 -0500
32966 -+++ linux-2.6.37/virt/kvm/kvm_main.c 2011-01-17 02:41:02.000000000 -0500
32967 +diff -urNp linux-2.6.37.1/virt/kvm/kvm_main.c linux-2.6.37.1/virt/kvm/kvm_main.c
32968 +--- linux-2.6.37.1/virt/kvm/kvm_main.c 2011-01-04 19:50:19.000000000 -0500
32969 ++++ linux-2.6.37.1/virt/kvm/kvm_main.c 2011-01-17 02:41:02.000000000 -0500
32970 @@ -1344,6 +1344,7 @@ static int kvm_vcpu_release(struct inode
32971 return 0;
32972 }
Report Message
Find on MARC Find on Google Groups