From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QTSYM-0001Mb-1M for garchives@archives.gentoo.org; Mon, 06 Jun 2011 05:42:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A18B81C017; Mon, 6 Jun 2011 05:40:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2F8481C017 for ; Mon, 6 Jun 2011 05:40:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D84341B400F for ; Mon, 6 Jun 2011 05:40:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 27C1780037 for ; Mon, 6 Jun 2011 05:40:27 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <67c9b9d30e96df32d28f6f2fcfb7c44da12a700f.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 2.6.39/, 2.6.32/ X-VCS-Repository: proj/hardened-patchset X-VCS-Files: 2.6.32/0000_README 2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201105251736.patch 2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106042120.patch 2.6.32/4422_grsec-mute-warnings.patch 2.6.32/4435_grsec-kconfig-gentoo.patch 2.6.39/0000_README 2.6.39/1000_linux-2.6.39.1.patch 2.6.39/4420_grsecurity-2.2.2-2.6.39-201105251736.patch 2.6.39/4420_grsecurity-2.2.2-2.6.39.1-201106042120.patch 2.6.39/4422_grsec-mute-warnings.patch 2.6.39/4435_grsec-kconfig-gentoo.patch X-VCS-Directories: 2.6.39/ 2.6.32/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 67c9b9d30e96df32d28f6f2fcfb7c44da12a700f Date: Mon, 6 Jun 2011 05:40:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3203e6b07c6ad7c08017106eacff2604 commit: 67c9b9d30e96df32d28f6f2fcfb7c44da12a700f Author: Anthony G. Basile gentoo org> AuthorDate: Mon Jun 6 05:38:24 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jun 6 05:38:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-patc= hset.git;a=3Dcommit;h=3D67c9b9d3 Update Grsec/PaX 2.2.2-2.6.32.41-201106042120 2.2.2-2.6.39.1-201106042120 --- 2.6.32/0000_README | 2 +- ..._grsecurity-2.2.2-2.6.32.41-201106042120.patch} | 615 +- 2.6.32/4422_grsec-mute-warnings.patch | 8 +- 2.6.32/4435_grsec-kconfig-gentoo.patch | 2 +- 2.6.39/0000_README | 6 +- 2.6.39/1000_linux-2.6.39.1.patch | 6469 +++++++++ ...0_grsecurity-2.2.2-2.6.39.1-201106042120.patch} |13826 ++++++++++----= ------ 2.6.39/4422_grsec-mute-warnings.patch | 8 +- 2.6.39/4435_grsec-kconfig-gentoo.patch | 2 +- 9 files changed, 14113 insertions(+), 6825 deletions(-) diff --git a/2.6.32/0000_README b/2.6.32/0000_README index cd33071..beea0b4 100644 --- a/2.6.32/0000_README +++ b/2.6.32/0000_README @@ -3,7 +3,7 @@ README =20 Individual Patch Descriptions: ------------------------------------------------------------------------= ----- -Patch: 4420_grsecurity-2.2.2-2.6.32.41-201105251736.patch +Patch: 4420_grsecurity-2.2.2-2.6.32.41-201106042120.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity =20 diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201105251736.patch b/= 2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106042120.patch similarity index 99% rename from 2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201105251736.patch rename to 2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106042120.patch index d39c729..7457e1f 100644 --- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201105251736.patch +++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106042120.patch @@ -3769,6 +3769,30 @@ diff -urNp linux-2.6.32.41/arch/sparc/include/asm/= spinlock_64.h linux-2.6.32.41/ { __asm__ __volatile__( " stw %%g0, [%0]" +diff -urNp linux-2.6.32.41/arch/sparc/include/asm/thread_info_32.h linux= -2.6.32.41/arch/sparc/include/asm/thread_info_32.h +--- linux-2.6.32.41/arch/sparc/include/asm/thread_info_32.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.41/arch/sparc/include/asm/thread_info_32.h 2011-06-04 2= 0:46:01.000000000 -0400 +@@ -50,6 +50,8 @@ struct thread_info { + unsigned long w_saved; +=20 + struct restart_block restart_block; ++ ++ unsigned long lowest_stack; + }; +=20 + /* +diff -urNp linux-2.6.32.41/arch/sparc/include/asm/thread_info_64.h linux= -2.6.32.41/arch/sparc/include/asm/thread_info_64.h +--- linux-2.6.32.41/arch/sparc/include/asm/thread_info_64.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.41/arch/sparc/include/asm/thread_info_64.h 2011-06-04 2= 0:46:21.000000000 -0400 +@@ -68,6 +68,8 @@ struct thread_info { + struct pt_regs *kern_una_regs; + unsigned int kern_una_insn; +=20 ++ unsigned long lowest_stack; ++ + unsigned long fpregs[0] __attribute__ ((aligned(64))); + }; +=20 diff -urNp linux-2.6.32.41/arch/sparc/include/asm/uaccess_32.h linux-2.6= .32.41/arch/sparc/include/asm/uaccess_32.h --- linux-2.6.32.41/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31= :47.000000000 -0400 +++ linux-2.6.32.41/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56= :46.000000000 -0400 @@ -6270,7 +6294,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32_aout.= c linux-2.6.32.41/arch/x86/ia return has_dumped; diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.S linux-2.6.32.41/arc= h/x86/ia32/ia32entry.S --- linux-2.6.32.41/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.41/arch/x86/ia32/ia32entry.S 2011-05-22 23:14:58.000000= 000 -0400 ++++ linux-2.6.32.41/arch/x86/ia32/ia32entry.S 2011-06-04 20:29:52.000000= 000 -0400 @@ -13,6 +13,7 @@ #include =09 #include @@ -6279,7 +6303,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia #include =20 /* Avoid __ASSEMBLER__'ifying just for this. */ -@@ -93,6 +94,32 @@ ENTRY(native_irq_enable_sysexit) +@@ -93,6 +94,30 @@ ENTRY(native_irq_enable_sysexit) ENDPROC(native_irq_enable_sysexit) #endif =20 @@ -6298,21 +6322,19 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entr= y.S linux-2.6.32.41/arch/x86/ia + call pax_randomize_kstack + popq %rax +#endif -+#ifdef CONFIG_PAX_MEMORY_STACKLEAK -+ call pax_erase_kstack -+#endif ++ pax_erase_kstack + .endm + -+ .macro pax_erase_kstack ++.macro pax_erase_kstack +#ifdef CONFIG_PAX_MEMORY_STACKLEAK + call pax_erase_kstack +#endif -+ .endm ++.endm + /* * 32bit SYSENTER instruction entry. * -@@ -119,7 +146,7 @@ ENTRY(ia32_sysenter_target) +@@ -119,7 +144,7 @@ ENTRY(ia32_sysenter_target) CFI_REGISTER rsp,rbp SWAPGS_UNSAFE_STACK movq PER_CPU_VAR(kernel_stack), %rsp @@ -6321,7 +6343,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia /* * No need to follow this irqs on/off section: the syscall * disabled irqs, here we enable it straight after entry: -@@ -135,7 +162,8 @@ ENTRY(ia32_sysenter_target) +@@ -135,7 +160,8 @@ ENTRY(ia32_sysenter_target) pushfq CFI_ADJUST_CFA_OFFSET 8 /*CFI_REL_OFFSET rflags,0*/ @@ -6331,7 +6353,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia CFI_REGISTER rip,r10 pushq $__USER32_CS CFI_ADJUST_CFA_OFFSET 8 -@@ -150,6 +178,12 @@ ENTRY(ia32_sysenter_target) +@@ -150,6 +176,12 @@ ENTRY(ia32_sysenter_target) SAVE_ARGS 0,0,1 /* no need to do an access_ok check here because rbp has been 32bit zero extended */=20 @@ -6344,7 +6366,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia 1: movl (%rbp),%ebp .section __ex_table,"a" .quad 1b,ia32_badarg -@@ -172,6 +206,7 @@ sysenter_dispatch: +@@ -172,6 +204,7 @@ sysenter_dispatch: testl $_TIF_ALLWORK_MASK,TI_flags(%r10) jnz sysexit_audit sysexit_from_sys_call: @@ -6352,7 +6374,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia andl $~TS_COMPAT,TI_status(%r10) /* clear IF, that popfq doesn't enable interrupts early */ andl $~0x200,EFLAGS-R11(%rsp)=20 -@@ -200,6 +235,9 @@ sysexit_from_sys_call: +@@ -200,6 +233,9 @@ sysexit_from_sys_call: movl %eax,%esi /* 2nd arg: syscall number */ movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ call audit_syscall_entry @@ -6362,7 +6384,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys -@@ -252,6 +290,9 @@ sysenter_tracesys: +@@ -252,6 +288,9 @@ sysenter_tracesys: movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter @@ -6372,7 +6394,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace change= d it */ RESTORE_REST cmpq $(IA32_NR_syscalls-1),%rax -@@ -283,19 +324,24 @@ ENDPROC(ia32_sysenter_target) +@@ -283,19 +322,24 @@ ENDPROC(ia32_sysenter_target) ENTRY(ia32_cstar_target) CFI_STARTPROC32 simple CFI_SIGNAL_FRAME @@ -6399,7 +6421,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia movl %eax,%eax /* zero extension */ movq %rax,ORIG_RAX-ARGOFFSET(%rsp) movq %rcx,RIP-ARGOFFSET(%rsp) -@@ -311,6 +357,12 @@ ENTRY(ia32_cstar_target) +@@ -311,6 +355,12 @@ ENTRY(ia32_cstar_target) /* no need to do an access_ok check here because r8 has been 32bit zero extended */=20 /* hardware stack frame is complete now */=09 @@ -6412,7 +6434,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia 1: movl (%r8),%r9d .section __ex_table,"a" .quad 1b,ia32_badarg -@@ -333,6 +385,7 @@ cstar_dispatch: +@@ -333,6 +383,7 @@ cstar_dispatch: testl $_TIF_ALLWORK_MASK,TI_flags(%r10) jnz sysretl_audit sysretl_from_sys_call: @@ -6420,7 +6442,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia andl $~TS_COMPAT,TI_status(%r10) RESTORE_ARGS 1,-ARG_SKIP,1,1,1 movl RIP-ARGOFFSET(%rsp),%ecx -@@ -370,6 +423,9 @@ cstar_tracesys: +@@ -370,6 +421,9 @@ cstar_tracesys: movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter @@ -6430,7 +6452,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace cha= nged it */ RESTORE_REST xchgl %ebp,%r9d -@@ -415,6 +471,7 @@ ENTRY(ia32_syscall) +@@ -415,6 +469,7 @@ ENTRY(ia32_syscall) CFI_REL_OFFSET rip,RIP-RIP PARAVIRT_ADJUST_EXCEPTION_FRAME SWAPGS @@ -6438,7 +6460,7 @@ diff -urNp linux-2.6.32.41/arch/x86/ia32/ia32entry.= S linux-2.6.32.41/arch/x86/ia /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -@@ -448,6 +505,9 @@ ia32_tracesys: =20 +@@ -448,6 +503,9 @@ ia32_tracesys: =20 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter @@ -12965,7 +12987,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 32.S linux-2.6.32.41/arch/x86/k CFI_ADJUST_CFA_OFFSET -24 diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_64.S linux-2.6.32.41/ar= ch/x86/kernel/entry_64.S --- linux-2.6.32.41/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.41/arch/x86/kernel/entry_64.S 2011-05-22 23:18:48.00000= 0000 -0400 ++++ linux-2.6.32.41/arch/x86/kernel/entry_64.S 2011-06-04 20:30:53.00000= 0000 -0400 @@ -53,6 +53,7 @@ #include #include @@ -12974,7 +12996,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k =20 /* Avoid __ASSEMBLER__'ifying just for this. */ #include -@@ -174,6 +175,259 @@ ENTRY(native_usergs_sysret64) +@@ -174,6 +175,257 @@ ENTRY(native_usergs_sysret64) ENDPROC(native_usergs_sysret64) #endif /* CONFIG_PARAVIRT */ =20 @@ -13071,9 +13093,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k + call pax_randomize_kstack + pop %rax +#endif -+#ifdef CONFIG_PAX_MEMORY_STACKLEAK -+ call pax_erase_kstack -+#endif ++ pax_erase_kstack + .endm + +#ifdef CONFIG_PAX_MEMORY_UDEREF @@ -13182,11 +13202,11 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entr= y_64.S linux-2.6.32.41/arch/x86/k +ENDPROC(pax_exit_kernel_user) +#endif + -+ .macro pax_erase_kstack ++.macro pax_erase_kstack +#ifdef CONFIG_PAX_MEMORY_STACKLEAK + call pax_erase_kstack +#endif -+ .endm ++.endm + +#ifdef CONFIG_PAX_MEMORY_STACKLEAK +/* @@ -13234,7 +13254,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k =20 .macro TRACE_IRQS_IRETQ offset=3DARGOFFSET #ifdef CONFIG_TRACE_IRQFLAGS -@@ -317,7 +571,7 @@ ENTRY(save_args) +@@ -317,7 +569,7 @@ ENTRY(save_args) leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */ movq_cfi rbp, 8 /* push %rbp */ leaq 8(%rsp), %rbp /* mov %rsp, %ebp */ @@ -13243,7 +13263,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k je 1f SWAPGS /* -@@ -409,7 +663,7 @@ ENTRY(ret_from_fork) +@@ -409,7 +661,7 @@ ENTRY(ret_from_fork) =20 RESTORE_REST =20 @@ -13252,7 +13272,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k je int_ret_from_sys_call =20 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET -@@ -455,7 +709,7 @@ END(ret_from_fork) +@@ -455,7 +707,7 @@ END(ret_from_fork) ENTRY(system_call) CFI_STARTPROC simple CFI_SIGNAL_FRAME @@ -13261,7 +13281,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k CFI_REGISTER rip,rcx /*CFI_REGISTER rflags,r11*/ SWAPGS_UNSAFE_STACK -@@ -468,12 +722,13 @@ ENTRY(system_call_after_swapgs) +@@ -468,12 +720,13 @@ ENTRY(system_call_after_swapgs) =20 movq %rsp,PER_CPU_VAR(old_rsp) movq PER_CPU_VAR(kernel_stack),%rsp @@ -13276,7 +13296,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k movq %rax,ORIG_RAX-ARGOFFSET(%rsp) movq %rcx,RIP-ARGOFFSET(%rsp) CFI_REL_OFFSET rip,RIP-ARGOFFSET -@@ -502,6 +757,7 @@ sysret_check: +@@ -502,6 +755,7 @@ sysret_check: andl %edi,%edx jnz sysret_careful CFI_REMEMBER_STATE @@ -13284,7 +13304,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k /* * sysretq will re-enable interrupts: */ -@@ -562,6 +818,9 @@ auditsys: +@@ -562,6 +816,9 @@ auditsys: movq %rax,%rsi /* 2nd arg: syscall number */ movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */ call audit_syscall_entry @@ -13294,7 +13314,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k LOAD_ARGS 0 /* reload call-clobbered registers */ jmp system_call_fastpath =20 -@@ -592,6 +851,9 @@ tracesys: +@@ -592,6 +849,9 @@ tracesys: FIXUP_TOP_OF_STACK %rdi movq %rsp,%rdi call syscall_trace_enter @@ -13304,7 +13324,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k /* * Reload arg registers from stack in case ptrace changed them. * We don't reload %rax because syscall_trace_enter() returned -@@ -613,7 +875,7 @@ tracesys: +@@ -613,7 +873,7 @@ tracesys: GLOBAL(int_ret_from_sys_call) DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF @@ -13313,7 +13333,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k je retint_restore_args movl $_TIF_ALLWORK_MASK,%edi /* edi: mask to check */ -@@ -800,6 +1062,16 @@ END(interrupt) +@@ -800,6 +1060,16 @@ END(interrupt) CFI_ADJUST_CFA_OFFSET 10*8 call save_args PARTIAL_FRAME 0 @@ -13330,7 +13350,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k call \func .endm =20 -@@ -822,7 +1094,7 @@ ret_from_intr: +@@ -822,7 +1092,7 @@ ret_from_intr: CFI_ADJUST_CFA_OFFSET -8 exit_intr: GET_THREAD_INFO(%rcx) @@ -13339,7 +13359,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k je retint_kernel =20 /* Interrupt came from user space */ -@@ -844,12 +1116,14 @@ retint_swapgs: /* return to user-space=20 +@@ -844,12 +1114,14 @@ retint_swapgs: /* return to user-space=20 * The iretq could re-enable interrupts: */ DISABLE_INTERRUPTS(CLBR_ANY) @@ -13354,7 +13374,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k /* * The iretq could re-enable interrupts: */ -@@ -1032,6 +1306,16 @@ ENTRY(\sym) +@@ -1032,6 +1304,16 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET 15*8 call error_entry DEFAULT_FRAME 0 @@ -13371,7 +13391,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1049,6 +1333,16 @@ ENTRY(\sym) +@@ -1049,6 +1331,16 @@ ENTRY(\sym) subq $15*8, %rsp call save_paranoid TRACE_IRQS_OFF @@ -13388,7 +13408,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1066,9 +1360,24 @@ ENTRY(\sym) +@@ -1066,9 +1358,24 @@ ENTRY(\sym) subq $15*8, %rsp call save_paranoid TRACE_IRQS_OFF @@ -13414,7 +13434,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) call \do_sym addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) -@@ -1085,6 +1394,16 @@ ENTRY(\sym) +@@ -1085,6 +1392,16 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET 15*8 call error_entry DEFAULT_FRAME 0 @@ -13431,7 +13451,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ -@@ -1104,6 +1423,16 @@ ENTRY(\sym) +@@ -1104,6 +1421,16 @@ ENTRY(\sym) call save_paranoid DEFAULT_FRAME 0 TRACE_IRQS_OFF @@ -13448,7 +13468,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ -@@ -1405,14 +1734,27 @@ ENTRY(paranoid_exit) +@@ -1405,14 +1732,27 @@ ENTRY(paranoid_exit) TRACE_IRQS_OFF testl %ebx,%ebx /* swapgs needed? */ jnz paranoid_restore @@ -13477,7 +13497,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k TRACE_IRQS_IRETQ 0 RESTORE_ALL 8 jmp irq_return -@@ -1470,7 +1812,7 @@ ENTRY(error_entry) +@@ -1470,7 +1810,7 @@ ENTRY(error_entry) movq_cfi r14, R14+8 movq_cfi r15, R15+8 xorl %ebx,%ebx @@ -13486,7 +13506,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k je error_kernelspace error_swapgs: SWAPGS -@@ -1529,6 +1871,16 @@ ENTRY(nmi) +@@ -1529,6 +1869,16 @@ ENTRY(nmi) CFI_ADJUST_CFA_OFFSET 15*8 call save_paranoid DEFAULT_FRAME 0 @@ -13503,7 +13523,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/entry_= 64.S linux-2.6.32.41/arch/x86/k /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ movq %rsp,%rdi movq $-1,%rsi -@@ -1539,11 +1891,25 @@ ENTRY(nmi) +@@ -1539,11 +1889,25 @@ ENTRY(nmi) DISABLE_INTERRUPTS(CLBR_NONE) testl %ebx,%ebx /* swapgs needed? */ jnz nmi_restore @@ -15852,7 +15872,7 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/setup.= c linux-2.6.32.41/arch/x86/kern bss_resource.end =3D virt_to_phys(&__bss_stop)-1; diff -urNp linux-2.6.32.41/arch/x86/kernel/setup_percpu.c linux-2.6.32.4= 1/arch/x86/kernel/setup_percpu.c --- linux-2.6.32.41/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.41/arch/x86/kernel/setup_percpu.c 2011-04-17 15:56:46.0= 00000000 -0400 ++++ linux-2.6.32.41/arch/x86/kernel/setup_percpu.c 2011-06-04 20:36:29.0= 00000000 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -15896,8 +15916,8 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/setup_= percpu.c linux-2.6.32.41/arch/x delta =3D (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_sta= rt; for_each_possible_cpu(cpu) { +#ifdef CONFIG_CC_STACKPROTECTOR -+#ifdef CONFIG_x86_32 -+ unsigned long canary =3D per_cpu(stack_canary, cpu); ++#ifdef CONFIG_X86_32 ++ unsigned long canary =3D per_cpu(stack_canary.canary, cpu); +#endif +#endif per_cpu_offset(cpu) =3D delta + pcpu_unit_offsets[cpu]; @@ -15908,9 +15928,9 @@ diff -urNp linux-2.6.32.41/arch/x86/kernel/setup_= percpu.c linux-2.6.32.41/arch/x #endif #endif +#ifdef CONFIG_CC_STACKPROTECTOR -+#ifdef CONFIG_x86_32 -+ if (cpu =3D=3D boot_cpu_id) -+ per_cpu(stack_canary, cpu) =3D canary; ++#ifdef CONFIG_X86_32 ++ if (!cpu) ++ per_cpu(stack_canary.canary, cpu) =3D canary; +#endif +#endif /* @@ -19688,7 +19708,7 @@ diff -urNp linux-2.6.32.41/arch/x86/mm/extable.c = linux-2.6.32.41/arch/x86/mm/ext pnp_bios_is_utter_crap =3D 1; diff -urNp linux-2.6.32.41/arch/x86/mm/fault.c linux-2.6.32.41/arch/x86/= mm/fault.c --- linux-2.6.32.41/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.41/arch/x86/mm/fault.c 2011-04-17 15:56:46.000000000 -0= 400 ++++ linux-2.6.32.41/arch/x86/mm/fault.c 2011-06-04 20:36:59.000000000 -0= 400 @@ -11,10 +11,19 @@ #include /* __kprobes, ... */ #include /* kmmio_handler, ... */ @@ -19910,10 +19930,10 @@ diff -urNp linux-2.6.32.41/arch/x86/mm/fault.c = linux-2.6.32.41/arch/x86/mm/fault +#ifdef CONFIG_X86_64 + if (mm && (error_code & PF_INSTR) && mm->context.vdso) { + if (regs->ip =3D=3D (unsigned long)vgettimeofday) { -+ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback= _gettimeofday); ++ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, gettimeo= fday); + return; + } else if (regs->ip =3D=3D (unsigned long)vtime) { -+ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback= _time); ++ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, clock_ge= ttime); + return; + } else if (regs->ip =3D=3D (unsigned long)vgetcpu) { + regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu); @@ -22468,15 +22488,15 @@ diff -urNp linux-2.6.32.41/arch/x86/vdso/vdso32= -setup.c linux-2.6.32.41/arch/x86 } diff -urNp linux-2.6.32.41/arch/x86/vdso/vdso.lds.S linux-2.6.32.41/arch= /x86/vdso/vdso.lds.S --- linux-2.6.32.41/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.41/arch/x86/vdso/vdso.lds.S 2011-04-17 15:56:46.0000000= 00 -0400 ++++ linux-2.6.32.41/arch/x86/vdso/vdso.lds.S 2011-06-04 20:37:24.0000000= 00 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK =3D VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x =3D vdso_ ## x; #include "vextern.h" #undef VEXTERN + +#define VEXTERN(x) VDSO64_ ## x =3D __vdso_ ## x; -+VEXTERN(fallback_gettimeofday) -+VEXTERN(fallback_time) ++VEXTERN(gettimeofday) ++VEXTERN(clock_gettime) +VEXTERN(getcpu) +#undef VEXTERN diff -urNp linux-2.6.32.41/arch/x86/vdso/vextern.h linux-2.6.32.41/arch/= x86/vdso/vextern.h @@ -35701,7 +35721,7 @@ diff -urNp linux-2.6.32.41/fs/9p/vfs_inode.c linu= x-2.6.32.41/fs/9p/vfs_inode.c IS_ERR(s) ? "" : s); diff -urNp linux-2.6.32.41/fs/aio.c linux-2.6.32.41/fs/aio.c --- linux-2.6.32.41/fs/aio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.41/fs/aio.c 2011-05-16 21:46:57.000000000 -0400 ++++ linux-2.6.32.41/fs/aio.c 2011-06-04 20:40:21.000000000 -0400 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx=20 size +=3D sizeof(struct io_event) * nr_events; nr_pages =3D (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -35720,6 +35740,26 @@ diff -urNp linux-2.6.32.41/fs/aio.c linux-2.6.32= .41/fs/aio.c /* needed to zero any padding within an entry (there shouldn't be=20 * any, but C is fun! */ +@@ -1382,13 +1384,18 @@ static ssize_t aio_fsync(struct kiocb *i + static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb) + { + ssize_t ret; ++ struct iovec iovstack; +=20 + ret =3D rw_copy_check_uvector(type, (struct iovec __user *)kiocb->ki_b= uf, + kiocb->ki_nbytes, 1, +- &kiocb->ki_inline_vec, &kiocb->ki_iovec); ++ &iovstack, &kiocb->ki_iovec); + if (ret < 0) + goto out; +=20 ++ if (kiocb->ki_iovec =3D=3D &iovstack) { ++ kiocb->ki_inline_vec =3D iovstack; ++ kiocb->ki_iovec =3D &kiocb->ki_inline_vec; ++ } + kiocb->ki_nr_segs =3D kiocb->ki_nbytes; + kiocb->ki_cur_seg =3D 0; + /* ki_nbytes/left now reflect bytes instead of segs */ diff -urNp linux-2.6.32.41/fs/attr.c linux-2.6.32.41/fs/attr.c --- linux-2.6.32.41/fs/attr.c 2011-03-27 14:31:47.000000000 -0400 +++ linux-2.6.32.41/fs/attr.c 2011-04-17 15:56:46.000000000 -0400 @@ -37491,7 +37531,7 @@ diff -urNp linux-2.6.32.41/fs/ecryptfs/inode.c li= nux-2.6.32.41/fs/ecryptfs/inode goto out_free; diff -urNp linux-2.6.32.41/fs/exec.c linux-2.6.32.41/fs/exec.c --- linux-2.6.32.41/fs/exec.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.41/fs/exec.c 2011-05-04 17:56:20.000000000 -0400 ++++ linux-2.6.32.41/fs/exec.c 2011-06-04 20:41:36.000000000 -0400 @@ -56,12 +56,24 @@ #include #include @@ -37782,7 +37822,7 @@ diff -urNp linux-2.6.32.41/fs/exec.c linux-2.6.32= .41/fs/exec.c out: if (bprm->mm) { acct_arg_size(bprm, 0); -@@ -1594,6 +1684,209 @@ out: +@@ -1594,6 +1684,220 @@ out: return ispipe; } =20 @@ -37989,10 +38029,21 @@ diff -urNp linux-2.6.32.41/fs/exec.c linux-2.6.= 32.41/fs/exec.c +} +#endif + ++#ifdef CONFIG_PAX_MEMORY_STACKLEAK ++void pax_track_stack(void) ++{ ++ unsigned long sp =3D (unsigned long)&sp; ++ if (sp < current_thread_info()->lowest_stack && ++ sp > (unsigned long)task_stack_page(current)) ++ current_thread_info()->lowest_stack =3D sp; ++} ++EXPORT_SYMBOL(pax_track_stack); ++#endif ++ static int zap_process(struct task_struct *start) { struct task_struct *t; -@@ -1796,17 +2089,17 @@ static void wait_for_dump_helpers(struct +@@ -1796,17 +2100,17 @@ static void wait_for_dump_helpers(struct pipe =3D file->f_path.dentry->d_inode->i_pipe; =20 pipe_lock(pipe); @@ -38015,7 +38066,7 @@ diff -urNp linux-2.6.32.41/fs/exec.c linux-2.6.32= .41/fs/exec.c pipe_unlock(pipe); =20 } -@@ -1829,10 +2122,13 @@ void do_coredump(long signr, int exit_co +@@ -1829,10 +2133,13 @@ void do_coredump(long signr, int exit_co char **helper_argv =3D NULL; int helper_argc =3D 0; int dump_count =3D 0; @@ -38030,7 +38081,7 @@ diff -urNp linux-2.6.32.41/fs/exec.c linux-2.6.32= .41/fs/exec.c binfmt =3D mm->binfmt; if (!binfmt || !binfmt->core_dump) goto fail; -@@ -1877,6 +2173,8 @@ void do_coredump(long signr, int exit_co +@@ -1877,6 +2184,8 @@ void do_coredump(long signr, int exit_co */ clear_thread_flag(TIF_SIGPENDING); =20 @@ -38039,7 +38090,7 @@ diff -urNp linux-2.6.32.41/fs/exec.c linux-2.6.32= .41/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, wh= ich * uses lock_kernel() -@@ -1911,7 +2209,7 @@ void do_coredump(long signr, int exit_co +@@ -1911,7 +2220,7 @@ void do_coredump(long signr, int exit_co goto fail_unlock; } =20 @@ -38048,7 +38099,7 @@ diff -urNp linux-2.6.32.41/fs/exec.c linux-2.6.32= .41/fs/exec.c if (core_pipe_limit && (core_pipe_limit < dump_count)) { printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n", task_tgid_vnr(current), current->comm); -@@ -1975,7 +2273,7 @@ close_fail: +@@ -1975,7 +2284,7 @@ close_fail: filp_close(file, NULL); fail_dropcount: if (dump_count) @@ -41681,7 +41732,7 @@ diff -urNp linux-2.6.32.41/fs/proc/array.c linux-= 2.6.32.41/fs/proc/array.c +#endif diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2.6.32.41/fs/proc/base.c --- linux-2.6.32.41/fs/proc/base.c 2011-04-22 19:16:29.000000000 -0400 -+++ linux-2.6.32.41/fs/proc/base.c 2011-04-22 19:16:44.000000000 -0400 ++++ linux-2.6.32.41/fs/proc/base.c 2011-06-04 21:20:50.000000000 -0400 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -41864,7 +41915,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c =20 generic_fillattr(inode, stat); =20 -@@ -1481,12 +1542,34 @@ static int pid_getattr(struct vfsmount * +@@ -1481,13 +1542,41 @@ static int pid_getattr(struct vfsmount * stat->uid =3D 0; stat->gid =3D 0; task =3D pid_task(proc_pid(inode), PIDTYPE_PID); @@ -41881,7 +41932,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP + || in_group_p(CONFIG_GRKERNSEC_PROC_GID) +#endif -+ ) ++ ) { +#endif if ((inode->i_mode =3D=3D (S_IFDIR|S_IRUGO|S_IXUGO)) || +#ifdef CONFIG_GRKERNSEC_PROC_USER @@ -41898,9 +41949,16 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-= 2.6.32.41/fs/proc/base.c stat->gid =3D cred->egid; +#endif } ++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PRO= C_USERGROUP) ++ } else { ++ rcu_read_unlock(); ++ return -ENOENT; ++ } ++#endif } rcu_read_unlock(); -@@ -1518,11 +1601,20 @@ static int pid_revalidate(struct dentry=20 + return 0; +@@ -1518,11 +1607,20 @@ static int pid_revalidate(struct dentry=20 =20 if (task) { if ((inode->i_mode =3D=3D (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -41921,7 +41979,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid =3D 0; -@@ -1643,7 +1735,8 @@ static int proc_fd_info(struct inode *in +@@ -1643,7 +1741,8 @@ static int proc_fd_info(struct inode *in int fd =3D proc_fd(inode); =20 if (task) { @@ -41931,7 +41989,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -1895,12 +1988,22 @@ static const struct file_operations proc +@@ -1895,12 +1994,22 @@ static const struct file_operations proc static int proc_fd_permission(struct inode *inode, int mask) { int rv; @@ -41956,7 +42014,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c return rv; } =20 -@@ -2009,6 +2112,9 @@ static struct dentry *proc_pident_lookup +@@ -2009,6 +2118,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; =20 @@ -41966,7 +42024,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2053,6 +2159,9 @@ static int proc_pident_readdir(struct fi +@@ -2053,6 +2165,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; =20 @@ -41976,7 +42034,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c ret =3D 0; i =3D filp->f_pos; switch (i) { -@@ -2320,7 +2429,7 @@ static void *proc_self_follow_link(struc +@@ -2320,7 +2435,7 @@ static void *proc_self_follow_link(struc static void proc_self_put_link(struct dentry *dentry, struct nameidata = *nd, void *cookie) { @@ -41985,7 +42043,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2519,7 +2628,7 @@ static const struct pid_entry tgid_base_ +@@ -2519,7 +2634,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -41994,7 +42052,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2544,10 +2653,10 @@ static const struct pid_entry tgid_base_ +@@ -2544,10 +2659,10 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, pro= c_attr_dir_operations), #endif @@ -42007,7 +42065,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2577,6 +2686,9 @@ static const struct pid_entry tgid_base_ +@@ -2577,6 +2692,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif @@ -42017,7 +42075,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c }; =20 static int proc_tgid_base_readdir(struct file * filp, -@@ -2701,7 +2813,14 @@ static struct dentry *proc_pid_instantia +@@ -2701,7 +2819,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; =20 @@ -42032,7 +42090,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c inode->i_op =3D &proc_tgid_base_inode_operations; inode->i_fop =3D &proc_tgid_base_operations; inode->i_flags|=3DS_IMMUTABLE; -@@ -2743,7 +2862,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -2743,7 +2868,11 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; =20 @@ -42044,7 +42102,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c put_task_struct(task); out: return result; -@@ -2808,6 +2931,11 @@ int proc_pid_readdir(struct file * filp, +@@ -2808,6 +2937,11 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr; struct task_struct *reaper; @@ -42056,7 +42114,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; =20 -@@ -2831,8 +2959,27 @@ int proc_pid_readdir(struct file * filp, +@@ -2831,8 +2965,27 @@ int proc_pid_readdir(struct file * filp, for (iter =3D next_tgid(ns, iter); iter.task; iter.tgid +=3D 1, iter =3D next_tgid(ns, iter)) { @@ -42085,7 +42143,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -2858,7 +3005,7 @@ static const struct pid_entry tid_base_s +@@ -2858,7 +3011,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -42094,7 +42152,7 @@ diff -urNp linux-2.6.32.41/fs/proc/base.c linux-2= .6.32.41/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2882,10 +3029,10 @@ static const struct pid_entry tid_base_s +@@ -2882,10 +3035,10 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc= _attr_dir_operations), #endif @@ -56581,7 +56639,7 @@ diff -urNp linux-2.6.32.41/include/linux/reiserfs= _fs_sb.h linux-2.6.32.41/includ on-disk FS format */ diff -urNp linux-2.6.32.41/include/linux/sched.h linux-2.6.32.41/include= /linux/sched.h --- linux-2.6.32.41/include/linux/sched.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.41/include/linux/sched.h 2011-05-18 20:09:37.000000000 = -0400 ++++ linux-2.6.32.41/include/linux/sched.h 2011-06-04 20:42:54.000000000 = -0400 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -56728,7 +56786,7 @@ diff -urNp linux-2.6.32.41/include/linux/sched.h = linux-2.6.32.41/include/linux/s #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* Index of current stored adress in ret_stack */ int curr_ret_stack; -@@ -1542,6 +1582,63 @@ struct task_struct { +@@ -1542,6 +1582,57 @@ struct task_struct { #endif /* CONFIG_TRACING */ }; =20 @@ -56777,22 +56835,16 @@ diff -urNp linux-2.6.32.41/include/linux/sched.= h linux-2.6.32.41/include/linux/s +void pax_report_refcount_overflow(struct pt_regs *regs); +void pax_report_usercopy(const void *ptr, unsigned long len, bool to, c= onst char *type); + -+static inline void pax_track_stack(void) -+{ -+ +#ifdef CONFIG_PAX_MEMORY_STACKLEAK -+ unsigned long sp =3D current_stack_pointer; -+ if (current_thread_info()->lowest_stack > sp && -+ (unsigned long)task_stack_page(current) < sp) -+ current_thread_info()->lowest_stack =3D sp; ++extern void pax_track_stack(void); ++#else ++static inline void pax_track_stack(void) {} +#endif + -+} -+ /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) =20 -@@ -1978,7 +2075,9 @@ void yield(void); +@@ -1978,7 +2069,9 @@ void yield(void); extern struct exec_domain default_exec_domain; =20 union thread_union { @@ -56802,7 +56854,7 @@ diff -urNp linux-2.6.32.41/include/linux/sched.h = linux-2.6.32.41/include/linux/s unsigned long stack[THREAD_SIZE/sizeof(long)]; }; =20 -@@ -2155,7 +2254,7 @@ extern void __cleanup_sighand(struct sig +@@ -2155,7 +2248,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); =20 @@ -56811,7 +56863,7 @@ diff -urNp linux-2.6.32.41/include/linux/sched.h = linux-2.6.32.41/include/linux/s =20 extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2284,13 +2383,17 @@ static inline unsigned long *end_of_stac +@@ -2284,13 +2377,17 @@ static inline unsigned long *end_of_stac =20 #endif =20 @@ -62813,27 +62865,33 @@ diff -urNp linux-2.6.32.41/localversion-grsec l= inux-2.6.32.41/localversion-grsec +-grsec diff -urNp linux-2.6.32.41/Makefile linux-2.6.32.41/Makefile --- linux-2.6.32.41/Makefile 2011-05-23 16:56:59.000000000 -0400 -+++ linux-2.6.32.41/Makefile 2011-05-23 16:57:13.000000000 -0400 -@@ -221,8 +221,8 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" ++++ linux-2.6.32.41/Makefile 2011-06-04 20:35:20.000000000 -0400 +@@ -221,8 +221,9 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" =20 HOSTCC =3D gcc HOSTCXX =3D g++ -HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fo= mit-frame-pointer -HOSTCXXFLAGS =3D -O2 -+HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fo= mit-frame-pointer -fno-delete-null-pointer-checks ++HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointe= r -fno-delete-null-pointer-checks ++HOSTCFLAGS +=3D $(call cc-option, -Wno-empty-body) +HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 # Decide whether to build built-in, modular, or both. # Normally, just do built-in. -@@ -342,6 +342,7 @@ LINUXINCLUDE :=3D -Iinclude \ +@@ -342,10 +343,12 @@ LINUXINCLUDE :=3D -Iinclude \ KBUILD_CPPFLAGS :=3D -D__KERNEL__ =20 KBUILD_CFLAGS :=3D -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -+ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initia= lizers \ ++ -W -Wno-unused-parameter -Wno-missing-field-initializers \ -fno-strict-aliasing -fno-common \ -Werror-implicit-function-declaration \ -Wno-format-security \ -@@ -644,7 +645,7 @@ export mod_strip_cmd + -fno-delete-null-pointer-checks ++KBUILD_CFLAGS +=3D $(call cc-option, -Wno-empty-body) + KBUILD_AFLAGS :=3D -D__ASSEMBLY__ +=20 + # Read KERNELRELEASE from include/config/kernel.release (if it exists) +@@ -644,7 +647,7 @@ export mod_strip_cmd =20 =20 ifeq ($(KBUILD_EXTMOD),) @@ -62842,6 +62900,36 @@ diff -urNp linux-2.6.32.41/Makefile linux-2.6.32= .41/Makefile =20 vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ +@@ -949,7 +952,19 @@ include/config/kernel.release: include/c + # version.h and scripts_basic is processed / created. +=20 + # Listed in dependency order +-PHONY +=3D prepare archprepare prepare0 prepare1 prepare2 prepare3 ++PHONY +=3D prepare archprepare prepare0 prepare1 prepare2 prepare3 pax-= plugin ++ ++ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y) ++KBUILD_CFLAGS +=3D $(call cc-ifversion, -ge, 0405, -fplugin=3D$(objtree= )/tools/gcc/pax_plugin.so -fplugin-arg-pax_plugin-track-lowest-sp=3D100) ++endif ++pax-plugin: ++ifneq (,$(findstring pax_plugin, $(KBUILD_CFLAGS))) ++ $(Q)$(MAKE) $(build)=3Dtools/gcc ++else ++ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y) ++ $(Q)echo "warning, your gcc does not support plugins, PAX_MEMORY_STACK= LEAK will be less secure" ++endif ++endif +=20 + # prepare3 is used to check if we are building in a separate output dir= ectory, + # and if so do: +@@ -970,7 +985,7 @@ ifneq ($(KBUILD_SRC),) + endif +=20 + # prepare2 creates a makefile if using a separate output directory +-prepare2: prepare3 outputmakefile ++prepare2: prepare3 outputmakefile pax-plugin +=20 + prepare1: prepare2 include/linux/version.h include/linux/utsrelease.h \ + include/asm include/config/auto.conf diff -urNp linux-2.6.32.41/mm/backing-dev.c linux-2.6.32.41/mm/backing-d= ev.c --- linux-2.6.32.41/mm/backing-dev.c 2011-03-27 14:31:47.000000000 -0400 +++ linux-2.6.32.41/mm/backing-dev.c 2011-05-04 17:56:28.000000000 -0400 @@ -69829,6 +69917,50 @@ diff -urNp linux-2.6.32.41/scripts/basic/fixdep.= c linux-2.6.32.41/scripts/basic/ =20 if (*p !=3D INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) !=3D 4 or wrong endianess? %#x\n= ", +diff -urNp linux-2.6.32.41/scripts/Makefile.build linux-2.6.32.41/script= s/Makefile.build +--- linux-2.6.32.41/scripts/Makefile.build 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.41/scripts/Makefile.build 2011-06-04 20:46:51.000000000= -0400 +@@ -59,7 +59,7 @@ endif + endif +=20 + # Do not include host rules unless needed +-ifneq ($(hostprogs-y)$(hostprogs-m),) ++ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m),) + include scripts/Makefile.host + endif +=20 +diff -urNp linux-2.6.32.41/scripts/Makefile.clean linux-2.6.32.41/script= s/Makefile.clean +--- linux-2.6.32.41/scripts/Makefile.clean 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.41/scripts/Makefile.clean 2011-06-04 20:47:19.000000000= -0400 +@@ -43,7 +43,8 @@ subdir-ymn :=3D $(addprefix $(obj)/,$(subd + __clean-files :=3D $(extra-y) $(always) \ + $(targets) $(clean-files) \ + $(host-progs) \ +- $(hostprogs-y) $(hostprogs-m) $(hostprogs-) ++ $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \ ++ $(hostlibs-y) $(hostlibs-m) $(hostlibs-) +=20 + # as clean-files is given relative to the current directory, this adds + # a $(obj) prefix, except for absolute paths +diff -urNp linux-2.6.32.41/scripts/Makefile.host linux-2.6.32.41/scripts= /Makefile.host +--- linux-2.6.32.41/scripts/Makefile.host 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.41/scripts/Makefile.host 2011-06-04 20:48:22.000000000 = -0400 +@@ -31,6 +31,7 @@ + # Note: Shared libraries consisting of C++ files are not supported +=20 + __hostprogs :=3D $(sort $(hostprogs-y) $(hostprogs-m)) ++__hostlibs :=3D $(sort $(hostlibs-y) $(hostlibs-m)) +=20 + # C code + # Executables compiled from a single .c file +@@ -54,6 +55,7 @@ host-cxxobjs :=3D $(sort $(foreach m,$(hos + # Shared libaries (only .c supported) + # Shared libraries (.so) - all .so files referenced in "xxx-objs" + host-cshlib :=3D $(sort $(filter %.so, $(host-cobjs))) ++host-cshlib +=3D $(sort $(filter %.so, $(__hostlibs))) + # Remove .so files from "xxx-objs" + host-cobjs :=3D $(filter-out %.so,$(host-cobjs)) +=20 diff -urNp linux-2.6.32.41/scripts/mod/file2alias.c linux-2.6.32.41/scri= pts/mod/file2alias.c --- linux-2.6.32.41/scripts/mod/file2alias.c 2011-03-27 14:31:47.0000000= 00 -0400 +++ linux-2.6.32.41/scripts/mod/file2alias.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -70124,8 +70256,8 @@ diff -urNp linux-2.6.32.41/security/integrity/ima= /ima_queue.c linux-2.6.32.41/se return 0; diff -urNp linux-2.6.32.41/security/Kconfig linux-2.6.32.41/security/Kco= nfig --- linux-2.6.32.41/security/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.41/security/Kconfig 2011-05-04 17:56:20.000000000 -0400 -@@ -4,6 +4,548 @@ ++++ linux-2.6.32.41/security/Kconfig 2011-06-04 20:45:36.000000000 -0400 +@@ -4,6 +4,555 @@ =20 menu "Security options" =20 @@ -70584,6 +70716,7 @@ diff -urNp linux-2.6.32.41/security/Kconfig linux= -2.6.32.41/security/Kconfig + +config PAX_MEMORY_STACKLEAK + bool "Sanitize kernel stack" ++ depends on X86 + help + By saying Y here the kernel will erase the kernel stack before it + returns from a system call. This in turn reduces the information @@ -70599,6 +70732,12 @@ diff -urNp linux-2.6.32.41/security/Kconfig linu= x-2.6.32.41/security/Kconfig + and you are advised to test this feature on your expected workload + before deploying it. + ++ Note: full support for this feature requires gcc with plugin support ++ so make sure your compiler is at least gcc 4.5.0 (cross compilation ++ is not supported). Using older gcc versions means that functions ++ with large enough stack frames may leave uninitialized memory behind ++ that may be exposed to a later syscall leaking the stack. ++ +config PAX_MEMORY_UDEREF + bool "Prevent invalid userland pointer dereference" + depends on X86 && !UML_X86 && !XEN @@ -70674,7 +70813,7 @@ diff -urNp linux-2.6.32.41/security/Kconfig linux= -2.6.32.41/security/Kconfig config KEYS bool "Enable access key retention support" help -@@ -146,7 +688,7 @@ config INTEL_TXT +@@ -146,7 +695,7 @@ config INTEL_TXT config LSM_MMAP_MIN_ADDR int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX @@ -71382,6 +71521,268 @@ diff -urNp linux-2.6.32.41/sound/pci/ymfpci/ymf= pci_main.c linux-2.6.32.41/sound/ chip->card =3D card; chip->pci =3D pci; chip->irq =3D -1; +diff -urNp linux-2.6.32.41/tools/gcc/Makefile linux-2.6.32.41/tools/gcc/= Makefile +--- linux-2.6.32.41/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -05= 00 ++++ linux-2.6.32.41/tools/gcc/Makefile 2011-06-04 20:52:13.000000000 -04= 00 +@@ -0,0 +1,11 @@ ++#CC :=3D gcc ++#PLUGIN_SOURCE_FILES :=3D pax_plugin.c ++#PLUGIN_OBJECT_FILES :=3D $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES)) ++GCCPLUGINS_DIR :=3D $(shell $(HOSTCC) -print-file-name=3Dplugin) ++#CFLAGS +=3D -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W ++ ++HOST_EXTRACFLAGS +=3D -I$(GCCPLUGINS_DIR)/include ++ ++hostlibs-y :=3D pax_plugin.so ++always :=3D $(hostlibs-y) ++pax_plugin-objs :=3D pax_plugin.o +diff -urNp linux-2.6.32.41/tools/gcc/pax_plugin.c linux-2.6.32.41/tools/= gcc/pax_plugin.c +--- linux-2.6.32.41/tools/gcc/pax_plugin.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.41/tools/gcc/pax_plugin.c 2011-06-04 20:52:13.000000000= -0400 +@@ -0,0 +1,242 @@ ++/* ++ * Copyright 2011 by the PaX Team ++ * Licensed under the GPL v2 ++ * ++ * Note: the choice of the license means that the compilation process i= s ++ * NOT 'eligible' as defined by gcc's library exception to the GP= L v3, ++ * but for the kernel it doesn't matter since it doesn't link aga= inst ++ * any of the gcc libraries ++ * ++ * gcc plugin to help implement various PaX features ++ * ++ * - track lowest stack pointer ++ * ++ * TODO: ++ * - initialize all local variables ++ * ++ * BUGS: ++ */ ++#include "gcc-plugin.h" ++#include "plugin-version.h" ++#include "config.h" ++#include "system.h" ++#include "coretypes.h" ++#include "tm.h" ++#include "toplev.h" ++#include "basic-block.h" ++#include "gimple.h" ++//#include "expr.h" where are you... ++#include "diagnostic.h" ++#include "rtl.h" ++#include "emit-rtl.h" ++#include "function.h" ++#include "tree.h" ++#include "tree-pass.h" ++#include "intl.h" ++ ++int plugin_is_GPL_compatible; ++ ++static int track_frame_size =3D -1; ++static const char track_function[] =3D "pax_track_stack"; ++static bool init_locals; ++ ++static struct plugin_info pax_plugin_info =3D { ++ .version =3D "201106030000", ++ .help =3D "track-lowest-sp=3Dnn\ttrack sp in functions whose frame si= ze is at least nn bytes\n" ++// "initialize-locals\t\tforcibly initialize all stack frames\n" ++}; ++ ++static bool gate_pax_track_stack(void); ++static unsigned int execute_pax_tree_instrument(void); ++static unsigned int execute_pax_final(void); ++ ++static struct gimple_opt_pass pax_tree_instrument_pass =3D { ++ .pass =3D { ++ .type =3D GIMPLE_PASS, ++ .name =3D "pax_tree_instrument", ++ .gate =3D gate_pax_track_stack, ++ .execute =3D execute_pax_tree_instrument, ++ .sub =3D NULL, ++ .next =3D NULL, ++ .static_pass_number =3D 0, ++ .tv_id =3D TV_NONE, ++ .properties_required =3D PROP_gimple_leh | PROP_cfg, ++ .properties_provided =3D 0, ++ .properties_destroyed =3D 0, ++ .todo_flags_start =3D 0, //TODO_verify_ssa | TODO_verify_flow | TODO_= verify_stmts, ++ .todo_flags_finish =3D TODO_verify_stmts // | TODO_dump_func ++ } ++}; ++ ++static struct rtl_opt_pass pax_final_rtl_opt_pass =3D { ++ .pass =3D { ++ .type =3D RTL_PASS, ++ .name =3D "pax_final", ++ .gate =3D gate_pax_track_stack, ++ .execute =3D execute_pax_final, ++ .sub =3D NULL, ++ .next =3D NULL, ++ .static_pass_number =3D 0, ++ .tv_id =3D TV_NONE, ++ .properties_required =3D 0, ++ .properties_provided =3D 0, ++ .properties_destroyed =3D 0, ++ .todo_flags_start =3D 0, ++ .todo_flags_finish =3D 0 ++ } ++}; ++ ++static bool gate_pax_track_stack(void) ++{ ++ return track_frame_size >=3D 0; ++} ++ ++static void pax_add_instrumentation(gimple_stmt_iterator *gsi, bool bef= ore) ++{ ++ gimple call; ++ tree decl, type; ++ ++ // insert call to void pax_track_stack(void) ++ type =3D build_function_type_list(void_type_node, NULL_TREE); ++ decl =3D build_fn_decl(track_function, type); ++ DECL_ASSEMBLER_NAME(decl); // for LTO ++ call =3D gimple_build_call(decl, 0); ++ if (before) ++ gsi_insert_before(gsi, call, GSI_CONTINUE_LINKING); ++ else ++ gsi_insert_after(gsi, call, GSI_CONTINUE_LINKING); ++} ++ ++static unsigned int execute_pax_tree_instrument(void) ++{ ++ basic_block bb; ++ gimple_stmt_iterator gsi; ++ ++ // 1. loop through BBs and GIMPLE statements ++ FOR_EACH_BB(bb) { ++ for (gsi =3D gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) { ++ // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA at= tributes ++ tree decl; ++ gimple stmt =3D gsi_stmt(gsi); ++ ++ if (!is_gimple_call(stmt)) ++ continue; ++ decl =3D gimple_call_fndecl(stmt); ++ if (!decl) ++ continue; ++ if (TREE_CODE(decl) !=3D FUNCTION_DECL) ++ continue; ++ if (!DECL_BUILT_IN(decl)) ++ continue; ++ if (DECL_BUILT_IN_CLASS(decl) !=3D BUILT_IN_NORMAL) ++ continue; ++ if (DECL_FUNCTION_CODE(decl) !=3D BUILT_IN_ALLOCA) ++ continue; ++ ++ // 2. insert track call after each __builtin_alloca call ++ pax_add_instrumentation(&gsi, false); ++// print_node(stderr, "pax", decl, 4); ++ } ++ } ++ ++ // 3. insert track call at the beginning ++ bb =3D ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb; ++ gsi =3D gsi_start_bb(bb); ++ pax_add_instrumentation(&gsi, true); ++ ++ return 0; ++} ++ ++static unsigned int execute_pax_final(void) ++{ ++ rtx insn; ++ ++ if (cfun->calls_alloca) ++ return 0; ++ ++ // 1. find pax_track_stack calls ++ for (insn =3D get_insns(); insn; insn =3D NEXT_INSN(insn)) { ++ // rtl match: (call_insn 8 7 9 3 (call (mem (symbol_ref ("pax_track_s= tack") [flags 0x41] ) [0 S1 A8]= ) (4)) -1 (nil) (nil)) ++ rtx body; ++ ++ if (!CALL_P(insn)) ++ continue; ++ body =3D PATTERN(insn); ++ if (GET_CODE(body) !=3D CALL) ++ continue; ++ body =3D XEXP(body, 0); ++ if (GET_CODE(body) !=3D MEM) ++ continue; ++ body =3D XEXP(body, 0); ++ if (GET_CODE(body) !=3D SYMBOL_REF) ++ continue; ++ if (strcmp(XSTR(body, 0), track_function)) ++ continue; ++// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_f= rame_size(), track_frame_size); ++ // 2. delete call if function frame is not big enough ++ if (get_frame_size() >=3D track_frame_size) ++ continue; ++ delete_insn_and_edges(insn); ++ } ++ ++// print_simple_rtl(stderr, get_insns()); ++// print_rtl(stderr, get_insns()); ++// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_fr= ame_size(), track_frame_size); ++ ++ return 0; ++} ++ ++int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc= _version *version) ++{ ++ const char * const plugin_name =3D plugin_info->base_name; ++ const int argc =3D plugin_info->argc; ++ const struct plugin_argument * const argv =3D plugin_info->argv; ++ int i; ++ struct register_pass_info pax_tree_instrument_pass_info =3D { ++ .pass =3D &pax_tree_instrument_pass.pass, ++// .reference_pass_name =3D "tree_profile", ++ .reference_pass_name =3D "optimized", ++ .ref_pass_instance_number =3D 0, ++ .pos_op =3D PASS_POS_INSERT_AFTER ++ }; ++ struct register_pass_info pax_final_pass_info =3D { ++ .pass =3D &pax_final_rtl_opt_pass.pass, ++ .reference_pass_name =3D "final", ++ .ref_pass_instance_number =3D 0, ++ .pos_op =3D PASS_POS_INSERT_BEFORE ++ }; ++ ++ if (!plugin_default_version_check(version, &gcc_version)) { ++ error(G_("incompatible gcc/plugin versions")); ++ return 1; ++ } ++ ++ register_callback(plugin_name, PLUGIN_INFO, NULL, &pax_plugin_info); ++ ++ for (i =3D 0; i < argc; ++i) { ++ if (!strcmp(argv[i].key, "track-lowest-sp")) { ++ if (!argv[i].value) { ++ error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plug= in_name, argv[i].key); ++ continue; ++ } ++ track_frame_size =3D atoi(argv[i].value); ++ if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_= size < 0) ++ error(G_("invalid option argument '-fplugin-arg-%s-%s=3D%s'"), plug= in_name, argv[i].key, argv[i].value); ++ continue; ++ } ++ if (!strcmp(argv[i].key, "initialize-locals")) { ++ if (argv[i].value) { ++ error(G_("invalid option argument '-fplugin-arg-%s-%s=3D%s'"), plug= in_name, argv[i].key, argv[i].value); ++ continue; ++ } ++ init_locals =3D true; ++ continue; ++ } ++ error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].= key); ++ } ++ ++ register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_t= ree_instrument_pass_info); ++ register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_f= inal_pass_info); ++ ++ return 0; ++} +Binary files linux-2.6.32.41/tools/gcc/pax_plugin.so and linux-2.6.32.41= /tools/gcc/pax_plugin.so differ diff -urNp linux-2.6.32.41/usr/gen_init_cpio.c linux-2.6.32.41/usr/gen_i= nit_cpio.c --- linux-2.6.32.41/usr/gen_init_cpio.c 2011-03-27 14:31:47.000000000 -0= 400 +++ linux-2.6.32.41/usr/gen_init_cpio.c 2011-04-17 15:56:46.000000000 -0= 400 diff --git a/2.6.32/4422_grsec-mute-warnings.patch b/2.6.32/4422_grsec-mu= te-warnings.patch index c53f71f..0c9c69a 100644 --- a/2.6.32/4422_grsec-mute-warnings.patch +++ b/2.6.32/4422_grsec-mute-warnings.patch @@ -29,14 +29,14 @@ warning flags of vanilla kernel versions. Acked-by: Christian Heim --- =20 ---- a/Makefile 2011-05-20 08:34:33.000000000 -0400 -+++ b/Makefile 2011-05-20 08:43:48.000000000 -0400 +--- a/Makefile 2011-06-05 20:27:54.000000000 -0400 ++++ b/Makefile 2011-06-05 20:28:46.000000000 -0400 @@ -221,7 +221,7 @@ =20 HOSTCC =3D gcc HOSTCXX =3D g++ --HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fo= mit-frame-pointer -fno-delete-null-pointer-checks +-HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointe= r -fno-delete-null-pointer-checks +HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-em= pty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit= -frame-pointer -fno-delete-null-pointer-checks + HOSTCFLAGS +=3D $(call cc-option, -Wno-empty-body) HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 - # Decide whether to build built-in, modular, or both. diff --git a/2.6.32/4435_grsec-kconfig-gentoo.patch b/2.6.32/4435_grsec-k= config-gentoo.patch index 6d61fd0..f2b8a25 100644 --- a/2.6.32/4435_grsec-kconfig-gentoo.patch +++ b/2.6.32/4435_grsec-kconfig-gentoo.patch @@ -303,7 +303,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/security/Kc= onfig linux-2.6.32-hardened help This is the kernel land equivalent of PAGEEXEC and MPROTECT, that is, enabling this option will make it harder to inject -@@ -476,8 +477,9 @@ +@@ -483,8 +484,9 @@ =20 config PAX_MEMORY_UDEREF bool "Prevent invalid userland pointer dereference" diff --git a/2.6.39/0000_README b/2.6.39/0000_README index a870632..86747fc 100644 --- a/2.6.39/0000_README +++ b/2.6.39/0000_README @@ -3,7 +3,11 @@ README =20 Individual Patch Descriptions: ------------------------------------------------------------------------= ----- -Patch: 4420_grsecurity-2.2.2-2.6.39-201105251736.patch +Patch: 1000_linux-2.6.39.1.patch +From: http://www.kernel.org +Desc: Linux 2.6.39.1 + +Patch: 4420_grsecurity-2.2.2-2.6.39.1-201106042120.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity =20 diff --git a/2.6.39/1000_linux-2.6.39.1.patch b/2.6.39/1000_linux-2.6.39.= 1.patch new file mode 100644 index 0000000..776c2f6 --- /dev/null +++ b/2.6.39/1000_linux-2.6.39.1.patch @@ -0,0 +1,6469 @@ +diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writi= ng-clients +index 5ebf5af..5aa5337 100644 +--- a/Documentation/i2c/writing-clients ++++ b/Documentation/i2c/writing-clients +@@ -38,7 +38,7 @@ static struct i2c_driver foo_driver =3D { + .name =3D "foo", + }, +=20 +- .id_table =3D foo_ids, ++ .id_table =3D foo_idtable, + .probe =3D foo_probe, + .remove =3D foo_remove, + /* if device autodetection is needed: */ +diff --git a/Documentation/usb/linux-cdc-acm.inf b/Documentation/usb/lin= ux-cdc-acm.inf +index 612e722..37a02ce 100644 +--- a/Documentation/usb/linux-cdc-acm.inf ++++ b/Documentation/usb/linux-cdc-acm.inf +@@ -90,10 +90,10 @@ ServiceBinary=3D%12%\USBSER.sys + [SourceDisksFiles] + [SourceDisksNames] + [DeviceList] +-%DESCRIPTION%=3DDriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_= A4AB&MI_02 ++%DESCRIPTION%=3DDriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_= 0104&MI_02 +=20 + [DeviceList.NTamd64] +-%DESCRIPTION%=3DDriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_= A4AB&MI_02 ++%DESCRIPTION%=3DDriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_= 0104&MI_02 +=20 +=20 + ;----------------------------------------------------------------------= -------- +diff --git a/Documentation/usb/linux.inf b/Documentation/usb/linux.inf +index 4dee958..4ffa715b0 100644 +--- a/Documentation/usb/linux.inf ++++ b/Documentation/usb/linux.inf +@@ -18,15 +18,15 @@ DriverVer =3D 06/21/2006,6.0.6000.16384 +=20 + ; Decoration for x86 architecture + [LinuxDevices.NTx86] +-%LinuxDevice% =3D RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_05= 25&PID_a4ab&MI_00 ++%LinuxDevice% =3D RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d= 6b&PID_0104&MI_00 +=20 + ; Decoration for x64 architecture + [LinuxDevices.NTamd64] +-%LinuxDevice% =3D RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_05= 25&PID_a4ab&MI_00 ++%LinuxDevice% =3D RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d= 6b&PID_0104&MI_00 +=20 + ; Decoration for ia64 architecture + [LinuxDevices.NTia64] +-%LinuxDevice% =3D RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_05= 25&PID_a4ab&MI_00 ++%LinuxDevice% =3D RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d= 6b&PID_0104&MI_00 +=20 + ;@@@ This is the common setting for setup + [ControlFlags] +diff --git a/Makefile b/Makefile +index 123d858..045b186 100644 +--- a/Makefile ++++ b/Makefile +@@ -1378,7 +1378,7 @@ endif # KBUILD_EXTMOD + clean: $(clean-dirs) + $(call cmd,rmdirs) + $(call cmd,rmfiles) +- @find $(or $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ ++ @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ + \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ + -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ + -o -name '*.symtypes' -o -name 'modules.order' \ +diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S +index c96fa1b..73b4a8b 100644 +--- a/arch/arm/mm/cache-v6.S ++++ b/arch/arm/mm/cache-v6.S +@@ -176,6 +176,7 @@ ENDPROC(v6_coherent_kern_range) + */ + ENTRY(v6_flush_kern_dcache_area) + add r1, r0, r1 ++ bic r0, r0, #D_CACHE_LINE_SIZE - 1 + 1: + #ifdef HARVARD_CACHE + mcr p15, 0, r0, c7, c14, 1 @ clean & invalidate D line +diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S +index dc18d81..d32f02b 100644 +--- a/arch/arm/mm/cache-v7.S ++++ b/arch/arm/mm/cache-v7.S +@@ -221,6 +221,8 @@ ENDPROC(v7_coherent_user_range) + ENTRY(v7_flush_kern_dcache_area) + dcache_line_size r2, r3 + add r1, r0, r1 ++ sub r3, r2, #1 ++ bic r0, r0, r3 + 1: + mcr p15, 0, r0, c7, c14, 1 @ clean & invalidate D line / unified line + add r0, r0, r2 +diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscallt= able.S +index 9b8393d..c54cca87 100644 +--- a/arch/m68k/kernel/syscalltable.S ++++ b/arch/m68k/kernel/syscalltable.S +@@ -319,8 +319,8 @@ ENTRY(sys_call_table) + .long sys_readlinkat + .long sys_fchmodat + .long sys_faccessat /* 300 */ +- .long sys_ni_syscall /* Reserved for pselect6 */ +- .long sys_ni_syscall /* Reserved for ppoll */ ++ .long sys_pselect6 ++ .long sys_ppoll + .long sys_unshare + .long sys_set_robust_list + .long sys_get_robust_list /* 305 */ +diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/= unistd.h +index 3eb82c2..9cbc2c3 100644 +--- a/arch/parisc/include/asm/unistd.h ++++ b/arch/parisc/include/asm/unistd.h +@@ -814,8 +814,14 @@ + #define __NR_recvmmsg (__NR_Linux + 319) + #define __NR_accept4 (__NR_Linux + 320) + #define __NR_prlimit64 (__NR_Linux + 321) +- +-#define __NR_Linux_syscalls (__NR_prlimit64 + 1) ++#define __NR_fanotify_init (__NR_Linux + 322) ++#define __NR_fanotify_mark (__NR_Linux + 323) ++#define __NR_clock_adjtime (__NR_Linux + 324) ++#define __NR_name_to_handle_at (__NR_Linux + 325) ++#define __NR_open_by_handle_at (__NR_Linux + 326) ++#define __NR_syncfs (__NR_Linux + 327) ++ ++#define __NR_Linux_syscalls (__NR_syncfs + 1) +=20 +=20 + #define __IGNORE_select /* newselect */ +diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_= parisc32.c +index 88a0ad1..dc9a624 100644 +--- a/arch/parisc/kernel/sys_parisc32.c ++++ b/arch/parisc/kernel/sys_parisc32.c +@@ -228,3 +228,11 @@ asmlinkage long compat_sys_fallocate(int fd, int mo= de, u32 offhi, u32 offlo, + return sys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo, + ((loff_t)lenhi << 32) | lenlo); + } ++ ++asmlinkage long compat_sys_fanotify_mark(int fan_fd, int flags, u32 mas= k_hi, ++ u32 mask_lo, int fd, ++ const char __user *pathname) ++{ ++ return sys_fanotify_mark(fan_fd, flags, ((u64)mask_hi << 32) | mask_lo= , ++ fd, pathname); ++} +diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/sys= call_table.S +index 4be85ee..a5b02ce 100644 +--- a/arch/parisc/kernel/syscall_table.S ++++ b/arch/parisc/kernel/syscall_table.S +@@ -420,6 +420,12 @@ + ENTRY_COMP(recvmmsg) + ENTRY_SAME(accept4) /* 320 */ + ENTRY_SAME(prlimit64) ++ ENTRY_SAME(fanotify_init) ++ ENTRY_COMP(fanotify_mark) ++ ENTRY_COMP(clock_adjtime) ++ ENTRY_SAME(name_to_handle_at) /* 325 */ ++ ENTRY_COMP(open_by_handle_at) ++ ENTRY_SAME(syncfs) +=20 + /* Nothing yet */ +=20 +diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c +index 5b5e1f0..c37ff6b 100644 +--- a/arch/powerpc/kernel/crash.c ++++ b/arch/powerpc/kernel/crash.c +@@ -170,7 +170,7 @@ static void crash_kexec_wait_realmode(int cpu) + int i; +=20 + msecs =3D 10000; +- for (i=3D0; i < NR_CPUS && msecs > 0; i++) { ++ for (i=3D0; i < nr_cpu_ids && msecs > 0; i++) { + if (i =3D=3D cpu) + continue; +=20 +diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64= .S +index 206a321..e89df59 100644 +--- a/arch/powerpc/kernel/misc_64.S ++++ b/arch/powerpc/kernel/misc_64.S +@@ -462,7 +462,8 @@ _GLOBAL(disable_kernel_fp) + * wait for the flag to change, indicating this kernel is going away bu= t + * the slave code for the next one is at addresses 0 to 100. + * +- * This is used by all slaves. ++ * This is used by all slaves, even those that did not find a matching ++ * paca in the secondary startup code. + * + * Physical (hardware) cpu id should be in r3. + */ +@@ -471,10 +472,6 @@ _GLOBAL(kexec_wait) + 1: mflr r5 + addi r5,r5,kexec_flag-1b +=20 +- li r4,KEXEC_STATE_REAL_MODE +- stb r4,PACAKEXECSTATE(r13) +- SYNC +- + 99: HMT_LOW + #ifdef CONFIG_KEXEC /* use no memory without kexec */ + lwz r4,0(r5) +@@ -499,11 +496,17 @@ kexec_flag: + * + * get phys id from paca + * switch to real mode ++ * mark the paca as no longer used + * join other cpus in kexec_wait(phys_id) + */ + _GLOBAL(kexec_smp_wait) + lhz r3,PACAHWCPUID(r13) + bl real_mode ++ ++ li r4,KEXEC_STATE_REAL_MODE ++ stb r4,PACAKEXECSTATE(r13) ++ SYNC ++ + b .kexec_wait +=20 + /* +diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/opro= file/op_model_power4.c +index 8ee51a2..e6bec74 100644 +--- a/arch/powerpc/oprofile/op_model_power4.c ++++ b/arch/powerpc/oprofile/op_model_power4.c +@@ -261,6 +261,28 @@ static int get_kernel(unsigned long pc, unsigned lo= ng mmcra) + return is_kernel; + } +=20 ++static bool pmc_overflow(unsigned long val) ++{ ++ if ((int)val < 0) ++ return true; ++ ++ /* ++ * Events on POWER7 can roll back if a speculative event doesn't ++ * eventually complete. Unfortunately in some rare cases they will ++ * raise a performance monitor exception. We need to catch this to ++ * ensure we reset the PMC. In all cases the PMC will be 256 or less ++ * cycles from overflow. ++ * ++ * We only do this if the first pass fails to find any overflowing ++ * PMCs because a user might set a period of less than 256 and we ++ * don't want to mistakenly reset them. ++ */ ++ if (__is_processor(PV_POWER7) && ((0x80000000 - val) <=3D 256)) ++ return true; ++ ++ return false; ++} ++ + static void power4_handle_interrupt(struct pt_regs *regs, + struct op_counter_config *ctr) + { +@@ -281,7 +303,7 @@ static void power4_handle_interrupt(struct pt_regs *= regs, +=20 + for (i =3D 0; i < cur_cpu_spec->num_pmcs; ++i) { + val =3D classic_ctr_read(i); +- if (val < 0) { ++ if (pmc_overflow(val)) { + if (oprofile_running && ctr[i].enabled) { + oprofile_add_ext_sample(pc, regs, i, is_kernel); + classic_ctr_write(i, reset_value[i]); +diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile +index d49c213..ae95935 100644 +--- a/arch/sh/kernel/cpu/Makefile ++++ b/arch/sh/kernel/cpu/Makefile +@@ -17,7 +17,5 @@ obj-$(CONFIG_ARCH_SHMOBILE) +=3D shmobile/ +=20 + obj-$(CONFIG_SH_ADC) +=3D adc.o + obj-$(CONFIG_SH_CLK_CPG_LEGACY) +=3D clock-cpg.o +-obj-$(CONFIG_SH_FPU) +=3D fpu.o +-obj-$(CONFIG_SH_FPU_EMU) +=3D fpu.o +=20 +-obj-y +=3D irq/ init.o clock.o hwblk.o proc.o ++obj-y +=3D irq/ init.o clock.o fpu.o hwblk.o proc.o +diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86 +index a9da516..795ea8e 100644 +--- a/arch/um/Kconfig.x86 ++++ b/arch/um/Kconfig.x86 +@@ -29,10 +29,10 @@ config X86_64 + def_bool 64BIT +=20 + config RWSEM_XCHGADD_ALGORITHM +- def_bool X86_XADD ++ def_bool X86_XADD && 64BIT +=20 + config RWSEM_GENERIC_SPINLOCK +- def_bool !X86_XADD ++ def_bool !RWSEM_XCHGADD_ALGORITHM +=20 + config 3_LEVEL_PGTABLES + bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT +diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cp= ufeature.h +index 91f3e087..cc5b052 100644 +--- a/arch/x86/include/asm/cpufeature.h ++++ b/arch/x86/include/asm/cpufeature.h +@@ -125,7 +125,7 @@ + #define X86_FEATURE_OSXSAVE (4*32+27) /* "" XSAVE enabled in the OS */ + #define X86_FEATURE_AVX (4*32+28) /* Advanced Vector Extensions */ + #define X86_FEATURE_F16C (4*32+29) /* 16-bit fp conversions */ +-#define X86_FEATURE_RDRND (4*32+30) /* The RDRAND instruction */ ++#define X86_FEATURE_RDRAND (4*32+30) /* The RDRAND instruction */ + #define X86_FEATURE_HYPERVISOR (4*32+31) /* Running on a hypervisor */ +=20 + /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word= 5 */ +diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uacce= ss.h +index abd3e0e..99f0ad7 100644 +--- a/arch/x86/include/asm/uaccess.h ++++ b/arch/x86/include/asm/uaccess.h +@@ -42,7 +42,7 @@ + * Returns 0 if the range is valid, nonzero otherwise. + * + * This is equivalent to the following test: +- * (u33)addr + (u33)size >=3D (u33)current->addr_limit.seg (u65 for x86= _64) ++ * (u33)addr + (u33)size > (u33)current->addr_limit.seg (u65 for x86_64= ) + * + * This needs 33-bit (65-bit for x86_64) arithmetic. We have a carry... + */ +diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_ap= ic.c +index 45fd33d..df63620 100644 +--- a/arch/x86/kernel/apic/io_apic.c ++++ b/arch/x86/kernel/apic/io_apic.c +@@ -621,14 +621,14 @@ struct IO_APIC_route_entry **alloc_ioapic_entries(= void) + struct IO_APIC_route_entry **ioapic_entries; +=20 + ioapic_entries =3D kzalloc(sizeof(*ioapic_entries) * nr_ioapics, +- GFP_KERNEL); ++ GFP_ATOMIC); + if (!ioapic_entries) + return 0; +=20 + for (apic =3D 0; apic < nr_ioapics; apic++) { + ioapic_entries[apic] =3D + kzalloc(sizeof(struct IO_APIC_route_entry) * +- nr_ioapic_registers[apic], GFP_KERNEL); ++ nr_ioapic_registers[apic], GFP_ATOMIC); + if (!ioapic_entries[apic]) + goto nomem; + } +diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c +index 6f9d1f6..b13ed39 100644 +--- a/arch/x86/kernel/cpu/amd.c ++++ b/arch/x86/kernel/cpu/amd.c +@@ -612,8 +612,11 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *= c) + } + #endif +=20 +- /* As a rule processors have APIC timer running in deep C states */ +- if (c->x86 > 0xf && !cpu_has_amd_erratum(amd_erratum_400)) ++ /* ++ * Family 0x12 and above processors have APIC timer ++ * running in deep C states. ++ */ ++ if (c->x86 > 0x11) + set_cpu_cap(c, X86_FEATURE_ARAT); +=20 + /* +@@ -629,10 +632,13 @@ static void __cpuinit init_amd(struct cpuinfo_x86 = *c) + * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=3D33012 + */ + u64 mask; ++ int err; +=20 +- rdmsrl(MSR_AMD64_MCx_MASK(4), mask); +- mask |=3D (1 << 10); +- wrmsrl(MSR_AMD64_MCx_MASK(4), mask); ++ err =3D rdmsrl_safe(MSR_AMD64_MCx_MASK(4), &mask); ++ if (err =3D=3D 0) { ++ mask |=3D (1 << 10); ++ checking_wrmsrl(MSR_AMD64_MCx_MASK(4), mask); ++ } + } + } +=20 +diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c +index e2ced00..173f3a3 100644 +--- a/arch/x86/kernel/cpu/common.c ++++ b/arch/x86/kernel/cpu/common.c +@@ -565,8 +565,7 @@ void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) +=20 + cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx); +=20 +- if (eax > 0) +- c->x86_capability[9] =3D ebx; ++ c->x86_capability[9] =3D ebx; + } +=20 + /* AMD-defined flags: level 0x80000001 */ +diff --git a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c b/arch/x86/kernel= /cpu/cpufreq/pcc-cpufreq.c +index 755a31e..907c8e6 100644 +--- a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c ++++ b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c +@@ -39,7 +39,7 @@ +=20 + #include +=20 +-#define PCC_VERSION "1.00.00" ++#define PCC_VERSION "1.10.00" + #define POLL_LOOPS 300 +=20 + #define CMD_COMPLETE 0x1 +@@ -102,7 +102,7 @@ static struct acpi_generic_address doorbell; + static u64 doorbell_preserve; + static u64 doorbell_write; +=20 +-static u8 OSC_UUID[16] =3D {0x63, 0x9B, 0x2C, 0x9F, 0x70, 0x91, 0x49, 0= x1f, ++static u8 OSC_UUID[16] =3D {0x9F, 0x2C, 0x9B, 0x63, 0x91, 0x70, 0x1f, 0= x49, + 0xBB, 0x4F, 0xA5, 0x98, 0x2F, 0xA1, 0xB5, 0x46}; +=20 + struct pcc_cpu { +diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c +index 4be9b39..c6724e4 100644 +--- a/arch/x86/kernel/setup.c ++++ b/arch/x86/kernel/setup.c +@@ -912,6 +912,13 @@ void __init setup_arch(char **cmdline_p) + memblock.current_limit =3D get_max_mapped(); + memblock_x86_fill(); +=20 ++ /* ++ * The EFI specification says that boot service code won't be called ++ * after ExitBootServices(). This is, in fact, a lie. ++ */ ++ if (efi_enabled) ++ efi_reserve_boot_services(); ++ + /* preallocate 4k for mptable mpc */ + early_reserve_e820_mpc_new(); +=20 +diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S +index 99e4826..a73397f 100644 +--- a/arch/x86/lib/copy_user_64.S ++++ b/arch/x86/lib/copy_user_64.S +@@ -72,7 +72,7 @@ ENTRY(_copy_to_user) + addq %rdx,%rcx + jc bad_to_user + cmpq TI_addr_limit(%rax),%rcx +- jae bad_to_user ++ ja bad_to_user + ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string + CFI_ENDPROC + ENDPROC(_copy_to_user) +@@ -85,7 +85,7 @@ ENTRY(_copy_from_user) + addq %rdx,%rcx + jc bad_from_user + cmpq TI_addr_limit(%rax),%rcx +- jae bad_from_user ++ ja bad_from_user + ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string + CFI_ENDPROC + ENDPROC(_copy_from_user) +diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_mod= el_amd.c +index c3b8e24..9fd8a56 100644 +--- a/arch/x86/oprofile/op_model_amd.c ++++ b/arch/x86/oprofile/op_model_amd.c +@@ -316,16 +316,23 @@ static void op_amd_stop_ibs(void) + wrmsrl(MSR_AMD64_IBSOPCTL, 0); + } +=20 +-static inline int eilvt_is_available(int offset) ++static inline int get_eilvt(int offset) + { +- /* check if we may assign a vector */ + return !setup_APIC_eilvt(offset, 0, APIC_EILVT_MSG_NMI, 1); + } +=20 ++static inline int put_eilvt(int offset) ++{ ++ return !setup_APIC_eilvt(offset, 0, 0, 1); ++} ++ + static inline int ibs_eilvt_valid(void) + { + int offset; + u64 val; ++ int valid =3D 0; ++ ++ preempt_disable(); +=20 + rdmsrl(MSR_AMD64_IBSCTL, val); + offset =3D val & IBSCTL_LVT_OFFSET_MASK; +@@ -333,16 +340,20 @@ static inline int ibs_eilvt_valid(void) + if (!(val & IBSCTL_LVT_OFFSET_VALID)) { + pr_err(FW_BUG "cpu %d, invalid IBS interrupt offset %d (MSR%08X=3D0x%= 016llx)\n", + smp_processor_id(), offset, MSR_AMD64_IBSCTL, val); +- return 0; ++ goto out; + } +=20 +- if (!eilvt_is_available(offset)) { ++ if (!get_eilvt(offset)) { + pr_err(FW_BUG "cpu %d, IBS interrupt offset %d not available (MSR%08X= =3D0x%016llx)\n", + smp_processor_id(), offset, MSR_AMD64_IBSCTL, val); +- return 0; ++ goto out; + } +=20 +- return 1; ++ valid =3D 1; ++out: ++ preempt_enable(); ++ ++ return valid; + } +=20 + static inline int get_ibs_offset(void) +@@ -600,67 +611,69 @@ static int setup_ibs_ctl(int ibs_eilvt_off) +=20 + static int force_ibs_eilvt_setup(void) + { +- int i; ++ int offset; + int ret; +=20 +- /* find the next free available EILVT entry */ +- for (i =3D 1; i < 4; i++) { +- if (!eilvt_is_available(i)) +- continue; +- ret =3D setup_ibs_ctl(i); +- if (ret) +- return ret; +- pr_err(FW_BUG "using offset %d for IBS interrupts\n", i); +- return 0; ++ /* ++ * find the next free available EILVT entry, skip offset 0, ++ * pin search to this cpu ++ */ ++ preempt_disable(); ++ for (offset =3D 1; offset < APIC_EILVT_NR_MAX; offset++) { ++ if (get_eilvt(offset)) ++ break; + } ++ preempt_enable(); +=20 +- printk(KERN_DEBUG "No EILVT entry available\n"); +- +- return -EBUSY; +-} +- +-static int __init_ibs_nmi(void) +-{ +- int ret; +- +- if (ibs_eilvt_valid()) +- return 0; ++ if (offset =3D=3D APIC_EILVT_NR_MAX) { ++ printk(KERN_DEBUG "No EILVT entry available\n"); ++ return -EBUSY; ++ } +=20 +- ret =3D force_ibs_eilvt_setup(); ++ ret =3D setup_ibs_ctl(offset); + if (ret) +- return ret; ++ goto out; +=20 +- if (!ibs_eilvt_valid()) +- return -EFAULT; ++ if (!ibs_eilvt_valid()) { ++ ret =3D -EFAULT; ++ goto out; ++ } +=20 ++ pr_err(FW_BUG "using offset %d for IBS interrupts\n", offset); + pr_err(FW_BUG "workaround enabled for IBS LVT offset\n"); +=20 + return 0; ++out: ++ preempt_disable(); ++ put_eilvt(offset); ++ preempt_enable(); ++ return ret; + } +=20 + /* + * check and reserve APIC extended interrupt LVT offset for IBS if + * available +- * +- * init_ibs() preforms implicitly cpu-local operations, so pin this +- * thread to its current CPU + */ +=20 + static void init_ibs(void) + { +- preempt_disable(); +- + ibs_caps =3D get_ibs_caps(); ++ + if (!ibs_caps) ++ return; ++ ++ if (ibs_eilvt_valid()) + goto out; +=20 +- if (__init_ibs_nmi() < 0) +- ibs_caps =3D 0; +- else +- printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps); ++ if (!force_ibs_eilvt_setup()) ++ goto out; ++ ++ /* Failed to setup ibs */ ++ ibs_caps =3D 0; ++ return; +=20 + out: +- preempt_enable(); ++ printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps); + } +=20 + static int (*create_arch_files)(struct super_block *sb, struct dentry *= root); +diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c +index 0fe27d7..b00c4ea 100644 +--- a/arch/x86/platform/efi/efi.c ++++ b/arch/x86/platform/efi/efi.c +@@ -315,6 +315,40 @@ static void __init print_efi_memmap(void) + } + #endif /* EFI_DEBUG */ +=20 ++void __init efi_reserve_boot_services(void) ++{ ++ void *p; ++ ++ for (p =3D memmap.map; p < memmap.map_end; p +=3D memmap.desc_size) { ++ efi_memory_desc_t *md =3D p; ++ unsigned long long start =3D md->phys_addr; ++ unsigned long long size =3D md->num_pages << EFI_PAGE_SHIFT; ++ ++ if (md->type !=3D EFI_BOOT_SERVICES_CODE && ++ md->type !=3D EFI_BOOT_SERVICES_DATA) ++ continue; ++ ++ memblock_x86_reserve_range(start, start + size, "EFI Boot"); ++ } ++} ++ ++static void __init efi_free_boot_services(void) ++{ ++ void *p; ++ ++ for (p =3D memmap.map; p < memmap.map_end; p +=3D memmap.desc_size) { ++ efi_memory_desc_t *md =3D p; ++ unsigned long long start =3D md->phys_addr; ++ unsigned long long size =3D md->num_pages << EFI_PAGE_SHIFT; ++ ++ if (md->type !=3D EFI_BOOT_SERVICES_CODE && ++ md->type !=3D EFI_BOOT_SERVICES_DATA) ++ continue; ++ ++ free_bootmem_late(start, size); ++ } ++} ++ + void __init efi_init(void) + { + efi_config_table_t *config_tables; +@@ -507,7 +541,9 @@ void __init efi_enter_virtual_mode(void) + efi.systab =3D NULL; + for (p =3D memmap.map; p < memmap.map_end; p +=3D memmap.desc_size) { + md =3D p; +- if (!(md->attribute & EFI_MEMORY_RUNTIME)) ++ if (!(md->attribute & EFI_MEMORY_RUNTIME) && ++ md->type !=3D EFI_BOOT_SERVICES_CODE && ++ md->type !=3D EFI_BOOT_SERVICES_DATA) + continue; +=20 + size =3D md->num_pages << EFI_PAGE_SHIFT; +@@ -558,6 +594,13 @@ void __init efi_enter_virtual_mode(void) + } +=20 + /* ++ * Thankfully, it does seem that no runtime services other than ++ * SetVirtualAddressMap() will touch boot services code, so we can ++ * get rid of it all at this point ++ */ ++ efi_free_boot_services(); ++ ++ /* + * Now that EFI is in virtual mode, update the function + * pointers in the runtime service table to the new virtual addresses. + * +diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_= 64.c +index ac0621a..641264c 100644 +--- a/arch/x86/platform/efi/efi_64.c ++++ b/arch/x86/platform/efi/efi_64.c +@@ -64,10 +64,11 @@ static void __init early_runtime_code_mapping_set_ex= ec(int executable) + if (!(__supported_pte_mask & _PAGE_NX)) + return; +=20 +- /* Make EFI runtime service code area executable */ ++ /* Make EFI service code area executable */ + for (p =3D memmap.map; p < memmap.map_end; p +=3D memmap.desc_size) { + md =3D p; +- if (md->type =3D=3D EFI_RUNTIME_SERVICES_CODE) { ++ if (md->type =3D=3D EFI_RUNTIME_SERVICES_CODE || ++ md->type =3D=3D EFI_BOOT_SERVICES_CODE) { + unsigned long end; + end =3D md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); + early_mapping_set_exec(md->phys_addr, end, executable); +diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c +index 0684f3c..f298bd7 100644 +--- a/arch/x86/xen/mmu.c ++++ b/arch/x86/xen/mmu.c +@@ -1187,7 +1187,7 @@ static void drop_other_mm_ref(void *info) +=20 + active_mm =3D percpu_read(cpu_tlbstate.active_mm); +=20 +- if (active_mm =3D=3D mm) ++ if (active_mm =3D=3D mm && percpu_read(cpu_tlbstate.state) !=3D TLBSTA= TE_OK) + leave_mm(smp_processor_id()); +=20 + /* If this cpu still has a stale cr3 reference, then make sure +diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c +index 141eb0d..c881ae4 100644 +--- a/arch/x86/xen/p2m.c ++++ b/arch/x86/xen/p2m.c +@@ -522,11 +522,20 @@ static bool __init __early_alloc_p2m(unsigned long= pfn) + /* Boundary cross-over for the edges: */ + if (idx) { + unsigned long *p2m =3D extend_brk(PAGE_SIZE, PAGE_SIZE); ++ unsigned long *mid_mfn_p; +=20 + p2m_init(p2m); +=20 + p2m_top[topidx][mididx] =3D p2m; +=20 ++ /* For save/restore we need to MFN of the P2M saved */ ++ ++ mid_mfn_p =3D p2m_top_mfn_p[topidx]; ++ WARN(mid_mfn_p[mididx] !=3D virt_to_mfn(p2m_missing), ++ "P2M_TOP_P[%d][%d] !=3D MFN of p2m_missing!\n", ++ topidx, mididx); ++ mid_mfn_p[mididx] =3D virt_to_mfn(p2m); ++ + } + return idx !=3D 0; + } +@@ -549,12 +558,29 @@ unsigned long __init set_phys_range_identity(unsig= ned long pfn_s, + pfn +=3D P2M_MID_PER_PAGE * P2M_PER_PAGE) + { + unsigned topidx =3D p2m_top_index(pfn); +- if (p2m_top[topidx] =3D=3D p2m_mid_missing) { +- unsigned long **mid =3D extend_brk(PAGE_SIZE, PAGE_SIZE); ++ unsigned long *mid_mfn_p; ++ unsigned long **mid; ++ ++ mid =3D p2m_top[topidx]; ++ mid_mfn_p =3D p2m_top_mfn_p[topidx]; ++ if (mid =3D=3D p2m_mid_missing) { ++ mid =3D extend_brk(PAGE_SIZE, PAGE_SIZE); +=20 + p2m_mid_init(mid); +=20 + p2m_top[topidx] =3D mid; ++ ++ BUG_ON(mid_mfn_p !=3D p2m_mid_missing_mfn); ++ } ++ /* And the save/restore P2M tables.. */ ++ if (mid_mfn_p =3D=3D p2m_mid_missing_mfn) { ++ mid_mfn_p =3D extend_brk(PAGE_SIZE, PAGE_SIZE); ++ p2m_mid_mfn_init(mid_mfn_p); ++ ++ p2m_top_mfn_p[topidx] =3D mid_mfn_p; ++ p2m_top_mfn[topidx] =3D virt_to_mfn(mid_mfn_p); ++ /* Note: we don't set mid_mfn_p[midix] here, ++ * look in __early_alloc_p2m */ + } + } +=20 +diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c +index 90bac0a..ca6297b 100644 +--- a/arch/x86/xen/setup.c ++++ b/arch/x86/xen/setup.c +@@ -166,7 +166,7 @@ static unsigned long __init xen_set_identity(const s= truct e820entry *list, + if (last > end) + continue; +=20 +- if (entry->type =3D=3D E820_RAM) { ++ if ((entry->type =3D=3D E820_RAM) || (entry->type =3D=3D E820_UNUSABL= E)) { + if (start > start_pci) + identity +=3D set_phys_range_identity( + PFN_UP(start_pci), PFN_DOWN(start)); +@@ -227,7 +227,11 @@ char * __init xen_memory_setup(void) +=20 + memcpy(map_raw, map, sizeof(map)); + e820.nr_map =3D 0; ++#ifdef CONFIG_X86_32 ++ xen_extra_mem_start =3D mem_end; ++#else + xen_extra_mem_start =3D max((1ULL << 32), mem_end); ++#endif + for (i =3D 0; i < memmap.nr_entries; i++) { + unsigned long long end; +=20 +diff --git a/block/blk-flush.c b/block/blk-flush.c +index 6c9b5e1..bb21e4c 100644 +--- a/block/blk-flush.c ++++ b/block/blk-flush.c +@@ -212,13 +212,19 @@ static void flush_end_io(struct request *flush_rq,= int error) + } +=20 + /* +- * Moving a request silently to empty queue_head may stall the +- * queue. Kick the queue in those cases. This function is called +- * from request completion path and calling directly into +- * request_fn may confuse the driver. Always use kblockd. ++ * Kick the queue to avoid stall for two cases: ++ * 1. Moving a request silently to empty queue_head may stall the ++ * queue. ++ * 2. When flush request is running in non-queueable queue, the ++ * queue is hold. Restart the queue after flush request is finished ++ * to avoid stall. ++ * This function is called from request completion path and calling ++ * directly into request_fn may confuse the driver. Always use ++ * kblockd. + */ +- if (queued) ++ if (queued || q->flush_queue_delayed) + blk_run_queue_async(q); ++ q->flush_queue_delayed =3D 0; + } +=20 + /** +diff --git a/block/blk-settings.c b/block/blk-settings.c +index 1fa7692..fa1eb04 100644 +--- a/block/blk-settings.c ++++ b/block/blk-settings.c +@@ -120,7 +120,7 @@ void blk_set_default_limits(struct queue_limits *lim= ) + lim->discard_granularity =3D 0; + lim->discard_alignment =3D 0; + lim->discard_misaligned =3D 0; +- lim->discard_zeroes_data =3D -1; ++ lim->discard_zeroes_data =3D 1; + lim->logical_block_size =3D lim->physical_block_size =3D lim->io_min =3D= 512; + lim->bounce_pfn =3D (unsigned long)(BLK_BOUNCE_ANY >> PAGE_SHIFT); + lim->alignment_offset =3D 0; +@@ -166,6 +166,7 @@ void blk_queue_make_request(struct request_queue *q,= make_request_fn *mfn) +=20 + blk_set_default_limits(&q->limits); + blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS); ++ q->limits.discard_zeroes_data =3D 0; +=20 + /* + * by default assume old behaviour and bounce for any highmem page +@@ -790,6 +791,12 @@ void blk_queue_flush(struct request_queue *q, unsig= ned int flush) + } + EXPORT_SYMBOL_GPL(blk_queue_flush); +=20 ++void blk_queue_flush_queueable(struct request_queue *q, bool queueable) ++{ ++ q->flush_not_queueable =3D !queueable; ++} ++EXPORT_SYMBOL_GPL(blk_queue_flush_queueable); ++ + static int __init blk_settings_init(void) + { + blk_max_low_pfn =3D max_low_pfn - 1; +diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c +index bd23631..d935bd8 100644 +--- a/block/blk-sysfs.c ++++ b/block/blk-sysfs.c +@@ -152,7 +152,8 @@ static ssize_t queue_discard_granularity_show(struct= request_queue *q, char *pag +=20 + static ssize_t queue_discard_max_show(struct request_queue *q, char *pa= ge) + { +- return queue_var_show(q->limits.max_discard_sectors << 9, page); ++ return sprintf(page, "%llu\n", ++ (unsigned long long)q->limits.max_discard_sectors << 9); + } +=20 + static ssize_t queue_discard_zeroes_data_show(struct request_queue *q, = char *page) +diff --git a/block/blk.h b/block/blk.h +index 6126346..1566e8d 100644 +--- a/block/blk.h ++++ b/block/blk.h +@@ -61,8 +61,28 @@ static inline struct request *__elv_next_request(stru= ct request_queue *q) + rq =3D list_entry_rq(q->queue_head.next); + return rq; + } +- +- if (!q->elevator->ops->elevator_dispatch_fn(q, 0)) ++ /* ++ * Flush request is running and flush request isn't queueable ++ * in the drive, we can hold the queue till flush request is ++ * finished. Even we don't do this, driver can't dispatch next ++ * requests and will requeue them. And this can improve ++ * throughput too. For example, we have request flush1, write1, ++ * flush 2. flush1 is dispatched, then queue is hold, write1 ++ * isn't inserted to queue. After flush1 is finished, flush2 ++ * will be dispatched. Since disk cache is already clean, ++ * flush2 will be finished very soon, so looks like flush2 is ++ * folded to flush1. ++ * Since the queue is hold, a flag is set to indicate the queue ++ * should be restarted later. Please see flush_end_io() for ++ * details. ++ */ ++ if (q->flush_pending_idx !=3D q->flush_running_idx && ++ !queue_flush_queueable(q)) { ++ q->flush_queue_delayed =3D 1; ++ return NULL; ++ } ++ if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) || ++ !q->elevator->ops->elevator_dispatch_fn(q, 0)) + return NULL; + } + } +diff --git a/block/genhd.c b/block/genhd.c +index 2dd9887..95822ae 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -1728,7 +1728,7 @@ static void disk_add_events(struct gendisk *disk) + { + struct disk_events *ev; +=20 +- if (!disk->fops->check_events || !(disk->events | disk->async_events)) ++ if (!disk->fops->check_events) + return; +=20 + ev =3D kzalloc(sizeof(*ev), GFP_KERNEL); +diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c +index e2f57e9e..d51f979 100644 +--- a/drivers/ata/libata-scsi.c ++++ b/drivers/ata/libata-scsi.c +@@ -1089,21 +1089,21 @@ static int atapi_drain_needed(struct request *rq= ) + static int ata_scsi_dev_config(struct scsi_device *sdev, + struct ata_device *dev) + { ++ struct request_queue *q =3D sdev->request_queue; ++ + if (!ata_id_has_unload(dev->id)) + dev->flags |=3D ATA_DFLAG_NO_UNLOAD; +=20 + /* configure max sectors */ +- blk_queue_max_hw_sectors(sdev->request_queue, dev->max_sectors); ++ blk_queue_max_hw_sectors(q, dev->max_sectors); +=20 + if (dev->class =3D=3D ATA_DEV_ATAPI) { +- struct request_queue *q =3D sdev->request_queue; + void *buf; +=20 + sdev->sector_size =3D ATA_SECT_SIZE; +=20 + /* set DMA padding */ +- blk_queue_update_dma_pad(sdev->request_queue, +- ATA_DMA_PAD_SZ - 1); ++ blk_queue_update_dma_pad(q, ATA_DMA_PAD_SZ - 1); +=20 + /* configure draining */ + buf =3D kmalloc(ATAPI_MAX_DRAIN, q->bounce_gfp | GFP_KERNEL); +@@ -1131,8 +1131,7 @@ static int ata_scsi_dev_config(struct scsi_device = *sdev, + "sector_size=3D%u > PAGE_SIZE, PIO may malfunction\n", + sdev->sector_size); +=20 +- blk_queue_update_dma_alignment(sdev->request_queue, +- sdev->sector_size - 1); ++ blk_queue_update_dma_alignment(q, sdev->sector_size - 1); +=20 + if (dev->flags & ATA_DFLAG_AN) + set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); +@@ -1145,6 +1144,8 @@ static int ata_scsi_dev_config(struct scsi_device = *sdev, + scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth); + } +=20 ++ blk_queue_flush_queueable(q, false); ++ + dev->sdev =3D sdev; + return 0; + } +@@ -2138,7 +2139,7 @@ static unsigned int ata_scsiop_inq_b0(struct ata_s= csi_args *args, u8 *rbuf) + * with the unmap bit set. + */ + if (ata_id_has_trim(args->id)) { +- put_unaligned_be32(65535 * 512 / 8, &rbuf[20]); ++ put_unaligned_be64(65535 * 512 / 8, &rbuf[36]); + put_unaligned_be32(1, &rbuf[28]); + } +=20 +diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c +index 905ff76..635a759 100644 +--- a/drivers/ata/pata_cmd64x.c ++++ b/drivers/ata/pata_cmd64x.c +@@ -41,6 +41,9 @@ + enum { + CFR =3D 0x50, + CFR_INTR_CH0 =3D 0x04, ++ CNTRL =3D 0x51, ++ CNTRL_CH0 =3D 0x04, ++ CNTRL_CH1 =3D 0x08, + CMDTIM =3D 0x52, + ARTTIM0 =3D 0x53, + DRWTIM0 =3D 0x54, +@@ -328,9 +331,19 @@ static int cmd64x_init_one(struct pci_dev *pdev, co= nst struct pci_device_id *id) + .port_ops =3D &cmd648_port_ops + } + }; +- const struct ata_port_info *ppi[] =3D { &cmd_info[id->driver_data], NU= LL }; +- u8 mrdmode; ++ const struct ata_port_info *ppi[] =3D { ++ &cmd_info[id->driver_data], ++ &cmd_info[id->driver_data], ++ NULL ++ }; ++ u8 mrdmode, reg; + int rc; ++ struct pci_dev *bridge =3D pdev->bus->self; ++ /* mobility split bridges don't report enabled ports correctly */ ++ int port_ok =3D !(bridge && bridge->vendor =3D=3D ++ PCI_VENDOR_ID_MOBILITY_ELECTRONICS); ++ /* all (with exceptions below) apart from 643 have CNTRL_CH0 bit */ ++ int cntrl_ch0_ok =3D (id->driver_data !=3D 0); +=20 + rc =3D pcim_enable_device(pdev); + if (rc) +@@ -341,11 +354,18 @@ static int cmd64x_init_one(struct pci_dev *pdev, c= onst struct pci_device_id *id) +=20 + if (pdev->device =3D=3D PCI_DEVICE_ID_CMD_646) { + /* Does UDMA work ? */ +- if (pdev->revision > 4) ++ if (pdev->revision > 4) { + ppi[0] =3D &cmd_info[2]; ++ ppi[1] =3D &cmd_info[2]; ++ } + /* Early rev with other problems ? */ +- else if (pdev->revision =3D=3D 1) ++ else if (pdev->revision =3D=3D 1) { + ppi[0] =3D &cmd_info[3]; ++ ppi[1] =3D &cmd_info[3]; ++ } ++ /* revs 1,2 have no CNTRL_CH0 */ ++ if (pdev->revision < 3) ++ cntrl_ch0_ok =3D 0; + } +=20 + pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 64); +@@ -354,6 +374,20 @@ static int cmd64x_init_one(struct pci_dev *pdev, co= nst struct pci_device_id *id) + mrdmode |=3D 0x02; /* Memory read line enable */ + pci_write_config_byte(pdev, MRDMODE, mrdmode); +=20 ++ /* check for enabled ports */ ++ pci_read_config_byte(pdev, CNTRL, ®); ++ if (!port_ok) ++ dev_printk(KERN_NOTICE, &pdev->dev, "Mobility Bridge detected, ignori= ng CNTRL port enable/disable\n"); ++ if (port_ok && cntrl_ch0_ok && !(reg & CNTRL_CH0)) { ++ dev_printk(KERN_NOTICE, &pdev->dev, "Primary port is disabled\n"); ++ ppi[0] =3D &ata_dummy_port_info; ++ ++ } ++ if (port_ok && !(reg & CNTRL_CH1)) { ++ dev_printk(KERN_NOTICE, &pdev->dev, "Secondary port is disabled\n"); ++ ppi[1] =3D &ata_dummy_port_info; ++ } ++ + /* Force PIO 0 here.. */ +=20 + /* PPC specific fixup copied from old driver */ +diff --git a/drivers/block/brd.c b/drivers/block/brd.c +index b7f51e4..c94bc48 100644 +--- a/drivers/block/brd.c ++++ b/drivers/block/brd.c +@@ -552,7 +552,7 @@ static struct kobject *brd_probe(dev_t dev, int *par= t, void *data) + struct kobject *kobj; +=20 + mutex_lock(&brd_devices_mutex); +- brd =3D brd_init_one(dev & MINORMASK); ++ brd =3D brd_init_one(MINOR(dev) >> part_shift); + kobj =3D brd ? get_disk(brd->brd_disk) : ERR_PTR(-ENOMEM); + mutex_unlock(&brd_devices_mutex); +=20 +@@ -585,15 +585,18 @@ static int __init brd_init(void) + if (max_part > 0) + part_shift =3D fls(max_part); +=20 ++ if ((1UL << part_shift) > DISK_MAX_PARTS) ++ return -EINVAL; ++ + if (rd_nr > 1UL << (MINORBITS - part_shift)) + return -EINVAL; +=20 + if (rd_nr) { + nr =3D rd_nr; +- range =3D rd_nr; ++ range =3D rd_nr << part_shift; + } else { + nr =3D CONFIG_BLK_DEV_RAM_COUNT; +- range =3D 1UL << (MINORBITS - part_shift); ++ range =3D 1UL << MINORBITS; + } +=20 + if (register_blkdev(RAMDISK_MAJOR, "ramdisk")) +@@ -632,7 +635,7 @@ static void __exit brd_exit(void) + unsigned long range; + struct brd_device *brd, *next; +=20 +- range =3D rd_nr ? rd_nr : 1UL << (MINORBITS - part_shift); ++ range =3D rd_nr ? rd_nr << part_shift : 1UL << MINORBITS; +=20 + list_for_each_entry_safe(brd, next, &brd_devices, brd_list) + brd_del_one(brd); +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index a076a14..c59a672 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -1658,7 +1658,7 @@ static struct kobject *loop_probe(dev_t dev, int *= part, void *data) + struct kobject *kobj; +=20 + mutex_lock(&loop_devices_mutex); +- lo =3D loop_init_one(dev & MINORMASK); ++ lo =3D loop_init_one(MINOR(dev) >> part_shift); + kobj =3D lo ? get_disk(lo->lo_disk) : ERR_PTR(-ENOMEM); + mutex_unlock(&loop_devices_mutex); +=20 +@@ -1691,15 +1691,18 @@ static int __init loop_init(void) + if (max_part > 0) + part_shift =3D fls(max_part); +=20 ++ if ((1UL << part_shift) > DISK_MAX_PARTS) ++ return -EINVAL; ++ + if (max_loop > 1UL << (MINORBITS - part_shift)) + return -EINVAL; +=20 + if (max_loop) { + nr =3D max_loop; +- range =3D max_loop; ++ range =3D max_loop << part_shift; + } else { + nr =3D 8; +- range =3D 1UL << (MINORBITS - part_shift); ++ range =3D 1UL << MINORBITS; + } +=20 + if (register_blkdev(LOOP_MAJOR, "loop")) +@@ -1738,7 +1741,7 @@ static void __exit loop_exit(void) + unsigned long range; + struct loop_device *lo, *next; +=20 +- range =3D max_loop ? max_loop : 1UL << (MINORBITS - part_shift); ++ range =3D max_loop ? max_loop << part_shift : 1UL << MINORBITS; +=20 + list_for_each_entry_safe(lo, next, &loop_devices, lo_list) + loop_del_one(lo); +diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c +index 8690e31..46b8136 100644 +--- a/drivers/block/paride/pcd.c ++++ b/drivers/block/paride/pcd.c +@@ -320,6 +320,7 @@ static void pcd_init_units(void) + disk->first_minor =3D unit; + strcpy(disk->disk_name, cd->name); /* umm... */ + disk->fops =3D &pcd_bdops; ++ disk->flags =3D GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; + } + } +=20 +diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c +index e427fbe..7878da8 100644 +--- a/drivers/cdrom/viocd.c ++++ b/drivers/cdrom/viocd.c +@@ -625,7 +625,8 @@ static int viocd_probe(struct vio_dev *vdev, const s= truct vio_device_id *id) + blk_queue_max_hw_sectors(q, 4096 / 512); + gendisk->queue =3D q; + gendisk->fops =3D &viocd_fops; +- gendisk->flags =3D GENHD_FL_CD|GENHD_FL_REMOVABLE; ++ gendisk->flags =3D GENHD_FL_CD | GENHD_FL_REMOVABLE | ++ GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; + set_capacity(gendisk, 0); + gendisk->private_data =3D d; + d->viocd_disk =3D gendisk; +diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c +index d72433f..ee01716 100644 +--- a/drivers/char/i8k.c ++++ b/drivers/char/i8k.c +@@ -139,8 +139,8 @@ static int i8k_smm(struct smm_regs *regs) + "movl %%edi,20(%%rax)\n\t" + "popq %%rdx\n\t" + "movl %%edx,0(%%rax)\n\t" +- "lahf\n\t" +- "shrl $8,%%eax\n\t" ++ "pushfq\n\t" ++ "popq %%rax\n\t" + "andl $1,%%eax\n" + :"=3Da"(rc) + : "a"(regs) +diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c +index 2dafc5c..7c10f96 100644 +--- a/drivers/cpufreq/cpufreq.c ++++ b/drivers/cpufreq/cpufreq.c +@@ -1208,12 +1208,28 @@ static int __cpufreq_remove_dev(struct sys_devic= e *sys_dev) + cpufreq_driver->exit(data); + unlock_policy_rwsem_write(cpu); +=20 ++ cpufreq_debug_enable_ratelimit(); ++ ++#ifdef CONFIG_HOTPLUG_CPU ++ /* when the CPU which is the parent of the kobj is hotplugged ++ * offline, check for siblings, and create cpufreq sysfs interface ++ * and symlinks ++ */ ++ if (unlikely(cpumask_weight(data->cpus) > 1)) { ++ /* first sibling now owns the new sysfs dir */ ++ cpumask_clear_cpu(cpu, data->cpus); ++ cpufreq_add_dev(get_cpu_sysdev(cpumask_first(data->cpus))); ++ ++ /* finally remove our own symlink */ ++ lock_policy_rwsem_write(cpu); ++ __cpufreq_remove_dev(sys_dev); ++ } ++#endif ++ + free_cpumask_var(data->related_cpus); + free_cpumask_var(data->cpus); + kfree(data); +- per_cpu(cpufreq_cpu_data, cpu) =3D NULL; +=20 +- cpufreq_debug_enable_ratelimit(); + return 0; + } +=20 +diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_s= tats.c +index 00d73fc..4f1b8de 100644 +--- a/drivers/cpufreq/cpufreq_stats.c ++++ b/drivers/cpufreq/cpufreq_stats.c +@@ -165,17 +165,27 @@ static int freq_table_get_index(struct cpufreq_sta= ts *stat, unsigned int freq) + return -1; + } +=20 ++/* should be called late in the CPU removal sequence so that the stats ++ * memory is still available in case someone tries to use it. ++ */ + static void cpufreq_stats_free_table(unsigned int cpu) + { + struct cpufreq_stats *stat =3D per_cpu(cpufreq_stats_table, cpu); +- struct cpufreq_policy *policy =3D cpufreq_cpu_get(cpu); +- if (policy && policy->cpu =3D=3D cpu) +- sysfs_remove_group(&policy->kobj, &stats_attr_group); + if (stat) { + kfree(stat->time_in_state); + kfree(stat); + } + per_cpu(cpufreq_stats_table, cpu) =3D NULL; ++} ++ ++/* must be called early in the CPU removal sequence (before ++ * cpufreq_remove_dev) so that policy is still valid. ++ */ ++static void cpufreq_stats_free_sysfs(unsigned int cpu) ++{ ++ struct cpufreq_policy *policy =3D cpufreq_cpu_get(cpu); ++ if (policy && policy->cpu =3D=3D cpu) ++ sysfs_remove_group(&policy->kobj, &stats_attr_group); + if (policy) + cpufreq_cpu_put(policy); + } +@@ -316,6 +326,9 @@ static int __cpuinit cpufreq_stat_cpu_callback(struc= t notifier_block *nfb, + case CPU_ONLINE_FROZEN: + cpufreq_update_policy(cpu); + break; ++ case CPU_DOWN_PREPARE: ++ cpufreq_stats_free_sysfs(cpu); ++ break; + case CPU_DEAD: + case CPU_DEAD_FROZEN: + cpufreq_stats_free_table(cpu); +@@ -324,9 +337,11 @@ static int __cpuinit cpufreq_stat_cpu_callback(stru= ct notifier_block *nfb, + return NOTIFY_OK; + } +=20 ++/* priority=3D1 so this will get called before cpufreq_remove_dev */ + static struct notifier_block cpufreq_stat_cpu_notifier __refdata =3D + { + .notifier_call =3D cpufreq_stat_cpu_callback, ++ .priority =3D 1, + }; +=20 + static struct notifier_block notifier_policy_block =3D { +diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governor= s/menu.c +index f508690..c47f3d0 100644 +--- a/drivers/cpuidle/governors/menu.c ++++ b/drivers/cpuidle/governors/menu.c +@@ -237,6 +237,7 @@ static int menu_select(struct cpuidle_device *dev) + unsigned int power_usage =3D -1; + int i; + int multiplier; ++ struct timespec t; +=20 + if (data->needs_update) { + menu_update(dev); +@@ -251,8 +252,9 @@ static int menu_select(struct cpuidle_device *dev) + return 0; +=20 + /* determine the expected residency time, round up */ ++ t =3D ktime_to_timespec(tick_nohz_get_sleep_length()); + data->expected_us =3D +- DIV_ROUND_UP((u32)ktime_to_ns(tick_nohz_get_sleep_length()), 1000)= ; ++ t.tv_sec * USEC_PER_SEC + t.tv_nsec / NSEC_PER_USEC; +=20 +=20 + data->bucket =3D which_bucket(data->expected_us); +diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i= 915/intel_ringbuffer.c +index e9e6f71..c4504a2 100644 +--- a/drivers/gpu/drm/i915/intel_ringbuffer.c ++++ b/drivers/gpu/drm/i915/intel_ringbuffer.c +@@ -666,12 +666,37 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, = u32 gflag, u32 rflag) + static bool + bsd_ring_get_irq(struct intel_ring_buffer *ring) + { +- return ring_get_irq(ring, GT_BSD_USER_INTERRUPT); ++ struct drm_device *dev =3D ring->dev; ++ drm_i915_private_t *dev_priv =3D dev->dev_private; ++ ++ if (!dev->irq_enabled) ++ return false; ++ ++ spin_lock(&ring->irq_lock); ++ if (ring->irq_refcount++ =3D=3D 0) { ++ if (IS_G4X(dev)) ++ i915_enable_irq(dev_priv, I915_BSD_USER_INTERRUPT); ++ else ++ ironlake_enable_irq(dev_priv, GT_BSD_USER_INTERRUPT); ++ } ++ spin_unlock(&ring->irq_lock); ++ ++ return true; + } + static void + bsd_ring_put_irq(struct intel_ring_buffer *ring) + { +- ring_put_irq(ring, GT_BSD_USER_INTERRUPT); ++ struct drm_device *dev =3D ring->dev; ++ drm_i915_private_t *dev_priv =3D dev->dev_private; ++ ++ spin_lock(&ring->irq_lock); ++ if (--ring->irq_refcount =3D=3D 0) { ++ if (IS_G4X(dev)) ++ i915_disable_irq(dev_priv, I915_BSD_USER_INTERRUPT); ++ else ++ ironlake_disable_irq(dev_priv, GT_BSD_USER_INTERRUPT); ++ } ++ spin_unlock(&ring->irq_lock); + } +=20 + static int +diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon= /evergreen.c +index 9073e3b..296e6ec 100644 +--- a/drivers/gpu/drm/radeon/evergreen.c ++++ b/drivers/gpu/drm/radeon/evergreen.c +@@ -1578,7 +1578,7 @@ static void evergreen_gpu_init(struct radeon_devic= e *rdev) + u32 sq_stack_resource_mgmt_2; + u32 sq_stack_resource_mgmt_3; + u32 vgt_cache_invalidation; +- u32 hdp_host_path_cntl; ++ u32 hdp_host_path_cntl, tmp; + int i, j, num_shader_engines, ps_thread_count; +=20 + switch (rdev->family) { +@@ -2141,6 +2141,10 @@ static void evergreen_gpu_init(struct radeon_devi= ce *rdev) + for (i =3D SQ_ALU_CONST_BUFFER_SIZE_HS_0; i < 0x29000; i +=3D 4) + WREG32(i, 0); +=20 ++ tmp =3D RREG32(HDP_MISC_CNTL); ++ tmp |=3D HDP_FLUSH_INVALIDATE_CACHE; ++ WREG32(HDP_MISC_CNTL, tmp); ++ + hdp_host_path_cntl =3D RREG32(HDP_HOST_PATH_CNTL); + WREG32(HDP_HOST_PATH_CNTL, hdp_host_path_cntl); +=20 +diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeo= n/evergreend.h +index fc40e0c..f37e91e 100644 +--- a/drivers/gpu/drm/radeon/evergreend.h ++++ b/drivers/gpu/drm/radeon/evergreend.h +@@ -64,6 +64,8 @@ + #define GB_BACKEND_MAP 0x98FC + #define DMIF_ADDR_CONFIG 0xBD4 + #define HDP_ADDR_CONFIG 0x2F48 ++#define HDP_MISC_CNTL 0x2F4C ++#define HDP_FLUSH_INVALIDATE_CACHE (1 << 0) +=20 + #define CC_SYS_RB_BACKEND_DISABLE 0x3F88 + #define GC_USER_RB_BACKEND_DISABLE 0x9B7C +diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c +index 3d8a763..b205ba1 100644 +--- a/drivers/gpu/drm/radeon/ni.c ++++ b/drivers/gpu/drm/radeon/ni.c +@@ -417,7 +417,7 @@ static u32 cayman_get_tile_pipe_to_backend_map(struc= t radeon_device *rdev, + num_shader_engines =3D 1; + if (num_shader_engines > rdev->config.cayman.max_shader_engines) + num_shader_engines =3D rdev->config.cayman.max_shader_engines; +- if (num_backends_per_asic > num_shader_engines) ++ if (num_backends_per_asic < num_shader_engines) + num_backends_per_asic =3D num_shader_engines; + if (num_backends_per_asic > (rdev->config.cayman.max_backends_per_se *= num_shader_engines)) + num_backends_per_asic =3D rdev->config.cayman.max_backends_per_se * n= um_shader_engines; +@@ -829,7 +829,7 @@ static void cayman_gpu_init(struct radeon_device *rd= ev) + rdev->config.cayman.tile_config |=3D + ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; + rdev->config.cayman.tile_config |=3D +- (gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_= SHIFT; ++ ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE= _SHIFT) << 8; + rdev->config.cayman.tile_config |=3D + ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12; +=20 +@@ -931,6 +931,10 @@ static void cayman_gpu_init(struct radeon_device *r= dev) + WREG32(CB_PERF_CTR3_SEL_0, 0); + WREG32(CB_PERF_CTR3_SEL_1, 0); +=20 ++ tmp =3D RREG32(HDP_MISC_CNTL); ++ tmp |=3D HDP_FLUSH_INVALIDATE_CACHE; ++ WREG32(HDP_MISC_CNTL, tmp); ++ + hdp_host_path_cntl =3D RREG32(HDP_HOST_PATH_CNTL); + WREG32(HDP_HOST_PATH_CNTL, hdp_host_path_cntl); +=20 +diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h +index 0f9a08b..b2088c1 100644 +--- a/drivers/gpu/drm/radeon/nid.h ++++ b/drivers/gpu/drm/radeon/nid.h +@@ -136,6 +136,8 @@ + #define HDP_NONSURFACE_INFO 0x2C08 + #define HDP_NONSURFACE_SIZE 0x2C0C + #define HDP_ADDR_CONFIG 0x2F48 ++#define HDP_MISC_CNTL 0x2F4C ++#define HDP_FLUSH_INVALIDATE_CACHE (1 << 0) +=20 + #define CC_SYS_RB_BACKEND_DISABLE 0x3F88 + #define GC_USER_SYS_RB_BACKEND_DISABLE 0x3F8C +diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/rade= on/radeon_asic.c +index ca57619..d948265 100644 +--- a/drivers/gpu/drm/radeon/radeon_asic.c ++++ b/drivers/gpu/drm/radeon/radeon_asic.c +@@ -782,6 +782,7 @@ static struct radeon_asic evergreen_asic =3D { + .hpd_fini =3D &evergreen_hpd_fini, + .hpd_sense =3D &evergreen_hpd_sense, + .hpd_set_polarity =3D &evergreen_hpd_set_polarity, ++ .ioctl_wait_idle =3D r600_ioctl_wait_idle, + .gui_idle =3D &r600_gui_idle, + .pm_misc =3D &evergreen_pm_misc, + .pm_prepare =3D &evergreen_pm_prepare, +@@ -828,6 +829,7 @@ static struct radeon_asic sumo_asic =3D { + .hpd_fini =3D &evergreen_hpd_fini, + .hpd_sense =3D &evergreen_hpd_sense, + .hpd_set_polarity =3D &evergreen_hpd_set_polarity, ++ .ioctl_wait_idle =3D r600_ioctl_wait_idle, + .gui_idle =3D &r600_gui_idle, + .pm_misc =3D &evergreen_pm_misc, + .pm_prepare =3D &evergreen_pm_prepare, +@@ -874,6 +876,7 @@ static struct radeon_asic btc_asic =3D { + .hpd_fini =3D &evergreen_hpd_fini, + .hpd_sense =3D &evergreen_hpd_sense, + .hpd_set_polarity =3D &evergreen_hpd_set_polarity, ++ .ioctl_wait_idle =3D r600_ioctl_wait_idle, + .gui_idle =3D &r600_gui_idle, + .pm_misc =3D &evergreen_pm_misc, + .pm_prepare =3D &evergreen_pm_prepare, +@@ -920,6 +923,7 @@ static struct radeon_asic cayman_asic =3D { + .hpd_fini =3D &evergreen_hpd_fini, + .hpd_sense =3D &evergreen_hpd_sense, + .hpd_set_polarity =3D &evergreen_hpd_set_polarity, ++ .ioctl_wait_idle =3D r600_ioctl_wait_idle, + .gui_idle =3D &r600_gui_idle, + .pm_misc =3D &evergreen_pm_misc, + .pm_prepare =3D &evergreen_pm_prepare, +diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c +index 0ec91c1..a5eda4c 100644 +--- a/drivers/hid/hid-magicmouse.c ++++ b/drivers/hid/hid-magicmouse.c +@@ -501,9 +501,17 @@ static int magicmouse_probe(struct hid_device *hdev= , + } + report->size =3D 6; +=20 ++ /* ++ * The device reponds with 'invalid report id' when feature ++ * report switching it into multitouch mode is sent to it. ++ * ++ * This results in -EIO from the _raw low-level transport callback, ++ * but there seems to be no other way of switching the mode. ++ * Thus the super-ugly hacky success check below. ++ */ + ret =3D hdev->hid_output_raw_report(hdev, feature, sizeof(feature), + HID_FEATURE_REPORT); +- if (ret !=3D sizeof(feature)) { ++ if (ret !=3D -EIO) { + hid_err(hdev, "unable to request touch data (%d)\n", ret); + goto err_stop_hw; + } +diff --git a/drivers/hwmon/pmbus_core.c b/drivers/hwmon/pmbus_core.c +index 196ffaf..7df490e 100644 +--- a/drivers/hwmon/pmbus_core.c ++++ b/drivers/hwmon/pmbus_core.c +@@ -700,6 +700,7 @@ do { \ + struct sensor_device_attribute *a \ + =3D &data->_type##s[data->num_##_type##s].attribute; \ + BUG_ON(data->num_attributes >=3D data->max_attributes); \ ++ sysfs_attr_init(&a->dev_attr.attr); \ + a->dev_attr.attr.name =3D _name; \ + a->dev_attr.attr.mode =3D _mode; \ + a->dev_attr.show =3D _show; \ +diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-teg= ra.c +index b4ab39b..5f1b92c 100644 +--- a/drivers/i2c/busses/i2c-tegra.c ++++ b/drivers/i2c/busses/i2c-tegra.c +@@ -330,6 +330,11 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c= _dev) + i2c_writel(i2c_dev, 0, I2C_INT_MASK); + clk_set_rate(i2c_dev->clk, i2c_dev->bus_clk_rate * 8); +=20 ++ if (!i2c_dev->is_dvc) { ++ u32 sl_cfg =3D i2c_readl(i2c_dev, I2C_SL_CNFG); ++ i2c_writel(i2c_dev, sl_cfg | I2C_SL_CNFG_NEWSL, I2C_SL_CNFG); ++ } ++ + val =3D 7 << I2C_FIFO_CONTROL_TX_TRIG_SHIFT | + 0 << I2C_FIFO_CONTROL_RX_TRIG_SHIFT; + i2c_writel(i2c_dev, val, I2C_FIFO_CONTROL); +diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c +index a5ec5a7..9560822 100644 +--- a/drivers/ide/ide-cd.c ++++ b/drivers/ide/ide-cd.c +@@ -1773,7 +1773,8 @@ static int ide_cd_probe(ide_drive_t *drive) +=20 + g->minors =3D 1; + g->driverfs_dev =3D &drive->gendev; +- g->flags =3D GENHD_FL_CD | GENHD_FL_REMOVABLE; ++ g->flags =3D GENHD_FL_CD | GENHD_FL_REMOVABLE | ++ GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; + if (ide_cdrom_setup(drive)) { + put_device(&info->dev); + goto failed; +diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c +index 5c93627..70bd738 100644 +--- a/drivers/md/bitmap.c ++++ b/drivers/md/bitmap.c +@@ -493,11 +493,11 @@ void bitmap_update_sb(struct bitmap *bitmap) + spin_unlock_irqrestore(&bitmap->lock, flags); + sb =3D kmap_atomic(bitmap->sb_page, KM_USER0); + sb->events =3D cpu_to_le64(bitmap->mddev->events); +- if (bitmap->mddev->events < bitmap->events_cleared) { ++ if (bitmap->mddev->events < bitmap->events_cleared) + /* rocking back to read-only */ + bitmap->events_cleared =3D bitmap->mddev->events; +- sb->events_cleared =3D cpu_to_le64(bitmap->events_cleared); +- } ++ sb->events_cleared =3D cpu_to_le64(bitmap->events_cleared); ++ sb->state =3D cpu_to_le32(bitmap->flags); + /* Just in case these have been changed via sysfs: */ + sb->daemon_sleep =3D cpu_to_le32(bitmap->mddev->bitmap_info.daemon_sle= ep/HZ); + sb->write_behind =3D cpu_to_le32(bitmap->mddev->bitmap_info.max_write_= behind); +@@ -618,7 +618,7 @@ success: + if (le32_to_cpu(sb->version) =3D=3D BITMAP_MAJOR_HOSTENDIAN) + bitmap->flags |=3D BITMAP_HOSTENDIAN; + bitmap->events_cleared =3D le64_to_cpu(sb->events_cleared); +- if (sb->state & cpu_to_le32(BITMAP_STALE)) ++ if (bitmap->flags & BITMAP_STALE) + bitmap->events_cleared =3D bitmap->mddev->events; + err =3D 0; + out: +@@ -652,9 +652,11 @@ static int bitmap_mask_state(struct bitmap *bitmap,= enum bitmap_state bits, + switch (op) { + case MASK_SET: + sb->state |=3D cpu_to_le32(bits); ++ bitmap->flags |=3D bits; + break; + case MASK_UNSET: + sb->state &=3D cpu_to_le32(~bits); ++ bitmap->flags &=3D ~bits; + break; + default: + BUG(); +diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c +index a550a05..aa4e570 100644 +--- a/drivers/md/dm-mpath.c ++++ b/drivers/md/dm-mpath.c +@@ -1290,7 +1290,7 @@ static int do_end_io(struct multipath *m, struct r= equest *clone, + if (!error && !clone->errors) + return 0; /* I/O complete */ +=20 +- if (error =3D=3D -EOPNOTSUPP || error =3D=3D -EREMOTEIO) ++ if (error =3D=3D -EOPNOTSUPP || error =3D=3D -EREMOTEIO || error =3D=3D= -EILSEQ) + return error; +=20 + if (mpio->pgpath) +diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c +index cb8380c..53e603b 100644 +--- a/drivers/md/dm-table.c ++++ b/drivers/md/dm-table.c +@@ -362,6 +362,7 @@ static void close_dev(struct dm_dev_internal *d, str= uct mapped_device *md) + static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *= dev, + sector_t start, sector_t len, void *data) + { ++ struct request_queue *q; + struct queue_limits *limits =3D data; + struct block_device *bdev =3D dev->bdev; + sector_t dev_size =3D +@@ -370,6 +371,22 @@ static int device_area_is_invalid(struct dm_target = *ti, struct dm_dev *dev, + limits->logical_block_size >> SECTOR_SHIFT; + char b[BDEVNAME_SIZE]; +=20 ++ /* ++ * Some devices exist without request functions, ++ * such as loop devices not yet bound to backing files. ++ * Forbid the use of such devices. ++ */ ++ q =3D bdev_get_queue(bdev); ++ if (!q || !q->make_request_fn) { ++ DMWARN("%s: %s is not yet initialised: " ++ "start=3D%llu, len=3D%llu, dev_size=3D%llu", ++ dm_device_name(ti->table->md), bdevname(bdev, b), ++ (unsigned long long)start, ++ (unsigned long long)len, ++ (unsigned long long)dev_size); ++ return 1; ++ } ++ + if (!dev_size) + return 0; +=20 +diff --git a/drivers/md/md.c b/drivers/md/md.c +index 7d6f7f1..4a4c0f8 100644 +--- a/drivers/md/md.c ++++ b/drivers/md/md.c +@@ -4347,13 +4347,19 @@ static int md_alloc(dev_t dev, char *name) + disk->fops =3D &md_fops; + disk->private_data =3D mddev; + disk->queue =3D mddev->queue; ++ blk_queue_flush(mddev->queue, REQ_FLUSH | REQ_FUA); + /* Allow extended partitions. This makes the + * 'mdp' device redundant, but we can't really + * remove it now. + */ + disk->flags |=3D GENHD_FL_EXT_DEVT; +- add_disk(disk); + mddev->gendisk =3D disk; ++ /* As soon as we call add_disk(), another thread could get ++ * through to md_open, so make sure it doesn't get too far ++ */ ++ mutex_lock(&mddev->open_mutex); ++ add_disk(disk); ++ + error =3D kobject_init_and_add(&mddev->kobj, &md_ktype, + &disk_to_dev(disk)->kobj, "%s", "md"); + if (error) { +@@ -4367,8 +4373,7 @@ static int md_alloc(dev_t dev, char *name) + if (mddev->kobj.sd && + sysfs_create_group(&mddev->kobj, &md_bitmap_group)) + printk(KERN_DEBUG "pointless warning\n"); +- +- blk_queue_flush(mddev->queue, REQ_FLUSH | REQ_FUA); ++ mutex_unlock(&mddev->open_mutex); + abort: + mutex_unlock(&disks_mutex); + if (!error && mddev->kobj.sd) { +diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/f= rontends/dib0070.c +index d4e466a..1d47d4d 100644 +--- a/drivers/media/dvb/frontends/dib0070.c ++++ b/drivers/media/dvb/frontends/dib0070.c +@@ -73,27 +73,47 @@ struct dib0070_state { +=20 + u8 wbd_gain_current; + u16 wbd_offset_3_3[2]; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg[2]; ++ u8 i2c_write_buffer[3]; ++ u8 i2c_read_buffer[2]; + }; +=20 + static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg) + { +- u8 b[2]; +- struct i2c_msg msg[2] =3D { +- { .addr =3D state->cfg->i2c_address, .flags =3D 0, .buf =3D &r= eg, .len =3D 1 }, +- { .addr =3D state->cfg->i2c_address, .flags =3D I2C_M_RD, .buf =3D b,= .len =3D 2 }, +- }; +- if (i2c_transfer(state->i2c, msg, 2) !=3D 2) { ++ state->i2c_write_buffer[0] =3D reg; ++ ++ memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->cfg->i2c_address; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 1; ++ state->msg[1].addr =3D state->cfg->i2c_address; ++ state->msg[1].flags =3D I2C_M_RD; ++ state->msg[1].buf =3D state->i2c_read_buffer; ++ state->msg[1].len =3D 2; ++ ++ if (i2c_transfer(state->i2c, state->msg, 2) !=3D 2) { + printk(KERN_WARNING "DiB0070 I2C read failed\n"); + return 0; + } +- return (b[0] << 8) | b[1]; ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 v= al) + { +- u8 b[3] =3D { reg, val >> 8, val & 0xff }; +- struct i2c_msg msg =3D { .addr =3D state->cfg->i2c_address, .flags =3D= 0, .buf =3D b, .len =3D 3 }; +- if (i2c_transfer(state->i2c, &msg, 1) !=3D 1) { ++ state->i2c_write_buffer[0] =3D reg; ++ state->i2c_write_buffer[1] =3D val >> 8; ++ state->i2c_write_buffer[2] =3D val & 0xff; ++ ++ memset(state->msg, 0, sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->cfg->i2c_address; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 3; ++ ++ if (i2c_transfer(state->i2c, state->msg, 1) !=3D 1) { + printk(KERN_WARNING "DiB0070 I2C write failed\n"); + return -EREMOTEIO; + } +diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/f= rontends/dib0090.c +index 52ff1a2..c9c935a 100644 +--- a/drivers/media/dvb/frontends/dib0090.c ++++ b/drivers/media/dvb/frontends/dib0090.c +@@ -191,6 +191,11 @@ struct dib0090_state { + u8 wbd_calibration_gain; + const struct dib0090_wbd_slope *current_wbd_table; + u16 wbdmux; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg[2]; ++ u8 i2c_write_buffer[3]; ++ u8 i2c_read_buffer[2]; + }; +=20 + struct dib0090_fw_state { +@@ -198,27 +203,48 @@ struct dib0090_fw_state { + struct dvb_frontend *fe; + struct dib0090_identity identity; + const struct dib0090_config *config; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg; ++ u8 i2c_write_buffer[2]; ++ u8 i2c_read_buffer[2]; + }; +=20 + static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg) + { +- u8 b[2]; +- struct i2c_msg msg[2] =3D { +- {.addr =3D state->config->i2c_address, .flags =3D 0, .buf =3D ®, .= len =3D 1}, +- {.addr =3D state->config->i2c_address, .flags =3D I2C_M_RD, .buf =3D = b, .len =3D 2}, +- }; +- if (i2c_transfer(state->i2c, msg, 2) !=3D 2) { ++ state->i2c_write_buffer[0] =3D reg; ++ ++ memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->config->i2c_address; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 1; ++ state->msg[1].addr =3D state->config->i2c_address; ++ state->msg[1].flags =3D I2C_M_RD; ++ state->msg[1].buf =3D state->i2c_read_buffer; ++ state->msg[1].len =3D 2; ++ ++ if (i2c_transfer(state->i2c, state->msg, 2) !=3D 2) { + printk(KERN_WARNING "DiB0090 I2C read failed\n"); + return 0; + } +- return (b[0] << 8) | b[1]; ++ ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 = val) + { +- u8 b[3] =3D { reg & 0xff, val >> 8, val & 0xff }; +- struct i2c_msg msg =3D {.addr =3D state->config->i2c_address, .flags =3D= 0, .buf =3D b, .len =3D 3 }; +- if (i2c_transfer(state->i2c, &msg, 1) !=3D 1) { ++ state->i2c_write_buffer[0] =3D reg & 0xff; ++ state->i2c_write_buffer[1] =3D val >> 8; ++ state->i2c_write_buffer[2] =3D val & 0xff; ++ ++ memset(state->msg, 0, sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->config->i2c_address; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 3; ++ ++ if (i2c_transfer(state->i2c, state->msg, 1) !=3D 1) { + printk(KERN_WARNING "DiB0090 I2C write failed\n"); + return -EREMOTEIO; + } +@@ -227,20 +253,31 @@ static int dib0090_write_reg(struct dib0090_state = *state, u32 reg, u16 val) +=20 + static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg) + { +- u8 b[2]; +- struct i2c_msg msg =3D {.addr =3D reg, .flags =3D I2C_M_RD, .buf =3D b= , .len =3D 2 }; +- if (i2c_transfer(state->i2c, &msg, 1) !=3D 1) { ++ state->i2c_write_buffer[0] =3D reg; ++ ++ memset(&state->msg, 0, sizeof(struct i2c_msg)); ++ state->msg.addr =3D reg; ++ state->msg.flags =3D I2C_M_RD; ++ state->msg.buf =3D state->i2c_read_buffer; ++ state->msg.len =3D 2; ++ if (i2c_transfer(state->i2c, &state->msg, 1) !=3D 1) { + printk(KERN_WARNING "DiB0090 I2C read failed\n"); + return 0; + } +- return (b[0] << 8) | b[1]; ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg,= u16 val) + { +- u8 b[2] =3D { val >> 8, val & 0xff }; +- struct i2c_msg msg =3D {.addr =3D reg, .flags =3D 0, .buf =3D b, .len = =3D 2 }; +- if (i2c_transfer(state->i2c, &msg, 1) !=3D 1) { ++ state->i2c_write_buffer[0] =3D val >> 8; ++ state->i2c_write_buffer[1] =3D val & 0xff; ++ ++ memset(&state->msg, 0, sizeof(struct i2c_msg)); ++ state->msg.addr =3D reg; ++ state->msg.flags =3D 0; ++ state->msg.buf =3D state->i2c_write_buffer; ++ state->msg.len =3D 2; ++ if (i2c_transfer(state->i2c, &state->msg, 1) !=3D 1) { + printk(KERN_WARNING "DiB0090 I2C write failed\n"); + return -EREMOTEIO; + } +diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/= frontends/dib7000m.c +index 289a798..79cb1c2 100644 +--- a/drivers/media/dvb/frontends/dib7000m.c ++++ b/drivers/media/dvb/frontends/dib7000m.c +@@ -50,6 +50,11 @@ struct dib7000m_state { + u16 revision; +=20 + u8 agc_state; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg[2]; ++ u8 i2c_write_buffer[4]; ++ u8 i2c_read_buffer[2]; + }; +=20 + enum dib7000m_power_mode { +@@ -64,29 +69,39 @@ enum dib7000m_power_mode { +=20 + static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg) + { +- u8 wb[2] =3D { (reg >> 8) | 0x80, reg & 0xff }; +- u8 rb[2]; +- struct i2c_msg msg[2] =3D { +- { .addr =3D state->i2c_addr >> 1, .flags =3D 0, .buf =3D wb, .= len =3D 2 }, +- { .addr =3D state->i2c_addr >> 1, .flags =3D I2C_M_RD, .buf =3D rb, .= len =3D 2 }, +- }; +- +- if (i2c_transfer(state->i2c_adap, msg, 2) !=3D 2) ++ state->i2c_write_buffer[0] =3D (reg >> 8) | 0x80; ++ state->i2c_write_buffer[1] =3D reg & 0xff; ++ ++ memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c_addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 2; ++ state->msg[1].addr =3D state->i2c_addr >> 1; ++ state->msg[1].flags =3D I2C_M_RD; ++ state->msg[1].buf =3D state->i2c_read_buffer; ++ state->msg[1].len =3D 2; ++ ++ if (i2c_transfer(state->i2c_adap, state->msg, 2) !=3D 2) + dprintk("i2c read error on %d",reg); +=20 +- return (rb[0] << 8) | rb[1]; ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u= 16 val) + { +- u8 b[4] =3D { +- (reg >> 8) & 0xff, reg & 0xff, +- (val >> 8) & 0xff, val & 0xff, +- }; +- struct i2c_msg msg =3D { +- .addr =3D state->i2c_addr >> 1, .flags =3D 0, .buf =3D b, .len =3D 4 +- }; +- return i2c_transfer(state->i2c_adap, &msg, 1) !=3D 1 ? -EREMOTEIO : 0; ++ state->i2c_write_buffer[0] =3D (reg >> 8) & 0xff; ++ state->i2c_write_buffer[1] =3D reg & 0xff; ++ state->i2c_write_buffer[2] =3D (val >> 8) & 0xff; ++ state->i2c_write_buffer[3] =3D val & 0xff; ++ ++ memset(&state->msg[0], 0, sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c_addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 4; ++ ++ return i2c_transfer(state->i2c_adap, state->msg, 1) !=3D 1 ? -EREMOTEI= O : 0; + } + static void dib7000m_write_tab(struct dib7000m_state *state, u16 *buf) + { +diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/= frontends/dib7000p.c +index 900af60..0c9f40c 100644 +--- a/drivers/media/dvb/frontends/dib7000p.c ++++ b/drivers/media/dvb/frontends/dib7000p.c +@@ -63,6 +63,11 @@ struct dib7000p_state { +=20 + u16 tuner_enable; + struct i2c_adapter dib7090_tuner_adap; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg[2]; ++ u8 i2c_write_buffer[4]; ++ u8 i2c_read_buffer[2]; + }; +=20 + enum dib7000p_power_mode { +@@ -76,29 +81,39 @@ static int dib7090_set_diversity_in(struct dvb_front= end *fe, int onoff); +=20 + static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg) + { +- u8 wb[2] =3D { reg >> 8, reg & 0xff }; +- u8 rb[2]; +- struct i2c_msg msg[2] =3D { +- {.addr =3D state->i2c_addr >> 1, .flags =3D 0, .buf =3D wb, .len =3D = 2}, +- {.addr =3D state->i2c_addr >> 1, .flags =3D I2C_M_RD, .buf =3D rb, .l= en =3D 2}, +- }; ++ state->i2c_write_buffer[0] =3D reg >> 8; ++ state->i2c_write_buffer[1] =3D reg & 0xff; ++ ++ memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c_addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 2; ++ state->msg[1].addr =3D state->i2c_addr >> 1; ++ state->msg[1].flags =3D I2C_M_RD; ++ state->msg[1].buf =3D state->i2c_read_buffer; ++ state->msg[1].len =3D 2; +=20 +- if (i2c_transfer(state->i2c_adap, msg, 2) !=3D 2) ++ if (i2c_transfer(state->i2c_adap, state->msg, 2) !=3D 2) + dprintk("i2c read error on %d", reg); +=20 +- return (rb[0] << 8) | rb[1]; ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u= 16 val) + { +- u8 b[4] =3D { +- (reg >> 8) & 0xff, reg & 0xff, +- (val >> 8) & 0xff, val & 0xff, +- }; +- struct i2c_msg msg =3D { +- .addr =3D state->i2c_addr >> 1, .flags =3D 0, .buf =3D b, .len =3D 4 +- }; +- return i2c_transfer(state->i2c_adap, &msg, 1) !=3D 1 ? -EREMOTEIO : 0; ++ state->i2c_write_buffer[0] =3D (reg >> 8) & 0xff; ++ state->i2c_write_buffer[1] =3D reg & 0xff; ++ state->i2c_write_buffer[2] =3D (val >> 8) & 0xff; ++ state->i2c_write_buffer[3] =3D val & 0xff; ++ ++ memset(&state->msg[0], 0, sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c_addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 4; ++ ++ return i2c_transfer(state->i2c_adap, state->msg, 1) !=3D 1 ? -EREMOTEI= O : 0; + } +=20 + static void dib7000p_write_tab(struct dib7000p_state *state, u16 * buf) +@@ -1550,11 +1565,24 @@ static void dib7000p_release(struct dvb_frontend= *demod) +=20 + int dib7000pc_detection(struct i2c_adapter *i2c_adap) + { +- u8 tx[2], rx[2]; ++ u8 *tx, *rx; + struct i2c_msg msg[2] =3D { +- {.addr =3D 18 >> 1, .flags =3D 0, .buf =3D tx, .len =3D 2}, +- {.addr =3D 18 >> 1, .flags =3D I2C_M_RD, .buf =3D rx, .len =3D 2}, ++ {.addr =3D 18 >> 1, .flags =3D 0, .len =3D 2}, ++ {.addr =3D 18 >> 1, .flags =3D I2C_M_RD, .len =3D 2}, + }; ++ int ret =3D 0; ++ ++ tx =3D kzalloc(2*sizeof(u8), GFP_KERNEL); ++ if (!tx) ++ return -ENOMEM; ++ rx =3D kzalloc(2*sizeof(u8), GFP_KERNEL); ++ if (!rx) { ++ goto rx_memory_error; ++ ret =3D -ENOMEM; ++ } ++ ++ msg[0].buf =3D tx; ++ msg[1].buf =3D rx; +=20 + tx[0] =3D 0x03; + tx[1] =3D 0x00; +@@ -1574,7 +1602,11 @@ int dib7000pc_detection(struct i2c_adapter *i2c_a= dap) + } +=20 + dprintk("-D- DiB7000PC not detected"); +- return 0; ++ ++ kfree(rx); ++rx_memory_error: ++ kfree(tx); ++ return ret; + } + EXPORT_SYMBOL(dib7000pc_detection); +=20 +diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/f= rontends/dib8000.c +index c1c3e26..7d2ea11 100644 +--- a/drivers/media/dvb/frontends/dib8000.c ++++ b/drivers/media/dvb/frontends/dib8000.c +@@ -35,6 +35,8 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0= )"); + struct i2c_device { + struct i2c_adapter *adap; + u8 addr; ++ u8 *i2c_write_buffer; ++ u8 *i2c_read_buffer; + }; +=20 + struct dib8000_state { +@@ -70,6 +72,11 @@ struct dib8000_state { + u32 status; +=20 + struct dvb_frontend *fe[MAX_NUMBER_OF_FRONTENDS]; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg[2]; ++ u8 i2c_write_buffer[4]; ++ u8 i2c_read_buffer[2]; + }; +=20 + enum dib8000_power_mode { +@@ -79,22 +86,41 @@ enum dib8000_power_mode { +=20 + static u16 dib8000_i2c_read16(struct i2c_device *i2c, u16 reg) + { +- u8 wb[2] =3D { reg >> 8, reg & 0xff }; +- u8 rb[2]; + struct i2c_msg msg[2] =3D { +- {.addr =3D i2c->addr >> 1,.flags =3D 0,.buf =3D wb,.len =3D 2}, +- {.addr =3D i2c->addr >> 1,.flags =3D I2C_M_RD,.buf =3D rb,.len =3D 2}= , ++ {.addr =3D i2c->addr >> 1, .flags =3D 0, ++ .buf =3D i2c->i2c_write_buffer, .len =3D 2}, ++ {.addr =3D i2c->addr >> 1, .flags =3D I2C_M_RD, ++ .buf =3D i2c->i2c_read_buffer, .len =3D 2}, + }; +=20 ++ msg[0].buf[0] =3D reg >> 8; ++ msg[0].buf[1] =3D reg & 0xff; ++ + if (i2c_transfer(i2c->adap, msg, 2) !=3D 2) + dprintk("i2c read error on %d", reg); +=20 +- return (rb[0] << 8) | rb[1]; ++ return (msg[1].buf[0] << 8) | msg[1].buf[1]; + } +=20 + static u16 dib8000_read_word(struct dib8000_state *state, u16 reg) + { +- return dib8000_i2c_read16(&state->i2c, reg); ++ state->i2c_write_buffer[0] =3D reg >> 8; ++ state->i2c_write_buffer[1] =3D reg & 0xff; ++ ++ memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c.addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 2; ++ state->msg[1].addr =3D state->i2c.addr >> 1; ++ state->msg[1].flags =3D I2C_M_RD; ++ state->msg[1].buf =3D state->i2c_read_buffer; ++ state->msg[1].len =3D 2; ++ ++ if (i2c_transfer(state->i2c.adap, state->msg, 2) !=3D 2) ++ dprintk("i2c read error on %d", reg); ++ ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + static u32 dib8000_read32(struct dib8000_state *state, u16 reg) +@@ -109,19 +135,34 @@ static u32 dib8000_read32(struct dib8000_state *st= ate, u16 reg) +=20 + static int dib8000_i2c_write16(struct i2c_device *i2c, u16 reg, u16 val= ) + { +- u8 b[4] =3D { +- (reg >> 8) & 0xff, reg & 0xff, +- (val >> 8) & 0xff, val & 0xff, +- }; +- struct i2c_msg msg =3D { +- .addr =3D i2c->addr >> 1,.flags =3D 0,.buf =3D b,.len =3D 4 +- }; +- return i2c_transfer(i2c->adap, &msg, 1) !=3D 1 ? -EREMOTEIO : 0; ++ struct i2c_msg msg =3D {.addr =3D i2c->addr >> 1, .flags =3D 0, ++ .buf =3D i2c->i2c_write_buffer, .len =3D 4}; ++ int ret =3D 0; ++ ++ msg.buf[0] =3D (reg >> 8) & 0xff; ++ msg.buf[1] =3D reg & 0xff; ++ msg.buf[2] =3D (val >> 8) & 0xff; ++ msg.buf[3] =3D val & 0xff; ++ ++ ret =3D i2c_transfer(i2c->adap, &msg, 1) !=3D 1 ? -EREMOTEIO : 0; ++ ++ return ret; + } +=20 + static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16= val) + { +- return dib8000_i2c_write16(&state->i2c, reg, val); ++ state->i2c_write_buffer[0] =3D (reg >> 8) & 0xff; ++ state->i2c_write_buffer[1] =3D reg & 0xff; ++ state->i2c_write_buffer[2] =3D (val >> 8) & 0xff; ++ state->i2c_write_buffer[3] =3D val & 0xff; ++ ++ memset(&state->msg[0], 0, sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c.addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 4; ++ ++ return i2c_transfer(state->i2c.adap, state->msg, 1) !=3D 1 ? -EREMOTEI= O : 0; + } +=20 + static const s16 coeff_2k_sb_1seg_dqpsk[8] =3D { +@@ -980,30 +1021,31 @@ static void dib8000_update_timf(struct dib8000_st= ate *state) + dprintk("Updated timing frequency: %d (default: %d)", state->timf, sta= te->timf_default); + } +=20 ++static const u16 adc_target_16dB[11] =3D { ++ (1 << 13) - 825 - 117, ++ (1 << 13) - 837 - 117, ++ (1 << 13) - 811 - 117, ++ (1 << 13) - 766 - 117, ++ (1 << 13) - 737 - 117, ++ (1 << 13) - 693 - 117, ++ (1 << 13) - 648 - 117, ++ (1 << 13) - 619 - 117, ++ (1 << 13) - 575 - 117, ++ (1 << 13) - 531 - 117, ++ (1 << 13) - 501 - 117 ++}; ++static const u8 permu_seg[] =3D { 6, 5, 7, 4, 8, 3, 9, 2, 10, 1, 11, 0,= 12 }; ++ + static void dib8000_set_channel(struct dib8000_state *state, u8 seq, u8= autosearching) + { + u16 mode, max_constellation, seg_diff_mask =3D 0, nbseg_diff =3D 0; + u8 guard, crate, constellation, timeI; +- u8 permu_seg[] =3D { 6, 5, 7, 4, 8, 3, 9, 2, 10, 1, 11, 0, 12 }; + u16 i, coeff[4], P_cfr_left_edge =3D 0, P_cfr_right_edge =3D 0, seg_ma= sk13 =3D 0x1fff; // All 13 segments enabled + const s16 *ncoeff =3D NULL, *ana_fe; + u16 tmcc_pow =3D 0; + u16 coff_pow =3D 0x2800; + u16 init_prbs =3D 0xfff; + u16 ana_gain =3D 0; +- u16 adc_target_16dB[11] =3D { +- (1 << 13) - 825 - 117, +- (1 << 13) - 837 - 117, +- (1 << 13) - 811 - 117, +- (1 << 13) - 766 - 117, +- (1 << 13) - 737 - 117, +- (1 << 13) - 693 - 117, +- (1 << 13) - 648 - 117, +- (1 << 13) - 619 - 117, +- (1 << 13) - 575 - 117, +- (1 << 13) - 531 - 117, +- (1 << 13) - 501 - 117 +- }; +=20 + if (state->ber_monitored_layer !=3D LAYER_ALL) + dib8000_write_word(state, 285, (dib8000_read_word(state, 285) & 0x60)= | state->ber_monitored_layer); +@@ -2379,10 +2421,22 @@ EXPORT_SYMBOL(dib8000_get_slave_frontend); +=20 + int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods,= u8 default_addr, u8 first_addr) + { +- int k =3D 0; ++ int k =3D 0, ret =3D 0; + u8 new_addr =3D 0; + struct i2c_device client =3D {.adap =3D host }; +=20 ++ client.i2c_write_buffer =3D kzalloc(4 * sizeof(u8), GFP_KERNEL); ++ if (!client.i2c_write_buffer) { ++ dprintk("%s: not enough memory", __func__); ++ return -ENOMEM; ++ } ++ client.i2c_read_buffer =3D kzalloc(4 * sizeof(u8), GFP_KERNEL); ++ if (!client.i2c_read_buffer) { ++ dprintk("%s: not enough memory", __func__); ++ ret =3D -ENOMEM; ++ goto error_memory; ++ } ++ + for (k =3D no_of_demods - 1; k >=3D 0; k--) { + /* designated i2c address */ + new_addr =3D first_addr + (k << 1); +@@ -2394,7 +2448,8 @@ int dib8000_i2c_enumeration(struct i2c_adapter *ho= st, int no_of_demods, u8 defau + client.addr =3D default_addr; + if (dib8000_identify(&client) =3D=3D 0) { + dprintk("#%d: not identified", k); +- return -EINVAL; ++ ret =3D -EINVAL; ++ goto error; + } + } +=20 +@@ -2420,7 +2475,12 @@ int dib8000_i2c_enumeration(struct i2c_adapter *h= ost, int no_of_demods, u8 defau + dib8000_i2c_write16(&client, 1286, 0); + } +=20 +- return 0; ++error: ++ kfree(client.i2c_read_buffer); ++error_memory: ++ kfree(client.i2c_write_buffer); ++ ++ return ret; + } +=20 + EXPORT_SYMBOL(dib8000_i2c_enumeration); +@@ -2519,6 +2579,8 @@ struct dvb_frontend *dib8000_attach(struct i2c_ada= pter *i2c_adap, u8 i2c_addr, s + memcpy(&state->cfg, cfg, sizeof(struct dib8000_config)); + state->i2c.adap =3D i2c_adap; + state->i2c.addr =3D i2c_addr; ++ state->i2c.i2c_write_buffer =3D state->i2c_write_buffer; ++ state->i2c.i2c_read_buffer =3D state->i2c_read_buffer; + state->gpio_val =3D cfg->gpio_val; + state->gpio_dir =3D cfg->gpio_dir; +=20 +diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/f= rontends/dib9000.c +index 9151876..451ffa2 100644 +--- a/drivers/media/dvb/frontends/dib9000.c ++++ b/drivers/media/dvb/frontends/dib9000.c +@@ -27,6 +27,8 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0= )"); + struct i2c_device { + struct i2c_adapter *i2c_adap; + u8 i2c_addr; ++ u8 *i2c_read_buffer; ++ u8 *i2c_write_buffer; + }; +=20 + /* lock */ +@@ -92,11 +94,16 @@ struct dib9000_state { +=20 + struct dvb_frontend *fe[MAX_NUMBER_OF_FRONTENDS]; + u16 component_bus_speed; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg[2]; ++ u8 i2c_write_buffer[255]; ++ u8 i2c_read_buffer[255]; + }; +=20 +-u32 fe_info[44] =3D { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0= , 0, ++static const u32 fe_info[44] =3D { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, = 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0 ++ 0, 0, 0, 0, 0, 0, 0, 0 + }; +=20 + enum dib9000_power_mode { +@@ -217,25 +224,33 @@ static u16 dib9000_read16_attr(struct dib9000_stat= e *state, u16 reg, u8 * b, u32 + u32 chunk_size =3D 126; + u32 l; + int ret; +- u8 wb[2] =3D { reg >> 8, reg & 0xff }; +- struct i2c_msg msg[2] =3D { +- {.addr =3D state->i2c.i2c_addr >> 1, .flags =3D 0, .buf =3D wb, .len = =3D 2}, +- {.addr =3D state->i2c.i2c_addr >> 1, .flags =3D I2C_M_RD, .buf =3D b,= .len =3D len}, +- }; +=20 + if (state->platform.risc.fw_is_running && (reg < 1024)) + return dib9000_risc_apb_access_read(state, reg, attribute, NULL, 0, b= , len); +=20 ++ memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c.i2c_addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D 2; ++ state->msg[1].addr =3D state->i2c.i2c_addr >> 1; ++ state->msg[1].flags =3D I2C_M_RD; ++ state->msg[1].buf =3D b; ++ state->msg[1].len =3D len; ++ ++ state->i2c_write_buffer[0] =3D reg >> 8; ++ state->i2c_write_buffer[1] =3D reg & 0xff; ++ + if (attribute & DATA_BUS_ACCESS_MODE_8BIT) +- wb[0] |=3D (1 << 5); ++ state->i2c_write_buffer[0] |=3D (1 << 5); + if (attribute & DATA_BUS_ACCESS_MODE_NO_ADDRESS_INCREMENT) +- wb[0] |=3D (1 << 4); ++ state->i2c_write_buffer[0] |=3D (1 << 4); +=20 + do { + l =3D len < chunk_size ? len : chunk_size; +- msg[1].len =3D l; +- msg[1].buf =3D b; +- ret =3D i2c_transfer(state->i2c.i2c_adap, msg, 2) !=3D 2 ? -EREMOTEIO= : 0; ++ state->msg[1].len =3D l; ++ state->msg[1].buf =3D b; ++ ret =3D i2c_transfer(state->i2c.i2c_adap, state->msg, 2) !=3D 2 ? -ER= EMOTEIO : 0; + if (ret !=3D 0) { + dprintk("i2c read error on %d", reg); + return -EREMOTEIO; +@@ -253,50 +268,47 @@ static u16 dib9000_read16_attr(struct dib9000_stat= e *state, u16 reg, u8 * b, u32 +=20 + static u16 dib9000_i2c_read16(struct i2c_device *i2c, u16 reg) + { +- u8 b[2]; +- u8 wb[2] =3D { reg >> 8, reg & 0xff }; + struct i2c_msg msg[2] =3D { +- {.addr =3D i2c->i2c_addr >> 1, .flags =3D 0, .buf =3D wb, .len =3D 2}= , +- {.addr =3D i2c->i2c_addr >> 1, .flags =3D I2C_M_RD, .buf =3D b, .len = =3D 2}, ++ {.addr =3D i2c->i2c_addr >> 1, .flags =3D 0, ++ .buf =3D i2c->i2c_write_buffer, .len =3D 2}, ++ {.addr =3D i2c->i2c_addr >> 1, .flags =3D I2C_M_RD, ++ .buf =3D i2c->i2c_read_buffer, .len =3D 2}, + }; +=20 ++ i2c->i2c_write_buffer[0] =3D reg >> 8; ++ i2c->i2c_write_buffer[1] =3D reg & 0xff; ++ + if (i2c_transfer(i2c->i2c_adap, msg, 2) !=3D 2) { + dprintk("read register %x error", reg); + return 0; + } +=20 +- return (b[0] << 8) | b[1]; ++ return (i2c->i2c_read_buffer[0] << 8) | i2c->i2c_read_buffer[1]; + } +=20 + static inline u16 dib9000_read_word(struct dib9000_state *state, u16 re= g) + { +- u8 b[2]; +- if (dib9000_read16_attr(state, reg, b, 2, 0) !=3D 0) ++ if (dib9000_read16_attr(state, reg, state->i2c_read_buffer, 2, 0) !=3D= 0) + return 0; +- return (b[0] << 8 | b[1]); ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + static inline u16 dib9000_read_word_attr(struct dib9000_state *state, u= 16 reg, u16 attribute) + { +- u8 b[2]; +- if (dib9000_read16_attr(state, reg, b, 2, attribute) !=3D 0) ++ if (dib9000_read16_attr(state, reg, state->i2c_read_buffer, 2, ++ attribute) !=3D 0) + return 0; +- return (b[0] << 8 | b[1]); ++ return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; + } +=20 + #define dib9000_read16_noinc_attr(state, reg, b, len, attribute) dib900= 0_read16_attr(state, reg, b, len, (attribute) | DATA_BUS_ACCESS_MODE_NO_A= DDRESS_INCREMENT) +=20 + static u16 dib9000_write16_attr(struct dib9000_state *state, u16 reg, c= onst u8 * buf, u32 len, u16 attribute) + { +- u8 b[255]; + u32 chunk_size =3D 126; + u32 l; + int ret; +=20 +- struct i2c_msg msg =3D { +- .addr =3D state->i2c.i2c_addr >> 1, .flags =3D 0, .buf =3D b, .len =3D= len + 2 +- }; +- + if (state->platform.risc.fw_is_running && (reg < 1024)) { + if (dib9000_risc_apb_access_write + (state, reg, DATA_BUS_ACCESS_MODE_16BIT | DATA_BUS_ACCESS_MODE_NO= _ADDRESS_INCREMENT | attribute, buf, len) !=3D 0) +@@ -304,20 +316,26 @@ static u16 dib9000_write16_attr(struct dib9000_sta= te *state, u16 reg, const u8 * + return 0; + } +=20 +- b[0] =3D (reg >> 8) & 0xff; +- b[1] =3D (reg) & 0xff; ++ memset(&state->msg[0], 0, sizeof(struct i2c_msg)); ++ state->msg[0].addr =3D state->i2c.i2c_addr >> 1; ++ state->msg[0].flags =3D 0; ++ state->msg[0].buf =3D state->i2c_write_buffer; ++ state->msg[0].len =3D len + 2; ++ ++ state->i2c_write_buffer[0] =3D (reg >> 8) & 0xff; ++ state->i2c_write_buffer[1] =3D (reg) & 0xff; +=20 + if (attribute & DATA_BUS_ACCESS_MODE_8BIT) +- b[0] |=3D (1 << 5); ++ state->i2c_write_buffer[0] |=3D (1 << 5); + if (attribute & DATA_BUS_ACCESS_MODE_NO_ADDRESS_INCREMENT) +- b[0] |=3D (1 << 4); ++ state->i2c_write_buffer[0] |=3D (1 << 4); +=20 + do { + l =3D len < chunk_size ? len : chunk_size; +- msg.len =3D l + 2; +- memcpy(&b[2], buf, l); ++ state->msg[0].len =3D l + 2; ++ memcpy(&state->i2c_write_buffer[2], buf, l); +=20 +- ret =3D i2c_transfer(state->i2c.i2c_adap, &msg, 1) !=3D 1 ? -EREMOTEI= O : 0; ++ ret =3D i2c_transfer(state->i2c.i2c_adap, state->msg, 1) !=3D 1 ? -ER= EMOTEIO : 0; +=20 + buf +=3D l; + len -=3D l; +@@ -331,11 +349,16 @@ static u16 dib9000_write16_attr(struct dib9000_sta= te *state, u16 reg, const u8 * +=20 + static int dib9000_i2c_write16(struct i2c_device *i2c, u16 reg, u16 val= ) + { +- u8 b[4] =3D { (reg >> 8) & 0xff, reg & 0xff, (val >> 8) & 0xff, val & = 0xff }; + struct i2c_msg msg =3D { +- .addr =3D i2c->i2c_addr >> 1, .flags =3D 0, .buf =3D b, .len =3D 4 ++ .addr =3D i2c->i2c_addr >> 1, .flags =3D 0, ++ .buf =3D i2c->i2c_write_buffer, .len =3D 4 + }; +=20 ++ i2c->i2c_write_buffer[0] =3D (reg >> 8) & 0xff; ++ i2c->i2c_write_buffer[1] =3D reg & 0xff; ++ i2c->i2c_write_buffer[2] =3D (val >> 8) & 0xff; ++ i2c->i2c_write_buffer[3] =3D val & 0xff; ++ + return i2c_transfer(i2c->i2c_adap, &msg, 1) !=3D 1 ? -EREMOTEIO : 0; + } +=20 +@@ -1015,8 +1038,8 @@ static int dib9000_fw_memmbx_sync(struct dib9000_s= tate *state, u8 i) + return 0; + dib9000_risc_mem_write(state, FE_MM_RW_SYNC, &i); + do { +- dib9000_risc_mem_read(state, FE_MM_RW_SYNC, &i, 1); +- } while (i && index_loop--); ++ dib9000_risc_mem_read(state, FE_MM_RW_SYNC, state->i2c_read_buffer, 1= ); ++ } while (state->i2c_read_buffer[0] && index_loop--); +=20 + if (index_loop > 0) + return 0; +@@ -1139,7 +1162,7 @@ static int dib9000_fw_get_channel(struct dvb_front= end *fe, struct dvb_frontend_p +=20 + s8 intlv_native; + }; +- struct dibDVBTChannel ch; ++ struct dibDVBTChannel *ch; + int ret =3D 0; +=20 + DibAcquireLock(&state->platform.risc.mem_mbx_lock); +@@ -1148,9 +1171,12 @@ static int dib9000_fw_get_channel(struct dvb_fron= tend *fe, struct dvb_frontend_p + ret =3D -EIO; + } +=20 +- dib9000_risc_mem_read(state, FE_MM_R_CHANNEL_UNION, (u8 *) &ch, sizeof= (struct dibDVBTChannel)); ++ dib9000_risc_mem_read(state, FE_MM_R_CHANNEL_UNION, ++ state->i2c_read_buffer, sizeof(struct dibDVBTChannel)); ++ ch =3D (struct dibDVBTChannel *)state->i2c_read_buffer; ++ +=20 +- switch (ch.spectrum_inversion & 0x7) { ++ switch (ch->spectrum_inversion & 0x7) { + case 1: + state->fe[0]->dtv_property_cache.inversion =3D INVERSION_ON; + break; +@@ -1162,7 +1188,7 @@ static int dib9000_fw_get_channel(struct dvb_front= end *fe, struct dvb_frontend_p + state->fe[0]->dtv_property_cache.inversion =3D INVERSION_AUTO; + break; + } +- switch (ch.nfft) { ++ switch (ch->nfft) { + case 0: + state->fe[0]->dtv_property_cache.transmission_mode =3D TRANSMISSION_M= ODE_2K; + break; +@@ -1177,7 +1203,7 @@ static int dib9000_fw_get_channel(struct dvb_front= end *fe, struct dvb_frontend_p + state->fe[0]->dtv_property_cache.transmission_mode =3D TRANSMISSION_M= ODE_AUTO; + break; + } +- switch (ch.guard) { ++ switch (ch->guard) { + case 0: + state->fe[0]->dtv_property_cache.guard_interval =3D GUARD_INTERVAL_1_= 32; + break; +@@ -1195,7 +1221,7 @@ static int dib9000_fw_get_channel(struct dvb_front= end *fe, struct dvb_frontend_p + state->fe[0]->dtv_property_cache.guard_interval =3D GUARD_INTERVAL_AU= TO; + break; + } +- switch (ch.constellation) { ++ switch (ch->constellation) { + case 2: + state->fe[0]->dtv_property_cache.modulation =3D QAM_64; + break; +@@ -1210,7 +1236,7 @@ static int dib9000_fw_get_channel(struct dvb_front= end *fe, struct dvb_frontend_p + state->fe[0]->dtv_property_cache.modulation =3D QAM_AUTO; + break; + } +- switch (ch.hrch) { ++ switch (ch->hrch) { + case 0: + state->fe[0]->dtv_property_cache.hierarchy =3D HIERARCHY_NONE; + break; +@@ -1222,7 +1248,7 @@ static int dib9000_fw_get_channel(struct dvb_front= end *fe, struct dvb_frontend_p + state->fe[0]->dtv_property_cache.hierarchy =3D HIERARCHY_AUTO; + break; + } +- switch (ch.code_rate_hp) { ++ switch (ch->code_rate_hp) { + case 1: + state->fe[0]->dtv_property_cache.code_rate_HP =3D FEC_1_2; + break; +@@ -1243,7 +1269,7 @@ static int dib9000_fw_get_channel(struct dvb_front= end *fe, struct dvb_frontend_p + state->fe[0]->dtv_property_cache.code_rate_HP =3D FEC_AUTO; + break; + } +- switch (ch.code_rate_lp) { ++ switch (ch->code_rate_lp) { + case 1: + state->fe[0]->dtv_property_cache.code_rate_LP =3D FEC_1_2; + break; +@@ -1439,9 +1465,10 @@ static int dib9000_fw_tune(struct dvb_frontend *f= e, struct dvb_frontend_paramete + break; + case CT_DEMOD_STEP_1: + if (search) +- dib9000_risc_mem_read(state, FE_MM_R_CHANNEL_SEARCH_STATE, (u8 *) &i= , 1); ++ dib9000_risc_mem_read(state, FE_MM_R_CHANNEL_SEARCH_STATE, state->i2= c_read_buffer, 1); + else +- dib9000_risc_mem_read(state, FE_MM_R_CHANNEL_TUNE_STATE, (u8 *) &i, = 1); ++ dib9000_risc_mem_read(state, FE_MM_R_CHANNEL_TUNE_STATE, state->i2c_= read_buffer, 1); ++ i =3D (s8)state->i2c_read_buffer[0]; + switch (i) { /* something happened */ + case 0: + break; +@@ -2038,14 +2065,17 @@ static int dib9000_read_status(struct dvb_fronte= nd *fe, fe_status_t * stat) + static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber) + { + struct dib9000_state *state =3D fe->demodulator_priv; +- u16 c[16]; ++ u16 *c; +=20 + DibAcquireLock(&state->platform.risc.mem_mbx_lock); + if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) + return -EIO; +- dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, sizeof(c)); ++ dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, ++ state->i2c_read_buffer, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); +=20 ++ c =3D (u16 *)state->i2c_read_buffer; ++ + *ber =3D c[10] << 16 | c[11]; + return 0; + } +@@ -2054,7 +2084,7 @@ static int dib9000_read_signal_strength(struct dvb= _frontend *fe, u16 * strength) + { + struct dib9000_state *state =3D fe->demodulator_priv; + u8 index_frontend; +- u16 c[16]; ++ u16 *c =3D (u16 *)state->i2c_read_buffer; + u16 val; +=20 + *strength =3D 0; +@@ -2069,7 +2099,7 @@ static int dib9000_read_signal_strength(struct dvb= _frontend *fe, u16 * strength) + DibAcquireLock(&state->platform.risc.mem_mbx_lock); + if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) + return -EIO; +- dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, sizeof(c)); ++ dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); +=20 + val =3D 65535 - c[4]; +@@ -2083,14 +2113,14 @@ static int dib9000_read_signal_strength(struct d= vb_frontend *fe, u16 * strength) + static u32 dib9000_get_snr(struct dvb_frontend *fe) + { + struct dib9000_state *state =3D fe->demodulator_priv; +- u16 c[16]; ++ u16 *c =3D (u16 *)state->i2c_read_buffer; + u32 n, s, exp; + u16 val; +=20 + DibAcquireLock(&state->platform.risc.mem_mbx_lock); + if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) + return -EIO; +- dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, sizeof(c)); ++ dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); +=20 + val =3D c[7]; +@@ -2137,12 +2167,12 @@ static int dib9000_read_snr(struct dvb_frontend = *fe, u16 * snr) + static int dib9000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc) + { + struct dib9000_state *state =3D fe->demodulator_priv; +- u16 c[16]; ++ u16 *c =3D (u16 *)state->i2c_read_buffer; +=20 + DibAcquireLock(&state->platform.risc.mem_mbx_lock); + if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) + return -EIO; +- dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, sizeof(c)); ++ dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); +=20 + *unc =3D c[12]; +@@ -2151,10 +2181,22 @@ static int dib9000_read_unc_blocks(struct dvb_fr= ontend *fe, u32 * unc) +=20 + int dib9000_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, = u8 default_addr, u8 first_addr) + { +- int k =3D 0; ++ int k =3D 0, ret =3D 0; + u8 new_addr =3D 0; + struct i2c_device client =3D {.i2c_adap =3D i2c }; +=20 ++ client.i2c_write_buffer =3D kzalloc(4 * sizeof(u8), GFP_KERNEL); ++ if (!client.i2c_write_buffer) { ++ dprintk("%s: not enough memory", __func__); ++ return -ENOMEM; ++ } ++ client.i2c_read_buffer =3D kzalloc(4 * sizeof(u8), GFP_KERNEL); ++ if (!client.i2c_read_buffer) { ++ dprintk("%s: not enough memory", __func__); ++ ret =3D -ENOMEM; ++ goto error_memory; ++ } ++ + client.i2c_addr =3D default_addr + 16; + dib9000_i2c_write16(&client, 1796, 0x0); +=20 +@@ -2178,7 +2220,8 @@ int dib9000_i2c_enumeration(struct i2c_adapter *i2= c, int no_of_demods, u8 defaul + client.i2c_addr =3D default_addr; + if (dib9000_identify(&client) =3D=3D 0) { + dprintk("DiB9000 #%d: not identified", k); +- return -EIO; ++ ret =3D -EIO; ++ goto error; + } + } +=20 +@@ -2196,7 +2239,12 @@ int dib9000_i2c_enumeration(struct i2c_adapter *i= 2c, int no_of_demods, u8 defaul + dib9000_i2c_write16(&client, 1795, 0); + } +=20 +- return 0; ++error: ++ kfree(client.i2c_read_buffer); ++error_memory: ++ kfree(client.i2c_write_buffer); ++ ++ return ret; + } + EXPORT_SYMBOL(dib9000_i2c_enumeration); +=20 +@@ -2261,6 +2309,8 @@ struct dvb_frontend *dib9000_attach(struct i2c_ada= pter *i2c_adap, u8 i2c_addr, c + memcpy(&st->chip.d9.cfg, cfg, sizeof(struct dib9000_config)); + st->i2c.i2c_adap =3D i2c_adap; + st->i2c.i2c_addr =3D i2c_addr; ++ st->i2c.i2c_write_buffer =3D st->i2c_write_buffer; ++ st->i2c.i2c_read_buffer =3D st->i2c_read_buffer; +=20 + st->gpio_dir =3D DIB9000_GPIO_DEFAULT_DIRECTIONS; + st->gpio_val =3D DIB9000_GPIO_DEFAULT_VALUES; +diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/medi= a/dvb/frontends/dibx000_common.c +index f6938f9..dc5d17a 100644 +--- a/drivers/media/dvb/frontends/dibx000_common.c ++++ b/drivers/media/dvb/frontends/dibx000_common.c +@@ -10,30 +10,39 @@ MODULE_PARM_DESC(debug, "turn on debugging (default:= 0)"); +=20 + static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, = u16 val) + { +- u8 b[4] =3D { +- (reg >> 8) & 0xff, reg & 0xff, +- (val >> 8) & 0xff, val & 0xff, +- }; +- struct i2c_msg msg =3D { +- .addr =3D mst->i2c_addr,.flags =3D 0,.buf =3D b,.len =3D 4 +- }; +- +- return i2c_transfer(mst->i2c_adap, &msg, 1) !=3D 1 ? -EREMOTEIO : 0; ++ mst->i2c_write_buffer[0] =3D (reg >> 8) & 0xff; ++ mst->i2c_write_buffer[1] =3D reg & 0xff; ++ mst->i2c_write_buffer[2] =3D (val >> 8) & 0xff; ++ mst->i2c_write_buffer[3] =3D val & 0xff; ++ ++ memset(mst->msg, 0, sizeof(struct i2c_msg)); ++ mst->msg[0].addr =3D mst->i2c_addr; ++ mst->msg[0].flags =3D 0; ++ mst->msg[0].buf =3D mst->i2c_write_buffer; ++ mst->msg[0].len =3D 4; ++ ++ return i2c_transfer(mst->i2c_adap, mst->msg, 1) !=3D 1 ? -EREMOTEIO : = 0; + } +=20 + static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg) + { +- u8 wb[2] =3D { reg >> 8, reg & 0xff }; +- u8 rb[2]; +- struct i2c_msg msg[2] =3D { +- {.addr =3D mst->i2c_addr, .flags =3D 0, .buf =3D wb, .len =3D 2}, +- {.addr =3D mst->i2c_addr, .flags =3D I2C_M_RD, .buf =3D rb, .len =3D = 2}, +- }; +- +- if (i2c_transfer(mst->i2c_adap, msg, 2) !=3D 2) ++ mst->i2c_write_buffer[0] =3D reg >> 8; ++ mst->i2c_write_buffer[1] =3D reg & 0xff; ++ ++ memset(mst->msg, 0, 2 * sizeof(struct i2c_msg)); ++ mst->msg[0].addr =3D mst->i2c_addr; ++ mst->msg[0].flags =3D 0; ++ mst->msg[0].buf =3D mst->i2c_write_buffer; ++ mst->msg[0].len =3D 2; ++ mst->msg[1].addr =3D mst->i2c_addr; ++ mst->msg[1].flags =3D I2C_M_RD; ++ mst->msg[1].buf =3D mst->i2c_read_buffer; ++ mst->msg[1].len =3D 2; ++ ++ if (i2c_transfer(mst->i2c_adap, mst->msg, 2) !=3D 2) + dprintk("i2c read error on %d", reg); +=20 +- return (rb[0] << 8) | rb[1]; ++ return (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1]; + } +=20 + static int dibx000_is_i2c_done(struct dibx000_i2c_master *mst) +@@ -248,26 +257,32 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2= c_adapter *i2c_adap, + struct i2c_msg msg[], int num) + { + struct dibx000_i2c_master *mst =3D i2c_get_adapdata(i2c_adap); +- struct i2c_msg m[2 + num]; +- u8 tx_open[4], tx_close[4]; +=20 +- memset(m, 0, sizeof(struct i2c_msg) * (2 + num)); ++ if (num > 32) { ++ dprintk("%s: too much I2C message to be transmitted (%i).\ ++ Maximum is 32", __func__, num); ++ return -ENOMEM; ++ } ++ ++ memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); +=20 + dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_GPIO_6_7); +=20 +- dibx000_i2c_gate_ctrl(mst, tx_open, msg[0].addr, 1); +- m[0].addr =3D mst->i2c_addr; +- m[0].buf =3D tx_open; +- m[0].len =3D 4; ++ /* open the gate */ ++ dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1); ++ mst->msg[0].addr =3D mst->i2c_addr; ++ mst->msg[0].buf =3D &mst->i2c_write_buffer[0]; ++ mst->msg[0].len =3D 4; +=20 +- memcpy(&m[1], msg, sizeof(struct i2c_msg) * num); ++ memcpy(&mst->msg[1], msg, sizeof(struct i2c_msg) * num); +=20 +- dibx000_i2c_gate_ctrl(mst, tx_close, 0, 0); +- m[num + 1].addr =3D mst->i2c_addr; +- m[num + 1].buf =3D tx_close; +- m[num + 1].len =3D 4; ++ /* close the gate */ ++ dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[4], 0, 0); ++ mst->msg[num + 1].addr =3D mst->i2c_addr; ++ mst->msg[num + 1].buf =3D &mst->i2c_write_buffer[4]; ++ mst->msg[num + 1].len =3D 4; +=20 +- return i2c_transfer(mst->i2c_adap, m, 2 + num) =3D=3D 2 + num ? num : = -EIO; ++ return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) =3D=3D 2 + num ?= num : -EIO; + } +=20 + static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo =3D { +@@ -279,26 +294,32 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c= _adapter *i2c_adap, + struct i2c_msg msg[], int num) + { + struct dibx000_i2c_master *mst =3D i2c_get_adapdata(i2c_adap); +- struct i2c_msg m[2 + num]; +- u8 tx_open[4], tx_close[4]; +=20 +- memset(m, 0, sizeof(struct i2c_msg) * (2 + num)); ++ if (num > 32) { ++ dprintk("%s: too much I2C message to be transmitted (%i).\ ++ Maximum is 32", __func__, num); ++ return -ENOMEM; ++ } ++ ++ memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); +=20 + dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER); +=20 +- dibx000_i2c_gate_ctrl(mst, tx_open, msg[0].addr, 1); +- m[0].addr =3D mst->i2c_addr; +- m[0].buf =3D tx_open; +- m[0].len =3D 4; ++ /* open the gate */ ++ dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1); ++ mst->msg[0].addr =3D mst->i2c_addr; ++ mst->msg[0].buf =3D &mst->i2c_write_buffer[0]; ++ mst->msg[0].len =3D 4; +=20 +- memcpy(&m[1], msg, sizeof(struct i2c_msg) * num); ++ memcpy(&mst->msg[1], msg, sizeof(struct i2c_msg) * num); +=20 +- dibx000_i2c_gate_ctrl(mst, tx_close, 0, 0); +- m[num + 1].addr =3D mst->i2c_addr; +- m[num + 1].buf =3D tx_close; +- m[num + 1].len =3D 4; ++ /* close the gate */ ++ dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[4], 0, 0); ++ mst->msg[num + 1].addr =3D mst->i2c_addr; ++ mst->msg[num + 1].buf =3D &mst->i2c_write_buffer[4]; ++ mst->msg[num + 1].len =3D 4; +=20 +- return i2c_transfer(mst->i2c_adap, m, 2 + num) =3D=3D 2 + num ? num : = -EIO; ++ return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) =3D=3D 2 + num ?= num : -EIO; + } +=20 + static struct i2c_algorithm dibx000_i2c_gated_tuner_algo =3D { +diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/medi= a/dvb/frontends/dibx000_common.h +index 977d343..f031165 100644 +--- a/drivers/media/dvb/frontends/dibx000_common.h ++++ b/drivers/media/dvb/frontends/dibx000_common.h +@@ -28,6 +28,11 @@ struct dibx000_i2c_master { + u8 i2c_addr; +=20 + u16 base_reg; ++ ++ /* for the I2C transfer */ ++ struct i2c_msg msg[34]; ++ u8 i2c_write_buffer[8]; ++ u8 i2c_read_buffer[2]; + }; +=20 + extern int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, +diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/v= ideo/cx88/cx88-blackbird.c +index bca307e..f637d34 100644 +--- a/drivers/media/video/cx88/cx88-blackbird.c ++++ b/drivers/media/video/cx88/cx88-blackbird.c +@@ -1122,7 +1122,6 @@ static int mpeg_release(struct file *file) + mutex_lock(&dev->core->lock); + file->private_data =3D NULL; + kfree(fh); +- mutex_unlock(&dev->core->lock); +=20 + /* Make sure we release the hardware */ + drv =3D cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD); +@@ -1131,6 +1130,8 @@ static int mpeg_release(struct file *file) +=20 + atomic_dec(&dev->core->mpeg_users); +=20 ++ mutex_unlock(&dev->core->lock); ++ + return 0; + } +=20 +@@ -1334,11 +1335,9 @@ static int cx8802_blackbird_probe(struct cx8802_d= river *drv) + blackbird_register_video(dev); +=20 + /* initial device configuration: needed ? */ +- mutex_lock(&dev->core->lock); + // init_controls(core); + cx88_set_tvnorm(core,core->tvnorm); + cx88_video_mux(core,0); +- mutex_unlock(&dev->core->lock); +=20 + return 0; +=20 +diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/c= x88/cx88-dvb.c +index 7b8c9d3..c69df7e 100644 +--- a/drivers/media/video/cx88/cx88-dvb.c ++++ b/drivers/media/video/cx88/cx88-dvb.c +@@ -133,6 +133,7 @@ static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe= , int acquire) + return -EINVAL; + } +=20 ++ mutex_lock(&dev->core->lock); + drv =3D cx8802_get_driver(dev, CX88_MPEG_DVB); + if (drv) { + if (acquire){ +@@ -143,6 +144,7 @@ static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe= , int acquire) + dev->frontends.active_fe_id =3D 0; + } + } ++ mutex_unlock(&dev->core->lock); +=20 + return ret; + } +diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/= cx88/cx88-mpeg.c +index addf954..497f26f 100644 +--- a/drivers/media/video/cx88/cx88-mpeg.c ++++ b/drivers/media/video/cx88/cx88-mpeg.c +@@ -624,13 +624,11 @@ static int cx8802_request_acquire(struct cx8802_dr= iver *drv) +=20 + if (drv->advise_acquire) + { +- mutex_lock(&drv->core->lock); + core->active_ref++; + if (core->active_type_id =3D=3D CX88_BOARD_NONE) { + core->active_type_id =3D drv->type_id; + drv->advise_acquire(drv); + } +- mutex_unlock(&drv->core->lock); +=20 + mpeg_dbg(1,"%s() Post acquire GPIO=3D%x\n", __func__, cx_read(MO_GP0_= IO)); + } +@@ -643,14 +641,12 @@ static int cx8802_request_release(struct cx8802_dr= iver *drv) + { + struct cx88_core *core =3D drv->core; +=20 +- mutex_lock(&drv->core->lock); + if (drv->advise_release && --core->active_ref =3D=3D 0) + { + drv->advise_release(drv); + core->active_type_id =3D CX88_BOARD_NONE; + mpeg_dbg(1,"%s() Post release GPIO=3D%x\n", __func__, cx_read(MO_GP0_= IO)); + } +- mutex_unlock(&drv->core->lock); +=20 + return 0; + } +@@ -713,18 +709,17 @@ int cx8802_register_driver(struct cx8802_driver *d= rv) + drv->request_release =3D cx8802_request_release; + memcpy(driver, drv, sizeof(*driver)); +=20 ++ mutex_lock(&drv->core->lock); + err =3D drv->probe(driver); + if (err =3D=3D 0) { + i++; +- mutex_lock(&drv->core->lock); + list_add_tail(&driver->drvlist, &dev->drvlist); +- mutex_unlock(&drv->core->lock); + } else { + printk(KERN_ERR + "%s/2: cx8802 probe failed, err =3D %d\n", + dev->core->name, err); + } +- ++ mutex_unlock(&drv->core->lock); + } +=20 + return i ? 0 : -ENODEV; +@@ -748,6 +743,8 @@ int cx8802_unregister_driver(struct cx8802_driver *d= rv) + dev->pci->subsystem_device, dev->core->board.name, + dev->core->boardnr); +=20 ++ mutex_lock(&dev->core->lock); ++ + list_for_each_entry_safe(d, dtmp, &dev->drvlist, drvlist) { + /* only unregister the correct driver type */ + if (d->type_id !=3D drv->type_id) +@@ -755,15 +752,14 @@ int cx8802_unregister_driver(struct cx8802_driver = *drv) +=20 + err =3D d->remove(d); + if (err =3D=3D 0) { +- mutex_lock(&drv->core->lock); + list_del(&d->drvlist); +- mutex_unlock(&drv->core->lock); + kfree(d); + } else + printk(KERN_ERR "%s/2: cx8802 driver remove " + "failed (%d)\n", dev->core->name, err); + } +=20 ++ mutex_unlock(&dev->core->lock); + } +=20 + return err; +@@ -827,6 +823,8 @@ static void __devexit cx8802_remove(struct pci_dev *= pci_dev) +=20 + flush_request_modules(dev); +=20 ++ mutex_lock(&dev->core->lock); ++ + if (!list_empty(&dev->drvlist)) { + struct cx8802_driver *drv, *tmp; + int err; +@@ -838,9 +836,7 @@ static void __devexit cx8802_remove(struct pci_dev *= pci_dev) + list_for_each_entry_safe(drv, tmp, &dev->drvlist, drvlist) { + err =3D drv->remove(drv); + if (err =3D=3D 0) { +- mutex_lock(&drv->core->lock); + list_del(&drv->drvlist); +- mutex_unlock(&drv->core->lock); + } else + printk(KERN_ERR "%s/2: cx8802 driver remove " + "failed (%d)\n", dev->core->name, err); +@@ -848,6 +844,8 @@ static void __devexit cx8802_remove(struct pci_dev *= pci_dev) + } + } +=20 ++ mutex_unlock(&dev->core->lock); ++ + /* Destroy any 8802 reference. */ + dev->core->dvbdev =3D NULL; +=20 +diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/= cx88.h +index 9b3742a..3d32f4a 100644 +--- a/drivers/media/video/cx88/cx88.h ++++ b/drivers/media/video/cx88/cx88.h +@@ -505,6 +505,8 @@ struct cx8802_driver { + int (*suspend)(struct pci_dev *pci_dev, pm_message_t state); + int (*resume)(struct pci_dev *pci_dev); +=20 ++ /* Callers to the following functions must hold core->lock */ ++ + /* MPEG 8802 -> mini driver - Driver probe and configuration */ + int (*probe)(struct cx8802_driver *drv); + int (*remove)(struct cx8802_driver *drv); +@@ -561,8 +563,9 @@ struct cx8802_dev { + /* for switching modulation types */ + unsigned char ts_gen_cntrl; +=20 +- /* List of attached drivers */ ++ /* List of attached drivers; must hold core->lock to access */ + struct list_head drvlist; ++ + struct work_struct request_module_wk; + }; +=20 +@@ -685,6 +688,8 @@ int cx88_audio_thread(void *data); +=20 + int cx8802_register_driver(struct cx8802_driver *drv); + int cx8802_unregister_driver(struct cx8802_driver *drv); ++ ++/* Caller must hold core->lock */ + struct cx8802_driver * cx8802_get_driver(struct cx8802_dev *dev, enum c= x88_board_type btype); +=20 + /* ----------------------------------------------------------- */ +diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c +index 3ab9ffa..55c5d47 100644 +--- a/drivers/mfd/omap-usb-host.c ++++ b/drivers/mfd/omap-usb-host.c +@@ -994,22 +994,33 @@ static void usbhs_disable(struct device *dev) + dev_dbg(dev, "operation timed out\n"); + } +=20 +- if (pdata->ehci_data->phy_reset) { +- if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) +- gpio_free(pdata->ehci_data->reset_gpio_port[0]); +- +- if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) +- gpio_free(pdata->ehci_data->reset_gpio_port[1]); ++ if (is_omap_usbhs_rev2(omap)) { ++ if (is_ehci_tll_mode(pdata->port_mode[0])) ++ clk_enable(omap->usbtll_p1_fck); ++ if (is_ehci_tll_mode(pdata->port_mode[1])) ++ clk_enable(omap->usbtll_p2_fck); ++ clk_disable(omap->utmi_p2_fck); ++ clk_disable(omap->utmi_p1_fck); + } +=20 +- clk_disable(omap->utmi_p2_fck); +- clk_disable(omap->utmi_p1_fck); + clk_disable(omap->usbtll_ick); + clk_disable(omap->usbtll_fck); + clk_disable(omap->usbhost_fs_fck); + clk_disable(omap->usbhost_hs_fck); + clk_disable(omap->usbhost_ick); +=20 ++ /* The gpio_free migh sleep; so unlock the spinlock */ ++ spin_unlock_irqrestore(&omap->lock, flags); ++ ++ if (pdata->ehci_data->phy_reset) { ++ if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) ++ gpio_free(pdata->ehci_data->reset_gpio_port[0]); ++ ++ if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) ++ gpio_free(pdata->ehci_data->reset_gpio_port[1]); ++ } ++ return; ++ + end_disble: + spin_unlock_irqrestore(&omap->lock, flags); + } +diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c +index 5060e60..e601672 100644 +--- a/drivers/mtd/mtdconcat.c ++++ b/drivers/mtd/mtdconcat.c +@@ -319,7 +319,7 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, st= ruct mtd_oob_ops *ops) + if (!(mtd->flags & MTD_WRITEABLE)) + return -EROFS; +=20 +- ops->retlen =3D 0; ++ ops->retlen =3D ops->oobretlen =3D 0; +=20 + for (i =3D 0; i < concat->num_subdev; i++) { + struct mtd_info *subdev =3D concat->subdev[i]; +@@ -334,7 +334,7 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, st= ruct mtd_oob_ops *ops) + devops.len =3D subdev->size - to; +=20 + err =3D subdev->write_oob(subdev, to, &devops); +- ops->retlen +=3D devops.retlen; ++ ops->retlen +=3D devops.oobretlen; + if (err) + return err; +=20 +diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c +index c54a4cb..d1345fc 100644 +--- a/drivers/mtd/nand/nand_base.c ++++ b/drivers/mtd/nand/nand_base.c +@@ -3112,6 +3112,8 @@ ident_done: + chip->chip_shift +=3D 32 - 1; + } +=20 ++ chip->badblockbits =3D 8; ++ + /* Set the bad block position */ + if (mtd->writesize > 512 || (busw & NAND_BUSWIDTH_16)) + chip->badblockpos =3D NAND_LARGE_BADBLOCK_POS; +diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c +index da9a351..2c8040f 100644 +--- a/drivers/mtd/nand/omap2.c ++++ b/drivers/mtd/nand/omap2.c +@@ -263,11 +263,10 @@ static void omap_read_buf_pref(struct mtd_info *mt= d, u_char *buf, int len) + if (ret) { + /* PFPW engine is busy, use cpu copy method */ + if (info->nand.options & NAND_BUSWIDTH_16) +- omap_read_buf16(mtd, buf, len); ++ omap_read_buf16(mtd, (u_char *)p, len); + else +- omap_read_buf8(mtd, buf, len); ++ omap_read_buf8(mtd, (u_char *)p, len); + } else { +- p =3D (u32 *) buf; + do { + r_count =3D gpmc_read_status(GPMC_PREFETCH_FIFO_CNT); + r_count =3D r_count >> 2; +@@ -293,7 +292,7 @@ static void omap_write_buf_pref(struct mtd_info *mtd= , + struct omap_nand_info, mtd); + uint32_t w_count =3D 0; + int i =3D 0, ret =3D 0; +- u16 *p; ++ u16 *p =3D (u16 *)buf; + unsigned long tim, limit; +=20 + /* take care of subpage writes */ +@@ -309,11 +308,10 @@ static void omap_write_buf_pref(struct mtd_info *m= td, + if (ret) { + /* PFPW engine is busy, use cpu copy method */ + if (info->nand.options & NAND_BUSWIDTH_16) +- omap_write_buf16(mtd, buf, len); ++ omap_write_buf16(mtd, (u_char *)p, len); + else +- omap_write_buf8(mtd, buf, len); ++ omap_write_buf8(mtd, (u_char *)p, len); + } else { +- p =3D (u16 *) buf; + while (len) { + w_count =3D gpmc_read_status(GPMC_PREFETCH_FIFO_CNT); + w_count =3D w_count >> 1; +diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_a= lb.c +index ba71582..a20bfef 100644 +--- a/drivers/net/bonding/bond_alb.c ++++ b/drivers/net/bonding/bond_alb.c +@@ -163,8 +163,6 @@ static int tlb_initialize(struct bonding *bond) + struct tlb_client_info *new_hashtbl; + int i; +=20 +- spin_lock_init(&(bond_info->tx_hashtbl_lock)); +- + new_hashtbl =3D kzalloc(size, GFP_KERNEL); + if (!new_hashtbl) { + pr_err("%s: Error: Failed to allocate TLB hash table\n", +@@ -764,8 +762,6 @@ static int rlb_initialize(struct bonding *bond) + int size =3D RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info); + int i; +=20 +- spin_lock_init(&(bond_info->rx_hashtbl_lock)); +- + new_hashtbl =3D kmalloc(size, GFP_KERNEL); + if (!new_hashtbl) { + pr_err("%s: Error: Failed to allocate RLB hash table\n", +diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_= main.c +index 16d6fe9..ffb0fde 100644 +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -1535,12 +1535,6 @@ int bond_enslave(struct net_device *bond_dev, str= uct net_device *slave_dev) + bond_dev->name, slave_dev->name); + } +=20 +- /* bond must be initialized by bond_open() before enslaving */ +- if (!(bond_dev->flags & IFF_UP)) { +- pr_warning("%s: master_dev is not up in bond_enslave\n", +- bond_dev->name); +- } +- + /* already enslaved */ + if (slave_dev->flags & IFF_SLAVE) { + pr_debug("Error, Device was already enslaved\n"); +@@ -4975,9 +4969,19 @@ static int bond_init(struct net_device *bond_dev) + { + struct bonding *bond =3D netdev_priv(bond_dev); + struct bond_net *bn =3D net_generic(dev_net(bond_dev), bond_net_id); ++ struct alb_bond_info *bond_info =3D &(BOND_ALB_INFO(bond)); +=20 + pr_debug("Begin bond_init for %s\n", bond_dev->name); +=20 ++ /* ++ * Initialize locks that may be required during ++ * en/deslave operations. All of the bond_open work ++ * (of which this is part) should really be moved to ++ * a phase prior to dev_open ++ */ ++ spin_lock_init(&(bond_info->tx_hashtbl_lock)); ++ spin_lock_init(&(bond_info->rx_hashtbl_lock)); ++ + bond->wq =3D create_singlethread_workqueue(bond_dev->name); + if (!bond->wq) + return -ENOMEM; +diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond= _sysfs.c +index de87aea..8a2717e 100644 +--- a/drivers/net/bonding/bond_sysfs.c ++++ b/drivers/net/bonding/bond_sysfs.c +@@ -227,12 +227,6 @@ static ssize_t bonding_store_slaves(struct device *= d, + struct net_device *dev; + struct bonding *bond =3D to_bond(d); +=20 +- /* Quick sanity check -- is the bond interface up? */ +- if (!(bond->dev->flags & IFF_UP)) { +- pr_warning("%s: doing slave updates when interface is down.\n", +- bond->dev->name); +- } +- + if (!rtnl_trylock()) + return restart_syscall(); +=20 +diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c +index 78e34e9..6d357d6 100644 +--- a/drivers/net/macvlan.c ++++ b/drivers/net/macvlan.c +@@ -598,8 +598,8 @@ static int macvlan_port_create(struct net_device *de= v) + err =3D netdev_rx_handler_register(dev, macvlan_handle_frame, port); + if (err) + kfree(port); +- +- dev->priv_flags |=3D IFF_MACVLAN_PORT; ++ else ++ dev->priv_flags |=3D IFF_MACVLAN_PORT; + return err; + } +=20 +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/ne= t/wireless/ath/ath9k/ar9003_eeprom.c +index 6eadf97..37af3f4 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +@@ -652,7 +652,7 @@ static const struct ar9300_eeprom ar9300_x113 =3D { + .regDmn =3D { LE16(0), LE16(0x1f) }, + .txrxMask =3D 0x77, /* 4 bits tx and 4 bits rx */ + .opCapFlags =3D { +- .opFlags =3D AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A, ++ .opFlags =3D AR5416_OPFLAGS_11A, + .eepMisc =3D 0, + }, + .rfSilent =3D 0, +@@ -922,7 +922,7 @@ static const struct ar9300_eeprom ar9300_x113 =3D { + .db_stage2 =3D {3, 3, 3}, /* 3 chain */ + .db_stage3 =3D {3, 3, 3}, /* doesn't exist for 2G */ + .db_stage4 =3D {3, 3, 3}, /* don't exist for 2G */ +- .xpaBiasLvl =3D 0, ++ .xpaBiasLvl =3D 0xf, + .txFrameToDataStart =3D 0x0e, + .txFrameToPaOn =3D 0x0e, + .txClip =3D 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */ +@@ -3994,6 +3994,16 @@ static int ar9003_hw_tx_power_regwrite(struct ath= _hw *ah, u8 * pPwrArray) + POW_SM(pPwrArray[ALL_TARGET_LEGACY_1L_5L], 0) + ); +=20 ++ /* Write the power for duplicated frames - HT40 */ ++ ++ /* dup40_cck (LSB), dup40_ofdm, ext20_cck, ext20_ofdm (MSB) */ ++ REG_WRITE(ah, 0xa3e0, ++ POW_SM(pPwrArray[ALL_TARGET_LEGACY_6_24], 24) | ++ POW_SM(pPwrArray[ALL_TARGET_LEGACY_1L_5L], 16) | ++ POW_SM(pPwrArray[ALL_TARGET_LEGACY_6_24], 8) | ++ POW_SM(pPwrArray[ALL_TARGET_LEGACY_1L_5L], 0) ++ ); ++ + /* Write the HT20 power per rate set */ +=20 + /* 0/8/16 (LSB), 1-3/9-11/17-19, 4, 5 (MSB) */ +diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wirele= ss/ath/ath9k/calib.c +index 8649581..fe3c10e 100644 +--- a/drivers/net/wireless/ath/ath9k/calib.c ++++ b/drivers/net/wireless/ath/ath9k/calib.c +@@ -69,15 +69,21 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct= ath_hw *ah, + int16_t *nfarray) + { + struct ath_common *common =3D ath9k_hw_common(ah); ++ struct ieee80211_conf *conf =3D &common->hw->conf; + struct ath_nf_limits *limit; + struct ath9k_nfcal_hist *h; + bool high_nf_mid =3D false; ++ u8 chainmask =3D (ah->rxchainmask << 3) | ah->rxchainmask; + int i; +=20 + h =3D cal->nfCalHist; + limit =3D ath9k_hw_get_nf_limits(ah, ah->curchan); +=20 + for (i =3D 0; i < NUM_NF_READINGS; i++) { ++ if (!(chainmask & (1 << i)) || ++ ((i >=3D AR5416_MAX_CHAINS) && !conf_is_ht40(conf))) ++ continue; ++ + h[i].nfCalBuffer[h[i].currIndex] =3D nfarray[i]; +=20 + if (++h[i].currIndex >=3D ATH9K_NF_CAL_HIST_MAX) +@@ -225,6 +231,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k= _channel *chan) + int32_t val; + u8 chainmask =3D (ah->rxchainmask << 3) | ah->rxchainmask; + struct ath_common *common =3D ath9k_hw_common(ah); ++ struct ieee80211_conf *conf =3D &common->hw->conf; + s16 default_nf =3D ath9k_hw_get_default_nf(ah, chan); +=20 + if (ah->caldata) +@@ -234,6 +241,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k= _channel *chan) + if (chainmask & (1 << i)) { + s16 nfval; +=20 ++ if ((i >=3D AR5416_MAX_CHAINS) && !conf_is_ht40(conf)) ++ continue; ++ + if (h) + nfval =3D h[i].privNF; + else +@@ -293,6 +303,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k= _channel *chan) + ENABLE_REGWRITE_BUFFER(ah); + for (i =3D 0; i < NUM_NF_READINGS; i++) { + if (chainmask & (1 << i)) { ++ if ((i >=3D AR5416_MAX_CHAINS) && !conf_is_ht40(conf)) ++ continue; ++ + val =3D REG_READ(ah, ah->nf_regs[i]); + val &=3D 0xFFFFFE00; + val |=3D (((u32) (-50) << 1) & 0x1ff); +diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wirel= ess/iwlwifi/iwl-core.c +index bafbe57..1755729 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-core.c ++++ b/drivers/net/wireless/iwlwifi/iwl-core.c +@@ -1783,6 +1783,15 @@ int iwl_mac_change_interface(struct ieee80211_hw = *hw, struct ieee80211_vif *vif, +=20 + mutex_lock(&priv->mutex); +=20 ++ if (!ctx->vif || !iwl_is_ready_rf(priv)) { ++ /* ++ * Huh? But wait ... this can maybe happen when ++ * we're in the middle of a firmware restart! ++ */ ++ err =3D -EBUSY; ++ goto out; ++ } ++ + interface_modes =3D ctx->interface_modes | ctx->exclusive_interface_mo= des; +=20 + if (!(interface_modes & BIT(newtype))) { +@@ -1810,6 +1819,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *= hw, struct ieee80211_vif *vif, + /* success */ + iwl_teardown_interface(priv, vif, true); + vif->type =3D newtype; ++ vif->p2p =3D newp2p; + err =3D iwl_setup_interface(priv, ctx); + WARN_ON(err); + /* +diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wirele= ss/iwlwifi/iwl-dev.h +index 68b953f..c0a4cfb 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-dev.h ++++ b/drivers/net/wireless/iwlwifi/iwl-dev.h +@@ -1658,21 +1658,24 @@ iwl_rxon_ctx_from_vif(struct ieee80211_vif *vif) + ctx < &priv->contexts[NUM_IWL_RXON_CTX]; ctx++) \ + if (priv->valid_contexts & BIT(ctx->ctxid)) +=20 +-static inline int iwl_is_associated(struct iwl_priv *priv, +- enum iwl_rxon_context_id ctxid) ++static inline int iwl_is_associated_ctx(struct iwl_rxon_context *ctx) + { +- return (priv->contexts[ctxid].active.filter_flags & +- RXON_FILTER_ASSOC_MSK) ? 1 : 0; ++ return (ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0; + } +=20 +-static inline int iwl_is_any_associated(struct iwl_priv *priv) ++static inline int iwl_is_associated(struct iwl_priv *priv, ++ enum iwl_rxon_context_id ctxid) + { +- return iwl_is_associated(priv, IWL_RXON_CTX_BSS); ++ return iwl_is_associated_ctx(&priv->contexts[ctxid]); + } +=20 +-static inline int iwl_is_associated_ctx(struct iwl_rxon_context *ctx) ++static inline int iwl_is_any_associated(struct iwl_priv *priv) + { +- return (ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0; ++ struct iwl_rxon_context *ctx; ++ for_each_context(priv, ctx) ++ if (iwl_is_associated_ctx(ctx)) ++ return true; ++ return false; + } +=20 + static inline int is_channel_valid(const struct iwl_channel_info *ch_in= fo) +diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p5= 4/p54usb.c +index e183587..a8f3bc7 100644 +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -82,6 +82,7 @@ static struct usb_device_id p54u_table[] __devinitdata= =3D { + {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ + {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ + {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 vers= ion 2 */ ++ {USB_DEVICE(0x083a, 0xc501)}, /* Zoom Wireless-G 4410 */ + {USB_DEVICE(0x083a, 0xf503)}, /* Accton FD7050E ver 1010ec */ + {USB_DEVICE(0x0846, 0x4240)}, /* Netgear WG111 (v2) */ + {USB_DEVICE(0x0915, 0x2000)}, /* Cohiba Proto board */ +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 5129ed6..4b2bbe8 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -2784,6 +2784,16 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x34= 2e, vtd_mask_spec_errors); + DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_erro= rs); + #endif +=20 ++static void __devinit fixup_ti816x_class(struct pci_dev* dev) ++{ ++ /* TI 816x devices do not have class code set when in PCIe boot mode *= / ++ if (dev->class =3D=3D PCI_CLASS_NOT_DEFINED) { ++ dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n"); ++ dev->class =3D PCI_CLASS_MULTIMEDIA_VIDEO; ++ } ++} ++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TI, 0xb800, fixup_ti816x_class); ++ + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, + struct pci_fixup *end) + { +diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_h= wi.c +index f0b8951..a8a2b6b 100644 +--- a/drivers/scsi/bnx2i/bnx2i_hwi.c ++++ b/drivers/scsi/bnx2i/bnx2i_hwi.c +@@ -1274,6 +1274,7 @@ int bnx2i_send_fw_iscsi_init_msg(struct bnx2i_hba = *hba) + iscsi_init.dummy_buffer_addr_hi =3D + (u32) ((u64) hba->dummy_buf_dma >> 32); +=20 ++ hba->num_ccell =3D hba->max_sqes >> 1; + hba->ctx_ccell_tasks =3D + ((hba->num_ccell & 0xFFFF) | (hba->max_sqes << 16)); + iscsi_init.num_ccells_per_conn =3D hba->num_ccell; +diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_= init.c +index 1d24a28..6adbdc3 100644 +--- a/drivers/scsi/bnx2i/bnx2i_init.c ++++ b/drivers/scsi/bnx2i/bnx2i_init.c +@@ -244,7 +244,7 @@ void bnx2i_stop(void *handle) + wait_event_interruptible_timeout(hba->eh_wait, + (list_empty(&hba->ep_ofld_list) && + list_empty(&hba->ep_destroy_list)), +- 10 * HZ); ++ 2 * HZ); + /* Wait for all endpoints to be torn down, Chip will be reset once + * control returns to network driver. So it is required to cleanup an= d + * release all connection resources before returning from this routine= . +diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i= _iscsi.c +index 1809f9c..51a970f 100644 +--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c ++++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c +@@ -858,7 +858,7 @@ struct bnx2i_hba *bnx2i_alloc_hba(struct cnic_dev *c= nic) + mutex_init(&hba->net_dev_lock); + init_waitqueue_head(&hba->eh_wait); + if (test_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type)) { +- hba->hba_shutdown_tmo =3D 20 * HZ; ++ hba->hba_shutdown_tmo =3D 30 * HZ; + hba->conn_teardown_tmo =3D 20 * HZ; + hba->conn_ctx_destroy_tmo =3D 6 * HZ; + } else { /* 5706/5708/5709 */ +@@ -1208,6 +1208,9 @@ static int bnx2i_task_xmit(struct iscsi_task *task= ) + struct bnx2i_cmd *cmd =3D task->dd_data; + struct iscsi_cmd *hdr =3D (struct iscsi_cmd *) task->hdr; +=20 ++ if (bnx2i_conn->ep->num_active_cmds + 1 > hba->max_sqes) ++ return -ENOMEM; ++ + /* + * If there is no scsi_cmnd this must be a mgmt task + */ +diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas= /mpt2sas_scsih.c +index d2064a0..9aab26a 100644 +--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c ++++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c +@@ -113,6 +113,7 @@ struct sense_info { + }; +=20 +=20 ++#define MPT2SAS_TURN_ON_FAULT_LED (0xFFFC) + #define MPT2SAS_RESCAN_AFTER_HOST_RESET (0xFFFF) +=20 + /** +@@ -121,6 +122,7 @@ struct sense_info { + * @work: work object (ioc->fault_reset_work_q) + * @cancel_pending_work: flag set during reset handling + * @ioc: per adapter object ++ * @device_handle: device handle + * @VF_ID: virtual function id + * @VP_ID: virtual port id + * @ignore: flag meaning this event has been marked to ignore +@@ -134,6 +136,7 @@ struct fw_event_work { + u8 cancel_pending_work; + struct delayed_work delayed_work; + struct MPT2SAS_ADAPTER *ioc; ++ u16 device_handle; + u8 VF_ID; + u8 VP_ID; + u8 ignore; +@@ -3708,17 +3711,75 @@ _scsih_scsi_ioc_info(struct MPT2SAS_ADAPTER *ioc= , struct scsi_cmnd *scmd, + #endif +=20 + /** +- * _scsih_smart_predicted_fault - illuminate Fault LED ++ * _scsih_turn_on_fault_led - illuminate Fault LED + * @ioc: per adapter object + * @handle: device handle ++ * Context: process + * + * Return nothing. + */ + static void +-_scsih_smart_predicted_fault(struct MPT2SAS_ADAPTER *ioc, u16 handle) ++_scsih_turn_on_fault_led(struct MPT2SAS_ADAPTER *ioc, u16 handle) + { + Mpi2SepReply_t mpi_reply; + Mpi2SepRequest_t mpi_request; ++ ++ memset(&mpi_request, 0, sizeof(Mpi2SepRequest_t)); ++ mpi_request.Function =3D MPI2_FUNCTION_SCSI_ENCLOSURE_PROCESSOR; ++ mpi_request.Action =3D MPI2_SEP_REQ_ACTION_WRITE_STATUS; ++ mpi_request.SlotStatus =3D ++ cpu_to_le32(MPI2_SEP_REQ_SLOTSTATUS_PREDICTED_FAULT); ++ mpi_request.DevHandle =3D cpu_to_le16(handle); ++ mpi_request.Flags =3D MPI2_SEP_REQ_FLAGS_DEVHANDLE_ADDRESS; ++ if ((mpt2sas_base_scsi_enclosure_processor(ioc, &mpi_reply, ++ &mpi_request)) !=3D 0) { ++ printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n", ioc->name, ++ __FILE__, __LINE__, __func__); ++ return; ++ } ++ ++ if (mpi_reply.IOCStatus || mpi_reply.IOCLogInfo) { ++ dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "enclosure_processor: " ++ "ioc_status (0x%04x), loginfo(0x%08x)\n", ioc->name, ++ le16_to_cpu(mpi_reply.IOCStatus), ++ le32_to_cpu(mpi_reply.IOCLogInfo))); ++ return; ++ } ++} ++ ++/** ++ * _scsih_send_event_to_turn_on_fault_led - fire delayed event ++ * @ioc: per adapter object ++ * @handle: device handle ++ * Context: interrupt. ++ * ++ * Return nothing. ++ */ ++static void ++_scsih_send_event_to_turn_on_fault_led(struct MPT2SAS_ADAPTER *ioc, u16= handle) ++{ ++ struct fw_event_work *fw_event; ++ ++ fw_event =3D kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC); ++ if (!fw_event) ++ return; ++ fw_event->event =3D MPT2SAS_TURN_ON_FAULT_LED; ++ fw_event->device_handle =3D handle; ++ fw_event->ioc =3D ioc; ++ _scsih_fw_event_add(ioc, fw_event); ++} ++ ++/** ++ * _scsih_smart_predicted_fault - process smart errors ++ * @ioc: per adapter object ++ * @handle: device handle ++ * Context: interrupt. ++ * ++ * Return nothing. ++ */ ++static void ++_scsih_smart_predicted_fault(struct MPT2SAS_ADAPTER *ioc, u16 handle) ++{ + struct scsi_target *starget; + struct MPT2SAS_TARGET *sas_target_priv_data; + Mpi2EventNotificationReply_t *event_reply; +@@ -3745,30 +3806,8 @@ _scsih_smart_predicted_fault(struct MPT2SAS_ADAPT= ER *ioc, u16 handle) + starget_printk(KERN_WARNING, starget, "predicted fault\n"); + spin_unlock_irqrestore(&ioc->sas_device_lock, flags); +=20 +- if (ioc->pdev->subsystem_vendor =3D=3D PCI_VENDOR_ID_IBM) { +- memset(&mpi_request, 0, sizeof(Mpi2SepRequest_t)); +- mpi_request.Function =3D MPI2_FUNCTION_SCSI_ENCLOSURE_PROCESSOR; +- mpi_request.Action =3D MPI2_SEP_REQ_ACTION_WRITE_STATUS; +- mpi_request.SlotStatus =3D +- cpu_to_le32(MPI2_SEP_REQ_SLOTSTATUS_PREDICTED_FAULT); +- mpi_request.DevHandle =3D cpu_to_le16(handle); +- mpi_request.Flags =3D MPI2_SEP_REQ_FLAGS_DEVHANDLE_ADDRESS; +- if ((mpt2sas_base_scsi_enclosure_processor(ioc, &mpi_reply, +- &mpi_request)) !=3D 0) { +- printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n", +- ioc->name, __FILE__, __LINE__, __func__); +- return; +- } +- +- if (mpi_reply.IOCStatus || mpi_reply.IOCLogInfo) { +- dewtprintk(ioc, printk(MPT2SAS_INFO_FMT +- "enclosure_processor: ioc_status (0x%04x), " +- "loginfo(0x%08x)\n", ioc->name, +- le16_to_cpu(mpi_reply.IOCStatus), +- le32_to_cpu(mpi_reply.IOCLogInfo))); +- return; +- } +- } ++ if (ioc->pdev->subsystem_vendor =3D=3D PCI_VENDOR_ID_IBM) ++ _scsih_send_event_to_turn_on_fault_led(ioc, handle); +=20 + /* insert into event log */ + sz =3D offsetof(Mpi2EventNotificationReply_t, EventData) + +@@ -6330,6 +6369,9 @@ _firmware_event_work(struct work_struct *work) + } +=20 + switch (fw_event->event) { ++ case MPT2SAS_TURN_ON_FAULT_LED: ++ _scsih_turn_on_fault_led(ioc, fw_event->device_handle); ++ break; + case MPI2_EVENT_SAS_TOPOLOGY_CHANGE_LIST: + _scsih_sas_topology_change_event(ioc, fw_event); + break; +diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_= attr.c +index d3e58d7..c52a0a2 100644 +--- a/drivers/scsi/qla2xxx/qla_attr.c ++++ b/drivers/scsi/qla2xxx/qla_attr.c +@@ -1877,14 +1877,15 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) +=20 + scsi_remove_host(vha->host); +=20 ++ /* Allow timer to run to drain queued items, when removing vp */ ++ qla24xx_deallocate_vp_id(vha); ++ + if (vha->timer_active) { + qla2x00_vp_stop_timer(vha); + DEBUG15(printk(KERN_INFO "scsi(%ld): timer for the vport[%d]" + " =3D %p has stopped\n", vha->host_no, vha->vp_idx, vha)); + } +=20 +- qla24xx_deallocate_vp_id(vha); +- + /* No pending activities shall be there on the vha now */ + DEBUG(msleep(random32()%10)); /* Just to see if something falls on + * the net we have placed below */ +diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw= .h +index f5ba09c..5223c1d 100644 +--- a/drivers/scsi/qla2xxx/qla_fw.h ++++ b/drivers/scsi/qla2xxx/qla_fw.h +@@ -416,8 +416,7 @@ struct cmd_type_6 { + uint8_t vp_index; +=20 + uint32_t fcp_data_dseg_address[2]; /* Data segment address. */ +- uint16_t fcp_data_dseg_len; /* Data segment length. */ +- uint16_t reserved_1; /* MUST be set to 0. */ ++ uint32_t fcp_data_dseg_len; /* Data segment length. */ + }; +=20 + #define COMMAND_TYPE_7 0x18 /* Command Type 7 entry */ +diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx= .c +index 455fe13..eb31213 100644 +--- a/drivers/scsi/qla2xxx/qla_nx.c ++++ b/drivers/scsi/qla2xxx/qla_nx.c +@@ -2548,11 +2548,11 @@ qla2xx_build_scsi_type_6_iocbs(srb_t *sp, struct= cmd_type_6 *cmd_pkt, + dsd_seg =3D (uint32_t *)&cmd_pkt->fcp_data_dseg_address; + *dsd_seg++ =3D cpu_to_le32(LSD(dsd_ptr->dsd_list_dma)); + *dsd_seg++ =3D cpu_to_le32(MSD(dsd_ptr->dsd_list_dma)); +- cmd_pkt->fcp_data_dseg_len =3D dsd_list_len; ++ *dsd_seg++ =3D cpu_to_le32(dsd_list_len); + } else { + *cur_dsd++ =3D cpu_to_le32(LSD(dsd_ptr->dsd_list_dma)); + *cur_dsd++ =3D cpu_to_le32(MSD(dsd_ptr->dsd_list_dma)); +- *cur_dsd++ =3D dsd_list_len; ++ *cur_dsd++ =3D cpu_to_le32(dsd_list_len); + } + cur_dsd =3D (uint32_t *)next_dsd; + while (avail_dsds) { +diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os= .c +index aa77475..4c3f5e8 100644 +--- a/drivers/scsi/qla2xxx/qla_os.c ++++ b/drivers/scsi/qla2xxx/qla_os.c +@@ -2360,21 +2360,26 @@ qla2x00_remove_one(struct pci_dev *pdev) + base_vha =3D pci_get_drvdata(pdev); + ha =3D base_vha->hw; +=20 +- spin_lock_irqsave(&ha->vport_slock, flags); +- list_for_each_entry(vha, &ha->vp_list, list) { +- atomic_inc(&vha->vref_count); ++ mutex_lock(&ha->vport_lock); ++ while (ha->cur_vport_count) { ++ struct Scsi_Host *scsi_host; +=20 +- if (vha->fc_vport) { +- spin_unlock_irqrestore(&ha->vport_slock, flags); ++ spin_lock_irqsave(&ha->vport_slock, flags); +=20 +- fc_vport_terminate(vha->fc_vport); ++ BUG_ON(base_vha->list.next =3D=3D &ha->vp_list); ++ /* This assumes first entry in ha->vp_list is always base vha */ ++ vha =3D list_first_entry(&base_vha->list, scsi_qla_host_t, list); ++ scsi_host =3D scsi_host_get(vha->host); +=20 +- spin_lock_irqsave(&ha->vport_slock, flags); +- } ++ spin_unlock_irqrestore(&ha->vport_slock, flags); ++ mutex_unlock(&ha->vport_lock); ++ ++ fc_vport_terminate(vha->fc_vport); ++ scsi_host_put(vha->host); +=20 +- atomic_dec(&vha->vref_count); ++ mutex_lock(&ha->vport_lock); + } +- spin_unlock_irqrestore(&ha->vport_slock, flags); ++ mutex_unlock(&ha->vport_lock); +=20 + set_bit(UNLOADING, &base_vha->dpc_flags); +=20 +@@ -3604,7 +3609,8 @@ qla2x00_timer(scsi_qla_host_t *vha) + if (!pci_channel_offline(ha->pdev)) + pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w); +=20 +- if (IS_QLA82XX(ha)) { ++ /* Make sure qla82xx_watchdog is run only for physical port */ ++ if (!vha->vp_idx && IS_QLA82XX(ha)) { + if (test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) + start_dpc++; + qla82xx_watchdog(vha); +@@ -3675,8 +3681,8 @@ qla2x00_timer(scsi_qla_host_t *vha) + atomic_read(&vha->loop_down_timer))); + } +=20 +- /* Check if beacon LED needs to be blinked */ +- if (ha->beacon_blink_led =3D=3D 1) { ++ /* Check if beacon LED needs to be blinked for physical host only */ ++ if (!vha->vp_idx && (ha->beacon_blink_led =3D=3D 1)) { + set_bit(BEACON_BLINK_NEEDED, &vha->dpc_flags); + start_dpc++; + } +diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c +index 95019c7..4778e27 100644 +--- a/drivers/scsi/sr.c ++++ b/drivers/scsi/sr.c +@@ -636,7 +636,7 @@ static int sr_probe(struct device *dev) + disk->first_minor =3D minor; + sprintf(disk->disk_name, "sr%d", minor); + disk->fops =3D &sr_bdops; +- disk->flags =3D GENHD_FL_CD; ++ disk->flags =3D GENHD_FL_CD | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; + disk->events =3D DISK_EVENT_MEDIA_CHANGE | DISK_EVENT_EJECT_REQUEST; +=20 + blk_queue_rq_timeout(sdev->request_queue, SR_TIMEOUT); +diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c +index 9f4b58b..7e22b73 100644 +--- a/drivers/scsi/ultrastor.c ++++ b/drivers/scsi/ultrastor.c +@@ -307,7 +307,7 @@ static inline int find_and_clear_bit_16(unsigned lon= g *field) + "0: bsfw %1,%w0\n\t" + "btr %0,%1\n\t" + "jnc 0b" +- : "=3D&r" (rv), "=3Dm" (*field) :); ++ : "=3D&r" (rv), "+m" (*field) :); +=20 + return rv; + } +diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c +index 6172335..82dd6fb 100644 +--- a/drivers/sh/clk/cpg.c ++++ b/drivers/sh/clk/cpg.c +@@ -105,7 +105,7 @@ static int sh_clk_div6_set_parent(struct clk *clk, s= truct clk *parent) +=20 + /* Rebuild the frequency table */ + clk_rate_table_build(clk, clk->freq_table, table->nr_divisors, +- table, &clk->arch_flags); ++ table, NULL); +=20 + return 0; + } +diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/st= aging/brcm80211/brcmsmac/wlc_ampdu.c +index f008659..f7bff4e 100644 +--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c ++++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +@@ -1123,21 +1123,12 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info = *ampdu, struct scb *scb, + ini->txretry[index] =3D 0; +=20 + /* ampdu_ack_len: number of acked aggregated frames */ +- /* ampdu_ack_map: block ack bit map for the aggregation */ + /* ampdu_len: number of aggregated frames */ + rate_status(wlc, tx_info, txs, mcs); + tx_info->flags |=3D IEEE80211_TX_STAT_ACK; + tx_info->flags |=3D IEEE80211_TX_STAT_AMPDU; +- +- /* XXX TODO: Make these accurate. */ + tx_info->status.ampdu_ack_len =3D +- (txs-> +- status & TX_STATUS_FRM_RTX_MASK) >> +- TX_STATUS_FRM_RTX_SHIFT; +- tx_info->status.ampdu_len =3D +- (txs-> +- status & TX_STATUS_FRM_RTX_MASK) >> +- TX_STATUS_FRM_RTX_SHIFT; ++ tx_info->status.ampdu_len =3D 1; +=20 + skb_pull(p, D11_PHY_HDR_LEN); + skb_pull(p, D11_TXH_LEN); +@@ -1163,6 +1154,8 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *a= mpdu, struct scb *scb, + /* Retry timeout */ + ini->tx_in_transit--; + ieee80211_tx_info_clear_status(tx_info); ++ tx_info->status.ampdu_ack_len =3D 0; ++ tx_info->status.ampdu_len =3D 1; + tx_info->flags |=3D + IEEE80211_TX_STAT_AMPDU_NO_BACK; + skb_pull(p, D11_PHY_HDR_LEN); +diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/stagi= ng/rtl8712/rtl871x_ioctl_set.c +index 8b1451d..8486eb1 100644 +--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c ++++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c +@@ -68,7 +68,10 @@ static u8 do_join(struct _adapter *padapter) + pmlmepriv->fw_state |=3D _FW_UNDER_LINKING; + pmlmepriv->pscanned =3D plist; + pmlmepriv->to_join =3D true; +- if (_queue_empty(queue) =3D=3D true) { ++ ++ /* adhoc mode will start with an empty queue, but skip checking */ ++ if (!check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) && ++ _queue_empty(queue)) { + if (pmlmepriv->fw_state & _FW_UNDER_LINKING) + pmlmepriv->fw_state ^=3D _FW_UNDER_LINKING; + /* when set_ssid/set_bssid for do_join(), but scanning queue +diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbi= p/usbip_common.c +index 7b1fe45..37b650b 100644 +--- a/drivers/staging/usbip/usbip_common.c ++++ b/drivers/staging/usbip/usbip_common.c +@@ -604,7 +604,7 @@ static void correct_endian_ret_submit(struct usbip_h= eader_ret_submit *pdu, + be32_to_cpus(&pdu->status); + be32_to_cpus(&pdu->actual_length); + be32_to_cpus(&pdu->start_frame); +- cpu_to_be32s(&pdu->number_of_packets); ++ be32_to_cpus(&pdu->number_of_packets); + be32_to_cpus(&pdu->error_count); + } + } +diff --git a/drivers/target/target_core_device.c b/drivers/target/target= _core_device.c +index d25e208..fc10ed4 100644 +--- a/drivers/target/target_core_device.c ++++ b/drivers/target/target_core_device.c +@@ -150,13 +150,13 @@ out: +=20 + { + struct se_device *dev =3D se_lun->lun_se_dev; +- spin_lock(&dev->stats_lock); ++ spin_lock_irq(&dev->stats_lock); + dev->num_cmds++; + if (se_cmd->data_direction =3D=3D DMA_TO_DEVICE) + dev->write_bytes +=3D se_cmd->data_length; + else if (se_cmd->data_direction =3D=3D DMA_FROM_DEVICE) + dev->read_bytes +=3D se_cmd->data_length; +- spin_unlock(&dev->stats_lock); ++ spin_unlock_irq(&dev->stats_lock); + } +=20 + /* +diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_co= re_tmr.c +index 4a10983..59b8b9c 100644 +--- a/drivers/target/target_core_tmr.c ++++ b/drivers/target/target_core_tmr.c +@@ -55,7 +55,8 @@ struct se_tmr_req *core_tmr_alloc_req( + { + struct se_tmr_req *tmr; +=20 +- tmr =3D kmem_cache_zalloc(se_tmr_req_cache, GFP_KERNEL); ++ tmr =3D kmem_cache_zalloc(se_tmr_req_cache, (in_interrupt()) ? ++ GFP_ATOMIC : GFP_KERNEL); + if (!(tmr)) { + printk(KERN_ERR "Unable to allocate struct se_tmr_req\n"); + return ERR_PTR(-ENOMEM); +@@ -398,9 +399,9 @@ int core_tmr_lun_reset( + printk(KERN_INFO "LUN_RESET: SCSI-2 Released reservation\n"); + } +=20 +- spin_lock(&dev->stats_lock); ++ spin_lock_irq(&dev->stats_lock); + dev->num_resets++; +- spin_unlock(&dev->stats_lock); ++ spin_unlock_irq(&dev->stats_lock); +=20 + DEBUG_LR("LUN_RESET: %s for [%s] Complete\n", + (preempt_and_abort_list) ? "Preempt" : "TMR", +diff --git a/drivers/target/target_core_transport.c b/drivers/target/tar= get_core_transport.c +index 9583b23..beaf8fa 100644 +--- a/drivers/target/target_core_transport.c ++++ b/drivers/target/target_core_transport.c +@@ -762,7 +762,6 @@ static void transport_lun_remove_cmd(struct se_cmd *= cmd) + transport_all_task_dev_remove_state(cmd); + spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); +=20 +- transport_free_dev_tasks(cmd); +=20 + check_lun: + spin_lock_irqsave(&lun->lun_cmd_lock, flags); +@@ -1195,6 +1194,7 @@ transport_get_task_from_execute_queue(struct se_de= vice *dev) + break; +=20 + list_del(&task->t_execute_list); ++ atomic_set(&task->task_execute_queue, 0); + atomic_dec(&dev->execute_tasks); +=20 + return task; +@@ -1210,8 +1210,14 @@ void transport_remove_task_from_execute_queue( + { + unsigned long flags; +=20 ++ if (atomic_read(&task->task_execute_queue) =3D=3D 0) { ++ dump_stack(); ++ return; ++ } ++ + spin_lock_irqsave(&dev->execute_task_lock, flags); + list_del(&task->t_execute_list); ++ atomic_set(&task->task_execute_queue, 0); + atomic_dec(&dev->execute_tasks); + spin_unlock_irqrestore(&dev->execute_task_lock, flags); + } +@@ -2058,6 +2064,13 @@ int transport_generic_handle_tmr( + } + EXPORT_SYMBOL(transport_generic_handle_tmr); +=20 ++void transport_generic_free_cmd_intr( ++ struct se_cmd *cmd) ++{ ++ transport_add_cmd_to_queue(cmd, TRANSPORT_FREE_CMD_INTR); ++} ++EXPORT_SYMBOL(transport_generic_free_cmd_intr); ++ + static int transport_stop_tasks_for_cmd(struct se_cmd *cmd) + { + struct se_task *task, *task_tmp; +@@ -4776,18 +4789,20 @@ void transport_do_task_sg_chain(struct se_cmd *c= md) + sg_end_cur->page_link &=3D ~0x02; +=20 + sg_chain(sg_head, task_sg_num, sg_head_cur); +- sg_count +=3D (task->task_sg_num + 1); +- } else + sg_count +=3D task->task_sg_num; ++ task_sg_num =3D (task->task_sg_num + 1); ++ } else { ++ sg_chain(sg_head, task_sg_num, sg_head_cur); ++ sg_count +=3D task->task_sg_num; ++ task_sg_num =3D task->task_sg_num; ++ } +=20 + sg_head =3D sg_head_cur; + sg_link =3D sg_link_cur; +- task_sg_num =3D task->task_sg_num; + continue; + } + sg_head =3D sg_first =3D &task->task_sg[0]; + sg_link =3D &task->task_sg[task->task_sg_num]; +- task_sg_num =3D task->task_sg_num; + /* + * Check for single task.. + */ +@@ -4798,9 +4813,12 @@ void transport_do_task_sg_chain(struct se_cmd *cm= d) + */ + sg_end =3D &task->task_sg[task->task_sg_num - 1]; + sg_end->page_link &=3D ~0x02; +- sg_count +=3D (task->task_sg_num + 1); +- } else + sg_count +=3D task->task_sg_num; ++ task_sg_num =3D (task->task_sg_num + 1); ++ } else { ++ sg_count +=3D task->task_sg_num; ++ task_sg_num =3D task->task_sg_num; ++ } + } + /* + * Setup the starting pointer and total t_tasks_sg_linked_no including +@@ -4809,21 +4827,20 @@ void transport_do_task_sg_chain(struct se_cmd *c= md) + T_TASK(cmd)->t_tasks_sg_chained =3D sg_first; + T_TASK(cmd)->t_tasks_sg_chained_no =3D sg_count; +=20 +- DEBUG_CMD_M("Setup T_TASK(cmd)->t_tasks_sg_chained: %p and" +- " t_tasks_sg_chained_no: %u\n", T_TASK(cmd)->t_tasks_sg_chained, ++ DEBUG_CMD_M("Setup cmd: %p T_TASK(cmd)->t_tasks_sg_chained: %p and" ++ " t_tasks_sg_chained_no: %u\n", cmd, T_TASK(cmd)->t_tasks_sg_chained, + T_TASK(cmd)->t_tasks_sg_chained_no); +=20 + for_each_sg(T_TASK(cmd)->t_tasks_sg_chained, sg, + T_TASK(cmd)->t_tasks_sg_chained_no, i) { +=20 +- DEBUG_CMD_M("SG: %p page: %p length: %d offset: %d\n", +- sg, sg_page(sg), sg->length, sg->offset); ++ DEBUG_CMD_M("SG[%d]: %p page: %p length: %d offset: %d, magic: 0x%08x= \n", ++ i, sg, sg_page(sg), sg->length, sg->offset, sg->sg_magic); + if (sg_is_chain(sg)) + DEBUG_CMD_M("SG: %p sg_is_chain=3D1\n", sg); + if (sg_is_last(sg)) + DEBUG_CMD_M("SG: %p sg_is_last=3D1\n", sg); + } +- + } + EXPORT_SYMBOL(transport_do_task_sg_chain); +=20 +@@ -5297,6 +5314,8 @@ void transport_generic_free_cmd( + if (wait_for_tasks && cmd->transport_wait_for_tasks) + cmd->transport_wait_for_tasks(cmd, 0, 0); +=20 ++ transport_free_dev_tasks(cmd); ++ + transport_generic_remove(cmd, release_to_pool, + session_reinstatement); + } +@@ -6132,6 +6151,9 @@ get_cmd: + case TRANSPORT_REMOVE: + transport_generic_remove(cmd, 1, 0); + break; ++ case TRANSPORT_FREE_CMD_INTR: ++ transport_generic_free_cmd(cmd, 0, 1, 0); ++ break; + case TRANSPORT_PROCESS_TMR: + transport_generic_do_tmr(cmd); + break; +diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c +index e057e53..caa2535 100644 +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -946,7 +946,7 @@ static int acm_probe(struct usb_interface *intf, + u8 ac_management_function =3D 0; + u8 call_management_function =3D 0; + int call_interface_num =3D -1; +- int data_interface_num; ++ int data_interface_num =3D -1; + unsigned long quirks; + int num_rx_buf; + int i; +@@ -1030,7 +1030,11 @@ next_desc: + if (!union_header) { + if (call_interface_num > 0) { + dev_dbg(&intf->dev, "No union descriptor, using call management desc= riptor\n"); +- data_interface =3D usb_ifnum_to_if(usb_dev, (data_interface_num =3D = call_interface_num)); ++ /* quirks for Droids MuIn LCD */ ++ if (quirks & NO_DATA_INTERFACE) ++ data_interface =3D usb_ifnum_to_if(usb_dev, 0); ++ else ++ data_interface =3D usb_ifnum_to_if(usb_dev, (data_interface_num =3D= call_interface_num)); + control_interface =3D intf; + } else { + if (intf->cur_altsetting->desc.bNumEndpoints !=3D 3) { +@@ -1622,6 +1626,11 @@ static const struct usb_device_id acm_ids[] =3D { + .driver_info =3D NOT_A_MODEM, + }, +=20 ++ /* Support for Droids MuIn LCD */ ++ { USB_DEVICE(0x04d8, 0x000b), ++ .driver_info =3D NO_DATA_INTERFACE, ++ }, ++ + /* control interfaces without any protocol set */ + { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, + USB_CDC_PROTO_NONE) }, +diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h +index b4ea54d..683104a 100644 +--- a/drivers/usb/class/cdc-acm.h ++++ b/drivers/usb/class/cdc-acm.h +@@ -137,3 +137,4 @@ struct acm { + #define SINGLE_RX_URB 2 + #define NO_CAP_LINE 4 + #define NOT_A_MODEM 8 ++#define NO_DATA_INTERFACE 16 +diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c +index 77a7fae..cddc533 100644 +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c +@@ -986,7 +986,7 @@ static int register_root_hub(struct usb_hcd *hcd) + spin_unlock_irq (&hcd_root_hub_lock); +=20 + /* Did the HC die before the root hub was registered? */ +- if (HCD_DEAD(hcd) || hcd->state =3D=3D HC_STATE_HALT) ++ if (HCD_DEAD(hcd)) + usb_hc_died (hcd); /* This time clean up */ + } +=20 +@@ -2128,9 +2128,6 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd) + set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); + if (hcd->shared_hcd) + set_bit(HCD_FLAG_SAW_IRQ, &hcd->shared_hcd->flags); +- +- if (unlikely(hcd->state =3D=3D HC_STATE_HALT)) +- usb_hc_died(hcd); + rc =3D IRQ_HANDLED; + } +=20 +diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc= .c +index 9b7cdb1..41dc093 100644 +--- a/drivers/usb/gadget/at91_udc.c ++++ b/drivers/usb/gadget/at91_udc.c +@@ -1767,7 +1767,7 @@ static int __init at91udc_probe(struct platform_de= vice *pdev) + } +=20 + /* newer chips have more FIFO memory than rm9200 */ +- if (cpu_is_at91sam9260()) { ++ if (cpu_is_at91sam9260() || cpu_is_at91sam9g20()) { + udc->ep[0].maxpacket =3D 64; + udc->ep[3].maxpacket =3D 64; + udc->ep[4].maxpacket =3D 512; +diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c +index 882484a..fa12ec8 100644 +--- a/drivers/usb/gadget/f_rndis.c ++++ b/drivers/usb/gadget/f_rndis.c +@@ -420,8 +420,7 @@ rndis_setup(struct usb_function *f, const struct usb= _ctrlrequest *ctrl) + */ + case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) + | USB_CDC_SEND_ENCAPSULATED_COMMAND: +- if (w_length > req->length || w_value +- || w_index !=3D rndis->ctrl_id) ++ if (w_value || w_index !=3D rndis->ctrl_id) + goto invalid; + /* read the request; process it later */ + value =3D w_length; +diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c +index 78561d1..c606b02 100644 +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -777,8 +777,9 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd) + goto dead; + } +=20 ++ /* Shared IRQ? */ + masked_status =3D status & INTR_MASK; +- if (!masked_status) { /* irq sharing? */ ++ if (!masked_status || unlikely(hcd->state =3D=3D HC_STATE_HALT)) { + spin_unlock(&ehci->lock); + return IRQ_NONE; + } +@@ -873,6 +874,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd) + dead: + ehci_reset(ehci); + ehci_writel(ehci, 0, &ehci->regs->configured_flag); ++ usb_hc_died(hcd); + /* generic layer kills/unlinks all urbs, then + * uses ehci_stop to clean up the rest + */ +diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched= .c +index 1543c83..d12426f 100644 +--- a/drivers/usb/host/ehci-sched.c ++++ b/drivers/usb/host/ehci-sched.c +@@ -471,8 +471,10 @@ static int enable_periodic (struct ehci_hcd *ehci) + */ + status =3D handshake_on_error_set_halt(ehci, &ehci->regs->status, + STS_PSS, 0, 9 * 125); +- if (status) ++ if (status) { ++ usb_hc_died(ehci_to_hcd(ehci)); + return status; ++ } +=20 + cmd =3D ehci_readl(ehci, &ehci->regs->command) | CMD_PSE; + ehci_writel(ehci, cmd, &ehci->regs->command); +@@ -510,8 +512,10 @@ static int disable_periodic (struct ehci_hcd *ehci) + */ + status =3D handshake_on_error_set_halt(ehci, &ehci->regs->status, + STS_PSS, STS_PSS, 9 * 125); +- if (status) ++ if (status) { ++ usb_hc_died(ehci_to_hcd(ehci)); + return status; ++ } +=20 + cmd =3D ehci_readl(ehci, &ehci->regs->command) & ~CMD_PSE; + ehci_writel(ehci, cmd, &ehci->regs->command); +diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-h= cd.c +index c0e22f2..baae4cc 100644 +--- a/drivers/usb/host/isp116x-hcd.c ++++ b/drivers/usb/host/isp116x-hcd.c +@@ -612,6 +612,7 @@ static irqreturn_t isp116x_irq(struct usb_hcd *hcd) + /* IRQ's are off, we do no DMA, + perfectly ready to die ... */ + hcd->state =3D HC_STATE_HALT; ++ usb_hc_died(hcd); + ret =3D IRQ_HANDLED; + goto done; + } +diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c +index d557235..c001fff 100644 +--- a/drivers/usb/host/ohci-hcd.c ++++ b/drivers/usb/host/ohci-hcd.c +@@ -764,6 +764,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) + if (ints =3D=3D ~(u32)0) { + disable (ohci); + ohci_dbg (ohci, "device removed!\n"); ++ usb_hc_died(hcd); + return IRQ_HANDLED; + } +=20 +@@ -771,7 +772,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) + ints &=3D ohci_readl(ohci, ®s->intrenable); +=20 + /* interrupt for some other device? */ +- if (ints =3D=3D 0) ++ if (ints =3D=3D 0 || unlikely(hcd->state =3D=3D HC_STATE_HALT)) + return IRQ_NOTMINE; +=20 + if (ints & OHCI_INTR_UE) { +@@ -788,6 +789,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) + } else { + disable (ohci); + ohci_err (ohci, "OHCI Unrecoverable Error, disabled\n"); ++ usb_hc_died(hcd); + } +=20 + ohci_dump (ohci, 1); +diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c +index d84d6f0..ad8166c 100644 +--- a/drivers/usb/host/ohci-pci.c ++++ b/drivers/usb/host/ohci-pci.c +@@ -181,10 +181,18 @@ static int ohci_quirk_amd700(struct usb_hcd *hcd) + */ + static int ohci_quirk_nvidia_shutdown(struct usb_hcd *hcd) + { ++ struct pci_dev *pdev =3D to_pci_dev(hcd->self.controller); + struct ohci_hcd *ohci =3D hcd_to_ohci(hcd); +=20 +- ohci->flags |=3D OHCI_QUIRK_SHUTDOWN; +- ohci_dbg(ohci, "enabled nVidia shutdown quirk\n"); ++ /* Evidently nVidia fixed their later hardware; this is a guess at ++ * the changeover point. ++ */ ++#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_USB 0x026d ++ ++ if (pdev->device < PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_USB) { ++ ohci->flags |=3D OHCI_QUIRK_SHUTDOWN; ++ ohci_dbg(ohci, "enabled nVidia shutdown quirk\n"); ++ } +=20 + return 0; + } +diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp= -hcd.c +index 4a771f6..5fbe997 100644 +--- a/drivers/usb/host/oxu210hp-hcd.c ++++ b/drivers/usb/host/oxu210hp-hcd.c +@@ -1884,6 +1884,7 @@ static int enable_periodic(struct oxu_hcd *oxu) + status =3D handshake(oxu, &oxu->regs->status, STS_PSS, 0, 9 * 125); + if (status !=3D 0) { + oxu_to_hcd(oxu)->state =3D HC_STATE_HALT; ++ usb_hc_died(oxu_to_hcd(oxu)); + return status; + } +=20 +@@ -1909,6 +1910,7 @@ static int disable_periodic(struct oxu_hcd *oxu) + status =3D handshake(oxu, &oxu->regs->status, STS_PSS, STS_PSS, 9 * 12= 5); + if (status !=3D 0) { + oxu_to_hcd(oxu)->state =3D HC_STATE_HALT; ++ usb_hc_died(oxu_to_hcd(oxu)); + return status; + } +=20 +@@ -2449,8 +2451,9 @@ static irqreturn_t oxu210_hcd_irq(struct usb_hcd *= hcd) + goto dead; + } +=20 ++ /* Shared IRQ? */ + status &=3D INTR_MASK; +- if (!status) { /* irq sharing? */ ++ if (!status || unlikely(hcd->state =3D=3D HC_STATE_HALT)) { + spin_unlock(&oxu->lock); + return IRQ_NONE; + } +@@ -2516,6 +2519,7 @@ static irqreturn_t oxu210_hcd_irq(struct usb_hcd *= hcd) + dead: + ehci_reset(oxu); + writel(0, &oxu->regs->configured_flag); ++ usb_hc_died(hcd); + /* generic layer kills/unlinks all urbs, then + * uses oxu_stop to clean up the rest + */ +diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c +index 627f343..783e5e0 100644 +--- a/drivers/usb/host/xhci-mem.c ++++ b/drivers/usb/host/xhci-mem.c +@@ -207,14 +207,13 @@ void xhci_free_or_cache_endpoint_ring(struct xhci_= hcd *xhci, +=20 + rings_cached =3D virt_dev->num_rings_cached; + if (rings_cached < XHCI_MAX_RINGS_CACHED) { +- virt_dev->num_rings_cached++; +- rings_cached =3D virt_dev->num_rings_cached; + virt_dev->ring_cache[rings_cached] =3D + virt_dev->eps[ep_index].ring; ++ virt_dev->num_rings_cached++; + xhci_dbg(xhci, "Cached old ring, " + "%d ring%s cached\n", +- rings_cached, +- (rings_cached > 1) ? "s" : ""); ++ virt_dev->num_rings_cached, ++ (virt_dev->num_rings_cached > 1) ? "s" : ""); + } else { + xhci_ring_free(xhci, virt_dev->eps[ep_index].ring); + xhci_dbg(xhci, "Ring cache full (%d rings), " +@@ -1046,12 +1045,12 @@ static unsigned int xhci_get_endpoint_interval(s= truct usb_device *udev, + break; +=20 + case USB_SPEED_FULL: +- if (usb_endpoint_xfer_int(&ep->desc)) { ++ if (usb_endpoint_xfer_isoc(&ep->desc)) { + interval =3D xhci_parse_exponent_interval(udev, ep); + break; + } + /* +- * Fall through for isochronous endpoint interval decoding ++ * Fall through for interrupt endpoint interval decoding + * since it uses the same rules as low speed interrupt + * endpoints. + */ +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index 7437386..078b566 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -1632,6 +1632,9 @@ static int process_ctrl_td(struct xhci_hcd *xhci, = struct xhci_td *td, + else + *status =3D 0; + break; ++ case COMP_STOP_INVAL: ++ case COMP_STOP: ++ return finish_td(xhci, td, event_trb, event, ep, status, false); + default: + if (!xhci_requires_manual_halt_cleanup(xhci, + ep_ctx, trb_comp_code)) +@@ -1676,15 +1679,12 @@ static int process_ctrl_td(struct xhci_hcd *xhci= , struct xhci_td *td, + } + } else { + /* Maybe the event was for the data stage? */ +- if (trb_comp_code !=3D COMP_STOP_INVAL) { +- /* We didn't stop on a link TRB in the middle */ +- td->urb->actual_length =3D +- td->urb->transfer_buffer_length - +- TRB_LEN(event->transfer_len); +- xhci_dbg(xhci, "Waiting for status " +- "stage event\n"); +- return 0; +- } ++ td->urb->actual_length =3D ++ td->urb->transfer_buffer_length - ++ TRB_LEN(le32_to_cpu(event->transfer_len)); ++ xhci_dbg(xhci, "Waiting for status " ++ "stage event\n"); ++ return 0; + } + } +=20 +diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c +index 81b976e..d2cd3ce 100644 +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -1692,8 +1692,17 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, str= uct usb_device *udev) + xhci_dbg_ctx(xhci, virt_dev->out_ctx, + LAST_CTX_TO_EP_NUM(slot_ctx->dev_info)); +=20 ++ /* Free any rings that were dropped, but not changed. */ ++ for (i =3D 1; i < 31; ++i) { ++ if ((ctrl_ctx->drop_flags & (1 << (i + 1))) && ++ !(ctrl_ctx->add_flags & (1 << (i + 1)))) ++ xhci_free_or_cache_endpoint_ring(xhci, virt_dev, i); ++ } + xhci_zero_in_ctx(xhci, virt_dev); +- /* Install new rings and free or cache any old rings */ ++ /* ++ * Install any rings for completely new endpoints or changed endpoints= , ++ * and free or cache any old rings from changed endpoints. ++ */ + for (i =3D 1; i < 31; ++i) { + if (!virt_dev->eps[i].new_ring) + continue; +diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c +index 0f11afd..ebeccb7 100644 +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -112,6 +112,10 @@ static const struct usb_device_id id_table[] =3D { + { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/G= PRS Modem */ + { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ + { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */ ++ { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */ ++ { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */ ++ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ ++ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ + { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ + { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ + { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone = */ +diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio= .c +index 4de6ef0..e8dbde5 100644 +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -566,6 +566,7 @@ static struct usb_device_id id_table_combined [] =3D= { + { USB_DEVICE(FTDI_VID, FTDI_IBS_APP70_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_TAVIR_STK500_PID) }, + /* + * ELV devices: + */ +diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi= _sio_ids.h +index efffc23..1d946cd 100644 +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -491,6 +491,11 @@ + /* www.canusb.com Lawicel CANUSB device (FTDI_VID) */ + #define FTDI_CANUSB_PID 0xFFA8 /* Product Id */ +=20 ++/* ++ * TavIR AVR product ids (FTDI_VID) ++ */ ++#define FTDI_TAVIR_STK500_PID 0xFA33 /* STK500 AVR programmer */ ++ +=20 +=20 + /********************************/ +diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin= _gps.c +index 26710b1..456447e033 100644 +--- a/drivers/usb/serial/garmin_gps.c ++++ b/drivers/usb/serial/garmin_gps.c +@@ -1,7 +1,7 @@ + /* + * Garmin GPS driver + * +- * Copyright (C) 2006-2009 Hermann Kneissel herkne@users.sourceforge.ne= t ++ * Copyright (C) 2006-2011 Hermann Kneissel herkne@gmx.de + * + * The latest version of the driver can be found at + * http://sourceforge.net/projects/garmin-gps/ +@@ -51,7 +51,7 @@ static int debug; + */ +=20 + #define VERSION_MAJOR 0 +-#define VERSION_MINOR 33 ++#define VERSION_MINOR 36 +=20 + #define _STR(s) #s + #define _DRIVER_VERSION(a, b) "v" _STR(a) "." _STR(b) +@@ -410,6 +410,7 @@ static int gsp_send_ack(struct garmin_data *garmin_d= ata_p, __u8 pkt_id) + */ + static int gsp_rec_packet(struct garmin_data *garmin_data_p, int count) + { ++ unsigned long flags; + const __u8 *recpkt =3D garmin_data_p->inbuffer+GSP_INITIAL_OFFSET; + __le32 *usbdata =3D (__le32 *) garmin_data_p->inbuffer; +=20 +@@ -458,7 +459,9 @@ static int gsp_rec_packet(struct garmin_data *garmin= _data_p, int count) + /* if this was an abort-transfer command, flush all + queued data. */ + if (isAbortTrfCmnd(garmin_data_p->inbuffer)) { ++ spin_lock_irqsave(&garmin_data_p->lock, flags); + garmin_data_p->flags |=3D FLAGS_DROP_DATA; ++ spin_unlock_irqrestore(&garmin_data_p->lock, flags); + pkt_clear(garmin_data_p); + } +=20 +@@ -943,7 +946,7 @@ static int garmin_open(struct tty_struct *tty, struc= t usb_serial_port *port) + spin_lock_irqsave(&garmin_data_p->lock, flags); + garmin_data_p->mode =3D initial_mode; + garmin_data_p->count =3D 0; +- garmin_data_p->flags =3D 0; ++ garmin_data_p->flags &=3D FLAGS_SESSION_REPLY1_SEEN; + spin_unlock_irqrestore(&garmin_data_p->lock, flags); +=20 + /* shutdown any bulk reads that might be going on */ +@@ -1178,7 +1181,8 @@ static int garmin_write_room(struct tty_struct *tt= y) +=20 +=20 + static void garmin_read_process(struct garmin_data *garmin_data_p, +- unsigned char *data, unsigned data_length) ++ unsigned char *data, unsigned data_length, ++ int bulk_data) + { + unsigned long flags; +=20 +@@ -1193,7 +1197,8 @@ static void garmin_read_process(struct garmin_data= *garmin_data_p, + send it directly to the tty port */ + if (garmin_data_p->flags & FLAGS_QUEUING) { + pkt_add(garmin_data_p, data, data_length); +- } else if (getLayerId(data) =3D=3D GARMIN_LAYERID_APPL) { ++ } else if (bulk_data || ++ getLayerId(data) =3D=3D GARMIN_LAYERID_APPL) { +=20 + spin_lock_irqsave(&garmin_data_p->lock, flags); + garmin_data_p->flags |=3D APP_RESP_SEEN; +@@ -1237,7 +1242,7 @@ static void garmin_read_bulk_callback(struct urb *= urb) + usb_serial_debug_data(debug, &port->dev, + __func__, urb->actual_length, data); +=20 +- garmin_read_process(garmin_data_p, data, urb->actual_length); ++ garmin_read_process(garmin_data_p, data, urb->actual_length, 1); +=20 + if (urb->actual_length =3D=3D 0 && + 0 !=3D (garmin_data_p->flags & FLAGS_BULK_IN_RESTART)) { +@@ -1346,7 +1351,7 @@ static void garmin_read_int_callback(struct urb *u= rb) + __func__, garmin_data_p->serial_num); + } +=20 +- garmin_read_process(garmin_data_p, data, urb->actual_length); ++ garmin_read_process(garmin_data_p, data, urb->actual_length, 0); +=20 + port->interrupt_in_urb->dev =3D port->serial->dev; + retval =3D usb_submit_urb(urb, GFP_ATOMIC); +@@ -1461,6 +1466,7 @@ static int garmin_attach(struct usb_serial *serial= ) + garmin_data_p->timer.function =3D timeout_handler; + garmin_data_p->port =3D port; + garmin_data_p->state =3D 0; ++ garmin_data_p->flags =3D 0; + garmin_data_p->count =3D 0; + usb_set_serial_port_data(port, garmin_data_p); +=20 +diff --git a/drivers/usb/serial/moto_modem.c b/drivers/usb/serial/moto_m= odem.c +index 653465f..e2bfecc 100644 +--- a/drivers/usb/serial/moto_modem.c ++++ b/drivers/usb/serial/moto_modem.c +@@ -25,6 +25,7 @@ static const struct usb_device_id id_table[] =3D { + { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ + { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Mororola phone */ + { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */ ++ { USB_DEVICE(0x22b8, 0x2c84) }, /* Motorola VE240 phone */ + { USB_DEVICE(0x22b8, 0x2c64) }, /* Motorola V950 phone */ + { }, + }; +diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c +index d77ff04..318dd00 100644 +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -149,6 +149,7 @@ static void option_instat_callback(struct urb *urb); + #define HUAWEI_PRODUCT_K3765 0x1465 + #define HUAWEI_PRODUCT_E14AC 0x14AC + #define HUAWEI_PRODUCT_ETS1220 0x1803 ++#define HUAWEI_PRODUCT_E353 0x1506 +=20 + #define QUANTA_VENDOR_ID 0x0408 + #define QUANTA_PRODUCT_Q101 0xEA02 +@@ -532,6 +533,7 @@ static const struct usb_device_id option_ids[] =3D { + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765= , 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS12= 20, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC= , 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353,= 0xff, 0x01, 0x01) }, + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) = }, + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) = }, + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) = }, +@@ -972,7 +974,7 @@ static const struct usb_device_id option_ids[] =3D { + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, + { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA = 450 1xEVDO modem */ + { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */ +- { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_= B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730/GT-B3710 LT= E USB modem.*/ ++ { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_= B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB mod= em.*/ + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); +@@ -1109,6 +1111,12 @@ static int option_probe(struct usb_serial *serial= , + serial->interface->cur_altsetting->desc.bInterfaceNumber =3D=3D 1) + return -ENODEV; +=20 ++ /* Don't bind network interface on Samsung GT-B3730, it is handled by = a separate module */ ++ if (serial->dev->descriptor.idVendor =3D=3D SAMSUNG_VENDOR_ID && ++ serial->dev->descriptor.idProduct =3D=3D SAMSUNG_PRODUCT_GT_B3730 && ++ serial->interface->cur_altsetting->desc.bInterfaceClass !=3D USB_CLAS= S_CDC_DATA) ++ return -ENODEV; ++ + data =3D serial->private =3D kzalloc(sizeof(struct usb_wwan_intf_priva= te), GFP_KERNEL); +=20 + if (!data) +diff --git a/drivers/usb/storage/unusual_realtek.h b/drivers/usb/storage= /unusual_realtek.h +index 3236e03..e41f50c 100644 +--- a/drivers/usb/storage/unusual_realtek.h ++++ b/drivers/usb/storage/unusual_realtek.h +@@ -23,19 +23,19 @@ + #if defined(CONFIG_USB_STORAGE_REALTEK) || \ + defined(CONFIG_USB_STORAGE_REALTEK_MODULE) +=20 +-UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x9999, ++UNUSUAL_DEV(0x0bda, 0x0138, 0x0000, 0x9999, + "Realtek", + "USB Card Reader", +- USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0), ++ USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), +=20 + UNUSUAL_DEV(0x0bda, 0x0158, 0x0000, 0x9999, + "Realtek", + "USB Card Reader", +- USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0), ++ USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), +=20 +-UNUSUAL_DEV(0x0bda, 0x0138, 0x0000, 0x9999, ++UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x9999, + "Realtek", + "USB Card Reader", +- USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0), ++ USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), +=20 + #endif /* defined(CONFIG_USB_STORAGE_REALTEK) || ... */ +diff --git a/fs/block_dev.c b/fs/block_dev.c +index 257b00e..1f2b199 100644 +--- a/fs/block_dev.c ++++ b/fs/block_dev.c +@@ -1120,6 +1120,15 @@ static int __blkdev_get(struct block_device *bdev= , fmode_t mode, int for_part) + goto restart; + } + } ++ ++ if (!ret && !bdev->bd_openers) { ++ bd_set_size(bdev,(loff_t)get_capacity(disk)<<9); ++ bdi =3D blk_get_backing_dev_info(bdev); ++ if (bdi =3D=3D NULL) ++ bdi =3D &default_backing_dev_info; ++ bdev_inode_switch_bdi(bdev->bd_inode, bdi); ++ } ++ + /* + * If the device is invalidated, rescan partition + * if open succeeded or failed with -ENOMEDIUM. +@@ -1130,14 +1139,6 @@ static int __blkdev_get(struct block_device *bdev= , fmode_t mode, int for_part) + rescan_partitions(disk, bdev); + if (ret) + goto out_clear; +- +- if (!bdev->bd_openers) { +- bd_set_size(bdev,(loff_t)get_capacity(disk)<<9); +- bdi =3D blk_get_backing_dev_info(bdev); +- if (bdi =3D=3D NULL) +- bdi =3D &default_backing_dev_info; +- bdev_inode_switch_bdi(bdev->bd_inode, bdi); +- } + } else { + struct block_device *whole; + whole =3D bdget_disk(disk, 0); +@@ -1237,6 +1238,8 @@ int blkdev_get(struct block_device *bdev, fmode_t = mode, void *holder) + res =3D __blkdev_get(bdev, mode, 0); +=20 + if (whole) { ++ struct gendisk *disk =3D whole->bd_disk; ++ + /* finish claiming */ + mutex_lock(&bdev->bd_mutex); + spin_lock(&bdev_lock); +@@ -1263,15 +1266,16 @@ int blkdev_get(struct block_device *bdev, fmode_= t mode, void *holder) + spin_unlock(&bdev_lock); +=20 + /* +- * Block event polling for write claims. Any write +- * holder makes the write_holder state stick until all +- * are released. This is good enough and tracking +- * individual writeable reference is too fragile given +- * the way @mode is used in blkdev_get/put(). ++ * Block event polling for write claims if requested. Any ++ * write holder makes the write_holder state stick until ++ * all are released. This is good enough and tracking ++ * individual writeable reference is too fragile given the ++ * way @mode is used in blkdev_get/put(). + */ +- if (!res && (mode & FMODE_WRITE) && !bdev->bd_write_holder) { ++ if ((disk->flags & GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE) && ++ !res && (mode & FMODE_WRITE) && !bdev->bd_write_holder) { + bdev->bd_write_holder =3D true; +- disk_block_events(bdev->bd_disk); ++ disk_block_events(disk); + } +=20 + mutex_unlock(&bdev->bd_mutex); +diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c +index 277262a..29fac128 100644 +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -2447,7 +2447,7 @@ void reset_cifs_unix_caps(int xid, struct cifsTcon= Info *tcon, +=20 + if (!CIFSSMBQFSUnixInfo(xid, tcon)) { + __u64 cap =3D le64_to_cpu(tcon->fsUnixInfo.Capability); +- ++ cFYI(1, "unix caps which server supports %lld", cap); + /* check for reconnect case in which we do not + want to change the mount behavior if we can avoid it */ + if (vol_info =3D=3D NULL) { +@@ -2465,6 +2465,9 @@ void reset_cifs_unix_caps(int xid, struct cifsTcon= Info *tcon, + } + } +=20 ++ if (cap & CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP) ++ cERROR(1, "per-share encryption not supported yet"); ++ + cap &=3D CIFS_UNIX_CAP_MASK; + if (vol_info && vol_info->no_psx_acl) + cap &=3D ~CIFS_UNIX_POSIX_ACL_CAP; +@@ -2513,6 +2516,10 @@ void reset_cifs_unix_caps(int xid, struct cifsTco= nInfo *tcon, + cFYI(1, "very large read cap"); + if (cap & CIFS_UNIX_LARGE_WRITE_CAP) + cFYI(1, "very large write cap"); ++ if (cap & CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP) ++ cFYI(1, "transport encryption cap"); ++ if (cap & CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP) ++ cFYI(1, "mandatory transport encryption cap"); + #endif /* CIFS_DEBUG2 */ + if (CIFSSMBSetFSUnixInfo(xid, tcon, cap)) { + if (vol_info =3D=3D NULL) { +@@ -2831,20 +2838,26 @@ try_mount_again: + goto remote_path_check; + } +=20 +- /* do not care if following two calls succeed - informational */ +- if (!tcon->ipc) { +- CIFSSMBQFSDeviceInfo(xid, tcon); +- CIFSSMBQFSAttributeInfo(xid, tcon); +- } +- + /* tell server which Unix caps we support */ +- if (tcon->ses->capabilities & CAP_UNIX) ++ if (tcon->ses->capabilities & CAP_UNIX) { + /* reset of caps checks mount to see if unix extensions + disabled for just this mount */ + reset_cifs_unix_caps(xid, tcon, sb, volume_info); +- else ++ if ((tcon->ses->server->tcpStatus =3D=3D CifsNeedReconnect) && ++ (le64_to_cpu(tcon->fsUnixInfo.Capability) & ++ CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP)) { ++ rc =3D -EACCES; ++ goto mount_fail_check; ++ } ++ } else + tcon->unix_ext =3D 0; /* server does not support them */ +=20 ++ /* do not care if following two calls succeed - informational */ ++ if (!tcon->ipc) { ++ CIFSSMBQFSDeviceInfo(xid, tcon); ++ CIFSSMBQFSAttributeInfo(xid, tcon); ++ } ++ + /* convert forward to back slashes in prepath here if needed */ + if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) =3D=3D 0) + convert_delimiter(cifs_sb->prepath, CIFS_DIR_SEP(cifs_sb)); +diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c +index 4d4cc6a..94ab3c0 100644 +--- a/fs/ecryptfs/inode.c ++++ b/fs/ecryptfs/inode.c +@@ -527,6 +527,8 @@ static int ecryptfs_rmdir(struct inode *dir, struct = dentry *dentry) + dget(lower_dentry); + rc =3D vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry); + dput(lower_dentry); ++ if (!rc && dentry->d_inode) ++ clear_nlink(dentry->d_inode); + fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); + dir->i_nlink =3D lower_dir_dentry->d_inode->i_nlink; + unlock_dir(lower_dir_dentry); +diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c +index 03e609c..27a7fef 100644 +--- a/fs/ecryptfs/keystore.c ++++ b/fs/ecryptfs/keystore.c +@@ -599,8 +599,8 @@ struct ecryptfs_write_tag_70_packet_silly_stack { + struct mutex *tfm_mutex; + char *block_aligned_filename; + struct ecryptfs_auth_tok *auth_tok; +- struct scatterlist src_sg; +- struct scatterlist dst_sg; ++ struct scatterlist src_sg[2]; ++ struct scatterlist dst_sg[2]; + struct blkcipher_desc desc; + char iv[ECRYPTFS_MAX_IV_BYTES]; + char hash[ECRYPTFS_TAG_70_DIGEST_SIZE]; +@@ -816,23 +816,21 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *r= emaining_bytes, + memcpy(&s->block_aligned_filename[s->num_rand_bytes], filename, + filename_size); + rc =3D virt_to_scatterlist(s->block_aligned_filename, +- s->block_aligned_filename_size, &s->src_sg, 1); +- if (rc !=3D 1) { ++ s->block_aligned_filename_size, s->src_sg, 2); ++ if (rc < 1) { + printk(KERN_ERR "%s: Internal error whilst attempting to " +- "convert filename memory to scatterlist; " +- "expected rc =3D 1; got rc =3D [%d]. " ++ "convert filename memory to scatterlist; rc =3D [%d]. " + "block_aligned_filename_size =3D [%zd]\n", __func__, rc, + s->block_aligned_filename_size); + goto out_release_free_unlock; + } + rc =3D virt_to_scatterlist(&dest[s->i], s->block_aligned_filename_size= , +- &s->dst_sg, 1); +- if (rc !=3D 1) { ++ s->dst_sg, 2); ++ if (rc < 1) { + printk(KERN_ERR "%s: Internal error whilst attempting to " + "convert encrypted filename memory to scatterlist; " +- "expected rc =3D 1; got rc =3D [%d]. " +- "block_aligned_filename_size =3D [%zd]\n", __func__, rc, +- s->block_aligned_filename_size); ++ "rc =3D [%d]. block_aligned_filename_size =3D [%zd]\n", ++ __func__, rc, s->block_aligned_filename_size); + goto out_release_free_unlock; + } + /* The characters in the first block effectively do the job +@@ -855,7 +853,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *rem= aining_bytes, + mount_crypt_stat->global_default_fn_cipher_key_bytes); + goto out_release_free_unlock; + } +- rc =3D crypto_blkcipher_encrypt_iv(&s->desc, &s->dst_sg, &s->src_sg, ++ rc =3D crypto_blkcipher_encrypt_iv(&s->desc, s->dst_sg, s->src_sg, + s->block_aligned_filename_size); + if (rc) { + printk(KERN_ERR "%s: Error attempting to encrypt filename; " +@@ -891,8 +889,8 @@ struct ecryptfs_parse_tag_70_packet_silly_stack { + struct mutex *tfm_mutex; + char *decrypted_filename; + struct ecryptfs_auth_tok *auth_tok; +- struct scatterlist src_sg; +- struct scatterlist dst_sg; ++ struct scatterlist src_sg[2]; ++ struct scatterlist dst_sg[2]; + struct blkcipher_desc desc; + char fnek_sig_hex[ECRYPTFS_SIG_SIZE_HEX + 1]; + char iv[ECRYPTFS_MAX_IV_BYTES]; +@@ -1008,13 +1006,12 @@ ecryptfs_parse_tag_70_packet(char **filename, si= ze_t *filename_size, + } + mutex_lock(s->tfm_mutex); + rc =3D virt_to_scatterlist(&data[(*packet_size)], +- s->block_aligned_filename_size, &s->src_sg, 1); +- if (rc !=3D 1) { ++ s->block_aligned_filename_size, s->src_sg, 2); ++ if (rc < 1) { + printk(KERN_ERR "%s: Internal error whilst attempting to " + "convert encrypted filename memory to scatterlist; " +- "expected rc =3D 1; got rc =3D [%d]. " +- "block_aligned_filename_size =3D [%zd]\n", __func__, rc, +- s->block_aligned_filename_size); ++ "rc =3D [%d]. block_aligned_filename_size =3D [%zd]\n", ++ __func__, rc, s->block_aligned_filename_size); + goto out_unlock; + } + (*packet_size) +=3D s->block_aligned_filename_size; +@@ -1028,13 +1025,12 @@ ecryptfs_parse_tag_70_packet(char **filename, si= ze_t *filename_size, + goto out_unlock; + } + rc =3D virt_to_scatterlist(s->decrypted_filename, +- s->block_aligned_filename_size, &s->dst_sg, 1); +- if (rc !=3D 1) { ++ s->block_aligned_filename_size, s->dst_sg, 2); ++ if (rc < 1) { + printk(KERN_ERR "%s: Internal error whilst attempting to " + "convert decrypted filename memory to scatterlist; " +- "expected rc =3D 1; got rc =3D [%d]. " +- "block_aligned_filename_size =3D [%zd]\n", __func__, rc, +- s->block_aligned_filename_size); ++ "rc =3D [%d]. block_aligned_filename_size =3D [%zd]\n", ++ __func__, rc, s->block_aligned_filename_size); + goto out_free_unlock; + } + /* The characters in the first block effectively do the job of +@@ -1065,7 +1061,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size= _t *filename_size, + mount_crypt_stat->global_default_fn_cipher_key_bytes); + goto out_free_unlock; + } +- rc =3D crypto_blkcipher_decrypt_iv(&s->desc, &s->dst_sg, &s->src_sg, ++ rc =3D crypto_blkcipher_decrypt_iv(&s->desc, s->dst_sg, s->src_sg, + s->block_aligned_filename_size); + if (rc) { + printk(KERN_ERR "%s: Error attempting to decrypt filename; " +diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c +index 32f3b86..93f9fd0 100644 +--- a/fs/ext3/namei.c ++++ b/fs/ext3/namei.c +@@ -1416,10 +1416,19 @@ static int make_indexed_dir(handle_t *handle, st= ruct dentry *dentry, + frame->at =3D entries; + frame->bh =3D bh; + bh =3D bh2; ++ /* ++ * Mark buffers dirty here so that if do_split() fails we write a ++ * consistent set of buffers to disk. ++ */ ++ ext3_journal_dirty_metadata(handle, frame->bh); ++ ext3_journal_dirty_metadata(handle, bh); + de =3D do_split(handle,dir, &bh, frame, &hinfo, &retval); +- dx_release (frames); +- if (!(de)) ++ if (!de) { ++ ext3_mark_inode_dirty(handle, dir); ++ dx_release(frames); + return retval; ++ } ++ dx_release(frames); +=20 + return add_dirent_to_buf(handle, dentry, inode, de, bh); + } +diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h +index 4daaf2b..1e37c09 100644 +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h +@@ -1590,12 +1590,8 @@ void ext4_get_group_no_and_offset(struct super_bl= ock *sb, ext4_fsblk_t blocknr, + */ + struct ext4_lazy_init { + unsigned long li_state; +- +- wait_queue_head_t li_wait_daemon; + wait_queue_head_t li_wait_task; +- struct timer_list li_timer; + struct task_struct *li_task; +- + struct list_head li_request_list; + struct mutex li_list_mtx; + }; +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index d8a16ee..15bfa44 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -1273,6 +1273,8 @@ repeat_load_buddy: + return 0; +=20 + err: ++ if (page) ++ page_cache_release(page); + if (e4b->bd_bitmap_page) + page_cache_release(e4b->bd_bitmap_page); + if (e4b->bd_buddy_page) +diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c +index b6dbd05..7bb8f76 100644 +--- a/fs/ext4/page-io.c ++++ b/fs/ext4/page-io.c +@@ -203,46 +203,29 @@ static void ext4_end_bio(struct bio *bio, int erro= r) + for (i =3D 0; i < io_end->num_io_pages; i++) { + struct page *page =3D io_end->pages[i]->p_page; + struct buffer_head *bh, *head; +- int partial_write =3D 0; ++ loff_t offset; ++ loff_t io_end_offset; +=20 +- head =3D page_buffers(page); +- if (error) ++ if (error) { + SetPageError(page); +- BUG_ON(!head); +- if (head->b_size !=3D PAGE_CACHE_SIZE) { +- loff_t offset; +- loff_t io_end_offset =3D io_end->offset + io_end->size; ++ set_bit(AS_EIO, &page->mapping->flags); ++ head =3D page_buffers(page); ++ BUG_ON(!head); ++ ++ io_end_offset =3D io_end->offset + io_end->size; +=20 + offset =3D (sector_t) page->index << PAGE_CACHE_SHIFT; + bh =3D head; + do { + if ((offset >=3D io_end->offset) && +- (offset+bh->b_size <=3D io_end_offset)) { +- if (error) +- buffer_io_error(bh); +- +- } +- if (buffer_delay(bh)) +- partial_write =3D 1; +- else if (!buffer_mapped(bh)) +- clear_buffer_dirty(bh); +- else if (buffer_dirty(bh)) +- partial_write =3D 1; ++ (offset+bh->b_size <=3D io_end_offset)) ++ buffer_io_error(bh); ++ + offset +=3D bh->b_size; + bh =3D bh->b_this_page; + } while (bh !=3D head); + } +=20 +- /* +- * If this is a partial write which happened to make +- * all buffers uptodate then we can optimize away a +- * bogus readpage() for the next read(). Here we +- * 'discover' whether the page went uptodate as a +- * result of this (potentially partial) write. +- */ +- if (!partial_write) +- SetPageUptodate(page); +- + put_io_page(io_end->pages[i]); + } + io_end->num_io_pages =3D 0; +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 8553dfb..e28c0f2 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -2659,12 +2659,6 @@ static void print_daily_error_info(unsigned long = arg) + mod_timer(&sbi->s_err_report, jiffies + 24*60*60*HZ); /* Once a day *= / + } +=20 +-static void ext4_lazyinode_timeout(unsigned long data) +-{ +- struct task_struct *p =3D (struct task_struct *)data; +- wake_up_process(p); +-} +- + /* Find next suitable group and run ext4_init_inode_table */ + static int ext4_run_li_request(struct ext4_li_request *elr) + { +@@ -2712,7 +2706,7 @@ static int ext4_run_li_request(struct ext4_li_requ= est *elr) +=20 + /* + * Remove lr_request from the list_request and free the +- * request tructure. Should be called with li_list_mtx held ++ * request structure. Should be called with li_list_mtx held + */ + static void ext4_remove_li_request(struct ext4_li_request *elr) + { +@@ -2730,14 +2724,16 @@ static void ext4_remove_li_request(struct ext4_l= i_request *elr) +=20 + static void ext4_unregister_li_request(struct super_block *sb) + { +- struct ext4_li_request *elr =3D EXT4_SB(sb)->s_li_request; +- +- if (!ext4_li_info) ++ mutex_lock(&ext4_li_mtx); ++ if (!ext4_li_info) { ++ mutex_unlock(&ext4_li_mtx); + return; ++ } +=20 + mutex_lock(&ext4_li_info->li_list_mtx); +- ext4_remove_li_request(elr); ++ ext4_remove_li_request(EXT4_SB(sb)->s_li_request); + mutex_unlock(&ext4_li_info->li_list_mtx); ++ mutex_unlock(&ext4_li_mtx); + } +=20 + static struct task_struct *ext4_lazyinit_task; +@@ -2756,14 +2752,10 @@ static int ext4_lazyinit_thread(void *arg) + struct ext4_lazy_init *eli =3D (struct ext4_lazy_init *)arg; + struct list_head *pos, *n; + struct ext4_li_request *elr; +- unsigned long next_wakeup; +- DEFINE_WAIT(wait); ++ unsigned long next_wakeup, cur; +=20 + BUG_ON(NULL =3D=3D eli); +=20 +- eli->li_timer.data =3D (unsigned long)current; +- eli->li_timer.function =3D ext4_lazyinode_timeout; +- + eli->li_task =3D current; + wake_up(&eli->li_wait_task); +=20 +@@ -2797,19 +2789,15 @@ cont_thread: + if (freezing(current)) + refrigerator(); +=20 +- if ((time_after_eq(jiffies, next_wakeup)) || ++ cur =3D jiffies; ++ if ((time_after_eq(cur, next_wakeup)) || + (MAX_JIFFY_OFFSET =3D=3D next_wakeup)) { + cond_resched(); + continue; + } +=20 +- eli->li_timer.expires =3D next_wakeup; +- add_timer(&eli->li_timer); +- prepare_to_wait(&eli->li_wait_daemon, &wait, +- TASK_INTERRUPTIBLE); +- if (time_before(jiffies, next_wakeup)) +- schedule(); +- finish_wait(&eli->li_wait_daemon, &wait); ++ schedule_timeout_interruptible(next_wakeup - cur); ++ + if (kthread_should_stop()) { + ext4_clear_request_list(); + goto exit_thread; +@@ -2833,12 +2821,10 @@ exit_thread: + goto cont_thread; + } + mutex_unlock(&eli->li_list_mtx); +- del_timer_sync(&ext4_li_info->li_timer); + eli->li_task =3D NULL; + wake_up(&eli->li_wait_task); +=20 + kfree(ext4_li_info); +- ext4_lazyinit_task =3D NULL; + ext4_li_info =3D NULL; + mutex_unlock(&ext4_li_mtx); +=20 +@@ -2866,7 +2852,6 @@ static int ext4_run_lazyinit_thread(void) + if (IS_ERR(ext4_lazyinit_task)) { + int err =3D PTR_ERR(ext4_lazyinit_task); + ext4_clear_request_list(); +- del_timer_sync(&ext4_li_info->li_timer); + kfree(ext4_li_info); + ext4_li_info =3D NULL; + printk(KERN_CRIT "EXT4: error %d creating inode table " +@@ -2915,9 +2900,7 @@ static int ext4_li_info_new(void) + INIT_LIST_HEAD(&eli->li_request_list); + mutex_init(&eli->li_list_mtx); +=20 +- init_waitqueue_head(&eli->li_wait_daemon); + init_waitqueue_head(&eli->li_wait_task); +- init_timer(&eli->li_timer); + eli->li_state |=3D EXT4_LAZYINIT_QUIT; +=20 + ext4_li_info =3D eli; +diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c +index 69b1804..f486ff6 100644 +--- a/fs/jbd/commit.c ++++ b/fs/jbd/commit.c +@@ -722,8 +722,13 @@ wait_for_iobuf: + required. */ + JBUFFER_TRACE(jh, "file as BJ_Forget"); + journal_file_buffer(jh, commit_transaction, BJ_Forget); +- /* Wake up any transactions which were waiting for this +- IO to complete */ ++ /* ++ * Wake up any transactions which were waiting for this ++ * IO to complete. The barrier must be here so that changes ++ * by journal_file_buffer() take effect before wake_up_bit() ++ * does the waitqueue check. ++ */ ++ smp_mb(); + wake_up_bit(&bh->b_state, BH_Unshadow); + JBUFFER_TRACE(jh, "brelse shadowed buffer"); + __brelse(bh); +diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c +index b3713af..e2d4285 100644 +--- a/fs/jbd/journal.c ++++ b/fs/jbd/journal.c +@@ -437,9 +437,12 @@ int __log_space_left(journal_t *journal) + int __log_start_commit(journal_t *journal, tid_t target) + { + /* +- * Are we already doing a recent enough commit? ++ * The only transaction we can possibly wait upon is the ++ * currently running transaction (if it exists). Otherwise, ++ * the target tid must be an old one. + */ +- if (!tid_geq(journal->j_commit_request, target)) { ++ if (journal->j_running_transaction && ++ journal->j_running_transaction->t_tid =3D=3D target) { + /* + * We want a new commit: OK, mark the request and wakeup the + * commit thread. We do _not_ do the commit ourselves. +@@ -451,7 +454,14 @@ int __log_start_commit(journal_t *journal, tid_t ta= rget) + journal->j_commit_sequence); + wake_up(&journal->j_wait_commit); + return 1; +- } ++ } else if (!tid_geq(journal->j_commit_request, target)) ++ /* This should never happen, but if it does, preserve ++ the evidence before kjournald goes into a loop and ++ increments j_commit_sequence beyond all recognition. */ ++ WARN_ONCE(1, "jbd: bad log_start_commit: %u %u %u %u\n", ++ journal->j_commit_request, journal->j_commit_sequence, ++ target, journal->j_running_transaction ? ++ journal->j_running_transaction->t_tid : 0); + return 0; + } +=20 +diff --git a/fs/namei.c b/fs/namei.c +index e3c4f11..6ff858c 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1378,12 +1378,12 @@ static inline int nested_symlink(struct path *pa= th, struct nameidata *nd) + { + int res; +=20 +- BUG_ON(nd->depth >=3D MAX_NESTED_LINKS); + if (unlikely(current->link_count >=3D MAX_NESTED_LINKS)) { + path_put_conditional(path, nd); + path_put(&nd->path); + return -ELOOP; + } ++ BUG_ON(nd->depth >=3D MAX_NESTED_LINKS); +=20 + nd->depth++; + current->link_count++; +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index cf1b339..d0e15db 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -267,9 +267,11 @@ static int nfs4_handle_exception(struct nfs_server = *server, int errorcode, struc + break; + nfs4_schedule_stateid_recovery(server, state); + goto wait_on_recovery; ++ case -NFS4ERR_EXPIRED: ++ if (state !=3D NULL) ++ nfs4_schedule_stateid_recovery(server, state); + case -NFS4ERR_STALE_STATEID: + case -NFS4ERR_STALE_CLIENTID: +- case -NFS4ERR_EXPIRED: + nfs4_schedule_lease_recovery(clp); + goto wait_on_recovery; + #if defined(CONFIG_NFS_V4_1) +@@ -3670,9 +3672,11 @@ nfs4_async_handle_error(struct rpc_task *task, co= nst struct nfs_server *server, + break; + nfs4_schedule_stateid_recovery(server, state); + goto wait_on_recovery; ++ case -NFS4ERR_EXPIRED: ++ if (state !=3D NULL) ++ nfs4_schedule_stateid_recovery(server, state); + case -NFS4ERR_STALE_STATEID: + case -NFS4ERR_STALE_CLIENTID: +- case -NFS4ERR_EXPIRED: + nfs4_schedule_lease_recovery(clp); + goto wait_on_recovery; + #if defined(CONFIG_NFS_V4_1) +@@ -4543,6 +4547,7 @@ int nfs4_lock_delegation_recall(struct nfs4_state = *state, struct file_lock *fl) + case -ESTALE: + goto out; + case -NFS4ERR_EXPIRED: ++ nfs4_schedule_stateid_recovery(server, state); + case -NFS4ERR_STALE_CLIENTID: + case -NFS4ERR_STALE_STATEID: + nfs4_schedule_lease_recovery(server->nfs_client); +diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c +index 036f5ad..e97dd21 100644 +--- a/fs/nfs/nfs4state.c ++++ b/fs/nfs/nfs4state.c +@@ -1466,7 +1466,10 @@ static int nfs4_reclaim_lease(struct nfs_client *= clp) + #ifdef CONFIG_NFS_V4_1 + void nfs4_schedule_session_recovery(struct nfs4_session *session) + { +- nfs4_schedule_lease_recovery(session->clp); ++ struct nfs_client *clp =3D session->clp; ++ ++ set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); ++ nfs4_schedule_lease_recovery(clp); + } + EXPORT_SYMBOL_GPL(nfs4_schedule_session_recovery); +=20 +@@ -1549,6 +1552,7 @@ static int nfs4_reset_session(struct nfs_client *c= lp) + status =3D nfs4_recovery_handle_error(clp, status); + goto out; + } ++ clear_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); + /* create_session negotiated new slot table */ + clear_bit(NFS4CLNT_RECALL_SLOT, &clp->cl_state); +=20 +diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c +index f57f528..101c85a 100644 +--- a/fs/nfs/pnfs.c ++++ b/fs/nfs/pnfs.c +@@ -1009,7 +1009,7 @@ void + pnfs_set_layoutcommit(struct nfs_write_data *wdata) + { + struct nfs_inode *nfsi =3D NFS_I(wdata->inode); +- loff_t end_pos =3D wdata->args.offset + wdata->res.count; ++ loff_t end_pos =3D wdata->mds_offset + wdata->res.count; + bool mark_as_dirty =3D false; +=20 + spin_lock(&nfsi->vfs_inode.i_lock); +diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c +index ce4f624..a29d5cc 100644 +--- a/fs/partitions/ldm.c ++++ b/fs/partitions/ldm.c +@@ -1335,6 +1335,11 @@ static bool ldm_frag_add (const u8 *data, int siz= e, struct list_head *frags) +=20 + list_add_tail (&f->list, frags); + found: ++ if (rec >=3D f->num) { ++ ldm_error("REC value (%d) exceeds NUM value (%d)", rec, f->num); ++ return false; ++ } ++ + if (f->map & (1 << rec)) { + ldm_error ("Duplicate VBLK, part %d.", rec); + f->map &=3D 0x7F; /* Mark the group as broken */ +diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c +index bf31b47..cad60b5 100644 +--- a/fs/ubifs/sb.c ++++ b/fs/ubifs/sb.c +@@ -475,7 +475,8 @@ failed: + * @c: UBIFS file-system description object + * + * This function returns a pointer to the superblock node or a negative= error +- * code. ++ * code. Note, the user of this function is responsible of kfree()'ing = the ++ * returned superblock buffer. + */ + struct ubifs_sb_node *ubifs_read_sb_node(struct ubifs_info *c) + { +diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c +index 04ad07f..328e6fc 100644 +--- a/fs/ubifs/super.c ++++ b/fs/ubifs/super.c +@@ -1584,6 +1584,7 @@ static int ubifs_remount_rw(struct ubifs_info *c) + } + sup->leb_cnt =3D cpu_to_le32(c->leb_cnt); + err =3D ubifs_write_sb_node(c, sup); ++ kfree(sup); + if (err) + goto out; + } +diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h +index 2ad95fa..ae9091a 100644 +--- a/include/linux/blkdev.h ++++ b/include/linux/blkdev.h +@@ -257,7 +257,7 @@ struct queue_limits { + unsigned char misaligned; + unsigned char discard_misaligned; + unsigned char cluster; +- signed char discard_zeroes_data; ++ unsigned char discard_zeroes_data; + }; +=20 + struct request_queue +@@ -364,6 +364,8 @@ struct request_queue + * for flush operations + */ + unsigned int flush_flags; ++ unsigned int flush_not_queueable:1; ++ unsigned int flush_queue_delayed:1; + unsigned int flush_pending_idx:1; + unsigned int flush_running_idx:1; + unsigned long flush_pending_since; +@@ -843,6 +845,7 @@ extern void blk_queue_softirq_done(struct request_qu= eue *, softirq_done_fn *); + extern void blk_queue_rq_timed_out(struct request_queue *, rq_timed_out= _fn *); + extern void blk_queue_rq_timeout(struct request_queue *, unsigned int); + extern void blk_queue_flush(struct request_queue *q, unsigned int flush= ); ++extern void blk_queue_flush_queueable(struct request_queue *q, bool que= ueable); + extern struct backing_dev_info *blk_get_backing_dev_info(struct block_d= evice *bdev); +=20 + extern int blk_rq_map_sg(struct request_queue *, struct request *, stru= ct scatterlist *); +@@ -1066,13 +1069,16 @@ static inline int queue_limit_discard_alignment(= struct queue_limits *lim, sector + { + unsigned int alignment =3D (sector << 9) & (lim->discard_granularity -= 1); +=20 ++ if (!lim->max_discard_sectors) ++ return 0; ++ + return (lim->discard_granularity + lim->discard_alignment - alignment) + & (lim->discard_granularity - 1); + } +=20 + static inline unsigned int queue_discard_zeroes_data(struct request_que= ue *q) + { +- if (q->limits.discard_zeroes_data =3D=3D 1) ++ if (q->limits.max_discard_sectors && q->limits.discard_zeroes_data =3D= =3D 1) + return 1; +=20 + return 0; +@@ -1111,6 +1117,11 @@ static inline unsigned int block_size(struct bloc= k_device *bdev) + return bdev->bd_block_size; + } +=20 ++static inline bool queue_flush_queueable(struct request_queue *q) ++{ ++ return !q->flush_not_queueable; ++} ++ + typedef struct {struct page *v;} Sector; +=20 + unsigned char *read_dev_sector(struct block_device *, sector_t, Sector = *); +diff --git a/include/linux/efi.h b/include/linux/efi.h +index 33fa120..e376270 100644 +--- a/include/linux/efi.h ++++ b/include/linux/efi.h +@@ -299,6 +299,7 @@ extern void efi_initialize_iomem_resources(struct re= source *code_resource, + struct resource *data_resource, struct resource *bss_resource); + extern unsigned long efi_get_time(void); + extern int efi_set_rtc_mmss(unsigned long nowtime); ++extern void efi_reserve_boot_services(void); + extern struct efi_memory_map memmap; +=20 + /** +diff --git a/include/linux/genhd.h b/include/linux/genhd.h +index d764a42..300d758 100644 +--- a/include/linux/genhd.h ++++ b/include/linux/genhd.h +@@ -127,6 +127,7 @@ struct hd_struct { + #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 + #define GENHD_FL_EXT_DEVT 64 /* allow extended devt */ + #define GENHD_FL_NATIVE_CAPACITY 128 ++#define GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE 256 +=20 + enum { + DISK_EVENT_MEDIA_CHANGE =3D 1 << 0, /* media changed */ +diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h +index 8abe8d7..8652a4f 100644 +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -608,6 +608,8 @@ + #define PCI_DEVICE_ID_MATROX_G550 0x2527 + #define PCI_DEVICE_ID_MATROX_VIA 0x4536 +=20 ++#define PCI_VENDOR_ID_MOBILITY_ELECTRONICS 0x14f2 ++ + #define PCI_VENDOR_ID_CT 0x102c + #define PCI_DEVICE_ID_CT_69000 0x00c0 + #define PCI_DEVICE_ID_CT_65545 0x00d8 +diff --git a/include/linux/pm_qos_params.h b/include/linux/pm_qos_params= .h +index 77cbddb..a7d87f9 100644 +--- a/include/linux/pm_qos_params.h ++++ b/include/linux/pm_qos_params.h +@@ -16,6 +16,10 @@ + #define PM_QOS_NUM_CLASSES 4 + #define PM_QOS_DEFAULT_VALUE -1 +=20 ++#define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC) ++#define PM_QOS_NETWORK_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC) ++#define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE 0 ++ + struct pm_qos_request_list { + struct plist_node list; + int pm_qos_class; +diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h +index e98cd2e..06d6964 100644 +--- a/include/linux/seqlock.h ++++ b/include/linux/seqlock.h +@@ -88,12 +88,12 @@ static __always_inline unsigned read_seqbegin(const = seqlock_t *sl) + unsigned ret; +=20 + repeat: +- ret =3D sl->sequence; +- smp_rmb(); ++ ret =3D ACCESS_ONCE(sl->sequence); + if (unlikely(ret & 1)) { + cpu_relax(); + goto repeat; + } ++ smp_rmb(); +=20 + return ret; + } +diff --git a/include/net/dst.h b/include/net/dst.h +index 75b95df..b3ad020 100644 +--- a/include/net/dst.h ++++ b/include/net/dst.h +@@ -120,6 +120,8 @@ static inline u32 *dst_metrics_write_ptr(struct dst_= entry *dst) + { + unsigned long p =3D dst->_metrics; +=20 ++ BUG_ON(!p); ++ + if (p & DST_METRICS_READ_ONLY) + return dst->ops->cow_metrics(dst, p); + return __DST_METRICS_PTR(p); +diff --git a/include/target/target_core_base.h b/include/target/target_c= ore_base.h +index 1d3b5b2..561ac99 100644 +--- a/include/target/target_core_base.h ++++ b/include/target/target_core_base.h +@@ -98,6 +98,7 @@ enum transport_state_table { + TRANSPORT_REMOVE =3D 14, + TRANSPORT_FREE =3D 15, + TRANSPORT_NEW_CMD_MAP =3D 16, ++ TRANSPORT_FREE_CMD_INTR =3D 17, + }; +=20 + /* Used for struct se_cmd->se_cmd_flags */ +diff --git a/include/target/target_core_transport.h b/include/target/tar= get_core_transport.h +index 59aa464..24a1c6c 100644 +--- a/include/target/target_core_transport.h ++++ b/include/target/target_core_transport.h +@@ -172,6 +172,7 @@ extern int transport_generic_handle_cdb_map(struct s= e_cmd *); + extern int transport_generic_handle_data(struct se_cmd *); + extern void transport_new_cmd_failure(struct se_cmd *); + extern int transport_generic_handle_tmr(struct se_cmd *); ++extern void transport_generic_free_cmd_intr(struct se_cmd *); + extern void __transport_stop_task_timer(struct se_task *, unsigned long= *); + extern unsigned char transport_asciihex_to_binaryhex(unsigned char val[= 2]); + extern int transport_generic_map_mem_to_cmd(struct se_cmd *cmd, struct = scatterlist *, u32, +diff --git a/init/main.c b/init/main.c +index 4a9479e..48df882 100644 +--- a/init/main.c ++++ b/init/main.c +@@ -580,8 +580,8 @@ asmlinkage void __init start_kernel(void) + #endif + page_cgroup_init(); + enable_debug_pagealloc(); +- kmemleak_init(); + debug_objects_mem_init(); ++ kmemleak_init(); + setup_per_cpu_pageset(); + numa_policy_init(); + if (late_time_init) +diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c +index 0da058b..a9582ef 100644 +--- a/kernel/pm_qos_params.c ++++ b/kernel/pm_qos_params.c +@@ -53,11 +53,17 @@ enum pm_qos_type { + PM_QOS_MIN /* return the smallest value */ + }; +=20 ++/* ++ * Note: The lockless read path depends on the CPU accessing ++ * target_value atomically. Atomic access is only guaranteed on all CP= U ++ * types linux supports for 32 bit quantites ++ */ + struct pm_qos_object { + struct plist_head requests; + struct blocking_notifier_head *notifiers; + struct miscdevice pm_qos_power_miscdev; + char *name; ++ s32 target_value; /* Do not change to 64 bit */ + s32 default_value; + enum pm_qos_type type; + }; +@@ -70,7 +76,8 @@ static struct pm_qos_object cpu_dma_pm_qos =3D { + .requests =3D PLIST_HEAD_INIT(cpu_dma_pm_qos.requests, pm_qos_lock), + .notifiers =3D &cpu_dma_lat_notifier, + .name =3D "cpu_dma_latency", +- .default_value =3D 2000 * USEC_PER_SEC, ++ .target_value =3D PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE, ++ .default_value =3D PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE, + .type =3D PM_QOS_MIN, + }; +=20 +@@ -79,7 +86,8 @@ static struct pm_qos_object network_lat_pm_qos =3D { + .requests =3D PLIST_HEAD_INIT(network_lat_pm_qos.requests, pm_qos_lock= ), + .notifiers =3D &network_lat_notifier, + .name =3D "network_latency", +- .default_value =3D 2000 * USEC_PER_SEC, ++ .target_value =3D PM_QOS_NETWORK_LAT_DEFAULT_VALUE, ++ .default_value =3D PM_QOS_NETWORK_LAT_DEFAULT_VALUE, + .type =3D PM_QOS_MIN + }; +=20 +@@ -89,7 +97,8 @@ static struct pm_qos_object network_throughput_pm_qos = =3D { + .requests =3D PLIST_HEAD_INIT(network_throughput_pm_qos.requests, pm_q= os_lock), + .notifiers =3D &network_throughput_notifier, + .name =3D "network_throughput", +- .default_value =3D 0, ++ .target_value =3D PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE, ++ .default_value =3D PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE, + .type =3D PM_QOS_MAX, + }; +=20 +@@ -135,6 +144,16 @@ static inline int pm_qos_get_value(struct pm_qos_ob= ject *o) + } + } +=20 ++static inline s32 pm_qos_read_value(struct pm_qos_object *o) ++{ ++ return o->target_value; ++} ++ ++static inline void pm_qos_set_value(struct pm_qos_object *o, s32 value) ++{ ++ o->target_value =3D value; ++} ++ + static void update_target(struct pm_qos_object *o, struct plist_node *n= ode, + int del, int value) + { +@@ -159,6 +178,7 @@ static void update_target(struct pm_qos_object *o, s= truct plist_node *node, + plist_add(node, &o->requests); + } + curr_value =3D pm_qos_get_value(o); ++ pm_qos_set_value(o, curr_value); + spin_unlock_irqrestore(&pm_qos_lock, flags); +=20 + if (prev_value !=3D curr_value) +@@ -193,18 +213,11 @@ static int find_pm_qos_object_by_minor(int minor) + * pm_qos_request - returns current system wide qos expectation + * @pm_qos_class: identification of which qos value is requested + * +- * This function returns the current target value in an atomic manner. ++ * This function returns the current target value. + */ + int pm_qos_request(int pm_qos_class) + { +- unsigned long flags; +- int value; +- +- spin_lock_irqsave(&pm_qos_lock, flags); +- value =3D pm_qos_get_value(pm_qos_array[pm_qos_class]); +- spin_unlock_irqrestore(&pm_qos_lock, flags); +- +- return value; ++ return pm_qos_read_value(pm_qos_array[pm_qos_class]); + } + EXPORT_SYMBOL_GPL(pm_qos_request); +=20 +diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c +index ee24fa1..666880d 100644 +--- a/kernel/trace/ftrace.c ++++ b/kernel/trace/ftrace.c +@@ -2413,14 +2413,16 @@ ftrace_regex_release(struct inode *inode, struct= file *file, int enable) + ftrace_match_records(parser->buffer, parser->idx, enable); + } +=20 +- mutex_lock(&ftrace_lock); +- if (ftrace_start_up && ftrace_enabled) +- ftrace_run_update_code(FTRACE_ENABLE_CALLS); +- mutex_unlock(&ftrace_lock); +- + trace_parser_put(parser); + kfree(iter); +=20 ++ if (file->f_mode & FMODE_WRITE) { ++ mutex_lock(&ftrace_lock); ++ if (ftrace_start_up && ftrace_enabled) ++ ftrace_run_update_code(FTRACE_ENABLE_CALLS); ++ mutex_unlock(&ftrace_lock); ++ } ++ + mutex_unlock(&ftrace_regex_lock); + return 0; + } +diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c +index 619313e..507a22f 100644 +--- a/lib/locking-selftest.c ++++ b/lib/locking-selftest.c +@@ -144,7 +144,7 @@ static void init_shared_classes(void) +=20 + #define HARDIRQ_ENTER() \ + local_irq_disable(); \ +- irq_enter(); \ ++ __irq_enter(); \ + WARN_ON(!in_irq()); +=20 + #define HARDIRQ_EXIT() \ +diff --git a/mm/kmemleak.c b/mm/kmemleak.c +index c1d5867..aacee45 100644 +--- a/mm/kmemleak.c ++++ b/mm/kmemleak.c +@@ -1414,9 +1414,12 @@ static void *kmemleak_seq_next(struct seq_file *s= eq, void *v, loff_t *pos) + ++(*pos); +=20 + list_for_each_continue_rcu(n, &object_list) { +- next_obj =3D list_entry(n, struct kmemleak_object, object_list); +- if (get_object(next_obj)) ++ struct kmemleak_object *obj =3D ++ list_entry(n, struct kmemleak_object, object_list); ++ if (get_object(obj)) { ++ next_obj =3D obj; + break; ++ } + } +=20 + put_object(prev_obj); +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 3f8bce2..e78b324 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -2064,6 +2064,7 @@ restart: + first_zones_zonelist(zonelist, high_zoneidx, NULL, + &preferred_zone); +=20 ++rebalance: + /* This is the last chance, in general, before the goto nopage. */ + page =3D get_page_from_freelist(gfp_mask, nodemask, order, zonelist, + high_zoneidx, alloc_flags & ~ALLOC_NO_WATERMARKS, +@@ -2071,7 +2072,6 @@ restart: + if (page) + goto got_pg; +=20 +-rebalance: + /* Allocate without watermarks if the context allows */ + if (alloc_flags & ALLOC_NO_WATERMARKS) { + page =3D __alloc_pages_high_priority(gfp_mask, order, +diff --git a/mm/shmem.c b/mm/shmem.c +index dfc7069..ba12be4 100644 +--- a/mm/shmem.c ++++ b/mm/shmem.c +@@ -916,11 +916,12 @@ static int shmem_unuse_inode(struct shmem_inode_in= fo *info, swp_entry_t entry, s + if (size > ENTRIES_PER_PAGE) + size =3D ENTRIES_PER_PAGE; + offset =3D shmem_find_swp(entry, ptr, ptr+size); ++ shmem_swp_unmap(ptr); + if (offset >=3D 0) { + shmem_dir_unmap(dir); ++ ptr =3D shmem_swp_map(subdir); + goto found; + } +- shmem_swp_unmap(ptr); + } + } + lost1: +@@ -1100,8 +1101,8 @@ static int shmem_writepage(struct page *page, stru= ct writeback_control *wbc) + delete_from_page_cache(page); + shmem_swp_set(info, entry, swap.val); + shmem_swp_unmap(entry); +- spin_unlock(&info->lock); + swap_shmem_alloc(swap); ++ spin_unlock(&info->lock); + BUG_ON(page_mapped(page)); + swap_writepage(page, wbc); + return 0; +diff --git a/mm/slub.c b/mm/slub.c +index 9d2e5e4..f6cb6cd 100644 +--- a/mm/slub.c ++++ b/mm/slub.c +@@ -261,6 +261,18 @@ static inline void *get_freepointer(struct kmem_cac= he *s, void *object) + return *(void **)(object + s->offset); + } +=20 ++static inline void *get_freepointer_safe(struct kmem_cache *s, void *ob= ject) ++{ ++ void *p; ++ ++#ifdef CONFIG_DEBUG_PAGEALLOC ++ probe_kernel_read(&p, (void **)(object + s->offset), sizeof(p)); ++#else ++ p =3D get_freepointer(s, object); ++#endif ++ return p; ++} ++ + static inline void set_freepointer(struct kmem_cache *s, void *object, = void *fp) + { + *(void **)(object + s->offset) =3D fp; +@@ -1943,7 +1955,7 @@ redo: + if (unlikely(!irqsafe_cpu_cmpxchg_double( + s->cpu_slab->freelist, s->cpu_slab->tid, + object, tid, +- get_freepointer(s, object), next_tid(tid)))) { ++ get_freepointer_safe(s, object), next_tid(tid)))) { +=20 + note_cmpxchg_failure("slab_alloc", s, tid); + goto redo; +diff --git a/mm/vmscan.c b/mm/vmscan.c +index 8bfd450..cc1470b 100644 +--- a/mm/vmscan.c ++++ b/mm/vmscan.c +@@ -230,8 +230,11 @@ unsigned long shrink_slab(unsigned long scanned, gf= p_t gfp_mask, + if (scanned =3D=3D 0) + scanned =3D SWAP_CLUSTER_MAX; +=20 +- if (!down_read_trylock(&shrinker_rwsem)) +- return 1; /* Assume we'll be able to shrink next time */ ++ if (!down_read_trylock(&shrinker_rwsem)) { ++ /* Assume we'll be able to shrink next time */ ++ ret =3D 1; ++ goto out; ++ } +=20 + list_for_each_entry(shrinker, &shrinker_list, list) { + unsigned long long delta; +@@ -282,6 +285,8 @@ unsigned long shrink_slab(unsigned long scanned, gfp= _t gfp_mask, + shrinker->nr +=3D total_scan; + } + up_read(&shrinker_rwsem); ++out: ++ cond_resched(); + return ret; + } +=20 +@@ -2286,7 +2291,7 @@ static bool sleeping_prematurely(pg_data_t *pgdat,= int order, long remaining, + * must be balanced + */ + if (order) +- return pgdat_balanced(pgdat, balanced, classzone_idx); ++ return !pgdat_balanced(pgdat, balanced, classzone_idx); + else + return !all_zones_ok; + } +diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c +index f7fa67c..f49da58 100644 +--- a/net/atm/atm_sysfs.c ++++ b/net/atm/atm_sysfs.c +@@ -59,6 +59,14 @@ static ssize_t show_atmaddress(struct device *cdev, + return pos - buf; + } +=20 ++static ssize_t show_atmindex(struct device *cdev, ++ struct device_attribute *attr, char *buf) ++{ ++ struct atm_dev *adev =3D to_atm_dev(cdev); ++ ++ return sprintf(buf, "%d\n", adev->number); ++} ++ + static ssize_t show_carrier(struct device *cdev, + struct device_attribute *attr, char *buf) + { +@@ -99,6 +107,7 @@ static ssize_t show_link_rate(struct device *cdev, +=20 + static DEVICE_ATTR(address, S_IRUGO, show_address, NULL); + static DEVICE_ATTR(atmaddress, S_IRUGO, show_atmaddress, NULL); ++static DEVICE_ATTR(atmindex, S_IRUGO, show_atmindex, NULL); + static DEVICE_ATTR(carrier, S_IRUGO, show_carrier, NULL); + static DEVICE_ATTR(type, S_IRUGO, show_type, NULL); + static DEVICE_ATTR(link_rate, S_IRUGO, show_link_rate, NULL); +@@ -106,6 +115,7 @@ static DEVICE_ATTR(link_rate, S_IRUGO, show_link_rat= e, NULL); + static struct device_attribute *atm_attrs[] =3D { + &dev_attr_atmaddress, + &dev_attr_address, ++ &dev_attr_atmindex, + &dev_attr_carrier, + &dev_attr_type, + &dev_attr_link_rate, +diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c +index 74ef4d4..5f9c091 100644 +--- a/net/bridge/br_netfilter.c ++++ b/net/bridge/br_netfilter.c +@@ -117,6 +117,10 @@ static struct dst_ops fake_dst_ops =3D { + * ipt_REJECT needs it. Future netfilter modules might + * require us to fill additional fields. + */ ++static const u32 br_dst_default_metrics[RTAX_MAX] =3D { ++ [RTAX_MTU - 1] =3D 1500, ++}; ++ + void br_netfilter_rtable_init(struct net_bridge *br) + { + struct rtable *rt =3D &br->fake_rtable; +@@ -124,7 +128,7 @@ void br_netfilter_rtable_init(struct net_bridge *br) + atomic_set(&rt->dst.__refcnt, 1); + rt->dst.dev =3D br->dev; + rt->dst.path =3D &rt->dst; +- dst_metric_set(&rt->dst, RTAX_MTU, 1500); ++ dst_init_metrics(&rt->dst, br_dst_default_metrics, true); + rt->dst.flags =3D DST_NOXFRM; + rt->dst.ops =3D &fake_dst_ops; + } +diff --git a/net/core/dev.c b/net/core/dev.c +index b624fe4..acd7423 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -1007,7 +1007,7 @@ rollback: + } +=20 + write_lock_bh(&dev_base_lock); +- hlist_del(&dev->name_hlist); ++ hlist_del_rcu(&dev->name_hlist); + write_unlock_bh(&dev_base_lock); +=20 + synchronize_rcu(); +@@ -5258,7 +5258,7 @@ void netdev_update_features(struct net_device *dev= ) + if (dev->features =3D=3D features) + return; +=20 +- netdev_info(dev, "Features changed: 0x%08x -> 0x%08x\n", ++ netdev_dbg(dev, "Features changed: 0x%08x -> 0x%08x\n", + dev->features, features); +=20 + if (dev->netdev_ops->ndo_set_features) +diff --git a/net/core/dst.c b/net/core/dst.c +index 91104d3..b71b7a3 100644 +--- a/net/core/dst.c ++++ b/net/core/dst.c +@@ -314,7 +314,7 @@ void __dst_destroy_metrics_generic(struct dst_entry = *dst, unsigned long old) + { + unsigned long prev, new; +=20 +- new =3D (unsigned long) dst_default_metrics; ++ new =3D ((unsigned long) dst_default_metrics) | DST_METRICS_READ_ONLY; + prev =3D cmpxchg(&dst->_metrics, old, new); + if (prev =3D=3D old) + kfree(__DST_METRICS_PTR(old)); +diff --git a/net/core/ethtool.c b/net/core/ethtool.c +index 74ead9e..f337525 100644 +--- a/net/core/ethtool.c ++++ b/net/core/ethtool.c +@@ -330,7 +330,7 @@ static const char netdev_features_strings[ETHTOOL_DE= V_FEATURE_WORDS * 32][ETH_GS + /* NETIF_F_IP_CSUM */ "tx-checksum-ipv4", + /* NETIF_F_NO_CSUM */ "tx-checksum-unneeded", + /* NETIF_F_HW_CSUM */ "tx-checksum-ip-generic", +- /* NETIF_F_IPV6_CSUM */ "tx_checksum-ipv6", ++ /* NETIF_F_IPV6_CSUM */ "tx-checksum-ipv6", + /* NETIF_F_HIGHDMA */ "highdma", + /* NETIF_F_FRAGLIST */ "tx-scatter-gather-fraglist", + /* NETIF_F_HW_VLAN_TX */ "tx-vlan-hw-insert", +diff --git a/net/core/skbuff.c b/net/core/skbuff.c +index 7ebeed0..3e934fe 100644 +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -2993,6 +2993,9 @@ int sock_queue_err_skb(struct sock *sk, struct sk_= buff *skb) + skb->destructor =3D sock_rmem_free; + atomic_add(skb->truesize, &sk->sk_rmem_alloc); +=20 ++ /* before exiting rcu section, make sure dst is refcounted */ ++ skb_dst_force(skb); ++ + skb_queue_tail(&sk->sk_error_queue, skb); + if (!sock_flag(sk, SOCK_DEAD)) + sk->sk_data_ready(sk, skb->len); +diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c +index 1fd3d9c..57ca93a 100644 +--- a/net/ipv4/igmp.c ++++ b/net/ipv4/igmp.c +@@ -1169,20 +1169,18 @@ static void igmp_group_dropped(struct ip_mc_list= *im) +=20 + if (!in_dev->dead) { + if (IGMP_V1_SEEN(in_dev)) +- goto done; ++ return; + if (IGMP_V2_SEEN(in_dev)) { + if (reporter) + igmp_send_report(in_dev, im, IGMP_HOST_LEAVE_MESSAGE); +- goto done; ++ return; + } + /* IGMPv3 */ + igmpv3_add_delrec(in_dev, im); +=20 + igmp_ifc_event(in_dev); + } +-done: + #endif +- ip_mc_clear_src(im); + } +=20 + static void igmp_group_added(struct ip_mc_list *im) +@@ -1319,6 +1317,7 @@ void ip_mc_dec_group(struct in_device *in_dev, __b= e32 addr) + *ip =3D i->next_rcu; + in_dev->mc_count--; + igmp_group_dropped(i); ++ ip_mc_clear_src(i); +=20 + if (!in_dev->dead) + ip_rt_multicast_event(in_dev); +@@ -1428,7 +1427,8 @@ void ip_mc_destroy_dev(struct in_device *in_dev) + in_dev->mc_list =3D i->next_rcu; + in_dev->mc_count--; +=20 +- igmp_group_dropped(i); ++ /* We've dropped the groups in ip_mc_down already */ ++ ip_mc_clear_src(i); + ip_ma_put(i); + } + } +diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c +index 4404973..3740403 100644 +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -228,11 +228,11 @@ static int ieee80211_get_key(struct wiphy *wiphy, = struct net_device *dev, + goto out; +=20 + if (pairwise) +- key =3D sta->ptk; ++ key =3D rcu_dereference(sta->ptk); + else if (key_idx < NUM_DEFAULT_KEYS) +- key =3D sta->gtk[key_idx]; ++ key =3D rcu_dereference(sta->gtk[key_idx]); + } else +- key =3D sdata->keys[key_idx]; ++ key =3D rcu_dereference(sdata->keys[key_idx]); +=20 + if (!key) + goto out; +@@ -921,8 +921,10 @@ static int ieee80211_change_mpath(struct wiphy *wip= hy, + static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, + struct mpath_info *pinfo) + { +- if (mpath->next_hop) +- memcpy(next_hop, mpath->next_hop->sta.addr, ETH_ALEN); ++ struct sta_info *next_hop_sta =3D rcu_dereference(mpath->next_hop); ++ ++ if (next_hop_sta) ++ memcpy(next_hop, next_hop_sta->sta.addr, ETH_ALEN); + else + memset(next_hop, 0, ETH_ALEN); +=20 +diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c +index 64d92d5..7ffcb55 100644 +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -789,7 +789,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_st= ruct *work) + ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); + } +=20 +- netif_tx_start_all_queues(sdata->dev); ++ netif_tx_wake_all_queues(sdata->dev); + } +=20 + void ieee80211_dynamic_ps_timer(unsigned long data) +diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntra= ck_sip.c +index 237cc19..cb5a285 100644 +--- a/net/netfilter/nf_conntrack_sip.c ++++ b/net/netfilter/nf_conntrack_sip.c +@@ -1419,6 +1419,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsig= ned int protoff, + const char *dptr, *end; + s16 diff, tdiff =3D 0; + int ret =3D NF_ACCEPT; ++ bool term; + typeof(nf_nat_sip_seq_adjust_hook) nf_nat_sip_seq_adjust; +=20 + if (ctinfo !=3D IP_CT_ESTABLISHED && +@@ -1453,14 +1454,21 @@ static int sip_help_tcp(struct sk_buff *skb, uns= igned int protoff, + if (dptr + matchoff =3D=3D end) + break; +=20 +- if (end + strlen("\r\n\r\n") > dptr + datalen) +- break; +- if (end[0] !=3D '\r' || end[1] !=3D '\n' || +- end[2] !=3D '\r' || end[3] !=3D '\n') ++ term =3D false; ++ for (; end + strlen("\r\n\r\n") <=3D dptr + datalen; end++) { ++ if (end[0] =3D=3D '\r' && end[1] =3D=3D '\n' && ++ end[2] =3D=3D '\r' && end[3] =3D=3D '\n') { ++ term =3D true; ++ break; ++ } ++ } ++ if (!term) + break; + end +=3D strlen("\r\n\r\n") + clen; +=20 + msglen =3D origlen =3D end - dptr; ++ if (msglen > datalen) ++ return NF_DROP; +=20 + ret =3D process_sip_msg(skb, ct, dataoff, &dptr, &msglen); + if (ret !=3D NF_ACCEPT) +diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c +index c2e628d..6d96275 100644 +--- a/net/sched/sch_sfq.c ++++ b/net/sched/sch_sfq.c +@@ -361,7 +361,7 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch) + { + struct sfq_sched_data *q =3D qdisc_priv(sch); + unsigned int hash; +- sfq_index x; ++ sfq_index x, qlen; + struct sfq_slot *slot; + int uninitialized_var(ret); +=20 +@@ -405,20 +405,12 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch= ) + if (++sch->q.qlen <=3D q->limit) + return NET_XMIT_SUCCESS; +=20 ++ qlen =3D slot->qlen; + sfq_drop(sch); +- return NET_XMIT_CN; +-} +- +-static struct sk_buff * +-sfq_peek(struct Qdisc *sch) +-{ +- struct sfq_sched_data *q =3D qdisc_priv(sch); +- +- /* No active slots */ +- if (q->tail =3D=3D NULL) +- return NULL; +- +- return q->slots[q->tail->next].skblist_next; ++ /* Return Congestion Notification only if we dropped a packet ++ * from this flow. ++ */ ++ return (qlen !=3D slot->qlen) ? NET_XMIT_CN : NET_XMIT_SUCCESS; + } +=20 + static struct sk_buff * +@@ -702,7 +694,7 @@ static struct Qdisc_ops sfq_qdisc_ops __read_mostly = =3D { + .priv_size =3D sizeof(struct sfq_sched_data), + .enqueue =3D sfq_enqueue, + .dequeue =3D sfq_dequeue, +- .peek =3D sfq_peek, ++ .peek =3D qdisc_peek_dequeued, + .drop =3D sfq_drop, + .init =3D sfq_init, + .reset =3D sfq_reset, +diff --git a/net/sctp/associola.c b/net/sctp/associola.c +index 1a21c57..525f97c 100644 +--- a/net/sctp/associola.c ++++ b/net/sctp/associola.c +@@ -64,6 +64,7 @@ + /* Forward declarations for internal functions. */ + static void sctp_assoc_bh_rcv(struct work_struct *work); + static void sctp_assoc_free_asconf_acks(struct sctp_association *asoc); ++static void sctp_assoc_free_asconf_queue(struct sctp_association *asoc)= ; +=20 + /* Keep track of the new idr low so that we don't re-use association id + * numbers too fast. It is protected by they idr spin lock is in the +@@ -446,6 +447,9 @@ void sctp_association_free(struct sctp_association *= asoc) + /* Free any cached ASCONF_ACK chunk. */ + sctp_assoc_free_asconf_acks(asoc); +=20 ++ /* Free the ASCONF queue. */ ++ sctp_assoc_free_asconf_queue(asoc); ++ + /* Free any cached ASCONF chunk. */ + if (asoc->addip_last_asconf) + sctp_chunk_free(asoc->addip_last_asconf); +@@ -1578,6 +1582,18 @@ retry: + return error; + } +=20 ++/* Free the ASCONF queue */ ++static void sctp_assoc_free_asconf_queue(struct sctp_association *asoc) ++{ ++ struct sctp_chunk *asconf; ++ struct sctp_chunk *tmp; ++ ++ list_for_each_entry_safe(asconf, tmp, &asoc->addip_chunk_list, list) { ++ list_del_init(&asconf->list); ++ sctp_chunk_free(asconf); ++ } ++} ++ + /* Free asconf_ack cache */ + static void sctp_assoc_free_asconf_acks(struct sctp_association *asoc) + { +diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c +index faf71d1..6150ac5 100644 +--- a/net/sctp/bind_addr.c ++++ b/net/sctp/bind_addr.c +@@ -140,14 +140,12 @@ void sctp_bind_addr_init(struct sctp_bind_addr *bp= , __u16 port) + /* Dispose of the address list. */ + static void sctp_bind_addr_clean(struct sctp_bind_addr *bp) + { +- struct sctp_sockaddr_entry *addr; +- struct list_head *pos, *temp; ++ struct sctp_sockaddr_entry *addr, *temp; +=20 + /* Empty the bind address list. */ +- list_for_each_safe(pos, temp, &bp->address_list) { +- addr =3D list_entry(pos, struct sctp_sockaddr_entry, list); +- list_del(pos); +- kfree(addr); ++ list_for_each_entry_safe(addr, temp, &bp->address_list, list) { ++ list_del_rcu(&addr->list); ++ call_rcu(&addr->rcu, sctp_local_addr_free); + SCTP_DBG_OBJCNT_DEC(addr); + } + } +diff --git a/net/socket.c b/net/socket.c +index 310d16b..65b2310 100644 +--- a/net/socket.c ++++ b/net/socket.c +@@ -2122,14 +2122,16 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user= *mmsg, unsigned int vlen, + */ + if (MSG_CMSG_COMPAT & flags) { + err =3D __sys_recvmsg(sock, (struct msghdr __user *)compat_entry, +- &msg_sys, flags, datagrams); ++ &msg_sys, flags & ~MSG_WAITFORONE, ++ datagrams); + if (err < 0) + break; + err =3D __put_user(err, &compat_entry->msg_len); + ++compat_entry; + } else { + err =3D __sys_recvmsg(sock, (struct msghdr __user *)entry, +- &msg_sys, flags, datagrams); ++ &msg_sys, flags & ~MSG_WAITFORONE, ++ datagrams); + if (err < 0) + break; + err =3D put_user(err, &entry->msg_len); +diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c +index bf005d3..f34f5ab 100644 +--- a/net/sunrpc/xprtsock.c ++++ b/net/sunrpc/xprtsock.c +@@ -1344,7 +1344,6 @@ static void xs_tcp_state_change(struct sock *sk) + case TCP_CLOSE_WAIT: + /* The server initiated a shutdown of the socket */ + xprt_force_disconnect(xprt); +- case TCP_SYN_SENT: + xprt->connect_cookie++; + case TCP_CLOSING: + /* +@@ -1758,6 +1757,7 @@ static void xs_tcp_reuse_connection(struct sock_xp= rt *transport) + static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socke= t *sock) + { + struct sock_xprt *transport =3D container_of(xprt, struct sock_xprt, x= prt); ++ int ret =3D -ENOTCONN; +=20 + if (!transport->inet) { + struct sock *sk =3D sock->sk; +@@ -1789,12 +1789,22 @@ static int xs_tcp_finish_connecting(struct rpc_x= prt *xprt, struct socket *sock) + } +=20 + if (!xprt_bound(xprt)) +- return -ENOTCONN; ++ goto out; +=20 + /* Tell the socket layer to start connecting... */ + xprt->stat.connect_count++; + xprt->stat.connect_start =3D jiffies; +- return kernel_connect(sock, xs_addr(xprt), xprt->addrlen, O_NONBLOCK); ++ ret =3D kernel_connect(sock, xs_addr(xprt), xprt->addrlen, O_NONBLOCK)= ; ++ switch (ret) { ++ case 0: ++ case -EINPROGRESS: ++ /* SYN_SENT! */ ++ xprt->connect_cookie++; ++ if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO) ++ xprt->reestablish_timeout =3D XS_TCP_INIT_REEST_TO; ++ } ++out: ++ return ret; + } +=20 + /** +diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c +index 4ebce42..2c70a1e 100644 +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -1679,14 +1679,6 @@ static int nl80211_set_key(struct sk_buff *skb, s= truct genl_info *info) + if (err) + goto out; +=20 +- if (!(rdev->wiphy.flags & +- WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS)) { +- if (!key.def_uni || !key.def_multi) { +- err =3D -EOPNOTSUPP; +- goto out; +- } +- } +- + err =3D rdev->ops->set_default_key(&rdev->wiphy, dev, key.idx, + key.def_uni, key.def_multi); +=20 +diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c +index ae3a698..ec1bcec 100644 +--- a/security/apparmor/lsm.c ++++ b/security/apparmor/lsm.c +@@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct *= task, char *name, + sa.aad.op =3D OP_SETPROCATTR; + sa.aad.info =3D name; + sa.aad.error =3D -EINVAL; +- return aa_audit(AUDIT_APPARMOR_DENIED, NULL, GFP_KERNEL, ++ return aa_audit(AUDIT_APPARMOR_DENIED, ++ __aa_current_profile(), GFP_KERNEL, + &sa, NULL); + } + } else if (strcmp(name, "exec") =3D=3D 0) { +diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c +index 930634e..7a0c586 100644 +--- a/security/keys/process_keys.c ++++ b/security/keys/process_keys.c +@@ -845,6 +845,7 @@ void key_replace_session_keyring(void) + new-> sgid =3D old-> sgid; + new->fsgid =3D old->fsgid; + new->user =3D get_uid(old->user); ++ new->user_ns =3D new->user->user_ns; + new->group_info =3D get_group_info(old->group_info); +=20 + new->securebits =3D old->securebits; +diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c +index 70a9d32..f5cad7c 100644 +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2349,9 +2349,16 @@ static int __devinit check_position_fix(struct az= x *chip, int fix) + /* Check VIA/ATI HD Audio Controller exist */ + switch (chip->driver_type) { + case AZX_DRIVER_VIA: +- case AZX_DRIVER_ATI: + /* Use link position directly, avoid any transfer problem. */ + return POS_FIX_VIACOMBO; ++ case AZX_DRIVER_ATI: ++ /* ATI chipsets don't work well with position-buffer */ ++ return POS_FIX_LPIB; ++ case AZX_DRIVER_GENERIC: ++ /* AMD chipsets also don't work with position-buffer */ ++ if (chip->pci->vendor =3D=3D PCI_VENDOR_ID_AMD) ++ return POS_FIX_LPIB; ++ break; + } +=20 + return POS_FIX_AUTO; +diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c +index 2942d2a..9f886bf 100644 +--- a/sound/pci/hda/patch_analog.c ++++ b/sound/pci/hda/patch_analog.c +@@ -3070,6 +3070,7 @@ static void ad1988_auto_init_analog_input(struct h= da_codec *codec) +=20 + for (i =3D 0; i < cfg->num_inputs; i++) { + hda_nid_t nid =3D cfg->inputs[i].pin; ++ int type =3D cfg->inputs[i].type; + switch (nid) { + case 0x15: /* port-C */ + snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0); +@@ -3079,7 +3080,7 @@ static void ad1988_auto_init_analog_input(struct h= da_codec *codec) + break; + } + snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, +- i =3D=3D AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN); ++ type =3D=3D AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN); + if (nid !=3D AD1988_PIN_CD_NID) + snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, + AMP_OUT_MUTE); +diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexa= nt.c +index ad97d93..15b9d16 100644 +--- a/sound/pci/hda/patch_conexant.c ++++ b/sound/pci/hda/patch_conexant.c +@@ -3036,6 +3036,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] =3D = { + SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD), ++ SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS), + SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS), + SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", CXT5066_IDEAPAD), /* Fallback f= or Lenovos without dock mic */ + {} +diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmat= el.c +index 94d19c0..1e32235 100644 +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -1600,7 +1600,7 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[]= =3D { + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe, + "Dell Studio XPS 1645", STAC_DELL_M6_BOTH), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413, +- "Dell Studio 1558", STAC_DELL_M6_BOTH), ++ "Dell Studio 1558", STAC_DELL_M6_DMIC), + {} /* terminator */ + }; +=20 +diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c +index 4005e9a..e55b298 100644 +--- a/sound/soc/codecs/wm_hubs.c ++++ b/sound/soc/codecs/wm_hubs.c +@@ -787,17 +787,17 @@ static const struct snd_soc_dapm_route analogue_ro= utes[] =3D { + static const struct snd_soc_dapm_route lineout1_diff_routes[] =3D { + { "LINEOUT1 Mixer", "IN1L Switch", "IN1L PGA" }, + { "LINEOUT1 Mixer", "IN1R Switch", "IN1R PGA" }, +- { "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" }, ++ { "LINEOUT1 Mixer", "Output Switch", "Left Output PGA" }, +=20 + { "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" }, + { "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" }, + }; +=20 + static const struct snd_soc_dapm_route lineout1_se_routes[] =3D { +- { "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" }, +- { "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" }, ++ { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" }, ++ { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" }, +=20 +- { "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" }, ++ { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" }, +=20 + { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" }, + { "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" }, +@@ -806,17 +806,17 @@ static const struct snd_soc_dapm_route lineout1_se= _routes[] =3D { + static const struct snd_soc_dapm_route lineout2_diff_routes[] =3D { + { "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" }, + { "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" }, +- { "LINEOUT2 Mixer", "Output Switch", "Right Output Mixer" }, ++ { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" }, +=20 + { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" }, + { "LINEOUT2P Driver", NULL, "LINEOUT2 Mixer" }, + }; +=20 + static const struct snd_soc_dapm_route lineout2_se_routes[] =3D { +- { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" }, +- { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" }, ++ { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" }, ++ { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" }, +=20 +- { "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" }, ++ { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" }, +=20 + { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" }, + { "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" }, +@@ -836,17 +836,21 @@ int wm_hubs_add_analogue_controls(struct snd_soc_c= odec *codec) + snd_soc_update_bits(codec, WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, + WM8993_IN2_VU, WM8993_IN2_VU); +=20 ++ snd_soc_update_bits(codec, WM8993_SPEAKER_VOLUME_LEFT, ++ WM8993_SPKOUT_VU, WM8993_SPKOUT_VU); + snd_soc_update_bits(codec, WM8993_SPEAKER_VOLUME_RIGHT, + WM8993_SPKOUT_VU, WM8993_SPKOUT_VU); +=20 + snd_soc_update_bits(codec, WM8993_LEFT_OUTPUT_VOLUME, +- WM8993_HPOUT1L_ZC, WM8993_HPOUT1L_ZC); ++ WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC, ++ WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC); + snd_soc_update_bits(codec, WM8993_RIGHT_OUTPUT_VOLUME, + WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC, + WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC); +=20 + snd_soc_update_bits(codec, WM8993_LEFT_OPGA_VOLUME, +- WM8993_MIXOUTL_ZC, WM8993_MIXOUTL_ZC); ++ WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU, ++ WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU); + snd_soc_update_bits(codec, WM8993_RIGHT_OPGA_VOLUME, + WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU, + WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU); +diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c +index 2afabaf..1a591f1 100644 +--- a/sound/soc/pxa/raumfeld.c ++++ b/sound/soc/pxa/raumfeld.c +@@ -151,13 +151,13 @@ static struct snd_soc_ops raumfeld_cs4270_ops =3D = { + .hw_params =3D raumfeld_cs4270_hw_params, + }; +=20 +-static int raumfeld_line_suspend(struct snd_soc_card *card) ++static int raumfeld_analog_suspend(struct snd_soc_card *card) + { + raumfeld_enable_audio(false); + return 0; + } +=20 +-static int raumfeld_line_resume(struct snd_soc_card *card) ++static int raumfeld_analog_resume(struct snd_soc_card *card) + { + raumfeld_enable_audio(true); + return 0; +@@ -225,32 +225,53 @@ static struct snd_soc_ops raumfeld_ak4104_ops =3D = { + .hw_params =3D raumfeld_ak4104_hw_params, + }; +=20 +-static struct snd_soc_dai_link raumfeld_dai[] =3D { ++#define DAI_LINK_CS4270 \ ++{ \ ++ .name =3D "CS4270", \ ++ .stream_name =3D "CS4270", \ ++ .cpu_dai_name =3D "pxa-ssp-dai.0", \ ++ .platform_name =3D "pxa-pcm-audio", \ ++ .codec_dai_name =3D "cs4270-hifi", \ ++ .codec_name =3D "cs4270-codec.0-0048", \ ++ .ops =3D &raumfeld_cs4270_ops, \ ++} ++ ++#define DAI_LINK_AK4104 \ ++{ \ ++ .name =3D "ak4104", \ ++ .stream_name =3D "Playback", \ ++ .cpu_dai_name =3D "pxa-ssp-dai.1", \ ++ .codec_dai_name =3D "ak4104-hifi", \ ++ .platform_name =3D "pxa-pcm-audio", \ ++ .ops =3D &raumfeld_ak4104_ops, \ ++ .codec_name =3D "spi0.0", \ ++} ++ ++static struct snd_soc_dai_link snd_soc_raumfeld_connector_dai[] =3D + { +- .name =3D "ak4104", +- .stream_name =3D "Playback", +- .cpu_dai_name =3D "pxa-ssp-dai.1", +- .codec_dai_name =3D "ak4104-hifi", +- .platform_name =3D "pxa-pcm-audio", +- .ops =3D &raumfeld_ak4104_ops, +- .codec_name =3D "ak4104-codec.0", +-}, ++ DAI_LINK_CS4270, ++ DAI_LINK_AK4104, ++}; ++ ++static struct snd_soc_dai_link snd_soc_raumfeld_speaker_dai[] =3D + { +- .name =3D "CS4270", +- .stream_name =3D "CS4270", +- .cpu_dai_name =3D "pxa-ssp-dai.0", +- .platform_name =3D "pxa-pcm-audio", +- .codec_dai_name =3D "cs4270-hifi", +- .codec_name =3D "cs4270-codec.0-0048", +- .ops =3D &raumfeld_cs4270_ops, +-},}; +- +-static struct snd_soc_card snd_soc_raumfeld =3D { +- .name =3D "Raumfeld", +- .dai_link =3D raumfeld_dai, +- .suspend_post =3D raumfeld_line_suspend, +- .resume_pre =3D raumfeld_line_resume, +- .num_links =3D ARRAY_SIZE(raumfeld_dai), ++ DAI_LINK_CS4270, ++}; ++ ++static struct snd_soc_card snd_soc_raumfeld_connector =3D { ++ .name =3D "Raumfeld Connector", ++ .dai_link =3D snd_soc_raumfeld_connector_dai, ++ .num_links =3D ARRAY_SIZE(snd_soc_raumfeld_connector_dai), ++ .suspend_post =3D raumfeld_analog_suspend, ++ .resume_pre =3D raumfeld_analog_resume, ++}; ++ ++static struct snd_soc_card snd_soc_raumfeld_speaker =3D { ++ .name =3D "Raumfeld Speaker", ++ .dai_link =3D snd_soc_raumfeld_speaker_dai, ++ .num_links =3D ARRAY_SIZE(snd_soc_raumfeld_speaker_dai), ++ .suspend_post =3D raumfeld_analog_suspend, ++ .resume_pre =3D raumfeld_analog_resume, + }; +=20 + static struct platform_device *raumfeld_audio_device; +@@ -271,22 +292,25 @@ static int __init raumfeld_audio_init(void) +=20 + set_max9485_clk(MAX9485_MCLK_FREQ_122880); +=20 +- /* Register LINE and SPDIF */ ++ /* Register analog device */ + raumfeld_audio_device =3D platform_device_alloc("soc-audio", 0); + if (!raumfeld_audio_device) + return -ENOMEM; +=20 +- platform_set_drvdata(raumfeld_audio_device, +- &snd_soc_raumfeld); +- ret =3D platform_device_add(raumfeld_audio_device); +- +- /* no S/PDIF on Speakers */ + if (machine_is_raumfeld_speaker()) ++ platform_set_drvdata(raumfeld_audio_device, ++ &snd_soc_raumfeld_speaker); ++ ++ if (machine_is_raumfeld_connector()) ++ platform_set_drvdata(raumfeld_audio_device, ++ &snd_soc_raumfeld_connector); ++ ++ ret =3D platform_device_add(raumfeld_audio_device); ++ if (ret < 0) + return ret; +=20 + raumfeld_enable_audio(true); +- +- return ret; ++ return 0; + } +=20 + static void __exit raumfeld_audio_exit(void) diff --git a/2.6.39/4420_grsecurity-2.2.2-2.6.39-201105251736.patch b/2.6= .39/4420_grsecurity-2.2.2-2.6.39.1-201106042120.patch similarity index 83% rename from 2.6.39/4420_grsecurity-2.2.2-2.6.39-201105251736.patch rename to 2.6.39/4420_grsecurity-2.2.2-2.6.39.1-201106042120.patch index 5d901de..83c2bb1 100644 --- a/2.6.39/4420_grsecurity-2.2.2-2.6.39-201105251736.patch +++ b/2.6.39/4420_grsecurity-2.2.2-2.6.39.1-201106042120.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.39/arch/alpha/include/asm/dma-mapping.h linux-2.6.3= 9/arch/alpha/include/asm/dma-mapping.h ---- linux-2.6.39/arch/alpha/include/asm/dma-mapping.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/alpha/include/asm/dma-mapping.h 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/include/asm/dma-mapping.h linux-2.6= .39.1/arch/alpha/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/alpha/include/asm/dma-mapping.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/alpha/include/asm/dma-mapping.h 2011-05-22 19:36= :30.000000000 -0400 @@ -3,9 +3,9 @@ =20 #include @@ -13,9 +13,9 @@ diff -urNp linux-2.6.39/arch/alpha/include/asm/dma-mapp= ing.h linux-2.6.39/arch/a { return dma_ops; } -diff -urNp linux-2.6.39/arch/alpha/include/asm/elf.h linux-2.6.39/arch/a= lpha/include/asm/elf.h ---- linux-2.6.39/arch/alpha/include/asm/elf.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/alpha/include/asm/elf.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/include/asm/elf.h linux-2.6.39.1/ar= ch/alpha/include/asm/elf.h +--- linux-2.6.39.1/arch/alpha/include/asm/elf.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/alpha/include/asm/elf.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -30,9 +30,9 @@ diff -urNp linux-2.6.39/arch/alpha/include/asm/elf.h li= nux-2.6.39/arch/alpha/inc /* $0 is set by ld.so to a pointer to a function which might be=20 registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.39/arch/alpha/include/asm/pgtable.h linux-2.6.39/ar= ch/alpha/include/asm/pgtable.h ---- linux-2.6.39/arch/alpha/include/asm/pgtable.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/alpha/include/asm/pgtable.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/include/asm/pgtable.h linux-2.6.39.= 1/arch/alpha/include/asm/pgtable.h +--- linux-2.6.39.1/arch/alpha/include/asm/pgtable.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/alpha/include/asm/pgtable.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) @@ -51,9 +51,9 @@ diff -urNp linux-2.6.39/arch/alpha/include/asm/pgtable.= h linux-2.6.39/arch/alpha #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAG= E_KWE) =20 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.39/arch/alpha/kernel/core_apecs.c linux-2.6.39/arch= /alpha/kernel/core_apecs.c ---- linux-2.6.39/arch/alpha/kernel/core_apecs.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_apecs.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_apecs.c linux-2.6.39.1/= arch/alpha/kernel/core_apecs.c +--- linux-2.6.39.1/arch/alpha/kernel/core_apecs.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_apecs.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -305,7 +305,7 @@ apecs_write_config(struct pci_bus *bus,=20 return PCIBIOS_SUCCESSFUL; } @@ -63,9 +63,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_apecs.c = linux-2.6.39/arch/alpha/k { .read =3D apecs_read_config, .write =3D apecs_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_cia.c linux-2.6.39/arch/a= lpha/kernel/core_cia.c ---- linux-2.6.39/arch/alpha/kernel/core_cia.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_cia.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_cia.c linux-2.6.39.1/ar= ch/alpha/kernel/core_cia.c +--- linux-2.6.39.1/arch/alpha/kernel/core_cia.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_cia.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -239,7 +239,7 @@ cia_write_config(struct pci_bus *bus, un return PCIBIOS_SUCCESSFUL; } @@ -75,9 +75,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_cia.c li= nux-2.6.39/arch/alpha/ker { .read =3D cia_read_config, .write =3D cia_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_irongate.c linux-2.6.39/a= rch/alpha/kernel/core_irongate.c ---- linux-2.6.39/arch/alpha/kernel/core_irongate.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_irongate.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_irongate.c linux-2.6.39= .1/arch/alpha/kernel/core_irongate.c +--- linux-2.6.39.1/arch/alpha/kernel/core_irongate.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_irongate.c 2011-05-22 19:36:30= .000000000 -0400 @@ -155,7 +155,7 @@ irongate_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } @@ -87,9 +87,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_irongate= .c linux-2.6.39/arch/alph { .read =3D irongate_read_config, .write =3D irongate_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_lca.c linux-2.6.39/arch/a= lpha/kernel/core_lca.c ---- linux-2.6.39/arch/alpha/kernel/core_lca.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_lca.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_lca.c linux-2.6.39.1/ar= ch/alpha/kernel/core_lca.c +--- linux-2.6.39.1/arch/alpha/kernel/core_lca.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_lca.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -231,7 +231,7 @@ lca_write_config(struct pci_bus *bus, un return PCIBIOS_SUCCESSFUL; } @@ -99,9 +99,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_lca.c li= nux-2.6.39/arch/alpha/ker { .read =3D lca_read_config, .write =3D lca_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_marvel.c linux-2.6.39/arc= h/alpha/kernel/core_marvel.c ---- linux-2.6.39/arch/alpha/kernel/core_marvel.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_marvel.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_marvel.c linux-2.6.39.1= /arch/alpha/kernel/core_marvel.c +--- linux-2.6.39.1/arch/alpha/kernel/core_marvel.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_marvel.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -588,7 +588,7 @@ marvel_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } @@ -111,9 +111,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_marvel= .c linux-2.6.39/arch/alpha/ { .read =3D marvel_read_config, .write =3D marvel_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_mcpcia.c linux-2.6.39/arc= h/alpha/kernel/core_mcpcia.c ---- linux-2.6.39/arch/alpha/kernel/core_mcpcia.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_mcpcia.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_mcpcia.c linux-2.6.39.1= /arch/alpha/kernel/core_mcpcia.c +--- linux-2.6.39.1/arch/alpha/kernel/core_mcpcia.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_mcpcia.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -235,7 +235,7 @@ mcpcia_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } @@ -123,9 +123,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_mcpcia= .c linux-2.6.39/arch/alpha/ { .read =3D mcpcia_read_config, .write =3D mcpcia_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_polaris.c linux-2.6.39/ar= ch/alpha/kernel/core_polaris.c ---- linux-2.6.39/arch/alpha/kernel/core_polaris.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_polaris.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_polaris.c linux-2.6.39.= 1/arch/alpha/kernel/core_polaris.c +--- linux-2.6.39.1/arch/alpha/kernel/core_polaris.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_polaris.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -136,7 +136,7 @@ polaris_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } @@ -135,9 +135,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_polari= s.c linux-2.6.39/arch/alpha { .read =3D polaris_read_config, .write =3D polaris_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_t2.c linux-2.6.39/arch/al= pha/kernel/core_t2.c ---- linux-2.6.39/arch/alpha/kernel/core_t2.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_t2.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_t2.c linux-2.6.39.1/arc= h/alpha/kernel/core_t2.c +--- linux-2.6.39.1/arch/alpha/kernel/core_t2.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_t2.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -314,7 +314,7 @@ t2_write_config(struct pci_bus *bus, uns return PCIBIOS_SUCCESSFUL; } @@ -147,9 +147,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_t2.c l= inux-2.6.39/arch/alpha/kern { .read =3D t2_read_config, .write =3D t2_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_titan.c linux-2.6.39/arch= /alpha/kernel/core_titan.c ---- linux-2.6.39/arch/alpha/kernel/core_titan.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_titan.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_titan.c linux-2.6.39.1/= arch/alpha/kernel/core_titan.c +--- linux-2.6.39.1/arch/alpha/kernel/core_titan.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_titan.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -191,7 +191,7 @@ titan_write_config(struct pci_bus *bus,=20 return PCIBIOS_SUCCESSFUL; } @@ -159,9 +159,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_titan.= c linux-2.6.39/arch/alpha/k { .read =3D titan_read_config, .write =3D titan_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_tsunami.c linux-2.6.39/ar= ch/alpha/kernel/core_tsunami.c ---- linux-2.6.39/arch/alpha/kernel/core_tsunami.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_tsunami.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_tsunami.c linux-2.6.39.= 1/arch/alpha/kernel/core_tsunami.c +--- linux-2.6.39.1/arch/alpha/kernel/core_tsunami.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_tsunami.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -166,7 +166,7 @@ tsunami_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } @@ -171,9 +171,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_tsunam= i.c linux-2.6.39/arch/alpha { .read =3D tsunami_read_config, .write =3D tsunami_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/core_wildfire.c linux-2.6.39/a= rch/alpha/kernel/core_wildfire.c ---- linux-2.6.39/arch/alpha/kernel/core_wildfire.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/core_wildfire.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/core_wildfire.c linux-2.6.39= .1/arch/alpha/kernel/core_wildfire.c +--- linux-2.6.39.1/arch/alpha/kernel/core_wildfire.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/core_wildfire.c 2011-05-22 19:36:30= .000000000 -0400 @@ -431,7 +431,7 @@ wildfire_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } @@ -183,9 +183,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/core_wildfi= re.c linux-2.6.39/arch/alph { .read =3D wildfire_read_config, .write =3D wildfire_write_config, -diff -urNp linux-2.6.39/arch/alpha/kernel/module.c linux-2.6.39/arch/alp= ha/kernel/module.c ---- linux-2.6.39/arch/alpha/kernel/module.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/alpha/kernel/module.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/module.c linux-2.6.39.1/arch= /alpha/kernel/module.c +--- linux-2.6.39.1/arch/alpha/kernel/module.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/module.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,=20 =20 /* The small sections were sorted to the end of the segment. @@ -195,9 +195,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/module.c li= nux-2.6.39/arch/alpha/kerne got =3D sechdrs[me->arch.gotsecindex].sh_addr; =20 for (i =3D 0; i < n; i++) { -diff -urNp linux-2.6.39/arch/alpha/kernel/osf_sys.c linux-2.6.39/arch/al= pha/kernel/osf_sys.c ---- linux-2.6.39/arch/alpha/kernel/osf_sys.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/alpha/kernel/osf_sys.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/osf_sys.c linux-2.6.39.1/arc= h/alpha/kernel/osf_sys.c +--- linux-2.6.39.1/arch/alpha/kernel/osf_sys.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/osf_sys.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -1142,7 +1142,7 @@ arch_get_unmapped_area_1(unsigned long a /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) @@ -229,9 +229,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/osf_sys.c l= inux-2.6.39/arch/alpha/kern if (addr !=3D (unsigned long) -ENOMEM) return addr; =20 -diff -urNp linux-2.6.39/arch/alpha/kernel/pci_iommu.c linux-2.6.39/arch/= alpha/kernel/pci_iommu.c ---- linux-2.6.39/arch/alpha/kernel/pci_iommu.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/pci_iommu.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/pci_iommu.c linux-2.6.39.1/a= rch/alpha/kernel/pci_iommu.c +--- linux-2.6.39.1/arch/alpha/kernel/pci_iommu.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/pci_iommu.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev return 0; } @@ -248,9 +248,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/pci_iommu.c= linux-2.6.39/arch/alpha/ke -struct dma_map_ops *dma_ops =3D &alpha_pci_ops; +const struct dma_map_ops *dma_ops =3D &alpha_pci_ops; EXPORT_SYMBOL(dma_ops); -diff -urNp linux-2.6.39/arch/alpha/kernel/pci-noop.c linux-2.6.39/arch/a= lpha/kernel/pci-noop.c ---- linux-2.6.39/arch/alpha/kernel/pci-noop.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/alpha/kernel/pci-noop.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/pci-noop.c linux-2.6.39.1/ar= ch/alpha/kernel/pci-noop.c +--- linux-2.6.39.1/arch/alpha/kernel/pci-noop.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/pci-noop.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de return 0; } @@ -269,9 +269,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/pci-noop.c = linux-2.6.39/arch/alpha/ker EXPORT_SYMBOL(dma_ops); =20 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max= len) -diff -urNp linux-2.6.39/arch/alpha/kernel/proto.h linux-2.6.39/arch/alph= a/kernel/proto.h ---- linux-2.6.39/arch/alpha/kernel/proto.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/alpha/kernel/proto.h 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/alpha/kernel/proto.h linux-2.6.39.1/arch/= alpha/kernel/proto.h +--- linux-2.6.39.1/arch/alpha/kernel/proto.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/alpha/kernel/proto.h 2011-05-22 19:36:30.0000000= 00 -0400 @@ -17,14 +17,14 @@ struct pci_dev; struct pci_controller; =20 @@ -363,9 +363,9 @@ diff -urNp linux-2.6.39/arch/alpha/kernel/proto.h lin= ux-2.6.39/arch/alpha/kernel extern void wildfire_init_arch(void); extern void wildfire_kill_arch(int); extern void wildfire_machine_check(unsigned long vector, unsigned long = la_ptr); -diff -urNp linux-2.6.39/arch/alpha/mm/fault.c linux-2.6.39/arch/alpha/mm= /fault.c ---- linux-2.6.39/arch/alpha/mm/fault.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/alpha/mm/fault.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/alpha/mm/fault.c linux-2.6.39.1/arch/alph= a/mm/fault.c +--- linux-2.6.39.1/arch/alpha/mm/fault.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/alpha/mm/fault.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -522,9 +522,9 @@ diff -urNp linux-2.6.39/arch/alpha/mm/fault.c linux-2= .6.39/arch/alpha/mm/fault.c } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.39/arch/arm/common/it8152.c linux-2.6.39/arch/arm/c= ommon/it8152.c ---- linux-2.6.39/arch/arm/common/it8152.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/arm/common/it8152.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/arm/common/it8152.c linux-2.6.39.1/arch/a= rm/common/it8152.c +--- linux-2.6.39.1/arch/arm/common/it8152.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/arm/common/it8152.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -221,7 +221,7 @@ static int it8152_pci_write_config(struc return PCIBIOS_SUCCESSFUL; } @@ -534,9 +534,9 @@ diff -urNp linux-2.6.39/arch/arm/common/it8152.c linu= x-2.6.39/arch/arm/common/it .read =3D it8152_pci_read_config, .write =3D it8152_pci_write_config, }; -diff -urNp linux-2.6.39/arch/arm/common/via82c505.c linux-2.6.39/arch/ar= m/common/via82c505.c ---- linux-2.6.39/arch/arm/common/via82c505.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/arm/common/via82c505.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/arm/common/via82c505.c linux-2.6.39.1/arc= h/arm/common/via82c505.c +--- linux-2.6.39.1/arch/arm/common/via82c505.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/arm/common/via82c505.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -52,7 +52,7 @@ via82c505_write_config(struct pci_bus *b return PCIBIOS_SUCCESSFUL; } @@ -546,9 +546,9 @@ diff -urNp linux-2.6.39/arch/arm/common/via82c505.c l= inux-2.6.39/arch/arm/common .read =3D via82c505_read_config, .write =3D via82c505_write_config, }; -diff -urNp linux-2.6.39/arch/arm/include/asm/cacheflush.h linux-2.6.39/a= rch/arm/include/asm/cacheflush.h ---- linux-2.6.39/arch/arm/include/asm/cacheflush.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/arm/include/asm/cacheflush.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/include/asm/cacheflush.h linux-2.6.39= .1/arch/arm/include/asm/cacheflush.h +--- linux-2.6.39.1/arch/arm/include/asm/cacheflush.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/arm/include/asm/cacheflush.h 2011-05-22 19:36:30= .000000000 -0400 @@ -115,7 +115,7 @@ struct cpu_cache_fns { */ #ifdef MULTI_CACHE @@ -558,9 +558,9 @@ diff -urNp linux-2.6.39/arch/arm/include/asm/cacheflu= sh.h linux-2.6.39/arch/arm/ =20 #define __cpuc_flush_icache_all cpu_cache.flush_icache_all #define __cpuc_flush_kern_all cpu_cache.flush_kern_all -diff -urNp linux-2.6.39/arch/arm/include/asm/elf.h linux-2.6.39/arch/arm= /include/asm/elf.h ---- linux-2.6.39/arch/arm/include/asm/elf.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/arm/include/asm/elf.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/arm/include/asm/elf.h linux-2.6.39.1/arch= /arm/include/asm/elf.h +--- linux-2.6.39.1/arch/arm/include/asm/elf.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/arm/include/asm/elf.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -588,9 +588,9 @@ diff -urNp linux-2.6.39/arch/arm/include/asm/elf.h li= nux-2.6.39/arch/arm/include extern int vectors_user_mapping(void); #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_map= ping() #define ARCH_HAS_SETUP_ADDITIONAL_PAGES -diff -urNp linux-2.6.39/arch/arm/include/asm/kmap_types.h linux-2.6.39/a= rch/arm/include/asm/kmap_types.h ---- linux-2.6.39/arch/arm/include/asm/kmap_types.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/arm/include/asm/kmap_types.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/include/asm/kmap_types.h linux-2.6.39= .1/arch/arm/include/asm/kmap_types.h +--- linux-2.6.39.1/arch/arm/include/asm/kmap_types.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/arm/include/asm/kmap_types.h 2011-05-22 19:36:30= .000000000 -0400 @@ -21,6 +21,7 @@ enum km_type { KM_L1_CACHE, KM_L2_CACHE, @@ -599,9 +599,9 @@ diff -urNp linux-2.6.39/arch/arm/include/asm/kmap_typ= es.h linux-2.6.39/arch/arm/ KM_TYPE_NR }; =20 -diff -urNp linux-2.6.39/arch/arm/include/asm/outercache.h linux-2.6.39/a= rch/arm/include/asm/outercache.h ---- linux-2.6.39/arch/arm/include/asm/outercache.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/arm/include/asm/outercache.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/include/asm/outercache.h linux-2.6.39= .1/arch/arm/include/asm/outercache.h +--- linux-2.6.39.1/arch/arm/include/asm/outercache.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/arm/include/asm/outercache.h 2011-05-22 19:36:30= .000000000 -0400 @@ -38,7 +38,7 @@ struct outer_cache_fns { =20 #ifdef CONFIG_OUTER_CACHE @@ -611,9 +611,9 @@ diff -urNp linux-2.6.39/arch/arm/include/asm/outercac= he.h linux-2.6.39/arch/arm/ =20 static inline void outer_inv_range(phys_addr_t start, phys_addr_t end) { -diff -urNp linux-2.6.39/arch/arm/include/asm/page.h linux-2.6.39/arch/ar= m/include/asm/page.h ---- linux-2.6.39/arch/arm/include/asm/page.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/arm/include/asm/page.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/arm/include/asm/page.h linux-2.6.39.1/arc= h/arm/include/asm/page.h +--- linux-2.6.39.1/arch/arm/include/asm/page.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/arm/include/asm/page.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -126,7 +126,7 @@ struct cpu_user_fns { }; =20 @@ -623,9 +623,9 @@ diff -urNp linux-2.6.39/arch/arm/include/asm/page.h l= inux-2.6.39/arch/arm/includ =20 #define __cpu_clear_user_highpage cpu_user.cpu_clear_user_highpage #define __cpu_copy_user_highpage cpu_user.cpu_copy_user_highpage -diff -urNp linux-2.6.39/arch/arm/include/asm/uaccess.h linux-2.6.39/arch= /arm/include/asm/uaccess.h ---- linux-2.6.39/arch/arm/include/asm/uaccess.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/arm/include/asm/uaccess.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/include/asm/uaccess.h linux-2.6.39.1/= arch/arm/include/asm/uaccess.h +--- linux-2.6.39.1/arch/arm/include/asm/uaccess.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/arm/include/asm/uaccess.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn =20 static inline unsigned long __must_check copy_from_user(void *to, const= void __user *from, unsigned long n) @@ -646,9 +646,9 @@ diff -urNp linux-2.6.39/arch/arm/include/asm/uaccess.= h linux-2.6.39/arch/arm/inc if (access_ok(VERIFY_WRITE, to, n)) n =3D __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.39/arch/arm/kernel/kgdb.c linux-2.6.39/arch/arm/ker= nel/kgdb.c ---- linux-2.6.39/arch/arm/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/arm/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/arm/kernel/kgdb.c linux-2.6.39.1/arch/arm= /kernel/kgdb.c +--- linux-2.6.39.1/arch/arm/kernel/kgdb.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/arm/kernel/kgdb.c 2011-05-22 19:36:30.000000000 = -0400 @@ -246,7 +246,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -658,9 +658,9 @@ diff -urNp linux-2.6.39/arch/arm/kernel/kgdb.c linux-= 2.6.39/arch/arm/kernel/kgdb #ifndef __ARMEB__ .gdb_bpt_instr =3D {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.39/arch/arm/kernel/process.c linux-2.6.39/arch/arm/= kernel/process.c ---- linux-2.6.39/arch/arm/kernel/process.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/arm/kernel/process.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/arm/kernel/process.c linux-2.6.39.1/arch/= arm/kernel/process.c +--- linux-2.6.39.1/arch/arm/kernel/process.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/arm/kernel/process.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -28,7 +28,6 @@ #include #include @@ -682,9 +682,9 @@ diff -urNp linux-2.6.39/arch/arm/kernel/process.c lin= ux-2.6.39/arch/arm/kernel/p #ifdef CONFIG_MMU /* * The vectors page is always readable from user space for the -diff -urNp linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c linux-2.6.39/arch/a= rm/mach-cns3xxx/pcie.c ---- linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-cns3xxx/pcie.c linux-2.6.39.1/ar= ch/arm/mach-cns3xxx/pcie.c +--- linux-2.6.39.1/arch/arm/mach-cns3xxx/pcie.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-cns3xxx/pcie.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -162,7 +162,7 @@ static int cns3xxx_pci_setup(int nr, str return 1; } @@ -694,9 +694,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c = linux-2.6.39/arch/arm/mach- .read =3D cns3xxx_pci_read_config, .write =3D cns3xxx_pci_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mach-dove/pcie.c linux-2.6.39/arch/arm/= mach-dove/pcie.c ---- linux-2.6.39/arch/arm/mach-dove/pcie.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/arm/mach-dove/pcie.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-dove/pcie.c linux-2.6.39.1/arch/= arm/mach-dove/pcie.c +--- linux-2.6.39.1/arch/arm/mach-dove/pcie.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/arm/mach-dove/pcie.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -155,7 +155,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } @@ -706,9 +706,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-dove/pcie.c lin= ux-2.6.39/arch/arm/mach-dov .read =3D pcie_rd_conf, .write =3D pcie_wr_conf, }; -diff -urNp linux-2.6.39/arch/arm/mach-footbridge/dc21285.c linux-2.6.39/= arch/arm/mach-footbridge/dc21285.c ---- linux-2.6.39/arch/arm/mach-footbridge/dc21285.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/arm/mach-footbridge/dc21285.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-footbridge/dc21285.c linux-2.6.3= 9.1/arch/arm/mach-footbridge/dc21285.c +--- linux-2.6.39.1/arch/arm/mach-footbridge/dc21285.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-footbridge/dc21285.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -129,7 +129,7 @@ dc21285_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } @@ -718,9 +718,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-footbridge/dc21= 285.c linux-2.6.39/arch/arm .read =3D dc21285_read_config, .write =3D dc21285_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mach-integrator/pci_v3.c linux-2.6.39/a= rch/arm/mach-integrator/pci_v3.c ---- linux-2.6.39/arch/arm/mach-integrator/pci_v3.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/arm/mach-integrator/pci_v3.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-integrator/pci_v3.c linux-2.6.39= .1/arch/arm/mach-integrator/pci_v3.c +--- linux-2.6.39.1/arch/arm/mach-integrator/pci_v3.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-integrator/pci_v3.c 2011-05-22 19:36:30= .000000000 -0400 @@ -340,7 +340,7 @@ static int v3_write_config(struct pci_bu return PCIBIOS_SUCCESSFUL; } @@ -730,9 +730,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-integrator/pci_= v3.c linux-2.6.39/arch/arm/ .read =3D v3_read_config, .write =3D v3_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mach-iop13xx/pci.c linux-2.6.39/arch/ar= m/mach-iop13xx/pci.c ---- linux-2.6.39/arch/arm/mach-iop13xx/pci.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/arm/mach-iop13xx/pci.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-iop13xx/pci.c linux-2.6.39.1/arc= h/arm/mach-iop13xx/pci.c +--- linux-2.6.39.1/arch/arm/mach-iop13xx/pci.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-iop13xx/pci.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -324,7 +324,7 @@ iop13xx_atux_write_config(struct pci_bus return PCIBIOS_SUCCESSFUL; } @@ -751,9 +751,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-iop13xx/pci.c l= inux-2.6.39/arch/arm/mach-i .read =3D iop13xx_atue_read_config, .write =3D iop13xx_atue_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mach-ixp2000/enp2611.c linux-2.6.39/arc= h/arm/mach-ixp2000/enp2611.c ---- linux-2.6.39/arch/arm/mach-ixp2000/enp2611.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/arm/mach-ixp2000/enp2611.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-ixp2000/enp2611.c linux-2.6.39.1= /arch/arm/mach-ixp2000/enp2611.c +--- linux-2.6.39.1/arch/arm/mach-ixp2000/enp2611.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-ixp2000/enp2611.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -137,7 +137,7 @@ static int enp2611_pci_write_config(stru return PCIBIOS_DEVICE_NOT_FOUND; } @@ -763,9 +763,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-ixp2000/enp2611= .c linux-2.6.39/arch/arm/ma .read =3D enp2611_pci_read_config, .write =3D enp2611_pci_write_config }; -diff -urNp linux-2.6.39/arch/arm/mach-ixp2000/pci.c linux-2.6.39/arch/ar= m/mach-ixp2000/pci.c ---- linux-2.6.39/arch/arm/mach-ixp2000/pci.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/arm/mach-ixp2000/pci.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-ixp2000/pci.c linux-2.6.39.1/arc= h/arm/mach-ixp2000/pci.c +--- linux-2.6.39.1/arch/arm/mach-ixp2000/pci.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-ixp2000/pci.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -125,7 +125,7 @@ int ixp2000_pci_write_config(struct pci_ } =20 @@ -775,9 +775,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-ixp2000/pci.c l= inux-2.6.39/arch/arm/mach-i .read =3D ixp2000_pci_read_config, .write =3D ixp2000_pci_write_config }; -diff -urNp linux-2.6.39/arch/arm/mach-ixp23xx/pci.c linux-2.6.39/arch/ar= m/mach-ixp23xx/pci.c ---- linux-2.6.39/arch/arm/mach-ixp23xx/pci.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/arm/mach-ixp23xx/pci.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-ixp23xx/pci.c linux-2.6.39.1/arc= h/arm/mach-ixp23xx/pci.c +--- linux-2.6.39.1/arch/arm/mach-ixp23xx/pci.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-ixp23xx/pci.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -136,7 +136,7 @@ static int ixp23xx_pci_write_config(stru return PCIBIOS_SUCCESSFUL; } @@ -787,9 +787,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-ixp23xx/pci.c l= inux-2.6.39/arch/arm/mach-i .read =3D ixp23xx_pci_read_config, .write =3D ixp23xx_pci_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mach-ixp4xx/common-pci.c linux-2.6.39/a= rch/arm/mach-ixp4xx/common-pci.c ---- linux-2.6.39/arch/arm/mach-ixp4xx/common-pci.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/arm/mach-ixp4xx/common-pci.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-ixp4xx/common-pci.c linux-2.6.39= .1/arch/arm/mach-ixp4xx/common-pci.c +--- linux-2.6.39.1/arch/arm/mach-ixp4xx/common-pci.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-ixp4xx/common-pci.c 2011-05-22 19:36:30= .000000000 -0400 @@ -283,7 +283,7 @@ static int ixp4xx_pci_write_config(struc return PCIBIOS_SUCCESSFUL; } @@ -799,9 +799,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-ixp4xx/common-p= ci.c linux-2.6.39/arch/arm/ .read =3D ixp4xx_pci_read_config, .write =3D ixp4xx_pci_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mach-kirkwood/pcie.c linux-2.6.39/arch/= arm/mach-kirkwood/pcie.c ---- linux-2.6.39/arch/arm/mach-kirkwood/pcie.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/arm/mach-kirkwood/pcie.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-kirkwood/pcie.c linux-2.6.39.1/a= rch/arm/mach-kirkwood/pcie.c +--- linux-2.6.39.1/arch/arm/mach-kirkwood/pcie.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-kirkwood/pcie.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -111,7 +111,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } @@ -811,9 +811,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-kirkwood/pcie.c= linux-2.6.39/arch/arm/mach .read =3D pcie_rd_conf, .write =3D pcie_wr_conf, }; -diff -urNp linux-2.6.39/arch/arm/mach-ks8695/pci.c linux-2.6.39/arch/arm= /mach-ks8695/pci.c ---- linux-2.6.39/arch/arm/mach-ks8695/pci.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/arm/mach-ks8695/pci.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-ks8695/pci.c linux-2.6.39.1/arch= /arm/mach-ks8695/pci.c +--- linux-2.6.39.1/arch/arm/mach-ks8695/pci.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-ks8695/pci.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -136,7 +136,7 @@ static void ks8695_local_writeconfig(int __raw_writel(value, KS8695_PCI_VA + KS8695_PBCD); } @@ -823,9 +823,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-ks8695/pci.c li= nux-2.6.39/arch/arm/mach-ks .read =3D ks8695_pci_readconfig, .write =3D ks8695_pci_writeconfig, }; -diff -urNp linux-2.6.39/arch/arm/mach-mmp/clock.c linux-2.6.39/arch/arm/= mach-mmp/clock.c ---- linux-2.6.39/arch/arm/mach-mmp/clock.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/arm/mach-mmp/clock.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-mmp/clock.c linux-2.6.39.1/arch/= arm/mach-mmp/clock.c +--- linux-2.6.39.1/arch/arm/mach-mmp/clock.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/arm/mach-mmp/clock.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -29,7 +29,7 @@ static void apbc_clk_disable(struct clk=20 __raw_writel(0, clk->clk_rst); } @@ -844,9 +844,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-mmp/clock.c lin= ux-2.6.39/arch/arm/mach-mmp .enable =3D apmu_clk_enable, .disable =3D apmu_clk_disable, }; -diff -urNp linux-2.6.39/arch/arm/mach-msm/iommu.c linux-2.6.39/arch/arm/= mach-msm/iommu.c ---- linux-2.6.39/arch/arm/mach-msm/iommu.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/arm/mach-msm/iommu.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-msm/iommu.c linux-2.6.39.1/arch/= arm/mach-msm/iommu.c +--- linux-2.6.39.1/arch/arm/mach-msm/iommu.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/arm/mach-msm/iommu.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -669,7 +669,7 @@ fail: return 0; } @@ -856,9 +856,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-msm/iommu.c lin= ux-2.6.39/arch/arm/mach-msm .domain_init =3D msm_iommu_domain_init, .domain_destroy =3D msm_iommu_domain_destroy, .attach_dev =3D msm_iommu_attach_dev, -diff -urNp linux-2.6.39/arch/arm/mach-msm/last_radio_log.c linux-2.6.39/= arch/arm/mach-msm/last_radio_log.c ---- linux-2.6.39/arch/arm/mach-msm/last_radio_log.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/arm/mach-msm/last_radio_log.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-msm/last_radio_log.c linux-2.6.3= 9.1/arch/arm/mach-msm/last_radio_log.c +--- linux-2.6.39.1/arch/arm/mach-msm/last_radio_log.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-msm/last_radio_log.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -48,6 +48,7 @@ static ssize_t last_radio_log_read(struc } =20 @@ -867,9 +867,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-msm/last_radio_= log.c linux-2.6.39/arch/arm .read =3D last_radio_log_read, .llseek =3D default_llseek, }; -diff -urNp linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c linux-2.6.39/arch/a= rm/mach-mv78xx0/pcie.c ---- linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-mv78xx0/pcie.c linux-2.6.39.1/ar= ch/arm/mach-mv78xx0/pcie.c +--- linux-2.6.39.1/arch/arm/mach-mv78xx0/pcie.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-mv78xx0/pcie.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -222,7 +222,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } @@ -879,9 +879,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c = linux-2.6.39/arch/arm/mach- .read =3D pcie_rd_conf, .write =3D pcie_wr_conf, }; -diff -urNp linux-2.6.39/arch/arm/mach-orion5x/pci.c linux-2.6.39/arch/ar= m/mach-orion5x/pci.c ---- linux-2.6.39/arch/arm/mach-orion5x/pci.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/arm/mach-orion5x/pci.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-orion5x/pci.c linux-2.6.39.1/arc= h/arm/mach-orion5x/pci.c +--- linux-2.6.39.1/arch/arm/mach-orion5x/pci.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-orion5x/pci.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -130,7 +130,7 @@ static int pcie_wr_conf(struct pci_bus * return ret; } @@ -900,9 +900,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-orion5x/pci.c l= inux-2.6.39/arch/arm/mach-o .read =3D orion5x_pci_rd_conf, .write =3D orion5x_pci_wr_conf, }; -diff -urNp linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c linux-2.6.= 39/arch/arm/mach-sa1100/pci-nanoengine.c ---- linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-sa1100/pci-nanoengine.c linux-2.= 6.39.1/arch/arm/mach-sa1100/pci-nanoengine.c +--- linux-2.6.39.1/arch/arm/mach-sa1100/pci-nanoengine.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-sa1100/pci-nanoengine.c 2011-05-22 19:3= 6:30.000000000 -0400 @@ -117,7 +117,7 @@ static int nanoengine_write_config(struc return PCIBIOS_SUCCESSFUL; } @@ -912,9 +912,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-sa1100/pci-nano= engine.c linux-2.6.39/arch/ .read =3D nanoengine_read_config, .write =3D nanoengine_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mach-tegra/pcie.c linux-2.6.39/arch/arm= /mach-tegra/pcie.c ---- linux-2.6.39/arch/arm/mach-tegra/pcie.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/arm/mach-tegra/pcie.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-tegra/pcie.c linux-2.6.39.1/arch= /arm/mach-tegra/pcie.c +--- linux-2.6.39.1/arch/arm/mach-tegra/pcie.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-tegra/pcie.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -336,7 +336,7 @@ static int tegra_pcie_write_conf(struct=20 return PCIBIOS_SUCCESSFUL; } @@ -924,9 +924,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-tegra/pcie.c li= nux-2.6.39/arch/arm/mach-te .read =3D tegra_pcie_read_conf, .write =3D tegra_pcie_write_conf, }; -diff -urNp linux-2.6.39/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.39/a= rch/arm/mach-ux500/mbox-db5500.c ---- linux-2.6.39/arch/arm/mach-ux500/mbox-db5500.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/arm/mach-ux500/mbox-db5500.c 2011-05-22 19:41:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.39= .1/arch/arm/mach-ux500/mbox-db5500.c +--- linux-2.6.39.1/arch/arm/mach-ux500/mbox-db5500.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-ux500/mbox-db5500.c 2011-05-22 19:41:32= .000000000 -0400 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev return sprintf(buf, "0x%X\n", mbox_value); } @@ -936,9 +936,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-ux500/mbox-db55= 00.c linux-2.6.39/arch/arm/ =20 static int mbox_show(struct seq_file *s, void *data) { -diff -urNp linux-2.6.39/arch/arm/mach-versatile/pci.c linux-2.6.39/arch/= arm/mach-versatile/pci.c ---- linux-2.6.39/arch/arm/mach-versatile/pci.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/arm/mach-versatile/pci.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mach-versatile/pci.c linux-2.6.39.1/a= rch/arm/mach-versatile/pci.c +--- linux-2.6.39.1/arch/arm/mach-versatile/pci.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/arm/mach-versatile/pci.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -165,7 +165,7 @@ static int versatile_write_config(struct return PCIBIOS_SUCCESSFUL; } @@ -948,9 +948,9 @@ diff -urNp linux-2.6.39/arch/arm/mach-versatile/pci.c= linux-2.6.39/arch/arm/mach .read =3D versatile_read_config, .write =3D versatile_write_config, }; -diff -urNp linux-2.6.39/arch/arm/mm/fault.c linux-2.6.39/arch/arm/mm/fau= lt.c ---- linux-2.6.39/arch/arm/mm/fault.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/arm/mm/fault.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mm/fault.c linux-2.6.39.1/arch/arm/mm= /fault.c +--- linux-2.6.39.1/arch/arm/mm/fault.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/arm/mm/fault.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -999,9 +999,9 @@ diff -urNp linux-2.6.39/arch/arm/mm/fault.c linux-2.6= .39/arch/arm/mm/fault.c /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.39/arch/arm/mm/mmap.c linux-2.6.39/arch/arm/mm/mmap= .c ---- linux-2.6.39/arch/arm/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/arm/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/arm/mm/mmap.c linux-2.6.39.1/arch/arm/mm/= mmap.c +--- linux-2.6.39.1/arch/arm/mm/mmap.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/arm/mm/mmap.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -1051,9 +1051,9 @@ diff -urNp linux-2.6.39/arch/arm/mm/mmap.c linux-2.= 6.39/arch/arm/mm/mmap.c /* * Remember the place where we stopped the search: */ -diff -urNp linux-2.6.39/arch/arm/plat-iop/pci.c linux-2.6.39/arch/arm/pl= at-iop/pci.c ---- linux-2.6.39/arch/arm/plat-iop/pci.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/arm/plat-iop/pci.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/arm/plat-iop/pci.c linux-2.6.39.1/arch/ar= m/plat-iop/pci.c +--- linux-2.6.39.1/arch/arm/plat-iop/pci.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/arm/plat-iop/pci.c 2011-05-22 19:36:30.000000000= -0400 @@ -161,7 +161,7 @@ iop3xx_write_config(struct pci_bus *bus, return PCIBIOS_SUCCESSFUL; } @@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.39/arch/arm/plat-iop/pci.c lin= ux-2.6.39/arch/arm/plat-iop/p .read =3D iop3xx_read_config, .write =3D iop3xx_write_config, }; -diff -urNp linux-2.6.39/arch/avr32/include/asm/elf.h linux-2.6.39/arch/a= vr32/include/asm/elf.h ---- linux-2.6.39/arch/avr32/include/asm/elf.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/avr32/include/asm/elf.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/avr32/include/asm/elf.h linux-2.6.39.1/ar= ch/avr32/include/asm/elf.h +--- linux-2.6.39.1/arch/avr32/include/asm/elf.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/avr32/include/asm/elf.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -1082,9 +1082,9 @@ diff -urNp linux-2.6.39/arch/avr32/include/asm/elf.= h linux-2.6.39/arch/avr32/inc =20 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space= , -diff -urNp linux-2.6.39/arch/avr32/include/asm/kmap_types.h linux-2.6.39= /arch/avr32/include/asm/kmap_types.h ---- linux-2.6.39/arch/avr32/include/asm/kmap_types.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/avr32/include/asm/kmap_types.h 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/avr32/include/asm/kmap_types.h linux-2.6.= 39.1/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.39.1/arch/avr32/include/asm/kmap_types.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/avr32/include/asm/kmap_types.h 2011-05-22 19:36:= 30.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -1095,9 +1095,9 @@ diff -urNp linux-2.6.39/arch/avr32/include/asm/kmap= _types.h linux-2.6.39/arch/av }; =20 #undef D -diff -urNp linux-2.6.39/arch/avr32/mm/fault.c linux-2.6.39/arch/avr32/mm= /fault.c ---- linux-2.6.39/arch/avr32/mm/fault.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/avr32/mm/fault.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/avr32/mm/fault.c linux-2.6.39.1/arch/avr3= 2/mm/fault.c +--- linux-2.6.39.1/arch/avr32/mm/fault.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/avr32/mm/fault.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru =20 int exception_trace =3D 1; @@ -1139,9 +1139,9 @@ diff -urNp linux-2.6.39/arch/avr32/mm/fault.c linux= -2.6.39/arch/avr32/mm/fault.c if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.39/arch/blackfin/kernel/kgdb.c linux-2.6.39/arch/bl= ackfin/kernel/kgdb.c ---- linux-2.6.39/arch/blackfin/kernel/kgdb.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/blackfin/kernel/kgdb.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/blackfin/kernel/kgdb.c linux-2.6.39.1/arc= h/blackfin/kernel/kgdb.c +--- linux-2.6.39.1/arch/blackfin/kernel/kgdb.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/blackfin/kernel/kgdb.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler= */ } @@ -1151,9 +1151,9 @@ diff -urNp linux-2.6.39/arch/blackfin/kernel/kgdb.c= linux-2.6.39/arch/blackfin/k .gdb_bpt_instr =3D {0xa1}, .flags =3D KGDB_HW_BREAKPOINT, .set_hw_breakpoint =3D bfin_set_hw_break, -diff -urNp linux-2.6.39/arch/blackfin/mm/maccess.c linux-2.6.39/arch/bla= ckfin/mm/maccess.c ---- linux-2.6.39/arch/blackfin/mm/maccess.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/blackfin/mm/maccess.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/blackfin/mm/maccess.c linux-2.6.39.1/arch= /blackfin/mm/maccess.c +--- linux-2.6.39.1/arch/blackfin/mm/maccess.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/blackfin/mm/maccess.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -16,7 +16,7 @@ static int validate_memory_access_addres return bfin_mem_access_type(addr, size); } @@ -1172,9 +1172,9 @@ diff -urNp linux-2.6.39/arch/blackfin/mm/maccess.c = linux-2.6.39/arch/blackfin/mm { unsigned long ldst =3D (unsigned long)dst; int mem_type; -diff -urNp linux-2.6.39/arch/frv/include/asm/kmap_types.h linux-2.6.39/a= rch/frv/include/asm/kmap_types.h ---- linux-2.6.39/arch/frv/include/asm/kmap_types.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/frv/include/asm/kmap_types.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/frv/include/asm/kmap_types.h linux-2.6.39= .1/arch/frv/include/asm/kmap_types.h +--- linux-2.6.39.1/arch/frv/include/asm/kmap_types.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/frv/include/asm/kmap_types.h 2011-05-22 19:36:30= .000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -1183,9 +1183,9 @@ diff -urNp linux-2.6.39/arch/frv/include/asm/kmap_t= ypes.h linux-2.6.39/arch/frv/ KM_TYPE_NR }; =20 -diff -urNp linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h linux-2.6.39/arc= h/frv/mb93090-mb00/pci-frv.h ---- linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/frv/mb93090-mb00/pci-frv.h linux-2.6.39.1= /arch/frv/mb93090-mb00/pci-frv.h +--- linux-2.6.39.1/arch/frv/mb93090-mb00/pci-frv.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/frv/mb93090-mb00/pci-frv.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -34,7 +34,7 @@ void pcibios_resource_survey(void); =20 extern int __nongpreldata pcibios_last_bus; @@ -1195,9 +1195,9 @@ diff -urNp linux-2.6.39/arch/frv/mb93090-mb00/pci-f= rv.h linux-2.6.39/arch/frv/mb =20 /* pci-irq.c */ extern unsigned int pcibios_irq_mask; -diff -urNp linux-2.6.39/arch/frv/mb93090-mb00/pci-vdk.c linux-2.6.39/arc= h/frv/mb93090-mb00/pci-vdk.c ---- linux-2.6.39/arch/frv/mb93090-mb00/pci-vdk.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/frv/mb93090-mb00/pci-vdk.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/frv/mb93090-mb00/pci-vdk.c linux-2.6.39.1= /arch/frv/mb93090-mb00/pci-vdk.c +--- linux-2.6.39.1/arch/frv/mb93090-mb00/pci-vdk.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/frv/mb93090-mb00/pci-vdk.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -27,7 +27,7 @@ unsigned int __nongpreldata pci_probe =3D=20 =20 int __nongpreldata pcibios_last_bus =3D -1; @@ -1225,9 +1225,9 @@ diff -urNp linux-2.6.39/arch/frv/mb93090-mb00/pci-v= dk.c linux-2.6.39/arch/frv/mb =20 if (!mb93090_mb00_detected) return -ENXIO; -diff -urNp linux-2.6.39/arch/frv/mm/elf-fdpic.c linux-2.6.39/arch/frv/mm= /elf-fdpic.c ---- linux-2.6.39/arch/frv/mm/elf-fdpic.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/frv/mm/elf-fdpic.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/frv/mm/elf-fdpic.c linux-2.6.39.1/arch/fr= v/mm/elf-fdpic.c +--- linux-2.6.39.1/arch/frv/mm/elf-fdpic.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/frv/mm/elf-fdpic.c 2011-05-22 19:36:30.000000000= -0400 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str if (addr) { addr =3D PAGE_ALIGN(addr); @@ -1256,9 +1256,9 @@ diff -urNp linux-2.6.39/arch/frv/mm/elf-fdpic.c lin= ux-2.6.39/arch/frv/mm/elf-fdp goto success; addr =3D vma->vm_end; } -diff -urNp linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.39/ar= ch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.39.= 1/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.39.1/arch/ia64/hp/common/hwsw_iommu.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/ia64/hp/common/hwsw_iommu.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -17,7 +17,7 @@ #include #include @@ -1277,9 +1277,9 @@ diff -urNp linux-2.6.39/arch/ia64/hp/common/hwsw_io= mmu.c linux-2.6.39/arch/ia64/ { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.39/arch/ia64/hp/common/sba_iommu.c linux-2.6.39/arc= h/ia64/hp/common/sba_iommu.c ---- linux-2.6.39/arch/ia64/hp/common/sba_iommu.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/ia64/hp/common/sba_iommu.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/hp/common/sba_iommu.c linux-2.6.39.1= /arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.39.1/arch/ia64/hp/common/sba_iommu.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/ia64/hp/common/sba_iommu.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -1298,9 +1298,9 @@ diff -urNp linux-2.6.39/arch/ia64/hp/common/sba_iom= mu.c linux-2.6.39/arch/ia64/h .alloc_coherent =3D sba_alloc_coherent, .free_coherent =3D sba_free_coherent, .map_page =3D sba_map_page, -diff -urNp linux-2.6.39/arch/ia64/include/asm/dma-mapping.h linux-2.6.39= /arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.39/arch/ia64/include/asm/dma-mapping.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/ia64/include/asm/dma-mapping.h 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/include/asm/dma-mapping.h linux-2.6.= 39.1/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/ia64/include/asm/dma-mapping.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/ia64/include/asm/dma-mapping.h 2011-05-22 19:36:= 30.000000000 -0400 @@ -14,7 +14,7 @@ =20 #define DMA_ERROR_CODE 0 @@ -1344,9 +1344,9 @@ diff -urNp linux-2.6.39/arch/ia64/include/asm/dma-m= apping.h linux-2.6.39/arch/ia return ops->dma_supported(dev, mask); } =20 -diff -urNp linux-2.6.39/arch/ia64/include/asm/elf.h linux-2.6.39/arch/ia= 64/include/asm/elf.h ---- linux-2.6.39/arch/ia64/include/asm/elf.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/ia64/include/asm/elf.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/include/asm/elf.h linux-2.6.39.1/arc= h/ia64/include/asm/elf.h +--- linux-2.6.39.1/arch/ia64/include/asm/elf.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/ia64/include/asm/elf.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -42,6 +42,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -1361,9 +1361,9 @@ diff -urNp linux-2.6.39/arch/ia64/include/asm/elf.h= linux-2.6.39/arch/ia64/inclu #define PT_IA_64_UNWIND 0x70000001 =20 /* IA-64 relocations: */ -diff -urNp linux-2.6.39/arch/ia64/include/asm/machvec.h linux-2.6.39/arc= h/ia64/include/asm/machvec.h ---- linux-2.6.39/arch/ia64/include/asm/machvec.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/ia64/include/asm/machvec.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/include/asm/machvec.h linux-2.6.39.1= /arch/ia64/include/asm/machvec.h +--- linux-2.6.39.1/arch/ia64/include/asm/machvec.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/ia64/include/asm/machvec.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -1382,9 +1382,9 @@ diff -urNp linux-2.6.39/arch/ia64/include/asm/machv= ec.h linux-2.6.39/arch/ia64/i =20 /* * Define default versions so we can extend machvec for new platforms w= ithout having -diff -urNp linux-2.6.39/arch/ia64/include/asm/pgtable.h linux-2.6.39/arc= h/ia64/include/asm/pgtable.h ---- linux-2.6.39/arch/ia64/include/asm/pgtable.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/ia64/include/asm/pgtable.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/include/asm/pgtable.h linux-2.6.39.1= /arch/ia64/include/asm/pgtable.h +--- linux-2.6.39.1/arch/ia64/include/asm/pgtable.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/ia64/include/asm/pgtable.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -12,7 +12,7 @@ * David Mosberger-Tang */ @@ -1412,9 +1412,9 @@ diff -urNp linux-2.6.39/arch/ia64/include/asm/pgtab= le.h linux-2.6.39/arch/ia64/i #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX= ) -diff -urNp linux-2.6.39/arch/ia64/include/asm/spinlock.h linux-2.6.39/ar= ch/ia64/include/asm/spinlock.h ---- linux-2.6.39/arch/ia64/include/asm/spinlock.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/ia64/include/asm/spinlock.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/include/asm/spinlock.h linux-2.6.39.= 1/arch/ia64/include/asm/spinlock.h +--- linux-2.6.39.1/arch/ia64/include/asm/spinlock.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/ia64/include/asm/spinlock.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi unsigned short *p =3D (unsigned short *)&lock->lock + 1, tmp; =20 @@ -1424,9 +1424,9 @@ diff -urNp linux-2.6.39/arch/ia64/include/asm/spinl= ock.h linux-2.6.39/arch/ia64/ } =20 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *= lock) -diff -urNp linux-2.6.39/arch/ia64/include/asm/uaccess.h linux-2.6.39/arc= h/ia64/include/asm/uaccess.h ---- linux-2.6.39/arch/ia64/include/asm/uaccess.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/ia64/include/asm/uaccess.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/include/asm/uaccess.h linux-2.6.39.1= /arch/ia64/include/asm/uaccess.h +--- linux-2.6.39.1/arch/ia64/include/asm/uaccess.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/ia64/include/asm/uaccess.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from =3D (from); \ long __cu_len =3D (n); \ @@ -1445,9 +1445,9 @@ diff -urNp linux-2.6.39/arch/ia64/include/asm/uacce= ss.h linux-2.6.39/arch/ia64/i __cu_len =3D __copy_user((__force void __user *) __cu_to, __cu_from, = __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.39/arch/ia64/kernel/dma-mapping.c linux-2.6.39/arch= /ia64/kernel/dma-mapping.c ---- linux-2.6.39/arch/ia64/kernel/dma-mapping.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/ia64/kernel/dma-mapping.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/kernel/dma-mapping.c linux-2.6.39.1/= arch/ia64/kernel/dma-mapping.c +--- linux-2.6.39.1/arch/ia64/kernel/dma-mapping.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/ia64/kernel/dma-mapping.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -1466,9 +1466,9 @@ diff -urNp linux-2.6.39/arch/ia64/kernel/dma-mappin= g.c linux-2.6.39/arch/ia64/ke { return dma_ops; } -diff -urNp linux-2.6.39/arch/ia64/kernel/module.c linux-2.6.39/arch/ia64= /kernel/module.c ---- linux-2.6.39/arch/ia64/kernel/module.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/ia64/kernel/module.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/ia64/kernel/module.c linux-2.6.39.1/arch/= ia64/kernel/module.c +--- linux-2.6.39.1/arch/ia64/kernel/module.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/ia64/kernel/module.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -1557,9 +1557,9 @@ diff -urNp linux-2.6.39/arch/ia64/kernel/module.c l= inux-2.6.39/arch/ia64/kernel/ mod->arch.gp =3D gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.39/arch/ia64/kernel/pci-dma.c linux-2.6.39/arch/ia6= 4/kernel/pci-dma.c ---- linux-2.6.39/arch/ia64/kernel/pci-dma.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/ia64/kernel/pci-dma.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/kernel/pci-dma.c linux-2.6.39.1/arch= /ia64/kernel/pci-dma.c +--- linux-2.6.39.1/arch/ia64/kernel/pci-dma.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/ia64/kernel/pci-dma.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev =3D { .dma_mask =3D &fallback_dev.coherent_dma_mask, }; @@ -1569,9 +1569,9 @@ diff -urNp linux-2.6.39/arch/ia64/kernel/pci-dma.c = linux-2.6.39/arch/ia64/kernel =20 static int __init pci_iommu_init(void) { -diff -urNp linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c linux-2.6.39/arch= /ia64/kernel/pci-swiotlb.c ---- linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/kernel/pci-swiotlb.c linux-2.6.39.1/= arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.39.1/arch/ia64/kernel/pci-swiotlb.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/ia64/kernel/pci-swiotlb.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -1581,9 +1581,9 @@ diff -urNp linux-2.6.39/arch/ia64/kernel/pci-swiotl= b.c linux-2.6.39/arch/ia64/ke .alloc_coherent =3D ia64_swiotlb_alloc_coherent, .free_coherent =3D swiotlb_free_coherent, .map_page =3D swiotlb_map_page, -diff -urNp linux-2.6.39/arch/ia64/kernel/sys_ia64.c linux-2.6.39/arch/ia= 64/kernel/sys_ia64.c ---- linux-2.6.39/arch/ia64/kernel/sys_ia64.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/ia64/kernel/sys_ia64.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/kernel/sys_ia64.c linux-2.6.39.1/arc= h/ia64/kernel/sys_ia64.c +--- linux-2.6.39.1/arch/ia64/kernel/sys_ia64.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/ia64/kernel/sys_ia64.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) =3D=3D RGN_HPAGE) addr =3D 0; @@ -1616,9 +1616,9 @@ diff -urNp linux-2.6.39/arch/ia64/kernel/sys_ia64.c= linux-2.6.39/arch/ia64/kerne /* Remember the address where we stopped this search: */ mm->free_area_cache =3D addr + len; return addr; -diff -urNp linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S linux-2.6.39/arch= /ia64/kernel/vmlinux.lds.S ---- linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/kernel/vmlinux.lds.S linux-2.6.39.1/= arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.39.1/arch/ia64/kernel/vmlinux.lds.S 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/ia64/kernel/vmlinux.lds.S 2011-05-22 19:36:30.00= 0000000 -0400 @@ -199,7 +199,7 @@ SECTIONS { /* Per-cpu data: */ . =3D ALIGN(PERCPU_PAGE_SIZE); @@ -1628,9 +1628,9 @@ diff -urNp linux-2.6.39/arch/ia64/kernel/vmlinux.ld= s.S linux-2.6.39/arch/ia64/ke /* * ensure percpu data fits * into percpu page size -diff -urNp linux-2.6.39/arch/ia64/mm/fault.c linux-2.6.39/arch/ia64/mm/f= ault.c ---- linux-2.6.39/arch/ia64/mm/fault.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/ia64/mm/fault.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/ia64/mm/fault.c linux-2.6.39.1/arch/ia64/= mm/fault.c +--- linux-2.6.39.1/arch/ia64/mm/fault.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/ia64/mm/fault.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned=20 return pte_present(pte); } @@ -1680,9 +1680,9 @@ diff -urNp linux-2.6.39/arch/ia64/mm/fault.c linux-= 2.6.39/arch/ia64/mm/fault.c /* * If for any reason at all we couldn't handle the fault, make * sure we exit gracefully rather than endlessly redo the -diff -urNp linux-2.6.39/arch/ia64/mm/hugetlbpage.c linux-2.6.39/arch/ia6= 4/mm/hugetlbpage.c ---- linux-2.6.39/arch/ia64/mm/hugetlbpage.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/ia64/mm/hugetlbpage.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/mm/hugetlbpage.c linux-2.6.39.1/arch= /ia64/mm/hugetlbpage.c +--- linux-2.6.39.1/arch/ia64/mm/hugetlbpage.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/ia64/mm/hugetlbpage.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area( /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) @@ -1692,9 +1692,9 @@ diff -urNp linux-2.6.39/arch/ia64/mm/hugetlbpage.c = linux-2.6.39/arch/ia64/mm/hug return addr; addr =3D ALIGN(vmm->vm_end, HPAGE_SIZE); } -diff -urNp linux-2.6.39/arch/ia64/mm/init.c linux-2.6.39/arch/ia64/mm/in= it.c ---- linux-2.6.39/arch/ia64/mm/init.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/ia64/mm/init.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/mm/init.c linux-2.6.39.1/arch/ia64/m= m/init.c +--- linux-2.6.39.1/arch/ia64/mm/init.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/ia64/mm/init.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start =3D current->thread.rbs_bot & PAGE_MASK; vma->vm_end =3D vma->vm_start + PAGE_SIZE; @@ -1715,9 +1715,9 @@ diff -urNp linux-2.6.39/arch/ia64/mm/init.c linux-2= .6.39/arch/ia64/mm/init.c vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.39/arch/ia64/pci/pci.c linux-2.6.39/arch/ia64/pci/p= ci.c ---- linux-2.6.39/arch/ia64/pci/pci.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/ia64/pci/pci.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/pci/pci.c linux-2.6.39.1/arch/ia64/p= ci/pci.c +--- linux-2.6.39.1/arch/ia64/pci/pci.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/ia64/pci/pci.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -109,7 +109,7 @@ static int pci_write(struct pci_bus *bus devfn, where, size, value); } @@ -1727,9 +1727,9 @@ diff -urNp linux-2.6.39/arch/ia64/pci/pci.c linux-2= .6.39/arch/ia64/pci/pci.c .read =3D pci_read, .write =3D pci_write, }; -diff -urNp linux-2.6.39/arch/ia64/sn/pci/pci_dma.c linux-2.6.39/arch/ia6= 4/sn/pci/pci_dma.c ---- linux-2.6.39/arch/ia64/sn/pci/pci_dma.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/ia64/sn/pci/pci_dma.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/ia64/sn/pci/pci_dma.c linux-2.6.39.1/arch= /ia64/sn/pci/pci_dma.c +--- linux-2.6.39.1/arch/ia64/sn/pci/pci_dma.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/ia64/sn/pci/pci_dma.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1739,9 +1739,9 @@ diff -urNp linux-2.6.39/arch/ia64/sn/pci/pci_dma.c = linux-2.6.39/arch/ia64/sn/pci .alloc_coherent =3D sn_dma_alloc_coherent, .free_coherent =3D sn_dma_free_coherent, .map_page =3D sn_dma_map_page, -diff -urNp linux-2.6.39/arch/m32r/lib/usercopy.c linux-2.6.39/arch/m32r/= lib/usercopy.c ---- linux-2.6.39/arch/m32r/lib/usercopy.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/m32r/lib/usercopy.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/m32r/lib/usercopy.c linux-2.6.39.1/arch/m= 32r/lib/usercopy.c +--- linux-2.6.39.1/arch/m32r/lib/usercopy.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/m32r/lib/usercopy.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long= n) @@ -1762,9 +1762,9 @@ diff -urNp linux-2.6.39/arch/m32r/lib/usercopy.c li= nux-2.6.39/arch/m32r/lib/user prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.39/arch/microblaze/include/asm/device.h linux-2.6.3= 9/arch/microblaze/include/asm/device.h ---- linux-2.6.39/arch/microblaze/include/asm/device.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/microblaze/include/asm/device.h 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/microblaze/include/asm/device.h linux-2.6= .39.1/arch/microblaze/include/asm/device.h +--- linux-2.6.39.1/arch/microblaze/include/asm/device.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/microblaze/include/asm/device.h 2011-05-22 19:36= :30.000000000 -0400 @@ -13,7 +13,7 @@ struct device_node; =20 struct dev_archdata { @@ -1774,9 +1774,9 @@ diff -urNp linux-2.6.39/arch/microblaze/include/asm= /device.h linux-2.6.39/arch/m void *dma_data; }; =20 -diff -urNp linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h linux-= 2.6.39/arch/microblaze/include/asm/dma-mapping.h ---- linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h 2011-05-22 19= :36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/microblaze/include/asm/dma-mapping.h linu= x-2.6.39.1/arch/microblaze/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/microblaze/include/asm/dma-mapping.h 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/microblaze/include/asm/dma-mapping.h 2011-05-22 = 19:36:30.000000000 -0400 @@ -43,14 +43,14 @@ static inline unsigned long device_to_ma return 0xfffffffful; } @@ -1848,9 +1848,9 @@ diff -urNp linux-2.6.39/arch/microblaze/include/asm= /dma-mapping.h linux-2.6.39/a =20 BUG_ON(!ops); debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.39/arch/microblaze/include/asm/pci.h linux-2.6.39/a= rch/microblaze/include/asm/pci.h ---- linux-2.6.39/arch/microblaze/include/asm/pci.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/microblaze/include/asm/pci.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/microblaze/include/asm/pci.h linux-2.6.39= .1/arch/microblaze/include/asm/pci.h +--- linux-2.6.39.1/arch/microblaze/include/asm/pci.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/microblaze/include/asm/pci.h 2011-05-22 19:36:30= .000000000 -0400 @@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_ } =20 @@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.39/arch/microblaze/include/asm= /pci.h linux-2.6.39/arch/micr #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.39/arch/microblaze/kernel/dma.c linux-2.6.39/arch/m= icroblaze/kernel/dma.c ---- linux-2.6.39/arch/microblaze/kernel/dma.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/microblaze/kernel/dma.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/microblaze/kernel/dma.c linux-2.6.39.1/ar= ch/microblaze/kernel/dma.c +--- linux-2.6.39.1/arch/microblaze/kernel/dma.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/microblaze/kernel/dma.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -134,7 +134,7 @@ static inline void dma_direct_unmap_page __dma_sync_page(dma_address, 0 , size, direction); } @@ -1874,9 +1874,9 @@ diff -urNp linux-2.6.39/arch/microblaze/kernel/dma.= c linux-2.6.39/arch/microblaz .alloc_coherent =3D dma_direct_alloc_coherent, .free_coherent =3D dma_direct_free_coherent, .map_sg =3D dma_direct_map_sg, -diff -urNp linux-2.6.39/arch/microblaze/kernel/kgdb.c linux-2.6.39/arch/= microblaze/kernel/kgdb.c ---- linux-2.6.39/arch/microblaze/kernel/kgdb.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/microblaze/kernel/kgdb.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/microblaze/kernel/kgdb.c linux-2.6.39.1/a= rch/microblaze/kernel/kgdb.c +--- linux-2.6.39.1/arch/microblaze/kernel/kgdb.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/microblaze/kernel/kgdb.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -141,7 +141,7 @@ void kgdb_arch_exit(void) /* * Global data @@ -1886,9 +1886,9 @@ diff -urNp linux-2.6.39/arch/microblaze/kernel/kgdb= .c linux-2.6.39/arch/microbla #ifdef __MICROBLAZEEL__ .gdb_bpt_instr =3D {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ #else -diff -urNp linux-2.6.39/arch/microblaze/pci/indirect_pci.c linux-2.6.39/= arch/microblaze/pci/indirect_pci.c ---- linux-2.6.39/arch/microblaze/pci/indirect_pci.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/microblaze/pci/indirect_pci.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/microblaze/pci/indirect_pci.c linux-2.6.3= 9.1/arch/microblaze/pci/indirect_pci.c +--- linux-2.6.39.1/arch/microblaze/pci/indirect_pci.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/microblaze/pci/indirect_pci.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -140,7 +140,7 @@ indirect_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } @@ -1898,9 +1898,9 @@ diff -urNp linux-2.6.39/arch/microblaze/pci/indirec= t_pci.c linux-2.6.39/arch/mic .read =3D indirect_read_config, .write =3D indirect_write_config, }; -diff -urNp linux-2.6.39/arch/microblaze/pci/pci-common.c linux-2.6.39/ar= ch/microblaze/pci/pci-common.c ---- linux-2.6.39/arch/microblaze/pci/pci-common.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/microblaze/pci/pci-common.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/microblaze/pci/pci-common.c linux-2.6.39.= 1/arch/microblaze/pci/pci-common.c +--- linux-2.6.39.1/arch/microblaze/pci/pci-common.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/microblaze/pci/pci-common.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -48,14 +48,14 @@ resource_size_t isa_mem_base; /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */ unsigned int pci_flags; @@ -1928,9 +1928,9 @@ diff -urNp linux-2.6.39/arch/microblaze/pci/pci-com= mon.c linux-2.6.39/arch/micro .read =3D null_read_config, .write =3D null_write_config, }; -diff -urNp linux-2.6.39/arch/mips/alchemy/common/pci.c linux-2.6.39/arch= /mips/alchemy/common/pci.c ---- linux-2.6.39/arch/mips/alchemy/common/pci.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/mips/alchemy/common/pci.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/alchemy/common/pci.c linux-2.6.39.1/= arch/mips/alchemy/common/pci.c +--- linux-2.6.39.1/arch/mips/alchemy/common/pci.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/mips/alchemy/common/pci.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -51,7 +51,7 @@ static struct resource pci_mem_resource=20 .flags =3D IORESOURCE_MEM }; @@ -1940,9 +1940,9 @@ diff -urNp linux-2.6.39/arch/mips/alchemy/common/pc= i.c linux-2.6.39/arch/mips/al =20 static struct pci_controller au1x_controller =3D { .pci_ops =3D &au1x_pci_ops, -diff -urNp linux-2.6.39/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.3= 9/arch/mips/cavium-octeon/dma-octeon.c ---- linux-2.6.39/arch/mips/cavium-octeon/dma-octeon.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/mips/cavium-octeon/dma-octeon.c 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/cavium-octeon/dma-octeon.c linux-2.6= .39.1/arch/mips/cavium-octeon/dma-octeon.c +--- linux-2.6.39.1/arch/mips/cavium-octeon/dma-octeon.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/mips/cavium-octeon/dma-octeon.c 2011-05-22 19:36= :30.000000000 -0400 @@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p } =20 @@ -1961,9 +1961,9 @@ diff -urNp linux-2.6.39/arch/mips/cavium-octeon/dma= -octeon.c linux-2.6.39/arch/m =20 void __init octeon_pci_dma_init(void) { -diff -urNp linux-2.6.39/arch/mips/cobalt/pci.c linux-2.6.39/arch/mips/co= balt/pci.c ---- linux-2.6.39/arch/mips/cobalt/pci.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/mips/cobalt/pci.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/mips/cobalt/pci.c linux-2.6.39.1/arch/mip= s/cobalt/pci.c +--- linux-2.6.39.1/arch/mips/cobalt/pci.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/mips/cobalt/pci.c 2011-05-22 19:36:30.000000000 = -0400 @@ -14,7 +14,7 @@ =20 #include @@ -1973,9 +1973,9 @@ diff -urNp linux-2.6.39/arch/mips/cobalt/pci.c linu= x-2.6.39/arch/mips/cobalt/pci =20 static struct resource cobalt_mem_resource =3D { .start =3D GT_DEF_PCI0_MEM0_BASE, -diff -urNp linux-2.6.39/arch/mips/include/asm/device.h linux-2.6.39/arch= /mips/include/asm/device.h ---- linux-2.6.39/arch/mips/include/asm/device.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/mips/include/asm/device.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/include/asm/device.h linux-2.6.39.1/= arch/mips/include/asm/device.h +--- linux-2.6.39.1/arch/mips/include/asm/device.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/mips/include/asm/device.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -10,7 +10,7 @@ struct dma_map_ops; =20 struct dev_archdata { @@ -1985,9 +1985,9 @@ diff -urNp linux-2.6.39/arch/mips/include/asm/devic= e.h linux-2.6.39/arch/mips/in }; =20 struct pdev_archdata { -diff -urNp linux-2.6.39/arch/mips/include/asm/dma-mapping.h linux-2.6.39= /arch/mips/include/asm/dma-mapping.h ---- linux-2.6.39/arch/mips/include/asm/dma-mapping.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/mips/include/asm/dma-mapping.h 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/include/asm/dma-mapping.h linux-2.6.= 39.1/arch/mips/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/mips/include/asm/dma-mapping.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/mips/include/asm/dma-mapping.h 2011-05-22 19:36:= 30.000000000 -0400 @@ -9,9 +9,9 @@ #include #endif @@ -2034,9 +2034,9 @@ diff -urNp linux-2.6.39/arch/mips/include/asm/dma-m= apping.h linux-2.6.39/arch/mi =20 ops->free_coherent(dev, size, vaddr, dma_handle); =20 -diff -urNp linux-2.6.39/arch/mips/include/asm/elf.h linux-2.6.39/arch/mi= ps/include/asm/elf.h ---- linux-2.6.39/arch/mips/include/asm/elf.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/include/asm/elf.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/include/asm/elf.h linux-2.6.39.1/arc= h/mips/include/asm/elf.h +--- linux-2.6.39.1/arch/mips/include/asm/elf.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/include/asm/elf.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -372,13 +372,16 @@ extern const char *__elf_platform; #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -2058,9 +2058,9 @@ diff -urNp linux-2.6.39/arch/mips/include/asm/elf.h= linux-2.6.39/arch/mips/inclu -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coh= erence.h linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-cohere= nce.h ---- linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.= h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.= h 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/include/asm/mach-cavium-octeon/dma-c= oherence.h linux-2.6.39.1/arch/mips/include/asm/mach-cavium-octeon/dma-co= herence.h +--- linux-2.6.39.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherenc= e.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherenc= e.h 2011-05-22 19:36:30.000000000 -0400 @@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); =20 @@ -2070,9 +2070,9 @@ diff -urNp linux-2.6.39/arch/mips/include/asm/mach-= cavium-octeon/dma-coherence.h extern char *octeon_swiotlb; =20 #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */ -diff -urNp linux-2.6.39/arch/mips/include/asm/page.h linux-2.6.39/arch/m= ips/include/asm/page.h ---- linux-2.6.39/arch/mips/include/asm/page.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/mips/include/asm/page.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/include/asm/page.h linux-2.6.39.1/ar= ch/mips/include/asm/page.h +--- linux-2.6.39.1/arch/mips/include/asm/page.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/mips/include/asm/page.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -2082,9 +2082,9 @@ diff -urNp linux-2.6.39/arch/mips/include/asm/page.= h linux-2.6.39/arch/mips/incl #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.39/arch/mips/include/asm/pci/bridge.h linux-2.6.39/= arch/mips/include/asm/pci/bridge.h ---- linux-2.6.39/arch/mips/include/asm/pci/bridge.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/mips/include/asm/pci/bridge.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/include/asm/pci/bridge.h linux-2.6.3= 9.1/arch/mips/include/asm/pci/bridge.h +--- linux-2.6.39.1/arch/mips/include/asm/pci/bridge.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/mips/include/asm/pci/bridge.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -849,6 +849,6 @@ struct bridge_controller { extern void register_bridge_irq(unsigned int irq); extern int request_bridge_irq(struct bridge_controller *bc); @@ -2093,9 +2093,9 @@ diff -urNp linux-2.6.39/arch/mips/include/asm/pci/b= ridge.h linux-2.6.39/arch/mip +extern const struct pci_ops bridge_pci_ops; =20 #endif /* _ASM_PCI_BRIDGE_H */ -diff -urNp linux-2.6.39/arch/mips/include/asm/system.h linux-2.6.39/arch= /mips/include/asm/system.h ---- linux-2.6.39/arch/mips/include/asm/system.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/mips/include/asm/system.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/include/asm/system.h linux-2.6.39.1/= arch/mips/include/asm/system.h +--- linux-2.6.39.1/arch/mips/include/asm/system.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/mips/include/asm/system.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -2104,9 +2104,9 @@ diff -urNp linux-2.6.39/arch/mips/include/asm/syste= m.h linux-2.6.39/arch/mips/in +#define arch_align_stack(x) ((x) & ~0xfUL) =20 #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c linux-2.6.39/ar= ch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/kernel/binfmt_elfn32.c linux-2.6.39.= 1/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.39.1/arch/mips/kernel/binfmt_elfn32.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/mips/kernel/binfmt_elfn32.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -2121,9 +2121,9 @@ diff -urNp linux-2.6.39/arch/mips/kernel/binfmt_elf= n32.c linux-2.6.39/arch/mips/ #include #include #include -diff -urNp linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c linux-2.6.39/ar= ch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/kernel/binfmt_elfo32.c linux-2.6.39.= 1/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.39.1/arch/mips/kernel/binfmt_elfo32.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/mips/kernel/binfmt_elfo32.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -2138,9 +2138,9 @@ diff -urNp linux-2.6.39/arch/mips/kernel/binfmt_elf= o32.c linux-2.6.39/arch/mips/ #include =20 /* -diff -urNp linux-2.6.39/arch/mips/kernel/kgdb.c linux-2.6.39/arch/mips/k= ernel/kgdb.c ---- linux-2.6.39/arch/mips/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/mips/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/mips/kernel/kgdb.c linux-2.6.39.1/arch/mi= ps/kernel/kgdb.c +--- linux-2.6.39.1/arch/mips/kernel/kgdb.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/mips/kernel/kgdb.c 2011-05-22 19:36:30.000000000= -0400 @@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.39/arch/mips/kernel/kgdb.c lin= ux-2.6.39/arch/mips/kernel/kg =20 /* * We use kgdb_early_setup so that functions we need to call now don't -diff -urNp linux-2.6.39/arch/mips/kernel/process.c linux-2.6.39/arch/mip= s/kernel/process.c ---- linux-2.6.39/arch/mips/kernel/process.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/kernel/process.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/kernel/process.c linux-2.6.39.1/arch= /mips/kernel/process.c +--- linux-2.6.39.1/arch/mips/kernel/process.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/kernel/process.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -2169,9 +2169,9 @@ diff -urNp linux-2.6.39/arch/mips/kernel/process.c = linux-2.6.39/arch/mips/kernel - - return sp & ALMASK; -} -diff -urNp linux-2.6.39/arch/mips/kernel/syscall.c linux-2.6.39/arch/mip= s/kernel/syscall.c ---- linux-2.6.39/arch/mips/kernel/syscall.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/kernel/syscall.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/kernel/syscall.c linux-2.6.39.1/arch= /mips/kernel/syscall.c +--- linux-2.6.39.1/arch/mips/kernel/syscall.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/kernel/syscall.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str do_color_align =3D 0; if (filp || (flags & MAP_SHARED)) @@ -2236,9 +2236,9 @@ diff -urNp linux-2.6.39/arch/mips/kernel/syscall.c = linux-2.6.39/arch/mips/kernel SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, off_t, offset) -diff -urNp linux-2.6.39/arch/mips/mm/dma-default.c linux-2.6.39/arch/mip= s/mm/dma-default.c ---- linux-2.6.39/arch/mips/mm/dma-default.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/mm/dma-default.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/mm/dma-default.c linux-2.6.39.1/arch= /mips/mm/dma-default.c +--- linux-2.6.39.1/arch/mips/mm/dma-default.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/mm/dma-default.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev,=20 =20 EXPORT_SYMBOL(dma_cache_sync); @@ -2257,9 +2257,9 @@ diff -urNp linux-2.6.39/arch/mips/mm/dma-default.c = linux-2.6.39/arch/mips/mm/dma EXPORT_SYMBOL(mips_dma_map_ops); =20 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) -diff -urNp linux-2.6.39/arch/mips/mm/fault.c linux-2.6.39/arch/mips/mm/f= ault.c ---- linux-2.6.39/arch/mips/mm/fault.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/mips/mm/fault.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/mips/mm/fault.c linux-2.6.39.1/arch/mips/= mm/fault.c +--- linux-2.6.39.1/arch/mips/mm/fault.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/mips/mm/fault.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -28,6 +28,23 @@ #include /* For VMALLOC_END */ #include @@ -2284,9 +2284,9 @@ diff -urNp linux-2.6.39/arch/mips/mm/fault.c linux-= 2.6.39/arch/mips/mm/fault.c /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.39/arch/mips/mti-malta/malta-pci.c linux-2.6.39/arc= h/mips/mti-malta/malta-pci.c ---- linux-2.6.39/arch/mips/mti-malta/malta-pci.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/mips/mti-malta/malta-pci.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/mti-malta/malta-pci.c linux-2.6.39.1= /arch/mips/mti-malta/malta-pci.c +--- linux-2.6.39.1/arch/mips/mti-malta/malta-pci.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/mips/mti-malta/malta-pci.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -64,9 +64,9 @@ static struct resource msc_io_resource =3D .flags =3D IORESOURCE_IO, }; @@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.39/arch/mips/mti-malta/malta-p= ci.c linux-2.6.39/arch/mips/m =20 static struct pci_controller bonito64_controller =3D { .pci_ops =3D &bonito64_pci_ops, -diff -urNp linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c linux-2.6.39/= arch/mips/nxp/pnx8550/common/pci.c ---- linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/nxp/pnx8550/common/pci.c linux-2.6.3= 9.1/arch/mips/nxp/pnx8550/common/pci.c +--- linux-2.6.39.1/arch/mips/nxp/pnx8550/common/pci.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/mips/nxp/pnx8550/common/pci.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -40,7 +40,7 @@ static struct resource pci_mem_resource=20 .flags =3D IORESOURCE_MEM }; @@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.39/arch/mips/nxp/pnx8550/commo= n/pci.c linux-2.6.39/arch/mip =20 static struct pci_controller pnx8550_controller =3D { .pci_ops =3D &pnx8550_pci_ops, -diff -urNp linux-2.6.39/arch/mips/pci/ops-au1000.c linux-2.6.39/arch/mip= s/pci/ops-au1000.c ---- linux-2.6.39/arch/mips/pci/ops-au1000.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-au1000.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-au1000.c linux-2.6.39.1/arch= /mips/pci/ops-au1000.c +--- linux-2.6.39.1/arch/mips/pci/ops-au1000.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-au1000.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -302,7 +302,7 @@ static int config_write(struct pci_bus * } } @@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-au1000.c = linux-2.6.39/arch/mips/pci/op config_read, config_write }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-bcm63xx.c linux-2.6.39/arch/mi= ps/pci/ops-bcm63xx.c ---- linux-2.6.39/arch/mips/pci/ops-bcm63xx.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-bcm63xx.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-bcm63xx.c linux-2.6.39.1/arc= h/mips/pci/ops-bcm63xx.c +--- linux-2.6.39.1/arch/mips/pci/ops-bcm63xx.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-bcm63xx.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -173,7 +173,7 @@ static int bcm63xx_pci_write(struct pci_ where, size, val); } @@ -2345,9 +2345,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-bcm63xx.c= linux-2.6.39/arch/mips/pci/o .read =3D bcm63xx_cb_read, .write =3D bcm63xx_cb_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-bonito64.c linux-2.6.39/arch/m= ips/pci/ops-bonito64.c ---- linux-2.6.39/arch/mips/pci/ops-bonito64.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-bonito64.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-bonito64.c linux-2.6.39.1/ar= ch/mips/pci/ops-bonito64.c +--- linux-2.6.39.1/arch/mips/pci/ops-bonito64.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-bonito64.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -155,7 +155,7 @@ static int bonito64_pcibios_write(struct return PCIBIOS_SUCCESSFUL; } @@ -2357,9 +2357,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-bonito64.= c linux-2.6.39/arch/mips/pci/ .read =3D bonito64_pcibios_read, .write =3D bonito64_pcibios_write }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-bridge.c linux-2.6.39/arch/mip= s/pci/ops-bridge.c ---- linux-2.6.39/arch/mips/pci/ops-bridge.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-bridge.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-bridge.c linux-2.6.39.1/arch= /mips/pci/ops-bridge.c +--- linux-2.6.39.1/arch/mips/pci/ops-bridge.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-bridge.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -316,7 +316,7 @@ static int pci_write_config(struct pci_b return pci_conf0_write_config(bus, devfn, where, size, value); } @@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-bridge.c = linux-2.6.39/arch/mips/pci/op .read =3D pci_read_config, .write =3D pci_write_config, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-emma2rh.c linux-2.6.39/arch/mi= ps/pci/ops-emma2rh.c ---- linux-2.6.39/arch/mips/pci/ops-emma2rh.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-emma2rh.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-emma2rh.c linux-2.6.39.1/arc= h/mips/pci/ops-emma2rh.c +--- linux-2.6.39.1/arch/mips/pci/ops-emma2rh.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-emma2rh.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -176,7 +176,7 @@ static int pci_config_write(struct pci_b return PCIBIOS_SUCCESSFUL; } @@ -2381,9 +2381,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-emma2rh.c= linux-2.6.39/arch/mips/pci/o .read =3D pci_config_read, .write =3D pci_config_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-gt64xxx_pci0.c linux-2.6.39/ar= ch/mips/pci/ops-gt64xxx_pci0.c ---- linux-2.6.39/arch/mips/pci/ops-gt64xxx_pci0.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-gt64xxx_pci0.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-gt64xxx_pci0.c linux-2.6.39.= 1/arch/mips/pci/ops-gt64xxx_pci0.c +--- linux-2.6.39.1/arch/mips/pci/ops-gt64xxx_pci0.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-gt64xxx_pci0.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -146,7 +146,7 @@ static int gt64xxx_pci0_pcibios_write(st return PCIBIOS_SUCCESSFUL; } @@ -2393,9 +2393,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-gt64xxx_p= ci0.c linux-2.6.39/arch/mips/ .read =3D gt64xxx_pci0_pcibios_read, .write =3D gt64xxx_pci0_pcibios_write }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-loongson2.c linux-2.6.39/arch/= mips/pci/ops-loongson2.c ---- linux-2.6.39/arch/mips/pci/ops-loongson2.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-loongson2.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-loongson2.c linux-2.6.39.1/a= rch/mips/pci/ops-loongson2.c +--- linux-2.6.39.1/arch/mips/pci/ops-loongson2.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-loongson2.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -174,7 +174,7 @@ static int loongson_pcibios_write(struct return PCIBIOS_SUCCESSFUL; } @@ -2405,9 +2405,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-loongson2= .c linux-2.6.39/arch/mips/pci .read =3D loongson_pcibios_read, .write =3D loongson_pcibios_write }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-mace.c linux-2.6.39/arch/mips/= pci/ops-mace.c ---- linux-2.6.39/arch/mips/pci/ops-mace.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/mips/pci/ops-mace.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-mace.c linux-2.6.39.1/arch/m= ips/pci/ops-mace.c +--- linux-2.6.39.1/arch/mips/pci/ops-mace.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-mace.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -96,7 +96,7 @@ mace_pci_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } @@ -2417,9 +2417,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-mace.c li= nux-2.6.39/arch/mips/pci/ops- .read =3D mace_pci_read_config, .write =3D mace_pci_write_config, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-msc.c linux-2.6.39/arch/mips/p= ci/ops-msc.c ---- linux-2.6.39/arch/mips/pci/ops-msc.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/mips/pci/ops-msc.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-msc.c linux-2.6.39.1/arch/mi= ps/pci/ops-msc.c +--- linux-2.6.39.1/arch/mips/pci/ops-msc.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-msc.c 2011-05-22 19:36:30.000000000= -0400 @@ -142,7 +142,7 @@ static int msc_pcibios_write(struct pci_ return PCIBIOS_SUCCESSFUL; } @@ -2429,9 +2429,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-msc.c lin= ux-2.6.39/arch/mips/pci/ops-m .read =3D msc_pcibios_read, .write =3D msc_pcibios_write }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-nile4.c linux-2.6.39/arch/mips= /pci/ops-nile4.c ---- linux-2.6.39/arch/mips/pci/ops-nile4.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/mips/pci/ops-nile4.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-nile4.c linux-2.6.39.1/arch/= mips/pci/ops-nile4.c +--- linux-2.6.39.1/arch/mips/pci/ops-nile4.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-nile4.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -141,7 +141,7 @@ static int nile4_pcibios_write(struct pc return PCIBIOS_SUCCESSFUL; } @@ -2441,9 +2441,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-nile4.c l= inux-2.6.39/arch/mips/pci/ops .read =3D nile4_pcibios_read, .write =3D nile4_pcibios_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-pmcmsp.c linux-2.6.39/arch/mip= s/pci/ops-pmcmsp.c ---- linux-2.6.39/arch/mips/pci/ops-pmcmsp.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-pmcmsp.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-pmcmsp.c linux-2.6.39.1/arch= /mips/pci/ops-pmcmsp.c +--- linux-2.6.39.1/arch/mips/pci/ops-pmcmsp.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-pmcmsp.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -904,7 +904,7 @@ msp_pcibios_write_config(struct pci_bus=20 * write - function for Linux to generate PCI Configuration writ= es. * @@ -2453,9 +2453,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-pmcmsp.c = linux-2.6.39/arch/mips/pci/op .read =3D msp_pcibios_read_config, .write =3D msp_pcibios_write_config }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-pnx8550.c linux-2.6.39/arch/mi= ps/pci/ops-pnx8550.c ---- linux-2.6.39/arch/mips/pci/ops-pnx8550.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-pnx8550.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-pnx8550.c linux-2.6.39.1/arc= h/mips/pci/ops-pnx8550.c +--- linux-2.6.39.1/arch/mips/pci/ops-pnx8550.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-pnx8550.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -276,7 +276,7 @@ static int config_write(struct pci_bus * } } @@ -2465,9 +2465,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-pnx8550.c= linux-2.6.39/arch/mips/pci/o config_read, config_write }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-rc32434.c linux-2.6.39/arch/mi= ps/pci/ops-rc32434.c ---- linux-2.6.39/arch/mips/pci/ops-rc32434.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-rc32434.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-rc32434.c linux-2.6.39.1/arc= h/mips/pci/ops-rc32434.c +--- linux-2.6.39.1/arch/mips/pci/ops-rc32434.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-rc32434.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -201,7 +201,7 @@ static int pci_config_write(struct pci_b } } @@ -2477,9 +2477,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-rc32434.c= linux-2.6.39/arch/mips/pci/o .read =3D pci_config_read, .write =3D pci_config_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-sni.c linux-2.6.39/arch/mips/p= ci/ops-sni.c ---- linux-2.6.39/arch/mips/pci/ops-sni.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/mips/pci/ops-sni.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-sni.c linux-2.6.39.1/arch/mi= ps/pci/ops-sni.c +--- linux-2.6.39.1/arch/mips/pci/ops-sni.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-sni.c 2011-05-22 19:36:30.000000000= -0400 @@ -83,7 +83,7 @@ static int pcimt_write(struct pci_bus *b return 0; } @@ -2498,9 +2498,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-sni.c lin= ux-2.6.39/arch/mips/pci/ops-s .read =3D pcit_read, .write =3D pcit_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-titan.c linux-2.6.39/arch/mips= /pci/ops-titan.c ---- linux-2.6.39/arch/mips/pci/ops-titan.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/mips/pci/ops-titan.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-titan.c linux-2.6.39.1/arch/= mips/pci/ops-titan.c +--- linux-2.6.39.1/arch/mips/pci/ops-titan.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-titan.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -105,7 +105,7 @@ static int titan_write_config(struct pci /* * Titan PCI structure @@ -2510,9 +2510,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-titan.c l= inux-2.6.39/arch/mips/pci/ops titan_read_config, titan_write_config, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-titan-ht.c linux-2.6.39/arch/m= ips/pci/ops-titan-ht.c ---- linux-2.6.39/arch/mips/pci/ops-titan-ht.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-titan-ht.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-titan-ht.c linux-2.6.39.1/ar= ch/mips/pci/ops-titan-ht.c +--- linux-2.6.39.1/arch/mips/pci/ops-titan-ht.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-titan-ht.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -118,7 +118,7 @@ static int titan_ht_config_write(struct=20 return PCIBIOS_SUCCESSFUL; } @@ -2522,9 +2522,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-titan-ht.= c linux-2.6.39/arch/mips/pci/ .read =3D titan_ht_config_read, .write =3D titan_ht_config_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-tx3927.c linux-2.6.39/arch/mip= s/pci/ops-tx3927.c ---- linux-2.6.39/arch/mips/pci/ops-tx3927.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-tx3927.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-tx3927.c linux-2.6.39.1/arch= /mips/pci/ops-tx3927.c +--- linux-2.6.39.1/arch/mips/pci/ops-tx3927.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-tx3927.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -121,7 +121,7 @@ static int tx3927_pci_write_config(struc return check_abort(); } @@ -2534,9 +2534,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-tx3927.c = linux-2.6.39/arch/mips/pci/op .read =3D tx3927_pci_read_config, .write =3D tx3927_pci_write_config, }; -diff -urNp linux-2.6.39/arch/mips/pci/ops-vr41xx.c linux-2.6.39/arch/mip= s/pci/ops-vr41xx.c ---- linux-2.6.39/arch/mips/pci/ops-vr41xx.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/ops-vr41xx.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/ops-vr41xx.c linux-2.6.39.1/arch= /mips/pci/ops-vr41xx.c +--- linux-2.6.39.1/arch/mips/pci/ops-vr41xx.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/ops-vr41xx.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -120,7 +120,7 @@ static int pci_config_write(struct pci_b return PCIBIOS_SUCCESSFUL; } @@ -2546,9 +2546,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/ops-vr41xx.c = linux-2.6.39/arch/mips/pci/op .read =3D pci_config_read, .write =3D pci_config_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/pci-bcm1480.c linux-2.6.39/arch/mi= ps/pci/pci-bcm1480.c ---- linux-2.6.39/arch/mips/pci/pci-bcm1480.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-bcm1480.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-bcm1480.c linux-2.6.39.1/arc= h/mips/pci/pci-bcm1480.c +--- linux-2.6.39.1/arch/mips/pci/pci-bcm1480.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-bcm1480.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -171,7 +171,7 @@ static int bcm1480_pcibios_write(struct=20 return PCIBIOS_SUCCESSFUL; } @@ -2558,9 +2558,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-bcm1480.c= linux-2.6.39/arch/mips/pci/p bcm1480_pcibios_read, bcm1480_pcibios_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/pci-bcm1480ht.c linux-2.6.39/arch/= mips/pci/pci-bcm1480ht.c ---- linux-2.6.39/arch/mips/pci/pci-bcm1480ht.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-bcm1480ht.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-bcm1480ht.c linux-2.6.39.1/a= rch/mips/pci/pci-bcm1480ht.c +--- linux-2.6.39.1/arch/mips/pci/pci-bcm1480ht.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-bcm1480ht.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -166,7 +166,7 @@ static int bcm1480ht_pcibios_get_busno(v return 0; } @@ -2570,9 +2570,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-bcm1480ht= .c linux-2.6.39/arch/mips/pci .read =3D bcm1480ht_pcibios_read, .write =3D bcm1480ht_pcibios_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/pci-bcm63xx.h linux-2.6.39/arch/mi= ps/pci/pci-bcm63xx.h ---- linux-2.6.39/arch/mips/pci/pci-bcm63xx.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-bcm63xx.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-bcm63xx.h linux-2.6.39.1/arc= h/mips/pci/pci-bcm63xx.h +--- linux-2.6.39.1/arch/mips/pci/pci-bcm63xx.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-bcm63xx.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -16,8 +16,8 @@ /* * defined in ops-bcm63xx.c @@ -2584,9 +2584,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-bcm63xx.h= linux-2.6.39/arch/mips/pci/p =20 /* * defined in pci-bcm63xx.c -diff -urNp linux-2.6.39/arch/mips/pci/pci-emma2rh.c linux-2.6.39/arch/mi= ps/pci/pci-emma2rh.c ---- linux-2.6.39/arch/mips/pci/pci-emma2rh.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-emma2rh.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-emma2rh.c linux-2.6.39.1/arc= h/mips/pci/pci-emma2rh.c +--- linux-2.6.39.1/arch/mips/pci/pci-emma2rh.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-emma2rh.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -43,7 +43,7 @@ static struct resource pci_mem_resource=20 .flags =3D IORESOURCE_MEM, }; @@ -2596,9 +2596,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-emma2rh.c= linux-2.6.39/arch/mips/pci/p =20 static struct pci_controller emma2rh_pci_controller =3D { .pci_ops =3D &emma2rh_pci_ops, -diff -urNp linux-2.6.39/arch/mips/pci/pcie-octeon.c linux-2.6.39/arch/mi= ps/pci/pcie-octeon.c ---- linux-2.6.39/arch/mips/pci/pcie-octeon.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/pcie-octeon.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pcie-octeon.c linux-2.6.39.1/arc= h/mips/pci/pcie-octeon.c +--- linux-2.6.39.1/arch/mips/pci/pcie-octeon.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pcie-octeon.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -1237,7 +1237,7 @@ static int octeon_pcie1_write_config(str return octeon_pcie_write_config(1, bus, devfn, reg, size, val); } @@ -2617,9 +2617,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pcie-octeon.c= linux-2.6.39/arch/mips/pci/p octeon_pcie1_read_config, octeon_pcie1_write_config, }; -diff -urNp linux-2.6.39/arch/mips/pci/pci-ip27.c linux-2.6.39/arch/mips/= pci/pci-ip27.c ---- linux-2.6.39/arch/mips/pci/pci-ip27.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/mips/pci/pci-ip27.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-ip27.c linux-2.6.39.1/arch/m= ips/pci/pci-ip27.c +--- linux-2.6.39.1/arch/mips/pci/pci-ip27.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-ip27.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -39,7 +39,7 @@ static struct bridge_controller bridges[ struct bridge_controller *irq_to_bridge[MAX_PCI_BUSSES * MAX_DEVICES_PE= R_PCIBUS]; int irq_to_slot[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS]; @@ -2629,9 +2629,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-ip27.c li= nux-2.6.39/arch/mips/pci/pci- =20 int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) { -diff -urNp linux-2.6.39/arch/mips/pci/pci-ip32.c linux-2.6.39/arch/mips/= pci/pci-ip32.c ---- linux-2.6.39/arch/mips/pci/pci-ip32.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/mips/pci/pci-ip32.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-ip32.c linux-2.6.39.1/arch/m= ips/pci/pci-ip32.c +--- linux-2.6.39.1/arch/mips/pci/pci-ip32.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-ip32.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -82,7 +82,7 @@ static irqreturn_t macepci_error(int irq } =20 @@ -2641,9 +2641,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-ip32.c li= nux-2.6.39/arch/mips/pci/pci- #ifdef CONFIG_64BIT static struct resource mace_pci_mem_resource =3D { .name =3D "SGI O2 PCI MEM", -diff -urNp linux-2.6.39/arch/mips/pci/pci-lasat.c linux-2.6.39/arch/mips= /pci/pci-lasat.c ---- linux-2.6.39/arch/mips/pci/pci-lasat.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/mips/pci/pci-lasat.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-lasat.c linux-2.6.39.1/arch/= mips/pci/pci-lasat.c +--- linux-2.6.39.1/arch/mips/pci/pci-lasat.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-lasat.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -14,8 +14,8 @@ =20 #include @@ -2655,9 +2655,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-lasat.c l= inux-2.6.39/arch/mips/pci/pci static struct resource lasat_pci_mem_resource =3D { .name =3D "LASAT PCI MEM", .start =3D 0x18000000, -diff -urNp linux-2.6.39/arch/mips/pci/pci-octeon.c linux-2.6.39/arch/mip= s/pci/pci-octeon.c ---- linux-2.6.39/arch/mips/pci/pci-octeon.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-octeon.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-octeon.c linux-2.6.39.1/arch= /mips/pci/pci-octeon.c +--- linux-2.6.39.1/arch/mips/pci/pci-octeon.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-octeon.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -334,7 +334,7 @@ static int octeon_write_config(struct pc } =20 @@ -2667,9 +2667,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-octeon.c = linux-2.6.39/arch/mips/pci/pc octeon_read_config, octeon_write_config, }; -diff -urNp linux-2.6.39/arch/mips/pci/pci-rc32434.c linux-2.6.39/arch/mi= ps/pci/pci-rc32434.c ---- linux-2.6.39/arch/mips/pci/pci-rc32434.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-rc32434.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-rc32434.c linux-2.6.39.1/arc= h/mips/pci/pci-rc32434.c +--- linux-2.6.39.1/arch/mips/pci/pci-rc32434.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-rc32434.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -75,7 +75,7 @@ static struct resource rc32434_res_pci_i .flags =3D IORESOURCE_IO, }; @@ -2679,9 +2679,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-rc32434.c= linux-2.6.39/arch/mips/pci/p =20 #define PCI_MEM1_START PCI_ADDR_START #define PCI_MEM1_END (PCI_ADDR_START + CPUTOPCI_MEM_WIN - 1) -diff -urNp linux-2.6.39/arch/mips/pci/pci-sb1250.c linux-2.6.39/arch/mip= s/pci/pci-sb1250.c ---- linux-2.6.39/arch/mips/pci/pci-sb1250.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-sb1250.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-sb1250.c linux-2.6.39.1/arch= /mips/pci/pci-sb1250.c +--- linux-2.6.39.1/arch/mips/pci/pci-sb1250.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-sb1250.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -181,7 +181,7 @@ static int sb1250_pcibios_write(struct p return PCIBIOS_SUCCESSFUL; } @@ -2691,9 +2691,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-sb1250.c = linux-2.6.39/arch/mips/pci/pc .read =3D sb1250_pcibios_read, .write =3D sb1250_pcibios_write, }; -diff -urNp linux-2.6.39/arch/mips/pci/pci-vr41xx.c linux-2.6.39/arch/mip= s/pci/pci-vr41xx.c ---- linux-2.6.39/arch/mips/pci/pci-vr41xx.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-vr41xx.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-vr41xx.c linux-2.6.39.1/arch= /mips/pci/pci-vr41xx.c +--- linux-2.6.39.1/arch/mips/pci/pci-vr41xx.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-vr41xx.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -36,7 +36,7 @@ =20 #include "pci-vr41xx.h" @@ -2703,9 +2703,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-vr41xx.c = linux-2.6.39/arch/mips/pci/pc =20 static void __iomem *pciu_base; =20 -diff -urNp linux-2.6.39/arch/mips/pci/pci-yosemite.c linux-2.6.39/arch/m= ips/pci/pci-yosemite.c ---- linux-2.6.39/arch/mips/pci/pci-yosemite.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/mips/pci/pci-yosemite.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pci/pci-yosemite.c linux-2.6.39.1/ar= ch/mips/pci/pci-yosemite.c +--- linux-2.6.39.1/arch/mips/pci/pci-yosemite.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/mips/pci/pci-yosemite.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -11,7 +11,7 @@ #include #include @@ -2715,9 +2715,9 @@ diff -urNp linux-2.6.39/arch/mips/pci/pci-yosemite.= c linux-2.6.39/arch/mips/pci/ =20 static struct resource py_mem_resource =3D { .start =3D 0xe0000000UL, -diff -urNp linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c linux-2.6.39/= arch/mips/pmc-sierra/yosemite/ht.c ---- linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pmc-sierra/yosemite/ht.c linux-2.6.3= 9.1/arch/mips/pmc-sierra/yosemite/ht.c +--- linux-2.6.39.1/arch/mips/pmc-sierra/yosemite/ht.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/mips/pmc-sierra/yosemite/ht.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -366,7 +366,7 @@ resource_size_t pcibios_align_resource(v return start; } @@ -2727,9 +2727,9 @@ diff -urNp linux-2.6.39/arch/mips/pmc-sierra/yosemi= te/ht.c linux-2.6.39/arch/mip titan_ht_config_read_byte, titan_ht_config_read_word, titan_ht_config_read_dword, -diff -urNp linux-2.6.39/arch/mips/pnx8550/common/pci.c linux-2.6.39/arch= /mips/pnx8550/common/pci.c ---- linux-2.6.39/arch/mips/pnx8550/common/pci.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/mips/pnx8550/common/pci.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/mips/pnx8550/common/pci.c linux-2.6.39.1/= arch/mips/pnx8550/common/pci.c +--- linux-2.6.39.1/arch/mips/pnx8550/common/pci.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/mips/pnx8550/common/pci.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -40,7 +40,7 @@ static struct resource pci_mem_resource=20 .flags =3D IORESOURCE_MEM }; @@ -2739,9 +2739,9 @@ diff -urNp linux-2.6.39/arch/mips/pnx8550/common/pc= i.c linux-2.6.39/arch/mips/pn =20 static struct pci_controller pnx8550_controller =3D { .pci_ops =3D &pnx8550_pci_ops, -diff -urNp linux-2.6.39/arch/mips/sni/pcimt.c linux-2.6.39/arch/mips/sni= /pcimt.c ---- linux-2.6.39/arch/mips/sni/pcimt.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/mips/sni/pcimt.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/mips/sni/pcimt.c linux-2.6.39.1/arch/mips= /sni/pcimt.c +--- linux-2.6.39.1/arch/mips/sni/pcimt.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/mips/sni/pcimt.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -183,7 +183,7 @@ static void __init sni_pcimt_resource_in request_resource(&sni_mem_resource, pcimt_mem_resources + i); } @@ -2751,9 +2751,9 @@ diff -urNp linux-2.6.39/arch/mips/sni/pcimt.c linux= -2.6.39/arch/mips/sni/pcimt.c =20 static struct pci_controller sni_controller =3D { .pci_ops =3D &sni_pcimt_ops, -diff -urNp linux-2.6.39/arch/mips/sni/pcit.c linux-2.6.39/arch/mips/sni/= pcit.c ---- linux-2.6.39/arch/mips/sni/pcit.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/mips/sni/pcit.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/mips/sni/pcit.c linux-2.6.39.1/arch/mips/= sni/pcit.c +--- linux-2.6.39.1/arch/mips/sni/pcit.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/mips/sni/pcit.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -145,7 +145,7 @@ static void __init sni_pcit_resource_ini } =20 @@ -2763,9 +2763,9 @@ diff -urNp linux-2.6.39/arch/mips/sni/pcit.c linux-= 2.6.39/arch/mips/sni/pcit.c =20 static struct pci_controller sni_pcit_controller =3D { .pci_ops =3D &sni_pcit_ops, -diff -urNp linux-2.6.39/arch/mips/wrppmc/pci.c linux-2.6.39/arch/mips/wr= ppmc/pci.c ---- linux-2.6.39/arch/mips/wrppmc/pci.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/mips/wrppmc/pci.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/mips/wrppmc/pci.c linux-2.6.39.1/arch/mip= s/wrppmc/pci.c +--- linux-2.6.39.1/arch/mips/wrppmc/pci.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/mips/wrppmc/pci.c 2011-05-22 19:36:30.000000000 = -0400 @@ -14,7 +14,7 @@ =20 #include @@ -2775,9 +2775,9 @@ diff -urNp linux-2.6.39/arch/mips/wrppmc/pci.c linu= x-2.6.39/arch/mips/wrppmc/pci =20 static struct resource pci0_io_resource =3D { .name =3D "pci_0 io", -diff -urNp linux-2.6.39/arch/mn10300/unit-asb2305/pci-asb2305.h linux-2.= 6.39/arch/mn10300/unit-asb2305/pci-asb2305.h ---- linux-2.6.39/arch/mn10300/unit-asb2305/pci-asb2305.h 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/arch/mn10300/unit-asb2305/pci-asb2305.h 2011-05-22 19:3= 6:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/mn10300/unit-asb2305/pci-asb2305.h linux-= 2.6.39.1/arch/mn10300/unit-asb2305/pci-asb2305.h +--- linux-2.6.39.1/arch/mn10300/unit-asb2305/pci-asb2305.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/mn10300/unit-asb2305/pci-asb2305.h 2011-05-22 19= :36:30.000000000 -0400 @@ -39,7 +39,7 @@ extern void pcibios_resource_survey(void =20 extern int pcibios_last_bus; @@ -2787,9 +2787,9 @@ diff -urNp linux-2.6.39/arch/mn10300/unit-asb2305/p= ci-asb2305.h linux-2.6.39/arc =20 extern struct irq_routing_table *pcibios_get_irq_routing_table(void); extern int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int ir= q); -diff -urNp linux-2.6.39/arch/mn10300/unit-asb2305/pci.c linux-2.6.39/arc= h/mn10300/unit-asb2305/pci.c ---- linux-2.6.39/arch/mn10300/unit-asb2305/pci.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/mn10300/unit-asb2305/pci.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/mn10300/unit-asb2305/pci.c linux-2.6.39.1= /arch/mn10300/unit-asb2305/pci.c +--- linux-2.6.39.1/arch/mn10300/unit-asb2305/pci.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/mn10300/unit-asb2305/pci.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -24,7 +24,7 @@ unsigned int pci_probe =3D 1; =20 int pcibios_last_bus =3D -1; @@ -2817,9 +2817,9 @@ diff -urNp linux-2.6.39/arch/mn10300/unit-asb2305/p= ci.c linux-2.6.39/arch/mn1030 { struct pci_bus bus; /* Fake bus and device */ u32 x; -diff -urNp linux-2.6.39/arch/parisc/include/asm/elf.h linux-2.6.39/arch/= parisc/include/asm/elf.h ---- linux-2.6.39/arch/parisc/include/asm/elf.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/parisc/include/asm/elf.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/parisc/include/asm/elf.h linux-2.6.39.1/a= rch/parisc/include/asm/elf.h +--- linux-2.6.39.1/arch/parisc/include/asm/elf.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/parisc/include/asm/elf.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration.. =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -2834,9 +2834,9 @@ diff -urNp linux-2.6.39/arch/parisc/include/asm/elf= .h linux-2.6.39/arch/parisc/i /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space= , but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.39/arch/parisc/include/asm/pgtable.h linux-2.6.39/a= rch/parisc/include/asm/pgtable.h ---- linux-2.6.39/arch/parisc/include/asm/pgtable.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/parisc/include/asm/pgtable.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/parisc/include/asm/pgtable.h linux-2.6.39= .1/arch/parisc/include/asm/pgtable.h +--- linux-2.6.39.1/arch/parisc/include/asm/pgtable.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/parisc/include/asm/pgtable.h 2011-05-22 19:36:30= .000000000 -0400 @@ -207,6 +207,17 @@ struct vm_area_struct; #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_REA= D | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -2855,9 +2855,9 @@ diff -urNp linux-2.6.39/arch/parisc/include/asm/pgt= able.h linux-2.6.39/arch/pari #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.39/arch/parisc/kernel/module.c linux-2.6.39/arch/pa= risc/kernel/module.c ---- linux-2.6.39/arch/parisc/kernel/module.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/parisc/kernel/module.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/parisc/kernel/module.c linux-2.6.39.1/arc= h/parisc/kernel/module.c +--- linux-2.6.39.1/arch/parisc/kernel/module.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/parisc/kernel/module.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -96,16 +96,38 @@ =20 /* three functions to determine where in the module core @@ -2958,9 +2958,9 @@ diff -urNp linux-2.6.39/arch/parisc/kernel/module.c= linux-2.6.39/arch/parisc/ker =20 DEBUGP("register_unwind_table(), sect =3D %d at 0x%p - 0x%p (gp=3D0x%l= x)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.39/arch/parisc/kernel/sys_parisc.c linux-2.6.39/arc= h/parisc/kernel/sys_parisc.c ---- linux-2.6.39/arch/parisc/kernel/sys_parisc.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/parisc/kernel/sys_parisc.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/parisc/kernel/sys_parisc.c linux-2.6.39.1= /arch/parisc/kernel/sys_parisc.c +--- linux-2.6.39.1/arch/parisc/kernel/sys_parisc.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/parisc/kernel/sys_parisc.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) @@ -2988,9 +2988,9 @@ diff -urNp linux-2.6.39/arch/parisc/kernel/sys_pari= sc.c linux-2.6.39/arch/parisc =20 if (filp) { addr =3D get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.39/arch/parisc/kernel/traps.c linux-2.6.39/arch/par= isc/kernel/traps.c ---- linux-2.6.39/arch/parisc/kernel/traps.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/parisc/kernel/traps.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/parisc/kernel/traps.c linux-2.6.39.1/arch= /parisc/kernel/traps.c +--- linux-2.6.39.1/arch/parisc/kernel/traps.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/parisc/kernel/traps.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod =20 down_read(¤t->mm->mmap_sem); @@ -3002,9 +3002,9 @@ diff -urNp linux-2.6.39/arch/parisc/kernel/traps.c = linux-2.6.39/arch/parisc/kern fault_address =3D regs->iaoq[0]; fault_space =3D regs->iasq[0]; =20 -diff -urNp linux-2.6.39/arch/parisc/mm/fault.c linux-2.6.39/arch/parisc/= mm/fault.c ---- linux-2.6.39/arch/parisc/mm/fault.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/parisc/mm/fault.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/parisc/mm/fault.c linux-2.6.39.1/arch/par= isc/mm/fault.c +--- linux-2.6.39.1/arch/parisc/mm/fault.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/parisc/mm/fault.c 2011-05-22 19:36:30.000000000 = -0400 @@ -15,6 +15,7 @@ #include #include @@ -3174,9 +3174,9 @@ diff -urNp linux-2.6.39/arch/parisc/mm/fault.c linu= x-2.6.39/arch/parisc/mm/fault =20 /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.39/arch/powerpc/include/asm/device.h linux-2.6.39/a= rch/powerpc/include/asm/device.h ---- linux-2.6.39/arch/powerpc/include/asm/device.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/device.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/device.h linux-2.6.39= .1/arch/powerpc/include/asm/device.h +--- linux-2.6.39.1/arch/powerpc/include/asm/device.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/device.h 2011-05-22 19:36:30= .000000000 -0400 @@ -17,7 +17,7 @@ struct device_node; */ struct dev_archdata { @@ -3186,9 +3186,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/de= vice.h linux-2.6.39/arch/powe =20 /* * When an iommu is in use, dma_data is used as a ptr to the base of t= he -diff -urNp linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h linux-2.6= .39/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h 2011-05-22 19:36= :30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/dma-mapping.h linux-2= .6.39.1/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/powerpc/include/asm/dma-mapping.h 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/dma-mapping.h 2011-05-22 19:= 36:30.000000000 -0400 @@ -67,12 +67,13 @@ static inline unsigned long device_to_ma /* * Available generic sets of operations @@ -3251,9 +3251,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/dm= a-mapping.h linux-2.6.39/arch =20 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.39/arch/powerpc/include/asm/elf.h linux-2.6.39/arch= /powerpc/include/asm/elf.h ---- linux-2.6.39/arch/powerpc/include/asm/elf.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/elf.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/elf.h linux-2.6.39.1/= arch/powerpc/include/asm/elf.h +--- linux-2.6.39.1/arch/powerpc/include/asm/elf.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/elf.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -3286,9 +3286,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/el= f.h linux-2.6.39/arch/powerpc #endif /* __KERNEL__ */ =20 /* -diff -urNp linux-2.6.39/arch/powerpc/include/asm/iommu.h linux-2.6.39/ar= ch/powerpc/include/asm/iommu.h ---- linux-2.6.39/arch/powerpc/include/asm/iommu.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/iommu.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/iommu.h linux-2.6.39.= 1/arch/powerpc/include/asm/iommu.h +--- linux-2.6.39.1/arch/powerpc/include/asm/iommu.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/iommu.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); @@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/io= mmu.h linux-2.6.39/arch/power #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.39/arch/powerpc/include/asm/kmap_types.h linux-2.6.= 39/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.39/arch/powerpc/include/asm/kmap_types.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/kmap_types.h 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/kmap_types.h linux-2.= 6.39.1/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.39.1/arch/powerpc/include/asm/kmap_types.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/kmap_types.h 2011-05-22 19:3= 6:30.000000000 -0400 @@ -27,6 +27,7 @@ enum km_type { KM_PPC_SYNC_PAGE, KM_PPC_SYNC_ICACHE, @@ -3310,9 +3310,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/km= ap_types.h linux-2.6.39/arch/ KM_TYPE_NR }; =20 -diff -urNp linux-2.6.39/arch/powerpc/include/asm/page_64.h linux-2.6.39/= arch/powerpc/include/asm/page_64.h ---- linux-2.6.39/arch/powerpc/include/asm/page_64.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/page_64.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/page_64.h linux-2.6.3= 9.1/arch/powerpc/include/asm/page_64.h +--- linux-2.6.39.1/arch/powerpc/include/asm/page_64.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/page_64.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -172,15 +172,18 @@ do { \ * stack by default, so in the absence of a PT_GNU_STACK program header * we turn execute permission off. @@ -3334,9 +3334,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/pa= ge_64.h linux-2.6.39/arch/pow =20 #include =20 -diff -urNp linux-2.6.39/arch/powerpc/include/asm/page.h linux-2.6.39/arc= h/powerpc/include/asm/page.h ---- linux-2.6.39/arch/powerpc/include/asm/page.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/page.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/page.h linux-2.6.39.1= /arch/powerpc/include/asm/page.h +--- linux-2.6.39.1/arch/powerpc/include/asm/page.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/page.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -3359,9 +3359,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/pa= ge.h linux-2.6.39/arch/powerp #ifndef __ASSEMBLY__ =20 #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.39/arch/powerpc/include/asm/pci.h linux-2.6.39/arch= /powerpc/include/asm/pci.h ---- linux-2.6.39/arch/powerpc/include/asm/pci.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/pci.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/pci.h linux-2.6.39.1/= arch/powerpc/include/asm/pci.h +--- linux-2.6.39.1/arch/powerpc/include/asm/pci.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/pci.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } =20 @@ -3373,9 +3373,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/pc= i.h linux-2.6.39/arch/powerpc #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.39/arch/powerpc/include/asm/pgtable.h linux-2.6.39/= arch/powerpc/include/asm/pgtable.h ---- linux-2.6.39/arch/powerpc/include/asm/pgtable.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/pgtable.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/pgtable.h linux-2.6.3= 9.1/arch/powerpc/include/asm/pgtable.h +--- linux-2.6.39.1/arch/powerpc/include/asm/pgtable.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/pgtable.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ @@ -3384,9 +3384,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/pg= table.h linux-2.6.39/arch/pow #ifndef __ASSEMBLY__ #include /* For TASK_SIZE */ #include -diff -urNp linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h linux-2.6.= 39/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/pte-hash32.h linux-2.= 6.39.1/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.39.1/arch/powerpc/include/asm/pte-hash32.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/pte-hash32.h 2011-05-22 19:3= 6:30.000000000 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -3395,9 +3395,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/pt= e-hash32.h linux-2.6.39/arch/ #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP system= s) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.39/arch/powerpc/include/asm/reg.h linux-2.6.39/arch= /powerpc/include/asm/reg.h ---- linux-2.6.39/arch/powerpc/include/asm/reg.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/reg.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/reg.h linux-2.6.39.1/= arch/powerpc/include/asm/reg.h +--- linux-2.6.39.1/arch/powerpc/include/asm/reg.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/reg.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -201,6 +201,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/re= g.h linux-2.6.39/arch/powerpc #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.39/arch/powerpc/include/asm/swiotlb.h linux-2.6.39/= arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.39/arch/powerpc/include/asm/swiotlb.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/swiotlb.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/swiotlb.h linux-2.6.3= 9.1/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.39.1/arch/powerpc/include/asm/swiotlb.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/swiotlb.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -13,7 +13,7 @@ =20 #include @@ -3418,9 +3418,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/sw= iotlb.h linux-2.6.39/arch/pow =20 static inline void dma_mark_clean(void *addr, size_t size) {} =20 -diff -urNp linux-2.6.39/arch/powerpc/include/asm/system.h linux-2.6.39/a= rch/powerpc/include/asm/system.h ---- linux-2.6.39/arch/powerpc/include/asm/system.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/system.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/system.h linux-2.6.39= .1/arch/powerpc/include/asm/system.h +--- linux-2.6.39.1/arch/powerpc/include/asm/system.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/system.h 2011-05-22 19:36:30= .000000000 -0400 @@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o)= , (n)) #endif @@ -3430,9 +3430,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/sy= stem.h linux-2.6.39/arch/powe =20 /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -diff -urNp linux-2.6.39/arch/powerpc/include/asm/uaccess.h linux-2.6.39/= arch/powerpc/include/asm/uaccess.h ---- linux-2.6.39/arch/powerpc/include/asm/uaccess.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/powerpc/include/asm/uaccess.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/include/asm/uaccess.h linux-2.6.3= 9.1/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.39.1/arch/powerpc/include/asm/uaccess.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/include/asm/uaccess.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -3610,9 +3610,9 @@ diff -urNp linux-2.6.39/arch/powerpc/include/asm/ua= ccess.h linux-2.6.39/arch/pow extern unsigned long __clear_user(void __user *addr, unsigned long size= ); =20 static inline unsigned long clear_user(void __user *addr, unsigned long= size) -diff -urNp linux-2.6.39/arch/powerpc/kernel/dma.c linux-2.6.39/arch/powe= rpc/kernel/dma.c ---- linux-2.6.39/arch/powerpc/kernel/dma.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/powerpc/kernel/dma.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/dma.c linux-2.6.39.1/arch/= powerpc/kernel/dma.c +--- linux-2.6.39.1/arch/powerpc/kernel/dma.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/dma.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl } #endif @@ -3631,9 +3631,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/dma.c l= inux-2.6.39/arch/powerpc/kern =20 if (ppc_md.dma_set_mask) return ppc_md.dma_set_mask(dev, dma_mask); -diff -urNp linux-2.6.39/arch/powerpc/kernel/dma-iommu.c linux-2.6.39/arc= h/powerpc/kernel/dma-iommu.c ---- linux-2.6.39/arch/powerpc/kernel/dma-iommu.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/dma-iommu.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/dma-iommu.c linux-2.6.39.1= /arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.39.1/arch/powerpc/kernel/dma-iommu.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/dma-iommu.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } =20 @@ -3652,9 +3652,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/dma-iom= mu.c linux-2.6.39/arch/powerp .alloc_coherent =3D dma_iommu_alloc_coherent, .free_coherent =3D dma_iommu_free_coherent, .map_sg =3D dma_iommu_map_sg, -diff -urNp linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.39/a= rch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.39= .1/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.39.1/arch/powerpc/kernel/dma-swiotlb.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/dma-swiotlb.c 2011-05-22 19:36:30= .000000000 -0400 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -3664,9 +3664,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/dma-swi= otlb.c linux-2.6.39/arch/powe .alloc_coherent =3D dma_direct_alloc_coherent, .free_coherent =3D dma_direct_free_coherent, .map_sg =3D swiotlb_map_sg_attrs, -diff -urNp linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S linux-2.6.3= 9/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/exceptions-64e.S linux-2.6= .39.1/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.39.1/arch/powerpc/kernel/exceptions-64e.S 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/exceptions-64e.S 2011-05-22 19:36= :30.000000000 -0400 @@ -495,6 +495,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -3685,9 +3685,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/excepti= ons-64e.S linux-2.6.39/arch/p addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S linux-2.6.3= 9/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/exceptions-64s.S linux-2.6= .39.1/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.39.1/arch/powerpc/kernel/exceptions-64s.S 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/exceptions-64s.S 2011-05-22 19:36= :30.000000000 -0400 @@ -848,10 +848,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -3700,9 +3700,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/excepti= ons-64s.S linux-2.6.39/arch/p mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.39/arch/powerpc/kernel/ibmebus.c linux-2.6.39/arch/= powerpc/kernel/ibmebus.c ---- linux-2.6.39/arch/powerpc/kernel/ibmebus.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/ibmebus.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/ibmebus.c linux-2.6.39.1/a= rch/powerpc/kernel/ibmebus.c +--- linux-2.6.39.1/arch/powerpc/kernel/ibmebus.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/ibmebus.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct=20 return 1; } @@ -3712,9 +3712,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/ibmebus= .c linux-2.6.39/arch/powerpc/ .alloc_coherent =3D ibmebus_alloc_coherent, .free_coherent =3D ibmebus_free_coherent, .map_sg =3D ibmebus_map_sg, -diff -urNp linux-2.6.39/arch/powerpc/kernel/kgdb.c linux-2.6.39/arch/pow= erpc/kernel/kgdb.c ---- linux-2.6.39/arch/powerpc/kernel/kgdb.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/kgdb.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/kgdb.c linux-2.6.39.1/arch= /powerpc/kernel/kgdb.c +--- linux-2.6.39.1/arch/powerpc/kernel/kgdb.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/kgdb.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto /* * Global data @@ -3724,9 +3724,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/kgdb.c = linux-2.6.39/arch/powerpc/ker .gdb_bpt_instr =3D {0x7d, 0x82, 0x10, 0x08}, }; =20 -diff -urNp linux-2.6.39/arch/powerpc/kernel/module_32.c linux-2.6.39/arc= h/powerpc/kernel/module_32.c ---- linux-2.6.39/arch/powerpc/kernel/module_32.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/module_32.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/module_32.c linux-2.6.39.1= /arch/powerpc/kernel/module_32.c +--- linux-2.6.39.1/arch/powerpc/kernel/module_32.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/module_32.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section =3D i; } @@ -3756,9 +3756,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/module_= 32.c linux-2.6.39/arch/powerp =20 /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.39/arch/powerpc/kernel/module.c linux-2.6.39/arch/p= owerpc/kernel/module.c ---- linux-2.6.39/arch/powerpc/kernel/module.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/module.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/module.c linux-2.6.39.1/ar= ch/powerpc/kernel/module.c +--- linux-2.6.39.1/arch/powerpc/kernel/module.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/module.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -31,11 +31,24 @@ =20 LIST_HEAD(module_bug_list); @@ -3798,9 +3798,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/module.= c linux-2.6.39/arch/powerpc/k static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.39/arch/powerpc/kernel/pci-common.c linux-2.6.39/ar= ch/powerpc/kernel/pci-common.c ---- linux-2.6.39/arch/powerpc/kernel/pci-common.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/pci-common.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/pci-common.c linux-2.6.39.= 1/arch/powerpc/kernel/pci-common.c +--- linux-2.6.39.1/arch/powerpc/kernel/pci-common.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/pci-common.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -53,14 +53,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags =3D 0; =20 @@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/pci-com= mon.c linux-2.6.39/arch/power { .read =3D null_read_config, .write =3D null_write_config, -diff -urNp linux-2.6.39/arch/powerpc/kernel/process.c linux-2.6.39/arch/= powerpc/kernel/process.c ---- linux-2.6.39/arch/powerpc/kernel/process.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/process.c 2011-05-22 19:41:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/process.c linux-2.6.39.1/a= rch/powerpc/kernel/process.c +--- linux-2.6.39.1/arch/powerpc/kernel/process.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/process.c 2011-05-22 19:41:32.000= 000000 -0400 @@ -655,8 +655,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing @@ -3923,9 +3923,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/process= .c linux-2.6.39/arch/powerpc/ - - return ret; -} -diff -urNp linux-2.6.39/arch/powerpc/kernel/rtas_pci.c linux-2.6.39/arch= /powerpc/kernel/rtas_pci.c ---- linux-2.6.39/arch/powerpc/kernel/rtas_pci.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/rtas_pci.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/rtas_pci.c linux-2.6.39.1/= arch/powerpc/kernel/rtas_pci.c +--- linux-2.6.39.1/arch/powerpc/kernel/rtas_pci.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/rtas_pci.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -149,7 +149,7 @@ static int rtas_pci_write_config(struct=20 return PCIBIOS_DEVICE_NOT_FOUND; } @@ -3935,9 +3935,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/rtas_pc= i.c linux-2.6.39/arch/powerpc .read =3D rtas_pci_read_config, .write =3D rtas_pci_write_config, }; -diff -urNp linux-2.6.39/arch/powerpc/kernel/signal_32.c linux-2.6.39/arc= h/powerpc/kernel/signal_32.c ---- linux-2.6.39/arch/powerpc/kernel/signal_32.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/signal_32.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/signal_32.c linux-2.6.39.1= /arch/powerpc/kernel/signal_32.c +--- linux-2.6.39.1/arch/powerpc/kernel/signal_32.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/signal_32.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame =3D &rt_sf->uc.uc_mcontext; @@ -3947,9 +3947,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/signal_= 32.c linux-2.6.39/arch/powerp if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link =3D current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.39/arch/powerpc/kernel/signal_64.c linux-2.6.39/arc= h/powerpc/kernel/signal_64.c ---- linux-2.6.39/arch/powerpc/kernel/signal_64.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/signal_64.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/signal_64.c linux-2.6.39.1= /arch/powerpc/kernel/signal_64.c +--- linux-2.6.39.1/arch/powerpc/kernel/signal_64.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/signal_64.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val =3D 0; =20 @@ -3959,9 +3959,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/signal_= 64.c linux-2.6.39/arch/powerp regs->link =3D current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |=3D setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.39/arch/powerpc/kernel/vdso.c linux-2.6.39/arch/pow= erpc/kernel/vdso.c ---- linux-2.6.39/arch/powerpc/kernel/vdso.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/powerpc/kernel/vdso.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/vdso.c linux-2.6.39.1/arch= /powerpc/kernel/vdso.c +--- linux-2.6.39.1/arch/powerpc/kernel/vdso.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/vdso.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -36,6 +36,7 @@ #include #include @@ -3988,9 +3988,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/vdso.c = linux-2.6.39/arch/powerpc/ker if (IS_ERR_VALUE(vdso_base)) { rc =3D vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.39/arch/powerpc/kernel/vio.c linux-2.6.39/arch/powe= rpc/kernel/vio.c ---- linux-2.6.39/arch/powerpc/kernel/vio.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/powerpc/kernel/vio.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/kernel/vio.c linux-2.6.39.1/arch/= powerpc/kernel/vio.c +--- linux-2.6.39.1/arch/powerpc/kernel/vio.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/powerpc/kernel/vio.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s return dma_iommu_ops.dma_supported(dev, mask); } @@ -4005,9 +4005,9 @@ diff -urNp linux-2.6.39/arch/powerpc/kernel/vio.c l= inux-2.6.39/arch/powerpc/kern .map_page =3D vio_dma_iommu_map_page, .unmap_page =3D vio_dma_iommu_unmap_page, .dma_supported =3D vio_dma_iommu_dma_supported, -diff -urNp linux-2.6.39/arch/powerpc/lib/usercopy_64.c linux-2.6.39/arch= /powerpc/lib/usercopy_64.c ---- linux-2.6.39/arch/powerpc/lib/usercopy_64.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/powerpc/lib/usercopy_64.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/lib/usercopy_64.c linux-2.6.39.1/= arch/powerpc/lib/usercopy_64.c +--- linux-2.6.39.1/arch/powerpc/lib/usercopy_64.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/lib/usercopy_64.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -9,22 +9,6 @@ #include #include @@ -4039,9 +4039,9 @@ diff -urNp linux-2.6.39/arch/powerpc/lib/usercopy_6= 4.c linux-2.6.39/arch/powerpc -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); =20 -diff -urNp linux-2.6.39/arch/powerpc/mm/fault.c linux-2.6.39/arch/powerp= c/mm/fault.c ---- linux-2.6.39/arch/powerpc/mm/fault.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/powerpc/mm/fault.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/powerpc/mm/fault.c linux-2.6.39.1/arch/po= werpc/mm/fault.c +--- linux-2.6.39.1/arch/powerpc/mm/fault.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/powerpc/mm/fault.c 2011-05-22 19:36:30.000000000= -0400 @@ -31,6 +31,10 @@ #include #include @@ -4146,9 +4146,9 @@ diff -urNp linux-2.6.39/arch/powerpc/mm/fault.c lin= ux-2.6.39/arch/powerpc/mm/fau _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.39/arch/powerpc/mm/mmap_64.c linux-2.6.39/arch/powe= rpc/mm/mmap_64.c ---- linux-2.6.39/arch/powerpc/mm/mmap_64.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/powerpc/mm/mmap_64.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/mm/mmap_64.c linux-2.6.39.1/arch/= powerpc/mm/mmap_64.c +--- linux-2.6.39.1/arch/powerpc/mm/mmap_64.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/powerpc/mm/mmap_64.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -4172,9 +4172,9 @@ diff -urNp linux-2.6.39/arch/powerpc/mm/mmap_64.c l= inux-2.6.39/arch/powerpc/mm/m mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.39/arch/powerpc/mm/slice.c linux-2.6.39/arch/powerp= c/mm/slice.c ---- linux-2.6.39/arch/powerpc/mm/slice.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/powerpc/mm/slice.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/powerpc/mm/slice.c linux-2.6.39.1/arch/po= werpc/mm/slice.c +--- linux-2.6.39.1/arch/powerpc/mm/slice.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/powerpc/mm/slice.c 2011-05-22 19:36:30.000000000= -0400 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ if ((mm->task_size - len) < addr) return 0; @@ -4241,9 +4241,9 @@ diff -urNp linux-2.6.39/arch/powerpc/mm/slice.c lin= ux-2.6.39/arch/powerpc/mm/sli /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr =3D _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.39/arch/powerpc/platforms/52xx/efika.c linux-2.6.39= /arch/powerpc/platforms/52xx/efika.c ---- linux-2.6.39/arch/powerpc/platforms/52xx/efika.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/52xx/efika.c 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/52xx/efika.c linux-2.6.= 39.1/arch/powerpc/platforms/52xx/efika.c +--- linux-2.6.39.1/arch/powerpc/platforms/52xx/efika.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/52xx/efika.c 2011-05-22 19:36:= 30.000000000 -0400 @@ -60,7 +60,7 @@ static int rtas_write_config(struct pci_ return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL; } @@ -4253,9 +4253,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/52xx= /efika.c linux-2.6.39/arch/po .read =3D rtas_read_config, .write =3D rtas_write_config, }; -diff -urNp linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c linux-2= .6.39/arch/powerpc/platforms/cell/celleb_pci.c ---- linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c 2011-05-22 19:= 36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_pci.c linux= -2.6.39.1/arch/powerpc/platforms/cell/celleb_pci.c +--- linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_pci.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_pci.c 2011-05-22 1= 9:36:30.000000000 -0400 @@ -234,7 +234,7 @@ static int celleb_fake_pci_write_config( return PCIBIOS_SUCCESSFUL; } @@ -4265,9 +4265,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/cell= /celleb_pci.c linux-2.6.39/ar .read =3D celleb_fake_pci_read_config, .write =3D celleb_fake_pci_write_config, }; -diff -urNp linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c li= nux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c ---- linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c 2011-05-1= 9 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c 2011-05-2= 2 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_epci.c = linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_epci.c +--- linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_epci.c 2011-05= -19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_epci.c 2011-05= -22 19:36:30.000000000 -0400 @@ -245,7 +245,7 @@ static int celleb_epci_write_config(stru return celleb_epci_check_abort(hose, addr); } @@ -4277,9 +4277,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/cell= /celleb_scc_epci.c linux-2.6. .read =3D celleb_epci_read_config, .write =3D celleb_epci_write_config, }; -diff -urNp linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c l= inux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c ---- linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-05-= 19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-05-= 22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_pciex.c= linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_pciex.c +--- linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-0= 5-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-0= 5-22 19:36:30.000000000 -0400 @@ -399,7 +399,7 @@ static int scc_pciex_write_config(struct return PCIBIOS_SUCCESSFUL; } @@ -4289,9 +4289,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/cell= /celleb_scc_pciex.c linux-2.6 scc_pciex_read_config, scc_pciex_write_config, }; -diff -urNp linux-2.6.39/arch/powerpc/platforms/cell/iommu.c linux-2.6.39= /arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.39/arch/powerpc/platforms/cell/iommu.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/cell/iommu.c 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/cell/iommu.c linux-2.6.= 39.1/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.39.1/arch/powerpc/platforms/cell/iommu.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/cell/iommu.c 2011-05-22 19:36:= 30.000000000 -0400 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc =20 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -4301,9 +4301,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/cell= /iommu.c linux-2.6.39/arch/po .alloc_coherent =3D dma_fixed_alloc_coherent, .free_coherent =3D dma_fixed_free_coherent, .map_sg =3D dma_fixed_map_sg, -diff -urNp linux-2.6.39/arch/powerpc/platforms/chrp/pci.c linux-2.6.39/a= rch/powerpc/platforms/chrp/pci.c ---- linux-2.6.39/arch/powerpc/platforms/chrp/pci.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/chrp/pci.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/chrp/pci.c linux-2.6.39= .1/arch/powerpc/platforms/chrp/pci.c +--- linux-2.6.39.1/arch/powerpc/platforms/chrp/pci.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/chrp/pci.c 2011-05-22 19:36:30= .000000000 -0400 @@ -84,7 +84,7 @@ int gg2_write_config(struct pci_bus *bus return PCIBIOS_SUCCESSFUL; } @@ -4322,9 +4322,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/chrp= /pci.c linux-2.6.39/arch/powe { .read =3D rtas_read_config, .write =3D rtas_write_config, -diff -urNp linux-2.6.39/arch/powerpc/platforms/iseries/pci.c linux-2.6.3= 9/arch/powerpc/platforms/iseries/pci.c ---- linux-2.6.39/arch/powerpc/platforms/iseries/pci.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/iseries/pci.c 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/iseries/pci.c linux-2.6= .39.1/arch/powerpc/platforms/iseries/pci.c +--- linux-2.6.39.1/arch/powerpc/platforms/iseries/pci.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/iseries/pci.c 2011-05-22 19:36= :30.000000000 -0400 @@ -533,7 +533,7 @@ static int iSeries_pci_write_config(stru return 0; } @@ -4334,9 +4334,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/iser= ies/pci.c linux-2.6.39/arch/p .read =3D iSeries_pci_read_config, .write =3D iSeries_pci_write_config }; -diff -urNp linux-2.6.39/arch/powerpc/platforms/maple/pci.c linux-2.6.39/= arch/powerpc/platforms/maple/pci.c ---- linux-2.6.39/arch/powerpc/platforms/maple/pci.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/maple/pci.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/maple/pci.c linux-2.6.3= 9.1/arch/powerpc/platforms/maple/pci.c +--- linux-2.6.39.1/arch/powerpc/platforms/maple/pci.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/maple/pci.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -180,7 +180,7 @@ static int u3_agp_write_config(struct pc return PCIBIOS_SUCCESSFUL; } @@ -4364,9 +4364,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/mapl= e/pci.c linux-2.6.39/arch/pow { .read =3D u4_pcie_read_config, .write =3D u4_pcie_write_config, -diff -urNp linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c linux-2.6.39= /arch/powerpc/platforms/pasemi/pci.c ---- linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/pasemi/pci.c linux-2.6.= 39.1/arch/powerpc/platforms/pasemi/pci.c +--- linux-2.6.39.1/arch/powerpc/platforms/pasemi/pci.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/pasemi/pci.c 2011-05-22 19:36:= 30.000000000 -0400 @@ -176,7 +176,7 @@ static int pa_pxp_write_config(struct pc return PCIBIOS_SUCCESSFUL; } @@ -4376,9 +4376,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/pase= mi/pci.c linux-2.6.39/arch/po .read =3D pa_pxp_read_config, .write =3D pa_pxp_write_config, }; -diff -urNp linux-2.6.39/arch/powerpc/platforms/powermac/pci.c linux-2.6.= 39/arch/powerpc/platforms/powermac/pci.c ---- linux-2.6.39/arch/powerpc/platforms/powermac/pci.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/powermac/pci.c 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/powermac/pci.c linux-2.= 6.39.1/arch/powerpc/platforms/powermac/pci.c +--- linux-2.6.39.1/arch/powerpc/platforms/powermac/pci.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/powermac/pci.c 2011-05-22 19:3= 6:30.000000000 -0400 @@ -218,7 +218,7 @@ static int macrisc_write_config(struct p return PCIBIOS_SUCCESSFUL; } @@ -4397,9 +4397,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/powe= rmac/pci.c linux-2.6.39/arch/ { .read =3D chaos_read_config, .write =3D chaos_write_config, -diff -urNp linux-2.6.39/arch/powerpc/platforms/ps3/system-bus.c linux-2.= 6.39/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.39/arch/powerpc/platforms/ps3/system-bus.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/arch/powerpc/platforms/ps3/system-bus.c 2011-05-22 19:3= 6:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/platforms/ps3/system-bus.c linux-= 2.6.39.1/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.39.1/arch/powerpc/platforms/ps3/system-bus.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/platforms/ps3/system-bus.c 2011-05-22 19= :36:30.000000000 -0400 @@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi return mask >=3D DMA_BIT_MASK(32); } @@ -4418,9 +4418,9 @@ diff -urNp linux-2.6.39/arch/powerpc/platforms/ps3/= system-bus.c linux-2.6.39/arc .alloc_coherent =3D ps3_alloc_coherent, .free_coherent =3D ps3_free_coherent, .map_sg =3D ps3_ioc0_map_sg, -diff -urNp linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c linux-2.6.39/arch/= powerpc/sysdev/fsl_pci.c ---- linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/sysdev/fsl_pci.c linux-2.6.39.1/a= rch/powerpc/sysdev/fsl_pci.c +--- linux-2.6.39.1/arch/powerpc/sysdev/fsl_pci.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/sysdev/fsl_pci.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -573,7 +573,7 @@ static int mpc83xx_pcie_write_config(str return PCIBIOS_SUCCESSFUL; } @@ -4430,9 +4430,9 @@ diff -urNp linux-2.6.39/arch/powerpc/sysdev/fsl_pci= .c linux-2.6.39/arch/powerpc/ .read =3D mpc83xx_pcie_read_config, .write =3D mpc83xx_pcie_write_config, }; -diff -urNp linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c linux-2.6.39/= arch/powerpc/sysdev/indirect_pci.c ---- linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/sysdev/indirect_pci.c linux-2.6.3= 9.1/arch/powerpc/sysdev/indirect_pci.c +--- linux-2.6.39.1/arch/powerpc/sysdev/indirect_pci.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/sysdev/indirect_pci.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -148,7 +148,7 @@ indirect_write_config(struct pci_bus *bu return PCIBIOS_SUCCESSFUL; } @@ -4442,9 +4442,9 @@ diff -urNp linux-2.6.39/arch/powerpc/sysdev/indirec= t_pci.c linux-2.6.39/arch/pow { .read =3D indirect_read_config, .write =3D indirect_write_config, -diff -urNp linux-2.6.39/arch/powerpc/sysdev/ppc4xx_pci.c linux-2.6.39/ar= ch/powerpc/sysdev/ppc4xx_pci.c ---- linux-2.6.39/arch/powerpc/sysdev/ppc4xx_pci.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/powerpc/sysdev/ppc4xx_pci.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/sysdev/ppc4xx_pci.c linux-2.6.39.= 1/arch/powerpc/sysdev/ppc4xx_pci.c +--- linux-2.6.39.1/arch/powerpc/sysdev/ppc4xx_pci.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/sysdev/ppc4xx_pci.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -1514,7 +1514,7 @@ static int ppc4xx_pciex_write_config(str return PCIBIOS_SUCCESSFUL; } @@ -4454,9 +4454,9 @@ diff -urNp linux-2.6.39/arch/powerpc/sysdev/ppc4xx_= pci.c linux-2.6.39/arch/power { .read =3D ppc4xx_pciex_read_config, .write =3D ppc4xx_pciex_write_config, -diff -urNp linux-2.6.39/arch/powerpc/sysdev/tsi108_pci.c linux-2.6.39/ar= ch/powerpc/sysdev/tsi108_pci.c ---- linux-2.6.39/arch/powerpc/sysdev/tsi108_pci.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/powerpc/sysdev/tsi108_pci.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/powerpc/sysdev/tsi108_pci.c linux-2.6.39.= 1/arch/powerpc/sysdev/tsi108_pci.c +--- linux-2.6.39.1/arch/powerpc/sysdev/tsi108_pci.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/powerpc/sysdev/tsi108_pci.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -190,7 +190,7 @@ void tsi108_clear_pci_cfg_error(void) tsi108_clear_pci_error(tsi108_pci_cfg_phys); } @@ -4466,9 +4466,9 @@ diff -urNp linux-2.6.39/arch/powerpc/sysdev/tsi108_= pci.c linux-2.6.39/arch/power .read =3D tsi108_direct_read_config, .write =3D tsi108_direct_write_config, }; -diff -urNp linux-2.6.39/arch/s390/include/asm/elf.h linux-2.6.39/arch/s3= 90/include/asm/elf.h ---- linux-2.6.39/arch/s390/include/asm/elf.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/s390/include/asm/elf.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/s390/include/asm/elf.h linux-2.6.39.1/arc= h/s390/include/asm/elf.h +--- linux-2.6.39.1/arch/s390/include/asm/elf.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/s390/include/asm/elf.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled; the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -4494,9 +4494,9 @@ diff -urNp linux-2.6.39/arch/s390/include/asm/elf.h= linux-2.6.39/arch/s390/inclu -#define arch_randomize_brk arch_randomize_brk - #endif -diff -urNp linux-2.6.39/arch/s390/include/asm/system.h linux-2.6.39/arch= /s390/include/asm/system.h ---- linux-2.6.39/arch/s390/include/asm/system.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/s390/include/asm/system.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/s390/include/asm/system.h linux-2.6.39.1/= arch/s390/include/asm/system.h +--- linux-2.6.39.1/arch/s390/include/asm/system.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/s390/include/asm/system.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); @@ -4506,9 +4506,9 @@ diff -urNp linux-2.6.39/arch/s390/include/asm/syste= m.h linux-2.6.39/arch/s390/in =20 static inline int tprot(unsigned long addr) { -diff -urNp linux-2.6.39/arch/s390/include/asm/uaccess.h linux-2.6.39/arc= h/s390/include/asm/uaccess.h ---- linux-2.6.39/arch/s390/include/asm/uaccess.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/s390/include/asm/uaccess.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/s390/include/asm/uaccess.h linux-2.6.39.1= /arch/s390/include/asm/uaccess.h +--- linux-2.6.39.1/arch/s390/include/asm/uaccess.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/s390/include/asm/uaccess.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -234,6 +234,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -4541,9 +4541,9 @@ diff -urNp linux-2.6.39/arch/s390/include/asm/uacce= ss.h linux-2.6.39/arch/s390/i if (unlikely(sz !=3D -1 && sz < n)) { copy_from_user_overflow(); return n; -diff -urNp linux-2.6.39/arch/s390/Kconfig linux-2.6.39/arch/s390/Kconfig ---- linux-2.6.39/arch/s390/Kconfig 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/s390/Kconfig 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/s390/Kconfig linux-2.6.39.1/arch/s390/Kco= nfig +--- linux-2.6.39.1/arch/s390/Kconfig 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/s390/Kconfig 2011-05-22 19:36:30.000000000 -0400 @@ -234,11 +234,9 @@ config S390_EXEC_PROTECT prompt "Data execute protection" help @@ -4559,9 +4559,9 @@ diff -urNp linux-2.6.39/arch/s390/Kconfig linux-2.6= .39/arch/s390/Kconfig =20 comment "Code generation options" =20 -diff -urNp linux-2.6.39/arch/s390/kernel/module.c linux-2.6.39/arch/s390= /kernel/module.c ---- linux-2.6.39/arch/s390/kernel/module.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/s390/kernel/module.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/s390/kernel/module.c linux-2.6.39.1/arch/= s390/kernel/module.c +--- linux-2.6.39.1/arch/s390/kernel/module.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/s390/kernel/module.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, =20 /* Increase core size by size of got & plt and set start @@ -4633,9 +4633,9 @@ diff -urNp linux-2.6.39/arch/s390/kernel/module.c l= inux-2.6.39/arch/s390/kernel/ rela->r_addend - loc; if (r_type =3D=3D R_390_GOTPC) *(unsigned int *) loc =3D val; -diff -urNp linux-2.6.39/arch/s390/kernel/process.c linux-2.6.39/arch/s39= 0/kernel/process.c ---- linux-2.6.39/arch/s390/kernel/process.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/s390/kernel/process.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/s390/kernel/process.c linux-2.6.39.1/arch= /s390/kernel/process.c +--- linux-2.6.39.1/arch/s390/kernel/process.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/s390/kernel/process.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru } return 0; @@ -4676,9 +4676,9 @@ diff -urNp linux-2.6.39/arch/s390/kernel/process.c = linux-2.6.39/arch/s390/kernel - return base; - return ret; -} -diff -urNp linux-2.6.39/arch/s390/kernel/setup.c linux-2.6.39/arch/s390/= kernel/setup.c ---- linux-2.6.39/arch/s390/kernel/setup.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/s390/kernel/setup.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/s390/kernel/setup.c linux-2.6.39.1/arch/s= 390/kernel/setup.c +--- linux-2.6.39.1/arch/s390/kernel/setup.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/s390/kernel/setup.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char * } early_param("mem", early_parse_mem); @@ -4727,9 +4727,9 @@ diff -urNp linux-2.6.39/arch/s390/kernel/setup.c li= nux-2.6.39/arch/s390/kernel/s static void setup_addressing_mode(void) { if (user_mode =3D=3D SECONDARY_SPACE_MODE) { -diff -urNp linux-2.6.39/arch/s390/mm/maccess.c linux-2.6.39/arch/s390/mm= /maccess.c ---- linux-2.6.39/arch/s390/mm/maccess.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/s390/mm/maccess.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/s390/mm/maccess.c linux-2.6.39.1/arch/s39= 0/mm/maccess.c +--- linux-2.6.39.1/arch/s390/mm/maccess.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/s390/mm/maccess.c 2011-05-22 19:36:30.000000000 = -0400 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void=20 return rc ? rc : count; } @@ -4739,9 +4739,9 @@ diff -urNp linux-2.6.39/arch/s390/mm/maccess.c linu= x-2.6.39/arch/s390/mm/maccess { long copied =3D 0; =20 -diff -urNp linux-2.6.39/arch/s390/mm/mmap.c linux-2.6.39/arch/s390/mm/mm= ap.c ---- linux-2.6.39/arch/s390/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/s390/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/s390/mm/mmap.c linux-2.6.39.1/arch/s390/m= m/mmap.c +--- linux-2.6.39.1/arch/s390/mm/mmap.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/s390/mm/mmap.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -4788,9 +4788,9 @@ diff -urNp linux-2.6.39/arch/s390/mm/mmap.c linux-2= .6.39/arch/s390/mm/mmap.c mm->get_unmapped_area =3D s390_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.39/arch/score/include/asm/system.h linux-2.6.39/arc= h/score/include/asm/system.h ---- linux-2.6.39/arch/score/include/asm/system.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/score/include/asm/system.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/score/include/asm/system.h linux-2.6.39.1= /arch/score/include/asm/system.h +--- linux-2.6.39.1/arch/score/include/asm/system.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/score/include/asm/system.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -17,7 +17,7 @@ do { \ #define finish_arch_switch(prev) do {} while (0) =20 @@ -4800,9 +4800,9 @@ diff -urNp linux-2.6.39/arch/score/include/asm/syst= em.h linux-2.6.39/arch/score/ =20 #define mb() barrier() #define rmb() barrier() -diff -urNp linux-2.6.39/arch/score/kernel/process.c linux-2.6.39/arch/sc= ore/kernel/process.c ---- linux-2.6.39/arch/score/kernel/process.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/score/kernel/process.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/score/kernel/process.c linux-2.6.39.1/arc= h/score/kernel/process.c +--- linux-2.6.39.1/arch/score/kernel/process.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/score/kernel/process.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru =20 return task_pt_regs(task)->cp0_epc; @@ -4812,9 +4812,9 @@ diff -urNp linux-2.6.39/arch/score/kernel/process.c= linux-2.6.39/arch/score/kern -{ - return sp; -} -diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c linux-2.6.39= /arch/sh/drivers/pci/ops-dreamcast.c ---- linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/drivers/pci/ops-dreamcast.c linux-2.6.= 39.1/arch/sh/drivers/pci/ops-dreamcast.c +--- linux-2.6.39.1/arch/sh/drivers/pci/ops-dreamcast.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/sh/drivers/pci/ops-dreamcast.c 2011-05-22 19:36:= 30.000000000 -0400 @@ -76,7 +76,7 @@ static int gapspci_write(struct pci_bus=20 return PCIBIOS_SUCCESSFUL; } @@ -4824,9 +4824,9 @@ diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-dre= amcast.c linux-2.6.39/arch/sh .read =3D gapspci_read, .write =3D gapspci_write, }; -diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-sh4.c linux-2.6.39/arch/= sh/drivers/pci/ops-sh4.c ---- linux-2.6.39/arch/sh/drivers/pci/ops-sh4.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/sh/drivers/pci/ops-sh4.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/drivers/pci/ops-sh4.c linux-2.6.39.1/a= rch/sh/drivers/pci/ops-sh4.c +--- linux-2.6.39.1/arch/sh/drivers/pci/ops-sh4.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/sh/drivers/pci/ops-sh4.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -96,7 +96,7 @@ static int sh4_pci_write(struct pci_bus=20 return PCIBIOS_SUCCESSFUL; } @@ -4836,9 +4836,9 @@ diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-sh4= .c linux-2.6.39/arch/sh/drive .read =3D sh4_pci_read, .write =3D sh4_pci_write, }; -diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-sh5.c linux-2.6.39/arch/= sh/drivers/pci/ops-sh5.c ---- linux-2.6.39/arch/sh/drivers/pci/ops-sh5.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/sh/drivers/pci/ops-sh5.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/drivers/pci/ops-sh5.c linux-2.6.39.1/a= rch/sh/drivers/pci/ops-sh5.c +--- linux-2.6.39.1/arch/sh/drivers/pci/ops-sh5.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/sh/drivers/pci/ops-sh5.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -62,7 +62,7 @@ static int sh5pci_write(struct pci_bus * return PCIBIOS_SUCCESSFUL; } @@ -4848,9 +4848,9 @@ diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-sh5= .c linux-2.6.39/arch/sh/drive .read =3D sh5pci_read, .write =3D sh5pci_write, }; -diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-sh7786.c linux-2.6.39/ar= ch/sh/drivers/pci/ops-sh7786.c ---- linux-2.6.39/arch/sh/drivers/pci/ops-sh7786.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/sh/drivers/pci/ops-sh7786.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/drivers/pci/ops-sh7786.c linux-2.6.39.= 1/arch/sh/drivers/pci/ops-sh7786.c +--- linux-2.6.39.1/arch/sh/drivers/pci/ops-sh7786.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/sh/drivers/pci/ops-sh7786.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -165,7 +165,7 @@ out: return ret; } @@ -4860,9 +4860,9 @@ diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-sh7= 786.c linux-2.6.39/arch/sh/dr .read =3D sh7786_pcie_read, .write =3D sh7786_pcie_write, }; -diff -urNp linux-2.6.39/arch/sh/drivers/pci/pcie-sh7786.c linux-2.6.39/a= rch/sh/drivers/pci/pcie-sh7786.c ---- linux-2.6.39/arch/sh/drivers/pci/pcie-sh7786.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/sh/drivers/pci/pcie-sh7786.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/drivers/pci/pcie-sh7786.c linux-2.6.39= .1/arch/sh/drivers/pci/pcie-sh7786.c +--- linux-2.6.39.1/arch/sh/drivers/pci/pcie-sh7786.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/sh/drivers/pci/pcie-sh7786.c 2011-05-22 19:36:30= .000000000 -0400 @@ -109,7 +109,7 @@ static struct resource sh7786_pci2_resou }, }; @@ -4872,9 +4872,9 @@ diff -urNp linux-2.6.39/arch/sh/drivers/pci/pcie-sh= 7786.c linux-2.6.39/arch/sh/d =20 #define DEFINE_CONTROLLER(start, idx) \ { \ -diff -urNp linux-2.6.39/arch/sh/drivers/pci/pci-sh4.h linux-2.6.39/arch/= sh/drivers/pci/pci-sh4.h ---- linux-2.6.39/arch/sh/drivers/pci/pci-sh4.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/sh/drivers/pci/pci-sh4.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/drivers/pci/pci-sh4.h linux-2.6.39.1/a= rch/sh/drivers/pci/pci-sh4.h +--- linux-2.6.39.1/arch/sh/drivers/pci/pci-sh4.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/sh/drivers/pci/pci-sh4.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -161,7 +161,7 @@ #define SH4_PCIPDR 0x220 /* Port IO Data Register */ =20 @@ -4884,9 +4884,9 @@ diff -urNp linux-2.6.39/arch/sh/drivers/pci/pci-sh4= .h linux-2.6.39/arch/sh/drive int pci_fixup_pcic(struct pci_channel *chan); =20 struct sh4_pci_address_space { -diff -urNp linux-2.6.39/arch/sh/drivers/pci/pci-sh5.h linux-2.6.39/arch/= sh/drivers/pci/pci-sh5.h ---- linux-2.6.39/arch/sh/drivers/pci/pci-sh5.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/sh/drivers/pci/pci-sh5.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/drivers/pci/pci-sh5.h linux-2.6.39.1/a= rch/sh/drivers/pci/pci-sh5.h +--- linux-2.6.39.1/arch/sh/drivers/pci/pci-sh5.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/sh/drivers/pci/pci-sh5.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -105,6 +105,6 @@ extern unsigned long pcicr_virt; #define PCISH5_MEM_SIZCONV(x) (((x / 0x40000) - 1) << 18) #define PCISH5_IO_SIZCONV(x) (((x / 0x40000) - 1) << 18) @@ -4895,9 +4895,9 @@ diff -urNp linux-2.6.39/arch/sh/drivers/pci/pci-sh5= .h linux-2.6.39/arch/sh/drive +extern const struct pci_ops sh5_pci_ops; =20 #endif /* __PCI_SH5_H */ -diff -urNp linux-2.6.39/arch/sh/include/asm/dma-mapping.h linux-2.6.39/a= rch/sh/include/asm/dma-mapping.h ---- linux-2.6.39/arch/sh/include/asm/dma-mapping.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/sh/include/asm/dma-mapping.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/include/asm/dma-mapping.h linux-2.6.39= .1/arch/sh/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/sh/include/asm/dma-mapping.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/sh/include/asm/dma-mapping.h 2011-05-22 19:36:30= .000000000 -0400 @@ -1,10 +1,10 @@ #ifndef __ASM_SH_DMA_MAPPING_H #define __ASM_SH_DMA_MAPPING_H @@ -4956,9 +4956,9 @@ diff -urNp linux-2.6.39/arch/sh/include/asm/dma-map= ping.h linux-2.6.39/arch/sh/i =20 if (dma_release_from_coherent(dev, get_order(size), vaddr)) return; -diff -urNp linux-2.6.39/arch/sh/kernel/dma-nommu.c linux-2.6.39/arch/sh/= kernel/dma-nommu.c ---- linux-2.6.39/arch/sh/kernel/dma-nommu.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/sh/kernel/dma-nommu.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/sh/kernel/dma-nommu.c linux-2.6.39.1/arch= /sh/kernel/dma-nommu.c +--- linux-2.6.39.1/arch/sh/kernel/dma-nommu.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/sh/kernel/dma-nommu.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device=20 } #endif @@ -4968,9 +4968,9 @@ diff -urNp linux-2.6.39/arch/sh/kernel/dma-nommu.c = linux-2.6.39/arch/sh/kernel/d .alloc_coherent =3D dma_generic_alloc_coherent, .free_coherent =3D dma_generic_free_coherent, .map_page =3D nommu_map_page, -diff -urNp linux-2.6.39/arch/sh/kernel/kgdb.c linux-2.6.39/arch/sh/kerne= l/kgdb.c ---- linux-2.6.39/arch/sh/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/sh/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/sh/kernel/kgdb.c linux-2.6.39.1/arch/sh/k= ernel/kgdb.c +--- linux-2.6.39.1/arch/sh/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/sh/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -319,7 +319,7 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } @@ -4980,9 +4980,9 @@ diff -urNp linux-2.6.39/arch/sh/kernel/kgdb.c linux= -2.6.39/arch/sh/kernel/kgdb.c /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr =3D { 0x3c, 0xc3 }, -diff -urNp linux-2.6.39/arch/sh/mm/consistent.c linux-2.6.39/arch/sh/mm/= consistent.c ---- linux-2.6.39/arch/sh/mm/consistent.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/sh/mm/consistent.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/sh/mm/consistent.c linux-2.6.39.1/arch/sh= /mm/consistent.c +--- linux-2.6.39.1/arch/sh/mm/consistent.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/sh/mm/consistent.c 2011-05-22 19:36:30.000000000= -0400 @@ -22,7 +22,7 @@ =20 #define PREALLOC_DMA_DEBUG_ENTRIES 4096 @@ -4992,9 +4992,9 @@ diff -urNp linux-2.6.39/arch/sh/mm/consistent.c lin= ux-2.6.39/arch/sh/mm/consiste EXPORT_SYMBOL(dma_ops); =20 static int __init dma_init(void) -diff -urNp linux-2.6.39/arch/sh/mm/mmap.c linux-2.6.39/arch/sh/mm/mmap.c ---- linux-2.6.39/arch/sh/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/sh/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sh/mm/mmap.c linux-2.6.39.1/arch/sh/mm/mm= ap.c +--- linux-2.6.39.1/arch/sh/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/sh/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str addr =3D PAGE_ALIGN(addr); =20 @@ -5069,9 +5069,9 @@ diff -urNp linux-2.6.39/arch/sh/mm/mmap.c linux-2.6= .39/arch/sh/mm/mmap.c =20 bottomup: /* -diff -urNp linux-2.6.39/arch/sparc/include/asm/atomic_64.h linux-2.6.39/= arch/sparc/include/asm/atomic_64.h ---- linux-2.6.39/arch/sparc/include/asm/atomic_64.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/atomic_64.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/atomic_64.h linux-2.6.3= 9.1/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.39.1/arch/sparc/include/asm/atomic_64.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/atomic_64.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } =20 @@ -5243,9 +5243,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/atom= ic_64.h linux-2.6.39/arch/spa } =20 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.39/arch/sparc/include/asm/cache.h linux-2.6.39/arch= /sparc/include/asm/cache.h ---- linux-2.6.39/arch/sparc/include/asm/cache.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/cache.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/cache.h linux-2.6.39.1/= arch/sparc/include/asm/cache.h +--- linux-2.6.39.1/arch/sparc/include/asm/cache.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/cache.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -10,7 +10,7 @@ #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) =20 @@ -5255,9 +5255,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/cach= e.h linux-2.6.39/arch/sparc/i =20 #ifdef CONFIG_SPARC32 #define SMP_CACHE_BYTES_SHIFT 5 -diff -urNp linux-2.6.39/arch/sparc/include/asm/dma-mapping.h linux-2.6.3= 9/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.39/arch/sparc/include/asm/dma-mapping.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/dma-mapping.h 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/dma-mapping.h linux-2.6= .39.1/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/sparc/include/asm/dma-mapping.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/dma-mapping.h 2011-05-22 19:36= :30.000000000 -0400 @@ -12,10 +12,10 @@ extern int dma_supported(struct device * #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f= ) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) @@ -5289,9 +5289,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/dma-= mapping.h linux-2.6.39/arch/s =20 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.39/arch/sparc/include/asm/elf_32.h linux-2.6.39/arc= h/sparc/include/asm/elf_32.h ---- linux-2.6.39/arch/sparc/include/asm/elf_32.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/elf_32.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/elf_32.h linux-2.6.39.1= /arch/sparc/include/asm/elf_32.h +--- linux-2.6.39.1/arch/sparc/include/asm/elf_32.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/elf_32.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -114,6 +114,13 @@ typedef struct { =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -5306,9 +5306,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/elf_= 32.h linux-2.6.39/arch/sparc/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspac= e on Sparc. */ -diff -urNp linux-2.6.39/arch/sparc/include/asm/elf_64.h linux-2.6.39/arc= h/sparc/include/asm/elf_64.h ---- linux-2.6.39/arch/sparc/include/asm/elf_64.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/elf_64.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/elf_64.h linux-2.6.39.1= /arch/sparc/include/asm/elf_64.h +--- linux-2.6.39.1/arch/sparc/include/asm/elf_64.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/elf_64.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -162,6 +162,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -5322,9 +5322,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/elf_= 64.h linux-2.6.39/arch/sparc/ =20 /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.39/arch/sparc/include/asm/pgtable_32.h linux-2.6.39= /arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.39/arch/sparc/include/asm/pgtable_32.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/pgtable_32.h 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/pgtable_32.h linux-2.6.= 39.1/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.39.1/arch/sparc/include/asm/pgtable_32.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/pgtable_32.h 2011-05-22 19:36:= 30.000000000 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -5356,9 +5356,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/pgta= ble_32.h linux-2.6.39/arch/sp extern unsigned long page_kernel; =20 #ifdef MODULE -diff -urNp linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.39/a= rch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.39= .1/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.39.1/arch/sparc/include/asm/pgtsrmmu.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/pgtsrmmu.h 2011-05-22 19:36:30= .000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -5373,9 +5373,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/pgts= rmmu.h linux-2.6.39/arch/spar #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_P= RIV | \ SRMMU_DIRTY | SRMMU_REF) =20 -diff -urNp linux-2.6.39/arch/sparc/include/asm/spinlock_64.h linux-2.6.3= 9/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.39/arch/sparc/include/asm/spinlock_64.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/spinlock_64.h 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/spinlock_64.h linux-2.6= .39.1/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.39.1/arch/sparc/include/asm/spinlock_64.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/spinlock_64.h 2011-05-22 19:36= :30.000000000 -0400 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags( =20 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones.= .. */ @@ -5473,9 +5473,33 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/spi= nlock_64.h linux-2.6.39/arch/s { unsigned long mask, tmp1, tmp2, result; =20 -diff -urNp linux-2.6.39/arch/sparc/include/asm/uaccess_32.h linux-2.6.39= /arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.39/arch/sparc/include/asm/uaccess_32.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/uaccess_32.h 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/thread_info_32.h linux-= 2.6.39.1/arch/sparc/include/asm/thread_info_32.h +--- linux-2.6.39.1/arch/sparc/include/asm/thread_info_32.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/thread_info_32.h 2011-06-03 01= :14:03.000000000 -0400 +@@ -50,6 +50,8 @@ struct thread_info { + unsigned long w_saved; +=20 + struct restart_block restart_block; ++ ++ unsigned long lowest_stack; + }; +=20 + /* +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/thread_info_64.h linux-= 2.6.39.1/arch/sparc/include/asm/thread_info_64.h +--- linux-2.6.39.1/arch/sparc/include/asm/thread_info_64.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/thread_info_64.h 2011-06-03 01= :14:21.000000000 -0400 +@@ -63,6 +63,8 @@ struct thread_info { + struct pt_regs *kern_una_regs; + unsigned int kern_una_insn; +=20 ++ unsigned long lowest_stack; ++ + unsigned long fpregs[0] __attribute__ ((aligned(64))); + }; +=20 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/uaccess_32.h linux-2.6.= 39.1/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.39.1/arch/sparc/include/asm/uaccess_32.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/uaccess_32.h 2011-05-22 19:36:= 30.000000000 -0400 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ =20 static inline unsigned long copy_to_user(void __user *to, const void *f= rom, unsigned long n) @@ -5527,9 +5551,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/uacc= ess_32.h linux-2.6.39/arch/sp return __copy_user((__force void __user *) to, from, n); } =20 -diff -urNp linux-2.6.39/arch/sparc/include/asm/uaccess_64.h linux-2.6.39= /arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.39/arch/sparc/include/asm/uaccess_64.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/uaccess_64.h 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/uaccess_64.h linux-2.6.= 39.1/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.39.1/arch/sparc/include/asm/uaccess_64.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/uaccess_64.h 2011-05-22 19:36:= 30.000000000 -0400 @@ -10,6 +10,7 @@ #include #include @@ -5572,9 +5596,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/uacc= ess_64.h linux-2.6.39/arch/sp if (unlikely(ret)) ret =3D copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.39/arch/sparc/include/asm/uaccess.h linux-2.6.39/ar= ch/sparc/include/asm/uaccess.h ---- linux-2.6.39/arch/sparc/include/asm/uaccess.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/sparc/include/asm/uaccess.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/include/asm/uaccess.h linux-2.6.39.= 1/arch/sparc/include/asm/uaccess.h +--- linux-2.6.39.1/arch/sparc/include/asm/uaccess.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/include/asm/uaccess.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H @@ -5589,9 +5613,9 @@ diff -urNp linux-2.6.39/arch/sparc/include/asm/uacc= ess.h linux-2.6.39/arch/sparc #if defined(__sparc__) && defined(__arch64__) #include #else -diff -urNp linux-2.6.39/arch/sparc/kernel/iommu.c linux-2.6.39/arch/spar= c/kernel/iommu.c ---- linux-2.6.39/arch/sparc/kernel/iommu.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/sparc/kernel/iommu.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/iommu.c linux-2.6.39.1/arch/= sparc/kernel/iommu.c +--- linux-2.6.39.1/arch/sparc/kernel/iommu.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/iommu.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -5610,9 +5634,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/iommu.c l= inux-2.6.39/arch/sparc/kernel EXPORT_SYMBOL(dma_ops); =20 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.39/arch/sparc/kernel/ioport.c linux-2.6.39/arch/spa= rc/kernel/ioport.c ---- linux-2.6.39/arch/sparc/kernel/ioport.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/sparc/kernel/ioport.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/ioport.c linux-2.6.39.1/arch= /sparc/kernel/ioport.c +--- linux-2.6.39.1/arch/sparc/kernel/ioport.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/ioport.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -402,7 +402,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -5631,9 +5655,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/ioport.c = linux-2.6.39/arch/sparc/kerne .alloc_coherent =3D pci32_alloc_coherent, .free_coherent =3D pci32_free_coherent, .map_page =3D pci32_map_page, -diff -urNp linux-2.6.39/arch/sparc/kernel/kgdb_32.c linux-2.6.39/arch/sp= arc/kernel/kgdb_32.c ---- linux-2.6.39/arch/sparc/kernel/kgdb_32.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/sparc/kernel/kgdb_32.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/kgdb_32.c linux-2.6.39.1/arc= h/sparc/kernel/kgdb_32.c +--- linux-2.6.39.1/arch/sparc/kernel/kgdb_32.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/kgdb_32.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re regs->npc =3D regs->pc + 4; } @@ -5643,9 +5667,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/kgdb_32.c= linux-2.6.39/arch/sparc/kern /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.39/arch/sparc/kernel/kgdb_64.c linux-2.6.39/arch/sp= arc/kernel/kgdb_64.c ---- linux-2.6.39/arch/sparc/kernel/kgdb_64.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/sparc/kernel/kgdb_64.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/kgdb_64.c linux-2.6.39.1/arc= h/sparc/kernel/kgdb_64.c +--- linux-2.6.39.1/arch/sparc/kernel/kgdb_64.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/kgdb_64.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re regs->tnpc =3D regs->tpc + 4; } @@ -5655,9 +5679,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/kgdb_64.c= linux-2.6.39/arch/sparc/kern /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.39/arch/sparc/kernel/Makefile linux-2.6.39/arch/spa= rc/kernel/Makefile ---- linux-2.6.39/arch/sparc/kernel/Makefile 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/sparc/kernel/Makefile 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/Makefile linux-2.6.39.1/arch= /sparc/kernel/Makefile +--- linux-2.6.39.1/arch/sparc/kernel/Makefile 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/Makefile 2011-05-22 19:36:30.000000= 000 -0400 @@ -3,7 +3,7 @@ # =20 @@ -5667,9 +5691,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/Makefile = linux-2.6.39/arch/sparc/kerne =20 extra-y :=3D head_$(BITS).o extra-y +=3D init_task.o -diff -urNp linux-2.6.39/arch/sparc/kernel/pcic.c linux-2.6.39/arch/sparc= /kernel/pcic.c ---- linux-2.6.39/arch/sparc/kernel/pcic.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/sparc/kernel/pcic.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/pcic.c linux-2.6.39.1/arch/s= parc/kernel/pcic.c +--- linux-2.6.39.1/arch/sparc/kernel/pcic.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/pcic.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -268,7 +268,7 @@ static int pcic_write_config(struct pci_ return -EINVAL; } @@ -5679,9 +5703,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/pcic.c li= nux-2.6.39/arch/sparc/kernel/ .read =3D pcic_read_config, .write =3D pcic_write_config, }; -diff -urNp linux-2.6.39/arch/sparc/kernel/pci_common.c linux-2.6.39/arch= /sparc/kernel/pci_common.c ---- linux-2.6.39/arch/sparc/kernel/pci_common.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/pci_common.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/pci_common.c linux-2.6.39.1/= arch/sparc/kernel/pci_common.c +--- linux-2.6.39.1/arch/sparc/kernel/pci_common.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/pci_common.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -249,7 +249,7 @@ static int sun4u_write_pci_cfg(struct pc return PCIBIOS_SUCCESSFUL; } @@ -5700,9 +5724,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/pci_commo= n.c linux-2.6.39/arch/sparc/k .read =3D sun4v_read_pci_cfg, .write =3D sun4v_write_pci_cfg, }; -diff -urNp linux-2.6.39/arch/sparc/kernel/pci_impl.h linux-2.6.39/arch/s= parc/kernel/pci_impl.h ---- linux-2.6.39/arch/sparc/kernel/pci_impl.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/pci_impl.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/pci_impl.h linux-2.6.39.1/ar= ch/sparc/kernel/pci_impl.h +--- linux-2.6.39.1/arch/sparc/kernel/pci_impl.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/pci_impl.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -175,8 +175,8 @@ extern void pci_config_write8(u8 *addr,=20 extern void pci_config_write16(u16 *addr, u16 val); extern void pci_config_write32(u32 *addr, u32 val); @@ -5714,9 +5738,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/pci_impl.= h linux-2.6.39/arch/sparc/ker =20 extern volatile int pci_poke_in_progress; extern volatile int pci_poke_cpu; -diff -urNp linux-2.6.39/arch/sparc/kernel/pci_sun4v.c linux-2.6.39/arch/= sparc/kernel/pci_sun4v.c ---- linux-2.6.39/arch/sparc/kernel/pci_sun4v.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/pci_sun4v.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/pci_sun4v.c linux-2.6.39.1/a= rch/sparc/kernel/pci_sun4v.c +--- linux-2.6.39.1/arch/sparc/kernel/pci_sun4v.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/pci_sun4v.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -5726,9 +5750,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/pci_sun4v= .c linux-2.6.39/arch/sparc/ke .alloc_coherent =3D dma_4v_alloc_coherent, .free_coherent =3D dma_4v_free_coherent, .map_page =3D dma_4v_map_page, -diff -urNp linux-2.6.39/arch/sparc/kernel/process_32.c linux-2.6.39/arch= /sparc/kernel/process_32.c ---- linux-2.6.39/arch/sparc/kernel/process_32.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/process_32.c 2011-05-22 19:41:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/process_32.c linux-2.6.39.1/= arch/sparc/kernel/process_32.c +--- linux-2.6.39.1/arch/sparc/kernel/process_32.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/process_32.c 2011-05-22 19:41:32.00= 0000000 -0400 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) rw->ins[4], rw->ins[5], rw->ins[6], @@ -5764,9 +5788,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/process_3= 2.c linux-2.6.39/arch/sparc/k fp =3D rw->ins[6]; } while (++count < 16); printk("\n"); -diff -urNp linux-2.6.39/arch/sparc/kernel/process_64.c linux-2.6.39/arch= /sparc/kernel/process_64.c ---- linux-2.6.39/arch/sparc/kernel/process_64.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/process_64.c 2011-05-22 19:41:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/process_64.c linux-2.6.39.1/= arch/sparc/kernel/process_64.c +--- linux-2.6.39.1/arch/sparc/kernel/process_64.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/process_64.c 2011-05-22 19:41:32.00= 0000000 -0400 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); @@ -5802,9 +5826,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/process_6= 4.c linux-2.6.39/arch/sparc/k (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, -diff -urNp linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c linux-2.6.39/ar= ch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/sys_sparc_32.c linux-2.6.39.= 1/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.39.1/arch/sparc/kernel/sys_sparc_32.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/sys_sparc_32.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -5823,9 +5847,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/sys_sparc= _32.c linux-2.6.39/arch/sparc return addr; addr =3D vmm->vm_end; if (flags & MAP_SHARED) -diff -urNp linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c linux-2.6.39/ar= ch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.39.= 1/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.39.1/arch/sparc/kernel/sys_sparc_64.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/sys_sparc_64.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -5973,9 +5997,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/sys_sparc= _64.c linux-2.6.39/arch/sparc mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.39/arch/sparc/kernel/traps_32.c linux-2.6.39/arch/s= parc/kernel/traps_32.c ---- linux-2.6.39/arch/sparc/kernel/traps_32.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/traps_32.c 2011-05-22 19:41:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/traps_32.c linux-2.6.39.1/ar= ch/sparc/kernel/traps_32.c +--- linux-2.6.39.1/arch/sparc/kernel/traps_32.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/traps_32.c 2011-05-22 19:41:32.0000= 00000 -0400 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_ count++ < 30 && (((unsigned long) rw) >=3D PAGE_OFFSET) && @@ -5985,9 +6009,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/traps_32.= c linux-2.6.39/arch/sparc/ker (void *) rw->ins[7]); rw =3D (struct reg_window32 *)rw->ins[6]; } -diff -urNp linux-2.6.39/arch/sparc/kernel/traps_64.c linux-2.6.39/arch/s= parc/kernel/traps_64.c ---- linux-2.6.39/arch/sparc/kernel/traps_64.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/traps_64.c 2011-05-22 19:41:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/traps_64.c linux-2.6.39.1/ar= ch/sparc/kernel/traps_64.c +--- linux-2.6.39.1/arch/sparc/kernel/traps_64.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/traps_64.c 2011-05-22 19:41:32.0000= 00000 -0400 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_ i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, @@ -6104,9 +6128,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/traps_64.= c linux-2.6.39/arch/sparc/ker (void *) rw->ins[7]); =20 rw =3D kernel_stack_up(rw); -diff -urNp linux-2.6.39/arch/sparc/kernel/unaligned_64.c linux-2.6.39/ar= ch/sparc/kernel/unaligned_64.c ---- linux-2.6.39/arch/sparc/kernel/unaligned_64.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/sparc/kernel/unaligned_64.c 2011-05-22 19:41:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/kernel/unaligned_64.c linux-2.6.39.= 1/arch/sparc/kernel/unaligned_64.c +--- linux-2.6.39.1/arch/sparc/kernel/unaligned_64.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/sparc/kernel/unaligned_64.c 2011-05-22 19:41:32.= 000000000 -0400 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); =20 @@ -6116,9 +6140,9 @@ diff -urNp linux-2.6.39/arch/sparc/kernel/unaligned= _64.c linux-2.6.39/arch/sparc regs->tpc, (void *) regs->tpc); } } -diff -urNp linux-2.6.39/arch/sparc/lib/atomic_64.S linux-2.6.39/arch/spa= rc/lib/atomic_64.S ---- linux-2.6.39/arch/sparc/lib/atomic_64.S 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/sparc/lib/atomic_64.S 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/lib/atomic_64.S linux-2.6.39.1/arch= /sparc/lib/atomic_64.S +--- linux-2.6.39.1/arch/sparc/lib/atomic_64.S 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/sparc/lib/atomic_64.S 2011-05-22 19:36:30.000000= 000 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 =3D increment, %o1 =3D atomic_ptr */ BACKOFF_SETUP(%o2) @@ -6353,9 +6377,9 @@ diff -urNp linux-2.6.39/arch/sparc/lib/atomic_64.S = linux-2.6.39/arch/sparc/lib/a casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -diff -urNp linux-2.6.39/arch/sparc/lib/ksyms.c linux-2.6.39/arch/sparc/l= ib/ksyms.c ---- linux-2.6.39/arch/sparc/lib/ksyms.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/sparc/lib/ksyms.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/sparc/lib/ksyms.c linux-2.6.39.1/arch/spa= rc/lib/ksyms.c +--- linux-2.6.39.1/arch/sparc/lib/ksyms.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/sparc/lib/ksyms.c 2011-05-22 19:36:30.000000000 = -0400 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write); =20 /* Atomic counter implementation. */ @@ -6374,9 +6398,9 @@ diff -urNp linux-2.6.39/arch/sparc/lib/ksyms.c linu= x-2.6.39/arch/sparc/lib/ksyms EXPORT_SYMBOL(atomic64_sub_ret); =20 /* Atomic bit operations. */ -diff -urNp linux-2.6.39/arch/sparc/lib/Makefile linux-2.6.39/arch/sparc/= lib/Makefile ---- linux-2.6.39/arch/sparc/lib/Makefile 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/sparc/lib/Makefile 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/sparc/lib/Makefile linux-2.6.39.1/arch/sp= arc/lib/Makefile +--- linux-2.6.39.1/arch/sparc/lib/Makefile 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/sparc/lib/Makefile 2011-05-22 19:36:30.000000000= -0400 @@ -2,7 +2,7 @@ # =20 @@ -6386,9 +6410,9 @@ diff -urNp linux-2.6.39/arch/sparc/lib/Makefile lin= ux-2.6.39/arch/sparc/lib/Make =20 lib-$(CONFIG_SPARC32) +=3D mul.o rem.o sdiv.o udiv.o umul.o urem.o ashr= di3.o lib-$(CONFIG_SPARC32) +=3D memcpy.o memset.o -diff -urNp linux-2.6.39/arch/sparc/Makefile linux-2.6.39/arch/sparc/Make= file ---- linux-2.6.39/arch/sparc/Makefile 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/sparc/Makefile 2011-05-22 19:41:32.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/Makefile linux-2.6.39.1/arch/sparc/= Makefile +--- linux-2.6.39.1/arch/sparc/Makefile 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/sparc/Makefile 2011-05-22 19:41:32.000000000 -04= 00 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) +=3D arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -6398,9 +6422,9 @@ diff -urNp linux-2.6.39/arch/sparc/Makefile linux-2= .6.39/arch/sparc/Makefile VMLINUX_MAIN +=3D $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN +=3D $(drivers-y) $(net-y) =20 -diff -urNp linux-2.6.39/arch/sparc/mm/fault_32.c linux-2.6.39/arch/sparc= /mm/fault_32.c ---- linux-2.6.39/arch/sparc/mm/fault_32.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/sparc/mm/fault_32.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/sparc/mm/fault_32.c linux-2.6.39.1/arch/s= parc/mm/fault_32.c +--- linux-2.6.39.1/arch/sparc/mm/fault_32.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/sparc/mm/fault_32.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -22,6 +22,9 @@ #include #include @@ -6705,9 +6729,9 @@ diff -urNp linux-2.6.39/arch/sparc/mm/fault_32.c li= nux-2.6.39/arch/sparc/mm/faul /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.39/arch/sparc/mm/fault_64.c linux-2.6.39/arch/sparc= /mm/fault_64.c ---- linux-2.6.39/arch/sparc/mm/fault_64.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/sparc/mm/fault_64.c 2011-05-22 19:41:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/sparc/mm/fault_64.c linux-2.6.39.1/arch/s= parc/mm/fault_64.c +--- linux-2.6.39.1/arch/sparc/mm/fault_64.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/sparc/mm/fault_64.c 2011-05-22 19:41:32.00000000= 0 -0400 @@ -21,6 +21,9 @@ #include #include @@ -7215,9 +7239,9 @@ diff -urNp linux-2.6.39/arch/sparc/mm/fault_64.c li= nux-2.6.39/arch/sparc/mm/faul /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.39/arch/sparc/mm/hugetlbpage.c linux-2.6.39/arch/sp= arc/mm/hugetlbpage.c ---- linux-2.6.39/arch/sparc/mm/hugetlbpage.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/sparc/mm/hugetlbpage.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/sparc/mm/hugetlbpage.c linux-2.6.39.1/arc= h/sparc/mm/hugetlbpage.c +--- linux-2.6.39.1/arch/sparc/mm/hugetlbpage.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/sparc/mm/hugetlbpage.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -68,7 +68,7 @@ full_search: } return -ENOMEM; @@ -7277,9 +7301,9 @@ diff -urNp linux-2.6.39/arch/sparc/mm/hugetlbpage.c= linux-2.6.39/arch/sparc/mm/h return addr; } if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) -diff -urNp linux-2.6.39/arch/sparc/mm/init_32.c linux-2.6.39/arch/sparc/= mm/init_32.c ---- linux-2.6.39/arch/sparc/mm/init_32.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/sparc/mm/init_32.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/sparc/mm/init_32.c linux-2.6.39.1/arch/sp= arc/mm/init_32.c +--- linux-2.6.39.1/arch/sparc/mm/init_32.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/sparc/mm/init_32.c 2011-05-22 19:36:30.000000000= -0400 @@ -318,6 +318,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -7314,9 +7338,9 @@ diff -urNp linux-2.6.39/arch/sparc/mm/init_32.c lin= ux-2.6.39/arch/sparc/mm/init_ protection_map[12] =3D PAGE_READONLY; protection_map[13] =3D PAGE_READONLY; protection_map[14] =3D PAGE_SHARED; -diff -urNp linux-2.6.39/arch/sparc/mm/Makefile linux-2.6.39/arch/sparc/m= m/Makefile ---- linux-2.6.39/arch/sparc/mm/Makefile 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/sparc/mm/Makefile 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/sparc/mm/Makefile linux-2.6.39.1/arch/spa= rc/mm/Makefile +--- linux-2.6.39.1/arch/sparc/mm/Makefile 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/sparc/mm/Makefile 2011-05-22 19:36:30.000000000 = -0400 @@ -2,7 +2,7 @@ # =20 @@ -7326,9 +7350,9 @@ diff -urNp linux-2.6.39/arch/sparc/mm/Makefile linu= x-2.6.39/arch/sparc/mm/Makefi =20 obj-$(CONFIG_SPARC64) +=3D ultra.o tlb.o tsb.o obj-y +=3D fault_$(BITS).o -diff -urNp linux-2.6.39/arch/sparc/mm/srmmu.c linux-2.6.39/arch/sparc/mm= /srmmu.c ---- linux-2.6.39/arch/sparc/mm/srmmu.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/sparc/mm/srmmu.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/sparc/mm/srmmu.c linux-2.6.39.1/arch/spar= c/mm/srmmu.c +--- linux-2.6.39.1/arch/sparc/mm/srmmu.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/sparc/mm/srmmu.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED =3D pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -7343,9 +7367,9 @@ diff -urNp linux-2.6.39/arch/sparc/mm/srmmu.c linux= -2.6.39/arch/sparc/mm/srmmu.c BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel =3D pgprot_val(SRMMU_PAGE_KERNEL); =20 -diff -urNp linux-2.6.39/arch/tile/kernel/pci.c linux-2.6.39/arch/tile/ke= rnel/pci.c ---- linux-2.6.39/arch/tile/kernel/pci.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/tile/kernel/pci.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/tile/kernel/pci.c linux-2.6.39.1/arch/til= e/kernel/pci.c +--- linux-2.6.39.1/arch/tile/kernel/pci.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/tile/kernel/pci.c 2011-05-22 19:36:30.000000000 = -0400 @@ -60,7 +60,7 @@ int __write_once tile_plx_gen1; static struct pci_controller controllers[TILE_NUM_PCIE]; static int num_controllers; @@ -7364,9 +7388,9 @@ diff -urNp linux-2.6.39/arch/tile/kernel/pci.c linu= x-2.6.39/arch/tile/kernel/pci .read =3D tile_cfg_read, .write =3D tile_cfg_write, }; -diff -urNp linux-2.6.39/arch/um/include/asm/kmap_types.h linux-2.6.39/ar= ch/um/include/asm/kmap_types.h ---- linux-2.6.39/arch/um/include/asm/kmap_types.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/um/include/asm/kmap_types.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/um/include/asm/kmap_types.h linux-2.6.39.= 1/arch/um/include/asm/kmap_types.h +--- linux-2.6.39.1/arch/um/include/asm/kmap_types.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/um/include/asm/kmap_types.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -7375,9 +7399,9 @@ diff -urNp linux-2.6.39/arch/um/include/asm/kmap_ty= pes.h linux-2.6.39/arch/um/in KM_TYPE_NR }; =20 -diff -urNp linux-2.6.39/arch/um/include/asm/page.h linux-2.6.39/arch/um/= include/asm/page.h ---- linux-2.6.39/arch/um/include/asm/page.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/um/include/asm/page.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/um/include/asm/page.h linux-2.6.39.1/arch= /um/include/asm/page.h +--- linux-2.6.39.1/arch/um/include/asm/page.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/um/include/asm/page.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -7388,9 +7412,9 @@ diff -urNp linux-2.6.39/arch/um/include/asm/page.h = linux-2.6.39/arch/um/include/ #ifndef __ASSEMBLY__ =20 struct page; -diff -urNp linux-2.6.39/arch/um/kernel/process.c linux-2.6.39/arch/um/ke= rnel/process.c ---- linux-2.6.39/arch/um/kernel/process.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/um/kernel/process.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/um/kernel/process.c linux-2.6.39.1/arch/u= m/kernel/process.c +--- linux-2.6.39.1/arch/um/kernel/process.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/um/kernel/process.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -404,22 +404,6 @@ int singlestepping(void * t) return 2; } @@ -7414,9 +7438,9 @@ diff -urNp linux-2.6.39/arch/um/kernel/process.c li= nux-2.6.39/arch/um/kernel/pro unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; -diff -urNp linux-2.6.39/arch/um/sys-i386/syscalls.c linux-2.6.39/arch/um= /sys-i386/syscalls.c ---- linux-2.6.39/arch/um/sys-i386/syscalls.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/um/sys-i386/syscalls.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/um/sys-i386/syscalls.c linux-2.6.39.1/arc= h/um/sys-i386/syscalls.c +--- linux-2.6.39.1/arch/um/sys-i386/syscalls.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/um/sys-i386/syscalls.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -7439,9 +7463,9 @@ diff -urNp linux-2.6.39/arch/um/sys-i386/syscalls.c= linux-2.6.39/arch/um/sys-i38 /* * The prototype on i386 is: * -diff -urNp linux-2.6.39/arch/unicore32/kernel/pci.c linux-2.6.39/arch/un= icore32/kernel/pci.c ---- linux-2.6.39/arch/unicore32/kernel/pci.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/unicore32/kernel/pci.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/unicore32/kernel/pci.c linux-2.6.39.1/arc= h/unicore32/kernel/pci.c +--- linux-2.6.39.1/arch/unicore32/kernel/pci.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/unicore32/kernel/pci.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -66,7 +66,7 @@ puv3_write_config(struct pci_bus *bus, u return PCIBIOS_SUCCESSFUL; } @@ -7451,9 +7475,9 @@ diff -urNp linux-2.6.39/arch/unicore32/kernel/pci.c= linux-2.6.39/arch/unicore32/ .read =3D puv3_read_config, .write =3D puv3_write_config, }; -diff -urNp linux-2.6.39/arch/x86/boot/bitops.h linux-2.6.39/arch/x86/boo= t/bitops.h ---- linux-2.6.39/arch/x86/boot/bitops.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/boot/bitops.h 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/boot/bitops.h linux-2.6.39.1/arch/x86= /boot/bitops.h +--- linux-2.6.39.1/arch/x86/boot/bitops.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/boot/bitops.h 2011-05-22 19:36:30.000000000 = -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int=20 u8 v; const u32 *p =3D (const u32 *)addr; @@ -7472,9 +7496,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/bitops.h linu= x-2.6.39/arch/x86/boot/bitops } =20 #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.39/arch/x86/boot/boot.h linux-2.6.39/arch/x86/boot/= boot.h ---- linux-2.6.39/arch/x86/boot/boot.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/x86/boot/boot.h 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/x86/boot/boot.h linux-2.6.39.1/arch/x86/b= oot/boot.h +--- linux-2.6.39.1/arch/x86/boot/boot.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/x86/boot/boot.h 2011-05-22 19:36:30.000000000 -0= 400 @@ -85,7 +85,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -7493,9 +7517,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/boot.h linux-= 2.6.39/arch/x86/boot/boot.h : "=3Dqm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.39/arch/x86/boot/compressed/head_32.S linux-2.6.39/= arch/x86/boot/compressed/head_32.S ---- linux-2.6.39/arch/x86/boot/compressed/head_32.S 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/boot/compressed/head_32.S 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/boot/compressed/head_32.S linux-2.6.3= 9.1/arch/x86/boot/compressed/head_32.S +--- linux-2.6.39.1/arch/x86/boot/compressed/head_32.S 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/boot/compressed/head_32.S 2011-05-22 19:36:3= 0.000000000 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -7524,9 +7548,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/compressed/he= ad_32.S linux-2.6.39/arch/x86 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.39/arch/x86/boot/compressed/head_64.S linux-2.6.39/= arch/x86/boot/compressed/head_64.S ---- linux-2.6.39/arch/x86/boot/compressed/head_64.S 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/boot/compressed/head_64.S 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/boot/compressed/head_64.S linux-2.6.3= 9.1/arch/x86/boot/compressed/head_64.S +--- linux-2.6.39.1/arch/x86/boot/compressed/head_64.S 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/boot/compressed/head_64.S 2011-05-22 19:36:3= 0.000000000 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -7545,9 +7569,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/compressed/he= ad_64.S linux-2.6.39/arch/x86 #endif =20 /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.39/arch/x86/boot/compressed/misc.c linux-2.6.39/arc= h/x86/boot/compressed/misc.c ---- linux-2.6.39/arch/x86/boot/compressed/misc.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/boot/compressed/misc.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/boot/compressed/misc.c linux-2.6.39.1= /arch/x86/boot/compressed/misc.c +--- linux-2.6.39.1/arch/x86/boot/compressed/misc.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/boot/compressed/misc.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -310,7 +310,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -7566,9 +7590,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/compressed/mi= sc.c linux-2.6.39/arch/x86/bo error("Wrong destination address"); #endif =20 -diff -urNp linux-2.6.39/arch/x86/boot/compressed/relocs.c linux-2.6.39/a= rch/x86/boot/compressed/relocs.c ---- linux-2.6.39/arch/x86/boot/compressed/relocs.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/boot/compressed/relocs.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/boot/compressed/relocs.c linux-2.6.39= .1/arch/x86/boot/compressed/relocs.c +--- linux-2.6.39.1/arch/x86/boot/compressed/relocs.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/boot/compressed/relocs.c 2011-05-22 19:36:30= .000000000 -0400 @@ -13,8 +13,11 @@ =20 static void die(char *fmt, ...); @@ -7761,9 +7785,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/compressed/re= locs.c linux-2.6.39/arch/x86/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.39/arch/x86/boot/cpucheck.c linux-2.6.39/arch/x86/b= oot/cpucheck.c ---- linux-2.6.39/arch/x86/boot/cpucheck.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/boot/cpucheck.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/boot/cpucheck.c linux-2.6.39.1/arch/x= 86/boot/cpucheck.c +--- linux-2.6.39.1/arch/x86/boot/cpucheck.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/boot/cpucheck.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw =3D -1, fsw =3D -1; u32 cr0; @@ -7859,9 +7883,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/cpucheck.c li= nux-2.6.39/arch/x86/boot/cpuc =20 err =3D check_flags(); } -diff -urNp linux-2.6.39/arch/x86/boot/header.S linux-2.6.39/arch/x86/boo= t/header.S ---- linux-2.6.39/arch/x86/boot/header.S 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/boot/header.S 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/boot/header.S linux-2.6.39.1/arch/x86= /boot/header.S +--- linux-2.6.39.1/arch/x86/boot/header.S 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/boot/header.S 2011-05-22 19:36:30.000000000 = -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -7871,9 +7895,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/header.S linu= x-2.6.39/arch/x86/boot/header =20 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.39/arch/x86/boot/memory.c linux-2.6.39/arch/x86/boo= t/memory.c ---- linux-2.6.39/arch/x86/boot/memory.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/boot/memory.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/boot/memory.c linux-2.6.39.1/arch/x86= /boot/memory.c +--- linux-2.6.39.1/arch/x86/boot/memory.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/boot/memory.c 2011-05-22 19:36:30.000000000 = -0400 @@ -19,7 +19,7 @@ =20 static int detect_memory_e820(void) @@ -7883,9 +7907,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/memory.c linu= x-2.6.39/arch/x86/boot/memory struct biosregs ireg, oreg; struct e820entry *desc =3D boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-2.6.39/arch/x86/boot/video.c linux-2.6.39/arch/x86/boot= /video.c ---- linux-2.6.39/arch/x86/boot/video.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/boot/video.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/boot/video.c linux-2.6.39.1/arch/x86/= boot/video.c +--- linux-2.6.39.1/arch/x86/boot/video.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/boot/video.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -96,7 +96,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -7895,9 +7919,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/video.c linux= -2.6.39/arch/x86/boot/video.c int key; unsigned int v; =20 -diff -urNp linux-2.6.39/arch/x86/boot/video-vesa.c linux-2.6.39/arch/x86= /boot/video-vesa.c ---- linux-2.6.39/arch/x86/boot/video-vesa.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/boot/video-vesa.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/boot/video-vesa.c linux-2.6.39.1/arch= /x86/boot/video-vesa.c +--- linux-2.6.39.1/arch/x86/boot/video-vesa.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/boot/video-vesa.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) =20 boot_params.screen_info.vesapm_seg =3D oreg.es; @@ -7906,9 +7930,9 @@ diff -urNp linux-2.6.39/arch/x86/boot/video-vesa.c = linux-2.6.39/arch/x86/boot/vi } =20 /* -diff -urNp linux-2.6.39/arch/x86/ia32/ia32_aout.c linux-2.6.39/arch/x86/= ia32/ia32_aout.c ---- linux-2.6.39/arch/x86/ia32/ia32_aout.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/ia32/ia32_aout.c 2011-05-22 19:41:32.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/ia32/ia32_aout.c linux-2.6.39.1/arch/= x86/ia32/ia32_aout.c +--- linux-2.6.39.1/arch/x86/ia32/ia32_aout.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/ia32/ia32_aout.c 2011-05-22 19:41:32.0000000= 00 -0400 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st unsigned long dump_start, dump_size; struct user32 dump; @@ -7918,9 +7942,9 @@ diff -urNp linux-2.6.39/arch/x86/ia32/ia32_aout.c l= inux-2.6.39/arch/x86/ia32/ia3 fs =3D get_fs(); set_fs(KERNEL_DS); has_dumped =3D 1; -diff -urNp linux-2.6.39/arch/x86/ia32/ia32entry.S linux-2.6.39/arch/x86/= ia32/ia32entry.S ---- linux-2.6.39/arch/x86/ia32/ia32entry.S 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/ia32/ia32entry.S 2011-05-23 17:16:01.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/ia32/ia32entry.S linux-2.6.39.1/arch/= x86/ia32/ia32entry.S +--- linux-2.6.39.1/arch/x86/ia32/ia32entry.S 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/ia32/ia32entry.S 2011-05-23 17:16:01.0000000= 00 -0400 @@ -13,6 +13,7 @@ #include =09 #include @@ -8098,9 +8122,9 @@ diff -urNp linux-2.6.39/arch/x86/ia32/ia32entry.S l= inux-2.6.39/arch/x86/ia32/ia3 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace change= d it */ RESTORE_REST cmpq $(IA32_NR_syscalls-1),%rax -diff -urNp linux-2.6.39/arch/x86/ia32/ia32_signal.c linux-2.6.39/arch/x8= 6/ia32/ia32_signal.c ---- linux-2.6.39/arch/x86/ia32/ia32_signal.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/ia32/ia32_signal.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/ia32/ia32_signal.c linux-2.6.39.1/arc= h/x86/ia32/ia32_signal.c +--- linux-2.6.39.1/arch/x86/ia32/ia32_signal.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/ia32/ia32_signal.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct=20 sp -=3D frame_size; /* Align the stack pointer according to the i386 ABI, @@ -8150,9 +8174,9 @@ diff -urNp linux-2.6.39/arch/x86/ia32/ia32_signal.c= linux-2.6.39/arch/x86/ia32/i } put_user_catch(err); =20 if (err) -diff -urNp linux-2.6.39/arch/x86/include/asm/alternative.h linux-2.6.39/= arch/x86/include/asm/alternative.h ---- linux-2.6.39/arch/x86/include/asm/alternative.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/alternative.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/alternative.h linux-2.6.3= 9.1/arch/x86/include/asm/alternative.h +--- linux-2.6.39.1/arch/x86/include/asm/alternative.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/alternative.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -94,7 +94,7 @@ static inline int alternatives_text_rese ".section .discard,\"aw\",@progbits\n" \ " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <=3D slen */= \ @@ -8162,9 +8186,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/altern= ative.h linux-2.6.39/arch/x86 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/apm.h linux-2.6.39/arch/x86= /include/asm/apm.h ---- linux-2.6.39/arch/x86/include/asm/apm.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/include/asm/apm.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/apm.h linux-2.6.39.1/arch= /x86/include/asm/apm.h +--- linux-2.6.39.1/arch/x86/include/asm/apm.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/apm.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -8183,9 +8207,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/apm.h = linux-2.6.39/arch/x86/include "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.39/arch/x86/include/asm/atomic64_32.h linux-2.6.39/= arch/x86/include/asm/atomic64_32.h ---- linux-2.6.39/arch/x86/include/asm/atomic64_32.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/atomic64_32.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/atomic64_32.h linux-2.6.3= 9.1/arch/x86/include/asm/atomic64_32.h +--- linux-2.6.39.1/arch/x86/include/asm/atomic64_32.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/atomic64_32.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -12,6 +12,14 @@ typedef struct { u64 __aligned(8) counter; } atomic64_t; @@ -8335,9 +8359,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/atomic= 64_32.h linux-2.6.39/arch/x86 * atomic64_sub - subtract the atomic64 variable * @i: integer value to subtract * @v: pointer to type atomic64_t -diff -urNp linux-2.6.39/arch/x86/include/asm/atomic64_64.h linux-2.6.39/= arch/x86/include/asm/atomic64_64.h ---- linux-2.6.39/arch/x86/include/asm/atomic64_64.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/atomic64_64.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/atomic64_64.h linux-2.6.3= 9.1/arch/x86/include/asm/atomic64_64.h +--- linux-2.6.39.1/arch/x86/include/asm/atomic64_64.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/atomic64_64.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -18,7 +18,19 @@ */ static inline long atomic64_read(const atomic64_t *v) @@ -8659,9 +8683,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/atomic= 64_64.h linux-2.6.39/arch/x86 } =20 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.39/arch/x86/include/asm/atomic.h linux-2.6.39/arch/= x86/include/asm/atomic.h ---- linux-2.6.39/arch/x86/include/asm/atomic.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/atomic.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/atomic.h linux-2.6.39.1/a= rch/x86/include/asm/atomic.h +--- linux-2.6.39.1/arch/x86/include/asm/atomic.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/atomic.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -22,7 +22,18 @@ */ static inline int atomic_read(const atomic_t *v) @@ -9074,9 +9098,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/atomic= .h linux-2.6.39/arch/x86/incl /* * atomic_dec_if_positive - decrement by 1 if old value positive * @v: pointer of type atomic_t -diff -urNp linux-2.6.39/arch/x86/include/asm/bitops.h linux-2.6.39/arch/= x86/include/asm/bitops.h ---- linux-2.6.39/arch/x86/include/asm/bitops.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/bitops.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/bitops.h linux-2.6.39.1/a= rch/x86/include/asm/bitops.h +--- linux-2.6.39.1/arch/x86/include/asm/bitops.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/bitops.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -38,7 +38,7 @@ * a mask operation on a byte. */ @@ -9086,9 +9110,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/bitops= .h linux-2.6.39/arch/x86/incl #define CONST_MASK(nr) (1 << ((nr) & 7)) =20 /** -diff -urNp linux-2.6.39/arch/x86/include/asm/boot.h linux-2.6.39/arch/x8= 6/include/asm/boot.h ---- linux-2.6.39/arch/x86/include/asm/boot.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/include/asm/boot.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/boot.h linux-2.6.39.1/arc= h/x86/include/asm/boot.h +--- linux-2.6.39.1/arch/x86/include/asm/boot.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/boot.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -11,10 +11,15 @@ #include =20 @@ -9106,9 +9130,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/boot.h= linux-2.6.39/arch/x86/includ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.39/arch/x86/include/asm/cacheflush.h linux-2.6.39/a= rch/x86/include/asm/cacheflush.h ---- linux-2.6.39/arch/x86/include/asm/cacheflush.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/cacheflush.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/cacheflush.h linux-2.6.39= .1/arch/x86/include/asm/cacheflush.h +--- linux-2.6.39.1/arch/x86/include/asm/cacheflush.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/cacheflush.h 2011-05-22 19:36:30= .000000000 -0400 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem unsigned long pg_flags =3D pg->flags & _PGMT_MASK; =20 @@ -9118,9 +9142,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/cachef= lush.h linux-2.6.39/arch/x86/ else if (pg_flags =3D=3D _PGMT_WC) return _PAGE_CACHE_WC; else if (pg_flags =3D=3D _PGMT_UC_MINUS) -diff -urNp linux-2.6.39/arch/x86/include/asm/cache.h linux-2.6.39/arch/x= 86/include/asm/cache.h ---- linux-2.6.39/arch/x86/include/asm/cache.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/cache.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/cache.h linux-2.6.39.1/ar= ch/x86/include/asm/cache.h +--- linux-2.6.39.1/arch/x86/include/asm/cache.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/cache.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -5,12 +5,13 @@ =20 /* L1 cache line size */ @@ -9137,9 +9161,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/cache.= h linux-2.6.39/arch/x86/inclu =20 #ifdef CONFIG_X86_VSMP #ifdef CONFIG_SMP -diff -urNp linux-2.6.39/arch/x86/include/asm/checksum_32.h linux-2.6.39/= arch/x86/include/asm/checksum_32.h ---- linux-2.6.39/arch/x86/include/asm/checksum_32.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/checksum_32.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/checksum_32.h linux-2.6.3= 9.1/arch/x86/include/asm/checksum_32.h +--- linux-2.6.39.1/arch/x86/include/asm/checksum_32.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/checksum_32.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -9173,9 +9197,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/checks= um_32.h linux-2.6.39/arch/x86 len, sum, NULL, err_ptr); =20 if (len) -diff -urNp linux-2.6.39/arch/x86/include/asm/cpufeature.h linux-2.6.39/a= rch/x86/include/asm/cpufeature.h ---- linux-2.6.39/arch/x86/include/asm/cpufeature.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/cpufeature.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/cpufeature.h linux-2.6.39= .1/arch/x86/include/asm/cpufeature.h +--- linux-2.6.39.1/arch/x86/include/asm/cpufeature.h 2011-06-03 00:04:13= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/cpufeature.h 2011-06-03 00:32:04= .000000000 -0400 @@ -351,7 +351,7 @@ static __always_inline __pure bool __sta ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ @@ -9185,9 +9209,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/cpufea= ture.h linux-2.6.39/arch/x86/ "3: movb $1,%0\n" "4:\n" ".previous\n" -diff -urNp linux-2.6.39/arch/x86/include/asm/desc_defs.h linux-2.6.39/ar= ch/x86/include/asm/desc_defs.h ---- linux-2.6.39/arch/x86/include/asm/desc_defs.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/desc_defs.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/desc_defs.h linux-2.6.39.= 1/arch/x86/include/asm/desc_defs.h +--- linux-2.6.39.1/arch/x86/include/asm/desc_defs.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/desc_defs.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -31,6 +31,12 @@ struct desc_struct { unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; @@ -9201,9 +9225,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/desc_d= efs.h linux-2.6.39/arch/x86/i }; } __attribute__((packed)); =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/desc.h linux-2.6.39/arch/x8= 6/include/asm/desc.h ---- linux-2.6.39/arch/x86/include/asm/desc.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/include/asm/desc.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/desc.h linux-2.6.39.1/arc= h/x86/include/asm/desc.h +--- linux-2.6.39.1/arch/x86/include/asm/desc.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/desc.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -4,6 +4,7 @@ #include #include @@ -9384,9 +9408,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/desc.h= linux-2.6.39/arch/x86/includ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/device.h linux-2.6.39/arch/= x86/include/asm/device.h ---- linux-2.6.39/arch/x86/include/asm/device.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/device.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/device.h linux-2.6.39.1/a= rch/x86/include/asm/device.h +--- linux-2.6.39.1/arch/x86/include/asm/device.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/device.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -9396,9 +9420,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/device= .h linux-2.6.39/arch/x86/incl #endif #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU) void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.39/arch/x86/include/asm/dma-mapping.h linux-2.6.39/= arch/x86/include/asm/dma-mapping.h ---- linux-2.6.39/arch/x86/include/asm/dma-mapping.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/dma-mapping.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/dma-mapping.h linux-2.6.3= 9.1/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.39.1/arch/x86/include/asm/dma-mapping.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/dma-mapping.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -26,9 +26,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -9438,9 +9462,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/dma-ma= pping.h linux-2.6.39/arch/x86 =20 WARN_ON(irqs_disabled()); /* for portability */ =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/e820.h linux-2.6.39/arch/x8= 6/include/asm/e820.h ---- linux-2.6.39/arch/x86/include/asm/e820.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/include/asm/e820.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/e820.h linux-2.6.39.1/arc= h/x86/include/asm/e820.h +--- linux-2.6.39.1/arch/x86/include/asm/e820.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/e820.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -69,7 +69,7 @@ struct e820map { #define ISA_START_ADDRESS 0xa0000 #define ISA_END_ADDRESS 0x100000 @@ -9450,9 +9474,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/e820.h= linux-2.6.39/arch/x86/includ #define BIOS_END 0x00100000 =20 #define BIOS_ROM_BASE 0xffe00000 -diff -urNp linux-2.6.39/arch/x86/include/asm/elf.h linux-2.6.39/arch/x86= /include/asm/elf.h ---- linux-2.6.39/arch/x86/include/asm/elf.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/include/asm/elf.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/elf.h linux-2.6.39.1/arch= /x86/include/asm/elf.h +--- linux-2.6.39.1/arch/x86/include/asm/elf.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/elf.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -237,7 +237,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -9506,9 +9530,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/elf.h = linux-2.6.39/arch/x86/include -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/emergency-restart.h linux-2= .6.39/arch/x86/include/asm/emergency-restart.h ---- linux-2.6.39/arch/x86/include/asm/emergency-restart.h 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/emergency-restart.h 2011-05-22 19:= 36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/emergency-restart.h linux= -2.6.39.1/arch/x86/include/asm/emergency-restart.h +--- linux-2.6.39.1/arch/x86/include/asm/emergency-restart.h 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/emergency-restart.h 2011-05-22 1= 9:36:30.000000000 -0400 @@ -15,6 +15,6 @@ enum reboot_type { =20 extern enum reboot_type reboot_type; @@ -9517,9 +9541,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/emerge= ncy-restart.h linux-2.6.39/ar +extern void machine_emergency_restart(void) __noreturn; =20 #endif /* _ASM_X86_EMERGENCY_RESTART_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/futex.h linux-2.6.39/arch/x= 86/include/asm/futex.h ---- linux-2.6.39/arch/x86/include/asm/futex.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/futex.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/futex.h linux-2.6.39.1/ar= ch/x86/include/asm/futex.h +--- linux-2.6.39.1/arch/x86/include/asm/futex.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/futex.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -12,16 +12,18 @@ #include =20 @@ -9578,9 +9602,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/futex.= h linux-2.6.39/arch/x86/inclu : "i" (-EFAULT), "r" (newval), "1" (oldval) : "memory" ); -diff -urNp linux-2.6.39/arch/x86/include/asm/hw_irq.h linux-2.6.39/arch/= x86/include/asm/hw_irq.h ---- linux-2.6.39/arch/x86/include/asm/hw_irq.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/hw_irq.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/hw_irq.h linux-2.6.39.1/a= rch/x86/include/asm/hw_irq.h +--- linux-2.6.39.1/arch/x86/include/asm/hw_irq.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/hw_irq.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void); extern void enable_IO_APIC(void); =20 @@ -9592,9 +9616,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/hw_irq= .h linux-2.6.39/arch/x86/incl =20 /* EISA */ extern void eisa_set_level_irq(unsigned int irq); -diff -urNp linux-2.6.39/arch/x86/include/asm/i387.h linux-2.6.39/arch/x8= 6/include/asm/i387.h ---- linux-2.6.39/arch/x86/include/asm/i387.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/include/asm/i387.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/i387.h linux-2.6.39.1/arc= h/x86/include/asm/i387.h +--- linux-2.6.39.1/arch/x86/include/asm/i387.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/i387.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc { int err; @@ -9644,9 +9668,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/i387.h= linux-2.6.39/arch/x86/includ else clts(); } -diff -urNp linux-2.6.39/arch/x86/include/asm/io.h linux-2.6.39/arch/x86/= include/asm/io.h ---- linux-2.6.39/arch/x86/include/asm/io.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/include/asm/io.h 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/io.h linux-2.6.39.1/arch/= x86/include/asm/io.h +--- linux-2.6.39.1/arch/x86/include/asm/io.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/io.h 2011-05-22 19:36:30.0000000= 00 -0400 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void); =20 #include @@ -9665,9 +9689,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/io.h l= inux-2.6.39/arch/x86/include/ /* * Convert a virtual cached pointer to an uncached pointer */ -diff -urNp linux-2.6.39/arch/x86/include/asm/iommu.h linux-2.6.39/arch/x= 86/include/asm/iommu.h ---- linux-2.6.39/arch/x86/include/asm/iommu.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/iommu.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/iommu.h linux-2.6.39.1/ar= ch/x86/include/asm/iommu.h +--- linux-2.6.39.1/arch/x86/include/asm/iommu.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/iommu.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -1,7 +1,7 @@ #ifndef _ASM_X86_IOMMU_H #define _ASM_X86_IOMMU_H @@ -9677,9 +9701,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/iommu.= h linux-2.6.39/arch/x86/inclu extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.39/arch/x86/include/asm/irqflags.h linux-2.6.39/arc= h/x86/include/asm/irqflags.h ---- linux-2.6.39/arch/x86/include/asm/irqflags.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/irqflags.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/irqflags.h linux-2.6.39.1= /arch/x86/include/asm/irqflags.h +--- linux-2.6.39.1/arch/x86/include/asm/irqflags.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/irqflags.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i sti; \ sysexit @@ -9692,9 +9716,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/irqfla= gs.h linux-2.6.39/arch/x86/in #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.39/arch/x86/include/asm/kprobes.h linux-2.6.39/arch= /x86/include/asm/kprobes.h ---- linux-2.6.39/arch/x86/include/asm/kprobes.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/kprobes.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/kprobes.h linux-2.6.39.1/= arch/x86/include/asm/kprobes.h +--- linux-2.6.39.1/arch/x86/include/asm/kprobes.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/kprobes.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t; #define RELATIVEJUMP_SIZE 5 #define RELATIVECALL_OPCODE 0xe8 @@ -9711,9 +9735,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/kprobe= s.h linux-2.6.39/arch/x86/inc =20 #define flush_insn_slot(p) do { } while (0) =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/kvm_host.h linux-2.6.39/arc= h/x86/include/asm/kvm_host.h ---- linux-2.6.39/arch/x86/include/asm/kvm_host.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/kvm_host.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/kvm_host.h linux-2.6.39.1= /arch/x86/include/asm/kvm_host.h +--- linux-2.6.39.1/arch/x86/include/asm/kvm_host.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/kvm_host.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -419,7 +419,7 @@ struct kvm_arch { unsigned int n_used_mmu_pages; unsigned int n_requested_mmu_pages; @@ -9732,9 +9756,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/kvm_ho= st.h linux-2.6.39/arch/x86/in =20 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.39/arch/x86/include/asm/local.h linux-2.6.39/arch/x= 86/include/asm/local.h ---- linux-2.6.39/arch/x86/include/asm/local.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/local.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/local.h linux-2.6.39.1/ar= ch/x86/include/asm/local.h +--- linux-2.6.39.1/arch/x86/include/asm/local.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/local.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -18,26 +18,58 @@ typedef struct { =20 static inline void local_inc(local_t *l) @@ -9887,9 +9911,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/local.= h linux-2.6.39/arch/x86/inclu : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.39/arch/x86/include/asm/mce.h linux-2.6.39/arch/x86= /include/asm/mce.h ---- linux-2.6.39/arch/x86/include/asm/mce.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/include/asm/mce.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/mce.h linux-2.6.39.1/arch= /x86/include/asm/mce.h +--- linux-2.6.39.1/arch/x86/include/asm/mce.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/mce.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -198,7 +198,7 @@ int mce_notify_irq(void); void mce_notify_process(void); =20 @@ -9899,9 +9923,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/mce.h = linux-2.6.39/arch/x86/include =20 /* * Exception handler -diff -urNp linux-2.6.39/arch/x86/include/asm/microcode.h linux-2.6.39/ar= ch/x86/include/asm/microcode.h ---- linux-2.6.39/arch/x86/include/asm/microcode.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/microcode.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/microcode.h linux-2.6.39.= 1/arch/x86/include/asm/microcode.h +--- linux-2.6.39.1/arch/x86/include/asm/microcode.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/microcode.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; =20 @@ -9948,9 +9972,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/microc= ode.h linux-2.6.39/arch/x86/i { return NULL; } -diff -urNp linux-2.6.39/arch/x86/include/asm/mman.h linux-2.6.39/arch/x8= 6/include/asm/mman.h ---- linux-2.6.39/arch/x86/include/asm/mman.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/include/asm/mman.h 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/mman.h linux-2.6.39.1/arc= h/x86/include/asm/mman.h +--- linux-2.6.39.1/arch/x86/include/asm/mman.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/mman.h 2011-05-22 19:36:30.00000= 0000 -0400 @@ -5,4 +5,14 @@ =20 #include @@ -9966,9 +9990,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/mman.h= linux-2.6.39/arch/x86/includ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/mmu_context.h linux-2.6.39/= arch/x86/include/asm/mmu_context.h ---- linux-2.6.39/arch/x86/include/asm/mmu_context.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/mmu_context.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/mmu_context.h linux-2.6.3= 9.1/arch/x86/include/asm/mmu_context.h +--- linux-2.6.39.1/arch/x86/include/asm/mmu_context.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/mmu_context.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m =20 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_str= uct *tsk) @@ -10092,9 +10116,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/mmu_= context.h linux-2.6.39/arch/x86 } =20 #define activate_mm(prev, next) \ -diff -urNp linux-2.6.39/arch/x86/include/asm/mmu.h linux-2.6.39/arch/x86= /include/asm/mmu.h ---- linux-2.6.39/arch/x86/include/asm/mmu.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/include/asm/mmu.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/mmu.h linux-2.6.39.1/arch= /x86/include/asm/mmu.h +--- linux-2.6.39.1/arch/x86/include/asm/mmu.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/mmu.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -9,10 +9,22 @@ * we put the segment information here. */ @@ -10120,9 +10144,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/mmu.= h linux-2.6.39/arch/x86/include =20 #ifdef CONFIG_X86_64 /* True if mm supports a task running in 32 bit compatibility mode. */ -diff -urNp linux-2.6.39/arch/x86/include/asm/module.h linux-2.6.39/arch/= x86/include/asm/module.h ---- linux-2.6.39/arch/x86/include/asm/module.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/module.h 2011-05-22 19:41:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/module.h linux-2.6.39.1/a= rch/x86/include/asm/module.h +--- linux-2.6.39.1/arch/x86/include/asm/module.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/module.h 2011-05-22 19:41:32.000= 000000 -0400 @@ -5,6 +5,7 @@ =20 #ifdef CONFIG_X86_64 @@ -10164,9 +10188,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/modu= le.h linux-2.6.39/arch/x86/incl +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX= _KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT + #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/page_64_types.h linux-2.6.3= 9/arch/x86/include/asm/page_64_types.h ---- linux-2.6.39/arch/x86/include/asm/page_64_types.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/page_64_types.h 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/page_64_types.h linux-2.6= .39.1/arch/x86/include/asm/page_64_types.h +--- linux-2.6.39.1/arch/x86/include/asm/page_64_types.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/page_64_types.h 2011-05-22 19:36= :30.000000000 -0400 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); =20 /* duplicated to the one in bootmem.h */ @@ -10176,9 +10200,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/page= _64_types.h linux-2.6.39/arch/x =20 extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) -diff -urNp linux-2.6.39/arch/x86/include/asm/paravirt.h linux-2.6.39/arc= h/x86/include/asm/paravirt.h ---- linux-2.6.39/arch/x86/include/asm/paravirt.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/paravirt.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/paravirt.h linux-2.6.39.1= /arch/x86/include/asm/paravirt.h +--- linux-2.6.39.1/arch/x86/include/asm/paravirt.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/paravirt.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -10232,9 +10256,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/para= virt.h linux-2.6.39/arch/x86/in #endif /* CONFIG_X86_32 */ =20 #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.39/arch/x86/include/asm/paravirt_types.h linux-2.6.= 39/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.39/arch/x86/include/asm/paravirt_types.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/paravirt_types.h 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/paravirt_types.h linux-2.= 6.39.1/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.39.1/arch/x86/include/asm/paravirt_types.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/paravirt_types.h 2011-05-22 19:3= 6:30.000000000 -0400 @@ -317,6 +317,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -10248,9 +10272,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/para= virt_types.h linux-2.6.39/arch/ }; =20 struct arch_spinlock; -diff -urNp linux-2.6.39/arch/x86/include/asm/pci_x86.h linux-2.6.39/arch= /x86/include/asm/pci_x86.h ---- linux-2.6.39/arch/x86/include/asm/pci_x86.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pci_x86.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pci_x86.h linux-2.6.39.1/= arch/x86/include/asm/pci_x86.h +--- linux-2.6.39.1/arch/x86/include/asm/pci_x86.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pci_x86.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct=20 extern void (*pcibios_disable_irq)(struct pci_dev *dev); =20 @@ -10273,9 +10297,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pci_= x86.h linux-2.6.39/arch/x86/inc extern bool port_cf9_safe; =20 /* arch_initcall level */ -diff -urNp linux-2.6.39/arch/x86/include/asm/pgalloc.h linux-2.6.39/arch= /x86/include/asm/pgalloc.h ---- linux-2.6.39/arch/x86/include/asm/pgalloc.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgalloc.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgalloc.h linux-2.6.39.1/= arch/x86/include/asm/pgalloc.h +--- linux-2.6.39.1/arch/x86/include/asm/pgalloc.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgalloc.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -10290,9 +10314,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgal= loc.h linux-2.6.39/arch/x86/inc set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable-2level.h linux-2.6.= 39/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.39/arch/x86/include/asm/pgtable-2level.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable-2level.h 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable-2level.h linux-2.= 6.39.1/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable-2level.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable-2level.h 2011-05-22 19:3= 6:30.000000000 -0400 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t=20 =20 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -10303,9 +10327,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble-2level.h linux-2.6.39/arch/ } =20 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_32.h linux-2.6.39/a= rch/x86/include/asm/pgtable_32.h ---- linux-2.6.39/arch/x86/include/asm/pgtable_32.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable_32.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable_32.h linux-2.6.39= .1/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable_32.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable_32.h 2011-05-22 19:36:30= .000000000 -0400 @@ -25,9 +25,6 @@ struct mm_struct; struct vm_area_struct; @@ -10349,9 +10373,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble_32.h linux-2.6.39/arch/x86/ /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h linux-2.= 6.39/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h 2011-05-22 19:3= 6:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable_32_types.h linux-= 2.6.39.1/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable_32_types.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable_32_types.h 2011-05-22 19= :36:30.000000000 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -10381,9 +10405,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble_32_types.h linux-2.6.39/arc #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable-3level.h linux-2.6.= 39/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.39/arch/x86/include/asm/pgtable-3level.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable-3level.h 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable-3level.h linux-2.= 6.39.1/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable-3level.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable-3level.h 2011-05-22 19:3= 6:30.000000000 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic =20 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -10401,9 +10425,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble-3level.h linux-2.6.39/arch/ } =20 /* -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_64.h linux-2.6.39/a= rch/x86/include/asm/pgtable_64.h ---- linux-2.6.39/arch/x86/include/asm/pgtable_64.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable_64.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable_64.h linux-2.6.39= .1/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable_64.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable_64.h 2011-05-22 19:36:30= .000000000 -0400 @@ -16,10 +16,13 @@ =20 extern pud_t level3_kernel_pgt[512]; @@ -10440,9 +10464,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble_64.h linux-2.6.39/arch/x86/ } =20 static inline void native_pgd_clear(pgd_t *pgd) -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h linux-2.= 6.39/arch/x86/include/asm/pgtable_64_types.h ---- linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h 2011-05-22 19:3= 6:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable_64_types.h linux-= 2.6.39.1/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable_64_types.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable_64_types.h 2011-05-22 19= :36:30.000000000 -0400 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -10454,9 +10478,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble_64_types.h linux-2.6.39/arc +#define ktva_ktla(addr) (addr) =20 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable.h linux-2.6.39/arch= /x86/include/asm/pgtable.h ---- linux-2.6.39/arch/x86/include/asm/pgtable.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable.h linux-2.6.39.1/= arch/x86/include/asm/pgtable.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm =20 #define arch_end_context_switch(prev) do {} while(0) @@ -10626,9 +10650,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble.h linux-2.6.39/arch/x86/inc =20 #include #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_types.h linux-2.6.3= 9/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.39/arch/x86/include/asm/pgtable_types.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/pgtable_types.h 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/pgtable_types.h linux-2.6= .39.1/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.39.1/arch/x86/include/asm/pgtable_types.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/pgtable_types.h 2011-05-22 19:36= :30.000000000 -0400 @@ -16,13 +16,12 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -10742,9 +10766,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/pgta= ble_types.h linux-2.6.39/arch/x =20 #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.39/arch/x86/include/asm/processor.h linux-2.6.39/ar= ch/x86/include/asm/processor.h ---- linux-2.6.39/arch/x86/include/asm/processor.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/processor.h 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/processor.h linux-2.6.39.= 1/arch/x86/include/asm/processor.h +--- linux-2.6.39.1/arch/x86/include/asm/processor.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/processor.h 2011-05-22 19:36:30.= 000000000 -0400 @@ -266,7 +266,7 @@ struct tss_struct { =20 } ____cacheline_aligned; @@ -10847,9 +10871,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/proc= essor.h linux-2.6.39/arch/x86/i #define KSTK_EIP(task) (task_pt_regs(task)->ip) =20 /* Get/set a process' ability to use the timestamp counter instruction = */ -diff -urNp linux-2.6.39/arch/x86/include/asm/ptrace.h linux-2.6.39/arch/= x86/include/asm/ptrace.h ---- linux-2.6.39/arch/x86/include/asm/ptrace.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/ptrace.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/ptrace.h linux-2.6.39.1/a= rch/x86/include/asm/ptrace.h +--- linux-2.6.39.1/arch/x86/include/asm/ptrace.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/ptrace.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_ } =20 @@ -10886,9 +10910,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/ptra= ce.h linux-2.6.39/arch/x86/incl #endif } =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/reboot.h linux-2.6.39/arch/= x86/include/asm/reboot.h ---- linux-2.6.39/arch/x86/include/asm/reboot.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/reboot.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/reboot.h linux-2.6.39.1/a= rch/x86/include/asm/reboot.h +--- linux-2.6.39.1/arch/x86/include/asm/reboot.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/reboot.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -6,19 +6,19 @@ struct pt_regs; =20 @@ -10914,9 +10938,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/rebo= ot.h linux-2.6.39/arch/x86/incl /* These must match dispatch_table in reboot_32.S */ #define MRR_BIOS 0 #define MRR_APM 1 -diff -urNp linux-2.6.39/arch/x86/include/asm/rwsem.h linux-2.6.39/arch/x= 86/include/asm/rwsem.h ---- linux-2.6.39/arch/x86/include/asm/rwsem.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/rwsem.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/rwsem.h linux-2.6.39.1/ar= ch/x86/include/asm/rwsem.h +--- linux-2.6.39.1/arch/x86/include/asm/rwsem.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/rwsem.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -11041,9 +11065,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/rwse= m.h linux-2.6.39/arch/x86/inclu : "+r" (tmp), "+m" (sem->count) : : "memory"); =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/segment.h linux-2.6.39/arch= /x86/include/asm/segment.h ---- linux-2.6.39/arch/x86/include/asm/segment.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/segment.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/segment.h linux-2.6.39.1/= arch/x86/include/asm/segment.h +--- linux-2.6.39.1/arch/x86/include/asm/segment.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/segment.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -64,8 +64,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -11103,9 +11127,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/segm= ent.h linux-2.6.39/arch/x86/inc #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3) -diff -urNp linux-2.6.39/arch/x86/include/asm/smp.h linux-2.6.39/arch/x86= /include/asm/smp.h ---- linux-2.6.39/arch/x86/include/asm/smp.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/include/asm/smp.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/smp.h linux-2.6.39.1/arch= /x86/include/asm/smp.h +--- linux-2.6.39.1/arch/x86/include/asm/smp.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/smp.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_ /* cpus sharing the last level cache: */ DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map); @@ -11132,9 +11156,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/smp.= h linux-2.6.39/arch/x86/include #define safe_smp_processor_id() smp_processor_id() =20 #endif -diff -urNp linux-2.6.39/arch/x86/include/asm/spinlock.h linux-2.6.39/arc= h/x86/include/asm/spinlock.h ---- linux-2.6.39/arch/x86/include/asm/spinlock.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/spinlock.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/spinlock.h linux-2.6.39.1= /arch/x86/include/asm/spinlock.h +--- linux-2.6.39.1/arch/x86/include/asm/spinlock.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/spinlock.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar static inline void arch_read_lock(arch_rwlock_t *rw) { @@ -11197,9 +11221,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/spin= lock.h linux-2.6.39/arch/x86/in : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/stackprotector.h linux-2.6.= 39/arch/x86/include/asm/stackprotector.h ---- linux-2.6.39/arch/x86/include/asm/stackprotector.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/stackprotector.h 2011-05-22 19:36:= 30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/stackprotector.h linux-2.= 6.39.1/arch/x86/include/asm/stackprotector.h +--- linux-2.6.39.1/arch/x86/include/asm/stackprotector.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/stackprotector.h 2011-05-22 19:3= 6:30.000000000 -0400 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se =20 static inline void load_stack_canary_segment(void) @@ -11209,9 +11233,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/stac= kprotector.h linux-2.6.39/arch/ asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } -diff -urNp linux-2.6.39/arch/x86/include/asm/stacktrace.h linux-2.6.39/a= rch/x86/include/asm/stacktrace.h ---- linux-2.6.39/arch/x86/include/asm/stacktrace.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/stacktrace.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/stacktrace.h linux-2.6.39= .1/arch/x86/include/asm/stacktrace.h +--- linux-2.6.39.1/arch/x86/include/asm/stacktrace.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/stacktrace.h 2011-05-22 19:36:30= .000000000 -0400 @@ -11,28 +11,20 @@ =20 extern int kstack_depth_to_print; @@ -11262,9 +11286,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/stac= ktrace.h linux-2.6.39/arch/x86/ }; =20 void dump_trace(struct task_struct *tsk, struct pt_regs *regs, -diff -urNp linux-2.6.39/arch/x86/include/asm/system.h linux-2.6.39/arch/= x86/include/asm/system.h ---- linux-2.6.39/arch/x86/include/asm/system.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/system.h 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/system.h linux-2.6.39.1/a= rch/x86/include/asm/system.h +--- linux-2.6.39.1/arch/x86/include/asm/system.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/system.h 2011-05-22 19:36:30.000= 000000 -0400 @@ -129,7 +129,7 @@ do { \ "call __switch_to\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ @@ -11307,9 +11331,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/syst= em.h linux-2.6.39/arch/x86/incl =20 /* * Force strict CPU ordering. -diff -urNp linux-2.6.39/arch/x86/include/asm/thread_info.h linux-2.6.39/= arch/x86/include/asm/thread_info.h ---- linux-2.6.39/arch/x86/include/asm/thread_info.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/thread_info.h 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/thread_info.h linux-2.6.3= 9.1/arch/x86/include/asm/thread_info.h +--- linux-2.6.39.1/arch/x86/include/asm/thread_info.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/thread_info.h 2011-05-22 19:36:3= 0.000000000 -0400 @@ -10,6 +10,7 @@ #include #include @@ -11457,9 +11481,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/thre= ad_info.h linux-2.6.39/arch/x86 + #endif #endif /* _ASM_X86_THREAD_INFO_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/uaccess_32.h linux-2.6.39/a= rch/x86/include/asm/uaccess_32.h ---- linux-2.6.39/arch/x86/include/asm/uaccess_32.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/uaccess_32.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/uaccess_32.h linux-2.6.39= .1/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.39.1/arch/x86/include/asm/uaccess_32.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/uaccess_32.h 2011-05-22 19:36:30= .000000000 -0400 @@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned lon= g n) @@ -11627,9 +11651,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/uacc= ess_32.h linux-2.6.39/arch/x86/ return n; } =20 -diff -urNp linux-2.6.39/arch/x86/include/asm/uaccess_64.h linux-2.6.39/a= rch/x86/include/asm/uaccess_64.h ---- linux-2.6.39/arch/x86/include/asm/uaccess_64.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/uaccess_64.h 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/uaccess_64.h linux-2.6.39= .1/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.39.1/arch/x86/include/asm/uaccess_64.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/uaccess_64.h 2011-05-22 19:36:30= .000000000 -0400 @@ -11,6 +11,9 @@ #include #include @@ -12034,9 +12058,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/uacc= ess_64.h linux-2.6.39/arch/x86/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zero= rest); =20 #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/uaccess.h linux-2.6.39/arch= /x86/include/asm/uaccess.h ---- linux-2.6.39/arch/x86/include/asm/uaccess.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/uaccess.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/uaccess.h linux-2.6.39.1/= arch/x86/include/asm/uaccess.h +--- linux-2.6.39.1/arch/x86/include/asm/uaccess.h 2011-06-03 00:04:13.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/uaccess.h 2011-06-03 00:32:04.00= 0000000 -0400 @@ -8,12 +8,15 @@ #include #include @@ -12255,9 +12279,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/uacc= ess.h linux-2.6.39/arch/x86/inc #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.39/arch/x86/include/asm/vgtod.h linux-2.6.39/arch/x= 86/include/asm/vgtod.h ---- linux-2.6.39/arch/x86/include/asm/vgtod.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/vgtod.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/vgtod.h linux-2.6.39.1/ar= ch/x86/include/asm/vgtod.h +--- linux-2.6.39.1/arch/x86/include/asm/vgtod.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/vgtod.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -12266,9 +12290,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/vgto= d.h linux-2.6.39/arch/x86/inclu cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.39/arch/x86/include/asm/vsyscall.h linux-2.6.39/arc= h/x86/include/asm/vsyscall.h ---- linux-2.6.39/arch/x86/include/asm/vsyscall.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/vsyscall.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/vsyscall.h linux-2.6.39.1= /arch/x86/include/asm/vsyscall.h +--- linux-2.6.39.1/arch/x86/include/asm/vsyscall.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/vsyscall.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { =20 #ifdef __KERNEL__ @@ -12299,9 +12323,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/vsys= call.h linux-2.6.39/arch/x86/in #endif /* __KERNEL__ */ =20 #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.39/arch/x86/include/asm/xen/pci.h linux-2.6.39/arch= /x86/include/asm/xen/pci.h ---- linux-2.6.39/arch/x86/include/asm/xen/pci.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/xen/pci.h 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/xen/pci.h linux-2.6.39.1/= arch/x86/include/asm/xen/pci.h +--- linux-2.6.39.1/arch/x86/include/asm/xen/pci.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/xen/pci.h 2011-05-22 19:36:30.00= 0000000 -0400 @@ -33,7 +33,7 @@ struct xen_pci_frontend_ops { void (*disable_msix)(struct pci_dev *dev); }; @@ -12311,9 +12335,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/xen/= pci.h linux-2.6.39/arch/x86/inc =20 static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev, int vectors[]) -diff -urNp linux-2.6.39/arch/x86/include/asm/xsave.h linux-2.6.39/arch/x= 86/include/asm/xsave.h ---- linux-2.6.39/arch/x86/include/asm/xsave.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/include/asm/xsave.h 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/include/asm/xsave.h linux-2.6.39.1/ar= ch/x86/include/asm/xsave.h +--- linux-2.6.39.1/arch/x86/include/asm/xsave.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/include/asm/xsave.h 2011-05-22 19:36:30.0000= 00000 -0400 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav { int err; @@ -12338,9 +12362,9 @@ diff -urNp linux-2.6.39/arch/x86/include/asm/xsav= e.h linux-2.6.39/arch/x86/inclu __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.39/arch/x86/Kconfig linux-2.6.39/arch/x86/Kconfig ---- linux-2.6.39/arch/x86/Kconfig 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/Kconfig 2011-05-22 19:41:32.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/Kconfig linux-2.6.39.1/arch/x86/Kconf= ig +--- linux-2.6.39.1/arch/x86/Kconfig 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/Kconfig 2011-05-22 19:41:32.000000000 -0400 @@ -224,7 +224,7 @@ config X86_HT =20 config X86_32_LAZY_GS @@ -12422,9 +12446,9 @@ diff -urNp linux-2.6.39/arch/x86/Kconfig linux-2.= 6.39/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. =20 -diff -urNp linux-2.6.39/arch/x86/Kconfig.cpu linux-2.6.39/arch/x86/Kconf= ig.cpu ---- linux-2.6.39/arch/x86/Kconfig.cpu 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/x86/Kconfig.cpu 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/x86/Kconfig.cpu linux-2.6.39.1/arch/x86/K= config.cpu +--- linux-2.6.39.1/arch/x86/Kconfig.cpu 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/x86/Kconfig.cpu 2011-05-22 19:36:30.000000000 -0= 400 @@ -334,7 +334,7 @@ config X86_PPRO_FENCE =20 config X86_F00F_BUG @@ -12452,9 +12476,9 @@ diff -urNp linux-2.6.39/arch/x86/Kconfig.cpu linu= x-2.6.39/arch/x86/Kconfig.cpu =20 config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.39/arch/x86/Kconfig.debug linux-2.6.39/arch/x86/Kco= nfig.debug ---- linux-2.6.39/arch/x86/Kconfig.debug 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/Kconfig.debug 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/Kconfig.debug linux-2.6.39.1/arch/x86= /Kconfig.debug +--- linux-2.6.39.1/arch/x86/Kconfig.debug 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/Kconfig.debug 2011-05-22 19:36:30.000000000 = -0400 @@ -101,7 +101,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -12473,9 +12497,9 @@ diff -urNp linux-2.6.39/arch/x86/Kconfig.debug li= nux-2.6.39/arch/x86/Kconfig.deb ---help--- This option helps catch unintended modifications to loadable kernel module's text and read-only data. It also prevents execution -diff -urNp linux-2.6.39/arch/x86/kernel/acpi/sleep.c linux-2.6.39/arch/x= 86/kernel/acpi/sleep.c ---- linux-2.6.39/arch/x86/kernel/acpi/sleep.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/kernel/acpi/sleep.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/acpi/sleep.c linux-2.6.39.1/ar= ch/x86/kernel/acpi/sleep.c +--- linux-2.6.39.1/arch/x86/kernel/acpi/sleep.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/acpi/sleep.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -88,8 +88,12 @@ int acpi_suspend_lowlevel(void) header->trampoline_segment =3D trampoline_address() >> 4; #ifdef CONFIG_SMP @@ -12489,9 +12513,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/acpi/slee= p.c linux-2.6.39/arch/x86/kerne initial_gs =3D per_cpu_offset(smp_processor_id()); #endif initial_code =3D (unsigned long)wakeup_long64; -diff -urNp linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.39/ar= ch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.39.= 1/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.39.1/arch/x86/kernel/acpi/wakeup_32.S 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/acpi/wakeup_32.S 2011-05-22 19:36:30.= 000000000 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -12508,9 +12532,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/acpi/wake= up_32.S linux-2.6.39/arch/x86/k =20 bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.39/arch/x86/kernel/alternative.c linux-2.6.39/arch/= x86/kernel/alternative.c ---- linux-2.6.39/arch/x86/kernel/alternative.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/kernel/alternative.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/alternative.c linux-2.6.39.1/a= rch/x86/kernel/alternative.c +--- linux-2.6.39.1/arch/x86/kernel/alternative.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/alternative.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const=20 if (!*poff || ptr < text || ptr >=3D text_end) continue; @@ -12624,9 +12648,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/alternati= ve.c linux-2.6.39/arch/x86/kern #endif =20 void __init arch_init_ideal_nop5(void) -diff -urNp linux-2.6.39/arch/x86/kernel/amd_iommu.c linux-2.6.39/arch/x8= 6/kernel/amd_iommu.c ---- linux-2.6.39/arch/x86/kernel/amd_iommu.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/kernel/amd_iommu.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/amd_iommu.c linux-2.6.39.1/arc= h/x86/kernel/amd_iommu.c +--- linux-2.6.39.1/arch/x86/kernel/amd_iommu.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/amd_iommu.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -48,7 +48,7 @@ static DEFINE_SPINLOCK(iommu_pd_list_loc */ static struct protection_domain *pt_domain; @@ -12654,9 +12678,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/amd_iommu= .c linux-2.6.39/arch/x86/kernel .domain_init =3D amd_iommu_domain_init, .domain_destroy =3D amd_iommu_domain_destroy, .attach_dev =3D amd_iommu_attach_device, -diff -urNp linux-2.6.39/arch/x86/kernel/apic/apic.c linux-2.6.39/arch/x8= 6/kernel/apic/apic.c ---- linux-2.6.39/arch/x86/kernel/apic/apic.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/kernel/apic/apic.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/apic/apic.c linux-2.6.39.1/arc= h/x86/kernel/apic/apic.c +--- linux-2.6.39.1/arch/x86/kernel/apic/apic.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/apic/apic.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -1821,7 +1821,7 @@ void smp_error_interrupt(struct pt_regs=20 apic_write(APIC_ESR, 0); v1 =3D apic_read(APIC_ESR); @@ -12675,12 +12699,12 @@ diff -urNp linux-2.6.39/arch/x86/kernel/apic/ap= ic.c linux-2.6.39/arch/x86/kernel bios_cpu_apicid =3D early_per_cpu_ptr(x86_bios_cpu_apicid); bitmap_zero(clustermap, NUM_APIC_CLUSTERS); =20 -diff -urNp linux-2.6.39/arch/x86/kernel/apic/io_apic.c linux-2.6.39/arch= /x86/kernel/apic/io_apic.c ---- linux-2.6.39/arch/x86/kernel/apic/io_apic.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/kernel/apic/io_apic.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/apic/io_apic.c linux-2.6.39.1/= arch/x86/kernel/apic/io_apic.c +--- linux-2.6.39.1/arch/x86/kernel/apic/io_apic.c 2011-06-03 00:04:13.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/apic/io_apic.c 2011-06-03 00:42:37.00= 0000000 -0400 @@ -623,7 +623,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries =3D kzalloc(sizeof(*ioapic_entries) * nr_ioapics, - GFP_KERNEL); + GFP_ATOMIC); if (!ioapic_entries) - return 0; + return NULL; @@ -12732,9 +12756,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/apic/io_a= pic.c linux-2.6.39/arch/x86/ker =20 eoi_ioapic_irq(irq, cfg); } -diff -urNp linux-2.6.39/arch/x86/kernel/apm_32.c linux-2.6.39/arch/x86/k= ernel/apm_32.c ---- linux-2.6.39/arch/x86/kernel/apm_32.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/apm_32.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/apm_32.c linux-2.6.39.1/arch/x= 86/kernel/apm_32.c +--- linux-2.6.39.1/arch/x86/kernel/apm_32.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/apm_32.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -412,7 +412,7 @@ static DEFINE_MUTEX(apm_mutex); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -12806,9 +12830,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/apm_32.c = linux-2.6.39/arch/x86/kernel/ap =20 proc_create("apm", 0, NULL, &apm_file_ops); =20 -diff -urNp linux-2.6.39/arch/x86/kernel/asm-offsets_64.c linux-2.6.39/ar= ch/x86/kernel/asm-offsets_64.c ---- linux-2.6.39/arch/x86/kernel/asm-offsets_64.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/asm-offsets_64.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/asm-offsets_64.c linux-2.6.39.= 1/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.39.1/arch/x86/kernel/asm-offsets_64.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/asm-offsets_64.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -69,6 +69,7 @@ int main(void) BLANK(); #undef ENTRY @@ -12817,9 +12841,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/asm-offse= ts_64.c linux-2.6.39/arch/x86/k OFFSET(TSS_ist, tss_struct, x86_tss.ist); BLANK(); =20 -diff -urNp linux-2.6.39/arch/x86/kernel/asm-offsets.c linux-2.6.39/arch/= x86/kernel/asm-offsets.c ---- linux-2.6.39/arch/x86/kernel/asm-offsets.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/kernel/asm-offsets.c 2011-05-25 17:35:48.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/asm-offsets.c linux-2.6.39.1/a= rch/x86/kernel/asm-offsets.c +--- linux-2.6.39.1/arch/x86/kernel/asm-offsets.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/asm-offsets.c 2011-05-25 17:35:48.000= 000000 -0400 @@ -33,6 +33,8 @@ void common(void) { OFFSET(TI_status, thread_info, status); OFFSET(TI_addr_limit, thread_info, addr_limit); @@ -12856,10 +12880,10 @@ diff -urNp linux-2.6.39/arch/x86/kernel/asm-off= sets.c linux-2.6.39/arch/x86/kern #ifdef CONFIG_XEN BLANK(); OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/amd.c linux-2.6.39/arch/x86/= kernel/cpu/amd.c ---- linux-2.6.39/arch/x86/kernel/cpu/amd.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/amd.c 2011-05-22 19:36:30.000000000= -0400 -@@ -641,7 +641,7 @@ static unsigned int __cpuinit amd_size_c +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/amd.c linux-2.6.39.1/arch/= x86/kernel/cpu/amd.c +--- linux-2.6.39.1/arch/x86/kernel/cpu/amd.c 2011-06-03 00:04:13.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/amd.c 2011-06-03 00:32:04.0000000= 00 -0400 +@@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c unsigned int size) { /* AMD errata T13 (order #21922) */ @@ -12868,9 +12892,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/amd.c= linux-2.6.39/arch/x86/kernel/c /* Duron Rev A0 */ if (c->x86_model =3D=3D 3 && c->x86_mask =3D=3D 0) size =3D 64; -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/common.c linux-2.6.39/arch/x= 86/kernel/cpu/common.c ---- linux-2.6.39/arch/x86/kernel/cpu/common.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/common.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/common.c linux-2.6.39.1/ar= ch/x86/kernel/cpu/common.c +--- linux-2.6.39.1/arch/x86/kernel/cpu/common.c 2011-06-03 00:04:13.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/common.c 2011-06-03 00:32:04.0000= 00000 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon =20 static const struct cpu_dev *this_cpu __cpuinitdata =3D &default_cpu; @@ -12941,7 +12965,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne gdt_descr.size =3D GDT_SIZE - 1; load_gdt(&gdt_descr); /* Reload the per-cpu base */ -@@ -825,6 +771,10 @@ static void __cpuinit identify_cpu(struc +@@ -824,6 +770,10 @@ static void __cpuinit identify_cpu(struc /* Filter out anything that depends on CPUID levels we don't have */ filter_cpuid_features(c, true); =20 @@ -12952,7 +12976,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne /* If the model name is still unset, do table lookup. */ if (!c->x86_model_id[0]) { const char *p; -@@ -1004,6 +954,9 @@ static __init int setup_disablecpuid(cha +@@ -1003,6 +953,9 @@ static __init int setup_disablecpuid(cha } __setup("clearcpuid=3D", setup_disablecpuid); =20 @@ -12962,7 +12986,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne #ifdef CONFIG_X86_64 struct desc_ptr idt_descr =3D { NR_VECTORS * 16 - 1, (unsigned long) id= t_table }; =20 -@@ -1019,7 +972,7 @@ DEFINE_PER_CPU(struct task_struct *, cur +@@ -1018,7 +971,7 @@ DEFINE_PER_CPU(struct task_struct *, cur EXPORT_PER_CPU_SYMBOL(current_task); =20 DEFINE_PER_CPU(unsigned long, kernel_stack) =3D @@ -12971,7 +12995,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne EXPORT_PER_CPU_SYMBOL(kernel_stack); =20 DEFINE_PER_CPU(char *, irq_stack_ptr) =3D -@@ -1084,7 +1037,7 @@ struct pt_regs * __cpuinit idle_regs(str +@@ -1083,7 +1036,7 @@ struct pt_regs * __cpuinit idle_regs(str { memset(regs, 0, sizeof(struct pt_regs)); regs->fs =3D __KERNEL_PERCPU; @@ -12980,7 +13004,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne =20 return regs; } -@@ -1139,7 +1092,7 @@ void __cpuinit cpu_init(void) +@@ -1138,7 +1091,7 @@ void __cpuinit cpu_init(void) int i; =20 cpu =3D stack_smp_processor_id(); @@ -12989,7 +13013,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne oist =3D &per_cpu(orig_ist, cpu); =20 #ifdef CONFIG_NUMA -@@ -1165,7 +1118,7 @@ void __cpuinit cpu_init(void) +@@ -1164,7 +1117,7 @@ void __cpuinit cpu_init(void) switch_to_new_gdt(cpu); loadsegment(fs, 0); =20 @@ -12998,7 +13022,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne =20 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); syscall_init(); -@@ -1174,7 +1127,6 @@ void __cpuinit cpu_init(void) +@@ -1173,7 +1126,6 @@ void __cpuinit cpu_init(void) wrmsrl(MSR_KERNEL_GS_BASE, 0); barrier(); =20 @@ -13006,7 +13030,7 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne if (cpu !=3D 0) enable_x2apic(); =20 -@@ -1228,7 +1180,7 @@ void __cpuinit cpu_init(void) +@@ -1227,7 +1179,7 @@ void __cpuinit cpu_init(void) { int cpu =3D smp_processor_id(); struct task_struct *curr =3D current; @@ -13015,9 +13039,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/commo= n.c linux-2.6.39/arch/x86/kerne struct thread_struct *thread =3D &curr->thread; =20 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/intel.c linux-2.6.39/arch/x8= 6/kernel/cpu/intel.c ---- linux-2.6.39/arch/x86/kernel/cpu/intel.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/intel.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/intel.c linux-2.6.39.1/arc= h/x86/kernel/cpu/intel.c +--- linux-2.6.39.1/arch/x86/kernel/cpu/intel.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/intel.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. @@ -13027,9 +13051,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/intel= .c linux-2.6.39/arch/x86/kernel load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/Makefile linux-2.6.39/arch/x= 86/kernel/cpu/Makefile ---- linux-2.6.39/arch/x86/kernel/cpu/Makefile 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/Makefile 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/Makefile linux-2.6.39.1/ar= ch/x86/kernel/cpu/Makefile +--- linux-2.6.39.1/arch/x86/kernel/cpu/Makefile 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/Makefile 2011-05-22 19:36:30.0000= 00000 -0400 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o =3D -pg CFLAGS_REMOVE_perf_event.o =3D -pg endif @@ -13041,9 +13065,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/Makef= ile linux-2.6.39/arch/x86/kerne obj-y :=3D intel_cacheinfo.o scattered.o topology.o obj-y +=3D proc.o capflags.o powerflags.o common.o obj-y +=3D vmware.o hypervisor.o sched.o mshyperv.o -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.39/ar= ch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.39.= 1/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.39.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -46,6 +46,7 @@ #include #include @@ -13145,9 +13169,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mchec= k/mce.c linux-2.6.39/arch/x86/k atomic_set(&mce_executing, 0); atomic_set(&mce_callin, 0); atomic_set(&global_nwo, 0); -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.39/arc= h/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.39.1= /arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.39.1/arch/x86/kernel/cpu/mtrr/main.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/mtrr/main.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -13157,9 +13181,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mtrr/= main.c linux-2.6.39/arch/x86/ke =20 const struct mtrr_ops *mtrr_if; =20 -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.39/arc= h/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.39.1= /arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.39.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-22 19:36:30.0= 00000000 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; =20 @@ -13188,9 +13212,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mtrr/= mtrr.h linux-2.6.39/arch/x86/ke }; =20 extern int generic_get_free_region(unsigned long base, unsigned long si= ze, -diff -urNp linux-2.6.39/arch/x86/kernel/cpu/perf_event.c linux-2.6.39/ar= ch/x86/kernel/cpu/perf_event.c ---- linux-2.6.39/arch/x86/kernel/cpu/perf_event.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/cpu/perf_event.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/cpu/perf_event.c linux-2.6.39.= 1/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.39.1/arch/x86/kernel/cpu/perf_event.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/cpu/perf_event.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -774,6 +774,8 @@ static int x86_schedule_events(struct cp int i, j, w, wmax, num =3D 0; struct hw_perf_event *hwc; @@ -13209,9 +13233,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/cpu/perf_= event.c linux-2.6.39/arch/x86/k } } =20 -diff -urNp linux-2.6.39/arch/x86/kernel/crash.c linux-2.6.39/arch/x86/ke= rnel/crash.c ---- linux-2.6.39/arch/x86/kernel/crash.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/kernel/crash.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/crash.c linux-2.6.39.1/arch/x8= 6/kernel/crash.c +--- linux-2.6.39.1/arch/x86/kernel/crash.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/kernel/crash.c 2011-05-22 19:36:30.000000000= -0400 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,=20 regs =3D args->regs; =20 @@ -13221,9 +13245,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/crash.c l= inux-2.6.39/arch/x86/kernel/cra crash_fixup_ss_esp(&fixed_regs, regs); regs =3D &fixed_regs; } -diff -urNp linux-2.6.39/arch/x86/kernel/doublefault_32.c linux-2.6.39/ar= ch/x86/kernel/doublefault_32.c ---- linux-2.6.39/arch/x86/kernel/doublefault_32.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/doublefault_32.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/doublefault_32.c linux-2.6.39.= 1/arch/x86/kernel/doublefault_32.c +--- linux-2.6.39.1/arch/x86/kernel/doublefault_32.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/doublefault_32.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -11,7 +11,7 @@ =20 #define DOUBLEFAULT_STACKSIZE (1024) @@ -13255,9 +13279,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/doublefau= lt_32.c linux-2.6.39/arch/x86/k .fs =3D __KERNEL_PERCPU, =20 .__cr3 =3D __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack_32.c linux-2.6.39/arch= /x86/kernel/dumpstack_32.c ---- linux-2.6.39/arch/x86/kernel/dumpstack_32.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/kernel/dumpstack_32.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/dumpstack_32.c linux-2.6.39.1/= arch/x86/kernel/dumpstack_32.c +--- linux-2.6.39.1/arch/x86/kernel/dumpstack_32.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/dumpstack_32.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task bp =3D stack_frame(task, regs); =20 @@ -13321,9 +13345,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack= _32.c linux-2.6.39/arch/x86/ker if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack_64.c linux-2.6.39/arch= /x86/kernel/dumpstack_64.c ---- linux-2.6.39/arch/x86/kernel/dumpstack_64.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/kernel/dumpstack_64.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/dumpstack_64.c linux-2.6.39.1/= arch/x86/kernel/dumpstack_64.c +--- linux-2.6.39.1/arch/x86/kernel/dumpstack_64.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/dumpstack_64.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task unsigned long *irq_stack_end =3D (unsigned long *)per_cpu(irq_stack_ptr, cpu); @@ -13375,9 +13399,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack= _64.c linux-2.6.39/arch/x86/ker put_cpu(); } EXPORT_SYMBOL(dump_trace); -diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack.c linux-2.6.39/arch/x8= 6/kernel/dumpstack.c ---- linux-2.6.39/arch/x86/kernel/dumpstack.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/kernel/dumpstack.c 2011-05-22 19:41:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/dumpstack.c linux-2.6.39.1/arc= h/x86/kernel/dumpstack.c +--- linux-2.6.39.1/arch/x86/kernel/dumpstack.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/dumpstack.c 2011-05-22 19:41:32.00000= 0000 -0400 @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs @@ -13521,9 +13545,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack= .c linux-2.6.39/arch/x86/kernel report_bug(regs->ip, regs); =20 if (__die(str, regs, err)) -diff -urNp linux-2.6.39/arch/x86/kernel/early_printk.c linux-2.6.39/arch= /x86/kernel/early_printk.c ---- linux-2.6.39/arch/x86/kernel/early_printk.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/kernel/early_printk.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/early_printk.c linux-2.6.39.1/= arch/x86/kernel/early_printk.c +--- linux-2.6.39.1/arch/x86/kernel/early_printk.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/early_printk.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -7,6 +7,7 @@ #include #include @@ -13541,9 +13565,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/early_pri= ntk.c linux-2.6.39/arch/x86/ker va_start(ap, fmt); n =3D vscnprintf(buf, sizeof(buf), fmt, ap); early_console->write(early_console, buf, n); -diff -urNp linux-2.6.39/arch/x86/kernel/entry_32.S linux-2.6.39/arch/x86= /kernel/entry_32.S ---- linux-2.6.39/arch/x86/kernel/entry_32.S 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/kernel/entry_32.S 2011-05-23 17:07:00.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/entry_32.S linux-2.6.39.1/arch= /x86/kernel/entry_32.S +--- linux-2.6.39.1/arch/x86/kernel/entry_32.S 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/entry_32.S 2011-05-23 17:07:00.000000= 000 -0400 @@ -185,13 +185,146 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm @@ -14026,9 +14050,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/entry_32.= S linux-2.6.39/arch/x86/kernel/ RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.39/arch/x86/kernel/entry_64.S linux-2.6.39/arch/x86= /kernel/entry_64.S ---- linux-2.6.39/arch/x86/kernel/entry_64.S 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/kernel/entry_64.S 2011-05-23 17:10:49.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/entry_64.S linux-2.6.39.1/arch= /x86/kernel/entry_64.S +--- linux-2.6.39.1/arch/x86/kernel/entry_64.S 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/entry_64.S 2011-05-23 17:10:49.000000= 000 -0400 @@ -53,6 +53,7 @@ #include #include @@ -14601,9 +14625,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/entry_64.= S linux-2.6.39/arch/x86/kernel/ RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.39/arch/x86/kernel/ftrace.c linux-2.6.39/arch/x86/k= ernel/ftrace.c ---- linux-2.6.39/arch/x86/kernel/ftrace.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/ftrace.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/ftrace.c linux-2.6.39.1/arch/x= 86/kernel/ftrace.c +--- linux-2.6.39.1/arch/x86/kernel/ftrace.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/ftrace.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the=20 static void *mod_code_newcode; /* holds the text to write to the IP */ =20 @@ -14661,9 +14685,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/ftrace.c = linux-2.6.39/arch/x86/kernel/ft if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; =20 -diff -urNp linux-2.6.39/arch/x86/kernel/head32.c linux-2.6.39/arch/x86/k= ernel/head32.c ---- linux-2.6.39/arch/x86/kernel/head32.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/head32.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/head32.c linux-2.6.39.1/arch/x= 86/kernel/head32.c +--- linux-2.6.39.1/arch/x86/kernel/head32.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/head32.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -19,6 +19,7 @@ #include #include @@ -14681,9 +14705,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/head32.c = linux-2.6.39/arch/x86/kernel/he =20 #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.39/arch/x86/kernel/head_32.S linux-2.6.39/arch/x86/= kernel/head_32.S ---- linux-2.6.39/arch/x86/kernel/head_32.S 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/head_32.S 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/head_32.S linux-2.6.39.1/arch/= x86/kernel/head_32.S +--- linux-2.6.39.1/arch/x86/kernel/head_32.S 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/head_32.S 2011-05-22 19:36:30.0000000= 00 -0400 @@ -25,6 +25,12 @@ /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) @@ -15118,9 +15142,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/head_32.S= linux-2.6.39/arch/x86/kernel/h + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.39/arch/x86/kernel/head_64.S linux-2.6.39/arch/x86/= kernel/head_64.S ---- linux-2.6.39/arch/x86/kernel/head_64.S 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/head_64.S 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/head_64.S linux-2.6.39.1/arch/= x86/kernel/head_64.S +--- linux-2.6.39.1/arch/x86/kernel/head_64.S 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/head_64.S 2011-05-22 19:36:30.0000000= 00 -0400 @@ -19,6 +19,7 @@ #include #include @@ -15390,9 +15414,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/head_64.S= linux-2.6.39/arch/x86/kernel/h =20 __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c linux-2.6.39/arc= h/x86/kernel/i386_ksyms_32.c ---- linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/i386_ksyms_32.c linux-2.6.39.1= /arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.39.1/arch/x86/kernel/i386_ksyms_32.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/i386_ksyms_32.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -15414,9 +15438,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/i386_ksym= s_32.c linux-2.6.39/arch/x86/ke +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.39/arch/x86/kernel/i8259.c linux-2.6.39/arch/x86/ke= rnel/i8259.c ---- linux-2.6.39/arch/x86/kernel/i8259.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/kernel/i8259.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/i8259.c linux-2.6.39.1/arch/x8= 6/kernel/i8259.c +--- linux-2.6.39.1/arch/x86/kernel/i8259.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/kernel/i8259.c 2011-05-22 19:36:30.000000000= -0400 @@ -210,7 +210,7 @@ spurious_8259A_irq: "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |=3D irqmask; @@ -15426,9 +15450,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/i8259.c l= inux-2.6.39/arch/x86/kernel/i82 /* * Theoretically we do not have to handle this IRQ, * but in Linux this does not cause problems and is -diff -urNp linux-2.6.39/arch/x86/kernel/init_task.c linux-2.6.39/arch/x8= 6/kernel/init_task.c ---- linux-2.6.39/arch/x86/kernel/init_task.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/kernel/init_task.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/init_task.c linux-2.6.39.1/arc= h/x86/kernel/init_task.c +--- linux-2.6.39.1/arch/x86/kernel/init_task.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/init_task.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. @@ -15447,9 +15471,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/init_task= .c linux-2.6.39/arch/x86/kernel - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_s= mp =3D { [0 ... NR_CPUS-1] =3D INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.39/arch/x86/kernel/ioport.c linux-2.6.39/arch/x86/k= ernel/ioport.c ---- linux-2.6.39/arch/x86/kernel/ioport.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/ioport.c 2011-05-22 19:41:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/ioport.c linux-2.6.39.1/arch/x= 86/kernel/ioport.c +--- linux-2.6.39.1/arch/x86/kernel/ioport.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/ioport.c 2011-05-22 19:41:32.00000000= 0 -0400 @@ -6,6 +6,7 @@ #include #include @@ -15493,9 +15517,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/ioport.c = linux-2.6.39/arch/x86/kernel/io if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-2.6.39/arch/x86/kernel/irq_32.c linux-2.6.39/arch/x86/k= ernel/irq_32.c ---- linux-2.6.39/arch/x86/kernel/irq_32.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/irq_32.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/irq_32.c linux-2.6.39.1/arch/x= 86/kernel/irq_32.c +--- linux-2.6.39.1/arch/x86/kernel/irq_32.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/irq_32.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -36,7 +36,7 @@ static int check_stack_overflow(void) __asm__ __volatile__("andl %%esp,%0" : "=3Dr" (sp) : "0" (THREAD_SIZE - 1)); @@ -15637,9 +15661,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/irq_32.c = linux-2.6.39/arch/x86/kernel/ir /* * Shouldn't happen, we returned above if in_interrupt(): */ -diff -urNp linux-2.6.39/arch/x86/kernel/irq.c linux-2.6.39/arch/x86/kern= el/irq.c ---- linux-2.6.39/arch/x86/kernel/irq.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/kernel/irq.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/kernel/irq.c linux-2.6.39.1/arch/x86/= kernel/irq.c +--- linux-2.6.39.1/arch/x86/kernel/irq.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/kernel/irq.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -17,7 +17,7 @@ #include #include @@ -15674,9 +15698,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/irq.c lin= ux-2.6.39/arch/x86/kernel/irq.c #endif return sum; } -diff -urNp linux-2.6.39/arch/x86/kernel/kgdb.c linux-2.6.39/arch/x86/ker= nel/kgdb.c ---- linux-2.6.39/arch/x86/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/kgdb.c linux-2.6.39.1/arch/x86= /kernel/kgdb.c +--- linux-2.6.39.1/arch/x86/kernel/kgdb.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/kernel/kgdb.c 2011-05-22 19:36:30.000000000 = -0400 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem,=20 #ifdef CONFIG_X86_32 switch (regno) { @@ -15724,9 +15748,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/kgdb.c li= nux-2.6.39/arch/x86/kernel/kgdb /* Breakpoint instruction: */ .gdb_bpt_instr =3D { 0xcc }, .flags =3D KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.39/arch/x86/kernel/kprobes.c linux-2.6.39/arch/x86/= kernel/kprobes.c ---- linux-2.6.39/arch/x86/kernel/kprobes.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/kprobes.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/kprobes.c linux-2.6.39.1/arch/= x86/kernel/kprobes.c +--- linux-2.6.39.1/arch/x86/kernel/kprobes.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/kprobes.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat } __attribute__((packed)) *insn; =20 @@ -15860,9 +15884,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/kprobes.c= linux-2.6.39/arch/x86/kernel/k RELATIVE_ADDR_SIZE); =20 insn_buf[0] =3D RELATIVEJUMP_OPCODE; -diff -urNp linux-2.6.39/arch/x86/kernel/ldt.c linux-2.6.39/arch/x86/kern= el/ldt.c ---- linux-2.6.39/arch/x86/kernel/ldt.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/kernel/ldt.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/kernel/ldt.c linux-2.6.39.1/arch/x86/= kernel/ldt.c +--- linux-2.6.39.1/arch/x86/kernel/ldt.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/kernel/ldt.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -15927,9 +15951,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/ldt.c lin= ux-2.6.39/arch/x86/kernel/ldt.c fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl =3D 0; -diff -urNp linux-2.6.39/arch/x86/kernel/machine_kexec_32.c linux-2.6.39/= arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.39/arch/x86/kernel/machine_kexec_32.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/machine_kexec_32.c 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/machine_kexec_32.c linux-2.6.3= 9.1/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.39.1/arch/x86/kernel/machine_kexec_32.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/machine_kexec_32.c 2011-05-22 19:36:3= 0.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -15957,9 +15981,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/machine_k= exec_32.c linux-2.6.39/arch/x86 =20 relocate_kernel_ptr =3D control_page; page_list[PA_CONTROL_PAGE] =3D __pa(control_page); -diff -urNp linux-2.6.39/arch/x86/kernel/microcode_amd.c linux-2.6.39/arc= h/x86/kernel/microcode_amd.c ---- linux-2.6.39/arch/x86/kernel/microcode_amd.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/microcode_amd.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/microcode_amd.c linux-2.6.39.1= /arch/x86/kernel/microcode_amd.c +--- linux-2.6.39.1/arch/x86/kernel/microcode_amd.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/microcode_amd.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -339,7 +339,7 @@ static void microcode_fini_cpu_amd(int c uci->mc =3D NULL; } @@ -15978,9 +16002,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/microcode= _amd.c linux-2.6.39/arch/x86/ke { return µcode_amd_ops; } -diff -urNp linux-2.6.39/arch/x86/kernel/microcode_core.c linux-2.6.39/ar= ch/x86/kernel/microcode_core.c ---- linux-2.6.39/arch/x86/kernel/microcode_core.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/microcode_core.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/microcode_core.c linux-2.6.39.= 1/arch/x86/kernel/microcode_core.c +--- linux-2.6.39.1/arch/x86/kernel/microcode_core.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/microcode_core.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -93,7 +93,7 @@ MODULE_LICENSE("GPL"); =20 #define MICROCODE_VERSION "2.00" @@ -15990,9 +16014,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/microcode= _core.c linux-2.6.39/arch/x86/k =20 /* * Synchronization. -diff -urNp linux-2.6.39/arch/x86/kernel/microcode_intel.c linux-2.6.39/a= rch/x86/kernel/microcode_intel.c ---- linux-2.6.39/arch/x86/kernel/microcode_intel.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/microcode_intel.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/microcode_intel.c linux-2.6.39= .1/arch/x86/kernel/microcode_intel.c +--- linux-2.6.39.1/arch/x86/kernel/microcode_intel.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/microcode_intel.c 2011-05-22 19:36:30= .000000000 -0400 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod =20 static int get_ucode_user(void *to, const void *from, size_t n) @@ -16027,9 +16051,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/microcode= _intel.c linux-2.6.39/arch/x86/ { return µcode_intel_ops; } -diff -urNp linux-2.6.39/arch/x86/kernel/module.c linux-2.6.39/arch/x86/k= ernel/module.c ---- linux-2.6.39/arch/x86/kernel/module.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/module.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/module.c linux-2.6.39.1/arch/x= 86/kernel/module.c +--- linux-2.6.39.1/arch/x86/kernel/module.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/module.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -35,21 +35,66 @@ #define DEBUGP(fmt...) #endif @@ -16168,9 +16192,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/module.c = linux-2.6.39/arch/x86/kernel/mo #if 0 if ((s64)val !=3D *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.39/arch/x86/kernel/paravirt.c linux-2.6.39/arch/x86= /kernel/paravirt.c ---- linux-2.6.39/arch/x86/kernel/paravirt.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/kernel/paravirt.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/paravirt.c linux-2.6.39.1/arch= /x86/kernel/paravirt.c +--- linux-2.6.39.1/arch/x86/kernel/paravirt.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/paravirt.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ static void *get_call_destination(u8 type) @@ -16284,9 +16308,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/paravirt.= c linux-2.6.39/arch/x86/kernel/ }; =20 EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.3= 9/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c 2011-05-22 19:36:3= 0.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/paravirt-spinlocks.c linux-2.6= .39.1/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.39.1/arch/x86/kernel/paravirt-spinlocks.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/paravirt-spinlocks.c 2011-05-22 19:36= :30.000000000 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t=20 arch_spin_lock(lock); } @@ -16296,9 +16320,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/paravirt-= spinlocks.c linux-2.6.39/arch/x #ifdef CONFIG_SMP .spin_is_locked =3D __ticket_spin_is_locked, .spin_is_contended =3D __ticket_spin_is_contended, -diff -urNp linux-2.6.39/arch/x86/kernel/pci-calgary_64.c linux-2.6.39/ar= ch/x86/kernel/pci-calgary_64.c ---- linux-2.6.39/arch/x86/kernel/pci-calgary_64.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/pci-calgary_64.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/pci-calgary_64.c linux-2.6.39.= 1/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.39.1/arch/x86/kernel/pci-calgary_64.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/pci-calgary_64.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -179,13 +179,13 @@ static void calioc2_dump_error_regs(stru static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl)= ; static void get_tce_space_from_tar(void); @@ -16324,9 +16348,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/pci-calga= ry_64.c linux-2.6.39/arch/x86/k .alloc_coherent =3D calgary_alloc_coherent, .free_coherent =3D calgary_free_coherent, .map_sg =3D calgary_map_sg, -diff -urNp linux-2.6.39/arch/x86/kernel/pci-dma.c linux-2.6.39/arch/x86/= kernel/pci-dma.c ---- linux-2.6.39/arch/x86/kernel/pci-dma.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/pci-dma.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/pci-dma.c linux-2.6.39.1/arch/= x86/kernel/pci-dma.c +--- linux-2.6.39.1/arch/x86/kernel/pci-dma.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/pci-dma.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -16,7 +16,7 @@ =20 static int forbid_dac __read_mostly; @@ -16345,9 +16369,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/pci-dma.c= linux-2.6.39/arch/x86/kernel/p =20 #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.39/arch/x86/kernel/pci-gart_64.c linux-2.6.39/arch/= x86/kernel/pci-gart_64.c ---- linux-2.6.39/arch/x86/kernel/pci-gart_64.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/kernel/pci-gart_64.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/pci-gart_64.c linux-2.6.39.1/a= rch/x86/kernel/pci-gart_64.c +--- linux-2.6.39.1/arch/x86/kernel/pci-gart_64.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/pci-gart_64.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -695,7 +695,7 @@ static __init int init_amd_gatt(struct a return -1; } @@ -16357,9 +16381,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/pci-gart_= 64.c linux-2.6.39/arch/x86/kern .map_sg =3D gart_map_sg, .unmap_sg =3D gart_unmap_sg, .map_page =3D gart_map_page, -diff -urNp linux-2.6.39/arch/x86/kernel/pci-iommu_table.c linux-2.6.39/a= rch/x86/kernel/pci-iommu_table.c ---- linux-2.6.39/arch/x86/kernel/pci-iommu_table.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/pci-iommu_table.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/pci-iommu_table.c linux-2.6.39= .1/arch/x86/kernel/pci-iommu_table.c +--- linux-2.6.39.1/arch/x86/kernel/pci-iommu_table.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/pci-iommu_table.c 2011-05-22 19:36:30= .000000000 -0400 @@ -2,7 +2,7 @@ #include #include @@ -16378,9 +16402,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/pci-iommu= _table.c linux-2.6.39/arch/x86/ /* Simple cyclic dependency checker. */ for (p =3D start; p < finish; p++) { q =3D find_dependents_of(start, finish, p); -diff -urNp linux-2.6.39/arch/x86/kernel/pci-nommu.c linux-2.6.39/arch/x8= 6/kernel/pci-nommu.c ---- linux-2.6.39/arch/x86/kernel/pci-nommu.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/kernel/pci-nommu.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/pci-nommu.c linux-2.6.39.1/arc= h/x86/kernel/pci-nommu.c +--- linux-2.6.39.1/arch/x86/kernel/pci-nommu.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/pci-nommu.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -16390,9 +16414,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/pci-nommu= .c linux-2.6.39/arch/x86/kernel .alloc_coherent =3D dma_generic_alloc_coherent, .free_coherent =3D nommu_free_coherent, .map_sg =3D nommu_map_sg, -diff -urNp linux-2.6.39/arch/x86/kernel/pci-swiotlb.c linux-2.6.39/arch/= x86/kernel/pci-swiotlb.c ---- linux-2.6.39/arch/x86/kernel/pci-swiotlb.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/kernel/pci-swiotlb.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/pci-swiotlb.c linux-2.6.39.1/a= rch/x86/kernel/pci-swiotlb.c +--- linux-2.6.39.1/arch/x86/kernel/pci-swiotlb.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/pci-swiotlb.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -16402,9 +16426,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/pci-swiot= lb.c linux-2.6.39/arch/x86/kern .mapping_error =3D swiotlb_dma_mapping_error, .alloc_coherent =3D x86_swiotlb_alloc_coherent, .free_coherent =3D swiotlb_free_coherent, -diff -urNp linux-2.6.39/arch/x86/kernel/process_32.c linux-2.6.39/arch/x= 86/kernel/process_32.c ---- linux-2.6.39/arch/x86/kernel/process_32.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/kernel/process_32.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/process_32.c linux-2.6.39.1/ar= ch/x86/kernel/process_32.c +--- linux-2.6.39.1/arch/x86/kernel/process_32.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/process_32.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -16491,9 +16515,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/process_3= 2.c linux-2.6.39/arch/x86/kerne return 0; } - -diff -urNp linux-2.6.39/arch/x86/kernel/process_64.c linux-2.6.39/arch/x= 86/kernel/process_64.c ---- linux-2.6.39/arch/x86/kernel/process_64.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/kernel/process_64.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/process_64.c linux-2.6.39.1/ar= ch/x86/kernel/process_64.c +--- linux-2.6.39.1/arch/x86/kernel/process_64.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/process_64.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -87,7 +87,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -16558,9 +16582,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/process_6= 4.c linux-2.6.39/arch/x86/kerne return 0; ip =3D *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.39/arch/x86/kernel/process.c linux-2.6.39/arch/x86/= kernel/process.c ---- linux-2.6.39/arch/x86/kernel/process.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/process.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/process.c linux-2.6.39.1/arch/= x86/kernel/process.c +--- linux-2.6.39.1/arch/x86/kernel/process.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/process.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru =20 void free_thread_info(struct thread_info *ti) @@ -16695,9 +16719,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/process.c= linux-2.6.39/arch/x86/kernel/p +#endif +} +#endif -diff -urNp linux-2.6.39/arch/x86/kernel/ptrace.c linux-2.6.39/arch/x86/k= ernel/ptrace.c ---- linux-2.6.39/arch/x86/kernel/ptrace.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/ptrace.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/ptrace.c linux-2.6.39.1/arch/x= 86/kernel/ptrace.c +--- linux-2.6.39.1/arch/x86/kernel/ptrace.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/ptrace.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi unsigned long addr, unsigned long data) { @@ -16751,9 +16775,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/ptrace.c = linux-2.6.39/arch/x86/kernel/pt { bool step; =20 -diff -urNp linux-2.6.39/arch/x86/kernel/pvclock.c linux-2.6.39/arch/x86/= kernel/pvclock.c ---- linux-2.6.39/arch/x86/kernel/pvclock.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/pvclock.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/pvclock.c linux-2.6.39.1/arch/= x86/kernel/pvclock.c +--- linux-2.6.39.1/arch/x86/kernel/pvclock.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/pvclock.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc return pv_tsc_khz; } @@ -16782,9 +16806,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/pvclock.c= linux-2.6.39/arch/x86/kernel/p } while (unlikely(last !=3D ret)); =20 return ret; -diff -urNp linux-2.6.39/arch/x86/kernel/reboot.c linux-2.6.39/arch/x86/k= ernel/reboot.c ---- linux-2.6.39/arch/x86/kernel/reboot.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/reboot.c 2011-05-23 17:07:00.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/reboot.c linux-2.6.39.1/arch/x= 86/kernel/reboot.c +--- linux-2.6.39.1/arch/x86/kernel/reboot.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/reboot.c 2011-05-23 17:07:00.00000000= 0 -0400 @@ -35,7 +35,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); =20 @@ -16916,9 +16940,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/reboot.c = linux-2.6.39/arch/x86/kernel/re } =20 struct machine_ops machine_ops =3D { -diff -urNp linux-2.6.39/arch/x86/kernel/setup.c linux-2.6.39/arch/x86/ke= rnel/setup.c ---- linux-2.6.39/arch/x86/kernel/setup.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/kernel/setup.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/setup.c linux-2.6.39.1/arch/x8= 6/kernel/setup.c +--- linux-2.6.39.1/arch/x86/kernel/setup.c 2011-06-03 00:04:13.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/kernel/setup.c 2011-06-03 00:32:04.000000000= -0400 @@ -650,7 +650,7 @@ static void __init trim_bios_range(void) * area (640->1Mb) as ram even though it is not. * take them out. @@ -16948,9 +16972,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/setup.c l= inux-2.6.39/arch/x86/kernel/set data_resource.end =3D virt_to_phys(_edata)-1; bss_resource.start =3D virt_to_phys(&__bss_start); bss_resource.end =3D virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.39/arch/x86/kernel/setup_percpu.c linux-2.6.39/arch= /x86/kernel/setup_percpu.c ---- linux-2.6.39/arch/x86/kernel/setup_percpu.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/kernel/setup_percpu.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/setup_percpu.c linux-2.6.39.1/= arch/x86/kernel/setup_percpu.c +--- linux-2.6.39.1/arch/x86/kernel/setup_percpu.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/setup_percpu.c 2011-06-04 20:08:30.00= 0000000 -0400 @@ -21,19 +21,17 @@ #include #include @@ -16994,8 +17018,8 @@ diff -urNp linux-2.6.39/arch/x86/kernel/setup_per= cpu.c linux-2.6.39/arch/x86/ker delta =3D (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_sta= rt; for_each_possible_cpu(cpu) { +#ifdef CONFIG_CC_STACKPROTECTOR -+#ifdef CONFIG_x86_32 -+ unsigned long canary =3D per_cpu(stack_canary, cpu); ++#ifdef CONFIG_X86_32 ++ unsigned long canary =3D per_cpu(stack_canary.canary, cpu); +#endif +#endif per_cpu_offset(cpu) =3D delta + pcpu_unit_offsets[cpu]; @@ -17006,17 +17030,17 @@ diff -urNp linux-2.6.39/arch/x86/kernel/setup_p= ercpu.c linux-2.6.39/arch/x86/ker set_cpu_numa_node(cpu, early_cpu_to_node(cpu)); #endif +#ifdef CONFIG_CC_STACKPROTECTOR -+#ifdef CONFIG_x86_32 -+ if (cpu =3D=3D boot_cpu_id) -+ per_cpu(stack_canary, cpu) =3D canary; ++#ifdef CONFIG_X86_32 ++ if (!cpu) ++ per_cpu(stack_canary.canary, cpu) =3D canary; +#endif +#endif /* * Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.39/arch/x86/kernel/signal.c linux-2.6.39/arch/x86/k= ernel/signal.c ---- linux-2.6.39/arch/x86/kernel/signal.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/kernel/signal.c 2011-05-23 17:07:00.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/signal.c linux-2.6.39.1/arch/x= 86/kernel/signal.c +--- linux-2.6.39.1/arch/x86/kernel/signal.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/signal.c 2011-05-23 17:07:00.00000000= 0 -0400 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) =3D=3D 0. @@ -17100,9 +17124,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/signal.c = linux-2.6.39/arch/x86/kernel/si return; =20 if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.39/arch/x86/kernel/smpboot.c linux-2.6.39/arch/x86/= kernel/smpboot.c ---- linux-2.6.39/arch/x86/kernel/smpboot.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/smpboot.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/smpboot.c linux-2.6.39.1/arch/= x86/kernel/smpboot.c +--- linux-2.6.39.1/arch/x86/kernel/smpboot.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/smpboot.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -696,17 +696,20 @@ static int __cpuinit do_boot_cpu(int api set_idle_for_cpu(cpu, c_idle.idle); do_rest: @@ -17140,9 +17164,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/smpboot.c= linux-2.6.39/arch/x86/kernel/s err =3D do_boot_cpu(apicid, cpu); if (err) { pr_debug("do_boot_cpu failed %d\n", err); -diff -urNp linux-2.6.39/arch/x86/kernel/step.c linux-2.6.39/arch/x86/ker= nel/step.c ---- linux-2.6.39/arch/x86/kernel/step.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/kernel/step.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/step.c linux-2.6.39.1/arch/x86= /kernel/step.c +--- linux-2.6.39.1/arch/x86/kernel/step.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/kernel/step.c 2011-05-22 19:36:30.000000000 = -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -17185,17 +17209,17 @@ diff -urNp linux-2.6.39/arch/x86/kernel/step.c = linux-2.6.39/arch/x86/kernel/step /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.39/arch/x86/kernel/syscall_table_32.S linux-2.6.39/= arch/x86/kernel/syscall_table_32.S ---- linux-2.6.39/arch/x86/kernel/syscall_table_32.S 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/syscall_table_32.S 2011-05-22 19:36:30.= 000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/syscall_table_32.S linux-2.6.3= 9.1/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.39.1/arch/x86/kernel/syscall_table_32.S 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/syscall_table_32.S 2011-05-22 19:36:3= 0.000000000 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for r= estarting */ .long sys_exit -diff -urNp linux-2.6.39/arch/x86/kernel/sys_i386_32.c linux-2.6.39/arch/= x86/kernel/sys_i386_32.c ---- linux-2.6.39/arch/x86/kernel/sys_i386_32.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/kernel/sys_i386_32.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/sys_i386_32.c linux-2.6.39.1/a= rch/x86/kernel/sys_i386_32.c +--- linux-2.6.39.1/arch/x86/kernel/sys_i386_32.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/sys_i386_32.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -24,17 +24,224 @@ =20 #include @@ -17433,9 +17457,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/sys_i386_= 32.c linux-2.6.39/arch/x86/kern + + return addr; } -diff -urNp linux-2.6.39/arch/x86/kernel/sys_x86_64.c linux-2.6.39/arch/x= 86/kernel/sys_x86_64.c ---- linux-2.6.39/arch/x86/kernel/sys_x86_64.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/kernel/sys_x86_64.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/sys_x86_64.c linux-2.6.39.1/ar= ch/x86/kernel/sys_x86_64.c +--- linux-2.6.39.1/arch/x86/kernel/sys_x86_64.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/sys_x86_64.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -17573,9 +17597,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/sys_x86_6= 4.c linux-2.6.39/arch/x86/kerne mm->cached_hole_size =3D ~0UL; =20 return addr; -diff -urNp linux-2.6.39/arch/x86/kernel/tboot.c linux-2.6.39/arch/x86/ke= rnel/tboot.c ---- linux-2.6.39/arch/x86/kernel/tboot.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/kernel/tboot.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/tboot.c linux-2.6.39.1/arch/x8= 6/kernel/tboot.c +--- linux-2.6.39.1/arch/x86/kernel/tboot.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/kernel/tboot.c 2011-05-22 19:36:30.000000000= -0400 @@ -218,7 +218,7 @@ static int tboot_setup_sleep(void) =20 void tboot_shutdown(u32 shutdown_type) @@ -17624,9 +17648,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/tboot.c l= inux-2.6.39/arch/x86/kernel/tbo register_hotcpu_notifier(&tboot_cpu_notifier); return 0; } -diff -urNp linux-2.6.39/arch/x86/kernel/time.c linux-2.6.39/arch/x86/ker= nel/time.c ---- linux-2.6.39/arch/x86/kernel/time.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/kernel/time.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/time.c linux-2.6.39.1/arch/x86= /kernel/time.c +--- linux-2.6.39.1/arch/x86/kernel/time.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/kernel/time.c 2011-05-22 19:36:30.000000000 = -0400 @@ -22,17 +22,13 @@ #include #include @@ -17665,9 +17689,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/time.c li= nux-2.6.39/arch/x86/kernel/time } return pc; } -diff -urNp linux-2.6.39/arch/x86/kernel/tls.c linux-2.6.39/arch/x86/kern= el/tls.c ---- linux-2.6.39/arch/x86/kernel/tls.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/kernel/tls.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/kernel/tls.c linux-2.6.39.1/arch/x86/= kernel/tls.c +--- linux-2.6.39.1/arch/x86/kernel/tls.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/kernel/tls.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; @@ -17680,9 +17704,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/tls.c lin= ux-2.6.39/arch/x86/kernel/tls.c set_tls_desc(p, idx, &info, 1); =20 return 0; -diff -urNp linux-2.6.39/arch/x86/kernel/trampoline_32.S linux-2.6.39/arc= h/x86/kernel/trampoline_32.S ---- linux-2.6.39/arch/x86/kernel/trampoline_32.S 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/trampoline_32.S 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/trampoline_32.S linux-2.6.39.1= /arch/x86/kernel/trampoline_32.S +--- linux-2.6.39.1/arch/x86/kernel/trampoline_32.S 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/trampoline_32.S 2011-05-22 19:36:30.0= 00000000 -0400 @@ -32,6 +32,12 @@ #include #include @@ -17705,9 +17729,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/trampolin= e_32.S linux-2.6.39/arch/x86/ke =20 # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.39/arch/x86/kernel/trampoline_64.S linux-2.6.39/arc= h/x86/kernel/trampoline_64.S ---- linux-2.6.39/arch/x86/kernel/trampoline_64.S 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/trampoline_64.S 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/trampoline_64.S linux-2.6.39.1= /arch/x86/kernel/trampoline_64.S +--- linux-2.6.39.1/arch/x86/kernel/trampoline_64.S 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/trampoline_64.S 2011-05-22 19:36:30.0= 00000000 -0400 @@ -90,7 +90,7 @@ startup_32: movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds @@ -17726,9 +17750,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/trampolin= e_64.S linux-2.6.39/arch/x86/ke .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS -diff -urNp linux-2.6.39/arch/x86/kernel/traps.c linux-2.6.39/arch/x86/ke= rnel/traps.c ---- linux-2.6.39/arch/x86/kernel/traps.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/kernel/traps.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/traps.c linux-2.6.39.1/arch/x8= 6/kernel/traps.c +--- linux-2.6.39.1/arch/x86/kernel/traps.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/kernel/traps.c 2011-05-22 19:36:30.000000000= -0400 @@ -70,12 +70,6 @@ asmlinkage int system_call(void); =20 /* Do we ignore FPU interrupts ? */ @@ -17890,9 +17914,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/traps.c l= inux-2.6.39/arch/x86/kernel/tra =20 if (!tsk_used_math(tsk)) { local_irq_enable(); -diff -urNp linux-2.6.39/arch/x86/kernel/vm86_32.c linux-2.6.39/arch/x86/= kernel/vm86_32.c ---- linux-2.6.39/arch/x86/kernel/vm86_32.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/kernel/vm86_32.c 2011-05-22 19:41:32.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/vm86_32.c linux-2.6.39.1/arch/= x86/kernel/vm86_32.c +--- linux-2.6.39.1/arch/x86/kernel/vm86_32.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/vm86_32.c 2011-05-22 19:41:32.0000000= 00 -0400 @@ -41,6 +41,7 @@ #include #include @@ -17957,9 +17981,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/vm86_32.c= linux-2.6.39/arch/x86/kernel/v if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) =3D=3D BIOSSEG) -diff -urNp linux-2.6.39/arch/x86/kernel/vmlinux.lds.S linux-2.6.39/arch/= x86/kernel/vmlinux.lds.S ---- linux-2.6.39/arch/x86/kernel/vmlinux.lds.S 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/kernel/vmlinux.lds.S 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.39.1/a= rch/x86/kernel/vmlinux.lds.S +--- linux-2.6.39.1/arch/x86/kernel/vmlinux.lds.S 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/vmlinux.lds.S 2011-05-22 19:36:30.000= 000000 -0400 @@ -26,6 +26,13 @@ #include #include @@ -18256,9 +18280,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/vmlinux.l= ds.S linux-2.6.39/arch/x86/kern "kernel image bigger than KERNEL_IMAGE_SIZE"); =20 #ifdef CONFIG_SMP -diff -urNp linux-2.6.39/arch/x86/kernel/vsyscall_64.c linux-2.6.39/arch/= x86/kernel/vsyscall_64.c ---- linux-2.6.39/arch/x86/kernel/vsyscall_64.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/kernel/vsyscall_64.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/vsyscall_64.c linux-2.6.39.1/a= rch/x86/kernel/vsyscall_64.c +--- linux-2.6.39.1/arch/x86/kernel/vsyscall_64.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/vsyscall_64.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa =20 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -18276,9 +18300,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/vsyscall_= 64.c linux-2.6.39/arch/x86/kern p =3D tcache->blob[1]; } else if (__vgetcpu_mode =3D=3D VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ -diff -urNp linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.39/ar= ch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.39.= 1/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.39.1/arch/x86/kernel/x8664_ksyms_64.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/kernel/x8664_ksyms_64.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic_string); EXPORT_SYMBOL(copy_user_generic_unrolled); @@ -18288,9 +18312,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/x8664_ksy= ms_64.c linux-2.6.39/arch/x86/k =20 EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(clear_page); -diff -urNp linux-2.6.39/arch/x86/kernel/xsave.c linux-2.6.39/arch/x86/ke= rnel/xsave.c ---- linux-2.6.39/arch/x86/kernel/xsave.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/kernel/xsave.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/kernel/xsave.c linux-2.6.39.1/arch/x8= 6/kernel/xsave.c +--- linux-2.6.39.1/arch/x86/kernel/xsave.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/kernel/xsave.c 2011-05-22 19:36:30.000000000= -0400 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -EINVAL; @@ -18318,9 +18342,9 @@ diff -urNp linux-2.6.39/arch/x86/kernel/xsave.c l= inux-2.6.39/arch/x86/kernel/xsa buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.39/arch/x86/kvm/emulate.c linux-2.6.39/arch/x86/kvm= /emulate.c ---- linux-2.6.39/arch/x86/kvm/emulate.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/kvm/emulate.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/kvm/emulate.c linux-2.6.39.1/arch/x86= /kvm/emulate.c +--- linux-2.6.39.1/arch/x86/kvm/emulate.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/kvm/emulate.c 2011-05-22 19:36:30.000000000 = -0400 @@ -89,7 +89,7 @@ #define Src2ImmByte (2<<29) #define Src2One (3<<29) @@ -18355,9 +18379,9 @@ diff -urNp linux-2.6.39/arch/x86/kvm/emulate.c li= nux-2.6.39/arch/x86/kvm/emulate switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \ -diff -urNp linux-2.6.39/arch/x86/kvm/lapic.c linux-2.6.39/arch/x86/kvm/l= apic.c ---- linux-2.6.39/arch/x86/kvm/lapic.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/x86/kvm/lapic.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/x86/kvm/lapic.c linux-2.6.39.1/arch/x86/k= vm/lapic.c +--- linux-2.6.39.1/arch/x86/kvm/lapic.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/x86/kvm/lapic.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -53,7 +53,7 @@ #define APIC_BUS_CYCLE_NS 1 =20 @@ -18367,9 +18391,9 @@ diff -urNp linux-2.6.39/arch/x86/kvm/lapic.c linu= x-2.6.39/arch/x86/kvm/lapic.c =20 #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-2.6.39/arch/x86/kvm/mmu.c linux-2.6.39/arch/x86/kvm/mmu= .c ---- linux-2.6.39/arch/x86/kvm/mmu.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/kvm/mmu.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kvm/mmu.c linux-2.6.39.1/arch/x86/kvm= /mmu.c +--- linux-2.6.39.1/arch/x86/kvm/mmu.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/kvm/mmu.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -3240,7 +3240,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu * =20 pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes); @@ -18388,9 +18412,9 @@ diff -urNp linux-2.6.39/arch/x86/kvm/mmu.c linux-= 2.6.39/arch/x86/kvm/mmu.c gentry =3D 0; kvm_mmu_free_some_pages(vcpu); ++vcpu->kvm->stat.mmu_pte_write; -diff -urNp linux-2.6.39/arch/x86/kvm/paging_tmpl.h linux-2.6.39/arch/x86= /kvm/paging_tmpl.h ---- linux-2.6.39/arch/x86/kvm/paging_tmpl.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/kvm/paging_tmpl.h 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kvm/paging_tmpl.h linux-2.6.39.1/arch= /x86/kvm/paging_tmpl.h +--- linux-2.6.39.1/arch/x86/kvm/paging_tmpl.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/kvm/paging_tmpl.h 2011-05-22 19:36:30.000000= 000 -0400 @@ -552,6 +552,8 @@ static int FNAME(page_fault)(struct kvm_ unsigned long mmu_seq; bool map_writable; @@ -18409,9 +18433,9 @@ diff -urNp linux-2.6.39/arch/x86/kvm/paging_tmpl.= h linux-2.6.39/arch/x86/kvm/pag =20 spin_unlock(&vcpu->kvm->mmu_lock); =20 -diff -urNp linux-2.6.39/arch/x86/kvm/svm.c linux-2.6.39/arch/x86/kvm/svm= .c ---- linux-2.6.39/arch/x86/kvm/svm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/kvm/svm.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kvm/svm.c linux-2.6.39.1/arch/x86/kvm= /svm.c +--- linux-2.6.39.1/arch/x86/kvm/svm.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/kvm/svm.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -3278,7 +3278,11 @@ static void reload_tss(struct kvm_vcpu * int cpu =3D raw_smp_processor_id(); =20 @@ -18444,9 +18468,9 @@ diff -urNp linux-2.6.39/arch/x86/kvm/svm.c linux-= 2.6.39/arch/x86/kvm/svm.c .cpu_has_kvm_support =3D has_svm, .disabled_by_bios =3D is_disabled, .hardware_setup =3D svm_hardware_setup, -diff -urNp linux-2.6.39/arch/x86/kvm/vmx.c linux-2.6.39/arch/x86/kvm/vmx= .c ---- linux-2.6.39/arch/x86/kvm/vmx.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/kvm/vmx.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kvm/vmx.c linux-2.6.39.1/arch/x86/kvm= /vmx.c +--- linux-2.6.39.1/arch/x86/kvm/vmx.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/kvm/vmx.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -725,7 +725,11 @@ static void reload_tss(void) struct desc_struct *descs; =20 @@ -18534,9 +18558,9 @@ diff -urNp linux-2.6.39/arch/x86/kvm/vmx.c linux-= 2.6.39/arch/x86/kvm/vmx.c .cpu_has_kvm_support =3D cpu_has_kvm_support, .disabled_by_bios =3D vmx_disabled_by_bios, .hardware_setup =3D hardware_setup, -diff -urNp linux-2.6.39/arch/x86/kvm/x86.c linux-2.6.39/arch/x86/kvm/x86= .c ---- linux-2.6.39/arch/x86/kvm/x86.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/kvm/x86.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/kvm/x86.c linux-2.6.39.1/arch/x86/kvm= /x86.c +--- linux-2.6.39.1/arch/x86/kvm/x86.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/kvm/x86.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -94,7 +94,7 @@ static void update_cr8_intercept(struct=20 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -18633,9 +18657,9 @@ diff -urNp linux-2.6.39/arch/x86/kvm/x86.c linux-= 2.6.39/arch/x86/kvm/x86.c =20 if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.39/arch/x86/lib/atomic64_32.c linux-2.6.39/arch/x86= /lib/atomic64_32.c ---- linux-2.6.39/arch/x86/lib/atomic64_32.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/lib/atomic64_32.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/atomic64_32.c linux-2.6.39.1/arch= /x86/lib/atomic64_32.c +--- linux-2.6.39.1/arch/x86/lib/atomic64_32.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/atomic64_32.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -8,18 +8,30 @@ =20 long long atomic64_read_cx8(long long, const atomic64_t *v); @@ -18714,9 +18738,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/atomic64_32.= c linux-2.6.39/arch/x86/lib/ato long long atomic64_dec_if_positive_386(atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_if_positive_386); int atomic64_inc_not_zero_386(atomic64_t *v); -diff -urNp linux-2.6.39/arch/x86/lib/atomic64_386_32.S linux-2.6.39/arch= /x86/lib/atomic64_386_32.S ---- linux-2.6.39/arch/x86/lib/atomic64_386_32.S 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/lib/atomic64_386_32.S 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/atomic64_386_32.S linux-2.6.39.1/= arch/x86/lib/atomic64_386_32.S +--- linux-2.6.39.1/arch/x86/lib/atomic64_386_32.S 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/atomic64_386_32.S 2011-05-22 19:36:30.00= 0000000 -0400 @@ -48,6 +48,10 @@ BEGIN(read) movl (v), %eax movl 4(v), %edx @@ -18972,9 +18996,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/atomic64_386= _32.S linux-2.6.39/arch/x86/lib js 1f movl %eax, (v) movl %edx, 4(v) -diff -urNp linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S linux-2.6.39/arch= /x86/lib/atomic64_cx8_32.S ---- linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/atomic64_cx8_32.S linux-2.6.39.1/= arch/x86/lib/atomic64_cx8_32.S +--- linux-2.6.39.1/arch/x86/lib/atomic64_cx8_32.S 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/atomic64_cx8_32.S 2011-05-22 19:36:30.00= 0000000 -0400 @@ -39,6 +39,14 @@ ENTRY(atomic64_read_cx8) CFI_ENDPROC ENDPROC(atomic64_read_cx8) @@ -19153,9 +19177,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/atomic64_cx8= _32.S linux-2.6.39/arch/x86/lib LOCK_PREFIX cmpxchg8b (%esi) jne 1b -diff -urNp linux-2.6.39/arch/x86/lib/checksum_32.S linux-2.6.39/arch/x86= /lib/checksum_32.S ---- linux-2.6.39/arch/x86/lib/checksum_32.S 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/lib/checksum_32.S 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/checksum_32.S linux-2.6.39.1/arch= /x86/lib/checksum_32.S +--- linux-2.6.39.1/arch/x86/lib/checksum_32.S 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/checksum_32.S 2011-05-22 19:36:30.000000= 000 -0400 @@ -28,7 +28,8 @@ #include #include @@ -19400,9 +19424,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/checksum_32.= S linux-2.6.39/arch/x86/lib/che =09 #undef ROUND #undef ROUND1 =09 -diff -urNp linux-2.6.39/arch/x86/lib/clear_page_64.S linux-2.6.39/arch/x= 86/lib/clear_page_64.S ---- linux-2.6.39/arch/x86/lib/clear_page_64.S 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/lib/clear_page_64.S 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/clear_page_64.S linux-2.6.39.1/ar= ch/x86/lib/clear_page_64.S +--- linux-2.6.39.1/arch/x86/lib/clear_page_64.S 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/clear_page_64.S 2011-05-22 19:36:30.0000= 00000 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) =20 #include @@ -19412,9 +19436,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/clear_page_6= 4.S linux-2.6.39/arch/x86/lib/c 1: .byte 0xeb /* jmp */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.39/arch/x86/lib/copy_page_64.S linux-2.6.39/arch/x8= 6/lib/copy_page_64.S ---- linux-2.6.39/arch/x86/lib/copy_page_64.S 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/lib/copy_page_64.S 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/copy_page_64.S linux-2.6.39.1/arc= h/x86/lib/copy_page_64.S +--- linux-2.6.39.1/arch/x86/lib/copy_page_64.S 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/copy_page_64.S 2011-05-22 19:36:30.00000= 0000 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) =20 #include @@ -19424,9 +19448,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/copy_page_64= .S linux-2.6.39/arch/x86/lib/co 1: .byte 0xeb /* jmp */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.39/arch/x86/lib/copy_user_64.S linux-2.6.39/arch/x8= 6/lib/copy_user_64.S ---- linux-2.6.39/arch/x86/lib/copy_user_64.S 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/lib/copy_user_64.S 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/copy_user_64.S linux-2.6.39.1/arc= h/x86/lib/copy_user_64.S +--- linux-2.6.39.1/arch/x86/lib/copy_user_64.S 2011-06-03 00:04:13.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/copy_user_64.S 2011-06-03 00:32:05.00000= 0000 -0400 @@ -15,13 +15,14 @@ #include #include @@ -19455,7 +19479,7 @@ diff -urNp linux-2.6.39/arch/x86/lib/copy_user_64= .S linux-2.6.39/arch/x86/lib/co - addq %rdx,%rcx - jc bad_to_user - cmpq TI_addr_limit(%rax),%rcx -- jae bad_to_user +- ja bad_to_user - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string - CFI_ENDPROC -ENDPROC(_copy_to_user) @@ -19468,7 +19492,7 @@ diff -urNp linux-2.6.39/arch/x86/lib/copy_user_64= .S linux-2.6.39/arch/x86/lib/co - addq %rdx,%rcx - jc bad_from_user - cmpq TI_addr_limit(%rax),%rcx -- jae bad_from_user +- ja bad_from_user - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string - CFI_ENDPROC -ENDPROC(_copy_from_user) @@ -19483,9 +19507,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/copy_user_64= .S linux-2.6.39/arch/x86/lib/co movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S linux-2.6.39= /arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/copy_user_nocache_64.S linux-2.6.= 39.1/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.39.1/arch/x86/lib/copy_user_nocache_64.S 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/copy_user_nocache_64.S 2011-05-22 19:36:= 30.000000000 -0400 @@ -14,6 +14,7 @@ #include #include @@ -19510,9 +19534,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/copy_user_no= cache_64.S linux-2.6.39/arch/x8 cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -diff -urNp linux-2.6.39/arch/x86/lib/csum-wrappers_64.c linux-2.6.39/arc= h/x86/lib/csum-wrappers_64.c ---- linux-2.6.39/arch/x86/lib/csum-wrappers_64.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/arch/x86/lib/csum-wrappers_64.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/csum-wrappers_64.c linux-2.6.39.1= /arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.39.1/arch/x86/lib/csum-wrappers_64.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/csum-wrappers_64.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _ len -=3D 2; } @@ -19539,9 +19563,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/csum-wrapper= s_64.c linux-2.6.39/arch/x86/li return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.39/arch/x86/lib/getuser.S linux-2.6.39/arch/x86/lib= /getuser.S ---- linux-2.6.39/arch/x86/lib/getuser.S 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/lib/getuser.S 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/lib/getuser.S linux-2.6.39.1/arch/x86= /lib/getuser.S +--- linux-2.6.39.1/arch/x86/lib/getuser.S 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/lib/getuser.S 2011-05-22 19:36:30.000000000 = -0400 @@ -33,14 +33,35 @@ #include #include @@ -19647,9 +19671,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/getuser.S li= nux-2.6.39/arch/x86/lib/getuser 4: movq -7(%_ASM_AX),%_ASM_DX xor %eax,%eax ret -diff -urNp linux-2.6.39/arch/x86/lib/insn.c linux-2.6.39/arch/x86/lib/in= sn.c ---- linux-2.6.39/arch/x86/lib/insn.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/lib/insn.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/insn.c linux-2.6.39.1/arch/x86/li= b/insn.c +--- linux-2.6.39.1/arch/x86/lib/insn.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/x86/lib/insn.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -21,6 +21,11 @@ #include #include @@ -19673,9 +19697,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/insn.c linux= -2.6.39/arch/x86/lib/insn.c insn->x86_64 =3D x86_64 ? 1 : 0; insn->opnd_bytes =3D 4; if (x86_64) -diff -urNp linux-2.6.39/arch/x86/lib/mmx_32.c linux-2.6.39/arch/x86/lib/= mmx_32.c ---- linux-2.6.39/arch/x86/lib/mmx_32.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/lib/mmx_32.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/lib/mmx_32.c linux-2.6.39.1/arch/x86/= lib/mmx_32.c +--- linux-2.6.39.1/arch/x86/lib/mmx_32.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/lib/mmx_32.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -19991,9 +20015,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/mmx_32.c lin= ux-2.6.39/arch/x86/lib/mmx_32.c =20 from +=3D 64; to +=3D 64; -diff -urNp linux-2.6.39/arch/x86/lib/putuser.S linux-2.6.39/arch/x86/lib= /putuser.S ---- linux-2.6.39/arch/x86/lib/putuser.S 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/lib/putuser.S 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/lib/putuser.S linux-2.6.39.1/arch/x86= /lib/putuser.S +--- linux-2.6.39.1/arch/x86/lib/putuser.S 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/lib/putuser.S 2011-05-22 19:36:30.000000000 = -0400 @@ -15,7 +15,8 @@ #include #include @@ -20131,9 +20155,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/putuser.S li= nux-2.6.39/arch/x86/lib/putuser #endif xor %eax,%eax EXIT -diff -urNp linux-2.6.39/arch/x86/lib/usercopy_32.c linux-2.6.39/arch/x86= /lib/usercopy_32.c ---- linux-2.6.39/arch/x86/lib/usercopy_32.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/lib/usercopy_32.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/usercopy_32.c linux-2.6.39.1/arch= /x86/lib/usercopy_32.c +--- linux-2.6.39.1/arch/x86/lib/usercopy_32.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/usercopy_32.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -43,7 +43,7 @@ do { \ __asm__ __volatile__( \ " testl %1,%1\n" \ @@ -20754,9 +20778,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/usercopy_32.= c linux-2.6.39/arch/x86/lib/use +} +EXPORT_SYMBOL(set_fs); +#endif -diff -urNp linux-2.6.39/arch/x86/lib/usercopy_64.c linux-2.6.39/arch/x86= /lib/usercopy_64.c ---- linux-2.6.39/arch/x86/lib/usercopy_64.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/lib/usercopy_64.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/lib/usercopy_64.c linux-2.6.39.1/arch= /x86/lib/usercopy_64.c +--- linux-2.6.39.1/arch/x86/lib/usercopy_64.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/lib/usercopy_64.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -42,6 +42,12 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -20805,9 +20829,9 @@ diff -urNp linux-2.6.39/arch/x86/lib/usercopy_64.= c linux-2.6.39/arch/x86/lib/use } EXPORT_SYMBOL(copy_in_user); =20 -diff -urNp linux-2.6.39/arch/x86/Makefile linux-2.6.39/arch/x86/Makefile ---- linux-2.6.39/arch/x86/Makefile 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/Makefile 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/Makefile linux-2.6.39.1/arch/x86/Make= file +--- linux-2.6.39.1/arch/x86/Makefile 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/Makefile 2011-05-22 19:36:30.000000000 -0400 @@ -195,3 +195,12 @@ define archhelp echo ' FDARGS=3D"..." arguments for the booted ker= nel' echo ' FDINITRD=3Dfile initrd for the booted kernel= ' @@ -20821,9 +20845,9 @@ diff -urNp linux-2.6.39/arch/x86/Makefile linux-2= .6.39/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.39/arch/x86/mm/extable.c linux-2.6.39/arch/x86/mm/e= xtable.c ---- linux-2.6.39/arch/x86/mm/extable.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/mm/extable.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/mm/extable.c linux-2.6.39.1/arch/x86/= mm/extable.c +--- linux-2.6.39.1/arch/x86/mm/extable.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/mm/extable.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -1,14 +1,71 @@ #include #include @@ -20897,9 +20921,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/extable.c lin= ux-2.6.39/arch/x86/mm/extable.c extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap =3D 1; -diff -urNp linux-2.6.39/arch/x86/mm/fault.c linux-2.6.39/arch/x86/mm/fau= lt.c ---- linux-2.6.39/arch/x86/mm/fault.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/mm/fault.c 2011-05-22 20:33:41.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/fault.c linux-2.6.39.1/arch/x86/mm= /fault.c +--- linux-2.6.39.1/arch/x86/mm/fault.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/x86/mm/fault.c 2011-06-04 10:15:52.000000000 -04= 00 @@ -12,10 +12,18 @@ #include /* kmmio_handler, ... */ #include /* perf_sw_event */ @@ -21104,10 +21128,10 @@ diff -urNp linux-2.6.39/arch/x86/mm/fault.c lin= ux-2.6.39/arch/x86/mm/fault.c +#ifdef CONFIG_X86_64 + if (mm && (error_code & PF_INSTR) && mm->context.vdso) { + if (regs->ip =3D=3D (unsigned long)vgettimeofday) { -+ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback= _gettimeofday); ++ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, gettimeo= fday); + return; + } else if (regs->ip =3D=3D (unsigned long)vtime) { -+ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback= _time); ++ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, clock_ge= ttime); + return; + } else if (regs->ip =3D=3D (unsigned long)vgetcpu) { + regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu); @@ -21569,9 +21593,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/fault.c linux= -2.6.39/arch/x86/mm/fault.c + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.39/arch/x86/mm/gup.c linux-2.6.39/arch/x86/mm/gup.c ---- linux-2.6.39/arch/x86/mm/gup.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/mm/gup.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/gup.c linux-2.6.39.1/arch/x86/mm/g= up.c +--- linux-2.6.39.1/arch/x86/mm/gup.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/mm/gup.c 2011-05-22 19:36:30.000000000 -0400 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long=20 addr =3D start; len =3D (unsigned long) nr_pages << PAGE_SHIFT; @@ -21581,9 +21605,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/gup.c linux-2= .6.39/arch/x86/mm/gup.c (void __user *)start, len))) return 0; =20 -diff -urNp linux-2.6.39/arch/x86/mm/highmem_32.c linux-2.6.39/arch/x86/m= m/highmem_32.c ---- linux-2.6.39/arch/x86/mm/highmem_32.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/mm/highmem_32.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/highmem_32.c linux-2.6.39.1/arch/x= 86/mm/highmem_32.c +--- linux-2.6.39.1/arch/x86/mm/highmem_32.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/mm/highmem_32.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page idx =3D type + KM_TYPE_NR*smp_processor_id(); vaddr =3D __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -21595,9 +21619,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/highmem_32.c = linux-2.6.39/arch/x86/mm/highme =20 return (void *)vaddr; } -diff -urNp linux-2.6.39/arch/x86/mm/hugetlbpage.c linux-2.6.39/arch/x86/= mm/hugetlbpage.c ---- linux-2.6.39/arch/x86/mm/hugetlbpage.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/mm/hugetlbpage.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/hugetlbpage.c linux-2.6.39.1/arch/= x86/mm/hugetlbpage.c +--- linux-2.6.39.1/arch/x86/mm/hugetlbpage.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/mm/hugetlbpage.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe struct hstate *h =3D hstate_file(file); struct mm_struct *mm =3D current->mm; @@ -21805,9 +21829,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/hugetlbpage.c= linux-2.6.39/arch/x86/mm/huget return addr; } if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) -diff -urNp linux-2.6.39/arch/x86/mm/init_32.c linux-2.6.39/arch/x86/mm/i= nit_32.c ---- linux-2.6.39/arch/x86/mm/init_32.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/mm/init_32.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/mm/init_32.c linux-2.6.39.1/arch/x86/= mm/init_32.c +--- linux-2.6.39.1/arch/x86/mm/init_32.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/mm/init_32.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void) } =20 @@ -22082,9 +22106,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/init_32.c lin= ux-2.6.39/arch/x86/mm/init_32.c set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.39/arch/x86/mm/init_64.c linux-2.6.39/arch/x86/mm/i= nit_64.c ---- linux-2.6.39/arch/x86/mm/init_64.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/mm/init_64.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/mm/init_64.c linux-2.6.39.1/arch/x86/= mm/init_64.c +--- linux-2.6.39.1/arch/x86/mm/init_64.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/mm/init_64.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -74,7 +74,7 @@ early_param("gbpages", parse_direct_gbpa * around without checking the pgd every time. */ @@ -22196,9 +22220,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/init_64.c lin= ux-2.6.39/arch/x86/mm/init_64.c return "[vdso]"; if (vma =3D=3D &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.39/arch/x86/mm/init.c linux-2.6.39/arch/x86/mm/init= .c ---- linux-2.6.39/arch/x86/mm/init.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/mm/init.c 2011-05-23 19:01:08.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/init.c linux-2.6.39.1/arch/x86/mm/= init.c +--- linux-2.6.39.1/arch/x86/mm/init.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/mm/init.c 2011-05-23 19:01:08.000000000 -040= 0 @@ -33,7 +33,7 @@ int direct_gbpages static void __init find_early_table_space(unsigned long end, int use_ps= e, int use_gbpages) @@ -22322,9 +22346,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/init.c linux-= 2.6.39/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.39/arch/x86/mm/iomap_32.c linux-2.6.39/arch/x86/mm/= iomap_32.c ---- linux-2.6.39/arch/x86/mm/iomap_32.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/mm/iomap_32.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/mm/iomap_32.c linux-2.6.39.1/arch/x86= /mm/iomap_32.c +--- linux-2.6.39.1/arch/x86/mm/iomap_32.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/mm/iomap_32.c 2011-05-22 19:36:30.000000000 = -0400 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long type =3D kmap_atomic_idx_push(); idx =3D type + KM_TYPE_NR * smp_processor_id(); @@ -22337,9 +22361,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/iomap_32.c li= nux-2.6.39/arch/x86/mm/iomap_32 arch_flush_lazy_mmu_mode(); =20 return (void *)vaddr; -diff -urNp linux-2.6.39/arch/x86/mm/ioremap.c linux-2.6.39/arch/x86/mm/i= oremap.c ---- linux-2.6.39/arch/x86/mm/ioremap.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/mm/ioremap.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/mm/ioremap.c linux-2.6.39.1/arch/x86/= mm/ioremap.c +--- linux-2.6.39.1/arch/x86/mm/ioremap.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/mm/ioremap.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re for (pfn =3D phys_addr >> PAGE_SHIFT; pfn <=3D last_pfn; pfn++) { int is_ram =3D page_is_ram(pfn); @@ -22368,9 +22392,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/ioremap.c lin= ux-2.6.39/arch/x86/mm/ioremap.c =20 /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.39/a= rch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-22 19:36:30.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.39= .1/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.39.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-22 19:36:30= .000000000 -0400 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg * memory (e.g. tracked pages)? For now, we need this to avoid * invoking kmemcheck for PnP BIOS calls. @@ -22383,9 +22407,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/kmemcheck/kme= mcheck.c linux-2.6.39/arch/x86/ return false; =20 pte =3D kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.39/arch/x86/mm/mmap.c linux-2.6.39/arch/x86/mm/mmap= .c ---- linux-2.6.39/arch/x86/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/mmap.c linux-2.6.39.1/arch/x86/mm/= mmap.c +--- linux-2.6.39.1/arch/x86/mm/mmap.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/mm/mmap.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -22467,9 +22491,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/mmap.c linux-= 2.6.39/arch/x86/mm/mmap.c mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.39/arch/x86/mm/mmio-mod.c linux-2.6.39/arch/x86/mm/= mmio-mod.c ---- linux-2.6.39/arch/x86/mm/mmio-mod.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/mm/mmio-mod.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/mm/mmio-mod.c linux-2.6.39.1/arch/x86= /mm/mmio-mod.c +--- linux-2.6.39.1/arch/x86/mm/mmio-mod.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/mm/mmio-mod.c 2011-05-22 19:36:30.000000000 = -0400 @@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p,=20 static void ioremap_trace_core(resource_size_t offset, unsigned long si= ze, void __iomem *addr) @@ -22488,9 +22512,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/mmio-mod.c li= nux-2.6.39/arch/x86/mm/mmio-mod }; map.map_id =3D trace->id; =20 -diff -urNp linux-2.6.39/arch/x86/mm/numa_32.c linux-2.6.39/arch/x86/mm/n= uma_32.c ---- linux-2.6.39/arch/x86/mm/numa_32.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/mm/numa_32.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/mm/numa_32.c linux-2.6.39.1/arch/x86/= mm/numa_32.c +--- linux-2.6.39.1/arch/x86/mm/numa_32.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/mm/numa_32.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -22499,9 +22523,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/numa_32.c lin= ux-2.6.39/arch/x86/mm/numa_32.c extern unsigned long highend_pfn, highstart_pfn; =20 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.39/arch/x86/mm/pageattr.c linux-2.6.39/arch/x86/mm/= pageattr.c ---- linux-2.6.39/arch/x86/mm/pageattr.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/mm/pageattr.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/mm/pageattr.c linux-2.6.39.1/arch/x86= /mm/pageattr.c +--- linux-2.6.39.1/arch/x86/mm/pageattr.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/mm/pageattr.c 2011-05-22 19:36:30.000000000 = -0400 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection */ #ifdef CONFIG_PCI_BIOS @@ -22586,9 +22610,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/pageattr.c li= nux-2.6.39/arch/x86/mm/pageattr } =20 static int -diff -urNp linux-2.6.39/arch/x86/mm/pageattr-test.c linux-2.6.39/arch/x8= 6/mm/pageattr-test.c ---- linux-2.6.39/arch/x86/mm/pageattr-test.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/arch/x86/mm/pageattr-test.c 2011-05-22 19:36:30.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/pageattr-test.c linux-2.6.39.1/arc= h/x86/mm/pageattr-test.c +--- linux-2.6.39.1/arch/x86/mm/pageattr-test.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/arch/x86/mm/pageattr-test.c 2011-05-22 19:36:30.00000= 0000 -0400 @@ -36,7 +36,7 @@ enum { =20 static int pte_testbit(pte_t pte) @@ -22598,9 +22622,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/pageattr-test= .c linux-2.6.39/arch/x86/mm/pag } =20 struct split_state { -diff -urNp linux-2.6.39/arch/x86/mm/pat.c linux-2.6.39/arch/x86/mm/pat.c ---- linux-2.6.39/arch/x86/mm/pat.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/mm/pat.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/pat.c linux-2.6.39.1/arch/x86/mm/p= at.c +--- linux-2.6.39.1/arch/x86/mm/pat.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/mm/pat.c 2011-05-22 19:36:30.000000000 -0400 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end) =20 if (!entry) { @@ -22648,9 +22672,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/pat.c linux-2= .6.39/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.39/arch/x86/mm/pgtable_32.c linux-2.6.39/arch/x86/m= m/pgtable_32.c ---- linux-2.6.39/arch/x86/mm/pgtable_32.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/mm/pgtable_32.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/pgtable_32.c linux-2.6.39.1/arch/x= 86/mm/pgtable_32.c +--- linux-2.6.39.1/arch/x86/mm/pgtable_32.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/mm/pgtable_32.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,=20 return; } @@ -22665,9 +22689,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/pgtable_32.c = linux-2.6.39/arch/x86/mm/pgtabl =20 /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.39/arch/x86/mm/pgtable.c linux-2.6.39/arch/x86/mm/p= gtable.c ---- linux-2.6.39/arch/x86/mm/pgtable.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/mm/pgtable.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/mm/pgtable.c linux-2.6.39.1/arch/x86/= mm/pgtable.c +--- linux-2.6.39.1/arch/x86/mm/pgtable.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/mm/pgtable.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -22913,9 +22937,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/pgtable.c lin= ux-2.6.39/arch/x86/mm/pgtable.c pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.39/arch/x86/mm/setup_nx.c linux-2.6.39/arch/x86/mm/= setup_nx.c ---- linux-2.6.39/arch/x86/mm/setup_nx.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/mm/setup_nx.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/mm/setup_nx.c linux-2.6.39.1/arch/x86= /mm/setup_nx.c +--- linux-2.6.39.1/arch/x86/mm/setup_nx.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/mm/setup_nx.c 2011-05-22 19:36:30.000000000 = -0400 @@ -5,8 +5,10 @@ #include #include @@ -22945,9 +22969,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/setup_nx.c li= nux-2.6.39/arch/x86/mm/setup_nx __supported_pte_mask &=3D ~_PAGE_NX; } =20 -diff -urNp linux-2.6.39/arch/x86/mm/tlb.c linux-2.6.39/arch/x86/mm/tlb.c ---- linux-2.6.39/arch/x86/mm/tlb.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/mm/tlb.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/mm/tlb.c linux-2.6.39.1/arch/x86/mm/t= lb.c +--- linux-2.6.39.1/arch/x86/mm/tlb.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/mm/tlb.c 2011-05-22 19:36:30.000000000 -0400 @@ -65,7 +65,11 @@ void leave_mm(int cpu) BUG(); cpumask_clear_cpu(cpu, @@ -22960,9 +22984,9 @@ diff -urNp linux-2.6.39/arch/x86/mm/tlb.c linux-2= .6.39/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); =20 -diff -urNp linux-2.6.39/arch/x86/oprofile/backtrace.c linux-2.6.39/arch/= x86/oprofile/backtrace.c ---- linux-2.6.39/arch/x86/oprofile/backtrace.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/oprofile/backtrace.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/oprofile/backtrace.c linux-2.6.39.1/a= rch/x86/oprofile/backtrace.c +--- linux-2.6.39.1/arch/x86/oprofile/backtrace.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/oprofile/backtrace.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram struct stack_frame_ia32 *fp; =20 @@ -22981,9 +23005,9 @@ diff -urNp linux-2.6.39/arch/x86/oprofile/backtra= ce.c linux-2.6.39/arch/x86/opro unsigned long stack =3D kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.39/arch/x86/pci/ce4100.c linux-2.6.39/arch/x86/pci/= ce4100.c ---- linux-2.6.39/arch/x86/pci/ce4100.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/pci/ce4100.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/pci/ce4100.c linux-2.6.39.1/arch/x86/= pci/ce4100.c +--- linux-2.6.39.1/arch/x86/pci/ce4100.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/pci/ce4100.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned in return pci_direct_conf1.write(seg, bus, devfn, reg, len, value); } @@ -22993,9 +23017,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/ce4100.c lin= ux-2.6.39/arch/x86/pci/ce4100.c .read =3D ce4100_conf_read, .write =3D ce4100_conf_write, }; -diff -urNp linux-2.6.39/arch/x86/pci/common.c linux-2.6.39/arch/x86/pci/= common.c ---- linux-2.6.39/arch/x86/pci/common.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/pci/common.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/pci/common.c linux-2.6.39.1/arch/x86/= pci/common.c +--- linux-2.6.39.1/arch/x86/pci/common.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/pci/common.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -33,8 +33,8 @@ int noioapicreroute =3D 1; int pcibios_last_bus =3D -1; unsigned long pirq_table_addr; @@ -23007,9 +23031,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/common.c lin= ux-2.6.39/arch/x86/pci/common.c =20 int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int de= vfn, int reg, int len, u32 *val) -diff -urNp linux-2.6.39/arch/x86/pci/direct.c linux-2.6.39/arch/x86/pci/= direct.c ---- linux-2.6.39/arch/x86/pci/direct.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/pci/direct.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/pci/direct.c linux-2.6.39.1/arch/x86/= pci/direct.c +--- linux-2.6.39.1/arch/x86/pci/direct.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/pci/direct.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int=20 =20 #undef PCI_CONF1_ADDRESS @@ -23037,9 +23061,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/direct.c lin= ux-2.6.39/arch/x86/pci/direct.c { u32 x =3D 0; int year, devfn; -diff -urNp linux-2.6.39/arch/x86/pci/fixup.c linux-2.6.39/arch/x86/pci/f= ixup.c ---- linux-2.6.39/arch/x86/pci/fixup.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/x86/pci/fixup.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/x86/pci/fixup.c linux-2.6.39.1/arch/x86/p= ci/fixup.c +--- linux-2.6.39.1/arch/x86/pci/fixup.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/x86/pci/fixup.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -435,7 +435,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), }, @@ -23049,9 +23073,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/fixup.c linu= x-2.6.39/arch/x86/pci/fixup.c }; =20 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *de= v) -diff -urNp linux-2.6.39/arch/x86/pci/mmconfig_32.c linux-2.6.39/arch/x86= /pci/mmconfig_32.c ---- linux-2.6.39/arch/x86/pci/mmconfig_32.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/pci/mmconfig_32.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/pci/mmconfig_32.c linux-2.6.39.1/arch= /x86/pci/mmconfig_32.c +--- linux-2.6.39.1/arch/x86/pci/mmconfig_32.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/pci/mmconfig_32.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int=20 return 0; } @@ -23061,9 +23085,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/mmconfig_32.= c linux-2.6.39/arch/x86/pci/mmc .read =3D pci_mmcfg_read, .write =3D pci_mmcfg_write, }; -diff -urNp linux-2.6.39/arch/x86/pci/mmconfig_64.c linux-2.6.39/arch/x86= /pci/mmconfig_64.c ---- linux-2.6.39/arch/x86/pci/mmconfig_64.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/arch/x86/pci/mmconfig_64.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/arch/x86/pci/mmconfig_64.c linux-2.6.39.1/arch= /x86/pci/mmconfig_64.c +--- linux-2.6.39.1/arch/x86/pci/mmconfig_64.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/arch/x86/pci/mmconfig_64.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int=20 return 0; } @@ -23073,9 +23097,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/mmconfig_64.= c linux-2.6.39/arch/x86/pci/mmc .read =3D pci_mmcfg_read, .write =3D pci_mmcfg_write, }; -diff -urNp linux-2.6.39/arch/x86/pci/mrst.c linux-2.6.39/arch/x86/pci/mr= st.c ---- linux-2.6.39/arch/x86/pci/mrst.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/pci/mrst.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/pci/mrst.c linux-2.6.39.1/arch/x86/pc= i/mrst.c +--- linux-2.6.39.1/arch/x86/pci/mrst.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/x86/pci/mrst.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -218,7 +218,7 @@ static int mrst_pci_irq_enable(struct pc return 0; } @@ -23085,9 +23109,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/mrst.c linux= -2.6.39/arch/x86/pci/mrst.c .read =3D pci_read, .write =3D pci_write, }; -diff -urNp linux-2.6.39/arch/x86/pci/numaq_32.c linux-2.6.39/arch/x86/pc= i/numaq_32.c ---- linux-2.6.39/arch/x86/pci/numaq_32.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/pci/numaq_32.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/pci/numaq_32.c linux-2.6.39.1/arch/x8= 6/pci/numaq_32.c +--- linux-2.6.39.1/arch/x86/pci/numaq_32.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/pci/numaq_32.c 2011-05-22 19:36:30.000000000= -0400 @@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i =20 #undef PCI_CONF1_MQ_ADDRESS @@ -23097,9 +23121,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/numaq_32.c l= inux-2.6.39/arch/x86/pci/numaq_ .read =3D pci_conf1_mq_read, .write =3D pci_conf1_mq_write }; -diff -urNp linux-2.6.39/arch/x86/pci/olpc.c linux-2.6.39/arch/x86/pci/ol= pc.c ---- linux-2.6.39/arch/x86/pci/olpc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/pci/olpc.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/pci/olpc.c linux-2.6.39.1/arch/x86/pc= i/olpc.c +--- linux-2.6.39.1/arch/x86/pci/olpc.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/x86/pci/olpc.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -23109,9 +23133,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/olpc.c linux= -2.6.39/arch/x86/pci/olpc.c .read =3D pci_olpc_read, .write =3D pci_olpc_write, }; -diff -urNp linux-2.6.39/arch/x86/pci/pcbios.c linux-2.6.39/arch/x86/pci/= pcbios.c ---- linux-2.6.39/arch/x86/pci/pcbios.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/arch/x86/pci/pcbios.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/arch/x86/pci/pcbios.c linux-2.6.39.1/arch/x86/= pci/pcbios.c +--- linux-2.6.39.1/arch/x86/pci/pcbios.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/arch/x86/pci/pcbios.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -79,50 +79,93 @@ union bios32 { static struct { unsigned long address; @@ -23434,9 +23458,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/pcbios.c lin= ux-2.6.39/arch/x86/pci/pcbios.c return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.39/arch/x86/pci/xen.c linux-2.6.39/arch/x86/pci/xen= .c ---- linux-2.6.39/arch/x86/pci/xen.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/pci/xen.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/pci/xen.c linux-2.6.39.1/arch/x86/pci= /xen.c +--- linux-2.6.39.1/arch/x86/pci/xen.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/pci/xen.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -62,7 +62,7 @@ static int acpi_register_gsi_xen_hvm(str #include #include @@ -23446,9 +23470,9 @@ diff -urNp linux-2.6.39/arch/x86/pci/xen.c linux-= 2.6.39/arch/x86/pci/xen.c EXPORT_SYMBOL_GPL(xen_pci_frontend); =20 #define XEN_PIRQ_MSI_DATA (MSI_DATA_TRIGGER_EDGE | \ -diff -urNp linux-2.6.39/arch/x86/platform/efi/efi_32.c linux-2.6.39/arch= /x86/platform/efi/efi_32.c ---- linux-2.6.39/arch/x86/platform/efi/efi_32.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/platform/efi/efi_32.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/platform/efi/efi_32.c linux-2.6.39.1/= arch/x86/platform/efi/efi_32.c +--- linux-2.6.39.1/arch/x86/platform/efi/efi_32.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/platform/efi/efi_32.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -38,70 +38,37 @@ */ =20 @@ -23529,9 +23553,9 @@ diff -urNp linux-2.6.39/arch/x86/platform/efi/efi= _32.c linux-2.6.39/arch/x86/pla =20 /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S linux-2.6.39= /arch/x86/platform/efi/efi_stub_32.S ---- linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/platform/efi/efi_stub_32.S linux-2.6.= 39.1/arch/x86/platform/efi/efi_stub_32.S +--- linux-2.6.39.1/arch/x86/platform/efi/efi_stub_32.S 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/arch/x86/platform/efi/efi_stub_32.S 2011-05-22 19:36:= 30.000000000 -0400 @@ -6,6 +6,7 @@ */ =20 @@ -23630,9 +23654,9 @@ diff -urNp linux-2.6.39/arch/x86/platform/efi/efi= _stub_32.S linux-2.6.39/arch/x8 saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c linux-2.6.39/ar= ch/x86/platform/olpc/olpc_dt.c ---- linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/platform/olpc/olpc_dt.c linux-2.6.39.= 1/arch/x86/platform/olpc/olpc_dt.c +--- linux-2.6.39.1/arch/x86/platform/olpc/olpc_dt.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/arch/x86/platform/olpc/olpc_dt.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -154,7 +154,7 @@ void * __init prom_early_alloc(unsigned=20 return res; } @@ -23642,9 +23666,9 @@ diff -urNp linux-2.6.39/arch/x86/platform/olpc/ol= pc_dt.c linux-2.6.39/arch/x86/p .nextprop =3D olpc_dt_nextprop, .getproplen =3D olpc_dt_getproplen, .getproperty =3D olpc_dt_getproperty, -diff -urNp linux-2.6.39/arch/x86/platform/uv/tlb_uv.c linux-2.6.39/arch/= x86/platform/uv/tlb_uv.c ---- linux-2.6.39/arch/x86/platform/uv/tlb_uv.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/arch/x86/platform/uv/tlb_uv.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/platform/uv/tlb_uv.c linux-2.6.39.1/a= rch/x86/platform/uv/tlb_uv.c +--- linux-2.6.39.1/arch/x86/platform/uv/tlb_uv.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/arch/x86/platform/uv/tlb_uv.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -342,6 +342,8 @@ static void uv_reset_with_ipi(struct bau cpumask_t mask; struct reset_args reset_args; @@ -23654,9 +23678,9 @@ diff -urNp linux-2.6.39/arch/x86/platform/uv/tlb_= uv.c linux-2.6.39/arch/x86/plat reset_args.sender =3D sender; =20 cpus_clear(mask); -diff -urNp linux-2.6.39/arch/x86/power/cpu.c linux-2.6.39/arch/x86/power= /cpu.c ---- linux-2.6.39/arch/x86/power/cpu.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/arch/x86/power/cpu.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/arch/x86/power/cpu.c linux-2.6.39.1/arch/x86/p= ower/cpu.c +--- linux-2.6.39.1/arch/x86/power/cpu.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/arch/x86/power/cpu.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -130,7 +130,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -23676,9 +23700,9 @@ diff -urNp linux-2.6.39/arch/x86/power/cpu.c linu= x-2.6.39/arch/x86/power/cpu.c =20 syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.39/arch/x86/vdso/Makefile linux-2.6.39/arch/x86/vds= o/Makefile ---- linux-2.6.39/arch/x86/vdso/Makefile 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/vdso/Makefile 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/vdso/Makefile linux-2.6.39.1/arch/x86= /vdso/Makefile +--- linux-2.6.39.1/arch/x86/vdso/Makefile 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/vdso/Makefile 2011-05-22 19:36:30.000000000 = -0400 @@ -123,7 +123,7 @@ quiet_cmd_vdso =3D VDSO $@ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' @@ -23688,9 +23712,9 @@ diff -urNp linux-2.6.39/arch/x86/vdso/Makefile li= nux-2.6.39/arch/x86/vdso/Makefi GCOV_PROFILE :=3D n =20 # -diff -urNp linux-2.6.39/arch/x86/vdso/vclock_gettime.c linux-2.6.39/arch= /x86/vdso/vclock_gettime.c ---- linux-2.6.39/arch/x86/vdso/vclock_gettime.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/vdso/vclock_gettime.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/vdso/vclock_gettime.c linux-2.6.39.1/= arch/x86/vdso/vclock_gettime.c +--- linux-2.6.39.1/arch/x86/vdso/vclock_gettime.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/vdso/vclock_gettime.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -22,24 +22,48 @@ #include #include @@ -23789,9 +23813,9 @@ diff -urNp linux-2.6.39/arch/x86/vdso/vclock_gett= ime.c linux-2.6.39/arch/x86/vds } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.39/arch/x86/vdso/vdso32-setup.c linux-2.6.39/arch/x= 86/vdso/vdso32-setup.c ---- linux-2.6.39/arch/x86/vdso/vdso32-setup.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/arch/x86/vdso/vdso32-setup.c 2011-05-22 19:36:30.000000= 000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/vdso/vdso32-setup.c linux-2.6.39.1/ar= ch/x86/vdso/vdso32-setup.c +--- linux-2.6.39.1/arch/x86/vdso/vdso32-setup.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/arch/x86/vdso/vdso32-setup.c 2011-05-22 19:36:30.0000= 00000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -23874,22 +23898,22 @@ diff -urNp linux-2.6.39/arch/x86/vdso/vdso32-se= tup.c linux-2.6.39/arch/x86/vdso/ return &gate_vma; return NULL; } -diff -urNp linux-2.6.39/arch/x86/vdso/vdso.lds.S linux-2.6.39/arch/x86/v= dso/vdso.lds.S ---- linux-2.6.39/arch/x86/vdso/vdso.lds.S 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/vdso/vdso.lds.S 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/vdso/vdso.lds.S linux-2.6.39.1/arch/x= 86/vdso/vdso.lds.S +--- linux-2.6.39.1/arch/x86/vdso/vdso.lds.S 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/vdso/vdso.lds.S 2011-06-04 10:15:38.00000000= 0 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK =3D VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x =3D vdso_ ## x; #include "vextern.h" #undef VEXTERN + +#define VEXTERN(x) VDSO64_ ## x =3D __vdso_ ## x; -+VEXTERN(fallback_gettimeofday) -+VEXTERN(fallback_time) ++VEXTERN(gettimeofday) ++VEXTERN(clock_gettime) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.39/arch/x86/vdso/vextern.h linux-2.6.39/arch/x86/vd= so/vextern.h ---- linux-2.6.39/arch/x86/vdso/vextern.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/vdso/vextern.h 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/vdso/vextern.h linux-2.6.39.1/arch/x8= 6/vdso/vextern.h +--- linux-2.6.39.1/arch/x86/vdso/vextern.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/vdso/vextern.h 2011-05-22 19:36:30.000000000= -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ @@ -23897,9 +23921,9 @@ diff -urNp linux-2.6.39/arch/x86/vdso/vextern.h l= inux-2.6.39/arch/x86/vdso/vexte -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.39/arch/x86/vdso/vma.c linux-2.6.39/arch/x86/vdso/v= ma.c ---- linux-2.6.39/arch/x86/vdso/vma.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/vdso/vma.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/vdso/vma.c linux-2.6.39.1/arch/x86/vd= so/vma.c +--- linux-2.6.39.1/arch/x86/vdso/vma.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/arch/x86/vdso/vma.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -23938,9 +23962,9 @@ diff -urNp linux-2.6.39/arch/x86/vdso/vma.c linux= -2.6.39/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=3D", vdso_setup); -diff -urNp linux-2.6.39/arch/x86/xen/enlighten.c linux-2.6.39/arch/x86/x= en/enlighten.c ---- linux-2.6.39/arch/x86/xen/enlighten.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/arch/x86/xen/enlighten.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/arch/x86/xen/enlighten.c linux-2.6.39.1/arch/x= 86/xen/enlighten.c +--- linux-2.6.39.1/arch/x86/xen/enlighten.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/arch/x86/xen/enlighten.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); =20 struct shared_info xen_dummy_shared_info; @@ -24013,9 +24037,9 @@ diff -urNp linux-2.6.39/arch/x86/xen/enlighten.c = linux-2.6.39/arch/x86/xen/enlig xen_smp_init(); =20 #ifdef CONFIG_ACPI_NUMA -diff -urNp linux-2.6.39/arch/x86/xen/mmu.c linux-2.6.39/arch/x86/xen/mmu= .c ---- linux-2.6.39/arch/x86/xen/mmu.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/xen/mmu.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/xen/mmu.c linux-2.6.39.1/arch/x86/xen= /mmu.c +--- linux-2.6.39.1/arch/x86/xen/mmu.c 2011-06-03 00:04:13.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/xen/mmu.c 2011-06-03 00:32:05.000000000 -040= 0 @@ -1791,6 +1791,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -24036,9 +24060,9 @@ diff -urNp linux-2.6.39/arch/x86/xen/mmu.c linux-= 2.6.39/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); =20 -diff -urNp linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.39/arch= /x86/xen/pci-swiotlb-xen.c ---- linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c 2011-05-22 19:36:30.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.39.1/= arch/x86/xen/pci-swiotlb-xen.c +--- linux-2.6.39.1/arch/x86/xen/pci-swiotlb-xen.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/arch/x86/xen/pci-swiotlb-xen.c 2011-05-22 19:36:30.00= 0000000 -0400 @@ -10,7 +10,7 @@ =20 int xen_swiotlb __read_mostly; @@ -24048,9 +24072,9 @@ diff -urNp linux-2.6.39/arch/x86/xen/pci-swiotlb-= xen.c linux-2.6.39/arch/x86/xen .mapping_error =3D xen_swiotlb_dma_mapping_error, .alloc_coherent =3D xen_swiotlb_alloc_coherent, .free_coherent =3D xen_swiotlb_free_coherent, -diff -urNp linux-2.6.39/arch/x86/xen/smp.c linux-2.6.39/arch/x86/xen/smp= .c ---- linux-2.6.39/arch/x86/xen/smp.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/arch/x86/xen/smp.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/arch/x86/xen/smp.c linux-2.6.39.1/arch/x86/xen= /smp.c +--- linux-2.6.39.1/arch/x86/xen/smp.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/arch/x86/xen/smp.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() !=3D 0); @@ -24095,9 +24119,9 @@ diff -urNp linux-2.6.39/arch/x86/xen/smp.c linux-= 2.6.39/arch/x86/xen/smp.c #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -diff -urNp linux-2.6.39/arch/x86/xen/xen-asm_32.S linux-2.6.39/arch/x86/= xen/xen-asm_32.S ---- linux-2.6.39/arch/x86/xen/xen-asm_32.S 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/arch/x86/xen/xen-asm_32.S 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/arch/x86/xen/xen-asm_32.S linux-2.6.39.1/arch/= x86/xen/xen-asm_32.S +--- linux-2.6.39.1/arch/x86/xen/xen-asm_32.S 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/arch/x86/xen/xen-asm_32.S 2011-05-22 19:36:30.0000000= 00 -0400 @@ -83,14 +83,14 @@ ENTRY(xen_iret) ESP_OFFSET=3D4 # bytes pushed onto stack =20 @@ -24119,9 +24143,9 @@ diff -urNp linux-2.6.39/arch/x86/xen/xen-asm_32.S= linux-2.6.39/arch/x86/xen/xen- #else movl xen_vcpu, %eax #endif -diff -urNp linux-2.6.39/arch/x86/xen/xen-head.S linux-2.6.39/arch/x86/xe= n/xen-head.S ---- linux-2.6.39/arch/x86/xen/xen-head.S 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/arch/x86/xen/xen-head.S 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/arch/x86/xen/xen-head.S linux-2.6.39.1/arch/x8= 6/xen/xen-head.S +--- linux-2.6.39.1/arch/x86/xen/xen-head.S 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/arch/x86/xen/xen-head.S 2011-05-22 19:36:30.000000000= -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -24140,9 +24164,9 @@ diff -urNp linux-2.6.39/arch/x86/xen/xen-head.S l= inux-2.6.39/arch/x86/xen/xen-he #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.39/arch/x86/xen/xen-ops.h linux-2.6.39/arch/x86/xen= /xen-ops.h ---- linux-2.6.39/arch/x86/xen/xen-ops.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/arch/x86/xen/xen-ops.h 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/arch/x86/xen/xen-ops.h linux-2.6.39.1/arch/x86= /xen/xen-ops.h +--- linux-2.6.39.1/arch/x86/xen/xen-ops.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/arch/x86/xen/xen-ops.h 2011-05-22 19:36:30.000000000 = -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -24152,9 +24176,9 @@ diff -urNp linux-2.6.39/arch/x86/xen/xen-ops.h li= nux-2.6.39/arch/x86/xen/xen-ops struct trap_info; void xen_copy_trap_info(struct trap_info *traps); =20 -diff -urNp linux-2.6.39/block/blk-iopoll.c linux-2.6.39/block/blk-iopoll= .c ---- linux-2.6.39/block/blk-iopoll.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/block/blk-iopoll.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/block/blk-iopoll.c linux-2.6.39.1/block/blk-io= poll.c +--- linux-2.6.39.1/block/blk-iopoll.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/block/blk-iopoll.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -24164,9 +24188,9 @@ diff -urNp linux-2.6.39/block/blk-iopoll.c linux-= 2.6.39/block/blk-iopoll.c { struct list_head *list =3D &__get_cpu_var(blk_cpu_iopoll); int rearm =3D 0, budget =3D blk_iopoll_budget; -diff -urNp linux-2.6.39/block/blk-map.c linux-2.6.39/block/blk-map.c ---- linux-2.6.39/block/blk-map.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/block/blk-map.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/block/blk-map.c linux-2.6.39.1/block/blk-map.c +--- linux-2.6.39.1/block/blk-map.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/block/blk-map.c 2011-05-22 19:36:30.000000000 -0400 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue if (!len || !kbuf) return -EINVAL; @@ -24176,9 +24200,9 @@ diff -urNp linux-2.6.39/block/blk-map.c linux-2.6= .39/block/blk-map.c if (do_copy) bio =3D bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.39/block/blk-softirq.c linux-2.6.39/block/blk-softi= rq.c ---- linux-2.6.39/block/blk-softirq.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/block/blk-softirq.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/block/blk-softirq.c linux-2.6.39.1/block/blk-s= oftirq.c +--- linux-2.6.39.1/block/blk-softirq.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/block/blk-softirq.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,=20 * Softirq action handler - move entries to local list and loop over th= em * while passing them to the queue registered handler. @@ -24188,9 +24212,9 @@ diff -urNp linux-2.6.39/block/blk-softirq.c linux= -2.6.39/block/blk-softirq.c { struct list_head *cpu_list, local_list; =20 -diff -urNp linux-2.6.39/block/bsg.c linux-2.6.39/block/bsg.c ---- linux-2.6.39/block/bsg.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/block/bsg.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/block/bsg.c linux-2.6.39.1/block/bsg.c +--- linux-2.6.39.1/block/bsg.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/block/bsg.c 2011-05-22 19:36:30.000000000 -0400 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) @@ -24218,9 +24242,9 @@ diff -urNp linux-2.6.39/block/bsg.c linux-2.6.39/= block/bsg.c if (hdr->subprotocol =3D=3D BSG_SUB_PROTOCOL_SCSI_CMD) { if (blk_verify_command(rq->cmd, has_write_perm)) return -EPERM; -diff -urNp linux-2.6.39/block/scsi_ioctl.c linux-2.6.39/block/scsi_ioctl= .c ---- linux-2.6.39/block/scsi_ioctl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/block/scsi_ioctl.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/block/scsi_ioctl.c linux-2.6.39.1/block/scsi_i= octl.c +--- linux-2.6.39.1/block/scsi_ioctl.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/block/scsi_ioctl.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *r= q, struct sg_io_hdr *hdr, fmode_t mode) @@ -24272,9 +24296,9 @@ diff -urNp linux-2.6.39/block/scsi_ioctl.c linux-= 2.6.39/block/scsi_ioctl.c if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; =20 -diff -urNp linux-2.6.39/crypto/serpent.c linux-2.6.39/crypto/serpent.c ---- linux-2.6.39/crypto/serpent.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/crypto/serpent.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/crypto/serpent.c linux-2.6.39.1/crypto/serpent= .c +--- linux-2.6.39.1/crypto/serpent.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/crypto/serpent.c 2011-05-22 19:36:30.000000000 -0400 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_ u32 r0,r1,r2,r3,r4; int i; @@ -24284,9 +24308,9 @@ diff -urNp linux-2.6.39/crypto/serpent.c linux-2.= 6.39/crypto/serpent.c /* Copy key, add padding */ =20 for (i =3D 0; i < keylen; ++i) -diff -urNp linux-2.6.39/Documentation/dontdiff linux-2.6.39/Documentatio= n/dontdiff ---- linux-2.6.39/Documentation/dontdiff 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/Documentation/dontdiff 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/Documentation/dontdiff linux-2.6.39.1/Document= ation/dontdiff +--- linux-2.6.39.1/Documentation/dontdiff 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/Documentation/dontdiff 2011-05-22 19:36:30.000000000 = -0400 @@ -1,13 +1,16 @@ *.a *.aux @@ -24426,9 +24450,9 @@ diff -urNp linux-2.6.39/Documentation/dontdiff li= nux-2.6.39/Documentation/dontdi wakeup.bin wakeup.elf wakeup.lds -diff -urNp linux-2.6.39/Documentation/filesystems/configfs/configfs_exam= ple_macros.c linux-2.6.39/Documentation/filesystems/configfs/configfs_exa= mple_macros.c ---- linux-2.6.39/Documentation/filesystems/configfs/configfs_example_mac= ros.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/Documentation/filesystems/configfs/configfs_example_mac= ros.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/Documentation/filesystems/configfs/configfs_ex= ample_macros.c linux-2.6.39.1/Documentation/filesystems/configfs/configfs= _example_macros.c +--- linux-2.6.39.1/Documentation/filesystems/configfs/configfs_example_m= acros.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/Documentation/filesystems/configfs/configfs_example_m= acros.c 2011-05-22 19:36:30.000000000 -0400 @@ -368,7 +368,7 @@ static struct configfs_item_operations g * Note that, since no extra work is required on ->drop_item(), * no ->drop_item() is provided. @@ -24438,9 +24462,9 @@ diff -urNp linux-2.6.39/Documentation/filesystems= /configfs/configfs_example_macr .make_group =3D group_children_make_group, }; =20 -diff -urNp linux-2.6.39/Documentation/filesystems/sysfs.txt linux-2.6.39= /Documentation/filesystems/sysfs.txt ---- linux-2.6.39/Documentation/filesystems/sysfs.txt 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/Documentation/filesystems/sysfs.txt 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/Documentation/filesystems/sysfs.txt linux-2.6.= 39.1/Documentation/filesystems/sysfs.txt +--- linux-2.6.39.1/Documentation/filesystems/sysfs.txt 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/Documentation/filesystems/sysfs.txt 2011-05-22 19:36:= 30.000000000 -0400 @@ -125,8 +125,8 @@ set of sysfs operations for forwarding r show and store methods of the attribute owners.=20 =20 @@ -24452,9 +24476,9 @@ diff -urNp linux-2.6.39/Documentation/filesystems= /sysfs.txt linux-2.6.39/Documen }; =20 [ Subsystems should have already defined a struct kobj_type as a -diff -urNp linux-2.6.39/Documentation/kernel-parameters.txt linux-2.6.39= /Documentation/kernel-parameters.txt ---- linux-2.6.39/Documentation/kernel-parameters.txt 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/Documentation/kernel-parameters.txt 2011-05-22 19:36:30= .000000000 -0400 +diff -urNp linux-2.6.39.1/Documentation/kernel-parameters.txt linux-2.6.= 39.1/Documentation/kernel-parameters.txt +--- linux-2.6.39.1/Documentation/kernel-parameters.txt 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/Documentation/kernel-parameters.txt 2011-05-22 19:36:= 30.000000000 -0400 @@ -1879,6 +1879,13 @@ bytes respectively. Such letter suffixes the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -24469,9 +24493,9 @@ diff -urNp linux-2.6.39/Documentation/kernel-para= meters.txt linux-2.6.39/Documen pcbit=3D [HW,ISDN] =20 pcd. [PARIDE] -diff -urNp linux-2.6.39/drivers/acpi/acpi_ipmi.c linux-2.6.39/drivers/ac= pi/acpi_ipmi.c ---- linux-2.6.39/drivers/acpi/acpi_ipmi.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/acpi/acpi_ipmi.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/acpi_ipmi.c linux-2.6.39.1/driver= s/acpi/acpi_ipmi.c +--- linux-2.6.39.1/drivers/acpi/acpi_ipmi.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/acpi/acpi_ipmi.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -70,7 +70,7 @@ struct acpi_ipmi_device { struct ipmi_driver_data { struct list_head ipmi_devices; @@ -24481,9 +24505,9 @@ diff -urNp linux-2.6.39/drivers/acpi/acpi_ipmi.c = linux-2.6.39/drivers/acpi/acpi_ struct mutex ipmi_lock; }; =20 -diff -urNp linux-2.6.39/drivers/acpi/apei/cper.c linux-2.6.39/drivers/ac= pi/apei/cper.c ---- linux-2.6.39/drivers/acpi/apei/cper.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/acpi/apei/cper.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/apei/cper.c linux-2.6.39.1/driver= s/acpi/apei/cper.c +--- linux-2.6.39.1/drivers/acpi/apei/cper.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/acpi/apei/cper.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -38,12 +38,12 @@ */ u64 cper_next_record_id(void) @@ -24501,9 +24525,9 @@ diff -urNp linux-2.6.39/drivers/acpi/apei/cper.c = linux-2.6.39/drivers/acpi/apei/ } EXPORT_SYMBOL_GPL(cper_next_record_id); =20 -diff -urNp linux-2.6.39/drivers/acpi/battery.c linux-2.6.39/drivers/acpi= /battery.c ---- linux-2.6.39/drivers/acpi/battery.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/acpi/battery.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/acpi/battery.c linux-2.6.39.1/drivers/= acpi/battery.c +--- linux-2.6.39.1/drivers/acpi/battery.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/acpi/battery.c 2011-05-22 19:36:30.000000000 = -0400 @@ -864,7 +864,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } =20 @@ -24513,9 +24537,9 @@ diff -urNp linux-2.6.39/drivers/acpi/battery.c li= nux-2.6.39/drivers/acpi/battery mode_t mode; const char *name; } acpi_battery_file[] =3D { -diff -urNp linux-2.6.39/drivers/acpi/dock.c linux-2.6.39/drivers/acpi/do= ck.c ---- linux-2.6.39/drivers/acpi/dock.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/acpi/dock.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/dock.c linux-2.6.39.1/drivers/acp= i/dock.c +--- linux-2.6.39.1/drivers/acpi/dock.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/acpi/dock.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -24534,9 +24558,9 @@ diff -urNp linux-2.6.39/drivers/acpi/dock.c linux= -2.6.39/drivers/acpi/dock.c void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.39/drivers/acpi/ec_sys.c linux-2.6.39/drivers/acpi/= ec_sys.c ---- linux-2.6.39/drivers/acpi/ec_sys.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/acpi/ec_sys.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/acpi/ec_sys.c linux-2.6.39.1/drivers/a= cpi/ec_sys.c +--- linux-2.6.39.1/drivers/acpi/ec_sys.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/acpi/ec_sys.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -92,7 +92,7 @@ static ssize_t acpi_ec_write_io(struct f return count; } @@ -24546,9 +24570,9 @@ diff -urNp linux-2.6.39/drivers/acpi/ec_sys.c lin= ux-2.6.39/drivers/acpi/ec_sys.c .owner =3D THIS_MODULE, .open =3D acpi_ec_open_io, .read =3D acpi_ec_read_io, -diff -urNp linux-2.6.39/drivers/acpi/fan.c linux-2.6.39/drivers/acpi/fan= .c ---- linux-2.6.39/drivers/acpi/fan.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/acpi/fan.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/fan.c linux-2.6.39.1/drivers/acpi= /fan.c +--- linux-2.6.39.1/drivers/acpi/fan.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/acpi/fan.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -110,7 +110,7 @@ fan_set_cur_state(struct thermal_cooling return result; } @@ -24558,9 +24582,9 @@ diff -urNp linux-2.6.39/drivers/acpi/fan.c linux-= 2.6.39/drivers/acpi/fan.c .get_max_state =3D fan_get_max_state, .get_cur_state =3D fan_get_cur_state, .set_cur_state =3D fan_set_cur_state, -diff -urNp linux-2.6.39/drivers/acpi/power_meter.c linux-2.6.39/drivers/= acpi/power_meter.c ---- linux-2.6.39/drivers/acpi/power_meter.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/acpi/power_meter.c 2011-05-22 19:36:30.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/power_meter.c linux-2.6.39.1/driv= ers/acpi/power_meter.c +--- linux-2.6.39.1/drivers/acpi/power_meter.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/acpi/power_meter.c 2011-05-22 19:36:30.000000= 000 -0400 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d return res; =20 @@ -24570,9 +24594,9 @@ diff -urNp linux-2.6.39/drivers/acpi/power_meter.= c linux-2.6.39/drivers/acpi/pow =20 mutex_lock(&resource->lock); resource->trip[attr->index - 7] =3D temp; -diff -urNp linux-2.6.39/drivers/acpi/proc.c linux-2.6.39/drivers/acpi/pr= oc.c ---- linux-2.6.39/drivers/acpi/proc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/acpi/proc.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/proc.c linux-2.6.39.1/drivers/acp= i/proc.c +--- linux-2.6.39.1/drivers/acpi/proc.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/acpi/proc.c 2011-05-22 19:36:30.000000000 -04= 00 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -24607,9 +24631,9 @@ diff -urNp linux-2.6.39/drivers/acpi/proc.c linux= -2.6.39/drivers/acpi/proc.c if (device_can_wakeup(&dev->dev)) { bool enable =3D !device_may_wakeup(&dev->dev); device_set_wakeup_enable(&dev->dev, enable); -diff -urNp linux-2.6.39/drivers/acpi/processor_driver.c linux-2.6.39/dri= vers/acpi/processor_driver.c ---- linux-2.6.39/drivers/acpi/processor_driver.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/acpi/processor_driver.c 2011-05-22 19:36:30.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/processor_driver.c linux-2.6.39.1= /drivers/acpi/processor_driver.c +--- linux-2.6.39.1/drivers/acpi/processor_driver.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/acpi/processor_driver.c 2011-05-22 19:36:30.0= 00000000 -0400 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add( return 0; #endif @@ -24619,9 +24643,9 @@ diff -urNp linux-2.6.39/drivers/acpi/processor_dr= iver.c linux-2.6.39/drivers/acp =20 /* * Buggy BIOS check -diff -urNp linux-2.6.39/drivers/acpi/processor_idle.c linux-2.6.39/drive= rs/acpi/processor_idle.c ---- linux-2.6.39/drivers/acpi/processor_idle.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/acpi/processor_idle.c 2011-05-22 19:36:30.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/processor_idle.c linux-2.6.39.1/d= rivers/acpi/processor_idle.c +--- linux-2.6.39.1/drivers/acpi/processor_idle.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/acpi/processor_idle.c 2011-05-22 19:36:30.000= 000000 -0400 @@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, @@ -24631,9 +24655,9 @@ diff -urNp linux-2.6.39/drivers/acpi/processor_id= le.c linux-2.6.39/drivers/acpi/ }; =20 =20 -diff -urNp linux-2.6.39/drivers/acpi/processor_thermal.c linux-2.6.39/dr= ivers/acpi/processor_thermal.c ---- linux-2.6.39/drivers/acpi/processor_thermal.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/acpi/processor_thermal.c 2011-05-22 19:36:30.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/acpi/processor_thermal.c linux-2.6.39.= 1/drivers/acpi/processor_thermal.c +--- linux-2.6.39.1/drivers/acpi/processor_thermal.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/acpi/processor_thermal.c 2011-05-22 19:36:30.= 000000000 -0400 @@ -244,7 +244,7 @@ processor_set_cur_state(struct thermal_c return result; } @@ -24643,9 +24667,9 @@ diff -urNp linux-2.6.39/drivers/acpi/processor_th= ermal.c linux-2.6.39/drivers/ac .get_max_state =3D processor_get_max_state, .get_cur_state =3D processor_get_cur_state, .set_cur_state =3D processor_set_cur_state, -diff -urNp linux-2.6.39/drivers/acpi/sysfs.c linux-2.6.39/drivers/acpi/s= ysfs.c ---- linux-2.6.39/drivers/acpi/sysfs.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/acpi/sysfs.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/acpi/sysfs.c linux-2.6.39.1/drivers/ac= pi/sysfs.c +--- linux-2.6.39.1/drivers/acpi/sysfs.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/acpi/sysfs.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -149,12 +149,12 @@ static int param_get_debug_level(char *b return result; } @@ -24661,9 +24685,9 @@ diff -urNp linux-2.6.39/drivers/acpi/sysfs.c linu= x-2.6.39/drivers/acpi/sysfs.c .set =3D param_set_uint, .get =3D param_get_debug_level, }; -diff -urNp linux-2.6.39/drivers/acpi/thermal.c linux-2.6.39/drivers/acpi= /thermal.c ---- linux-2.6.39/drivers/acpi/thermal.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/acpi/thermal.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/acpi/thermal.c linux-2.6.39.1/drivers/= acpi/thermal.c +--- linux-2.6.39.1/drivers/acpi/thermal.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/acpi/thermal.c 2011-05-22 19:36:30.000000000 = -0400 @@ -812,7 +812,7 @@ acpi_thermal_unbind_cooling_device(struc thermal_zone_unbind_cooling_device); } @@ -24673,9 +24697,9 @@ diff -urNp linux-2.6.39/drivers/acpi/thermal.c li= nux-2.6.39/drivers/acpi/thermal .bind =3D acpi_thermal_bind_cooling_device, .unbind =3D acpi_thermal_unbind_cooling_device, .get_temp =3D thermal_get_temp, -diff -urNp linux-2.6.39/drivers/acpi/video.c linux-2.6.39/drivers/acpi/v= ideo.c ---- linux-2.6.39/drivers/acpi/video.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/acpi/video.c 2011-05-22 19:36:30.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/acpi/video.c linux-2.6.39.1/drivers/ac= pi/video.c +--- linux-2.6.39.1/drivers/acpi/video.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/acpi/video.c 2011-05-22 19:36:30.000000000 -0= 400 @@ -308,7 +308,7 @@ video_set_cur_state(struct thermal_cooli return acpi_video_device_lcd_set_level(video, level); } @@ -24685,9 +24709,9 @@ diff -urNp linux-2.6.39/drivers/acpi/video.c linu= x-2.6.39/drivers/acpi/video.c .get_max_state =3D video_get_max_state, .get_cur_state =3D video_get_cur_state, .set_cur_state =3D video_set_cur_state, -diff -urNp linux-2.6.39/drivers/ata/acard-ahci.c linux-2.6.39/drivers/at= a/acard-ahci.c ---- linux-2.6.39/drivers/ata/acard-ahci.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/acard-ahci.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/acard-ahci.c linux-2.6.39.1/driver= s/ata/acard-ahci.c +--- linux-2.6.39.1/drivers/ata/acard-ahci.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/acard-ahci.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -87,7 +87,7 @@ static struct scsi_host_template acard_a AHCI_SHT("acard-ahci"), }; @@ -24697,9 +24721,9 @@ diff -urNp linux-2.6.39/drivers/ata/acard-ahci.c = linux-2.6.39/drivers/ata/acard- .inherits =3D &ahci_ops, .qc_prep =3D acard_ahci_qc_prep, .qc_fill_rtf =3D acard_ahci_qc_fill_rtf, -diff -urNp linux-2.6.39/drivers/ata/ahci.c linux-2.6.39/drivers/ata/ahci= .c ---- linux-2.6.39/drivers/ata/ahci.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/ata/ahci.c 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/ahci.c linux-2.6.39.1/drivers/ata/= ahci.c +--- linux-2.6.39.1/drivers/ata/ahci.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/ata/ahci.c 2011-05-22 19:36:30.000000000 -040= 0 @@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh AHCI_SHT("ahci"), }; @@ -24721,9 +24745,9 @@ diff -urNp linux-2.6.39/drivers/ata/ahci.c linux-= 2.6.39/drivers/ata/ahci.c .inherits =3D &ahci_ops, .softreset =3D ahci_sb600_softreset, .pmp_softreset =3D ahci_sb600_softreset, -diff -urNp linux-2.6.39/drivers/ata/ahci.h linux-2.6.39/drivers/ata/ahci= .h ---- linux-2.6.39/drivers/ata/ahci.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/ata/ahci.h 2011-05-22 19:36:30.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/ahci.h linux-2.6.39.1/drivers/ata/= ahci.h +--- linux-2.6.39.1/drivers/ata/ahci.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/ata/ahci.h 2011-05-22 19:36:30.000000000 -040= 0 @@ -311,7 +311,7 @@ extern struct device_attribute *ahci_sde .shost_attrs =3D ahci_shost_attrs, \ .sdev_attrs =3D ahci_sdev_attrs @@ -24733,9 +24757,9 @@ diff -urNp linux-2.6.39/drivers/ata/ahci.h linux-= 2.6.39/drivers/ata/ahci.h =20 void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, u32 opts); -diff -urNp linux-2.6.39/drivers/ata/ata_generic.c linux-2.6.39/drivers/a= ta/ata_generic.c ---- linux-2.6.39/drivers/ata/ata_generic.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/ata_generic.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/ata_generic.c linux-2.6.39.1/drive= rs/ata/ata_generic.c +--- linux-2.6.39.1/drivers/ata/ata_generic.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/ata_generic.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -101,7 +101,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -24745,9 +24769,9 @@ diff -urNp linux-2.6.39/drivers/ata/ata_generic.c= linux-2.6.39/drivers/ata/ata_g .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_mode =3D generic_set_mode, -diff -urNp linux-2.6.39/drivers/ata/ata_piix.c linux-2.6.39/drivers/ata/= ata_piix.c ---- linux-2.6.39/drivers/ata/ata_piix.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/ata_piix.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/ata_piix.c linux-2.6.39.1/drivers/= ata/ata_piix.c +--- linux-2.6.39.1/drivers/ata/ata_piix.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/ata_piix.c 2011-05-22 19:36:30.000000000 = -0400 @@ -335,12 +335,12 @@ static struct scsi_host_template piix_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -24787,9 +24811,9 @@ diff -urNp linux-2.6.39/drivers/ata/ata_piix.c li= nux-2.6.39/drivers/ata/ata_piix .inherits =3D &piix_sata_ops, .hardreset =3D sata_std_hardreset, .scr_read =3D piix_sidpr_scr_read, -diff -urNp linux-2.6.39/drivers/ata/libahci.c linux-2.6.39/drivers/ata/l= ibahci.c ---- linux-2.6.39/drivers/ata/libahci.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/ata/libahci.c 2011-05-22 19:36:30.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/ata/libahci.c linux-2.6.39.1/drivers/a= ta/libahci.c +--- linux-2.6.39.1/drivers/ata/libahci.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/ata/libahci.c 2011-05-22 19:36:30.000000000 -= 0400 @@ -141,7 +141,7 @@ struct device_attribute *ahci_sdev_attrs }; EXPORT_SYMBOL_GPL(ahci_sdev_attrs); @@ -24799,9 +24823,9 @@ diff -urNp linux-2.6.39/drivers/ata/libahci.c lin= ux-2.6.39/drivers/ata/libahci.c .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D ahci_pmp_qc_defer, -diff -urNp linux-2.6.39/drivers/ata/libata-acpi.c linux-2.6.39/drivers/a= ta/libata-acpi.c ---- linux-2.6.39/drivers/ata/libata-acpi.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/libata-acpi.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/libata-acpi.c linux-2.6.39.1/drive= rs/ata/libata-acpi.c +--- linux-2.6.39.1/drivers/ata/libata-acpi.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/libata-acpi.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -24817,9 +24841,9 @@ diff -urNp linux-2.6.39/drivers/ata/libata-acpi.c= linux-2.6.39/drivers/ata/libat .handler =3D ata_acpi_ap_notify_dock, .uevent =3D ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.39/drivers/ata/libata-core.c linux-2.6.39/drivers/a= ta/libata-core.c ---- linux-2.6.39/drivers/ata/libata-core.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/libata-core.c 2011-05-22 19:36:30.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/libata-core.c linux-2.6.39.1/drive= rs/ata/libata-core.c +--- linux-2.6.39.1/drivers/ata/libata-core.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/libata-core.c 2011-05-22 19:36:30.0000000= 00 -0400 @@ -4747,7 +4747,7 @@ void ata_qc_free(struct ata_queued_cmd * struct ata_port *ap; unsigned int tag; @@ -24884,9 +24908,9 @@ diff -urNp linux-2.6.39/drivers/ata/libata-core.c= linux-2.6.39/drivers/ata/libat .qc_prep =3D ata_noop_qc_prep, .qc_issue =3D ata_dummy_qc_issue, .error_handler =3D ata_dummy_error_handler, -diff -urNp linux-2.6.39/drivers/ata/libata-eh.c linux-2.6.39/drivers/ata= /libata-eh.c ---- linux-2.6.39/drivers/ata/libata-eh.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/ata/libata-eh.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/ata/libata-eh.c linux-2.6.39.1/drivers= /ata/libata-eh.c +--- linux-2.6.39.1/drivers/ata/libata-eh.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/ata/libata-eh.c 2011-05-22 19:36:30.000000000= -0400 @@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap) { struct ata_link *link; @@ -24905,9 +24929,9 @@ diff -urNp linux-2.6.39/drivers/ata/libata-eh.c l= inux-2.6.39/drivers/ata/libata- ata_reset_fn_t hardreset =3D ops->hardreset; =20 /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.39/drivers/ata/libata-pmp.c linux-2.6.39/drivers/at= a/libata-pmp.c ---- linux-2.6.39/drivers/ata/libata-pmp.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/libata-pmp.c 2011-05-22 19:36:30.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/libata-pmp.c linux-2.6.39.1/driver= s/ata/libata-pmp.c +--- linux-2.6.39.1/drivers/ata/libata-pmp.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/libata-pmp.c 2011-05-22 19:36:30.00000000= 0 -0400 @@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -24917,9 +24941,9 @@ diff -urNp linux-2.6.39/drivers/ata/libata-pmp.c = linux-2.6.39/drivers/ata/libata int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link =3D &ap->link; struct ata_device *pmp_dev =3D pmp_link->device; -diff -urNp linux-2.6.39/drivers/ata/pata_acpi.c linux-2.6.39/drivers/ata= /pata_acpi.c ---- linux-2.6.39/drivers/ata/pata_acpi.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/ata/pata_acpi.c 2011-05-22 19:36:30.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_acpi.c linux-2.6.39.1/drivers= /ata/pata_acpi.c +--- linux-2.6.39.1/drivers/ata/pata_acpi.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/ata/pata_acpi.c 2011-05-22 19:36:30.000000000= -0400 @@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -24929,9 +24953,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_acpi.c l= inux-2.6.39/drivers/ata/pata_ac .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D pacpi_qc_issue, .cable_detect =3D pacpi_cable_detect, -diff -urNp linux-2.6.39/drivers/ata/pata_ali.c linux-2.6.39/drivers/ata/= pata_ali.c ---- linux-2.6.39/drivers/ata/pata_ali.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_ali.c 2011-05-22 19:36:30.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_ali.c linux-2.6.39.1/drivers/= ata/pata_ali.c +--- linux-2.6.39.1/drivers/ata/pata_ali.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_ali.c 2011-05-22 19:36:30.000000000 = -0400 @@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -24977,9 +25001,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_ali.c li= nux-2.6.39/drivers/ata/pata_ali .inherits =3D &ali_dma_base_ops, .check_atapi_dma =3D ali_check_atapi_dma, .dev_config =3D ali_warn_atapi_dma, -diff -urNp linux-2.6.39/drivers/ata/pata_amd.c linux-2.6.39/drivers/ata/= pata_amd.c ---- linux-2.6.39/drivers/ata/pata_amd.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_amd.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_amd.c linux-2.6.39.1/drivers/= ata/pata_amd.c +--- linux-2.6.39.1/drivers/ata/pata_amd.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_amd.c 2011-05-22 19:36:31.000000000 = -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations=20 .prereset =3D amd_pre_reset, }; @@ -25029,9 +25053,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_amd.c li= nux-2.6.39/drivers/ata/pata_amd .inherits =3D &nv_base_port_ops, .set_piomode =3D nv133_set_piomode, .set_dmamode =3D nv133_set_dmamode, -diff -urNp linux-2.6.39/drivers/ata/pata_arasan_cf.c linux-2.6.39/driver= s/ata/pata_arasan_cf.c ---- linux-2.6.39/drivers/ata/pata_arasan_cf.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/ata/pata_arasan_cf.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_arasan_cf.c linux-2.6.39.1/dr= ivers/ata/pata_arasan_cf.c +--- linux-2.6.39.1/drivers/ata/pata_arasan_cf.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_arasan_cf.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str /* Handle platform specific quirks */ if (pdata->quirk) { @@ -25043,9 +25067,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_arasan_c= f.c linux-2.6.39/drivers/ata/pa ap->pio_mask =3D 0; } if (pdata->quirk & CF_BROKEN_MWDMA) -diff -urNp linux-2.6.39/drivers/ata/pata_artop.c linux-2.6.39/drivers/at= a/pata_artop.c ---- linux-2.6.39/drivers/ata/pata_artop.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/pata_artop.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_artop.c linux-2.6.39.1/driver= s/ata/pata_artop.c +--- linux-2.6.39.1/drivers/ata/pata_artop.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_artop.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -312,7 +312,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -25064,9 +25088,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_artop.c = linux-2.6.39/drivers/ata/pata_a .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D artop6260_cable_detect, .set_piomode =3D artop6260_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_at32.c linux-2.6.39/drivers/ata= /pata_at32.c ---- linux-2.6.39/drivers/ata/pata_at32.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/ata/pata_at32.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_at32.c linux-2.6.39.1/drivers= /ata/pata_at32.c +--- linux-2.6.39.1/drivers/ata/pata_at32.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/ata/pata_at32.c 2011-05-22 19:36:31.000000000= -0400 @@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -25076,9 +25100,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_at32.c l= inux-2.6.39/drivers/ata/pata_at .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D pata_at32_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_at91.c linux-2.6.39/drivers/ata= /pata_at91.c ---- linux-2.6.39/drivers/ata/pata_at91.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/ata/pata_at91.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_at91.c linux-2.6.39.1/drivers= /ata/pata_at91.c +--- linux-2.6.39.1/drivers/ata/pata_at91.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/ata/pata_at91.c 2011-05-22 19:36:31.000000000= -0400 @@ -212,7 +212,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -25088,9 +25112,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_at91.c l= inux-2.6.39/drivers/ata/pata_at .inherits =3D &ata_sff_port_ops, =20 .sff_data_xfer =3D pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.39/drivers/ata/pata_atiixp.c linux-2.6.39/drivers/a= ta/pata_atiixp.c ---- linux-2.6.39/drivers/ata/pata_atiixp.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_atiixp.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_atiixp.c linux-2.6.39.1/drive= rs/ata/pata_atiixp.c +--- linux-2.6.39.1/drivers/ata/pata_atiixp.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_atiixp.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -25100,9 +25124,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_atiixp.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, =20 .qc_prep =3D ata_bmdma_dumb_qc_prep, -diff -urNp linux-2.6.39/drivers/ata/pata_atp867x.c linux-2.6.39/drivers/= ata/pata_atp867x.c ---- linux-2.6.39/drivers/ata/pata_atp867x.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_atp867x.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_atp867x.c linux-2.6.39.1/driv= ers/ata/pata_atp867x.c +--- linux-2.6.39.1/drivers/ata/pata_atp867x.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_atp867x.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -275,7 +275,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -25112,9 +25136,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_atp867x.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D atp867x_cable_detect, .set_piomode =3D atp867x_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_bf54x.c linux-2.6.39/drivers/at= a/pata_bf54x.c ---- linux-2.6.39/drivers/ata/pata_bf54x.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/pata_bf54x.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_bf54x.c linux-2.6.39.1/driver= s/ata/pata_bf54x.c +--- linux-2.6.39.1/drivers/ata/pata_bf54x.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_bf54x.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -25124,9 +25148,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_bf54x.c = linux-2.6.39/drivers/ata/pata_b .inherits =3D &ata_bmdma_port_ops, =20 .set_piomode =3D bfin_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_cmd640.c linux-2.6.39/drivers/a= ta/pata_cmd640.c ---- linux-2.6.39/drivers/ata/pata_cmd640.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_cmd640.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_cmd640.c linux-2.6.39.1/drive= rs/ata/pata_cmd640.c +--- linux-2.6.39.1/drivers/ata/pata_cmd640.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_cmd640.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_ ATA_PIO_SHT(DRV_NAME), }; @@ -25136,10 +25160,10 @@ diff -urNp linux-2.6.39/drivers/ata/pata_cmd640= .c linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_sff_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer =3D ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.39/drivers/ata/pata_cmd64x.c linux-2.6.39/drivers/a= ta/pata_cmd64x.c ---- linux-2.6.39/drivers/ata/pata_cmd64x.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_cmd64x.c 2011-05-22 19:36:31.000000000= -0400 -@@ -268,18 +268,18 @@ static const struct ata_port_operations=20 +diff -urNp linux-2.6.39.1/drivers/ata/pata_cmd64x.c linux-2.6.39.1/drive= rs/ata/pata_cmd64x.c +--- linux-2.6.39.1/drivers/ata/pata_cmd64x.c 2011-06-03 00:04:13.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_cmd64x.c 2011-06-03 00:32:05.0000000= 00 -0400 +@@ -271,18 +271,18 @@ static const struct ata_port_operations=20 .set_dmamode =3D cmd64x_set_dmamode, }; =20 @@ -25161,9 +25185,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_cmd64x.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &cmd64x_base_ops, .bmdma_stop =3D cmd648_bmdma_stop, .cable_detect =3D cmd648_cable_detect, -diff -urNp linux-2.6.39/drivers/ata/pata_cs5520.c linux-2.6.39/drivers/a= ta/pata_cs5520.c ---- linux-2.6.39/drivers/ata/pata_cs5520.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_cs5520.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_cs5520.c linux-2.6.39.1/drive= rs/ata/pata_cs5520.c +--- linux-2.6.39.1/drivers/ata/pata_cs5520.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_cs5520.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -25173,9 +25197,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_cs5520.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, .qc_prep =3D ata_bmdma_dumb_qc_prep, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.39/drivers/ata/pata_cs5530.c linux-2.6.39/drivers/a= ta/pata_cs5530.c ---- linux-2.6.39/drivers/ata/pata_cs5530.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_cs5530.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_cs5530.c linux-2.6.39.1/drive= rs/ata/pata_cs5530.c +--- linux-2.6.39.1/drivers/ata/pata_cs5530.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_cs5530.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -25185,9 +25209,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_cs5530.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, =20 .qc_prep =3D ata_bmdma_dumb_qc_prep, -diff -urNp linux-2.6.39/drivers/ata/pata_cs5535.c linux-2.6.39/drivers/a= ta/pata_cs5535.c ---- linux-2.6.39/drivers/ata/pata_cs5535.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_cs5535.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_cs5535.c linux-2.6.39.1/drive= rs/ata/pata_cs5535.c +--- linux-2.6.39.1/drivers/ata/pata_cs5535.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_cs5535.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25197,9 +25221,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_cs5535.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D cs5535_cable_detect, .set_piomode =3D cs5535_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_cs5536.c linux-2.6.39/drivers/a= ta/pata_cs5536.c ---- linux-2.6.39/drivers/ata/pata_cs5536.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_cs5536.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_cs5536.c linux-2.6.39.1/drive= rs/ata/pata_cs5536.c +--- linux-2.6.39.1/drivers/ata/pata_cs5536.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_cs5536.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25209,9 +25233,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_cs5536.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma32_port_ops, .cable_detect =3D cs5536_cable_detect, .set_piomode =3D cs5536_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_cypress.c linux-2.6.39/drivers/= ata/pata_cypress.c ---- linux-2.6.39/drivers/ata/pata_cypress.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_cypress.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_cypress.c linux-2.6.39.1/driv= ers/ata/pata_cypress.c +--- linux-2.6.39.1/drivers/ata/pata_cypress.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_cypress.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -25221,9 +25245,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_cypress.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D cy82c693_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_efar.c linux-2.6.39/drivers/ata= /pata_efar.c ---- linux-2.6.39/drivers/ata/pata_efar.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/ata/pata_efar.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_efar.c linux-2.6.39.1/drivers= /ata/pata_efar.c +--- linux-2.6.39.1/drivers/ata/pata_efar.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/ata/pata_efar.c 2011-05-22 19:36:31.000000000= -0400 @@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -25233,9 +25257,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_efar.c l= inux-2.6.39/drivers/ata/pata_ef .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D efar_cable_detect, .set_piomode =3D efar_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_hpt366.c linux-2.6.39/drivers/a= ta/pata_hpt366.c ---- linux-2.6.39/drivers/ata/pata_hpt366.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_hpt366.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_hpt366.c linux-2.6.39.1/drive= rs/ata/pata_hpt366.c +--- linux-2.6.39.1/drivers/ata/pata_hpt366.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_hpt366.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -276,7 +276,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -25245,9 +25269,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_hpt366.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D hpt36x_cable_detect, .mode_filter =3D hpt366_filter, -diff -urNp linux-2.6.39/drivers/ata/pata_hpt37x.c linux-2.6.39/drivers/a= ta/pata_hpt37x.c ---- linux-2.6.39/drivers/ata/pata_hpt37x.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_hpt37x.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_hpt37x.c linux-2.6.39.1/drive= rs/ata/pata_hpt37x.c +--- linux-2.6.39.1/drivers/ata/pata_hpt37x.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_hpt37x.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -589,7 +589,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -25293,9 +25317,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_hpt37x.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &hpt372_port_ops, .cable_detect =3D hpt374_fn1_cable_detect, }; -diff -urNp linux-2.6.39/drivers/ata/pata_hpt3x2n.c linux-2.6.39/drivers/= ata/pata_hpt3x2n.c ---- linux-2.6.39/drivers/ata/pata_hpt3x2n.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_hpt3x2n.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_hpt3x2n.c linux-2.6.39.1/driv= ers/ata/pata_hpt3x2n.c +--- linux-2.6.39.1/drivers/ata/pata_hpt3x2n.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_hpt3x2n.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -350,7 +350,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT302N/371N. */ @@ -25314,9 +25338,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_hpt3x2n.= c linux-2.6.39/drivers/ata/pata .inherits =3D &hpt3xxn_port_ops, .mode_filter =3D &hpt372n_filter, }; -diff -urNp linux-2.6.39/drivers/ata/pata_hpt3x3.c linux-2.6.39/drivers/a= ta/pata_hpt3x3.c ---- linux-2.6.39/drivers/ata/pata_hpt3x3.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_hpt3x3.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_hpt3x3.c linux-2.6.39.1/drive= rs/ata/pata_hpt3x3.c +--- linux-2.6.39.1/drivers/ata/pata_hpt3x3.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_hpt3x3.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25326,9 +25350,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_hpt3x3.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D hpt3x3_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_icside.c linux-2.6.39/drivers/a= ta/pata_icside.c ---- linux-2.6.39/drivers/ata/pata_icside.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_icside.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_icside.c linux-2.6.39.1/drive= rs/ata/pata_icside.c +--- linux-2.6.39.1/drivers/ata/pata_icside.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_icside.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -320,7 +320,7 @@ static void pata_icside_postreset(struct } } @@ -25338,9 +25362,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_icside.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep =3D ata_noop_qc_prep, -diff -urNp linux-2.6.39/drivers/ata/pata_isapnp.c linux-2.6.39/drivers/a= ta/pata_isapnp.c ---- linux-2.6.39/drivers/ata/pata_isapnp.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_isapnp.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_isapnp.c linux-2.6.39.1/drive= rs/ata/pata_isapnp.c +--- linux-2.6.39.1/drivers/ata/pata_isapnp.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_isapnp.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -25356,9 +25380,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_isapnp.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.39/drivers/ata/pata_it8213.c linux-2.6.39/drivers/a= ta/pata_it8213.c ---- linux-2.6.39/drivers/ata/pata_it8213.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_it8213.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_it8213.c linux-2.6.39.1/drive= rs/ata/pata_it8213.c +--- linux-2.6.39.1/drivers/ata/pata_it8213.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_it8213.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_ }; =20 @@ -25368,9 +25392,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_it8213.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D it8213_cable_detect, .set_piomode =3D it8213_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_it821x.c linux-2.6.39/drivers/a= ta/pata_it821x.c ---- linux-2.6.39/drivers/ata/pata_it821x.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_it821x.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_it821x.c linux-2.6.39.1/drive= rs/ata/pata_it821x.c +--- linux-2.6.39.1/drivers/ata/pata_it821x.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_it821x.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -801,7 +801,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25398,9 +25422,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_it821x.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, =20 .check_atapi_dma=3D it821x_check_atapi_dma, -diff -urNp linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c linux-2.6.39/driver= s/ata/pata_ixp4xx_cf.c ---- linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_ixp4xx_cf.c linux-2.6.39.1/dr= ivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.39.1/drivers/ata/pata_ixp4xx_cf.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_ixp4xx_cf.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -25410,9 +25434,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_ixp4xx_c= f.c linux-2.6.39/drivers/ata/pa .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ixp4xx_mmio_data_xfer, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.39/drivers/ata/pata_jmicron.c linux-2.6.39/drivers/= ata/pata_jmicron.c ---- linux-2.6.39/drivers/ata/pata_jmicron.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_jmicron.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_jmicron.c linux-2.6.39.1/driv= ers/ata/pata_jmicron.c +--- linux-2.6.39.1/drivers/ata/pata_jmicron.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_jmicron.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -25422,9 +25446,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_jmicron.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .prereset =3D jmicron_pre_reset, }; -diff -urNp linux-2.6.39/drivers/ata/pata_legacy.c linux-2.6.39/drivers/a= ta/pata_legacy.c ---- linux-2.6.39/drivers/ata/pata_legacy.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_legacy.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_legacy.c linux-2.6.39.1/drive= rs/ata/pata_legacy.c +--- linux-2.6.39.1/drivers/ata/pata_legacy.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_legacy.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -116,7 +116,7 @@ struct legacy_probe { =20 struct legacy_controller { @@ -25536,9 +25560,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_legacy.c= linux-2.6.39/drivers/ata/pata_ struct legacy_data *ld =3D &legacy_data[probe->slot]; struct ata_host *host =3D NULL; struct ata_port *ap; -diff -urNp linux-2.6.39/drivers/ata/pata_macio.c linux-2.6.39/drivers/at= a/pata_macio.c ---- linux-2.6.39/drivers/ata/pata_macio.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/pata_macio.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_macio.c linux-2.6.39.1/driver= s/ata/pata_macio.c +--- linux-2.6.39.1/drivers/ata/pata_macio.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_macio.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma .slave_configure =3D pata_macio_slave_config, }; @@ -25550,9 +25574,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_macio.c = linux-2.6.39/drivers/ata/pata_m .freeze =3D pata_macio_freeze, .set_piomode =3D pata_macio_set_timings, .set_dmamode =3D pata_macio_set_timings, -diff -urNp linux-2.6.39/drivers/ata/pata_marvell.c linux-2.6.39/drivers/= ata/pata_marvell.c ---- linux-2.6.39/drivers/ata/pata_marvell.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_marvell.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_marvell.c linux-2.6.39.1/driv= ers/ata/pata_marvell.c +--- linux-2.6.39.1/drivers/ata/pata_marvell.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_marvell.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -25562,9 +25586,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_marvell.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D marvell_cable_detect, .prereset =3D marvell_pre_reset, -diff -urNp linux-2.6.39/drivers/ata/pata_mpc52xx.c linux-2.6.39/drivers/= ata/pata_mpc52xx.c ---- linux-2.6.39/drivers/ata/pata_mpc52xx.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_mpc52xx.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_mpc52xx.c linux-2.6.39.1/driv= ers/ata/pata_mpc52xx.c +--- linux-2.6.39.1/drivers/ata/pata_mpc52xx.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_mpc52xx.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -25574,9 +25598,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_mpc52xx.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .sff_dev_select =3D mpc52xx_ata_dev_select, .set_piomode =3D mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_mpiix.c linux-2.6.39/drivers/at= a/pata_mpiix.c ---- linux-2.6.39/drivers/ata/pata_mpiix.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/pata_mpiix.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_mpiix.c linux-2.6.39.1/driver= s/ata/pata_mpiix.c +--- linux-2.6.39.1/drivers/ata/pata_mpiix.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_mpiix.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -25586,9 +25610,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_mpiix.c = linux-2.6.39/drivers/ata/pata_m .inherits =3D &ata_sff_port_ops, .qc_issue =3D mpiix_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.39/drivers/ata/pata_netcell.c linux-2.6.39/drivers/= ata/pata_netcell.c ---- linux-2.6.39/drivers/ata/pata_netcell.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_netcell.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_netcell.c linux-2.6.39.1/driv= ers/ata/pata_netcell.c +--- linux-2.6.39.1/drivers/ata/pata_netcell.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_netcell.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -25598,9 +25622,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_netcell.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_80wire, .read_id =3D netcell_read_id, -diff -urNp linux-2.6.39/drivers/ata/pata_ninja32.c linux-2.6.39/drivers/= ata/pata_ninja32.c ---- linux-2.6.39/drivers/ata/pata_ninja32.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_ninja32.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_ninja32.c linux-2.6.39.1/driv= ers/ata/pata_ninja32.c +--- linux-2.6.39.1/drivers/ata/pata_ninja32.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_ninja32.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -25610,9 +25634,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_ninja32.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .sff_dev_select =3D ninja32_dev_select, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.39/drivers/ata/pata_ns87410.c linux-2.6.39/drivers/= ata/pata_ns87410.c ---- linux-2.6.39/drivers/ata/pata_ns87410.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_ns87410.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_ns87410.c linux-2.6.39.1/driv= ers/ata/pata_ns87410.c +--- linux-2.6.39.1/drivers/ata/pata_ns87410.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_ns87410.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -25622,9 +25646,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_ns87410.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_sff_port_ops, .qc_issue =3D ns87410_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.39/drivers/ata/pata_ns87415.c linux-2.6.39/drivers/= ata/pata_ns87415.c ---- linux-2.6.39/drivers/ata/pata_ns87415.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_ns87415.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_ns87415.c linux-2.6.39.1/driv= ers/ata/pata_ns87415.c +--- linux-2.6.39.1/drivers/ata/pata_ns87415.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_ns87415.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -25643,9 +25667,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_ns87415.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ns87415_pata_ops, .sff_tf_read =3D ns87560_tf_read, .sff_check_status =3D ns87560_check_status, -diff -urNp linux-2.6.39/drivers/ata/pata_octeon_cf.c linux-2.6.39/driver= s/ata/pata_octeon_cf.c ---- linux-2.6.39/drivers/ata/pata_octeon_cf.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/ata/pata_octeon_cf.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_octeon_cf.c linux-2.6.39.1/dr= ivers/ata/pata_octeon_cf.c +--- linux-2.6.39.1/drivers/ata/pata_octeon_cf.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_octeon_cf.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -25655,9 +25679,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_octeon_c= f.c linux-2.6.39/drivers/ata/pa .inherits =3D &ata_sff_port_ops, .check_atapi_dma =3D octeon_cf_check_atapi_dma, .qc_prep =3D ata_noop_qc_prep, -diff -urNp linux-2.6.39/drivers/ata/pata_oldpiix.c linux-2.6.39/drivers/= ata/pata_oldpiix.c ---- linux-2.6.39/drivers/ata/pata_oldpiix.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_oldpiix.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_oldpiix.c linux-2.6.39.1/driv= ers/ata/pata_oldpiix.c +--- linux-2.6.39.1/drivers/ata/pata_oldpiix.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_oldpiix.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -25667,9 +25691,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_oldpiix.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D oldpiix_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.39/drivers/ata/pata_opti.c linux-2.6.39/drivers/ata= /pata_opti.c ---- linux-2.6.39/drivers/ata/pata_opti.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/ata/pata_opti.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_opti.c linux-2.6.39.1/drivers= /ata/pata_opti.c +--- linux-2.6.39.1/drivers/ata/pata_opti.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/ata/pata_opti.c 2011-05-22 19:36:31.000000000= -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -25679,9 +25703,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_opti.c l= inux-2.6.39/drivers/ata/pata_op .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D opti_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_optidma.c linux-2.6.39/drivers/= ata/pata_optidma.c ---- linux-2.6.39/drivers/ata/pata_optidma.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_optidma.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_optidma.c linux-2.6.39.1/driv= ers/ata/pata_optidma.c +--- linux-2.6.39.1/drivers/ata/pata_optidma.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_optidma.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -25700,9 +25724,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_optidma.= c linux-2.6.39/drivers/ata/pata .inherits =3D &optidma_port_ops, .set_piomode =3D optiplus_set_pio_mode, .set_dmamode =3D optiplus_set_dma_mode, -diff -urNp linux-2.6.39/drivers/ata/pata_palmld.c linux-2.6.39/drivers/a= ta/pata_palmld.c ---- linux-2.6.39/drivers/ata/pata_palmld.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_palmld.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_palmld.c linux-2.6.39.1/drive= rs/ata/pata_palmld.c +--- linux-2.6.39.1/drivers/ata/pata_palmld.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_palmld.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -42,7 +42,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -25712,9 +25736,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_palmld.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.39/drivers/ata/pata_pcmcia.c linux-2.6.39/drivers/a= ta/pata_pcmcia.c ---- linux-2.6.39/drivers/ata/pata_pcmcia.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_pcmcia.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_pcmcia.c linux-2.6.39.1/drive= rs/ata/pata_pcmcia.c +--- linux-2.6.39.1/drivers/ata/pata_pcmcia.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_pcmcia.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -25741,9 +25765,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_pcmcia.c= linux-2.6.39/drivers/ata/pata_ =20 /* Set up attributes in order to probe card and get resources */ pdev->config_flags |=3D CONF_ENABLE_IRQ | CONF_AUTO_SET_IO | -diff -urNp linux-2.6.39/drivers/ata/pata_pdc2027x.c linux-2.6.39/drivers= /ata/pata_pdc2027x.c ---- linux-2.6.39/drivers/ata/pata_pdc2027x.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/ata/pata_pdc2027x.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_pdc2027x.c linux-2.6.39.1/dri= vers/ata/pata_pdc2027x.c +--- linux-2.6.39.1/drivers/ata/pata_pdc2027x.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_pdc2027x.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -25761,9 +25785,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_pdc2027x= .c linux-2.6.39/drivers/ata/pat .inherits =3D &pdc2027x_pata100_ops, .mode_filter =3D pdc2027x_mode_filter, .set_piomode =3D pdc2027x_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_pdc202xx_old.c linux-2.6.39/dri= vers/ata/pata_pdc202xx_old.c ---- linux-2.6.39/drivers/ata/pata_pdc202xx_old.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/ata/pata_pdc202xx_old.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_pdc202xx_old.c linux-2.6.39.1= /drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.39.1/drivers/ata/pata_pdc202xx_old.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_pdc202xx_old.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -25782,9 +25806,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_pdc202xx= _old.c linux-2.6.39/drivers/ata .inherits =3D &pdc2024x_port_ops, =20 .check_atapi_dma =3D pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.39/drivers/ata/pata_piccolo.c linux-2.6.39/drivers/= ata/pata_piccolo.c ---- linux-2.6.39/drivers/ata/pata_piccolo.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_piccolo.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_piccolo.c linux-2.6.39.1/driv= ers/ata/pata_piccolo.c +--- linux-2.6.39.1/drivers/ata/pata_piccolo.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_piccolo.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -25794,9 +25818,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_piccolo.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_piomode =3D tosh_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_platform.c linux-2.6.39/drivers= /ata/pata_platform.c ---- linux-2.6.39/drivers/ata/pata_platform.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/ata/pata_platform.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_platform.c linux-2.6.39.1/dri= vers/ata/pata_platform.c +--- linux-2.6.39.1/drivers/ata/pata_platform.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_platform.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -25806,9 +25830,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_platform= .c linux-2.6.39/drivers/ata/pat .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, .cable_detect =3D ata_cable_unknown, -diff -urNp linux-2.6.39/drivers/ata/pata_pxa.c linux-2.6.39/drivers/ata/= pata_pxa.c ---- linux-2.6.39/drivers/ata/pata_pxa.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_pxa.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_pxa.c linux-2.6.39.1/drivers/= ata/pata_pxa.c +--- linux-2.6.39.1/drivers/ata/pata_pxa.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_pxa.c 2011-05-22 19:36:31.000000000 = -0400 @@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata ATA_BMDMA_SHT(DRV_NAME), }; @@ -25818,9 +25842,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_pxa.c li= nux-2.6.39/drivers/ata/pata_pxa .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, =20 -diff -urNp linux-2.6.39/drivers/ata/pata_qdi.c linux-2.6.39/drivers/ata/= pata_qdi.c ---- linux-2.6.39/drivers/ata/pata_qdi.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_qdi.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_qdi.c linux-2.6.39.1/drivers/= ata/pata_qdi.c +--- linux-2.6.39.1/drivers/ata/pata_qdi.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_qdi.c 2011-05-22 19:36:31.000000000 = -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -25839,9 +25863,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_qdi.c li= nux-2.6.39/drivers/ata/pata_qdi .inherits =3D &qdi6500_port_ops, .set_piomode =3D qdi6580_set_piomode, }; -diff -urNp linux-2.6.39/drivers/ata/pata_radisys.c linux-2.6.39/drivers/= ata/pata_radisys.c ---- linux-2.6.39/drivers/ata/pata_radisys.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_radisys.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_radisys.c linux-2.6.39.1/driv= ers/ata/pata_radisys.c +--- linux-2.6.39.1/drivers/ata/pata_radisys.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_radisys.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -25851,9 +25875,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_radisys.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D radisys_qc_issue, .cable_detect =3D ata_cable_unknown, -diff -urNp linux-2.6.39/drivers/ata/pata_rb532_cf.c linux-2.6.39/drivers= /ata/pata_rb532_cf.c ---- linux-2.6.39/drivers/ata/pata_rb532_cf.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/ata/pata_rb532_cf.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_rb532_cf.c linux-2.6.39.1/dri= vers/ata/pata_rb532_cf.c +--- linux-2.6.39.1/drivers/ata/pata_rb532_cf.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_rb532_cf.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -25863,9 +25887,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_rb532_cf= .c linux-2.6.39/drivers/ata/pat .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer32, }; -diff -urNp linux-2.6.39/drivers/ata/pata_rdc.c linux-2.6.39/drivers/ata/= pata_rdc.c ---- linux-2.6.39/drivers/ata/pata_rdc.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_rdc.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_rdc.c linux-2.6.39.1/drivers/= ata/pata_rdc.c +--- linux-2.6.39.1/drivers/ata/pata_rdc.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_rdc.c 2011-05-22 19:36:31.000000000 = -0400 @@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -25875,9 +25899,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_rdc.c li= nux-2.6.39/drivers/ata/pata_rdc .inherits =3D &ata_bmdma32_port_ops, .cable_detect =3D rdc_pata_cable_detect, .set_piomode =3D rdc_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_rz1000.c linux-2.6.39/drivers/a= ta/pata_rz1000.c ---- linux-2.6.39/drivers/ata/pata_rz1000.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_rz1000.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_rz1000.c linux-2.6.39.1/drive= rs/ata/pata_rz1000.c +--- linux-2.6.39.1/drivers/ata/pata_rz1000.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_rz1000.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -25887,9 +25911,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_rz1000.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_mode =3D rz1000_set_mode, -diff -urNp linux-2.6.39/drivers/ata/pata_samsung_cf.c linux-2.6.39/drive= rs/ata/pata_samsung_cf.c ---- linux-2.6.39/drivers/ata/pata_samsung_cf.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/ata/pata_samsung_cf.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_samsung_cf.c linux-2.6.39.1/d= rivers/ata/pata_samsung_cf.c +--- linux-2.6.39.1/drivers/ata/pata_samsung_cf.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_samsung_cf.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3 ATA_PIO_SHT(DRV_NAME), }; @@ -25908,9 +25932,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_samsung_= cf.c linux-2.6.39/drivers/ata/p .inherits =3D &ata_sff_port_ops, .set_piomode =3D pata_s3c_set_piomode, }; -diff -urNp linux-2.6.39/drivers/ata/pata_sc1200.c linux-2.6.39/drivers/a= ta/pata_sc1200.c ---- linux-2.6.39/drivers/ata/pata_sc1200.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_sc1200.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_sc1200.c linux-2.6.39.1/drive= rs/ata/pata_sc1200.c +--- linux-2.6.39.1/drivers/ata/pata_sc1200.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_sc1200.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -25920,9 +25944,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_sc1200.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma_port_ops, .qc_prep =3D ata_bmdma_dumb_qc_prep, .qc_issue =3D sc1200_qc_issue, -diff -urNp linux-2.6.39/drivers/ata/pata_scc.c linux-2.6.39/drivers/ata/= pata_scc.c ---- linux-2.6.39/drivers/ata/pata_scc.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_scc.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_scc.c linux-2.6.39.1/drivers/= ata/pata_scc.c +--- linux-2.6.39.1/drivers/ata/pata_scc.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_scc.c 2011-05-22 19:36:31.000000000 = -0400 @@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -25932,9 +25956,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_scc.c li= nux-2.6.39/drivers/ata/pata_scc .inherits =3D &ata_bmdma_port_ops, =20 .set_piomode =3D scc_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_sch.c linux-2.6.39/drivers/ata/= pata_sch.c ---- linux-2.6.39/drivers/ata/pata_sch.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_sch.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_sch.c linux-2.6.39.1/drivers/= ata/pata_sch.c +--- linux-2.6.39.1/drivers/ata/pata_sch.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_sch.c 2011-05-22 19:36:31.000000000 = -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -25944,9 +25968,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_sch.c li= nux-2.6.39/drivers/ata/pata_sch .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_piomode =3D sch_set_piomode, -diff -urNp linux-2.6.39/drivers/ata/pata_serverworks.c linux-2.6.39/driv= ers/ata/pata_serverworks.c ---- linux-2.6.39/drivers/ata/pata_serverworks.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/ata/pata_serverworks.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_serverworks.c linux-2.6.39.1/= drivers/ata/pata_serverworks.c +--- linux-2.6.39.1/drivers/ata/pata_serverworks.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_serverworks.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -300,7 +300,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -25965,9 +25989,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_serverwo= rks.c linux-2.6.39/drivers/ata/ .inherits =3D &serverworks_osb4_port_ops, .mode_filter =3D serverworks_csb_filter, }; -diff -urNp linux-2.6.39/drivers/ata/pata_sil680.c linux-2.6.39/drivers/a= ta/pata_sil680.c ---- linux-2.6.39/drivers/ata/pata_sil680.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/ata/pata_sil680.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_sil680.c linux-2.6.39.1/drive= rs/ata/pata_sil680.c +--- linux-2.6.39.1/drivers/ata/pata_sil680.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_sil680.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -225,8 +225,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25978,9 +26002,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_sil680.c= linux-2.6.39/drivers/ata/pata_ .inherits =3D &ata_bmdma32_port_ops, .sff_exec_command =3D sil680_sff_exec_command, .sff_irq_check =3D sil680_sff_irq_check, -diff -urNp linux-2.6.39/drivers/ata/pata_sis.c linux-2.6.39/drivers/ata/= pata_sis.c ---- linux-2.6.39/drivers/ata/pata_sis.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_sis.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_sis.c linux-2.6.39.1/drivers/= ata/pata_sis.c +--- linux-2.6.39.1/drivers/ata/pata_sis.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_sis.c 2011-05-22 19:36:31.000000000 = -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26036,9 +26060,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_sis.c li= nux-2.6.39/drivers/ata/pata_sis .inherits =3D &sis_base_ops, .set_piomode =3D sis_old_set_piomode, .set_dmamode =3D sis_old_set_dmamode, -diff -urNp linux-2.6.39/drivers/ata/pata_sl82c105.c linux-2.6.39/drivers= /ata/pata_sl82c105.c ---- linux-2.6.39/drivers/ata/pata_sl82c105.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/ata/pata_sl82c105.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_sl82c105.c linux-2.6.39.1/dri= vers/ata/pata_sl82c105.c +--- linux-2.6.39.1/drivers/ata/pata_sl82c105.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_sl82c105.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -26048,9 +26072,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_sl82c105= .c linux-2.6.39/drivers/ata/pat .inherits =3D &ata_bmdma_port_ops, .qc_defer =3D sl82c105_qc_defer, .bmdma_start =3D sl82c105_bmdma_start, -diff -urNp linux-2.6.39/drivers/ata/pata_triflex.c linux-2.6.39/drivers/= ata/pata_triflex.c ---- linux-2.6.39/drivers/ata/pata_triflex.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/pata_triflex.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_triflex.c linux-2.6.39.1/driv= ers/ata/pata_triflex.c +--- linux-2.6.39.1/drivers/ata/pata_triflex.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/pata_triflex.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -26060,9 +26084,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_triflex.= c linux-2.6.39/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .bmdma_start =3D triflex_bmdma_start, .bmdma_stop =3D triflex_bmdma_stop, -diff -urNp linux-2.6.39/drivers/ata/pata_via.c linux-2.6.39/drivers/ata/= pata_via.c ---- linux-2.6.39/drivers/ata/pata_via.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pata_via.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pata_via.c linux-2.6.39.1/drivers/= ata/pata_via.c +--- linux-2.6.39.1/drivers/ata/pata_via.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pata_via.c 2011-05-22 19:36:31.000000000 = -0400 @@ -441,7 +441,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26081,9 +26105,9 @@ diff -urNp linux-2.6.39/drivers/ata/pata_via.c li= nux-2.6.39/drivers/ata/pata_via .inherits =3D &via_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.39/drivers/ata/pdc_adma.c linux-2.6.39/drivers/ata/= pdc_adma.c ---- linux-2.6.39/drivers/ata/pdc_adma.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/pdc_adma.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/pdc_adma.c linux-2.6.39.1/drivers/= ata/pdc_adma.c +--- linux-2.6.39.1/drivers/ata/pdc_adma.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/pdc_adma.c 2011-05-22 19:36:31.000000000 = -0400 @@ -146,7 +146,7 @@ static struct scsi_host_template adma_at .dma_boundary =3D ADMA_DMA_BOUNDARY, }; @@ -26093,9 +26117,9 @@ diff -urNp linux-2.6.39/drivers/ata/pdc_adma.c li= nux-2.6.39/drivers/ata/pdc_adma .inherits =3D &ata_sff_port_ops, =20 .lost_interrupt =3D ATA_OP_NULL, -diff -urNp linux-2.6.39/drivers/ata/sata_dwc_460ex.c linux-2.6.39/driver= s/ata/sata_dwc_460ex.c ---- linux-2.6.39/drivers/ata/sata_dwc_460ex.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/ata/sata_dwc_460ex.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_dwc_460ex.c linux-2.6.39.1/dr= ivers/ata/sata_dwc_460ex.c +--- linux-2.6.39.1/drivers/ata/sata_dwc_460ex.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/ata/sata_dwc_460ex.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -1598,7 +1598,7 @@ static struct scsi_host_template sata_dw .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -26105,9 +26129,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_dwc_460e= x.c linux-2.6.39/drivers/ata/sa .inherits =3D &ata_sff_port_ops, =20 .error_handler =3D sata_dwc_error_handler, -diff -urNp linux-2.6.39/drivers/ata/sata_fsl.c linux-2.6.39/drivers/ata/= sata_fsl.c ---- linux-2.6.39/drivers/ata/sata_fsl.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_fsl.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_fsl.c linux-2.6.39.1/drivers/= ata/sata_fsl.c +--- linux-2.6.39.1/drivers/ata/sata_fsl.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_fsl.c 2011-05-22 19:36:31.000000000 = -0400 @@ -1268,7 +1268,7 @@ static struct scsi_host_template sata_fs .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -26117,9 +26141,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_fsl.c li= nux-2.6.39/drivers/ata/sata_fsl .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D ata_std_qc_defer, -diff -urNp linux-2.6.39/drivers/ata/sata_inic162x.c linux-2.6.39/drivers= /ata/sata_inic162x.c ---- linux-2.6.39/drivers/ata/sata_inic162x.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/ata/sata_inic162x.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_inic162x.c linux-2.6.39.1/dri= vers/ata/sata_inic162x.c +--- linux-2.6.39.1/drivers/ata/sata_inic162x.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/ata/sata_inic162x.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -26129,9 +26153,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_inic162x= .c linux-2.6.39/drivers/ata/sat .inherits =3D &sata_port_ops, =20 .check_atapi_dma =3D inic_check_atapi_dma, -diff -urNp linux-2.6.39/drivers/ata/sata_mv.c linux-2.6.39/drivers/ata/s= ata_mv.c ---- linux-2.6.39/drivers/ata/sata_mv.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/ata/sata_mv.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/ata/sata_mv.c linux-2.6.39.1/drivers/a= ta/sata_mv.c +--- linux-2.6.39.1/drivers/ata/sata_mv.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/ata/sata_mv.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -662,7 +662,7 @@ static struct scsi_host_template mv6_sht .dma_boundary =3D MV_DMA_BOUNDARY, }; @@ -26159,9 +26183,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_mv.c lin= ux-2.6.39/drivers/ata/sata_mv.c .inherits =3D &mv6_ops, .dev_config =3D ATA_OP_NULL, .qc_prep =3D mv_qc_prep_iie, -diff -urNp linux-2.6.39/drivers/ata/sata_nv.c linux-2.6.39/drivers/ata/s= ata_nv.c ---- linux-2.6.39/drivers/ata/sata_nv.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/ata/sata_nv.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/ata/sata_nv.c linux-2.6.39.1/drivers/a= ta/sata_nv.c +--- linux-2.6.39.1/drivers/ata/sata_nv.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/ata/sata_nv.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. @@ -26204,9 +26228,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_nv.c lin= ux-2.6.39/drivers/ata/sata_nv.c .inherits =3D &nv_generic_ops, =20 .qc_defer =3D ata_std_qc_defer, -diff -urNp linux-2.6.39/drivers/ata/sata_promise.c linux-2.6.39/drivers/= ata/sata_promise.c ---- linux-2.6.39/drivers/ata/sata_promise.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/ata/sata_promise.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_promise.c linux-2.6.39.1/driv= ers/ata/sata_promise.c +--- linux-2.6.39.1/drivers/ata/sata_promise.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/ata/sata_promise.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -194,7 +194,7 @@ static const struct ata_port_operations=20 .error_handler =3D pdc_error_handler, }; @@ -26233,9 +26257,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_promise.= c linux-2.6.39/drivers/ata/sata .inherits =3D &pdc_common_ops, .cable_detect =3D pdc_pata_cable_detect, .freeze =3D pdc_freeze, -diff -urNp linux-2.6.39/drivers/ata/sata_qstor.c linux-2.6.39/drivers/at= a/sata_qstor.c ---- linux-2.6.39/drivers/ata/sata_qstor.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/sata_qstor.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_qstor.c linux-2.6.39.1/driver= s/ata/sata_qstor.c +--- linux-2.6.39.1/drivers/ata/sata_qstor.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/sata_qstor.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary =3D QS_DMA_BOUNDARY, }; @@ -26245,9 +26269,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_qstor.c = linux-2.6.39/drivers/ata/sata_q .inherits =3D &ata_sff_port_ops, =20 .check_atapi_dma =3D qs_check_atapi_dma, -diff -urNp linux-2.6.39/drivers/ata/sata_sil24.c linux-2.6.39/drivers/at= a/sata_sil24.c ---- linux-2.6.39/drivers/ata/sata_sil24.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ata/sata_sil24.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_sil24.c linux-2.6.39.1/driver= s/ata/sata_sil24.c +--- linux-2.6.39.1/drivers/ata/sata_sil24.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ata/sata_sil24.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -26257,9 +26281,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_sil24.c = linux-2.6.39/drivers/ata/sata_s .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D sil24_qc_defer, -diff -urNp linux-2.6.39/drivers/ata/sata_sil.c linux-2.6.39/drivers/ata/= sata_sil.c ---- linux-2.6.39/drivers/ata/sata_sil.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_sil.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_sil.c linux-2.6.39.1/drivers/= ata/sata_sil.c +--- linux-2.6.39.1/drivers/ata/sata_sil.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_sil.c 2011-05-22 19:36:31.000000000 = -0400 @@ -181,7 +181,7 @@ static struct scsi_host_template sil_sht .sg_tablesize =3D ATA_MAX_PRD }; @@ -26269,9 +26293,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_sil.c li= nux-2.6.39/drivers/ata/sata_sil .inherits =3D &ata_bmdma32_port_ops, .dev_config =3D sil_dev_config, .set_mode =3D sil_set_mode, -diff -urNp linux-2.6.39/drivers/ata/sata_sis.c linux-2.6.39/drivers/ata/= sata_sis.c ---- linux-2.6.39/drivers/ata/sata_sis.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_sis.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_sis.c linux-2.6.39.1/drivers/= ata/sata_sis.c +--- linux-2.6.39.1/drivers/ata/sata_sis.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_sis.c 2011-05-22 19:36:31.000000000 = -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26281,9 +26305,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_sis.c li= nux-2.6.39/drivers/ata/sata_sis .inherits =3D &ata_bmdma_port_ops, .scr_read =3D sis_scr_read, .scr_write =3D sis_scr_write, -diff -urNp linux-2.6.39/drivers/ata/sata_svw.c linux-2.6.39/drivers/ata/= sata_svw.c ---- linux-2.6.39/drivers/ata/sata_svw.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_svw.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_svw.c linux-2.6.39.1/drivers/= ata/sata_svw.c +--- linux-2.6.39.1/drivers/ata/sata_svw.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_svw.c 2011-05-22 19:36:31.000000000 = -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; =20 @@ -26293,9 +26317,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_svw.c li= nux-2.6.39/drivers/ata/sata_svw .inherits =3D &ata_bmdma_port_ops, .sff_tf_load =3D k2_sata_tf_load, .sff_tf_read =3D k2_sata_tf_read, -diff -urNp linux-2.6.39/drivers/ata/sata_sx4.c linux-2.6.39/drivers/ata/= sata_sx4.c ---- linux-2.6.39/drivers/ata/sata_sx4.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_sx4.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_sx4.c linux-2.6.39.1/drivers/= ata/sata_sx4.c +--- linux-2.6.39.1/drivers/ata/sata_sx4.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_sx4.c 2011-05-22 19:36:31.000000000 = -0400 @@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat }; =20 @@ -26305,9 +26329,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_sx4.c li= nux-2.6.39/drivers/ata/sata_sx4 .inherits =3D &ata_sff_port_ops, =20 .check_atapi_dma =3D pdc_check_atapi_dma, -diff -urNp linux-2.6.39/drivers/ata/sata_uli.c linux-2.6.39/drivers/ata/= sata_uli.c ---- linux-2.6.39/drivers/ata/sata_uli.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_uli.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_uli.c linux-2.6.39.1/drivers/= ata/sata_uli.c +--- linux-2.6.39.1/drivers/ata/sata_uli.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_uli.c 2011-05-22 19:36:31.000000000 = -0400 @@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26317,9 +26341,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_uli.c li= nux-2.6.39/drivers/ata/sata_uli .inherits =3D &ata_bmdma_port_ops, .scr_read =3D uli_scr_read, .scr_write =3D uli_scr_write, -diff -urNp linux-2.6.39/drivers/ata/sata_via.c linux-2.6.39/drivers/ata/= sata_via.c ---- linux-2.6.39/drivers/ata/sata_via.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_via.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_via.c linux-2.6.39.1/drivers/= ata/sata_via.c +--- linux-2.6.39.1/drivers/ata/sata_via.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_via.c 2011-05-22 19:36:31.000000000 = -0400 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -26358,9 +26382,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_via.c li= nux-2.6.39/drivers/ata/sata_via .inherits =3D &svia_base_ops, .hardreset =3D sata_std_hardreset, .scr_read =3D vt8251_scr_read, -diff -urNp linux-2.6.39/drivers/ata/sata_vsc.c linux-2.6.39/drivers/ata/= sata_vsc.c ---- linux-2.6.39/drivers/ata/sata_vsc.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/ata/sata_vsc.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/ata/sata_vsc.c linux-2.6.39.1/drivers/= ata/sata_vsc.c +--- linux-2.6.39.1/drivers/ata/sata_vsc.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/ata/sata_vsc.c 2011-05-22 19:36:31.000000000 = -0400 @@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat }; =20 @@ -26370,9 +26394,9 @@ diff -urNp linux-2.6.39/drivers/ata/sata_vsc.c li= nux-2.6.39/drivers/ata/sata_vsc .inherits =3D &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.39/drivers/atm/adummy.c linux-2.6.39/drivers/atm/ad= ummy.c ---- linux-2.6.39/drivers/atm/adummy.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/atm/adummy.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/atm/adummy.c linux-2.6.39.1/drivers/at= m/adummy.c +--- linux-2.6.39.1/drivers/atm/adummy.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/atm/adummy.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct=20 vcc->pop(vcc, skb); else @@ -26382,9 +26406,9 @@ diff -urNp linux-2.6.39/drivers/atm/adummy.c linu= x-2.6.39/drivers/atm/adummy.c =20 return 0; } -diff -urNp linux-2.6.39/drivers/atm/ambassador.c linux-2.6.39/drivers/at= m/ambassador.c ---- linux-2.6.39/drivers/atm/ambassador.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/atm/ambassador.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/atm/ambassador.c linux-2.6.39.1/driver= s/atm/ambassador.c +--- linux-2.6.39.1/drivers/atm/ambassador.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/atm/ambassador.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,=20 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); =20 @@ -26421,9 +26445,9 @@ diff -urNp linux-2.6.39/drivers/atm/ambassador.c = linux-2.6.39/drivers/atm/ambass return -ENOMEM; // ? } =20 -diff -urNp linux-2.6.39/drivers/atm/atmtcp.c linux-2.6.39/drivers/atm/at= mtcp.c ---- linux-2.6.39/drivers/atm/atmtcp.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/atm/atmtcp.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/atm/atmtcp.c linux-2.6.39.1/drivers/at= m/atmtcp.c +--- linux-2.6.39.1/drivers/atm/atmtcp.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/atm/atmtcp.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc=20 if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -26473,9 +26497,9 @@ diff -urNp linux-2.6.39/drivers/atm/atmtcp.c linu= x-2.6.39/drivers/atm/atmtcp.c done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.39/drivers/atm/eni.c linux-2.6.39/drivers/atm/eni.c ---- linux-2.6.39/drivers/atm/eni.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/atm/eni.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/atm/eni.c linux-2.6.39.1/drivers/atm/e= ni.c +--- linux-2.6.39.1/drivers/atm/eni.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/atm/eni.c 2011-05-22 19:36:31.000000000 -0400 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -26521,9 +26545,9 @@ diff -urNp linux-2.6.39/drivers/atm/eni.c linux-2= .6.39/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.39/drivers/atm/firestream.c linux-2.6.39/drivers/at= m/firestream.c ---- linux-2.6.39/drivers/atm/firestream.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/atm/firestream.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/atm/firestream.c linux-2.6.39.1/driver= s/atm/firestream.c +--- linux-2.6.39.1/drivers/atm/firestream.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/atm/firestream.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct } } @@ -26557,9 +26581,9 @@ diff -urNp linux-2.6.39/drivers/atm/firestream.c = linux-2.6.39/drivers/atm/firest break; default: /* Hmm. Haven't written the code to handle the others yet...= -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n= ",=20 -diff -urNp linux-2.6.39/drivers/atm/fore200e.c linux-2.6.39/drivers/atm/= fore200e.c ---- linux-2.6.39/drivers/atm/fore200e.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/atm/fore200e.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/atm/fore200e.c linux-2.6.39.1/drivers/= atm/fore200e.c +--- linux-2.6.39.1/drivers/atm/fore200e.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/atm/fore200e.c 2011-05-22 19:36:31.000000000 = -0400 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -26616,9 +26640,9 @@ diff -urNp linux-2.6.39/drivers/atm/fore200e.c li= nux-2.6.39/drivers/atm/fore200e =20 fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - hear= tbeat is %08x\n", -diff -urNp linux-2.6.39/drivers/atm/he.c linux-2.6.39/drivers/atm/he.c ---- linux-2.6.39/drivers/atm/he.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/atm/he.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/atm/he.c linux-2.6.39.1/drivers/atm/he= .c +--- linux-2.6.39.1/drivers/atm/he.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/atm/he.c 2011-05-22 19:36:31.000000000 -0400 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i =20 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -26700,9 +26724,9 @@ diff -urNp linux-2.6.39/drivers/atm/he.c linux-2.= 6.39/drivers/atm/he.c =20 return 0; } -diff -urNp linux-2.6.39/drivers/atm/horizon.c linux-2.6.39/drivers/atm/h= orizon.c ---- linux-2.6.39/drivers/atm/horizon.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/atm/horizon.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/atm/horizon.c linux-2.6.39.1/drivers/a= tm/horizon.c +--- linux-2.6.39.1/drivers/atm/horizon.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/atm/horizon.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,=20 { struct atm_vcc * vcc =3D ATM_SKB(skb)->vcc; @@ -26721,9 +26745,9 @@ diff -urNp linux-2.6.39/drivers/atm/horizon.c lin= ux-2.6.39/drivers/atm/horizon.c =09 // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.39/drivers/atm/idt77252.c linux-2.6.39/drivers/atm/= idt77252.c ---- linux-2.6.39/drivers/atm/idt77252.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/atm/idt77252.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/atm/idt77252.c linux-2.6.39.1/drivers/= atm/idt77252.c +--- linux-2.6.39.1/drivers/atm/idt77252.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/atm/idt77252.c 2011-05-22 19:36:31.000000000 = -0400 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -26878,9 +26902,9 @@ diff -urNp linux-2.6.39/drivers/atm/idt77252.c li= nux-2.6.39/drivers/atm/idt77252 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.39/drivers/atm/iphase.c linux-2.6.39/drivers/atm/ip= hase.c ---- linux-2.6.39/drivers/atm/iphase.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/atm/iphase.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/atm/iphase.c linux-2.6.39.1/drivers/at= m/iphase.c +--- linux-2.6.39.1/drivers/atm/iphase.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/atm/iphase.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev) =20 status =3D (u_short) (buf_desc_ptr->desc_mode); =20 if (status & (RX_CER | RX_PTE | RX_OFL)) =20 @@ -26977,9 +27001,9 @@ diff -urNp linux-2.6.39/drivers/atm/iphase.c linu= x-2.6.39/drivers/atm/iphase.c if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota =3D vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota =3D %d \n", (u32)vcc->tx_quota = ); -diff -urNp linux-2.6.39/drivers/atm/lanai.c linux-2.6.39/drivers/atm/lan= ai.c ---- linux-2.6.39/drivers/atm/lanai.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/atm/lanai.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/atm/lanai.c linux-2.6.39.1/drivers/atm= /lanai.c +--- linux-2.6.39.1/drivers/atm/lanai.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/atm/lanai.c 2011-05-22 19:36:31.000000000 -04= 00 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -27034,9 +27058,9 @@ diff -urNp linux-2.6.39/drivers/atm/lanai.c linux= -2.6.39/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr =3D &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.39/drivers/atm/nicstar.c linux-2.6.39/drivers/atm/n= icstar.c ---- linux-2.6.39/drivers/atm/nicstar.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/atm/nicstar.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/atm/nicstar.c linux-2.6.39.1/drivers/a= tm/nicstar.c +--- linux-2.6.39.1/drivers/atm/nicstar.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/atm/nicstar.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,=20 if ((vc =3D (vc_map *) vcc->dev_data) =3D=3D NULL) { printk("nicstar%d: vcc->dev_data =3D=3D NULL on ns_send().\n", @@ -27238,9 +27262,9 @@ diff -urNp linux-2.6.39/drivers/atm/nicstar.c lin= ux-2.6.39/drivers/atm/nicstar.c } } =20 -diff -urNp linux-2.6.39/drivers/atm/solos-pci.c linux-2.6.39/drivers/atm= /solos-pci.c ---- linux-2.6.39/drivers/atm/solos-pci.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/atm/solos-pci.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/atm/solos-pci.c linux-2.6.39.1/drivers= /atm/solos-pci.c +--- linux-2.6.39.1/drivers/atm/solos-pci.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/atm/solos-pci.c 2011-05-22 19:36:31.000000000= -0400 @@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -27268,9 +27292,9 @@ diff -urNp linux-2.6.39/drivers/atm/solos-pci.c l= inux-2.6.39/drivers/atm/solos-p solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.39/drivers/atm/suni.c linux-2.6.39/drivers/atm/suni= .c ---- linux-2.6.39/drivers/atm/suni.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/atm/suni.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/atm/suni.c linux-2.6.39.1/drivers/atm/= suni.c +--- linux-2.6.39.1/drivers/atm/suni.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/atm/suni.c 2011-05-22 19:36:31.000000000 -040= 0 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock); =20 =20 @@ -27282,9 +27306,9 @@ diff -urNp linux-2.6.39/drivers/atm/suni.c linux-= 2.6.39/drivers/atm/suni.c =20 =20 static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.39/drivers/atm/uPD98402.c linux-2.6.39/drivers/atm/= uPD98402.c ---- linux-2.6.39/drivers/atm/uPD98402.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/atm/uPD98402.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/atm/uPD98402.c linux-2.6.39.1/drivers/= atm/uPD98402.c +--- linux-2.6.39.1/drivers/atm/uPD98402.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/atm/uPD98402.c 2011-05-22 19:36:31.000000000 = -0400 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error =3D 0; @@ -27329,9 +27353,9 @@ diff -urNp linux-2.6.39/drivers/atm/uPD98402.c li= nux-2.6.39/drivers/atm/uPD98402 return 0; } =20 -diff -urNp linux-2.6.39/drivers/atm/zatm.c linux-2.6.39/drivers/atm/zatm= .c ---- linux-2.6.39/drivers/atm/zatm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/atm/zatm.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/atm/zatm.c linux-2.6.39.1/drivers/atm/= zatm.c +--- linux-2.6.39.1/drivers/atm/zatm.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/atm/zatm.c 2011-05-22 19:36:31.000000000 -040= 0 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -27359,9 +27383,9 @@ diff -urNp linux-2.6.39/drivers/atm/zatm.c linux-= 2.6.39/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } =20 -diff -urNp linux-2.6.39/drivers/base/iommu.c linux-2.6.39/drivers/base/i= ommu.c ---- linux-2.6.39/drivers/base/iommu.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/base/iommu.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/base/iommu.c linux-2.6.39.1/drivers/ba= se/iommu.c +--- linux-2.6.39.1/drivers/base/iommu.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/base/iommu.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -23,9 +23,8 @@ #include #include @@ -27374,9 +27398,9 @@ diff -urNp linux-2.6.39/drivers/base/iommu.c linu= x-2.6.39/drivers/base/iommu.c { if (iommu_ops) BUG(); -diff -urNp linux-2.6.39/drivers/base/power/generic_ops.c linux-2.6.39/dr= ivers/base/power/generic_ops.c ---- linux-2.6.39/drivers/base/power/generic_ops.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/base/power/generic_ops.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/base/power/generic_ops.c linux-2.6.39.= 1/drivers/base/power/generic_ops.c +--- linux-2.6.39.1/drivers/base/power/generic_ops.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/base/power/generic_ops.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -215,7 +215,7 @@ int pm_generic_restore(struct device *de EXPORT_SYMBOL_GPL(pm_generic_restore); #endif /* CONFIG_PM_SLEEP */ @@ -27386,9 +27410,9 @@ diff -urNp linux-2.6.39/drivers/base/power/generi= c_ops.c linux-2.6.39/drivers/ba #ifdef CONFIG_PM_SLEEP .suspend =3D pm_generic_suspend, .resume =3D pm_generic_resume, -diff -urNp linux-2.6.39/drivers/base/power/wakeup.c linux-2.6.39/drivers= /base/power/wakeup.c ---- linux-2.6.39/drivers/base/power/wakeup.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/base/power/wakeup.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/base/power/wakeup.c linux-2.6.39.1/dri= vers/base/power/wakeup.c +--- linux-2.6.39.1/drivers/base/power/wakeup.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/base/power/wakeup.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -29,14 +29,14 @@ bool events_check_enabled; * They need to be modified together atomically, so it's better to use = one * atomic variable to hold them both. @@ -27424,9 +27448,9 @@ diff -urNp linux-2.6.39/drivers/base/power/wakeup= .c linux-2.6.39/drivers/base/po } =20 /** -diff -urNp linux-2.6.39/drivers/block/cciss.c linux-2.6.39/drivers/block= /cciss.c ---- linux-2.6.39/drivers/block/cciss.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/block/cciss.c 2011-05-22 19:41:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/block/cciss.c linux-2.6.39.1/drivers/b= lock/cciss.c +--- linux-2.6.39.1/drivers/block/cciss.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/block/cciss.c 2011-05-22 19:41:32.000000000 -= 0400 @@ -103,7 +103,7 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_devic * product =3D Marketing Name for the board * access =3D Address of the struct of function pointers @@ -27445,9 +27469,9 @@ diff -urNp linux-2.6.39/drivers/block/cciss.c lin= ux-2.6.39/drivers/block/cciss.c err =3D 0; err |=3D copy_from_user(&arg64.LUN_info, &arg32->LUN_info, -diff -urNp linux-2.6.39/drivers/block/cciss.h linux-2.6.39/drivers/block= /cciss.h ---- linux-2.6.39/drivers/block/cciss.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/block/cciss.h 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/block/cciss.h linux-2.6.39.1/drivers/b= lock/cciss.h +--- linux-2.6.39.1/drivers/block/cciss.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/block/cciss.h 2011-05-22 19:36:31.000000000 -= 0400 @@ -393,7 +393,7 @@ static bool SA5_performant_intr_pending( return register_value & SA5_OUTDB_STATUS_PERF_BIT; } @@ -27484,9 +27508,9 @@ diff -urNp linux-2.6.39/drivers/block/cciss.h lin= ux-2.6.39/drivers/block/cciss.h int nr_cmds; /* Max cmds this kind of ctlr can handle. */ }; =20 -diff -urNp linux-2.6.39/drivers/block/cpqarray.c linux-2.6.39/drivers/bl= ock/cpqarray.c ---- linux-2.6.39/drivers/block/cpqarray.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/block/cpqarray.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/block/cpqarray.c linux-2.6.39.1/driver= s/block/cpqarray.c +--- linux-2.6.39.1/drivers/block/cpqarray.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/block/cpqarray.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -80,7 +80,7 @@ static int eisa[8]; * product =3D Marketing Name for the board * access =3D Address of the struct of function pointers @@ -27505,9 +27529,9 @@ diff -urNp linux-2.6.39/drivers/block/cpqarray.c = linux-2.6.39/drivers/block/cpqa queue_next: creq =3D blk_peek_request(q); if (!creq) -diff -urNp linux-2.6.39/drivers/block/cpqarray.h linux-2.6.39/drivers/bl= ock/cpqarray.h ---- linux-2.6.39/drivers/block/cpqarray.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/block/cpqarray.h 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/block/cpqarray.h linux-2.6.39.1/driver= s/block/cpqarray.h +--- linux-2.6.39.1/drivers/block/cpqarray.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/block/cpqarray.h 2011-05-22 19:36:31.00000000= 0 -0400 @@ -69,7 +69,7 @@ struct access_method { struct board_type { __u32 board_id; @@ -27517,9 +27541,9 @@ diff -urNp linux-2.6.39/drivers/block/cpqarray.h = linux-2.6.39/drivers/block/cpqa }; =20 struct ctlr_info { -diff -urNp linux-2.6.39/drivers/block/DAC960.c linux-2.6.39/drivers/bloc= k/DAC960.c ---- linux-2.6.39/drivers/block/DAC960.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/block/DAC960.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/block/DAC960.c linux-2.6.39.1/drivers/= block/DAC960.c +--- linux-2.6.39.1/drivers/block/DAC960.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/block/DAC960.c 2011-05-22 19:36:31.000000000 = -0400 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur unsigned long flags; int Channel, TargetID; @@ -27529,9 +27553,9 @@ diff -urNp linux-2.6.39/drivers/block/DAC960.c li= nux-2.6.39/drivers/block/DAC960 if (!init_dma_loaf(Controller->PCIDevice, &local_dma,=20 DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + sizeof(DAC960_SCSI_Inquiry_T) + -diff -urNp linux-2.6.39/drivers/block/drbd/drbd_int.h linux-2.6.39/drive= rs/block/drbd/drbd_int.h ---- linux-2.6.39/drivers/block/drbd/drbd_int.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/block/drbd/drbd_int.h 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/block/drbd/drbd_int.h linux-2.6.39.1/d= rivers/block/drbd/drbd_int.h +--- linux-2.6.39.1/drivers/block/drbd/drbd_int.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/block/drbd/drbd_int.h 2011-05-22 19:36:31.000= 000000 -0400 @@ -736,7 +736,7 @@ struct drbd_request; struct drbd_epoch { struct list_head list; @@ -27550,9 +27574,9 @@ diff -urNp linux-2.6.39/drivers/block/drbd/drbd_i= nt.h linux-2.6.39/drivers/block unsigned int peer_seq; spinlock_t peer_seq_lock; unsigned int minor; -diff -urNp linux-2.6.39/drivers/block/drbd/drbd_main.c linux-2.6.39/driv= ers/block/drbd/drbd_main.c ---- linux-2.6.39/drivers/block/drbd/drbd_main.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/block/drbd/drbd_main.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/block/drbd/drbd_main.c linux-2.6.39.1/= drivers/block/drbd/drbd_main.c +--- linux-2.6.39.1/drivers/block/drbd/drbd_main.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/block/drbd/drbd_main.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -2387,7 +2387,7 @@ static int _drbd_send_ack(struct drbd_co p.sector =3D sector; p.block_id =3D block_id; @@ -27591,9 +27615,9 @@ diff -urNp linux-2.6.39/drivers/block/drbd/drbd_m= ain.c linux-2.6.39/drivers/bloc mdev->al_writ_cnt =3D mdev->bm_writ_cnt =3D mdev->read_cnt =3D -diff -urNp linux-2.6.39/drivers/block/drbd/drbd_nl.c linux-2.6.39/driver= s/block/drbd/drbd_nl.c ---- linux-2.6.39/drivers/block/drbd/drbd_nl.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/block/drbd/drbd_nl.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/block/drbd/drbd_nl.c linux-2.6.39.1/dr= ivers/block/drbd/drbd_nl.c +--- linux-2.6.39.1/drivers/block/drbd/drbd_nl.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/block/drbd/drbd_nl.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -2298,7 +2298,7 @@ static void drbd_connector_callback(stru module_put(THIS_MODULE); } @@ -27639,9 +27663,9 @@ diff -urNp linux-2.6.39/drivers/block/drbd/drbd_n= l.c linux-2.6.39/drivers/block/ cn_reply->ack =3D 0; /* not used here. */ cn_reply->len =3D sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); -diff -urNp linux-2.6.39/drivers/block/drbd/drbd_receiver.c linux-2.6.39/= drivers/block/drbd/drbd_receiver.c ---- linux-2.6.39/drivers/block/drbd/drbd_receiver.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/block/drbd/drbd_receiver.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/block/drbd/drbd_receiver.c linux-2.6.3= 9.1/drivers/block/drbd/drbd_receiver.c +--- linux-2.6.39.1/drivers/block/drbd/drbd_receiver.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/block/drbd/drbd_receiver.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -894,7 +894,7 @@ retry: sock->sk->sk_sndtimeo =3D mdev->net_conf->timeout*HZ/10; sock->sk->sk_rcvtimeo =3D MAX_SCHEDULE_TIMEOUT; @@ -27727,9 +27751,9 @@ diff -urNp linux-2.6.39/drivers/block/drbd/drbd_r= eceiver.c linux-2.6.39/drivers/ D_ASSERT(list_empty(&mdev->current_epoch->list)); } =20 -diff -urNp linux-2.6.39/drivers/block/nbd.c linux-2.6.39/drivers/block/n= bd.c ---- linux-2.6.39/drivers/block/nbd.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/block/nbd.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/block/nbd.c linux-2.6.39.1/drivers/blo= ck/nbd.c +--- linux-2.6.39.1/drivers/block/nbd.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/block/nbd.c 2011-05-22 19:36:31.000000000 -04= 00 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device * struct kvec iov; sigset_t blocked, oldset; @@ -27748,9 +27772,9 @@ diff -urNp linux-2.6.39/drivers/block/nbd.c linux= -2.6.39/drivers/block/nbd.c switch (cmd) { case NBD_DISCONNECT: { struct request sreq; -diff -urNp linux-2.6.39/drivers/block/smart1,2.h linux-2.6.39/drivers/bl= ock/smart1,2.h ---- linux-2.6.39/drivers/block/smart1,2.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/block/smart1,2.h 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/block/smart1,2.h linux-2.6.39.1/driver= s/block/smart1,2.h +--- linux-2.6.39.1/drivers/block/smart1,2.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/block/smart1,2.h 2011-05-22 19:36:31.00000000= 0 -0400 @@ -107,7 +107,7 @@ static unsigned long smart4_intr_pending return 0 ; } @@ -27787,9 +27811,9 @@ diff -urNp linux-2.6.39/drivers/block/smart1,2.h = linux-2.6.39/drivers/block/smar smart1_submit_command, smart1_intr_mask, smart1_fifo_full, -diff -urNp linux-2.6.39/drivers/block/xsysace.c linux-2.6.39/drivers/blo= ck/xsysace.c ---- linux-2.6.39/drivers/block/xsysace.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/block/xsysace.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/block/xsysace.c linux-2.6.39.1/drivers= /block/xsysace.c +--- linux-2.6.39.1/drivers/block/xsysace.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/block/xsysace.c 2011-05-22 19:36:31.000000000= -0400 @@ -262,7 +262,7 @@ static void ace_dataout_8(struct ace_dev ace->data_ptr =3D src; } @@ -27816,9 +27840,9 @@ diff -urNp linux-2.6.39/drivers/block/xsysace.c l= inux-2.6.39/drivers/block/xsysa .in =3D ace_in_le16, .out =3D ace_out_le16, .datain =3D ace_datain_le16, -diff -urNp linux-2.6.39/drivers/char/agp/frontend.c linux-2.6.39/drivers= /char/agp/frontend.c ---- linux-2.6.39/drivers/char/agp/frontend.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/char/agp/frontend.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/char/agp/frontend.c linux-2.6.39.1/dri= vers/char/agp/frontend.c +--- linux-2.6.39.1/drivers/char/agp/frontend.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/char/agp/frontend.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -27828,9 +27852,9 @@ diff -urNp linux-2.6.39/drivers/char/agp/frontend= .c linux-2.6.39/drivers/char/ag return -EFAULT; =20 client =3D agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.39/drivers/char/briq_panel.c linux-2.6.39/drivers/c= har/briq_panel.c ---- linux-2.6.39/drivers/char/briq_panel.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/char/briq_panel.c 2011-05-22 19:41:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/char/briq_panel.c linux-2.6.39.1/drive= rs/char/briq_panel.c +--- linux-2.6.39.1/drivers/char/briq_panel.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/char/briq_panel.c 2011-05-22 19:41:32.0000000= 00 -0400 @@ -9,6 +9,7 @@ #include #include @@ -27872,9 +27896,9 @@ diff -urNp linux-2.6.39/drivers/char/briq_panel.c= linux-2.6.39/drivers/char/briq =20 return len; } -diff -urNp linux-2.6.39/drivers/char/genrtc.c linux-2.6.39/drivers/char/= genrtc.c ---- linux-2.6.39/drivers/char/genrtc.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/char/genrtc.c 2011-05-22 19:41:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/char/genrtc.c linux-2.6.39.1/drivers/c= har/genrtc.c +--- linux-2.6.39.1/drivers/char/genrtc.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/char/genrtc.c 2011-05-22 19:41:32.000000000 -= 0400 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi switch (cmd) { =20 @@ -27883,9 +27907,9 @@ diff -urNp linux-2.6.39/drivers/char/genrtc.c lin= ux-2.6.39/drivers/char/genrtc.c if (get_rtc_pll(&pll)) return -EINVAL; else -diff -urNp linux-2.6.39/drivers/char/hpet.c linux-2.6.39/drivers/char/hp= et.c ---- linux-2.6.39/drivers/char/hpet.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/char/hpet.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/hpet.c linux-2.6.39.1/drivers/cha= r/hpet.c +--- linux-2.6.39.1/drivers/char/hpet.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/char/hpet.c 2011-05-22 19:36:31.000000000 -04= 00 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di } =20 @@ -27895,9 +27919,9 @@ diff -urNp linux-2.6.39/drivers/char/hpet.c linux= -2.6.39/drivers/char/hpet.c struct hpet_info *info) { struct hpet_timer __iomem *timer; -diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c linux-2.6.39/dr= ivers/char/ipmi/ipmi_devintf.c ---- linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/ipmi/ipmi_devintf.c linux-2.6.39.= 1/drivers/char/ipmi/ipmi_devintf.c +--- linux-2.6.39.1/drivers/char/ipmi/ipmi_devintf.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/char/ipmi/ipmi_devintf.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -109,8 +109,7 @@ static int ipmi_fasync(int fd, struct fi return (result); } @@ -27908,9 +27932,9 @@ diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_de= vintf.c linux-2.6.39/drivers/ch .ipmi_recv_hndl =3D file_receive_handler, }; =20 -diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.39= /drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.= 39.1/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.39.1/drivers/char/ipmi/ipmi_msghandler.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/char/ipmi/ipmi_msghandler.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -82,7 +82,7 @@ struct ipmi_user { struct kref refcount; =20 @@ -27968,9 +27992,9 @@ diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_ms= ghandler.c linux-2.6.39/drivers si =3D (struct ipmi_system_interface_addr *) &addr; si->addr_type =3D IPMI_SYSTEM_INTERFACE_ADDR_TYPE; si->channel =3D IPMI_BMC_CHANNEL; -diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_poweroff.c linux-2.6.39/d= rivers/char/ipmi/ipmi_poweroff.c ---- linux-2.6.39/drivers/char/ipmi/ipmi_poweroff.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/char/ipmi/ipmi_poweroff.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/ipmi/ipmi_poweroff.c linux-2.6.39= .1/drivers/char/ipmi/ipmi_poweroff.c +--- linux-2.6.39.1/drivers/char/ipmi/ipmi_poweroff.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/char/ipmi/ipmi_poweroff.c 2011-05-22 19:36:31= .000000000 -0400 @@ -133,7 +133,7 @@ static void receive_handler(struct ipmi_ complete(comp); } @@ -27980,9 +28004,9 @@ diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_po= weroff.c linux-2.6.39/drivers/c .ipmi_recv_hndl =3D receive_handler }; =20 -diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.39/dr= ivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.39.= 1/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.39.1/drivers/char/ipmi/ipmi_si_intf.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/char/ipmi/ipmi_si_intf.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -276,7 +276,7 @@ struct smi_info { unsigned char slave_addr; =20 @@ -28013,9 +28037,9 @@ diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_si= _intf.c linux-2.6.39/drivers/ch =20 new_smi->interrupt_disabled =3D 1; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c linux-2.6.39/d= rivers/char/ipmi/ipmi_watchdog.c ---- linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/ipmi/ipmi_watchdog.c linux-2.6.39= .1/drivers/char/ipmi/ipmi_watchdog.c +--- linux-2.6.39.1/drivers/char/ipmi/ipmi_watchdog.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/char/ipmi/ipmi_watchdog.c 2011-05-22 19:36:31= .000000000 -0400 @@ -216,7 +216,7 @@ static int set_param_timeout(const char=20 return rv; } @@ -28051,9 +28075,9 @@ diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_wa= tchdog.c linux-2.6.39/drivers/c .ipmi_recv_hndl =3D ipmi_wdog_msg_handler, .ipmi_watchdog_pretimeout =3D ipmi_wdog_pretimeout_handler }; -diff -urNp linux-2.6.39/drivers/char/Kconfig linux-2.6.39/drivers/char/K= config ---- linux-2.6.39/drivers/char/Kconfig 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/char/Kconfig 2011-05-22 19:41:37.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/char/Kconfig linux-2.6.39.1/drivers/ch= ar/Kconfig +--- linux-2.6.39.1/drivers/char/Kconfig 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/char/Kconfig 2011-05-22 19:41:37.000000000 -0= 400 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig" =20 config DEVKMEM @@ -28072,9 +28096,9 @@ diff -urNp linux-2.6.39/drivers/char/Kconfig linu= x-2.6.39/drivers/char/Kconfig default y =20 source "drivers/s390/char/Kconfig" -diff -urNp linux-2.6.39/drivers/char/mem.c linux-2.6.39/drivers/char/mem= .c ---- linux-2.6.39/drivers/char/mem.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/char/mem.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/mem.c linux-2.6.39.1/drivers/char= /mem.c +--- linux-2.6.39.1/drivers/char/mem.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/char/mem.c 2011-05-22 19:41:37.000000000 -040= 0 @@ -18,6 +18,7 @@ #include #include @@ -28207,9 +28231,9 @@ diff -urNp linux-2.6.39/drivers/char/mem.c linux-= 2.6.39/drivers/char/mem.c }; =20 static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.39/drivers/char/mmtimer.c linux-2.6.39/drivers/char= /mmtimer.c ---- linux-2.6.39/drivers/char/mmtimer.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/char/mmtimer.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/char/mmtimer.c linux-2.6.39.1/drivers/= char/mmtimer.c +--- linux-2.6.39.1/drivers/char/mmtimer.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/char/mmtimer.c 2011-05-22 19:36:31.000000000 = -0400 @@ -53,7 +53,7 @@ MODULE_LICENSE("GPL"); =20 #define RTC_BITS 55 /* 55 bits for this implementation */ @@ -28228,9 +28252,9 @@ diff -urNp linux-2.6.39/drivers/char/mmtimer.c li= nux-2.6.39/drivers/char/mmtimer .clock_set =3D sgi_clock_set, .clock_get =3D sgi_clock_get, .clock_getres =3D sgi_clock_getres, -diff -urNp linux-2.6.39/drivers/char/nvram.c linux-2.6.39/drivers/char/n= vram.c ---- linux-2.6.39/drivers/char/nvram.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/char/nvram.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/char/nvram.c linux-2.6.39.1/drivers/ch= ar/nvram.c +--- linux-2.6.39.1/drivers/char/nvram.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/char/nvram.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f =20 spin_unlock_irq(&rtc_lock); @@ -28240,9 +28264,9 @@ diff -urNp linux-2.6.39/drivers/char/nvram.c linu= x-2.6.39/drivers/char/nvram.c return -EFAULT; =20 *ppos =3D i; -diff -urNp linux-2.6.39/drivers/char/random.c linux-2.6.39/drivers/char/= random.c ---- linux-2.6.39/drivers/char/random.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/char/random.c 2011-05-22 19:41:37.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/char/random.c linux-2.6.39.1/drivers/c= har/random.c +--- linux-2.6.39.1/drivers/char/random.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/char/random.c 2011-05-22 19:41:37.000000000 -= 0400 @@ -261,8 +261,13 @@ /* * Configuration information @@ -28293,9 +28317,9 @@ diff -urNp linux-2.6.39/drivers/char/random.c lin= ux-2.6.39/drivers/char/random.c static int max_write_thresh =3D INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; =20 -diff -urNp linux-2.6.39/drivers/char/sonypi.c linux-2.6.39/drivers/char/= sonypi.c ---- linux-2.6.39/drivers/char/sonypi.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/char/sonypi.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/char/sonypi.c linux-2.6.39.1/drivers/c= har/sonypi.c +--- linux-2.6.39.1/drivers/char/sonypi.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/char/sonypi.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -55,6 +55,7 @@ #include #include @@ -28334,9 +28358,9 @@ diff -urNp linux-2.6.39/drivers/char/sonypi.c lin= ux-2.6.39/drivers/char/sonypi.c mutex_unlock(&sonypi_device.lock); =20 return 0; -diff -urNp linux-2.6.39/drivers/char/tpm/tpm_bios.c linux-2.6.39/drivers= /char/tpm/tpm_bios.c ---- linux-2.6.39/drivers/char/tpm/tpm_bios.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/char/tpm/tpm_bios.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/char/tpm/tpm_bios.c linux-2.6.39.1/dri= vers/char/tpm/tpm_bios.c +--- linux-2.6.39.1/drivers/char/tpm/tpm_bios.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/char/tpm/tpm_bios.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start event =3D addr; =20 @@ -28377,9 +28401,9 @@ diff -urNp linux-2.6.39/drivers/char/tpm/tpm_bios= .c linux-2.6.39/drivers/char/tp =20 memcpy(log->bios_event_log, virt, len); =20 -diff -urNp linux-2.6.39/drivers/char/tpm/tpm.c linux-2.6.39/drivers/char= /tpm/tpm.c ---- linux-2.6.39/drivers/char/tpm/tpm.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/char/tpm/tpm.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/char/tpm/tpm.c linux-2.6.39.1/drivers/= char/tpm/tpm.c +--- linux-2.6.39.1/drivers/char/tpm/tpm.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/char/tpm/tpm.c 2011-05-22 19:36:31.000000000 = -0400 @@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c chip->vendor.req_complete_val) goto out_recv; @@ -28398,9 +28422,9 @@ diff -urNp linux-2.6.39/drivers/char/tpm/tpm.c li= nux-2.6.39/drivers/char/tpm/tpm tpm_cmd.header.in =3D tpm_readpubek_header; err =3D transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, "attempting to read the PUBEK"); -diff -urNp linux-2.6.39/drivers/char/ttyprintk.c linux-2.6.39/drivers/ch= ar/ttyprintk.c ---- linux-2.6.39/drivers/char/ttyprintk.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/char/ttyprintk.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/char/ttyprintk.c linux-2.6.39.1/driver= s/char/ttyprintk.c +--- linux-2.6.39.1/drivers/char/ttyprintk.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/char/ttyprintk.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -170,7 +170,7 @@ static const struct tty_operations ttypr .ioctl =3D tpk_ioctl, }; @@ -28410,9 +28434,9 @@ diff -urNp linux-2.6.39/drivers/char/ttyprintk.c = linux-2.6.39/drivers/char/ttypr =20 static struct tty_driver *ttyprintk_driver; =20 -diff -urNp linux-2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux= -2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c ---- linux-2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2011-05-22 1= 9:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c lin= ux-2.6.39.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c +--- linux-2.6.39.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2011-05-22= 19:36:31.000000000 -0400 @@ -678,14 +678,14 @@ static int __devinit hwicap_setup(struct return retval; } @@ -28430,9 +28454,9 @@ diff -urNp linux-2.6.39/drivers/char/xilinx_hwica= p/xilinx_hwicap.c linux-2.6.39/ .get_configuration =3D fifo_icap_get_configuration, .set_configuration =3D fifo_icap_set_configuration, .get_status =3D fifo_icap_get_status, -diff -urNp linux-2.6.39/drivers/crypto/hifn_795x.c linux-2.6.39/drivers/= crypto/hifn_795x.c ---- linux-2.6.39/drivers/crypto/hifn_795x.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/crypto/hifn_795x.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/crypto/hifn_795x.c linux-2.6.39.1/driv= ers/crypto/hifn_795x.c +--- linux-2.6.39.1/drivers/crypto/hifn_795x.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/crypto/hifn_795x.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device=20 0xCA, 0x34, 0x2B, 0x2E}; struct scatterlist sg; @@ -28442,9 +28466,9 @@ diff -urNp linux-2.6.39/drivers/crypto/hifn_795x.= c linux-2.6.39/drivers/crypto/h memset(src, 0, sizeof(src)); memset(ctx.key, 0, sizeof(ctx.key)); =20 -diff -urNp linux-2.6.39/drivers/crypto/padlock-aes.c linux-2.6.39/driver= s/crypto/padlock-aes.c ---- linux-2.6.39/drivers/crypto/padlock-aes.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/crypto/padlock-aes.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/crypto/padlock-aes.c linux-2.6.39.1/dr= ivers/crypto/padlock-aes.c +--- linux-2.6.39.1/drivers/crypto/padlock-aes.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/crypto/padlock-aes.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm struct crypto_aes_ctx gen_aes; int cpu; @@ -28454,9 +28478,9 @@ diff -urNp linux-2.6.39/drivers/crypto/padlock-ae= s.c linux-2.6.39/drivers/crypto if (key_len % 8) { *flags |=3D CRYPTO_TFM_RES_BAD_KEY_LEN; return -EINVAL; -diff -urNp linux-2.6.39/drivers/dca/dca-core.c linux-2.6.39/drivers/dca/= dca-core.c ---- linux-2.6.39/drivers/dca/dca-core.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/dca/dca-core.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/dca/dca-core.c linux-2.6.39.1/drivers/= dca/dca-core.c +--- linux-2.6.39.1/drivers/dca/dca-core.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/dca/dca-core.c 2011-05-22 19:36:31.000000000 = -0400 @@ -325,7 +325,7 @@ EXPORT_SYMBOL_GPL(dca_get_tag); * @ops - pointer to struct of dca operation function pointers * @priv_size - size of extra mem to be added for provider's needs @@ -28466,9 +28490,9 @@ diff -urNp linux-2.6.39/drivers/dca/dca-core.c li= nux-2.6.39/drivers/dca/dca-core { struct dca_provider *dca; int alloc_size; -diff -urNp linux-2.6.39/drivers/dma/ioat/dca.c linux-2.6.39/drivers/dma/= ioat/dca.c ---- linux-2.6.39/drivers/dma/ioat/dca.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/dma/ioat/dca.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/dma/ioat/dca.c linux-2.6.39.1/drivers/= dma/ioat/dca.c +--- linux-2.6.39.1/drivers/dma/ioat/dca.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/dma/ioat/dca.c 2011-05-22 19:36:31.000000000 = -0400 @@ -234,7 +234,7 @@ static int ioat_dca_dev_managed(struct d return 0; } @@ -28496,9 +28520,9 @@ diff -urNp linux-2.6.39/drivers/dma/ioat/dca.c li= nux-2.6.39/drivers/dma/ioat/dca .add_requester =3D ioat3_dca_add_requester, .remove_requester =3D ioat3_dca_remove_requester, .get_tag =3D ioat3_dca_get_tag, -diff -urNp linux-2.6.39/drivers/edac/amd64_edac.h linux-2.6.39/drivers/e= dac/amd64_edac.h ---- linux-2.6.39/drivers/edac/amd64_edac.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/edac/amd64_edac.h 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/edac/amd64_edac.h linux-2.6.39.1/drive= rs/edac/amd64_edac.h +--- linux-2.6.39.1/drivers/edac/amd64_edac.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/edac/amd64_edac.h 2011-05-22 19:36:31.0000000= 00 -0400 @@ -333,7 +333,7 @@ struct chip_select { }; =20 @@ -28517,9 +28541,9 @@ diff -urNp linux-2.6.39/drivers/edac/amd64_edac.h= linux-2.6.39/drivers/edac/amd6 }; =20 int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset, -diff -urNp linux-2.6.39/drivers/edac/edac_mc_sysfs.c linux-2.6.39/driver= s/edac/edac_mc_sysfs.c ---- linux-2.6.39/drivers/edac/edac_mc_sysfs.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/edac/edac_mc_sysfs.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/edac/edac_mc_sysfs.c linux-2.6.39.1/dr= ivers/edac/edac_mc_sysfs.c +--- linux-2.6.39.1/drivers/edac/edac_mc_sysfs.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/edac/edac_mc_sysfs.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -760,7 +760,7 @@ static void edac_inst_grp_release(struct } =20 @@ -28529,9 +28553,9 @@ diff -urNp linux-2.6.39/drivers/edac/edac_mc_sysf= s.c linux-2.6.39/drivers/edac/e .show =3D inst_grp_show, .store =3D inst_grp_store }; -diff -urNp linux-2.6.39/drivers/edac/edac_pci_sysfs.c linux-2.6.39/drive= rs/edac/edac_pci_sysfs.c ---- linux-2.6.39/drivers/edac/edac_pci_sysfs.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/edac/edac_pci_sysfs.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/edac/edac_pci_sysfs.c linux-2.6.39.1/d= rivers/edac/edac_pci_sysfs.c +--- linux-2.6.39.1/drivers/edac/edac_pci_sysfs.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/edac/edac_pci_sysfs.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -26,8 +26,8 @@ static int edac_pci_log_pe =3D 1; /* log=20 static int edac_pci_log_npe =3D 1; /* log PCI non-parity error errors *= / static int edac_pci_poll_msec =3D 1000; /* one second workq period */ @@ -28615,9 +28639,9 @@ diff -urNp linux-2.6.39/drivers/edac/edac_pci_sys= fs.c linux-2.6.39/drivers/edac/ panic("EDAC: PCI Parity Error"); } } -diff -urNp linux-2.6.39/drivers/firewire/core-cdev.c linux-2.6.39/driver= s/firewire/core-cdev.c ---- linux-2.6.39/drivers/firewire/core-cdev.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/firewire/core-cdev.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/firewire/core-cdev.c linux-2.6.39.1/dr= ivers/firewire/core-cdev.c +--- linux-2.6.39.1/drivers/firewire/core-cdev.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/firewire/core-cdev.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -1312,8 +1312,7 @@ static int init_iso_resource(struct clie int ret; =20 @@ -28628,9 +28652,9 @@ diff -urNp linux-2.6.39/drivers/firewire/core-cde= v.c linux-2.6.39/drivers/firewi return -EINVAL; =20 r =3D kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.39/drivers/firewire/core-transaction.c linux-2.6.39= /drivers/firewire/core-transaction.c ---- linux-2.6.39/drivers/firewire/core-transaction.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/firewire/core-transaction.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/firewire/core-transaction.c linux-2.6.= 39.1/drivers/firewire/core-transaction.c +--- linux-2.6.39.1/drivers/firewire/core-transaction.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/firewire/core-transaction.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -36,6 +36,7 @@ #include #include @@ -28648,9 +28672,9 @@ diff -urNp linux-2.6.39/drivers/firewire/core-tra= nsaction.c linux-2.6.39/drivers init_timer_on_stack(&t.split_timeout_timer); init_completion(&d.done); d.payload =3D payload; -diff -urNp linux-2.6.39/drivers/firmware/dmi_scan.c linux-2.6.39/drivers= /firmware/dmi_scan.c ---- linux-2.6.39/drivers/firmware/dmi_scan.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/firmware/dmi_scan.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/firmware/dmi_scan.c linux-2.6.39.1/dri= vers/firmware/dmi_scan.c +--- linux-2.6.39.1/drivers/firmware/dmi_scan.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/firmware/dmi_scan.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void) } } @@ -28663,9 +28687,9 @@ diff -urNp linux-2.6.39/drivers/firmware/dmi_scan= .c linux-2.6.39/drivers/firmwar p =3D dmi_ioremap(0xF0000, 0x10000); if (p =3D=3D NULL) goto error; -diff -urNp linux-2.6.39/drivers/gpio/vr41xx_giu.c linux-2.6.39/drivers/g= pio/vr41xx_giu.c ---- linux-2.6.39/drivers/gpio/vr41xx_giu.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/gpio/vr41xx_giu.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/gpio/vr41xx_giu.c linux-2.6.39.1/drive= rs/gpio/vr41xx_giu.c +--- linux-2.6.39.1/drivers/gpio/vr41xx_giu.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/gpio/vr41xx_giu.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq) printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", maskl, pendl, maskh, pendh); @@ -28675,9 +28699,9 @@ diff -urNp linux-2.6.39/drivers/gpio/vr41xx_giu.c= linux-2.6.39/drivers/gpio/vr41 =20 return -EINVAL; } -diff -urNp linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.39/d= rivers/gpu/drm/drm_crtc_helper.c ---- linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.39= .1/drivers/gpu/drm/drm_crtc_helper.c +--- linux-2.6.39.1/drivers/gpu/drm/drm_crtc_helper.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/drm_crtc_helper.c 2011-05-22 19:36:31= .000000000 -0400 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d struct drm_crtc *tmp; int crtc_mask =3D 1; @@ -28696,9 +28720,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/drm_crtc_= helper.c linux-2.6.39/drivers/g crtc->enabled =3D drm_helper_crtc_in_use(crtc); if (!crtc->enabled) return true; -diff -urNp linux-2.6.39/drivers/gpu/drm/drm_drv.c linux-2.6.39/drivers/g= pu/drm/drm_drv.c ---- linux-2.6.39/drivers/gpu/drm/drm_drv.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/gpu/drm/drm_drv.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/drm_drv.c linux-2.6.39.1/drive= rs/gpu/drm/drm_drv.c +--- linux-2.6.39.1/drivers/gpu/drm/drm_drv.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/drm_drv.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp, =20 dev =3D file_priv->minor->dev; @@ -28708,9 +28732,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/drm_drv.c= linux-2.6.39/drivers/gpu/drm/d ++file_priv->ioctl_count; =20 DRM_DEBUG("pid=3D%d, cmd=3D0x%02x, nr=3D0x%02x, dev 0x%lx, auth=3D%d\n= ", -diff -urNp linux-2.6.39/drivers/gpu/drm/drm_fops.c linux-2.6.39/drivers/= gpu/drm/drm_fops.c ---- linux-2.6.39/drivers/gpu/drm/drm_fops.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/gpu/drm/drm_fops.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/drm_fops.c linux-2.6.39.1/driv= ers/gpu/drm/drm_fops.c +--- linux-2.6.39.1/drivers/gpu/drm/drm_fops.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/drm_fops.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * } =20 @@ -28760,9 +28784,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/drm_fops.= c linux-2.6.39/drivers/gpu/drm/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.39/drivers/gpu/drm/drm_global.c linux-2.6.39/driver= s/gpu/drm/drm_global.c ---- linux-2.6.39/drivers/gpu/drm/drm_global.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/drm_global.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/drm_global.c linux-2.6.39.1/dr= ivers/gpu/drm/drm_global.c +--- linux-2.6.39.1/drivers/gpu/drm/drm_global.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/drm_global.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -36,7 +36,7 @@ struct drm_global_item { struct mutex mutex; @@ -28820,9 +28844,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/drm_globa= l.c linux-2.6.39/drivers/gpu/dr ref->release(ref); item->object =3D NULL; } -diff -urNp linux-2.6.39/drivers/gpu/drm/drm_info.c linux-2.6.39/drivers/= gpu/drm/drm_info.c ---- linux-2.6.39/drivers/gpu/drm/drm_info.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/gpu/drm/drm_info.c 2011-05-22 19:41:37.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/drm_info.c linux-2.6.39.1/driv= ers/gpu/drm/drm_info.c +--- linux-2.6.39.1/drivers/gpu/drm/drm_info.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/drm_info.c 2011-05-22 19:41:37.000000= 000 -0400 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void struct drm_local_map *map; struct drm_map_list *r_list; @@ -28863,9 +28887,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/drm_info.= c linux-2.6.39/drivers/gpu/drm/ =20 #if defined(__i386__) pgprot =3D pgprot_val(vma->vm_page_prot); -diff -urNp linux-2.6.39/drivers/gpu/drm/drm_ioctl.c linux-2.6.39/drivers= /gpu/drm/drm_ioctl.c ---- linux-2.6.39/drivers/gpu/drm/drm_ioctl.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/gpu/drm/drm_ioctl.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/drm_ioctl.c linux-2.6.39.1/dri= vers/gpu/drm/drm_ioctl.c +--- linux-2.6.39.1/drivers/gpu/drm/drm_ioctl.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/drm_ioctl.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, stats->data[i].value =3D (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lo= ck->lock : 0); @@ -28875,9 +28899,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/drm_ioctl= .c linux-2.6.39/drivers/gpu/drm stats->data[i].type =3D dev->types[i]; } =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/drm_lock.c linux-2.6.39/drivers/= gpu/drm/drm_lock.c ---- linux-2.6.39/drivers/gpu/drm/drm_lock.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/gpu/drm/drm_lock.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/drm_lock.c linux-2.6.39.1/driv= ers/gpu/drm/drm_lock.c +--- linux-2.6.39.1/drivers/gpu/drm/drm_lock.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/drm_lock.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv =3D file_priv; @@ -28896,9 +28920,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/drm_lock.= c linux-2.6.39/drivers/gpu/drm/ =20 if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ -diff -urNp linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c linux-2.6.39/dri= vers/gpu/drm/i810/i810_dma.c ---- linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i810/i810_dma.c linux-2.6.39.1= /drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.39.1/drivers/gpu/drm/i810/i810_dma.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i810/i810_dma.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -28921,9 +28945,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i810/i810= _dma.c linux-2.6.39/drivers/gpu sarea_priv->last_enqueue =3D dev_priv->counter - 1; sarea_priv->last_dispatch =3D (int)hw_status[5]; =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h linux-2.6.39/dri= vers/gpu/drm/i810/i810_drv.h ---- linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i810/i810_drv.h linux-2.6.39.1= /drivers/gpu/drm/i810/i810_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/i810/i810_drv.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i810/i810_drv.h 2011-05-22 19:36:31.0= 00000000 -0400 @@ -108,8 +108,8 @@ typedef struct drm_i810_private { int page_flipping; =20 @@ -28935,9 +28959,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i810/i810= _drv.h linux-2.6.39/drivers/gpu =20 int front_offset; } drm_i810_private_t; -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.39/d= rivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.39= .1/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ch7017.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ch7017.c 2011-05-22 19:36:31= .000000000 -0400 @@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_ } } @@ -28947,9 +28971,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_= ch7017.c linux-2.6.39/drivers/g .init =3D ch7017_init, .detect =3D ch7017_detect, .mode_valid =3D ch7017_mode_valid, -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.39/d= rivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.39= .1/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-05-22 19:36:31= .000000000 -0400 @@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -28959,9 +28983,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_= ch7xxx.c linux-2.6.39/drivers/g .init =3D ch7xxx_init, .detect =3D ch7xxx_detect, .mode_valid =3D ch7xxx_mode_valid, -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo.h linux-2.6.39/drivers/= gpu/drm/i915/dvo.h ---- linux-2.6.39/drivers/gpu/drm/i915/dvo.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/dvo.h 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/dvo.h linux-2.6.39.1/driv= ers/gpu/drm/i915/dvo.h +--- linux-2.6.39.1/drivers/gpu/drm/i915/dvo.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/dvo.h 2011-05-22 19:36:31.000000= 000 -0400 @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -28994,9 +29018,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo.= h linux-2.6.39/drivers/gpu/drm/ +extern const struct intel_dvo_dev_ops ch7017_ops; =20 #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.39/dri= vers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.39.1= /drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ivch.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/dvo_ivch.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv } } @@ -29006,9 +29030,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_= ivch.c linux-2.6.39/drivers/gpu .init =3D ivch_init, .dpms =3D ivch_dpms, .mode_valid =3D ivch_mode_valid, -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.39/d= rivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.39= .1/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/dvo_sil164.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/dvo_sil164.c 2011-05-22 19:36:31= .000000000 -0400 @@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_ } } @@ -29018,9 +29042,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_= sil164.c linux-2.6.39/drivers/g .init =3D sil164_init, .detect =3D sil164_detect, .mode_valid =3D sil164_mode_valid, -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.39/d= rivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.39= .1/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/dvo_tfp410.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/dvo_tfp410.c 2011-05-22 19:36:31= .000000000 -0400 @@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_ } } @@ -29030,9 +29054,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_= tfp410.c linux-2.6.39/drivers/g .init =3D tfp410_init, .detect =3D tfp410_detect, .mode_valid =3D tfp410_mode_valid, -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.39= /drivers/gpu/drm/i915/i915_debugfs.c ---- linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.= 39.1/drivers/gpu/drm/i915/i915_debugfs.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -496,7 +496,7 @@ static int i915_interrupt_info(struct se I915_READ(GTIMR)); } @@ -29042,9 +29066,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915= _debugfs.c linux-2.6.39/drivers for (i =3D 0; i < I915_NUM_RINGS; i++) { if (IS_GEN6(dev)) { seq_printf(m, "Graphics Interrupt mask (%s): %08x\n", -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c linux-2.6.39/dri= vers/gpu/drm/i915/i915_dma.c ---- linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/i915_dma.c linux-2.6.39.1= /drivers/gpu/drm/i915/i915_dma.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/i915_dma.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/i915_dma.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s bool can_switch; =20 @@ -29054,9 +29078,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915= _dma.c linux-2.6.39/drivers/gpu spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39/dri= vers/gpu/drm/i915/i915_drv.c ---- linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39.1= /drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/i915_drv.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/i915_drv.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -679,7 +679,7 @@ static const struct dev_pm_ops i915_pm_o .restore =3D i915_pm_resume, }; @@ -29066,9 +29090,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915= _drv.c linux-2.6.39/drivers/gpu .fault =3D i915_gem_fault, .open =3D drm_gem_vm_open, .close =3D drm_gem_vm_close, -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h linux-2.6.39/dri= vers/gpu/drm/i915/i915_drv.h ---- linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/i915_drv.h linux-2.6.39.1= /drivers/gpu/drm/i915/i915_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/i915/i915_drv.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/i915_drv.h 2011-05-22 19:36:31.0= 00000000 -0400 @@ -287,7 +287,7 @@ typedef struct drm_i915_private { int current_page; int page_flipping; @@ -29096,9 +29120,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915= _drv.h linux-2.6.39/drivers/gpu { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux= -2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c ---- linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-22 1= 9:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c lin= ux-2.6.39.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-22= 19:36:31.000000000 -0400 @@ -192,7 +192,7 @@ i915_gem_object_set_to_gpu_domain(struct i915_gem_release_mmap(obj); =20 @@ -29108,9 +29132,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915= _gem_execbuffer.c linux-2.6.39/ =20 /* The actual obj->write_domain will be updated with * pending_write_domain after we emit the accumulated flush for all -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c linux-2.6.39/dri= vers/gpu/drm/i915/i915_irq.c ---- linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/i915_irq.c linux-2.6.39.1= /drivers/gpu/drm/i915/i915_irq.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/i915_irq.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/i915_irq.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -1101,7 +1101,7 @@ irqreturn_t i915_driver_irq_handler(DRM_ int ret =3D IRQ_NONE, pipe; bool blc_event =3D false; @@ -29129,9 +29153,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915= _irq.c linux-2.6.39/drivers/gpu =20 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); -diff -urNp linux-2.6.39/drivers/gpu/drm/i915/intel_display.c linux-2.6.3= 9/drivers/gpu/drm/i915/intel_display.c ---- linux-2.6.39/drivers/gpu/drm/i915/intel_display.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/i915/intel_display.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/i915/intel_display.c linux-2.6= .39.1/drivers/gpu/drm/i915/intel_display.c +--- linux-2.6.39.1/drivers/gpu/drm/i915/intel_display.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/i915/intel_display.c 2011-05-22 19:36= :31.000000000 -0400 @@ -2244,7 +2244,7 @@ intel_pipe_set_base(struct drm_crtc *crt =20 wait_event(dev_priv->pending_flip_queue, @@ -29168,9 +29192,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/i915/inte= l_display.c linux-2.6.39/driver =20 switch (INTEL_INFO(dev)->gen) { case 2: -diff -urNp linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h linux-2.6.39/drive= rs/gpu/drm/mga/mga_drv.h ---- linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/mga/mga_drv.h linux-2.6.39.1/d= rivers/gpu/drm/mga/mga_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/mga/mga_drv.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/mga/mga_drv.h 2011-05-22 19:36:31.000= 000000 -0400 @@ -120,9 +120,9 @@ typedef struct drm_mga_private { u32 clear_cmd; u32 maccess; @@ -29183,9 +29207,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/mga/mga_d= rv.h linux-2.6.39/drivers/gpu/d u32 next_fence_to_post; =20 unsigned int fb_cpp; -diff -urNp linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c linux-2.6.39/drive= rs/gpu/drm/mga/mga_irq.c ---- linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/mga/mga_irq.c linux-2.6.39.1/d= rivers/gpu/drm/mga/mga_irq.c +--- linux-2.6.39.1/drivers/gpu/drm/mga/mga_irq.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/mga/mga_irq.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de if (crtc !=3D 0) return 0; @@ -29222,9 +29246,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/mga/mga_i= rq.c linux-2.6.39/drivers/gpu/d - *sequence) <=3D (1 << 23))); =20 *sequence =3D cur_fence; -diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c linux-2.6= .39/drivers/gpu/drm/nouveau/nouveau_acpi.c ---- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_acpi.c linux-2= .6.39.1/drivers/gpu/drm/nouveau/nouveau_acpi.c +--- linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -141,7 +141,7 @@ static int nouveau_dsm_get_client_id(str return VGA_SWITCHEROO_DIS; } @@ -29234,9 +29258,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/n= ouveau_acpi.c linux-2.6.39/driv .switchto =3D nouveau_dsm_switchto, .power_state =3D nouveau_dsm_power_state, .init =3D nouveau_dsm_init, -diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.= 39/drivers/gpu/drm/nouveau/nouveau_drv.h ---- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-23 17:07:= 00.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.= 6.39.1/drivers/gpu/drm/nouveau/nouveau_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-23 17:0= 7:00.000000000 -0400 @@ -228,7 +228,7 @@ struct nouveau_channel { struct list_head pending; uint32_t sequence; @@ -29275,9 +29299,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/n= ouveau_drv.h linux-2.6.39/drive } ttm; =20 struct { -diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.= 6.39/drivers/gpu/drm/nouveau/nouveau_fence.c ---- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_fence.c linux-= 2.6.39.1/drivers/gpu/drm/nouveau/nouveau_fence.c +--- linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-22 19= :36:31.000000000 -0400 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan if (USE_REFCNT(dev)) sequence =3D nvchan_rd32(chan, 0x48); @@ -29296,9 +29320,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/n= ouveau_fence.c linux-2.6.39/dri return 0; } =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.= 39/drivers/gpu/drm/nouveau/nouveau_gem.c ---- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.= 6.39.1/drivers/gpu/drm/nouveau/nouveau_gem.c +--- linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch int trycnt =3D 0; int ret, i; @@ -29308,9 +29332,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/n= ouveau_gem.c linux-2.6.39/drive retry: if (++trycnt > 100000) { NV_ERROR(dev, "%s failed and gave up.\n", __func__); -diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.= 6.39/drivers/gpu/drm/nouveau/nouveau_state.c ---- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_state.c linux-= 2.6.39.1/drivers/gpu/drm/nouveau/nouveau_state.c +--- linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-22 19= :36:31.000000000 -0400 @@ -583,7 +583,7 @@ static bool nouveau_switcheroo_can_switc bool can_switch; =20 @@ -29320,9 +29344,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/n= ouveau_state.c linux-2.6.39/dri spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.3= 9/drivers/gpu/drm/nouveau/nv04_graph.c ---- linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6= .39.1/drivers/gpu/drm/nouveau/nv04_graph.c +--- linux-2.6.39.1/drivers/gpu/drm/nouveau/nv04_graph.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/nouveau/nv04_graph.c 2011-05-22 19:36= :31.000000000 -0400 @@ -552,7 +552,7 @@ static int nv04_graph_mthd_set_ref(struct nouveau_channel *chan, u32 class, u32 mthd, u32 data) @@ -29332,9 +29356,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/n= v04_graph.c linux-2.6.39/driver return 0; } =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c linux-2.6.39/dri= vers/gpu/drm/r128/r128_cce.c ---- linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/r128/r128_cce.c linux-2.6.39.1= /drivers/gpu/drm/r128/r128_cce.c +--- linux-2.6.39.1/drivers/gpu/drm/r128/r128_cce.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/r128/r128_cce.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d =20 /* GH: Simple idle check. @@ -29344,9 +29368,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128= _cce.c linux-2.6.39/drivers/gpu =20 /* We don't support anything other than bus-mastering ring mode, * but the ring can be in either AGP or PCI space for the ring -diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h linux-2.6.39/dri= vers/gpu/drm/r128/r128_drv.h ---- linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/r128/r128_drv.h linux-2.6.39.1= /drivers/gpu/drm/r128/r128_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/r128/r128_drv.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/r128/r128_drv.h 2011-05-22 19:36:31.0= 00000000 -0400 @@ -90,14 +90,14 @@ typedef struct drm_r128_private { int is_pci; unsigned long cce_buffers_offset; @@ -29364,9 +29388,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128= _drv.h linux-2.6.39/drivers/gpu =20 u32 color_fmt; unsigned int front_offset; -diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c linux-2.6.39/dri= vers/gpu/drm/r128/r128_irq.c ---- linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/r128/r128_irq.c linux-2.6.39.1= /drivers/gpu/drm/r128/r128_irq.c +--- linux-2.6.39.1/drivers/gpu/drm/r128/r128_irq.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/r128/r128_irq.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d if (crtc !=3D 0) return 0; @@ -29385,9 +29409,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128= _irq.c linux-2.6.39/drivers/gpu drm_handle_vblank(dev, 0); return IRQ_HANDLED; } -diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_state.c linux-2.6.39/d= rivers/gpu/drm/r128/r128_state.c ---- linux-2.6.39/drivers/gpu/drm/r128/r128_state.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/r128/r128_state.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/r128/r128_state.c linux-2.6.39= .1/drivers/gpu/drm/r128/r128_state.c +--- linux-2.6.39.1/drivers/gpu/drm/r128/r128_state.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/r128/r128_state.c 2011-05-22 19:36:31= .000000000 -0400 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv =20 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv) @@ -29401,9 +29425,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128= _state.c linux-2.6.39/drivers/g } =20 #endif -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/atom.c linux-2.6.39/drive= rs/gpu/drm/radeon/atom.c ---- linux-2.6.39/drivers/gpu/drm/radeon/atom.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/atom.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/atom.c linux-2.6.39.1/d= rivers/gpu/drm/radeon/atom.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/atom.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/atom.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c char name[512]; int i; @@ -29413,9 +29437,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/at= om.c linux-2.6.39/drivers/gpu/d ctx->card =3D card; ctx->bios =3D bios; =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.39= /drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.= 39.1/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/mkregtable.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/mkregtable.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,=20 regex_t mask_rex; regmatch_t match[4]; @@ -29433,9 +29457,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/mk= regtable.c linux-2.6.39/drivers =20 if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c linux-2= .6.39/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-22 19:= 36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_atombios.c linux= -2.6.39.1/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-22 1= 9:36:31.000000000 -0400 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from struct radeon_gpio_rec gpio; struct radeon_hpd hpd; @@ -29445,9 +29469,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_atombios.c linux-2.6.39/dr if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_off= set)) return false; =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c lin= ux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-19= 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-22= 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_atpx_handler.c l= inux-2.6.39.1/drivers/gpu/drm/radeon/radeon_atpx_handler.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-= 19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-= 22 19:36:31.000000000 -0400 @@ -234,7 +234,7 @@ static int radeon_atpx_get_client_id(str return VGA_SWITCHEROO_DIS; } @@ -29457,9 +29481,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_atpx_handler.c linux-2.6.3 .switchto =3D radeon_atpx_switchto, .power_state =3D radeon_atpx_power_state, .init =3D radeon_atpx_init, -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c linux-2.6= .39/drivers/gpu/drm/radeon/radeon_device.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_device.c linux-2= .6.39.1/drivers/gpu/drm/radeon/radeon_device.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_device.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_device.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -674,7 +674,7 @@ static bool radeon_switcheroo_can_switch bool can_switch; =20 @@ -29469,9 +29493,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_device.c linux-2.6.39/driv spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c linux-2.= 6.39/drivers/gpu/drm/radeon/radeon_display.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_display.c linux-= 2.6.39.1/drivers/gpu/drm/radeon/radeon_display.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_display.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_display.c 2011-05-22 19= :36:31.000000000 -0400 @@ -934,6 +934,8 @@ void radeon_compute_pll_legacy(struct ra uint32_t post_div; u32 pll_out_min, pll_out_max; @@ -29481,9 +29505,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_display.c linux-2.6.39/dri DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->ma= x_ref_div); freq =3D freq * 1000; =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.39= /drivers/gpu/drm/radeon/radeon_drv.h ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.= 39.1/drivers/gpu/drm/radeon/radeon_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-22 19:36:= 31.000000000 -0400 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private { =20 /* SW interrupt */ @@ -29493,9 +29517,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_drv.h linux-2.6.39/drivers int vblank_crtc; uint32_t irq_enable_reg; uint32_t r500_disp_irq_reg; -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.= 39/drivers/gpu/drm/radeon/radeon_fence.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_fence.c linux-2.= 6.39.1/drivers/gpu/drm/radeon/radeon_fence.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_devi write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags); return 0; @@ -29514,9 +29538,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_fence.c linux-2.6.39/drive INIT_LIST_HEAD(&rdev->fence_drv.created); INIT_LIST_HEAD(&rdev->fence_drv.emited); INIT_LIST_HEAD(&rdev->fence_drv.signaled); -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon.h linux-2.6.39/dri= vers/gpu/drm/radeon/radeon.h ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon.h 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon.h linux-2.6.39.1= /drivers/gpu/drm/radeon/radeon.h +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon.h 2011-05-22 19:36:31.0= 00000000 -0400 @@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_d */ struct radeon_fence_driver { @@ -29526,9 +29550,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon.h linux-2.6.39/drivers/gpu uint32_t last_seq; unsigned long last_jiffies; unsigned long last_timeout; -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.= 39/drivers/gpu/drm/radeon/radeon_ioc32.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.= 6.39.1/drivers/gpu/drm/radeon/radeon_ioc32.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str request =3D compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) @@ -29538,9 +29562,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_ioc32.c linux-2.6.39/drive &request->value)) return -EFAULT; =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.39= /drivers/gpu/drm/radeon/radeon_irq.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.= 39.1/drivers/gpu/drm/radeon/radeon_irq.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de unsigned int ret; RING_LOCALS; @@ -29561,9 +29585,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_irq.c linux-2.6.39/drivers DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); =20 dev->max_vblank_count =3D 0x001fffff; -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.= 39/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_state.c linux-2.= 6.39.1/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_state.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_state.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS) sarea_priv->nbox =3D RADEON_NR_SAREA_CLIPRECTS; @@ -29582,9 +29606,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_state.c linux-2.6.39/drive =20 DRM_DEBUG("pid=3D%d\n", DRM_CURRENTPID); =20 -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.39= /drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.= 39.1/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str man->size =3D size >> PAGE_SHIFT; } @@ -29645,9 +29669,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/ra= deon_ttm.c linux-2.6.39/drivers vma->vm_ops =3D &radeon_ttm_vm_ops; return 0; } -diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/rs690.c linux-2.6.39/driv= ers/gpu/drm/radeon/rs690.c ---- linux-2.6.39/drivers/gpu/drm/radeon/rs690.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/radeon/rs690.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/radeon/rs690.c linux-2.6.39.1/= drivers/gpu/drm/radeon/rs690.c +--- linux-2.6.39.1/drivers/gpu/drm/radeon/rs690.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/radeon/rs690.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) @@ -29661,9 +29685,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/rs= 690.c linux-2.6.39/drivers/gpu/ } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) -diff -urNp linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.39/dri= vers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.39.1= /drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.39.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_ return best_bo; } @@ -29721,9 +29745,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/ttm/ttm_b= o_vm.c linux-2.6.39/drivers/gpu =20 static const struct vm_operations_struct ttm_bo_vm_ops =3D { .fault =3D ttm_bo_vm_fault, -diff -urNp linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.3= 9/drivers/gpu/drm/ttm/ttm_page_alloc.c ---- linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6= .39.1/drivers/gpu/drm/ttm/ttm_page_alloc.c +--- linux-2.6.39.1/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-22 19:36= :31.000000000 -0400 @@ -397,9 +397,9 @@ static int ttm_pool_get_num_unused_pages */ static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages= , gfp_t gfp_mask) @@ -29736,9 +29760,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/ttm/ttm_p= age_alloc.c linux-2.6.39/driver struct ttm_page_pool *pool; =20 pool_offset =3D pool_offset % NUM_POOLS; -diff -urNp linux-2.6.39/drivers/gpu/drm/via/via_drv.h linux-2.6.39/drive= rs/gpu/drm/via/via_drv.h ---- linux-2.6.39/drivers/gpu/drm/via/via_drv.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/via/via_drv.h 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/via/via_drv.h linux-2.6.39.1/d= rivers/gpu/drm/via/via_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/via/via_drv.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/via/via_drv.h 2011-05-22 19:36:31.000= 000000 -0400 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { typedef uint32_t maskarray_t[5]; =20 @@ -29757,9 +29781,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/via/via_d= rv.h linux-2.6.39/drivers/gpu/d drm_via_state_t hc_state; char pci_buf[VIA_PCI_BUF_SIZE]; const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; -diff -urNp linux-2.6.39/drivers/gpu/drm/via/via_irq.c linux-2.6.39/drive= rs/gpu/drm/via/via_irq.c ---- linux-2.6.39/drivers/gpu/drm/via/via_irq.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/via/via_irq.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/via/via_irq.c linux-2.6.39.1/d= rivers/gpu/drm/via/via_irq.c +--- linux-2.6.39.1/drivers/gpu/drm/via/via_irq.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/via/via_irq.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de if (crtc !=3D 0) return 0; @@ -29830,9 +29854,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/via/via_i= rq.c linux-2.6.39/drivers/gpu/d irqwait->request.type &=3D ~_DRM_VBLANK_RELATIVE; case VIA_IRQ_ABSOLUTE: break; -diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.39= /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h ---- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.= 39.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +--- linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-05-22 19:36:= 31.000000000 -0400 @@ -240,7 +240,7 @@ struct vmw_private { * Fencing and IRQs. */ @@ -29842,9 +29866,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vm= wgfx_drv.h linux-2.6.39/drivers wait_queue_head_t fence_queue; wait_queue_head_t fifo_queue; atomic_t fence_queue_waiters; -diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.= 39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c ---- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.= 6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +--- linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev while (!vmw_lag_lt(queue, us)) { spin_lock(&queue->lock); @@ -29854,9 +29878,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vm= wgfx_fence.c linux-2.6.39/drive else { fence =3D list_first_entry(&queue->head, struct vmw_fence, head); -diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.3= 9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c ---- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6= .39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +--- linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-22 19:36= :31.000000000 -0400 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de (unsigned int) min, (unsigned int) fifo->capabilities); @@ -29893,9 +29917,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vm= wgfx_fifo.c linux-2.6.39/driver .fault =3D vmw_fifo_vm_fault, .open =3D NULL, .close =3D NULL -diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.39= /drivers/gpu/drm/vmwgfx/vmwgfx_irq.c ---- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.= 39.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +--- linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva * emitted. Then the fence is stale and signaled. */ @@ -29914,9 +29938,9 @@ diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vm= wgfx_irq.c linux-2.6.39/drivers ret =3D 0; =20 for (;;) { -diff -urNp linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c linux-2.6.39/dr= ivers/gpu/vga/vga_switcheroo.c ---- linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/gpu/vga/vga_switcheroo.c linux-2.6.39.= 1/drivers/gpu/vga/vga_switcheroo.c +--- linux-2.6.39.1/drivers/gpu/vga/vga_switcheroo.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/gpu/vga/vga_switcheroo.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -53,7 +53,7 @@ struct vgasr_priv { int registered_clients; struct vga_switcheroo_client clients[VGA_SWITCHEROO_MAX_CLIENTS]; @@ -29935,9 +29959,9 @@ diff -urNp linux-2.6.39/drivers/gpu/vga/vga_switc= heroo.c linux-2.6.39/drivers/gp { mutex_lock(&vgasr_mutex); if (vgasr_priv.handler) { -diff -urNp linux-2.6.39/drivers/hid/hid-core.c linux-2.6.39/drivers/hid/= hid-core.c ---- linux-2.6.39/drivers/hid/hid-core.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/hid/hid-core.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/hid/hid-core.c linux-2.6.39.1/drivers/= hid/hid-core.c +--- linux-2.6.39.1/drivers/hid/hid-core.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/hid/hid-core.c 2011-05-22 19:36:31.000000000 = -0400 @@ -1888,7 +1888,7 @@ static bool hid_ignore(struct hid_device =20 int hid_add_device(struct hid_device *hdev) @@ -29956,9 +29980,9 @@ diff -urNp linux-2.6.39/drivers/hid/hid-core.c li= nux-2.6.39/drivers/hid/hid-core =20 hid_debug_register(hdev, dev_name(&hdev->dev)); ret =3D device_add(&hdev->dev); -diff -urNp linux-2.6.39/drivers/hid/hid-picolcd.c linux-2.6.39/drivers/h= id/hid-picolcd.c ---- linux-2.6.39/drivers/hid/hid-picolcd.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/hid/hid-picolcd.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/hid/hid-picolcd.c linux-2.6.39.1/drive= rs/hid/hid-picolcd.c +--- linux-2.6.39.1/drivers/hid/hid-picolcd.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/hid/hid-picolcd.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -1037,7 +1037,7 @@ static int picolcd_check_lcd_fb(struct l return fb && fb =3D=3D picolcd_fbinfo((struct picolcd_data *)lcd_get_d= ata(ldev)); } @@ -29968,9 +29992,9 @@ diff -urNp linux-2.6.39/drivers/hid/hid-picolcd.c= linux-2.6.39/drivers/hid/hid-p .get_contrast =3D picolcd_get_contrast, .set_contrast =3D picolcd_set_contrast, .check_fb =3D picolcd_check_lcd_fb, -diff -urNp linux-2.6.39/drivers/hid/usbhid/hiddev.c linux-2.6.39/drivers= /hid/usbhid/hiddev.c ---- linux-2.6.39/drivers/hid/usbhid/hiddev.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/hid/usbhid/hiddev.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/hid/usbhid/hiddev.c linux-2.6.39.1/dri= vers/hid/usbhid/hiddev.c +--- linux-2.6.39.1/drivers/hid/usbhid/hiddev.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/hid/usbhid/hiddev.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi break; =20 @@ -29980,9 +30004,9 @@ diff -urNp linux-2.6.39/drivers/hid/usbhid/hiddev= .c linux-2.6.39/drivers/hid/usb break; =20 for (i =3D 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.39/drivers/hwmon/ibmaem.c linux-2.6.39/drivers/hwmo= n/ibmaem.c ---- linux-2.6.39/drivers/hwmon/ibmaem.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/hwmon/ibmaem.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/hwmon/ibmaem.c linux-2.6.39.1/drivers/= hwmon/ibmaem.c +--- linux-2.6.39.1/drivers/hwmon/ibmaem.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/hwmon/ibmaem.c 2011-05-22 19:36:31.000000000 = -0400 @@ -238,7 +238,7 @@ struct aem_read_sensor_resp { struct aem_driver_data { struct list_head aem_devices; @@ -29992,9 +30016,9 @@ diff -urNp linux-2.6.39/drivers/hwmon/ibmaem.c li= nux-2.6.39/drivers/hwmon/ibmaem }; =20 static void aem_register_bmc(int iface, struct device *dev); -diff -urNp linux-2.6.39/drivers/hwmon/ibmpex.c linux-2.6.39/drivers/hwmo= n/ibmpex.c ---- linux-2.6.39/drivers/hwmon/ibmpex.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/hwmon/ibmpex.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/hwmon/ibmpex.c linux-2.6.39.1/drivers/= hwmon/ibmpex.c +--- linux-2.6.39.1/drivers/hwmon/ibmpex.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/hwmon/ibmpex.c 2011-05-22 19:36:31.000000000 = -0400 @@ -110,7 +110,7 @@ struct ibmpex_bmc_data { struct ibmpex_driver_data { struct list_head bmc_data; @@ -30004,9 +30028,9 @@ diff -urNp linux-2.6.39/drivers/hwmon/ibmpex.c li= nux-2.6.39/drivers/hwmon/ibmpex }; =20 static struct ibmpex_driver_data driver_data =3D { -diff -urNp linux-2.6.39/drivers/hwmon/sht15.c linux-2.6.39/drivers/hwmon= /sht15.c ---- linux-2.6.39/drivers/hwmon/sht15.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/hwmon/sht15.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/hwmon/sht15.c linux-2.6.39.1/drivers/h= wmon/sht15.c +--- linux-2.6.39.1/drivers/hwmon/sht15.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/hwmon/sht15.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -113,7 +113,7 @@ struct sht15_data { int supply_uV; int supply_uV_valid; @@ -30055,9 +30079,9 @@ diff -urNp linux-2.6.39/drivers/hwmon/sht15.c lin= ux-2.6.39/drivers/hwmon/sht15.c return; } /* Read the data back from the device */ -diff -urNp linux-2.6.39/drivers/hwmon/w83791d.c linux-2.6.39/drivers/hwm= on/w83791d.c ---- linux-2.6.39/drivers/hwmon/w83791d.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/hwmon/w83791d.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/hwmon/w83791d.c linux-2.6.39.1/drivers= /hwmon/w83791d.c +--- linux-2.6.39.1/drivers/hwmon/w83791d.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/hwmon/w83791d.c 2011-05-22 19:36:31.000000000= -0400 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -30069,9 +30093,9 @@ diff -urNp linux-2.6.39/drivers/hwmon/w83791d.c l= inux-2.6.39/drivers/hwmon/w8379 static struct w83791d_data *w83791d_update_device(struct device *dev); =20 #ifdef DEBUG -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-at91.c linux-2.6.39/drive= rs/i2c/busses/i2c-at91.c ---- linux-2.6.39/drivers/i2c/busses/i2c-at91.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-at91.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-at91.c linux-2.6.39.1/d= rivers/i2c/busses/i2c-at91.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-at91.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-at91.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -181,7 +181,7 @@ static u32 at91_func(struct i2c_adapter=20 return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } @@ -30081,9 +30105,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-at= 91.c linux-2.6.39/drivers/i2c/b .master_xfer =3D at91_xfer, .functionality =3D at91_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-bfin-twi.c linux-2.6.39/d= rivers/i2c/busses/i2c-bfin-twi.c ---- linux-2.6.39/drivers/i2c/busses/i2c-bfin-twi.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-bfin-twi.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-bfin-twi.c linux-2.6.39= .1/drivers/i2c/busses/i2c-bfin-twi.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-bfin-twi.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-bfin-twi.c 2011-05-22 19:36:31= .000000000 -0400 @@ -599,7 +599,7 @@ static u32 bfin_twi_functionality(struct I2C_FUNC_I2C | I2C_FUNC_SMBUS_I2C_BLOCK; } @@ -30093,9 +30117,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-bf= in-twi.c linux-2.6.39/drivers/i .master_xfer =3D bfin_twi_master_xfer, .smbus_xfer =3D bfin_twi_smbus_xfer, .functionality =3D bfin_twi_functionality, -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-davinci.c linux-2.6.39/dr= ivers/i2c/busses/i2c-davinci.c ---- linux-2.6.39/drivers/i2c/busses/i2c-davinci.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-davinci.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-davinci.c linux-2.6.39.= 1/drivers/i2c/busses/i2c-davinci.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-davinci.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-davinci.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -630,7 +630,7 @@ static inline void i2c_davinci_cpufreq_d } #endif @@ -30105,9 +30129,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-da= vinci.c linux-2.6.39/drivers/i2 .master_xfer =3D i2c_davinci_xfer, .functionality =3D i2c_davinci_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-designware.c linux-2.6.39= /drivers/i2c/busses/i2c-designware.c ---- linux-2.6.39/drivers/i2c/busses/i2c-designware.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-designware.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-designware.c linux-2.6.= 39.1/drivers/i2c/busses/i2c-designware.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-designware.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-designware.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -689,7 +689,7 @@ tx_aborted: return IRQ_HANDLED; } @@ -30117,9 +30141,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-de= signware.c linux-2.6.39/drivers .master_xfer =3D i2c_dw_xfer, .functionality =3D i2c_dw_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-eg20t.c linux-2.6.39/driv= ers/i2c/busses/i2c-eg20t.c ---- linux-2.6.39/drivers/i2c/busses/i2c-eg20t.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-eg20t.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-eg20t.c linux-2.6.39.1/= drivers/i2c/busses/i2c-eg20t.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-eg20t.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-eg20t.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -708,7 +708,7 @@ static u32 pch_i2c_func(struct i2c_adapt return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR; } @@ -30129,9 +30153,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-eg= 20t.c linux-2.6.39/drivers/i2c/ .master_xfer =3D pch_i2c_xfer, .functionality =3D pch_i2c_func }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-imx.c linux-2.6.39/driver= s/i2c/busses/i2c-imx.c ---- linux-2.6.39/drivers/i2c/busses/i2c-imx.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-imx.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-imx.c linux-2.6.39.1/dr= ivers/i2c/busses/i2c-imx.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-imx.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-imx.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -457,7 +457,7 @@ static u32 i2c_imx_func(struct i2c_adapt return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } @@ -30141,9 +30165,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-im= x.c linux-2.6.39/drivers/i2c/bu .master_xfer =3D i2c_imx_xfer, .functionality =3D i2c_imx_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c linux-2.6.39/= drivers/i2c/busses/i2c-intel-mid.c ---- linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-intel-mid.c linux-2.6.3= 9.1/drivers/i2c/busses/i2c-intel-mid.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-intel-mid.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-intel-mid.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -917,7 +917,7 @@ err: return IRQ_HANDLED; } @@ -30153,9 +30177,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-in= tel-mid.c linux-2.6.39/drivers/ .master_xfer =3D intel_mid_i2c_xfer, .functionality =3D intel_mid_i2c_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-nforce2.c linux-2.6.39/dr= ivers/i2c/busses/i2c-nforce2.c ---- linux-2.6.39/drivers/i2c/busses/i2c-nforce2.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-nforce2.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-nforce2.c linux-2.6.39.= 1/drivers/i2c/busses/i2c-nforce2.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-nforce2.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-nforce2.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -303,7 +303,7 @@ static u32 nforce2_func(struct i2c_adapt I2C_FUNC_SMBUS_BLOCK_DATA : 0); } @@ -30165,9 +30189,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-nf= orce2.c linux-2.6.39/drivers/i2 .smbus_xfer =3D nforce2_access, .functionality =3D nforce2_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-pmcmsp.c linux-2.6.39/dri= vers/i2c/busses/i2c-pmcmsp.c ---- linux-2.6.39/drivers/i2c/busses/i2c-pmcmsp.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-pmcmsp.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-pmcmsp.c linux-2.6.39.1= /drivers/i2c/busses/i2c-pmcmsp.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-pmcmsp.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-pmcmsp.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -615,7 +615,7 @@ static u32 pmcmsptwi_i2c_func(struct i2c =20 /* -- Initialization -- */ @@ -30177,9 +30201,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-pm= cmsp.c linux-2.6.39/drivers/i2c .master_xfer =3D pmcmsptwi_master_xfer, .functionality =3D pmcmsptwi_i2c_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-pnx.c linux-2.6.39/driver= s/i2c/busses/i2c-pnx.c ---- linux-2.6.39/drivers/i2c/busses/i2c-pnx.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-pnx.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-pnx.c linux-2.6.39.1/dr= ivers/i2c/busses/i2c-pnx.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-pnx.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-pnx.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -535,7 +535,7 @@ static u32 i2c_pnx_func(struct i2c_adapt return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } @@ -30189,9 +30213,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-pn= x.c linux-2.6.39/drivers/i2c/bu .master_xfer =3D i2c_pnx_xfer, .functionality =3D i2c_pnx_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-puv3.c linux-2.6.39/drive= rs/i2c/busses/i2c-puv3.c ---- linux-2.6.39/drivers/i2c/busses/i2c-puv3.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-puv3.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-puv3.c linux-2.6.39.1/d= rivers/i2c/busses/i2c-puv3.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-puv3.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-puv3.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -176,7 +176,7 @@ static u32 puv3_i2c_func(struct i2c_adap return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } @@ -30201,9 +30225,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-pu= v3.c linux-2.6.39/drivers/i2c/b .master_xfer =3D puv3_i2c_xfer, .functionality =3D puv3_i2c_func, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-s6000.c linux-2.6.39/driv= ers/i2c/busses/i2c-s6000.c ---- linux-2.6.39/drivers/i2c/busses/i2c-s6000.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-s6000.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-s6000.c linux-2.6.39.1/= drivers/i2c/busses/i2c-s6000.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-s6000.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-s6000.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -243,7 +243,7 @@ static u32 s6i2c_functionality(struct i2 return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } @@ -30213,9 +30237,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-s6= 000.c linux-2.6.39/drivers/i2c/ .master_xfer =3D s6i2c_master_xfer, .functionality =3D s6i2c_functionality, }; -diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c linux-2.6.39/= drivers/i2c/busses/i2c-sh_mobile.c ---- linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/i2c/busses/i2c-sh_mobile.c linux-2.6.3= 9.1/drivers/i2c/busses/i2c-sh_mobile.c +--- linux-2.6.39.1/drivers/i2c/busses/i2c-sh_mobile.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/i2c/busses/i2c-sh_mobile.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -529,7 +529,7 @@ static u32 sh_mobile_i2c_func(struct i2c return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } @@ -30225,9 +30249,9 @@ diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-sh= _mobile.c linux-2.6.39/drivers/ .functionality =3D sh_mobile_i2c_func, .master_xfer =3D sh_mobile_i2c_xfer, }; -diff -urNp linux-2.6.39/drivers/ide/ide-cd.c linux-2.6.39/drivers/ide/id= e-cd.c ---- linux-2.6.39/drivers/ide/ide-cd.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/ide/ide-cd.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/ide/ide-cd.c linux-2.6.39.1/drivers/id= e/ide-cd.c +--- linux-2.6.39.1/drivers/ide/ide-cd.c 2011-06-03 00:04:14.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/ide/ide-cd.c 2011-06-03 00:32:05.000000000 -0= 400 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment =3D queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -30237,9 +30261,9 @@ diff -urNp linux-2.6.39/drivers/ide/ide-cd.c linu= x-2.6.39/drivers/ide/ide-cd.c drive->dma =3D 0; } } -diff -urNp linux-2.6.39/drivers/ide/ide-floppy.c linux-2.6.39/drivers/id= e/ide-floppy.c ---- linux-2.6.39/drivers/ide/ide-floppy.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/ide/ide-floppy.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/ide/ide-floppy.c linux-2.6.39.1/driver= s/ide/ide-floppy.c +--- linux-2.6.39.1/drivers/ide/ide-floppy.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/ide/ide-floppy.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d u8 pc_buf[256], header_len, desc_cnt; int i, rc =3D 1, blocks, length; @@ -30249,9 +30273,9 @@ diff -urNp linux-2.6.39/drivers/ide/ide-floppy.c = linux-2.6.39/drivers/ide/ide-fl ide_debug_log(IDE_DBG_FUNC, "enter"); =20 drive->bios_cyl =3D 0; -diff -urNp linux-2.6.39/drivers/ide/it821x.c linux-2.6.39/drivers/ide/it= 821x.c ---- linux-2.6.39/drivers/ide/it821x.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/ide/it821x.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/ide/it821x.c linux-2.6.39.1/drivers/id= e/it821x.c +--- linux-2.6.39.1/drivers/ide/it821x.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/ide/it821x.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -508,7 +508,7 @@ static void it821x_quirkproc(ide_drive_t =20 } @@ -30261,9 +30285,9 @@ diff -urNp linux-2.6.39/drivers/ide/it821x.c linu= x-2.6.39/drivers/ide/it821x.c .dma_host_set =3D ide_dma_host_set, .dma_setup =3D ide_dma_setup, .dma_start =3D it821x_dma_start, -diff -urNp linux-2.6.39/drivers/ide/setup-pci.c linux-2.6.39/drivers/ide= /setup-pci.c ---- linux-2.6.39/drivers/ide/setup-pci.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/ide/setup-pci.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/ide/setup-pci.c linux-2.6.39.1/drivers= /ide/setup-pci.c +--- linux-2.6.39.1/drivers/ide/setup-pci.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/ide/setup-pci.c 2011-05-22 19:36:31.000000000= -0400 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev int ret, i, n_ports =3D dev2 ? 4 : 2; struct ide_hw hw[4], *hws[] =3D { NULL, NULL, NULL, NULL }; @@ -30273,9 +30297,9 @@ diff -urNp linux-2.6.39/drivers/ide/setup-pci.c l= inux-2.6.39/drivers/ide/setup-p for (i =3D 0; i < n_ports / 2; i++) { ret =3D ide_setup_pci_controller(pdev[i], d, !i); if (ret < 0) -diff -urNp linux-2.6.39/drivers/ide/trm290.c linux-2.6.39/drivers/ide/tr= m290.c ---- linux-2.6.39/drivers/ide/trm290.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/ide/trm290.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/ide/trm290.c linux-2.6.39.1/drivers/id= e/trm290.c +--- linux-2.6.39.1/drivers/ide/trm290.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/ide/trm290.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -314,7 +314,7 @@ static const struct ide_tp_ops trm290_tp .output_data =3D ide_output_data, }; @@ -30285,9 +30309,9 @@ diff -urNp linux-2.6.39/drivers/ide/trm290.c linu= x-2.6.39/drivers/ide/trm290.c .dma_host_set =3D trm290_dma_host_set, .dma_setup =3D trm290_dma_setup, .dma_start =3D trm290_dma_start, -diff -urNp linux-2.6.39/drivers/infiniband/core/cm.c linux-2.6.39/driver= s/infiniband/core/cm.c ---- linux-2.6.39/drivers/infiniband/core/cm.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/infiniband/core/cm.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/core/cm.c linux-2.6.39.1/dr= ivers/infiniband/core/cm.c +--- linux-2.6.39.1/drivers/infiniband/core/cm.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/core/cm.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -113,7 +113,7 @@ static char const counter_group_names[CM =20 struct cm_counter_group { @@ -30427,9 +30451,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/core/c= m.c linux-2.6.39/drivers/infini } =20 static const struct sysfs_ops cm_counter_ops =3D { -diff -urNp linux-2.6.39/drivers/infiniband/core/fmr_pool.c linux-2.6.39/= drivers/infiniband/core/fmr_pool.c ---- linux-2.6.39/drivers/infiniband/core/fmr_pool.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/core/fmr_pool.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/core/fmr_pool.c linux-2.6.3= 9.1/drivers/infiniband/core/fmr_pool.c +--- linux-2.6.39.1/drivers/infiniband/core/fmr_pool.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/core/fmr_pool.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -97,8 +97,8 @@ struct ib_fmr_pool { =20 struct task_struct *thread; @@ -30497,9 +30521,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/core/f= mr_pool.c linux-2.6.39/drivers/ wake_up_process(pool->thread); } } -diff -urNp linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.39/d= rivers/infiniband/hw/cxgb4/mem.c ---- linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.39= .1/drivers/infiniband/hw/cxgb4/mem.c +--- linux-2.6.39.1/drivers/infiniband/hw/cxgb4/mem.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/cxgb4/mem.c 2011-05-22 19:36:31= .000000000 -0400 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r int err; struct fw_ri_tpte tpt; @@ -30518,9 +30542,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/cxg= b4/mem.c linux-2.6.39/drivers/i } PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n", __func__, stag_state, type, pdid, stag_idx); -diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c linux-2.= 6.39/drivers/infiniband/hw/ipath/ipath_dma.c ---- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_dma.c linux-= 2.6.39.1/drivers/infiniband/hw/ipath/ipath_dma.c +--- linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_dma.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_dma.c 2011-05-22 19= :36:31.000000000 -0400 @@ -175,7 +175,7 @@ static void ipath_dma_free_coherent(stru free_pages((unsigned long) cpu_addr, get_order(size)); } @@ -30530,9 +30554,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/ipa= th/ipath_dma.c linux-2.6.39/dri ipath_mapping_error, ipath_dma_map_single, ipath_dma_unmap_single, -diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6= .39/drivers/infiniband/hw/ipath/ipath_fs.c ---- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_fs.c linux-2= .6.39.1/drivers/infiniband/hw/ipath/ipath_fs.c +--- linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru struct infinipath_counters counters; struct ipath_devdata *dd; @@ -30542,9 +30566,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/ipa= th/ipath_fs.c linux-2.6.39/driv dd =3D file->f_path.dentry->d_inode->i_private; dd->ipath_f_read_counters(dd, &counters); =20 -diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6= .39/drivers/infiniband/hw/ipath/ipath_rc.c ---- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_rc.c linux-2= .6.39.1/drivers/infiniband/hw/ipath/ipath_rc.c +--- linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de struct ib_atomic_eth *ateth; struct ipath_ack_entry *e; @@ -30568,9 +30592,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/ipa= th/ipath_rc.c linux-2.6.39/driv (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, be64_to_cpu(ateth->compare_data), sdata); -diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.= 6.39/drivers/infiniband/hw/ipath/ipath_ruc.c ---- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_ruc.c linux-= 2.6.39.1/drivers/infiniband/hw/ipath/ipath_ruc.c +--- linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-22 19= :36:31.000000000 -0400 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip unsigned long flags; struct ib_wc wc; @@ -30594,9 +30618,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/ipa= th/ipath_ruc.c linux-2.6.39/dri (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, sdata, wqe->wr.wr.atomic.swap); goto send_comp; -diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h linux-= 2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h ---- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-05-22 19= :36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_verbs.h linu= x-2.6.39.1/drivers/infiniband/hw/ipath/ipath_verbs.h +--- linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-05-22 = 19:36:31.000000000 -0400 @@ -931,6 +931,6 @@ extern unsigned int ib_ipath_max_srq_wrs =20 extern const u32 ib_ipath_rnr_table[]; @@ -30605,9 +30629,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/ipa= th/ipath_verbs.h linux-2.6.39/d +extern const struct ib_dma_mapping_ops ipath_dma_mapping_ops; =20 #endif /* IPATH_VERBS_H */ -diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes.c linux-2.6.39/dri= vers/infiniband/hw/nes/nes.c ---- linux-2.6.39/drivers/infiniband/hw/nes/nes.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/nes/nes.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/nes/nes.c linux-2.6.39.1= /drivers/infiniband/hw/nes/nes.c +--- linux-2.6.39.1/drivers/infiniband/hw/nes/nes.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/nes/nes.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi LIST_HEAD(nes_adapter_list); static LIST_HEAD(nes_dev_list); @@ -30626,9 +30650,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/nes= /nes.c linux-2.6.39/drivers/inf =20 /* Free the control structures */ =20 -diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.39/= drivers/infiniband/hw/nes/nes_cm.c ---- linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.3= 9.1/drivers/infiniband/hw/nes/nes_cm.c +--- linux-2.6.39.1/drivers/infiniband/hw/nes/nes_cm.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/nes/nes_cm.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -68,14 +68,14 @@ u32 cm_packets_dropped; u32 cm_packets_retrans; u32 cm_packets_created; @@ -30825,9 +30849,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/nes= /nes_cm.c linux-2.6.39/drivers/ nes_debug(NES_DBG_CM, "cm_node =3D %p - cm_id =3D %p, jiffies =3D %lu\= n", cm_node, cm_id, jiffies); =20 -diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes.h linux-2.6.39/dri= vers/infiniband/hw/nes/nes.h ---- linux-2.6.39/drivers/infiniband/hw/nes/nes.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/nes/nes.h 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/nes/nes.h linux-2.6.39.1= /drivers/infiniband/hw/nes/nes.h +--- linux-2.6.39.1/drivers/infiniband/hw/nes/nes.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/nes/nes.h 2011-05-22 19:36:31.0= 00000000 -0400 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level; extern unsigned int wqm_quanta; extern struct list_head nes_adapter_list; @@ -30879,9 +30903,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/nes= /nes.h linux-2.6.39/drivers/inf =20 extern u32 int_mod_timer_init; extern u32 int_mod_cq_depth_256; -diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.39= /drivers/infiniband/hw/nes/nes_nic.c ---- linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.= 39.1/drivers/infiniband/hw/nes/nes_nic.c +--- linux-2.6.39.1/drivers/infiniband/hw/nes/nes_nic.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/nes/nes_nic.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats target_stat_values[++index] =3D mh_detected; target_stat_values[++index] =3D mh_pauses_sent; @@ -30932,9 +30956,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/nes= /nes_nic.c linux-2.6.39/drivers target_stat_values[++index] =3D nesadapter->free_4kpbl; target_stat_values[++index] =3D nesadapter->free_256pbl; target_stat_values[++index] =3D int_mod_timer_init; -diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.= 39/drivers/infiniband/hw/nes/nes_verbs.c ---- linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/nes/nes_verbs.c linux-2.= 6.39.1/drivers/infiniband/hw/nes/nes_verbs.c +--- linux-2.6.39.1/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -46,9 +46,9 @@ =20 #include @@ -30966,9 +30990,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/nes= /nes_verbs.c linux-2.6.39/drive nesqp->destroyed =3D 1; =20 /* Blow away the connection if it exists. */ -diff -urNp linux-2.6.39/drivers/infiniband/hw/qib/qib.h linux-2.6.39/dri= vers/infiniband/hw/qib/qib.h ---- linux-2.6.39/drivers/infiniband/hw/qib/qib.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/qib/qib.h 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/qib/qib.h linux-2.6.39.1= /drivers/infiniband/hw/qib/qib.h +--- linux-2.6.39.1/drivers/infiniband/hw/qib/qib.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/qib/qib.h 2011-05-22 19:36:31.0= 00000000 -0400 @@ -51,6 +51,7 @@ #include #include @@ -30986,9 +31010,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/qib= /qib.h linux-2.6.39/drivers/inf extern struct pci_driver qib_driver; =20 #define QIB_CHIP_SWVERSION QIB_CHIP_VERS_MAJ -diff -urNp linux-2.6.39/drivers/infiniband/hw/qib/qib_mmap.c linux-2.6.3= 9/drivers/infiniband/hw/qib/qib_mmap.c ---- linux-2.6.39/drivers/infiniband/hw/qib/qib_mmap.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/qib/qib_mmap.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/qib/qib_mmap.c linux-2.6= .39.1/drivers/infiniband/hw/qib/qib_mmap.c +--- linux-2.6.39.1/drivers/infiniband/hw/qib/qib_mmap.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/qib/qib_mmap.c 2011-05-22 19:36= :31.000000000 -0400 @@ -75,7 +75,7 @@ static void qib_vma_close(struct vm_area kref_put(&ip->ref, qib_release_mmap_info); } @@ -30998,9 +31022,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/qib= /qib_mmap.c linux-2.6.39/driver .open =3D qib_vma_open, .close =3D qib_vma_close, }; -diff -urNp linux-2.6.39/drivers/infiniband/hw/qib/qib_pcie.c linux-2.6.3= 9/drivers/infiniband/hw/qib/qib_pcie.c ---- linux-2.6.39/drivers/infiniband/hw/qib/qib_pcie.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/infiniband/hw/qib/qib_pcie.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/infiniband/hw/qib/qib_pcie.c linux-2.6= .39.1/drivers/infiniband/hw/qib/qib_pcie.c +--- linux-2.6.39.1/drivers/infiniband/hw/qib/qib_pcie.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/infiniband/hw/qib/qib_pcie.c 2011-05-22 19:36= :31.000000000 -0400 @@ -735,7 +735,7 @@ qib_pci_resume(struct pci_dev *pdev) qib_init(dd, 1); /* same as re-init after reset */ } @@ -31010,9 +31034,9 @@ diff -urNp linux-2.6.39/drivers/infiniband/hw/qib= /qib_pcie.c linux-2.6.39/driver .error_detected =3D qib_pci_error_detected, .mmio_enabled =3D qib_pci_mmio_enabled, .link_reset =3D qib_pci_link_reset, -diff -urNp linux-2.6.39/drivers/input/gameport/gameport.c linux-2.6.39/d= rivers/input/gameport/gameport.c ---- linux-2.6.39/drivers/input/gameport/gameport.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/input/gameport/gameport.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/input/gameport/gameport.c linux-2.6.39= .1/drivers/input/gameport/gameport.c +--- linux-2.6.39.1/drivers/input/gameport/gameport.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/input/gameport/gameport.c 2011-05-22 19:36:31= .000000000 -0400 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys); */ static void gameport_init_port(struct gameport *gameport) @@ -31030,9 +31054,9 @@ diff -urNp linux-2.6.39/drivers/input/gameport/ga= meport.c linux-2.6.39/drivers/i gameport->dev.bus =3D &gameport_bus; gameport->dev.release =3D gameport_release_port; if (gameport->parent) -diff -urNp linux-2.6.39/drivers/input/input.c linux-2.6.39/drivers/input= /input.c ---- linux-2.6.39/drivers/input/input.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/input/input.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/input/input.c linux-2.6.39.1/drivers/i= nput/input.c +--- linux-2.6.39.1/drivers/input/input.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/input/input.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -1815,7 +1815,7 @@ static void input_cleanse_bitmasks(struc */ int input_register_device(struct input_dev *dev) @@ -31051,9 +31075,9 @@ diff -urNp linux-2.6.39/drivers/input/input.c lin= ux-2.6.39/drivers/input/input.c =20 error =3D device_add(&dev->dev); if (error) -diff -urNp linux-2.6.39/drivers/input/joystick/sidewinder.c linux-2.6.39= /drivers/input/joystick/sidewinder.c ---- linux-2.6.39/drivers/input/joystick/sidewinder.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/input/joystick/sidewinder.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/input/joystick/sidewinder.c linux-2.6.= 39.1/drivers/input/joystick/sidewinder.c +--- linux-2.6.39.1/drivers/input/joystick/sidewinder.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/input/joystick/sidewinder.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -30,6 +30,7 @@ #include #include @@ -31071,9 +31095,9 @@ diff -urNp linux-2.6.39/drivers/input/joystick/si= dewinder.c linux-2.6.39/drivers i =3D sw_read_packet(sw->gameport, buf, sw->length, 0); =20 if (sw->type =3D=3D SW_ID_3DP && sw->length =3D=3D 66 && i !=3D 66) { = /* Broken packet, try to fix */ -diff -urNp linux-2.6.39/drivers/input/joystick/xpad.c linux-2.6.39/drive= rs/input/joystick/xpad.c ---- linux-2.6.39/drivers/input/joystick/xpad.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/input/joystick/xpad.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/input/joystick/xpad.c linux-2.6.39.1/d= rivers/input/joystick/xpad.c +--- linux-2.6.39.1/drivers/input/joystick/xpad.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/input/joystick/xpad.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas =20 static int xpad_led_probe(struct usb_xpad *xpad) @@ -31092,9 +31116,9 @@ diff -urNp linux-2.6.39/drivers/input/joystick/xp= ad.c linux-2.6.39/drivers/input =20 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); led->xpad =3D xpad; -diff -urNp linux-2.6.39/drivers/input/mousedev.c linux-2.6.39/drivers/in= put/mousedev.c ---- linux-2.6.39/drivers/input/mousedev.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/input/mousedev.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/input/mousedev.c linux-2.6.39.1/driver= s/input/mousedev.c +--- linux-2.6.39.1/drivers/input/mousedev.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/input/mousedev.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file =20 spin_unlock_irq(&client->packet_lock); @@ -31104,9 +31128,9 @@ diff -urNp linux-2.6.39/drivers/input/mousedev.c = linux-2.6.39/drivers/input/mous return -EFAULT; =20 return count; -diff -urNp linux-2.6.39/drivers/input/serio/serio.c linux-2.6.39/drivers= /input/serio/serio.c ---- linux-2.6.39/drivers/input/serio/serio.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/input/serio/serio.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/input/serio/serio.c linux-2.6.39.1/dri= vers/input/serio/serio.c +--- linux-2.6.39.1/drivers/input/serio/serio.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/input/serio/serio.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -497,7 +497,7 @@ static void serio_release_port(struct de */ static void serio_init_port(struct serio *serio) @@ -31125,9 +31149,9 @@ diff -urNp linux-2.6.39/drivers/input/serio/serio= .c linux-2.6.39/drivers/input/s serio->dev.bus =3D &serio_bus; serio->dev.release =3D serio_release_port; serio->dev.groups =3D serio_device_attr_groups; -diff -urNp linux-2.6.39/drivers/isdn/capi/capi.c linux-2.6.39/drivers/is= dn/capi/capi.c ---- linux-2.6.39/drivers/isdn/capi/capi.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/isdn/capi/capi.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/capi/capi.c linux-2.6.39.1/driver= s/isdn/capi/capi.c +--- linux-2.6.39.1/drivers/isdn/capi/capi.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/isdn/capi/capi.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -89,8 +89,8 @@ struct capiminor { =20 struct capi20_appl *ap; @@ -31165,9 +31189,9 @@ diff -urNp linux-2.6.39/drivers/isdn/capi/capi.c = linux-2.6.39/drivers/isdn/capi/ capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */ capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */ capimsg_setu16(skb->data, 16, len); /* Data length */ -diff -urNp linux-2.6.39/drivers/isdn/gigaset/common.c linux-2.6.39/drive= rs/isdn/gigaset/common.c ---- linux-2.6.39/drivers/isdn/gigaset/common.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/isdn/gigaset/common.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/gigaset/common.c linux-2.6.39.1/d= rivers/isdn/gigaset/common.c +--- linux-2.6.39.1/drivers/isdn/gigaset/common.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/gigaset/common.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct=20 cs->commands_pending =3D 0; cs->cur_at_seq =3D 0; @@ -31177,9 +31201,9 @@ diff -urNp linux-2.6.39/drivers/isdn/gigaset/comm= on.c linux-2.6.39/drivers/isdn/ cs->dev =3D NULL; cs->tty =3D NULL; cs->tty_dev =3D NULL; -diff -urNp linux-2.6.39/drivers/isdn/gigaset/gigaset.h linux-2.6.39/driv= ers/isdn/gigaset/gigaset.h ---- linux-2.6.39/drivers/isdn/gigaset/gigaset.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/isdn/gigaset/gigaset.h 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/gigaset/gigaset.h linux-2.6.39.1/= drivers/isdn/gigaset/gigaset.h +--- linux-2.6.39.1/drivers/isdn/gigaset/gigaset.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/gigaset/gigaset.h 2011-05-22 19:36:31.00= 0000000 -0400 @@ -35,6 +35,7 @@ #include #include @@ -31197,9 +31221,9 @@ diff -urNp linux-2.6.39/drivers/isdn/gigaset/giga= set.h linux-2.6.39/drivers/isdn struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.39/drivers/isdn/gigaset/interface.c linux-2.6.39/dr= ivers/isdn/gigaset/interface.c ---- linux-2.6.39/drivers/isdn/gigaset/interface.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/isdn/gigaset/interface.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/gigaset/interface.c linux-2.6.39.= 1/drivers/isdn/gigaset/interface.c +--- linux-2.6.39.1/drivers/isdn/gigaset/interface.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/gigaset/interface.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; tty->driver_data =3D cs; @@ -31287,9 +31311,9 @@ diff -urNp linux-2.6.39/drivers/isdn/gigaset/inte= rface.c linux-2.6.39/drivers/is dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.39/drivers/isdn/hardware/avm/b1.c linux-2.6.39/driv= ers/isdn/hardware/avm/b1.c ---- linux-2.6.39/drivers/isdn/hardware/avm/b1.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/avm/b1.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/avm/b1.c linux-2.6.39.1/= drivers/isdn/hardware/avm/b1.c +--- linux-2.6.39.1/drivers/isdn/hardware/avm/b1.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/avm/b1.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -31308,9 +31332,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/avm= /b1.c linux-2.6.39/drivers/isdn return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6= .39/drivers/isdn/hardware/eicon/capidtmf.c ---- linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/eicon/capidtmf.c linux-2= .6.39.1/drivers/isdn/hardware/eicon/capidtmf.c +--- linux-2.6.39.1/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT]; short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES]; @@ -31319,9 +31343,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/eic= on/capidtmf.c linux-2.6.39/driv =20 if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE) { -diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c linux-2.6= .39/drivers/isdn/hardware/eicon/capifunc.c ---- linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/eicon/capifunc.c linux-2= .6.39.1/drivers/isdn/hardware/eicon/capifunc.c +--- linux-2.6.39.1/drivers/isdn/hardware/eicon/capifunc.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/eicon/capifunc.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -31331,9 +31355,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/eic= on/capifunc.c linux-2.6.39/driv DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); =20 for (x =3D 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6= .39/drivers/isdn/hardware/eicon/diddfunc.c ---- linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/eicon/diddfunc.c linux-2= .6.39.1/drivers/isdn/hardware/eicon/diddfunc.c +--- linux-2.6.39.1/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -31343,9 +31367,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/eic= on/diddfunc.c linux-2.6.39/driv DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); =20 for (x =3D 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c linux-2.= 6.39/drivers/isdn/hardware/eicon/divasfunc.c ---- linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/eicon/divasfunc.c linux-= 2.6.39.1/drivers/isdn/hardware/eicon/divasfunc.c +--- linux-2.6.39.1/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-22 19= :36:31.000000000 -0400 @@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -31355,9 +31379,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/eic= on/divasfunc.c linux-2.6.39/dri DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); =20 for (x =3D 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.= 39/drivers/isdn/hardware/eicon/idifunc.c ---- linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/eicon/idifunc.c linux-2.= 6.39.1/drivers/isdn/hardware/eicon/idifunc.c +--- linux-2.6.39.1/drivers/isdn/hardware/eicon/idifunc.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/eicon/idifunc.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -31367,9 +31391,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/eic= on/idifunc.c linux-2.6.39/drive DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); =20 for (x =3D 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/message.c linux-2.6.= 39/drivers/isdn/hardware/eicon/message.c ---- linux-2.6.39/drivers/isdn/hardware/eicon/message.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/eicon/message.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/eicon/message.c linux-2.= 6.39.1/drivers/isdn/hardware/eicon/message.c +--- linux-2.6.39.1/drivers/isdn/hardware/eicon/message.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/eicon/message.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci) dword d; word w; @@ -31406,9 +31430,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/eic= on/message.c linux-2.6.39/drive set_group_ind_mask (plci); /* all APPLs within this inc. call are all= owed to dial in */ =20 if(!a->group_optimization_enabled) -diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.= 39/drivers/isdn/hardware/eicon/mntfunc.c ---- linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/hardware/eicon/mntfunc.c linux-2.= 6.39.1/drivers/isdn/hardware/eicon/mntfunc.c +--- linux-2.6.39.1/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -31418,9 +31442,9 @@ diff -urNp linux-2.6.39/drivers/isdn/hardware/eic= on/mntfunc.c linux-2.6.39/drive DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); =20 for (x =3D 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_common.c linux-2.6.39/driv= ers/isdn/i4l/isdn_common.c ---- linux-2.6.39/drivers/isdn/i4l/isdn_common.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/isdn/i4l/isdn_common.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/i4l/isdn_common.c linux-2.6.39.1/= drivers/isdn/i4l/isdn_common.c +--- linux-2.6.39.1/drivers/isdn/i4l/isdn_common.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/i4l/isdn_common.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -1292,6 +1292,8 @@ isdn_ioctl(struct file *file, uint cmd,=20 } iocpar; void __user *argp =3D (void __user *)arg; @@ -31430,9 +31454,9 @@ diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_com= mon.c linux-2.6.39/drivers/isdn #define name iocpar.name #define bname iocpar.bname #define iocts iocpar.iocts -diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_net.c linux-2.6.39/drivers= /isdn/i4l/isdn_net.c ---- linux-2.6.39/drivers/isdn/i4l/isdn_net.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/isdn/i4l/isdn_net.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/i4l/isdn_net.c linux-2.6.39.1/dri= vers/isdn/i4l/isdn_net.c +--- linux-2.6.39.1/drivers/isdn/i4l/isdn_net.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/isdn/i4l/isdn_net.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -400,7 +400,7 @@ isdn_net_stat_callback(int idx, isdn_ctr isdn_net_local *lp =3D p->local; #ifdef CONFIG_ISDN_X25 @@ -31451,9 +31475,9 @@ diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_net= .c linux-2.6.39/drivers/isdn/i4 #endif =20 if (lp->flags & ISDN_NET_CONNECTED) { -diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.c linux-2.6.39/dr= ivers/isdn/i4l/isdn_x25iface.c ---- linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/i4l/isdn_x25iface.c linux-2.6.39.= 1/drivers/isdn/i4l/isdn_x25iface.c +--- linux-2.6.39.1/drivers/isdn/i4l/isdn_x25iface.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/i4l/isdn_x25iface.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -52,7 +52,7 @@ static int isdn_x25iface_connect_ind( st static int isdn_x25iface_disconn_ind( struct concap_proto * ); =20 @@ -31463,9 +31487,9 @@ diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_x25= iface.c linux-2.6.39/drivers/is &isdn_x25iface_proto_new, &isdn_x25iface_proto_del, &isdn_x25iface_proto_restart, -diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.h linux-2.6.39/dr= ivers/isdn/i4l/isdn_x25iface.h ---- linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.h 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/isdn/i4l/isdn_x25iface.h linux-2.6.39.= 1/drivers/isdn/i4l/isdn_x25iface.h +--- linux-2.6.39.1/drivers/isdn/i4l/isdn_x25iface.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/isdn/i4l/isdn_x25iface.h 2011-05-22 19:36:31.= 000000000 -0400 @@ -23,7 +23,7 @@ #include #include @@ -31475,9 +31499,9 @@ diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_x25= iface.h linux-2.6.39/drivers/is extern struct concap_proto * isdn_x25iface_proto_new(void); =20 =20 -diff -urNp linux-2.6.39/drivers/isdn/icn/icn.c linux-2.6.39/drivers/isdn= /icn/icn.c ---- linux-2.6.39/drivers/isdn/icn/icn.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/isdn/icn/icn.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/isdn/icn/icn.c linux-2.6.39.1/drivers/= isdn/icn/icn.c +--- linux-2.6.39.1/drivers/isdn/icn/icn.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/isdn/icn/icn.c 2011-05-22 19:36:31.000000000 = -0400 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count =3D len; @@ -31487,9 +31511,9 @@ diff -urNp linux-2.6.39/drivers/isdn/icn/icn.c li= nux-2.6.39/drivers/isdn/icn/icn return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.39/drivers/lguest/core.c linux-2.6.39/drivers/lgues= t/core.c ---- linux-2.6.39/drivers/lguest/core.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/lguest/core.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/lguest/core.c linux-2.6.39.1/drivers/l= guest/core.c +--- linux-2.6.39.1/drivers/lguest/core.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/lguest/core.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -92,9 +92,17 @@ static __init int map_switcher(void) * it's worked so far. The end address needs +1 because __get_vm_area * allocates an extra guard page, so we need space for that. @@ -31517,9 +31541,9 @@ diff -urNp linux-2.6.39/drivers/lguest/core.c lin= ux-2.6.39/drivers/lguest/core.c end_switcher_text - start_switcher_text); =20 printk(KERN_INFO "lguest: mapped switcher at %p\n", -diff -urNp linux-2.6.39/drivers/lguest/lguest_device.c linux-2.6.39/driv= ers/lguest/lguest_device.c ---- linux-2.6.39/drivers/lguest/lguest_device.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/lguest/lguest_device.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/lguest/lguest_device.c linux-2.6.39.1/= drivers/lguest/lguest_device.c +--- linux-2.6.39.1/drivers/lguest/lguest_device.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/lguest/lguest_device.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -374,7 +374,7 @@ error: } =20 @@ -31529,9 +31553,9 @@ diff -urNp linux-2.6.39/drivers/lguest/lguest_dev= ice.c linux-2.6.39/drivers/lgue .get_features =3D lg_get_features, .finalize_features =3D lg_finalize_features, .get =3D lg_get, -diff -urNp linux-2.6.39/drivers/lguest/x86/core.c linux-2.6.39/drivers/l= guest/x86/core.c ---- linux-2.6.39/drivers/lguest/x86/core.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/lguest/x86/core.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/lguest/x86/core.c linux-2.6.39.1/drive= rs/lguest/x86/core.c +--- linux-2.6.39.1/drivers/lguest/x86/core.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/lguest/x86/core.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -59,7 +59,7 @@ static struct { /* Offset from where switcher.S was compiled to where we've copied it *= / static unsigned long switcher_offset(void) @@ -31573,9 +31597,9 @@ diff -urNp linux-2.6.39/drivers/lguest/x86/core.c= linux-2.6.39/drivers/lguest/x8 lguest_entry.segment =3D LGUEST_CS; =20 /* -diff -urNp linux-2.6.39/drivers/lguest/x86/switcher_32.S linux-2.6.39/dr= ivers/lguest/x86/switcher_32.S ---- linux-2.6.39/drivers/lguest/x86/switcher_32.S 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/lguest/x86/switcher_32.S 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/lguest/x86/switcher_32.S linux-2.6.39.= 1/drivers/lguest/x86/switcher_32.S +--- linux-2.6.39.1/drivers/lguest/x86/switcher_32.S 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/lguest/x86/switcher_32.S 2011-05-22 19:36:31.= 000000000 -0400 @@ -87,6 +87,7 @@ #include #include @@ -31634,9 +31658,9 @@ diff -urNp linux-2.6.39/drivers/lguest/x86/switch= er_32.S linux-2.6.39/drivers/lg =20 // Every interrupt can come to us here // But we must truly tell each apart. -diff -urNp linux-2.6.39/drivers/md/dm.c linux-2.6.39/drivers/md/dm.c ---- linux-2.6.39/drivers/md/dm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/md/dm.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/md/dm.c linux-2.6.39.1/drivers/md/dm.c +--- linux-2.6.39.1/drivers/md/dm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/md/dm.c 2011-05-22 19:36:31.000000000 -0400 @@ -162,9 +162,9 @@ struct mapped_device { /* * Event handling. @@ -31691,9 +31715,9 @@ diff -urNp linux-2.6.39/drivers/md/dm.c linux-2.6= .39/drivers/md/dm.c } =20 void dm_uevent_add(struct mapped_device *md, struct list_head *elist) -diff -urNp linux-2.6.39/drivers/md/dm-crypt.c linux-2.6.39/drivers/md/dm= -crypt.c ---- linux-2.6.39/drivers/md/dm-crypt.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/md/dm-crypt.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/md/dm-crypt.c linux-2.6.39.1/drivers/m= d/dm-crypt.c +--- linux-2.6.39.1/drivers/md/dm-crypt.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/md/dm-crypt.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -138,7 +138,7 @@ struct crypt_config { char *cipher; char *cipher_string; @@ -31743,9 +31767,9 @@ diff -urNp linux-2.6.39/drivers/md/dm-crypt.c lin= ux-2.6.39/drivers/md/dm-crypt.c .ctr =3D crypt_iv_lmk_ctr, .dtr =3D crypt_iv_lmk_dtr, .init =3D crypt_iv_lmk_init, -diff -urNp linux-2.6.39/drivers/md/dm-ioctl.c linux-2.6.39/drivers/md/dm= -ioctl.c ---- linux-2.6.39/drivers/md/dm-ioctl.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/md/dm-ioctl.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/md/dm-ioctl.c linux-2.6.39.1/drivers/m= d/dm-ioctl.c +--- linux-2.6.39.1/drivers/md/dm-ioctl.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/md/dm-ioctl.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str cmd =3D=3D DM_LIST_VERSIONS_CMD) return 0; @@ -31755,9 +31779,9 @@ diff -urNp linux-2.6.39/drivers/md/dm-ioctl.c lin= ux-2.6.39/drivers/md/dm-ioctl.c if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; -diff -urNp linux-2.6.39/drivers/md/dm-raid1.c linux-2.6.39/drivers/md/dm= -raid1.c ---- linux-2.6.39/drivers/md/dm-raid1.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/md/dm-raid1.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/md/dm-raid1.c linux-2.6.39.1/drivers/m= d/dm-raid1.c +--- linux-2.6.39.1/drivers/md/dm-raid1.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/md/dm-raid1.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -42,7 +42,7 @@ enum dm_raid1_error { =20 struct mirror { @@ -31830,9 +31854,9 @@ diff -urNp linux-2.6.39/drivers/md/dm-raid1.c lin= ux-2.6.39/drivers/md/dm-raid1.c return 'A'; =20 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' : -diff -urNp linux-2.6.39/drivers/md/dm-stripe.c linux-2.6.39/drivers/md/d= m-stripe.c ---- linux-2.6.39/drivers/md/dm-stripe.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/md/dm-stripe.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/md/dm-stripe.c linux-2.6.39.1/drivers/= md/dm-stripe.c +--- linux-2.6.39.1/drivers/md/dm-stripe.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/md/dm-stripe.c 2011-05-22 19:36:31.000000000 = -0400 @@ -20,7 +20,7 @@ struct stripe { struct dm_dev *dev; sector_t physical_start; @@ -31871,10 +31895,10 @@ diff -urNp linux-2.6.39/drivers/md/dm-stripe.c = linux-2.6.39/drivers/md/dm-stripe DM_IO_ERROR_THRESHOLD) schedule_work(&sc->trigger_event); } -diff -urNp linux-2.6.39/drivers/md/dm-table.c linux-2.6.39/drivers/md/dm= -table.c ---- linux-2.6.39/drivers/md/dm-table.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/md/dm-table.c 2011-05-22 19:36:31.000000000 -04= 00 -@@ -373,7 +373,7 @@ static int device_area_is_invalid(struct +diff -urNp linux-2.6.39.1/drivers/md/dm-table.c linux-2.6.39.1/drivers/m= d/dm-table.c +--- linux-2.6.39.1/drivers/md/dm-table.c 2011-06-03 00:04:14.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/md/dm-table.c 2011-06-03 00:32:05.000000000 -= 0400 +@@ -390,7 +390,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; =20 @@ -31883,9 +31907,9 @@ diff -urNp linux-2.6.39/drivers/md/dm-table.c lin= ux-2.6.39/drivers/md/dm-table.c DMWARN("%s: %s too small for target: " "start=3D%llu, len=3D%llu, dev_size=3D%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6.39/drivers/md/md.c ---- linux-2.6.39/drivers/md/md.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/md/md.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/md/md.c linux-2.6.39.1/drivers/md/md.c +--- linux-2.6.39.1/drivers/md/md.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/drivers/md/md.c 2011-06-03 00:32:05.000000000 -0400 @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev); * start build, activate spare */ @@ -31955,7 +31979,7 @@ diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6= .39/drivers/md/md.c =20 INIT_LIST_HEAD(&rdev->same_set); init_waitqueue_head(&rdev->blocked_wait); -@@ -6383,7 +6383,7 @@ static int md_seq_show(struct seq_file * +@@ -6388,7 +6388,7 @@ static int md_seq_show(struct seq_file * =20 spin_unlock(&pers_lock); seq_printf(seq, "\n"); @@ -31964,7 +31988,7 @@ diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6= .39/drivers/md/md.c return 0; } if (v =3D=3D (void*)2) { -@@ -6472,7 +6472,7 @@ static int md_seq_show(struct seq_file * +@@ -6477,7 +6477,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { seq_printf(seq, ", file: "); @@ -31973,7 +31997,7 @@ diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6= .39/drivers/md/md.c } =20 seq_printf(seq, "\n"); -@@ -6506,7 +6506,7 @@ static int md_seq_open(struct inode *ino +@@ -6511,7 +6511,7 @@ static int md_seq_open(struct inode *ino else { struct seq_file *p =3D file->private_data; p->private =3D mi; @@ -31982,7 +32006,7 @@ diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6= .39/drivers/md/md.c } return error; } -@@ -6522,7 +6522,7 @@ static unsigned int mdstat_poll(struct f +@@ -6527,7 +6527,7 @@ static unsigned int mdstat_poll(struct f /* always allow read */ mask =3D POLLIN | POLLRDNORM; =20 @@ -31991,7 +32015,7 @@ diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6= .39/drivers/md/md.c mask |=3D POLLERR | POLLPRI; return mask; } -@@ -6566,7 +6566,7 @@ static int is_mddev_idle(mddev_t *mddev, +@@ -6571,7 +6571,7 @@ static int is_mddev_idle(mddev_t *mddev, struct gendisk *disk =3D rdev->bdev->bd_contains->bd_disk; curr_events =3D (int)part_stat_read(&disk->part0, sectors[0]) + (int)part_stat_read(&disk->part0, sectors[1]) - @@ -32000,9 +32024,9 @@ diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6= .39/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.39/drivers/md/md.h linux-2.6.39/drivers/md/md.h ---- linux-2.6.39/drivers/md/md.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/md/md.h 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/md/md.h linux-2.6.39.1/drivers/md/md.h +--- linux-2.6.39.1/drivers/md/md.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/md/md.h 2011-05-22 19:36:31.000000000 -0400 @@ -97,13 +97,13 @@ struct mdk_rdev_s * only maintained for arrays that * support hot removal @@ -32028,9 +32052,9 @@ diff -urNp linux-2.6.39/drivers/md/md.h linux-2.6= .39/drivers/md/md.h } =20 struct mdk_personality -diff -urNp linux-2.6.39/drivers/md/raid10.c linux-2.6.39/drivers/md/raid= 10.c ---- linux-2.6.39/drivers/md/raid10.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/md/raid10.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/md/raid10.c linux-2.6.39.1/drivers/md/= raid10.c +--- linux-2.6.39.1/drivers/md/raid10.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/md/raid10.c 2011-05-22 19:36:31.000000000 -04= 00 @@ -1209,7 +1209,7 @@ static void end_sync_read(struct bio *bi if (test_bit(BIO_UPTODATE, &bio->bi_flags)) set_bit(R10BIO_Uptodate, &r10_bio->state); @@ -32081,9 +32105,9 @@ diff -urNp linux-2.6.39/drivers/md/raid10.c linux= -2.6.39/drivers/md/raid10.c if (sync_page_io(rdev, r10_bio->devs[sl].addr + sect, -diff -urNp linux-2.6.39/drivers/md/raid1.c linux-2.6.39/drivers/md/raid1= .c ---- linux-2.6.39/drivers/md/raid1.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/md/raid1.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/md/raid1.c linux-2.6.39.1/drivers/md/r= aid1.c +--- linux-2.6.39.1/drivers/md/raid1.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/md/raid1.c 2011-05-22 19:36:31.000000000 -040= 0 @@ -1342,7 +1342,7 @@ static void sync_request_write(mddev_t * if (r1_bio->bios[d]->bi_end_io !=3D end_sync_read) continue; @@ -32102,9 +32126,9 @@ diff -urNp linux-2.6.39/drivers/md/raid1.c linux-= 2.6.39/drivers/md/raid1.c printk(KERN_INFO "md/raid1:%s: read error corrected " "(%d sectors at %llu on %s)\n", -diff -urNp linux-2.6.39/drivers/md/raid5.c linux-2.6.39/drivers/md/raid5= .c ---- linux-2.6.39/drivers/md/raid5.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/md/raid5.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/md/raid5.c linux-2.6.39.1/drivers/md/r= aid5.c +--- linux-2.6.39.1/drivers/md/raid5.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/md/raid5.c 2011-05-22 19:36:31.000000000 -040= 0 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea bi->bi_next =3D NULL; if (rw =3D=3D WRITE && @@ -32150,9 +32174,9 @@ diff -urNp linux-2.6.39/drivers/md/raid5.c linux-= 2.6.39/drivers/md/raid5.c =20 chunk_offset =3D sector_div(new_sector, sectors_per_chunk); stripe =3D new_sector; -diff -urNp linux-2.6.39/drivers/media/common/saa7146_hlp.c linux-2.6.39/= drivers/media/common/saa7146_hlp.c ---- linux-2.6.39/drivers/media/common/saa7146_hlp.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/media/common/saa7146_hlp.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/common/saa7146_hlp.c linux-2.6.3= 9.1/drivers/media/common/saa7146_hlp.c +--- linux-2.6.39.1/drivers/media/common/saa7146_hlp.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/common/saa7146_hlp.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -353,6 +353,8 @@ static void calculate_clipping_registers =20 int x[32], y[32], w[32], h[32]; @@ -32162,9 +32186,9 @@ diff -urNp linux-2.6.39/drivers/media/common/saa7= 146_hlp.c linux-2.6.39/drivers/ /* clear out memory */ memset(&line_list[0], 0x00, sizeof(u32)*32); memset(&pixel_list[0], 0x00, sizeof(u32)*32); -diff -urNp linux-2.6.39/drivers/media/common/saa7146_vbi.c linux-2.6.39/= drivers/media/common/saa7146_vbi.c ---- linux-2.6.39/drivers/media/common/saa7146_vbi.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/media/common/saa7146_vbi.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/common/saa7146_vbi.c linux-2.6.3= 9.1/drivers/media/common/saa7146_vbi.c +--- linux-2.6.39.1/drivers/media/common/saa7146_vbi.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/common/saa7146_vbi.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -501,7 +501,7 @@ static ssize_t vbi_read(struct file *fil return ret; } @@ -32174,9 +32198,9 @@ diff -urNp linux-2.6.39/drivers/media/common/saa7= 146_vbi.c linux-2.6.39/drivers/ .init =3D vbi_init, .open =3D vbi_open, .release =3D vbi_close, -diff -urNp linux-2.6.39/drivers/media/common/saa7146_video.c linux-2.6.3= 9/drivers/media/common/saa7146_video.c ---- linux-2.6.39/drivers/media/common/saa7146_video.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/media/common/saa7146_video.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/common/saa7146_video.c linux-2.6= .39.1/drivers/media/common/saa7146_video.c +--- linux-2.6.39.1/drivers/media/common/saa7146_video.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/common/saa7146_video.c 2011-05-22 19:36= :31.000000000 -0400 @@ -1420,7 +1420,7 @@ out: return ret; } @@ -32186,9 +32210,9 @@ diff -urNp linux-2.6.39/drivers/media/common/saa7= 146_video.c linux-2.6.39/driver .init =3D video_init, .open =3D video_open, .release =3D video_close, -diff -urNp linux-2.6.39/drivers/media/dvb/dm1105/dm1105.c linux-2.6.39/d= rivers/media/dvb/dm1105/dm1105.c ---- linux-2.6.39/drivers/media/dvb/dm1105/dm1105.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/dm1105/dm1105.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/dm1105/dm1105.c linux-2.6.39= .1/drivers/media/dvb/dm1105/dm1105.c +--- linux-2.6.39.1/drivers/media/dvb/dm1105/dm1105.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/dm1105/dm1105.c 2011-05-22 19:36:31= .000000000 -0400 @@ -418,7 +418,7 @@ static u32 functionality(struct i2c_adap return I2C_FUNC_I2C; } @@ -32198,9 +32222,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/dm1105/= dm1105.c linux-2.6.39/drivers/m .master_xfer =3D dm1105_i2c_xfer, .functionality =3D functionality, }; -diff -urNp linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linu= x-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ---- linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-22 = 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c li= nux-2.6.39.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +--- linux-2.6.39.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-2= 2 19:36:31.000000000 -0400 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru u8 buf[HOST_LINK_BUF_SIZE]; int i; @@ -32219,9 +32243,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/dvb-cor= e/dvb_ca_en50221.c linux-2.6.39 dprintk("%s\n", __func__); =20 /* Incoming packet has a 2 byte header. hdr[0] =3D slot_id, hdr[1] =3D= connection_id */ -diff -urNp linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.39= /drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.= 39.1/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.39.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -32231,9 +32255,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/dvb-cor= e/dvbdev.c linux-2.6.39/drivers struct device *clsdev; int minor; int id; -diff -urNp linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2= .6.39/drivers/media/dvb/dvb-usb/dib0700_core.c ---- linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-22 19:= 36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/dvb-usb/dib0700_core.c linux= -2.6.39.1/drivers/media/dvb/dvb-usb/dib0700_core.c +--- linux-2.6.39.1/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-22 1= 9:36:31.000000000 -0400 @@ -391,6 +391,8 @@ int dib0700_download_firmware(struct usb =20 u8 buf[260]; @@ -32243,9 +32267,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/dvb-usb= /dib0700_core.c linux-2.6.39/dr while ((ret =3D dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", hx.addr, hx.len, hx.chk); -diff -urNp linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.39= /drivers/media/dvb/dvb-usb/lmedm04.c ---- linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.= 39.1/drivers/media/dvb/dvb-usb/lmedm04.c +--- linux-2.6.39.1/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -663,6 +663,7 @@ static int lme2510_download_firmware(str packet_size =3D 0x31; len_in =3D 1; @@ -32263,10 +32287,10 @@ diff -urNp linux-2.6.39/drivers/media/dvb/dvb-u= sb/lmedm04.c linux-2.6.39/drivers data[0] =3D 0x0a; len_in =3D 1; info("FRM Firmware Cold Reset"); -diff -urNp linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c linux-2.6= .39/drivers/media/dvb/frontends/dib7000p.c ---- linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c 2011-05-22 19:36= :31.000000000 -0400 -@@ -1913,7 +1913,7 @@ static u32 dib7000p_i2c_func(struct i2c_ +diff -urNp linux-2.6.39.1/drivers/media/dvb/frontends/dib7000p.c linux-2= .6.39.1/drivers/media/dvb/frontends/dib7000p.c +--- linux-2.6.39.1/drivers/media/dvb/frontends/dib7000p.c 2011-06-03 00:= 04:14.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/frontends/dib7000p.c 2011-06-03 00:= 32:05.000000000 -0400 +@@ -1945,7 +1945,7 @@ static u32 dib7000p_i2c_func(struct i2c_ return I2C_FUNC_I2C; } =20 @@ -32275,10 +32299,10 @@ diff -urNp linux-2.6.39/drivers/media/dvb/front= ends/dib7000p.c linux-2.6.39/driv .master_xfer =3D dib7090_tuner_xfer, .functionality =3D dib7000p_i2c_func, }; -diff -urNp linux-2.6.39/drivers/media/dvb/frontends/dib9000.c linux-2.6.= 39/drivers/media/dvb/frontends/dib9000.c ---- linux-2.6.39/drivers/media/dvb/frontends/dib9000.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/frontends/dib9000.c 2011-05-22 19:36:= 31.000000000 -0400 -@@ -1649,12 +1649,12 @@ static u32 dib9000_i2c_func(struct i2c_a +diff -urNp linux-2.6.39.1/drivers/media/dvb/frontends/dib9000.c linux-2.= 6.39.1/drivers/media/dvb/frontends/dib9000.c +--- linux-2.6.39.1/drivers/media/dvb/frontends/dib9000.c 2011-06-03 00:0= 4:14.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/frontends/dib9000.c 2011-06-03 00:3= 2:05.000000000 -0400 +@@ -1676,12 +1676,12 @@ static u32 dib9000_i2c_func(struct i2c_a return I2C_FUNC_I2C; } =20 @@ -32293,10 +32317,10 @@ diff -urNp linux-2.6.39/drivers/media/dvb/front= ends/dib9000.c linux-2.6.39/drive .master_xfer =3D dib9000_fw_component_bus_xfer, .functionality =3D dib9000_i2c_func, }; -diff -urNp linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c lin= ux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c ---- linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c 2011-05-19= 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c 2011-05-22= 19:36:31.000000000 -0400 -@@ -212,12 +212,12 @@ static int dibx000_i2c_master_xfer_gpio3 +diff -urNp linux-2.6.39.1/drivers/media/dvb/frontends/dibx000_common.c l= inux-2.6.39.1/drivers/media/dvb/frontends/dibx000_common.c +--- linux-2.6.39.1/drivers/media/dvb/frontends/dibx000_common.c 2011-06-= 03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/frontends/dibx000_common.c 2011-06-= 03 00:37:36.000000000 -0400 +@@ -221,12 +221,12 @@ static int dibx000_i2c_master_xfer_gpio3 return num; } =20 @@ -32311,8 +32335,8 @@ diff -urNp linux-2.6.39/drivers/media/dvb/fronten= ds/dibx000_common.c linux-2.6.3 .master_xfer =3D dibx000_i2c_master_xfer_gpio34, .functionality =3D dibx000_i2c_func, }; -@@ -270,7 +270,7 @@ static int dibx000_i2c_gated_gpio67_xfer - return i2c_transfer(mst->i2c_adap, m, 2 + num) =3D=3D 2 + num ? num : = -EIO; +@@ -285,7 +285,7 @@ static int dibx000_i2c_gated_gpio67_xfer + return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) =3D=3D 2 + num ?= num : -EIO; } =20 -static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo =3D { @@ -32320,8 +32344,8 @@ diff -urNp linux-2.6.39/drivers/media/dvb/fronten= ds/dibx000_common.c linux-2.6.3 .master_xfer =3D dibx000_i2c_gated_gpio67_xfer, .functionality =3D dibx000_i2c_func, }; -@@ -301,7 +301,7 @@ static int dibx000_i2c_gated_tuner_xfer( - return i2c_transfer(mst->i2c_adap, m, 2 + num) =3D=3D 2 + num ? num : = -EIO; +@@ -322,7 +322,7 @@ static int dibx000_i2c_gated_tuner_xfer( + return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) =3D=3D 2 + num ?= num : -EIO; } =20 -static struct i2c_algorithm dibx000_i2c_gated_tuner_algo =3D { @@ -32329,7 +32353,7 @@ diff -urNp linux-2.6.39/drivers/media/dvb/fronten= ds/dibx000_common.c linux-2.6.3 .master_xfer =3D dibx000_i2c_gated_tuner_xfer, .functionality =3D dibx000_i2c_func, }; -@@ -354,7 +354,7 @@ void dibx000_reset_i2c_master(struct dib +@@ -375,7 +375,7 @@ void dibx000_reset_i2c_master(struct dib EXPORT_SYMBOL(dibx000_reset_i2c_master); =20 static int i2c_adapter_init(struct i2c_adapter *i2c_adap, @@ -32338,9 +32362,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/fronten= ds/dibx000_common.c linux-2.6.3 struct dibx000_i2c_master *mst) { strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); -diff -urNp linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c linux-2.6.= 39/drivers/media/dvb/frontends/mb86a16.c ---- linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/frontends/mb86a16.c linux-2.= 6.39.1/drivers/media/dvb/frontends/mb86a16.c +--- linux-2.6.39.1/drivers/media/dvb/frontends/mb86a16.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/frontends/mb86a16.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16 int ret =3D -1; int sync; @@ -32350,9 +32374,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/fronten= ds/mb86a16.c linux-2.6.39/drive dprintk(verbose, MB86A16_INFO, 1, "freq=3D%d Mhz, symbrt=3D%d Ksps", s= tate->frequency, state->srate); =20 fcp =3D 3000; -diff -urNp linux-2.6.39/drivers/media/dvb/frontends/or51211.c linux-2.6.= 39/drivers/media/dvb/frontends/or51211.c ---- linux-2.6.39/drivers/media/dvb/frontends/or51211.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/frontends/or51211.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/frontends/or51211.c linux-2.= 6.39.1/drivers/media/dvb/frontends/or51211.c +--- linux-2.6.39.1/drivers/media/dvb/frontends/or51211.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/frontends/or51211.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct u8 tudata[585]; int i; @@ -32362,9 +32386,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/fronten= ds/or51211.c linux-2.6.39/drive dprintk("Firmware is %zd bytes\n",fw->size); =20 /* Get eprom data */ -diff -urNp linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c linux-2.6.= 39/drivers/media/dvb/frontends/s5h1420.c ---- linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/frontends/s5h1420.c linux-2.= 6.39.1/drivers/media/dvb/frontends/s5h1420.c +--- linux-2.6.39.1/drivers/media/dvb/frontends/s5h1420.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/frontends/s5h1420.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -870,7 +870,7 @@ static int s5h1420_tuner_i2c_tuner_xfer( return i2c_transfer(state->i2c, m, 1+num) =3D=3D 1 + num ? num : -EIO; } @@ -32374,9 +32398,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/fronten= ds/s5h1420.c linux-2.6.39/drive .master_xfer =3D s5h1420_tuner_i2c_tuner_xfer, .functionality =3D s5h1420_tuner_i2c_func, }; -diff -urNp linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c linux-2.6.= 39/drivers/media/dvb/mantis/mantis_i2c.c ---- linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/mantis/mantis_i2c.c linux-2.= 6.39.1/drivers/media/dvb/mantis/mantis_i2c.c +--- linux-2.6.39.1/drivers/media/dvb/mantis/mantis_i2c.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/mantis/mantis_i2c.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -212,7 +212,7 @@ static u32 mantis_i2c_func(struct i2c_ad return I2C_FUNC_SMBUS_EMUL; } @@ -32386,9 +32410,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/mantis/= mantis_i2c.c linux-2.6.39/drive .master_xfer =3D mantis_i2c_xfer, .functionality =3D mantis_i2c_func, }; -diff -urNp linux-2.6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c linux-2.= 6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c ---- linux-2.6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/dvb/ttusb-dec/ttusb_dec.c linux-= 2.6.39.1/drivers/media/dvb/ttusb-dec/ttusb_dec.c +--- linux-2.6.39.1/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2011-05-22 19= :36:31.000000000 -0400 @@ -1614,7 +1614,7 @@ static int fe_send_command(struct dvb_fr return ttusb_dec_send_command(dec, command, param_length, params, resu= lt_length, cmd_result); } @@ -32398,9 +32422,9 @@ diff -urNp linux-2.6.39/drivers/media/dvb/ttusb-d= ec/ttusb_dec.c linux-2.6.39/dri .send_command =3D fe_send_command }; =20 -diff -urNp linux-2.6.39/drivers/media/radio/radio-cadet.c linux-2.6.39/d= rivers/media/radio/radio-cadet.c ---- linux-2.6.39/drivers/media/radio/radio-cadet.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/media/radio/radio-cadet.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/radio/radio-cadet.c linux-2.6.39= .1/drivers/media/radio/radio-cadet.c +--- linux-2.6.39.1/drivers/media/radio/radio-cadet.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/media/radio/radio-cadet.c 2011-05-22 19:36:31= .000000000 -0400 @@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f readbuf[i++] =3D dev->rdsbuf[dev->rdsout++]; mutex_unlock(&dev->lock); @@ -32410,9 +32434,9 @@ diff -urNp linux-2.6.39/drivers/media/radio/radio= -cadet.c linux-2.6.39/drivers/m return -EFAULT; return i; } -diff -urNp linux-2.6.39/drivers/media/radio/radio-si4713.c linux-2.6.39/= drivers/media/radio/radio-si4713.c ---- linux-2.6.39/drivers/media/radio/radio-si4713.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/media/radio/radio-si4713.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/radio/radio-si4713.c linux-2.6.3= 9.1/drivers/media/radio/radio-si4713.c +--- linux-2.6.39.1/drivers/media/radio/radio-si4713.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/radio/radio-si4713.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -231,7 +231,7 @@ static long radio_si4713_default(struct=20 ioctl, cmd, arg); } @@ -32422,9 +32446,9 @@ diff -urNp linux-2.6.39/drivers/media/radio/radio= -si4713.c linux-2.6.39/drivers/ .vidioc_enumaudout =3D radio_si4713_enumaudout, .vidioc_g_audout =3D radio_si4713_g_audout, .vidioc_s_audout =3D radio_si4713_s_audout, -diff -urNp linux-2.6.39/drivers/media/rc/ir-lirc-codec.c linux-2.6.39/dr= ivers/media/rc/ir-lirc-codec.c ---- linux-2.6.39/drivers/media/rc/ir-lirc-codec.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/media/rc/ir-lirc-codec.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/rc/ir-lirc-codec.c linux-2.6.39.= 1/drivers/media/rc/ir-lirc-codec.c +--- linux-2.6.39.1/drivers/media/rc/ir-lirc-codec.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/media/rc/ir-lirc-codec.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -277,7 +277,7 @@ static void ir_lirc_close(void *data) return; } @@ -32434,9 +32458,9 @@ diff -urNp linux-2.6.39/drivers/media/rc/ir-lirc-= codec.c linux-2.6.39/drivers/me .owner =3D THIS_MODULE, .write =3D ir_lirc_transmit_ir, .unlocked_ioctl =3D ir_lirc_ioctl, -diff -urNp linux-2.6.39/drivers/media/rc/lirc_dev.c linux-2.6.39/drivers= /media/rc/lirc_dev.c ---- linux-2.6.39/drivers/media/rc/lirc_dev.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/media/rc/lirc_dev.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/media/rc/lirc_dev.c linux-2.6.39.1/dri= vers/media/rc/lirc_dev.c +--- linux-2.6.39.1/drivers/media/rc/lirc_dev.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/media/rc/lirc_dev.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -151,7 +151,7 @@ static int lirc_thread(void *irctl) } =20 @@ -32446,9 +32470,9 @@ diff -urNp linux-2.6.39/drivers/media/rc/lirc_dev= .c linux-2.6.39/drivers/media/r .owner =3D THIS_MODULE, .read =3D lirc_dev_fop_read, .write =3D lirc_dev_fop_write, -diff -urNp linux-2.6.39/drivers/media/rc/rc-main.c linux-2.6.39/drivers/= media/rc/rc-main.c ---- linux-2.6.39/drivers/media/rc/rc-main.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/media/rc/rc-main.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/media/rc/rc-main.c linux-2.6.39.1/driv= ers/media/rc/rc-main.c +--- linux-2.6.39.1/drivers/media/rc/rc-main.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/media/rc/rc-main.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -996,7 +996,7 @@ EXPORT_SYMBOL_GPL(rc_free_device); =20 int rc_register_device(struct rc_dev *dev) @@ -32467,9 +32491,9 @@ diff -urNp linux-2.6.39/drivers/media/rc/rc-main.= c linux-2.6.39/drivers/media/rc dev_set_name(&dev->dev, "rc%ld", dev->devno); dev_set_drvdata(&dev->dev, dev); rc =3D device_add(&dev->dev); -diff -urNp linux-2.6.39/drivers/media/video/au0828/au0828.h linux-2.6.39= /drivers/media/video/au0828/au0828.h ---- linux-2.6.39/drivers/media/video/au0828/au0828.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/media/video/au0828/au0828.h 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/au0828/au0828.h linux-2.6.= 39.1/drivers/media/video/au0828/au0828.h +--- linux-2.6.39.1/drivers/media/video/au0828/au0828.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/au0828/au0828.h 2011-05-22 19:36:= 31.000000000 -0400 @@ -191,7 +191,7 @@ struct au0828_dev { =20 /* I2C */ @@ -32479,9 +32503,9 @@ diff -urNp linux-2.6.39/drivers/media/video/au082= 8/au0828.h linux-2.6.39/drivers struct i2c_client i2c_client; u32 i2c_rc; =20 -diff -urNp linux-2.6.39/drivers/media/video/cafe_ccic.c linux-2.6.39/dri= vers/media/video/cafe_ccic.c ---- linux-2.6.39/drivers/media/video/cafe_ccic.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/media/video/cafe_ccic.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/cafe_ccic.c linux-2.6.39.1= /drivers/media/video/cafe_ccic.c +--- linux-2.6.39.1/drivers/media/video/cafe_ccic.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/cafe_ccic.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -520,7 +520,7 @@ static u32 cafe_smbus_func(struct i2c_ad I2C_FUNC_SMBUS_WRITE_BYTE_DATA; } @@ -32491,9 +32515,9 @@ diff -urNp linux-2.6.39/drivers/media/video/cafe_= ccic.c linux-2.6.39/drivers/med .smbus_xfer =3D cafe_smbus_xfer, .functionality =3D cafe_smbus_func }; -diff -urNp linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c linux-2= .6.39/drivers/media/video/cx18/cx18-alsa-pcm.c ---- linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-05-22 19:= 36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/cx18/cx18-alsa-pcm.c linux= -2.6.39.1/drivers/media/video/cx18/cx18-alsa-pcm.c +--- linux-2.6.39.1/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-05-22 1= 9:36:31.000000000 -0400 @@ -314,7 +314,7 @@ static struct page *snd_pcm_get_vmalloc_ return vmalloc_to_page(pageptr); } @@ -32503,9 +32527,9 @@ diff -urNp linux-2.6.39/drivers/media/video/cx18/= cx18-alsa-pcm.c linux-2.6.39/dr .open =3D snd_cx18_pcm_capture_open, .close =3D snd_cx18_pcm_capture_close, .ioctl =3D snd_cx18_pcm_ioctl, -diff -urNp linux-2.6.39/drivers/media/video/cx18/cx18-driver.c linux-2.6= .39/drivers/media/video/cx18/cx18-driver.c ---- linux-2.6.39/drivers/media/video/cx18/cx18-driver.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/cx18/cx18-driver.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/cx18/cx18-driver.c linux-2= .6.39.1/drivers/media/video/cx18/cx18-driver.c +--- linux-2.6.39.1/drivers/media/video/cx18/cx18-driver.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/cx18/cx18-driver.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -61,7 +61,7 @@ static struct pci_device_id cx18_pci_tbl =20 MODULE_DEVICE_TABLE(pci, cx18_pci_tbl); @@ -32533,9 +32557,9 @@ diff -urNp linux-2.6.39/drivers/media/video/cx18/= cx18-driver.c linux-2.6.39/driv if (i >=3D CX18_MAX_CARDS) { printk(KERN_ERR "cx18: cannot manage card %d, driver has a " "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1); -diff -urNp linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c linu= x-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c ---- linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c 2011-05-22 = 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/cx231xx/cx231xx-audio.c li= nux-2.6.39.1/drivers/media/video/cx231xx/cx231xx-audio.c +--- linux-2.6.39.1/drivers/media/video/cx231xx/cx231xx-audio.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/cx231xx/cx231xx-audio.c 2011-05-2= 2 19:36:31.000000000 -0400 @@ -613,7 +613,7 @@ static struct page *snd_pcm_get_vmalloc_ return vmalloc_to_page(pageptr); } @@ -32545,9 +32569,9 @@ diff -urNp linux-2.6.39/drivers/media/video/cx231= xx/cx231xx-audio.c linux-2.6.39 .open =3D snd_cx231xx_capture_open, .close =3D snd_cx231xx_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c linux-= 2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c ---- linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-22 19= :36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/cx231xx/cx231xx-i2c.c linu= x-2.6.39.1/drivers/media/video/cx231xx/cx231xx-i2c.c +--- linux-2.6.39.1/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-22 = 19:36:31.000000000 -0400 @@ -435,7 +435,7 @@ static u32 functionality(struct i2c_adap return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; } @@ -32557,9 +32581,9 @@ diff -urNp linux-2.6.39/drivers/media/video/cx231= xx/cx231xx-i2c.c linux-2.6.39/d .master_xfer =3D cx231xx_i2c_xfer, .functionality =3D functionality, }; -diff -urNp linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c linu= x-2.6.39/drivers/media/video/cx23885/cx23885-input.c ---- linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c 2011-05-22 = 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/cx23885/cx23885-input.c li= nux-2.6.39.1/drivers/media/video/cx23885/cx23885-input.c +--- linux-2.6.39.1/drivers/media/video/cx23885/cx23885-input.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/cx23885/cx23885-input.c 2011-05-2= 2 19:36:31.000000000 -0400 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur bool handle =3D false; struct ir_raw_event ir_core_event[64]; @@ -32569,9 +32593,9 @@ diff -urNp linux-2.6.39/drivers/media/video/cx238= 85/cx23885-input.c linux-2.6.39 do { num =3D 0; v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event, -diff -urNp linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c linux-2.6.3= 9/drivers/media/video/cx88/cx88-alsa.c ---- linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/cx88/cx88-alsa.c linux-2.6= .39.1/drivers/media/video/cx88/cx88-alsa.c +--- linux-2.6.39.1/drivers/media/video/cx88/cx88-alsa.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/cx88/cx88-alsa.c 2011-05-22 19:36= :31.000000000 -0400 @@ -519,7 +519,7 @@ static struct page *snd_cx88_page(struct /* * operators @@ -32581,9 +32605,9 @@ diff -urNp linux-2.6.39/drivers/media/video/cx88/= cx88-alsa.c linux-2.6.39/driver .open =3D snd_cx88_pcm_open, .close =3D snd_cx88_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h lin= ux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h ---- linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h 2011-05-19= 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h 2011-05-22= 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/davinci/ccdc_hw_device.h l= inux-2.6.39.1/drivers/media/video/davinci/ccdc_hw_device.h +--- linux-2.6.39.1/drivers/media/video/davinci/ccdc_hw_device.h 2011-05-= 19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/davinci/ccdc_hw_device.h 2011-05-= 22 19:36:31.000000000 -0400 @@ -99,7 +99,7 @@ struct ccdc_hw_device { /* module owner */ struct module *owner; @@ -32593,9 +32617,9 @@ diff -urNp linux-2.6.39/drivers/media/video/davin= ci/ccdc_hw_device.h linux-2.6.3 }; =20 /* Used by CCDC module to register & unregister with vpfe capture drive= r */ -diff -urNp linux-2.6.39/drivers/media/video/davinci/vpss.c linux-2.6.39/= drivers/media/video/davinci/vpss.c ---- linux-2.6.39/drivers/media/video/davinci/vpss.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/media/video/davinci/vpss.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/davinci/vpss.c linux-2.6.3= 9.1/drivers/media/video/davinci/vpss.c +--- linux-2.6.39.1/drivers/media/video/davinci/vpss.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/davinci/vpss.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -103,7 +103,7 @@ struct vpss_oper_config { __iomem void *vpss_regs_base1; enum vpss_platform_type platform; @@ -32605,9 +32629,9 @@ diff -urNp linux-2.6.39/drivers/media/video/davin= ci/vpss.c linux-2.6.39/drivers/ }; =20 static struct vpss_oper_config oper_cfg; -diff -urNp linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c linux-= 2.6.39/drivers/media/video/em28xx/em28xx-audio.c ---- linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c 2011-05-22 19= :36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/em28xx/em28xx-audio.c linu= x-2.6.39.1/drivers/media/video/em28xx/em28xx-audio.c +--- linux-2.6.39.1/drivers/media/video/em28xx/em28xx-audio.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/em28xx/em28xx-audio.c 2011-05-22 = 19:36:31.000000000 -0400 @@ -432,7 +432,7 @@ static struct page *snd_pcm_get_vmalloc_ return vmalloc_to_page(pageptr); } @@ -32617,9 +32641,9 @@ diff -urNp linux-2.6.39/drivers/media/video/em28x= x/em28xx-audio.c linux-2.6.39/d .open =3D snd_em28xx_capture_open, .close =3D snd_em28xx_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/media/video/em28xx/em28xx-i2c.c linux-2.= 6.39/drivers/media/video/em28xx/em28xx-i2c.c ---- linux-2.6.39/drivers/media/video/em28xx/em28xx-i2c.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/em28xx/em28xx-i2c.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/em28xx/em28xx-i2c.c linux-= 2.6.39.1/drivers/media/video/em28xx/em28xx-i2c.c +--- linux-2.6.39.1/drivers/media/video/em28xx/em28xx-i2c.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/em28xx/em28xx-i2c.c 2011-05-22 19= :36:31.000000000 -0400 @@ -451,7 +451,7 @@ static u32 functionality(struct i2c_adap return I2C_FUNC_SMBUS_EMUL; } @@ -32629,9 +32653,9 @@ diff -urNp linux-2.6.39/drivers/media/video/em28x= x/em28xx-i2c.c linux-2.6.39/dri .master_xfer =3D em28xx_i2c_xfer, .functionality =3D functionality, }; -diff -urNp linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c linux-2.6.= 39/drivers/media/video/hdpvr/hdpvr-i2c.c ---- linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/hdpvr/hdpvr-i2c.c linux-2.= 6.39.1/drivers/media/video/hdpvr/hdpvr-i2c.c +--- linux-2.6.39.1/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -179,7 +179,7 @@ static u32 hdpvr_functionality(struct i2 return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } @@ -32641,9 +32665,9 @@ diff -urNp linux-2.6.39/drivers/media/video/hdpvr= /hdpvr-i2c.c linux-2.6.39/drive .master_xfer =3D hdpvr_transfer, .functionality =3D hdpvr_functionality, }; -diff -urNp linux-2.6.39/drivers/media/video/imx074.c linux-2.6.39/driver= s/media/video/imx074.c ---- linux-2.6.39/drivers/media/video/imx074.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/media/video/imx074.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/imx074.c linux-2.6.39.1/dr= ivers/media/video/imx074.c +--- linux-2.6.39.1/drivers/media/video/imx074.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/media/video/imx074.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -267,7 +267,7 @@ static int imx074_g_chip_ident(struct v4 return 0; } @@ -32662,9 +32686,9 @@ diff -urNp linux-2.6.39/drivers/media/video/imx07= 4.c linux-2.6.39/drivers/media/ .g_chip_ident =3D imx074_g_chip_ident, }; =20 -diff -urNp linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c linux-2.6= .39/drivers/media/video/ivtv/ivtv-driver.c ---- linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/ivtv/ivtv-driver.c linux-2= .6.39.1/drivers/media/video/ivtv/ivtv-driver.c +--- linux-2.6.39.1/drivers/media/video/ivtv/ivtv-driver.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/ivtv/ivtv-driver.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl); =20 @@ -32674,9 +32698,9 @@ diff -urNp linux-2.6.39/drivers/media/video/ivtv/= ivtv-driver.c linux-2.6.39/driv =20 /* Parameter declarations */ static int cardtype[IVTV_MAX_CARDS]; -diff -urNp linux-2.6.39/drivers/media/video/mt9m001.c linux-2.6.39/drive= rs/media/video/mt9m001.c ---- linux-2.6.39/drivers/media/video/mt9m001.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/media/video/mt9m001.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/mt9m001.c linux-2.6.39.1/d= rivers/media/video/mt9m001.c +--- linux-2.6.39.1/drivers/media/video/mt9m001.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/mt9m001.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -691,7 +691,7 @@ static int mt9m001_g_skip_top_lines(stru return 0; } @@ -32704,9 +32728,9 @@ diff -urNp linux-2.6.39/drivers/media/video/mt9m0= 01.c linux-2.6.39/drivers/media .g_skip_top_lines =3D mt9m001_g_skip_top_lines, }; =20 -diff -urNp linux-2.6.39/drivers/media/video/mt9t031.c linux-2.6.39/drive= rs/media/video/mt9t031.c ---- linux-2.6.39/drivers/media/video/mt9t031.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/media/video/mt9t031.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/mt9t031.c linux-2.6.39.1/d= rivers/media/video/mt9t031.c +--- linux-2.6.39.1/drivers/media/video/mt9t031.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/mt9t031.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -725,7 +725,7 @@ static int mt9t031_runtime_resume(struct return 0; } @@ -32743,9 +32767,9 @@ diff -urNp linux-2.6.39/drivers/media/video/mt9t0= 31.c linux-2.6.39/drivers/media .g_skip_top_lines =3D mt9t031_g_skip_top_lines, }; =20 -diff -urNp linux-2.6.39/drivers/media/video/mt9v022.c linux-2.6.39/drive= rs/media/video/mt9v022.c ---- linux-2.6.39/drivers/media/video/mt9v022.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/media/video/mt9v022.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/mt9v022.c linux-2.6.39.1/d= rivers/media/video/mt9v022.c +--- linux-2.6.39.1/drivers/media/video/mt9v022.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/mt9v022.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -825,7 +825,7 @@ static int mt9v022_g_skip_top_lines(stru return 0; } @@ -32773,9 +32797,9 @@ diff -urNp linux-2.6.39/drivers/media/video/mt9v0= 22.c linux-2.6.39/drivers/media .g_skip_top_lines =3D mt9v022_g_skip_top_lines, }; =20 -diff -urNp linux-2.6.39/drivers/media/video/mx2_camera.c linux-2.6.39/dr= ivers/media/video/mx2_camera.c ---- linux-2.6.39/drivers/media/video/mx2_camera.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/media/video/mx2_camera.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/mx2_camera.c linux-2.6.39.= 1/drivers/media/video/mx2_camera.c +--- linux-2.6.39.1/drivers/media/video/mx2_camera.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/mx2_camera.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -668,7 +668,7 @@ static void mx2_videobuf_release(struct=20 free_buffer(vq, buf); } @@ -32785,9 +32809,9 @@ diff -urNp linux-2.6.39/drivers/media/video/mx2_c= amera.c linux-2.6.39/drivers/me .buf_setup =3D mx2_videobuf_setup, .buf_prepare =3D mx2_videobuf_prepare, .buf_queue =3D mx2_videobuf_queue, -diff -urNp linux-2.6.39/drivers/media/video/omap24xxcam.c linux-2.6.39/d= rivers/media/video/omap24xxcam.c ---- linux-2.6.39/drivers/media/video/omap24xxcam.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/media/video/omap24xxcam.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/omap24xxcam.c linux-2.6.39= .1/drivers/media/video/omap24xxcam.c +--- linux-2.6.39.1/drivers/media/video/omap24xxcam.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/omap24xxcam.c 2011-05-22 19:36:31= .000000000 -0400 @@ -403,7 +403,7 @@ static void omap24xxcam_vbq_complete(str spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags); =20 @@ -32797,9 +32821,9 @@ diff -urNp linux-2.6.39/drivers/media/video/omap2= 4xxcam.c linux-2.6.39/drivers/m if (csr & csr_error) { vb->state =3D VIDEOBUF_ERROR; if (!atomic_read(&fh->cam->in_reset)) { -diff -urNp linux-2.6.39/drivers/media/video/omap24xxcam.h linux-2.6.39/d= rivers/media/video/omap24xxcam.h ---- linux-2.6.39/drivers/media/video/omap24xxcam.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/media/video/omap24xxcam.h 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/omap24xxcam.h linux-2.6.39= .1/drivers/media/video/omap24xxcam.h +--- linux-2.6.39.1/drivers/media/video/omap24xxcam.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/omap24xxcam.h 2011-05-22 19:36:31= .000000000 -0400 @@ -533,7 +533,7 @@ struct omap24xxcam_fh { spinlock_t vbq_lock; /* spinlock for the videobuf queue */ struct videobuf_queue vbq; @@ -32809,9 +32833,9 @@ diff -urNp linux-2.6.39/drivers/media/video/omap2= 4xxcam.h linux-2.6.39/drivers/m /* accessing cam here doesn't need serialisation: it's constant */ struct omap24xxcam_device *cam; }; -diff -urNp linux-2.6.39/drivers/media/video/omap3isp/isp.h linux-2.6.39/= drivers/media/video/omap3isp/isp.h ---- linux-2.6.39/drivers/media/video/omap3isp/isp.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/media/video/omap3isp/isp.h 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/omap3isp/isp.h linux-2.6.3= 9.1/drivers/media/video/omap3isp/isp.h +--- linux-2.6.39.1/drivers/media/video/omap3isp/isp.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/omap3isp/isp.h 2011-05-22 19:36:3= 1.000000000 -0400 @@ -290,7 +290,7 @@ struct isp_device { =20 struct iommu *iommu; @@ -32821,9 +32845,9 @@ diff -urNp linux-2.6.39/drivers/media/video/omap3= isp/isp.h linux-2.6.39/drivers/ }; =20 #define v4l2_dev_to_isp_device(dev) \ -diff -urNp linux-2.6.39/drivers/media/video/ov2640.c linux-2.6.39/driver= s/media/video/ov2640.c ---- linux-2.6.39/drivers/media/video/ov2640.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/media/video/ov2640.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/ov2640.c linux-2.6.39.1/dr= ivers/media/video/ov2640.c +--- linux-2.6.39.1/drivers/media/video/ov2640.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/media/video/ov2640.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -1080,7 +1080,7 @@ static struct soc_camera_ops ov2640_ops=20 .num_controls =3D ARRAY_SIZE(ov2640_controls), }; @@ -32842,9 +32866,9 @@ diff -urNp linux-2.6.39/drivers/media/video/ov264= 0.c linux-2.6.39/drivers/media/ .s_stream =3D ov2640_s_stream, .g_mbus_fmt =3D ov2640_g_fmt, .s_mbus_fmt =3D ov2640_s_fmt, -diff -urNp linux-2.6.39/drivers/media/video/ov772x.c linux-2.6.39/driver= s/media/video/ov772x.c ---- linux-2.6.39/drivers/media/video/ov772x.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/media/video/ov772x.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/ov772x.c linux-2.6.39.1/dr= ivers/media/video/ov772x.c +--- linux-2.6.39.1/drivers/media/video/ov772x.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/media/video/ov772x.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -1079,7 +1079,7 @@ static struct soc_camera_ops ov772x_ops=20 .num_controls =3D ARRAY_SIZE(ov772x_controls), }; @@ -32863,9 +32887,9 @@ diff -urNp linux-2.6.39/drivers/media/video/ov772= x.c linux-2.6.39/drivers/media/ .s_stream =3D ov772x_s_stream, .g_mbus_fmt =3D ov772x_g_fmt, .s_mbus_fmt =3D ov772x_s_fmt, -diff -urNp linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c lin= ux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c ---- linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-19= 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-22= 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c l= inux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +--- linux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-= 19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-= 22 19:36:31.000000000 -0400 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw=20 u8 *eeprom; struct tveeprom tvdata; @@ -32875,9 +32899,9 @@ diff -urNp linux-2.6.39/drivers/media/video/pvrus= b2/pvrusb2-eeprom.c linux-2.6.3 memset(&tvdata,0,sizeof(tvdata)); =20 eeprom =3D pvr2_eeprom_fetch(hdw); -diff -urNp linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c l= inux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c ---- linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-05-= 19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-05-= 22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c= linux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +--- linux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-0= 5-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-0= 5-22 19:36:31.000000000 -0400 @@ -527,7 +527,7 @@ static u32 pvr2_i2c_functionality(struct return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; } @@ -32887,9 +32911,9 @@ diff -urNp linux-2.6.39/drivers/media/video/pvrus= b2/pvrusb2-i2c-core.c linux-2.6 .master_xfer =3D pvr2_i2c_xfer, .functionality =3D pvr2_i2c_functionality, }; -diff -urNp linux-2.6.39/drivers/media/video/rj54n1cb0c.c linux-2.6.39/dr= ivers/media/video/rj54n1cb0c.c ---- linux-2.6.39/drivers/media/video/rj54n1cb0c.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/media/video/rj54n1cb0c.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/rj54n1cb0c.c linux-2.6.39.= 1/drivers/media/video/rj54n1cb0c.c +--- linux-2.6.39.1/drivers/media/video/rj54n1cb0c.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/rj54n1cb0c.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -1327,7 +1327,7 @@ static int rj54n1_s_ctrl(struct v4l2_sub return 0; } @@ -32908,9 +32932,9 @@ diff -urNp linux-2.6.39/drivers/media/video/rj54n= 1cb0c.c linux-2.6.39/drivers/me .s_stream =3D rj54n1_s_stream, .s_mbus_fmt =3D rj54n1_s_fmt, .g_mbus_fmt =3D rj54n1_g_fmt, -diff -urNp linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c linu= x-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c ---- linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-22 = 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/s5p-fimc/fimc-capture.c li= nux-2.6.39.1/drivers/media/video/s5p-fimc/fimc-capture.c +--- linux-2.6.39.1/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-2= 2 19:36:31.000000000 -0400 @@ -376,7 +376,7 @@ static void fimc_unlock(struct vb2_queue mutex_unlock(&ctx->fimc_dev->lock); } @@ -32920,9 +32944,9 @@ diff -urNp linux-2.6.39/drivers/media/video/s5p-f= imc/fimc-capture.c linux-2.6.39 .queue_setup =3D queue_setup, .buf_prepare =3D buffer_prepare, .buf_queue =3D buffer_queue, -diff -urNp linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c linux-2= .6.39/drivers/media/video/s5p-fimc/fimc-core.c ---- linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-22 19:= 36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/s5p-fimc/fimc-core.c linux= -2.6.39.1/drivers/media/video/s5p-fimc/fimc-core.c +--- linux-2.6.39.1/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-22 1= 9:36:31.000000000 -0400 @@ -768,7 +768,7 @@ static void fimc_unlock(struct vb2_queue mutex_unlock(&ctx->fimc_dev->lock); } @@ -32932,9 +32956,9 @@ diff -urNp linux-2.6.39/drivers/media/video/s5p-f= imc/fimc-core.c linux-2.6.39/dr .queue_setup =3D fimc_queue_setup, .buf_prepare =3D fimc_buf_prepare, .buf_queue =3D fimc_buf_queue, -diff -urNp linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c linux-2.= 6.39/drivers/media/video/saa7134/saa6752hs.c ---- linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c 2011-05-22 19:3= 6:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/saa7134/saa6752hs.c linux-= 2.6.39.1/drivers/media/video/saa7134/saa6752hs.c +--- linux-2.6.39.1/drivers/media/video/saa7134/saa6752hs.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/saa7134/saa6752hs.c 2011-05-22 19= :36:31.000000000 -0400 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su unsigned char localPAT[256]; unsigned char localPMT[256]; @@ -32944,9 +32968,9 @@ diff -urNp linux-2.6.39/drivers/media/video/saa71= 34/saa6752hs.c linux-2.6.39/dri /* Set video format - must be done first as it resets other settings *= / set_reg8(client, 0x41, h->video_format); =20 -diff -urNp linux-2.6.39/drivers/media/video/saa7134/saa7134-alsa.c linux= -2.6.39/drivers/media/video/saa7134/saa7134-alsa.c ---- linux-2.6.39/drivers/media/video/saa7134/saa7134-alsa.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/saa7134/saa7134-alsa.c 2011-05-22 1= 9:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/saa7134/saa7134-alsa.c lin= ux-2.6.39.1/drivers/media/video/saa7134/saa7134-alsa.c +--- linux-2.6.39.1/drivers/media/video/saa7134/saa7134-alsa.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/saa7134/saa7134-alsa.c 2011-05-22= 19:36:31.000000000 -0400 @@ -808,7 +808,7 @@ static struct page *snd_card_saa7134_pag * ALSA capture callbacks definition */ @@ -32956,9 +32980,9 @@ diff -urNp linux-2.6.39/drivers/media/video/saa71= 34/saa7134-alsa.c linux-2.6.39/ .open =3D snd_card_saa7134_capture_open, .close =3D snd_card_saa7134_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c linux-= 2.6.39/drivers/media/video/saa7164/saa7164-cmd.c ---- linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-22 19= :36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/saa7164/saa7164-cmd.c linu= x-2.6.39.1/drivers/media/video/saa7164/saa7164-cmd.c +--- linux-2.6.39.1/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-22 = 19:36:31.000000000 -0400 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d u8 tmp[512]; dprintk(DBGLVL_CMD, "%s()\n", __func__); @@ -32977,9 +33001,9 @@ diff -urNp linux-2.6.39/drivers/media/video/saa71= 64/saa7164-cmd.c linux-2.6.39/d while (loop) { =20 struct tmComResInfo tRsp =3D { 0, 0, 0, 0, 0, 0 }; -diff -urNp linux-2.6.39/drivers/media/video/sh_mobile_csi2.c linux-2.6.3= 9/drivers/media/video/sh_mobile_csi2.c ---- linux-2.6.39/drivers/media/video/sh_mobile_csi2.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/sh_mobile_csi2.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/sh_mobile_csi2.c linux-2.6= .39.1/drivers/media/video/sh_mobile_csi2.c +--- linux-2.6.39.1/drivers/media/video/sh_mobile_csi2.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/sh_mobile_csi2.c 2011-05-22 19:36= :31.000000000 -0400 @@ -127,12 +127,12 @@ static int sh_csi2_s_fmt(struct v4l2_sub return 0; } @@ -32995,9 +33019,9 @@ diff -urNp linux-2.6.39/drivers/media/video/sh_mo= bile_csi2.c linux-2.6.39/driver =20 static struct v4l2_subdev_ops sh_csi2_subdev_ops =3D { .core =3D &sh_csi2_subdev_core_ops, -diff -urNp linux-2.6.39/drivers/media/video/soc_camera_platform.c linux-= 2.6.39/drivers/media/video/soc_camera_platform.c ---- linux-2.6.39/drivers/media/video/soc_camera_platform.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/soc_camera_platform.c 2011-05-22 19= :36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/soc_camera_platform.c linu= x-2.6.39.1/drivers/media/video/soc_camera_platform.c +--- linux-2.6.39.1/drivers/media/video/soc_camera_platform.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/soc_camera_platform.c 2011-05-22 = 19:36:31.000000000 -0400 @@ -70,7 +70,7 @@ static int soc_camera_platform_fill_fmt( return 0; } @@ -33016,9 +33040,9 @@ diff -urNp linux-2.6.39/drivers/media/video/soc_c= amera_platform.c linux-2.6.39/d .s_stream =3D soc_camera_platform_s_stream, .enum_mbus_fmt =3D soc_camera_platform_enum_fmt, .cropcap =3D soc_camera_platform_cropcap, -diff -urNp linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c linux-2.6.= 39/drivers/media/video/tlg2300/pd-alsa.c ---- linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/tlg2300/pd-alsa.c linux-2.= 6.39.1/drivers/media/video/tlg2300/pd-alsa.c +--- linux-2.6.39.1/drivers/media/video/tlg2300/pd-alsa.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/tlg2300/pd-alsa.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -265,7 +265,7 @@ static struct page *snd_pcm_pd_get_page( return vmalloc_to_page(pageptr); } @@ -33028,9 +33052,9 @@ diff -urNp linux-2.6.39/drivers/media/video/tlg23= 00/pd-alsa.c linux-2.6.39/drive .open =3D snd_pd_capture_open, .close =3D snd_pd_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/media/video/tw9910.c linux-2.6.39/driver= s/media/video/tw9910.c ---- linux-2.6.39/drivers/media/video/tw9910.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/media/video/tw9910.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/tw9910.c linux-2.6.39.1/dr= ivers/media/video/tw9910.c +--- linux-2.6.39.1/drivers/media/video/tw9910.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/media/video/tw9910.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -894,7 +894,7 @@ static struct soc_camera_ops tw9910_ops=20 .enum_input =3D tw9910_enum_input, }; @@ -33049,9 +33073,9 @@ diff -urNp linux-2.6.39/drivers/media/video/tw991= 0.c linux-2.6.39/drivers/media/ .s_stream =3D tw9910_s_stream, .g_mbus_fmt =3D tw9910_g_fmt, .s_mbus_fmt =3D tw9910_s_fmt, -diff -urNp linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c l= inux-2.6.39/drivers/media/video/usbvision/usbvision-core.c ---- linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c 2011-05-= 19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c 2011-05-= 22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/usbvision/usbvision-core.c= linux-2.6.39.1/drivers/media/video/usbvision/usbvision-core.c +--- linux-2.6.39.1/drivers/media/video/usbvision/usbvision-core.c 2011-0= 5-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/usbvision/usbvision-core.c 2011-0= 5-22 19:36:31.000000000 -0400 @@ -799,6 +799,8 @@ static enum parse_state usbvision_parse_ unsigned char rv, gv, bv; static unsigned char *Y, *U, *V; @@ -33061,9 +33085,9 @@ diff -urNp linux-2.6.39/drivers/media/video/usbvi= sion/usbvision-core.c linux-2.6 frame =3D usbvision->cur_frame; image_size =3D frame->frmwidth * frame->frmheight; if ((frame->v4l2_format.format =3D=3D V4L2_PIX_FMT_YUV422P) || -diff -urNp linux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c li= nux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c ---- linux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c 2011-05-1= 9 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c 2011-05-2= 2 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/usbvision/usbvision-i2c.c = linux-2.6.39.1/drivers/media/video/usbvision/usbvision-i2c.c +--- linux-2.6.39.1/drivers/media/video/usbvision/usbvision-i2c.c 2011-05= -19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/usbvision/usbvision-i2c.c 2011-05= -22 19:36:31.000000000 -0400 @@ -189,7 +189,7 @@ static u32 functionality(struct i2c_adap =20 /* -----exported algorithm data: ------------------------------------- = */ @@ -33073,9 +33097,9 @@ diff -urNp linux-2.6.39/drivers/media/video/usbvi= sion/usbvision-i2c.c linux-2.6. .master_xfer =3D usbvision_i2c_xfer, .smbus_xfer =3D NULL, .functionality =3D functionality, -diff -urNp linux-2.6.39/drivers/media/video/v4l2-device.c linux-2.6.39/d= rivers/media/video/v4l2-device.c ---- linux-2.6.39/drivers/media/video/v4l2-device.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/media/video/v4l2-device.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/v4l2-device.c linux-2.6.39= .1/drivers/media/video/v4l2-device.c +--- linux-2.6.39.1/drivers/media/video/v4l2-device.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/v4l2-device.c 2011-05-22 19:36:31= .000000000 -0400 @@ -71,9 +71,9 @@ int v4l2_device_put(struct v4l2_device * EXPORT_SYMBOL_GPL(v4l2_device_put); =20 @@ -33088,9 +33112,9 @@ diff -urNp linux-2.6.39/drivers/media/video/v4l2-= device.c linux-2.6.39/drivers/m int len =3D strlen(basename); =20 if (basename[len - 1] >=3D '0' && basename[len - 1] <=3D '9') -diff -urNp linux-2.6.39/drivers/media/video/videobuf-dma-sg.c linux-2.6.= 39/drivers/media/video/videobuf-dma-sg.c ---- linux-2.6.39/drivers/media/video/videobuf-dma-sg.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/media/video/videobuf-dma-sg.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/media/video/videobuf-dma-sg.c linux-2.= 6.39.1/drivers/media/video/videobuf-dma-sg.c +--- linux-2.6.39.1/drivers/media/video/videobuf-dma-sg.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/media/video/videobuf-dma-sg.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size) { struct videobuf_queue q; @@ -33100,9 +33124,9 @@ diff -urNp linux-2.6.39/drivers/media/video/video= buf-dma-sg.c linux-2.6.39/drive /* Required to make generic handler to call __videobuf_alloc */ q.int_ops =3D &sg_ops; =20 -diff -urNp linux-2.6.39/drivers/message/fusion/mptbase.c linux-2.6.39/dr= ivers/message/fusion/mptbase.c ---- linux-2.6.39/drivers/message/fusion/mptbase.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/message/fusion/mptbase.c 2011-05-22 19:41:37.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/message/fusion/mptbase.c linux-2.6.39.= 1/drivers/message/fusion/mptbase.c +--- linux-2.6.39.1/drivers/message/fusion/mptbase.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/message/fusion/mptbase.c 2011-05-22 19:41:37.= 000000000 -0400 @@ -143,7 +143,7 @@ static int MptDriverClass[MPT_MAX_PRO static MPT_EVHANDLER MptEvHandlers[MPT_MAX_PROTOCOL_DRIVERS]; /* Reset handler lookup table */ @@ -33144,9 +33168,9 @@ diff -urNp linux-2.6.39/drivers/message/fusion/mp= tbase.c linux-2.6.39/drivers/me /* * Rounding UP to nearest 4-kB boundary here... */ -diff -urNp linux-2.6.39/drivers/message/fusion/mptbase.h linux-2.6.39/dr= ivers/message/fusion/mptbase.h ---- linux-2.6.39/drivers/message/fusion/mptbase.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/message/fusion/mptbase.h 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/message/fusion/mptbase.h linux-2.6.39.= 1/drivers/message/fusion/mptbase.h +--- linux-2.6.39.1/drivers/message/fusion/mptbase.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/message/fusion/mptbase.h 2011-05-22 19:36:31.= 000000000 -0400 @@ -908,7 +908,7 @@ extern int mpt_event_register(u8 cb_idx extern void mpt_event_deregister(u8 cb_idx); extern int mpt_reset_register(u8 cb_idx, MPT_RESETHANDLER reset_func); @@ -33156,9 +33180,9 @@ diff -urNp linux-2.6.39/drivers/message/fusion/mp= tbase.h linux-2.6.39/drivers/me extern void mpt_device_driver_deregister(u8 cb_idx); extern MPT_FRAME_HDR *mpt_get_msg_frame(u8 cb_idx, MPT_ADAPTER *ioc); extern void mpt_free_msg_frame(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf); -diff -urNp linux-2.6.39/drivers/message/fusion/mptctl.c linux-2.6.39/dri= vers/message/fusion/mptctl.c ---- linux-2.6.39/drivers/message/fusion/mptctl.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/message/fusion/mptctl.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/message/fusion/mptctl.c linux-2.6.39.1= /drivers/message/fusion/mptctl.c +--- linux-2.6.39.1/drivers/message/fusion/mptctl.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/message/fusion/mptctl.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -3000,7 +3000,7 @@ mptctl_remove(struct pci_dev *pdev) { } @@ -33168,9 +33192,9 @@ diff -urNp linux-2.6.39/drivers/message/fusion/mp= tctl.c linux-2.6.39/drivers/mes .probe =3D mptctl_probe, .remove =3D mptctl_remove, }; -diff -urNp linux-2.6.39/drivers/message/fusion/mptsas.c linux-2.6.39/dri= vers/message/fusion/mptsas.c ---- linux-2.6.39/drivers/message/fusion/mptsas.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/message/fusion/mptsas.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/message/fusion/mptsas.c linux-2.6.39.1= /drivers/message/fusion/mptsas.c +--- linux-2.6.39.1/drivers/message/fusion/mptsas.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/message/fusion/mptsas.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -33219,9 +33243,9 @@ diff -urNp linux-2.6.39/drivers/message/fusion/mp= tsas.c linux-2.6.39/drivers/mes static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.39/drivers/message/fusion/mptscsih.c linux-2.6.39/d= rivers/message/fusion/mptscsih.c ---- linux-2.6.39/drivers/message/fusion/mptscsih.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/message/fusion/mptscsih.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/message/fusion/mptscsih.c linux-2.6.39= .1/drivers/message/fusion/mptscsih.c +--- linux-2.6.39.1/drivers/message/fusion/mptscsih.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/message/fusion/mptscsih.c 2011-05-22 19:36:31= .000000000 -0400 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost) =20 h =3D shost_priv(SChost); @@ -33247,9 +33271,9 @@ diff -urNp linux-2.6.39/drivers/message/fusion/mp= tscsih.c linux-2.6.39/drivers/m =20 return h->info_kbuf; } -diff -urNp linux-2.6.39/drivers/message/i2o/i2o_config.c linux-2.6.39/dr= ivers/message/i2o/i2o_config.c ---- linux-2.6.39/drivers/message/i2o/i2o_config.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/message/i2o/i2o_config.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/message/i2o/i2o_config.c linux-2.6.39.= 1/drivers/message/i2o/i2o_config.c +--- linux-2.6.39.1/drivers/message/i2o/i2o_config.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/message/i2o/i2o_config.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon struct i2o_message *msg; unsigned int iop; @@ -33259,9 +33283,9 @@ diff -urNp linux-2.6.39/drivers/message/i2o/i2o_c= onfig.c linux-2.6.39/drivers/me if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg)) return -EFAULT; =20 -diff -urNp linux-2.6.39/drivers/message/i2o/i2o_proc.c linux-2.6.39/driv= ers/message/i2o/i2o_proc.c ---- linux-2.6.39/drivers/message/i2o/i2o_proc.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/message/i2o/i2o_proc.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/message/i2o/i2o_proc.c linux-2.6.39.1/= drivers/message/i2o/i2o_proc.c +--- linux-2.6.39.1/drivers/message/i2o/i2o_proc.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/message/i2o/i2o_proc.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -255,13 +255,6 @@ static char *scsi_devices[] =3D { "Array Controller Device" }; @@ -33348,9 +33372,9 @@ diff -urNp linux-2.6.39/drivers/message/i2o/i2o_p= roc.c linux-2.6.39/drivers/mess =20 return 0; } -diff -urNp linux-2.6.39/drivers/message/i2o/iop.c linux-2.6.39/drivers/m= essage/i2o/iop.c ---- linux-2.6.39/drivers/message/i2o/iop.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/message/i2o/iop.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/message/i2o/iop.c linux-2.6.39.1/drive= rs/message/i2o/iop.c +--- linux-2.6.39.1/drivers/message/i2o/iop.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/message/i2o/iop.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro =20 spin_lock_irqsave(&c->context_list_lock, flags); @@ -33374,9 +33398,9 @@ diff -urNp linux-2.6.39/drivers/message/i2o/iop.c= linux-2.6.39/drivers/message/i INIT_LIST_HEAD(&c->context_list); #endif =20 -diff -urNp linux-2.6.39/drivers/mfd/ab3100-core.c linux-2.6.39/drivers/m= fd/ab3100-core.c ---- linux-2.6.39/drivers/mfd/ab3100-core.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mfd/ab3100-core.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mfd/ab3100-core.c linux-2.6.39.1/drive= rs/mfd/ab3100-core.c +--- linux-2.6.39.1/drivers/mfd/ab3100-core.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mfd/ab3100-core.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -385,7 +385,7 @@ static int ab3100_event_registers_startu return 0; } @@ -33386,9 +33410,9 @@ diff -urNp linux-2.6.39/drivers/mfd/ab3100-core.c= linux-2.6.39/drivers/mfd/ab310 .get_chip_id =3D ab3100_get_chip_id, .set_register =3D set_register_interruptible, .get_register =3D get_register_interruptible, -diff -urNp linux-2.6.39/drivers/mfd/ab3550-core.c linux-2.6.39/drivers/m= fd/ab3550-core.c ---- linux-2.6.39/drivers/mfd/ab3550-core.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mfd/ab3550-core.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mfd/ab3550-core.c linux-2.6.39.1/drive= rs/mfd/ab3550-core.c +--- linux-2.6.39.1/drivers/mfd/ab3550-core.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mfd/ab3550-core.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -676,7 +676,7 @@ static int ab3550_startup_irq_enabled(st return val; } @@ -33398,9 +33422,9 @@ diff -urNp linux-2.6.39/drivers/mfd/ab3550-core.c= linux-2.6.39/drivers/mfd/ab355 .get_chip_id =3D ab3550_get_chip_id, .get_register =3D ab3550_get_register_interruptible, .set_register =3D ab3550_set_register_interruptible, -diff -urNp linux-2.6.39/drivers/mfd/ab8500-core.c linux-2.6.39/drivers/m= fd/ab8500-core.c ---- linux-2.6.39/drivers/mfd/ab8500-core.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mfd/ab8500-core.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mfd/ab8500-core.c linux-2.6.39.1/drive= rs/mfd/ab8500-core.c +--- linux-2.6.39.1/drivers/mfd/ab8500-core.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mfd/ab8500-core.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -223,7 +223,7 @@ static int ab8500_mask_and_set_register( =20 } @@ -33410,9 +33434,9 @@ diff -urNp linux-2.6.39/drivers/mfd/ab8500-core.c= linux-2.6.39/drivers/mfd/ab850 .get_chip_id =3D ab8500_get_chip_id, .get_register =3D ab8500_get_register, .set_register =3D ab8500_set_register, -diff -urNp linux-2.6.39/drivers/mfd/abx500-core.c linux-2.6.39/drivers/m= fd/abx500-core.c ---- linux-2.6.39/drivers/mfd/abx500-core.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mfd/abx500-core.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mfd/abx500-core.c linux-2.6.39.1/drive= rs/mfd/abx500-core.c +--- linux-2.6.39.1/drivers/mfd/abx500-core.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mfd/abx500-core.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -18,7 +18,7 @@ struct abx500_device_entry { struct device *dev; }; @@ -33494,9 +33518,9 @@ diff -urNp linux-2.6.39/drivers/mfd/abx500-core.c= linux-2.6.39/drivers/mfd/abx50 =20 lookup_ops(dev->parent, &ops); if ((ops !=3D NULL) && (ops->startup_irq_enabled !=3D NULL)) -diff -urNp linux-2.6.39/drivers/mfd/janz-cmodio.c linux-2.6.39/drivers/m= fd/janz-cmodio.c ---- linux-2.6.39/drivers/mfd/janz-cmodio.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mfd/janz-cmodio.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mfd/janz-cmodio.c linux-2.6.39.1/drive= rs/mfd/janz-cmodio.c +--- linux-2.6.39.1/drivers/mfd/janz-cmodio.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mfd/janz-cmodio.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -13,6 +13,7 @@ =20 #include @@ -33505,9 +33529,9 @@ diff -urNp linux-2.6.39/drivers/mfd/janz-cmodio.c= linux-2.6.39/drivers/mfd/janz- #include #include #include -diff -urNp linux-2.6.39/drivers/mfd/mcp-sa11x0.c linux-2.6.39/drivers/mf= d/mcp-sa11x0.c ---- linux-2.6.39/drivers/mfd/mcp-sa11x0.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/mfd/mcp-sa11x0.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/mfd/mcp-sa11x0.c linux-2.6.39.1/driver= s/mfd/mcp-sa11x0.c +--- linux-2.6.39.1/drivers/mfd/mcp-sa11x0.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/mfd/mcp-sa11x0.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -128,7 +128,7 @@ static void mcp_sa11x0_disable(struct mc /* * Our methods. @@ -33517,9 +33541,9 @@ diff -urNp linux-2.6.39/drivers/mfd/mcp-sa11x0.c = linux-2.6.39/drivers/mfd/mcp-sa .set_telecom_divisor =3D mcp_sa11x0_set_telecom_divisor, .set_audio_divisor =3D mcp_sa11x0_set_audio_divisor, .reg_write =3D mcp_sa11x0_write, -diff -urNp linux-2.6.39/drivers/mfd/wm8350-i2c.c linux-2.6.39/drivers/mf= d/wm8350-i2c.c ---- linux-2.6.39/drivers/mfd/wm8350-i2c.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/mfd/wm8350-i2c.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/mfd/wm8350-i2c.c linux-2.6.39.1/driver= s/mfd/wm8350-i2c.c +--- linux-2.6.39.1/drivers/mfd/wm8350-i2c.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/mfd/wm8350-i2c.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc u8 msg[(WM8350_MAX_REGISTER << 1) + 1]; int ret; @@ -33529,9 +33553,9 @@ diff -urNp linux-2.6.39/drivers/mfd/wm8350-i2c.c = linux-2.6.39/drivers/mfd/wm8350 if (bytes > ((WM8350_MAX_REGISTER << 1) + 1)) return -EINVAL; =20 -diff -urNp linux-2.6.39/drivers/misc/enclosure.c linux-2.6.39/drivers/mi= sc/enclosure.c ---- linux-2.6.39/drivers/misc/enclosure.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/misc/enclosure.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/misc/enclosure.c linux-2.6.39.1/driver= s/misc/enclosure.c +--- linux-2.6.39.1/drivers/misc/enclosure.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/misc/enclosure.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -161,7 +161,7 @@ enclosure_register(struct device *dev, c } EXPORT_SYMBOL_GPL(enclosure_register); @@ -33541,9 +33565,9 @@ diff -urNp linux-2.6.39/drivers/misc/enclosure.c = linux-2.6.39/drivers/misc/enclo =20 /** * enclosure_unregister - remove an enclosure -diff -urNp linux-2.6.39/drivers/misc/kgdbts.c linux-2.6.39/drivers/misc/= kgdbts.c ---- linux-2.6.39/drivers/misc/kgdbts.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/misc/kgdbts.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/misc/kgdbts.c linux-2.6.39.1/drivers/m= isc/kgdbts.c +--- linux-2.6.39.1/drivers/misc/kgdbts.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/misc/kgdbts.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -33562,9 +33586,9 @@ diff -urNp linux-2.6.39/drivers/misc/kgdbts.c lin= ux-2.6.39/drivers/misc/kgdbts.c .name =3D "kgdbts", .read_char =3D kgdbts_get_char, .write_char =3D kgdbts_put_char, -diff -urNp linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c linux-2.6.39/= drivers/misc/lis3lv02d/lis3lv02d.c ---- linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/lis3lv02d/lis3lv02d.c linux-2.6.3= 9.1/drivers/misc/lis3lv02d/lis3lv02d.c +--- linux-2.6.39.1/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -435,7 +435,7 @@ static irqreturn_t lis302dl_interrupt(in * the lid is closed. This leads to interrupts as soon as a little mov= e * is done. @@ -33601,9 +33625,9 @@ diff -urNp linux-2.6.39/drivers/misc/lis3lv02d/li= s3lv02d.c linux-2.6.39/drivers/ return POLLIN | POLLRDNORM; return 0; } -diff -urNp linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h linux-2.6.39/= drivers/misc/lis3lv02d/lis3lv02d.h ---- linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/lis3lv02d/lis3lv02d.h linux-2.6.3= 9.1/drivers/misc/lis3lv02d/lis3lv02d.h +--- linux-2.6.39.1/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-22 19:36:3= 1.000000000 -0400 @@ -265,7 +265,7 @@ struct lis3lv02d { struct input_polled_dev *idev; /* input device */ struct platform_device *pdev; /* platform device */ @@ -33613,9 +33637,9 @@ diff -urNp linux-2.6.39/drivers/misc/lis3lv02d/li= s3lv02d.h linux-2.6.39/drivers/ union axis_conversion ac; /* hw -> logical axis */ int mapped_btns[3]; =20 -diff -urNp linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c linux-2.6.39/d= rivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/sgi-gru/gruhandles.c linux-2.6.39= .1/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.39.1/drivers/misc/sgi-gru/gruhandles.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/misc/sgi-gru/gruhandles.c 2011-05-22 19:36:31= .000000000 -0400 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op unsigned long nsec; =20 @@ -33627,9 +33651,9 @@ diff -urNp linux-2.6.39/drivers/misc/sgi-gru/gruh= andles.c linux-2.6.39/drivers/m if (mcs_op_statistics[op].max < nsec) mcs_op_statistics[op].max =3D nsec; } -diff -urNp linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.39/dr= ivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.39.= 1/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.39.1/drivers/misc/sgi-gru/gruprocfs.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/misc/sgi-gru/gruprocfs.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -32,9 +32,9 @@ =20 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -33653,9 +33677,9 @@ diff -urNp linux-2.6.39/drivers/misc/sgi-gru/grup= rocfs.c linux-2.6.39/drivers/mi max =3D mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.39/drivers/misc/sgi-gru/grutables.h linux-2.6.39/dr= ivers/misc/sgi-gru/grutables.h ---- linux-2.6.39/drivers/misc/sgi-gru/grutables.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/misc/sgi-gru/grutables.h 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/sgi-gru/grutables.h linux-2.6.39.= 1/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.39.1/drivers/misc/sgi-gru/grutables.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/misc/sgi-gru/grutables.h 2011-05-22 19:36:31.= 000000000 -0400 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -33835,9 +33859,9 @@ diff -urNp linux-2.6.39/drivers/misc/sgi-gru/grut= ables.h linux-2.6.39/drivers/mi } while (0) =20 #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.39/drive= rs/misc/sgi-xp/xpc_sn2.c ---- linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.39.1/d= rivers/misc/sgi-xp/xpc_sn2.c +--- linux-2.6.39.1/drivers/misc/sgi-xp/xpc_sn2.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/misc/sgi-xp/xpc_sn2.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -2351,7 +2351,7 @@ xpc_received_payload_sn2(struct xpc_chan xpc_acknowledge_msgs_sn2(ch, get, msg->flags); } @@ -33847,9 +33871,9 @@ diff -urNp linux-2.6.39/drivers/misc/sgi-xp/xpc_s= n2.c linux-2.6.39/drivers/misc/ .setup_partitions =3D xpc_setup_partitions_sn2, .teardown_partitions =3D xpc_teardown_partitions_sn2, .process_activate_IRQ_rcvd =3D xpc_process_activate_IRQ_rcvd_sn2, -diff -urNp linux-2.6.39/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.39/driver= s/misc/sgi-xp/xpc_uv.c ---- linux-2.6.39/drivers/misc/sgi-xp/xpc_uv.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/misc/sgi-xp/xpc_uv.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.39.1/dr= ivers/misc/sgi-xp/xpc_uv.c +--- linux-2.6.39.1/drivers/misc/sgi-xp/xpc_uv.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/misc/sgi-xp/xpc_uv.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -1674,7 +1674,7 @@ xpc_received_payload_uv(struct xpc_chann XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret); } @@ -33859,9 +33883,9 @@ diff -urNp linux-2.6.39/drivers/misc/sgi-xp/xpc_u= v.c linux-2.6.39/drivers/misc/s .setup_partitions =3D xpc_setup_partitions_uv, .teardown_partitions =3D xpc_teardown_partitions_uv, .process_activate_IRQ_rcvd =3D xpc_process_activate_IRQ_rcvd_uv, -diff -urNp linux-2.6.39/drivers/misc/spear13xx_pcie_gadget.c linux-2.6.3= 9/drivers/misc/spear13xx_pcie_gadget.c ---- linux-2.6.39/drivers/misc/spear13xx_pcie_gadget.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/misc/spear13xx_pcie_gadget.c 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/misc/spear13xx_pcie_gadget.c linux-2.6= .39.1/drivers/misc/spear13xx_pcie_gadget.c +--- linux-2.6.39.1/drivers/misc/spear13xx_pcie_gadget.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/misc/spear13xx_pcie_gadget.c 2011-05-22 19:36= :31.000000000 -0400 @@ -644,7 +644,7 @@ static ssize_t pcie_gadget_target_attr_s return ret; } @@ -33871,9 +33895,9 @@ diff -urNp linux-2.6.39/drivers/misc/spear13xx_pc= ie_gadget.c linux-2.6.39/driver .show_attribute =3D pcie_gadget_target_attr_show, .store_attribute =3D pcie_gadget_target_attr_store, }; -diff -urNp linux-2.6.39/drivers/mmc/host/davinci_mmc.c linux-2.6.39/driv= ers/mmc/host/davinci_mmc.c ---- linux-2.6.39/drivers/mmc/host/davinci_mmc.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/mmc/host/davinci_mmc.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/davinci_mmc.c linux-2.6.39.1/= drivers/mmc/host/davinci_mmc.c +--- linux-2.6.39.1/drivers/mmc/host/davinci_mmc.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/davinci_mmc.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -1133,7 +1133,7 @@ static void mmc_davinci_enable_sdio_irq( } } @@ -33883,9 +33907,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/davinci_= mmc.c linux-2.6.39/drivers/mmc/ .request =3D mmc_davinci_request, .set_ios =3D mmc_davinci_set_ios, .get_cd =3D mmc_davinci_get_cd, -diff -urNp linux-2.6.39/drivers/mmc/host/dw_mmc.c linux-2.6.39/drivers/m= mc/host/dw_mmc.c ---- linux-2.6.39/drivers/mmc/host/dw_mmc.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mmc/host/dw_mmc.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/dw_mmc.c linux-2.6.39.1/drive= rs/mmc/host/dw_mmc.c +--- linux-2.6.39.1/drivers/mmc/host/dw_mmc.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/dw_mmc.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -417,7 +417,7 @@ static int dw_mci_idmac_init(struct dw_m return 0; } @@ -33895,9 +33919,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/dw_mmc.c= linux-2.6.39/drivers/mmc/host/ .init =3D dw_mci_idmac_init, .start =3D dw_mci_idmac_start_dma, .stop =3D dw_mci_idmac_stop_dma, -diff -urNp linux-2.6.39/drivers/mmc/host/s3cmci.c linux-2.6.39/drivers/m= mc/host/s3cmci.c ---- linux-2.6.39/drivers/mmc/host/s3cmci.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mmc/host/s3cmci.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/s3cmci.c linux-2.6.39.1/drive= rs/mmc/host/s3cmci.c +--- linux-2.6.39.1/drivers/mmc/host/s3cmci.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/s3cmci.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -1349,7 +1349,7 @@ static void s3cmci_enable_sdio_irq(struc s3cmci_check_sdio_irq(host); } @@ -33907,9 +33931,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/s3cmci.c= linux-2.6.39/drivers/mmc/host/ .request =3D s3cmci_request, .set_ios =3D s3cmci_set_ios, .get_ro =3D s3cmci_get_ro, -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-cns3xxx.c linux-2.6.39/dr= ivers/mmc/host/sdhci-cns3xxx.c ---- linux-2.6.39/drivers/mmc/host/sdhci-cns3xxx.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-cns3xxx.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-cns3xxx.c linux-2.6.39.= 1/drivers/mmc/host/sdhci-cns3xxx.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-cns3xxx.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-cns3xxx.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -81,7 +81,7 @@ out: host->clock =3D clock; } @@ -33919,9 +33943,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-cn= s3xxx.c linux-2.6.39/drivers/mm .get_max_clock =3D sdhci_cns3xxx_get_max_clk, .set_clock =3D sdhci_cns3xxx_set_clock, }; -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-dove.c linux-2.6.39/drive= rs/mmc/host/sdhci-dove.c ---- linux-2.6.39/drivers/mmc/host/sdhci-dove.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-dove.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-dove.c linux-2.6.39.1/d= rivers/mmc/host/sdhci-dove.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-dove.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-dove.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -56,7 +56,7 @@ static u32 sdhci_dove_readl(struct sdhci return ret; } @@ -33931,9 +33955,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-do= ve.c linux-2.6.39/drivers/mmc/h .read_w =3D sdhci_dove_readw, .read_l =3D sdhci_dove_readl, }; -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c linux-2.6.39/= drivers/mmc/host/sdhci-esdhc-imx.c ---- linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-esdhc-imx.c linux-2.6.3= 9.1/drivers/mmc/host/sdhci-esdhc-imx.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -201,7 +201,7 @@ static unsigned int esdhc_pltfm_get_ro(s return -ENOSYS; } @@ -33943,9 +33967,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-es= dhc-imx.c linux-2.6.39/drivers/ .read_l =3D esdhc_readl_le, .read_w =3D esdhc_readw_le, .write_l =3D esdhc_writel_le, -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-of.h linux-2.6.39/drivers= /mmc/host/sdhci-of.h ---- linux-2.6.39/drivers/mmc/host/sdhci-of.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-of.h 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-of.h linux-2.6.39.1/dri= vers/mmc/host/sdhci-of.h +--- linux-2.6.39.1/drivers/mmc/host/sdhci-of.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-of.h 2011-05-22 19:36:31.00000= 0000 -0400 @@ -21,7 +21,7 @@ =20 struct sdhci_of_data { @@ -33955,9 +33979,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-of= .h linux-2.6.39/drivers/mmc/hos }; =20 struct sdhci_of_host { -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-pci.c linux-2.6.39/driver= s/mmc/host/sdhci-pci.c ---- linux-2.6.39/drivers/mmc/host/sdhci-pci.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-pci.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-pci.c linux-2.6.39.1/dr= ivers/mmc/host/sdhci-pci.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-pci.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-pci.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -786,7 +786,7 @@ static int sdhci_pci_enable_dma(struct s return 0; } @@ -33967,9 +33991,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-pc= i.c linux-2.6.39/drivers/mmc/ho .enable_dma =3D sdhci_pci_enable_dma, }; =20 -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-pltfm.c linux-2.6.39/driv= ers/mmc/host/sdhci-pltfm.c ---- linux-2.6.39/drivers/mmc/host/sdhci-pltfm.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-pltfm.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-pltfm.c linux-2.6.39.1/= drivers/mmc/host/sdhci-pltfm.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-pltfm.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-pltfm.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -41,7 +41,7 @@ * = * \**********************************************************************= *******/ @@ -33979,9 +34003,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-pl= tfm.c linux-2.6.39/drivers/mmc/ }; =20 /**********************************************************************= *******\ -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-pxa.c linux-2.6.39/driver= s/mmc/host/sdhci-pxa.c ---- linux-2.6.39/drivers/mmc/host/sdhci-pxa.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-pxa.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-pxa.c linux-2.6.39.1/dr= ivers/mmc/host/sdhci-pxa.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-pxa.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-pxa.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -69,7 +69,7 @@ static void set_clock(struct sdhci_host=20 } } @@ -33991,9 +34015,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-px= a.c linux-2.6.39/drivers/mmc/ho .set_clock =3D set_clock, }; =20 -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-s3c.c linux-2.6.39/driver= s/mmc/host/sdhci-s3c.c ---- linux-2.6.39/drivers/mmc/host/sdhci-s3c.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-s3c.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-s3c.c linux-2.6.39.1/dr= ivers/mmc/host/sdhci-s3c.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-s3c.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-s3c.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -309,7 +309,7 @@ static int sdhci_s3c_platform_8bit_width return 0; } @@ -34003,9 +34027,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-s3= c.c linux-2.6.39/drivers/mmc/ho .get_max_clock =3D sdhci_s3c_get_max_clk, .set_clock =3D sdhci_s3c_set_clock, .get_min_clock =3D sdhci_s3c_get_min_clock, -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-spear.c linux-2.6.39/driv= ers/mmc/host/sdhci-spear.c ---- linux-2.6.39/drivers/mmc/host/sdhci-spear.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-spear.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-spear.c linux-2.6.39.1/= drivers/mmc/host/sdhci-spear.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-spear.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-spear.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -32,7 +32,7 @@ struct spear_sdhci { }; =20 @@ -34015,9 +34039,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-sp= ear.c linux-2.6.39/drivers/mmc/ /* Nothing to do for now. */ }; =20 -diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-tegra.c linux-2.6.39/driv= ers/mmc/host/sdhci-tegra.c ---- linux-2.6.39/drivers/mmc/host/sdhci-tegra.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdhci-tegra.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdhci-tegra.c linux-2.6.39.1/= drivers/mmc/host/sdhci-tegra.c +--- linux-2.6.39.1/drivers/mmc/host/sdhci-tegra.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdhci-tegra.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -242,7 +242,7 @@ static void tegra_sdhci_pltfm_exit(struc clk_put(pltfm_host->clk); } @@ -34027,9 +34051,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdhci-te= gra.c linux-2.6.39/drivers/mmc/ .get_ro =3D tegra_sdhci_get_ro, .read_l =3D tegra_sdhci_readl, .read_w =3D tegra_sdhci_readw, -diff -urNp linux-2.6.39/drivers/mmc/host/sdricoh_cs.c linux-2.6.39/drive= rs/mmc/host/sdricoh_cs.c ---- linux-2.6.39/drivers/mmc/host/sdricoh_cs.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/mmc/host/sdricoh_cs.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sdricoh_cs.c linux-2.6.39.1/d= rivers/mmc/host/sdricoh_cs.c +--- linux-2.6.39.1/drivers/mmc/host/sdricoh_cs.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sdricoh_cs.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -387,7 +387,7 @@ static int sdricoh_get_ro(struct mmc_hos return (status & STATUS_CARD_LOCKED); } @@ -34039,9 +34063,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sdricoh_= cs.c linux-2.6.39/drivers/mmc/h .request =3D sdricoh_request, .set_ios =3D sdricoh_set_ios, .get_ro =3D sdricoh_get_ro, -diff -urNp linux-2.6.39/drivers/mmc/host/sh_mmcif.c linux-2.6.39/drivers= /mmc/host/sh_mmcif.c ---- linux-2.6.39/drivers/mmc/host/sh_mmcif.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/mmc/host/sh_mmcif.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/mmc/host/sh_mmcif.c linux-2.6.39.1/dri= vers/mmc/host/sh_mmcif.c +--- linux-2.6.39.1/drivers/mmc/host/sh_mmcif.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/mmc/host/sh_mmcif.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -872,7 +872,7 @@ static int sh_mmcif_get_cd(struct mmc_ho return p->get_cd(host->pd); } @@ -34051,9 +34075,9 @@ diff -urNp linux-2.6.39/drivers/mmc/host/sh_mmcif= .c linux-2.6.39/drivers/mmc/hos .request =3D sh_mmcif_request, .set_ios =3D sh_mmcif_set_ios, .get_cd =3D sh_mmcif_get_cd, -diff -urNp linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.39= /drivers/mtd/chips/cfi_cmdset_0001.c ---- linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.= 39.1/drivers/mtd/chips/cfi_cmdset_0001.c +--- linux-2.6.39.1/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info * struct cfi_pri_intelext *cfip =3D cfi->cmdset_priv; unsigned long timeo =3D jiffies + HZ; @@ -34081,9 +34105,9 @@ diff -urNp linux-2.6.39/drivers/mtd/chips/cfi_cmd= set_0001.c linux-2.6.39/drivers adr +=3D chip->start; =20 retry: -diff -urNp linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.39= /drivers/mtd/chips/cfi_cmdset_0020.c ---- linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.= 39.1/drivers/mtd/chips/cfi_cmdset_0020.c +--- linux-2.6.39.1/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct unsigned long cmd_addr; struct cfi_private *cfi =3D map->fldrv_priv; @@ -34129,9 +34153,9 @@ diff -urNp linux-2.6.39/drivers/mtd/chips/cfi_cmd= set_0020.c linux-2.6.39/drivers adr +=3D chip->start; =20 /* Let's determine this according to the interleave only once */ -diff -urNp linux-2.6.39/drivers/mtd/devices/doc2000.c linux-2.6.39/drive= rs/mtd/devices/doc2000.c ---- linux-2.6.39/drivers/mtd/devices/doc2000.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/mtd/devices/doc2000.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/devices/doc2000.c linux-2.6.39.1/d= rivers/mtd/devices/doc2000.c +--- linux-2.6.39.1/drivers/mtd/devices/doc2000.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/mtd/devices/doc2000.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt =20 /* The ECC will not be calculated correctly if less than 512 is writt= en */ @@ -34141,9 +34165,9 @@ diff -urNp linux-2.6.39/drivers/mtd/devices/doc20= 00.c linux-2.6.39/drivers/mtd/d printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.39/drivers/mtd/devices/doc2001.c linux-2.6.39/drive= rs/mtd/devices/doc2001.c ---- linux-2.6.39/drivers/mtd/devices/doc2001.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/mtd/devices/doc2001.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/devices/doc2001.c linux-2.6.39.1/d= rivers/mtd/devices/doc2001.c +--- linux-2.6.39.1/drivers/mtd/devices/doc2001.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/mtd/devices/doc2001.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip =3D &this->chips[from >> (this->chipshift)]; =20 @@ -34153,9 +34177,9 @@ diff -urNp linux-2.6.39/drivers/mtd/devices/doc20= 01.c linux-2.6.39/drivers/mtd/d return -EINVAL; =20 /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.39/drivers/mtd/ftl.c linux-2.6.39/drivers/mtd/ftl.c ---- linux-2.6.39/drivers/mtd/ftl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/mtd/ftl.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/ftl.c linux-2.6.39.1/drivers/mtd/f= tl.c +--- linux-2.6.39.1/drivers/mtd/ftl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/mtd/ftl.c 2011-05-22 19:36:31.000000000 -0400 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t * loff_t offset; uint16_t srcunitswap =3D cpu_to_le16(srcunit); @@ -34165,9 +34189,9 @@ diff -urNp linux-2.6.39/drivers/mtd/ftl.c linux-2= .6.39/drivers/mtd/ftl.c eun =3D &part->EUNInfo[srcunit]; xfer =3D &part->XferInfo[xferunit]; DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n", -diff -urNp linux-2.6.39/drivers/mtd/inftlcore.c linux-2.6.39/drivers/mtd= /inftlcore.c ---- linux-2.6.39/drivers/mtd/inftlcore.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/mtd/inftlcore.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/mtd/inftlcore.c linux-2.6.39.1/drivers= /mtd/inftlcore.c +--- linux-2.6.39.1/drivers/mtd/inftlcore.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/mtd/inftlcore.c 2011-05-22 19:36:31.000000000= -0400 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr struct inftl_oob oob; size_t retlen; @@ -34177,9 +34201,9 @@ diff -urNp linux-2.6.39/drivers/mtd/inftlcore.c l= inux-2.6.39/drivers/mtd/inftlco DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=3D%p,thisVUC=3D%= d," "pending=3D%d)\n", inftl, thisVUC, pendingblock); =20 -diff -urNp linux-2.6.39/drivers/mtd/inftlmount.c linux-2.6.39/drivers/mt= d/inftlmount.c ---- linux-2.6.39/drivers/mtd/inftlmount.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/mtd/inftlmount.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/inftlmount.c linux-2.6.39.1/driver= s/mtd/inftlmount.c +--- linux-2.6.39.1/drivers/mtd/inftlmount.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/mtd/inftlmount.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL struct INFTLPartition *ip; size_t retlen; @@ -34189,9 +34213,9 @@ diff -urNp linux-2.6.39/drivers/mtd/inftlmount.c = linux-2.6.39/drivers/mtd/inftlm DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=3D%p)\n", inftl= ); =20 /* -diff -urNp linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.39/dri= vers/mtd/lpddr/qinfo_probe.c ---- linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.39.1= /drivers/mtd/lpddr/qinfo_probe.c +--- linux-2.6.39.1/drivers/mtd/lpddr/qinfo_probe.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/mtd/lpddr/qinfo_probe.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map { map_word pfow_val[4]; @@ -34201,9 +34225,9 @@ diff -urNp linux-2.6.39/drivers/mtd/lpddr/qinfo_p= robe.c linux-2.6.39/drivers/mtd /* Check identification string */ pfow_val[0] =3D map_read(map, map->pfow_base + PFOW_QUERY_STRING_P); pfow_val[1] =3D map_read(map, map->pfow_base + PFOW_QUERY_STRING_F); -diff -urNp linux-2.6.39/drivers/mtd/mtdchar.c linux-2.6.39/drivers/mtd/m= tdchar.c ---- linux-2.6.39/drivers/mtd/mtdchar.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/mtd/mtdchar.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/mtd/mtdchar.c linux-2.6.39.1/drivers/m= td/mtdchar.c +--- linux-2.6.39.1/drivers/mtd/mtdchar.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/mtd/mtdchar.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -560,6 +560,8 @@ static int mtd_ioctl(struct file *file,=20 u_long size; struct mtd_info_user info; @@ -34213,9 +34237,9 @@ diff -urNp linux-2.6.39/drivers/mtd/mtdchar.c lin= ux-2.6.39/drivers/mtd/mtdchar.c DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n"); =20 size =3D (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; -diff -urNp linux-2.6.39/drivers/mtd/nand/denali.c linux-2.6.39/drivers/m= td/nand/denali.c ---- linux-2.6.39/drivers/mtd/nand/denali.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/mtd/nand/denali.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/mtd/nand/denali.c linux-2.6.39.1/drive= rs/mtd/nand/denali.c +--- linux-2.6.39.1/drivers/mtd/nand/denali.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/mtd/nand/denali.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -25,6 +25,7 @@ #include #include @@ -34224,9 +34248,9 @@ diff -urNp linux-2.6.39/drivers/mtd/nand/denali.c= linux-2.6.39/drivers/mtd/nand/ =20 #include "denali.h" =20 -diff -urNp linux-2.6.39/drivers/mtd/nftlcore.c linux-2.6.39/drivers/mtd/= nftlcore.c ---- linux-2.6.39/drivers/mtd/nftlcore.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/mtd/nftlcore.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/mtd/nftlcore.c linux-2.6.39.1/drivers/= mtd/nftlcore.c +--- linux-2.6.39.1/drivers/mtd/nftlcore.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/mtd/nftlcore.c 2011-05-22 19:36:31.000000000 = -0400 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre int inplace =3D 1; size_t retlen; @@ -34236,9 +34260,9 @@ diff -urNp linux-2.6.39/drivers/mtd/nftlcore.c li= nux-2.6.39/drivers/mtd/nftlcore memset(BlockMap, 0xff, sizeof(BlockMap)); memset(BlockFreeFound, 0, sizeof(BlockFreeFound)); =20 -diff -urNp linux-2.6.39/drivers/mtd/nftlmount.c linux-2.6.39/drivers/mtd= /nftlmount.c ---- linux-2.6.39/drivers/mtd/nftlmount.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/mtd/nftlmount.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/mtd/nftlmount.c linux-2.6.39.1/drivers= /mtd/nftlmount.c +--- linux-2.6.39.1/drivers/mtd/nftlmount.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/mtd/nftlmount.c 2011-05-22 19:36:31.000000000= -0400 @@ -24,6 +24,7 @@ #include #include @@ -34256,9 +34280,9 @@ diff -urNp linux-2.6.39/drivers/mtd/nftlmount.c l= inux-2.6.39/drivers/mtd/nftlmou /* Assume logical EraseSize =3D=3D physical erasesize for start= ing the scan. We'll sort it out later if we find a MediaHeader which says otherwi= se */ /* Actually, we won't. The new DiskOnChip driver has already scanned -diff -urNp linux-2.6.39/drivers/mtd/ubi/build.c linux-2.6.39/drivers/mtd= /ubi/build.c ---- linux-2.6.39/drivers/mtd/ubi/build.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/mtd/ubi/build.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/mtd/ubi/build.c linux-2.6.39.1/drivers= /mtd/ubi/build.c +--- linux-2.6.39.1/drivers/mtd/ubi/build.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/mtd/ubi/build.c 2011-05-22 19:36:31.000000000= -0400 @@ -1287,7 +1287,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -34298,9 +34322,9 @@ diff -urNp linux-2.6.39/drivers/mtd/ubi/build.c l= inux-2.6.39/drivers/mtd/ubi/bui } =20 /** -diff -urNp linux-2.6.39/drivers/net/bcm63xx_enet.c linux-2.6.39/drivers/= net/bcm63xx_enet.c ---- linux-2.6.39/drivers/net/bcm63xx_enet.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/net/bcm63xx_enet.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/net/bcm63xx_enet.c linux-2.6.39.1/driv= ers/net/bcm63xx_enet.c +--- linux-2.6.39.1/drivers/net/bcm63xx_enet.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/net/bcm63xx_enet.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -1469,7 +1469,7 @@ static int bcm_enet_set_pauseparam(struc return 0; } @@ -34310,9 +34334,9 @@ diff -urNp linux-2.6.39/drivers/net/bcm63xx_enet.= c linux-2.6.39/drivers/net/bcm6 .get_strings =3D bcm_enet_get_strings, .get_sset_count =3D bcm_enet_get_sset_count, .get_ethtool_stats =3D bcm_enet_get_ethtool_stats, -diff -urNp linux-2.6.39/drivers/net/bna/bnad_ethtool.c linux-2.6.39/driv= ers/net/bna/bnad_ethtool.c ---- linux-2.6.39/drivers/net/bna/bnad_ethtool.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/net/bna/bnad_ethtool.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/bna/bnad_ethtool.c linux-2.6.39.1/= drivers/net/bna/bnad_ethtool.c +--- linux-2.6.39.1/drivers/net/bna/bnad_ethtool.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/net/bna/bnad_ethtool.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -1242,7 +1242,7 @@ bnad_get_sset_count(struct net_device *n } } @@ -34322,9 +34346,9 @@ diff -urNp linux-2.6.39/drivers/net/bna/bnad_etht= ool.c linux-2.6.39/drivers/net/ .get_settings =3D bnad_get_settings, .set_settings =3D bnad_set_settings, .get_drvinfo =3D bnad_get_drvinfo, -diff -urNp linux-2.6.39/drivers/net/bnx2.c linux-2.6.39/drivers/net/bnx2= .c ---- linux-2.6.39/drivers/net/bnx2.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/bnx2.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/bnx2.c linux-2.6.39.1/drivers/net/= bnx2.c +--- linux-2.6.39.1/drivers/net/bnx2.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/net/bnx2.c 2011-05-22 19:36:31.000000000 -040= 0 @@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp) int rc =3D 0; u32 magic, csum; @@ -34334,9 +34358,9 @@ diff -urNp linux-2.6.39/drivers/net/bnx2.c linux-= 2.6.39/drivers/net/bnx2.c if ((rc =3D bnx2_nvram_read(bp, 0, data, 4)) !=3D 0) goto test_nvram_done; =20 -diff -urNp linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.39/d= rivers/net/bnx2x/bnx2x_ethtool.c ---- linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.39= .1/drivers/net/bnx2x/bnx2x_ethtool.c +--- linux-2.6.39.1/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-22 19:36:31= .000000000 -0400 @@ -1788,6 +1788,8 @@ static int bnx2x_test_nvram(struct bnx2x int i, rc; u32 magic, crc; @@ -34346,9 +34370,9 @@ diff -urNp linux-2.6.39/drivers/net/bnx2x/bnx2x_e= thtool.c linux-2.6.39/drivers/n if (BP_NOMCP(bp)) return 0; =20 -diff -urNp linux-2.6.39/drivers/net/chelsio/pm3393.c linux-2.6.39/driver= s/net/chelsio/pm3393.c ---- linux-2.6.39/drivers/net/chelsio/pm3393.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/net/chelsio/pm3393.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/chelsio/pm3393.c linux-2.6.39.1/dr= ivers/net/chelsio/pm3393.c +--- linux-2.6.39.1/drivers/net/chelsio/pm3393.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/net/chelsio/pm3393.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -571,7 +571,7 @@ static void pm3393_destroy(struct cmac * kfree(cmac); } @@ -34358,9 +34382,9 @@ diff -urNp linux-2.6.39/drivers/net/chelsio/pm339= 3.c linux-2.6.39/drivers/net/ch .destroy =3D pm3393_destroy, .reset =3D pm3393_reset, .interrupt_enable =3D pm3393_interrupt_enable, -diff -urNp linux-2.6.39/drivers/net/chelsio/vsc7326.c linux-2.6.39/drive= rs/net/chelsio/vsc7326.c ---- linux-2.6.39/drivers/net/chelsio/vsc7326.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/net/chelsio/vsc7326.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/chelsio/vsc7326.c linux-2.6.39.1/d= rivers/net/chelsio/vsc7326.c +--- linux-2.6.39.1/drivers/net/chelsio/vsc7326.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/net/chelsio/vsc7326.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -666,7 +666,7 @@ static void mac_destroy(struct cmac *mac kfree(mac); } @@ -34370,9 +34394,9 @@ diff -urNp linux-2.6.39/drivers/net/chelsio/vsc73= 26.c linux-2.6.39/drivers/net/c .destroy =3D mac_destroy, .reset =3D mac_reset, .interrupt_handler =3D mac_intr_handler, -diff -urNp linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c linux-2.6.39/driv= ers/net/cxgb4/cxgb4_main.c ---- linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/cxgb4/cxgb4_main.c linux-2.6.39.1/= drivers/net/cxgb4/cxgb4_main.c +--- linux-2.6.39.1/drivers/net/cxgb4/cxgb4_main.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/net/cxgb4/cxgb4_main.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -3428,6 +3428,8 @@ static int __devinit enable_msix(struct=20 unsigned int nchan =3D adap->params.nports; struct msix_entry entries[MAX_INGQ + 1]; @@ -34382,9 +34406,9 @@ diff -urNp linux-2.6.39/drivers/net/cxgb4/cxgb4_m= ain.c linux-2.6.39/drivers/net/ for (i =3D 0; i < ARRAY_SIZE(entries); ++i) entries[i].entry =3D i; =20 -diff -urNp linux-2.6.39/drivers/net/cxgb4/t4_hw.c linux-2.6.39/drivers/n= et/cxgb4/t4_hw.c ---- linux-2.6.39/drivers/net/cxgb4/t4_hw.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/net/cxgb4/t4_hw.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/net/cxgb4/t4_hw.c linux-2.6.39.1/drive= rs/net/cxgb4/t4_hw.c +--- linux-2.6.39.1/drivers/net/cxgb4/t4_hw.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/net/cxgb4/t4_hw.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter u8 vpd[VPD_LEN], csum; unsigned int vpdr_len, kw_offset, id_len; @@ -34394,9 +34418,9 @@ diff -urNp linux-2.6.39/drivers/net/cxgb4/t4_hw.c= linux-2.6.39/drivers/net/cxgb4 ret =3D pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd); if (ret < 0) return ret; -diff -urNp linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c linux-2.6.39/= drivers/net/cxgb4vf/cxgb4vf_main.c ---- linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/cxgb4vf/cxgb4vf_main.c linux-2.6.3= 9.1/drivers/net/cxgb4vf/cxgb4vf_main.c +--- linux-2.6.39.1/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -1572,7 +1572,7 @@ static int cxgb4vf_set_tso(struct net_de return 0; } @@ -34406,9 +34430,9 @@ diff -urNp linux-2.6.39/drivers/net/cxgb4vf/cxgb4= vf_main.c linux-2.6.39/drivers/ .get_settings =3D cxgb4vf_get_settings, .get_drvinfo =3D cxgb4vf_get_drvinfo, .get_msglevel =3D cxgb4vf_get_msglevel, -diff -urNp linux-2.6.39/drivers/net/e1000e/82571.c linux-2.6.39/drivers/= net/e1000e/82571.c ---- linux-2.6.39/drivers/net/e1000e/82571.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/net/e1000e/82571.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/net/e1000e/82571.c linux-2.6.39.1/driv= ers/net/e1000e/82571.c +--- linux-2.6.39.1/drivers/net/e1000e/82571.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/net/e1000e/82571.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw =3D &adapter->hw; @@ -34463,9 +34487,9 @@ diff -urNp linux-2.6.39/drivers/net/e1000e/82571.= c linux-2.6.39/drivers/net/e100 .acquire =3D e1000_acquire_nvm_82571, .read =3D e1000e_read_nvm_eerd, .release =3D e1000_release_nvm_82571, -diff -urNp linux-2.6.39/drivers/net/e1000e/e1000.h linux-2.6.39/drivers/= net/e1000e/e1000.h ---- linux-2.6.39/drivers/net/e1000e/e1000.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/net/e1000e/e1000.h 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/net/e1000e/e1000.h linux-2.6.39.1/driv= ers/net/e1000e/e1000.h +--- linux-2.6.39.1/drivers/net/e1000e/e1000.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/net/e1000e/e1000.h 2011-05-22 19:36:31.000000= 000 -0400 @@ -409,9 +409,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -34479,9 +34503,9 @@ diff -urNp linux-2.6.39/drivers/net/e1000e/e1000.= h linux-2.6.39/drivers/net/e100 }; =20 /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.39/drivers/net/e1000e/es2lan.c linux-2.6.39/drivers= /net/e1000e/es2lan.c ---- linux-2.6.39/drivers/net/e1000e/es2lan.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/net/e1000e/es2lan.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/net/e1000e/es2lan.c linux-2.6.39.1/dri= vers/net/e1000e/es2lan.c +--- linux-2.6.39.1/drivers/net/e1000e/es2lan.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/net/e1000e/es2lan.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw =3D &adapter->hw; @@ -34518,9 +34542,9 @@ diff -urNp linux-2.6.39/drivers/net/e1000e/es2lan= .c linux-2.6.39/drivers/net/e10 .acquire =3D e1000_acquire_nvm_80003es2lan, .read =3D e1000e_read_nvm_eerd, .release =3D e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.39/drivers/net/e1000e/hw.h linux-2.6.39/drivers/net= /e1000e/hw.h ---- linux-2.6.39/drivers/net/e1000e/hw.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/net/e1000e/hw.h 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/net/e1000e/hw.h linux-2.6.39.1/drivers= /net/e1000e/hw.h +--- linux-2.6.39.1/drivers/net/e1000e/hw.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/net/e1000e/hw.h 2011-05-22 19:36:31.000000000= -0400 @@ -811,6 +811,7 @@ struct e1000_nvm_operations { }; =20 @@ -34545,9 +34569,9 @@ diff -urNp linux-2.6.39/drivers/net/e1000e/hw.h l= inux-2.6.39/drivers/net/e1000e/ struct e1000_nvm_operations ops; =20 enum e1000_nvm_type type; -diff -urNp linux-2.6.39/drivers/net/e1000e/ich8lan.c linux-2.6.39/driver= s/net/e1000e/ich8lan.c ---- linux-2.6.39/drivers/net/e1000e/ich8lan.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/net/e1000e/ich8lan.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/e1000e/ich8lan.c linux-2.6.39.1/dr= ivers/net/e1000e/ich8lan.c +--- linux-2.6.39.1/drivers/net/e1000e/ich8lan.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/net/e1000e/ich8lan.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -3866,7 +3866,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -34575,9 +34599,9 @@ diff -urNp linux-2.6.39/drivers/net/e1000e/ich8la= n.c linux-2.6.39/drivers/net/e1 .acquire =3D e1000_acquire_nvm_ich8lan, .read =3D e1000_read_nvm_ich8lan, .release =3D e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.39/drivers/net/greth.c linux-2.6.39/drivers/net/gre= th.c ---- linux-2.6.39/drivers/net/greth.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/greth.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/greth.c linux-2.6.39.1/drivers/net= /greth.c +--- linux-2.6.39.1/drivers/net/greth.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/net/greth.c 2011-05-22 19:36:31.000000000 -04= 00 @@ -1192,7 +1192,7 @@ static const struct ethtool_ops greth_et .get_link =3D ethtool_op_get_link, }; @@ -34587,9 +34611,9 @@ diff -urNp linux-2.6.39/drivers/net/greth.c linux= -2.6.39/drivers/net/greth.c .ndo_open =3D greth_open, .ndo_stop =3D greth_close, .ndo_start_xmit =3D greth_start_xmit, -diff -urNp linux-2.6.39/drivers/net/hamradio/6pack.c linux-2.6.39/driver= s/net/hamradio/6pack.c ---- linux-2.6.39/drivers/net/hamradio/6pack.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/net/hamradio/6pack.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/hamradio/6pack.c linux-2.6.39.1/dr= ivers/net/hamradio/6pack.c +--- linux-2.6.39.1/drivers/net/hamradio/6pack.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/net/hamradio/6pack.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t unsigned char buf[512]; int count1; @@ -34599,9 +34623,9 @@ diff -urNp linux-2.6.39/drivers/net/hamradio/6pac= k.c linux-2.6.39/drivers/net/ha if (!count) return; =20 -diff -urNp linux-2.6.39/drivers/net/ibm_newemac/phy.c linux-2.6.39/drive= rs/net/ibm_newemac/phy.c ---- linux-2.6.39/drivers/net/ibm_newemac/phy.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/net/ibm_newemac/phy.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ibm_newemac/phy.c linux-2.6.39.1/d= rivers/net/ibm_newemac/phy.c +--- linux-2.6.39.1/drivers/net/ibm_newemac/phy.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/net/ibm_newemac/phy.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -273,7 +273,7 @@ static int genmii_read_link(struct mii_p } =20 @@ -34647,9 +34671,9 @@ diff -urNp linux-2.6.39/drivers/net/ibm_newemac/p= hy.c linux-2.6.39/drivers/net/i .init =3D m88e1112_init, .setup_aneg =3D genmii_setup_aneg, .setup_forced =3D genmii_setup_forced, -diff -urNp linux-2.6.39/drivers/net/ibmveth.c linux-2.6.39/drivers/net/i= bmveth.c ---- linux-2.6.39/drivers/net/ibmveth.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/net/ibmveth.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/net/ibmveth.c linux-2.6.39.1/drivers/n= et/ibmveth.c +--- linux-2.6.39.1/drivers/net/ibmveth.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/net/ibmveth.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -1625,7 +1625,7 @@ static struct vio_device_id ibmveth_devi }; MODULE_DEVICE_TABLE(vio, ibmveth_device_table); @@ -34659,9 +34683,9 @@ diff -urNp linux-2.6.39/drivers/net/ibmveth.c lin= ux-2.6.39/drivers/net/ibmveth.c .resume =3D ibmveth_resume }; =20 -diff -urNp linux-2.6.39/drivers/net/igb/e1000_82575.c linux-2.6.39/drive= rs/net/igb/e1000_82575.c ---- linux-2.6.39/drivers/net/igb/e1000_82575.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/net/igb/e1000_82575.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/igb/e1000_82575.c linux-2.6.39.1/d= rivers/net/igb/e1000_82575.c +--- linux-2.6.39.1/drivers/net/igb/e1000_82575.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/net/igb/e1000_82575.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -2029,7 +2029,7 @@ out: return ret_val; } @@ -34687,9 +34711,9 @@ diff -urNp linux-2.6.39/drivers/net/igb/e1000_825= 75.c linux-2.6.39/drivers/net/i .acquire =3D igb_acquire_nvm_82575, .read =3D igb_read_nvm_eerd, .release =3D igb_release_nvm_82575, -diff -urNp linux-2.6.39/drivers/net/igb/e1000_hw.h linux-2.6.39/drivers/= net/igb/e1000_hw.h ---- linux-2.6.39/drivers/net/igb/e1000_hw.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/net/igb/e1000_hw.h 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/net/igb/e1000_hw.h linux-2.6.39.1/driv= ers/net/igb/e1000_hw.h +--- linux-2.6.39.1/drivers/net/igb/e1000_hw.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/net/igb/e1000_hw.h 2011-05-22 19:36:31.000000= 000 -0400 @@ -342,14 +342,15 @@ struct e1000_nvm_operations { =20 struct e1000_info { @@ -34725,9 +34749,9 @@ diff -urNp linux-2.6.39/drivers/net/igb/e1000_hw.= h linux-2.6.39/drivers/net/igb/ struct e1000_nvm_operations ops; enum e1000_nvm_type type; enum e1000_nvm_override override; -diff -urNp linux-2.6.39/drivers/net/igbvf/vf.h linux-2.6.39/drivers/net/= igbvf/vf.h ---- linux-2.6.39/drivers/net/igbvf/vf.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/net/igbvf/vf.h 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/net/igbvf/vf.h linux-2.6.39.1/drivers/= net/igbvf/vf.h +--- linux-2.6.39.1/drivers/net/igbvf/vf.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/net/igbvf/vf.h 2011-05-22 19:36:31.000000000 = -0400 @@ -191,6 +191,7 @@ struct e1000_mac_operations { }; =20 @@ -34736,9 +34760,9 @@ diff -urNp linux-2.6.39/drivers/net/igbvf/vf.h li= nux-2.6.39/drivers/net/igbvf/vf struct e1000_mac_operations ops; u8 addr[6]; u8 perm_addr[6]; -diff -urNp linux-2.6.39/drivers/net/irda/sh_irda.c linux-2.6.39/drivers/= net/irda/sh_irda.c ---- linux-2.6.39/drivers/net/irda/sh_irda.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/net/irda/sh_irda.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/net/irda/sh_irda.c linux-2.6.39.1/driv= ers/net/irda/sh_irda.c +--- linux-2.6.39.1/drivers/net/irda/sh_irda.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/net/irda/sh_irda.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -307,7 +307,7 @@ static int xir_fte(struct sh_irda_self * return 0; } @@ -34775,9 +34799,9 @@ diff -urNp linux-2.6.39/drivers/net/irda/sh_irda.= c linux-2.6.39/drivers/net/irda const char *name; u16 data; =20 -diff -urNp linux-2.6.39/drivers/net/ixgb/ixgb_main.c linux-2.6.39/driver= s/net/ixgb/ixgb_main.c ---- linux-2.6.39/drivers/net/ixgb/ixgb_main.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/net/ixgb/ixgb_main.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgb/ixgb_main.c linux-2.6.39.1/dr= ivers/net/ixgb/ixgb_main.c +--- linux-2.6.39.1/drivers/net/ixgb/ixgb_main.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/net/ixgb/ixgb_main.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -1069,6 +1069,8 @@ ixgb_set_multi(struct net_device *netdev u32 rctl; int i; @@ -34787,9 +34811,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgb/ixgb_mai= n.c linux-2.6.39/drivers/net/ix /* Check for Promiscuous and All Multicast modes */ =20 rctl =3D IXGB_READ_REG(hw, RCTL); -diff -urNp linux-2.6.39/drivers/net/ixgb/ixgb_param.c linux-2.6.39/drive= rs/net/ixgb/ixgb_param.c ---- linux-2.6.39/drivers/net/ixgb/ixgb_param.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/net/ixgb/ixgb_param.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgb/ixgb_param.c linux-2.6.39.1/d= rivers/net/ixgb/ixgb_param.c +--- linux-2.6.39.1/drivers/net/ixgb/ixgb_param.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/net/ixgb/ixgb_param.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -261,6 +261,9 @@ void __devinit ixgb_check_options(struct ixgb_adapter *adapter) { @@ -34800,9 +34824,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgb/ixgb_par= am.c linux-2.6.39/drivers/net/i if (bd >=3D IXGB_MAX_NIC) { pr_notice("Warning: no configuration for board #%i\n", bd); pr_notice("Using defaults for all values\n"); -diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe_82599.c linux-2.6.39/dri= vers/net/ixgbe/ixgbe_82599.c ---- linux-2.6.39/drivers/net/ixgbe/ixgbe_82599.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/net/ixgbe/ixgbe_82599.c 2011-05-22 19:36:31.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbe/ixgbe_82599.c linux-2.6.39.1= /drivers/net/ixgbe/ixgbe_82599.c +--- linux-2.6.39.1/drivers/net/ixgbe/ixgbe_82599.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbe/ixgbe_82599.c 2011-05-22 19:36:31.0= 00000000 -0400 @@ -2099,7 +2099,7 @@ static struct ixgbe_phy_operations phy_o .check_overtemp =3D &ixgbe_tn_check_overtemp, }; @@ -34812,9 +34836,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe_8= 2599.c linux-2.6.39/drivers/net .mac =3D ixgbe_mac_82599EB, .get_invariants =3D &ixgbe_get_invariants_82599, .mac_ops =3D &mac_ops_82599, -diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe.h linux-2.6.39/drivers/n= et/ixgbe/ixgbe.h ---- linux-2.6.39/drivers/net/ixgbe/ixgbe.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/net/ixgbe/ixgbe.h 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbe/ixgbe.h linux-2.6.39.1/drive= rs/net/ixgbe/ixgbe.h +--- linux-2.6.39.1/drivers/net/ixgbe/ixgbe.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbe/ixgbe.h 2011-05-22 19:36:31.0000000= 00 -0400 @@ -493,8 +493,8 @@ enum ixgbe_boards { }; =20 @@ -34826,9 +34850,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe.h= linux-2.6.39/drivers/net/ixgbe #ifdef CONFIG_IXGBE_DCB extern const struct dcbnl_rtnl_ops dcbnl_ops; extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg, -diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h linux-2.6.39/driv= ers/net/ixgbe/ixgbe_type.h ---- linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbe/ixgbe_type.h linux-2.6.39.1/= drivers/net/ixgbe/ixgbe_type.h +--- linux-2.6.39.1/drivers/net/ixgbe/ixgbe_type.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbe/ixgbe_type.h 2011-05-22 19:36:31.00= 0000000 -0400 @@ -2572,7 +2572,7 @@ struct ixgbe_phy_operations { }; =20 @@ -34856,9 +34880,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe_t= ype.h linux-2.6.39/drivers/net/ struct mdio_if_info mdio; enum ixgbe_phy_type type; u32 id; -diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c linux-2.6.39/driv= ers/net/ixgbe/ixgbe_x540.c ---- linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbe/ixgbe_x540.c linux-2.6.39.1/= drivers/net/ixgbe/ixgbe_x540.c +--- linux-2.6.39.1/drivers/net/ixgbe/ixgbe_x540.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbe/ixgbe_x540.c 2011-05-22 19:36:31.00= 0000000 -0400 @@ -727,7 +727,7 @@ static struct ixgbe_phy_operations phy_o .check_overtemp =3D &ixgbe_tn_check_overtemp, }; @@ -34868,9 +34892,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe_x= 540.c linux-2.6.39/drivers/net/ .mac =3D ixgbe_mac_X540, .get_invariants =3D &ixgbe_get_invariants_X540, .mac_ops =3D &mac_ops_X540, -diff -urNp linux-2.6.39/drivers/net/ixgbevf/ethtool.c linux-2.6.39/drive= rs/net/ixgbevf/ethtool.c ---- linux-2.6.39/drivers/net/ixgbevf/ethtool.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/net/ixgbevf/ethtool.c 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbevf/ethtool.c linux-2.6.39.1/d= rivers/net/ixgbevf/ethtool.c +--- linux-2.6.39.1/drivers/net/ixgbevf/ethtool.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbevf/ethtool.c 2011-05-22 19:36:31.000= 000000 -0400 @@ -709,7 +709,7 @@ static int ixgbevf_nway_reset(struct net return 0; } @@ -34880,9 +34904,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbevf/ethto= ol.c linux-2.6.39/drivers/net/i .get_settings =3D ixgbevf_get_settings, .get_drvinfo =3D ixgbevf_get_drvinfo, .get_regs_len =3D ixgbevf_get_regs_len, -diff -urNp linux-2.6.39/drivers/net/ixgbevf/ixgbevf.h linux-2.6.39/drive= rs/net/ixgbevf/ixgbevf.h ---- linux-2.6.39/drivers/net/ixgbevf/ixgbevf.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/net/ixgbevf/ixgbevf.h 2011-05-22 19:36:31.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbevf/ixgbevf.h linux-2.6.39.1/d= rivers/net/ixgbevf/ixgbevf.h +--- linux-2.6.39.1/drivers/net/ixgbevf/ixgbevf.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbevf/ixgbevf.h 2011-05-22 19:36:31.000= 000000 -0400 @@ -279,7 +279,7 @@ enum ixgbevf_boards { =20 extern struct ixgbevf_info ixgbevf_82599_vf_info; @@ -34892,9 +34916,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbevf/ixgbe= vf.h linux-2.6.39/drivers/net/i =20 /* needed by ethtool.c */ extern char ixgbevf_driver_name[]; -diff -urNp linux-2.6.39/drivers/net/ixgbevf/vf.c linux-2.6.39/drivers/ne= t/ixgbevf/vf.c ---- linux-2.6.39/drivers/net/ixgbevf/vf.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/net/ixgbevf/vf.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbevf/vf.c linux-2.6.39.1/driver= s/net/ixgbevf/vf.c +--- linux-2.6.39.1/drivers/net/ixgbevf/vf.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbevf/vf.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -368,7 +368,7 @@ static s32 ixgbevf_check_mac_link_vf(str return 0; } @@ -34919,9 +34943,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbevf/vf.c = linux-2.6.39/drivers/net/ixgbev .mac =3D ixgbe_mac_X540_vf, .mac_ops =3D &ixgbevf_mac_ops, }; -diff -urNp linux-2.6.39/drivers/net/ixgbevf/vf.h linux-2.6.39/drivers/ne= t/ixgbevf/vf.h ---- linux-2.6.39/drivers/net/ixgbevf/vf.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/net/ixgbevf/vf.h 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/net/ixgbevf/vf.h linux-2.6.39.1/driver= s/net/ixgbevf/vf.h +--- linux-2.6.39.1/drivers/net/ixgbevf/vf.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/net/ixgbevf/vf.h 2011-05-22 19:36:31.00000000= 0 -0400 @@ -166,7 +166,7 @@ struct ixgbevf_hw_stats { =20 struct ixgbevf_info { @@ -34931,9 +34955,9 @@ diff -urNp linux-2.6.39/drivers/net/ixgbevf/vf.h = linux-2.6.39/drivers/net/ixgbev }; =20 #endif /* __IXGBE_VF_H__ */ -diff -urNp linux-2.6.39/drivers/net/ksz884x.c linux-2.6.39/drivers/net/k= sz884x.c ---- linux-2.6.39/drivers/net/ksz884x.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/net/ksz884x.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/net/ksz884x.c linux-2.6.39.1/drivers/n= et/ksz884x.c +--- linux-2.6.39.1/drivers/net/ksz884x.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/net/ksz884x.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -6536,6 +6536,8 @@ static void netdev_get_ethtool_stats(str int rc; u64 counter[TOTAL_PORT_COUNTER_NUM]; @@ -34952,9 +34976,9 @@ diff -urNp linux-2.6.39/drivers/net/ksz884x.c lin= ux-2.6.39/drivers/net/ksz884x.c .get_settings =3D netdev_get_settings, .set_settings =3D netdev_set_settings, .nway_reset =3D netdev_nway_reset, -diff -urNp linux-2.6.39/drivers/net/mlx4/main.c linux-2.6.39/drivers/net= /mlx4/main.c ---- linux-2.6.39/drivers/net/mlx4/main.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/net/mlx4/main.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/net/mlx4/main.c linux-2.6.39.1/drivers= /net/mlx4/main.c +--- linux-2.6.39.1/drivers/net/mlx4/main.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/net/mlx4/main.c 2011-05-22 19:36:31.000000000= -0400 @@ -40,6 +40,7 @@ #include #include @@ -34972,9 +34996,9 @@ diff -urNp linux-2.6.39/drivers/net/mlx4/main.c l= inux-2.6.39/drivers/net/mlx4/ma err =3D mlx4_QUERY_FW(dev); if (err) { if (err =3D=3D -EACCES) -diff -urNp linux-2.6.39/drivers/net/netconsole.c linux-2.6.39/drivers/ne= t/netconsole.c ---- linux-2.6.39/drivers/net/netconsole.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/net/netconsole.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/net/netconsole.c linux-2.6.39.1/driver= s/net/netconsole.c +--- linux-2.6.39.1/drivers/net/netconsole.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/net/netconsole.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -634,7 +634,7 @@ static void drop_netconsole_target(struc config_item_put(&nt->item); } @@ -34984,9 +35008,9 @@ diff -urNp linux-2.6.39/drivers/net/netconsole.c = linux-2.6.39/drivers/net/netcon .make_item =3D make_netconsole_target, .drop_item =3D drop_netconsole_target, }; -diff -urNp linux-2.6.39/drivers/net/niu.c linux-2.6.39/drivers/net/niu.c ---- linux-2.6.39/drivers/net/niu.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/niu.c 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/niu.c linux-2.6.39.1/drivers/net/n= iu.c +--- linux-2.6.39.1/drivers/net/niu.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/niu.c 2011-05-22 19:36:31.000000000 -0400 @@ -9067,6 +9067,8 @@ static void __devinit niu_try_msix(struc int i, num_irqs, err; u8 first_ldg; @@ -34996,9 +35020,9 @@ diff -urNp linux-2.6.39/drivers/net/niu.c linux-2= .6.39/drivers/net/niu.c first_ldg =3D (NIU_NUM_LDG / parent->num_ports) * np->port; for (i =3D 0; i < (NIU_NUM_LDG / parent->num_ports); i++) ldg_num_map[i] =3D first_ldg + i; -diff -urNp linux-2.6.39/drivers/net/pcnet32.c linux-2.6.39/drivers/net/p= cnet32.c ---- linux-2.6.39/drivers/net/pcnet32.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/net/pcnet32.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/net/pcnet32.c linux-2.6.39.1/drivers/n= et/pcnet32.c +--- linux-2.6.39.1/drivers/net/pcnet32.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/net/pcnet32.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -82,7 +82,7 @@ static int cards_found; /* * VLB I/O addresses @@ -35035,9 +35059,9 @@ diff -urNp linux-2.6.39/drivers/net/pcnet32.c lin= ux-2.6.39/drivers/net/pcnet32.c u8 promaddr[6]; int ret =3D -ENODEV; =20 -diff -urNp linux-2.6.39/drivers/net/ppp_generic.c linux-2.6.39/drivers/n= et/ppp_generic.c ---- linux-2.6.39/drivers/net/ppp_generic.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/net/ppp_generic.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/net/ppp_generic.c linux-2.6.39.1/drive= rs/net/ppp_generic.c +--- linux-2.6.39.1/drivers/net/ppp_generic.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/net/ppp_generic.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st void __user *addr =3D (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; @@ -35056,9 +35080,9 @@ diff -urNp linux-2.6.39/drivers/net/ppp_generic.c= linux-2.6.39/drivers/net/ppp_g break; err =3D 0; break; -diff -urNp linux-2.6.39/drivers/net/qlcnic/qlcnic.h linux-2.6.39/drivers= /net/qlcnic/qlcnic.h ---- linux-2.6.39/drivers/net/qlcnic/qlcnic.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/net/qlcnic/qlcnic.h 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/net/qlcnic/qlcnic.h linux-2.6.39.1/dri= vers/net/qlcnic/qlcnic.h +--- linux-2.6.39.1/drivers/net/qlcnic/qlcnic.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/net/qlcnic/qlcnic.h 2011-05-22 19:36:31.00000= 0000 -0400 @@ -1037,7 +1037,7 @@ struct qlcnic_adapter { struct vlan_group *vlgrp; struct qlcnic_npar_info *npars; @@ -35068,9 +35092,9 @@ diff -urNp linux-2.6.39/drivers/net/qlcnic/qlcnic= .h linux-2.6.39/drivers/net/qlc =20 struct qlcnic_adapter_stats stats; =20 -diff -urNp linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c linux-2.6.39/dr= ivers/net/qlcnic/qlcnic_main.c ---- linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c 2011-05-22 19:36:31.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/qlcnic/qlcnic_main.c linux-2.6.39.= 1/drivers/net/qlcnic/qlcnic_main.c +--- linux-2.6.39.1/drivers/net/qlcnic/qlcnic_main.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/net/qlcnic/qlcnic_main.c 2011-05-22 19:36:31.= 000000000 -0400 @@ -340,13 +340,13 @@ static const struct net_device_ops qlcni #endif }; @@ -35087,9 +35111,9 @@ diff -urNp linux-2.6.39/drivers/net/qlcnic/qlcnic= _main.c linux-2.6.39/drivers/ne .config_bridged_mode =3D qlcnicvf_config_bridged_mode, .config_led =3D qlcnicvf_config_led, .start_firmware =3D qlcnicvf_start_firmware -diff -urNp linux-2.6.39/drivers/net/qlge/qlge.h linux-2.6.39/drivers/net= /qlge/qlge.h ---- linux-2.6.39/drivers/net/qlge/qlge.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/net/qlge/qlge.h 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/net/qlge/qlge.h linux-2.6.39.1/drivers= /net/qlge/qlge.h +--- linux-2.6.39.1/drivers/net/qlge/qlge.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/net/qlge/qlge.h 2011-05-22 19:36:31.000000000= -0400 @@ -2134,7 +2134,7 @@ struct ql_adapter { struct delayed_work mpi_idc_work; struct delayed_work mpi_core_to_log; @@ -35099,9 +35123,9 @@ diff -urNp linux-2.6.39/drivers/net/qlge/qlge.h l= inux-2.6.39/drivers/net/qlge/ql u16 device_id; struct timer_list timer; atomic_t lb_count; -diff -urNp linux-2.6.39/drivers/net/qlge/qlge_main.c linux-2.6.39/driver= s/net/qlge/qlge_main.c ---- linux-2.6.39/drivers/net/qlge/qlge_main.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/net/qlge/qlge_main.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/qlge/qlge_main.c linux-2.6.39.1/dr= ivers/net/qlge/qlge_main.c +--- linux-2.6.39.1/drivers/net/qlge/qlge_main.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/net/qlge/qlge_main.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -4412,12 +4412,12 @@ error: rtnl_unlock(); } @@ -35117,9 +35141,9 @@ diff -urNp linux-2.6.39/drivers/net/qlge/qlge_mai= n.c linux-2.6.39/drivers/net/ql .get_flash =3D ql_get_8000_flash_params, .port_initialize =3D ql_8000_port_initialize, }; -diff -urNp linux-2.6.39/drivers/net/sfc/falcon.c linux-2.6.39/drivers/ne= t/sfc/falcon.c ---- linux-2.6.39/drivers/net/sfc/falcon.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/net/sfc/falcon.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/net/sfc/falcon.c linux-2.6.39.1/driver= s/net/sfc/falcon.c +--- linux-2.6.39.1/drivers/net/sfc/falcon.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/net/sfc/falcon.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -1703,7 +1703,7 @@ static int falcon_set_wol(struct efx_nic **********************************************************************= **** */ @@ -35138,9 +35162,9 @@ diff -urNp linux-2.6.39/drivers/net/sfc/falcon.c = linux-2.6.39/drivers/net/sfc/fa .probe =3D falcon_probe_nic, .remove =3D falcon_remove_nic, .init =3D falcon_init_nic, -diff -urNp linux-2.6.39/drivers/net/sfc/mtd.c linux-2.6.39/drivers/net/s= fc/mtd.c ---- linux-2.6.39/drivers/net/sfc/mtd.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/net/sfc/mtd.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/net/sfc/mtd.c linux-2.6.39.1/drivers/n= et/sfc/mtd.c +--- linux-2.6.39.1/drivers/net/sfc/mtd.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/net/sfc/mtd.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -382,7 +382,7 @@ static int falcon_mtd_sync(struct mtd_in return rc; } @@ -35159,9 +35183,9 @@ diff -urNp linux-2.6.39/drivers/net/sfc/mtd.c lin= ux-2.6.39/drivers/net/sfc/mtd.c .read =3D siena_mtd_read, .erase =3D siena_mtd_erase, .write =3D siena_mtd_write, -diff -urNp linux-2.6.39/drivers/net/sfc/nic.h linux-2.6.39/drivers/net/s= fc/nic.h ---- linux-2.6.39/drivers/net/sfc/nic.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/net/sfc/nic.h 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/net/sfc/nic.h linux-2.6.39.1/drivers/n= et/sfc/nic.h +--- linux-2.6.39.1/drivers/net/sfc/nic.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/net/sfc/nic.h 2011-05-22 19:36:31.000000000 -= 0400 @@ -152,9 +152,9 @@ struct siena_nic_data { int wol_filter_id; }; @@ -35175,9 +35199,9 @@ diff -urNp linux-2.6.39/drivers/net/sfc/nic.h lin= ux-2.6.39/drivers/net/sfc/nic.h =20 /**********************************************************************= **** * -diff -urNp linux-2.6.39/drivers/net/sfc/siena.c linux-2.6.39/drivers/net= /sfc/siena.c ---- linux-2.6.39/drivers/net/sfc/siena.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/net/sfc/siena.c 2011-05-22 19:36:31.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/net/sfc/siena.c linux-2.6.39.1/drivers= /net/sfc/siena.c +--- linux-2.6.39.1/drivers/net/sfc/siena.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/net/sfc/siena.c 2011-05-22 19:36:31.000000000= -0400 @@ -599,7 +599,7 @@ static void siena_init_wol(struct efx_ni **********************************************************************= **** */ @@ -35187,9 +35211,9 @@ diff -urNp linux-2.6.39/drivers/net/sfc/siena.c l= inux-2.6.39/drivers/net/sfc/sie .probe =3D siena_probe_nic, .remove =3D siena_remove_nic, .init =3D siena_init_nic, -diff -urNp linux-2.6.39/drivers/net/sh_eth.c linux-2.6.39/drivers/net/sh= _eth.c ---- linux-2.6.39/drivers/net/sh_eth.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/net/sh_eth.c 2011-05-22 19:36:31.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/net/sh_eth.c linux-2.6.39.1/drivers/ne= t/sh_eth.c +--- linux-2.6.39.1/drivers/net/sh_eth.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/net/sh_eth.c 2011-05-22 19:36:31.000000000 -0= 400 @@ -1360,7 +1360,7 @@ static void sh_eth_get_strings(struct ne } } @@ -35199,9 +35223,9 @@ diff -urNp linux-2.6.39/drivers/net/sh_eth.c linu= x-2.6.39/drivers/net/sh_eth.c .get_settings =3D sh_eth_get_settings, .set_settings =3D sh_eth_set_settings, .nway_reset =3D sh_eth_nway_reset, -diff -urNp linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c linux-2.6.39= /drivers/net/stmmac/stmmac_ethtool.c ---- linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/stmmac/stmmac_ethtool.c linux-2.6.= 39.1/drivers/net/stmmac/stmmac_ethtool.c +--- linux-2.6.39.1/drivers/net/stmmac/stmmac_ethtool.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/stmmac/stmmac_ethtool.c 2011-05-22 19:36:= 31.000000000 -0400 @@ -348,7 +348,7 @@ static int stmmac_set_wol(struct net_dev return 0; } @@ -35211,9 +35235,9 @@ diff -urNp linux-2.6.39/drivers/net/stmmac/stmmac= _ethtool.c linux-2.6.39/drivers .begin =3D stmmac_check_if_running, .get_drvinfo =3D stmmac_ethtool_getdrvinfo, .get_settings =3D stmmac_ethtool_getsettings, -diff -urNp linux-2.6.39/drivers/net/sungem_phy.c linux-2.6.39/drivers/ne= t/sungem_phy.c ---- linux-2.6.39/drivers/net/sungem_phy.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/net/sungem_phy.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/net/sungem_phy.c linux-2.6.39.1/driver= s/net/sungem_phy.c +--- linux-2.6.39.1/drivers/net/sungem_phy.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/net/sungem_phy.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -886,7 +886,7 @@ static int marvell_read_link(struct mii_ SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full) =20 @@ -35331,9 +35355,9 @@ diff -urNp linux-2.6.39/drivers/net/sungem_phy.c = linux-2.6.39/drivers/net/sungem .setup_aneg =3D genmii_setup_aneg, .setup_forced =3D genmii_setup_forced, .poll_link =3D genmii_poll_link, -diff -urNp linux-2.6.39/drivers/net/tg3.h linux-2.6.39/drivers/net/tg3.h ---- linux-2.6.39/drivers/net/tg3.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/tg3.h 2011-05-22 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/tg3.h linux-2.6.39.1/drivers/net/t= g3.h +--- linux-2.6.39.1/drivers/net/tg3.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/tg3.h 2011-05-22 19:36:31.000000000 -0400 @@ -131,6 +131,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -35342,9 +35366,9 @@ diff -urNp linux-2.6.39/drivers/net/tg3.h linux-2= .6.39/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.39/drivers/net/tile/tilepro.c linux-2.6.39/drivers/= net/tile/tilepro.c ---- linux-2.6.39/drivers/net/tile/tilepro.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/net/tile/tilepro.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/net/tile/tilepro.c linux-2.6.39.1/driv= ers/net/tile/tilepro.c +--- linux-2.6.39.1/drivers/net/tile/tilepro.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/net/tile/tilepro.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -2263,7 +2263,7 @@ static int tile_net_get_mac(struct net_d } =20 @@ -35354,9 +35378,9 @@ diff -urNp linux-2.6.39/drivers/net/tile/tilepro.= c linux-2.6.39/drivers/net/tile .ndo_open =3D tile_net_open, .ndo_stop =3D tile_net_stop, .ndo_start_xmit =3D tile_net_tx, -diff -urNp linux-2.6.39/drivers/net/tulip/de2104x.c linux-2.6.39/drivers= /net/tulip/de2104x.c ---- linux-2.6.39/drivers/net/tulip/de2104x.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/net/tulip/de2104x.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/net/tulip/de2104x.c linux-2.6.39.1/dri= vers/net/tulip/de2104x.c +--- linux-2.6.39.1/drivers/net/tulip/de2104x.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/net/tulip/de2104x.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -1817,6 +1817,8 @@ static void __devinit de21041_get_srom_i struct de_srom_info_leaf *il; void *bufp; @@ -35366,9 +35390,9 @@ diff -urNp linux-2.6.39/drivers/net/tulip/de2104x= .c linux-2.6.39/drivers/net/tul /* download entire eeprom */ for (i =3D 0; i < DE_EEPROM_WORDS; i++) ((__le16 *)ee_data)[i] =3D -diff -urNp linux-2.6.39/drivers/net/tulip/de4x5.c linux-2.6.39/drivers/n= et/tulip/de4x5.c ---- linux-2.6.39/drivers/net/tulip/de4x5.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/net/tulip/de4x5.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/net/tulip/de4x5.c linux-2.6.39.1/drive= rs/net/tulip/de4x5.c +--- linux-2.6.39.1/drivers/net/tulip/de4x5.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/net/tulip/de4x5.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=3D0; idev_addr[i]; @@ -35387,9 +35411,9 @@ diff -urNp linux-2.6.39/drivers/net/tulip/de4x5.c= linux-2.6.39/drivers/net/tulip return -EFAULT; break; } -diff -urNp linux-2.6.39/drivers/net/usb/asix.c linux-2.6.39/drivers/net/= usb/asix.c ---- linux-2.6.39/drivers/net/usb/asix.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/net/usb/asix.c 2011-05-22 19:36:31.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/net/usb/asix.c linux-2.6.39.1/drivers/= net/usb/asix.c +--- linux-2.6.39.1/drivers/net/usb/asix.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/net/usb/asix.c 2011-05-22 19:36:31.000000000 = -0400 @@ -1098,7 +1098,7 @@ out: return ret; } @@ -35399,9 +35423,9 @@ diff -urNp linux-2.6.39/drivers/net/usb/asix.c li= nux-2.6.39/drivers/net/usb/asix .get_drvinfo =3D asix_get_drvinfo, .get_link =3D asix_get_link, .get_msglevel =3D usbnet_get_msglevel, -diff -urNp linux-2.6.39/drivers/net/usb/cdc_ncm.c linux-2.6.39/drivers/n= et/usb/cdc_ncm.c ---- linux-2.6.39/drivers/net/usb/cdc_ncm.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/net/usb/cdc_ncm.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/net/usb/cdc_ncm.c linux-2.6.39.1/drive= rs/net/usb/cdc_ncm.c +--- linux-2.6.39.1/drivers/net/usb/cdc_ncm.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/net/usb/cdc_ncm.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -141,7 +141,7 @@ struct cdc_ncm_ctx { static void cdc_ncm_tx_timeout(unsigned long arg); static const struct driver_info cdc_ncm_info; @@ -35420,9 +35444,9 @@ diff -urNp linux-2.6.39/drivers/net/usb/cdc_ncm.c= linux-2.6.39/drivers/net/usb/c .get_drvinfo =3D cdc_ncm_get_drvinfo, .get_link =3D usbnet_get_link, .get_msglevel =3D usbnet_get_msglevel, -diff -urNp linux-2.6.39/drivers/net/usb/hso.c linux-2.6.39/drivers/net/u= sb/hso.c ---- linux-2.6.39/drivers/net/usb/hso.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/net/usb/hso.c 2011-05-22 19:36:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/net/usb/hso.c linux-2.6.39.1/drivers/n= et/usb/hso.c +--- linux-2.6.39.1/drivers/net/usb/hso.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/net/usb/hso.c 2011-05-22 19:36:31.000000000 -= 0400 @@ -71,7 +71,7 @@ #include #include @@ -35519,9 +35543,9 @@ diff -urNp linux-2.6.39/drivers/net/usb/hso.c lin= ux-2.6.39/drivers/net/usb/hso.c result =3D hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.39/drivers/net/usb/ipheth.c linux-2.6.39/drivers/ne= t/usb/ipheth.c ---- linux-2.6.39/drivers/net/usb/ipheth.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/net/usb/ipheth.c 2011-05-22 19:36:31.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/net/usb/ipheth.c linux-2.6.39.1/driver= s/net/usb/ipheth.c +--- linux-2.6.39.1/drivers/net/usb/ipheth.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/net/usb/ipheth.c 2011-05-22 19:36:31.00000000= 0 -0400 @@ -421,7 +421,7 @@ static u32 ipheth_ethtool_op_get_link(st return netif_carrier_ok(dev->net); } @@ -35531,9 +35555,9 @@ diff -urNp linux-2.6.39/drivers/net/usb/ipheth.c = linux-2.6.39/drivers/net/usb/ip .get_link =3D ipheth_ethtool_op_get_link }; =20 -diff -urNp linux-2.6.39/drivers/net/usb/sierra_net.c linux-2.6.39/driver= s/net/usb/sierra_net.c ---- linux-2.6.39/drivers/net/usb/sierra_net.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/net/usb/sierra_net.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/usb/sierra_net.c linux-2.6.39.1/dr= ivers/net/usb/sierra_net.c +--- linux-2.6.39.1/drivers/net/usb/sierra_net.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/net/usb/sierra_net.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct ne return sierra_net_get_private(dev)->link_up && netif_running(net); } @@ -35543,9 +35567,9 @@ diff -urNp linux-2.6.39/drivers/net/usb/sierra_ne= t.c linux-2.6.39/drivers/net/us .get_drvinfo =3D sierra_net_get_drvinfo, .get_link =3D sierra_net_get_link, .get_msglevel =3D usbnet_get_msglevel, -diff -urNp linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.= 39/drivers/net/vmxnet3/vmxnet3_ethtool.c ---- linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-22 19:36:= 31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.= 6.39.1/drivers/net/vmxnet3/vmxnet3_ethtool.c +--- linux-2.6.39.1/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-22 19:3= 6:31.000000000 -0400 @@ -631,8 +631,7 @@ vmxnet3_set_rss_indir(struct net_device=20 * Return with error code if any of the queue indices * is out of range @@ -35556,9 +35580,9 @@ diff -urNp linux-2.6.39/drivers/net/vmxnet3/vmxne= t3_ethtool.c linux-2.6.39/drive return -EINVAL; } =20 -diff -urNp linux-2.6.39/drivers/net/vxge/vxge-config.h linux-2.6.39/driv= ers/net/vxge/vxge-config.h ---- linux-2.6.39/drivers/net/vxge/vxge-config.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/net/vxge/vxge-config.h 2011-05-22 19:36:31.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/vxge/vxge-config.h linux-2.6.39.1/= drivers/net/vxge/vxge-config.h +--- linux-2.6.39.1/drivers/net/vxge/vxge-config.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/net/vxge/vxge-config.h 2011-05-22 19:36:31.00= 0000000 -0400 @@ -834,7 +834,7 @@ struct vxge_hw_device_hw_info { struct vxge_hw_device_attr { void __iomem *bar0; @@ -35568,9 +35592,9 @@ diff -urNp linux-2.6.39/drivers/net/vxge/vxge-con= fig.h linux-2.6.39/drivers/net/ }; =20 #define VXGE_HW_DEVICE_LINK_STATE_SET(hldev, ls) (hldev->link_state =3D= ls) -diff -urNp linux-2.6.39/drivers/net/vxge/vxge-main.c linux-2.6.39/driver= s/net/vxge/vxge-main.c ---- linux-2.6.39/drivers/net/vxge/vxge-main.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/net/vxge/vxge-main.c 2011-05-22 19:36:31.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/vxge/vxge-main.c linux-2.6.39.1/dr= ivers/net/vxge/vxge-main.c +--- linux-2.6.39.1/drivers/net/vxge/vxge-main.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/net/vxge/vxge-main.c 2011-05-22 19:36:31.0000= 00000 -0400 @@ -97,6 +97,8 @@ static inline void VXGE_COMPLETE_VPATH_T struct sk_buff *completed[NR_SKB_COMPLETED]; int more; @@ -35589,9 +35613,9 @@ diff -urNp linux-2.6.39/drivers/net/vxge/vxge-mai= n.c linux-2.6.39/drivers/net/vx /* * Filling * - itable with bucket numbers -diff -urNp linux-2.6.39/drivers/net/wan/cycx_x25.c linux-2.6.39/drivers/= net/wan/cycx_x25.c ---- linux-2.6.39/drivers/net/wan/cycx_x25.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/net/wan/cycx_x25.c 2011-05-22 19:36:31.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wan/cycx_x25.c linux-2.6.39.1/driv= ers/net/wan/cycx_x25.c +--- linux-2.6.39.1/drivers/net/wan/cycx_x25.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/net/wan/cycx_x25.c 2011-05-22 19:36:31.000000= 000 -0400 @@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned unsigned char hex[1024], * phex =3D hex; @@ -35601,9 +35625,9 @@ diff -urNp linux-2.6.39/drivers/net/wan/cycx_x25.= c linux-2.6.39/drivers/net/wan/ if (len >=3D (sizeof(hex) / 2)) len =3D (sizeof(hex) / 2) - 1; =20 -diff -urNp linux-2.6.39/drivers/net/wan/lapbether.c linux-2.6.39/drivers= /net/wan/lapbether.c ---- linux-2.6.39/drivers/net/wan/lapbether.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/net/wan/lapbether.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wan/lapbether.c linux-2.6.39.1/dri= vers/net/wan/lapbether.c +--- linux-2.6.39.1/drivers/net/wan/lapbether.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/net/wan/lapbether.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -259,7 +259,7 @@ static int lapbeth_set_mac_address(struc } =20 @@ -35613,9 +35637,9 @@ diff -urNp linux-2.6.39/drivers/net/wan/lapbether= .c linux-2.6.39/drivers/net/wan .connect_confirmation =3D lapbeth_connected, .connect_indication =3D lapbeth_connected, .disconnect_confirmation =3D lapbeth_disconnected, -diff -urNp linux-2.6.39/drivers/net/wan/x25_asy.c linux-2.6.39/drivers/n= et/wan/x25_asy.c ---- linux-2.6.39/drivers/net/wan/x25_asy.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/net/wan/x25_asy.c 2011-05-22 19:36:31.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/net/wan/x25_asy.c linux-2.6.39.1/drive= rs/net/wan/x25_asy.c +--- linux-2.6.39.1/drivers/net/wan/x25_asy.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/net/wan/x25_asy.c 2011-05-22 19:36:31.0000000= 00 -0400 @@ -434,7 +434,7 @@ static void x25_asy_disconnected(struct=20 netif_rx(skb); } @@ -35625,9 +35649,9 @@ diff -urNp linux-2.6.39/drivers/net/wan/x25_asy.c= linux-2.6.39/drivers/net/wan/x .connect_confirmation =3D x25_asy_connected, .connect_indication =3D x25_asy_connected, .disconnect_confirmation =3D x25_asy_disconnected, -diff -urNp linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.39/d= rivers/net/wimax/i2400m/usb-fw.c ---- linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c 2011-05-22 19:36:31.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.39= .1/drivers/net/wimax/i2400m/usb-fw.c +--- linux-2.6.39.1/drivers/net/wimax/i2400m/usb-fw.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wimax/i2400m/usb-fw.c 2011-05-22 19:36:31= .000000000 -0400 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru int do_autopm =3D 1; DECLARE_COMPLETION_ONSTACK(notif_completion); @@ -35637,9 +35661,9 @@ diff -urNp linux-2.6.39/drivers/net/wimax/i2400m/= usb-fw.c linux-2.6.39/drivers/n d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n", i2400m, ack, ack_size); BUG_ON(_ack =3D=3D i2400m->bm_ack_buf); -diff -urNp linux-2.6.39/drivers/net/wireless/airo.c linux-2.6.39/drivers= /net/wireless/airo.c ---- linux-2.6.39/drivers/net/wireless/airo.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/net/wireless/airo.c 2011-05-22 19:36:31.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/airo.c linux-2.6.39.1/dri= vers/net/wireless/airo.c +--- linux-2.6.39.1/drivers/net/wireless/airo.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/airo.c 2011-05-22 19:36:31.00000= 0000 -0400 @@ -3001,6 +3001,8 @@ static void airo_process_scan_results (s BSSListElement * loop_net; BSSListElement * tmp_net; @@ -35694,9 +35718,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/airo= .c linux-2.6.39/drivers/net/wir /* Get stats out of the card */ clear_bit(JOB_WSTATS, &local->jobs); if (local->power.event) { -diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c linux-2.6= .39/drivers/net/wireless/ath/ath5k/debug.c ---- linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ath/ath5k/debug.c linux-2= .6.39.1/drivers/net/wireless/ath/ath5k/debug.c +--- linux-2.6.39.1/drivers/net/wireless/ath/ath5k/debug.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ath/ath5k/debug.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f unsigned int v; u64 tsf; @@ -35760,9 +35784,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ath/= ath5k/debug.c linux-2.6.39/driv len +=3D snprintf(buf+len, sizeof(buf)-len, "available txbuffers: %d\n", sc->txbuf_len); =20 -diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c li= nux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c ---- linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05-1= 9 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05-2= 2 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c = linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c +--- linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05= -19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05= -22 19:36:31.000000000 -0400 @@ -734,6 +734,8 @@ static void ar9003_hw_tx_iq_cal(struct a s32 i, j, ip, im, nmeasurement; u8 nchains =3D get_streams(common->tx_chainmask); @@ -35781,9 +35805,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ath/= ath9k/ar9003_calib.c linux-2.6. for (i =3D 0; i < AR9300_MAX_CHAINS; i++) { if (ah->txchainmask & (1 << i)) num_chains++; -diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c li= nux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c ---- linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05-1= 9 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05-2= 2 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c = linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +--- linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05= -19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05= -22 19:36:31.000000000 -0400 @@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L, int theta_low_bin =3D 0; int i; @@ -35793,9 +35817,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ath/= ath9k/ar9003_paprd.c linux-2.6. /* disregard any bin that contains <=3D 16 samples */ thresh_accum_cnt =3D 16; scale_factor =3D 5; -diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c linux-2.6= .39/drivers/net/wireless/ath/ath9k/debug.c ---- linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ath/ath9k/debug.c linux-2= .6.39.1/drivers/net/wireless/ath/ath9k/debug.c +--- linux-2.6.39.1/drivers/net/wireless/ath/ath9k/debug.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ath/ath9k/debug.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -335,6 +335,8 @@ static ssize_t read_file_interrupt(struc char buf[512]; unsigned int len =3D 0; @@ -35814,9 +35838,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ath/= ath9k/debug.c linux-2.6.39/driv len +=3D snprintf(buf + len, sizeof(buf) - len, "%s (chan=3D%d center-freq: %d MHz channel-type: %d (%s))\n", wiphy_name(sc->hw->wiphy), -diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c li= nux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c ---- linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05-1= 9 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05-2= 2 19:36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ath/ath9k/htc_drv_main.c = linux-2.6.39.1/drivers/net/wireless/ath/ath9k/htc_drv_main.c +--- linux-2.6.39.1/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05= -19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05= -22 19:36:31.000000000 -0400 @@ -737,6 +737,8 @@ static ssize_t read_file_tgt_stats(struc unsigned int len =3D 0; int ret =3D 0; @@ -35853,9 +35877,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ath/= ath9k/htc_drv_main.c linux-2.6. .tx =3D ath9k_htc_tx, .start =3D ath9k_htc_start, .stop =3D ath9k_htc_stop, -diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/htc.h linux-2.6.3= 9/drivers/net/wireless/ath/ath9k/htc.h ---- linux-2.6.39/drivers/net/wireless/ath/ath9k/htc.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ath/ath9k/htc.h 2011-05-22 19:36:3= 1.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ath/ath9k/htc.h linux-2.6= .39.1/drivers/net/wireless/ath/ath9k/htc.h +--- linux-2.6.39.1/drivers/net/wireless/ath/ath9k/htc.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ath/ath9k/htc.h 2011-05-22 19:36= :31.000000000 -0400 @@ -42,7 +42,7 @@ #define TSF_TO_TU(_h, _l) \ ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10)) @@ -35865,9 +35889,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ath/= ath9k/htc.h linux-2.6.39/driver extern int htc_modparam_nohwcrypt; =20 enum htc_phymode { -diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h linux-2.6.39= /drivers/net/wireless/ath/ath9k/hw.h ---- linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h 2011-05-22 19:36:31= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ath/ath9k/hw.h linux-2.6.= 39.1/drivers/net/wireless/ath/ath9k/hw.h +--- linux-2.6.39.1/drivers/net/wireless/ath/ath9k/hw.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ath/ath9k/hw.h 2011-05-22 19:36:= 31.000000000 -0400 @@ -753,9 +753,7 @@ struct ath_hw { } enable_32kHz_clock; =20 @@ -35879,9 +35903,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ath/= ath9k/hw.h linux-2.6.39/drivers =20 /* Used to program the radio on non single-chip devices */ u32 *analogBank0Data; -diff -urNp linux-2.6.39/drivers/net/wireless/b43/debugfs.c linux-2.6.39/= drivers/net/wireless/b43/debugfs.c ---- linux-2.6.39/drivers/net/wireless/b43/debugfs.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/b43/debugfs.c 2011-05-22 19:36:31.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/b43/debugfs.c linux-2.6.3= 9.1/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.39.1/drivers/net/wireless/b43/debugfs.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/b43/debugfs.c 2011-05-22 19:36:3= 1.000000000 -0400 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -35891,9 +35915,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/b43/= debugfs.c linux-2.6.39/drivers/ /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c linux-2= .6.39/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c 2011-05-22 19:= 36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/b43legacy/debugfs.c linux= -2.6.39.1/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.39.1/drivers/net/wireless/b43legacy/debugfs.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/b43legacy/debugfs.c 2011-05-22 1= 9:36:31.000000000 -0400 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize= ); @@ -35903,9 +35927,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/b43l= egacy/debugfs.c linux-2.6.39/dr /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -diff -urNp linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6= .39/drivers/net/wireless/ipw2x00/ipw2100.c ---- linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-22 19:36= :31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ipw2x00/ipw2100.c linux-2= .6.39.1/drivers/net/wireless/ipw2x00/ipw2100.c +--- linux-2.6.39.1/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-22 19:= 36:31.000000000 -0400 @@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2 int err; DECLARE_SSID_BUF(ssid); @@ -35924,9 +35948,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ipw2= x00/ipw2100.c linux-2.6.39/driv IPW_DEBUG_HC("WEP_KEY_INFO: index =3D %d, len =3D %d/%d\n", idx, keylen, len); =20 -diff -urNp linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2= .6.39/drivers/net/wireless/ipw2x00/libipw_rx.c ---- linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-22 19:= 36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/ipw2x00/libipw_rx.c linux= -2.6.39.1/drivers/net/wireless/ipw2x00/libipw_rx.c +--- linux-2.6.39.1/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-22 1= 9:36:31.000000000 -0400 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons unsigned long flags; DECLARE_SSID_BUF(ssid); @@ -35936,9 +35960,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/ipw2= x00/libipw_rx.c linux-2.6.39/dr LIBIPW_DEBUG_SCAN("'%s' (%pM" "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", print_ssid(ssid, info_element->data, info_element->len), -diff -urNp linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c linux-2= .6.39/drivers/net/wireless/iwlegacy/iwl-3945.c ---- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-22 19:= 36:31.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-3945.c linux= -2.6.39.1/drivers/net/wireless/iwlegacy/iwl-3945.c +--- linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-22 1= 9:36:31.000000000 -0400 @@ -2630,7 +2630,7 @@ static int iwl3945_load_bsm(struct iwl_p return 0; } @@ -35957,9 +35981,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwle= gacy/iwl-3945.c linux-2.6.39/dr .get_hcmd_size =3D iwl3945_get_hcmd_size, .build_addsta_hcmd =3D iwl3945_build_addsta_hcmd, .request_scan =3D iwl3945_request_scan, -diff -urNp linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c linux-2= .6.39/drivers/net/wireless/iwlegacy/iwl-4965.c ---- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.c linux= -2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.c +--- linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-22 1= 9:36:32.000000000 -0400 @@ -1904,7 +1904,7 @@ static void iwl4965_rx_handler_setup(str priv->rx_handlers[BEACON_NOTIFICATION] =3D iwl4965_rx_beacon_notif; } @@ -35987,9 +36011,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwle= gacy/iwl-4965.c linux-2.6.39/dr .tx =3D iwl4965_mac_tx, .start =3D iwl4965_mac_start, .stop =3D iwl4965_mac_stop, -diff -urNp linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h linux-2= .6.39/drivers/net/wireless/iwlegacy/iwl-4965.h ---- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.h linux= -2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.h +--- linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-22 1= 9:36:32.000000000 -0400 @@ -70,7 +70,7 @@ extern struct iwl_cfg iwl4965_cfg; =20 extern struct iwl_mod_params iwl4965_mod_params; @@ -35999,9 +36023,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwle= gacy/iwl-4965.h linux-2.6.39/dr =20 /* tx queue */ void iwl4965_free_tfds_in_queue(struct iwl_priv *priv, -diff -urNp linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h linux-2= .6.39/drivers/net/wireless/iwlegacy/iwl-core.h ---- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-core.h linux= -2.6.39.1/drivers/net/wireless/iwlegacy/iwl-core.h +--- linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-22 1= 9:36:32.000000000 -0400 @@ -150,7 +150,7 @@ struct iwl_lib_ops { int (*set_channel_switch)(struct iwl_priv *priv, struct ieee80211_channel_switch *ch_switch); @@ -36026,9 +36050,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwle= gacy/iwl-core.h linux-2.6.39/dr =20 }; =20 -diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.= 6.39/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-22 19:3= 6:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-6000.c linux-= 2.6.39.1/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-22 19= :36:32.000000000 -0400 @@ -422,11 +422,11 @@ static struct iwl_lib_ops iwl6030_lib =3D=20 } }; @@ -36043,9 +36067,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwlw= ifi/iwl-6000.c linux-2.6.39/dri .additional_nic_config =3D &iwl6150_additional_nic_config, }; =20 -diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h linux-2.6= .39/drivers/net/wireless/iwlwifi/iwl-agn.h ---- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-22 19:36= :32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn.h linux-2= .6.39.1/drivers/net/wireless/iwlwifi/iwl-agn.h +--- linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-22 19:= 36:32.000000000 -0400 @@ -109,9 +109,9 @@ extern struct iwl_cfg iwl230_bg_cfg; extern struct iwl_cfg iwl230_bgn_cfg; =20 @@ -36059,9 +36083,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwlw= ifi/iwl-agn.h linux-2.6.39/driv =20 extern struct ieee80211_ops iwlagn_hw_ops; extern struct ieee80211_ops iwl4965_hw_ops; -diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c linu= x-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c ---- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-22 = 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c li= nux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c +--- linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-2= 2 19:36:32.000000000 -0400 @@ -363,7 +363,7 @@ static int iwlagn_set_pan_params(struct=20 return ret; } @@ -36089,9 +36113,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwlw= ifi/iwl-agn-hcmd.c linux-2.6.39 .get_hcmd_size =3D iwlagn_get_hcmd_size, .build_addsta_hcmd =3D iwlagn_build_addsta_hcmd, .gain_computation =3D iwlagn_gain_computation, -diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-= 2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c ---- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-22 19= :36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linu= x-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +--- linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-22 = 19:36:32.000000000 -0400 @@ -883,6 +883,8 @@ static void rs_tx_status(void *priv_r, s struct iwl_station_priv *sta_priv =3D (void *)sta->drv_priv; struct iwl_rxon_context *ctx =3D sta_priv->common.ctx; @@ -36110,9 +36134,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwlw= ifi/iwl-agn-rs.c linux-2.6.39/d /* Override starting rate (index 0) if needed for debug purposes */ rs_dbgfs_set_mcs(lq_sta, &new_rate, index); =20 -diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h linux-2.= 6.39/drivers/net/wireless/iwlwifi/iwl-core.h ---- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-22 19:3= 6:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-core.h linux-= 2.6.39.1/drivers/net/wireless/iwlwifi/iwl-core.h +--- linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-22 19= :36:32.000000000 -0400 @@ -198,28 +198,25 @@ struct iwl_lib_ops { int (*set_channel_switch)(struct iwl_priv *priv, struct ieee80211_channel_switch *ch_switch); @@ -36146,9 +36170,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwlw= ifi/iwl-core.h linux-2.6.39/dri }; =20 struct iwl_led_ops { -diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux= -2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c ---- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-22 1= 9:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c lin= ux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c +--- linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-22= 19:36:32.000000000 -0400 @@ -549,6 +549,8 @@ static ssize_t iwl_dbgfs_status_read(str int pos =3D 0; const size_t bufsz =3D sizeof(buf); @@ -36167,9 +36191,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwlw= ifi/iwl-debugfs.c linux-2.6.39/ for_each_context(priv, ctx) { pos +=3D scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid); -diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2= .6.39/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debug.h linux= -2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-22 1= 9:36:32.000000000 -0400 @@ -68,8 +68,8 @@ do { =20 } while (0) =20 @@ -36181,9 +36205,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwlw= ifi/iwl-debug.h linux-2.6.39/dr static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, const void *p, u32 len) {} -diff -urNp linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c lin= ux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c ---- linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-19= 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-22= 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/cfg80211.c l= inux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/cfg80211.c +--- linux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-= 19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-= 22 19:36:32.000000000 -0400 @@ -763,7 +763,7 @@ static int iwm_cfg80211_flush_pmksa(stru } =20 @@ -36193,9 +36217,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwmc= 3200wifi/cfg80211.c linux-2.6.3 .change_virtual_intf =3D iwm_cfg80211_change_iface, .add_key =3D iwm_cfg80211_add_key, .get_key =3D iwm_cfg80211_get_key, -diff -urNp linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c linu= x-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c ---- linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-22 = 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/debugfs.c li= nux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/debugfs.c +--- linux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-2= 2 19:36:32.000000000 -0400 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s int buf_len =3D 512; size_t len =3D 0; @@ -36205,9 +36229,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/iwmc= 3200wifi/debugfs.c linux-2.6.39 if (*ppos !=3D 0) return 0; if (count < sizeof(buf)) -diff -urNp linux-2.6.39/drivers/net/wireless/libertas/cfg.c linux-2.6.39= /drivers/net/wireless/libertas/cfg.c ---- linux-2.6.39/drivers/net/wireless/libertas/cfg.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/libertas/cfg.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/libertas/cfg.c linux-2.6.= 39.1/drivers/net/wireless/libertas/cfg.c +--- linux-2.6.39.1/drivers/net/wireless/libertas/cfg.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/libertas/cfg.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -2003,7 +2003,7 @@ static int lbs_leave_ibss(struct wiphy * * Initialization */ @@ -36217,9 +36241,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/libe= rtas/cfg.c linux-2.6.39/drivers .set_channel =3D lbs_cfg_set_channel, .scan =3D lbs_cfg_scan, .connect =3D lbs_cfg_connect, -diff -urNp linux-2.6.39/drivers/net/wireless/libertas/debugfs.c linux-2.= 6.39/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.39/drivers/net/wireless/libertas/debugfs.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/libertas/debugfs.c 2011-05-22 19:3= 6:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/libertas/debugfs.c linux-= 2.6.39.1/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.39.1/drivers/net/wireless/libertas/debugfs.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/libertas/debugfs.c 2011-05-22 19= :36:32.000000000 -0400 @@ -702,7 +702,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -36229,9 +36253,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/libe= rtas/debugfs.c linux-2.6.39/dri }; =20 static const struct lbs_debugfs_files debugfs_files[] =3D { -diff -urNp linux-2.6.39/drivers/net/wireless/rndis_wlan.c linux-2.6.39/d= rivers/net/wireless/rndis_wlan.c ---- linux-2.6.39/drivers/net/wireless/rndis_wlan.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rndis_wlan.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rndis_wlan.c linux-2.6.39= .1/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.39.1/drivers/net/wireless/rndis_wlan.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rndis_wlan.c 2011-05-22 19:36:32= .000000000 -0400 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn =20 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold); @@ -36241,9 +36265,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rndi= s_wlan.c linux-2.6.39/drivers/n rts_threshold =3D 2347; =20 tmp =3D cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c linux-2.6.39/= drivers/net/wireless/rtlwifi/pci.c ---- linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rtlwifi/pci.c linux-2.6.3= 9.1/drivers/net/wireless/rtlwifi/pci.c +--- linux-2.6.39.1/drivers/net/wireless/rtlwifi/pci.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rtlwifi/pci.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -1869,7 +1869,7 @@ int rtl_pci_resume(struct pci_dev *pdev) } EXPORT_SYMBOL(rtl_pci_resume); @@ -36253,9 +36277,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rtlw= ifi/pci.c linux-2.6.39/drivers/ .adapter_start =3D rtl_pci_start, .adapter_stop =3D rtl_pci_stop, .adapter_tx =3D rtl_pci_tx, -diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h linux-2.6.39/= drivers/net/wireless/rtlwifi/pci.h ---- linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rtlwifi/pci.h linux-2.6.3= 9.1/drivers/net/wireless/rtlwifi/pci.h +--- linux-2.6.39.1/drivers/net/wireless/rtlwifi/pci.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rtlwifi/pci.h 2011-05-22 19:36:3= 2.000000000 -0400 @@ -234,7 +234,7 @@ struct rtl_pci_priv { =20 int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw); @@ -36265,9 +36289,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rtlw= ifi/pci.h linux-2.6.39/drivers/ =20 int __devinit rtl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id); -diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common= .c linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c ---- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011= -05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011= -05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_comm= on.c linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c +--- linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 20= 11-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 20= 11-05-22 19:36:32.000000000 -0400 @@ -827,6 +827,8 @@ static bool _rtl92c_phy_sw_chnl_step_by_ u8 rfpath; u8 num_total_rfpath =3D rtlphy->num_total_rfpath; @@ -36277,9 +36301,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rtlw= ifi/rtl8192c/phy_common.c linux precommoncmdcnt =3D 0; _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++, MAX_PRECMD_CNT, -diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c linu= x-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c ---- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-22 = 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c li= nux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +--- linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-2= 2 19:36:32.000000000 -0400 @@ -96,7 +96,7 @@ void rtl92c_deinit_sw_vars(struct ieee80 } } @@ -36298,9 +36322,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rtlw= ifi/rtl8192ce/sw.c linux-2.6.39 .name =3D "rtl92c_pci", .fw_name =3D "rtlwifi/rtl8192cfw.bin", .ops =3D &rtl8192ce_hal_ops, -diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c linu= x-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c ---- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-22 = 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c li= nux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +--- linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-2= 2 19:36:32.000000000 -0400 @@ -77,7 +77,7 @@ static void rtl92cu_deinit_sw_vars(struc } } @@ -36319,9 +36343,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rtlw= ifi/rtl8192cu/sw.c linux-2.6.39 .name =3D "rtl92c_usb", .fw_name =3D "rtlwifi/rtl8192cufw.bin", .ops =3D &rtl8192cu_hal_ops, -diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c linux-2.6.39/= drivers/net/wireless/rtlwifi/usb.c ---- linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rtlwifi/usb.c linux-2.6.3= 9.1/drivers/net/wireless/rtlwifi/usb.c +--- linux-2.6.39.1/drivers/net/wireless/rtlwifi/usb.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rtlwifi/usb.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -913,7 +913,7 @@ static bool rtl_usb_tx_chk_waitq_insert( return false; } @@ -36331,9 +36355,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rtlw= ifi/usb.c linux-2.6.39/drivers/ .adapter_start =3D rtl_usb_start, .adapter_stop =3D rtl_usb_stop, .adapter_tx =3D rtl_usb_tx, -diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h linux-2.6.39= /drivers/net/wireless/rtlwifi/wifi.h ---- linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/rtlwifi/wifi.h linux-2.6.= 39.1/drivers/net/wireless/rtlwifi/wifi.h +--- linux-2.6.39.1/drivers/net/wireless/rtlwifi/wifi.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/rtlwifi/wifi.h 2011-05-22 19:36:= 32.000000000 -0400 @@ -1447,7 +1447,7 @@ struct rtl_hal_cfg { u8 bar_id; char *name; @@ -36352,9 +36376,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/rtlw= ifi/wifi.h linux-2.6.39/drivers =20 /*this var will be set by set_bit, and was used to indicate status of -diff -urNp linux-2.6.39/drivers/net/wireless/wl12xx/spi.c linux-2.6.39/d= rivers/net/wireless/wl12xx/spi.c ---- linux-2.6.39/drivers/net/wireless/wl12xx/spi.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/net/wireless/wl12xx/spi.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/wireless/wl12xx/spi.c linux-2.6.39= .1/drivers/net/wireless/wl12xx/spi.c +--- linux-2.6.39.1/drivers/net/wireless/wl12xx/spi.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/net/wireless/wl12xx/spi.c 2011-05-22 19:36:32= .000000000 -0400 @@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct=20 u32 chunk_len; int i; @@ -36364,9 +36388,9 @@ diff -urNp linux-2.6.39/drivers/net/wireless/wl12= xx/spi.c linux-2.6.39/drivers/n WARN_ON(len > WL1271_AGGR_BUFFER_SIZE); =20 spi_message_init(&m); -diff -urNp linux-2.6.39/drivers/net/xen-netback/interface.c linux-2.6.39= /drivers/net/xen-netback/interface.c ---- linux-2.6.39/drivers/net/xen-netback/interface.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/net/xen-netback/interface.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/xen-netback/interface.c linux-2.6.= 39.1/drivers/net/xen-netback/interface.c +--- linux-2.6.39.1/drivers/net/xen-netback/interface.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/net/xen-netback/interface.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -273,7 +273,7 @@ static void xenvif_get_strings(struct ne } } @@ -36376,9 +36400,9 @@ diff -urNp linux-2.6.39/drivers/net/xen-netback/i= nterface.c linux-2.6.39/drivers .get_tx_csum =3D ethtool_op_get_tx_csum, .set_tx_csum =3D xenvif_set_tx_csum, .get_sg =3D ethtool_op_get_sg, -diff -urNp linux-2.6.39/drivers/net/xilinx_emaclite.c linux-2.6.39/drive= rs/net/xilinx_emaclite.c ---- linux-2.6.39/drivers/net/xilinx_emaclite.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/net/xilinx_emaclite.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/net/xilinx_emaclite.c linux-2.6.39.1/d= rivers/net/xilinx_emaclite.c +--- linux-2.6.39.1/drivers/net/xilinx_emaclite.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/net/xilinx_emaclite.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1085,7 +1085,7 @@ static bool get_bool(struct platform_dev } } @@ -36397,9 +36421,9 @@ diff -urNp linux-2.6.39/drivers/net/xilinx_emacli= te.c linux-2.6.39/drivers/net/x .ndo_open =3D xemaclite_open, .ndo_stop =3D xemaclite_close, .ndo_start_xmit =3D xemaclite_send, -diff -urNp linux-2.6.39/drivers/nfc/pn544.c linux-2.6.39/drivers/nfc/pn5= 44.c ---- linux-2.6.39/drivers/nfc/pn544.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/nfc/pn544.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/nfc/pn544.c linux-2.6.39.1/drivers/nfc= /pn544.c +--- linux-2.6.39.1/drivers/nfc/pn544.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/nfc/pn544.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -89,7 +89,7 @@ static ssize_t pn544_test(struct device=20 =20 static int pn544_enable(struct pn544_info *info, int mode) @@ -36436,9 +36460,9 @@ diff -urNp linux-2.6.39/drivers/nfc/pn544.c linux= -2.6.39/drivers/nfc/pn544.c int r =3D 0; =20 dev_dbg(&client->dev, "%s\n", __func__); -diff -urNp linux-2.6.39/drivers/of/pdt.c linux-2.6.39/drivers/of/pdt.c ---- linux-2.6.39/drivers/of/pdt.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/of/pdt.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/of/pdt.c linux-2.6.39.1/drivers/of/pdt= .c +--- linux-2.6.39.1/drivers/of/pdt.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/of/pdt.c 2011-05-22 19:36:32.000000000 -0400 @@ -24,7 +24,7 @@ #include #include @@ -36448,9 +36472,9 @@ diff -urNp linux-2.6.39/drivers/of/pdt.c linux-2.= 6.39/drivers/of/pdt.c =20 void __initdata (*of_pdt_build_more)(struct device_node *dp, struct device_node ***nextp); -diff -urNp linux-2.6.39/drivers/oprofile/buffer_sync.c linux-2.6.39/driv= ers/oprofile/buffer_sync.c ---- linux-2.6.39/drivers/oprofile/buffer_sync.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/oprofile/buffer_sync.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/oprofile/buffer_sync.c linux-2.6.39.1/= drivers/oprofile/buffer_sync.c +--- linux-2.6.39.1/drivers/oprofile/buffer_sync.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/oprofile/buffer_sync.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *en if (cookie =3D=3D NO_COOKIE) offset =3D pc; @@ -36486,9 +36510,9 @@ diff -urNp linux-2.6.39/drivers/oprofile/buffer_s= ync.c linux-2.6.39/drivers/opro } } release_mm(mm); -diff -urNp linux-2.6.39/drivers/oprofile/event_buffer.c linux-2.6.39/dri= vers/oprofile/event_buffer.c ---- linux-2.6.39/drivers/oprofile/event_buffer.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/oprofile/event_buffer.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/oprofile/event_buffer.c linux-2.6.39.1= /drivers/oprofile/event_buffer.c +--- linux-2.6.39.1/drivers/oprofile/event_buffer.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/oprofile/event_buffer.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } =20 @@ -36498,9 +36522,9 @@ diff -urNp linux-2.6.39/drivers/oprofile/event_bu= ffer.c linux-2.6.39/drivers/opr return; } =20 -diff -urNp linux-2.6.39/drivers/oprofile/oprof.c linux-2.6.39/drivers/op= rofile/oprof.c ---- linux-2.6.39/drivers/oprofile/oprof.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/oprofile/oprof.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/oprofile/oprof.c linux-2.6.39.1/driver= s/oprofile/oprof.c +--- linux-2.6.39.1/drivers/oprofile/oprof.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/oprofile/oprof.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -36510,9 +36534,9 @@ diff -urNp linux-2.6.39/drivers/oprofile/oprof.c = linux-2.6.39/drivers/oprofile/o start_switch_worker(); } =20 -diff -urNp linux-2.6.39/drivers/oprofile/oprofilefs.c linux-2.6.39/drive= rs/oprofile/oprofilefs.c ---- linux-2.6.39/drivers/oprofile/oprofilefs.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/oprofile/oprofilefs.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/oprofile/oprofilefs.c linux-2.6.39.1/d= rivers/oprofile/oprofilefs.c +--- linux-2.6.39.1/drivers/oprofile/oprofilefs.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/oprofile/oprofilefs.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -186,7 +186,7 @@ static const struct file_operations atom =20 =20 @@ -36522,9 +36546,9 @@ diff -urNp linux-2.6.39/drivers/oprofile/oprofile= fs.c linux-2.6.39/drivers/oprof { return __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444, val); -diff -urNp linux-2.6.39/drivers/oprofile/oprofile_stats.c linux-2.6.39/d= rivers/oprofile/oprofile_stats.c ---- linux-2.6.39/drivers/oprofile/oprofile_stats.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/oprofile/oprofile_stats.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/oprofile/oprofile_stats.c linux-2.6.39= .1/drivers/oprofile/oprofile_stats.c +--- linux-2.6.39.1/drivers/oprofile/oprofile_stats.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/oprofile/oprofile_stats.c 2011-05-22 19:36:32= .000000000 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip =3D 0; } @@ -36542,9 +36566,9 @@ diff -urNp linux-2.6.39/drivers/oprofile/oprofile= _stats.c linux-2.6.39/drivers/o } =20 =20 -diff -urNp linux-2.6.39/drivers/oprofile/oprofile_stats.h linux-2.6.39/d= rivers/oprofile/oprofile_stats.h ---- linux-2.6.39/drivers/oprofile/oprofile_stats.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/oprofile/oprofile_stats.h 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/oprofile/oprofile_stats.h linux-2.6.39= .1/drivers/oprofile/oprofile_stats.h +--- linux-2.6.39.1/drivers/oprofile/oprofile_stats.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/oprofile/oprofile_stats.h 2011-05-22 19:36:32= .000000000 -0400 @@ -13,11 +13,11 @@ #include =20 @@ -36562,9 +36586,9 @@ diff -urNp linux-2.6.39/drivers/oprofile/oprofile= _stats.h linux-2.6.39/drivers/o }; =20 extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.39/drivers/parisc/dino.c linux-2.6.39/drivers/paris= c/dino.c ---- linux-2.6.39/drivers/parisc/dino.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/parisc/dino.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/parisc/dino.c linux-2.6.39.1/drivers/p= arisc/dino.c +--- linux-2.6.39.1/drivers/parisc/dino.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/parisc/dino.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -238,7 +238,7 @@ static int dino_cfg_write(struct pci_bus return 0; } @@ -36574,9 +36598,9 @@ diff -urNp linux-2.6.39/drivers/parisc/dino.c lin= ux-2.6.39/drivers/parisc/dino.c .read =3D dino_cfg_read, .write =3D dino_cfg_write, }; -diff -urNp linux-2.6.39/drivers/parisc/lba_pci.c linux-2.6.39/drivers/pa= risc/lba_pci.c ---- linux-2.6.39/drivers/parisc/lba_pci.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/parisc/lba_pci.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/parisc/lba_pci.c linux-2.6.39.1/driver= s/parisc/lba_pci.c +--- linux-2.6.39.1/drivers/parisc/lba_pci.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/parisc/lba_pci.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -468,7 +468,7 @@ static int elroy_cfg_write(struct pci_bu } =20 @@ -36604,9 +36628,9 @@ diff -urNp linux-2.6.39/drivers/parisc/lba_pci.c = linux-2.6.39/drivers/parisc/lba u32 func_class; void *tmp_obj; char *version; -diff -urNp linux-2.6.39/drivers/parport/procfs.c linux-2.6.39/drivers/pa= rport/procfs.c ---- linux-2.6.39/drivers/parport/procfs.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/parport/procfs.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/parport/procfs.c linux-2.6.39.1/driver= s/parport/procfs.c +--- linux-2.6.39.1/drivers/parport/procfs.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/parport/procfs.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t =20 *ppos +=3D len; @@ -36625,9 +36649,9 @@ diff -urNp linux-2.6.39/drivers/parport/procfs.c = linux-2.6.39/drivers/parport/pr } #endif /* IEEE1284.3 support. */ =20 -diff -urNp linux-2.6.39/drivers/pci/access.c linux-2.6.39/drivers/pci/ac= cess.c ---- linux-2.6.39/drivers/pci/access.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/pci/access.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/pci/access.c linux-2.6.39.1/drivers/pc= i/access.c +--- linux-2.6.39.1/drivers/pci/access.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/pci/access.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -74,9 +74,9 @@ EXPORT_SYMBOL(pci_bus_write_config_dword * * Return previous raw operations @@ -36640,9 +36664,9 @@ diff -urNp linux-2.6.39/drivers/pci/access.c linu= x-2.6.39/drivers/pci/access.c unsigned long flags; =20 raw_spin_lock_irqsave(&pci_lock, flags); -diff -urNp linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.39/= drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.3= 9.1/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.39.1/drivers/pci/hotplug/acpiphp_glue.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/pci/hotplug/acpiphp_glue.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif } =20 @@ -36652,9 +36676,9 @@ diff -urNp linux-2.6.39/drivers/pci/hotplug/acpip= hp_glue.c linux-2.6.39/drivers/ .handler =3D handle_hotplug_event_func, }; =20 -diff -urNp linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.39/= drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.3= 9.1/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.39.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ =20 void compaq_nvram_init (void __iomem *rom_start) @@ -36669,9 +36693,9 @@ diff -urNp linux-2.6.39/drivers/pci/hotplug/cpqph= p_nvram.c linux-2.6.39/drivers/ dbg("int15 entry =3D %p\n", compaq_int15_entry_point); =20 /* initialize our int15 lock */ -diff -urNp linux-2.6.39/drivers/pci/hotplug/shpchp.h linux-2.6.39/driver= s/pci/hotplug/shpchp.h ---- linux-2.6.39/drivers/pci/hotplug/shpchp.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/pci/hotplug/shpchp.h 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/hotplug/shpchp.h linux-2.6.39.1/dr= ivers/pci/hotplug/shpchp.h +--- linux-2.6.39.1/drivers/pci/hotplug/shpchp.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/pci/hotplug/shpchp.h 2011-05-22 19:36:32.0000= 00000 -0400 @@ -86,7 +86,7 @@ struct slot { u8 presence_save; u8 pwr_save; @@ -36690,9 +36714,9 @@ diff -urNp linux-2.6.39/drivers/pci/hotplug/shpch= p.h linux-2.6.39/drivers/pci/ho wait_queue_head_t queue; /* sleep & wake process */ u8 slot_device_offset; u32 pcix_misc2_reg; /* for amd pogo errata */ -diff -urNp linux-2.6.39/drivers/pci/hotplug/shpchp_hpc.c linux-2.6.39/dr= ivers/pci/hotplug/shpchp_hpc.c ---- linux-2.6.39/drivers/pci/hotplug/shpchp_hpc.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/pci/hotplug/shpchp_hpc.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/hotplug/shpchp_hpc.c linux-2.6.39.= 1/drivers/pci/hotplug/shpchp_hpc.c +--- linux-2.6.39.1/drivers/pci/hotplug/shpchp_hpc.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/pci/hotplug/shpchp_hpc.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -910,7 +910,7 @@ static int shpc_get_max_bus_speed(struct return retval; } @@ -36702,9 +36726,9 @@ diff -urNp linux-2.6.39/drivers/pci/hotplug/shpch= p_hpc.c linux-2.6.39/drivers/pc .power_on_slot =3D hpc_power_on_slot, .slot_enable =3D hpc_slot_enable, .slot_disable =3D hpc_slot_disable, -diff -urNp linux-2.6.39/drivers/pci/intel-iommu.c linux-2.6.39/drivers/p= ci/intel-iommu.c ---- linux-2.6.39/drivers/pci/intel-iommu.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/pci/intel-iommu.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/pci/intel-iommu.c linux-2.6.39.1/drive= rs/pci/intel-iommu.c +--- linux-2.6.39.1/drivers/pci/intel-iommu.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/pci/intel-iommu.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -391,7 +391,7 @@ static int intel_iommu_strict; static DEFINE_SPINLOCK(device_domain_lock); static LIST_HEAD(device_domain_list); @@ -36732,9 +36756,9 @@ diff -urNp linux-2.6.39/drivers/pci/intel-iommu.c= linux-2.6.39/drivers/pci/intel .domain_init =3D intel_iommu_domain_init, .domain_destroy =3D intel_iommu_domain_destroy, .attach_dev =3D intel_iommu_attach_device, -diff -urNp linux-2.6.39/drivers/pci/pci-acpi.c linux-2.6.39/drivers/pci/= pci-acpi.c ---- linux-2.6.39/drivers/pci/pci-acpi.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/pci/pci-acpi.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/pci/pci-acpi.c linux-2.6.39.1/drivers/= pci/pci-acpi.c +--- linux-2.6.39.1/drivers/pci/pci-acpi.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/pci/pci-acpi.c 2011-05-22 19:36:32.000000000 = -0400 @@ -332,7 +332,7 @@ static int acpi_pci_run_wake(struct pci_ return 0; } @@ -36744,9 +36768,9 @@ diff -urNp linux-2.6.39/drivers/pci/pci-acpi.c li= nux-2.6.39/drivers/pci/pci-acpi .is_manageable =3D acpi_pci_power_manageable, .set_state =3D acpi_pci_set_power_state, .choose_state =3D acpi_pci_choose_state, -diff -urNp linux-2.6.39/drivers/pci/pci.c linux-2.6.39/drivers/pci/pci.c ---- linux-2.6.39/drivers/pci/pci.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/pci/pci.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/pci.c linux-2.6.39.1/drivers/pci/p= ci.c +--- linux-2.6.39.1/drivers/pci/pci.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/pci/pci.c 2011-05-22 19:36:32.000000000 -0400 @@ -480,9 +480,9 @@ pci_restore_bars(struct pci_dev *dev) pci_update_resource(dev, i); } @@ -36759,9 +36783,9 @@ diff -urNp linux-2.6.39/drivers/pci/pci.c linux-2= .6.39/drivers/pci/pci.c { if (!ops->is_manageable || !ops->set_state || !ops->choose_state || !ops->sleep_wake || !ops->can_wakeup) -diff -urNp linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.39/= drivers/pci/pcie/aer/aerdrv_core.c ---- linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.3= 9.1/drivers/pci/pcie/aer/aerdrv_core.c +--- linux-2.6.39.1/drivers/pci/pcie/aer/aerdrv_core.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/pci/pcie/aer/aerdrv_core.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -239,7 +239,7 @@ static bool find_source_device(struct pc static int report_error_detected(struct pci_dev *dev, void *data) { @@ -36798,9 +36822,9 @@ diff -urNp linux-2.6.39/drivers/pci/pcie/aer/aerd= rv_core.c linux-2.6.39/drivers/ =20 dev->error_state =3D pci_channel_io_normal; =20 -diff -urNp linux-2.6.39/drivers/pci/pcie/aer/aer_inject.c linux-2.6.39/d= rivers/pci/pcie/aer/aer_inject.c ---- linux-2.6.39/drivers/pci/pcie/aer/aer_inject.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/pci/pcie/aer/aer_inject.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/pcie/aer/aer_inject.c linux-2.6.39= .1/drivers/pci/pcie/aer/aer_inject.c +--- linux-2.6.39.1/drivers/pci/pcie/aer/aer_inject.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/pci/pcie/aer/aer_inject.c 2011-05-22 19:36:32= .000000000 -0400 @@ -64,7 +64,7 @@ struct aer_error { struct pci_bus_ops { struct list_head list; @@ -36855,9 +36879,9 @@ diff -urNp linux-2.6.39/drivers/pci/pcie/aer/aer_= inject.c linux-2.6.39/drivers/p struct pci_bus_ops *bus_ops; unsigned long flags; =20 -diff -urNp linux-2.6.39/drivers/pci/pcie/aspm.c linux-2.6.39/drivers/pci= /pcie/aspm.c ---- linux-2.6.39/drivers/pci/pcie/aspm.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/pci/pcie/aspm.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/pci/pcie/aspm.c linux-2.6.39.1/drivers= /pci/pcie/aspm.c +--- linux-2.6.39.1/drivers/pci/pcie/aspm.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/pci/pcie/aspm.c 2011-05-22 19:36:32.000000000= -0400 @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." =20 @@ -36871,9 +36895,9 @@ diff -urNp linux-2.6.39/drivers/pci/pcie/aspm.c l= inux-2.6.39/drivers/pci/pcie/as #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) =20 -diff -urNp linux-2.6.39/drivers/pci/pci.h linux-2.6.39/drivers/pci/pci.h ---- linux-2.6.39/drivers/pci/pci.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/pci/pci.h 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/pci.h linux-2.6.39.1/drivers/pci/p= ci.h +--- linux-2.6.39.1/drivers/pci/pci.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/pci/pci.h 2011-05-22 19:36:32.000000000 -0400 @@ -65,7 +65,7 @@ struct pci_platform_pm_ops { int (*run_wake)(struct pci_dev *dev, bool enable); }; @@ -36883,9 +36907,9 @@ diff -urNp linux-2.6.39/drivers/pci/pci.h linux-2= .6.39/drivers/pci/pci.h extern void pci_update_current_state(struct pci_dev *dev, pci_power_t s= tate); extern void pci_disable_enabled_device(struct pci_dev *dev); extern int pci_finish_runtime_suspend(struct pci_dev *dev); -diff -urNp linux-2.6.39/drivers/pci/probe.c linux-2.6.39/drivers/pci/pro= be.c ---- linux-2.6.39/drivers/pci/probe.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/pci/probe.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/probe.c linux-2.6.39.1/drivers/pci= /probe.c +--- linux-2.6.39.1/drivers/pci/probe.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/pci/probe.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -36930,9 +36954,9 @@ diff -urNp linux-2.6.39/drivers/pci/probe.c linux= -2.6.39/drivers/pci/probe.c { struct pci_bus *b; =20 -diff -urNp linux-2.6.39/drivers/pci/proc.c linux-2.6.39/drivers/pci/proc= .c ---- linux-2.6.39/drivers/pci/proc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/pci/proc.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/proc.c linux-2.6.39.1/drivers/pci/= proc.c +--- linux-2.6.39.1/drivers/pci/proc.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/pci/proc.c 2011-05-22 19:41:37.000000000 -040= 0 @@ -476,7 +476,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -36950,9 +36974,9 @@ diff -urNp linux-2.6.39/drivers/pci/proc.c linux-= 2.6.39/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized =3D 1; -diff -urNp linux-2.6.39/drivers/pci/xen-pcifront.c linux-2.6.39/drivers/= pci/xen-pcifront.c ---- linux-2.6.39/drivers/pci/xen-pcifront.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/pci/xen-pcifront.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/pci/xen-pcifront.c linux-2.6.39.1/driv= ers/pci/xen-pcifront.c +--- linux-2.6.39.1/drivers/pci/xen-pcifront.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/pci/xen-pcifront.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_ struct pcifront_sd *sd =3D bus->sysdata; struct pcifront_device *pdev =3D pcifront_get_pdev(sd); @@ -37016,9 +37040,9 @@ diff -urNp linux-2.6.39/drivers/pci/xen-pcifront.= c linux-2.6.39/drivers/pci/xen- .enable_msi =3D pci_frontend_enable_msi, .disable_msi =3D pci_frontend_disable_msi, .enable_msix =3D pci_frontend_enable_msix, -diff -urNp linux-2.6.39/drivers/pcmcia/at91_cf.c linux-2.6.39/drivers/pc= mcia/at91_cf.c ---- linux-2.6.39/drivers/pcmcia/at91_cf.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/pcmcia/at91_cf.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/at91_cf.c linux-2.6.39.1/driver= s/pcmcia/at91_cf.c +--- linux-2.6.39.1/drivers/pcmcia/at91_cf.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/at91_cf.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -203,7 +203,7 @@ at91_cf_set_mem_map(struct pcmcia_socket return 0; } @@ -37028,9 +37052,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/at91_cf.c = linux-2.6.39/drivers/pcmcia/at9 .init =3D at91_cf_ss_init, .suspend =3D at91_cf_ss_suspend, .get_status =3D at91_cf_get_status, -diff -urNp linux-2.6.39/drivers/pcmcia/bfin_cf_pcmcia.c linux-2.6.39/dri= vers/pcmcia/bfin_cf_pcmcia.c ---- linux-2.6.39/drivers/pcmcia/bfin_cf_pcmcia.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/pcmcia/bfin_cf_pcmcia.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/bfin_cf_pcmcia.c linux-2.6.39.1= /drivers/pcmcia/bfin_cf_pcmcia.c +--- linux-2.6.39.1/drivers/pcmcia/bfin_cf_pcmcia.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/bfin_cf_pcmcia.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -184,7 +184,7 @@ bfin_cf_set_mem_map(struct pcmcia_socket return 0; } @@ -37040,9 +37064,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/bfin_cf_pc= mcia.c linux-2.6.39/drivers/pcm .init =3D bfin_cf_ss_init, .suspend =3D bfin_cf_ss_suspend, .get_status =3D bfin_cf_get_status, -diff -urNp linux-2.6.39/drivers/pcmcia/db1xxx_ss.c linux-2.6.39/drivers/= pcmcia/db1xxx_ss.c ---- linux-2.6.39/drivers/pcmcia/db1xxx_ss.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/pcmcia/db1xxx_ss.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/db1xxx_ss.c linux-2.6.39.1/driv= ers/pcmcia/db1xxx_ss.c +--- linux-2.6.39.1/drivers/pcmcia/db1xxx_ss.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/db1xxx_ss.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -384,7 +384,7 @@ static int au1x00_pcmcia_set_mem_map(str return 0; } @@ -37052,9 +37076,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/db1xxx_ss.= c linux-2.6.39/drivers/pcmcia/d .init =3D db1x_pcmcia_sock_init, .suspend =3D db1x_pcmcia_sock_suspend, .get_status =3D db1x_pcmcia_get_status, -diff -urNp linux-2.6.39/drivers/pcmcia/electra_cf.c linux-2.6.39/drivers= /pcmcia/electra_cf.c ---- linux-2.6.39/drivers/pcmcia/electra_cf.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/pcmcia/electra_cf.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/electra_cf.c linux-2.6.39.1/dri= vers/pcmcia/electra_cf.c +--- linux-2.6.39.1/drivers/pcmcia/electra_cf.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/electra_cf.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -173,7 +173,7 @@ static int electra_cf_set_mem_map(struct return 0; } @@ -37064,9 +37088,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/electra_cf= .c linux-2.6.39/drivers/pcmcia/ .init =3D electra_cf_ss_init, .get_status =3D electra_cf_get_status, .set_socket =3D electra_cf_set_socket, -diff -urNp linux-2.6.39/drivers/pcmcia/m32r_cfc.c linux-2.6.39/drivers/p= cmcia/m32r_cfc.c ---- linux-2.6.39/drivers/pcmcia/m32r_cfc.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/pcmcia/m32r_cfc.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/m32r_cfc.c linux-2.6.39.1/drive= rs/pcmcia/m32r_cfc.c +--- linux-2.6.39.1/drivers/pcmcia/m32r_cfc.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/m32r_cfc.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -674,7 +674,7 @@ static int pcc_init(struct pcmcia_socket return 0; } @@ -37076,9 +37100,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/m32r_cfc.c= linux-2.6.39/drivers/pcmcia/m3 .init =3D pcc_init, .get_status =3D pcc_get_status, .set_socket =3D pcc_set_socket, -diff -urNp linux-2.6.39/drivers/pcmcia/m32r_pcc.c linux-2.6.39/drivers/p= cmcia/m32r_pcc.c ---- linux-2.6.39/drivers/pcmcia/m32r_pcc.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/pcmcia/m32r_pcc.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/m32r_pcc.c linux-2.6.39.1/drive= rs/pcmcia/m32r_pcc.c +--- linux-2.6.39.1/drivers/pcmcia/m32r_pcc.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/m32r_pcc.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -652,7 +652,7 @@ static int pcc_init(struct pcmcia_socket return 0; } @@ -37088,9 +37112,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/m32r_pcc.c= linux-2.6.39/drivers/pcmcia/m3 .init =3D pcc_init, .get_status =3D pcc_get_status, .set_socket =3D pcc_set_socket, -diff -urNp linux-2.6.39/drivers/pcmcia/m8xx_pcmcia.c linux-2.6.39/driver= s/pcmcia/m8xx_pcmcia.c ---- linux-2.6.39/drivers/pcmcia/m8xx_pcmcia.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/pcmcia/m8xx_pcmcia.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/m8xx_pcmcia.c linux-2.6.39.1/dr= ivers/pcmcia/m8xx_pcmcia.c +--- linux-2.6.39.1/drivers/pcmcia/m8xx_pcmcia.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/m8xx_pcmcia.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -1139,7 +1139,7 @@ static int m8xx_sock_suspend(struct pcmc return m8xx_set_socket(sock, &dead_socket); } @@ -37100,9 +37124,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/m8xx_pcmci= a.c linux-2.6.39/drivers/pcmcia .init =3D m8xx_sock_init, .suspend =3D m8xx_sock_suspend, .get_status =3D m8xx_get_status, -diff -urNp linux-2.6.39/drivers/pcmcia/omap_cf.c linux-2.6.39/drivers/pc= mcia/omap_cf.c ---- linux-2.6.39/drivers/pcmcia/omap_cf.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/pcmcia/omap_cf.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/omap_cf.c linux-2.6.39.1/driver= s/pcmcia/omap_cf.c +--- linux-2.6.39.1/drivers/pcmcia/omap_cf.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/omap_cf.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -185,7 +185,7 @@ omap_cf_set_mem_map(struct pcmcia_socket return 0; } @@ -37112,9 +37136,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/omap_cf.c = linux-2.6.39/drivers/pcmcia/oma .init =3D omap_cf_ss_init, .suspend =3D omap_cf_ss_suspend, .get_status =3D omap_cf_get_status, -diff -urNp linux-2.6.39/drivers/pcmcia/rsrc_iodyn.c linux-2.6.39/drivers= /pcmcia/rsrc_iodyn.c ---- linux-2.6.39/drivers/pcmcia/rsrc_iodyn.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/pcmcia/rsrc_iodyn.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/rsrc_iodyn.c linux-2.6.39.1/dri= vers/pcmcia/rsrc_iodyn.c +--- linux-2.6.39.1/drivers/pcmcia/rsrc_iodyn.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/rsrc_iodyn.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -161,7 +161,7 @@ static int iodyn_find_io(struct pcmcia_s } =20 @@ -37124,9 +37148,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/rsrc_iodyn= .c linux-2.6.39/drivers/pcmcia/ .validate_mem =3D NULL, .find_io =3D iodyn_find_io, .find_mem =3D NULL, -diff -urNp linux-2.6.39/drivers/pcmcia/rsrc_mgr.c linux-2.6.39/drivers/p= cmcia/rsrc_mgr.c ---- linux-2.6.39/drivers/pcmcia/rsrc_mgr.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/pcmcia/rsrc_mgr.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/rsrc_mgr.c linux-2.6.39.1/drive= rs/pcmcia/rsrc_mgr.c +--- linux-2.6.39.1/drivers/pcmcia/rsrc_mgr.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/rsrc_mgr.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -57,7 +57,7 @@ static int static_find_io(struct pcmcia_ } =20 @@ -37136,9 +37160,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/rsrc_mgr.c= linux-2.6.39/drivers/pcmcia/rs .validate_mem =3D NULL, .find_io =3D static_find_io, .find_mem =3D NULL, -diff -urNp linux-2.6.39/drivers/pcmcia/vrc4171_card.c linux-2.6.39/drive= rs/pcmcia/vrc4171_card.c ---- linux-2.6.39/drivers/pcmcia/vrc4171_card.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/pcmcia/vrc4171_card.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/vrc4171_card.c linux-2.6.39.1/d= rivers/pcmcia/vrc4171_card.c +--- linux-2.6.39.1/drivers/pcmcia/vrc4171_card.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/vrc4171_card.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -479,7 +479,7 @@ static int pccard_set_mem_map(struct pcm return 0; } @@ -37148,9 +37172,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/vrc4171_ca= rd.c linux-2.6.39/drivers/pcmci .init =3D pccard_init, .get_status =3D pccard_get_status, .set_socket =3D pccard_set_socket, -diff -urNp linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c linux-2.6.39/driv= ers/pcmcia/vrc4173_cardu.c ---- linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/vrc4173_cardu.c linux-2.6.39.1/= drivers/pcmcia/vrc4173_cardu.c +--- linux-2.6.39.1/drivers/pcmcia/vrc4173_cardu.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/vrc4173_cardu.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -384,7 +384,7 @@ static void cardu_proc_setup(unsigned in { } @@ -37160,9 +37184,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/vrc4173_ca= rdu.c linux-2.6.39/drivers/pcmc .init =3D cardu_init, .register_callback =3D cardu_register_callback, .inquire_socket =3D cardu_inquire_socket, -diff -urNp linux-2.6.39/drivers/pcmcia/xxs1500_ss.c linux-2.6.39/drivers= /pcmcia/xxs1500_ss.c ---- linux-2.6.39/drivers/pcmcia/xxs1500_ss.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/pcmcia/xxs1500_ss.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/pcmcia/xxs1500_ss.c linux-2.6.39.1/dri= vers/pcmcia/xxs1500_ss.c +--- linux-2.6.39.1/drivers/pcmcia/xxs1500_ss.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/pcmcia/xxs1500_ss.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -196,7 +196,7 @@ static int au1x00_pcmcia_set_mem_map(str return 0; } @@ -37172,9 +37196,9 @@ diff -urNp linux-2.6.39/drivers/pcmcia/xxs1500_ss= .c linux-2.6.39/drivers/pcmcia/ .init =3D xxs1500_pcmcia_sock_init, .suspend =3D xxs1500_pcmcia_sock_suspend, .get_status =3D xxs1500_pcmcia_get_status, -diff -urNp linux-2.6.39/drivers/platform/x86/acerhdf.c linux-2.6.39/driv= ers/platform/x86/acerhdf.c ---- linux-2.6.39/drivers/platform/x86/acerhdf.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/platform/x86/acerhdf.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/platform/x86/acerhdf.c linux-2.6.39.1/= drivers/platform/x86/acerhdf.c +--- linux-2.6.39.1/drivers/platform/x86/acerhdf.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/platform/x86/acerhdf.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -406,7 +406,7 @@ static int acerhdf_get_crit_temp(struct=20 } =20 @@ -37193,9 +37217,9 @@ diff -urNp linux-2.6.39/drivers/platform/x86/acer= hdf.c linux-2.6.39/drivers/plat .get_max_state =3D acerhdf_get_max_state, .get_cur_state =3D acerhdf_get_cur_state, .set_cur_state =3D acerhdf_set_cur_state, -diff -urNp linux-2.6.39/drivers/platform/x86/ideapad-laptop.c linux-2.6.= 39/drivers/platform/x86/ideapad-laptop.c ---- linux-2.6.39/drivers/platform/x86/ideapad-laptop.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/platform/x86/ideapad-laptop.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/platform/x86/ideapad-laptop.c linux-2.= 6.39.1/drivers/platform/x86/ideapad-laptop.c +--- linux-2.6.39.1/drivers/platform/x86/ideapad-laptop.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/platform/x86/ideapad-laptop.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -207,7 +207,7 @@ static int ideapad_rfk_set(void *data, b return write_ec_cmd(ideapad_handle, opcode, !blocked); } @@ -37205,9 +37229,9 @@ diff -urNp linux-2.6.39/drivers/platform/x86/idea= pad-laptop.c linux-2.6.39/drive .set_block =3D ideapad_rfk_set, }; =20 -diff -urNp linux-2.6.39/drivers/platform/x86/intel_menlow.c linux-2.6.39= /drivers/platform/x86/intel_menlow.c ---- linux-2.6.39/drivers/platform/x86/intel_menlow.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/platform/x86/intel_menlow.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/platform/x86/intel_menlow.c linux-2.6.= 39.1/drivers/platform/x86/intel_menlow.c +--- linux-2.6.39.1/drivers/platform/x86/intel_menlow.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/platform/x86/intel_menlow.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -143,7 +143,7 @@ static int memory_set_cur_bandwidth(stru return 0; } @@ -37217,9 +37241,9 @@ diff -urNp linux-2.6.39/drivers/platform/x86/inte= l_menlow.c linux-2.6.39/drivers .get_max_state =3D memory_get_max_bandwidth, .get_cur_state =3D memory_get_cur_bandwidth, .set_cur_state =3D memory_set_cur_bandwidth, -diff -urNp linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c linux-2= .6.39/drivers/platform/x86/intel_mid_thermal.c ---- linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/platform/x86/intel_mid_thermal.c linux= -2.6.39.1/drivers/platform/x86/intel_mid_thermal.c +--- linux-2.6.39.1/drivers/platform/x86/intel_mid_thermal.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/platform/x86/intel_mid_thermal.c 2011-05-22 1= 9:36:32.000000000 -0400 @@ -458,7 +458,7 @@ static int read_curr_temp(struct thermal } =20 @@ -37229,9 +37253,9 @@ diff -urNp linux-2.6.39/drivers/platform/x86/inte= l_mid_thermal.c linux-2.6.39/dr .get_temp =3D read_curr_temp, }; =20 -diff -urNp linux-2.6.39/drivers/platform/x86/samsung-laptop.c linux-2.6.= 39/drivers/platform/x86/samsung-laptop.c ---- linux-2.6.39/drivers/platform/x86/samsung-laptop.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/platform/x86/samsung-laptop.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/platform/x86/samsung-laptop.c linux-2.= 6.39.1/drivers/platform/x86/samsung-laptop.c +--- linux-2.6.39.1/drivers/platform/x86/samsung-laptop.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/platform/x86/samsung-laptop.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -419,7 +419,7 @@ static int rfkill_set(void *data, bool b return 0; } @@ -37241,9 +37265,9 @@ diff -urNp linux-2.6.39/drivers/platform/x86/sams= ung-laptop.c linux-2.6.39/drive .set_block =3D rfkill_set, }; =20 -diff -urNp linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c linux-2.6.39/dri= vers/pnp/pnpbios/bioscalls.c ---- linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.39.1= /drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.39.1/drivers/pnp/pnpbios/bioscalls.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/pnp/pnpbios/bioscalls.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -59,7 +59,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -37300,9 +37324,9 @@ diff -urNp linux-2.6.39/drivers/pnp/pnpbios/biosc= alls.c linux-2.6.39/drivers/pnp + + pax_close_kernel(); } -diff -urNp linux-2.6.39/drivers/pnp/resource.c linux-2.6.39/drivers/pnp/= resource.c ---- linux-2.6.39/drivers/pnp/resource.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/pnp/resource.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/pnp/resource.c linux-2.6.39.1/drivers/= pnp/resource.c +--- linux-2.6.39.1/drivers/pnp/resource.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/pnp/resource.c 2011-05-22 19:36:32.000000000 = -0400 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; =20 @@ -37321,9 +37345,9 @@ diff -urNp linux-2.6.39/drivers/pnp/resource.c li= nux-2.6.39/drivers/pnp/resource return 0; =20 /* check if the resource is reserved */ -diff -urNp linux-2.6.39/drivers/power/max8925_power.c linux-2.6.39/drive= rs/power/max8925_power.c ---- linux-2.6.39/drivers/power/max8925_power.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/power/max8925_power.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/power/max8925_power.c linux-2.6.39.1/d= rivers/power/max8925_power.c +--- linux-2.6.39.1/drivers/power/max8925_power.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/power/max8925_power.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -426,7 +426,7 @@ static __devinit int max8925_power_probe { struct max8925_chip *chip =3D dev_get_drvdata(pdev->dev.parent); @@ -37333,9 +37357,9 @@ diff -urNp linux-2.6.39/drivers/power/max8925_pow= er.c linux-2.6.39/drivers/power struct max8925_power_info *info; int ret; =20 -diff -urNp linux-2.6.39/drivers/regulator/core.c linux-2.6.39/drivers/re= gulator/core.c ---- linux-2.6.39/drivers/regulator/core.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/regulator/core.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/regulator/core.c linux-2.6.39.1/driver= s/regulator/core.c +--- linux-2.6.39.1/drivers/regulator/core.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/regulator/core.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -2883,7 +2883,7 @@ core_initcall(regulator_init); static int __init regulator_init_complete(void) { @@ -37345,9 +37369,9 @@ diff -urNp linux-2.6.39/drivers/regulator/core.c = linux-2.6.39/drivers/regulator/ struct regulation_constraints *c; int enabled, ret; =20 -diff -urNp linux-2.6.39/drivers/rtc/rtc-at32ap700x.c linux-2.6.39/driver= s/rtc/rtc-at32ap700x.c ---- linux-2.6.39/drivers/rtc/rtc-at32ap700x.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/rtc/rtc-at32ap700x.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-at32ap700x.c linux-2.6.39.1/dr= ivers/rtc/rtc-at32ap700x.c +--- linux-2.6.39.1/drivers/rtc/rtc-at32ap700x.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-at32ap700x.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -187,7 +187,7 @@ static irqreturn_t at32_rtc_interrupt(in return ret; } @@ -37357,9 +37381,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-at32ap700= x.c linux-2.6.39/drivers/rtc/rt .read_time =3D at32_rtc_readtime, .set_time =3D at32_rtc_settime, .read_alarm =3D at32_rtc_readalarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-au1xxx.c linux-2.6.39/drivers/rt= c/rtc-au1xxx.c ---- linux-2.6.39/drivers/rtc/rtc-au1xxx.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/rtc/rtc-au1xxx.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-au1xxx.c linux-2.6.39.1/driver= s/rtc/rtc-au1xxx.c +--- linux-2.6.39.1/drivers/rtc/rtc-au1xxx.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-au1xxx.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -57,7 +57,7 @@ static int au1xtoy_rtc_set_time(struct d return 0; } @@ -37369,9 +37393,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-au1xxx.c = linux-2.6.39/drivers/rtc/rtc-au .read_time =3D au1xtoy_rtc_read_time, .set_time =3D au1xtoy_rtc_set_time, }; -diff -urNp linux-2.6.39/drivers/rtc/rtc-bfin.c linux-2.6.39/drivers/rtc/= rtc-bfin.c ---- linux-2.6.39/drivers/rtc/rtc-bfin.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/rtc/rtc-bfin.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-bfin.c linux-2.6.39.1/drivers/= rtc/rtc-bfin.c +--- linux-2.6.39.1/drivers/rtc/rtc-bfin.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-bfin.c 2011-05-22 19:36:32.000000000 = -0400 @@ -333,7 +333,7 @@ static int bfin_rtc_proc(struct device * #undef yesno } @@ -37381,9 +37405,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-bfin.c li= nux-2.6.39/drivers/rtc/rtc-bfin .read_time =3D bfin_rtc_read_time, .set_time =3D bfin_rtc_set_time, .read_alarm =3D bfin_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-coh901331.c linux-2.6.39/drivers= /rtc/rtc-coh901331.c ---- linux-2.6.39/drivers/rtc/rtc-coh901331.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/rtc/rtc-coh901331.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-coh901331.c linux-2.6.39.1/dri= vers/rtc/rtc-coh901331.c +--- linux-2.6.39.1/drivers/rtc/rtc-coh901331.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-coh901331.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -142,7 +142,7 @@ static int coh901331_alarm_irq_enable(st return 0; } @@ -37393,9 +37417,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-coh901331= .c linux-2.6.39/drivers/rtc/rtc .read_time =3D coh901331_read_time, .set_mmss =3D coh901331_set_mmss, .read_alarm =3D coh901331_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-davinci.c linux-2.6.39/drivers/r= tc/rtc-davinci.c ---- linux-2.6.39/drivers/rtc/rtc-davinci.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/rtc/rtc-davinci.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-davinci.c linux-2.6.39.1/drive= rs/rtc/rtc-davinci.c +--- linux-2.6.39.1/drivers/rtc/rtc-davinci.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-davinci.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -469,7 +469,7 @@ static int davinci_rtc_set_alarm(struct=20 return 0; } @@ -37405,9 +37429,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-davinci.c= linux-2.6.39/drivers/rtc/rtc-d .ioctl =3D davinci_rtc_ioctl, .read_time =3D davinci_rtc_read_time, .set_time =3D davinci_rtc_set_time, -diff -urNp linux-2.6.39/drivers/rtc/rtc-dev.c linux-2.6.39/drivers/rtc/r= tc-dev.c ---- linux-2.6.39/drivers/rtc/rtc-dev.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/rtc/rtc-dev.c 2011-05-22 19:41:37.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-dev.c linux-2.6.39.1/drivers/r= tc/rtc-dev.c +--- linux-2.6.39.1/drivers/rtc/rtc-dev.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-dev.c 2011-05-22 19:41:37.000000000 -= 0400 @@ -14,6 +14,7 @@ #include #include @@ -37425,9 +37449,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-dev.c lin= ux-2.6.39/drivers/rtc/rtc-dev.c return rtc_set_time(rtc, &tm); =20 case RTC_PIE_ON: -diff -urNp linux-2.6.39/drivers/rtc/rtc-dm355evm.c linux-2.6.39/drivers/= rtc/rtc-dm355evm.c ---- linux-2.6.39/drivers/rtc/rtc-dm355evm.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/rtc/rtc-dm355evm.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-dm355evm.c linux-2.6.39.1/driv= ers/rtc/rtc-dm355evm.c +--- linux-2.6.39.1/drivers/rtc/rtc-dm355evm.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-dm355evm.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -115,7 +115,7 @@ static int dm355evm_rtc_set_time(struct=20 return 0; } @@ -37437,9 +37461,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-dm355evm.= c linux-2.6.39/drivers/rtc/rtc- .read_time =3D dm355evm_rtc_read_time, .set_time =3D dm355evm_rtc_set_time, }; -diff -urNp linux-2.6.39/drivers/rtc/rtc-ds1302.c linux-2.6.39/drivers/rt= c/rtc-ds1302.c ---- linux-2.6.39/drivers/rtc/rtc-ds1302.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/rtc/rtc-ds1302.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-ds1302.c linux-2.6.39.1/driver= s/rtc/rtc-ds1302.c +--- linux-2.6.39.1/drivers/rtc/rtc-ds1302.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-ds1302.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -199,7 +199,7 @@ static int ds1302_rtc_ioctl(struct devic return -ENOIOCTLCMD; } @@ -37449,9 +37473,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-ds1302.c = linux-2.6.39/drivers/rtc/rtc-ds .read_time =3D ds1302_rtc_read_time, .set_time =3D ds1302_rtc_set_time, .ioctl =3D ds1302_rtc_ioctl, -diff -urNp linux-2.6.39/drivers/rtc/rtc-imxdi.c linux-2.6.39/drivers/rtc= /rtc-imxdi.c ---- linux-2.6.39/drivers/rtc/rtc-imxdi.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/rtc/rtc-imxdi.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-imxdi.c linux-2.6.39.1/drivers= /rtc/rtc-imxdi.c +--- linux-2.6.39.1/drivers/rtc/rtc-imxdi.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-imxdi.c 2011-05-22 19:36:32.000000000= -0400 @@ -290,7 +290,7 @@ static int dryice_rtc_set_alarm(struct d return 0; } @@ -37461,9 +37485,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-imxdi.c l= inux-2.6.39/drivers/rtc/rtc-imx .read_time =3D dryice_rtc_read_time, .set_mmss =3D dryice_rtc_set_mmss, .alarm_irq_enable =3D dryice_rtc_alarm_irq_enable, -diff -urNp linux-2.6.39/drivers/rtc/rtc-jz4740.c linux-2.6.39/drivers/rt= c/rtc-jz4740.c ---- linux-2.6.39/drivers/rtc/rtc-jz4740.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/rtc/rtc-jz4740.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-jz4740.c linux-2.6.39.1/driver= s/rtc/rtc-jz4740.c +--- linux-2.6.39.1/drivers/rtc/rtc-jz4740.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-jz4740.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -174,7 +174,7 @@ static int jz4740_rtc_alarm_irq_enable(s return jz4740_rtc_ctrl_set_bits(rtc, JZ_RTC_CTRL_AF_IRQ, enable); } @@ -37473,9 +37497,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-jz4740.c = linux-2.6.39/drivers/rtc/rtc-jz .read_time =3D jz4740_rtc_read_time, .set_mmss =3D jz4740_rtc_set_mmss, .read_alarm =3D jz4740_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-m41t80.c linux-2.6.39/drivers/rt= c/rtc-m41t80.c ---- linux-2.6.39/drivers/rtc/rtc-m41t80.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/rtc/rtc-m41t80.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-m41t80.c linux-2.6.39.1/driver= s/rtc/rtc-m41t80.c +--- linux-2.6.39.1/drivers/rtc/rtc-m41t80.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-m41t80.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -354,7 +354,7 @@ static int m41t80_rtc_read_alarm(struct=20 return 0; } @@ -37485,9 +37509,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-m41t80.c = linux-2.6.39/drivers/rtc/rtc-m4 .read_time =3D m41t80_rtc_read_time, .set_time =3D m41t80_rtc_set_time, .read_alarm =3D m41t80_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-mxc.c linux-2.6.39/drivers/rtc/r= tc-mxc.c ---- linux-2.6.39/drivers/rtc/rtc-mxc.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/rtc/rtc-mxc.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-mxc.c linux-2.6.39.1/drivers/r= tc/rtc-mxc.c +--- linux-2.6.39.1/drivers/rtc/rtc-mxc.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-mxc.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -355,7 +355,7 @@ static int mxc_rtc_set_alarm(struct devi } =20 @@ -37497,9 +37521,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-mxc.c lin= ux-2.6.39/drivers/rtc/rtc-mxc.c .release =3D mxc_rtc_release, .read_time =3D mxc_rtc_read_time, .set_mmss =3D mxc_rtc_set_mmss, -diff -urNp linux-2.6.39/drivers/rtc/rtc-nuc900.c linux-2.6.39/drivers/rt= c/rtc-nuc900.c ---- linux-2.6.39/drivers/rtc/rtc-nuc900.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/rtc/rtc-nuc900.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-nuc900.c linux-2.6.39.1/driver= s/rtc/rtc-nuc900.c +--- linux-2.6.39.1/drivers/rtc/rtc-nuc900.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-nuc900.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -214,7 +214,7 @@ static int nuc900_rtc_set_alarm(struct d return 0; } @@ -37509,9 +37533,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-nuc900.c = linux-2.6.39/drivers/rtc/rtc-nu .read_time =3D nuc900_rtc_read_time, .set_time =3D nuc900_rtc_set_time, .read_alarm =3D nuc900_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-omap.c linux-2.6.39/drivers/rtc/= rtc-omap.c ---- linux-2.6.39/drivers/rtc/rtc-omap.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/rtc/rtc-omap.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-omap.c linux-2.6.39.1/drivers/= rtc/rtc-omap.c +--- linux-2.6.39.1/drivers/rtc/rtc-omap.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-omap.c 2011-05-22 19:36:32.000000000 = -0400 @@ -274,7 +274,7 @@ static int omap_rtc_set_alarm(struct dev return 0; } @@ -37521,9 +37545,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-omap.c li= nux-2.6.39/drivers/rtc/rtc-omap .read_time =3D omap_rtc_read_time, .set_time =3D omap_rtc_set_time, .read_alarm =3D omap_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-pcf50633.c linux-2.6.39/drivers/= rtc/rtc-pcf50633.c ---- linux-2.6.39/drivers/rtc/rtc-pcf50633.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/rtc/rtc-pcf50633.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-pcf50633.c linux-2.6.39.1/driv= ers/rtc/rtc-pcf50633.c +--- linux-2.6.39.1/drivers/rtc/rtc-pcf50633.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-pcf50633.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -238,7 +238,7 @@ static int pcf50633_rtc_set_alarm(struct return ret; } @@ -37533,9 +37557,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-pcf50633.= c linux-2.6.39/drivers/rtc/rtc- .read_time =3D pcf50633_rtc_read_time, .set_time =3D pcf50633_rtc_set_time, .read_alarm =3D pcf50633_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-pl031.c linux-2.6.39/drivers/rtc= /rtc-pl031.c ---- linux-2.6.39/drivers/rtc/rtc-pl031.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/rtc/rtc-pl031.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-pl031.c linux-2.6.39.1/drivers= /rtc/rtc-pl031.c +--- linux-2.6.39.1/drivers/rtc/rtc-pl031.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-pl031.c 2011-05-22 19:36:32.000000000= -0400 @@ -374,7 +374,7 @@ err_req: } =20 @@ -37563,9 +37587,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-pl031.c l= inux-2.6.39/drivers/rtc/rtc-pl0 .read_time =3D pl031_stv2_read_time, .set_time =3D pl031_stv2_set_time, .read_alarm =3D pl031_stv2_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-rx8025.c linux-2.6.39/drivers/rt= c/rtc-rx8025.c ---- linux-2.6.39/drivers/rtc/rtc-rx8025.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/rtc/rtc-rx8025.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-rx8025.c linux-2.6.39.1/driver= s/rtc/rtc-rx8025.c +--- linux-2.6.39.1/drivers/rtc/rtc-rx8025.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-rx8025.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -424,7 +424,7 @@ static int rx8025_alarm_irq_enable(struc return 0; } @@ -37575,9 +37599,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-rx8025.c = linux-2.6.39/drivers/rtc/rtc-rx .read_time =3D rx8025_get_time, .set_time =3D rx8025_set_time, .read_alarm =3D rx8025_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-sh.c linux-2.6.39/drivers/rtc/rt= c-sh.c ---- linux-2.6.39/drivers/rtc/rtc-sh.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/rtc/rtc-sh.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-sh.c linux-2.6.39.1/drivers/rt= c/rtc-sh.c +--- linux-2.6.39.1/drivers/rtc/rtc-sh.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/rtc/rtc-sh.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -576,7 +576,7 @@ static int sh_rtc_set_alarm(struct devic return 0; } @@ -37587,9 +37611,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-sh.c linu= x-2.6.39/drivers/rtc/rtc-sh.c .read_time =3D sh_rtc_read_time, .set_time =3D sh_rtc_set_time, .read_alarm =3D sh_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-stmp3xxx.c linux-2.6.39/drivers/= rtc/rtc-stmp3xxx.c ---- linux-2.6.39/drivers/rtc/rtc-stmp3xxx.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/rtc/rtc-stmp3xxx.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-stmp3xxx.c linux-2.6.39.1/driv= ers/rtc/rtc-stmp3xxx.c +--- linux-2.6.39.1/drivers/rtc/rtc-stmp3xxx.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-stmp3xxx.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -133,7 +133,7 @@ static int stmp3xxx_rtc_set_alarm(struct return 0; } @@ -37599,9 +37623,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-stmp3xxx.= c linux-2.6.39/drivers/rtc/rtc- .alarm_irq_enable =3D stmp3xxx_alarm_irq_enable, .read_time =3D stmp3xxx_rtc_gettime, -diff -urNp linux-2.6.39/drivers/rtc/rtc-tegra.c linux-2.6.39/drivers/rtc= /rtc-tegra.c ---- linux-2.6.39/drivers/rtc/rtc-tegra.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/rtc/rtc-tegra.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-tegra.c linux-2.6.39.1/drivers= /rtc/rtc-tegra.c +--- linux-2.6.39.1/drivers/rtc/rtc-tegra.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-tegra.c 2011-05-22 19:36:32.000000000= -0400 @@ -294,7 +294,7 @@ static irqreturn_t tegra_rtc_irq_handler return IRQ_HANDLED; } @@ -37611,9 +37635,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-tegra.c l= inux-2.6.39/drivers/rtc/rtc-teg .read_time =3D tegra_rtc_read_time, .set_time =3D tegra_rtc_set_time, .read_alarm =3D tegra_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-twl.c linux-2.6.39/drivers/rtc/r= tc-twl.c ---- linux-2.6.39/drivers/rtc/rtc-twl.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/rtc/rtc-twl.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-twl.c linux-2.6.39.1/drivers/r= tc/rtc-twl.c +--- linux-2.6.39.1/drivers/rtc/rtc-twl.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-twl.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -415,7 +415,7 @@ out: return ret; } @@ -37623,9 +37647,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-twl.c lin= ux-2.6.39/drivers/rtc/rtc-twl.c .read_time =3D twl_rtc_read_time, .set_time =3D twl_rtc_set_time, .read_alarm =3D twl_rtc_read_alarm, -diff -urNp linux-2.6.39/drivers/rtc/rtc-v3020.c linux-2.6.39/drivers/rtc= /rtc-v3020.c ---- linux-2.6.39/drivers/rtc/rtc-v3020.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/rtc/rtc-v3020.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/rtc/rtc-v3020.c linux-2.6.39.1/drivers= /rtc/rtc-v3020.c +--- linux-2.6.39.1/drivers/rtc/rtc-v3020.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/rtc/rtc-v3020.c 2011-05-22 19:36:32.000000000= -0400 @@ -62,7 +62,7 @@ struct v3020 { /* GPIO access */ struct v3020_gpio *gpio; @@ -37653,9 +37677,9 @@ diff -urNp linux-2.6.39/drivers/rtc/rtc-v3020.c l= inux-2.6.39/drivers/rtc/rtc-v30 .map_io =3D v3020_gpio_map, .unmap_io =3D v3020_gpio_unmap, .read_bit =3D v3020_gpio_read_bit, -diff -urNp linux-2.6.39/drivers/s390/char/con3270.c linux-2.6.39/drivers= /s390/char/con3270.c ---- linux-2.6.39/drivers/s390/char/con3270.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/s390/char/con3270.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/char/con3270.c linux-2.6.39.1/dri= vers/s390/char/con3270.c +--- linux-2.6.39.1/drivers/s390/char/con3270.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/s390/char/con3270.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -28,7 +28,7 @@ #define CON3270_OUTPUT_BUFFER_SIZE 1024 #define CON3270_STRING_PAGES 4 @@ -37674,9 +37698,9 @@ diff -urNp linux-2.6.39/drivers/s390/char/con3270= .c linux-2.6.39/drivers/s390/ch .activate =3D con3270_activate, .deactivate =3D con3270_deactivate, .intv =3D (void *) con3270_irq -diff -urNp linux-2.6.39/drivers/s390/char/fs3270.c linux-2.6.39/drivers/= s390/char/fs3270.c ---- linux-2.6.39/drivers/s390/char/fs3270.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/s390/char/fs3270.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/char/fs3270.c linux-2.6.39.1/driv= ers/s390/char/fs3270.c +--- linux-2.6.39.1/drivers/s390/char/fs3270.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/s390/char/fs3270.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -24,7 +24,7 @@ #include "raw3270.h" #include "ctrlchar.h" @@ -37695,9 +37719,9 @@ diff -urNp linux-2.6.39/drivers/s390/char/fs3270.= c linux-2.6.39/drivers/s390/cha .activate =3D fs3270_activate, .deactivate =3D fs3270_deactivate, .intv =3D (void *) fs3270_irq, -diff -urNp linux-2.6.39/drivers/s390/char/raw3270.c linux-2.6.39/drivers= /s390/char/raw3270.c ---- linux-2.6.39/drivers/s390/char/raw3270.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/s390/char/raw3270.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/char/raw3270.c linux-2.6.39.1/dri= vers/s390/char/raw3270.c +--- linux-2.6.39.1/drivers/s390/char/raw3270.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/s390/char/raw3270.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -488,7 +488,7 @@ raw3270_init_irq(struct raw3270_view *vi return RAW3270_IO_DONE; } @@ -37707,9 +37731,9 @@ diff -urNp linux-2.6.39/drivers/s390/char/raw3270= .c linux-2.6.39/drivers/s390/ch .intv =3D raw3270_init_irq }; =20 -diff -urNp linux-2.6.39/drivers/s390/char/tty3270.c linux-2.6.39/drivers= /s390/char/tty3270.c ---- linux-2.6.39/drivers/s390/char/tty3270.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/s390/char/tty3270.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/char/tty3270.c linux-2.6.39.1/dri= vers/s390/char/tty3270.c +--- linux-2.6.39.1/drivers/s390/char/tty3270.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/s390/char/tty3270.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -37,7 +37,7 @@ struct tty_driver *tty3270_driver; static int tty3270_max_index; @@ -37728,9 +37752,9 @@ diff -urNp linux-2.6.39/drivers/s390/char/tty3270= .c linux-2.6.39/drivers/s390/ch .activate =3D tty3270_activate, .deactivate =3D tty3270_deactivate, .intv =3D (void *) tty3270_irq, -diff -urNp linux-2.6.39/drivers/s390/cio/qdio_debug.c linux-2.6.39/drive= rs/s390/cio/qdio_debug.c ---- linux-2.6.39/drivers/s390/cio/qdio_debug.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/s390/cio/qdio_debug.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/cio/qdio_debug.c linux-2.6.39.1/d= rivers/s390/cio/qdio_debug.c +--- linux-2.6.39.1/drivers/s390/cio/qdio_debug.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/s390/cio/qdio_debug.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode * filp->f_path.dentry->d_inode->i_private); } @@ -37740,9 +37764,9 @@ diff -urNp linux-2.6.39/drivers/s390/cio/qdio_deb= ug.c linux-2.6.39/drivers/s390/ .owner =3D THIS_MODULE, .open =3D qperf_seq_open, .read =3D seq_read, -diff -urNp linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c linux-2.6.39/= drivers/s390/crypto/zcrypt_cex2a.c ---- linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/crypto/zcrypt_cex2a.c linux-2.6.3= 9.1/drivers/s390/crypto/zcrypt_cex2a.c +--- linux-2.6.39.1/drivers/s390/crypto/zcrypt_cex2a.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/s390/crypto/zcrypt_cex2a.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -415,7 +415,7 @@ out_free: /** * The crypto operations for a CEX2A card. @@ -37752,9 +37776,9 @@ diff -urNp linux-2.6.39/drivers/s390/crypto/zcryp= t_cex2a.c linux-2.6.39/drivers/ .rsa_modexpo =3D zcrypt_cex2a_modexpo, .rsa_modexpo_crt =3D zcrypt_cex2a_modexpo_crt, }; -diff -urNp linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c linux-2.6.39/= drivers/s390/crypto/zcrypt_pcica.c ---- linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcica.c linux-2.6.3= 9.1/drivers/s390/crypto/zcrypt_pcica.c +--- linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcica.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcica.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -347,7 +347,7 @@ out_free: /** * The crypto operations for a PCICA card. @@ -37764,9 +37788,9 @@ diff -urNp linux-2.6.39/drivers/s390/crypto/zcryp= t_pcica.c linux-2.6.39/drivers/ .rsa_modexpo =3D zcrypt_pcica_modexpo, .rsa_modexpo_crt =3D zcrypt_pcica_modexpo_crt, }; -diff -urNp linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c linux-2.6.39/= drivers/s390/crypto/zcrypt_pcicc.c ---- linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcicc.c linux-2.6.3= 9.1/drivers/s390/crypto/zcrypt_pcicc.c +--- linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcicc.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcicc.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -553,7 +553,7 @@ out_free: /** * The crypto operations for a PCICC card. @@ -37776,9 +37800,9 @@ diff -urNp linux-2.6.39/drivers/s390/crypto/zcryp= t_pcicc.c linux-2.6.39/drivers/ .rsa_modexpo =3D zcrypt_pcicc_modexpo, .rsa_modexpo_crt =3D zcrypt_pcicc_modexpo_crt, }; -diff -urNp linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c linux-2.6.39= /drivers/s390/crypto/zcrypt_pcixcc.c ---- linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcixcc.c linux-2.6.= 39.1/drivers/s390/crypto/zcrypt_pcixcc.c +--- linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcixcc.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/s390/crypto/zcrypt_pcixcc.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -851,13 +851,13 @@ static long zcrypt_pcixcc_rng(struct zcr /** * The crypto operations for a PCIXCC/CEX2C card. @@ -37795,9 +37819,9 @@ diff -urNp linux-2.6.39/drivers/s390/crypto/zcryp= t_pcixcc.c linux-2.6.39/drivers .rsa_modexpo =3D zcrypt_pcixcc_modexpo, .rsa_modexpo_crt =3D zcrypt_pcixcc_modexpo_crt, .send_cprb =3D zcrypt_pcixcc_send_cprb, -diff -urNp linux-2.6.39/drivers/s390/kvm/kvm_virtio.c linux-2.6.39/drive= rs/s390/kvm/kvm_virtio.c ---- linux-2.6.39/drivers/s390/kvm/kvm_virtio.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/s390/kvm/kvm_virtio.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/kvm/kvm_virtio.c linux-2.6.39.1/d= rivers/s390/kvm/kvm_virtio.c +--- linux-2.6.39.1/drivers/s390/kvm/kvm_virtio.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/s390/kvm/kvm_virtio.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -266,7 +266,7 @@ error: /* * The config ops structure as defined by virtio config @@ -37807,9 +37831,9 @@ diff -urNp linux-2.6.39/drivers/s390/kvm/kvm_virt= io.c linux-2.6.39/drivers/s390/ .get_features =3D kvm_get_features, .finalize_features =3D kvm_finalize_features, .get =3D kvm_get, -diff -urNp linux-2.6.39/drivers/s390/net/qeth_core.h linux-2.6.39/driver= s/s390/net/qeth_core.h ---- linux-2.6.39/drivers/s390/net/qeth_core.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/s390/net/qeth_core.h 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/s390/net/qeth_core.h linux-2.6.39.1/dr= ivers/s390/net/qeth_core.h +--- linux-2.6.39.1/drivers/s390/net/qeth_core.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/s390/net/qeth_core.h 2011-05-22 19:36:32.0000= 00000 -0400 @@ -743,7 +743,7 @@ struct qeth_card { struct qeth_qdio_info qdio; struct qeth_perf_stats perf_stats; @@ -37819,9 +37843,9 @@ diff -urNp linux-2.6.39/drivers/s390/net/qeth_cor= e.h linux-2.6.39/drivers/s390/n struct qeth_discipline discipline; atomic_t force_alloc_skb; struct service_level qeth_service_level; -diff -urNp linux-2.6.39/drivers/scsi/53c700.c linux-2.6.39/drivers/scsi/= 53c700.c ---- linux-2.6.39/drivers/scsi/53c700.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/scsi/53c700.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/scsi/53c700.c linux-2.6.39.1/drivers/s= csi/53c700.c +--- linux-2.6.39.1/drivers/scsi/53c700.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/scsi/53c700.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -2153,7 +2153,7 @@ EXPORT_SYMBOL(NCR_700_detect); EXPORT_SYMBOL(NCR_700_release); EXPORT_SYMBOL(NCR_700_intr); @@ -37831,9 +37855,9 @@ diff -urNp linux-2.6.39/drivers/scsi/53c700.c lin= ux-2.6.39/drivers/scsi/53c700.c .set_period =3D NCR_700_set_period, .show_period =3D 1, .set_offset =3D NCR_700_set_offset, -diff -urNp linux-2.6.39/drivers/scsi/aacraid/commctrl.c linux-2.6.39/dri= vers/scsi/aacraid/commctrl.c ---- linux-2.6.39/drivers/scsi/aacraid/commctrl.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/scsi/aacraid/commctrl.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/aacraid/commctrl.c linux-2.6.39.1= /drivers/scsi/aacraid/commctrl.c +--- linux-2.6.39.1/drivers/scsi/aacraid/commctrl.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/aacraid/commctrl.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d u32 actual_fibsize64, actual_fibsize =3D 0; int i; @@ -37842,9 +37866,9 @@ diff -urNp linux-2.6.39/drivers/scsi/aacraid/comm= ctrl.c linux-2.6.39/drivers/scs =20 if (dev->in_reset) { dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n")); -diff -urNp linux-2.6.39/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.39= /drivers/scsi/aic94xx/aic94xx_init.c ---- linux-2.6.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-05-22 19:41:37= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.= 39.1/drivers/scsi/aic94xx/aic94xx_init.c +--- linux-2.6.39.1/drivers/scsi/aic94xx/aic94xx_init.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/aic94xx/aic94xx_init.c 2011-05-22 19:41:= 37.000000000 -0400 @@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru flash_error_table[i].reason); } @@ -37854,9 +37878,9 @@ diff -urNp linux-2.6.39/drivers/scsi/aic94xx/aic9= 4xx_init.c linux-2.6.39/drivers asd_show_update_bios, asd_store_update_bios); =20 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) -diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_core.c linux-2.6.39/drivers= /scsi/bfa/bfa_core.c ---- linux-2.6.39/drivers/scsi/bfa/bfa_core.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/scsi/bfa/bfa_core.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/bfa/bfa_core.c linux-2.6.39.1/dri= vers/scsi/bfa/bfa_core.c +--- linux-2.6.39.1/drivers/scsi/bfa/bfa_core.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/scsi/bfa/bfa_core.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -24,7 +24,7 @@ BFA_TRC_FILE(HAL, CORE); /* * BFA module list terminated by NULL @@ -37866,9 +37890,9 @@ diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_core= .c linux-2.6.39/drivers/scsi/bf &hal_mod_sgpg, &hal_mod_fcport, &hal_mod_fcxp, -diff -urNp linux-2.6.39/drivers/scsi/bfa/bfad.c linux-2.6.39/drivers/scs= i/bfa/bfad.c ---- linux-2.6.39/drivers/scsi/bfa/bfad.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/scsi/bfa/bfad.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/scsi/bfa/bfad.c linux-2.6.39.1/drivers= /scsi/bfa/bfad.c +--- linux-2.6.39.1/drivers/scsi/bfa/bfad.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/scsi/bfa/bfad.c 2011-05-22 19:36:32.000000000= -0400 @@ -1027,6 +1027,8 @@ bfad_start_ops(struct bfad_s *bfad) { struct bfad_vport_s *vport, *vport_new; struct bfa_fcs_driver_info_s driver_info; @@ -37878,9 +37902,9 @@ diff -urNp linux-2.6.39/drivers/scsi/bfa/bfad.c l= inux-2.6.39/drivers/scsi/bfa/bf /* Fill the driver_info info to fcs*/ memset(&driver_info, 0, sizeof(driver_info)); strncpy(driver_info.version, BFAD_DRIVER_VERSION, -diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c linux-2.6.39/drivers/= scsi/bfa/bfa_fcs.c ---- linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs.c linux-2.6.39.1/driv= ers/scsi/bfa/bfa_fcs.c +--- linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -70,7 +70,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, st bfa_boolean_t min_cfg) { @@ -37908,9 +37932,9 @@ diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs.= c linux-2.6.39/drivers/scsi/bfa int nmods, i; =20 bfa_wc_init(&fcs->wc, bfa_fcs_exit_comp, fcs); -diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.39/dr= ivers/scsi/bfa/bfa_fcs_lport.c ---- linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.39.= 1/drivers/scsi/bfa/bfa_fcs_lport.c +--- linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc u16 len, count; u16 templen; @@ -37929,9 +37953,9 @@ diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs_= lport.c linux-2.6.39/drivers/sc /* * get port attributes */ -diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.39/dr= ivers/scsi/bfa/bfa_fcs_rport.c ---- linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.39.= 1/drivers/scsi/bfa/bfa_fcs_rport.c +--- linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc struct fc_rpsc_speed_info_s speeds; struct bfa_port_attr_s pport_attr; @@ -37941,9 +37965,9 @@ diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs_= rport.c linux-2.6.39/drivers/sc bfa_trc(port->fcs, rx_fchs->s_id); bfa_trc(port->fcs, rx_fchs->d_id); =20 -diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_modules.h linux-2.6.39/driv= ers/scsi/bfa/bfa_modules.h ---- linux-2.6.39/drivers/scsi/bfa/bfa_modules.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/scsi/bfa/bfa_modules.h 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/bfa/bfa_modules.h linux-2.6.39.1/= drivers/scsi/bfa/bfa_modules.h +--- linux-2.6.39.1/drivers/scsi/bfa/bfa_modules.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/bfa/bfa_modules.h 2011-05-22 19:36:32.00= 0000000 -0400 @@ -68,8 +68,8 @@ enum { static void bfa_ ## __mod ## _stop(struct bfa_s *bfa); \ static void bfa_ ## __mod ## _iocdisable(struct bfa_s *bfa); \ @@ -37975,9 +37999,9 @@ diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_modu= les.h linux-2.6.39/drivers/scsi +extern const struct bfa_module_s hal_mod_fcpim; =20 #endif /* __BFA_MODULES_H__ */ -diff -urNp linux-2.6.39/drivers/scsi/BusLogic.c linux-2.6.39/drivers/scs= i/BusLogic.c ---- linux-2.6.39/drivers/scsi/BusLogic.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/scsi/BusLogic.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/scsi/BusLogic.c linux-2.6.39.1/drivers= /scsi/BusLogic.c +--- linux-2.6.39.1/drivers/scsi/BusLogic.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/scsi/BusLogic.c 2011-05-22 19:36:32.000000000= -0400 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_Hos= tAdapter *PrototypeHostAdapter) @@ -37987,9 +38011,9 @@ diff -urNp linux-2.6.39/drivers/scsi/BusLogic.c l= inux-2.6.39/drivers/scsi/BusLog /* If a PCI BIOS is present, interrogate it for MultiMaster and FlashP= oint Host Adapters; otherwise, default to the standard ISA MultiMaster p= robe. -diff -urNp linux-2.6.39/drivers/scsi/dpt_i2o.c linux-2.6.39/drivers/scsi= /dpt_i2o.c ---- linux-2.6.39/drivers/scsi/dpt_i2o.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/scsi/dpt_i2o.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/scsi/dpt_i2o.c linux-2.6.39.1/drivers/= scsi/dpt_i2o.c +--- linux-2.6.39.1/drivers/scsi/dpt_i2o.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/scsi/dpt_i2o.c 2011-05-22 19:36:32.000000000 = -0400 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p dma_addr_t addr; ulong flags =3D 0; @@ -38008,9 +38032,9 @@ diff -urNp linux-2.6.39/drivers/scsi/dpt_i2o.c li= nux-2.6.39/drivers/scsi/dpt_i2o memset(msg, 0 , sizeof(msg)); len =3D scsi_bufflen(cmd); direction =3D 0x00000000;=09 -diff -urNp linux-2.6.39/drivers/scsi/eata.c linux-2.6.39/drivers/scsi/ea= ta.c ---- linux-2.6.39/drivers/scsi/eata.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/eata.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/eata.c linux-2.6.39.1/drivers/scs= i/eata.c +--- linux-2.6.39.1/drivers/scsi/eata.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/scsi/eata.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por struct hostdata *ha; char name[16]; @@ -38020,9 +38044,9 @@ diff -urNp linux-2.6.39/drivers/scsi/eata.c linux= -2.6.39/drivers/scsi/eata.c sprintf(name, "%s%d", driver_name, j); =20 if (!request_region(port_base, REGION_SIZE, driver_name)) { -diff -urNp linux-2.6.39/drivers/scsi/esp_scsi.c linux-2.6.39/drivers/scs= i/esp_scsi.c ---- linux-2.6.39/drivers/scsi/esp_scsi.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/scsi/esp_scsi.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/scsi/esp_scsi.c linux-2.6.39.1/drivers= /scsi/esp_scsi.c +--- linux-2.6.39.1/drivers/scsi/esp_scsi.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/scsi/esp_scsi.c 2011-05-22 19:36:32.000000000= -0400 @@ -2680,7 +2680,7 @@ static void esp_set_width(struct scsi_ta tp->flags |=3D ESP_TGT_CHECK_NEGO; } @@ -38032,9 +38056,9 @@ diff -urNp linux-2.6.39/drivers/scsi/esp_scsi.c l= inux-2.6.39/drivers/scsi/esp_sc .set_offset =3D esp_set_offset, .show_offset =3D 1, .set_period =3D esp_set_period, -diff -urNp linux-2.6.39/drivers/scsi/fcoe/fcoe.c linux-2.6.39/drivers/sc= si/fcoe/fcoe.c ---- linux-2.6.39/drivers/scsi/fcoe/fcoe.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/scsi/fcoe/fcoe.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/fcoe/fcoe.c linux-2.6.39.1/driver= s/scsi/fcoe/fcoe.c +--- linux-2.6.39.1/drivers/scsi/fcoe/fcoe.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/scsi/fcoe/fcoe.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -138,7 +138,7 @@ static int fcoe_vport_disable(struct fc_ static void fcoe_set_vport_symbolic_name(struct fc_vport *); static void fcoe_set_port_id(struct fc_lport *, u32, struct fc_frame *)= ; @@ -38044,9 +38068,9 @@ diff -urNp linux-2.6.39/drivers/scsi/fcoe/fcoe.c = linux-2.6.39/drivers/scsi/fcoe/ .frame_send =3D fcoe_xmit, .ddp_setup =3D fcoe_ddp_setup, .ddp_done =3D fcoe_ddp_done, -diff -urNp linux-2.6.39/drivers/scsi/fcoe/fcoe_ctlr.c linux-2.6.39/drive= rs/scsi/fcoe/fcoe_ctlr.c ---- linux-2.6.39/drivers/scsi/fcoe/fcoe_ctlr.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/fcoe/fcoe_ctlr.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/fcoe/fcoe_ctlr.c linux-2.6.39.1/d= rivers/scsi/fcoe/fcoe_ctlr.c +--- linux-2.6.39.1/drivers/scsi/fcoe/fcoe_ctlr.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/fcoe/fcoe_ctlr.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1912,7 +1912,7 @@ static void fcoe_ctlr_vn_rport_callback( mutex_unlock(&fip->ctlr_mutex); } @@ -38065,9 +38089,9 @@ diff -urNp linux-2.6.39/drivers/scsi/fcoe/fcoe_ct= lr.c linux-2.6.39/drivers/scsi/ fiph =3D (struct fip_header *)skb->data; sub =3D fiph->fip_subcode; =20 -diff -urNp linux-2.6.39/drivers/scsi/fnic/fnic_main.c linux-2.6.39/drive= rs/scsi/fnic/fnic_main.c ---- linux-2.6.39/drivers/scsi/fnic/fnic_main.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/fnic/fnic_main.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/fnic/fnic_main.c linux-2.6.39.1/d= rivers/scsi/fnic/fnic_main.c +--- linux-2.6.39.1/drivers/scsi/fnic/fnic_main.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/fnic/fnic_main.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -69,7 +69,7 @@ module_param(fnic_log_level, int, S_IRUG MODULE_PARM_DESC(fnic_log_level, "bit mask of fnic logging levels"); =20 @@ -38077,9 +38101,9 @@ diff -urNp linux-2.6.39/drivers/scsi/fnic/fnic_ma= in.c linux-2.6.39/drivers/scsi/ .frame_send =3D fnic_send, .lport_set_port_id =3D fnic_set_port_id, .fcp_abort_io =3D fnic_empty_scsi_cleanup, -diff -urNp linux-2.6.39/drivers/scsi/gdth.c linux-2.6.39/drivers/scsi/gd= th.c ---- linux-2.6.39/drivers/scsi/gdth.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/gdth.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/gdth.c linux-2.6.39.1/drivers/scs= i/gdth.c +--- linux-2.6.39.1/drivers/scsi/gdth.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/scsi/gdth.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg) unsigned long flags; gdth_ha_str *ha; @@ -38117,9 +38141,9 @@ diff -urNp linux-2.6.39/drivers/scsi/gdth.c linux= -2.6.39/drivers/scsi/gdth.c memset(cmnd, 0xff, MAX_COMMAND_SIZE); =20 TRACE2(("gdth_flush() hanum %d\n", ha->hanum)); -diff -urNp linux-2.6.39/drivers/scsi/gdth_proc.c linux-2.6.39/drivers/sc= si/gdth_proc.c ---- linux-2.6.39/drivers/scsi/gdth_proc.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/scsi/gdth_proc.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/gdth_proc.c linux-2.6.39.1/driver= s/scsi/gdth_proc.c +--- linux-2.6.39.1/drivers/scsi/gdth_proc.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/scsi/gdth_proc.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi u64 paddr; =20 @@ -38139,9 +38163,9 @@ diff -urNp linux-2.6.39/drivers/scsi/gdth_proc.c = linux-2.6.39/drivers/scsi/gdth_ gdtcmd =3D kmalloc(sizeof(*gdtcmd), GFP_KERNEL); estr =3D kmalloc(sizeof(*estr), GFP_KERNEL); if (!gdtcmd || !estr) -diff -urNp linux-2.6.39/drivers/scsi/hosts.c linux-2.6.39/drivers/scsi/h= osts.c ---- linux-2.6.39/drivers/scsi/hosts.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/scsi/hosts.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/scsi/hosts.c linux-2.6.39.1/drivers/sc= si/hosts.c +--- linux-2.6.39.1/drivers/scsi/hosts.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/scsi/hosts.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -42,7 +42,7 @@ #include "scsi_logging.h" =20 @@ -38160,9 +38184,9 @@ diff -urNp linux-2.6.39/drivers/scsi/hosts.c linu= x-2.6.39/drivers/scsi/hosts.c shost->dma_channel =3D 0xff; =20 /* These three are default values which can be overridden */ -diff -urNp linux-2.6.39/drivers/scsi/hpsa.h linux-2.6.39/drivers/scsi/hp= sa.h ---- linux-2.6.39/drivers/scsi/hpsa.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/hpsa.h 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/hpsa.h linux-2.6.39.1/drivers/scs= i/hpsa.h +--- linux-2.6.39.1/drivers/scsi/hpsa.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/scsi/hpsa.h 2011-05-22 19:36:32.000000000 -04= 00 @@ -347,7 +347,7 @@ static struct access_method SA5_access =3D SA5_completed, }; @@ -38172,9 +38196,9 @@ diff -urNp linux-2.6.39/drivers/scsi/hpsa.h linux= -2.6.39/drivers/scsi/hpsa.h SA5_submit_command, SA5_performant_intr_mask, SA5_fifo_full, -diff -urNp linux-2.6.39/drivers/scsi/hptiop.c linux-2.6.39/drivers/scsi/= hptiop.c ---- linux-2.6.39/drivers/scsi/hptiop.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/scsi/hptiop.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/scsi/hptiop.c linux-2.6.39.1/drivers/s= csi/hptiop.c +--- linux-2.6.39.1/drivers/scsi/hptiop.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/scsi/hptiop.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -1226,7 +1226,7 @@ static void hptiop_remove(struct pci_dev scsi_host_put(host); } @@ -38193,9 +38217,9 @@ diff -urNp linux-2.6.39/drivers/scsi/hptiop.c lin= ux-2.6.39/drivers/scsi/hptiop.c .iop_wait_ready =3D iop_wait_ready_mv, .internal_memalloc =3D hptiop_internal_memalloc_mv, .internal_memfree =3D hptiop_internal_memfree_mv, -diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibmvfc.c linux-2.6.39/driv= ers/scsi/ibmvscsi/ibmvfc.c ---- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvfc.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/scsi/ibmvscsi/ibmvfc.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvfc.c linux-2.6.39.1/= drivers/scsi/ibmvscsi/ibmvfc.c +--- linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvfc.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvfc.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -4881,7 +4881,7 @@ static struct vio_device_id ibmvfc_devic }; MODULE_DEVICE_TABLE(vio, ibmvfc_device_table); @@ -38205,9 +38229,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibm= vfc.c linux-2.6.39/drivers/scsi .resume =3D ibmvfc_resume }; =20 -diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c linux-2.6.39/dr= ivers/scsi/ibmvscsi/ibmvscsi.c ---- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvscsi.c linux-2.6.39.= 1/drivers/scsi/ibmvscsi/ibmvscsi.c +--- linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -104,7 +104,7 @@ static struct scsi_transport_template *i =20 #define IBMVSCSI_VERSION "1.5.9" @@ -38235,9 +38259,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibm= vscsi.c linux-2.6.39/drivers/sc }; =20 int __init ibmvscsi_module_init(void) -diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h linux-2.6.39/dr= ivers/scsi/ibmvscsi/ibmvscsi.h ---- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvscsi.h linux-2.6.39.= 1/drivers/scsi/ibmvscsi/ibmvscsi.h +--- linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvscsi.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvscsi.h 2011-05-22 19:36:32.= 000000000 -0400 @@ -127,7 +127,7 @@ struct ibmvscsi_ops { int (*resume) (struct ibmvscsi_host_data *hostdata); }; @@ -38248,9 +38272,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibm= vscsi.h linux-2.6.39/drivers/sc +extern const struct ibmvscsi_ops rpavscsi_ops; =20 #endif /* IBMVSCSI_H */ -diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c linux-2.6.39/dr= ivers/scsi/ibmvscsi/ibmvstgt.c ---- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvstgt.c linux-2.6.39.= 1/drivers/scsi/ibmvscsi/ibmvstgt.c +--- linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvstgt.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/ibmvscsi/ibmvstgt.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -951,7 +951,7 @@ static int get_system_info(void) return 0; } @@ -38260,9 +38284,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibm= vstgt.c linux-2.6.39/drivers/sc .tsk_mgmt_response =3D ibmvstgt_tsk_mgmt_response, .it_nexus_response =3D ibmvstgt_it_nexus_response, }; -diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c linux-2.6.= 39/drivers/scsi/ibmvscsi/iseries_vscsi.c ---- linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ibmvscsi/iseries_vscsi.c linux-2.= 6.39.1/drivers/scsi/ibmvscsi/iseries_vscsi.c +--- linux-2.6.39.1/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -163,7 +163,7 @@ static int iseriesvscsi_resume(struct ib return 0; } @@ -38272,9 +38296,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ise= ries_vscsi.c linux-2.6.39/drive .init_crq_queue =3D iseriesvscsi_init_crq_queue, .release_crq_queue =3D iseriesvscsi_release_crq_queue, .reset_crq_queue =3D iseriesvscsi_reset_crq_queue, -diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/rpa_vscsi.c linux-2.6.39/d= rivers/scsi/ibmvscsi/rpa_vscsi.c ---- linux-2.6.39/drivers/scsi/ibmvscsi/rpa_vscsi.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/scsi/ibmvscsi/rpa_vscsi.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ibmvscsi/rpa_vscsi.c linux-2.6.39= .1/drivers/scsi/ibmvscsi/rpa_vscsi.c +--- linux-2.6.39.1/drivers/scsi/ibmvscsi/rpa_vscsi.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/ibmvscsi/rpa_vscsi.c 2011-05-22 19:36:32= .000000000 -0400 @@ -358,7 +358,7 @@ static int rpavscsi_resume(struct ibmvsc return 0; } @@ -38284,9 +38308,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/rpa= _vscsi.c linux-2.6.39/drivers/s .init_crq_queue =3D rpavscsi_init_crq_queue, .release_crq_queue =3D rpavscsi_release_crq_queue, .reset_crq_queue =3D rpavscsi_reset_crq_queue, -diff -urNp linux-2.6.39/drivers/scsi/ipr.c linux-2.6.39/drivers/scsi/ipr= .c ---- linux-2.6.39/drivers/scsi/ipr.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/ipr.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ipr.c linux-2.6.39.1/drivers/scsi= /ipr.c +--- linux-2.6.39.1/drivers/scsi/ipr.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/drivers/scsi/ipr.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -6210,7 +6210,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -38296,9 +38320,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ipr.c linux-= 2.6.39/drivers/scsi/ipr.c .phy_reset =3D ipr_ata_phy_reset, .hardreset =3D ipr_sata_reset, .post_internal_cmd =3D ipr_ata_post_internal, -diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_exch.c linux-2.6.39/driver= s/scsi/libfc/fc_exch.c ---- linux-2.6.39/drivers/scsi/libfc/fc_exch.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/scsi/libfc/fc_exch.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/libfc/fc_exch.c linux-2.6.39.1/dr= ivers/scsi/libfc/fc_exch.c +--- linux-2.6.39.1/drivers/scsi/libfc/fc_exch.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/scsi/libfc/fc_exch.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -105,12 +105,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -38420,9 +38444,9 @@ diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_exc= h.c linux-2.6.39/drivers/scsi/l =20 fc_frame_free(fp); } -diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_lport.c linux-2.6.39/drive= rs/scsi/libfc/fc_lport.c ---- linux-2.6.39/drivers/scsi/libfc/fc_lport.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/libfc/fc_lport.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/libfc/fc_lport.c linux-2.6.39.1/d= rivers/scsi/libfc/fc_lport.c +--- linux-2.6.39.1/drivers/scsi/libfc/fc_lport.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/libfc/fc_lport.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1299,7 +1299,7 @@ static void fc_lport_enter_ns(struct fc_ fc_lport_error(lport, fp); } @@ -38432,9 +38456,9 @@ diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_lpo= rt.c linux-2.6.39/drivers/scsi/ .event_callback =3D fc_lport_rport_callback, }; =20 -diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_rport.c linux-2.6.39/drive= rs/scsi/libfc/fc_rport.c ---- linux-2.6.39/drivers/scsi/libfc/fc_rport.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/libfc/fc_rport.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/libfc/fc_rport.c linux-2.6.39.1/d= rivers/scsi/libfc/fc_rport.c +--- linux-2.6.39.1/drivers/scsi/libfc/fc_rport.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/libfc/fc_rport.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -256,7 +256,7 @@ static void fc_rport_work(struct work_st struct fc_rport_libfc_priv *rpriv; enum fc_rport_event event; @@ -38444,9 +38468,9 @@ diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_rpo= rt.c linux-2.6.39/drivers/scsi/ struct fc_rport_identifiers ids; struct fc_rport *rport; struct fc4_prov *prov; -diff -urNp linux-2.6.39/drivers/scsi/libsas/sas_ata.c linux-2.6.39/drive= rs/scsi/libsas/sas_ata.c ---- linux-2.6.39/drivers/scsi/libsas/sas_ata.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/libsas/sas_ata.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/libsas/sas_ata.c linux-2.6.39.1/d= rivers/scsi/libsas/sas_ata.c +--- linux-2.6.39.1/drivers/scsi/libsas/sas_ata.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/libsas/sas_ata.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -307,14 +307,14 @@ static void sas_ata_post_internal(struct } } @@ -38464,9 +38488,9 @@ diff -urNp linux-2.6.39/drivers/scsi/libsas/sas_a= ta.c linux-2.6.39/drivers/scsi/ .qc_prep =3D ata_noop_qc_prep, .qc_issue =3D sas_ata_qc_issue, .qc_fill_rtf =3D sas_ata_qc_fill_rtf, -diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.39/dr= ivers/scsi/lpfc/lpfc_debugfs.c ---- linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.39.= 1/drivers/scsi/lpfc/lpfc_debugfs.c +--- linux-2.6.39.1/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_ =20 #include @@ -38555,9 +38579,9 @@ diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc_de= bugfs.c linux-2.6.39/drivers/sc =20 snprintf(name, sizeof(name), "discovery_trace"); vport->debug_disc_trc =3D -diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc.h linux-2.6.39/drivers/sc= si/lpfc/lpfc.h ---- linux-2.6.39/drivers/scsi/lpfc/lpfc.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/scsi/lpfc/lpfc.h 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/lpfc/lpfc.h linux-2.6.39.1/driver= s/scsi/lpfc/lpfc.h +--- linux-2.6.39.1/drivers/scsi/lpfc/lpfc.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/scsi/lpfc/lpfc.h 2011-05-22 19:36:32.00000000= 0 -0400 @@ -419,7 +419,7 @@ struct lpfc_vport { struct dentry *debug_nodelist; struct dentry *vport_debugfs_root; @@ -38587,9 +38611,9 @@ diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc.h = linux-2.6.39/drivers/scsi/lpfc/ /* iDiag debugfs sub-directory */ struct dentry *idiag_root; struct dentry *idiag_pci_cfg; -diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.39/drive= rs/scsi/lpfc/lpfc_scsi.c ---- linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.39.1/d= rivers/scsi/lpfc/lpfc_scsi.c +--- linux-2.6.39.1/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb uint32_t evt_posted; =20 @@ -38641,9 +38665,9 @@ diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc_sc= si.c linux-2.6.39/drivers/scsi/ } =20 /** -diff -urNp linux-2.6.39/drivers/scsi/mac_esp.c linux-2.6.39/drivers/scsi= /mac_esp.c ---- linux-2.6.39/drivers/scsi/mac_esp.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/scsi/mac_esp.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/scsi/mac_esp.c linux-2.6.39.1/drivers/= scsi/mac_esp.c +--- linux-2.6.39.1/drivers/scsi/mac_esp.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/scsi/mac_esp.c 2011-05-22 19:36:32.000000000 = -0400 @@ -473,7 +473,7 @@ static irqreturn_t mac_scsi_esp_intr(int return IRQ_HANDLED; } @@ -38653,9 +38677,9 @@ diff -urNp linux-2.6.39/drivers/scsi/mac_esp.c li= nux-2.6.39/drivers/scsi/mac_esp .esp_write8 =3D mac_esp_write8, .esp_read8 =3D mac_esp_read8, .map_single =3D mac_esp_map_single, -diff -urNp linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.= 39/drivers/scsi/megaraid/megaraid_mbox.c ---- linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/megaraid/megaraid_mbox.c linux-2.= 6.39.1/drivers/scsi/megaraid/megaraid_mbox.c +--- linux-2.6.39.1/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -3510,6 +3510,8 @@ megaraid_cmm_register(adapter_t *adapter int rval; int i; @@ -38665,9 +38689,9 @@ diff -urNp linux-2.6.39/drivers/scsi/megaraid/meg= araid_mbox.c linux-2.6.39/drive // Allocate memory for the base list of scb for management module. adapter->uscb_list =3D kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_= KERNEL); =20 -diff -urNp linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c linux-= 2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c ---- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-22 19= :36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_base.c linu= x-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_base.c +--- linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-22 = 19:36:32.000000000 -0400 @@ -366,7 +366,7 @@ megasas_check_reset_xscale(struct megasa return 0; } @@ -38713,9 +38737,9 @@ diff -urNp linux-2.6.39/drivers/scsi/megaraid/meg= araid_sas_base.c linux-2.6.39/d =20 /** * megasas_issue_polled - Issues a polling command -diff -urNp linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c linu= x-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c ---- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-22 = 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_fusion.c li= nux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_fusion.c +--- linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-2= 2 19:36:32.000000000 -0400 @@ -2236,7 +2236,7 @@ void megasas_fusion_ocr_wq(struct work_s megasas_reset_fusion(instance->host); } @@ -38725,9 +38749,9 @@ diff -urNp linux-2.6.39/drivers/scsi/megaraid/meg= araid_sas_fusion.c linux-2.6.39 .fire_cmd =3D megasas_fire_cmd_fusion, .enable_intr =3D megasas_enable_intr_fusion, .disable_intr =3D megasas_disable_intr_fusion, -diff -urNp linux-2.6.39/drivers/scsi/megaraid/megaraid_sas.h linux-2.6.3= 9/drivers/scsi/megaraid/megaraid_sas.h ---- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/megaraid/megaraid_sas.h 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas.h linux-2.6= .39.1/drivers/scsi/megaraid/megaraid_sas.h +--- linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/megaraid/megaraid_sas.h 2011-05-22 19:36= :32.000000000 -0400 @@ -1330,7 +1330,7 @@ struct megasas_instance { atomic_t fw_outstanding; atomic_t fw_reset_no_pci_access; @@ -38737,9 +38761,9 @@ diff -urNp linux-2.6.39/drivers/scsi/megaraid/meg= araid_sas.h linux-2.6.39/driver struct tasklet_struct isr_tasklet; struct work_struct work_init; =20 -diff -urNp linux-2.6.39/drivers/scsi/ncr53c8xx.c linux-2.6.39/drivers/sc= si/ncr53c8xx.c ---- linux-2.6.39/drivers/scsi/ncr53c8xx.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/scsi/ncr53c8xx.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/ncr53c8xx.c linux-2.6.39.1/driver= s/scsi/ncr53c8xx.c +--- linux-2.6.39.1/drivers/scsi/ncr53c8xx.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/scsi/ncr53c8xx.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -8606,7 +8606,7 @@ static void ncr53c8xx_get_signalling(str spi_signalling(shost) =3D type; } @@ -38749,9 +38773,9 @@ diff -urNp linux-2.6.39/drivers/scsi/ncr53c8xx.c = linux-2.6.39/drivers/scsi/ncr53 .set_period =3D ncr53c8xx_set_period, .show_period =3D 1, .set_offset =3D ncr53c8xx_set_offset, -diff -urNp linux-2.6.39/drivers/scsi/osd/osd_initiator.c linux-2.6.39/dr= ivers/scsi/osd/osd_initiator.c ---- linux-2.6.39/drivers/scsi/osd/osd_initiator.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/osd/osd_initiator.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/osd/osd_initiator.c linux-2.6.39.= 1/drivers/scsi/osd/osd_initiator.c +--- linux-2.6.39.1/drivers/scsi/osd/osd_initiator.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/osd/osd_initiator.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st int nelem =3D ARRAY_SIZE(get_attrs), a =3D 0; int ret; @@ -38761,9 +38785,9 @@ diff -urNp linux-2.6.39/drivers/scsi/osd/osd_init= iator.c linux-2.6.39/drivers/sc or =3D osd_start_request(od, GFP_KERNEL); if (!or) return -ENOMEM; -diff -urNp linux-2.6.39/drivers/scsi/pmcraid.c linux-2.6.39/drivers/scsi= /pmcraid.c ---- linux-2.6.39/drivers/scsi/pmcraid.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/scsi/pmcraid.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/scsi/pmcraid.c linux-2.6.39.1/drivers/= scsi/pmcraid.c +--- linux-2.6.39.1/drivers/scsi/pmcraid.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/scsi/pmcraid.c 2011-05-22 19:36:32.000000000 = -0400 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc res->scsi_dev =3D scsi_dev; scsi_dev->hostdata =3D res; @@ -38834,9 +38858,9 @@ diff -urNp linux-2.6.39/drivers/scsi/pmcraid.c li= nux-2.6.39/drivers/scsi/pmcraid schedule_work(&pinstance->worker_q); return rc; =20 -diff -urNp linux-2.6.39/drivers/scsi/pmcraid.h linux-2.6.39/drivers/scsi= /pmcraid.h ---- linux-2.6.39/drivers/scsi/pmcraid.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/scsi/pmcraid.h 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/scsi/pmcraid.h linux-2.6.39.1/drivers/= scsi/pmcraid.h +--- linux-2.6.39.1/drivers/scsi/pmcraid.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/scsi/pmcraid.h 2011-05-22 19:36:32.000000000 = -0400 @@ -750,7 +750,7 @@ struct pmcraid_instance { struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS]; =20 @@ -38866,10 +38890,10 @@ diff -urNp linux-2.6.39/drivers/scsi/pmcraid.h = linux-2.6.39/drivers/scsi/pmcraid =20 /* To indicate add/delete/modify during CCN */ u8 change_detected; -diff -urNp linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c linux-2.6.39/drive= rs/scsi/qla2xxx/qla_os.c ---- linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c 2011-05-22 19:36:32.00000= 0000 -0400 -@@ -4097,7 +4097,7 @@ static struct pci_driver qla2xxx_pci_dri +diff -urNp linux-2.6.39.1/drivers/scsi/qla2xxx/qla_os.c linux-2.6.39.1/d= rivers/scsi/qla2xxx/qla_os.c +--- linux-2.6.39.1/drivers/scsi/qla2xxx/qla_os.c 2011-06-03 00:04:14.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/qla2xxx/qla_os.c 2011-06-03 00:32:06.000= 000000 -0400 +@@ -4103,7 +4103,7 @@ static struct pci_driver qla2xxx_pci_dri .err_handler =3D &qla2xxx_err_handler, }; =20 @@ -38878,9 +38902,9 @@ diff -urNp linux-2.6.39/drivers/scsi/qla2xxx/qla_= os.c linux-2.6.39/drivers/scsi/ .owner =3D THIS_MODULE, .llseek =3D noop_llseek, }; -diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.39/driv= ers/scsi/qla4xxx/ql4_def.h ---- linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.39.1/= drivers/scsi/qla4xxx/ql4_def.h +--- linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_def.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_def.h 2011-05-22 19:36:32.00= 0000000 -0400 @@ -256,7 +256,7 @@ struct ddb_entry { atomic_t retry_relogin_timer; /* Min Time between relogins * (4000 only) */ @@ -38890,9 +38914,9 @@ diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_= def.h linux-2.6.39/drivers/scsi * retried */ =20 uint16_t port; -diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.39/dri= vers/scsi/qla4xxx/ql4_init.c ---- linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.39.1= /drivers/scsi/qla4xxx/ql4_init.c +--- linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_init.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_init.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_ ddb_entry->fw_ddb_index =3D fw_ddb_index; atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); @@ -38911,9 +38935,9 @@ diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_= init.c linux-2.6.39/drivers/scs atomic_set(&ddb_entry->relogin_timer, 0); clear_bit(DF_RELOGIN, &ddb_entry->flags); iscsi_unblock_session(ddb_entry->sess); -diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.39/drive= rs/scsi/qla4xxx/ql4_os.c ---- linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.39.1/d= rivers/scsi/qla4xxx/ql4_os.c +--- linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_os.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/qla4xxx/ql4_os.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -802,13 +802,13 @@ static void qla4xxx_timer(struct scsi_ql ddb_entry->fw_ddb_device_state =3D=3D DDB_DS_SESSION_FAILED) { @@ -38930,9 +38954,9 @@ diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_= os.c linux-2.6.39/drivers/scsi/ relogin_retry_count)) ); start_dpc++; -diff -urNp linux-2.6.39/drivers/scsi/scsi.c linux-2.6.39/drivers/scsi/sc= si.c ---- linux-2.6.39/drivers/scsi/scsi.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/scsi.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/scsi.c linux-2.6.39.1/drivers/scs= i/scsi.c +--- linux-2.6.39.1/drivers/scsi/scsi.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/scsi/scsi.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd * unsigned long timeout; int rtn =3D 0; @@ -38942,9 +38966,9 @@ diff -urNp linux-2.6.39/drivers/scsi/scsi.c linux= -2.6.39/drivers/scsi/scsi.c =20 /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state =3D=3D SDEV_DEL)) { -diff -urNp linux-2.6.39/drivers/scsi/scsi_debug.c linux-2.6.39/drivers/s= csi/scsi_debug.c ---- linux-2.6.39/drivers/scsi/scsi_debug.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/scsi/scsi_debug.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/scsi_debug.c linux-2.6.39.1/drive= rs/scsi/scsi_debug.c +--- linux-2.6.39.1/drivers/scsi/scsi_debug.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/scsi/scsi_debug.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_ unsigned char arr[SDEBUG_MAX_MSELECT_SZ]; unsigned char *cmd =3D (unsigned char *)scp->cmnd; @@ -38963,9 +38987,9 @@ diff -urNp linux-2.6.39/drivers/scsi/scsi_debug.c= linux-2.6.39/drivers/scsi/scsi if ((errsts =3D check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); -diff -urNp linux-2.6.39/drivers/scsi/scsi_lib.c linux-2.6.39/drivers/scs= i/scsi_lib.c ---- linux-2.6.39/drivers/scsi/scsi_lib.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/scsi/scsi_lib.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/scsi/scsi_lib.c linux-2.6.39.1/drivers= /scsi/scsi_lib.c +--- linux-2.6.39.1/drivers/scsi/scsi_lib.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/scsi/scsi_lib.c 2011-05-22 19:36:32.000000000= -0400 @@ -1410,7 +1410,7 @@ static void scsi_kill_request(struct req shost =3D sdev->host; scsi_init_cmd_errh(cmd); @@ -38987,9 +39011,9 @@ diff -urNp linux-2.6.39/drivers/scsi/scsi_lib.c l= inux-2.6.39/drivers/scsi/scsi_l =20 disposition =3D scsi_decide_disposition(cmd); if (disposition !=3D SUCCESS && -diff -urNp linux-2.6.39/drivers/scsi/scsi_sysfs.c linux-2.6.39/drivers/s= csi/scsi_sysfs.c ---- linux-2.6.39/drivers/scsi/scsi_sysfs.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/scsi/scsi_sysfs.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/scsi_sysfs.c linux-2.6.39.1/drive= rs/scsi/scsi_sysfs.c +--- linux-2.6.39.1/drivers/scsi/scsi_sysfs.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/scsi/scsi_sysfs.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -621,7 +621,7 @@ show_iostat_##field(struct device *dev,=20 char *buf) \ { \ @@ -38999,9 +39023,9 @@ diff -urNp linux-2.6.39/drivers/scsi/scsi_sysfs.c= linux-2.6.39/drivers/scsi/scsi return snprintf(buf, 20, "0x%llx\n", count); \ } \ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) -diff -urNp linux-2.6.39/drivers/scsi/scsi_transport_fc.c linux-2.6.39/dr= ivers/scsi/scsi_transport_fc.c ---- linux-2.6.39/drivers/scsi/scsi_transport_fc.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/scsi/scsi_transport_fc.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/scsi_transport_fc.c linux-2.6.39.= 1/drivers/scsi/scsi_transport_fc.c +--- linux-2.6.39.1/drivers/scsi/scsi_transport_fc.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/scsi_transport_fc.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_ * Netlink Infrastructure */ @@ -39038,9 +39062,9 @@ diff -urNp linux-2.6.39/drivers/scsi/scsi_transpo= rt_fc.c linux-2.6.39/drivers/sc return -EINVAL; /* * Check for overflow; dev_loss_tmo is u32 -diff -urNp linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c linux-2.6.39= /drivers/scsi/scsi_transport_iscsi.c ---- linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/scsi_transport_iscsi.c linux-2.6.= 39.1/drivers/scsi/scsi_transport_iscsi.c +--- linux-2.6.39.1/drivers/scsi/scsi_transport_iscsi.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/scsi_transport_iscsi.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -83,7 +83,7 @@ struct iscsi_internal { struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1]; }; @@ -39068,9 +39092,9 @@ diff -urNp linux-2.6.39/drivers/scsi/scsi_transpo= rt_iscsi.c linux-2.6.39/drivers =20 err =3D class_register(&iscsi_transport_class); if (err) -diff -urNp linux-2.6.39/drivers/scsi/scsi_transport_srp.c linux-2.6.39/d= rivers/scsi/scsi_transport_srp.c ---- linux-2.6.39/drivers/scsi/scsi_transport_srp.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/scsi/scsi_transport_srp.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/scsi_transport_srp.c linux-2.6.39= .1/drivers/scsi/scsi_transport_srp.c +--- linux-2.6.39.1/drivers/scsi/scsi_transport_srp.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/scsi_transport_srp.c 2011-05-22 19:36:32= .000000000 -0400 @@ -33,7 +33,7 @@ #include "scsi_transport_srp_internal.h" =20 @@ -39098,9 +39122,9 @@ diff -urNp linux-2.6.39/drivers/scsi/scsi_transpo= rt_srp.c linux-2.6.39/drivers/s dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); =20 transport_setup_device(&rport->dev); -diff -urNp linux-2.6.39/drivers/scsi/sg.c linux-2.6.39/drivers/scsi/sg.c ---- linux-2.6.39/drivers/scsi/sg.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/scsi/sg.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/sg.c linux-2.6.39.1/drivers/scsi/= sg.c +--- linux-2.6.39.1/drivers/scsi/sg.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/sg.c 2011-05-22 19:36:32.000000000 -0400 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -39119,9 +39143,9 @@ diff -urNp linux-2.6.39/drivers/scsi/sg.c linux-2= .6.39/drivers/scsi/sg.c =20 sg_proc_sgp =3D proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.39= /drivers/scsi/sym53c8xx_2/sym_glue.c ---- linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.= 39.1/drivers/scsi/sym53c8xx_2/sym_glue.c +--- linux-2.6.39.1/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p int do_iounmap =3D 0; int do_disable_device =3D 1; @@ -39131,9 +39155,9 @@ diff -urNp linux-2.6.39/drivers/scsi/sym53c8xx_2/= sym_glue.c linux-2.6.39/drivers memset(&sym_dev, 0, sizeof(sym_dev)); memset(&nvram, 0, sizeof(nvram)); sym_dev.pdev =3D pdev; -diff -urNp linux-2.6.39/drivers/scsi/vmw_pvscsi.c linux-2.6.39/drivers/s= csi/vmw_pvscsi.c ---- linux-2.6.39/drivers/scsi/vmw_pvscsi.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/scsi/vmw_pvscsi.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/scsi/vmw_pvscsi.c linux-2.6.39.1/drive= rs/scsi/vmw_pvscsi.c +--- linux-2.6.39.1/drivers/scsi/vmw_pvscsi.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/scsi/vmw_pvscsi.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const dma_addr_t base; unsigned i; @@ -39143,9 +39167,9 @@ diff -urNp linux-2.6.39/drivers/scsi/vmw_pvscsi.c= linux-2.6.39/drivers/scsi/vmw_ cmd.ringsStatePPN =3D adapter->ringStatePA >> PAGE_SHIFT; cmd.reqRingNumPages =3D adapter->req_pages; cmd.cmpRingNumPages =3D adapter->cmp_pages; -diff -urNp linux-2.6.39/drivers/sh/clk/cpg.c linux-2.6.39/drivers/sh/clk= /cpg.c ---- linux-2.6.39/drivers/sh/clk/cpg.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/sh/clk/cpg.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/sh/clk/cpg.c linux-2.6.39.1/drivers/sh= /clk/cpg.c +--- linux-2.6.39.1/drivers/sh/clk/cpg.c 2011-06-03 00:04:14.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/sh/clk/cpg.c 2011-06-03 00:32:06.000000000 -0= 400 @@ -26,7 +26,7 @@ static void sh_clk_mstp32_disable(struct clk->enable_reg); } @@ -39198,9 +39222,9 @@ diff -urNp linux-2.6.39/drivers/sh/clk/cpg.c linu= x-2.6.39/drivers/sh/clk/cpg.c .recalc =3D sh_clk_div4_recalc, .set_rate =3D sh_clk_div4_set_rate, .round_rate =3D sh_clk_div_round_rate, -diff -urNp linux-2.6.39/drivers/spi/dw_spi.h linux-2.6.39/drivers/spi/dw= _spi.h ---- linux-2.6.39/drivers/spi/dw_spi.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/spi/dw_spi.h 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/spi/dw_spi.h linux-2.6.39.1/drivers/sp= i/dw_spi.h +--- linux-2.6.39.1/drivers/spi/dw_spi.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/spi/dw_spi.h 2011-05-22 19:36:32.000000000 -0= 400 @@ -151,7 +151,7 @@ struct dw_spi { int dma_chan_done; struct device *dma_dev; @@ -39210,9 +39234,9 @@ diff -urNp linux-2.6.39/drivers/spi/dw_spi.h linu= x-2.6.39/drivers/spi/dw_spi.h void *dma_priv; /* platform relate info */ struct pci_dev *dmac; =20 -diff -urNp linux-2.6.39/drivers/spi/dw_spi_mid.c linux-2.6.39/drivers/sp= i/dw_spi_mid.c ---- linux-2.6.39/drivers/spi/dw_spi_mid.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/spi/dw_spi_mid.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/spi/dw_spi_mid.c linux-2.6.39.1/driver= s/spi/dw_spi_mid.c +--- linux-2.6.39.1/drivers/spi/dw_spi_mid.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/spi/dw_spi_mid.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -180,7 +180,7 @@ static int mid_spi_dma_transfer(struct d return 0; } @@ -39222,9 +39246,9 @@ diff -urNp linux-2.6.39/drivers/spi/dw_spi_mid.c = linux-2.6.39/drivers/spi/dw_spi .dma_init =3D mid_spi_dma_init, .dma_exit =3D mid_spi_dma_exit, .dma_transfer =3D mid_spi_dma_transfer, -diff -urNp linux-2.6.39/drivers/spi/spi.c linux-2.6.39/drivers/spi/spi.c ---- linux-2.6.39/drivers/spi/spi.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/spi/spi.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/spi/spi.c linux-2.6.39.1/drivers/spi/s= pi.c +--- linux-2.6.39.1/drivers/spi/spi.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/spi/spi.c 2011-05-22 19:36:32.000000000 -0400 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma EXPORT_SYMBOL_GPL(spi_bus_unlock); =20 @@ -39234,9 +39258,9 @@ diff -urNp linux-2.6.39/drivers/spi/spi.c linux-2= .6.39/drivers/spi/spi.c =20 static u8 *buf; =20 -diff -urNp linux-2.6.39/drivers/ssb/driver_pcicore.c linux-2.6.39/driver= s/ssb/driver_pcicore.c ---- linux-2.6.39/drivers/ssb/driver_pcicore.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/ssb/driver_pcicore.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/ssb/driver_pcicore.c linux-2.6.39.1/dr= ivers/ssb/driver_pcicore.c +--- linux-2.6.39.1/drivers/ssb/driver_pcicore.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/ssb/driver_pcicore.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -223,7 +223,7 @@ static int ssb_pcicore_write_config(stru return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL; } @@ -39246,9 +39270,9 @@ diff -urNp linux-2.6.39/drivers/ssb/driver_pcicor= e.c linux-2.6.39/drivers/ssb/dr .read =3D ssb_pcicore_read_config, .write =3D ssb_pcicore_write_config, }; -diff -urNp linux-2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c linux= -2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c ---- linux-2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c 2011-05-22 1= 9:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/ath6kl/os/linux/cfg80211.c lin= ux-2.6.39.1/drivers/staging/ath6kl/os/linux/cfg80211.c +--- linux-2.6.39.1/drivers/staging/ath6kl/os/linux/cfg80211.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/ath6kl/os/linux/cfg80211.c 2011-05-22= 19:36:32.000000000 -0400 @@ -1391,8 +1391,7 @@ u32 cipher_suites[] =3D { WLAN_CIPHER_SUITE_CCMP, }; @@ -39259,9 +39283,9 @@ diff -urNp linux-2.6.39/drivers/staging/ath6kl/os= /linux/cfg80211.c linux-2.6.39/ .change_virtual_intf =3D ar6k_cfg80211_change_iface, .add_virtual_intf =3D ar6k_cfg80211_add_virtual_intf, .del_virtual_intf =3D ar6k_cfg80211_del_virtual_intf, -diff -urNp linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c l= inux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c ---- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-05-= 19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-05-= 22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c= linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +--- linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-0= 5-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-0= 5-22 19:36:32.000000000 -0400 @@ -857,14 +857,14 @@ static void dhd_op_if(dhd_if_t *ifp) free_netdev(ifp->net); } @@ -39324,9 +39348,9 @@ diff -urNp linux-2.6.39/drivers/staging/brcm80211= /brcmfmac/dhd_linux.c linux-2.6 .ndo_open =3D dhd_open, .ndo_stop =3D dhd_stop, .ndo_get_stats =3D dhd_get_stats, -diff -urNp linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c= linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c ---- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c 2011-0= 5-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c 2011-0= 5-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_cfg80211= .c linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +--- linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c 2011= -05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c 2011= -05-22 19:36:32.000000000 -0400 @@ -2109,7 +2109,7 @@ wl_cfg80211_flush_pmksa(struct wiphy *wi =20 } @@ -39336,9 +39360,9 @@ diff -urNp linux-2.6.39/drivers/staging/brcm80211= /brcmfmac/wl_cfg80211.c linux-2 .change_virtual_intf =3D wl_cfg80211_change_iface, .scan =3D wl_cfg80211_scan, .set_wiphy_params =3D wl_cfg80211_set_wiphy_params, -diff -urNp linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux= -2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c ---- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-22 1= 9:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c lin= ux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c +--- linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-22= 19:36:32.000000000 -0400 @@ -495,7 +495,7 @@ wl_iw_get_range(struct net_device *dev, list =3D (wl_u32_list_t *) channels; =20 @@ -39348,9 +39372,9 @@ diff -urNp linux-2.6.39/drivers/staging/brcm80211= /brcmfmac/wl_iw.c linux-2.6.39/ =20 range->min_nwid =3D range->max_nwid =3D 0; =20 -diff -urNp linux-2.6.39/drivers/staging/comedi/comedi_fops.c linux-2.6.3= 9/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.39/drivers/staging/comedi/comedi_fops.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/staging/comedi/comedi_fops.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/comedi/comedi_fops.c linux-2.6= .39.1/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.39.1/drivers/staging/comedi/comedi_fops.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/comedi/comedi_fops.c 2011-05-22 19:36= :32.000000000 -0400 @@ -1445,7 +1445,7 @@ static void comedi_unmap(struct vm_area_ mutex_unlock(&dev->mutex); } @@ -39360,9 +39384,9 @@ diff -urNp linux-2.6.39/drivers/staging/comedi/co= medi_fops.c linux-2.6.39/driver .close =3D comedi_unmap, }; =20 -diff -urNp linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c linux-2.6= .39/drivers/staging/cx25821/cx25821-alsa.c ---- linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c 2011-05-22 19:36= :32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/cx25821/cx25821-alsa.c linux-2= .6.39.1/drivers/staging/cx25821/cx25821-alsa.c +--- linux-2.6.39.1/drivers/staging/cx25821/cx25821-alsa.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/cx25821/cx25821-alsa.c 2011-05-22 19:= 36:32.000000000 -0400 @@ -586,7 +586,7 @@ static struct page *snd_cx25821_page(str /* * operators @@ -39372,9 +39396,9 @@ diff -urNp linux-2.6.39/drivers/staging/cx25821/c= x25821-alsa.c linux-2.6.39/driv .open =3D snd_cx25821_pcm_open, .close =3D snd_cx25821_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c linux-2.6.= 39/drivers/staging/cx25821/cx25821-i2c.c ---- linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/cx25821/cx25821-i2c.c linux-2.= 6.39.1/drivers/staging/cx25821/cx25821-i2c.c +--- linux-2.6.39.1/drivers/staging/cx25821/cx25821-i2c.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/cx25821/cx25821-i2c.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -282,7 +282,7 @@ static u32 cx25821_functionality(struct=20 I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA; } @@ -39384,9 +39408,9 @@ diff -urNp linux-2.6.39/drivers/staging/cx25821/c= x25821-i2c.c linux-2.6.39/drive .master_xfer =3D i2c_xfer, .functionality =3D cx25821_functionality, #ifdef NEED_ALGO_CONTROL -diff -urNp linux-2.6.39/drivers/staging/et131x/et1310_tx.c linux-2.6.39/= drivers/staging/et131x/et1310_tx.c ---- linux-2.6.39/drivers/staging/et131x/et1310_tx.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/staging/et131x/et1310_tx.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/et131x/et1310_tx.c linux-2.6.3= 9.1/drivers/staging/et131x/et1310_tx.c +--- linux-2.6.39.1/drivers/staging/et131x/et1310_tx.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/et131x/et1310_tx.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru struct net_device_stats *stats =3D &etdev->net_stats; =20 @@ -39402,9 +39426,9 @@ diff -urNp linux-2.6.39/drivers/staging/et131x/et= 1310_tx.c linux-2.6.39/drivers/ =20 if (tcb->skb) { stats->tx_bytes +=3D tcb->skb->len; -diff -urNp linux-2.6.39/drivers/staging/et131x/et131x_adapter.h linux-2.= 6.39/drivers/staging/et131x/et131x_adapter.h ---- linux-2.6.39/drivers/staging/et131x/et131x_adapter.h 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/et131x/et131x_adapter.h 2011-05-22 19:3= 6:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/et131x/et131x_adapter.h linux-= 2.6.39.1/drivers/staging/et131x/et131x_adapter.h +--- linux-2.6.39.1/drivers/staging/et131x/et131x_adapter.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/et131x/et131x_adapter.h 2011-05-22 19= :36:32.000000000 -0400 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t { * operations */ @@ -39420,9 +39444,9 @@ diff -urNp linux-2.6.39/drivers/staging/et131x/et= 131x_adapter.h linux-2.6.39/dri u32 norcvbuf; /* # Rx packets discarded */ u32 noxmtbuf; /* # Tx packets discarded */ =20 -diff -urNp linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c= linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c ---- linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-0= 5-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-0= 5-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug= .c linux-2.6.39.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +--- linux-2.6.39.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011= -05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011= -05-22 19:36:32.000000000 -0400 @@ -55,7 +55,7 @@ int numofmsgbuf =3D 0; // // Table of entry-point routines for char device @@ -39432,9 +39456,9 @@ diff -urNp linux-2.6.39/drivers/staging/ft1000/ft= 1000-usb/ft1000_debug.c linux-2 { .unlocked_ioctl =3D ft1000_ioctl, .poll =3D ft1000_poll_dev, -diff -urNp linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c l= inux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c ---- linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c 2011-05-= 19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c 2011-05-= 22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/generic_serial/rio/rio_linux.c= linux-2.6.39.1/drivers/staging/generic_serial/rio/rio_linux.c +--- linux-2.6.39.1/drivers/staging/generic_serial/rio/rio_linux.c 2011-0= 5-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/generic_serial/rio/rio_linux.c 2011-0= 5-22 19:36:32.000000000 -0400 @@ -221,7 +221,7 @@ module_param(rio_poll, int, 0); module_param(rio_debug, int, 0644); module_param(rio_irqmask, long, 0); @@ -39444,9 +39468,9 @@ diff -urNp linux-2.6.39/drivers/staging/generic_s= erial/rio/rio_linux.c linux-2.6 rio_disable_tx_interrupts, rio_enable_tx_interrupts, rio_disable_rx_interrupts, -diff -urNp linux-2.6.39/drivers/staging/generic_serial/ser_a2232.c linux= -2.6.39/drivers/staging/generic_serial/ser_a2232.c ---- linux-2.6.39/drivers/staging/generic_serial/ser_a2232.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/generic_serial/ser_a2232.c 2011-05-22 1= 9:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/generic_serial/ser_a2232.c lin= ux-2.6.39.1/drivers/staging/generic_serial/ser_a2232.c +--- linux-2.6.39.1/drivers/staging/generic_serial/ser_a2232.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/generic_serial/ser_a2232.c 2011-05-22= 19:36:32.000000000 -0400 @@ -144,7 +144,7 @@ static int a2232_open(struct tty_struct /*---------------------------------------------------------------------= ------ * Interface from generic_serial.c back here @@ -39456,9 +39480,9 @@ diff -urNp linux-2.6.39/drivers/staging/generic_s= erial/ser_a2232.c linux-2.6.39/ a2232_disable_tx_interrupts, a2232_enable_tx_interrupts, a2232_disable_rx_interrupts, -diff -urNp linux-2.6.39/drivers/staging/generic_serial/sx.c linux-2.6.39= /drivers/staging/generic_serial/sx.c ---- linux-2.6.39/drivers/staging/generic_serial/sx.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/staging/generic_serial/sx.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/generic_serial/sx.c linux-2.6.= 39.1/drivers/staging/generic_serial/sx.c +--- linux-2.6.39.1/drivers/staging/generic_serial/sx.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/generic_serial/sx.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -355,7 +355,7 @@ module_param(sx_irqmask, int, 0); =20 MODULE_LICENSE("GPL"); @@ -39468,9 +39492,9 @@ diff -urNp linux-2.6.39/drivers/staging/generic_s= erial/sx.c linux-2.6.39/drivers sx_disable_tx_interrupts, sx_enable_tx_interrupts, sx_disable_rx_interrupts, -diff -urNp linux-2.6.39/drivers/staging/generic_serial/vme_scc.c linux-2= .6.39/drivers/staging/generic_serial/vme_scc.c ---- linux-2.6.39/drivers/staging/generic_serial/vme_scc.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/generic_serial/vme_scc.c 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/generic_serial/vme_scc.c linux= -2.6.39.1/drivers/staging/generic_serial/vme_scc.c +--- linux-2.6.39.1/drivers/staging/generic_serial/vme_scc.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/generic_serial/vme_scc.c 2011-05-22 1= 9:36:32.000000000 -0400 @@ -94,7 +94,7 @@ static struct scc_port scc_ports[2]; * Interface from generic_serial.c back here *---------------------------------------------------------------------= -----*/ @@ -39480,9 +39504,9 @@ diff -urNp linux-2.6.39/drivers/staging/generic_s= erial/vme_scc.c linux-2.6.39/dr scc_disable_tx_interrupts, scc_enable_tx_interrupts, scc_disable_rx_interrupts, -diff -urNp linux-2.6.39/drivers/staging/gma500/psb_fb.c linux-2.6.39/dri= vers/staging/gma500/psb_fb.c ---- linux-2.6.39/drivers/staging/gma500/psb_fb.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/gma500/psb_fb.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/gma500/psb_fb.c linux-2.6.39.1= /drivers/staging/gma500/psb_fb.c +--- linux-2.6.39.1/drivers/staging/gma500/psb_fb.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/gma500/psb_fb.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -230,7 +230,7 @@ static void psbfb_vm_close(struct vm_are DRM_DEBUG("vm_close\n"); } @@ -39492,9 +39516,9 @@ diff -urNp linux-2.6.39/drivers/staging/gma500/ps= b_fb.c linux-2.6.39/drivers/sta .fault =3D psbfb_vm_fault, .open =3D psbfb_vm_open, .close =3D psbfb_vm_close -diff -urNp linux-2.6.39/drivers/staging/go7007/go7007-i2c.c linux-2.6.39= /drivers/staging/go7007/go7007-i2c.c ---- linux-2.6.39/drivers/staging/go7007/go7007-i2c.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/staging/go7007/go7007-i2c.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/go7007/go7007-i2c.c linux-2.6.= 39.1/drivers/staging/go7007/go7007-i2c.c +--- linux-2.6.39.1/drivers/staging/go7007/go7007-i2c.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/go7007/go7007-i2c.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -198,7 +198,7 @@ static u32 go7007_functionality(struct i return I2C_FUNC_SMBUS_BYTE_DATA; } @@ -39504,9 +39528,9 @@ diff -urNp linux-2.6.39/drivers/staging/go7007/go= 7007-i2c.c linux-2.6.39/drivers .smbus_xfer =3D go7007_smbus_xfer, .master_xfer =3D go7007_i2c_master_xfer, .functionality =3D go7007_functionality, -diff -urNp linux-2.6.39/drivers/staging/go7007/go7007-usb.c linux-2.6.39= /drivers/staging/go7007/go7007-usb.c ---- linux-2.6.39/drivers/staging/go7007/go7007-usb.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/staging/go7007/go7007-usb.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/go7007/go7007-usb.c linux-2.6.= 39.1/drivers/staging/go7007/go7007-usb.c +--- linux-2.6.39.1/drivers/staging/go7007/go7007-usb.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/go7007/go7007-usb.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -849,7 +849,7 @@ static int go7007_usb_send_firmware(stru &transferred, timeout); } @@ -39534,9 +39558,9 @@ diff -urNp linux-2.6.39/drivers/staging/go7007/go= 7007-usb.c linux-2.6.39/drivers .master_xfer =3D go7007_usb_i2c_master_xfer, .functionality =3D go7007_usb_functionality, }; -diff -urNp linux-2.6.39/drivers/staging/go7007/go7007-v4l2.c linux-2.6.3= 9/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.39/drivers/staging/go7007/go7007-v4l2.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/staging/go7007/go7007-v4l2.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/go7007/go7007-v4l2.c linux-2.6= .39.1/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.39.1/drivers/staging/go7007/go7007-v4l2.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/go7007/go7007-v4l2.c 2011-05-22 19:36= :32.000000000 -0400 @@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -39546,9 +39570,9 @@ diff -urNp linux-2.6.39/drivers/staging/go7007/go= 7007-v4l2.c linux-2.6.39/driver .open =3D go7007_vm_open, .close =3D go7007_vm_close, .fault =3D go7007_vm_fault, -diff -urNp linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c linux-2.= 6.39/drivers/staging/go7007/saa7134-go7007.c ---- linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c 2011-05-22 19:3= 6:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/go7007/saa7134-go7007.c linux-= 2.6.39.1/drivers/staging/go7007/saa7134-go7007.c +--- linux-2.6.39.1/drivers/staging/go7007/saa7134-go7007.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/go7007/saa7134-go7007.c 2011-05-22 19= :36:32.000000000 -0400 @@ -421,7 +421,7 @@ static int saa7134_go7007_send_command(s =20 } @@ -39558,9 +39582,9 @@ diff -urNp linux-2.6.39/drivers/staging/go7007/sa= a7134-go7007.c linux-2.6.39/dri .interface_reset =3D saa7134_go7007_interface_reset, .write_interrupt =3D saa7134_go7007_write_interrupt, .read_interrupt =3D saa7134_go7007_read_interrupt, -diff -urNp linux-2.6.39/drivers/staging/go7007/snd-go7007.c linux-2.6.39= /drivers/staging/go7007/snd-go7007.c ---- linux-2.6.39/drivers/staging/go7007/snd-go7007.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/staging/go7007/snd-go7007.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/go7007/snd-go7007.c linux-2.6.= 39.1/drivers/staging/go7007/snd-go7007.c +--- linux-2.6.39.1/drivers/staging/go7007/snd-go7007.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/go7007/snd-go7007.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -204,7 +204,7 @@ static struct page *go7007_snd_pcm_page( return vmalloc_to_page(substream->runtime->dma_area + offset); } @@ -39579,9 +39603,9 @@ diff -urNp linux-2.6.39/drivers/staging/go7007/sn= d-go7007.c linux-2.6.39/drivers .dev_free =3D go7007_snd_free, }; =20 -diff -urNp linux-2.6.39/drivers/staging/hv/channel.c linux-2.6.39/driver= s/staging/hv/channel.c ---- linux-2.6.39/drivers/staging/hv/channel.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/staging/hv/channel.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/hv/channel.c linux-2.6.39.1/dr= ivers/staging/hv/channel.c +--- linux-2.6.39.1/drivers/staging/hv/channel.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/staging/hv/channel.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -509,8 +509,8 @@ int vmbus_establish_gpadl(struct vmbus_c unsigned long flags; int ret =3D 0; @@ -39593,9 +39617,9 @@ diff -urNp linux-2.6.39/drivers/staging/hv/channe= l.c linux-2.6.39/drivers/stagin =20 ret =3D create_gpadl_header(kbuffer, size, &msginfo, &msgcount); if (ret) -diff -urNp linux-2.6.39/drivers/staging/hv/hv.c linux-2.6.39/drivers/sta= ging/hv/hv.c ---- linux-2.6.39/drivers/staging/hv/hv.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/staging/hv/hv.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/staging/hv/hv.c linux-2.6.39.1/drivers= /staging/hv/hv.c +--- linux-2.6.39.1/drivers/staging/hv/hv.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/staging/hv/hv.c 2011-05-22 19:36:32.000000000= -0400 @@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi u64 output_address =3D (output) ? virt_to_phys(output) : 0; u32 output_address_hi =3D output_address >> 32; @@ -39605,9 +39629,9 @@ diff -urNp linux-2.6.39/drivers/staging/hv/hv.c l= inux-2.6.39/drivers/staging/hv/ =20 DPRINT_DBG(VMBUS, "Hypercall ", control, input, output); -diff -urNp linux-2.6.39/drivers/staging/hv/rndis_filter.c linux-2.6.39/d= rivers/staging/hv/rndis_filter.c ---- linux-2.6.39/drivers/staging/hv/rndis_filter.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/staging/hv/rndis_filter.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/hv/rndis_filter.c linux-2.6.39= .1/drivers/staging/hv/rndis_filter.c +--- linux-2.6.39.1/drivers/staging/hv/rndis_filter.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/hv/rndis_filter.c 2011-05-22 19:36:32= .000000000 -0400 @@ -49,7 +49,7 @@ struct rndis_device { =20 enum rndis_device_state state; @@ -39635,9 +39659,9 @@ diff -urNp linux-2.6.39/drivers/staging/hv/rndis_= filter.c linux-2.6.39/drivers/s =20 /* Ignore return since this msg is optional. */ rndis_filter_send_request(dev, request); -diff -urNp linux-2.6.39/drivers/staging/hv/vmbus_drv.c linux-2.6.39/driv= ers/staging/hv/vmbus_drv.c ---- linux-2.6.39/drivers/staging/hv/vmbus_drv.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/staging/hv/vmbus_drv.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/hv/vmbus_drv.c linux-2.6.39.1/= drivers/staging/hv/vmbus_drv.c +--- linux-2.6.39.1/drivers/staging/hv/vmbus_drv.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/staging/hv/vmbus_drv.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -661,14 +661,14 @@ int vmbus_child_device_register(struct h { int ret =3D 0; @@ -39655,9 +39679,9 @@ diff -urNp linux-2.6.39/drivers/staging/hv/vmbus_= drv.c linux-2.6.39/drivers/stag =20 /* The new device belongs to this bus */ child_device_obj->device.bus =3D &vmbus_drv.bus; /* device->dev.bus; *= / -diff -urNp linux-2.6.39/drivers/staging/hv/vmbus_private.h linux-2.6.39/= drivers/staging/hv/vmbus_private.h ---- linux-2.6.39/drivers/staging/hv/vmbus_private.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/staging/hv/vmbus_private.h 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/hv/vmbus_private.h linux-2.6.3= 9.1/drivers/staging/hv/vmbus_private.h +--- linux-2.6.39.1/drivers/staging/hv/vmbus_private.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/hv/vmbus_private.h 2011-05-22 19:36:3= 2.000000000 -0400 @@ -58,7 +58,7 @@ enum vmbus_connect_state { struct vmbus_connection { enum vmbus_connect_state conn_state; @@ -39667,9 +39691,9 @@ diff -urNp linux-2.6.39/drivers/staging/hv/vmbus_= private.h linux-2.6.39/drivers/ =20 /* * Represents channel interrupts. Each bit position represents a -diff -urNp linux-2.6.39/drivers/staging/iio/ring_generic.h linux-2.6.39/= drivers/staging/iio/ring_generic.h ---- linux-2.6.39/drivers/staging/iio/ring_generic.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/staging/iio/ring_generic.h 2011-05-25 16:55:27.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/iio/ring_generic.h linux-2.6.3= 9.1/drivers/staging/iio/ring_generic.h +--- linux-2.6.39.1/drivers/staging/iio/ring_generic.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/iio/ring_generic.h 2011-05-25 16:55:2= 7.000000000 -0400 @@ -134,7 +134,7 @@ struct iio_ring_buffer { struct iio_handler access_handler; struct iio_event_interface ev_int; @@ -39679,9 +39703,9 @@ diff -urNp linux-2.6.39/drivers/staging/iio/ring_= generic.h linux-2.6.39/drivers/ int (*preenable)(struct iio_dev *); int (*postenable)(struct iio_dev *); int (*predisable)(struct iio_dev *); -diff -urNp linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c linux-= 2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c ---- linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c 2011-05-22 19= :36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/intel_sst/intelmid_ctrl.c linu= x-2.6.39.1/drivers/staging/intel_sst/intelmid_ctrl.c +--- linux-2.6.39.1/drivers/staging/intel_sst/intelmid_ctrl.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/intel_sst/intelmid_ctrl.c 2011-05-22 = 19:36:32.000000000 -0400 @@ -494,7 +494,7 @@ static int snd_intelmad_device_set(struc struct snd_intelmad *intelmaddata; struct snd_pmic_ops *scard_ops; @@ -39691,9 +39715,9 @@ diff -urNp linux-2.6.39/drivers/staging/intel_sst= /intelmid_ctrl.c linux-2.6.39/d =20 pr_debug("snd_intelmad_device_set called\n"); =20 -diff -urNp linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interfac= e.c linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interface.c ---- linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interface.c 201= 1-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interface.c 201= 1-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/intel_sst/intel_sst_drv_interf= ace.c linux-2.6.39.1/drivers/staging/intel_sst/intel_sst_drv_interface.c +--- linux-2.6.39.1/drivers/staging/intel_sst/intel_sst_drv_interface.c 2= 011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/intel_sst/intel_sst_drv_interface.c 2= 011-05-22 19:36:32.000000000 -0400 @@ -470,7 +470,7 @@ int sst_device_control(int cmd, void *ar } =20 @@ -39703,9 +39727,9 @@ diff -urNp linux-2.6.39/drivers/staging/intel_sst= /intel_sst_drv_interface.c linu .open =3D sst_open_pcm_stream, .device_control =3D sst_device_control, .close =3D sst_close_pcm_stream, -diff -urNp linux-2.6.39/drivers/staging/line6/capture.c linux-2.6.39/dri= vers/staging/line6/capture.c ---- linux-2.6.39/drivers/staging/line6/capture.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/line6/capture.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/line6/capture.c linux-2.6.39.1= /drivers/staging/line6/capture.c +--- linux-2.6.39.1/drivers/staging/line6/capture.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/line6/capture.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -378,7 +378,7 @@ snd_line6_capture_pointer(struct snd_pcm } =20 @@ -39715,9 +39739,9 @@ diff -urNp linux-2.6.39/drivers/staging/line6/cap= ture.c linux-2.6.39/drivers/sta .open =3D snd_line6_capture_open, .close =3D snd_line6_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/staging/line6/capture.h linux-2.6.39/dri= vers/staging/line6/capture.h ---- linux-2.6.39/drivers/staging/line6/capture.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/line6/capture.h 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/line6/capture.h linux-2.6.39.1= /drivers/staging/line6/capture.h +--- linux-2.6.39.1/drivers/staging/line6/capture.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/line6/capture.h 2011-05-22 19:36:32.0= 00000000 -0400 @@ -17,7 +17,7 @@ #include "driver.h" #include "pcm.h" @@ -39727,9 +39751,9 @@ diff -urNp linux-2.6.39/drivers/staging/line6/cap= ture.h linux-2.6.39/drivers/sta =20 extern void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fb= uf, int fsize); -diff -urNp linux-2.6.39/drivers/staging/line6/midi.c linux-2.6.39/driver= s/staging/line6/midi.c ---- linux-2.6.39/drivers/staging/line6/midi.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/staging/line6/midi.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/line6/midi.c linux-2.6.39.1/dr= ivers/staging/line6/midi.c +--- linux-2.6.39.1/drivers/staging/line6/midi.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/staging/line6/midi.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -239,14 +239,14 @@ static void line6_midi_input_trigger(str line6->line6midi->substream_receive =3D 0; } @@ -39756,9 +39780,9 @@ diff -urNp linux-2.6.39/drivers/staging/line6/mid= i.c linux-2.6.39/drivers/stagin .dev_free =3D snd_line6_midi_free, }; =20 -diff -urNp linux-2.6.39/drivers/staging/line6/pcm.c linux-2.6.39/drivers= /staging/line6/pcm.c ---- linux-2.6.39/drivers/staging/line6/pcm.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/staging/line6/pcm.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/line6/pcm.c linux-2.6.39.1/dri= vers/staging/line6/pcm.c +--- linux-2.6.39.1/drivers/staging/line6/pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/staging/line6/pcm.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -384,7 +384,7 @@ void line6_pcm_disconnect(struct snd_lin int line6_init_pcm(struct usb_line6 *line6, struct line6_pcm_properties *properties) @@ -39768,9 +39792,9 @@ diff -urNp linux-2.6.39/drivers/staging/line6/pcm= .c linux-2.6.39/drivers/staging .dev_free =3D snd_line6_pcm_free, }; =20 -diff -urNp linux-2.6.39/drivers/staging/line6/playback.c linux-2.6.39/dr= ivers/staging/line6/playback.c ---- linux-2.6.39/drivers/staging/line6/playback.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/staging/line6/playback.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/line6/playback.c linux-2.6.39.= 1/drivers/staging/line6/playback.c +--- linux-2.6.39.1/drivers/staging/line6/playback.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/line6/playback.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -536,7 +536,7 @@ snd_line6_playback_pointer(struct snd_pc } =20 @@ -39780,9 +39804,9 @@ diff -urNp linux-2.6.39/drivers/staging/line6/pla= yback.c linux-2.6.39/drivers/st .open =3D snd_line6_playback_open, .close =3D snd_line6_playback_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/staging/line6/playback.h linux-2.6.39/dr= ivers/staging/line6/playback.h ---- linux-2.6.39/drivers/staging/line6/playback.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/staging/line6/playback.h 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/line6/playback.h linux-2.6.39.= 1/drivers/staging/line6/playback.h +--- linux-2.6.39.1/drivers/staging/line6/playback.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/line6/playback.h 2011-05-22 19:36:32.= 000000000 -0400 @@ -27,7 +27,7 @@ */ #define USE_CLEAR_BUFFER_WORKAROUND 1 @@ -39792,9 +39816,9 @@ diff -urNp linux-2.6.39/drivers/staging/line6/pla= yback.h linux-2.6.39/drivers/st =20 extern int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm); extern int line6_submit_audio_out_all_urbs(struct snd_line6_pcm *line6p= cm); -diff -urNp linux-2.6.39/drivers/staging/msm/staging-devices.c linux-2.6.= 39/drivers/staging/msm/staging-devices.c ---- linux-2.6.39/drivers/staging/msm/staging-devices.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/msm/staging-devices.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/msm/staging-devices.c linux-2.= 6.39.1/drivers/staging/msm/staging-devices.c +--- linux-2.6.39.1/drivers/staging/msm/staging-devices.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/msm/staging-devices.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -211,7 +211,7 @@ static int msm_fb_lcdc_gpio_config(int o } =20 @@ -39804,9 +39828,9 @@ diff -urNp linux-2.6.39/drivers/staging/msm/stagi= ng-devices.c linux-2.6.39/drive .lcdc_gpio_config =3D msm_fb_lcdc_gpio_config, }; =20 -diff -urNp linux-2.6.39/drivers/staging/octeon/ethernet.c linux-2.6.39/d= rivers/staging/octeon/ethernet.c ---- linux-2.6.39/drivers/staging/octeon/ethernet.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/staging/octeon/ethernet.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/octeon/ethernet.c linux-2.6.39= .1/drivers/staging/octeon/ethernet.c +--- linux-2.6.39.1/drivers/staging/octeon/ethernet.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/octeon/ethernet.c 2011-05-22 19:36:32= .000000000 -0400 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_ * since the RX tasklet also increments it. */ @@ -39823,9 +39847,9 @@ diff -urNp linux-2.6.39/drivers/staging/octeon/et= hernet.c linux-2.6.39/drivers/s #endif } =20 -diff -urNp linux-2.6.39/drivers/staging/octeon/ethernet-rx.c linux-2.6.3= 9/drivers/staging/octeon/ethernet-rx.c ---- linux-2.6.39/drivers/staging/octeon/ethernet-rx.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/staging/octeon/ethernet-rx.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/octeon/ethernet-rx.c linux-2.6= .39.1/drivers/staging/octeon/ethernet-rx.c +--- linux-2.6.39.1/drivers/staging/octeon/ethernet-rx.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/octeon/ethernet-rx.c 2011-05-22 19:36= :32.000000000 -0400 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi /* Increment RX stats for virtual ports */ if (work->ipprt >=3D CVMX_PIP_NUM_INPUT_PORTS) { @@ -39854,9 +39878,9 @@ diff -urNp linux-2.6.39/drivers/staging/octeon/et= hernet-rx.c linux-2.6.39/driver #endif dev_kfree_skb_irq(skb); } -diff -urNp linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.= 39/drivers/staging/olpc_dcon/olpc_dcon.c ---- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.= 6.39.1/drivers/staging/olpc_dcon/olpc_dcon.c +--- linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -43,7 +43,7 @@ module_param(noinit, int, 0444); static int useaa =3D 1; module_param(useaa, int, 0444); @@ -39866,9 +39890,9 @@ diff -urNp linux-2.6.39/drivers/staging/olpc_dcon= /olpc_dcon.c linux-2.6.39/drive =20 /* I2C structures */ =20 -diff -urNp linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h linux-2.6.= 39/drivers/staging/olpc_dcon/olpc_dcon.h ---- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon.h linux-2.= 6.39.1/drivers/staging/olpc_dcon/olpc_dcon.h +--- linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-22 19:3= 6:32.000000000 -0400 @@ -92,11 +92,11 @@ struct dcon_platform_data { extern irqreturn_t dcon_interrupt(int irq, void *id); =20 @@ -39883,9 +39907,9 @@ diff -urNp linux-2.6.39/drivers/staging/olpc_dcon= /olpc_dcon.h linux-2.6.39/drive #endif =20 #endif -diff -urNp linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c lin= ux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c ---- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-19= 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-22= 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c l= inux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c +--- linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-= 19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-= 22 19:36:32.000000000 -0400 @@ -185,7 +185,7 @@ static u8 dcon_read_status_xo_1_5(void) return status; } @@ -39895,9 +39919,9 @@ diff -urNp linux-2.6.39/drivers/staging/olpc_dcon= /olpc_dcon_xo_1_5.c linux-2.6.3 .init =3D dcon_init_xo_1_5, .bus_stabilize_wiggle =3D dcon_wiggle_xo_1_5, .set_dconload =3D dcon_set_dconload_xo_1_5, -diff -urNp linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c linux= -2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c ---- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c 2011-05-19 0= 0:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c 2011-05-22 1= 9:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c lin= ux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c +--- linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c 2011-05-19= 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c 2011-05-22= 19:36:32.000000000 -0400 @@ -196,7 +196,7 @@ static u8 dcon_read_status_xo_1(void) return status; } @@ -39907,9 +39931,9 @@ diff -urNp linux-2.6.39/drivers/staging/olpc_dcon= /olpc_dcon_xo_1.c linux-2.6.39/ .init =3D dcon_init_xo_1, .bus_stabilize_wiggle =3D dcon_wiggle_xo_1, .set_dconload =3D dcon_set_dconload_1, -diff -urNp linux-2.6.39/drivers/staging/phison/phison.c linux-2.6.39/dri= vers/staging/phison/phison.c ---- linux-2.6.39/drivers/staging/phison/phison.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/phison/phison.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/phison/phison.c linux-2.6.39.1= /drivers/staging/phison/phison.c +--- linux-2.6.39.1/drivers/staging/phison/phison.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/phison/phison.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -39919,9 +39943,9 @@ diff -urNp linux-2.6.39/drivers/staging/phison/ph= ison.c linux-2.6.39/drivers/sta .inherits =3D &ata_bmdma_port_ops, .prereset =3D phison_pre_reset, }; -diff -urNp linux-2.6.39/drivers/staging/pohmelfs/inode.c linux-2.6.39/dr= ivers/staging/pohmelfs/inode.c ---- linux-2.6.39/drivers/staging/pohmelfs/inode.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/staging/pohmelfs/inode.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/pohmelfs/inode.c linux-2.6.39.= 1/drivers/staging/pohmelfs/inode.c +--- linux-2.6.39.1/drivers/staging/pohmelfs/inode.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/pohmelfs/inode.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root =3D RB_ROOT; @@ -39940,9 +39964,9 @@ diff -urNp linux-2.6.39/drivers/staging/pohmelfs/= inode.c linux-2.6.39/drivers/st atomic_long_set(&psb->total_inodes, 0); =20 mutex_init(&psb->state_lock); -diff -urNp linux-2.6.39/drivers/staging/pohmelfs/mcache.c linux-2.6.39/d= rivers/staging/pohmelfs/mcache.c ---- linux-2.6.39/drivers/staging/pohmelfs/mcache.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/staging/pohmelfs/mcache.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/pohmelfs/mcache.c linux-2.6.39= .1/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.39.1/drivers/staging/pohmelfs/mcache.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/pohmelfs/mcache.c 2011-05-22 19:36:32= .000000000 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data =3D data; m->start =3D start; @@ -39952,9 +39976,9 @@ diff -urNp linux-2.6.39/drivers/staging/pohmelfs/= mcache.c linux-2.6.39/drivers/s =20 mutex_lock(&psb->mcache_lock); err =3D pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.39/drivers/staging/pohmelfs/netfs.h linux-2.6.39/dr= ivers/staging/pohmelfs/netfs.h ---- linux-2.6.39/drivers/staging/pohmelfs/netfs.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/staging/pohmelfs/netfs.h 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/pohmelfs/netfs.h linux-2.6.39.= 1/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.39.1/drivers/staging/pohmelfs/netfs.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/pohmelfs/netfs.h 2011-05-22 19:36:32.= 000000000 -0400 @@ -571,14 +571,14 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -39972,9 +39996,9 @@ diff -urNp linux-2.6.39/drivers/staging/pohmelfs/= netfs.h linux-2.6.39/drivers/st =20 unsigned int crypto_attached_size; unsigned int crypto_align_size; -diff -urNp linux-2.6.39/drivers/staging/pohmelfs/trans.c linux-2.6.39/dr= ivers/staging/pohmelfs/trans.c ---- linux-2.6.39/drivers/staging/pohmelfs/trans.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/staging/pohmelfs/trans.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/pohmelfs/trans.c linux-2.6.39.= 1/drivers/staging/pohmelfs/trans.c +--- linux-2.6.39.1/drivers/staging/pohmelfs/trans.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/pohmelfs/trans.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran int err; struct netfs_cmd *cmd =3D t->iovec.iov_base; @@ -39984,9 +40008,9 @@ diff -urNp linux-2.6.39/drivers/staging/pohmelfs/= trans.c linux-2.6.39/drivers/st =20 cmd->size =3D t->iovec.iov_len - sizeof(struct netfs_cmd) + t->attached_size + t->attached_pages * sizeof(struct netfs_cmd); -diff -urNp linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c linux-= 2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c ---- linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-19 00= :06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-22 19= :36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/rtl8192u/ieee80211/proc.c linu= x-2.6.39.1/drivers/staging/rtl8192u/ieee80211/proc.c +--- linux-2.6.39.1/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-19 = 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-22 = 19:36:32.000000000 -0400 @@ -87,7 +87,7 @@ static int c_show(struct seq_file *m, vo return 0; } @@ -40005,9 +40029,9 @@ diff -urNp linux-2.6.39/drivers/staging/rtl8192u/= ieee80211/proc.c linux-2.6.39/d .open =3D crypto_info_open, .read =3D seq_read, .llseek =3D seq_lseek, -diff -urNp linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h linux-2.6.3= 9/drivers/staging/rtl8712/rtl871x_io.h ---- linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/rtl8712/rtl871x_io.h linux-2.6= .39.1/drivers/staging/rtl8712/rtl871x_io.h +--- linux-2.6.39.1/drivers/staging/rtl8712/rtl871x_io.h 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/rtl8712/rtl871x_io.h 2011-05-22 19:36= :32.000000000 -0400 @@ -107,7 +107,7 @@ struct intf_hdl { void (*intf_hdl_unload)(u8 *priv); void (*intf_hdl_open)(u8 *priv); @@ -40017,9 +40041,9 @@ diff -urNp linux-2.6.39/drivers/staging/rtl8712/r= tl871x_io.h linux-2.6.39/driver }; =20 struct reg_protocol_rd { -diff -urNp linux-2.6.39/drivers/staging/solo6x10/g723.c linux-2.6.39/dri= vers/staging/solo6x10/g723.c ---- linux-2.6.39/drivers/staging/solo6x10/g723.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/solo6x10/g723.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/solo6x10/g723.c linux-2.6.39.1= /drivers/staging/solo6x10/g723.c +--- linux-2.6.39.1/drivers/staging/solo6x10/g723.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/solo6x10/g723.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -237,7 +237,7 @@ static int snd_solo_pcm_copy(struct snd_ return 0; } @@ -40038,9 +40062,9 @@ diff -urNp linux-2.6.39/drivers/staging/solo6x10/= g723.c linux-2.6.39/drivers/sta struct snd_card *card; struct snd_kcontrol_new kctl; char name[32]; -diff -urNp linux-2.6.39/drivers/staging/spectra/ffsport.c linux-2.6.39/d= rivers/staging/spectra/ffsport.c ---- linux-2.6.39/drivers/staging/spectra/ffsport.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/staging/spectra/ffsport.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/spectra/ffsport.c linux-2.6.39= .1/drivers/staging/spectra/ffsport.c +--- linux-2.6.39.1/drivers/staging/spectra/ffsport.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/spectra/ffsport.c 2011-05-22 19:36:32= .000000000 -0400 @@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block return ret; } @@ -40050,9 +40074,9 @@ diff -urNp linux-2.6.39/drivers/staging/spectra/f= fsport.c linux-2.6.39/drivers/s .owner =3D THIS_MODULE, .open =3D GLOB_SBD_open, .release =3D GLOB_SBD_release, -diff -urNp linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c linux-2.6.3= 9/drivers/staging/tm6000/tm6000-alsa.c ---- linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/tm6000/tm6000-alsa.c linux-2.6= .39.1/drivers/staging/tm6000/tm6000-alsa.c +--- linux-2.6.39.1/drivers/staging/tm6000/tm6000-alsa.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/tm6000/tm6000-alsa.c 2011-05-22 19:36= :32.000000000 -0400 @@ -380,7 +380,7 @@ static snd_pcm_uframes_t snd_tm6000_poin /* * operators @@ -40062,9 +40086,9 @@ diff -urNp linux-2.6.39/drivers/staging/tm6000/tm= 6000-alsa.c linux-2.6.39/driver .open =3D snd_tm6000_pcm_open, .close =3D snd_tm6000_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/drivers/staging/tty/istallion.c linux-2.6.39/dri= vers/staging/tty/istallion.c ---- linux-2.6.39/drivers/staging/tty/istallion.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/tty/istallion.c 2011-05-22 20:49:07.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/tty/istallion.c linux-2.6.39.1= /drivers/staging/tty/istallion.c +--- linux-2.6.39.1/drivers/staging/tty/istallion.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/tty/istallion.c 2011-05-22 20:49:07.0= 00000000 -0400 @@ -186,7 +186,6 @@ static struct ktermios stli_deftermios=20 * re-used for each stats call. */ @@ -40099,9 +40123,9 @@ diff -urNp linux-2.6.39/drivers/staging/tty/istal= lion.c linux-2.6.39/drivers/sta if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd))) return -EFAULT; if (stli_dummybrd.brdnr >=3D STL_MAXBRDS) -diff -urNp linux-2.6.39/drivers/staging/tty/stallion.c linux-2.6.39/driv= ers/staging/tty/stallion.c ---- linux-2.6.39/drivers/staging/tty/stallion.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/staging/tty/stallion.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/tty/stallion.c linux-2.6.39.1/= drivers/staging/tty/stallion.c +--- linux-2.6.39.1/drivers/staging/tty/stallion.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/staging/tty/stallion.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp struct stlport stl_dummyport; struct stlport *portp; @@ -40111,9 +40135,9 @@ diff -urNp linux-2.6.39/drivers/staging/tty/stall= ion.c linux-2.6.39/drivers/stag if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport))) return -EFAULT; portp =3D stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr, -diff -urNp linux-2.6.39/drivers/staging/usbip/vhci.h linux-2.6.39/driver= s/staging/usbip/vhci.h ---- linux-2.6.39/drivers/staging/usbip/vhci.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/staging/usbip/vhci.h 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/usbip/vhci.h linux-2.6.39.1/dr= ivers/staging/usbip/vhci.h +--- linux-2.6.39.1/drivers/staging/usbip/vhci.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/staging/usbip/vhci.h 2011-05-22 19:36:32.0000= 00000 -0400 @@ -92,7 +92,7 @@ struct vhci_hcd { unsigned resuming:1; unsigned long re_timeout; @@ -40123,9 +40147,9 @@ diff -urNp linux-2.6.39/drivers/staging/usbip/vhc= i.h linux-2.6.39/drivers/stagin =20 /* * NOTE: -diff -urNp linux-2.6.39/drivers/staging/usbip/vhci_hcd.c linux-2.6.39/dr= ivers/staging/usbip/vhci_hcd.c ---- linux-2.6.39/drivers/staging/usbip/vhci_hcd.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/staging/usbip/vhci_hcd.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/usbip/vhci_hcd.c linux-2.6.39.= 1/drivers/staging/usbip/vhci_hcd.c +--- linux-2.6.39.1/drivers/staging/usbip/vhci_hcd.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/usbip/vhci_hcd.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -536,7 +536,7 @@ static void vhci_tx_urb(struct urb *urb) return; } @@ -40153,9 +40177,9 @@ diff -urNp linux-2.6.39/drivers/staging/usbip/vhc= i_hcd.c linux-2.6.39/drivers/st spin_lock_init(&vhci->lock); =20 =20 -diff -urNp linux-2.6.39/drivers/staging/usbip/vhci_rx.c linux-2.6.39/dri= vers/staging/usbip/vhci_rx.c ---- linux-2.6.39/drivers/staging/usbip/vhci_rx.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/usbip/vhci_rx.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/usbip/vhci_rx.c linux-2.6.39.1= /drivers/staging/usbip/vhci_rx.c +--- linux-2.6.39.1/drivers/staging/usbip/vhci_rx.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/usbip/vhci_rx.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -81,7 +81,7 @@ static void vhci_recv_ret_submit(struct=20 usbip_uerr("cannot find a urb of seqnum %u\n", pdu->base.seqnum); @@ -40165,9 +40189,9 @@ diff -urNp linux-2.6.39/drivers/staging/usbip/vhc= i_rx.c linux-2.6.39/drivers/sta usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); return; } -diff -urNp linux-2.6.39/drivers/staging/vme/devices/vme_user.c linux-2.6= .39/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.39/drivers/staging/vme/devices/vme_user.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/vme/devices/vme_user.c 2011-05-22 19:36= :32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/vme/devices/vme_user.c linux-2= .6.39.1/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.39.1/drivers/staging/vme/devices/vme_user.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/vme/devices/vme_user.c 2011-05-22 19:= 36:32.000000000 -0400 @@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(stru static int __devinit vme_user_probe(struct device *, int, int); static int __devexit vme_user_remove(struct device *, int, int); @@ -40177,9 +40201,9 @@ diff -urNp linux-2.6.39/drivers/staging/vme/devic= es/vme_user.c linux-2.6.39/driv .open =3D vme_user_open, .release =3D vme_user_release, .read =3D vme_user_read, -diff -urNp linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblk= dev_block.c linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblk= dev_block.c ---- linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblkdev_blo= ck.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblkdev_blo= ck.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/westbridge/astoria/block/cyasb= lkdev_block.c linux-2.6.39.1/drivers/staging/westbridge/astoria/block/cya= sblkdev_block.c +--- linux-2.6.39.1/drivers/staging/westbridge/astoria/block/cyasblkdev_b= lock.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/westbridge/astoria/block/cyasblkdev_b= lock.c 2011-05-22 19:36:32.000000000 -0400 @@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge =20 =20 @@ -40189,9 +40213,9 @@ diff -urNp linux-2.6.39/drivers/staging/westbridg= e/astoria/block/cyasblkdev_bloc .open =3D cyasblkdev_blk_open, .release =3D cyasblkdev_blk_release, .ioctl =3D cyasblkdev_blk_ioctl, -diff -urNp linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c linux-2.6= .39/drivers/staging/wlags49_h2/wl_netdev.c ---- linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c 2011-05-22 19:36= :32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/wlags49_h2/wl_netdev.c linux-2= .6.39.1/drivers/staging/wlags49_h2/wl_netdev.c +--- linux-2.6.39.1/drivers/staging/wlags49_h2/wl_netdev.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/wlags49_h2/wl_netdev.c 2011-05-22 19:= 36:32.000000000 -0400 @@ -474,7 +474,7 @@ static void wl_get_drvinfo(struct net_de } } // wl_get_drvinfo @@ -40201,9 +40225,9 @@ diff -urNp linux-2.6.39/drivers/staging/wlags49_h= 2/wl_netdev.c linux-2.6.39/driv .get_drvinfo =3D wl_get_drvinfo, .get_link =3D ethtool_op_get_link, }; -diff -urNp linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.= 39/drivers/staging/wlan-ng/hfa384x_usb.c ---- linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.= 6.39.1/drivers/staging/wlan-ng/hfa384x_usb.c +--- linux-2.6.39.1/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -671,7 +671,7 @@ struct usbctlx_cmd_completor { hfa384x_cmdresult_t *result; }; @@ -40231,9 +40255,9 @@ diff -urNp linux-2.6.39/drivers/staging/wlan-ng/h= fa384x_usb.c linux-2.6.39/drive { usbctlx_rmem_completor_t *complete =3D (usbctlx_rmem_completor_t *) he= ad; =20 -diff -urNp linux-2.6.39/drivers/staging/zcache/tmem.c linux-2.6.39/drive= rs/staging/zcache/tmem.c ---- linux-2.6.39/drivers/staging/zcache/tmem.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/staging/zcache/tmem.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/zcache/tmem.c linux-2.6.39.1/d= rivers/staging/zcache/tmem.c +--- linux-2.6.39.1/drivers/staging/zcache/tmem.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/staging/zcache/tmem.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -39,7 +39,7 @@ * A tmem host implementation must use this function to register callba= cks * for memory allocation. @@ -40252,9 +40276,9 @@ diff -urNp linux-2.6.39/drivers/staging/zcache/tm= em.c linux-2.6.39/drivers/stagi =20 void tmem_register_pamops(struct tmem_pamops *m) { -diff -urNp linux-2.6.39/drivers/staging/zcache/zcache.c linux-2.6.39/dri= vers/staging/zcache/zcache.c ---- linux-2.6.39/drivers/staging/zcache/zcache.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/staging/zcache/zcache.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/staging/zcache/zcache.c linux-2.6.39.1= /drivers/staging/zcache/zcache.c +--- linux-2.6.39.1/drivers/staging/zcache/zcache.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/staging/zcache/zcache.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -882,7 +882,7 @@ static void zcache_obj_free(struct tmem_ kmem_cache_free(zcache_obj_cache, obj); } @@ -40273,9 +40297,9 @@ diff -urNp linux-2.6.39/drivers/staging/zcache/zc= ache.c linux-2.6.39/drivers/sta .create =3D zcache_pampd_create, .get_data =3D zcache_pampd_get_data, .free =3D zcache_pampd_free, -diff -urNp linux-2.6.39/drivers/target/target_core_alua.c linux-2.6.39/d= rivers/target/target_core_alua.c ---- linux-2.6.39/drivers/target/target_core_alua.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/target/target_core_alua.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/target/target_core_alua.c linux-2.6.39= .1/drivers/target/target_core_alua.c +--- linux-2.6.39.1/drivers/target/target_core_alua.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/target/target_core_alua.c 2011-05-22 19:36:32= .000000000 -0400 @@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_ char path[ALUA_METADATA_PATH_LEN]; int len; @@ -40294,9 +40318,9 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_alua.c linux-2.6.39/drivers/t memset(path, 0, ALUA_METADATA_PATH_LEN); memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN); =20 -diff -urNp linux-2.6.39/drivers/target/target_core_cdb.c linux-2.6.39/dr= ivers/target/target_core_cdb.c ---- linux-2.6.39/drivers/target/target_core_cdb.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/target/target_core_cdb.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/target/target_core_cdb.c linux-2.6.39.= 1/drivers/target/target_core_cdb.c +--- linux-2.6.39.1/drivers/target/target_core_cdb.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/target/target_core_cdb.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd * int length =3D 0; unsigned char buf[SE_MODE_PAGE_BUF]; @@ -40306,9 +40330,9 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_cdb.c linux-2.6.39/drivers/ta memset(buf, 0, SE_MODE_PAGE_BUF); =20 switch (cdb[2] & 0x3f) { -diff -urNp linux-2.6.39/drivers/target/target_core_configfs.c linux-2.6.= 39/drivers/target/target_core_configfs.c ---- linux-2.6.39/drivers/target/target_core_configfs.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/target/target_core_configfs.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/target/target_core_configfs.c linux-2.= 6.39.1/drivers/target/target_core_configfs.c +--- linux-2.6.39.1/drivers/target/target_core_configfs.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/target/target_core_configfs.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -1280,6 +1280,8 @@ static ssize_t target_core_dev_pr_show_a ssize_t len =3D 0; int reg_count =3D 0, prf_isid; @@ -40354,9 +40378,9 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_configfs.c linux-2.6.39/drive .make_group =3D target_core_call_addhbatotarget, .drop_item =3D target_core_call_delhbafromtarget, }; -diff -urNp linux-2.6.39/drivers/target/target_core_fabric_configfs.c lin= ux-2.6.39/drivers/target/target_core_fabric_configfs.c ---- linux-2.6.39/drivers/target/target_core_fabric_configfs.c 2011-05-19= 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/target/target_core_fabric_configfs.c 2011-05-22= 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/target/target_core_fabric_configfs.c l= inux-2.6.39.1/drivers/target/target_core_fabric_configfs.c +--- linux-2.6.39.1/drivers/target/target_core_fabric_configfs.c 2011-05-= 19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/target/target_core_fabric_configfs.c 2011-05-= 22 19:36:32.000000000 -0400 @@ -1174,7 +1174,7 @@ static void target_fabric_drop_wwn( config_item_put(item); } @@ -40366,9 +40390,9 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_fabric_configfs.c linux-2.6.3 .make_group =3D target_fabric_make_wwn, .drop_item =3D target_fabric_drop_wwn, }; -diff -urNp linux-2.6.39/drivers/target/target_core_pr.c linux-2.6.39/dri= vers/target/target_core_pr.c ---- linux-2.6.39/drivers/target/target_core_pr.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/target/target_core_pr.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/target/target_core_pr.c linux-2.6.39.1= /drivers/target/target_core_pr.c +--- linux-2.6.39.1/drivers/target/target_core_pr.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/target/target_core_pr.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi unsigned char t_port[PR_APTPL_MAX_TPORT_LEN]; u16 tpgt; @@ -40396,10 +40420,10 @@ diff -urNp linux-2.6.39/drivers/target/target_c= ore_pr.c linux-2.6.39/drivers/tar memset(iov, 0, sizeof(struct iovec)); memset(path, 0, 512); =20 -diff -urNp linux-2.6.39/drivers/target/target_core_tmr.c linux-2.6.39/dr= ivers/target/target_core_tmr.c ---- linux-2.6.39/drivers/target/target_core_tmr.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/target/target_core_tmr.c 2011-05-22 19:36:32.00= 0000000 -0400 -@@ -262,7 +262,7 @@ int core_tmr_lun_reset( +diff -urNp linux-2.6.39.1/drivers/target/target_core_tmr.c linux-2.6.39.= 1/drivers/target/target_core_tmr.c +--- linux-2.6.39.1/drivers/target/target_core_tmr.c 2011-06-03 00:04:14.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/target/target_core_tmr.c 2011-06-03 00:32:07.= 000000000 -0400 +@@ -263,7 +263,7 @@ int core_tmr_lun_reset( CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key, T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), @@ -40408,7 +40432,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_tmr.c linux-2.6.39/drivers/ta atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); -@@ -304,7 +304,7 @@ int core_tmr_lun_reset( +@@ -305,7 +305,7 @@ int core_tmr_lun_reset( DEBUG_LR("LUN_RESET: got t_transport_active =3D 1 for" " task: %p, t_fe_count: %d dev: %p\n", task, fe_count, dev); @@ -40417,7 +40441,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_tmr.c linux-2.6.39/drivers/ta spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); -@@ -314,7 +314,7 @@ int core_tmr_lun_reset( +@@ -315,7 +315,7 @@ int core_tmr_lun_reset( } DEBUG_LR("LUN_RESET: Got t_transport_active =3D 0 for task: %p," " t_fe_count: %d dev: %p\n", task, fe_count, dev); @@ -40426,10 +40450,10 @@ diff -urNp linux-2.6.39/drivers/target/target_c= ore_tmr.c linux-2.6.39/drivers/ta spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); =20 -diff -urNp linux-2.6.39/drivers/target/target_core_transport.c linux-2.6= .39/drivers/target/target_core_transport.c ---- linux-2.6.39/drivers/target/target_core_transport.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/target/target_core_transport.c 2011-05-22 19:36= :32.000000000 -0400 -@@ -1675,7 +1675,7 @@ struct se_device *transport_add_device_t +diff -urNp linux-2.6.39.1/drivers/target/target_core_transport.c linux-2= .6.39.1/drivers/target/target_core_transport.c +--- linux-2.6.39.1/drivers/target/target_core_transport.c 2011-06-03 00:= 04:14.000000000 -0400 ++++ linux-2.6.39.1/drivers/target/target_core_transport.c 2011-06-03 00:= 32:07.000000000 -0400 +@@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t =20 dev->queue_depth =3D dev_limits->queue_depth; atomic_set(&dev->depth_left, dev->queue_depth); @@ -40438,7 +40462,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv =20 se_dev_set_default_attribs(dev, dev_limits); =20 -@@ -1876,7 +1876,7 @@ static int transport_check_alloc_task_at +@@ -1882,7 +1882,7 @@ static int transport_check_alloc_task_at * Used to determine when ORDERED commands should go from * Dormant to Active status. */ @@ -40447,7 +40471,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv smp_mb__after_atomic_inc(); DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n", cmd->se_ordered_id, cmd->sam_task_attr, -@@ -2156,7 +2156,7 @@ static void transport_generic_request_fa +@@ -2169,7 +2169,7 @@ static void transport_generic_request_fa " t_transport_active: %d t_transport_stop: %d" " t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), @@ -40456,7 +40480,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left), atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), -@@ -2660,9 +2660,9 @@ check_depth: +@@ -2673,9 +2673,9 @@ check_depth: spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags); atomic_set(&task->task_active, 1); atomic_set(&task->task_sent, 1); @@ -40468,7 +40492,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv T_TASK(cmd)->t_task_cdbs) atomic_set(&cmd->transport_sent, 1); =20 -@@ -5549,7 +5549,7 @@ static void transport_generic_wait_for_t +@@ -5568,7 +5568,7 @@ static void transport_generic_wait_for_t atomic_set(&T_TASK(cmd)->transport_lun_stop, 0); } if (!atomic_read(&T_TASK(cmd)->t_transport_active) || @@ -40477,7 +40501,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv goto remove; =20 atomic_set(&T_TASK(cmd)->t_transport_stop, 1); -@@ -5778,7 +5778,7 @@ int transport_check_aborted_status(struc +@@ -5797,7 +5797,7 @@ int transport_check_aborted_status(struc { int ret =3D 0; =20 @@ -40486,7 +40510,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv if (!(send_status) || (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS)) return 1; -@@ -5806,7 +5806,7 @@ void transport_send_task_abort(struct se +@@ -5825,7 +5825,7 @@ void transport_send_task_abort(struct se */ if (cmd->data_direction =3D=3D DMA_TO_DEVICE) { if (CMD_TFO(cmd)->write_pending_status(cmd) !=3D 0) { @@ -40495,7 +40519,7 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv smp_mb__after_atomic_inc(); cmd->scsi_status =3D SAM_STAT_TASK_ABORTED; transport_new_cmd_failure(cmd); -@@ -5930,7 +5930,7 @@ static void transport_processing_shutdow +@@ -5949,7 +5949,7 @@ static void transport_processing_shutdow CMD_TFO(cmd)->get_task_tag(cmd), T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), @@ -40504,9 +40528,9 @@ diff -urNp linux-2.6.39/drivers/target/target_cor= e_transport.c linux-2.6.39/driv atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); -diff -urNp linux-2.6.39/drivers/telephony/ixj.c linux-2.6.39/drivers/tel= ephony/ixj.c ---- linux-2.6.39/drivers/telephony/ixj.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/telephony/ixj.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/telephony/ixj.c linux-2.6.39.1/drivers= /telephony/ixj.c +--- linux-2.6.39.1/drivers/telephony/ixj.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/telephony/ixj.c 2011-05-22 19:36:32.000000000= -0400 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j) bool mContinue; char *pIn, *pOut; @@ -40516,9 +40540,9 @@ diff -urNp linux-2.6.39/drivers/telephony/ixj.c l= inux-2.6.39/drivers/telephony/i if (!SCI_Prepare(j)) return 0; =20 -diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_console.h linux-2.6.39/drive= rs/tty/hvc/hvc_console.h ---- linux-2.6.39/drivers/tty/hvc/hvc_console.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/hvc/hvc_console.h 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/hvc/hvc_console.h linux-2.6.39.1/d= rivers/tty/hvc/hvc_console.h +--- linux-2.6.39.1/drivers/tty/hvc/hvc_console.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/hvc/hvc_console.h 2011-05-22 19:36:32.000= 000000 -0400 @@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter /* register a vterm for hvc tty operation (module_init or hotplug add) = */ extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data, @@ -40527,9 +40551,9 @@ diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_conso= le.h linux-2.6.39/drivers/tty/h /* remove a vterm from hvc tty operation (module_exit or hotplug remove= ) */ extern int hvc_remove(struct hvc_struct *hp); =20 -diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_iucv.c linux-2.6.39/drivers/= tty/hvc/hvc_iucv.c ---- linux-2.6.39/drivers/tty/hvc/hvc_iucv.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/tty/hvc/hvc_iucv.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/hvc/hvc_iucv.c linux-2.6.39.1/driv= ers/tty/hvc/hvc_iucv.c +--- linux-2.6.39.1/drivers/tty/hvc/hvc_iucv.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/tty/hvc/hvc_iucv.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -1203,7 +1203,7 @@ static int param_get_vmidfilter(char *bu =20 #define param_check_vmidfilter(name, p) __param_check(name, p, void) @@ -40539,9 +40563,9 @@ diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_iucv.= c linux-2.6.39/drivers/tty/hvc/ .set =3D param_set_vmidfilter, .get =3D param_get_vmidfilter, }; -diff -urNp linux-2.6.39/drivers/tty/hvc/hvcs.c linux-2.6.39/drivers/tty/= hvc/hvcs.c ---- linux-2.6.39/drivers/tty/hvc/hvcs.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/tty/hvc/hvcs.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/tty/hvc/hvcs.c linux-2.6.39.1/drivers/= tty/hvc/hvcs.c +--- linux-2.6.39.1/drivers/tty/hvc/hvcs.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/tty/hvc/hvcs.c 2011-05-22 19:36:32.000000000 = -0400 @@ -83,6 +83,7 @@ #include #include @@ -40644,9 +40668,9 @@ diff -urNp linux-2.6.39/drivers/tty/hvc/hvcs.c li= nux-2.6.39/drivers/tty/hvc/hvcs return 0; =20 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_xen.c linux-2.6.39/drivers/t= ty/hvc/hvc_xen.c ---- linux-2.6.39/drivers/tty/hvc/hvc_xen.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/tty/hvc/hvc_xen.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/tty/hvc/hvc_xen.c linux-2.6.39.1/drive= rs/tty/hvc/hvc_xen.c +--- linux-2.6.39.1/drivers/tty/hvc/hvc_xen.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/tty/hvc/hvc_xen.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt return recv; } @@ -40683,9 +40707,9 @@ diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_xen.c= linux-2.6.39/drivers/tty/hvc/h =20 if (!xen_pv_domain()) return 0; -diff -urNp linux-2.6.39/drivers/tty/ipwireless/tty.c linux-2.6.39/driver= s/tty/ipwireless/tty.c ---- linux-2.6.39/drivers/tty/ipwireless/tty.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/tty/ipwireless/tty.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/ipwireless/tty.c linux-2.6.39.1/dr= ivers/tty/ipwireless/tty.c +--- linux-2.6.39.1/drivers/tty/ipwireless/tty.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/tty/ipwireless/tty.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -29,6 +29,7 @@ #include #include @@ -40808,9 +40832,9 @@ diff -urNp linux-2.6.39/drivers/tty/ipwireless/tt= y.c linux-2.6.39/drivers/tty/ip do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.39/drivers/tty/mxser.c linux-2.6.39/drivers/tty/mxs= er.c ---- linux-2.6.39/drivers/tty/mxser.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/tty/mxser.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/mxser.c linux-2.6.39.1/drivers/tty= /mxser.c +--- linux-2.6.39.1/drivers/tty/mxser.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/tty/mxser.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -2340,7 +2340,7 @@ static const struct tty_operations mxser .get_icount =3D mxser_get_icount, }; @@ -40820,9 +40844,9 @@ diff -urNp linux-2.6.39/drivers/tty/mxser.c linux= -2.6.39/drivers/tty/mxser.c .carrier_raised =3D mxser_carrier_raised, .dtr_rts =3D mxser_dtr_rts, .activate =3D mxser_activate, -diff -urNp linux-2.6.39/drivers/tty/n_gsm.c linux-2.6.39/drivers/tty/n_g= sm.c ---- linux-2.6.39/drivers/tty/n_gsm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/tty/n_gsm.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/n_gsm.c linux-2.6.39.1/drivers/tty= /n_gsm.c +--- linux-2.6.39.1/drivers/tty/n_gsm.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/tty/n_gsm.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -1588,7 +1588,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s return NULL; spin_lock_init(&dlci->lock); @@ -40832,9 +40856,9 @@ diff -urNp linux-2.6.39/drivers/tty/n_gsm.c linux= -2.6.39/drivers/tty/n_gsm.c kfree(dlci); return NULL; } -diff -urNp linux-2.6.39/drivers/tty/n_tty.c linux-2.6.39/drivers/tty/n_t= ty.c ---- linux-2.6.39/drivers/tty/n_tty.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/tty/n_tty.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/n_tty.c linux-2.6.39.1/drivers/tty= /n_tty.c +--- linux-2.6.39.1/drivers/tty/n_tty.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/tty/n_tty.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -2122,6 +2122,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ { *ops =3D tty_ldisc_N_TTY; @@ -40844,9 +40868,9 @@ diff -urNp linux-2.6.39/drivers/tty/n_tty.c linux= -2.6.39/drivers/tty/n_tty.c + ops->flags =3D 0; } EXPORT_SYMBOL_GPL(n_tty_inherit_ops); -diff -urNp linux-2.6.39/drivers/tty/pty.c linux-2.6.39/drivers/tty/pty.c ---- linux-2.6.39/drivers/tty/pty.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/tty/pty.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/pty.c linux-2.6.39.1/drivers/tty/p= ty.c +--- linux-2.6.39.1/drivers/tty/pty.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/pty.c 2011-05-22 19:36:32.000000000 -0400 @@ -699,7 +699,18 @@ out: return retval; } @@ -40878,9 +40902,9 @@ diff -urNp linux-2.6.39/drivers/tty/pty.c linux-2= .6.39/drivers/tty/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0= ) -diff -urNp linux-2.6.39/drivers/tty/rocket.c linux-2.6.39/drivers/tty/ro= cket.c ---- linux-2.6.39/drivers/tty/rocket.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/tty/rocket.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/tty/rocket.c linux-2.6.39.1/drivers/tt= y/rocket.c +--- linux-2.6.39.1/drivers/tty/rocket.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/tty/rocket.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info struct rocket_ports tmp; int board; @@ -40890,9 +40914,9 @@ diff -urNp linux-2.6.39/drivers/tty/rocket.c linu= x-2.6.39/drivers/tty/rocket.c if (!retports) return -EFAULT; memset(&tmp, 0, sizeof (tmp)); -diff -urNp linux-2.6.39/drivers/tty/serial/21285.c linux-2.6.39/drivers/= tty/serial/21285.c ---- linux-2.6.39/drivers/tty/serial/21285.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/tty/serial/21285.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/21285.c linux-2.6.39.1/driv= ers/tty/serial/21285.c +--- linux-2.6.39.1/drivers/tty/serial/21285.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/21285.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -340,7 +340,7 @@ static int serial21285_verify_port(struc return ret; } @@ -40902,9 +40926,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/21285.= c linux-2.6.39/drivers/tty/seri .tx_empty =3D serial21285_tx_empty, .get_mctrl =3D serial21285_get_mctrl, .set_mctrl =3D serial21285_set_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/8250.c linux-2.6.39/drivers/t= ty/serial/8250.c ---- linux-2.6.39/drivers/tty/serial/8250.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/tty/serial/8250.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/8250.c linux-2.6.39.1/drive= rs/tty/serial/8250.c +--- linux-2.6.39.1/drivers/tty/serial/8250.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/8250.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -2708,7 +2708,7 @@ serial8250_type(struct uart_port *port) return uart_config[type].name; } @@ -40914,9 +40938,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/8250.c= linux-2.6.39/drivers/tty/seria .tx_empty =3D serial8250_tx_empty, .set_mctrl =3D serial8250_set_mctrl, .get_mctrl =3D serial8250_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/altera_jtaguart.c linux-2.6.3= 9/drivers/tty/serial/altera_jtaguart.c ---- linux-2.6.39/drivers/tty/serial/altera_jtaguart.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/altera_jtaguart.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/altera_jtaguart.c linux-2.6= .39.1/drivers/tty/serial/altera_jtaguart.c +--- linux-2.6.39.1/drivers/tty/serial/altera_jtaguart.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/altera_jtaguart.c 2011-05-22 19:36= :32.000000000 -0400 @@ -281,7 +281,7 @@ static int altera_jtaguart_verify_port(s /* * Define the basic serial functions we support. @@ -40926,9 +40950,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/altera= _jtaguart.c linux-2.6.39/driver .tx_empty =3D altera_jtaguart_tx_empty, .get_mctrl =3D altera_jtaguart_get_mctrl, .set_mctrl =3D altera_jtaguart_set_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/altera_uart.c linux-2.6.39/dr= ivers/tty/serial/altera_uart.c ---- linux-2.6.39/drivers/tty/serial/altera_uart.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/altera_uart.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/altera_uart.c linux-2.6.39.= 1/drivers/tty/serial/altera_uart.c +--- linux-2.6.39.1/drivers/tty/serial/altera_uart.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/altera_uart.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -380,7 +380,7 @@ static int altera_uart_verify_port(struc /* * Define the basic serial functions we support. @@ -40938,9 +40962,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/altera= _uart.c linux-2.6.39/drivers/tt .tx_empty =3D altera_uart_tx_empty, .get_mctrl =3D altera_uart_get_mctrl, .set_mctrl =3D altera_uart_set_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/amba-pl010.c linux-2.6.39/dri= vers/tty/serial/amba-pl010.c ---- linux-2.6.39/drivers/tty/serial/amba-pl010.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/amba-pl010.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/amba-pl010.c linux-2.6.39.1= /drivers/tty/serial/amba-pl010.c +--- linux-2.6.39.1/drivers/tty/serial/amba-pl010.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/amba-pl010.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -529,7 +529,7 @@ static int pl010_verify_port(struct uart return ret; } @@ -40950,9 +40974,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/amba-p= l010.c linux-2.6.39/drivers/tty .tx_empty =3D pl010_tx_empty, .set_mctrl =3D pl010_set_mctrl, .get_mctrl =3D pl010_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/amba-pl011.c linux-2.6.39/dri= vers/tty/serial/amba-pl011.c ---- linux-2.6.39/drivers/tty/serial/amba-pl011.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/amba-pl011.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/amba-pl011.c linux-2.6.39.1= /drivers/tty/serial/amba-pl011.c +--- linux-2.6.39.1/drivers/tty/serial/amba-pl011.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/amba-pl011.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -1581,7 +1581,7 @@ static int pl010_verify_port(struct uart return ret; } @@ -40962,9 +40986,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/amba-p= l011.c linux-2.6.39/drivers/tty .tx_empty =3D pl01x_tx_empty, .set_mctrl =3D pl011_set_mctrl, .get_mctrl =3D pl01x_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/apbuart.c linux-2.6.39/driver= s/tty/serial/apbuart.c ---- linux-2.6.39/drivers/tty/serial/apbuart.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/tty/serial/apbuart.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/apbuart.c linux-2.6.39.1/dr= ivers/tty/serial/apbuart.c +--- linux-2.6.39.1/drivers/tty/serial/apbuart.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/apbuart.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -328,7 +328,7 @@ static int apbuart_verify_port(struct ua return ret; } @@ -40974,9 +40998,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/apbuar= t.c linux-2.6.39/drivers/tty/se .tx_empty =3D apbuart_tx_empty, .set_mctrl =3D apbuart_set_mctrl, .get_mctrl =3D apbuart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/atmel_serial.c linux-2.6.39/d= rivers/tty/serial/atmel_serial.c ---- linux-2.6.39/drivers/tty/serial/atmel_serial.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/atmel_serial.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/atmel_serial.c linux-2.6.39= .1/drivers/tty/serial/atmel_serial.c +--- linux-2.6.39.1/drivers/tty/serial/atmel_serial.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/atmel_serial.c 2011-05-22 19:36:32= .000000000 -0400 @@ -1382,7 +1382,7 @@ atmel_ioctl(struct uart_port *port, unsi =20 =20 @@ -40986,9 +41010,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/atmel_= serial.c linux-2.6.39/drivers/t .tx_empty =3D atmel_tx_empty, .set_mctrl =3D atmel_set_mctrl, .get_mctrl =3D atmel_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/bcm63xx_uart.c linux-2.6.39/d= rivers/tty/serial/bcm63xx_uart.c ---- linux-2.6.39/drivers/tty/serial/bcm63xx_uart.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/bcm63xx_uart.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/bcm63xx_uart.c linux-2.6.39= .1/drivers/tty/serial/bcm63xx_uart.c +--- linux-2.6.39.1/drivers/tty/serial/bcm63xx_uart.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/bcm63xx_uart.c 2011-05-22 19:36:32= .000000000 -0400 @@ -636,7 +636,7 @@ static int bcm_uart_verify_port(struct u } =20 @@ -40998,9 +41022,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/bcm63x= x_uart.c linux-2.6.39/drivers/t .tx_empty =3D bcm_uart_tx_empty, .get_mctrl =3D bcm_uart_get_mctrl, .set_mctrl =3D bcm_uart_set_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/bfin_5xx.c linux-2.6.39/drive= rs/tty/serial/bfin_5xx.c ---- linux-2.6.39/drivers/tty/serial/bfin_5xx.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/bfin_5xx.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/bfin_5xx.c linux-2.6.39.1/d= rivers/tty/serial/bfin_5xx.c +--- linux-2.6.39.1/drivers/tty/serial/bfin_5xx.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/bfin_5xx.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1036,7 +1036,7 @@ static int bfin_kgdboc_port_startup(stru } #endif @@ -41010,9 +41034,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/bfin_5= xx.c linux-2.6.39/drivers/tty/s .tx_empty =3D bfin_serial_tx_empty, .set_mctrl =3D bfin_serial_set_mctrl, .get_mctrl =3D bfin_serial_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/bfin_sport_uart.c linux-2.6.3= 9/drivers/tty/serial/bfin_sport_uart.c ---- linux-2.6.39/drivers/tty/serial/bfin_sport_uart.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/bfin_sport_uart.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/bfin_sport_uart.c linux-2.6= .39.1/drivers/tty/serial/bfin_sport_uart.c +--- linux-2.6.39.1/drivers/tty/serial/bfin_sport_uart.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/bfin_sport_uart.c 2011-05-22 19:36= :32.000000000 -0400 @@ -571,7 +571,7 @@ static void sport_set_termios(struct uar spin_unlock_irqrestore(&up->port.lock, flags); } @@ -41022,9 +41046,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/bfin_s= port_uart.c linux-2.6.39/driver .tx_empty =3D sport_tx_empty, .set_mctrl =3D sport_set_mctrl, .get_mctrl =3D sport_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/clps711x.c linux-2.6.39/drive= rs/tty/serial/clps711x.c ---- linux-2.6.39/drivers/tty/serial/clps711x.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/clps711x.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/clps711x.c linux-2.6.39.1/d= rivers/tty/serial/clps711x.c +--- linux-2.6.39.1/drivers/tty/serial/clps711x.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/clps711x.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -380,7 +380,7 @@ static int clps711xuart_request_port(str return 0; } @@ -41034,9 +41058,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/clps71= 1x.c linux-2.6.39/drivers/tty/s .tx_empty =3D clps711xuart_tx_empty, .set_mctrl =3D clps711xuart_set_mctrl_null, .get_mctrl =3D clps711xuart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c linu= x-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c ---- linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-22 = 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/cpm_uart/cpm_uart_core.c li= nux-2.6.39.1/drivers/tty/serial/cpm_uart/cpm_uart_core.c +--- linux-2.6.39.1/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-2= 2 19:36:32.000000000 -0400 @@ -1099,7 +1099,7 @@ static void cpm_put_poll_char(struct uar } #endif /* CONFIG_CONSOLE_POLL */ @@ -41046,9 +41070,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/cpm_ua= rt/cpm_uart_core.c linux-2.6.39 .tx_empty =3D cpm_uart_tx_empty, .set_mctrl =3D cpm_uart_set_mctrl, .get_mctrl =3D cpm_uart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/dz.c linux-2.6.39/drivers/tty= /serial/dz.c ---- linux-2.6.39/drivers/tty/serial/dz.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/tty/serial/dz.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/dz.c linux-2.6.39.1/drivers= /tty/serial/dz.c +--- linux-2.6.39.1/drivers/tty/serial/dz.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/tty/serial/dz.c 2011-05-22 19:36:32.000000000= -0400 @@ -746,7 +746,7 @@ static int dz_verify_port(struct uart_po return ret; } @@ -41058,9 +41082,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/dz.c l= inux-2.6.39/drivers/tty/serial/ .tx_empty =3D dz_tx_empty, .get_mctrl =3D dz_get_mctrl, .set_mctrl =3D dz_set_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/imx.c linux-2.6.39/drivers/tt= y/serial/imx.c ---- linux-2.6.39/drivers/tty/serial/imx.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/tty/serial/imx.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/imx.c linux-2.6.39.1/driver= s/tty/serial/imx.c +--- linux-2.6.39.1/drivers/tty/serial/imx.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/imx.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -1018,7 +1018,7 @@ imx_verify_port(struct uart_port *port,=20 return ret; } @@ -41070,9 +41094,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/imx.c = linux-2.6.39/drivers/tty/serial .tx_empty =3D imx_tx_empty, .set_mctrl =3D imx_set_mctrl, .get_mctrl =3D imx_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/ioc3_serial.c linux-2.6.39/dr= ivers/tty/serial/ioc3_serial.c ---- linux-2.6.39/drivers/tty/serial/ioc3_serial.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/ioc3_serial.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/ioc3_serial.c linux-2.6.39.= 1/drivers/tty/serial/ioc3_serial.c +--- linux-2.6.39.1/drivers/tty/serial/ioc3_serial.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/ioc3_serial.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -1874,7 +1874,7 @@ static int ic3_request_port(struct uart_ } =20 @@ -41082,9 +41106,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/ioc3_s= erial.c linux-2.6.39/drivers/tt .tx_empty =3D ic3_tx_empty, .set_mctrl =3D ic3_set_mctrl, .get_mctrl =3D ic3_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/ioc4_serial.c linux-2.6.39/dr= ivers/tty/serial/ioc4_serial.c ---- linux-2.6.39/drivers/tty/serial/ioc4_serial.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/ioc4_serial.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/ioc4_serial.c linux-2.6.39.= 1/drivers/tty/serial/ioc4_serial.c +--- linux-2.6.39.1/drivers/tty/serial/ioc4_serial.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/ioc4_serial.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -2593,7 +2593,7 @@ static int ic4_request_port(struct uart_ =20 /* Associate the uart functions above - given to serial core */ @@ -41094,9 +41118,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/ioc4_s= erial.c linux-2.6.39/drivers/tt .tx_empty =3D ic4_tx_empty, .set_mctrl =3D ic4_set_mctrl, .get_mctrl =3D ic4_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/ip22zilog.c linux-2.6.39/driv= ers/tty/serial/ip22zilog.c ---- linux-2.6.39/drivers/tty/serial/ip22zilog.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/tty/serial/ip22zilog.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/ip22zilog.c linux-2.6.39.1/= drivers/tty/serial/ip22zilog.c +--- linux-2.6.39.1/drivers/tty/serial/ip22zilog.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/ip22zilog.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -928,7 +928,7 @@ static int ip22zilog_verify_port(struct=20 return -EINVAL; } @@ -41106,9 +41130,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/ip22zi= log.c linux-2.6.39/drivers/tty/ .tx_empty =3D ip22zilog_tx_empty, .set_mctrl =3D ip22zilog_set_mctrl, .get_mctrl =3D ip22zilog_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/kgdboc.c linux-2.6.39/drivers= /tty/serial/kgdboc.c ---- linux-2.6.39/drivers/tty/serial/kgdboc.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/tty/serial/kgdboc.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/kgdboc.c linux-2.6.39.1/dri= vers/tty/serial/kgdboc.c +--- linux-2.6.39.1/drivers/tty/serial/kgdboc.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/kgdboc.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -22,7 +22,7 @@ =20 #define MAX_CONFIG_LEN 40 @@ -41127,9 +41151,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/kgdboc= .c linux-2.6.39/drivers/tty/ser .name =3D "kgdboc", .read_char =3D kgdboc_get_char, .write_char =3D kgdboc_put_char, -diff -urNp linux-2.6.39/drivers/tty/serial/m32r_sio.c linux-2.6.39/drive= rs/tty/serial/m32r_sio.c ---- linux-2.6.39/drivers/tty/serial/m32r_sio.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/m32r_sio.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/m32r_sio.c linux-2.6.39.1/d= rivers/tty/serial/m32r_sio.c +--- linux-2.6.39.1/drivers/tty/serial/m32r_sio.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/m32r_sio.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -939,7 +939,7 @@ m32r_sio_type(struct uart_port *port) return uart_config[type].name; } @@ -41139,9 +41163,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/m32r_s= io.c linux-2.6.39/drivers/tty/s .tx_empty =3D m32r_sio_tx_empty, .set_mctrl =3D m32r_sio_set_mctrl, .get_mctrl =3D m32r_sio_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/max3100.c linux-2.6.39/driver= s/tty/serial/max3100.c ---- linux-2.6.39/drivers/tty/serial/max3100.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/tty/serial/max3100.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/max3100.c linux-2.6.39.1/dr= ivers/tty/serial/max3100.c +--- linux-2.6.39.1/drivers/tty/serial/max3100.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/max3100.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -710,7 +710,7 @@ static void max3100_break_ctl(struct uar dev_dbg(&s->spi->dev, "%s\n", __func__); } @@ -41151,9 +41175,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/max310= 0.c linux-2.6.39/drivers/tty/se .tx_empty =3D max3100_tx_empty, .set_mctrl =3D max3100_set_mctrl, .get_mctrl =3D max3100_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/max3107.c linux-2.6.39/driver= s/tty/serial/max3107.c ---- linux-2.6.39/drivers/tty/serial/max3107.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/tty/serial/max3107.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/max3107.c linux-2.6.39.1/dr= ivers/tty/serial/max3107.c +--- linux-2.6.39.1/drivers/tty/serial/max3107.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/max3107.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -910,7 +910,7 @@ static void max3107_break_ctl(struct uar =20 =20 @@ -41163,9 +41187,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/max310= 7.c linux-2.6.39/drivers/tty/se .tx_empty =3D max3107_tx_empty, .set_mctrl =3D max3107_set_mctrl, .get_mctrl =3D max3107_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/mfd.c linux-2.6.39/drivers/tt= y/serial/mfd.c ---- linux-2.6.39/drivers/tty/serial/mfd.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/tty/serial/mfd.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/mfd.c linux-2.6.39.1/driver= s/tty/serial/mfd.c +--- linux-2.6.39.1/drivers/tty/serial/mfd.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/mfd.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -1178,7 +1178,7 @@ static struct console serial_hsu_console }; #endif @@ -41175,9 +41199,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/mfd.c = linux-2.6.39/drivers/tty/serial .tx_empty =3D serial_hsu_tx_empty, .set_mctrl =3D serial_hsu_set_mctrl, .get_mctrl =3D serial_hsu_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/mpc52xx_uart.c linux-2.6.39/d= rivers/tty/serial/mpc52xx_uart.c ---- linux-2.6.39/drivers/tty/serial/mpc52xx_uart.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/mpc52xx_uart.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/mpc52xx_uart.c linux-2.6.39= .1/drivers/tty/serial/mpc52xx_uart.c +--- linux-2.6.39.1/drivers/tty/serial/mpc52xx_uart.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/mpc52xx_uart.c 2011-05-22 19:36:32= .000000000 -0400 @@ -283,7 +283,7 @@ static irqreturn_t mpc52xx_psc_handle_ir return mpc5xxx_uart_process_int(port); } @@ -41223,9 +41247,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/mpc52x= x_uart.c linux-2.6.39/drivers/t .tx_empty =3D mpc52xx_uart_tx_empty, .set_mctrl =3D mpc52xx_uart_set_mctrl, .get_mctrl =3D mpc52xx_uart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/mpsc.c linux-2.6.39/drivers/t= ty/serial/mpsc.c ---- linux-2.6.39/drivers/tty/serial/mpsc.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/tty/serial/mpsc.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/mpsc.c linux-2.6.39.1/drive= rs/tty/serial/mpsc.c +--- linux-2.6.39.1/drivers/tty/serial/mpsc.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/mpsc.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -1663,7 +1663,7 @@ static void mpsc_put_poll_char(struct ua } #endif @@ -41235,9 +41259,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/mpsc.c= linux-2.6.39/drivers/tty/seria .tx_empty =3D mpsc_tx_empty, .set_mctrl =3D mpsc_set_mctrl, .get_mctrl =3D mpsc_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/mrst_max3110.c linux-2.6.39/d= rivers/tty/serial/mrst_max3110.c ---- linux-2.6.39/drivers/tty/serial/mrst_max3110.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/mrst_max3110.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/mrst_max3110.c linux-2.6.39= .1/drivers/tty/serial/mrst_max3110.c +--- linux-2.6.39.1/drivers/tty/serial/mrst_max3110.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/mrst_max3110.c 2011-05-22 19:36:32= .000000000 -0400 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u int loop =3D 1, num, total =3D 0; u8 recv_buf[512], *pbuf; @@ -41256,9 +41280,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/mrst_m= ax3110.c linux-2.6.39/drivers/t .tx_empty =3D serial_m3110_tx_empty, .set_mctrl =3D serial_m3110_set_mctrl, .get_mctrl =3D serial_m3110_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/msm_serial.c linux-2.6.39/dri= vers/tty/serial/msm_serial.c ---- linux-2.6.39/drivers/tty/serial/msm_serial.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/msm_serial.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/msm_serial.c linux-2.6.39.1= /drivers/tty/serial/msm_serial.c +--- linux-2.6.39.1/drivers/tty/serial/msm_serial.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/msm_serial.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -702,7 +702,7 @@ static void msm_power(struct uart_port * } } @@ -41268,9 +41292,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/msm_se= rial.c linux-2.6.39/drivers/tty .tx_empty =3D msm_tx_empty, .set_mctrl =3D msm_set_mctrl, .get_mctrl =3D msm_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/msm_serial_hs.c linux-2.6.39/= drivers/tty/serial/msm_serial_hs.c ---- linux-2.6.39/drivers/tty/serial/msm_serial_hs.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/msm_serial_hs.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/msm_serial_hs.c linux-2.6.3= 9.1/drivers/tty/serial/msm_serial_hs.c +--- linux-2.6.39.1/drivers/tty/serial/msm_serial_hs.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/msm_serial_hs.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -360,7 +360,7 @@ struct msm_hs_port { static struct msm_hs_port q_uart_port[UARTDM_NR]; static struct platform_driver msm_serial_hs_platform_driver; @@ -41289,9 +41313,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/msm_se= rial_hs.c linux-2.6.39/drivers/ .tx_empty =3D msm_hs_tx_empty, .set_mctrl =3D msm_hs_set_mctrl_locked, .get_mctrl =3D msm_hs_get_mctrl_locked, -diff -urNp linux-2.6.39/drivers/tty/serial/mux.c linux-2.6.39/drivers/tt= y/serial/mux.c ---- linux-2.6.39/drivers/tty/serial/mux.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/tty/serial/mux.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/mux.c linux-2.6.39.1/driver= s/tty/serial/mux.c +--- linux-2.6.39.1/drivers/tty/serial/mux.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/mux.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -442,7 +442,7 @@ static struct console mux_console =3D { #define MUX_CONSOLE NULL #endif @@ -41301,9 +41325,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/mux.c = linux-2.6.39/drivers/tty/serial .tx_empty =3D mux_tx_empty, .set_mctrl =3D mux_set_mctrl, .get_mctrl =3D mux_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/mxs-auart.c linux-2.6.39/driv= ers/tty/serial/mxs-auart.c ---- linux-2.6.39/drivers/tty/serial/mxs-auart.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/tty/serial/mxs-auart.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/mxs-auart.c linux-2.6.39.1/= drivers/tty/serial/mxs-auart.c +--- linux-2.6.39.1/drivers/tty/serial/mxs-auart.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/mxs-auart.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -499,7 +499,7 @@ static void mxs_auart_enable_ms(struct u /* just empty */ } @@ -41313,9 +41337,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/mxs-au= art.c linux-2.6.39/drivers/tty/ .tx_empty =3D mxs_auart_tx_empty, .start_tx =3D mxs_auart_start_tx, .stop_tx =3D mxs_auart_stop_tx, -diff -urNp linux-2.6.39/drivers/tty/serial/netx-serial.c linux-2.6.39/dr= ivers/tty/serial/netx-serial.c ---- linux-2.6.39/drivers/tty/serial/netx-serial.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/netx-serial.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/netx-serial.c linux-2.6.39.= 1/drivers/tty/serial/netx-serial.c +--- linux-2.6.39.1/drivers/tty/serial/netx-serial.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/netx-serial.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -464,7 +464,7 @@ netx_verify_port(struct uart_port *port, return ret; } @@ -41325,9 +41349,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/netx-s= erial.c linux-2.6.39/drivers/tt .tx_empty =3D netx_tx_empty, .set_mctrl =3D netx_set_mctrl, .get_mctrl =3D netx_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/nwpserial.c linux-2.6.39/driv= ers/tty/serial/nwpserial.c ---- linux-2.6.39/drivers/tty/serial/nwpserial.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/tty/serial/nwpserial.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/nwpserial.c linux-2.6.39.1/= drivers/tty/serial/nwpserial.c +--- linux-2.6.39.1/drivers/tty/serial/nwpserial.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/nwpserial.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -303,7 +303,7 @@ static unsigned int nwpserial_tx_empty(s return ret & UART_LSR_TEMT ? TIOCSER_TEMT : 0; } @@ -41337,9 +41361,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/nwpser= ial.c linux-2.6.39/drivers/tty/ .tx_empty =3D nwpserial_tx_empty, .set_mctrl =3D nwpserial_set_mctrl, .get_mctrl =3D nwpserial_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/omap-serial.c linux-2.6.39/dr= ivers/tty/serial/omap-serial.c ---- linux-2.6.39/drivers/tty/serial/omap-serial.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/omap-serial.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/omap-serial.c linux-2.6.39.= 1/drivers/tty/serial/omap-serial.c +--- linux-2.6.39.1/drivers/tty/serial/omap-serial.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/omap-serial.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -1029,7 +1029,7 @@ static inline void serial_omap_add_conso =20 #endif @@ -41349,9 +41373,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/omap-s= erial.c linux-2.6.39/drivers/tt .tx_empty =3D serial_omap_tx_empty, .set_mctrl =3D serial_omap_set_mctrl, .get_mctrl =3D serial_omap_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/pch_uart.c linux-2.6.39/drive= rs/tty/serial/pch_uart.c ---- linux-2.6.39/drivers/tty/serial/pch_uart.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/pch_uart.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/pch_uart.c linux-2.6.39.1/d= rivers/tty/serial/pch_uart.c +--- linux-2.6.39.1/drivers/tty/serial/pch_uart.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/pch_uart.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1351,7 +1351,7 @@ static int pch_uart_verify_port(struct u return 0; } @@ -41361,9 +41385,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/pch_ua= rt.c linux-2.6.39/drivers/tty/s .tx_empty =3D pch_uart_tx_empty, .set_mctrl =3D pch_uart_set_mctrl, .get_mctrl =3D pch_uart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/pmac_zilog.c linux-2.6.39/dri= vers/tty/serial/pmac_zilog.c ---- linux-2.6.39/drivers/tty/serial/pmac_zilog.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/pmac_zilog.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/pmac_zilog.c linux-2.6.39.1= /drivers/tty/serial/pmac_zilog.c +--- linux-2.6.39.1/drivers/tty/serial/pmac_zilog.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/pmac_zilog.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -1427,7 +1427,7 @@ static void pmz_poll_put_char(struct uar =20 #endif /* CONFIG_CONSOLE_POLL */ @@ -41373,9 +41397,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/pmac_z= ilog.c linux-2.6.39/drivers/tty .tx_empty =3D pmz_tx_empty, .set_mctrl =3D pmz_set_mctrl, .get_mctrl =3D pmz_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/pnx8xxx_uart.c linux-2.6.39/d= rivers/tty/serial/pnx8xxx_uart.c ---- linux-2.6.39/drivers/tty/serial/pnx8xxx_uart.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/pnx8xxx_uart.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/pnx8xxx_uart.c linux-2.6.39= .1/drivers/tty/serial/pnx8xxx_uart.c +--- linux-2.6.39.1/drivers/tty/serial/pnx8xxx_uart.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/pnx8xxx_uart.c 2011-05-22 19:36:32= .000000000 -0400 @@ -614,7 +614,7 @@ pnx8xxx_verify_port(struct uart_port *po return ret; } @@ -41385,9 +41409,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/pnx8xx= x_uart.c linux-2.6.39/drivers/t .tx_empty =3D pnx8xxx_tx_empty, .set_mctrl =3D pnx8xxx_set_mctrl, .get_mctrl =3D pnx8xxx_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/pxa.c linux-2.6.39/drivers/tt= y/serial/pxa.c ---- linux-2.6.39/drivers/tty/serial/pxa.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/tty/serial/pxa.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/pxa.c linux-2.6.39.1/driver= s/tty/serial/pxa.c +--- linux-2.6.39.1/drivers/tty/serial/pxa.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/pxa.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -706,7 +706,7 @@ static struct console serial_pxa_console #define PXA_CONSOLE NULL #endif @@ -41397,9 +41421,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/pxa.c = linux-2.6.39/drivers/tty/serial .tx_empty =3D serial_pxa_tx_empty, .set_mctrl =3D serial_pxa_set_mctrl, .get_mctrl =3D serial_pxa_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/sa1100.c linux-2.6.39/drivers= /tty/serial/sa1100.c ---- linux-2.6.39/drivers/tty/serial/sa1100.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/tty/serial/sa1100.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/sa1100.c linux-2.6.39.1/dri= vers/tty/serial/sa1100.c +--- linux-2.6.39.1/drivers/tty/serial/sa1100.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/sa1100.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -577,7 +577,7 @@ sa1100_verify_port(struct uart_port *por return ret; } @@ -41409,9 +41433,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/sa1100= .c linux-2.6.39/drivers/tty/ser .tx_empty =3D sa1100_tx_empty, .set_mctrl =3D sa1100_set_mctrl, .get_mctrl =3D sa1100_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/samsung.c linux-2.6.39/driver= s/tty/serial/samsung.c ---- linux-2.6.39/drivers/tty/serial/samsung.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/tty/serial/samsung.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/samsung.c linux-2.6.39.1/dr= ivers/tty/serial/samsung.c +--- linux-2.6.39.1/drivers/tty/serial/samsung.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/samsung.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -860,7 +860,7 @@ static struct console s3c24xx_serial_con #define S3C24XX_SERIAL_CONSOLE NULL #endif @@ -41421,9 +41445,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/samsun= g.c linux-2.6.39/drivers/tty/se .pm =3D s3c24xx_serial_pm, .tx_empty =3D s3c24xx_serial_tx_empty, .get_mctrl =3D s3c24xx_serial_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/sc26xx.c linux-2.6.39/drivers= /tty/serial/sc26xx.c ---- linux-2.6.39/drivers/tty/serial/sc26xx.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/tty/serial/sc26xx.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/sc26xx.c linux-2.6.39.1/dri= vers/tty/serial/sc26xx.c +--- linux-2.6.39.1/drivers/tty/serial/sc26xx.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/sc26xx.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -515,7 +515,7 @@ static int sc26xx_verify_port(struct uar return -EINVAL; } @@ -41433,9 +41457,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/sc26xx= .c linux-2.6.39/drivers/tty/ser .tx_empty =3D sc26xx_tx_empty, .set_mctrl =3D sc26xx_set_mctrl, .get_mctrl =3D sc26xx_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/serial_ks8695.c linux-2.6.39/= drivers/tty/serial/serial_ks8695.c ---- linux-2.6.39/drivers/tty/serial/serial_ks8695.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/serial_ks8695.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/serial_ks8695.c linux-2.6.3= 9.1/drivers/tty/serial/serial_ks8695.c +--- linux-2.6.39.1/drivers/tty/serial/serial_ks8695.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/serial_ks8695.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -528,7 +528,7 @@ static int ks8695uart_verify_port(struct return ret; } @@ -41445,9 +41469,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/serial= _ks8695.c linux-2.6.39/drivers/ .tx_empty =3D ks8695uart_tx_empty, .set_mctrl =3D ks8695uart_set_mctrl, .get_mctrl =3D ks8695uart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/serial_txx9.c linux-2.6.39/dr= ivers/tty/serial/serial_txx9.c ---- linux-2.6.39/drivers/tty/serial/serial_txx9.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/serial_txx9.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/serial_txx9.c linux-2.6.39.= 1/drivers/tty/serial/serial_txx9.c +--- linux-2.6.39.1/drivers/tty/serial/serial_txx9.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/serial_txx9.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -857,7 +857,7 @@ serial_txx9_type(struct uart_port *port) return "txx9"; } @@ -41457,9 +41481,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/serial= _txx9.c linux-2.6.39/drivers/tt .tx_empty =3D serial_txx9_tx_empty, .set_mctrl =3D serial_txx9_set_mctrl, .get_mctrl =3D serial_txx9_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/sn_console.c linux-2.6.39/dri= vers/tty/serial/sn_console.c ---- linux-2.6.39/drivers/tty/serial/sn_console.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/sn_console.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/sn_console.c linux-2.6.39.1= /drivers/tty/serial/sn_console.c +--- linux-2.6.39.1/drivers/tty/serial/sn_console.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/sn_console.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -388,7 +388,7 @@ static void snp_config_port(struct uart_ =20 /* Associate the uart functions above - given to serial core */ @@ -41469,9 +41493,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/sn_con= sole.c linux-2.6.39/drivers/tty .tx_empty =3D snp_tx_empty, .set_mctrl =3D snp_set_mctrl, .get_mctrl =3D snp_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/sunhv.c linux-2.6.39/drivers/= tty/serial/sunhv.c ---- linux-2.6.39/drivers/tty/serial/sunhv.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/tty/serial/sunhv.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/sunhv.c linux-2.6.39.1/driv= ers/tty/serial/sunhv.c +--- linux-2.6.39.1/drivers/tty/serial/sunhv.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/sunhv.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -168,12 +168,12 @@ struct sunhv_ops { int (*receive_chars)(struct uart_port *port, struct tty_struct *tty); }; @@ -41496,9 +41520,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/sunhv.= c linux-2.6.39/drivers/tty/seri .tx_empty =3D sunhv_tx_empty, .set_mctrl =3D sunhv_set_mctrl, .get_mctrl =3D sunhv_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/sunsab.c linux-2.6.39/drivers= /tty/serial/sunsab.c ---- linux-2.6.39/drivers/tty/serial/sunsab.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/tty/serial/sunsab.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/sunsab.c linux-2.6.39.1/dri= vers/tty/serial/sunsab.c +--- linux-2.6.39.1/drivers/tty/serial/sunsab.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/sunsab.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -804,7 +804,7 @@ static int sunsab_verify_port(struct uar return -EINVAL; } @@ -41508,9 +41532,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/sunsab= .c linux-2.6.39/drivers/tty/ser .tx_empty =3D sunsab_tx_empty, .set_mctrl =3D sunsab_set_mctrl, .get_mctrl =3D sunsab_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/sunsu.c linux-2.6.39/drivers/= tty/serial/sunsu.c ---- linux-2.6.39/drivers/tty/serial/sunsu.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/tty/serial/sunsu.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/sunsu.c linux-2.6.39.1/driv= ers/tty/serial/sunsu.c +--- linux-2.6.39.1/drivers/tty/serial/sunsu.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/sunsu.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -946,7 +946,7 @@ sunsu_type(struct uart_port *port) return uart_config[type].name; } @@ -41520,9 +41544,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/sunsu.= c linux-2.6.39/drivers/tty/seri .tx_empty =3D sunsu_tx_empty, .set_mctrl =3D sunsu_set_mctrl, .get_mctrl =3D sunsu_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/sunzilog.c linux-2.6.39/drive= rs/tty/serial/sunzilog.c ---- linux-2.6.39/drivers/tty/serial/sunzilog.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/sunzilog.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/sunzilog.c linux-2.6.39.1/d= rivers/tty/serial/sunzilog.c +--- linux-2.6.39.1/drivers/tty/serial/sunzilog.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/sunzilog.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1042,7 +1042,7 @@ static void sunzilog_put_poll_char(struc } #endif /* CONFIG_CONSOLE_POLL */ @@ -41532,9 +41556,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/sunzil= og.c linux-2.6.39/drivers/tty/s .tx_empty =3D sunzilog_tx_empty, .set_mctrl =3D sunzilog_set_mctrl, .get_mctrl =3D sunzilog_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/timbuart.c linux-2.6.39/drive= rs/tty/serial/timbuart.c ---- linux-2.6.39/drivers/tty/serial/timbuart.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/timbuart.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/timbuart.c linux-2.6.39.1/d= rivers/tty/serial/timbuart.c +--- linux-2.6.39.1/drivers/tty/serial/timbuart.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/timbuart.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -394,7 +394,7 @@ static int timbuart_verify_port(struct u return -EINVAL; } @@ -41544,9 +41568,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/timbua= rt.c linux-2.6.39/drivers/tty/s .tx_empty =3D timbuart_tx_empty, .set_mctrl =3D timbuart_set_mctrl, .get_mctrl =3D timbuart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/uartlite.c linux-2.6.39/drive= rs/tty/serial/uartlite.c ---- linux-2.6.39/drivers/tty/serial/uartlite.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/uartlite.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/uartlite.c linux-2.6.39.1/d= rivers/tty/serial/uartlite.c +--- linux-2.6.39.1/drivers/tty/serial/uartlite.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/uartlite.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -331,7 +331,7 @@ static void ulite_put_poll_char(struct u } #endif @@ -41556,9 +41580,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/uartli= te.c linux-2.6.39/drivers/tty/s .tx_empty =3D ulite_tx_empty, .set_mctrl =3D ulite_set_mctrl, .get_mctrl =3D ulite_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/ucc_uart.c linux-2.6.39/drive= rs/tty/serial/ucc_uart.c ---- linux-2.6.39/drivers/tty/serial/ucc_uart.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/tty/serial/ucc_uart.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/ucc_uart.c linux-2.6.39.1/d= rivers/tty/serial/ucc_uart.c +--- linux-2.6.39.1/drivers/tty/serial/ucc_uart.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/ucc_uart.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1088,7 +1088,7 @@ static int qe_uart_verify_port(struct ua * * Details on these functions can be found in Documentation/serial/driv= er @@ -41568,9 +41592,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/ucc_ua= rt.c linux-2.6.39/drivers/tty/s .tx_empty =3D qe_uart_tx_empty, .set_mctrl =3D qe_uart_set_mctrl, .get_mctrl =3D qe_uart_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/vr41xx_siu.c linux-2.6.39/dri= vers/tty/serial/vr41xx_siu.c ---- linux-2.6.39/drivers/tty/serial/vr41xx_siu.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/vr41xx_siu.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/vr41xx_siu.c linux-2.6.39.1= /drivers/tty/serial/vr41xx_siu.c +--- linux-2.6.39.1/drivers/tty/serial/vr41xx_siu.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/vr41xx_siu.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -683,7 +683,7 @@ static int siu_verify_port(struct uart_p return 0; } @@ -41580,9 +41604,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/vr41xx= _siu.c linux-2.6.39/drivers/tty .tx_empty =3D siu_tx_empty, .set_mctrl =3D siu_set_mctrl, .get_mctrl =3D siu_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/vt8500_serial.c linux-2.6.39/= drivers/tty/serial/vt8500_serial.c ---- linux-2.6.39/drivers/tty/serial/vt8500_serial.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/tty/serial/vt8500_serial.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/vt8500_serial.c linux-2.6.3= 9.1/drivers/tty/serial/vt8500_serial.c +--- linux-2.6.39.1/drivers/tty/serial/vt8500_serial.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/tty/serial/vt8500_serial.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -519,7 +519,7 @@ static struct console vt8500_console =3D { #define VT8500_CONSOLE NULL #endif @@ -41592,9 +41616,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/vt8500= _serial.c linux-2.6.39/drivers/ .tx_empty =3D vt8500_tx_empty, .set_mctrl =3D vt8500_set_mctrl, .get_mctrl =3D vt8500_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/serial/zs.c linux-2.6.39/drivers/tty= /serial/zs.c ---- linux-2.6.39/drivers/tty/serial/zs.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/tty/serial/zs.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/tty/serial/zs.c linux-2.6.39.1/drivers= /tty/serial/zs.c +--- linux-2.6.39.1/drivers/tty/serial/zs.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/tty/serial/zs.c 2011-05-22 19:36:32.000000000= -0400 @@ -1044,7 +1044,7 @@ static int zs_verify_port(struct uart_po } =20 @@ -41604,9 +41628,9 @@ diff -urNp linux-2.6.39/drivers/tty/serial/zs.c l= inux-2.6.39/drivers/tty/serial/ .tx_empty =3D zs_tx_empty, .set_mctrl =3D zs_set_mctrl, .get_mctrl =3D zs_get_mctrl, -diff -urNp linux-2.6.39/drivers/tty/tty_io.c linux-2.6.39/drivers/tty/tt= y_io.c ---- linux-2.6.39/drivers/tty/tty_io.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/tty/tty_io.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/tty/tty_io.c linux-2.6.39.1/drivers/tt= y/tty_io.c +--- linux-2.6.39.1/drivers/tty/tty_io.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/tty/tty_io.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -139,21 +139,11 @@ EXPORT_SYMBOL(tty_mutex); /* Spinlock to protect the tty->tty_files list */ DEFINE_SPINLOCK(tty_files_lock); @@ -41744,9 +41768,9 @@ diff -urNp linux-2.6.39/drivers/tty/tty_io.c linu= x-2.6.39/drivers/tty/tty_io.c /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.39/drivers/tty/tty_ldisc.c linux-2.6.39/drivers/tty= /tty_ldisc.c ---- linux-2.6.39/drivers/tty/tty_ldisc.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/tty/tty_ldisc.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/tty/tty_ldisc.c linux-2.6.39.1/drivers= /tty/tty_ldisc.c +--- linux-2.6.39.1/drivers/tty/tty_ldisc.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/tty/tty_ldisc.c 2011-05-22 19:36:32.000000000= -0400 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo =3D ld->ops; @@ -41792,9 +41816,9 @@ diff -urNp linux-2.6.39/drivers/tty/tty_ldisc.c l= inux-2.6.39/drivers/tty/tty_ldi module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.39/drivers/tty/vt/keyboard.c linux-2.6.39/drivers/t= ty/vt/keyboard.c ---- linux-2.6.39/drivers/tty/vt/keyboard.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/tty/vt/keyboard.c 2011-05-22 20:32:43.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/tty/vt/keyboard.c linux-2.6.39.1/drive= rs/tty/vt/keyboard.c +--- linux-2.6.39.1/drivers/tty/vt/keyboard.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/tty/vt/keyboard.c 2011-05-22 20:32:43.0000000= 00 -0400 @@ -658,6 +658,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode =3D=3D VC_OFF) && value !=3D KVAL(K_SAK)) @@ -41812,9 +41836,9 @@ diff -urNp linux-2.6.39/drivers/tty/vt/keyboard.c= linux-2.6.39/drivers/tty/vt/ke fn_handler[value](vc); } =20 -diff -urNp linux-2.6.39/drivers/tty/vt/vt.c linux-2.6.39/drivers/tty/vt/= vt.c ---- linux-2.6.39/drivers/tty/vt/vt.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/tty/vt/vt.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/tty/vt/vt.c linux-2.6.39.1/drivers/tty= /vt/vt.c +--- linux-2.6.39.1/drivers/tty/vt/vt.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/drivers/tty/vt/vt.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -261,7 +261,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier =20 static void notify_write(struct vc_data *vc, unsigned int unicode) @@ -41824,9 +41848,9 @@ diff -urNp linux-2.6.39/drivers/tty/vt/vt.c linux= -2.6.39/drivers/tty/vt/vt.c atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } =20 -diff -urNp linux-2.6.39/drivers/tty/vt/vt_ioctl.c linux-2.6.39/drivers/t= ty/vt/vt_ioctl.c ---- linux-2.6.39/drivers/tty/vt/vt_ioctl.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/tty/vt/vt_ioctl.c 2011-05-22 19:41:37.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/tty/vt/vt_ioctl.c linux-2.6.39.1/drive= rs/tty/vt/vt_ioctl.c +--- linux-2.6.39.1/drivers/tty/vt/vt_ioctl.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/tty/vt/vt_ioctl.c 2011-05-22 19:41:37.0000000= 00 -0400 @@ -209,9 +209,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -41867,9 +41891,9 @@ diff -urNp linux-2.6.39/drivers/tty/vt/vt_ioctl.c= linux-2.6.39/drivers/tty/vt/vt if (!perm) { ret =3D -EPERM; goto reterr; -diff -urNp linux-2.6.39/drivers/uio/uio.c linux-2.6.39/drivers/uio/uio.c ---- linux-2.6.39/drivers/uio/uio.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/drivers/uio/uio.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/uio/uio.c linux-2.6.39.1/drivers/uio/u= io.c +--- linux-2.6.39.1/drivers/uio/uio.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/uio/uio.c 2011-05-22 19:36:32.000000000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -41961,9 +41985,9 @@ diff -urNp linux-2.6.39/drivers/uio/uio.c linux-2= .6.39/drivers/uio/uio.c =20 ret =3D uio_get_minor(idev); if (ret) -diff -urNp linux-2.6.39/drivers/usb/atm/cxacru.c linux-2.6.39/drivers/us= b/atm/cxacru.c ---- linux-2.6.39/drivers/usb/atm/cxacru.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/usb/atm/cxacru.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/usb/atm/cxacru.c linux-2.6.39.1/driver= s/usb/atm/cxacru.c +--- linux-2.6.39.1/drivers/usb/atm/cxacru.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/usb/atm/cxacru.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c ret =3D sscanf(buf + pos, "%x=3D%x%n", &index, &value, &tmp); if (ret < 2) @@ -41973,9 +41997,9 @@ diff -urNp linux-2.6.39/drivers/usb/atm/cxacru.c = linux-2.6.39/drivers/usb/atm/cx return -EINVAL; pos +=3D tmp; =20 -diff -urNp linux-2.6.39/drivers/usb/atm/usbatm.c linux-2.6.39/drivers/us= b/atm/usbatm.c ---- linux-2.6.39/drivers/usb/atm/usbatm.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/drivers/usb/atm/usbatm.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/drivers/usb/atm/usbatm.c linux-2.6.39.1/driver= s/usb/atm/usbatm.c +--- linux-2.6.39.1/drivers/usb/atm/usbatm.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/drivers/usb/atm/usbatm.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -42055,9 +42079,9 @@ diff -urNp linux-2.6.39/drivers/usb/atm/usbatm.c = linux-2.6.39/drivers/usb/atm/us =20 if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.39/drivers/usb/core/devices.c linux-2.6.39/drivers/= usb/core/devices.c ---- linux-2.6.39/drivers/usb/core/devices.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/usb/core/devices.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/core/devices.c linux-2.6.39.1/driv= ers/usb/core/devices.c +--- linux-2.6.39.1/drivers/usb/core/devices.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/usb/core/devices.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -126,7 +126,7 @@ static const char *format_endpt =3D * time it gets called. */ @@ -42085,10 +42109,10 @@ diff -urNp linux-2.6.39/drivers/usb/core/device= s.c linux-2.6.39/drivers/usb/core if (file->f_version !=3D event_count) { file->f_version =3D event_count; return POLLIN | POLLRDNORM; -diff -urNp linux-2.6.39/drivers/usb/core/hcd.c linux-2.6.39/drivers/usb/= core/hcd.c ---- linux-2.6.39/drivers/usb/core/hcd.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/usb/core/hcd.c 2011-05-22 19:36:32.000000000 -0= 400 -@@ -2577,7 +2577,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd +diff -urNp linux-2.6.39.1/drivers/usb/core/hcd.c linux-2.6.39.1/drivers/= usb/core/hcd.c +--- linux-2.6.39.1/drivers/usb/core/hcd.c 2011-06-03 00:04:14.000000000 = -0400 ++++ linux-2.6.39.1/drivers/usb/core/hcd.c 2011-06-03 00:32:07.000000000 = -0400 +@@ -2574,7 +2574,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd =20 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) =20 @@ -42097,7 +42121,7 @@ diff -urNp linux-2.6.39/drivers/usb/core/hcd.c li= nux-2.6.39/drivers/usb/core/hcd =20 /* * The registration is unlocked. -@@ -2587,7 +2587,7 @@ struct usb_mon_operations *mon_ops; +@@ -2584,7 +2584,7 @@ struct usb_mon_operations *mon_ops; * symbols from usbcore, usbcore gets referenced and cannot be unloaded= first. */ =20 @@ -42106,9 +42130,9 @@ diff -urNp linux-2.6.39/drivers/usb/core/hcd.c li= nux-2.6.39/drivers/usb/core/hcd { =20 if (mon_ops) -diff -urNp linux-2.6.39/drivers/usb/core/message.c linux-2.6.39/drivers/= usb/core/message.c ---- linux-2.6.39/drivers/usb/core/message.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/usb/core/message.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/core/message.c linux-2.6.39.1/driv= ers/usb/core/message.c +--- linux-2.6.39.1/drivers/usb/core/message.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/usb/core/message.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device buf =3D kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -42120,9 +42144,9 @@ diff -urNp linux-2.6.39/drivers/usb/core/message.= c linux-2.6.39/drivers/usb/core if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.39/drivers/usb/early/ehci-dbgp.c linux-2.6.39/drive= rs/usb/early/ehci-dbgp.c ---- linux-2.6.39/drivers/usb/early/ehci-dbgp.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/usb/early/ehci-dbgp.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/early/ehci-dbgp.c linux-2.6.39.1/d= rivers/usb/early/ehci-dbgp.c +--- linux-2.6.39.1/drivers/usb/early/ehci-dbgp.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/usb/early/ehci-dbgp.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x, } =20 @@ -42141,9 +42165,9 @@ diff -urNp linux-2.6.39/drivers/usb/early/ehci-db= gp.c linux-2.6.39/drivers/usb/e .name =3D "kgdbdbgp", .read_char =3D kgdbdbgp_read_char, .write_char =3D kgdbdbgp_write_char, -diff -urNp linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c linux-2.6.39/dri= vers/usb/gadget/fsl_qe_udc.c ---- linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/fsl_qe_udc.c linux-2.6.39.1= /drivers/usb/gadget/fsl_qe_udc.c +--- linux-2.6.39.1/drivers/usb/gadget/fsl_qe_udc.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/fsl_qe_udc.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -1859,7 +1859,7 @@ out: return status; } @@ -42162,9 +42186,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/fsl_qe= _udc.c linux-2.6.39/drivers/usb .get_frame =3D qe_get_frame, .wakeup =3D qe_wakeup, /* .set_selfpowered =3D qe_set_selfpowered,*/ /* always selfpowered */ -diff -urNp linux-2.6.39/drivers/usb/gadget/fsl_udc_core.c linux-2.6.39/d= rivers/usb/gadget/fsl_udc_core.c ---- linux-2.6.39/drivers/usb/gadget/fsl_udc_core.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/fsl_udc_core.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/fsl_udc_core.c linux-2.6.39= .1/drivers/usb/gadget/fsl_udc_core.c +--- linux-2.6.39.1/drivers/usb/gadget/fsl_udc_core.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/fsl_udc_core.c 2011-05-22 19:36:32= .000000000 -0400 @@ -1003,7 +1003,7 @@ static void fsl_ep_fifo_flush(struct usb } while (fsl_readl(&dr_regs->endptstatus) & bits); } @@ -42183,9 +42207,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/fsl_ud= c_core.c linux-2.6.39/drivers/u .get_frame =3D fsl_get_frame, .wakeup =3D fsl_wakeup, /* .set_selfpowered =3D fsl_set_selfpowered, */ /* Always selfpowered *= / -diff -urNp linux-2.6.39/drivers/usb/gadget/fusb300_udc.c linux-2.6.39/dr= ivers/usb/gadget/fusb300_udc.c ---- linux-2.6.39/drivers/usb/gadget/fusb300_udc.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/fusb300_udc.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/fusb300_udc.c linux-2.6.39.= 1/drivers/usb/gadget/fusb300_udc.c +--- linux-2.6.39.1/drivers/usb/gadget/fusb300_udc.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/fusb300_udc.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -527,7 +527,7 @@ static void fusb300_fifo_flush(struct us { } @@ -42204,9 +42228,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/fusb30= 0_udc.c linux-2.6.39/drivers/us .pullup =3D fusb300_udc_pullup, }; =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/goku_udc.c linux-2.6.39/drive= rs/usb/gadget/goku_udc.c ---- linux-2.6.39/drivers/usb/gadget/goku_udc.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/goku_udc.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/goku_udc.c linux-2.6.39.1/d= rivers/usb/gadget/goku_udc.c +--- linux-2.6.39.1/drivers/usb/gadget/goku_udc.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/goku_udc.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -973,7 +973,7 @@ static void goku_fifo_flush(struct usb_e command(regs, COMMAND_FIFO_CLEAR, ep->num); } @@ -42216,9 +42240,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/goku_u= dc.c linux-2.6.39/drivers/usb/g .enable =3D goku_ep_enable, .disable =3D goku_ep_disable, =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/imx_udc.c linux-2.6.39/driver= s/usb/gadget/imx_udc.c ---- linux-2.6.39/drivers/usb/gadget/imx_udc.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/imx_udc.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/imx_udc.c linux-2.6.39.1/dr= ivers/usb/gadget/imx_udc.c +--- linux-2.6.39.1/drivers/usb/gadget/imx_udc.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/imx_udc.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -937,7 +937,7 @@ static void imx_ep_fifo_flush(struct usb local_irq_restore(flags); } @@ -42228,9 +42252,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/imx_ud= c.c linux-2.6.39/drivers/usb/ga .enable =3D imx_ep_enable, .disable =3D imx_ep_disable, =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/m66592-udc.c linux-2.6.39/dri= vers/usb/gadget/m66592-udc.c ---- linux-2.6.39/drivers/usb/gadget/m66592-udc.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/m66592-udc.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/m66592-udc.c linux-2.6.39.1= /drivers/usb/gadget/m66592-udc.c +--- linux-2.6.39.1/drivers/usb/gadget/m66592-udc.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/m66592-udc.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -1437,7 +1437,7 @@ static void m66592_fifo_flush(struct usb spin_unlock_irqrestore(&ep->m66592->lock, flags); } @@ -42249,9 +42273,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/m66592= -udc.c linux-2.6.39/drivers/usb .get_frame =3D m66592_get_frame, }; =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/mv_udc_core.c linux-2.6.39/dr= ivers/usb/gadget/mv_udc_core.c ---- linux-2.6.39/drivers/usb/gadget/mv_udc_core.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/mv_udc_core.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/mv_udc_core.c linux-2.6.39.= 1/drivers/usb/gadget/mv_udc_core.c +--- linux-2.6.39.1/drivers/usb/gadget/mv_udc_core.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/mv_udc_core.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -972,7 +972,7 @@ static int mv_ep_set_wedge(struct usb_ep return mv_ep_set_halt_wedge(_ep, 1, 1); } @@ -42261,9 +42285,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/mv_udc= _core.c linux-2.6.39/drivers/us .enable =3D mv_ep_enable, .disable =3D mv_ep_disable, =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/omap_udc.c linux-2.6.39/drive= rs/usb/gadget/omap_udc.c ---- linux-2.6.39/drivers/usb/gadget/omap_udc.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/omap_udc.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/omap_udc.c linux-2.6.39.1/d= rivers/usb/gadget/omap_udc.c +--- linux-2.6.39.1/drivers/usb/gadget/omap_udc.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/omap_udc.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -1177,7 +1177,7 @@ done: return status; } @@ -42282,9 +42306,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/omap_u= dc.c linux-2.6.39/drivers/usb/g .get_frame =3D omap_get_frame, .wakeup =3D omap_wakeup, .set_selfpowered =3D omap_set_selfpowered, -diff -urNp linux-2.6.39/drivers/usb/gadget/pxa25x_udc.c linux-2.6.39/dri= vers/usb/gadget/pxa25x_udc.c ---- linux-2.6.39/drivers/usb/gadget/pxa25x_udc.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/pxa25x_udc.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/pxa25x_udc.c linux-2.6.39.1= /drivers/usb/gadget/pxa25x_udc.c +--- linux-2.6.39.1/drivers/usb/gadget/pxa25x_udc.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/pxa25x_udc.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -896,7 +896,7 @@ static void pxa25x_ep_fifo_flush(struct=20 } =20 @@ -42294,9 +42318,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/pxa25x= _udc.c linux-2.6.39/drivers/usb .enable =3D pxa25x_ep_enable, .disable =3D pxa25x_ep_disable, =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/pxa27x_udc.c linux-2.6.39/dri= vers/usb/gadget/pxa27x_udc.c ---- linux-2.6.39/drivers/usb/gadget/pxa27x_udc.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/pxa27x_udc.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/pxa27x_udc.c linux-2.6.39.1= /drivers/usb/gadget/pxa27x_udc.c +--- linux-2.6.39.1/drivers/usb/gadget/pxa27x_udc.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/pxa27x_udc.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -1491,7 +1491,7 @@ static int pxa_ep_disable(struct usb_ep=20 return 0; } @@ -42306,9 +42330,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/pxa27x= _udc.c linux-2.6.39/drivers/usb .enable =3D pxa_ep_enable, .disable =3D pxa_ep_disable, =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/r8a66597-udc.c linux-2.6.39/d= rivers/usb/gadget/r8a66597-udc.c ---- linux-2.6.39/drivers/usb/gadget/r8a66597-udc.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/r8a66597-udc.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/r8a66597-udc.c linux-2.6.39= .1/drivers/usb/gadget/r8a66597-udc.c +--- linux-2.6.39.1/drivers/usb/gadget/r8a66597-udc.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/r8a66597-udc.c 2011-05-22 19:36:32= .000000000 -0400 @@ -1392,7 +1392,7 @@ static void r8a66597_fifo_flush(struct u spin_unlock_irqrestore(&ep->r8a66597->lock, flags); } @@ -42327,9 +42351,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/r8a665= 97-udc.c linux-2.6.39/drivers/u .get_frame =3D r8a66597_get_frame, }; =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/s3c-hsotg.c linux-2.6.39/driv= ers/usb/gadget/s3c-hsotg.c ---- linux-2.6.39/drivers/usb/gadget/s3c-hsotg.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/s3c-hsotg.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/s3c-hsotg.c linux-2.6.39.1/= drivers/usb/gadget/s3c-hsotg.c +--- linux-2.6.39.1/drivers/usb/gadget/s3c-hsotg.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/s3c-hsotg.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -2461,7 +2461,7 @@ static int s3c_hsotg_ep_sethalt(struct u return 0; } @@ -42348,9 +42372,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/s3c-hs= otg.c linux-2.6.39/drivers/usb/ .get_frame =3D s3c_hsotg_gadget_getframe, }; =20 -diff -urNp linux-2.6.39/drivers/usb/gadget/uvc_queue.c linux-2.6.39/driv= ers/usb/gadget/uvc_queue.c ---- linux-2.6.39/drivers/usb/gadget/uvc_queue.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/usb/gadget/uvc_queue.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/gadget/uvc_queue.c linux-2.6.39.1/= drivers/usb/gadget/uvc_queue.c +--- linux-2.6.39.1/drivers/usb/gadget/uvc_queue.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/usb/gadget/uvc_queue.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -400,7 +400,7 @@ static void uvc_vm_close(struct vm_area_ buffer->vma_use_count--; } @@ -42360,9 +42384,9 @@ diff -urNp linux-2.6.39/drivers/usb/gadget/uvc_qu= eue.c linux-2.6.39/drivers/usb/ .open =3D uvc_vm_open, .close =3D uvc_vm_close, }; -diff -urNp linux-2.6.39/drivers/usb/host/ehci-fsl.c linux-2.6.39/drivers= /usb/host/ehci-fsl.c ---- linux-2.6.39/drivers/usb/host/ehci-fsl.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/usb/host/ehci-fsl.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/host/ehci-fsl.c linux-2.6.39.1/dri= vers/usb/host/ehci-fsl.c +--- linux-2.6.39.1/drivers/usb/host/ehci-fsl.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/usb/host/ehci-fsl.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -380,7 +380,7 @@ static int ehci_fsl_drv_restore(struct d return 0; } @@ -42372,10 +42396,10 @@ diff -urNp linux-2.6.39/drivers/usb/host/ehci-f= sl.c linux-2.6.39/drivers/usb/hos .suspend =3D ehci_fsl_drv_suspend, .resume =3D ehci_fsl_drv_resume, .restore =3D ehci_fsl_drv_restore, -diff -urNp linux-2.6.39/drivers/usb/host/xhci-mem.c linux-2.6.39/drivers= /usb/host/xhci-mem.c ---- linux-2.6.39/drivers/usb/host/xhci-mem.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/usb/host/xhci-mem.c 2011-05-22 19:36:32.0000000= 00 -0400 -@@ -1671,6 +1671,8 @@ static int xhci_check_trb_in_td_math(str +diff -urNp linux-2.6.39.1/drivers/usb/host/xhci-mem.c linux-2.6.39.1/dri= vers/usb/host/xhci-mem.c +--- linux-2.6.39.1/drivers/usb/host/xhci-mem.c 2011-06-03 00:04:14.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/usb/host/xhci-mem.c 2011-06-03 00:32:07.00000= 0000 -0400 +@@ -1670,6 +1670,8 @@ static int xhci_check_trb_in_td_math(str unsigned int num_tests; int i, ret; =20 @@ -42384,9 +42408,9 @@ diff -urNp linux-2.6.39/drivers/usb/host/xhci-mem= .c linux-2.6.39/drivers/usb/hos num_tests =3D ARRAY_SIZE(simple_test_vector); for (i =3D 0; i < num_tests; i++) { ret =3D xhci_test_trb_in_td(xhci, -diff -urNp linux-2.6.39/drivers/usb/mon/mon_main.c linux-2.6.39/drivers/= usb/mon/mon_main.c ---- linux-2.6.39/drivers/usb/mon/mon_main.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/usb/mon/mon_main.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/mon/mon_main.c linux-2.6.39.1/driv= ers/usb/mon/mon_main.c +--- linux-2.6.39.1/drivers/usb/mon/mon_main.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/usb/mon/mon_main.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb =3D { /* * Ops @@ -42396,9 +42420,9 @@ diff -urNp linux-2.6.39/drivers/usb/mon/mon_main.= c linux-2.6.39/drivers/usb/mon/ .urb_submit =3D mon_submit, .urb_submit_error =3D mon_submit_error, .urb_complete =3D mon_complete, -diff -urNp linux-2.6.39/drivers/usb/musb/cppi_dma.h linux-2.6.39/drivers= /usb/musb/cppi_dma.h ---- linux-2.6.39/drivers/usb/musb/cppi_dma.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/usb/musb/cppi_dma.h 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/musb/cppi_dma.h linux-2.6.39.1/dri= vers/usb/musb/cppi_dma.h +--- linux-2.6.39.1/drivers/usb/musb/cppi_dma.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/usb/musb/cppi_dma.h 2011-05-22 19:36:32.00000= 0000 -0400 @@ -113,7 +113,7 @@ struct cppi_channel { =20 /* CPPI DMA controller object */ @@ -42408,9 +42432,9 @@ diff -urNp linux-2.6.39/drivers/usb/musb/cppi_dma= .h linux-2.6.39/drivers/usb/mus struct musb *musb; void __iomem *mregs; /* Mentor regs */ void __iomem *tibase; /* TI/CPPI regs */ -diff -urNp linux-2.6.39/drivers/usb/otg/msm_otg.c linux-2.6.39/drivers/u= sb/otg/msm_otg.c ---- linux-2.6.39/drivers/usb/otg/msm_otg.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/drivers/usb/otg/msm_otg.c 2011-05-22 19:36:32.000000000= -0400 +diff -urNp linux-2.6.39.1/drivers/usb/otg/msm_otg.c linux-2.6.39.1/drive= rs/usb/otg/msm_otg.c +--- linux-2.6.39.1/drivers/usb/otg/msm_otg.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/drivers/usb/otg/msm_otg.c 2011-05-22 19:36:32.0000000= 00 -0400 @@ -95,7 +95,7 @@ static int ulpi_write(struct otg_transce return 0; } @@ -42420,9 +42444,9 @@ diff -urNp linux-2.6.39/drivers/usb/otg/msm_otg.c= linux-2.6.39/drivers/usb/otg/m .read =3D ulpi_read, .write =3D ulpi_write, }; -diff -urNp linux-2.6.39/drivers/usb/otg/ulpi_viewport.c linux-2.6.39/dri= vers/usb/otg/ulpi_viewport.c ---- linux-2.6.39/drivers/usb/otg/ulpi_viewport.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/usb/otg/ulpi_viewport.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/otg/ulpi_viewport.c linux-2.6.39.1= /drivers/usb/otg/ulpi_viewport.c +--- linux-2.6.39.1/drivers/usb/otg/ulpi_viewport.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/usb/otg/ulpi_viewport.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -74,7 +74,7 @@ static int ulpi_viewport_write(struct ot return ulpi_viewport_wait(view, ULPI_VIEW_RUN); } @@ -42432,9 +42456,9 @@ diff -urNp linux-2.6.39/drivers/usb/otg/ulpi_view= port.c linux-2.6.39/drivers/usb .read =3D ulpi_viewport_read, .write =3D ulpi_viewport_write, }; -diff -urNp linux-2.6.39/drivers/usb/serial/ftdi_sio.c linux-2.6.39/drive= rs/usb/serial/ftdi_sio.c ---- linux-2.6.39/drivers/usb/serial/ftdi_sio.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/usb/serial/ftdi_sio.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/serial/ftdi_sio.c linux-2.6.39.1/d= rivers/usb/serial/ftdi_sio.c +--- linux-2.6.39.1/drivers/usb/serial/ftdi_sio.c 2011-06-03 00:04:14.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/usb/serial/ftdi_sio.c 2011-06-03 00:32:07.000= 000000 -0400 @@ -104,27 +104,27 @@ static int ftdi_stmclite_probe(struct=20 static void ftdi_USB_UIRT_setup(struct ftdi_private *priv); static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv); @@ -42469,9 +42493,9 @@ diff -urNp linux-2.6.39/drivers/usb/serial/ftdi_s= io.c linux-2.6.39/drivers/usb/s .probe =3D ftdi_stmclite_probe, }; =20 -diff -urNp linux-2.6.39/drivers/usb/wusbcore/wa-hc.h linux-2.6.39/driver= s/usb/wusbcore/wa-hc.h ---- linux-2.6.39/drivers/usb/wusbcore/wa-hc.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/drivers/usb/wusbcore/wa-hc.h 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/wusbcore/wa-hc.h linux-2.6.39.1/dr= ivers/usb/wusbcore/wa-hc.h +--- linux-2.6.39.1/drivers/usb/wusbcore/wa-hc.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/drivers/usb/wusbcore/wa-hc.h 2011-05-22 19:36:32.0000= 00000 -0400 @@ -192,7 +192,7 @@ struct wahc { struct list_head xfer_delayed_list; spinlock_t xfer_list_lock; @@ -42490,9 +42514,9 @@ diff -urNp linux-2.6.39/drivers/usb/wusbcore/wa-h= c.h linux-2.6.39/drivers/usb/wu } =20 /** -diff -urNp linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c linux-2.6.39/driv= ers/usb/wusbcore/wa-xfer.c ---- linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/drivers/usb/wusbcore/wa-xfer.c linux-2.6.39.1/= drivers/usb/wusbcore/wa-xfer.c +--- linux-2.6.39.1/drivers/usb/wusbcore/wa-xfer.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/drivers/usb/wusbcore/wa-xfer.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -294,7 +294,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) @@ -42502,9 +42526,9 @@ diff -urNp linux-2.6.39/drivers/usb/wusbcore/wa-x= fer.c linux-2.6.39/drivers/usb/ } =20 /* -diff -urNp linux-2.6.39/drivers/vhost/vhost.c linux-2.6.39/drivers/vhost= /vhost.c ---- linux-2.6.39/drivers/vhost/vhost.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/vhost/vhost.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/vhost/vhost.c linux-2.6.39.1/drivers/v= host/vhost.c +--- linux-2.6.39.1/drivers/vhost/vhost.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/vhost/vhost.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -580,7 +580,7 @@ static int init_used(struct vhost_virtqu return get_user(vq->last_used_idx, &used->idx); } @@ -42514,9 +42538,9 @@ diff -urNp linux-2.6.39/drivers/vhost/vhost.c lin= ux-2.6.39/drivers/vhost/vhost.c { struct file *eventfp, *filep =3D NULL, *pollstart =3D NULL, *pollstop =3D NULL; -diff -urNp linux-2.6.39/drivers/video/backlight/corgi_lcd.c linux-2.6.39= /drivers/video/backlight/corgi_lcd.c ---- linux-2.6.39/drivers/video/backlight/corgi_lcd.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/corgi_lcd.c 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/corgi_lcd.c linux-2.6.= 39.1/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.39.1/drivers/video/backlight/corgi_lcd.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/corgi_lcd.c 2011-05-22 19:36:= 32.000000000 -0400 @@ -383,7 +383,7 @@ static int corgi_lcd_get_power(struct lc return lcd->power; } @@ -42526,9 +42550,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/c= orgi_lcd.c linux-2.6.39/drivers .get_power =3D corgi_lcd_get_power, .set_power =3D corgi_lcd_set_power, .set_mode =3D corgi_lcd_set_mode, -diff -urNp linux-2.6.39/drivers/video/backlight/cr_bllcd.c linux-2.6.39/= drivers/video/backlight/cr_bllcd.c ---- linux-2.6.39/drivers/video/backlight/cr_bllcd.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/cr_bllcd.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/cr_bllcd.c linux-2.6.3= 9.1/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.39.1/drivers/video/backlight/cr_bllcd.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/cr_bllcd.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -165,7 +165,7 @@ static int cr_lcd_set_power(struct lcd_d return 0; } @@ -42538,9 +42562,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/c= r_bllcd.c linux-2.6.39/drivers/ .set_power =3D cr_lcd_set_power, }; =20 -diff -urNp linux-2.6.39/drivers/video/backlight/ili9320.c linux-2.6.39/d= rivers/video/backlight/ili9320.c ---- linux-2.6.39/drivers/video/backlight/ili9320.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/ili9320.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/ili9320.c linux-2.6.39= .1/drivers/video/backlight/ili9320.c +--- linux-2.6.39.1/drivers/video/backlight/ili9320.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/ili9320.c 2011-05-22 19:36:32= .000000000 -0400 @@ -166,7 +166,7 @@ static int ili9320_get_power(struct lcd_ return lcd->power; } @@ -42550,9 +42574,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/i= li9320.c linux-2.6.39/drivers/v .get_power =3D ili9320_get_power, .set_power =3D ili9320_set_power, }; -diff -urNp linux-2.6.39/drivers/video/backlight/jornada720_lcd.c linux-2= .6.39/drivers/video/backlight/jornada720_lcd.c ---- linux-2.6.39/drivers/video/backlight/jornada720_lcd.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/jornada720_lcd.c 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/jornada720_lcd.c linux= -2.6.39.1/drivers/video/backlight/jornada720_lcd.c +--- linux-2.6.39.1/drivers/video/backlight/jornada720_lcd.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/jornada720_lcd.c 2011-05-22 1= 9:36:32.000000000 -0400 @@ -87,7 +87,7 @@ static int jornada_lcd_set_power(struct=20 return 0; } @@ -42562,9 +42586,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/j= ornada720_lcd.c linux-2.6.39/dr .get_contrast =3D jornada_lcd_get_contrast, .set_contrast =3D jornada_lcd_set_contrast, .get_power =3D jornada_lcd_get_power, -diff -urNp linux-2.6.39/drivers/video/backlight/l4f00242t03.c linux-2.6.= 39/drivers/video/backlight/l4f00242t03.c ---- linux-2.6.39/drivers/video/backlight/l4f00242t03.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/l4f00242t03.c 2011-05-22 19:36:= 32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/l4f00242t03.c linux-2.= 6.39.1/drivers/video/backlight/l4f00242t03.c +--- linux-2.6.39.1/drivers/video/backlight/l4f00242t03.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/l4f00242t03.c 2011-05-22 19:3= 6:32.000000000 -0400 @@ -149,7 +149,7 @@ static int l4f00242t03_lcd_power_set(str return 0; } @@ -42574,9 +42598,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/l= 4f00242t03.c linux-2.6.39/drive .set_power =3D l4f00242t03_lcd_power_set, .get_power =3D l4f00242t03_lcd_power_get, }; -diff -urNp linux-2.6.39/drivers/video/backlight/lcd.c linux-2.6.39/drive= rs/video/backlight/lcd.c ---- linux-2.6.39/drivers/video/backlight/lcd.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/video/backlight/lcd.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/lcd.c linux-2.6.39.1/d= rivers/video/backlight/lcd.c +--- linux-2.6.39.1/drivers/video/backlight/lcd.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/lcd.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -192,7 +192,7 @@ static struct device_attribute lcd_devic * or a pointer to the newly allocated device. */ @@ -42586,9 +42610,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/l= cd.c linux-2.6.39/drivers/video { struct lcd_device *new_ld; int rc; -diff -urNp linux-2.6.39/drivers/video/backlight/ld9040.c linux-2.6.39/dr= ivers/video/backlight/ld9040.c ---- linux-2.6.39/drivers/video/backlight/ld9040.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/ld9040.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/ld9040.c linux-2.6.39.= 1/drivers/video/backlight/ld9040.c +--- linux-2.6.39.1/drivers/video/backlight/ld9040.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/ld9040.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -651,7 +651,7 @@ static int ld9040_set_brightness(struct=20 return ret; } @@ -42598,9 +42622,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/l= d9040.c linux-2.6.39/drivers/vi .set_power =3D ld9040_set_power, .get_power =3D ld9040_get_power, }; -diff -urNp linux-2.6.39/drivers/video/backlight/lms283gf05.c linux-2.6.3= 9/drivers/video/backlight/lms283gf05.c ---- linux-2.6.39/drivers/video/backlight/lms283gf05.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/lms283gf05.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/lms283gf05.c linux-2.6= .39.1/drivers/video/backlight/lms283gf05.c +--- linux-2.6.39.1/drivers/video/backlight/lms283gf05.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/lms283gf05.c 2011-05-22 19:36= :32.000000000 -0400 @@ -144,7 +144,7 @@ static int lms283gf05_power_set(struct l return 0; } @@ -42610,9 +42634,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/l= ms283gf05.c linux-2.6.39/driver .set_power =3D lms283gf05_power_set, .get_power =3D NULL, }; -diff -urNp linux-2.6.39/drivers/video/backlight/ltv350qv.c linux-2.6.39/= drivers/video/backlight/ltv350qv.c ---- linux-2.6.39/drivers/video/backlight/ltv350qv.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/ltv350qv.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/ltv350qv.c linux-2.6.3= 9.1/drivers/video/backlight/ltv350qv.c +--- linux-2.6.39.1/drivers/video/backlight/ltv350qv.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/ltv350qv.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -221,7 +221,7 @@ static int ltv350qv_get_power(struct lcd return lcd->power; } @@ -42622,9 +42646,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/l= tv350qv.c linux-2.6.39/drivers/ .get_power =3D ltv350qv_get_power, .set_power =3D ltv350qv_set_power, }; -diff -urNp linux-2.6.39/drivers/video/backlight/platform_lcd.c linux-2.6= .39/drivers/video/backlight/platform_lcd.c ---- linux-2.6.39/drivers/video/backlight/platform_lcd.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/platform_lcd.c 2011-05-22 19:36= :32.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/platform_lcd.c linux-2= .6.39.1/drivers/video/backlight/platform_lcd.c +--- linux-2.6.39.1/drivers/video/backlight/platform_lcd.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/platform_lcd.c 2011-05-22 19:= 36:32.000000000 -0400 @@ -66,7 +66,7 @@ static int platform_lcd_match(struct lcd return plcd->us->parent =3D=3D info->device; } @@ -42634,9 +42658,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/p= latform_lcd.c linux-2.6.39/driv .get_power =3D platform_lcd_get_power, .set_power =3D platform_lcd_set_power, .check_fb =3D platform_lcd_match, -diff -urNp linux-2.6.39/drivers/video/backlight/s6e63m0.c linux-2.6.39/d= rivers/video/backlight/s6e63m0.c ---- linux-2.6.39/drivers/video/backlight/s6e63m0.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/s6e63m0.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/s6e63m0.c linux-2.6.39= .1/drivers/video/backlight/s6e63m0.c +--- linux-2.6.39.1/drivers/video/backlight/s6e63m0.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/s6e63m0.c 2011-05-22 19:36:32= .000000000 -0400 @@ -644,7 +644,7 @@ static int s6e63m0_set_brightness(struct return ret; } @@ -42646,9 +42670,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/s= 6e63m0.c linux-2.6.39/drivers/v .set_power =3D s6e63m0_set_power, .get_power =3D s6e63m0_get_power, }; -diff -urNp linux-2.6.39/drivers/video/backlight/tdo24m.c linux-2.6.39/dr= ivers/video/backlight/tdo24m.c ---- linux-2.6.39/drivers/video/backlight/tdo24m.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/tdo24m.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/tdo24m.c linux-2.6.39.= 1/drivers/video/backlight/tdo24m.c +--- linux-2.6.39.1/drivers/video/backlight/tdo24m.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/tdo24m.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -322,7 +322,7 @@ static int tdo24m_set_mode(struct lcd_de return lcd->adj_mode(lcd, mode); } @@ -42658,9 +42682,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/t= do24m.c linux-2.6.39/drivers/vi .get_power =3D tdo24m_get_power, .set_power =3D tdo24m_set_power, .set_mode =3D tdo24m_set_mode, -diff -urNp linux-2.6.39/drivers/video/backlight/tosa_lcd.c linux-2.6.39/= drivers/video/backlight/tosa_lcd.c ---- linux-2.6.39/drivers/video/backlight/tosa_lcd.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/video/backlight/tosa_lcd.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/backlight/tosa_lcd.c linux-2.6.3= 9.1/drivers/video/backlight/tosa_lcd.c +--- linux-2.6.39.1/drivers/video/backlight/tosa_lcd.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/backlight/tosa_lcd.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -163,7 +163,7 @@ static int tosa_lcd_set_mode(struct lcd_ return 0; } @@ -42670,9 +42694,9 @@ diff -urNp linux-2.6.39/drivers/video/backlight/t= osa_lcd.c linux-2.6.39/drivers/ .set_power =3D tosa_lcd_set_power, .get_power =3D tosa_lcd_get_power, .set_mode =3D tosa_lcd_set_mode, -diff -urNp linux-2.6.39/drivers/video/bf537-lq035.c linux-2.6.39/drivers= /video/bf537-lq035.c ---- linux-2.6.39/drivers/video/bf537-lq035.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/video/bf537-lq035.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/video/bf537-lq035.c linux-2.6.39.1/dri= vers/video/bf537-lq035.c +--- linux-2.6.39.1/drivers/video/bf537-lq035.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/video/bf537-lq035.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -682,7 +682,7 @@ static int bfin_lcd_check_fb(struct lcd_ return 0; } @@ -42682,9 +42706,9 @@ diff -urNp linux-2.6.39/drivers/video/bf537-lq035= .c linux-2.6.39/drivers/video/b .get_power =3D bfin_lcd_get_power, .set_power =3D bfin_lcd_set_power, .get_contrast =3D bfin_lcd_get_contrast, -diff -urNp linux-2.6.39/drivers/video/bf54x-lq043fb.c linux-2.6.39/drive= rs/video/bf54x-lq043fb.c ---- linux-2.6.39/drivers/video/bf54x-lq043fb.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/video/bf54x-lq043fb.c 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/bf54x-lq043fb.c linux-2.6.39.1/d= rivers/video/bf54x-lq043fb.c +--- linux-2.6.39.1/drivers/video/bf54x-lq043fb.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/video/bf54x-lq043fb.c 2011-05-22 19:36:32.000= 000000 -0400 @@ -467,7 +467,7 @@ static int bfin_lcd_check_fb(struct lcd_ return 0; } @@ -42694,9 +42718,9 @@ diff -urNp linux-2.6.39/drivers/video/bf54x-lq043= fb.c linux-2.6.39/drivers/video .get_power =3D bfin_lcd_get_power, .set_power =3D bfin_lcd_set_power, .get_contrast =3D bfin_lcd_get_contrast, -diff -urNp linux-2.6.39/drivers/video/bfin-t350mcqb-fb.c linux-2.6.39/dr= ivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.39/drivers/video/bfin-t350mcqb-fb.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/video/bfin-t350mcqb-fb.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/bfin-t350mcqb-fb.c linux-2.6.39.= 1/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.39.1/drivers/video/bfin-t350mcqb-fb.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/video/bfin-t350mcqb-fb.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -387,7 +387,7 @@ static int bfin_lcd_check_fb(struct lcd_ return 0; } @@ -42706,9 +42730,9 @@ diff -urNp linux-2.6.39/drivers/video/bfin-t350mc= qb-fb.c linux-2.6.39/drivers/vi .get_power =3D bfin_lcd_get_power, .set_power =3D bfin_lcd_set_power, .get_contrast =3D bfin_lcd_get_contrast, -diff -urNp linux-2.6.39/drivers/video/fbcmap.c linux-2.6.39/drivers/vide= o/fbcmap.c ---- linux-2.6.39/drivers/video/fbcmap.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/video/fbcmap.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/video/fbcmap.c linux-2.6.39.1/drivers/= video/fbcmap.c +--- linux-2.6.39.1/drivers/video/fbcmap.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/video/fbcmap.c 2011-05-22 19:36:32.000000000 = -0400 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc =3D -ENODEV; goto out; @@ -42719,9 +42743,9 @@ diff -urNp linux-2.6.39/drivers/video/fbcmap.c li= nux-2.6.39/drivers/video/fbcmap rc =3D -EINVAL; goto out1; } -diff -urNp linux-2.6.39/drivers/video/fbmem.c linux-2.6.39/drivers/video= /fbmem.c ---- linux-2.6.39/drivers/video/fbmem.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/video/fbmem.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/video/fbmem.c linux-2.6.39.1/drivers/v= ideo/fbmem.c +--- linux-2.6.39.1/drivers/video/fbmem.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/video/fbmem.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in image->dx +=3D image->width + 8; } @@ -42767,9 +42791,9 @@ diff -urNp linux-2.6.39/drivers/video/fbmem.c lin= ux-2.6.39/drivers/video/fbmem.c return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.39/drivers/video/geode/display_gx1.c linux-2.6.39/d= rivers/video/geode/display_gx1.c ---- linux-2.6.39/drivers/video/geode/display_gx1.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/video/geode/display_gx1.c 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/geode/display_gx1.c linux-2.6.39= .1/drivers/video/geode/display_gx1.c +--- linux-2.6.39.1/drivers/video/geode/display_gx1.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/video/geode/display_gx1.c 2011-05-22 19:36:32= .000000000 -0400 @@ -208,7 +208,7 @@ static void gx1_set_hw_palette_reg(struc writel(val, par->dc_regs + DC_PAL_DATA); } @@ -42779,9 +42803,9 @@ diff -urNp linux-2.6.39/drivers/video/geode/displ= ay_gx1.c linux-2.6.39/drivers/v .set_mode =3D gx1_set_mode, .set_palette_reg =3D gx1_set_hw_palette_reg, }; -diff -urNp linux-2.6.39/drivers/video/geode/display_gx1.h linux-2.6.39/d= rivers/video/geode/display_gx1.h ---- linux-2.6.39/drivers/video/geode/display_gx1.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/drivers/video/geode/display_gx1.h 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/geode/display_gx1.h linux-2.6.39= .1/drivers/video/geode/display_gx1.h +--- linux-2.6.39.1/drivers/video/geode/display_gx1.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/drivers/video/geode/display_gx1.h 2011-05-22 19:36:32= .000000000 -0400 @@ -18,7 +18,7 @@ unsigned gx1_gx_base(void); int gx1_frame_buffer_size(void); @@ -42791,9 +42815,9 @@ diff -urNp linux-2.6.39/drivers/video/geode/displ= ay_gx1.h linux-2.6.39/drivers/v =20 /* GX1 configuration I/O registers */ =20 -diff -urNp linux-2.6.39/drivers/video/geode/geodefb.h linux-2.6.39/drive= rs/video/geode/geodefb.h ---- linux-2.6.39/drivers/video/geode/geodefb.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/drivers/video/geode/geodefb.h 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/geode/geodefb.h linux-2.6.39.1/d= rivers/video/geode/geodefb.h +--- linux-2.6.39.1/drivers/video/geode/geodefb.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/drivers/video/geode/geodefb.h 2011-05-22 19:36:32.000= 000000 -0400 @@ -31,8 +31,8 @@ struct geodefb_par { int panel_y; void __iomem *dc_regs; @@ -42805,9 +42829,9 @@ diff -urNp linux-2.6.39/drivers/video/geode/geode= fb.h linux-2.6.39/drivers/video }; =20 #endif /* !__GEODEFB_H__ */ -diff -urNp linux-2.6.39/drivers/video/geode/video_cs5530.c linux-2.6.39/= drivers/video/geode/video_cs5530.c ---- linux-2.6.39/drivers/video/geode/video_cs5530.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/video/geode/video_cs5530.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/geode/video_cs5530.c linux-2.6.3= 9.1/drivers/video/geode/video_cs5530.c +--- linux-2.6.39.1/drivers/video/geode/video_cs5530.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/geode/video_cs5530.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -186,7 +186,7 @@ static int cs5530_blank_display(struct f return 0; } @@ -42817,9 +42841,9 @@ diff -urNp linux-2.6.39/drivers/video/geode/video= _cs5530.c linux-2.6.39/drivers/ .set_dclk =3D cs5530_set_dclk_frequency, .configure_display =3D cs5530_configure_display, .blank_display =3D cs5530_blank_display, -diff -urNp linux-2.6.39/drivers/video/geode/video_cs5530.h linux-2.6.39/= drivers/video/geode/video_cs5530.h ---- linux-2.6.39/drivers/video/geode/video_cs5530.h 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/video/geode/video_cs5530.h 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/geode/video_cs5530.h linux-2.6.3= 9.1/drivers/video/geode/video_cs5530.h +--- linux-2.6.39.1/drivers/video/geode/video_cs5530.h 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/geode/video_cs5530.h 2011-05-22 19:36:3= 2.000000000 -0400 @@ -15,7 +15,7 @@ #ifndef __VIDEO_CS5530_H__ #define __VIDEO_CS5530_H__ @@ -42829,9 +42853,9 @@ diff -urNp linux-2.6.39/drivers/video/geode/video= _cs5530.h linux-2.6.39/drivers/ =20 /* CS5530 Video device registers */ =20 -diff -urNp linux-2.6.39/drivers/video/i810/i810_accel.c linux-2.6.39/dri= vers/video/i810/i810_accel.c ---- linux-2.6.39/drivers/video/i810/i810_accel.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/video/i810/i810_accel.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/i810/i810_accel.c linux-2.6.39.1= /drivers/video/i810/i810_accel.c +--- linux-2.6.39.1/drivers/video/i810/i810_accel.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/video/i810/i810_accel.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct=20 } } @@ -42840,9 +42864,9 @@ diff -urNp linux-2.6.39/drivers/video/i810/i810_a= ccel.c linux-2.6.39/drivers/vid i810_report_error(mmio);=20 par->dev_flags |=3D LOCKUP; info->pixmap.scan_align =3D 1; -diff -urNp linux-2.6.39/drivers/video/matrox/matroxfb_base.c linux-2.6.3= 9/drivers/video/matrox/matroxfb_base.c ---- linux-2.6.39/drivers/video/matrox/matroxfb_base.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/drivers/video/matrox/matroxfb_base.c 2011-05-22 19:36:3= 2.000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/matrox/matroxfb_base.c linux-2.6= .39.1/drivers/video/matrox/matroxfb_base.c +--- linux-2.6.39.1/drivers/video/matrox/matroxfb_base.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/matrox/matroxfb_base.c 2011-05-22 19:36= :32.000000000 -0400 @@ -1232,7 +1232,7 @@ static struct fb_ops matroxfb_ops =3D { #define RSText 0x7 #define RSText8 0x8 @@ -42852,9 +42876,9 @@ diff -urNp linux-2.6.39/drivers/video/matrox/matr= oxfb_base.c linux-2.6.39/driver { { 0, 8, 0}, { 0, 8, 0}, { 0, 8, 0}, { 0, 0, 0}, 8 }, { { 10, 5, 0}, { 5, 5, 0}, { 0, 5, 0}, { 15, 1, 0}, 16 }, { { 11, 5, 0}, { 5, 6, 0}, { 0, 5, 0}, { 0, 0, 0}, 16 }, -diff -urNp linux-2.6.39/drivers/video/omap/lcd_ams_delta.c linux-2.6.39/= drivers/video/omap/lcd_ams_delta.c ---- linux-2.6.39/drivers/video/omap/lcd_ams_delta.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/drivers/video/omap/lcd_ams_delta.c 2011-05-22 19:36:32.= 000000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/omap/lcd_ams_delta.c linux-2.6.3= 9.1/drivers/video/omap/lcd_ams_delta.c +--- linux-2.6.39.1/drivers/video/omap/lcd_ams_delta.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/drivers/video/omap/lcd_ams_delta.c 2011-05-22 19:36:3= 2.000000000 -0400 @@ -87,7 +87,7 @@ static int ams_delta_lcd_get_contrast(st return ams_delta_lcd & AMS_DELTA_MAX_CONTRAST; } @@ -42864,9 +42888,9 @@ diff -urNp linux-2.6.39/drivers/video/omap/lcd_am= s_delta.c linux-2.6.39/drivers/ .get_power =3D ams_delta_lcd_get_power, .set_power =3D ams_delta_lcd_set_power, .get_contrast =3D ams_delta_lcd_get_contrast, -diff -urNp linux-2.6.39/drivers/video/pxa3xx-gcu.c linux-2.6.39/drivers/= video/pxa3xx-gcu.c ---- linux-2.6.39/drivers/video/pxa3xx-gcu.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/drivers/video/pxa3xx-gcu.c 2011-05-22 19:36:32.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/drivers/video/pxa3xx-gcu.c linux-2.6.39.1/driv= ers/video/pxa3xx-gcu.c +--- linux-2.6.39.1/drivers/video/pxa3xx-gcu.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/drivers/video/pxa3xx-gcu.c 2011-05-22 19:36:32.000000= 000 -0400 @@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv { dma_addr_t shared_phys; struct resource *resource_mem; @@ -42876,9 +42900,9 @@ diff -urNp linux-2.6.39/drivers/video/pxa3xx-gcu.= c linux-2.6.39/drivers/video/px wait_queue_head_t wait_idle; wait_queue_head_t wait_free; spinlock_t spinlock; -diff -urNp linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c linux-2.6.39/dr= ivers/video/sh_mobile_lcdcfb.c ---- linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/drivers/video/sh_mobile_lcdcfb.c linux-2.6.39.= 1/drivers/video/sh_mobile_lcdcfb.c +--- linux-2.6.39.1/drivers/video/sh_mobile_lcdcfb.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/drivers/video/sh_mobile_lcdcfb.c 2011-05-22 19:36:32.= 000000000 -0400 @@ -245,7 +245,7 @@ static unsigned long lcdc_sys_read_data( return lcdc_read(ch->lcdc, _LDDRDR) & 0x3ffff; } @@ -42888,9 +42912,9 @@ diff -urNp linux-2.6.39/drivers/video/sh_mobile_l= cdcfb.c linux-2.6.39/drivers/vi lcdc_sys_write_index, lcdc_sys_write_data, lcdc_sys_read_data, -diff -urNp linux-2.6.39/drivers/video/udlfb.c linux-2.6.39/drivers/video= /udlfb.c ---- linux-2.6.39/drivers/video/udlfb.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/drivers/video/udlfb.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/drivers/video/udlfb.c linux-2.6.39.1/drivers/v= ideo/udlfb.c +--- linux-2.6.39.1/drivers/video/udlfb.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/drivers/video/udlfb.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data=20 dlfb_urb_completion(urb); =20 @@ -42974,9 +42998,9 @@ diff -urNp linux-2.6.39/drivers/video/udlfb.c lin= ux-2.6.39/drivers/video/udlfb.c =20 return count; } -diff -urNp linux-2.6.39/drivers/video/uvesafb.c linux-2.6.39/drivers/vid= eo/uvesafb.c ---- linux-2.6.39/drivers/video/uvesafb.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/drivers/video/uvesafb.c 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/drivers/video/uvesafb.c linux-2.6.39.1/drivers= /video/uvesafb.c +--- linux-2.6.39.1/drivers/video/uvesafb.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/drivers/video/uvesafb.c 2011-05-22 19:36:32.000000000= -0400 @@ -19,6 +19,7 @@ #include #include @@ -43061,9 +43085,9 @@ diff -urNp linux-2.6.39/drivers/video/uvesafb.c l= inux-2.6.39/drivers/video/uvesa .set =3D param_set_scroll, }; #define param_check_scroll(name, p) __param_check(name, p, void) -diff -urNp linux-2.6.39/drivers/video/vesafb.c linux-2.6.39/drivers/vide= o/vesafb.c ---- linux-2.6.39/drivers/video/vesafb.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/video/vesafb.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/video/vesafb.c linux-2.6.39.1/drivers/= video/vesafb.c +--- linux-2.6.39.1/drivers/video/vesafb.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/video/vesafb.c 2011-05-22 19:36:32.000000000 = -0400 @@ -9,6 +9,7 @@ */ =20 @@ -43167,9 +43191,9 @@ diff -urNp linux-2.6.39/drivers/video/vesafb.c li= nux-2.6.39/drivers/video/vesafb if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.39/drivers/virtio/virtio_balloon.c linux-2.6.39/dri= vers/virtio/virtio_balloon.c ---- linux-2.6.39/drivers/virtio/virtio_balloon.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/drivers/virtio/virtio_balloon.c 2011-05-22 19:36:32.000= 000000 -0400 +diff -urNp linux-2.6.39.1/drivers/virtio/virtio_balloon.c linux-2.6.39.1= /drivers/virtio/virtio_balloon.c +--- linux-2.6.39.1/drivers/virtio/virtio_balloon.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/drivers/virtio/virtio_balloon.c 2011-05-22 19:36:32.0= 00000000 -0400 @@ -176,6 +176,8 @@ static void update_balloon_stats(struct=20 struct sysinfo i; int idx =3D 0; @@ -43179,9 +43203,9 @@ diff -urNp linux-2.6.39/drivers/virtio/virtio_bal= loon.c linux-2.6.39/drivers/vir all_vm_events(events); si_meminfo(&i); =20 -diff -urNp linux-2.6.39/drivers/xen/gntalloc.c linux-2.6.39/drivers/xen/= gntalloc.c ---- linux-2.6.39/drivers/xen/gntalloc.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/drivers/xen/gntalloc.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/drivers/xen/gntalloc.c linux-2.6.39.1/drivers/= xen/gntalloc.c +--- linux-2.6.39.1/drivers/xen/gntalloc.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/drivers/xen/gntalloc.c 2011-05-22 19:36:32.000000000 = -0400 @@ -440,7 +440,7 @@ static void gntalloc_vma_close(struct vm spin_unlock(&gref_lock); } @@ -43191,9 +43215,9 @@ diff -urNp linux-2.6.39/drivers/xen/gntalloc.c li= nux-2.6.39/drivers/xen/gntalloc .close =3D gntalloc_vma_close, }; =20 -diff -urNp linux-2.6.39/drivers/xen/gntdev.c linux-2.6.39/drivers/xen/gn= tdev.c ---- linux-2.6.39/drivers/xen/gntdev.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/drivers/xen/gntdev.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/drivers/xen/gntdev.c linux-2.6.39.1/drivers/xe= n/gntdev.c +--- linux-2.6.39.1/drivers/xen/gntdev.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/drivers/xen/gntdev.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -340,7 +340,7 @@ static void gntdev_vma_close(struct vm_a gntdev_put_map(map); } @@ -43212,9 +43236,9 @@ diff -urNp linux-2.6.39/drivers/xen/gntdev.c linu= x-2.6.39/drivers/xen/gntdev.c .release =3D mn_release, .invalidate_page =3D mn_invl_page, .invalidate_range_start =3D mn_invl_range_start, -diff -urNp linux-2.6.39/drivers/xen/xenfs/privcmd.c linux-2.6.39/drivers= /xen/xenfs/privcmd.c ---- linux-2.6.39/drivers/xen/xenfs/privcmd.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/drivers/xen/xenfs/privcmd.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/drivers/xen/xenfs/privcmd.c linux-2.6.39.1/dri= vers/xen/xenfs/privcmd.c +--- linux-2.6.39.1/drivers/xen/xenfs/privcmd.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/drivers/xen/xenfs/privcmd.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -268,7 +268,7 @@ static int mmap_return_errors(void *data return put_user(*mfnp, st->user++); } @@ -43233,9 +43257,9 @@ diff -urNp linux-2.6.39/drivers/xen/xenfs/privcmd= .c linux-2.6.39/drivers/xen/xen .fault =3D privcmd_fault }; =20 -diff -urNp linux-2.6.39/fs/9p/vfs_inode.c linux-2.6.39/fs/9p/vfs_inode.c ---- linux-2.6.39/fs/9p/vfs_inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/9p/vfs_inode.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/9p/vfs_inode.c linux-2.6.39.1/fs/9p/vfs_ino= de.c +--- linux-2.6.39.1/fs/9p/vfs_inode.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/9p/vfs_inode.c 2011-05-22 19:36:32.000000000 -0400 @@ -1210,7 +1210,7 @@ static void *v9fs_vfs_follow_link(struct void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -43245,9 +43269,9 @@ diff -urNp linux-2.6.39/fs/9p/vfs_inode.c linux-2= .6.39/fs/9p/vfs_inode.c =20 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "" : s); -diff -urNp linux-2.6.39/fs/aio.c linux-2.6.39/fs/aio.c ---- linux-2.6.39/fs/aio.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/aio.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/aio.c linux-2.6.39.1/fs/aio.c +--- linux-2.6.39.1/fs/aio.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/aio.c 2011-06-03 01:00:34.000000000 -0400 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx=20 size +=3D sizeof(struct io_event) * nr_events; nr_pages =3D (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -43266,9 +43290,39 @@ diff -urNp linux-2.6.39/fs/aio.c linux-2.6.39/fs= /aio.c /* needed to zero any padding within an entry (there shouldn't be=20 * any, but C is fun! */ -diff -urNp linux-2.6.39/fs/attr.c linux-2.6.39/fs/attr.c ---- linux-2.6.39/fs/attr.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/attr.c 2011-05-22 19:41:37.000000000 -0400 +@@ -1381,22 +1383,27 @@ static ssize_t aio_fsync(struct kiocb *i + static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, boo= l compat) + { + ssize_t ret; ++ struct iovec iovstack; +=20 + #ifdef CONFIG_COMPAT + if (compat) + ret =3D compat_rw_copy_check_uvector(type, + (struct compat_iovec __user *)kiocb->ki_buf, +- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec, ++ kiocb->ki_nbytes, 1, &iovstack, + &kiocb->ki_iovec); + else + #endif + ret =3D rw_copy_check_uvector(type, + (struct iovec __user *)kiocb->ki_buf, +- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec, ++ kiocb->ki_nbytes, 1, &iovstack, + &kiocb->ki_iovec); + if (ret < 0) + goto out; +=20 ++ if (kiocb->ki_iovec =3D=3D &iovstack) { ++ kiocb->ki_inline_vec =3D iovstack; ++ kiocb->ki_iovec =3D &kiocb->ki_inline_vec; ++ } + kiocb->ki_nr_segs =3D kiocb->ki_nbytes; + kiocb->ki_cur_seg =3D 0; + /* ki_nbytes/left now reflect bytes instead of segs */ +diff -urNp linux-2.6.39.1/fs/attr.c linux-2.6.39.1/fs/attr.c +--- linux-2.6.39.1/fs/attr.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/attr.c 2011-05-22 19:41:37.000000000 -0400 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode=20 unsigned long limit; =20 @@ -43277,9 +43331,9 @@ diff -urNp linux-2.6.39/fs/attr.c linux-2.6.39/fs= /attr.c if (limit !=3D RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.39/fs/befs/linuxvfs.c linux-2.6.39/fs/befs/linuxvfs= .c ---- linux-2.6.39/fs/befs/linuxvfs.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/befs/linuxvfs.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/befs/linuxvfs.c linux-2.6.39.1/fs/befs/linu= xvfs.c +--- linux-2.6.39.1/fs/befs/linuxvfs.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/befs/linuxvfs.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -498,7 +498,7 @@ static void befs_put_link(struct dentry=20 { befs_inode_info *befs_ino =3D BEFS_I(dentry->d_inode); @@ -43289,9 +43343,9 @@ diff -urNp linux-2.6.39/fs/befs/linuxvfs.c linux-= 2.6.39/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.39/fs/binfmt_aout.c linux-2.6.39/fs/binfmt_aout.c ---- linux-2.6.39/fs/binfmt_aout.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/binfmt_aout.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/binfmt_aout.c linux-2.6.39.1/fs/binfmt_aout= .c +--- linux-2.6.39.1/fs/binfmt_aout.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/binfmt_aout.c 2011-05-22 19:41:37.000000000 -0400 @@ -16,6 +16,7 @@ #include #include @@ -43368,9 +43422,9 @@ diff -urNp linux-2.6.39/fs/binfmt_aout.c linux-2.= 6.39/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.39/fs/binfmt_elf.c linux-2.6.39/fs/binfmt_elf.c ---- linux-2.6.39/fs/binfmt_elf.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/binfmt_elf.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/binfmt_elf.c linux-2.6.39.1/fs/binfmt_elf.c +--- linux-2.6.39.1/fs/binfmt_elf.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/binfmt_elf.c 2011-05-22 19:41:37.000000000 -0400 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump #define elf_core_dump NULL #endif @@ -44074,9 +44128,9 @@ diff -urNp linux-2.6.39/fs/binfmt_elf.c linux-2.6= .39/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.39/fs/binfmt_flat.c linux-2.6.39/fs/binfmt_flat.c ---- linux-2.6.39/fs/binfmt_flat.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/binfmt_flat.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/binfmt_flat.c linux-2.6.39.1/fs/binfmt_flat= .c +--- linux-2.6.39.1/fs/binfmt_flat.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/binfmt_flat.c 2011-05-22 19:36:32.000000000 -0400 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b realdatastart =3D (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -44109,9 +44163,9 @@ diff -urNp linux-2.6.39/fs/binfmt_flat.c linux-2.= 6.39/fs/binfmt_flat.c ret =3D result; goto err; } -diff -urNp linux-2.6.39/fs/bio.c linux-2.6.39/fs/bio.c ---- linux-2.6.39/fs/bio.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/bio.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/bio.c linux-2.6.39.1/fs/bio.c +--- linux-2.6.39.1/fs/bio.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/bio.c 2011-05-22 19:36:32.000000000 -0400 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b const int read =3D bio_data_dir(bio) =3D=3D READ; struct bio_map_data *bmd =3D bio->bi_private; @@ -44121,9 +44175,9 @@ diff -urNp linux-2.6.39/fs/bio.c linux-2.6.39/fs/= bio.c =20 __bio_for_each_segment(bvec, bio, i, 0) { char *addr =3D page_address(bvec->bv_page); -diff -urNp linux-2.6.39/fs/block_dev.c linux-2.6.39/fs/block_dev.c ---- linux-2.6.39/fs/block_dev.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/block_dev.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/block_dev.c linux-2.6.39.1/fs/block_dev.c +--- linux-2.6.39.1/fs/block_dev.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/fs/block_dev.c 2011-06-03 00:32:07.000000000 -0400 @@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de else if (bdev->bd_contains =3D=3D bdev) return true; /* is a whole device which isn't held */ @@ -44133,9 +44187,9 @@ diff -urNp linux-2.6.39/fs/block_dev.c linux-2.6.= 39/fs/block_dev.c return true; /* is a partition of a device that is being partitione= d */ else if (whole->bd_holder !=3D NULL) return false; /* is a partition of a held device */ -diff -urNp linux-2.6.39/fs/btrfs/compression.c linux-2.6.39/fs/btrfs/com= pression.c ---- linux-2.6.39/fs/btrfs/compression.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/btrfs/compression.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/btrfs/compression.c linux-2.6.39.1/fs/btrfs= /compression.c +--- linux-2.6.39.1/fs/btrfs/compression.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/btrfs/compression.c 2011-05-22 19:36:32.000000000 = -0400 @@ -719,7 +719,7 @@ static int comp_num_workspace[BTRFS_COMP static atomic_t comp_alloc_workspace[BTRFS_COMPRESS_TYPES]; static wait_queue_head_t comp_workspace_wait[BTRFS_COMPRESS_TYPES]; @@ -44145,9 +44199,9 @@ diff -urNp linux-2.6.39/fs/btrfs/compression.c li= nux-2.6.39/fs/btrfs/compression &btrfs_zlib_compress, &btrfs_lzo_compress, }; -diff -urNp linux-2.6.39/fs/btrfs/compression.h linux-2.6.39/fs/btrfs/com= pression.h ---- linux-2.6.39/fs/btrfs/compression.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/btrfs/compression.h 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/btrfs/compression.h linux-2.6.39.1/fs/btrfs= /compression.h +--- linux-2.6.39.1/fs/btrfs/compression.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/btrfs/compression.h 2011-05-22 19:36:32.000000000 = -0400 @@ -77,7 +77,7 @@ struct btrfs_compress_op { size_t srclen, size_t destlen); }; @@ -44158,9 +44212,9 @@ diff -urNp linux-2.6.39/fs/btrfs/compression.h li= nux-2.6.39/fs/btrfs/compression +extern const struct btrfs_compress_op btrfs_lzo_compress; =20 #endif -diff -urNp linux-2.6.39/fs/btrfs/ctree.c linux-2.6.39/fs/btrfs/ctree.c ---- linux-2.6.39/fs/btrfs/ctree.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/btrfs/ctree.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/btrfs/ctree.c linux-2.6.39.1/fs/btrfs/ctree= .c +--- linux-2.6.39.1/fs/btrfs/ctree.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/btrfs/ctree.c 2011-05-22 19:36:32.000000000 -0400 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st free_extent_buffer(buf); add_root_to_dirty_list(root); @@ -44185,9 +44239,9 @@ diff -urNp linux-2.6.39/fs/btrfs/ctree.c linux-2.= 6.39/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret =3D fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.39/fs/btrfs/disk-io.c linux-2.6.39/fs/btrfs/disk-io= .c ---- linux-2.6.39/fs/btrfs/disk-io.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/btrfs/disk-io.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/btrfs/disk-io.c linux-2.6.39.1/fs/btrfs/dis= k-io.c +--- linux-2.6.39.1/fs/btrfs/disk-io.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/btrfs/disk-io.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -42,7 +42,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -44206,9 +44260,9 @@ diff -urNp linux-2.6.39/fs/btrfs/disk-io.c linux-= 2.6.39/fs/btrfs/disk-io.c .write_cache_pages_lock_hook =3D btree_lock_page_hook, .readpage_end_io_hook =3D btree_readpage_end_io_hook, .submit_bio_hook =3D btree_submit_bio_hook, -diff -urNp linux-2.6.39/fs/btrfs/extent_io.h linux-2.6.39/fs/btrfs/exten= t_io.h ---- linux-2.6.39/fs/btrfs/extent_io.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/btrfs/extent_io.h 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/btrfs/extent_io.h linux-2.6.39.1/fs/btrfs/e= xtent_io.h +--- linux-2.6.39.1/fs/btrfs/extent_io.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/btrfs/extent_io.h 2011-05-22 19:36:32.000000000 -0= 400 @@ -56,36 +56,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags, u64 bio_offset); @@ -44269,9 +44323,9 @@ diff -urNp linux-2.6.39/fs/btrfs/extent_io.h linu= x-2.6.39/fs/btrfs/extent_io.h }; =20 struct extent_state { -diff -urNp linux-2.6.39/fs/btrfs/free-space-cache.c linux-2.6.39/fs/btrf= s/free-space-cache.c ---- linux-2.6.39/fs/btrfs/free-space-cache.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/fs/btrfs/free-space-cache.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/fs/btrfs/free-space-cache.c linux-2.6.39.1/fs/= btrfs/free-space-cache.c +--- linux-2.6.39.1/fs/btrfs/free-space-cache.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/fs/btrfs/free-space-cache.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -1910,8 +1910,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { if (entry->bytes < bytes || @@ -44289,9 +44343,9 @@ diff -urNp linux-2.6.39/fs/btrfs/free-space-cache= .c linux-2.6.39/fs/btrfs/free-s node =3D rb_next(&entry->offset_index); if (!node) break; -diff -urNp linux-2.6.39/fs/btrfs/inode.c linux-2.6.39/fs/btrfs/inode.c ---- linux-2.6.39/fs/btrfs/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/btrfs/inode.c 2011-05-22 20:42:42.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/btrfs/inode.c linux-2.6.39.1/fs/btrfs/inode= .c +--- linux-2.6.39.1/fs/btrfs/inode.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/btrfs/inode.c 2011-05-22 20:42:42.000000000 -0400 @@ -65,7 +65,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; @@ -44334,9 +44388,9 @@ diff -urNp linux-2.6.39/fs/btrfs/inode.c linux-2.= 6.39/fs/btrfs/inode.c .fill_delalloc =3D run_delalloc_range, .submit_bio_hook =3D btrfs_submit_bio_hook, .merge_bio_hook =3D btrfs_merge_bio_hook, -diff -urNp linux-2.6.39/fs/btrfs/ioctl.c linux-2.6.39/fs/btrfs/ioctl.c ---- linux-2.6.39/fs/btrfs/ioctl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/btrfs/ioctl.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/btrfs/ioctl.c linux-2.6.39.1/fs/btrfs/ioctl= .c +--- linux-2.6.39.1/fs/btrfs/ioctl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/btrfs/ioctl.c 2011-05-22 19:41:37.000000000 -0400 @@ -2361,9 +2361,12 @@ long btrfs_ioctl_space_info(struct btrfs for (i =3D 0; i < num_types; i++) { struct btrfs_space_info *tmp; @@ -44361,9 +44415,9 @@ diff -urNp linux-2.6.39/fs/btrfs/ioctl.c linux-2.= 6.39/fs/btrfs/ioctl.c } up_read(&info->groups_sem); } -diff -urNp linux-2.6.39/fs/btrfs/lzo.c linux-2.6.39/fs/btrfs/lzo.c ---- linux-2.6.39/fs/btrfs/lzo.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/btrfs/lzo.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/btrfs/lzo.c linux-2.6.39.1/fs/btrfs/lzo.c +--- linux-2.6.39.1/fs/btrfs/lzo.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/btrfs/lzo.c 2011-05-22 19:36:32.000000000 -0400 @@ -418,7 +418,7 @@ out: return ret; } @@ -44373,9 +44427,9 @@ diff -urNp linux-2.6.39/fs/btrfs/lzo.c linux-2.6.= 39/fs/btrfs/lzo.c .alloc_workspace =3D lzo_alloc_workspace, .free_workspace =3D lzo_free_workspace, .compress_pages =3D lzo_compress_pages, -diff -urNp linux-2.6.39/fs/btrfs/relocation.c linux-2.6.39/fs/btrfs/relo= cation.c ---- linux-2.6.39/fs/btrfs/relocation.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/btrfs/relocation.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/btrfs/relocation.c linux-2.6.39.1/fs/btrfs/= relocation.c +--- linux-2.6.39.1/fs/btrfs/relocation.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/btrfs/relocation.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt } spin_unlock(&rc->reloc_root_tree.lock); @@ -44385,9 +44439,9 @@ diff -urNp linux-2.6.39/fs/btrfs/relocation.c lin= ux-2.6.39/fs/btrfs/relocation.c =20 if (!del) { spin_lock(&rc->reloc_root_tree.lock); -diff -urNp linux-2.6.39/fs/btrfs/zlib.c linux-2.6.39/fs/btrfs/zlib.c ---- linux-2.6.39/fs/btrfs/zlib.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/btrfs/zlib.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/btrfs/zlib.c linux-2.6.39.1/fs/btrfs/zlib.c +--- linux-2.6.39.1/fs/btrfs/zlib.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/btrfs/zlib.c 2011-05-22 19:36:32.000000000 -0400 @@ -390,7 +390,7 @@ next: return ret; } @@ -44397,9 +44451,9 @@ diff -urNp linux-2.6.39/fs/btrfs/zlib.c linux-2.6= .39/fs/btrfs/zlib.c .alloc_workspace =3D zlib_alloc_workspace, .free_workspace =3D zlib_free_workspace, .compress_pages =3D zlib_compress_pages, -diff -urNp linux-2.6.39/fs/cachefiles/bind.c linux-2.6.39/fs/cachefiles/= bind.c ---- linux-2.6.39/fs/cachefiles/bind.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/cachefiles/bind.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/cachefiles/bind.c linux-2.6.39.1/fs/cachefi= les/bind.c +--- linux-2.6.39.1/fs/cachefiles/bind.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/cachefiles/bind.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); =20 @@ -44416,9 +44470,9 @@ diff -urNp linux-2.6.39/fs/cachefiles/bind.c linu= x-2.6.39/fs/cachefiles/bind.c cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); =20 -diff -urNp linux-2.6.39/fs/cachefiles/daemon.c linux-2.6.39/fs/cachefile= s/daemon.c ---- linux-2.6.39/fs/cachefiles/daemon.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/cachefiles/daemon.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/cachefiles/daemon.c linux-2.6.39.1/fs/cache= files/daemon.c +--- linux-2.6.39.1/fs/cachefiles/daemon.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/cachefiles/daemon.c 2011-05-22 19:36:32.000000000 = -0400 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st if (n > buflen) return -EMSGSIZE; @@ -44455,9 +44509,9 @@ diff -urNp linux-2.6.39/fs/cachefiles/daemon.c li= nux-2.6.39/fs/cachefiles/daemon return cachefiles_daemon_range_error(cache, args); =20 cache->bstop_percent =3D bstop; -diff -urNp linux-2.6.39/fs/cachefiles/internal.h linux-2.6.39/fs/cachefi= les/internal.h ---- linux-2.6.39/fs/cachefiles/internal.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/fs/cachefiles/internal.h 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/fs/cachefiles/internal.h linux-2.6.39.1/fs/cac= hefiles/internal.h +--- linux-2.6.39.1/fs/cachefiles/internal.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/fs/cachefiles/internal.h 2011-05-22 19:36:32.00000000= 0 -0400 @@ -57,7 +57,7 @@ struct cachefiles_cache { wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */ struct rb_root active_nodes; /* active nodes (can't be culled) */ @@ -44492,9 +44546,9 @@ diff -urNp linux-2.6.39/fs/cachefiles/internal.h = linux-2.6.39/fs/cachefiles/inte } =20 #else -diff -urNp linux-2.6.39/fs/cachefiles/namei.c linux-2.6.39/fs/cachefiles= /namei.c ---- linux-2.6.39/fs/cachefiles/namei.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/cachefiles/namei.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/cachefiles/namei.c linux-2.6.39.1/fs/cachef= iles/namei.c +--- linux-2.6.39.1/fs/cachefiles/namei.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/cachefiles/namei.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -318,7 +318,7 @@ try_again: /* first step is to make up a grave dentry in the graveyard */ sprintf(nbuffer, "%08x%08x", @@ -44504,9 +44558,9 @@ diff -urNp linux-2.6.39/fs/cachefiles/namei.c lin= ux-2.6.39/fs/cachefiles/namei.c =20 /* do the multiway lock magic */ trap =3D lock_rename(cache->graveyard, dir); -diff -urNp linux-2.6.39/fs/cachefiles/proc.c linux-2.6.39/fs/cachefiles/= proc.c ---- linux-2.6.39/fs/cachefiles/proc.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/cachefiles/proc.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/cachefiles/proc.c linux-2.6.39.1/fs/cachefi= les/proc.c +--- linux-2.6.39.1/fs/cachefiles/proc.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/cachefiles/proc.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -14,9 +14,9 @@ #include #include "internal.h" @@ -44533,9 +44587,9 @@ diff -urNp linux-2.6.39/fs/cachefiles/proc.c linu= x-2.6.39/fs/cachefiles/proc.c if (x =3D=3D 0 && y =3D=3D 0 && z =3D=3D 0) return 0; =20 -diff -urNp linux-2.6.39/fs/cachefiles/rdwr.c linux-2.6.39/fs/cachefiles/= rdwr.c ---- linux-2.6.39/fs/cachefiles/rdwr.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/cachefiles/rdwr.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/cachefiles/rdwr.c linux-2.6.39.1/fs/cachefi= les/rdwr.c +--- linux-2.6.39.1/fs/cachefiles/rdwr.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/cachefiles/rdwr.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache old_fs =3D get_fs(); set_fs(KERNEL_DS); @@ -44545,9 +44599,9 @@ diff -urNp linux-2.6.39/fs/cachefiles/rdwr.c linu= x-2.6.39/fs/cachefiles/rdwr.c set_fs(old_fs); kunmap(page); if (ret !=3D len) -diff -urNp linux-2.6.39/fs/ceph/addr.c linux-2.6.39/fs/ceph/addr.c ---- linux-2.6.39/fs/ceph/addr.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ceph/addr.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ceph/addr.c linux-2.6.39.1/fs/ceph/addr.c +--- linux-2.6.39.1/fs/ceph/addr.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ceph/addr.c 2011-05-22 19:36:32.000000000 -0400 @@ -1164,7 +1164,7 @@ out: return ret; } @@ -44557,9 +44611,9 @@ diff -urNp linux-2.6.39/fs/ceph/addr.c linux-2.6.= 39/fs/ceph/addr.c .fault =3D filemap_fault, .page_mkwrite =3D ceph_page_mkwrite, }; -diff -urNp linux-2.6.39/fs/ceph/dir.c linux-2.6.39/fs/ceph/dir.c ---- linux-2.6.39/fs/ceph/dir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ceph/dir.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ceph/dir.c linux-2.6.39.1/fs/ceph/dir.c +--- linux-2.6.39.1/fs/ceph/dir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ceph/dir.c 2011-05-22 19:36:32.000000000 -0400 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil struct ceph_fs_client *fsc =3D ceph_inode_to_client(inode); struct ceph_mds_client *mdsc =3D fsc->mdsc; @@ -44578,9 +44632,9 @@ diff -urNp linux-2.6.39/fs/ceph/dir.c linux-2.6.3= 9/fs/ceph/dir.c u64 pos =3D ceph_make_fpos(frag, off); struct ceph_mds_reply_inode *in =3D rinfo->dir_in[off - fi->offset].in; -diff -urNp linux-2.6.39/fs/cifs/cifs_debug.c linux-2.6.39/fs/cifs/cifs_d= ebug.c ---- linux-2.6.39/fs/cifs/cifs_debug.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/cifs/cifs_debug.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/cifs/cifs_debug.c linux-2.6.39.1/fs/cifs/ci= fs_debug.c +--- linux-2.6.39.1/fs/cifs/cifs_debug.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/cifs/cifs_debug.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(str tcon =3D list_entry(tmp3, struct cifsTconInfo, @@ -44688,9 +44742,9 @@ diff -urNp linux-2.6.39/fs/cifs/cifs_debug.c linu= x-2.6.39/fs/cifs/cifs_debug.c } } } -diff -urNp linux-2.6.39/fs/cifs/cifsglob.h linux-2.6.39/fs/cifs/cifsglob= .h ---- linux-2.6.39/fs/cifs/cifsglob.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/cifs/cifsglob.h 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/cifs/cifsglob.h linux-2.6.39.1/fs/cifs/cifs= glob.h +--- linux-2.6.39.1/fs/cifs/cifsglob.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/cifs/cifsglob.h 2011-05-22 19:36:32.000000000 -040= 0 @@ -305,28 +305,28 @@ struct cifsTconInfo { __u16 Flags; /* optional support bits */ enum statusEnum tidStatus; @@ -44751,9 +44805,9 @@ diff -urNp linux-2.6.39/fs/cifs/cifsglob.h linux-= 2.6.39/fs/cifs/cifsglob.h =20 static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon, unsigned int bytes) -diff -urNp linux-2.6.39/fs/cifs/link.c linux-2.6.39/fs/cifs/link.c ---- linux-2.6.39/fs/cifs/link.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/cifs/link.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/cifs/link.c linux-2.6.39.1/fs/cifs/link.c +--- linux-2.6.39.1/fs/cifs/link.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/cifs/link.c 2011-05-22 19:36:32.000000000 -0400 @@ -577,7 +577,7 @@ symlink_exit: =20 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void = *cookie) @@ -44763,9 +44817,9 @@ diff -urNp linux-2.6.39/fs/cifs/link.c linux-2.6.= 39/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.39/fs/coda/cache.c linux-2.6.39/fs/coda/cache.c ---- linux-2.6.39/fs/coda/cache.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/coda/cache.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/coda/cache.c linux-2.6.39.1/fs/coda/cache.c +--- linux-2.6.39.1/fs/coda/cache.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/coda/cache.c 2011-05-22 19:36:32.000000000 -0400 @@ -24,7 +24,7 @@ #include "coda_linux.h" #include "coda_cache.h" @@ -44810,9 +44864,9 @@ diff -urNp linux-2.6.39/fs/coda/cache.c linux-2.6= .39/fs/coda/cache.c spin_unlock(&cii->c_lock); =20 return hit; -diff -urNp linux-2.6.39/fs/compat_binfmt_elf.c linux-2.6.39/fs/compat_bi= nfmt_elf.c ---- linux-2.6.39/fs/compat_binfmt_elf.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/compat_binfmt_elf.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/compat_binfmt_elf.c linux-2.6.39.1/fs/compa= t_binfmt_elf.c +--- linux-2.6.39.1/fs/compat_binfmt_elf.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/compat_binfmt_elf.c 2011-05-22 19:36:32.000000000 = -0400 @@ -30,11 +30,13 @@ #undef elf_phdr #undef elf_shdr @@ -44827,9 +44881,9 @@ diff -urNp linux-2.6.39/fs/compat_binfmt_elf.c li= nux-2.6.39/fs/compat_binfmt_elf #define elf_addr_t Elf32_Addr =20 /* -diff -urNp linux-2.6.39/fs/compat.c linux-2.6.39/fs/compat.c ---- linux-2.6.39/fs/compat.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/compat.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/compat.c linux-2.6.39.1/fs/compat.c +--- linux-2.6.39.1/fs/compat.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/compat.c 2011-05-22 19:41:37.000000000 -0400 @@ -566,7 +566,7 @@ ssize_t compat_rw_copy_check_uvector(int goto out; =20 @@ -45018,9 +45072,9 @@ diff -urNp linux-2.6.39/fs/compat.c linux-2.6.39/= fs/compat.c if (n < 0) goto out_nofds; =20 -diff -urNp linux-2.6.39/fs/compat_ioctl.c linux-2.6.39/fs/compat_ioctl.c ---- linux-2.6.39/fs/compat_ioctl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/compat_ioctl.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/compat_ioctl.c linux-2.6.39.1/fs/compat_ioc= tl.c +--- linux-2.6.39.1/fs/compat_ioctl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/compat_ioctl.c 2011-05-22 19:36:32.000000000 -0400 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi =20 err =3D get_user(palp, &up->palette); @@ -45041,9 +45095,9 @@ diff -urNp linux-2.6.39/fs/compat_ioctl.c linux-2= .6.39/fs/compat_ioctl.c if (a > b) return 1; if (a < b) -diff -urNp linux-2.6.39/fs/configfs/dir.c linux-2.6.39/fs/configfs/dir.c ---- linux-2.6.39/fs/configfs/dir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/configfs/dir.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/configfs/dir.c linux-2.6.39.1/fs/configfs/d= ir.c +--- linux-2.6.39.1/fs/configfs/dir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/configfs/dir.c 2011-05-22 19:36:32.000000000 -0400 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file=20 } for (p=3Dq->next; p!=3D &parent_sd->s_children; p=3Dp->next) { @@ -45068,9 +45122,9 @@ diff -urNp linux-2.6.39/fs/configfs/dir.c linux-2= .6.39/fs/configfs/dir.c =20 /* * We'll have a dentry and an inode for -diff -urNp linux-2.6.39/fs/configfs/file.c linux-2.6.39/fs/configfs/file= .c ---- linux-2.6.39/fs/configfs/file.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/configfs/file.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/configfs/file.c linux-2.6.39.1/fs/configfs/= file.c +--- linux-2.6.39.1/fs/configfs/file.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/configfs/file.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -215,7 +215,7 @@ static int check_perm(struct inode * ino struct config_item *item =3D configfs_get_config_item(file->f_path.den= try->d_parent); struct configfs_attribute * attr =3D to_attr(file->f_path.dentry); @@ -45080,9 +45134,9 @@ diff -urNp linux-2.6.39/fs/configfs/file.c linux-= 2.6.39/fs/configfs/file.c int error =3D 0; =20 if (!item || !attr) -diff -urNp linux-2.6.39/fs/configfs/item.c linux-2.6.39/fs/configfs/item= .c ---- linux-2.6.39/fs/configfs/item.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/configfs/item.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/configfs/item.c linux-2.6.39.1/fs/configfs/= item.c +--- linux-2.6.39.1/fs/configfs/item.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/configfs/item.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -123,7 +123,7 @@ void config_item_init_type_name(struct c EXPORT_SYMBOL(config_item_init_type_name); =20 @@ -45092,9 +45146,9 @@ diff -urNp linux-2.6.39/fs/configfs/item.c linux-= 2.6.39/fs/configfs/item.c { config_item_set_name(&group->cg_item, name); group->cg_item.ci_type =3D type; -diff -urNp linux-2.6.39/fs/dcache.c linux-2.6.39/fs/dcache.c ---- linux-2.6.39/fs/dcache.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/dcache.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/dcache.c linux-2.6.39.1/fs/dcache.c +--- linux-2.6.39.1/fs/dcache.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/dcache.c 2011-05-22 19:36:32.000000000 -0400 @@ -3069,7 +3069,7 @@ void __init vfs_caches_init(unsigned lon mempages -=3D reserve; =20 @@ -45104,9 +45158,9 @@ diff -urNp linux-2.6.39/fs/dcache.c linux-2.6.39/= fs/dcache.c =20 dcache_init(); inode_init(); -diff -urNp linux-2.6.39/fs/dlm/lockspace.c linux-2.6.39/fs/dlm/lockspace= .c ---- linux-2.6.39/fs/dlm/lockspace.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/dlm/lockspace.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/dlm/lockspace.c linux-2.6.39.1/fs/dlm/locks= pace.c +--- linux-2.6.39.1/fs/dlm/lockspace.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/dlm/lockspace.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset, return 0; } @@ -45116,10 +45170,10 @@ diff -urNp linux-2.6.39/fs/dlm/lockspace.c linu= x-2.6.39/fs/dlm/lockspace.c .uevent =3D dlm_uevent, }; =20 -diff -urNp linux-2.6.39/fs/ecryptfs/inode.c linux-2.6.39/fs/ecryptfs/ino= de.c ---- linux-2.6.39/fs/ecryptfs/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ecryptfs/inode.c 2011-05-22 19:36:32.000000000 -0400 -@@ -621,7 +621,7 @@ static int ecryptfs_readlink_lower(struc +diff -urNp linux-2.6.39.1/fs/ecryptfs/inode.c linux-2.6.39.1/fs/ecryptfs= /inode.c +--- linux-2.6.39.1/fs/ecryptfs/inode.c 2011-06-03 00:04:14.000000000 -04= 00 ++++ linux-2.6.39.1/fs/ecryptfs/inode.c 2011-06-03 00:32:07.000000000 -04= 00 +@@ -623,7 +623,7 @@ static int ecryptfs_readlink_lower(struc old_fs =3D get_fs(); set_fs(get_ds()); rc =3D lower_dentry->d_inode->i_op->readlink(lower_dentry, @@ -45128,7 +45182,7 @@ diff -urNp linux-2.6.39/fs/ecryptfs/inode.c linux= -2.6.39/fs/ecryptfs/inode.c lower_bufsiz); set_fs(old_fs); if (rc < 0) -@@ -667,7 +667,7 @@ static void *ecryptfs_follow_link(struct +@@ -669,7 +669,7 @@ static void *ecryptfs_follow_link(struct } old_fs =3D get_fs(); set_fs(get_ds()); @@ -45137,7 +45191,7 @@ diff -urNp linux-2.6.39/fs/ecryptfs/inode.c linux= -2.6.39/fs/ecryptfs/inode.c set_fs(old_fs); if (rc < 0) { kfree(buf); -@@ -682,7 +682,7 @@ out: +@@ -684,7 +684,7 @@ out: static void ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *pt= r) { @@ -45146,9 +45200,9 @@ diff -urNp linux-2.6.39/fs/ecryptfs/inode.c linux= -2.6.39/fs/ecryptfs/inode.c if (!IS_ERR(buf)) { /* Free the char* */ kfree(buf); -diff -urNp linux-2.6.39/fs/ecryptfs/miscdev.c linux-2.6.39/fs/ecryptfs/m= iscdev.c ---- linux-2.6.39/fs/ecryptfs/miscdev.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/ecryptfs/miscdev.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/ecryptfs/miscdev.c linux-2.6.39.1/fs/ecrypt= fs/miscdev.c +--- linux-2.6.39.1/fs/ecryptfs/miscdev.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/ecryptfs/miscdev.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -328,7 +328,7 @@ check_list: goto out_unlock_msg_ctx; i =3D 5; @@ -45158,9 +45212,9 @@ diff -urNp linux-2.6.39/fs/ecryptfs/miscdev.c lin= ux-2.6.39/fs/ecryptfs/miscdev.c goto out_unlock_msg_ctx; i +=3D packet_length_size; if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) -diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs/exec.c ---- linux-2.6.39/fs/exec.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/exec.c 2011-05-22 20:44:52.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/exec.c linux-2.6.39.1/fs/exec.c +--- linux-2.6.39.1/fs/exec.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/exec.c 2011-06-03 23:33:13.000000000 -0400 @@ -55,12 +55,24 @@ #include #include @@ -45473,7 +45527,7 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs= /exec.c cn->corename =3D kmalloc(cn->size, GFP_KERNEL); cn->used =3D 0; =20 -@@ -1648,6 +1738,208 @@ out: +@@ -1648,6 +1738,219 @@ out: return ispipe; } =20 @@ -45679,10 +45733,21 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/= fs/exec.c +} +#endif + ++#ifdef CONFIG_PAX_MEMORY_STACKLEAK ++void pax_track_stack(void) ++{ ++ unsigned long sp =3D (unsigned long)&sp; ++ if (sp < current_thread_info()->lowest_stack && ++ sp > (unsigned long)task_stack_page(current)) ++ current_thread_info()->lowest_stack =3D sp; ++} ++EXPORT_SYMBOL(pax_track_stack); ++#endif ++ static int zap_process(struct task_struct *start, int exit_code) { struct task_struct *t; -@@ -1858,17 +2150,17 @@ static void wait_for_dump_helpers(struct +@@ -1858,17 +2161,17 @@ static void wait_for_dump_helpers(struct pipe =3D file->f_path.dentry->d_inode->i_pipe; =20 pipe_lock(pipe); @@ -45705,7 +45770,7 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs= /exec.c pipe_unlock(pipe); =20 } -@@ -1929,7 +2221,7 @@ void do_coredump(long signr, int exit_co +@@ -1929,7 +2232,7 @@ void do_coredump(long signr, int exit_co int retval =3D 0; int flag =3D 0; int ispipe; @@ -45714,7 +45779,7 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs= /exec.c struct coredump_params cprm =3D { .signr =3D signr, .regs =3D regs, -@@ -1944,6 +2236,9 @@ void do_coredump(long signr, int exit_co +@@ -1944,6 +2247,9 @@ void do_coredump(long signr, int exit_co =20 audit_core_dumps(signr); =20 @@ -45724,7 +45789,7 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs= /exec.c binfmt =3D mm->binfmt; if (!binfmt || !binfmt->core_dump) goto fail; -@@ -1984,6 +2279,8 @@ void do_coredump(long signr, int exit_co +@@ -1984,6 +2290,8 @@ void do_coredump(long signr, int exit_co goto fail_corename; } =20 @@ -45733,7 +45798,7 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs= /exec.c if (ispipe) { int dump_count; char **helper_argv; -@@ -2011,7 +2308,7 @@ void do_coredump(long signr, int exit_co +@@ -2011,7 +2319,7 @@ void do_coredump(long signr, int exit_co } cprm.limit =3D RLIM_INFINITY; =20 @@ -45742,7 +45807,7 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs= /exec.c if (core_pipe_limit && (core_pipe_limit < dump_count)) { printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n", task_tgid_vnr(current), current->comm); -@@ -2081,7 +2378,7 @@ close_fail: +@@ -2081,7 +2389,7 @@ close_fail: filp_close(cprm.file, NULL); fail_dropcount: if (ispipe) @@ -45751,9 +45816,9 @@ diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs= /exec.c fail_unlock: kfree(cn.corename); fail_corename: -diff -urNp linux-2.6.39/fs/ext2/balloc.c linux-2.6.39/fs/ext2/balloc.c ---- linux-2.6.39/fs/ext2/balloc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ext2/balloc.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ext2/balloc.c linux-2.6.39.1/fs/ext2/balloc= .c +--- linux-2.6.39.1/fs/ext2/balloc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ext2/balloc.c 2011-05-22 19:41:37.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e =20 free_blocks =3D percpu_counter_read_positive(&sbi->s_freeblocks_counte= r); @@ -45763,9 +45828,9 @@ diff -urNp linux-2.6.39/fs/ext2/balloc.c linux-2.= 6.39/fs/ext2/balloc.c sbi->s_resuid !=3D current_fsuid() && (sbi->s_resgid =3D=3D 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.39/fs/ext3/balloc.c linux-2.6.39/fs/ext3/balloc.c ---- linux-2.6.39/fs/ext3/balloc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ext3/balloc.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ext3/balloc.c linux-2.6.39.1/fs/ext3/balloc= .c +--- linux-2.6.39.1/fs/ext3/balloc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ext3/balloc.c 2011-05-22 19:41:37.000000000 -0400 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e =20 free_blocks =3D percpu_counter_read_positive(&sbi->s_freeblocks_counte= r); @@ -45775,9 +45840,9 @@ diff -urNp linux-2.6.39/fs/ext3/balloc.c linux-2.= 6.39/fs/ext3/balloc.c sbi->s_resuid !=3D current_fsuid() && (sbi->s_resgid =3D=3D 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.39/fs/ext4/balloc.c linux-2.6.39/fs/ext4/balloc.c ---- linux-2.6.39/fs/ext4/balloc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ext4/balloc.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ext4/balloc.c linux-2.6.39.1/fs/ext4/balloc= .c +--- linux-2.6.39.1/fs/ext4/balloc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ext4/balloc.c 2011-05-22 19:41:37.000000000 -0400 @@ -522,7 +522,7 @@ static int ext4_has_free_blocks(struct e /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid =3D=3D current_fsuid() || @@ -45787,9 +45852,9 @@ diff -urNp linux-2.6.39/fs/ext4/balloc.c linux-2.= 6.39/fs/ext4/balloc.c if (free_blocks >=3D (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.39/fs/ext4/ext4.h linux-2.6.39/fs/ext4/ext4.h ---- linux-2.6.39/fs/ext4/ext4.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ext4/ext4.h 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ext4/ext4.h linux-2.6.39.1/fs/ext4/ext4.h +--- linux-2.6.39.1/fs/ext4/ext4.h 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/fs/ext4/ext4.h 2011-06-03 00:32:07.000000000 -0400 @@ -1166,19 +1166,19 @@ struct ext4_sb_info { unsigned long s_mb_last_start; =20 @@ -45820,10 +45885,10 @@ diff -urNp linux-2.6.39/fs/ext4/ext4.h linux-2.= 6.39/fs/ext4/ext4.h atomic_t s_lock_busy; =20 /* locality groups */ -diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2.6.39/fs/ext4/mballoc.c ---- linux-2.6.39/fs/ext4/mballoc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ext4/mballoc.c 2011-05-22 19:36:32.000000000 -0400 -@@ -1851,7 +1851,7 @@ void ext4_mb_simple_scan_group(struct ex +diff -urNp linux-2.6.39.1/fs/ext4/mballoc.c linux-2.6.39.1/fs/ext4/mball= oc.c +--- linux-2.6.39.1/fs/ext4/mballoc.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/fs/ext4/mballoc.c 2011-06-03 00:32:07.000000000 -0400 +@@ -1853,7 +1853,7 @@ void ext4_mb_simple_scan_group(struct ex BUG_ON(ac->ac_b_ex.fe_len !=3D ac->ac_g_ex.fe_len); =20 if (EXT4_SB(sb)->s_mb_stats) @@ -45832,7 +45897,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c =20 break; } -@@ -2145,7 +2145,7 @@ repeat: +@@ -2147,7 +2147,7 @@ repeat: ac->ac_status =3D AC_STATUS_CONTINUE; ac->ac_flags |=3D EXT4_MB_HINT_FIRST; cr =3D 3; @@ -45841,7 +45906,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c goto repeat; } } -@@ -2188,6 +2188,8 @@ static int ext4_mb_seq_groups_show(struc +@@ -2190,6 +2190,8 @@ static int ext4_mb_seq_groups_show(struc ext4_grpblk_t counters[16]; } sg; =20 @@ -45850,7 +45915,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c group--; if (group =3D=3D 0) seq_printf(seq, "#%-5s: %-5s %-5s %-5s " -@@ -2611,25 +2613,25 @@ int ext4_mb_release(struct super_block * +@@ -2613,25 +2615,25 @@ int ext4_mb_release(struct super_block * if (sbi->s_mb_stats) { printk(KERN_INFO "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n", @@ -45886,7 +45951,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c } =20 free_percpu(sbi->s_locality_groups); -@@ -3105,16 +3107,16 @@ static void ext4_mb_collect_stats(struct +@@ -3107,16 +3109,16 @@ static void ext4_mb_collect_stats(struct struct ext4_sb_info *sbi =3D EXT4_SB(ac->ac_sb); =20 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) { @@ -45909,7 +45974,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c } =20 if (ac->ac_op =3D=3D EXT4_MB_HISTORY_ALLOC) -@@ -3512,7 +3514,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat +@@ -3514,7 +3516,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat trace_ext4_mb_new_inode_pa(ac, pa); =20 ext4_mb_use_inode_pa(ac, pa); @@ -45918,7 +45983,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c =20 ei =3D EXT4_I(ac->ac_inode); grp =3D ext4_get_group_info(sb, ac->ac_b_ex.fe_group); -@@ -3572,7 +3574,7 @@ ext4_mb_new_group_pa(struct ext4_allocat +@@ -3574,7 +3576,7 @@ ext4_mb_new_group_pa(struct ext4_allocat trace_ext4_mb_new_group_pa(ac, pa); =20 ext4_mb_use_group_pa(ac, pa); @@ -45927,7 +45992,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c =20 grp =3D ext4_get_group_info(sb, ac->ac_b_ex.fe_group); lg =3D ac->ac_lg; -@@ -3659,7 +3661,7 @@ ext4_mb_release_inode_pa(struct ext4_bud +@@ -3661,7 +3663,7 @@ ext4_mb_release_inode_pa(struct ext4_bud * from the bitmap and continue. */ } @@ -45936,7 +46001,7 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c =20 return err; } -@@ -3677,7 +3679,7 @@ ext4_mb_release_group_pa(struct ext4_bud +@@ -3679,7 +3681,7 @@ ext4_mb_release_group_pa(struct ext4_bud ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit); BUG_ON(group !=3D e4b->bd_group && pa->pa_len !=3D 0); mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len); @@ -45945,9 +46010,9 @@ diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2= .6.39/fs/ext4/mballoc.c trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len); =20 return 0; -diff -urNp linux-2.6.39/fs/fcntl.c linux-2.6.39/fs/fcntl.c ---- linux-2.6.39/fs/fcntl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fcntl.c 2011-05-22 20:45:50.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fcntl.c linux-2.6.39.1/fs/fcntl.c +--- linux-2.6.39.1/fs/fcntl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fcntl.c 2011-05-22 20:45:50.000000000 -0400 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -45985,9 +46050,9 @@ diff -urNp linux-2.6.39/fs/fcntl.c linux-2.6.39/f= s/fcntl.c )); =20 fasync_cache =3D kmem_cache_create("fasync_cache", -diff -urNp linux-2.6.39/fs/fifo.c linux-2.6.39/fs/fifo.c ---- linux-2.6.39/fs/fifo.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fifo.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fifo.c linux-2.6.39.1/fs/fifo.c +--- linux-2.6.39.1/fs/fifo.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fifo.c 2011-05-22 19:36:32.000000000 -0400 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode */ filp->f_op =3D &read_pipefifo_fops; @@ -46058,9 +46123,9 @@ diff -urNp linux-2.6.39/fs/fifo.c linux-2.6.39/fs= /fifo.c free_pipe_info(inode); =20 err_nocleanup: -diff -urNp linux-2.6.39/fs/file.c linux-2.6.39/fs/file.c ---- linux-2.6.39/fs/file.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/file.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/file.c linux-2.6.39.1/fs/file.c +--- linux-2.6.39.1/fs/file.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/file.c 2011-05-22 19:41:37.000000000 -0400 @@ -15,6 +15,7 @@ #include #include @@ -46077,9 +46142,9 @@ diff -urNp linux-2.6.39/fs/file.c linux-2.6.39/fs= /file.c if (nr >=3D rlimit(RLIMIT_NOFILE)) return -EMFILE; =20 -diff -urNp linux-2.6.39/fs/filesystems.c linux-2.6.39/fs/filesystems.c ---- linux-2.6.39/fs/filesystems.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/filesystems.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/filesystems.c linux-2.6.39.1/fs/filesystems= .c +--- linux-2.6.39.1/fs/filesystems.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/filesystems.c 2011-05-22 19:41:37.000000000 -0400 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con int len =3D dot ? dot - name : strlen(name); =20 @@ -46093,9 +46158,9 @@ diff -urNp linux-2.6.39/fs/filesystems.c linux-2.= 6.39/fs/filesystems.c fs =3D __get_fs_type(name, len); =20 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { -diff -urNp linux-2.6.39/fs/fscache/cookie.c linux-2.6.39/fs/fscache/cook= ie.c ---- linux-2.6.39/fs/fscache/cookie.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fscache/cookie.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fscache/cookie.c linux-2.6.39.1/fs/fscache/= cookie.c +--- linux-2.6.39.1/fs/fscache/cookie.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/fscache/cookie.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire parent ? (char *) parent->def->name : "", def->name, netfs_data); @@ -46214,9 +46279,9 @@ diff -urNp linux-2.6.39/fs/fscache/cookie.c linux= -2.6.39/fs/fscache/cookie.c wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING, fscache_wait_bit, TASK_UNINTERRUPTIBLE); } -diff -urNp linux-2.6.39/fs/fscache/internal.h linux-2.6.39/fs/fscache/in= ternal.h ---- linux-2.6.39/fs/fscache/internal.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/fscache/internal.h 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/fscache/internal.h linux-2.6.39.1/fs/fscach= e/internal.h +--- linux-2.6.39.1/fs/fscache/internal.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/fscache/internal.h 2011-05-22 19:36:32.000000000 -= 0400 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void); extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS]; extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS]; @@ -46420,9 +46485,9 @@ diff -urNp linux-2.6.39/fs/fscache/internal.h lin= ux-2.6.39/fs/fscache/internal.h #define fscache_stat_d(stat) do {} while (0) #endif =20 -diff -urNp linux-2.6.39/fs/fscache/object.c linux-2.6.39/fs/fscache/obje= ct.c ---- linux-2.6.39/fs/fscache/object.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fscache/object.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fscache/object.c linux-2.6.39.1/fs/fscache/= object.c +--- linux-2.6.39.1/fs/fscache/object.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/fscache/object.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -128,7 +128,7 @@ static void fscache_object_state_machine /* update the object metadata on disk */ case FSCACHE_OBJECT_UPDATING: @@ -46534,9 +46599,9 @@ diff -urNp linux-2.6.39/fs/fscache/object.c linux= -2.6.39/fs/fscache/object.c break; =20 default: -diff -urNp linux-2.6.39/fs/fscache/operation.c linux-2.6.39/fs/fscache/o= peration.c ---- linux-2.6.39/fs/fscache/operation.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/fscache/operation.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/fscache/operation.c linux-2.6.39.1/fs/fscac= he/operation.c +--- linux-2.6.39.1/fs/fscache/operation.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/fscache/operation.c 2011-05-22 19:36:32.000000000 = -0400 @@ -17,7 +17,7 @@ #include #include "internal.h" @@ -46652,9 +46717,9 @@ diff -urNp linux-2.6.39/fs/fscache/operation.c li= nux-2.6.39/fs/fscache/operation =20 ASSERTCMP(atomic_read(&op->usage), =3D=3D, 0); =20 -diff -urNp linux-2.6.39/fs/fscache/page.c linux-2.6.39/fs/fscache/page.c ---- linux-2.6.39/fs/fscache/page.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fscache/page.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fscache/page.c linux-2.6.39.1/fs/fscache/pa= ge.c +--- linux-2.6.39.1/fs/fscache/page.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fscache/page.c 2011-05-22 19:36:32.000000000 -0400 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct val =3D radix_tree_lookup(&cookie->stores, page->index); if (!val) { @@ -47038,9 +47103,9 @@ diff -urNp linux-2.6.39/fs/fscache/page.c linux-2= .6.39/fs/fscache/page.c #endif =20 for (loop =3D 0; loop < pagevec->nr; loop++) { -diff -urNp linux-2.6.39/fs/fscache/stats.c linux-2.6.39/fs/fscache/stats= .c ---- linux-2.6.39/fs/fscache/stats.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fscache/stats.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fscache/stats.c linux-2.6.39.1/fs/fscache/s= tats.c +--- linux-2.6.39.1/fs/fscache/stats.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/fscache/stats.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -18,95 +18,95 @@ /* * operation counters @@ -47416,9 +47481,9 @@ diff -urNp linux-2.6.39/fs/fscache/stats.c linux-= 2.6.39/fs/fscache/stats.c =20 seq_printf(m, "CacheOp: alo=3D%d luo=3D%d luc=3D%d gro=3D%d\n", atomic_read(&fscache_n_cop_alloc_object), -diff -urNp linux-2.6.39/fs/fs_struct.c linux-2.6.39/fs/fs_struct.c ---- linux-2.6.39/fs/fs_struct.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fs_struct.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fs_struct.c linux-2.6.39.1/fs/fs_struct.c +--- linux-2.6.39.1/fs/fs_struct.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fs_struct.c 2011-05-22 19:41:37.000000000 -0400 @@ -4,6 +4,7 @@ #include #include @@ -47508,9 +47573,9 @@ diff -urNp linux-2.6.39/fs/fs_struct.c linux-2.6.= 39/fs/fs_struct.c spin_unlock(&fs->lock); =20 task_unlock(current); -diff -urNp linux-2.6.39/fs/fuse/cuse.c linux-2.6.39/fs/fuse/cuse.c ---- linux-2.6.39/fs/fuse/cuse.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fuse/cuse.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fuse/cuse.c linux-2.6.39.1/fs/fuse/cuse.c +--- linux-2.6.39.1/fs/fuse/cuse.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fuse/cuse.c 2011-05-22 19:36:32.000000000 -0400 @@ -538,8 +538,18 @@ static int cuse_channel_release(struct i return rc; } @@ -47545,9 +47610,9 @@ diff -urNp linux-2.6.39/fs/fuse/cuse.c linux-2.6.= 39/fs/fuse/cuse.c cuse_class =3D class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.39/fs/fuse/dev.c linux-2.6.39/fs/fuse/dev.c ---- linux-2.6.39/fs/fuse/dev.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fuse/dev.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fuse/dev.c linux-2.6.39.1/fs/fuse/dev.c +--- linux-2.6.39.1/fs/fuse/dev.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fuse/dev.c 2011-05-22 19:36:32.000000000 -0400 @@ -1181,7 +1181,7 @@ static ssize_t fuse_dev_do_read(struct f return err; } @@ -47629,9 +47694,9 @@ diff -urNp linux-2.6.39/fs/fuse/dev.c linux-2.6.3= 9/fs/fuse/dev.c const struct file_operations fuse_dev_operations =3D { .owner =3D THIS_MODULE, .llseek =3D no_llseek, -diff -urNp linux-2.6.39/fs/fuse/dir.c linux-2.6.39/fs/fuse/dir.c ---- linux-2.6.39/fs/fuse/dir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fuse/dir.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fuse/dir.c linux-2.6.39.1/fs/fuse/dir.c +--- linux-2.6.39.1/fs/fuse/dir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fuse/dir.c 2011-05-22 19:36:32.000000000 -0400 @@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *de return link; } @@ -47641,9 +47706,9 @@ diff -urNp linux-2.6.39/fs/fuse/dir.c linux-2.6.3= 9/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.39/fs/fuse/fuse_i.h linux-2.6.39/fs/fuse/fuse_i.h ---- linux-2.6.39/fs/fuse/fuse_i.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/fuse/fuse_i.h 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/fuse/fuse_i.h linux-2.6.39.1/fs/fuse/fuse_i= .h +--- linux-2.6.39.1/fs/fuse/fuse_i.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/fuse/fuse_i.h 2011-05-22 19:36:32.000000000 -0400 @@ -540,6 +540,16 @@ extern const struct file_operations fuse =20 extern const struct dentry_operations fuse_dentry_operations; @@ -47661,9 +47726,9 @@ diff -urNp linux-2.6.39/fs/fuse/fuse_i.h linux-2.= 6.39/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.39/fs/gfs2/ops_inode.c linux-2.6.39/fs/gfs2/ops_ino= de.c ---- linux-2.6.39/fs/gfs2/ops_inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/gfs2/ops_inode.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/gfs2/ops_inode.c linux-2.6.39.1/fs/gfs2/ops= _inode.c +--- linux-2.6.39.1/fs/gfs2/ops_inode.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/gfs2/ops_inode.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -740,6 +740,8 @@ static int gfs2_rename(struct inode *odi unsigned int x; int error; @@ -47682,9 +47747,9 @@ diff -urNp linux-2.6.39/fs/gfs2/ops_inode.c linux= -2.6.39/fs/gfs2/ops_inode.c if (!IS_ERR(s)) kfree(s); } -diff -urNp linux-2.6.39/fs/hfsplus/catalog.c linux-2.6.39/fs/hfsplus/cat= alog.c ---- linux-2.6.39/fs/hfsplus/catalog.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/hfsplus/catalog.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/hfsplus/catalog.c linux-2.6.39.1/fs/hfsplus= /catalog.c +--- linux-2.6.39.1/fs/hfsplus/catalog.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/hfsplus/catalog.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block=20 int err; u16 type; @@ -47712,9 +47777,9 @@ diff -urNp linux-2.6.39/fs/hfsplus/catalog.c linu= x-2.6.39/fs/hfsplus/catalog.c dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name, dst_dir->i_ino, dst_name->name); -diff -urNp linux-2.6.39/fs/hfsplus/dir.c linux-2.6.39/fs/hfsplus/dir.c ---- linux-2.6.39/fs/hfsplus/dir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/hfsplus/dir.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/hfsplus/dir.c linux-2.6.39.1/fs/hfsplus/dir= .c +--- linux-2.6.39.1/fs/hfsplus/dir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/hfsplus/dir.c 2011-05-22 19:36:32.000000000 -0400 @@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file * struct hfsplus_readdir_data *rd; u16 type; @@ -47724,9 +47789,9 @@ diff -urNp linux-2.6.39/fs/hfsplus/dir.c linux-2.= 6.39/fs/hfsplus/dir.c if (filp->f_pos >=3D inode->i_size) return 0; =20 -diff -urNp linux-2.6.39/fs/hfsplus/inode.c linux-2.6.39/fs/hfsplus/inode= .c ---- linux-2.6.39/fs/hfsplus/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/hfsplus/inode.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/hfsplus/inode.c linux-2.6.39.1/fs/hfsplus/i= node.c +--- linux-2.6.39.1/fs/hfsplus/inode.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/hfsplus/inode.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode=20 int res =3D 0; u16 type; @@ -47745,9 +47810,9 @@ diff -urNp linux-2.6.39/fs/hfsplus/inode.c linux-= 2.6.39/fs/hfsplus/inode.c if (HFSPLUS_IS_RSRC(inode)) main_inode =3D HFSPLUS_I(inode)->rsrc_inode; =20 -diff -urNp linux-2.6.39/fs/hfsplus/ioctl.c linux-2.6.39/fs/hfsplus/ioctl= .c ---- linux-2.6.39/fs/hfsplus/ioctl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/hfsplus/ioctl.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/hfsplus/ioctl.c linux-2.6.39.1/fs/hfsplus/i= octl.c +--- linux-2.6.39.1/fs/hfsplus/ioctl.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/hfsplus/ioctl.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent struct hfsplus_cat_file *file; int res; @@ -47766,9 +47831,9 @@ diff -urNp linux-2.6.39/fs/hfsplus/ioctl.c linux-= 2.6.39/fs/hfsplus/ioctl.c if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode)) return -EOPNOTSUPP; =20 -diff -urNp linux-2.6.39/fs/hfsplus/super.c linux-2.6.39/fs/hfsplus/super= .c ---- linux-2.6.39/fs/hfsplus/super.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/hfsplus/super.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/hfsplus/super.c linux-2.6.39.1/fs/hfsplus/s= uper.c +--- linux-2.6.39.1/fs/hfsplus/super.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/hfsplus/super.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup struct nls_table *nls =3D NULL; int err; @@ -47778,9 +47843,9 @@ diff -urNp linux-2.6.39/fs/hfsplus/super.c linux-= 2.6.39/fs/hfsplus/super.c err =3D -EINVAL; sbi =3D kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) -diff -urNp linux-2.6.39/fs/hugetlbfs/inode.c linux-2.6.39/fs/hugetlbfs/i= node.c ---- linux-2.6.39/fs/hugetlbfs/inode.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/hugetlbfs/inode.c 2011-05-22 19:41:37.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/hugetlbfs/inode.c linux-2.6.39.1/fs/hugetlb= fs/inode.c +--- linux-2.6.39.1/fs/hugetlbfs/inode.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/hugetlbfs/inode.c 2011-05-22 19:41:37.000000000 -0= 400 @@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs .kill_sb =3D kill_litter_super, }; @@ -47790,9 +47855,9 @@ diff -urNp linux-2.6.39/fs/hugetlbfs/inode.c linu= x-2.6.39/fs/hugetlbfs/inode.c =20 static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.39/fs/inode.c linux-2.6.39/fs/inode.c ---- linux-2.6.39/fs/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/inode.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/inode.c linux-2.6.39.1/fs/inode.c +--- linux-2.6.39.1/fs/inode.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/inode.c 2011-05-22 19:36:32.000000000 -0400 @@ -862,8 +862,8 @@ unsigned int get_next_ino(void) =20 #ifdef CONFIG_SMP @@ -47804,9 +47869,9 @@ diff -urNp linux-2.6.39/fs/inode.c linux-2.6.39/f= s/inode.c =20 res =3D next - LAST_INO_BATCH; } -diff -urNp linux-2.6.39/fs/jbd/checkpoint.c linux-2.6.39/fs/jbd/checkpoi= nt.c ---- linux-2.6.39/fs/jbd/checkpoint.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/jbd/checkpoint.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/jbd/checkpoint.c linux-2.6.39.1/fs/jbd/chec= kpoint.c +--- linux-2.6.39.1/fs/jbd/checkpoint.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/jbd/checkpoint.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal tid_t this_tid; int result; @@ -47816,9 +47881,9 @@ diff -urNp linux-2.6.39/fs/jbd/checkpoint.c linux= -2.6.39/fs/jbd/checkpoint.c jbd_debug(1, "Start checkpoint\n"); =20 /* -diff -urNp linux-2.6.39/fs/jffs2/compr_rtime.c linux-2.6.39/fs/jffs2/com= pr_rtime.c ---- linux-2.6.39/fs/jffs2/compr_rtime.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/jffs2/compr_rtime.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/jffs2/compr_rtime.c linux-2.6.39.1/fs/jffs2= /compr_rtime.c +--- linux-2.6.39.1/fs/jffs2/compr_rtime.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/jffs2/compr_rtime.c 2011-05-22 19:36:32.000000000 = -0400 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned int outpos =3D 0; int pos=3D0; @@ -47837,9 +47902,9 @@ diff -urNp linux-2.6.39/fs/jffs2/compr_rtime.c li= nux-2.6.39/fs/jffs2/compr_rtime memset(positions,0,sizeof(positions)); =20 while (outposflags & JFFS2_SB_FLAG_BUILDING)); @@ -47887,9 +47952,9 @@ diff -urNp linux-2.6.39/fs/jffs2/xattr.c linux-2.= 6.39/fs/jffs2/xattr.c /* Phase.1 : Merge same xref */ for (i=3D0; i < XREF_TMPHASH_SIZE; i++) xref_tmphash[i] =3D NULL; -diff -urNp linux-2.6.39/fs/Kconfig.binfmt linux-2.6.39/fs/Kconfig.binfmt ---- linux-2.6.39/fs/Kconfig.binfmt 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/Kconfig.binfmt 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/Kconfig.binfmt linux-2.6.39.1/fs/Kconfig.bi= nfmt +--- linux-2.6.39.1/fs/Kconfig.binfmt 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/Kconfig.binfmt 2011-05-22 19:36:32.000000000 -0400 @@ -86,7 +86,7 @@ config HAVE_AOUT =20 config BINFMT_AOUT @@ -47899,9 +47964,9 @@ diff -urNp linux-2.6.39/fs/Kconfig.binfmt linux-2= .6.39/fs/Kconfig.binfmt ---help--- A.out (Assembler.OUTput) is a set of formats for libraries and executables used in the earliest versions of UNIX. Linux used -diff -urNp linux-2.6.39/fs/libfs.c linux-2.6.39/fs/libfs.c ---- linux-2.6.39/fs/libfs.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/libfs.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/libfs.c linux-2.6.39.1/fs/libfs.c +--- linux-2.6.39.1/fs/libfs.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/libfs.c 2011-05-22 19:36:32.000000000 -0400 @@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v =20 for (p=3Dq->next; p !=3D &dentry->d_subdirs; p=3Dp->next) { @@ -47926,9 +47991,9 @@ diff -urNp linux-2.6.39/fs/libfs.c linux-2.6.39/f= s/libfs.c next->d_name.len, filp->f_pos,=20 next->d_inode->i_ino,=20 dt_type(next->d_inode)) < 0) -diff -urNp linux-2.6.39/fs/lockd/clntproc.c linux-2.6.39/fs/lockd/clntpr= oc.c ---- linux-2.6.39/fs/lockd/clntproc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/lockd/clntproc.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/lockd/clntproc.c linux-2.6.39.1/fs/lockd/cl= ntproc.c +--- linux-2.6.39.1/fs/lockd/clntproc.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/lockd/clntproc.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt /* * Cookie counter for NLM requests @@ -47952,9 +48017,9 @@ diff -urNp linux-2.6.39/fs/lockd/clntproc.c linux= -2.6.39/fs/lockd/clntproc.c req =3D &reqst; memset(req, 0, sizeof(*req)); locks_init_lock(&req->a_args.lock.fl); -diff -urNp linux-2.6.39/fs/lockd/svc.c linux-2.6.39/fs/lockd/svc.c ---- linux-2.6.39/fs/lockd/svc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/lockd/svc.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/lockd/svc.c linux-2.6.39.1/fs/lockd/svc.c +--- linux-2.6.39.1/fs/lockd/svc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/lockd/svc.c 2011-05-22 19:36:32.000000000 -0400 @@ -41,7 +41,7 @@ =20 static struct svc_program nlmsvc_program; @@ -47964,9 +48029,9 @@ diff -urNp linux-2.6.39/fs/lockd/svc.c linux-2.6.= 39/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); =20 static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.39/fs/locks.c linux-2.6.39/fs/locks.c ---- linux-2.6.39/fs/locks.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/locks.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/locks.c linux-2.6.39.1/fs/locks.c +--- linux-2.6.39.1/fs/locks.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/locks.c 2011-05-22 19:36:32.000000000 -0400 @@ -2033,16 +2033,16 @@ void locks_remove_flock(struct file *fil return; =20 @@ -47988,9 +48053,9 @@ diff -urNp linux-2.6.39/fs/locks.c linux-2.6.39/f= s/locks.c } =20 lock_flocks(); -diff -urNp linux-2.6.39/fs/logfs/super.c linux-2.6.39/fs/logfs/super.c ---- linux-2.6.39/fs/logfs/super.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/logfs/super.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/logfs/super.c linux-2.6.39.1/fs/logfs/super= .c +--- linux-2.6.39.1/fs/logfs/super.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/logfs/super.c 2011-05-22 19:36:32.000000000 -0400 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super struct logfs_disk_super _ds1, *ds1 =3D &_ds1; int err, valid0, valid1; @@ -48000,9 +48065,9 @@ diff -urNp linux-2.6.39/fs/logfs/super.c linux-2.= 6.39/fs/logfs/super.c /* read first superblock */ err =3D wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0); if (err) -diff -urNp linux-2.6.39/fs/namei.c linux-2.6.39/fs/namei.c ---- linux-2.6.39/fs/namei.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/namei.c 2011-05-23 18:21:41.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/namei.c linux-2.6.39.1/fs/namei.c +--- linux-2.6.39.1/fs/namei.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/fs/namei.c 2011-06-03 00:32:07.000000000 -0400 @@ -237,20 +237,30 @@ int generic_permission(struct inode *ino return ret; =20 @@ -48472,9 +48537,9 @@ diff -urNp linux-2.6.39/fs/namei.c linux-2.6.39/f= s/namei.c len =3D -EFAULT; out: return len; -diff -urNp linux-2.6.39/fs/namespace.c linux-2.6.39/fs/namespace.c ---- linux-2.6.39/fs/namespace.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/namespace.c 2011-05-22 20:43:58.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/namespace.c linux-2.6.39.1/fs/namespace.c +--- linux-2.6.39.1/fs/namespace.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/namespace.c 2011-05-22 20:43:58.000000000 -0400 @@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval =3D do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -48534,9 +48599,9 @@ diff -urNp linux-2.6.39/fs/namespace.c linux-2.6.= 39/fs/namespace.c get_fs_root(current->fs, &root); error =3D lock_mount(&old); if (error) -diff -urNp linux-2.6.39/fs/ncpfs/dir.c linux-2.6.39/fs/ncpfs/dir.c ---- linux-2.6.39/fs/ncpfs/dir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ncpfs/dir.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ncpfs/dir.c linux-2.6.39.1/fs/ncpfs/dir.c +--- linux-2.6.39.1/fs/ncpfs/dir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ncpfs/dir.c 2011-05-22 19:36:32.000000000 -0400 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr int res, val =3D 0, len; __u8 __name[NCP_MAXPATHLEN + 1]; @@ -48582,9 +48647,9 @@ diff -urNp linux-2.6.39/fs/ncpfs/dir.c linux-2.6.= 39/fs/ncpfs/dir.c DPRINTK("ncp_rename: %s/%s to %s/%s\n", old_dentry->d_parent->d_name.name, old_dentry->d_name.name, new_dentry->d_parent->d_name.name, new_dentry->d_name.name); -diff -urNp linux-2.6.39/fs/ncpfs/inode.c linux-2.6.39/fs/ncpfs/inode.c ---- linux-2.6.39/fs/ncpfs/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ncpfs/inode.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ncpfs/inode.c linux-2.6.39.1/fs/ncpfs/inode= .c +--- linux-2.6.39.1/fs/ncpfs/inode.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ncpfs/inode.c 2011-05-22 19:36:32.000000000 -0400 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b #endif struct ncp_entry_info finfo; @@ -48594,9 +48659,9 @@ diff -urNp linux-2.6.39/fs/ncpfs/inode.c linux-2.= 6.39/fs/ncpfs/inode.c data.wdog_pid =3D NULL; server =3D kzalloc(sizeof(struct ncp_server), GFP_KERNEL); if (!server) -diff -urNp linux-2.6.39/fs/nfs/inode.c linux-2.6.39/fs/nfs/inode.c ---- linux-2.6.39/fs/nfs/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nfs/inode.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/nfs/inode.c linux-2.6.39.1/fs/nfs/inode.c +--- linux-2.6.39.1/fs/nfs/inode.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/nfs/inode.c 2011-05-22 19:36:32.000000000 -0400 @@ -999,16 +999,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -48617,10 +48682,10 @@ diff -urNp linux-2.6.39/fs/nfs/inode.c linux-2.= 6.39/fs/nfs/inode.c } =20 void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.39/fs/nfs/nfs4proc.c linux-2.6.39/fs/nfs/nfs4proc.c ---- linux-2.6.39/fs/nfs/nfs4proc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nfs/nfs4proc.c 2011-05-22 19:36:32.000000000 -0400 -@@ -5840,14 +5840,14 @@ struct nfs4_state_recovery_ops nfs41_nog +diff -urNp linux-2.6.39.1/fs/nfs/nfs4proc.c linux-2.6.39.1/fs/nfs/nfs4pr= oc.c +--- linux-2.6.39.1/fs/nfs/nfs4proc.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/fs/nfs/nfs4proc.c 2011-06-03 00:32:07.000000000 -0400 +@@ -5845,14 +5845,14 @@ struct nfs4_state_recovery_ops nfs41_nog }; #endif /* CONFIG_NFS_V4_1 */ =20 @@ -48637,9 +48702,9 @@ diff -urNp linux-2.6.39/fs/nfs/nfs4proc.c linux-2= .6.39/fs/nfs/nfs4proc.c .sched_state_renewal =3D nfs41_proc_async_sequence, .get_state_renewal_cred_locked =3D nfs4_get_machine_cred_locked, .renew_lease =3D nfs4_proc_sequence, -diff -urNp linux-2.6.39/fs/nfsd/lockd.c linux-2.6.39/fs/nfsd/lockd.c ---- linux-2.6.39/fs/nfsd/lockd.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nfsd/lockd.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/nfsd/lockd.c linux-2.6.39.1/fs/nfsd/lockd.c +--- linux-2.6.39.1/fs/nfsd/lockd.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/nfsd/lockd.c 2011-05-22 19:36:32.000000000 -0400 @@ -60,7 +60,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -48649,9 +48714,9 @@ diff -urNp linux-2.6.39/fs/nfsd/lockd.c linux-2.6= .39/fs/nfsd/lockd.c .fopen =3D nlm_fopen, /* open file for locking */ .fclose =3D nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.39/fs/nfsd/nfs4state.c linux-2.6.39/fs/nfsd/nfs4sta= te.c ---- linux-2.6.39/fs/nfsd/nfs4state.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nfsd/nfs4state.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/nfsd/nfs4state.c linux-2.6.39.1/fs/nfsd/nfs= 4state.c +--- linux-2.6.39.1/fs/nfsd/nfs4state.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/nfsd/nfs4state.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -3784,6 +3784,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc unsigned int strhashval; int err; @@ -48661,9 +48726,9 @@ diff -urNp linux-2.6.39/fs/nfsd/nfs4state.c linux= -2.6.39/fs/nfsd/nfs4state.c dprintk("NFSD: nfsd4_lock: start=3D%Ld length=3D%Ld\n", (long long) lock->lk_offset, (long long) lock->lk_length); -diff -urNp linux-2.6.39/fs/nfsd/nfs4xdr.c linux-2.6.39/fs/nfsd/nfs4xdr.c ---- linux-2.6.39/fs/nfsd/nfs4xdr.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nfsd/nfs4xdr.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/nfsd/nfs4xdr.c linux-2.6.39.1/fs/nfsd/nfs4x= dr.c +--- linux-2.6.39.1/fs/nfsd/nfs4xdr.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/nfsd/nfs4xdr.c 2011-05-22 19:36:32.000000000 -0400 @@ -1793,6 +1793,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s .dentry =3D dentry, }; @@ -48673,9 +48738,9 @@ diff -urNp linux-2.6.39/fs/nfsd/nfs4xdr.c linux-2= .6.39/fs/nfsd/nfs4xdr.c BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1); BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion)); BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion)); -diff -urNp linux-2.6.39/fs/nfsd/nfsctl.c linux-2.6.39/fs/nfsd/nfsctl.c ---- linux-2.6.39/fs/nfsd/nfsctl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nfsd/nfsctl.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/nfsd/nfsctl.c linux-2.6.39.1/fs/nfsd/nfsctl= .c +--- linux-2.6.39.1/fs/nfsd/nfsctl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/nfsd/nfsctl.c 2011-05-22 19:36:32.000000000 -0400 @@ -182,7 +182,7 @@ static int export_features_open(struct i return single_open(file, export_features_show, NULL); } @@ -48685,9 +48750,9 @@ diff -urNp linux-2.6.39/fs/nfsd/nfsctl.c linux-2.= 6.39/fs/nfsd/nfsctl.c .open =3D export_features_open, .read =3D seq_read, .llseek =3D seq_lseek, -diff -urNp linux-2.6.39/fs/nfsd/vfs.c linux-2.6.39/fs/nfsd/vfs.c ---- linux-2.6.39/fs/nfsd/vfs.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nfsd/vfs.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/nfsd/vfs.c linux-2.6.39.1/fs/nfsd/vfs.c +--- linux-2.6.39.1/fs/nfsd/vfs.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/nfsd/vfs.c 2011-05-22 19:36:32.000000000 -0400 @@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs =3D get_fs(); @@ -48715,9 +48780,9 @@ diff -urNp linux-2.6.39/fs/nfsd/vfs.c linux-2.6.3= 9/fs/nfsd/vfs.c set_fs(oldfs); =20 if (host_err < 0) -diff -urNp linux-2.6.39/fs/nilfs2/segment.c linux-2.6.39/fs/nilfs2/segme= nt.c ---- linux-2.6.39/fs/nilfs2/segment.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/nilfs2/segment.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/nilfs2/segment.c linux-2.6.39.1/fs/nilfs2/s= egment.c +--- linux-2.6.39.1/fs/nilfs2/segment.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/nilfs2/segment.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -555,7 +555,7 @@ static void nilfs_write_file_node_binfo( *vblocknr =3D binfo->bi_v.bi_vblocknr; } @@ -48763,9 +48828,9 @@ diff -urNp linux-2.6.39/fs/nilfs2/segment.c linux= -2.6.39/fs/nilfs2/segment.c struct nilfs_segsum_pointer ssp; struct nilfs_finfo *finfo =3D NULL; union nilfs_binfo binfo; -diff -urNp linux-2.6.39/fs/notify/dnotify/dnotify.c linux-2.6.39/fs/noti= fy/dnotify/dnotify.c ---- linux-2.6.39/fs/notify/dnotify/dnotify.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/fs/notify/dnotify/dnotify.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/fs/notify/dnotify/dnotify.c linux-2.6.39.1/fs/= notify/dnotify/dnotify.c +--- linux-2.6.39.1/fs/notify/dnotify/dnotify.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/fs/notify/dnotify/dnotify.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsn kmem_cache_free(dnotify_mark_cache, dn_mark); } @@ -48775,9 +48840,9 @@ diff -urNp linux-2.6.39/fs/notify/dnotify/dnotify= .c linux-2.6.39/fs/notify/dnoti .handle_event =3D dnotify_handle_event, .should_send_event =3D dnotify_should_send_event, .free_group_priv =3D NULL, -diff -urNp linux-2.6.39/fs/notify/notification.c linux-2.6.39/fs/notify/= notification.c ---- linux-2.6.39/fs/notify/notification.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/fs/notify/notification.c 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/fs/notify/notification.c linux-2.6.39.1/fs/not= ify/notification.c +--- linux-2.6.39.1/fs/notify/notification.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/fs/notify/notification.c 2011-05-22 19:36:32.00000000= 0 -0400 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event * get set to 0 so it will never get 'freed' */ @@ -48796,9 +48861,9 @@ diff -urNp linux-2.6.39/fs/notify/notification.c = linux-2.6.39/fs/notify/notifica } EXPORT_SYMBOL_GPL(fsnotify_get_cookie); =20 -diff -urNp linux-2.6.39/fs/ntfs/dir.c linux-2.6.39/fs/ntfs/dir.c ---- linux-2.6.39/fs/ntfs/dir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ntfs/dir.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ntfs/dir.c linux-2.6.39.1/fs/ntfs/dir.c +--- linux-2.6.39.1/fs/ntfs/dir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ntfs/dir.c 2011-05-22 19:36:32.000000000 -0400 @@ -1329,7 +1329,7 @@ find_next_index_buffer: ia =3D (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); @@ -48808,9 +48873,9 @@ diff -urNp linux-2.6.39/fs/ntfs/dir.c linux-2.6.3= 9/fs/ntfs/dir.c ntfs_error(sb, "Out of bounds check failed. Corrupt directory " "inode 0x%lx or driver bug.", vdir->i_ino); goto err_out; -diff -urNp linux-2.6.39/fs/ntfs/file.c linux-2.6.39/fs/ntfs/file.c ---- linux-2.6.39/fs/ntfs/file.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ntfs/file.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ntfs/file.c linux-2.6.39.1/fs/ntfs/file.c +--- linux-2.6.39.1/fs/ntfs/file.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ntfs/file.c 2011-05-22 19:36:32.000000000 -0400 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -48820,9 +48885,9 @@ diff -urNp linux-2.6.39/fs/ntfs/file.c linux-2.6.= 39/fs/ntfs/file.c =20 -const struct inode_operations ntfs_empty_inode_ops =3D {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.39/fs/ocfs2/cluster/heartbeat.c linux-2.6.39/fs/ocf= s2/cluster/heartbeat.c ---- linux-2.6.39/fs/ocfs2/cluster/heartbeat.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/fs/ocfs2/cluster/heartbeat.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/fs/ocfs2/cluster/heartbeat.c linux-2.6.39.1/fs= /ocfs2/cluster/heartbeat.c +--- linux-2.6.39.1/fs/ocfs2/cluster/heartbeat.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/fs/ocfs2/cluster/heartbeat.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -2261,7 +2261,7 @@ static struct configfs_item_operations o .store_attribute =3D o2hb_heartbeat_group_store, }; @@ -48832,9 +48897,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/cluster/heartbea= t.c linux-2.6.39/fs/ocfs2/clust .make_item =3D o2hb_heartbeat_group_make_item, .drop_item =3D o2hb_heartbeat_group_drop_item, }; -diff -urNp linux-2.6.39/fs/ocfs2/cluster/nodemanager.c linux-2.6.39/fs/o= cfs2/cluster/nodemanager.c ---- linux-2.6.39/fs/ocfs2/cluster/nodemanager.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/fs/ocfs2/cluster/nodemanager.c 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/fs/ocfs2/cluster/nodemanager.c linux-2.6.39.1/= fs/ocfs2/cluster/nodemanager.c +--- linux-2.6.39.1/fs/ocfs2/cluster/nodemanager.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/fs/ocfs2/cluster/nodemanager.c 2011-05-22 19:36:32.00= 0000000 -0400 @@ -752,7 +752,7 @@ static void o2nm_node_group_drop_item(st config_item_put(item); } @@ -48853,9 +48918,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/cluster/nodemana= ger.c linux-2.6.39/fs/ocfs2/clu .make_group =3D o2nm_cluster_group_make_group, .drop_item =3D o2nm_cluster_group_drop_item, }; -diff -urNp linux-2.6.39/fs/ocfs2/localalloc.c linux-2.6.39/fs/ocfs2/loca= lalloc.c ---- linux-2.6.39/fs/ocfs2/localalloc.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/ocfs2/localalloc.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/ocfs2/localalloc.c linux-2.6.39.1/fs/ocfs2/= localalloc.c +--- linux-2.6.39.1/fs/ocfs2/localalloc.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/ocfs2/localalloc.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -48865,9 +48930,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/localalloc.c lin= ux-2.6.39/fs/ocfs2/localalloc.c =20 bail: if (handle) -diff -urNp linux-2.6.39/fs/ocfs2/namei.c linux-2.6.39/fs/ocfs2/namei.c ---- linux-2.6.39/fs/ocfs2/namei.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ocfs2/namei.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ocfs2/namei.c linux-2.6.39.1/fs/ocfs2/namei= .c +--- linux-2.6.39.1/fs/ocfs2/namei.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ocfs2/namei.c 2011-05-22 19:36:32.000000000 -0400 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol struct ocfs2_dir_lookup_result orphan_insert =3D { NULL, }; struct ocfs2_dir_lookup_result target_insert =3D { NULL, }; @@ -48877,9 +48942,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/namei.c linux-2.= 6.39/fs/ocfs2/namei.c /* At some point it might be nice to break this function up a * bit. */ =20 -diff -urNp linux-2.6.39/fs/ocfs2/ocfs2.h linux-2.6.39/fs/ocfs2/ocfs2.h ---- linux-2.6.39/fs/ocfs2/ocfs2.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ocfs2/ocfs2.h 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ocfs2/ocfs2.h linux-2.6.39.1/fs/ocfs2/ocfs2= .h +--- linux-2.6.39.1/fs/ocfs2/ocfs2.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ocfs2/ocfs2.h 2011-05-22 19:36:32.000000000 -0400 @@ -235,11 +235,11 @@ enum ocfs2_vol_state =20 struct ocfs2_alloc_stats @@ -48897,9 +48962,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/ocfs2.h linux-2.= 6.39/fs/ocfs2/ocfs2.h }; =20 enum ocfs2_local_alloc_state -diff -urNp linux-2.6.39/fs/ocfs2/stackglue.h linux-2.6.39/fs/ocfs2/stack= glue.h ---- linux-2.6.39/fs/ocfs2/stackglue.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/ocfs2/stackglue.h 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/ocfs2/stackglue.h linux-2.6.39.1/fs/ocfs2/s= tackglue.h +--- linux-2.6.39.1/fs/ocfs2/stackglue.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/ocfs2/stackglue.h 2011-05-22 19:36:32.000000000 -0= 400 @@ -221,13 +221,13 @@ struct ocfs2_stack_operations { }; =20 @@ -48916,9 +48981,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/stackglue.h linu= x-2.6.39/fs/ocfs2/stackglue.h struct module *sp_owner; =20 /* These are managed by the stackglue code. */ -diff -urNp linux-2.6.39/fs/ocfs2/stack_o2cb.c linux-2.6.39/fs/ocfs2/stac= k_o2cb.c ---- linux-2.6.39/fs/ocfs2/stack_o2cb.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/ocfs2/stack_o2cb.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/ocfs2/stack_o2cb.c linux-2.6.39.1/fs/ocfs2/= stack_o2cb.c +--- linux-2.6.39.1/fs/ocfs2/stack_o2cb.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/ocfs2/stack_o2cb.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -358,7 +358,7 @@ static int o2cb_cluster_this_node(unsign return 0; } @@ -48936,9 +49001,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/stack_o2cb.c lin= ux-2.6.39/fs/ocfs2/stack_o2cb.c static struct ocfs2_stack_plugin o2cb_stack =3D { .sp_name =3D "o2cb", .sp_ops =3D &o2cb_stack_ops, -diff -urNp linux-2.6.39/fs/ocfs2/stack_user.c linux-2.6.39/fs/ocfs2/stac= k_user.c ---- linux-2.6.39/fs/ocfs2/stack_user.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/ocfs2/stack_user.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/ocfs2/stack_user.c linux-2.6.39.1/fs/ocfs2/= stack_user.c +--- linux-2.6.39.1/fs/ocfs2/stack_user.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/ocfs2/stack_user.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -399,7 +399,7 @@ static int ocfs2_control_do_setversion_m long major, minor; char *ptr =3D NULL; @@ -48957,9 +49022,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/stack_user.c lin= ux-2.6.39/fs/ocfs2/stack_user.c .connect =3D user_cluster_connect, .disconnect =3D user_cluster_disconnect, .this_node =3D user_cluster_this_node, -diff -urNp linux-2.6.39/fs/ocfs2/suballoc.c linux-2.6.39/fs/ocfs2/suball= oc.c ---- linux-2.6.39/fs/ocfs2/suballoc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ocfs2/suballoc.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ocfs2/suballoc.c linux-2.6.39.1/fs/ocfs2/su= balloc.c +--- linux-2.6.39.1/fs/ocfs2/suballoc.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/ocfs2/suballoc.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -49014,9 +49079,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/suballoc.c linux= -2.6.39/fs/ocfs2/suballoc.c *num_clusters =3D res.sr_bits; } } -diff -urNp linux-2.6.39/fs/ocfs2/super.c linux-2.6.39/fs/ocfs2/super.c ---- linux-2.6.39/fs/ocfs2/super.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ocfs2/super.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ocfs2/super.c linux-2.6.39.1/fs/ocfs2/super= .c +--- linux-2.6.39.1/fs/ocfs2/super.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/ocfs2/super.c 2011-05-22 19:36:32.000000000 -0400 @@ -299,11 +299,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s =3D> GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -49051,9 +49116,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/super.c linux-2.= 6.39/fs/ocfs2/super.c =20 /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats =3D *stats; -diff -urNp linux-2.6.39/fs/ocfs2/symlink.c linux-2.6.39/fs/ocfs2/symlink= .c ---- linux-2.6.39/fs/ocfs2/symlink.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/ocfs2/symlink.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/ocfs2/symlink.c linux-2.6.39.1/fs/ocfs2/sym= link.c +--- linux-2.6.39.1/fs/ocfs2/symlink.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/ocfs2/symlink.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -142,7 +142,7 @@ bail: =20 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata= *nd, void *cookie) @@ -49063,9 +49128,9 @@ diff -urNp linux-2.6.39/fs/ocfs2/symlink.c linux-= 2.6.39/fs/ocfs2/symlink.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.39/fs/open.c linux-2.6.39/fs/open.c ---- linux-2.6.39/fs/open.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/open.c 2011-05-22 20:46:51.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/open.c linux-2.6.39.1/fs/open.c +--- linux-2.6.39.1/fs/open.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/open.c 2011-05-22 20:46:51.000000000 -0400 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _ error =3D locks_verify_truncate(inode, NULL, length); if (!error) @@ -49203,9 +49268,9 @@ diff -urNp linux-2.6.39/fs/open.c linux-2.6.39/fs= /open.c if (IS_ERR(f)) { put_unused_fd(fd); fd =3D PTR_ERR(f); -diff -urNp linux-2.6.39/fs/partitions/ldm.c linux-2.6.39/fs/partitions/l= dm.c ---- linux-2.6.39/fs/partitions/ldm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/partitions/ldm.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/partitions/ldm.c linux-2.6.39.1/fs/partitio= ns/ldm.c +--- linux-2.6.39.1/fs/partitions/ldm.c 2011-06-03 00:04:14.000000000 -04= 00 ++++ linux-2.6.39.1/fs/partitions/ldm.c 2011-06-03 00:32:07.000000000 -04= 00 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data ldm_error ("A VBLK claims to have %d parts.", num); return false; @@ -49223,9 +49288,9 @@ diff -urNp linux-2.6.39/fs/partitions/ldm.c linux= -2.6.39/fs/partitions/ldm.c if (!f) { ldm_crit ("Out of memory."); return false; -diff -urNp linux-2.6.39/fs/pipe.c linux-2.6.39/fs/pipe.c ---- linux-2.6.39/fs/pipe.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/pipe.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/pipe.c linux-2.6.39.1/fs/pipe.c +--- linux-2.6.39.1/fs/pipe.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/pipe.c 2011-05-22 19:41:37.000000000 -0400 @@ -420,9 +420,9 @@ redo: } if (bufs) /* More to do? */ @@ -49349,9 +49414,9 @@ diff -urNp linux-2.6.39/fs/pipe.c linux-2.6.39/fs= /pipe.c inode->i_fop =3D &rdwr_pipefifo_fops; =20 /* -diff -urNp linux-2.6.39/fs/proc/array.c linux-2.6.39/fs/proc/array.c ---- linux-2.6.39/fs/proc/array.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/array.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/array.c linux-2.6.39.1/fs/proc/array.c +--- linux-2.6.39.1/fs/proc/array.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/array.c 2011-05-22 19:41:37.000000000 -0400 @@ -60,6 +60,7 @@ #include #include @@ -49475,9 +49540,9 @@ diff -urNp linux-2.6.39/fs/proc/array.c linux-2.6= .39/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &curr_ip); +} +#endif -diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.39/fs/proc/base.c ---- linux-2.6.39/fs/proc/base.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/base.c 2011-05-22 21:50:17.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/base.c linux-2.6.39.1/fs/proc/base.c +--- linux-2.6.39.1/fs/proc/base.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/base.c 2011-06-04 21:20:04.000000000 -0400 @@ -104,6 +104,22 @@ struct pid_entry { union proc_op op; }; @@ -49660,7 +49725,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c =20 generic_fillattr(inode, stat); =20 -@@ -1791,12 +1852,34 @@ static int pid_getattr(struct vfsmount * +@@ -1791,13 +1852,41 @@ static int pid_getattr(struct vfsmount * stat->uid =3D 0; stat->gid =3D 0; task =3D pid_task(proc_pid(inode), PIDTYPE_PID); @@ -49677,7 +49742,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP + || in_group_p(CONFIG_GRKERNSEC_PROC_GID) +#endif -+ ) ++ ) { +#endif if ((inode->i_mode =3D=3D (S_IFDIR|S_IRUGO|S_IXUGO)) || +#ifdef CONFIG_GRKERNSEC_PROC_USER @@ -49694,9 +49759,16 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6= .39/fs/proc/base.c stat->gid =3D cred->egid; +#endif } ++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PRO= C_USERGROUP) ++ } else { ++ rcu_read_unlock(); ++ return -ENOENT; ++ } ++#endif } rcu_read_unlock(); -@@ -1834,11 +1917,20 @@ static int pid_revalidate(struct dentry=20 + return 0; +@@ -1834,11 +1923,20 @@ static int pid_revalidate(struct dentry=20 =20 if (task) { if ((inode->i_mode =3D=3D (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -49717,7 +49789,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid =3D 0; -@@ -1959,7 +2051,8 @@ static int proc_fd_info(struct inode *in +@@ -1959,7 +2057,8 @@ static int proc_fd_info(struct inode *in int fd =3D proc_fd(inode); =20 if (task) { @@ -49727,7 +49799,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -2219,15 +2312,25 @@ static const struct file_operations proc +@@ -2219,15 +2318,25 @@ static const struct file_operations proc */ static int proc_fd_permission(struct inode *inode, int mask, unsigned i= nt flags) { @@ -49755,7 +49827,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c return rv; } =20 -@@ -2337,6 +2440,9 @@ static struct dentry *proc_pident_lookup +@@ -2337,6 +2446,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; =20 @@ -49765,7 +49837,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2381,6 +2487,9 @@ static int proc_pident_readdir(struct fi +@@ -2381,6 +2493,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; =20 @@ -49775,7 +49847,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c ret =3D 0; i =3D filp->f_pos; switch (i) { -@@ -2651,7 +2760,7 @@ static void *proc_self_follow_link(struc +@@ -2651,7 +2766,7 @@ static void *proc_self_follow_link(struc static void proc_self_put_link(struct dentry *dentry, struct nameidata = *nd, void *cookie) { @@ -49784,7 +49856,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2835,7 +2944,7 @@ static const struct pid_entry tgid_base_ +@@ -2835,7 +2950,7 @@ static const struct pid_entry tgid_base_ REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations= ), #endif REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), @@ -49793,7 +49865,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2860,10 +2969,10 @@ static const struct pid_entry tgid_base_ +@@ -2860,10 +2975,10 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, pro= c_attr_dir_operations), #endif @@ -49806,7 +49878,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2894,6 +3003,9 @@ static const struct pid_entry tgid_base_ +@@ -2894,6 +3009,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif @@ -49816,7 +49888,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c }; =20 static int proc_tgid_base_readdir(struct file * filp, -@@ -3019,7 +3131,14 @@ static struct dentry *proc_pid_instantia +@@ -3019,7 +3137,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; =20 @@ -49831,7 +49903,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c inode->i_op =3D &proc_tgid_base_inode_operations; inode->i_fop =3D &proc_tgid_base_operations; inode->i_flags|=3DS_IMMUTABLE; -@@ -3061,7 +3180,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -3061,7 +3186,11 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; =20 @@ -49843,7 +49915,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c put_task_struct(task); out: return result; -@@ -3126,6 +3249,11 @@ int proc_pid_readdir(struct file * filp, +@@ -3126,6 +3255,11 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr; struct task_struct *reaper; @@ -49855,7 +49927,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; =20 -@@ -3149,8 +3277,27 @@ int proc_pid_readdir(struct file * filp, +@@ -3149,8 +3283,27 @@ int proc_pid_readdir(struct file * filp, for (iter =3D next_tgid(ns, iter); iter.task; iter.tgid +=3D 1, iter =3D next_tgid(ns, iter)) { @@ -49884,7 +49956,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -3177,7 +3324,7 @@ static const struct pid_entry tid_base_s +@@ -3177,7 +3330,7 @@ static const struct pid_entry tid_base_s REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), @@ -49893,7 +49965,7 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -3201,10 +3348,10 @@ static const struct pid_entry tid_base_s +@@ -3201,10 +3354,10 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc= _attr_dir_operations), #endif @@ -49906,9 +49978,9 @@ diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.= 39/fs/proc/base.c ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.39/fs/proc/cmdline.c linux-2.6.39/fs/proc/cmdline.c ---- linux-2.6.39/fs/proc/cmdline.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/cmdline.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/cmdline.c linux-2.6.39.1/fs/proc/cmdli= ne.c +--- linux-2.6.39.1/fs/proc/cmdline.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/cmdline.c 2011-05-22 19:41:37.000000000 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl =20 static int __init proc_cmdline_init(void) @@ -49921,9 +49993,9 @@ diff -urNp linux-2.6.39/fs/proc/cmdline.c linux-2= .6.39/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.39/fs/proc/devices.c linux-2.6.39/fs/proc/devices.c ---- linux-2.6.39/fs/proc/devices.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/devices.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/devices.c linux-2.6.39.1/fs/proc/devic= es.c +--- linux-2.6.39.1/fs/proc/devices.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/devices.c 2011-05-22 19:41:37.000000000 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc =20 static int __init proc_devices_init(void) @@ -49936,9 +50008,9 @@ diff -urNp linux-2.6.39/fs/proc/devices.c linux-2= .6.39/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.39/fs/proc/inode.c linux-2.6.39/fs/proc/inode.c ---- linux-2.6.39/fs/proc/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/inode.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/inode.c linux-2.6.39.1/fs/proc/inode.c +--- linux-2.6.39.1/fs/proc/inode.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/inode.c 2011-05-22 19:41:37.000000000 -0400 @@ -433,7 +433,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode =3D de->mode; @@ -49951,9 +50023,9 @@ diff -urNp linux-2.6.39/fs/proc/inode.c linux-2.6= .39/fs/proc/inode.c } if (de->size) inode->i_size =3D de->size; -diff -urNp linux-2.6.39/fs/proc/internal.h linux-2.6.39/fs/proc/internal= .h ---- linux-2.6.39/fs/proc/internal.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/internal.h 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/internal.h linux-2.6.39.1/fs/proc/inte= rnal.h +--- linux-2.6.39.1/fs/proc/internal.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/proc/internal.h 2011-05-22 19:41:37.000000000 -040= 0 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, @@ -49964,9 +50036,9 @@ diff -urNp linux-2.6.39/fs/proc/internal.h linux-= 2.6.39/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); =20 extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.39/fs/proc/Kconfig linux-2.6.39/fs/proc/Kconfig ---- linux-2.6.39/fs/proc/Kconfig 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/Kconfig 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/Kconfig linux-2.6.39.1/fs/proc/Kconfig +--- linux-2.6.39.1/fs/proc/Kconfig 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/Kconfig 2011-05-22 19:41:37.000000000 -0400 @@ -30,12 +30,12 @@ config PROC_FS =20 config PROC_KCORE @@ -49994,9 +50066,9 @@ diff -urNp linux-2.6.39/fs/proc/Kconfig linux-2.6= .39/fs/proc/Kconfig bool "Enable /proc page monitoring" if EXPERT help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.39/fs/proc/kcore.c linux-2.6.39/fs/proc/kcore.c ---- linux-2.6.39/fs/proc/kcore.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/kcore.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/kcore.c linux-2.6.39.1/fs/proc/kcore.c +--- linux-2.6.39.1/fs/proc/kcore.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/kcore.c 2011-05-22 19:41:37.000000000 -0400 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu off_t offset =3D 0; struct kcore_list *m; @@ -50064,9 +50136,9 @@ diff -urNp linux-2.6.39/fs/proc/kcore.c linux-2.6= .39/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.39/fs/proc/meminfo.c linux-2.6.39/fs/proc/meminfo.c ---- linux-2.6.39/fs/proc/meminfo.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/meminfo.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/meminfo.c linux-2.6.39.1/fs/proc/memin= fo.c +--- linux-2.6.39.1/fs/proc/meminfo.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/meminfo.c 2011-05-22 19:36:32.000000000 -0400 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_ unsigned long pages[NR_LRU_LISTS]; int lru; @@ -50085,9 +50157,9 @@ diff -urNp linux-2.6.39/fs/proc/meminfo.c linux-2= .6.39/fs/proc/meminfo.c #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * -diff -urNp linux-2.6.39/fs/proc/nommu.c linux-2.6.39/fs/proc/nommu.c ---- linux-2.6.39/fs/proc/nommu.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/nommu.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/nommu.c linux-2.6.39.1/fs/proc/nommu.c +--- linux-2.6.39.1/fs/proc/nommu.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/nommu.c 2011-05-22 19:36:32.000000000 -0400 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len =3D 1; @@ -50097,9 +50169,9 @@ diff -urNp linux-2.6.39/fs/proc/nommu.c linux-2.6= .39/fs/proc/nommu.c } =20 seq_putc(m, '\n'); -diff -urNp linux-2.6.39/fs/proc/proc_net.c linux-2.6.39/fs/proc/proc_net= .c ---- linux-2.6.39/fs/proc/proc_net.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/proc_net.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/proc_net.c linux-2.6.39.1/fs/proc/proc= _net.c +--- linux-2.6.39.1/fs/proc/proc_net.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/proc/proc_net.c 2011-05-22 19:41:37.000000000 -040= 0 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -50118,9 +50190,9 @@ diff -urNp linux-2.6.39/fs/proc/proc_net.c linux-= 2.6.39/fs/proc/proc_net.c =20 rcu_read_lock(); task =3D pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.39/fs/proc/proc_sysctl.c linux-2.6.39/fs/proc/proc_= sysctl.c ---- linux-2.6.39/fs/proc/proc_sysctl.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/proc/proc_sysctl.c 2011-05-22 19:41:37.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/proc/proc_sysctl.c linux-2.6.39.1/fs/proc/p= roc_sysctl.c +--- linux-2.6.39.1/fs/proc/proc_sysctl.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/proc/proc_sysctl.c 2011-05-22 19:41:37.000000000 -= 0400 @@ -8,6 +8,8 @@ #include #include "internal.h" @@ -50160,9 +50232,9 @@ diff -urNp linux-2.6.39/fs/proc/proc_sysctl.c lin= ux-2.6.39/fs/proc/proc_sysctl.c generic_fillattr(inode, stat); if (table) stat->mode =3D (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.39/fs/proc/root.c linux-2.6.39/fs/proc/root.c ---- linux-2.6.39/fs/proc/root.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/root.c 2011-05-22 19:41:37.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/root.c linux-2.6.39.1/fs/proc/root.c +--- linux-2.6.39.1/fs/proc/root.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/proc/root.c 2011-05-22 19:41:37.000000000 -0400 @@ -122,7 +122,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -50179,9 +50251,9 @@ diff -urNp linux-2.6.39/fs/proc/root.c linux-2.6.= 39/fs/proc/root.c proc_sys_init(); } =20 -diff -urNp linux-2.6.39/fs/proc/task_mmu.c linux-2.6.39/fs/proc/task_mmu= .c ---- linux-2.6.39/fs/proc/task_mmu.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/proc/task_mmu.c 2011-05-22 22:43:29.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/proc/task_mmu.c linux-2.6.39.1/fs/proc/task= _mmu.c +--- linux-2.6.39.1/fs/proc/task_mmu.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/proc/task_mmu.c 2011-05-22 22:43:29.000000000 -040= 0 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" @@ -50312,9 +50384,9 @@ diff -urNp linux-2.6.39/fs/proc/task_mmu.c linux-= 2.6.39/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.39/fs/proc/task_nommu.c linux-2.6.39/fs/proc/task_n= ommu.c ---- linux-2.6.39/fs/proc/task_nommu.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/proc/task_nommu.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/proc/task_nommu.c linux-2.6.39.1/fs/proc/ta= sk_nommu.c +--- linux-2.6.39.1/fs/proc/task_nommu.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/proc/task_nommu.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct else bytes +=3D kobjsize(mm); @@ -50333,9 +50405,9 @@ diff -urNp linux-2.6.39/fs/proc/task_nommu.c linu= x-2.6.39/fs/proc/task_nommu.c } else if (mm) { if (vma->vm_start <=3D mm->start_stack && vma->vm_end >=3D mm->start_stack) { -diff -urNp linux-2.6.39/fs/quota/netlink.c linux-2.6.39/fs/quota/netlink= .c ---- linux-2.6.39/fs/quota/netlink.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/quota/netlink.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/quota/netlink.c linux-2.6.39.1/fs/quota/net= link.c +--- linux-2.6.39.1/fs/quota/netlink.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/quota/netlink.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam void quota_send_warning(short type, unsigned int id, dev_t dev, const char warntype) @@ -50354,9 +50426,9 @@ diff -urNp linux-2.6.39/fs/quota/netlink.c linux-= 2.6.39/fs/quota/netlink.c "a_genl_family, 0, QUOTA_NL_C_WARNING); if (!msg_head) { printk(KERN_ERR -diff -urNp linux-2.6.39/fs/readdir.c linux-2.6.39/fs/readdir.c ---- linux-2.6.39/fs/readdir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/readdir.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/readdir.c linux-2.6.39.1/fs/readdir.c +--- linux-2.6.39.1/fs/readdir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/readdir.c 2011-05-22 19:41:42.000000000 -0400 @@ -17,6 +17,7 @@ #include #include @@ -50446,9 +50518,9 @@ diff -urNp linux-2.6.39/fs/readdir.c linux-2.6.39= /fs/readdir.c buf.count =3D count; buf.error =3D 0; =20 -diff -urNp linux-2.6.39/fs/reiserfs/dir.c linux-2.6.39/fs/reiserfs/dir.c ---- linux-2.6.39/fs/reiserfs/dir.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/reiserfs/dir.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/reiserfs/dir.c linux-2.6.39.1/fs/reiserfs/d= ir.c +--- linux-2.6.39.1/fs/reiserfs/dir.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/reiserfs/dir.c 2011-05-22 19:36:32.000000000 -0400 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr struct reiserfs_dir_entry de; int ret =3D 0; @@ -50458,9 +50530,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/dir.c linux-2= .6.39/fs/reiserfs/dir.c reiserfs_write_lock(inode->i_sb); =20 reiserfs_check_lock_depth(inode->i_sb, "readdir"); -diff -urNp linux-2.6.39/fs/reiserfs/do_balan.c linux-2.6.39/fs/reiserfs/= do_balan.c ---- linux-2.6.39/fs/reiserfs/do_balan.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/reiserfs/do_balan.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/reiserfs/do_balan.c linux-2.6.39.1/fs/reise= rfs/do_balan.c +--- linux-2.6.39.1/fs/reiserfs/do_balan.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/reiserfs/do_balan.c 2011-05-22 19:36:32.000000000 = -0400 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -50470,9 +50542,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/do_balan.c li= nux-2.6.39/fs/reiserfs/do_balan do_balance_starts(tb); =20 /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.39/fs/reiserfs/item_ops.c linux-2.6.39/fs/reiserfs/= item_ops.c ---- linux-2.6.39/fs/reiserfs/item_ops.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/fs/reiserfs/item_ops.c 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/fs/reiserfs/item_ops.c linux-2.6.39.1/fs/reise= rfs/item_ops.c +--- linux-2.6.39.1/fs/reiserfs/item_ops.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/fs/reiserfs/item_ops.c 2011-05-22 19:36:32.000000000 = -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -50527,9 +50599,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/item_ops.c li= nux-2.6.39/fs/reiserfs/item_ops &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.39/fs/reiserfs/journal.c linux-2.6.39/fs/reiserfs/j= ournal.c ---- linux-2.6.39/fs/reiserfs/journal.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/fs/reiserfs/journal.c 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/fs/reiserfs/journal.c linux-2.6.39.1/fs/reiser= fs/journal.c +--- linux-2.6.39.1/fs/reiserfs/journal.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/fs/reiserfs/journal.c 2011-05-22 19:36:32.000000000 -= 0400 @@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea struct buffer_head *bh; int i, j; @@ -50539,9 +50611,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/journal.c lin= ux-2.6.39/fs/reiserfs/journal.c bh =3D __getblk(dev, block, bufsize); if (buffer_uptodate(bh)) return (bh); -diff -urNp linux-2.6.39/fs/reiserfs/namei.c linux-2.6.39/fs/reiserfs/nam= ei.c ---- linux-2.6.39/fs/reiserfs/namei.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/reiserfs/namei.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/reiserfs/namei.c linux-2.6.39.1/fs/reiserfs= /namei.c +--- linux-2.6.39.1/fs/reiserfs/namei.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/reiserfs/namei.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode=20 unsigned long savelink =3D 1; struct timespec ctime; @@ -50551,9 +50623,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/namei.c linux= -2.6.39/fs/reiserfs/namei.c /* three balancings: (1) old name removal, (2) new name insertion and (3) maybe "save" link insertion stat data updates: (1) old directory, -diff -urNp linux-2.6.39/fs/reiserfs/procfs.c linux-2.6.39/fs/reiserfs/pr= ocfs.c ---- linux-2.6.39/fs/reiserfs/procfs.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/reiserfs/procfs.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/reiserfs/procfs.c linux-2.6.39.1/fs/reiserf= s/procfs.c +--- linux-2.6.39.1/fs/reiserfs/procfs.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/reiserfs/procfs.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -50572,9 +50644,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/procfs.c linu= x-2.6.39/fs/reiserfs/procfs.c seq_printf(m, /* on-disk fields */ "jp_journal_1st_block: \t%i\n" "jp_journal_dev: \t%s[%x]\n" -diff -urNp linux-2.6.39/fs/reiserfs/stree.c linux-2.6.39/fs/reiserfs/str= ee.c ---- linux-2.6.39/fs/reiserfs/stree.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/reiserfs/stree.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/reiserfs/stree.c linux-2.6.39.1/fs/reiserfs= /stree.c +--- linux-2.6.39.1/fs/reiserfs/stree.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/reiserfs/stree.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs int iter =3D 0; #endif @@ -50620,9 +50692,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/stree.c linux= -2.6.39/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); =20 if (inode) { /* Do we count quotas for item? */ -diff -urNp linux-2.6.39/fs/reiserfs/super.c linux-2.6.39/fs/reiserfs/sup= er.c ---- linux-2.6.39/fs/reiserfs/super.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/reiserfs/super.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/reiserfs/super.c linux-2.6.39.1/fs/reiserfs= /super.c +--- linux-2.6.39.1/fs/reiserfs/super.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/fs/reiserfs/super.c 2011-05-22 19:36:32.000000000 -04= 00 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct {.option_name =3D NULL} }; @@ -50632,9 +50704,9 @@ diff -urNp linux-2.6.39/fs/reiserfs/super.c linux= -2.6.39/fs/reiserfs/super.c *blocks =3D 0; if (!options || !*options) /* use default configuration: create tails, journaling on, no -diff -urNp linux-2.6.39/fs/select.c linux-2.6.39/fs/select.c ---- linux-2.6.39/fs/select.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/select.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/select.c linux-2.6.39.1/fs/select.c +--- linux-2.6.39.1/fs/select.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/select.c 2011-05-22 19:41:42.000000000 -0400 @@ -20,6 +20,7 @@ #include #include @@ -50671,9 +50743,9 @@ diff -urNp linux-2.6.39/fs/select.c linux-2.6.39/= fs/select.c if (nfds > rlimit(RLIMIT_NOFILE)) return -EINVAL; =20 -diff -urNp linux-2.6.39/fs/seq_file.c linux-2.6.39/fs/seq_file.c ---- linux-2.6.39/fs/seq_file.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/seq_file.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/seq_file.c linux-2.6.39.1/fs/seq_file.c +--- linux-2.6.39.1/fs/seq_file.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/seq_file.c 2011-05-22 19:36:32.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,=20 return 0; } @@ -50714,9 +50786,9 @@ diff -urNp linux-2.6.39/fs/seq_file.c linux-2.6.3= 9/fs/seq_file.c if (!m->buf) goto Enomem; m->count =3D 0; -diff -urNp linux-2.6.39/fs/splice.c linux-2.6.39/fs/splice.c ---- linux-2.6.39/fs/splice.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/splice.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/splice.c linux-2.6.39.1/fs/splice.c +--- linux-2.6.39.1/fs/splice.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/splice.c 2011-05-22 19:36:32.000000000 -0400 @@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); =20 @@ -50882,9 +50954,9 @@ diff -urNp linux-2.6.39/fs/splice.c linux-2.6.39/= fs/splice.c ret =3D -EAGAIN; =20 pipe_unlock(ipipe); -diff -urNp linux-2.6.39/fs/sysfs/file.c linux-2.6.39/fs/sysfs/file.c ---- linux-2.6.39/fs/sysfs/file.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/sysfs/file.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/sysfs/file.c linux-2.6.39.1/fs/sysfs/file.c +--- linux-2.6.39.1/fs/sysfs/file.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/sysfs/file.c 2011-05-22 19:36:32.000000000 -0400 @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent =20 struct sysfs_open_dirent { @@ -50930,9 +51002,9 @@ diff -urNp linux-2.6.39/fs/sysfs/file.c linux-2.6= .39/fs/sysfs/file.c wake_up_interruptible(&od->poll); } =20 -diff -urNp linux-2.6.39/fs/sysfs/mount.c linux-2.6.39/fs/sysfs/mount.c ---- linux-2.6.39/fs/sysfs/mount.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/sysfs/mount.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/sysfs/mount.c linux-2.6.39.1/fs/sysfs/mount= .c +--- linux-2.6.39.1/fs/sysfs/mount.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/sysfs/mount.c 2011-05-22 19:41:42.000000000 -0400 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root =3D { .s_name =3D "", .s_count =3D ATOMIC_INIT(1), @@ -50945,9 +51017,9 @@ diff -urNp linux-2.6.39/fs/sysfs/mount.c linux-2.= 6.39/fs/sysfs/mount.c .s_ino =3D 1, }; =20 -diff -urNp linux-2.6.39/fs/sysfs/symlink.c linux-2.6.39/fs/sysfs/symlink= .c ---- linux-2.6.39/fs/sysfs/symlink.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/sysfs/symlink.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/sysfs/symlink.c linux-2.6.39.1/fs/sysfs/sym= link.c +--- linux-2.6.39.1/fs/sysfs/symlink.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/fs/sysfs/symlink.c 2011-05-22 19:36:32.000000000 -040= 0 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de =20 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,= void *cookie) @@ -50957,9 +51029,9 @@ diff -urNp linux-2.6.39/fs/sysfs/symlink.c linux-= 2.6.39/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.39/fs/udf/inode.c linux-2.6.39/fs/udf/inode.c ---- linux-2.6.39/fs/udf/inode.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/udf/inode.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/udf/inode.c linux-2.6.39.1/fs/udf/inode.c +--- linux-2.6.39.1/fs/udf/inode.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/udf/inode.c 2011-05-22 19:36:32.000000000 -0400 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk( int goal =3D 0, pgoal =3D iinfo->i_location.logicalBlockNum; int lastblock =3D 0; @@ -50969,9 +51041,9 @@ diff -urNp linux-2.6.39/fs/udf/inode.c linux-2.6.= 39/fs/udf/inode.c prev_epos.offset =3D udf_file_entry_alloc_offset(inode); prev_epos.block =3D iinfo->i_location; prev_epos.bh =3D NULL; -diff -urNp linux-2.6.39/fs/udf/misc.c linux-2.6.39/fs/udf/misc.c ---- linux-2.6.39/fs/udf/misc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/udf/misc.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/udf/misc.c linux-2.6.39.1/fs/udf/misc.c +--- linux-2.6.39.1/fs/udf/misc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/udf/misc.c 2011-05-22 19:36:32.000000000 -0400 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id =20 u8 udf_tag_checksum(const struct tag *t) @@ -50981,9 +51053,9 @@ diff -urNp linux-2.6.39/fs/udf/misc.c linux-2.6.3= 9/fs/udf/misc.c u8 checksum =3D 0; int i; for (i =3D 0; i < sizeof(struct tag); ++i) -diff -urNp linux-2.6.39/fs/utimes.c linux-2.6.39/fs/utimes.c ---- linux-2.6.39/fs/utimes.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/utimes.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/utimes.c linux-2.6.39.1/fs/utimes.c +--- linux-2.6.39.1/fs/utimes.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/utimes.c 2011-05-22 19:41:42.000000000 -0400 @@ -1,6 +1,7 @@ #include #include @@ -51005,9 +51077,9 @@ diff -urNp linux-2.6.39/fs/utimes.c linux-2.6.39/= fs/utimes.c mutex_lock(&inode->i_mutex); error =3D notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.39/fs/xattr_acl.c linux-2.6.39/fs/xattr_acl.c ---- linux-2.6.39/fs/xattr_acl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/xattr_acl.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/xattr_acl.c linux-2.6.39.1/fs/xattr_acl.c +--- linux-2.6.39.1/fs/xattr_acl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/xattr_acl.c 2011-05-22 19:36:32.000000000 -0400 @@ -17,8 +17,8 @@ struct posix_acl * posix_acl_from_xattr(const void *value, size_t size) @@ -51019,9 +51091,9 @@ diff -urNp linux-2.6.39/fs/xattr_acl.c linux-2.6.= 39/fs/xattr_acl.c int count; struct posix_acl *acl; struct posix_acl_entry *acl_e; -diff -urNp linux-2.6.39/fs/xattr.c linux-2.6.39/fs/xattr.c ---- linux-2.6.39/fs/xattr.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/xattr.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/xattr.c linux-2.6.39.1/fs/xattr.c +--- linux-2.6.39.1/fs/xattr.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/xattr.c 2011-05-22 19:41:42.000000000 -0400 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); * Extended attribute SET operations */ @@ -51084,9 +51156,9 @@ diff -urNp linux-2.6.39/fs/xattr.c linux-2.6.39/f= s/xattr.c mnt_drop_write(f->f_path.mnt); } fput(f); -diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.39/fs/x= fs/linux-2.6/xfs_ioctl32.c ---- linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-05-22 19:41:42.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.39.1/= fs/xfs/linux-2.6/xfs_ioctl32.c +--- linux-2.6.39.1/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-05-22 19:41:42.00= 0000000 -0400 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( xfs_fsop_geom_t fsgeo; int error; @@ -51095,9 +51167,9 @@ diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_ioct= l32.c linux-2.6.39/fs/xfs/linux error =3D xfs_fs_geometry(mp, &fsgeo, 3); if (error) return -error; -diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.39/fs/xfs= /linux-2.6/xfs_ioctl.c ---- linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.39.1/fs= /xfs/linux-2.6/xfs_ioctl.c +--- linux-2.6.39.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 19:36:32.0000= 00000 -0400 @@ -128,7 +128,7 @@ xfs_find_handle( } =20 @@ -51107,9 +51179,9 @@ diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_ioct= l.c linux-2.6.39/fs/xfs/linux-2 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; =20 -diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.39/fs/xfs/= linux-2.6/xfs_iops.c ---- linux-2.6.39/fs/xfs/linux-2.6/xfs_iops.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/fs/xfs/linux-2.6/xfs_iops.c 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.39.1/fs/= xfs/linux-2.6/xfs_iops.c +--- linux-2.6.39.1/fs/xfs/linux-2.6/xfs_iops.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/fs/xfs/linux-2.6/xfs_iops.c 2011-05-22 19:36:32.00000= 0000 -0400 @@ -437,7 +437,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -51119,9 +51191,9 @@ diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_iops= .c linux-2.6.39/fs/xfs/linux-2. =20 if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.39/fs/xfs/xfs_bmap.c linux-2.6.39/fs/xfs/xfs_bmap.c ---- linux-2.6.39/fs/xfs/xfs_bmap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/xfs/xfs_bmap.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/xfs/xfs_bmap.c linux-2.6.39.1/fs/xfs/xfs_bm= ap.c +--- linux-2.6.39.1/fs/xfs/xfs_bmap.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/xfs/xfs_bmap.c 2011-05-22 19:36:32.000000000 -0400 @@ -287,7 +287,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -51131,9 +51203,9 @@ diff -urNp linux-2.6.39/fs/xfs/xfs_bmap.c linux-2= .6.39/fs/xfs/xfs_bmap.c #endif /* DEBUG */ =20 STATIC int -diff -urNp linux-2.6.39/fs/xfs/xfs_dir2.c linux-2.6.39/fs/xfs/xfs_dir2.c ---- linux-2.6.39/fs/xfs/xfs_dir2.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/fs/xfs/xfs_dir2.c 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/fs/xfs/xfs_dir2.c linux-2.6.39.1/fs/xfs/xfs_di= r2.c +--- linux-2.6.39.1/fs/xfs/xfs_dir2.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/fs/xfs/xfs_dir2.c 2011-05-22 19:36:32.000000000 -0400 @@ -85,7 +85,7 @@ xfs_ascii_ci_compname( return result; } @@ -51143,9 +51215,9 @@ diff -urNp linux-2.6.39/fs/xfs/xfs_dir2.c linux-2= .6.39/fs/xfs/xfs_dir2.c .hashname =3D xfs_ascii_ci_hashname, .compname =3D xfs_ascii_ci_compname, }; -diff -urNp linux-2.6.39/fs/xfs/xfs_dir2_sf.c linux-2.6.39/fs/xfs/xfs_dir= 2_sf.c ---- linux-2.6.39/fs/xfs/xfs_dir2_sf.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/fs/xfs/xfs_dir2_sf.c 2011-05-22 19:36:32.000000000 -040= 0 +diff -urNp linux-2.6.39.1/fs/xfs/xfs_dir2_sf.c linux-2.6.39.1/fs/xfs/xfs= _dir2_sf.c +--- linux-2.6.39.1/fs/xfs/xfs_dir2_sf.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/fs/xfs/xfs_dir2_sf.c 2011-05-22 19:36:32.000000000 -0= 400 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents( } =20 @@ -51163,9 +51235,9 @@ diff -urNp linux-2.6.39/fs/xfs/xfs_dir2_sf.c linu= x-2.6.39/fs/xfs/xfs_dir2_sf.c off & 0x7fffffff, ino, DT_UNKNOWN)) { *offset =3D off & 0x7fffffff; return 0; -diff -urNp linux-2.6.39/grsecurity/gracl_alloc.c linux-2.6.39/grsecurity= /gracl_alloc.c ---- linux-2.6.39/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.39/grsecurity/gracl_alloc.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/grsecurity/gracl_alloc.c linux-2.6.39.1/grsecu= rity/gracl_alloc.c +--- linux-2.6.39.1/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.39.1/grsecurity/gracl_alloc.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -0,0 +1,105 @@ +#include +#include @@ -51272,9 +51344,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_alloc.c = linux-2.6.39/grsecurity/gracl_a + else + return 1; +} -diff -urNp linux-2.6.39/grsecurity/gracl.c linux-2.6.39/grsecurity/gracl= .c ---- linux-2.6.39/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.39/grsecurity/gracl.c 2011-05-24 20:27:30.000000000 -0400 +diff -urNp linux-2.6.39.1/grsecurity/gracl.c linux-2.6.39.1/grsecurity/g= racl.c +--- linux-2.6.39.1/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.39.1/grsecurity/gracl.c 2011-05-24 20:27:30.000000000 -040= 0 @@ -0,0 +1,4103 @@ +#include +#include @@ -55379,9 +55451,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl.c linux-= 2.6.39/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.39/grsecurity/gracl_cap.c linux-2.6.39/grsecurity/g= racl_cap.c ---- linux-2.6.39/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/gracl_cap.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/gracl_cap.c linux-2.6.39.1/grsecuri= ty/gracl_cap.c +--- linux-2.6.39.1/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/gracl_cap.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,139 @@ +#include +#include @@ -55522,9 +55594,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_cap.c li= nux-2.6.39/grsecurity/gracl_cap + return 0; +} + -diff -urNp linux-2.6.39/grsecurity/gracl_fs.c linux-2.6.39/grsecurity/gr= acl_fs.c ---- linux-2.6.39/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.39/grsecurity/gracl_fs.c 2011-05-22 19:41:42.000000000 -04= 00 +diff -urNp linux-2.6.39.1/grsecurity/gracl_fs.c linux-2.6.39.1/grsecurit= y/gracl_fs.c +--- linux-2.6.39.1/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.39.1/grsecurity/gracl_fs.c 2011-05-22 19:41:42.000000000 -= 0400 @@ -0,0 +1,431 @@ +#include +#include @@ -55957,9 +56029,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_fs.c lin= ux-2.6.39/grsecurity/gracl_fs.c + + return 0; +} -diff -urNp linux-2.6.39/grsecurity/gracl_ip.c linux-2.6.39/grsecurity/gr= acl_ip.c ---- linux-2.6.39/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.39/grsecurity/gracl_ip.c 2011-05-22 22:47:31.000000000 -04= 00 +diff -urNp linux-2.6.39.1/grsecurity/gracl_ip.c linux-2.6.39.1/grsecurit= y/gracl_ip.c +--- linux-2.6.39.1/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.39.1/grsecurity/gracl_ip.c 2011-05-22 22:47:31.000000000 -= 0400 @@ -0,0 +1,381 @@ +#include +#include @@ -56342,9 +56414,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_ip.c lin= ux-2.6.39/grsecurity/gracl_ip.c + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin= , SOCK_DGRAM); +} -diff -urNp linux-2.6.39/grsecurity/gracl_learn.c linux-2.6.39/grsecurity= /gracl_learn.c ---- linux-2.6.39/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.39/grsecurity/gracl_learn.c 2011-05-22 22:47:45.000000000 = -0400 +diff -urNp linux-2.6.39.1/grsecurity/gracl_learn.c linux-2.6.39.1/grsecu= rity/gracl_learn.c +--- linux-2.6.39.1/grsecurity/gracl_learn.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.39.1/grsecurity/gracl_learn.c 2011-05-22 22:47:45.00000000= 0 -0400 @@ -0,0 +1,210 @@ +#include +#include @@ -56556,9 +56628,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_learn.c = linux-2.6.39/grsecurity/gracl_l + .release =3D close_learn, + .poll =3D poll_learn, +}; -diff -urNp linux-2.6.39/grsecurity/gracl_res.c linux-2.6.39/grsecurity/g= racl_res.c ---- linux-2.6.39/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/gracl_res.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/gracl_res.c linux-2.6.39.1/grsecuri= ty/gracl_res.c +--- linux-2.6.39.1/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/gracl_res.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,68 @@ +#include +#include @@ -56628,9 +56700,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_res.c li= nux-2.6.39/grsecurity/gracl_res + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.39/grsecurity/gracl_segv.c linux-2.6.39/grsecurity/= gracl_segv.c ---- linux-2.6.39/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/gracl_segv.c 2011-05-22 22:47:39.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/gracl_segv.c linux-2.6.39.1/grsecur= ity/gracl_segv.c +--- linux-2.6.39.1/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/gracl_segv.c 2011-05-22 22:47:39.000000000= -0400 @@ -0,0 +1,299 @@ +#include +#include @@ -56931,9 +57003,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_segv.c l= inux-2.6.39/grsecurity/gracl_se + + return; +} -diff -urNp linux-2.6.39/grsecurity/gracl_shm.c linux-2.6.39/grsecurity/g= racl_shm.c ---- linux-2.6.39/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/gracl_shm.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/gracl_shm.c linux-2.6.39.1/grsecuri= ty/gracl_shm.c +--- linux-2.6.39.1/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/gracl_shm.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,40 @@ +#include +#include @@ -56975,9 +57047,9 @@ diff -urNp linux-2.6.39/grsecurity/gracl_shm.c li= nux-2.6.39/grsecurity/gracl_shm + + return 1; +} -diff -urNp linux-2.6.39/grsecurity/grsec_chdir.c linux-2.6.39/grsecurity= /grsec_chdir.c ---- linux-2.6.39/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.39/grsecurity/grsec_chdir.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_chdir.c linux-2.6.39.1/grsecu= rity/grsec_chdir.c +--- linux-2.6.39.1/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.39.1/grsecurity/grsec_chdir.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -0,0 +1,19 @@ +#include +#include @@ -56998,9 +57070,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_chdir.c = linux-2.6.39/grsecurity/grsec_c +#endif + return; +} -diff -urNp linux-2.6.39/grsecurity/grsec_chroot.c linux-2.6.39/grsecurit= y/grsec_chroot.c ---- linux-2.6.39/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.39/grsecurity/grsec_chroot.c 2011-05-22 19:41:42.000000000= -0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_chroot.c linux-2.6.39.1/grsec= urity/grsec_chroot.c +--- linux-2.6.39.1/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.39.1/grsecurity/grsec_chroot.c 2011-05-22 19:41:42.0000000= 00 -0400 @@ -0,0 +1,355 @@ +#include +#include @@ -57357,9 +57429,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_chroot.c= linux-2.6.39/grsecurity/grsec_ +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.39/grsecurity/grsec_disabled.c linux-2.6.39/grsecur= ity/grsec_disabled.c ---- linux-2.6.39/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.39/grsecurity/grsec_disabled.c 2011-05-22 19:41:42.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_disabled.c linux-2.6.39.1/grs= ecurity/grsec_disabled.c +--- linux-2.6.39.1/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.00000= 0000 -0500 ++++ linux-2.6.39.1/grsecurity/grsec_disabled.c 2011-05-22 19:41:42.00000= 0000 -0400 @@ -0,0 +1,447 @@ +#include +#include @@ -57808,9 +57880,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_disabled= .c linux-2.6.39/grsecurity/grse +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.39/grsecurity/grsec_exec.c linux-2.6.39/grsecurity/= grsec_exec.c ---- linux-2.6.39/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/grsec_exec.c 2011-05-22 22:41:29.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_exec.c linux-2.6.39.1/grsecur= ity/grsec_exec.c +--- linux-2.6.39.1/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/grsec_exec.c 2011-05-22 22:41:29.000000000= -0400 @@ -0,0 +1,146 @@ +#include +#include @@ -57958,9 +58030,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_exec.c l= inux-2.6.39/grsecurity/grsec_ex + return; +} +#endif -diff -urNp linux-2.6.39/grsecurity/grsec_fifo.c linux-2.6.39/grsecurity/= grsec_fifo.c ---- linux-2.6.39/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/grsec_fifo.c 2011-05-22 19:41:42.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_fifo.c linux-2.6.39.1/grsecur= ity/grsec_fifo.c +--- linux-2.6.39.1/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/grsec_fifo.c 2011-05-22 19:41:42.000000000= -0400 @@ -0,0 +1,24 @@ +#include +#include @@ -57986,9 +58058,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_fifo.c l= inux-2.6.39/grsecurity/grsec_fi +#endif + return 0; +} -diff -urNp linux-2.6.39/grsecurity/grsec_fork.c linux-2.6.39/grsecurity/= grsec_fork.c ---- linux-2.6.39/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/grsec_fork.c 2011-05-22 19:41:42.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_fork.c linux-2.6.39.1/grsecur= ity/grsec_fork.c +--- linux-2.6.39.1/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/grsec_fork.c 2011-05-22 19:41:42.000000000= -0400 @@ -0,0 +1,23 @@ +#include +#include @@ -58013,9 +58085,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_fork.c l= inux-2.6.39/grsecurity/grsec_fo +#endif + return; +} -diff -urNp linux-2.6.39/grsecurity/grsec_init.c linux-2.6.39/grsecurity/= grsec_init.c ---- linux-2.6.39/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/grsec_init.c 2011-05-22 22:47:15.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_init.c linux-2.6.39.1/grsecur= ity/grsec_init.c +--- linux-2.6.39.1/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/grsec_init.c 2011-05-22 22:47:15.000000000= -0400 @@ -0,0 +1,269 @@ +#include +#include @@ -58286,9 +58358,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_init.c l= inux-2.6.39/grsecurity/grsec_in + + return; +} -diff -urNp linux-2.6.39/grsecurity/grsec_link.c linux-2.6.39/grsecurity/= grsec_link.c ---- linux-2.6.39/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/grsec_link.c 2011-05-22 19:41:42.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_link.c linux-2.6.39.1/grsecur= ity/grsec_link.c +--- linux-2.6.39.1/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/grsec_link.c 2011-05-22 19:41:42.000000000= -0400 @@ -0,0 +1,43 @@ +#include +#include @@ -58333,9 +58405,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_link.c l= inux-2.6.39/grsecurity/grsec_li +#endif + return 0; +} -diff -urNp linux-2.6.39/grsecurity/grsec_log.c linux-2.6.39/grsecurity/g= rsec_log.c ---- linux-2.6.39/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/grsec_log.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_log.c linux-2.6.39.1/grsecuri= ty/grsec_log.c +--- linux-2.6.39.1/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/grsec_log.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,310 @@ +#include +#include @@ -58647,9 +58719,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_log.c li= nux-2.6.39/grsecurity/grsec_log + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.39/grsecurity/grsec_mem.c linux-2.6.39/grsecurity/g= rsec_mem.c ---- linux-2.6.39/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/grsec_mem.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_mem.c linux-2.6.39.1/grsecuri= ty/grsec_mem.c +--- linux-2.6.39.1/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/grsec_mem.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,33 @@ +#include +#include @@ -58684,9 +58756,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_mem.c li= nux-2.6.39/grsecurity/grsec_mem + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.39/grsecurity/grsec_mount.c linux-2.6.39/grsecurity= /grsec_mount.c ---- linux-2.6.39/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.39/grsecurity/grsec_mount.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_mount.c linux-2.6.39.1/grsecu= rity/grsec_mount.c +--- linux-2.6.39.1/grsecurity/grsec_mount.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.39.1/grsecurity/grsec_mount.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -0,0 +1,62 @@ +#include +#include @@ -58750,9 +58822,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_mount.c = linux-2.6.39/grsecurity/grsec_m +#endif + return 0; +} -diff -urNp linux-2.6.39/grsecurity/grsec_pax.c linux-2.6.39/grsecurity/g= rsec_pax.c ---- linux-2.6.39/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/grsec_pax.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_pax.c linux-2.6.39.1/grsecuri= ty/grsec_pax.c +--- linux-2.6.39.1/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/grsec_pax.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,36 @@ +#include +#include @@ -58790,9 +58862,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_pax.c li= nux-2.6.39/grsecurity/grsec_pax +#endif + return; +} -diff -urNp linux-2.6.39/grsecurity/grsec_ptrace.c linux-2.6.39/grsecurit= y/grsec_ptrace.c ---- linux-2.6.39/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.39/grsecurity/grsec_ptrace.c 2011-05-22 19:41:42.000000000= -0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_ptrace.c linux-2.6.39.1/grsec= urity/grsec_ptrace.c +--- linux-2.6.39.1/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.39.1/grsecurity/grsec_ptrace.c 2011-05-22 19:41:42.0000000= 00 -0400 @@ -0,0 +1,14 @@ +#include +#include @@ -58808,9 +58880,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_ptrace.c= linux-2.6.39/grsecurity/grsec_ +#endif + return; +} -diff -urNp linux-2.6.39/grsecurity/grsec_sig.c linux-2.6.39/grsecurity/g= rsec_sig.c ---- linux-2.6.39/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/grsec_sig.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_sig.c linux-2.6.39.1/grsecuri= ty/grsec_sig.c +--- linux-2.6.39.1/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/grsec_sig.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,203 @@ +#include +#include @@ -59015,9 +59087,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_sig.c li= nux-2.6.39/grsecurity/grsec_sig +#endif + return 0; +} -diff -urNp linux-2.6.39/grsecurity/grsec_sock.c linux-2.6.39/grsecurity/= grsec_sock.c ---- linux-2.6.39/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/grsec_sock.c 2011-05-22 20:29:21.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_sock.c linux-2.6.39.1/grsecur= ity/grsec_sock.c +--- linux-2.6.39.1/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/grsec_sock.c 2011-05-22 20:29:21.000000000= -0400 @@ -0,0 +1,244 @@ +#include +#include @@ -59263,9 +59335,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_sock.c l= inux-2.6.39/grsecurity/grsec_so +#endif + return 0; +} -diff -urNp linux-2.6.39/grsecurity/grsec_sysctl.c linux-2.6.39/grsecurit= y/grsec_sysctl.c ---- linux-2.6.39/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.39/grsecurity/grsec_sysctl.c 2011-05-22 19:41:42.000000000= -0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_sysctl.c linux-2.6.39.1/grsec= urity/grsec_sysctl.c +--- linux-2.6.39.1/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.39.1/grsecurity/grsec_sysctl.c 2011-05-22 19:41:42.0000000= 00 -0400 @@ -0,0 +1,433 @@ +#include +#include @@ -59700,9 +59772,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_sysctl.c= linux-2.6.39/grsecurity/grsec_ + { } +}; +#endif -diff -urNp linux-2.6.39/grsecurity/grsec_time.c linux-2.6.39/grsecurity/= grsec_time.c ---- linux-2.6.39/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/grsecurity/grsec_time.c 2011-05-22 19:41:42.000000000 -= 0400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_time.c linux-2.6.39.1/grsecur= ity/grsec_time.c +--- linux-2.6.39.1/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/grsecurity/grsec_time.c 2011-05-22 19:41:42.000000000= -0400 @@ -0,0 +1,16 @@ +#include +#include @@ -59720,9 +59792,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_time.c l= inux-2.6.39/grsecurity/grsec_ti +} + +EXPORT_SYMBOL(gr_log_timechange); -diff -urNp linux-2.6.39/grsecurity/grsec_tpe.c linux-2.6.39/grsecurity/g= rsec_tpe.c ---- linux-2.6.39/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/grsecurity/grsec_tpe.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/grsecurity/grsec_tpe.c linux-2.6.39.1/grsecuri= ty/grsec_tpe.c +--- linux-2.6.39.1/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/grsecurity/grsec_tpe.c 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,39 @@ +#include +#include @@ -59763,9 +59835,9 @@ diff -urNp linux-2.6.39/grsecurity/grsec_tpe.c li= nux-2.6.39/grsecurity/grsec_tpe +#endif + return 1; +} -diff -urNp linux-2.6.39/grsecurity/grsum.c linux-2.6.39/grsecurity/grsum= .c ---- linux-2.6.39/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.39/grsecurity/grsum.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/grsecurity/grsum.c linux-2.6.39.1/grsecurity/g= rsum.c +--- linux-2.6.39.1/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.39.1/grsecurity/grsum.c 2011-05-22 19:41:42.000000000 -040= 0 @@ -0,0 +1,61 @@ +#include +#include @@ -59828,9 +59900,9 @@ diff -urNp linux-2.6.39/grsecurity/grsum.c linux-= 2.6.39/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.39/grsecurity/Kconfig linux-2.6.39/grsecurity/Kconf= ig ---- linux-2.6.39/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.39/grsecurity/Kconfig 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/grsecurity/Kconfig linux-2.6.39.1/grsecurity/K= config +--- linux-2.6.39.1/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.39.1/grsecurity/Kconfig 2011-05-22 19:41:42.000000000 -040= 0 @@ -0,0 +1,1045 @@ +# +# grecurity configuration @@ -60877,9 +60949,9 @@ diff -urNp linux-2.6.39/grsecurity/Kconfig linux-= 2.6.39/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.39/grsecurity/Makefile linux-2.6.39/grsecurity/Make= file ---- linux-2.6.39/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.39/grsecurity/Makefile 2011-05-24 20:26:54.000000000 -0400 +diff -urNp linux-2.6.39.1/grsecurity/Makefile linux-2.6.39.1/grsecurity/= Makefile +--- linux-2.6.39.1/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -05= 00 ++++ linux-2.6.39.1/grsecurity/Makefile 2011-05-24 20:26:54.000000000 -04= 00 @@ -0,0 +1,33 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dal= ton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -60914,9 +60986,9 @@ diff -urNp linux-2.6.39/grsecurity/Makefile linux= -2.6.39/grsecurity/Makefile + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.39/include/acpi/acpi_drivers.h linux-2.6.39/include= /acpi/acpi_drivers.h ---- linux-2.6.39/include/acpi/acpi_drivers.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/acpi/acpi_drivers.h 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/acpi/acpi_drivers.h linux-2.6.39.1/inc= lude/acpi/acpi_drivers.h +--- linux-2.6.39.1/include/acpi/acpi_drivers.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/acpi/acpi_drivers.h 2011-05-22 19:36:32.00000= 0000 -0400 @@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void); Dock Station ---------------------------------------------------------------------= ----- */ @@ -60946,9 +61018,9 @@ diff -urNp linux-2.6.39/include/acpi/acpi_drivers= .h linux-2.6.39/include/acpi/ac void *context) { return -ENODEV; -diff -urNp linux-2.6.39/include/acpi/processor.h linux-2.6.39/include/ac= pi/processor.h ---- linux-2.6.39/include/acpi/processor.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/acpi/processor.h 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/acpi/processor.h linux-2.6.39.1/includ= e/acpi/processor.h +--- linux-2.6.39.1/include/acpi/processor.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/acpi/processor.h 2011-05-22 19:36:32.00000000= 0 -0400 @@ -344,7 +344,7 @@ extern struct cpuidle_driver acpi_idle_d =20 /* in processor_thermal.c */ @@ -60958,9 +61030,9 @@ diff -urNp linux-2.6.39/include/acpi/processor.h = linux-2.6.39/include/acpi/proce #ifdef CONFIG_CPU_FREQ void acpi_thermal_cpufreq_init(void); void acpi_thermal_cpufreq_exit(void); -diff -urNp linux-2.6.39/include/asm-generic/atomic-long.h linux-2.6.39/i= nclude/asm-generic/atomic-long.h ---- linux-2.6.39/include/asm-generic/atomic-long.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/include/asm-generic/atomic-long.h 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/atomic-long.h linux-2.6.39= .1/include/asm-generic/atomic-long.h +--- linux-2.6.39.1/include/asm-generic/atomic-long.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/atomic-long.h 2011-05-22 19:36:32= .000000000 -0400 @@ -22,6 +22,12 @@ =20 typedef atomic64_t atomic_long_t; @@ -61261,9 +61333,9 @@ diff -urNp linux-2.6.39/include/asm-generic/atomi= c-long.h linux-2.6.39/include/a +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.39/include/asm-generic/cache.h linux-2.6.39/include= /asm-generic/cache.h ---- linux-2.6.39/include/asm-generic/cache.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/asm-generic/cache.h 2011-05-22 19:36:32.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/cache.h linux-2.6.39.1/inc= lude/asm-generic/cache.h +--- linux-2.6.39.1/include/asm-generic/cache.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/asm-generic/cache.h 2011-05-22 19:36:32.00000= 0000 -0400 @@ -6,7 +6,7 @@ * cache lines need to provide their own cache.h. */ @@ -61274,9 +61346,9 @@ diff -urNp linux-2.6.39/include/asm-generic/cache= .h linux-2.6.39/include/asm-gen +#define L1_CACHE_BYTES (1U << L1_CACHE_SHIFT) =20 #endif /* __ASM_GENERIC_CACHE_H */ -diff -urNp linux-2.6.39/include/asm-generic/dma-mapping-common.h linux-2= .6.39/include/asm-generic/dma-mapping-common.h ---- linux-2.6.39/include/asm-generic/dma-mapping-common.h 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/include/asm-generic/dma-mapping-common.h 2011-05-22 19:= 36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/dma-mapping-common.h linux= -2.6.39.1/include/asm-generic/dma-mapping-common.h +--- linux-2.6.39.1/include/asm-generic/dma-mapping-common.h 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/dma-mapping-common.h 2011-05-22 1= 9:36:32.000000000 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -61367,9 +61439,9 @@ diff -urNp linux-2.6.39/include/asm-generic/dma-m= apping-common.h linux-2.6.39/in =20 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.39/include/asm-generic/int-l64.h linux-2.6.39/inclu= de/asm-generic/int-l64.h ---- linux-2.6.39/include/asm-generic/int-l64.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/include/asm-generic/int-l64.h 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/int-l64.h linux-2.6.39.1/i= nclude/asm-generic/int-l64.h +--- linux-2.6.39.1/include/asm-generic/int-l64.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/int-l64.h 2011-05-22 19:36:32.000= 000000 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -61379,9 +61451,9 @@ diff -urNp linux-2.6.39/include/asm-generic/int-l= 64.h linux-2.6.39/include/asm-g #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.39/include/asm-generic/int-ll64.h linux-2.6.39/incl= ude/asm-generic/int-ll64.h ---- linux-2.6.39/include/asm-generic/int-ll64.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/include/asm-generic/int-ll64.h 2011-05-22 19:36:32.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/int-ll64.h linux-2.6.39.1/= include/asm-generic/int-ll64.h +--- linux-2.6.39.1/include/asm-generic/int-ll64.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/int-ll64.h 2011-05-22 19:36:32.00= 0000000 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -61391,9 +61463,9 @@ diff -urNp linux-2.6.39/include/asm-generic/int-l= l64.h linux-2.6.39/include/asm- #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.39/include/asm-generic/kmap_types.h linux-2.6.39/in= clude/asm-generic/kmap_types.h ---- linux-2.6.39/include/asm-generic/kmap_types.h 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/include/asm-generic/kmap_types.h 2011-05-22 19:36:32.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/kmap_types.h linux-2.6.39.= 1/include/asm-generic/kmap_types.h +--- linux-2.6.39.1/include/asm-generic/kmap_types.h 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/kmap_types.h 2011-05-22 19:36:32.= 000000000 -0400 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, KMAP_D(18) KM_NMI_PTE, @@ -61407,9 +61479,9 @@ diff -urNp linux-2.6.39/include/asm-generic/kmap_= types.h linux-2.6.39/include/as }; =20 #undef KMAP_D -diff -urNp linux-2.6.39/include/asm-generic/pgtable.h linux-2.6.39/inclu= de/asm-generic/pgtable.h ---- linux-2.6.39/include/asm-generic/pgtable.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/include/asm-generic/pgtable.h 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/pgtable.h linux-2.6.39.1/i= nclude/asm-generic/pgtable.h +--- linux-2.6.39.1/include/asm-generic/pgtable.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/pgtable.h 2011-05-22 19:36:32.000= 000000 -0400 @@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd) #endif /* __HAVE_ARCH_PMD_WRITE */ #endif @@ -61425,9 +61497,9 @@ diff -urNp linux-2.6.39/include/asm-generic/pgtab= le.h linux-2.6.39/include/asm-g #endif /* !__ASSEMBLY__ */ =20 #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.39/include/asm-generic/pgtable-nopmd.h linux-2.6.39= /include/asm-generic/pgtable-nopmd.h ---- linux-2.6.39/include/asm-generic/pgtable-nopmd.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/include/asm-generic/pgtable-nopmd.h 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/pgtable-nopmd.h linux-2.6.= 39.1/include/asm-generic/pgtable-nopmd.h +--- linux-2.6.39.1/include/asm-generic/pgtable-nopmd.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/pgtable-nopmd.h 2011-05-22 19:36:= 32.000000000 -0400 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -61464,9 +61536,9 @@ diff -urNp linux-2.6.39/include/asm-generic/pgtab= le-nopmd.h linux-2.6.39/include /* * The "pud_xxx()" functions here are trivial for a folded two-level * setup: the pmd is never bad, and a pmd always exists (as it's folded -diff -urNp linux-2.6.39/include/asm-generic/pgtable-nopud.h linux-2.6.39= /include/asm-generic/pgtable-nopud.h ---- linux-2.6.39/include/asm-generic/pgtable-nopud.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/include/asm-generic/pgtable-nopud.h 2011-05-22 19:36:32= .000000000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/pgtable-nopud.h linux-2.6.= 39.1/include/asm-generic/pgtable-nopud.h +--- linux-2.6.39.1/include/asm-generic/pgtable-nopud.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/pgtable-nopud.h 2011-05-22 19:36:= 32.000000000 -0400 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -61497,9 +61569,9 @@ diff -urNp linux-2.6.39/include/asm-generic/pgtab= le-nopud.h linux-2.6.39/include /* * The "pgd_xxx()" functions here are trivial for a folded two-level * setup: the pud is never bad, and a pud always exists (as it's folded -diff -urNp linux-2.6.39/include/asm-generic/vmlinux.lds.h linux-2.6.39/i= nclude/asm-generic/vmlinux.lds.h ---- linux-2.6.39/include/asm-generic/vmlinux.lds.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/include/asm-generic/vmlinux.lds.h 2011-05-22 19:36:32.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/include/asm-generic/vmlinux.lds.h linux-2.6.39= .1/include/asm-generic/vmlinux.lds.h +--- linux-2.6.39.1/include/asm-generic/vmlinux.lds.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/include/asm-generic/vmlinux.lds.h 2011-05-22 19:36:32= .000000000 -0400 @@ -213,6 +213,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) =3D .; \ @@ -61536,9 +61608,9 @@ diff -urNp linux-2.6.39/include/asm-generic/vmlin= ux.lds.h linux-2.6.39/include/a =20 /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.39/include/drm/drmP.h linux-2.6.39/include/drm/drmP= .h ---- linux-2.6.39/include/drm/drmP.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/drm/drmP.h 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/include/drm/drmP.h linux-2.6.39.1/include/drm/= drmP.h +--- linux-2.6.39.1/include/drm/drmP.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/include/drm/drmP.h 2011-05-22 19:41:42.000000000 -040= 0 @@ -73,6 +73,7 @@ #include #include @@ -61574,9 +61646,9 @@ diff -urNp linux-2.6.39/include/drm/drmP.h linux-= 2.6.39/include/drm/drmP.h /*@} */ =20 struct list_head filelist; -diff -urNp linux-2.6.39/include/linux/a.out.h linux-2.6.39/include/linux= /a.out.h ---- linux-2.6.39/include/linux/a.out.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/a.out.h 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/a.out.h linux-2.6.39.1/include/l= inux/a.out.h +--- linux-2.6.39.1/include/linux/a.out.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/a.out.h 2011-05-22 19:36:32.000000000 -= 0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 =3D 152 /* MIPS R6000/R4000 binary */ }; @@ -61592,9 +61664,9 @@ diff -urNp linux-2.6.39/include/linux/a.out.h lin= ux-2.6.39/include/linux/a.out.h #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.39/include/linux/atmdev.h linux-2.6.39/include/linu= x/atmdev.h ---- linux-2.6.39/include/linux/atmdev.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/atmdev.h 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/atmdev.h linux-2.6.39.1/include/= linux/atmdev.h +--- linux-2.6.39.1/include/linux/atmdev.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/atmdev.h 2011-05-22 19:36:32.000000000 = -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif =20 @@ -61604,9 +61676,9 @@ diff -urNp linux-2.6.39/include/linux/atmdev.h li= nux-2.6.39/include/linux/atmdev __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.39/include/linux/binfmts.h linux-2.6.39/include/lin= ux/binfmts.h ---- linux-2.6.39/include/linux/binfmts.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/linux/binfmts.h 2011-05-22 19:36:32.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/binfmts.h linux-2.6.39.1/include= /linux/binfmts.h +--- linux-2.6.39.1/include/linux/binfmts.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/linux/binfmts.h 2011-05-22 19:36:32.000000000= -0400 @@ -92,6 +92,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -61615,10 +61687,10 @@ diff -urNp linux-2.6.39/include/linux/binfmts.h= linux-2.6.39/include/linux/binfm unsigned long min_coredump; /* minimal dump size */ }; =20 -diff -urNp linux-2.6.39/include/linux/blkdev.h linux-2.6.39/include/linu= x/blkdev.h ---- linux-2.6.39/include/linux/blkdev.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/blkdev.h 2011-05-22 19:36:32.000000000 -0= 400 -@@ -1281,22 +1281,22 @@ queue_max_integrity_segments(struct requ +diff -urNp linux-2.6.39.1/include/linux/blkdev.h linux-2.6.39.1/include/= linux/blkdev.h +--- linux-2.6.39.1/include/linux/blkdev.h 2011-06-03 00:04:14.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/blkdev.h 2011-06-03 00:32:08.000000000 = -0400 +@@ -1292,22 +1292,22 @@ queue_max_integrity_segments(struct requ #endif /* CONFIG_BLK_DEV_INTEGRITY */ =20 struct block_device_operations { @@ -61653,9 +61725,9 @@ diff -urNp linux-2.6.39/include/linux/blkdev.h li= nux-2.6.39/include/linux/blkdev }; =20 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsign= ed int, -diff -urNp linux-2.6.39/include/linux/blktrace_api.h linux-2.6.39/includ= e/linux/blktrace_api.h ---- linux-2.6.39/include/linux/blktrace_api.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/include/linux/blktrace_api.h 2011-05-22 19:36:32.000000= 000 -0400 +diff -urNp linux-2.6.39.1/include/linux/blktrace_api.h linux-2.6.39.1/in= clude/linux/blktrace_api.h +--- linux-2.6.39.1/include/linux/blktrace_api.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/include/linux/blktrace_api.h 2011-05-22 19:36:32.0000= 00000 -0400 @@ -161,7 +161,7 @@ struct blk_trace { struct dentry *dir; struct dentry *dropped_file; @@ -61665,9 +61737,9 @@ diff -urNp linux-2.6.39/include/linux/blktrace_ap= i.h linux-2.6.39/include/linux/ }; =20 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user= *); -diff -urNp linux-2.6.39/include/linux/byteorder/little_endian.h linux-2.= 6.39/include/linux/byteorder/little_endian.h ---- linux-2.6.39/include/linux/byteorder/little_endian.h 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/include/linux/byteorder/little_endian.h 2011-05-22 19:3= 6:32.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/byteorder/little_endian.h linux-= 2.6.39.1/include/linux/byteorder/little_endian.h +--- linux-2.6.39.1/include/linux/byteorder/little_endian.h 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/include/linux/byteorder/little_endian.h 2011-05-22 19= :36:32.000000000 -0400 @@ -42,51 +42,51 @@ =20 static inline __le64 __cpu_to_le64p(const __u64 *p) @@ -61732,9 +61804,9 @@ diff -urNp linux-2.6.39/include/linux/byteorder/l= ittle_endian.h linux-2.6.39/inc } #define __cpu_to_le64s(x) do { (void)(x); } while (0) #define __le64_to_cpus(x) do { (void)(x); } while (0) -diff -urNp linux-2.6.39/include/linux/cache.h linux-2.6.39/include/linux= /cache.h ---- linux-2.6.39/include/linux/cache.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/cache.h 2011-05-22 19:36:32.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/cache.h linux-2.6.39.1/include/l= inux/cache.h +--- linux-2.6.39.1/include/linux/cache.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/cache.h 2011-05-22 19:36:32.000000000 -= 0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -61746,9 +61818,9 @@ diff -urNp linux-2.6.39/include/linux/cache.h lin= ux-2.6.39/include/linux/cache.h #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTE= S))) #endif -diff -urNp linux-2.6.39/include/linux/capability.h linux-2.6.39/include/= linux/capability.h ---- linux-2.6.39/include/linux/capability.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/linux/capability.h 2011-05-22 21:02:47.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/linux/capability.h linux-2.6.39.1/incl= ude/linux/capability.h +--- linux-2.6.39.1/include/linux/capability.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/linux/capability.h 2011-05-22 21:02:47.000000= 000 -0400 @@ -547,6 +547,9 @@ extern bool capable(int cap); extern bool ns_capable(struct user_namespace *ns, int cap); extern bool task_ns_capable(struct task_struct *t, int cap); @@ -61759,9 +61831,9 @@ diff -urNp linux-2.6.39/include/linux/capability.= h linux-2.6.39/include/linux/ca =20 /* audit system wants to get cap info from files as well */ extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct c= pu_vfs_cap_data *cpu_caps); -diff -urNp linux-2.6.39/include/linux/compiler-gcc4.h linux-2.6.39/inclu= de/linux/compiler-gcc4.h ---- linux-2.6.39/include/linux/compiler-gcc4.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/include/linux/compiler-gcc4.h 2011-05-22 19:36:32.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/include/linux/compiler-gcc4.h linux-2.6.39.1/i= nclude/linux/compiler-gcc4.h +--- linux-2.6.39.1/include/linux/compiler-gcc4.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/include/linux/compiler-gcc4.h 2011-05-22 19:36:32.000= 000000 -0400 @@ -46,6 +46,11 @@ #define __noclone __attribute__((__noclone__)) =20 @@ -61774,9 +61846,9 @@ diff -urNp linux-2.6.39/include/linux/compiler-gc= c4.h linux-2.6.39/include/linux #endif =20 #if __GNUC_MINOR__ > 0 -diff -urNp linux-2.6.39/include/linux/compiler.h linux-2.6.39/include/li= nux/compiler.h ---- linux-2.6.39/include/linux/compiler.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/compiler.h 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/compiler.h linux-2.6.39.1/includ= e/linux/compiler.h +--- linux-2.6.39.1/include/linux/compiler.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/compiler.h 2011-05-22 19:36:32.00000000= 0 -0400 @@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -61809,9 +61881,9 @@ diff -urNp linux-2.6.39/include/linux/compiler.h = linux-2.6.39/include/linux/comp +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) =20 #endif /* __LINUX_COMPILER_H */ -diff -urNp linux-2.6.39/include/linux/concap.h linux-2.6.39/include/linu= x/concap.h ---- linux-2.6.39/include/linux/concap.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/concap.h 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/concap.h linux-2.6.39.1/include/= linux/concap.h +--- linux-2.6.39.1/include/linux/concap.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/concap.h 2011-05-22 19:36:32.000000000 = -0400 @@ -30,7 +30,7 @@ struct concap_device_ops; struct concap_proto{ struct net_device *net_dev; /* net device using our service */ @@ -61821,9 +61893,9 @@ diff -urNp linux-2.6.39/include/linux/concap.h li= nux-2.6.39/include/linux/concap spinlock_t lock; int flags; void *proto_data; /* protocol specific private data, to -diff -urNp linux-2.6.39/include/linux/configfs.h linux-2.6.39/include/li= nux/configfs.h ---- linux-2.6.39/include/linux/configfs.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/configfs.h 2011-05-22 19:36:32.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/configfs.h linux-2.6.39.1/includ= e/linux/configfs.h +--- linux-2.6.39.1/include/linux/configfs.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/configfs.h 2011-05-22 19:36:32.00000000= 0 -0400 @@ -82,7 +82,7 @@ extern void config_item_put(struct confi struct config_item_type { struct module *ct_owner; @@ -61833,9 +61905,9 @@ diff -urNp linux-2.6.39/include/linux/configfs.h = linux-2.6.39/include/linux/conf struct configfs_attribute **ct_attrs; }; =20 -diff -urNp linux-2.6.39/include/linux/cpuset.h linux-2.6.39/include/linu= x/cpuset.h ---- linux-2.6.39/include/linux/cpuset.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/cpuset.h 2011-05-22 19:36:32.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/cpuset.h linux-2.6.39.1/include/= linux/cpuset.h +--- linux-2.6.39.1/include/linux/cpuset.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/cpuset.h 2011-05-22 19:36:32.000000000 = -0400 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void * nodemask. */ @@ -61845,9 +61917,9 @@ diff -urNp linux-2.6.39/include/linux/cpuset.h li= nux-2.6.39/include/linux/cpuset } =20 static inline void set_mems_allowed(nodemask_t nodemask) -diff -urNp linux-2.6.39/include/linux/dca.h linux-2.6.39/include/linux/d= ca.h ---- linux-2.6.39/include/linux/dca.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/dca.h 2011-05-22 19:36:32.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/dca.h linux-2.6.39.1/include/lin= ux/dca.h +--- linux-2.6.39.1/include/linux/dca.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/linux/dca.h 2011-05-22 19:36:32.000000000 -04= 00 @@ -34,7 +34,7 @@ void dca_unregister_notify(struct notifi =20 struct dca_provider { @@ -61866,9 +61938,9 @@ diff -urNp linux-2.6.39/include/linux/dca.h linux= -2.6.39/include/linux/dca.h void free_dca_provider(struct dca_provider *dca); int register_dca_provider(struct dca_provider *dca, struct device *dev)= ; void unregister_dca_provider(struct dca_provider *dca, struct device *d= ev); -diff -urNp linux-2.6.39/include/linux/decompress/mm.h linux-2.6.39/inclu= de/linux/decompress/mm.h ---- linux-2.6.39/include/linux/decompress/mm.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/include/linux/decompress/mm.h 2011-05-22 19:36:33.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/include/linux/decompress/mm.h linux-2.6.39.1/i= nclude/linux/decompress/mm.h +--- linux-2.6.39.1/include/linux/decompress/mm.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/include/linux/decompress/mm.h 2011-05-22 19:36:33.000= 000000 -0400 @@ -77,7 +77,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -61878,9 +61950,9 @@ diff -urNp linux-2.6.39/include/linux/decompress/= mm.h linux-2.6.39/include/linux #define free(a) kfree(a) =20 #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.39/include/linux/dma-mapping.h linux-2.6.39/include= /linux/dma-mapping.h ---- linux-2.6.39/include/linux/dma-mapping.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/linux/dma-mapping.h 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/linux/dma-mapping.h linux-2.6.39.1/inc= lude/linux/dma-mapping.h +--- linux-2.6.39.1/include/linux/dma-mapping.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/linux/dma-mapping.h 2011-05-22 19:36:33.00000= 0000 -0400 @@ -16,40 +16,40 @@ enum dma_data_direction { }; =20 @@ -61936,9 +62008,9 @@ diff -urNp linux-2.6.39/include/linux/dma-mapping= .h linux-2.6.39/include/linux/d }; =20 #define DMA_BIT_MASK(n) (((n) =3D=3D 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.39/include/linux/elf.h linux-2.6.39/include/linux/e= lf.h ---- linux-2.6.39/include/linux/elf.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/elf.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/elf.h linux-2.6.39.1/include/lin= ux/elf.h +--- linux-2.6.39.1/include/linux/elf.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/linux/elf.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 =20 @@ -62011,9 +62083,9 @@ diff -urNp linux-2.6.39/include/linux/elf.h linux= -2.6.39/include/linux/elf.h =20 #endif =20 -diff -urNp linux-2.6.39/include/linux/enclosure.h linux-2.6.39/include/l= inux/enclosure.h ---- linux-2.6.39/include/linux/enclosure.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/linux/enclosure.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/linux/enclosure.h linux-2.6.39.1/inclu= de/linux/enclosure.h +--- linux-2.6.39.1/include/linux/enclosure.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/linux/enclosure.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -98,7 +98,7 @@ struct enclosure_device { void *scratch; struct list_head node; @@ -62023,9 +62095,9 @@ diff -urNp linux-2.6.39/include/linux/enclosure.h= linux-2.6.39/include/linux/enc int components; struct enclosure_component component[0]; }; -diff -urNp linux-2.6.39/include/linux/fscache-cache.h linux-2.6.39/inclu= de/linux/fscache-cache.h ---- linux-2.6.39/include/linux/fscache-cache.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/include/linux/fscache-cache.h 2011-05-22 19:36:33.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/include/linux/fscache-cache.h linux-2.6.39.1/i= nclude/linux/fscache-cache.h +--- linux-2.6.39.1/include/linux/fscache-cache.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/include/linux/fscache-cache.h 2011-05-22 19:36:33.000= 000000 -0400 @@ -113,7 +113,7 @@ struct fscache_operation { #endif }; @@ -62044,9 +62116,9 @@ diff -urNp linux-2.6.39/include/linux/fscache-cac= he.h linux-2.6.39/include/linux op->processor =3D processor; op->release =3D release; INIT_LIST_HEAD(&op->pend_link); -diff -urNp linux-2.6.39/include/linux/fs.h linux-2.6.39/include/linux/fs= .h ---- linux-2.6.39/include/linux/fs.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/fs.h 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/fs.h linux-2.6.39.1/include/linu= x/fs.h +--- linux-2.6.39.1/include/linux/fs.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/include/linux/fs.h 2011-05-22 19:41:42.000000000 -040= 0 @@ -108,6 +108,11 @@ struct inodes_stat_t { /* File was opened by fanotify and shouldn't generate fanotify events *= / #define FMODE_NONOTIFY ((__force fmode_t)0x1000000) @@ -62198,9 +62270,9 @@ diff -urNp linux-2.6.39/include/linux/fs.h linux-= 2.6.39/include/linux/fs.h }; =20 /* -diff -urNp linux-2.6.39/include/linux/fs_struct.h linux-2.6.39/include/l= inux/fs_struct.h ---- linux-2.6.39/include/linux/fs_struct.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/linux/fs_struct.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/linux/fs_struct.h linux-2.6.39.1/inclu= de/linux/fs_struct.h +--- linux-2.6.39.1/include/linux/fs_struct.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/linux/fs_struct.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -6,7 +6,7 @@ #include =20 @@ -62210,9 +62282,9 @@ diff -urNp linux-2.6.39/include/linux/fs_struct.h= linux-2.6.39/include/linux/fs_ spinlock_t lock; seqcount_t seq; int umask; -diff -urNp linux-2.6.39/include/linux/ftrace_event.h linux-2.6.39/includ= e/linux/ftrace_event.h ---- linux-2.6.39/include/linux/ftrace_event.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/include/linux/ftrace_event.h 2011-05-22 19:36:33.000000= 000 -0400 +diff -urNp linux-2.6.39.1/include/linux/ftrace_event.h linux-2.6.39.1/in= clude/linux/ftrace_event.h +--- linux-2.6.39.1/include/linux/ftrace_event.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/include/linux/ftrace_event.h 2011-05-22 19:36:33.0000= 00000 -0400 @@ -235,7 +235,7 @@ extern int trace_define_field(struct ftr extern int trace_add_event_call(struct ftrace_event_call *call); extern void trace_remove_event_call(struct ftrace_event_call *call); @@ -62222,9 +62294,9 @@ diff -urNp linux-2.6.39/include/linux/ftrace_even= t.h linux-2.6.39/include/linux/ =20 int trace_set_clr_event(const char *system, const char *event, int set)= ; =20 -diff -urNp linux-2.6.39/include/linux/ftrace.h linux-2.6.39/include/linu= x/ftrace.h ---- linux-2.6.39/include/linux/ftrace.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/ftrace.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/ftrace.h linux-2.6.39.1/include/= linux/ftrace.h +--- linux-2.6.39.1/include/linux/ftrace.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/ftrace.h 2011-05-22 19:36:33.000000000 = -0400 @@ -140,7 +140,7 @@ extern void unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *o= ps, void *data); @@ -62234,10 +62306,10 @@ diff -urNp linux-2.6.39/include/linux/ftrace.h = linux-2.6.39/include/linux/ftrace extern void unregister_ftrace_function_probe_all(char *glob); =20 extern int ftrace_text_reserved(void *start, void *end); -diff -urNp linux-2.6.39/include/linux/genhd.h linux-2.6.39/include/linux= /genhd.h ---- linux-2.6.39/include/linux/genhd.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/genhd.h 2011-05-22 19:36:33.000000000 -04= 00 -@@ -183,7 +183,7 @@ struct gendisk { +diff -urNp linux-2.6.39.1/include/linux/genhd.h linux-2.6.39.1/include/l= inux/genhd.h +--- linux-2.6.39.1/include/linux/genhd.h 2011-06-03 00:04:14.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/genhd.h 2011-06-03 00:32:08.000000000 -= 0400 +@@ -184,7 +184,7 @@ struct gendisk { struct kobject *slave_dir; =20 struct timer_rand_state *random; @@ -62246,9 +62318,9 @@ diff -urNp linux-2.6.39/include/linux/genhd.h lin= ux-2.6.39/include/linux/genhd.h struct disk_events *ev; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.39/include/linux/gracl.h linux-2.6.39/include/linux= /gracl.h ---- linux-2.6.39/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.39/include/linux/gracl.h 2011-05-22 19:41:42.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/gracl.h linux-2.6.39.1/include/l= inux/gracl.h +--- linux-2.6.39.1/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.39.1/include/linux/gracl.h 2011-05-22 19:41:42.000000000 -= 0400 @@ -0,0 +1,317 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -62567,9 +62639,9 @@ diff -urNp linux-2.6.39/include/linux/gracl.h lin= ux-2.6.39/include/linux/gracl.h + +#endif + -diff -urNp linux-2.6.39/include/linux/gralloc.h linux-2.6.39/include/lin= ux/gralloc.h ---- linux-2.6.39/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.39/include/linux/gralloc.h 2011-05-22 19:41:42.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/gralloc.h linux-2.6.39.1/include= /linux/gralloc.h +--- linux-2.6.39.1/include/linux/gralloc.h 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.39.1/include/linux/gralloc.h 2011-05-22 19:41:42.000000000= -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -62580,9 +62652,9 @@ diff -urNp linux-2.6.39/include/linux/gralloc.h l= inux-2.6.39/include/linux/grall +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.39/include/linux/grdefs.h linux-2.6.39/include/linu= x/grdefs.h ---- linux-2.6.39/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/include/linux/grdefs.h 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/grdefs.h linux-2.6.39.1/include/= linux/grdefs.h +--- linux-2.6.39.1/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/include/linux/grdefs.h 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,139 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -62723,9 +62795,9 @@ diff -urNp linux-2.6.39/include/linux/grdefs.h li= nux-2.6.39/include/linux/grdefs +}; + +#endif -diff -urNp linux-2.6.39/include/linux/grinternal.h linux-2.6.39/include/= linux/grinternal.h ---- linux-2.6.39/include/linux/grinternal.h 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.39/include/linux/grinternal.h 2011-05-22 19:41:42.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/linux/grinternal.h linux-2.6.39.1/incl= ude/linux/grinternal.h +--- linux-2.6.39.1/include/linux/grinternal.h 1969-12-31 19:00:00.000000= 000 -0500 ++++ linux-2.6.39.1/include/linux/grinternal.h 2011-05-22 19:41:42.000000= 000 -0400 @@ -0,0 +1,219 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -62946,9 +63018,9 @@ diff -urNp linux-2.6.39/include/linux/grinternal.= h linux-2.6.39/include/linux/gr +#endif + +#endif -diff -urNp linux-2.6.39/include/linux/grmsg.h linux-2.6.39/include/linux= /grmsg.h ---- linux-2.6.39/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.39/include/linux/grmsg.h 2011-05-22 19:41:42.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/grmsg.h linux-2.6.39.1/include/l= inux/grmsg.h +--- linux-2.6.39.1/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.39.1/include/linux/grmsg.h 2011-05-22 19:41:42.000000000 -= 0400 @@ -0,0 +1,108 @@ +#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" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/eui= d:%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" @@ -63058,9 +63130,9 @@ diff -urNp linux-2.6.39/include/linux/grmsg.h lin= ux-2.6.39/include/linux/grmsg.h +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via p= trace by " +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privi= lege to init by " -diff -urNp linux-2.6.39/include/linux/grsecurity.h linux-2.6.39/include/= linux/grsecurity.h ---- linux-2.6.39/include/linux/grsecurity.h 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.39/include/linux/grsecurity.h 2011-05-22 19:41:42.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/linux/grsecurity.h linux-2.6.39.1/incl= ude/linux/grsecurity.h +--- linux-2.6.39.1/include/linux/grsecurity.h 1969-12-31 19:00:00.000000= 000 -0500 ++++ linux-2.6.39.1/include/linux/grsecurity.h 2011-05-22 19:41:42.000000= 000 -0400 @@ -0,0 +1,212 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -63274,9 +63346,9 @@ diff -urNp linux-2.6.39/include/linux/grsecurity.= h linux-2.6.39/include/linux/gr +#endif + +#endif -diff -urNp linux-2.6.39/include/linux/grsock.h linux-2.6.39/include/linu= x/grsock.h ---- linux-2.6.39/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.39/include/linux/grsock.h 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/grsock.h linux-2.6.39.1/include/= linux/grsock.h +--- linux-2.6.39.1/include/linux/grsock.h 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/include/linux/grsock.h 2011-05-22 19:41:42.000000000 = -0400 @@ -0,0 +1,19 @@ +#ifndef __GRSOCK_H +#define __GRSOCK_H @@ -63297,9 +63369,9 @@ diff -urNp linux-2.6.39/include/linux/grsock.h li= nux-2.6.39/include/linux/grsock + const int protocol); + +#endif -diff -urNp linux-2.6.39/include/linux/highmem.h linux-2.6.39/include/lin= ux/highmem.h ---- linux-2.6.39/include/linux/highmem.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/linux/highmem.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/highmem.h linux-2.6.39.1/include= /linux/highmem.h +--- linux-2.6.39.1/include/linux/highmem.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/linux/highmem.h 2011-05-22 19:36:33.000000000= -0400 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -63319,9 +63391,9 @@ diff -urNp linux-2.6.39/include/linux/highmem.h l= inux-2.6.39/include/linux/highm static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.39/include/linux/i2o.h linux-2.6.39/include/linux/i= 2o.h ---- linux-2.6.39/include/linux/i2o.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/i2o.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/i2o.h linux-2.6.39.1/include/lin= ux/i2o.h +--- linux-2.6.39.1/include/linux/i2o.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/linux/i2o.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -564,7 +564,7 @@ struct i2o_controller { struct i2o_device *exec; /* Executive */ #if BITS_PER_LONG =3D=3D 64 @@ -63331,9 +63403,9 @@ diff -urNp linux-2.6.39/include/linux/i2o.h linux= -2.6.39/include/linux/i2o.h struct list_head context_list; /* list of context id's and pointers */ #endif -diff -urNp linux-2.6.39/include/linux/if_phonet.h linux-2.6.39/include/l= inux/if_phonet.h ---- linux-2.6.39/include/linux/if_phonet.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/linux/if_phonet.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/linux/if_phonet.h linux-2.6.39.1/inclu= de/linux/if_phonet.h +--- linux-2.6.39.1/include/linux/if_phonet.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/linux/if_phonet.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -13,7 +13,7 @@ #define PHONET_DEV_MTU PHONET_MAX_MTU =20 @@ -63343,9 +63415,9 @@ diff -urNp linux-2.6.39/include/linux/if_phonet.h= linux-2.6.39/include/linux/if_ #endif =20 #endif -diff -urNp linux-2.6.39/include/linux/init.h linux-2.6.39/include/linux/= init.h ---- linux-2.6.39/include/linux/init.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/linux/init.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/linux/init.h linux-2.6.39.1/include/li= nux/init.h +--- linux-2.6.39.1/include/linux/init.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/linux/init.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm =20 /* Each module must use one module_init(). */ @@ -63362,9 +63434,9 @@ diff -urNp linux-2.6.39/include/linux/init.h linu= x-2.6.39/include/linux/init.h { return exitfn; } \ void cleanup_module(void) __attribute__((alias(#exitfn))); =20 -diff -urNp linux-2.6.39/include/linux/init_task.h linux-2.6.39/include/l= inux/init_task.h ---- linux-2.6.39/include/linux/init_task.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/linux/init_task.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/linux/init_task.h linux-2.6.39.1/inclu= de/linux/init_task.h +--- linux-2.6.39.1/include/linux/init_task.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/linux/init_task.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -83,6 +83,12 @@ extern struct group_info init_groups; #define INIT_IDS #endif @@ -63386,9 +63458,9 @@ diff -urNp linux-2.6.39/include/linux/init_task.h= linux-2.6.39/include/linux/ini .fs =3D &init_fs, \ .files =3D &init_files, \ .signal =3D &init_signals, \ -diff -urNp linux-2.6.39/include/linux/interrupt.h linux-2.6.39/include/l= inux/interrupt.h ---- linux-2.6.39/include/linux/interrupt.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/linux/interrupt.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/linux/interrupt.h linux-2.6.39.1/inclu= de/linux/interrupt.h +--- linux-2.6.39.1/include/linux/interrupt.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/linux/interrupt.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -422,7 +422,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -63413,9 +63485,9 @@ diff -urNp linux-2.6.39/include/linux/interrupt.h= linux-2.6.39/include/linux/int extern void softirq_init(void); static inline void __raise_softirq_irqoff(unsigned int nr) { -diff -urNp linux-2.6.39/include/linux/iommu.h linux-2.6.39/include/linux= /iommu.h ---- linux-2.6.39/include/linux/iommu.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/iommu.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/iommu.h linux-2.6.39.1/include/l= inux/iommu.h +--- linux-2.6.39.1/include/linux/iommu.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/iommu.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -49,7 +49,7 @@ struct iommu_ops { =20 #ifdef CONFIG_IOMMU_API @@ -63425,9 +63497,9 @@ diff -urNp linux-2.6.39/include/linux/iommu.h lin= ux-2.6.39/include/linux/iommu.h extern bool iommu_found(void); extern struct iommu_domain *iommu_domain_alloc(void); extern void iommu_domain_free(struct iommu_domain *domain); -diff -urNp linux-2.6.39/include/linux/ipmi.h linux-2.6.39/include/linux/= ipmi.h ---- linux-2.6.39/include/linux/ipmi.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/linux/ipmi.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/linux/ipmi.h linux-2.6.39.1/include/li= nux/ipmi.h +--- linux-2.6.39.1/include/linux/ipmi.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/linux/ipmi.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -282,7 +282,7 @@ struct ipmi_user_hndl { =20 /* Create a new user of the IPMI layer on the given interface number. *= / @@ -63437,9 +63509,9 @@ diff -urNp linux-2.6.39/include/linux/ipmi.h linu= x-2.6.39/include/linux/ipmi.h void *handler_data, ipmi_user_t *user); =20 -diff -urNp linux-2.6.39/include/linux/kallsyms.h linux-2.6.39/include/li= nux/kallsyms.h ---- linux-2.6.39/include/linux/kallsyms.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/kallsyms.h 2011-05-22 22:52:54.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/kallsyms.h linux-2.6.39.1/includ= e/linux/kallsyms.h +--- linux-2.6.39.1/include/linux/kallsyms.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/kallsyms.h 2011-05-22 22:52:54.00000000= 0 -0400 @@ -15,7 +15,8 @@ =20 struct module; @@ -63467,9 +63539,9 @@ diff -urNp linux-2.6.39/include/linux/kallsyms.h = linux-2.6.39/include/linux/kall =20 /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.39/include/linux/kgdb.h linux-2.6.39/include/linux/= kgdb.h ---- linux-2.6.39/include/linux/kgdb.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/linux/kgdb.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/linux/kgdb.h linux-2.6.39.1/include/li= nux/kgdb.h +--- linux-2.6.39.1/include/linux/kgdb.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/linux/kgdb.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -53,7 +53,7 @@ extern int kgdb_connected; extern int kgdb_io_module_registered; =20 @@ -63512,9 +63584,9 @@ diff -urNp linux-2.6.39/include/linux/kgdb.h linu= x-2.6.39/include/linux/kgdb.h =20 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern char *kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.39/include/linux/kmod.h linux-2.6.39/include/linux/= kmod.h ---- linux-2.6.39/include/linux/kmod.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/linux/kmod.h 2011-05-22 19:41:42.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/linux/kmod.h linux-2.6.39.1/include/li= nux/kmod.h +--- linux-2.6.39.1/include/linux/kmod.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/linux/kmod.h 2011-05-22 19:41:42.000000000 -0= 400 @@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysc * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ @@ -63524,9 +63596,9 @@ diff -urNp linux-2.6.39/include/linux/kmod.h linu= x-2.6.39/include/linux/kmod.h #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ -diff -urNp linux-2.6.39/include/linux/kvm_host.h linux-2.6.39/include/li= nux/kvm_host.h ---- linux-2.6.39/include/linux/kvm_host.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/kvm_host.h 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/kvm_host.h linux-2.6.39.1/includ= e/linux/kvm_host.h +--- linux-2.6.39.1/include/linux/kvm_host.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/kvm_host.h 2011-05-22 19:36:33.00000000= 0 -0400 @@ -302,7 +302,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -63545,9 +63617,9 @@ diff -urNp linux-2.6.39/include/linux/kvm_host.h = linux-2.6.39/include/linux/kvm_ void kvm_arch_exit(void); =20 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.39/include/linux/lapb.h linux-2.6.39/include/linux/= lapb.h ---- linux-2.6.39/include/linux/lapb.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/linux/lapb.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/linux/lapb.h linux-2.6.39.1/include/li= nux/lapb.h +--- linux-2.6.39.1/include/linux/lapb.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/linux/lapb.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -44,7 +44,7 @@ struct lapb_parms_struct { unsigned int mode; }; @@ -63557,9 +63629,9 @@ diff -urNp linux-2.6.39/include/linux/lapb.h linu= x-2.6.39/include/linux/lapb.h extern int lapb_unregister(struct net_device *dev); extern int lapb_getparms(struct net_device *dev, struct lapb_parms_stru= ct *parms); extern int lapb_setparms(struct net_device *dev, struct lapb_parms_stru= ct *parms); -diff -urNp linux-2.6.39/include/linux/lcd.h linux-2.6.39/include/linux/l= cd.h ---- linux-2.6.39/include/linux/lcd.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/lcd.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/lcd.h linux-2.6.39.1/include/lin= ux/lcd.h +--- linux-2.6.39.1/include/linux/lcd.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/linux/lcd.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -60,7 +60,7 @@ struct lcd_device { points to something in the body of that driver, it is also invalid.= */ struct mutex ops_lock; @@ -63578,9 +63650,9 @@ diff -urNp linux-2.6.39/include/linux/lcd.h linux= -2.6.39/include/linux/lcd.h extern void lcd_device_unregister(struct lcd_device *ld); =20 #define to_lcd_device(obj) container_of(obj, struct lcd_device, dev) -diff -urNp linux-2.6.39/include/linux/libata.h linux-2.6.39/include/linu= x/libata.h ---- linux-2.6.39/include/linux/libata.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/libata.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/libata.h linux-2.6.39.1/include/= linux/libata.h +--- linux-2.6.39.1/include/linux/libata.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/libata.h 2011-05-22 19:36:33.000000000 = -0400 @@ -524,11 +524,11 @@ struct ata_ioports { =20 struct ata_host { @@ -63631,9 +63703,9 @@ diff -urNp linux-2.6.39/include/linux/libata.h li= nux-2.6.39/include/linux/libata extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user= *arg); extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd= ); -diff -urNp linux-2.6.39/include/linux/lockd/bind.h linux-2.6.39/include/= linux/lockd/bind.h ---- linux-2.6.39/include/linux/lockd/bind.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/linux/lockd/bind.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/linux/lockd/bind.h linux-2.6.39.1/incl= ude/linux/lockd/bind.h +--- linux-2.6.39.1/include/linux/lockd/bind.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/linux/lockd/bind.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -63651,9 +63723,9 @@ diff -urNp linux-2.6.39/include/linux/lockd/bind.= h linux-2.6.39/include/linux/lo =20 /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.39/include/linux/mfd/abx500.h linux-2.6.39/include/= linux/mfd/abx500.h ---- linux-2.6.39/include/linux/mfd/abx500.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/linux/mfd/abx500.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/linux/mfd/abx500.h linux-2.6.39.1/incl= ude/linux/mfd/abx500.h +--- linux-2.6.39.1/include/linux/mfd/abx500.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/linux/mfd/abx500.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -227,6 +227,6 @@ struct abx500_ops { int (*startup_irq_enabled) (struct device *, unsigned int); }; @@ -63662,9 +63734,9 @@ diff -urNp linux-2.6.39/include/linux/mfd/abx500.= h linux-2.6.39/include/linux/mf +int abx500_register_ops(struct device *core_dev, const struct abx500_op= s *ops); void abx500_remove_ops(struct device *dev); #endif -diff -urNp linux-2.6.39/include/linux/mm.h linux-2.6.39/include/linux/mm= .h ---- linux-2.6.39/include/linux/mm.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/mm.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/mm.h linux-2.6.39.1/include/linu= x/mm.h +--- linux-2.6.39.1/include/linux/mm.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/include/linux/mm.h 2011-05-22 19:36:33.000000000 -040= 0 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void=20 =20 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pag= es */ @@ -63787,9 +63859,9 @@ diff -urNp linux-2.6.39/include/linux/mm.h linux-= 2.6.39/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.39/include/linux/mm_types.h linux-2.6.39/include/li= nux/mm_types.h ---- linux-2.6.39/include/linux/mm_types.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/mm_types.h 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/mm_types.h linux-2.6.39.1/includ= e/linux/mm_types.h +--- linux-2.6.39.1/include/linux/mm_types.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/mm_types.h 2011-05-22 19:36:33.00000000= 0 -0400 @@ -183,6 +183,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -63824,9 +63896,9 @@ diff -urNp linux-2.6.39/include/linux/mm_types.h = linux-2.6.39/include/linux/mm_t }; =20 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.39/include/linux/mmu_notifier.h linux-2.6.39/includ= e/linux/mmu_notifier.h ---- linux-2.6.39/include/linux/mmu_notifier.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/include/linux/mmu_notifier.h 2011-05-22 19:36:33.000000= 000 -0400 +diff -urNp linux-2.6.39.1/include/linux/mmu_notifier.h linux-2.6.39.1/in= clude/linux/mmu_notifier.h +--- linux-2.6.39.1/include/linux/mmu_notifier.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/include/linux/mmu_notifier.h 2011-05-22 19:36:33.0000= 00000 -0400 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -63843,9 +63915,9 @@ diff -urNp linux-2.6.39/include/linux/mmu_notifie= r.h linux-2.6.39/include/linux/ }) =20 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \ -diff -urNp linux-2.6.39/include/linux/mmzone.h linux-2.6.39/include/linu= x/mmzone.h ---- linux-2.6.39/include/linux/mmzone.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/mmzone.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/mmzone.h linux-2.6.39.1/include/= linux/mmzone.h +--- linux-2.6.39.1/include/linux/mmzone.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/mmzone.h 2011-05-22 19:36:33.000000000 = -0400 @@ -355,7 +355,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ =20 @@ -63855,9 +63927,9 @@ diff -urNp linux-2.6.39/include/linux/mmzone.h li= nux-2.6.39/include/linux/mmzone =20 /* * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on -diff -urNp linux-2.6.39/include/linux/mod_devicetable.h linux-2.6.39/inc= lude/linux/mod_devicetable.h ---- linux-2.6.39/include/linux/mod_devicetable.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/include/linux/mod_devicetable.h 2011-05-22 19:36:33.000= 000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/mod_devicetable.h linux-2.6.39.1= /include/linux/mod_devicetable.h +--- linux-2.6.39.1/include/linux/mod_devicetable.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/include/linux/mod_devicetable.h 2011-05-22 19:36:33.0= 00000000 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -63876,9 +63948,9 @@ diff -urNp linux-2.6.39/include/linux/mod_devicet= able.h linux-2.6.39/include/lin =20 struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.39/include/linux/module.h linux-2.6.39/include/linu= x/module.h ---- linux-2.6.39/include/linux/module.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/module.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/module.h linux-2.6.39.1/include/= linux/module.h +--- linux-2.6.39.1/include/linux/module.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/module.h 2011-05-22 19:36:33.000000000 = -0400 @@ -324,19 +324,16 @@ struct module int (*init)(void); =20 @@ -63954,9 +64026,9 @@ diff -urNp linux-2.6.39/include/linux/module.h li= nux-2.6.39/include/linux/module } =20 /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.39/include/linux/moduleloader.h linux-2.6.39/includ= e/linux/moduleloader.h ---- linux-2.6.39/include/linux/moduleloader.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/include/linux/moduleloader.h 2011-05-22 19:36:33.000000= 000 -0400 +diff -urNp linux-2.6.39.1/include/linux/moduleloader.h linux-2.6.39.1/in= clude/linux/moduleloader.h +--- linux-2.6.39.1/include/linux/moduleloader.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/include/linux/moduleloader.h 2011-05-22 19:36:33.0000= 00000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -63979,9 +64051,9 @@ diff -urNp linux-2.6.39/include/linux/moduleloade= r.h linux-2.6.39/include/linux/ /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.39/include/linux/moduleparam.h linux-2.6.39/include= /linux/moduleparam.h ---- linux-2.6.39/include/linux/moduleparam.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/linux/moduleparam.h 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/linux/moduleparam.h linux-2.6.39.1/inc= lude/linux/moduleparam.h +--- linux-2.6.39.1/include/linux/moduleparam.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/linux/moduleparam.h 2011-05-22 19:36:33.00000= 0000 -0400 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock * @len is usually just sizeof(string). */ @@ -64079,9 +64151,9 @@ diff -urNp linux-2.6.39/include/linux/moduleparam= .h linux-2.6.39/include/linux/m extern int param_set_copystring(const char *val, const struct kernel_pa= ram *); extern int param_get_string(char *buffer, const struct kernel_param *kp= ); =20 -diff -urNp linux-2.6.39/include/linux/mutex.h linux-2.6.39/include/linux= /mutex.h ---- linux-2.6.39/include/linux/mutex.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/mutex.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/mutex.h linux-2.6.39.1/include/l= inux/mutex.h +--- linux-2.6.39.1/include/linux/mutex.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/mutex.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -51,7 +51,7 @@ struct mutex { spinlock_t wait_lock; struct list_head wait_list; @@ -64091,9 +64163,9 @@ diff -urNp linux-2.6.39/include/linux/mutex.h lin= ux-2.6.39/include/linux/mutex.h #endif #ifdef CONFIG_DEBUG_MUTEXES const char *name; -diff -urNp linux-2.6.39/include/linux/namei.h linux-2.6.39/include/linux= /namei.h ---- linux-2.6.39/include/linux/namei.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/namei.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/namei.h linux-2.6.39.1/include/l= inux/namei.h +--- linux-2.6.39.1/include/linux/namei.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/namei.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -24,7 +24,7 @@ struct nameidata { unsigned seq; int last_type; @@ -64118,9 +64190,9 @@ diff -urNp linux-2.6.39/include/linux/namei.h lin= ux-2.6.39/include/linux/namei.h { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.39/include/linux/netfilter/xt_gradm.h linux-2.6.39/= include/linux/netfilter/xt_gradm.h ---- linux-2.6.39/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.= 000000000 -0500 -+++ linux-2.6.39/include/linux/netfilter/xt_gradm.h 2011-05-22 19:41:42.= 000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/netfilter/xt_gradm.h linux-2.6.3= 9.1/include/linux/netfilter/xt_gradm.h +--- linux-2.6.39.1/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:0= 0.000000000 -0500 ++++ linux-2.6.39.1/include/linux/netfilter/xt_gradm.h 2011-05-22 19:41:4= 2.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -64131,9 +64203,9 @@ diff -urNp linux-2.6.39/include/linux/netfilter/x= t_gradm.h linux-2.6.39/include/ +}; + +#endif -diff -urNp linux-2.6.39/include/linux/oprofile.h linux-2.6.39/include/li= nux/oprofile.h ---- linux-2.6.39/include/linux/oprofile.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/oprofile.h 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/oprofile.h linux-2.6.39.1/includ= e/linux/oprofile.h +--- linux-2.6.39.1/include/linux/oprofile.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/oprofile.h 2011-05-22 19:36:33.00000000= 0 -0400 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry *= root, char const * name, ulong * val); @@ -64146,9 +64218,9 @@ diff -urNp linux-2.6.39/include/linux/oprofile.h = linux-2.6.39/include/linux/opro =20 /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry= * root, -diff -urNp linux-2.6.39/include/linux/padata.h linux-2.6.39/include/linu= x/padata.h ---- linux-2.6.39/include/linux/padata.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/padata.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/padata.h linux-2.6.39.1/include/= linux/padata.h +--- linux-2.6.39.1/include/linux/padata.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/padata.h 2011-05-22 19:36:33.000000000 = -0400 @@ -129,7 +129,7 @@ struct parallel_data { struct padata_instance *pinst; struct padata_parallel_queue __percpu *pqueue; @@ -64158,9 +64230,9 @@ diff -urNp linux-2.6.39/include/linux/padata.h li= nux-2.6.39/include/linux/padata atomic_t reorder_objects; atomic_t refcnt; unsigned int max_seq_nr; -diff -urNp linux-2.6.39/include/linux/pci.h linux-2.6.39/include/linux/p= ci.h ---- linux-2.6.39/include/linux/pci.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/pci.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/pci.h linux-2.6.39.1/include/lin= ux/pci.h +--- linux-2.6.39.1/include/linux/pci.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/linux/pci.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -411,7 +411,7 @@ struct pci_bus { struct resource *resource[PCI_BRIDGE_RESOURCE_NUM]; struct list_head resources; /* address space routed to this bus */ @@ -64206,9 +64278,9 @@ diff -urNp linux-2.6.39/include/linux/pci.h linux= -2.6.39/include/linux/pci.h =20 static inline int pci_read_config_byte(struct pci_dev *dev, int where, = u8 *val) { -diff -urNp linux-2.6.39/include/linux/perf_event.h linux-2.6.39/include/= linux/perf_event.h ---- linux-2.6.39/include/linux/perf_event.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/linux/perf_event.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/linux/perf_event.h linux-2.6.39.1/incl= ude/linux/perf_event.h +--- linux-2.6.39.1/include/linux/perf_event.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/linux/perf_event.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -759,8 +759,8 @@ struct perf_event { =20 enum perf_event_active_state state; @@ -64244,9 +64316,9 @@ diff -urNp linux-2.6.39/include/linux/perf_event.= h linux-2.6.39/include/linux/pe =20 extern void perf_event_comm(struct task_struct *tsk); extern void perf_event_fork(struct task_struct *tsk); -diff -urNp linux-2.6.39/include/linux/pipe_fs_i.h linux-2.6.39/include/l= inux/pipe_fs_i.h ---- linux-2.6.39/include/linux/pipe_fs_i.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/linux/pipe_fs_i.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/linux/pipe_fs_i.h linux-2.6.39.1/inclu= de/linux/pipe_fs_i.h +--- linux-2.6.39.1/include/linux/pipe_fs_i.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/linux/pipe_fs_i.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -46,9 +46,9 @@ struct pipe_buffer { struct pipe_inode_info { wait_queue_head_t wait; @@ -64260,9 +64332,9 @@ diff -urNp linux-2.6.39/include/linux/pipe_fs_i.h= linux-2.6.39/include/linux/pip unsigned int r_counter; unsigned int w_counter; struct page *tmp_page; -diff -urNp linux-2.6.39/include/linux/pm.h linux-2.6.39/include/linux/pm= .h ---- linux-2.6.39/include/linux/pm.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/pm.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/pm.h linux-2.6.39.1/include/linu= x/pm.h +--- linux-2.6.39.1/include/linux/pm.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/include/linux/pm.h 2011-05-22 19:36:33.000000000 -040= 0 @@ -268,7 +268,7 @@ const struct dev_pm_ops name =3D { \ * runtime PM, make the pm member point to generic_subsys_pm_ops. */ @@ -64281,9 +64353,9 @@ diff -urNp linux-2.6.39/include/linux/pm.h linux-= 2.6.39/include/linux/pm.h }; =20 /* -diff -urNp linux-2.6.39/include/linux/pm_runtime.h linux-2.6.39/include/= linux/pm_runtime.h ---- linux-2.6.39/include/linux/pm_runtime.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/linux/pm_runtime.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/linux/pm_runtime.h linux-2.6.39.1/incl= ude/linux/pm_runtime.h +--- linux-2.6.39.1/include/linux/pm_runtime.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/linux/pm_runtime.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_ =20 static inline void pm_runtime_mark_last_busy(struct device *dev) @@ -64293,9 +64365,9 @@ diff -urNp linux-2.6.39/include/linux/pm_runtime.= h linux-2.6.39/include/linux/pm } =20 #else /* !CONFIG_PM_RUNTIME */ -diff -urNp linux-2.6.39/include/linux/poison.h linux-2.6.39/include/linu= x/poison.h ---- linux-2.6.39/include/linux/poison.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/poison.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/poison.h linux-2.6.39.1/include/= linux/poison.h +--- linux-2.6.39.1/include/linux/poison.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/poison.h 2011-05-22 19:36:33.000000000 = -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -64307,9 +64379,9 @@ diff -urNp linux-2.6.39/include/linux/poison.h li= nux-2.6.39/include/linux/poison =20 /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.39/include/linux/posix-timers.h linux-2.6.39/includ= e/linux/posix-timers.h ---- linux-2.6.39/include/linux/posix-timers.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/include/linux/posix-timers.h 2011-05-22 19:36:33.000000= 000 -0400 +diff -urNp linux-2.6.39.1/include/linux/posix-timers.h linux-2.6.39.1/in= clude/linux/posix-timers.h +--- linux-2.6.39.1/include/linux/posix-timers.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/include/linux/posix-timers.h 2011-05-22 19:36:33.0000= 00000 -0400 @@ -102,10 +102,10 @@ struct k_clock { struct itimerspec * cur_setting); }; @@ -64324,9 +64396,9 @@ diff -urNp linux-2.6.39/include/linux/posix-timer= s.h linux-2.6.39/include/linux/ =20 /* function to call to trigger timer event */ int posix_timer_event(struct k_itimer *timr, int si_private); -diff -urNp linux-2.6.39/include/linux/proc_fs.h linux-2.6.39/include/lin= ux/proc_fs.h ---- linux-2.6.39/include/linux/proc_fs.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/linux/proc_fs.h 2011-05-22 19:41:42.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/proc_fs.h linux-2.6.39.1/include= /linux/proc_fs.h +--- linux-2.6.39.1/include/linux/proc_fs.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/linux/proc_fs.h 2011-05-22 19:41:42.000000000= -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -64347,9 +64419,9 @@ diff -urNp linux-2.6.39/include/linux/proc_fs.h l= inux-2.6.39/include/linux/proc_ static inline struct proc_dir_entry *create_proc_read_entry(const char = *name, mode_t mode, struct proc_dir_entry *base,=20 read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.39/include/linux/ptrace.h linux-2.6.39/include/linu= x/ptrace.h ---- linux-2.6.39/include/linux/ptrace.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/ptrace.h 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/ptrace.h linux-2.6.39.1/include/= linux/ptrace.h +--- linux-2.6.39.1/include/linux/ptrace.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/ptrace.h 2011-05-22 19:41:42.000000000 = -0400 @@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_ extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 1 @@ -64363,9 +64435,9 @@ diff -urNp linux-2.6.39/include/linux/ptrace.h li= nux-2.6.39/include/linux/ptrace =20 static inline int ptrace_reparented(struct task_struct *child) { -diff -urNp linux-2.6.39/include/linux/random.h linux-2.6.39/include/linu= x/random.h ---- linux-2.6.39/include/linux/random.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/random.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/random.h linux-2.6.39.1/include/= linux/random.h +--- linux-2.6.39.1/include/linux/random.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/random.h 2011-05-22 19:36:33.000000000 = -0400 @@ -80,12 +80,17 @@ void srandom32(u32 seed); =20 u32 prandom32(struct rnd_state *); @@ -64385,9 +64457,9 @@ diff -urNp linux-2.6.39/include/linux/random.h li= nux-2.6.39/include/linux/random } =20 /** -diff -urNp linux-2.6.39/include/linux/reboot.h linux-2.6.39/include/linu= x/reboot.h ---- linux-2.6.39/include/linux/reboot.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/reboot.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/reboot.h linux-2.6.39.1/include/= linux/reboot.h +--- linux-2.6.39.1/include/linux/reboot.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/reboot.h 2011-05-22 19:36:33.000000000 = -0400 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st * Architecture-specific implementations of sys_reboot commands. */ @@ -64423,9 +64495,9 @@ diff -urNp linux-2.6.39/include/linux/reboot.h li= nux-2.6.39/include/linux/reboot #include =20 #endif -diff -urNp linux-2.6.39/include/linux/reiserfs_fs.h linux-2.6.39/include= /linux/reiserfs_fs.h ---- linux-2.6.39/include/linux/reiserfs_fs.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/linux/reiserfs_fs.h 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/linux/reiserfs_fs.h linux-2.6.39.1/inc= lude/linux/reiserfs_fs.h +--- linux-2.6.39.1/include/linux/reiserfs_fs.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/linux/reiserfs_fs.h 2011-05-22 19:36:33.00000= 0000 -0400 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ =20 @@ -64472,9 +64544,9 @@ diff -urNp linux-2.6.39/include/linux/reiserfs_fs= .h linux-2.6.39/include/linux/r =20 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_t= ype (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_= type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.39/include/linux/reiserfs_fs_sb.h linux-2.6.39/incl= ude/linux/reiserfs_fs_sb.h ---- linux-2.6.39/include/linux/reiserfs_fs_sb.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/include/linux/reiserfs_fs_sb.h 2011-05-22 19:36:33.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/include/linux/reiserfs_fs_sb.h linux-2.6.39.1/= include/linux/reiserfs_fs_sb.h +--- linux-2.6.39.1/include/linux/reiserfs_fs_sb.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/include/linux/reiserfs_fs_sb.h 2011-05-22 19:36:33.00= 0000000 -0400 @@ -386,7 +386,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -64484,9 +64556,9 @@ diff -urNp linux-2.6.39/include/linux/reiserfs_fs= _sb.h linux-2.6.39/include/linu // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.39/include/linux/rmap.h linux-2.6.39/include/linux/= rmap.h ---- linux-2.6.39/include/linux/rmap.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/linux/rmap.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/linux/rmap.h linux-2.6.39.1/include/li= nux/rmap.h +--- linux-2.6.39.1/include/linux/rmap.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/linux/rmap.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc void anon_vma_init(void); /* create anon_vma_cachep */ int anon_vma_prepare(struct vm_area_struct *); @@ -64498,9 +64570,9 @@ diff -urNp linux-2.6.39/include/linux/rmap.h linu= x-2.6.39/include/linux/rmap.h void __anon_vma_link(struct vm_area_struct *); =20 static inline void anon_vma_merge(struct vm_area_struct *vma, -diff -urNp linux-2.6.39/include/linux/sched.h linux-2.6.39/include/linux= /sched.h ---- linux-2.6.39/include/linux/sched.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/sched.h 2011-05-22 19:41:42.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/sched.h linux-2.6.39.1/include/l= inux/sched.h +--- linux-2.6.39.1/include/linux/sched.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/sched.h 2011-06-03 23:34:26.000000000 -= 0400 @@ -100,6 +100,7 @@ struct bio_list; struct fs_struct; struct perf_event_context; @@ -64638,7 +64710,7 @@ diff -urNp linux-2.6.39/include/linux/sched.h lin= ux-2.6.39/include/linux/sched.h #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* Index of current stored address in ret_stack */ int curr_ret_stack; -@@ -1542,6 +1583,63 @@ struct task_struct { +@@ -1542,6 +1583,57 @@ struct task_struct { #endif }; =20 @@ -64687,22 +64759,16 @@ diff -urNp linux-2.6.39/include/linux/sched.h l= inux-2.6.39/include/linux/sched.h +void pax_report_refcount_overflow(struct pt_regs *regs); +void pax_report_usercopy(const void *ptr, unsigned long len, bool to, c= onst char *type); + -+static inline void pax_track_stack(void) -+{ -+ +#ifdef CONFIG_PAX_MEMORY_STACKLEAK -+ unsigned long sp =3D current_stack_pointer; -+ if (current_thread_info()->lowest_stack > sp && -+ (unsigned long)task_stack_page(current) < sp) -+ current_thread_info()->lowest_stack =3D sp; ++extern void pax_track_stack(void); ++#else ++static inline void pax_track_stack(void) {} +#endif + -+} -+ /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) =20 -@@ -2009,7 +2107,9 @@ void yield(void); +@@ -2009,7 +2101,9 @@ void yield(void); extern struct exec_domain default_exec_domain; =20 union thread_union { @@ -64712,7 +64778,7 @@ diff -urNp linux-2.6.39/include/linux/sched.h lin= ux-2.6.39/include/linux/sched.h unsigned long stack[THREAD_SIZE/sizeof(long)]; }; =20 -@@ -2179,7 +2279,7 @@ extern void __cleanup_sighand(struct sig +@@ -2179,7 +2273,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); =20 @@ -64721,7 +64787,7 @@ diff -urNp linux-2.6.39/include/linux/sched.h lin= ux-2.6.39/include/linux/sched.h =20 extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2320,13 +2420,17 @@ static inline unsigned long *end_of_stac +@@ -2320,13 +2414,17 @@ static inline unsigned long *end_of_stac =20 #endif =20 @@ -64741,9 +64807,9 @@ diff -urNp linux-2.6.39/include/linux/sched.h lin= ux-2.6.39/include/linux/sched.h extern void thread_info_cache_init(void); =20 #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.39/include/linux/screen_info.h linux-2.6.39/include= /linux/screen_info.h ---- linux-2.6.39/include/linux/screen_info.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/linux/screen_info.h 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/linux/screen_info.h linux-2.6.39.1/inc= lude/linux/screen_info.h +--- linux-2.6.39.1/include/linux/screen_info.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/linux/screen_info.h 2011-05-22 19:36:33.00000= 0000 -0400 @@ -43,7 +43,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -64754,9 +64820,9 @@ diff -urNp linux-2.6.39/include/linux/screen_info= .h linux-2.6.39/include/linux/s } __attribute__((packed)); =20 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.39/include/linux/security.h linux-2.6.39/include/li= nux/security.h ---- linux-2.6.39/include/linux/security.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/security.h 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/security.h linux-2.6.39.1/includ= e/linux/security.h +--- linux-2.6.39.1/include/linux/security.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/security.h 2011-05-22 19:41:42.00000000= 0 -0400 @@ -36,6 +36,7 @@ #include #include @@ -64765,9 +64831,9 @@ diff -urNp linux-2.6.39/include/linux/security.h = linux-2.6.39/include/linux/secu #include =20 /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.39/include/linux/shm.h linux-2.6.39/include/linux/s= hm.h ---- linux-2.6.39/include/linux/shm.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/shm.h 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/shm.h linux-2.6.39.1/include/lin= ux/shm.h +--- linux-2.6.39.1/include/linux/shm.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/linux/shm.h 2011-05-22 19:41:42.000000000 -04= 00 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -64779,9 +64845,9 @@ diff -urNp linux-2.6.39/include/linux/shm.h linux= -2.6.39/include/linux/shm.h }; =20 /* shm_mode upper byte flags */ -diff -urNp linux-2.6.39/include/linux/skbuff.h linux-2.6.39/include/linu= x/skbuff.h ---- linux-2.6.39/include/linux/skbuff.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/skbuff.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/skbuff.h linux-2.6.39.1/include/= linux/skbuff.h +--- linux-2.6.39.1/include/linux/skbuff.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/skbuff.h 2011-05-22 19:36:33.000000000 = -0400 @@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp */ static inline int skb_queue_empty(const struct sk_buff_head *list) @@ -64818,9 +64884,9 @@ diff -urNp linux-2.6.39/include/linux/skbuff.h li= nux-2.6.39/include/linux/skbuff #endif =20 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); -diff -urNp linux-2.6.39/include/linux/slab_def.h linux-2.6.39/include/li= nux/slab_def.h ---- linux-2.6.39/include/linux/slab_def.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/slab_def.h 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/slab_def.h linux-2.6.39.1/includ= e/linux/slab_def.h +--- linux-2.6.39.1/include/linux/slab_def.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/slab_def.h 2011-05-22 19:36:33.00000000= 0 -0400 @@ -96,10 +96,10 @@ struct kmem_cache { unsigned long node_allocs; unsigned long node_frees; @@ -64836,9 +64902,9 @@ diff -urNp linux-2.6.39/include/linux/slab_def.h = linux-2.6.39/include/linux/slab =20 /* * If debugging is enabled, then the allocator can add additional -diff -urNp linux-2.6.39/include/linux/slab.h linux-2.6.39/include/linux/= slab.h ---- linux-2.6.39/include/linux/slab.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/linux/slab.h 2011-05-23 17:07:00.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/linux/slab.h linux-2.6.39.1/include/li= nux/slab.h +--- linux-2.6.39.1/include/linux/slab.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/linux/slab.h 2011-05-23 17:07:00.000000000 -0= 400 @@ -11,12 +11,20 @@ =20 #include @@ -64945,9 +65011,9 @@ diff -urNp linux-2.6.39/include/linux/slab.h linu= x-2.6.39/include/linux/slab.h +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.39/include/linux/slub_def.h linux-2.6.39/include/li= nux/slub_def.h ---- linux-2.6.39/include/linux/slub_def.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/slub_def.h 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/slub_def.h linux-2.6.39.1/includ= e/linux/slub_def.h +--- linux-2.6.39.1/include/linux/slub_def.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/slub_def.h 2011-05-22 19:36:33.00000000= 0 -0400 @@ -84,7 +84,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -64957,9 +65023,9 @@ diff -urNp linux-2.6.39/include/linux/slub_def.h = linux-2.6.39/include/linux/slub void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.39/include/linux/sonet.h linux-2.6.39/include/linux= /sonet.h ---- linux-2.6.39/include/linux/sonet.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/sonet.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/sonet.h linux-2.6.39.1/include/l= inux/sonet.h +--- linux-2.6.39.1/include/linux/sonet.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/sonet.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include =20 @@ -64969,9 +65035,9 @@ diff -urNp linux-2.6.39/include/linux/sonet.h lin= ux-2.6.39/include/linux/sonet.h __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.39/include/linux/ssb/ssb_driver_gige.h linux-2.6.39= /include/linux/ssb/ssb_driver_gige.h ---- linux-2.6.39/include/linux/ssb/ssb_driver_gige.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/include/linux/ssb/ssb_driver_gige.h 2011-05-22 19:36:33= .000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/ssb/ssb_driver_gige.h linux-2.6.= 39.1/include/linux/ssb/ssb_driver_gige.h +--- linux-2.6.39.1/include/linux/ssb/ssb_driver_gige.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/include/linux/ssb/ssb_driver_gige.h 2011-05-22 19:36:= 33.000000000 -0400 @@ -44,7 +44,7 @@ struct ssb_gige { =20 /* The PCI controller device. */ @@ -64981,9 +65047,9 @@ diff -urNp linux-2.6.39/include/linux/ssb/ssb_dri= ver_gige.h linux-2.6.39/include struct resource mem_resource; struct resource io_resource; }; -diff -urNp linux-2.6.39/include/linux/sunrpc/clnt.h linux-2.6.39/include= /linux/sunrpc/clnt.h ---- linux-2.6.39/include/linux/sunrpc/clnt.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/linux/sunrpc/clnt.h 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/linux/sunrpc/clnt.h linux-2.6.39.1/inc= lude/linux/sunrpc/clnt.h +--- linux-2.6.39.1/include/linux/sunrpc/clnt.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/linux/sunrpc/clnt.h 2011-05-22 19:36:33.00000= 0000 -0400 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por { switch (sap->sa_family) { @@ -65014,9 +65080,9 @@ diff -urNp linux-2.6.39/include/linux/sunrpc/clnt= .h linux-2.6.39/include/linux/s } =20 #endif /* __KERNEL__ */ -diff -urNp linux-2.6.39/include/linux/sunrpc/svc_rdma.h linux-2.6.39/inc= lude/linux/sunrpc/svc_rdma.h ---- linux-2.6.39/include/linux/sunrpc/svc_rdma.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/include/linux/sunrpc/svc_rdma.h 2011-05-22 19:36:33.000= 000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/sunrpc/svc_rdma.h linux-2.6.39.1= /include/linux/sunrpc/svc_rdma.h +--- linux-2.6.39.1/include/linux/sunrpc/svc_rdma.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/include/linux/sunrpc/svc_rdma.h 2011-05-22 19:36:33.0= 00000000 -0400 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord; extern unsigned int svcrdma_max_requests; extern unsigned int svcrdma_max_req_size; @@ -65042,9 +65108,9 @@ diff -urNp linux-2.6.39/include/linux/sunrpc/svc_= rdma.h linux-2.6.39/include/lin =20 #define RPCRDMA_VERSION 1 =20 -diff -urNp linux-2.6.39/include/linux/suspend.h linux-2.6.39/include/lin= ux/suspend.h ---- linux-2.6.39/include/linux/suspend.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/linux/suspend.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/suspend.h linux-2.6.39.1/include= /linux/suspend.h +--- linux-2.6.39.1/include/linux/suspend.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/linux/suspend.h 2011-05-22 19:36:33.000000000= -0400 @@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -65097,9 +65163,9 @@ diff -urNp linux-2.6.39/include/linux/suspend.h l= inux-2.6.39/include/linux/suspe }; =20 #ifdef CONFIG_HIBERNATION -diff -urNp linux-2.6.39/include/linux/sysctl.h linux-2.6.39/include/linu= x/sysctl.h ---- linux-2.6.39/include/linux/sysctl.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/sysctl.h 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/sysctl.h linux-2.6.39.1/include/= linux/sysctl.h +--- linux-2.6.39.1/include/linux/sysctl.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/sysctl.h 2011-05-22 19:41:42.000000000 = -0400 @@ -155,7 +155,11 @@ enum KERN_PANIC_ON_NMI=3D76, /* int: whether we will panic on an unrecovere= d */ }; @@ -65122,9 +65188,9 @@ diff -urNp linux-2.6.39/include/linux/sysctl.h li= nux-2.6.39/include/linux/sysctl extern int proc_dointvec(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec_minmax(struct ctl_table *, int, -diff -urNp linux-2.6.39/include/linux/sysfs.h linux-2.6.39/include/linux= /sysfs.h ---- linux-2.6.39/include/linux/sysfs.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/sysfs.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/sysfs.h linux-2.6.39.1/include/l= inux/sysfs.h +--- linux-2.6.39.1/include/linux/sysfs.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/sysfs.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -110,8 +110,8 @@ struct bin_attribute { #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr= ) =20 @@ -65136,9 +65202,9 @@ diff -urNp linux-2.6.39/include/linux/sysfs.h lin= ux-2.6.39/include/linux/sysfs.h }; =20 struct sysfs_dirent; -diff -urNp linux-2.6.39/include/linux/tty.h linux-2.6.39/include/linux/t= ty.h ---- linux-2.6.39/include/linux/tty.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/linux/tty.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/tty.h linux-2.6.39.1/include/lin= ux/tty.h +--- linux-2.6.39.1/include/linux/tty.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/linux/tty.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -13,6 +13,7 @@ #include #include @@ -65174,9 +65240,9 @@ diff -urNp linux-2.6.39/include/linux/tty.h linux= -2.6.39/include/linux/tty.h =20 /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.39/include/linux/tty_ldisc.h linux-2.6.39/include/l= inux/tty_ldisc.h ---- linux-2.6.39/include/linux/tty_ldisc.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/linux/tty_ldisc.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/linux/tty_ldisc.h linux-2.6.39.1/inclu= de/linux/tty_ldisc.h +--- linux-2.6.39.1/include/linux/tty_ldisc.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/linux/tty_ldisc.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -148,7 +148,7 @@ struct tty_ldisc_ops { =20 struct module *owner; @@ -65186,9 +65252,9 @@ diff -urNp linux-2.6.39/include/linux/tty_ldisc.h= linux-2.6.39/include/linux/tty }; =20 struct tty_ldisc { -diff -urNp linux-2.6.39/include/linux/types.h linux-2.6.39/include/linux= /types.h ---- linux-2.6.39/include/linux/types.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/linux/types.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/linux/types.h linux-2.6.39.1/include/l= inux/types.h +--- linux-2.6.39.1/include/linux/types.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/linux/types.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -213,10 +213,26 @@ typedef struct { int counter; } atomic_t; @@ -65216,9 +65282,9 @@ diff -urNp linux-2.6.39/include/linux/types.h lin= ux-2.6.39/include/linux/types.h #endif =20 struct list_head { -diff -urNp linux-2.6.39/include/linux/uaccess.h linux-2.6.39/include/lin= ux/uaccess.h ---- linux-2.6.39/include/linux/uaccess.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/linux/uaccess.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/uaccess.h linux-2.6.39.1/include= /linux/uaccess.h +--- linux-2.6.39.1/include/linux/uaccess.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/linux/uaccess.h 2011-05-22 19:36:33.000000000= -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs =3D get_fs(); \ @@ -65254,9 +65320,9 @@ diff -urNp linux-2.6.39/include/linux/uaccess.h l= inux-2.6.39/include/linux/uacce +extern long notrace __probe_kernel_write(void *dst, const void *src, si= ze_t size); =20 #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.39/include/linux/unaligned/access_ok.h linux-2.6.39= /include/linux/unaligned/access_ok.h ---- linux-2.6.39/include/linux/unaligned/access_ok.h 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/include/linux/unaligned/access_ok.h 2011-05-22 19:36:33= .000000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/unaligned/access_ok.h linux-2.6.= 39.1/include/linux/unaligned/access_ok.h +--- linux-2.6.39.1/include/linux/unaligned/access_ok.h 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/include/linux/unaligned/access_ok.h 2011-05-22 19:36:= 33.000000000 -0400 @@ -6,32 +6,32 @@ =20 static inline u16 get_unaligned_le16(const void *p) @@ -65296,9 +65362,9 @@ diff -urNp linux-2.6.39/include/linux/unaligned/a= ccess_ok.h linux-2.6.39/include } =20 static inline void put_unaligned_le16(u16 val, void *p) -diff -urNp linux-2.6.39/include/linux/usb/hcd.h linux-2.6.39/include/lin= ux/usb/hcd.h ---- linux-2.6.39/include/linux/usb/hcd.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/linux/usb/hcd.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/usb/hcd.h linux-2.6.39.1/include= /linux/usb/hcd.h +--- linux-2.6.39.1/include/linux/usb/hcd.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/linux/usb/hcd.h 2011-05-22 19:36:33.000000000= -0400 @@ -615,7 +615,7 @@ struct usb_mon_operations { /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */ }; @@ -65317,9 +65383,9 @@ diff -urNp linux-2.6.39/include/linux/usb/hcd.h l= inux-2.6.39/include/linux/usb/h void usb_mon_deregister(void); =20 #else -diff -urNp linux-2.6.39/include/linux/usb/intel_mid_otg.h linux-2.6.39/i= nclude/linux/usb/intel_mid_otg.h ---- linux-2.6.39/include/linux/usb/intel_mid_otg.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/include/linux/usb/intel_mid_otg.h 2011-05-22 19:36:33.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/include/linux/usb/intel_mid_otg.h linux-2.6.39= .1/include/linux/usb/intel_mid_otg.h +--- linux-2.6.39.1/include/linux/usb/intel_mid_otg.h 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/include/linux/usb/intel_mid_otg.h 2011-05-22 19:36:33= .000000000 -0400 @@ -115,7 +115,7 @@ struct intel_mid_otg_xceiv { void __iomem *base; =20 @@ -65329,9 +65395,9 @@ diff -urNp linux-2.6.39/include/linux/usb/intel_m= id_otg.h linux-2.6.39/include/l =20 /* atomic notifier for interrupt context */ struct atomic_notifier_head iotg_notifier; -diff -urNp linux-2.6.39/include/linux/usb/ulpi.h linux-2.6.39/include/li= nux/usb/ulpi.h ---- linux-2.6.39/include/linux/usb/ulpi.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/linux/usb/ulpi.h 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/linux/usb/ulpi.h linux-2.6.39.1/includ= e/linux/usb/ulpi.h +--- linux-2.6.39.1/include/linux/usb/ulpi.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/linux/usb/ulpi.h 2011-05-22 19:36:33.00000000= 0 -0400 @@ -186,7 +186,7 @@ struct otg_transceiver *otg_ulpi_create( =20 #ifdef CONFIG_USB_ULPI_VIEWPORT @@ -65341,9 +65407,9 @@ diff -urNp linux-2.6.39/include/linux/usb/ulpi.h = linux-2.6.39/include/linux/usb/ #endif =20 #endif /* __LINUX_USB_ULPI_H */ -diff -urNp linux-2.6.39/include/linux/vga_switcheroo.h linux-2.6.39/incl= ude/linux/vga_switcheroo.h ---- linux-2.6.39/include/linux/vga_switcheroo.h 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/include/linux/vga_switcheroo.h 2011-05-22 19:36:33.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/include/linux/vga_switcheroo.h linux-2.6.39.1/= include/linux/vga_switcheroo.h +--- linux-2.6.39.1/include/linux/vga_switcheroo.h 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/include/linux/vga_switcheroo.h 2011-05-22 19:36:33.00= 0000000 -0400 @@ -39,7 +39,7 @@ int vga_switcheroo_register_client(struc void vga_switcheroo_client_fb_set(struct pci_dev *dev, struct fb_info *info); @@ -65362,9 +65428,9 @@ diff -urNp linux-2.6.39/include/linux/vga_switche= roo.h linux-2.6.39/include/linu static inline void vga_switcheroo_unregister_handler(void) {} static inline int vga_switcheroo_process_delayed_switch(void) { return = 0; } =20 -diff -urNp linux-2.6.39/include/linux/virtio.h linux-2.6.39/include/linu= x/virtio.h ---- linux-2.6.39/include/linux/virtio.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/virtio.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/virtio.h linux-2.6.39.1/include/= linux/virtio.h +--- linux-2.6.39.1/include/linux/virtio.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/virtio.h 2011-05-22 19:36:33.000000000 = -0400 @@ -102,7 +102,7 @@ struct virtio_device { int index; struct device dev; @@ -65374,9 +65440,9 @@ diff -urNp linux-2.6.39/include/linux/virtio.h li= nux-2.6.39/include/linux/virtio struct list_head vqs; /* Note that this is a Linux set_bit-style bitmap. */ unsigned long features[1]; -diff -urNp linux-2.6.39/include/linux/vmalloc.h linux-2.6.39/include/lin= ux/vmalloc.h ---- linux-2.6.39/include/linux/vmalloc.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/linux/vmalloc.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/linux/vmalloc.h linux-2.6.39.1/include= /linux/vmalloc.h +--- linux-2.6.39.1/include/linux/vmalloc.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/linux/vmalloc.h 2011-05-22 19:36:33.000000000= -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining=20 #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ @@ -65493,9 +65559,9 @@ diff -urNp linux-2.6.39/include/linux/vmalloc.h l= inux-2.6.39/include/linux/vmall +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.39/include/linux/vmstat.h linux-2.6.39/include/linu= x/vmstat.h ---- linux-2.6.39/include/linux/vmstat.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/linux/vmstat.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/linux/vmstat.h linux-2.6.39.1/include/= linux/vmstat.h +--- linux-2.6.39.1/include/linux/vmstat.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/linux/vmstat.h 2011-05-22 19:36:33.000000000 = -0400 @@ -147,18 +147,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -65559,9 +65625,9 @@ diff -urNp linux-2.6.39/include/linux/vmstat.h li= nux-2.6.39/include/linux/vmstat } =20 static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-2.6.39/include/media/saa7146_vv.h linux-2.6.39/include/= media/saa7146_vv.h ---- linux-2.6.39/include/media/saa7146_vv.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/media/saa7146_vv.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/media/saa7146_vv.h linux-2.6.39.1/incl= ude/media/saa7146_vv.h +--- linux-2.6.39.1/include/media/saa7146_vv.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/media/saa7146_vv.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -202,13 +202,13 @@ void saa7146_set_gpio(struct saa7146_dev =20 /* from saa7146_video.c */ @@ -65578,9 +65644,9 @@ diff -urNp linux-2.6.39/include/media/saa7146_vv.= h linux-2.6.39/include/media/sa =20 /* resource management functions */ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit); -diff -urNp linux-2.6.39/include/media/v4l2-device.h linux-2.6.39/include= /media/v4l2-device.h ---- linux-2.6.39/include/media/v4l2-device.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/include/media/v4l2-device.h 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/include/media/v4l2-device.h linux-2.6.39.1/inc= lude/media/v4l2-device.h +--- linux-2.6.39.1/include/media/v4l2-device.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/include/media/v4l2-device.h 2011-05-22 19:36:33.00000= 0000 -0400 @@ -95,7 +95,7 @@ int __must_check v4l2_device_register(st this function returns 0. If the name ends with a digit (e.g. cx18), then the name will be set to cx18-0 since cx180 looks really odd. */ @@ -65590,9 +65656,9 @@ diff -urNp linux-2.6.39/include/media/v4l2-device= .h linux-2.6.39/include/media/v =20 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects. Since the parent disappears this ensures that v4l2_dev doesn't have = an -diff -urNp linux-2.6.39/include/net/caif/cfctrl.h linux-2.6.39/include/n= et/caif/cfctrl.h ---- linux-2.6.39/include/net/caif/cfctrl.h 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/include/net/caif/cfctrl.h 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/include/net/caif/cfctrl.h linux-2.6.39.1/inclu= de/net/caif/cfctrl.h +--- linux-2.6.39.1/include/net/caif/cfctrl.h 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/include/net/caif/cfctrl.h 2011-05-22 19:36:33.0000000= 00 -0400 @@ -101,8 +101,8 @@ struct cfctrl_request_info { struct cfctrl { struct cfsrvl serv; @@ -65604,9 +65670,9 @@ diff -urNp linux-2.6.39/include/net/caif/cfctrl.h= linux-2.6.39/include/net/caif/ struct list_head list; /* Protects from simultaneous access to first_req list */ spinlock_t info_list_lock; -diff -urNp linux-2.6.39/include/net/flow.h linux-2.6.39/include/net/flow= .h ---- linux-2.6.39/include/net/flow.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/net/flow.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/net/flow.h linux-2.6.39.1/include/net/= flow.h +--- linux-2.6.39.1/include/net/flow.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/include/net/flow.h 2011-05-22 19:36:33.000000000 -040= 0 @@ -167,6 +167,6 @@ extern struct flow_cache_object *flow_ca u8 dir, flow_resolve_t resolver, void *ctx); =20 @@ -65615,9 +65681,9 @@ diff -urNp linux-2.6.39/include/net/flow.h linux-= 2.6.39/include/net/flow.h +extern atomic_unchecked_t flow_cache_genid; =20 #endif -diff -urNp linux-2.6.39/include/net/inetpeer.h linux-2.6.39/include/net/= inetpeer.h ---- linux-2.6.39/include/net/inetpeer.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/net/inetpeer.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/net/inetpeer.h linux-2.6.39.1/include/= net/inetpeer.h +--- linux-2.6.39.1/include/net/inetpeer.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/net/inetpeer.h 2011-05-22 19:36:33.000000000 = -0400 @@ -43,8 +43,8 @@ struct inet_peer { */ union { @@ -65638,9 +65704,9 @@ diff -urNp linux-2.6.39/include/net/inetpeer.h li= nux-2.6.39/include/net/inetpeer } =20 #endif /* _NET_INETPEER_H */ -diff -urNp linux-2.6.39/include/net/ip_fib.h linux-2.6.39/include/net/ip= _fib.h ---- linux-2.6.39/include/net/ip_fib.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/net/ip_fib.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/net/ip_fib.h linux-2.6.39.1/include/ne= t/ip_fib.h +--- linux-2.6.39.1/include/net/ip_fib.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/net/ip_fib.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s =20 #define FIB_RES_SADDR(net, res) \ @@ -65650,9 +65716,9 @@ diff -urNp linux-2.6.39/include/net/ip_fib.h linu= x-2.6.39/include/net/ip_fib.h FIB_RES_NH(res).nh_saddr : \ fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw) -diff -urNp linux-2.6.39/include/net/ip_vs.h linux-2.6.39/include/net/ip_= vs.h ---- linux-2.6.39/include/net/ip_vs.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/net/ip_vs.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/net/ip_vs.h linux-2.6.39.1/include/net= /ip_vs.h +--- linux-2.6.39.1/include/net/ip_vs.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/net/ip_vs.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -512,7 +512,7 @@ struct ip_vs_conn { struct ip_vs_conn *control; /* Master control connection *= / atomic_t n_control; /* Number of controlled ones *= / @@ -65671,9 +65737,9 @@ diff -urNp linux-2.6.39/include/net/ip_vs.h linux= -2.6.39/include/net/ip_vs.h atomic_t weight; /* server weight */ =20 atomic_t refcnt; /* reference counter */ -diff -urNp linux-2.6.39/include/net/irda/ircomm_tty.h linux-2.6.39/inclu= de/net/irda/ircomm_tty.h ---- linux-2.6.39/include/net/irda/ircomm_tty.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/include/net/irda/ircomm_tty.h 2011-05-22 19:36:33.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/include/net/irda/ircomm_tty.h linux-2.6.39.1/i= nclude/net/irda/ircomm_tty.h +--- linux-2.6.39.1/include/net/irda/ircomm_tty.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/include/net/irda/ircomm_tty.h 2011-05-22 19:36:33.000= 000000 -0400 @@ -35,6 +35,7 @@ #include #include @@ -65693,9 +65759,9 @@ diff -urNp linux-2.6.39/include/net/irda/ircomm_t= ty.h linux-2.6.39/include/net/i =20 /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.39/include/net/iucv/af_iucv.h linux-2.6.39/include/= net/iucv/af_iucv.h ---- linux-2.6.39/include/net/iucv/af_iucv.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/net/iucv/af_iucv.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/net/iucv/af_iucv.h linux-2.6.39.1/incl= ude/net/iucv/af_iucv.h +--- linux-2.6.39.1/include/net/iucv/af_iucv.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/net/iucv/af_iucv.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -87,7 +87,7 @@ struct iucv_sock { struct iucv_sock_list { struct hlist_head head; @@ -65705,9 +65771,9 @@ diff -urNp linux-2.6.39/include/net/iucv/af_iucv.= h linux-2.6.39/include/net/iucv }; =20 unsigned int iucv_sock_poll(struct file *file, struct socket *sock, -diff -urNp linux-2.6.39/include/net/neighbour.h linux-2.6.39/include/net= /neighbour.h ---- linux-2.6.39/include/net/neighbour.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/net/neighbour.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/net/neighbour.h linux-2.6.39.1/include= /net/neighbour.h +--- linux-2.6.39.1/include/net/neighbour.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/net/neighbour.h 2011-05-22 19:36:33.000000000= -0400 @@ -118,12 +118,12 @@ struct neighbour { =20 struct neigh_ops { @@ -65727,9 +65793,9 @@ diff -urNp linux-2.6.39/include/net/neighbour.h l= inux-2.6.39/include/net/neighbo }; =20 struct pneigh_entry { -diff -urNp linux-2.6.39/include/net/netfilter/nf_conntrack_ecache.h linu= x-2.6.39/include/net/netfilter/nf_conntrack_ecache.h ---- linux-2.6.39/include/net/netfilter/nf_conntrack_ecache.h 2011-05-19 = 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/net/netfilter/nf_conntrack_ecache.h 2011-05-22 = 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/net/netfilter/nf_conntrack_ecache.h li= nux-2.6.39.1/include/net/netfilter/nf_conntrack_ecache.h +--- linux-2.6.39.1/include/net/netfilter/nf_conntrack_ecache.h 2011-05-1= 9 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/include/net/netfilter/nf_conntrack_ecache.h 2011-05-2= 2 19:36:33.000000000 -0400 @@ -95,7 +95,7 @@ nf_conntrack_eventmask_report(unsigned i int report) { @@ -65748,9 +65814,9 @@ diff -urNp linux-2.6.39/include/net/netfilter/nf_= conntrack_ecache.h linux-2.6.39 struct nf_conntrack_ecache *e; =20 rcu_read_lock(); -diff -urNp linux-2.6.39/include/net/netlink.h linux-2.6.39/include/net/n= etlink.h ---- linux-2.6.39/include/net/netlink.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/net/netlink.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/net/netlink.h linux-2.6.39.1/include/n= et/netlink.h +--- linux-2.6.39.1/include/net/netlink.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/net/netlink.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) { @@ -65760,9 +65826,9 @@ diff -urNp linux-2.6.39/include/net/netlink.h lin= ux-2.6.39/include/net/netlink.h } =20 /** -diff -urNp linux-2.6.39/include/net/netns/ipv4.h linux-2.6.39/include/ne= t/netns/ipv4.h ---- linux-2.6.39/include/net/netns/ipv4.h 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/include/net/netns/ipv4.h 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/include/net/netns/ipv4.h linux-2.6.39.1/includ= e/net/netns/ipv4.h +--- linux-2.6.39.1/include/net/netns/ipv4.h 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/include/net/netns/ipv4.h 2011-05-22 19:36:33.00000000= 0 -0400 @@ -54,8 +54,8 @@ struct netns_ipv4 { int sysctl_rt_cache_rebuild_count; int current_rt_cache_rebuild_count; @@ -65774,9 +65840,9 @@ diff -urNp linux-2.6.39/include/net/netns/ipv4.h = linux-2.6.39/include/net/netns/ =20 #ifdef CONFIG_IP_MROUTE #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES -diff -urNp linux-2.6.39/include/net/sctp/sctp.h linux-2.6.39/include/net= /sctp/sctp.h ---- linux-2.6.39/include/net/sctp/sctp.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/net/sctp/sctp.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/net/sctp/sctp.h linux-2.6.39.1/include= /net/sctp/sctp.h +--- linux-2.6.39.1/include/net/sctp/sctp.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/net/sctp/sctp.h 2011-05-22 19:36:33.000000000= -0400 @@ -316,9 +316,9 @@ do { \ =20 #else /* SCTP_DEBUG */ @@ -65790,9 +65856,9 @@ diff -urNp linux-2.6.39/include/net/sctp/sctp.h l= inux-2.6.39/include/net/sctp/sc #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.39/include/net/sock.h linux-2.6.39/include/net/sock= .h ---- linux-2.6.39/include/net/sock.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/net/sock.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/net/sock.h linux-2.6.39.1/include/net/= sock.h +--- linux-2.6.39.1/include/net/sock.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/include/net/sock.h 2011-05-22 19:36:33.000000000 -040= 0 @@ -277,7 +277,7 @@ struct sock { #ifdef CONFIG_RPS __u32 sk_rxhash; @@ -65802,9 +65868,9 @@ diff -urNp linux-2.6.39/include/net/sock.h linux-= 2.6.39/include/net/sock.h int sk_rcvbuf; =20 struct sk_filter __rcu *sk_filter; -diff -urNp linux-2.6.39/include/net/tcp.h linux-2.6.39/include/net/tcp.h ---- linux-2.6.39/include/net/tcp.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/net/tcp.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/net/tcp.h linux-2.6.39.1/include/net/t= cp.h +--- linux-2.6.39.1/include/net/tcp.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/include/net/tcp.h 2011-05-22 19:36:33.000000000 -0400 @@ -1374,7 +1374,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -65814,9 +65880,9 @@ diff -urNp linux-2.6.39/include/net/tcp.h linux-2= .6.39/include/net/tcp.h struct seq_operations seq_ops; }; =20 -diff -urNp linux-2.6.39/include/net/udp.h linux-2.6.39/include/net/udp.h ---- linux-2.6.39/include/net/udp.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/net/udp.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/net/udp.h linux-2.6.39.1/include/net/u= dp.h +--- linux-2.6.39.1/include/net/udp.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/include/net/udp.h 2011-05-22 19:36:33.000000000 -0400 @@ -234,7 +234,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -65826,9 +65892,9 @@ diff -urNp linux-2.6.39/include/net/udp.h linux-2= .6.39/include/net/udp.h struct seq_operations seq_ops; }; =20 -diff -urNp linux-2.6.39/include/net/xfrm.h linux-2.6.39/include/net/xfrm= .h ---- linux-2.6.39/include/net/xfrm.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/net/xfrm.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/net/xfrm.h linux-2.6.39.1/include/net/= xfrm.h +--- linux-2.6.39.1/include/net/xfrm.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/include/net/xfrm.h 2011-05-22 19:36:33.000000000 -040= 0 @@ -505,7 +505,7 @@ struct xfrm_policy { struct timer_list timer; =20 @@ -65838,9 +65904,9 @@ diff -urNp linux-2.6.39/include/net/xfrm.h linux-= 2.6.39/include/net/xfrm.h u32 priority; u32 index; struct xfrm_mark mark; -diff -urNp linux-2.6.39/include/pcmcia/ss.h linux-2.6.39/include/pcmcia/= ss.h ---- linux-2.6.39/include/pcmcia/ss.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/pcmcia/ss.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/pcmcia/ss.h linux-2.6.39.1/include/pcm= cia/ss.h +--- linux-2.6.39.1/include/pcmcia/ss.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/pcmcia/ss.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -241,9 +241,9 @@ struct pcmcia_socket { * "select PCCARD_NONSTATIC" in Kconfig. * @@ -65853,9 +65919,9 @@ diff -urNp linux-2.6.39/include/pcmcia/ss.h linux= -2.6.39/include/pcmcia/ss.h extern struct pccard_resource_ops pccard_nonstatic_ops; #else /* If PCMCIA is not used, but only CARDBUS, these functions are not use= d -diff -urNp linux-2.6.39/include/rdma/ib_verbs.h linux-2.6.39/include/rdm= a/ib_verbs.h ---- linux-2.6.39/include/rdma/ib_verbs.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/rdma/ib_verbs.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/rdma/ib_verbs.h linux-2.6.39.1/include= /rdma/ib_verbs.h +--- linux-2.6.39.1/include/rdma/ib_verbs.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/rdma/ib_verbs.h 2011-05-22 19:36:33.000000000= -0400 @@ -1149,7 +1149,7 @@ struct ib_device { struct ib_mad *in_mad, struct ib_mad *out_mad); @@ -65865,9 +65931,9 @@ diff -urNp linux-2.6.39/include/rdma/ib_verbs.h l= inux-2.6.39/include/rdma/ib_ver =20 struct module *owner; struct device dev; -diff -urNp linux-2.6.39/include/scsi/libfc.h linux-2.6.39/include/scsi/l= ibfc.h ---- linux-2.6.39/include/scsi/libfc.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/scsi/libfc.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/scsi/libfc.h linux-2.6.39.1/include/sc= si/libfc.h +--- linux-2.6.39.1/include/scsi/libfc.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/scsi/libfc.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -202,7 +202,7 @@ struct fc_rport_priv { struct mutex rp_mutex; struct delayed_work retry_work; @@ -65877,9 +65943,9 @@ diff -urNp linux-2.6.39/include/scsi/libfc.h linu= x-2.6.39/include/scsi/libfc.h struct list_head peers; struct work_struct event_work; u32 supported_classes; -diff -urNp linux-2.6.39/include/scsi/scsi_device.h linux-2.6.39/include/= scsi/scsi_device.h ---- linux-2.6.39/include/scsi/scsi_device.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/scsi/scsi_device.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/scsi/scsi_device.h linux-2.6.39.1/incl= ude/scsi/scsi_device.h +--- linux-2.6.39.1/include/scsi/scsi_device.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/scsi/scsi_device.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -161,9 +161,9 @@ struct scsi_device { unsigned int max_device_blocked; /* what device_blocked counts down fr= om */ #define SCSI_DEFAULT_DEVICE_BLOCKED 3 @@ -65893,9 +65959,9 @@ diff -urNp linux-2.6.39/include/scsi/scsi_device.= h linux-2.6.39/include/scsi/scs =20 struct device sdev_gendev, sdev_dev; -diff -urNp linux-2.6.39/include/sound/ac97_codec.h linux-2.6.39/include/= sound/ac97_codec.h ---- linux-2.6.39/include/sound/ac97_codec.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/sound/ac97_codec.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/sound/ac97_codec.h linux-2.6.39.1/incl= ude/sound/ac97_codec.h +--- linux-2.6.39.1/include/sound/ac97_codec.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/sound/ac97_codec.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -424,15 +424,15 @@ struct snd_ac97; =20 @@ -65937,9 +66003,9 @@ diff -urNp linux-2.6.39/include/sound/ac97_codec.= h linux-2.6.39/include/sound/ac void *private_data, struct snd_ac97_bus **rbus); /* create mixer controls */ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *= template, -diff -urNp linux-2.6.39/include/sound/core.h linux-2.6.39/include/sound/= core.h ---- linux-2.6.39/include/sound/core.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/include/sound/core.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/include/sound/core.h linux-2.6.39.1/include/so= und/core.h +--- linux-2.6.39.1/include/sound/core.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/include/sound/core.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -88,7 +88,7 @@ struct snd_device { snd_device_state_t state; /* state of the device */ snd_device_type_t type; /* device type */ @@ -65958,9 +66024,9 @@ diff -urNp linux-2.6.39/include/sound/core.h linu= x-2.6.39/include/sound/core.h int snd_device_register(struct snd_card *card, void *device_data); int snd_device_register_all(struct snd_card *card); int snd_device_disconnect(struct snd_card *card, void *device_data); -diff -urNp linux-2.6.39/include/sound/pcm.h linux-2.6.39/include/sound/p= cm.h ---- linux-2.6.39/include/sound/pcm.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/sound/pcm.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/sound/pcm.h linux-2.6.39.1/include/sou= nd/pcm.h +--- linux-2.6.39.1/include/sound/pcm.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/sound/pcm.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -379,7 +379,7 @@ struct snd_pcm_substream { unsigned int dma_buf_id; size_t dma_max; @@ -65979,9 +66045,9 @@ diff -urNp linux-2.6.39/include/sound/pcm.h linux= -2.6.39/include/sound/pcm.h void snd_pcm_set_sync(struct snd_pcm_substream *substream); int snd_pcm_lib_interleave_len(struct snd_pcm_substream *substream); int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream, -diff -urNp linux-2.6.39/include/sound/rawmidi.h linux-2.6.39/include/sou= nd/rawmidi.h ---- linux-2.6.39/include/sound/rawmidi.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/sound/rawmidi.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/sound/rawmidi.h linux-2.6.39.1/include= /sound/rawmidi.h +--- linux-2.6.39.1/include/sound/rawmidi.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/sound/rawmidi.h 2011-05-22 19:36:33.000000000= -0400 @@ -100,7 +100,7 @@ struct snd_rawmidi_substream { struct snd_rawmidi_runtime *runtime; struct pid *pid; @@ -66009,9 +66075,9 @@ diff -urNp linux-2.6.39/include/sound/rawmidi.h l= inux-2.6.39/include/sound/rawmi =20 /* callbacks */ =20 -diff -urNp linux-2.6.39/include/sound/seq_device.h linux-2.6.39/include/= sound/seq_device.h ---- linux-2.6.39/include/sound/seq_device.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/sound/seq_device.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/sound/seq_device.h linux-2.6.39.1/incl= ude/sound/seq_device.h +--- linux-2.6.39.1/include/sound/seq_device.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/sound/seq_device.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -69,7 +69,7 @@ struct snd_seq_dev_ops { */ void snd_seq_device_load_drivers(void); @@ -66021,9 +66087,9 @@ diff -urNp linux-2.6.39/include/sound/seq_device.= h linux-2.6.39/include/sound/se int snd_seq_device_unregister_driver(char *id); =20 #define SNDRV_SEQ_DEVICE_ARGPTR(dev) (void *)((char *)(dev) + sizeof(st= ruct snd_seq_device)) -diff -urNp linux-2.6.39/include/sound/snd_wavefront.h linux-2.6.39/inclu= de/sound/snd_wavefront.h ---- linux-2.6.39/include/sound/snd_wavefront.h 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/include/sound/snd_wavefront.h 2011-05-22 19:36:33.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/include/sound/snd_wavefront.h linux-2.6.39.1/i= nclude/sound/snd_wavefront.h +--- linux-2.6.39.1/include/sound/snd_wavefront.h 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/include/sound/snd_wavefront.h 2011-05-22 19:36:33.000= 000000 -0400 @@ -37,8 +37,8 @@ struct _snd_wavefront_midi { #define MPU_ACK 0xFE #define UART_MODE_ON 0x3F @@ -66035,9 +66101,9 @@ diff -urNp linux-2.6.39/include/sound/snd_wavefro= nt.h linux-2.6.39/include/sound =20 extern void snd_wavefront_midi_enable_virtual (snd_wavefront_card_t *= ); extern void snd_wavefront_midi_disable_virtual (snd_wavefront_card_t = *); -diff -urNp linux-2.6.39/include/sound/soc.h linux-2.6.39/include/sound/s= oc.h ---- linux-2.6.39/include/sound/soc.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/include/sound/soc.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/include/sound/soc.h linux-2.6.39.1/include/sou= nd/soc.h +--- linux-2.6.39.1/include/sound/soc.h 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/include/sound/soc.h 2011-05-22 19:36:33.000000000 -04= 00 @@ -245,7 +245,7 @@ struct snd_soc_jack_gpio; =20 typedef int (*hw_write_t)(void *,const char* ,int); @@ -66047,9 +66113,9 @@ diff -urNp linux-2.6.39/include/sound/soc.h linux= -2.6.39/include/sound/soc.h =20 enum snd_soc_control_type { SND_SOC_CUSTOM, -diff -urNp linux-2.6.39/include/sound/ymfpci.h linux-2.6.39/include/soun= d/ymfpci.h ---- linux-2.6.39/include/sound/ymfpci.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/include/sound/ymfpci.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/include/sound/ymfpci.h linux-2.6.39.1/include/= sound/ymfpci.h +--- linux-2.6.39.1/include/sound/ymfpci.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/include/sound/ymfpci.h 2011-05-22 19:36:33.000000000 = -0400 @@ -358,7 +358,7 @@ struct snd_ymfpci { spinlock_t reg_lock; spinlock_t voice_lock; @@ -66059,10 +66125,10 @@ diff -urNp linux-2.6.39/include/sound/ymfpci.h = linux-2.6.39/include/sound/ymfpci struct snd_info_entry *proc_entry; const struct firmware *dsp_microcode; const struct firmware *controller_microcode; -diff -urNp linux-2.6.39/include/target/target_core_base.h linux-2.6.39/i= nclude/target/target_core_base.h ---- linux-2.6.39/include/target/target_core_base.h 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/include/target/target_core_base.h 2011-05-22 19:36:33.0= 00000000 -0400 -@@ -431,8 +431,8 @@ struct se_transport_task { +diff -urNp linux-2.6.39.1/include/target/target_core_base.h linux-2.6.39= .1/include/target/target_core_base.h +--- linux-2.6.39.1/include/target/target_core_base.h 2011-06-03 00:04:14= .000000000 -0400 ++++ linux-2.6.39.1/include/target/target_core_base.h 2011-06-03 00:32:08= .000000000 -0400 +@@ -432,8 +432,8 @@ struct se_transport_task { atomic_t t_task_cdbs_left; atomic_t t_task_cdbs_ex_left; atomic_t t_task_cdbs_timeout_left; @@ -66073,7 +66139,7 @@ diff -urNp linux-2.6.39/include/target/target_cor= e_base.h linux-2.6.39/include/t atomic_t t_transport_active; atomic_t t_transport_complete; atomic_t t_transport_queue_active; -@@ -773,7 +773,7 @@ struct se_device { +@@ -774,7 +774,7 @@ struct se_device { atomic_t active_cmds; atomic_t simple_cmds; atomic_t depth_left; @@ -66082,9 +66148,9 @@ diff -urNp linux-2.6.39/include/target/target_cor= e_base.h linux-2.6.39/include/t atomic_t dev_tur_active; atomic_t execute_tasks; atomic_t dev_status_thr_count; -diff -urNp linux-2.6.39/include/trace/events/irq.h linux-2.6.39/include/= trace/events/irq.h ---- linux-2.6.39/include/trace/events/irq.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/include/trace/events/irq.h 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/include/trace/events/irq.h linux-2.6.39.1/incl= ude/trace/events/irq.h +--- linux-2.6.39.1/include/trace/events/irq.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/include/trace/events/irq.h 2011-05-22 19:36:33.000000= 000 -0400 @@ -36,7 +36,7 @@ struct softirq_action; */ TRACE_EVENT(irq_handler_entry, @@ -66103,9 +66169,9 @@ diff -urNp linux-2.6.39/include/trace/events/irq.= h linux-2.6.39/include/trace/ev =20 TP_ARGS(irq, action, ret), =20 -diff -urNp linux-2.6.39/include/video/udlfb.h linux-2.6.39/include/video= /udlfb.h ---- linux-2.6.39/include/video/udlfb.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/include/video/udlfb.h 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/include/video/udlfb.h linux-2.6.39.1/include/v= ideo/udlfb.h +--- linux-2.6.39.1/include/video/udlfb.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/include/video/udlfb.h 2011-05-22 19:36:33.000000000 -= 0400 @@ -51,10 +51,10 @@ struct dlfb_data { int base8; u32 pseudo_palette[256]; @@ -66121,9 +66187,9 @@ diff -urNp linux-2.6.39/include/video/udlfb.h lin= ux-2.6.39/include/video/udlfb.h }; =20 #define NR_USB_REQUEST_I2C_SUB_IO 0x02 -diff -urNp linux-2.6.39/include/video/uvesafb.h linux-2.6.39/include/vid= eo/uvesafb.h ---- linux-2.6.39/include/video/uvesafb.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/include/video/uvesafb.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/include/video/uvesafb.h linux-2.6.39.1/include= /video/uvesafb.h +--- linux-2.6.39.1/include/video/uvesafb.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/include/video/uvesafb.h 2011-05-22 19:36:33.000000000= -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -66132,9 +66198,9 @@ diff -urNp linux-2.6.39/include/video/uvesafb.h l= inux-2.6.39/include/video/uvesa void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.39/init/do_mounts.c linux-2.6.39/init/do_mounts.c ---- linux-2.6.39/init/do_mounts.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/init/do_mounts.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/init/do_mounts.c linux-2.6.39.1/init/do_mounts= .c +--- linux-2.6.39.1/init/do_mounts.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/init/do_mounts.c 2011-05-22 19:36:33.000000000 -0400 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa =20 static int __init do_mount_root(char *name, char *fs, int flags, void *= data) @@ -66174,9 +66240,9 @@ diff -urNp linux-2.6.39/init/do_mounts.c linux-2.= 6.39/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL= , MS_MOVE, NULL); sys_chroot((const char __user __force *)"."); } -diff -urNp linux-2.6.39/init/do_mounts.h linux-2.6.39/init/do_mounts.h ---- linux-2.6.39/init/do_mounts.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/init/do_mounts.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/init/do_mounts.h linux-2.6.39.1/init/do_mounts= .h +--- linux-2.6.39.1/init/do_mounts.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/init/do_mounts.h 2011-05-22 19:36:33.000000000 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; =20 static inline int create_dev(char *name, dev_t dev) @@ -66196,9 +66262,9 @@ diff -urNp linux-2.6.39/init/do_mounts.h linux-2.= 6.39/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.39/init/do_mounts_initrd.c linux-2.6.39/init/do_mou= nts_initrd.c ---- linux-2.6.39/init/do_mounts_initrd.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/init/do_mounts_initrd.c 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/init/do_mounts_initrd.c linux-2.6.39.1/init/do= _mounts_initrd.c +--- linux-2.6.39.1/init/do_mounts_initrd.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/init/do_mounts_initrd.c 2011-05-22 19:36:33.000000000= -0400 @@ -44,13 +44,13 @@ static void __init handle_initrd(void) create_dev("/dev/root.old", Root_RAM0); /* mount initrd on rootfs' /root */ @@ -66273,9 +66339,9 @@ diff -urNp linux-2.6.39/init/do_mounts_initrd.c l= inux-2.6.39/init/do_mounts_init + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.39/init/do_mounts_md.c linux-2.6.39/init/do_mounts_= md.c ---- linux-2.6.39/init/do_mounts_md.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/init/do_mounts_md.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/init/do_mounts_md.c linux-2.6.39.1/init/do_mou= nts_md.c +--- linux-2.6.39.1/init/do_mounts_md.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/init/do_mounts_md.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -66294,9 +66360,9 @@ diff -urNp linux-2.6.39/init/do_mounts_md.c linux= -2.6.39/init/do_mounts_md.c sys_ioctl(fd, BLKRRPART, 0); } sys_close(fd); -diff -urNp linux-2.6.39/init/initramfs.c linux-2.6.39/init/initramfs.c ---- linux-2.6.39/init/initramfs.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/init/initramfs.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/init/initramfs.c linux-2.6.39.1/init/initramfs= .c +--- linux-2.6.39.1/init/initramfs.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/init/initramfs.c 2011-05-22 19:36:33.000000000 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -66405,9 +66471,9 @@ diff -urNp linux-2.6.39/init/initramfs.c linux-2.= 6.39/init/initramfs.c state =3D SkipIt; next_state =3D Reset; return 0; -diff -urNp linux-2.6.39/init/Kconfig linux-2.6.39/init/Kconfig ---- linux-2.6.39/init/Kconfig 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/init/Kconfig 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/init/Kconfig linux-2.6.39.1/init/Kconfig +--- linux-2.6.39.1/init/Kconfig 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/init/Kconfig 2011-05-22 19:36:33.000000000 -0400 @@ -1202,7 +1202,7 @@ config SLUB_DEBUG =20 config COMPAT_BRK @@ -66417,9 +66483,9 @@ diff -urNp linux-2.6.39/init/Kconfig linux-2.6.39= /init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-2.6.39/init/main.c linux-2.6.39/init/main.c ---- linux-2.6.39/init/main.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/init/main.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/init/main.c linux-2.6.39.1/init/main.c +--- linux-2.6.39.1/init/main.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/init/main.c 2011-06-03 00:32:08.000000000 -0400 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void)=20 extern void tc_init(void); #endif @@ -66531,9 +66597,9 @@ diff -urNp linux-2.6.39/init/main.c linux-2.6.39/= init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.39/ipc/mqueue.c linux-2.6.39/ipc/mqueue.c ---- linux-2.6.39/ipc/mqueue.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/ipc/mqueue.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/ipc/mqueue.c linux-2.6.39.1/ipc/mqueue.c +--- linux-2.6.39.1/ipc/mqueue.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/ipc/mqueue.c 2011-05-22 19:41:42.000000000 -0400 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st mq_bytes =3D (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -66542,9 +66608,9 @@ diff -urNp linux-2.6.39/ipc/mqueue.c linux-2.6.39= /ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.39/ipc/sem.c linux-2.6.39/ipc/sem.c ---- linux-2.6.39/ipc/sem.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/ipc/sem.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/ipc/sem.c linux-2.6.39.1/ipc/sem.c +--- linux-2.6.39.1/ipc/sem.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/ipc/sem.c 2011-05-22 19:36:33.000000000 -0400 @@ -854,6 +854,8 @@ static int semctl_main(struct ipc_namesp int nsems; struct list_head tasks; @@ -66563,9 +66629,9 @@ diff -urNp linux-2.6.39/ipc/sem.c linux-2.6.39/ip= c/sem.c ns =3D current->nsproxy->ipc_ns; =20 if (nsops < 1 || semid < 0) -diff -urNp linux-2.6.39/ipc/shm.c linux-2.6.39/ipc/shm.c ---- linux-2.6.39/ipc/shm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/ipc/shm.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/ipc/shm.c linux-2.6.39.1/ipc/shm.c +--- linux-2.6.39.1/ipc/shm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/ipc/shm.c 2011-05-22 19:41:42.000000000 -0400 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -66627,9 +66693,9 @@ diff -urNp linux-2.6.39/ipc/shm.c linux-2.6.39/ip= c/shm.c size =3D i_size_read(path.dentry->d_inode); shm_unlock(shp); =20 -diff -urNp linux-2.6.39/kernel/acct.c linux-2.6.39/kernel/acct.c ---- linux-2.6.39/kernel/acct.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/acct.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/acct.c linux-2.6.39.1/kernel/acct.c +--- linux-2.6.39.1/kernel/acct.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/acct.c 2011-05-22 19:36:33.000000000 -0400 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a */ flim =3D current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -66639,9 +66705,9 @@ diff -urNp linux-2.6.39/kernel/acct.c linux-2.6.3= 9/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur =3D flim; set_fs(fs); -diff -urNp linux-2.6.39/kernel/audit.c linux-2.6.39/kernel/audit.c ---- linux-2.6.39/kernel/audit.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/audit.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/audit.c linux-2.6.39.1/kernel/audit.c +--- linux-2.6.39.1/kernel/audit.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/audit.c 2011-05-22 19:36:33.000000000 -0400 @@ -112,7 +112,7 @@ u32 audit_sig_sid =3D 0; 3) suppressed due to audit_rate_limit 4) suppressed due to audit_backlog_limit @@ -66678,9 +66744,9 @@ diff -urNp linux-2.6.39/kernel/audit.c linux-2.6.= 39/kernel/audit.c status_set.backlog =3D skb_queue_len(&audit_skb_queue); audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0, &status_set, sizeof(status_set)); -diff -urNp linux-2.6.39/kernel/auditsc.c linux-2.6.39/kernel/auditsc.c ---- linux-2.6.39/kernel/auditsc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/auditsc.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/auditsc.c linux-2.6.39.1/kernel/auditsc= .c +--- linux-2.6.39.1/kernel/auditsc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/auditsc.c 2011-05-22 19:36:33.000000000 -0400 @@ -2111,7 +2111,7 @@ int auditsc_get_stamp(struct audit_conte } =20 @@ -66699,9 +66765,9 @@ diff -urNp linux-2.6.39/kernel/auditsc.c linux-2.= 6.39/kernel/auditsc.c struct audit_context *context =3D task->audit_context; =20 if (context && context->in_syscall) { -diff -urNp linux-2.6.39/kernel/capability.c linux-2.6.39/kernel/capabili= ty.c ---- linux-2.6.39/kernel/capability.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/capability.c 2011-05-22 21:02:23.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/capability.c linux-2.6.39.1/kernel/capa= bility.c +--- linux-2.6.39.1/kernel/capability.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/kernel/capability.c 2011-05-22 21:02:23.000000000 -04= 00 @@ -206,6 +206,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_ * before modification is attempted and the application * fails. @@ -66762,9 +66828,9 @@ diff -urNp linux-2.6.39/kernel/capability.c linux= -2.6.39/kernel/capability.c /** * nsown_capable - Check superior capability to one's own user_ns * @cap: The capability in question -diff -urNp linux-2.6.39/kernel/cgroup.c linux-2.6.39/kernel/cgroup.c ---- linux-2.6.39/kernel/cgroup.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/cgroup.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/cgroup.c linux-2.6.39.1/kernel/cgroup.c +--- linux-2.6.39.1/kernel/cgroup.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/cgroup.c 2011-05-22 19:36:33.000000000 -0400 @@ -598,6 +598,8 @@ static struct css_set *find_css_set( struct hlist_head *hhead; struct cg_cgroup_link *link; @@ -66774,9 +66840,9 @@ diff -urNp linux-2.6.39/kernel/cgroup.c linux-2.6= .39/kernel/cgroup.c /* First see if we already have a cgroup group that matches * the desired set */ read_lock(&css_set_lock); -diff -urNp linux-2.6.39/kernel/compat.c linux-2.6.39/kernel/compat.c ---- linux-2.6.39/kernel/compat.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/compat.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/compat.c linux-2.6.39.1/kernel/compat.c +--- linux-2.6.39.1/kernel/compat.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/compat.c 2011-05-22 19:41:42.000000000 -0400 @@ -13,6 +13,7 @@ =20 #include @@ -66785,9 +66851,9 @@ diff -urNp linux-2.6.39/kernel/compat.c linux-2.6= .39/kernel/compat.c #include #include #include -diff -urNp linux-2.6.39/kernel/configs.c linux-2.6.39/kernel/configs.c ---- linux-2.6.39/kernel/configs.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/configs.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/configs.c linux-2.6.39.1/kernel/configs= .c +--- linux-2.6.39.1/kernel/configs.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/configs.c 2011-05-22 19:41:42.000000000 -0400 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; =20 @@ -66808,9 +66874,9 @@ diff -urNp linux-2.6.39/kernel/configs.c linux-2.= 6.39/kernel/configs.c if (!entry) return -ENOMEM; =20 -diff -urNp linux-2.6.39/kernel/cred.c linux-2.6.39/kernel/cred.c ---- linux-2.6.39/kernel/cred.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/cred.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/cred.c linux-2.6.39.1/kernel/cred.c +--- linux-2.6.39.1/kernel/cred.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/cred.c 2011-05-22 19:41:42.000000000 -0400 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head */ void __put_cred(struct cred *cred) @@ -66946,9 +67012,9 @@ diff -urNp linux-2.6.39/kernel/cred.c linux-2.6.3= 9/kernel/cred.c ret =3D security_secctx_to_secid(secctx, strlen(secctx), &secid); if (ret < 0) return ret; -diff -urNp linux-2.6.39/kernel/debug/debug_core.c linux-2.6.39/kernel/de= bug/debug_core.c ---- linux-2.6.39/kernel/debug/debug_core.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/kernel/debug/debug_core.c 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/kernel/debug/debug_core.c linux-2.6.39.1/kerne= l/debug/debug_core.c +--- linux-2.6.39.1/kernel/debug/debug_core.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/kernel/debug/debug_core.c 2011-05-22 19:36:33.0000000= 00 -0400 @@ -72,7 +72,7 @@ int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -67036,9 +67102,9 @@ diff -urNp linux-2.6.39/kernel/debug/debug_core.c= linux-2.6.39/kernel/debug/debu { BUG_ON(kgdb_connected); =20 -diff -urNp linux-2.6.39/kernel/debug/kdb/kdb_main.c linux-2.6.39/kernel/= debug/kdb/kdb_main.c ---- linux-2.6.39/kernel/debug/kdb/kdb_main.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/kernel/debug/kdb/kdb_main.c 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/kernel/debug/kdb/kdb_main.c linux-2.6.39.1/ker= nel/debug/kdb/kdb_main.c +--- linux-2.6.39.1/kernel/debug/kdb/kdb_main.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/kernel/debug/kdb/kdb_main.c 2011-05-22 19:36:33.00000= 0000 -0400 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha list_for_each_entry(mod, kdb_modules, list) { =20 @@ -67057,9 +67123,9 @@ diff -urNp linux-2.6.39/kernel/debug/kdb/kdb_main= .c linux-2.6.39/kernel/debug/kd =20 #ifdef CONFIG_MODULE_UNLOAD { -diff -urNp linux-2.6.39/kernel/exit.c linux-2.6.39/kernel/exit.c ---- linux-2.6.39/kernel/exit.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/exit.c 2011-05-22 20:02:30.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/exit.c linux-2.6.39.1/kernel/exit.c +--- linux-2.6.39.1/kernel/exit.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/exit.c 2011-05-22 20:02:30.000000000 -0400 @@ -57,6 +57,10 @@ #include #include @@ -67171,9 +67237,9 @@ diff -urNp linux-2.6.39/kernel/exit.c linux-2.6.3= 9/kernel/exit.c exit_mm(tsk); =20 if (group_dead) -diff -urNp linux-2.6.39/kernel/fork.c linux-2.6.39/kernel/fork.c ---- linux-2.6.39/kernel/fork.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/fork.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/fork.c linux-2.6.39.1/kernel/fork.c +--- linux-2.6.39.1/kernel/fork.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/fork.c 2011-05-22 19:41:42.000000000 -0400 @@ -287,7 +287,7 @@ static struct task_struct *dup_task_stru *stackend =3D STACK_END_MAGIC; /* for overflow detection */ =20 @@ -67470,9 +67536,9 @@ diff -urNp linux-2.6.39/kernel/fork.c linux-2.6.3= 9/kernel/fork.c new_fs =3D NULL; else new_fs =3D fs; -diff -urNp linux-2.6.39/kernel/futex.c linux-2.6.39/kernel/futex.c ---- linux-2.6.39/kernel/futex.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/futex.c 2011-05-22 22:41:57.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/futex.c linux-2.6.39.1/kernel/futex.c +--- linux-2.6.39.1/kernel/futex.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/futex.c 2011-05-22 22:41:57.000000000 -0400 @@ -54,6 +54,7 @@ #include #include @@ -67560,9 +67626,9 @@ diff -urNp linux-2.6.39/kernel/futex.c linux-2.6.= 39/kernel/futex.c =20 for (i =3D 0; i < ARRAY_SIZE(futex_queues); i++) { plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock); -diff -urNp linux-2.6.39/kernel/futex_compat.c linux-2.6.39/kernel/futex_= compat.c ---- linux-2.6.39/kernel/futex_compat.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/kernel/futex_compat.c 2011-05-22 22:42:09.000000000 -04= 00 +diff -urNp linux-2.6.39.1/kernel/futex_compat.c linux-2.6.39.1/kernel/fu= tex_compat.c +--- linux-2.6.39.1/kernel/futex_compat.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/kernel/futex_compat.c 2011-05-22 22:42:09.000000000 -= 0400 @@ -10,6 +10,7 @@ #include #include @@ -67602,9 +67668,9 @@ diff -urNp linux-2.6.39/kernel/futex_compat.c lin= ux-2.6.39/kernel/futex_compat.c head =3D p->compat_robust_list; rcu_read_unlock(); } -diff -urNp linux-2.6.39/kernel/gcov/base.c linux-2.6.39/kernel/gcov/base= .c ---- linux-2.6.39/kernel/gcov/base.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/gcov/base.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/gcov/base.c linux-2.6.39.1/kernel/gcov/= base.c +--- linux-2.6.39.1/kernel/gcov/base.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/kernel/gcov/base.c 2011-05-22 19:36:33.000000000 -040= 0 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } =20 @@ -67626,9 +67692,9 @@ diff -urNp linux-2.6.39/kernel/gcov/base.c linux-= 2.6.39/kernel/gcov/base.c if (prev) prev->next =3D info->next; else -diff -urNp linux-2.6.39/kernel/hrtimer.c linux-2.6.39/kernel/hrtimer.c ---- linux-2.6.39/kernel/hrtimer.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/hrtimer.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/hrtimer.c linux-2.6.39.1/kernel/hrtimer= .c +--- linux-2.6.39.1/kernel/hrtimer.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/hrtimer.c 2011-05-22 19:36:33.000000000 -0400 @@ -1383,7 +1383,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -67638,9 +67704,9 @@ diff -urNp linux-2.6.39/kernel/hrtimer.c linux-2.= 6.39/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.39/kernel/jump_label.c linux-2.6.39/kernel/jump_lab= el.c ---- linux-2.6.39/kernel/jump_label.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/jump_label.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/jump_label.c linux-2.6.39.1/kernel/jump= _label.c +--- linux-2.6.39.1/kernel/jump_label.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/kernel/jump_label.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -49,6 +49,17 @@ void jump_label_unlock(void) mutex_unlock(&jump_label_mutex); } @@ -67681,9 +67747,9 @@ diff -urNp linux-2.6.39/kernel/jump_label.c linux= -2.6.39/kernel/jump_label.c iter++; } } -diff -urNp linux-2.6.39/kernel/kallsyms.c linux-2.6.39/kernel/kallsyms.c ---- linux-2.6.39/kernel/kallsyms.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/kallsyms.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/kallsyms.c linux-2.6.39.1/kernel/kallsy= ms.c +--- linux-2.6.39.1/kernel/kallsyms.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/kallsyms.c 2011-05-22 19:41:42.000000000 -0400 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table = lookup" * compression (see scripts/kallsyms.c for a more complete descrip= tion) @@ -67786,9 +67852,9 @@ diff -urNp linux-2.6.39/kernel/kallsyms.c linux-2= .6.39/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.39/kernel/kmod.c linux-2.6.39/kernel/kmod.c ---- linux-2.6.39/kernel/kmod.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/kmod.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/kmod.c linux-2.6.39.1/kernel/kmod.c +--- linux-2.6.39.1/kernel/kmod.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/kmod.c 2011-05-22 19:41:42.000000000 -0400 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] =3D "/sb * If module auto-loading support is disabled then this function * becomes a no-operation. @@ -67885,9 +67951,9 @@ diff -urNp linux-2.6.39/kernel/kmod.c linux-2.6.3= 9/kernel/kmod.c EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ =20 -diff -urNp linux-2.6.39/kernel/kprobes.c linux-2.6.39/kernel/kprobes.c ---- linux-2.6.39/kernel/kprobes.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/kprobes.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/kprobes.c linux-2.6.39.1/kernel/kprobes= .c +--- linux-2.6.39.1/kernel/kprobes.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/kprobes.c 2011-05-22 19:36:33.000000000 -0400 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. @@ -67924,9 +67990,9 @@ diff -urNp linux-2.6.39/kernel/kprobes.c linux-2.= 6.39/kernel/kprobes.c =20 head =3D &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.39/kernel/lockdep.c linux-2.6.39/kernel/lockdep.c ---- linux-2.6.39/kernel/lockdep.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/lockdep.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/lockdep.c linux-2.6.39.1/kernel/lockdep= .c +--- linux-2.6.39.1/kernel/lockdep.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/lockdep.c 2011-05-22 19:36:33.000000000 -0400 @@ -571,6 +571,10 @@ static int static_obj(void *obj) end =3D (unsigned long) &_end, addr =3D (unsigned long) obj; @@ -67955,9 +68021,9 @@ diff -urNp linux-2.6.39/kernel/lockdep.c linux-2.= 6.39/kernel/lockdep.c if (very_verbose(class)) { printk("\nacquire class [%p] %s", class->key, class->name); if (class->name_version > 1) -diff -urNp linux-2.6.39/kernel/lockdep_proc.c linux-2.6.39/kernel/lockde= p_proc.c ---- linux-2.6.39/kernel/lockdep_proc.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/kernel/lockdep_proc.c 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/kernel/lockdep_proc.c linux-2.6.39.1/kernel/lo= ckdep_proc.c +--- linux-2.6.39.1/kernel/lockdep_proc.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/kernel/lockdep_proc.c 2011-05-22 19:36:33.000000000 -= 0400 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v =20 static void print_name(struct seq_file *m, struct lock_class *class) @@ -67967,9 +68033,9 @@ diff -urNp linux-2.6.39/kernel/lockdep_proc.c lin= ux-2.6.39/kernel/lockdep_proc.c const char *name =3D class->name; =20 if (!name) { -diff -urNp linux-2.6.39/kernel/module.c linux-2.6.39/kernel/module.c ---- linux-2.6.39/kernel/module.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/module.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/module.c linux-2.6.39.1/kernel/module.c +--- linux-2.6.39.1/kernel/module.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/module.c 2011-05-22 19:41:42.000000000 -0400 @@ -57,6 +57,7 @@ #include #include @@ -68698,9 +68764,9 @@ diff -urNp linux-2.6.39/kernel/module.c linux-2.6= .39/kernel/module.c mod =3D NULL; } return mod; -diff -urNp linux-2.6.39/kernel/mutex.c linux-2.6.39/kernel/mutex.c ---- linux-2.6.39/kernel/mutex.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/mutex.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/mutex.c linux-2.6.39.1/kernel/mutex.c +--- linux-2.6.39.1/kernel/mutex.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/mutex.c 2011-05-22 19:36:33.000000000 -0400 @@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock,=20 */ =20 @@ -68738,9 +68804,9 @@ diff -urNp linux-2.6.39/kernel/mutex.c linux-2.6.= 39/kernel/mutex.c mutex_set_owner(lock); =20 /* set it to 0 if there are no waiters left: */ -diff -urNp linux-2.6.39/kernel/mutex-debug.c linux-2.6.39/kernel/mutex-d= ebug.c ---- linux-2.6.39/kernel/mutex-debug.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/kernel/mutex-debug.c 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/kernel/mutex-debug.c linux-2.6.39.1/kernel/mut= ex-debug.c +--- linux-2.6.39.1/kernel/mutex-debug.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/kernel/mutex-debug.c 2011-05-22 19:36:33.000000000 -0= 400 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute } =20 @@ -68778,9 +68844,9 @@ diff -urNp linux-2.6.39/kernel/mutex-debug.c linu= x-2.6.39/kernel/mutex-debug.c DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); mutex_clear_owner(lock); } -diff -urNp linux-2.6.39/kernel/mutex-debug.h linux-2.6.39/kernel/mutex-d= ebug.h ---- linux-2.6.39/kernel/mutex-debug.h 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/kernel/mutex-debug.h 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/kernel/mutex-debug.h linux-2.6.39.1/kernel/mut= ex-debug.h +--- linux-2.6.39.1/kernel/mutex-debug.h 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/kernel/mutex-debug.h 2011-05-22 19:36:33.000000000 -0= 400 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, @@ -68801,9 +68867,9 @@ diff -urNp linux-2.6.39/kernel/mutex-debug.h linu= x-2.6.39/kernel/mutex-debug.h } =20 static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.39/kernel/mutex.h linux-2.6.39/kernel/mutex.h ---- linux-2.6.39/kernel/mutex.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/mutex.h 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/mutex.h linux-2.6.39.1/kernel/mutex.h +--- linux-2.6.39.1/kernel/mutex.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/mutex.h 2011-05-22 19:36:33.000000000 -0400 @@ -19,7 +19,7 @@ #ifdef CONFIG_SMP static inline void mutex_set_owner(struct mutex *lock) @@ -68813,9 +68879,9 @@ diff -urNp linux-2.6.39/kernel/mutex.h linux-2.6.= 39/kernel/mutex.h } =20 static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.39/kernel/padata.c linux-2.6.39/kernel/padata.c ---- linux-2.6.39/kernel/padata.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/padata.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/padata.c linux-2.6.39.1/kernel/padata.c +--- linux-2.6.39.1/kernel/padata.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/padata.c 2011-05-22 19:36:33.000000000 -0400 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins padata->pd =3D pd; padata->cb_cpu =3D cb_cpu; @@ -68839,9 +68905,9 @@ diff -urNp linux-2.6.39/kernel/padata.c linux-2.6= .39/kernel/padata.c atomic_set(&pd->reorder_objects, 0); atomic_set(&pd->refcnt, 0); pd->pinst =3D pinst; -diff -urNp linux-2.6.39/kernel/panic.c linux-2.6.39/kernel/panic.c ---- linux-2.6.39/kernel/panic.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/panic.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/panic.c linux-2.6.39.1/kernel/panic.c +--- linux-2.6.39.1/kernel/panic.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/panic.c 2011-05-22 19:41:42.000000000 -0400 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c const char *board; =20 @@ -68861,9 +68927,9 @@ diff -urNp linux-2.6.39/kernel/panic.c linux-2.6.= 39/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.39/kernel/params.c linux-2.6.39/kernel/params.c ---- linux-2.6.39/kernel/params.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/params.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/params.c linux-2.6.39.1/kernel/params.c +--- linux-2.6.39.1/kernel/params.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/params.c 2011-05-22 19:36:33.000000000 -0400 @@ -234,7 +234,7 @@ int parse_args(const char *name, { \ return sprintf(buffer, format, *((type *)kp->arg)); \ @@ -68918,9 +68984,9 @@ diff -urNp linux-2.6.39/kernel/params.c linux-2.6= .39/kernel/params.c .set =3D param_set_copystring, .get =3D param_get_string, }; -diff -urNp linux-2.6.39/kernel/perf_event.c linux-2.6.39/kernel/perf_eve= nt.c ---- linux-2.6.39/kernel/perf_event.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/perf_event.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/perf_event.c linux-2.6.39.1/kernel/perf= _event.c +--- linux-2.6.39.1/kernel/perf_event.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/kernel/perf_event.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_ return 0; } @@ -69021,9 +69087,9 @@ diff -urNp linux-2.6.39/kernel/perf_event.c linux= -2.6.39/kernel/perf_event.c &parent_event->child_total_time_running); =20 /* -diff -urNp linux-2.6.39/kernel/pid.c linux-2.6.39/kernel/pid.c ---- linux-2.6.39/kernel/pid.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/pid.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/pid.c linux-2.6.39.1/kernel/pid.c +--- linux-2.6.39.1/kernel/pid.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/pid.c 2011-05-22 19:41:42.000000000 -0400 @@ -33,6 +33,7 @@ #include #include @@ -69058,9 +69124,9 @@ diff -urNp linux-2.6.39/kernel/pid.c linux-2.6.39= /kernel/pid.c } =20 struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.39/kernel/posix-cpu-timers.c linux-2.6.39/kernel/po= six-cpu-timers.c ---- linux-2.6.39/kernel/posix-cpu-timers.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/kernel/posix-cpu-timers.c 2011-05-22 19:41:42.000000000= -0400 +diff -urNp linux-2.6.39.1/kernel/posix-cpu-timers.c linux-2.6.39.1/kerne= l/posix-cpu-timers.c +--- linux-2.6.39.1/kernel/posix-cpu-timers.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/kernel/posix-cpu-timers.c 2011-05-22 19:41:42.0000000= 00 -0400 @@ -6,6 +6,7 @@ #include #include @@ -69095,9 +69161,9 @@ diff -urNp linux-2.6.39/kernel/posix-cpu-timers.c= linux-2.6.39/kernel/posix-cpu- .clock_getres =3D thread_cpu_clock_getres, .clock_get =3D thread_cpu_clock_get, .timer_create =3D thread_cpu_timer_create, -diff -urNp linux-2.6.39/kernel/posix-timers.c linux-2.6.39/kernel/posix-= timers.c ---- linux-2.6.39/kernel/posix-timers.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/kernel/posix-timers.c 2011-05-22 20:13:41.000000000 -04= 00 +diff -urNp linux-2.6.39.1/kernel/posix-timers.c linux-2.6.39.1/kernel/po= six-timers.c +--- linux-2.6.39.1/kernel/posix-timers.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/kernel/posix-timers.c 2011-05-22 20:13:41.000000000 -= 0400 @@ -43,6 +43,7 @@ #include #include @@ -69278,9 +69344,9 @@ diff -urNp linux-2.6.39/kernel/posix-timers.c lin= ux-2.6.39/kernel/posix-timers.c =20 if (WARN_ON_ONCE(!kc || !kc->nsleep_restart)) return -EINVAL; -diff -urNp linux-2.6.39/kernel/power/poweroff.c linux-2.6.39/kernel/powe= r/poweroff.c ---- linux-2.6.39/kernel/power/poweroff.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/kernel/power/poweroff.c 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/kernel/power/poweroff.c linux-2.6.39.1/kernel/= power/poweroff.c +--- linux-2.6.39.1/kernel/power/poweroff.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/kernel/power/poweroff.c 2011-05-22 19:36:33.000000000= -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask =3D SYSRQ_ENABLE_BOOT, }; @@ -69290,9 +69356,9 @@ diff -urNp linux-2.6.39/kernel/power/poweroff.c l= inux-2.6.39/kernel/power/powero { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.39/kernel/power/process.c linux-2.6.39/kernel/power= /process.c ---- linux-2.6.39/kernel/power/process.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/kernel/power/process.c 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/kernel/power/process.c linux-2.6.39.1/kernel/p= ower/process.c +--- linux-2.6.39.1/kernel/power/process.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/kernel/power/process.c 2011-05-22 19:36:33.000000000 = -0400 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_ u64 elapsed_csecs64; unsigned int elapsed_csecs; @@ -69335,9 +69401,9 @@ diff -urNp linux-2.6.39/kernel/power/process.c li= nux-2.6.39/kernel/power/process break; =20 if (pm_wakeup_pending()) { -diff -urNp linux-2.6.39/kernel/printk.c linux-2.6.39/kernel/printk.c ---- linux-2.6.39/kernel/printk.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/printk.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/printk.c linux-2.6.39.1/kernel/printk.c +--- linux-2.6.39.1/kernel/printk.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/printk.c 2011-05-22 19:41:42.000000000 -0400 @@ -284,12 +284,17 @@ static int check_syslog_permissions(int=20 if (from_file && type !=3D SYSLOG_ACTION_OPEN) return 0; @@ -69357,9 +69423,9 @@ diff -urNp linux-2.6.39/kernel/printk.c linux-2.6= .39/kernel/printk.c "but no CAP_SYSLOG (deprecated).\n"); return 0; } -diff -urNp linux-2.6.39/kernel/profile.c linux-2.6.39/kernel/profile.c ---- linux-2.6.39/kernel/profile.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/profile.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/profile.c linux-2.6.39.1/kernel/profile= .c +--- linux-2.6.39.1/kernel/profile.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/profile.c 2011-05-22 19:36:33.000000000 -0400 @@ -39,7 +39,7 @@ struct profile_hit { /* Oprofile timer tick hook */ static int (*timer_hook)(struct pt_regs *) __read_mostly; @@ -69417,9 +69483,9 @@ diff -urNp linux-2.6.39/kernel/profile.c linux-2.= 6.39/kernel/profile.c return count; } =20 -diff -urNp linux-2.6.39/kernel/ptrace.c linux-2.6.39/kernel/ptrace.c ---- linux-2.6.39/kernel/ptrace.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/ptrace.c 2011-05-23 17:07:00.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/ptrace.c linux-2.6.39.1/kernel/ptrace.c +--- linux-2.6.39.1/kernel/ptrace.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/ptrace.c 2011-05-23 17:07:00.000000000 -0400 @@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -69591,9 +69657,9 @@ diff -urNp linux-2.6.39/kernel/ptrace.c linux-2.6= .39/kernel/ptrace.c goto out_put_task_struct; } =20 -diff -urNp linux-2.6.39/kernel/rcutorture.c linux-2.6.39/kernel/rcutortu= re.c ---- linux-2.6.39/kernel/rcutorture.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/rcutorture.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/rcutorture.c linux-2.6.39.1/kernel/rcut= orture.c +--- linux-2.6.39.1/kernel/rcutorture.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/kernel/rcutorture.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_ { 0 }; static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batc= h) =3D @@ -69758,9 +69824,9 @@ diff -urNp linux-2.6.39/kernel/rcutorture.c linux= -2.6.39/kernel/rcutorture.c for_each_possible_cpu(cpu) { for (i =3D 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { per_cpu(rcu_torture_count, cpu)[i] =3D 0; -diff -urNp linux-2.6.39/kernel/rcutree.c linux-2.6.39/kernel/rcutree.c ---- linux-2.6.39/kernel/rcutree.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/rcutree.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/rcutree.c linux-2.6.39.1/kernel/rcutree= .c +--- linux-2.6.39.1/kernel/rcutree.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/rcutree.c 2011-05-22 19:36:33.000000000 -0400 @@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -69770,9 +69836,9 @@ diff -urNp linux-2.6.39/kernel/rcutree.c linux-2.= 6.39/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.39/kernel/rcutree_plugin.h linux-2.6.39/kernel/rcut= ree_plugin.h ---- linux-2.6.39/kernel/rcutree_plugin.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/kernel/rcutree_plugin.h 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/kernel/rcutree_plugin.h linux-2.6.39.1/kernel/= rcutree_plugin.h +--- linux-2.6.39.1/kernel/rcutree_plugin.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/kernel/rcutree_plugin.h 2011-05-22 19:36:33.000000000= -0400 @@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void) =20 /* Clean up and exit. */ @@ -69835,9 +69901,9 @@ diff -urNp linux-2.6.39/kernel/rcutree_plugin.h l= inux-2.6.39/kernel/rcutree_plug =20 put_online_cpus(); } -diff -urNp linux-2.6.39/kernel/relay.c linux-2.6.39/kernel/relay.c ---- linux-2.6.39/kernel/relay.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/relay.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/relay.c linux-2.6.39.1/kernel/relay.c +--- linux-2.6.39.1/kernel/relay.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/relay.c 2011-05-22 19:36:33.000000000 -0400 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc }; ssize_t ret; @@ -69847,9 +69913,9 @@ diff -urNp linux-2.6.39/kernel/relay.c linux-2.6.= 39/kernel/relay.c if (rbuf->subbufs_produced =3D=3D rbuf->subbufs_consumed) return 0; if (splice_grow_spd(pipe, &spd)) -diff -urNp linux-2.6.39/kernel/resource.c linux-2.6.39/kernel/resource.c ---- linux-2.6.39/kernel/resource.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/resource.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/resource.c linux-2.6.39.1/kernel/resour= ce.c +--- linux-2.6.39.1/kernel/resource.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/resource.c 2011-05-22 19:41:42.000000000 -0400 @@ -133,8 +133,18 @@ static const struct file_operations proc =20 static int __init ioresources_init(void) @@ -69869,9 +69935,9 @@ diff -urNp linux-2.6.39/kernel/resource.c linux-2= .6.39/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.39/kernel/rtmutex-tester.c linux-2.6.39/kernel/rtmu= tex-tester.c ---- linux-2.6.39/kernel/rtmutex-tester.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/kernel/rtmutex-tester.c 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/kernel/rtmutex-tester.c linux-2.6.39.1/kernel/= rtmutex-tester.c +--- linux-2.6.39.1/kernel/rtmutex-tester.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/kernel/rtmutex-tester.c 2011-05-22 19:36:33.000000000= -0400 @@ -20,7 +20,7 @@ #define MAX_RT_TEST_MUTEXES 8 =20 @@ -69962,9 +70028,9 @@ diff -urNp linux-2.6.39/kernel/rtmutex-tester.c l= inux-2.6.39/kernel/rtmutex-test return; =20 default: -diff -urNp linux-2.6.39/kernel/sched_autogroup.c linux-2.6.39/kernel/sch= ed_autogroup.c ---- linux-2.6.39/kernel/sched_autogroup.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/kernel/sched_autogroup.c 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/kernel/sched_autogroup.c linux-2.6.39.1/kernel= /sched_autogroup.c +--- linux-2.6.39.1/kernel/sched_autogroup.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/kernel/sched_autogroup.c 2011-05-22 19:36:33.00000000= 0 -0400 @@ -7,7 +7,7 @@ =20 unsigned int __read_mostly sysctl_sched_autogroup_enabled =3D 1; @@ -69983,9 +70049,9 @@ diff -urNp linux-2.6.39/kernel/sched_autogroup.c = linux-2.6.39/kernel/sched_autog ag->tg =3D tg; #ifdef CONFIG_RT_GROUP_SCHED /* -diff -urNp linux-2.6.39/kernel/sched.c linux-2.6.39/kernel/sched.c ---- linux-2.6.39/kernel/sched.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/sched.c 2011-05-23 17:07:00.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/sched.c linux-2.6.39.1/kernel/sched.c +--- linux-2.6.39.1/kernel/sched.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/sched.c 2011-05-23 17:07:00.000000000 -0400 @@ -4078,6 +4078,8 @@ asmlinkage void __sched schedule(void) struct rq *rq; int cpu; @@ -70062,9 +70128,9 @@ diff -urNp linux-2.6.39/kernel/sched.c linux-2.6.= 39/kernel/sched.c =20 if (cpu !=3D group_first_cpu(sd->groups)) return; -diff -urNp linux-2.6.39/kernel/sched_fair.c linux-2.6.39/kernel/sched_fa= ir.c ---- linux-2.6.39/kernel/sched_fair.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/sched_fair.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/sched_fair.c linux-2.6.39.1/kernel/sche= d_fair.c +--- linux-2.6.39.1/kernel/sched_fair.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/kernel/sched_fair.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -3999,7 +3999,7 @@ static void nohz_idle_balance(int this_c * run_rebalance_domains is triggered when needed from the scheduler ti= ck. * Also triggered for nohz idle balancing (with nohz_balancing_kick set= ). @@ -70074,9 +70140,9 @@ diff -urNp linux-2.6.39/kernel/sched_fair.c linux= -2.6.39/kernel/sched_fair.c { int this_cpu =3D smp_processor_id(); struct rq *this_rq =3D cpu_rq(this_cpu); -diff -urNp linux-2.6.39/kernel/signal.c linux-2.6.39/kernel/signal.c ---- linux-2.6.39/kernel/signal.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/signal.c 2011-05-23 17:07:00.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/signal.c linux-2.6.39.1/kernel/signal.c +--- linux-2.6.39.1/kernel/signal.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/signal.c 2011-05-23 17:07:00.000000000 -0400 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache =20 int print_fatal_signals __read_mostly; @@ -70188,9 +70254,9 @@ diff -urNp linux-2.6.39/kernel/signal.c linux-2.6= .39/kernel/signal.c BUG_ON((exit_code & (0x7f | ~0xffff)) !=3D SIGTRAP); =20 memset(&info, 0, sizeof info); -diff -urNp linux-2.6.39/kernel/smp.c linux-2.6.39/kernel/smp.c ---- linux-2.6.39/kernel/smp.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/smp.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/smp.c linux-2.6.39.1/kernel/smp.c +--- linux-2.6.39.1/kernel/smp.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/smp.c 2011-05-22 19:36:33.000000000 -0400 @@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu } EXPORT_SYMBOL(smp_call_function); @@ -70218,9 +70284,9 @@ diff -urNp linux-2.6.39/kernel/smp.c linux-2.6.39= /kernel/smp.c { raw_spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.39/kernel/softirq.c linux-2.6.39/kernel/softirq.c ---- linux-2.6.39/kernel/softirq.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/softirq.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/softirq.c linux-2.6.39.1/kernel/softirq= .c +--- linux-2.6.39.1/kernel/softirq.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/softirq.c 2011-05-22 19:36:33.000000000 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec =20 DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -70275,9 +70341,9 @@ diff -urNp linux-2.6.39/kernel/softirq.c linux-2.= 6.39/kernel/softirq.c { struct tasklet_struct *list; =20 -diff -urNp linux-2.6.39/kernel/sys.c linux-2.6.39/kernel/sys.c ---- linux-2.6.39/kernel/sys.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/sys.c 2011-05-22 21:08:10.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/sys.c linux-2.6.39.1/kernel/sys.c +--- linux-2.6.39.1/kernel/sys.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/sys.c 2011-05-22 21:08:10.000000000 -0400 @@ -154,6 +154,12 @@ static int set_one_prio(struct task_stru error =3D -EACCES; goto out; @@ -70399,9 +70465,9 @@ diff -urNp linux-2.6.39/kernel/sys.c linux-2.6.39= /kernel/sys.c error =3D -EINVAL; break; } -diff -urNp linux-2.6.39/kernel/sysctl.c linux-2.6.39/kernel/sysctl.c ---- linux-2.6.39/kernel/sysctl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/sysctl.c 2011-05-22 20:23:10.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/sysctl.c linux-2.6.39.1/kernel/sysctl.c +--- linux-2.6.39.1/kernel/sysctl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/sysctl.c 2011-05-22 20:23:10.000000000 -0400 @@ -84,6 +84,13 @@ =20 =20 @@ -70591,9 +70657,9 @@ diff -urNp linux-2.6.39/kernel/sysctl.c linux-2.6= .39/kernel/sysctl.c EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); EXPORT_SYMBOL(register_sysctl_table); -diff -urNp linux-2.6.39/kernel/sysctl_check.c linux-2.6.39/kernel/sysctl= _check.c ---- linux-2.6.39/kernel/sysctl_check.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/kernel/sysctl_check.c 2011-05-22 19:41:42.000000000 -04= 00 +diff -urNp linux-2.6.39.1/kernel/sysctl_check.c linux-2.6.39.1/kernel/sy= sctl_check.c +--- linux-2.6.39.1/kernel/sysctl_check.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/kernel/sysctl_check.c 2011-05-22 19:41:42.000000000 -= 0400 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n set_fail(&fail, table, "Directory with extra2"); } else { @@ -70602,9 +70668,9 @@ diff -urNp linux-2.6.39/kernel/sysctl_check.c lin= ux-2.6.39/kernel/sysctl_check.c (table->proc_handler =3D=3D proc_dointvec) || (table->proc_handler =3D=3D proc_dointvec_minmax) || (table->proc_handler =3D=3D proc_dointvec_jiffies) || -diff -urNp linux-2.6.39/kernel/taskstats.c linux-2.6.39/kernel/taskstats= .c ---- linux-2.6.39/kernel/taskstats.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/taskstats.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/taskstats.c linux-2.6.39.1/kernel/tasks= tats.c +--- linux-2.6.39.1/kernel/taskstats.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/kernel/taskstats.c 2011-05-22 19:41:42.000000000 -040= 0 @@ -27,9 +27,12 @@ #include #include @@ -70628,9 +70694,9 @@ diff -urNp linux-2.6.39/kernel/taskstats.c linux-= 2.6.39/kernel/taskstats.c if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK]) return cmd_attr_register_cpumask(info); else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) -diff -urNp linux-2.6.39/kernel/time/posix-clock.c linux-2.6.39/kernel/ti= me/posix-clock.c ---- linux-2.6.39/kernel/time/posix-clock.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/kernel/time/posix-clock.c 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/kernel/time/posix-clock.c linux-2.6.39.1/kerne= l/time/posix-clock.c +--- linux-2.6.39.1/kernel/time/posix-clock.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/kernel/time/posix-clock.c 2011-05-22 19:36:33.0000000= 00 -0400 @@ -433,7 +433,7 @@ static int pc_timer_settime(struct k_iti return err; } @@ -70640,9 +70706,9 @@ diff -urNp linux-2.6.39/kernel/time/posix-clock.c= linux-2.6.39/kernel/time/posix .clock_getres =3D pc_clock_getres, .clock_set =3D pc_clock_settime, .clock_get =3D pc_clock_gettime, -diff -urNp linux-2.6.39/kernel/time/tick-broadcast.c linux-2.6.39/kernel= /time/tick-broadcast.c ---- linux-2.6.39/kernel/time/tick-broadcast.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/kernel/time/tick-broadcast.c 2011-05-22 19:36:33.000000= 000 -0400 +diff -urNp linux-2.6.39.1/kernel/time/tick-broadcast.c linux-2.6.39.1/ke= rnel/time/tick-broadcast.c +--- linux-2.6.39.1/kernel/time/tick-broadcast.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/kernel/time/tick-broadcast.c 2011-05-22 19:36:33.0000= 00000 -0400 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -70652,9 +70718,9 @@ diff -urNp linux-2.6.39/kernel/time/tick-broadcas= t.c linux-2.6.39/kernel/time/ti =20 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.39/kernel/time/timekeeping.c linux-2.6.39/kernel/ti= me/timekeeping.c ---- linux-2.6.39/kernel/time/timekeeping.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/kernel/time/timekeeping.c 2011-05-22 20:40:50.000000000= -0400 +diff -urNp linux-2.6.39.1/kernel/time/timekeeping.c linux-2.6.39.1/kerne= l/time/timekeeping.c +--- linux-2.6.39.1/kernel/time/timekeeping.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/kernel/time/timekeeping.c 2011-05-22 20:40:50.0000000= 00 -0400 @@ -14,6 +14,7 @@ #include #include @@ -70672,9 +70738,9 @@ diff -urNp linux-2.6.39/kernel/time/timekeeping.c= linux-2.6.39/kernel/time/timek write_seqlock_irqsave(&xtime_lock, flags); =20 timekeeping_forward_now(); -diff -urNp linux-2.6.39/kernel/time/timer_list.c linux-2.6.39/kernel/tim= e/timer_list.c ---- linux-2.6.39/kernel/time/timer_list.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/kernel/time/timer_list.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/kernel/time/timer_list.c linux-2.6.39.1/kernel= /time/timer_list.c +--- linux-2.6.39.1/kernel/time/timer_list.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/kernel/time/timer_list.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, =20 static void print_name_offset(struct seq_file *m, void *sym) @@ -70716,9 +70782,9 @@ diff -urNp linux-2.6.39/kernel/time/timer_list.c = linux-2.6.39/kernel/time/timer_ if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.39/kernel/time/timer_stats.c linux-2.6.39/kernel/ti= me/timer_stats.c ---- linux-2.6.39/kernel/time/timer_stats.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/kernel/time/timer_stats.c 2011-05-22 19:41:42.000000000= -0400 +diff -urNp linux-2.6.39.1/kernel/time/timer_stats.c linux-2.6.39.1/kerne= l/time/timer_stats.c +--- linux-2.6.39.1/kernel/time/timer_stats.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/kernel/time/timer_stats.c 2011-05-22 19:41:42.0000000= 00 -0400 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop; static unsigned long nr_entries; static struct entry entries[MAX_ENTRIES]; @@ -70787,9 +70853,9 @@ diff -urNp linux-2.6.39/kernel/time/timer_stats.c= linux-2.6.39/kernel/time/timer if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.39/kernel/time.c linux-2.6.39/kernel/time.c ---- linux-2.6.39/kernel/time.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/time.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/time.c linux-2.6.39.1/kernel/time.c +--- linux-2.6.39.1/kernel/time.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/time.c 2011-05-22 19:41:42.000000000 -0400 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim return error; =20 @@ -70802,9 +70868,9 @@ diff -urNp linux-2.6.39/kernel/time.c linux-2.6.3= 9/kernel/time.c /* SMP safe, global irq locking makes it work. */ sys_tz =3D *tz; update_vsyscall_tz(); -diff -urNp linux-2.6.39/kernel/timer.c linux-2.6.39/kernel/timer.c ---- linux-2.6.39/kernel/timer.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/kernel/timer.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/kernel/timer.c linux-2.6.39.1/kernel/timer.c +--- linux-2.6.39.1/kernel/timer.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/kernel/timer.c 2011-05-22 19:36:33.000000000 -0400 @@ -1305,7 +1305,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -70814,9 +70880,9 @@ diff -urNp linux-2.6.39/kernel/timer.c linux-2.6.= 39/kernel/timer.c { struct tvec_base *base =3D __this_cpu_read(tvec_bases); =20 -diff -urNp linux-2.6.39/kernel/trace/blktrace.c linux-2.6.39/kernel/trac= e/blktrace.c ---- linux-2.6.39/kernel/trace/blktrace.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/kernel/trace/blktrace.c 2011-05-22 19:36:33.000000000 -= 0400 +diff -urNp linux-2.6.39.1/kernel/trace/blktrace.c linux-2.6.39.1/kernel/= trace/blktrace.c +--- linux-2.6.39.1/kernel/trace/blktrace.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/kernel/trace/blktrace.c 2011-05-22 19:36:33.000000000= -0400 @@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f struct blk_trace *bt =3D filp->private_data; char buf[16]; @@ -70844,9 +70910,9 @@ diff -urNp linux-2.6.39/kernel/trace/blktrace.c l= inux-2.6.39/kernel/trace/blktra =20 ret =3D -EIO; bt->dropped_file =3D debugfs_create_file("dropped", 0444, dir, bt, -diff -urNp linux-2.6.39/kernel/trace/ftrace.c linux-2.6.39/kernel/trace/= ftrace.c ---- linux-2.6.39/kernel/trace/ftrace.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/kernel/trace/ftrace.c 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/kernel/trace/ftrace.c linux-2.6.39.1/kernel/tr= ace/ftrace.c +--- linux-2.6.39.1/kernel/trace/ftrace.c 2011-06-03 00:04:14.000000000 -= 0400 ++++ linux-2.6.39.1/kernel/trace/ftrace.c 2011-06-03 00:32:08.000000000 -= 0400 @@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod,=20 =20 ip =3D rec->ip; @@ -70895,9 +70961,9 @@ diff -urNp linux-2.6.39/kernel/trace/ftrace.c lin= ux-2.6.39/kernel/trace/ftrace.c { __unregister_ftrace_function_probe(glob, ops, NULL, PROBE_TEST_FUNC); } -diff -urNp linux-2.6.39/kernel/trace/trace.c linux-2.6.39/kernel/trace/t= race.c ---- linux-2.6.39/kernel/trace/trace.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/kernel/trace/trace.c 2011-05-22 19:36:33.000000000 -040= 0 +diff -urNp linux-2.6.39.1/kernel/trace/trace.c linux-2.6.39.1/kernel/tra= ce/trace.c +--- linux-2.6.39.1/kernel/trace/trace.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/kernel/trace/trace.c 2011-05-22 19:36:33.000000000 -0= 400 @@ -3330,6 +3330,8 @@ static ssize_t tracing_splice_read_pipe( size_t rem; unsigned int i; @@ -70940,9 +71006,9 @@ diff -urNp linux-2.6.39/kernel/trace/trace.c linu= x-2.6.39/kernel/trace/trace.c static int once; struct dentry *d_tracer; =20 -diff -urNp linux-2.6.39/kernel/trace/trace_events.c linux-2.6.39/kernel/= trace/trace_events.c ---- linux-2.6.39/kernel/trace/trace_events.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/kernel/trace/trace_events.c 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/kernel/trace/trace_events.c linux-2.6.39.1/ker= nel/trace/trace_events.c +--- linux-2.6.39.1/kernel/trace/trace_events.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/kernel/trace/trace_events.c 2011-05-22 19:36:33.00000= 0000 -0400 @@ -1241,10 +1241,10 @@ static LIST_HEAD(ftrace_module_file_list struct ftrace_module_file_ops { struct list_head list; @@ -70958,9 +71024,9 @@ diff -urNp linux-2.6.39/kernel/trace/trace_events= .c linux-2.6.39/kernel/trace/tr }; =20 static struct ftrace_module_file_ops * -diff -urNp linux-2.6.39/kernel/trace/trace_functions.c linux-2.6.39/kern= el/trace/trace_functions.c ---- linux-2.6.39/kernel/trace/trace_functions.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/kernel/trace/trace_functions.c 2011-05-22 19:36:33.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/kernel/trace/trace_functions.c linux-2.6.39.1/= kernel/trace/trace_functions.c +--- linux-2.6.39.1/kernel/trace/trace_functions.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/kernel/trace/trace_functions.c 2011-05-22 19:36:33.00= 0000000 -0400 @@ -308,7 +308,7 @@ ftrace_trace_onoff_print(struct seq_file static int ftrace_trace_onoff_unreg(char *glob, char *cmd, char *param) @@ -70970,9 +71036,9 @@ diff -urNp linux-2.6.39/kernel/trace/trace_functi= ons.c linux-2.6.39/kernel/trace =20 /* we register both traceon and traceoff to this callback */ if (strcmp(cmd, "traceon") =3D=3D 0) -diff -urNp linux-2.6.39/kernel/trace/trace_mmiotrace.c linux-2.6.39/kern= el/trace/trace_mmiotrace.c ---- linux-2.6.39/kernel/trace/trace_mmiotrace.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/kernel/trace/trace_mmiotrace.c 2011-05-22 19:36:33.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/kernel/trace/trace_mmiotrace.c linux-2.6.39.1/= kernel/trace/trace_mmiotrace.c +--- linux-2.6.39.1/kernel/trace/trace_mmiotrace.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/kernel/trace/trace_mmiotrace.c 2011-05-22 19:36:33.00= 0000000 -0400 @@ -24,7 +24,7 @@ struct header_iter { static struct trace_array *mmio_trace_array; static bool overrun_detected; @@ -71009,9 +71075,9 @@ diff -urNp linux-2.6.39/kernel/trace/trace_mmiotr= ace.c linux-2.6.39/kernel/trace return; } entry =3D ring_buffer_event_data(event); -diff -urNp linux-2.6.39/kernel/trace/trace_output.c linux-2.6.39/kernel/= trace/trace_output.c ---- linux-2.6.39/kernel/trace/trace_output.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/kernel/trace/trace_output.c 2011-05-22 19:36:33.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/kernel/trace/trace_output.c linux-2.6.39.1/ker= nel/trace/trace_output.c +--- linux-2.6.39.1/kernel/trace/trace_output.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/kernel/trace/trace_output.c 2011-05-22 19:36:33.00000= 0000 -0400 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,=20 =20 p =3D d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -71021,9 +71087,9 @@ diff -urNp linux-2.6.39/kernel/trace/trace_output= .c linux-2.6.39/kernel/trace/tr if (p) { s->len =3D p - s->buffer; return 1; -diff -urNp linux-2.6.39/kernel/trace/trace_stack.c linux-2.6.39/kernel/t= race/trace_stack.c ---- linux-2.6.39/kernel/trace/trace_stack.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/kernel/trace/trace_stack.c 2011-05-22 19:36:33.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/kernel/trace/trace_stack.c linux-2.6.39.1/kern= el/trace/trace_stack.c +--- linux-2.6.39.1/kernel/trace/trace_stack.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/kernel/trace/trace_stack.c 2011-05-22 19:36:33.000000= 000 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; =20 @@ -71033,9 +71099,9 @@ diff -urNp linux-2.6.39/kernel/trace/trace_stack.= c linux-2.6.39/kernel/trace/tra return; =20 local_irq_save(flags); -diff -urNp linux-2.6.39/kernel/trace/trace_workqueue.c linux-2.6.39/kern= el/trace/trace_workqueue.c ---- linux-2.6.39/kernel/trace/trace_workqueue.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/kernel/trace/trace_workqueue.c 2011-05-22 19:36:33.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/kernel/trace/trace_workqueue.c linux-2.6.39.1/= kernel/trace/trace_workqueue.c +--- linux-2.6.39.1/kernel/trace/trace_workqueue.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/kernel/trace/trace_workqueue.c 2011-05-22 19:36:33.00= 0000000 -0400 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats { int cpu; pid_t pid; @@ -71063,9 +71129,9 @@ diff -urNp linux-2.6.39/kernel/trace/trace_workqu= eue.c linux-2.6.39/kernel/trace tsk->comm); put_task_struct(tsk); } -diff -urNp linux-2.6.39/lib/bug.c linux-2.6.39/lib/bug.c ---- linux-2.6.39/lib/bug.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/bug.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/bug.c linux-2.6.39.1/lib/bug.c +--- linux-2.6.39.1/lib/bug.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/lib/bug.c 2011-05-22 19:36:33.000000000 -0400 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; =20 @@ -71075,9 +71141,9 @@ diff -urNp linux-2.6.39/lib/bug.c linux-2.6.39/li= b/bug.c =20 file =3D NULL; line =3D 0; -diff -urNp linux-2.6.39/lib/debugobjects.c linux-2.6.39/lib/debugobjects= .c ---- linux-2.6.39/lib/debugobjects.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/debugobjects.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/debugobjects.c linux-2.6.39.1/lib/debugobj= ects.c +--- linux-2.6.39.1/lib/debugobjects.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/lib/debugobjects.c 2011-05-22 19:36:33.000000000 -040= 0 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -71087,9 +71153,9 @@ diff -urNp linux-2.6.39/lib/debugobjects.c linux-= 2.6.39/lib/debugobjects.c if (is_on_stack =3D=3D onstack) return; =20 -diff -urNp linux-2.6.39/lib/dma-debug.c linux-2.6.39/lib/dma-debug.c ---- linux-2.6.39/lib/dma-debug.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/dma-debug.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/dma-debug.c linux-2.6.39.1/lib/dma-debug.c +--- linux-2.6.39.1/lib/dma-debug.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/lib/dma-debug.c 2011-05-22 19:36:33.000000000 -0400 @@ -862,7 +862,7 @@ out: =20 static void check_for_stack(struct device *dev, void *addr) @@ -71099,9 +71165,9 @@ diff -urNp linux-2.6.39/lib/dma-debug.c linux-2.6= .39/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=3D%p]\n", addr); } -diff -urNp linux-2.6.39/lib/inflate.c linux-2.6.39/lib/inflate.c ---- linux-2.6.39/lib/inflate.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/inflate.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/inflate.c linux-2.6.39.1/lib/inflate.c +--- linux-2.6.39.1/lib/inflate.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/lib/inflate.c 2011-05-22 19:36:33.000000000 -0400 @@ -269,7 +269,7 @@ static void free(void *where) malloc_ptr =3D free_mem_ptr; } @@ -71111,9 +71177,9 @@ diff -urNp linux-2.6.39/lib/inflate.c linux-2.6.3= 9/lib/inflate.c #define free(a) kfree(a) #endif =20 -diff -urNp linux-2.6.39/lib/Kconfig.debug linux-2.6.39/lib/Kconfig.debug ---- linux-2.6.39/lib/Kconfig.debug 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/Kconfig.debug 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/Kconfig.debug linux-2.6.39.1/lib/Kconfig.d= ebug +--- linux-2.6.39.1/lib/Kconfig.debug 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/lib/Kconfig.debug 2011-05-22 19:41:42.000000000 -0400 @@ -1078,6 +1078,7 @@ config LATENCYTOP depends on DEBUG_KERNEL depends on STACKTRACE_SUPPORT @@ -71122,9 +71188,9 @@ diff -urNp linux-2.6.39/lib/Kconfig.debug linux-2= .6.39/lib/Kconfig.debug select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE select KALLSYMS select KALLSYMS_ALL -diff -urNp linux-2.6.39/lib/kref.c linux-2.6.39/lib/kref.c ---- linux-2.6.39/lib/kref.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/kref.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/kref.c linux-2.6.39.1/lib/kref.c +--- linux-2.6.39.1/lib/kref.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/lib/kref.c 2011-05-22 19:36:33.000000000 -0400 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref) */ int kref_put(struct kref *kref, void (*release)(struct kref *kref)) @@ -71134,9 +71200,9 @@ diff -urNp linux-2.6.39/lib/kref.c linux-2.6.39/l= ib/kref.c WARN_ON(release =3D=3D (void (*)(struct kref *))kfree); =20 if (atomic_dec_and_test(&kref->refcount)) { -diff -urNp linux-2.6.39/lib/radix-tree.c linux-2.6.39/lib/radix-tree.c ---- linux-2.6.39/lib/radix-tree.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/radix-tree.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/radix-tree.c linux-2.6.39.1/lib/radix-tree= .c +--- linux-2.6.39.1/lib/radix-tree.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/lib/radix-tree.c 2011-05-22 19:36:33.000000000 -0400 @@ -80,7 +80,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -71146,9 +71212,9 @@ diff -urNp linux-2.6.39/lib/radix-tree.c linux-2.= 6.39/lib/radix-tree.c =20 static inline void *ptr_to_indirect(void *ptr) { -diff -urNp linux-2.6.39/lib/vsprintf.c linux-2.6.39/lib/vsprintf.c ---- linux-2.6.39/lib/vsprintf.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/lib/vsprintf.c 2011-05-22 20:54:59.000000000 -0400 +diff -urNp linux-2.6.39.1/lib/vsprintf.c linux-2.6.39.1/lib/vsprintf.c +--- linux-2.6.39.1/lib/vsprintf.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/lib/vsprintf.c 2011-05-22 20:54:59.000000000 -0400 @@ -16,6 +16,9 @@ * - scnprintf and vscnprintf */ @@ -71242,34 +71308,40 @@ diff -urNp linux-2.6.39/lib/vsprintf.c linux-2.= 6.39/lib/vsprintf.c break; } =20 -diff -urNp linux-2.6.39/localversion-grsec linux-2.6.39/localversion-grs= ec ---- linux-2.6.39/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.39/localversion-grsec 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/localversion-grsec linux-2.6.39.1/localversion= -grsec +--- linux-2.6.39.1/localversion-grsec 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.39.1/localversion-grsec 2011-05-22 19:41:42.000000000 -040= 0 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.39/Makefile linux-2.6.39/Makefile ---- linux-2.6.39/Makefile 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/Makefile 2011-05-22 19:41:42.000000000 -0400 -@@ -237,8 +237,8 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" +diff -urNp linux-2.6.39.1/Makefile linux-2.6.39.1/Makefile +--- linux-2.6.39.1/Makefile 2011-06-03 00:04:13.000000000 -0400 ++++ linux-2.6.39.1/Makefile 2011-06-04 17:40:47.000000000 -0400 +@@ -237,8 +237,9 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" =20 HOSTCC =3D gcc HOSTCXX =3D g++ -HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fo= mit-frame-pointer -HOSTCXXFLAGS =3D -O2 -+HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fo= mit-frame-pointer -fno-delete-null-pointer-checks ++HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointe= r -fno-delete-null-pointer-checks ++HOSTCFLAGS +=3D $(call cc-option, -Wno-empty-body) +HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 # Decide whether to build built-in, modular, or both. # Normally, just do built-in. -@@ -356,6 +356,7 @@ LINUXINCLUDE :=3D -I$(srctree)/arch/$(h +@@ -356,10 +357,12 @@ LINUXINCLUDE :=3D -I$(srctree)/arch/$(h KBUILD_CPPFLAGS :=3D -D__KERNEL__ =20 KBUILD_CFLAGS :=3D -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -+ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initia= lizers \ ++ -W -Wno-unused-parameter -Wno-missing-field-initializers \ -fno-strict-aliasing -fno-common \ -Werror-implicit-function-declaration \ -Wno-format-security \ -@@ -685,7 +686,7 @@ export mod_strip_cmd + -fno-delete-null-pointer-checks ++KBUILD_CFLAGS +=3D $(call cc-option, -Wno-empty-body) + KBUILD_AFLAGS_KERNEL :=3D + KBUILD_CFLAGS_KERNEL :=3D + KBUILD_AFLAGS :=3D -D__ASSEMBLY__ +@@ -685,7 +688,7 @@ export mod_strip_cmd =20 =20 ifeq ($(KBUILD_EXTMOD),) @@ -71278,9 +71350,39 @@ diff -urNp linux-2.6.39/Makefile linux-2.6.39/Ma= kefile =20 vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.39/mm/filemap.c linux-2.6.39/mm/filemap.c ---- linux-2.6.39/mm/filemap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/filemap.c 2011-05-22 19:41:42.000000000 -0400 +@@ -931,7 +934,19 @@ include/config/kernel.release: include/c + # version.h and scripts_basic is processed / created. +=20 + # Listed in dependency order +-PHONY +=3D prepare archprepare prepare0 prepare1 prepare2 prepare3 ++PHONY +=3D prepare archprepare prepare0 prepare1 prepare2 prepare3 pax-= plugin ++ ++ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y) ++KBUILD_CFLAGS +=3D $(call cc-ifversion, -ge, 0405, -fplugin=3D$(objtree= )/tools/gcc/pax_plugin.so -fplugin-arg-pax_plugin-track-lowest-sp=3D100) ++endif ++pax-plugin: ++ifneq (,$(findstring pax_plugin, $(KBUILD_CFLAGS))) ++ $(Q)$(MAKE) $(build)=3Dtools/gcc ++else ++ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y) ++ $(Q)echo "warning, your gcc does not support plugins, PAX_MEMORY_STACK= LEAK will be less secure" ++endif ++endif +=20 + # prepare3 is used to check if we are building in a separate output dir= ectory, + # and if so do: +@@ -947,7 +962,7 @@ ifneq ($(KBUILD_SRC),) + endif +=20 + # prepare2 creates a makefile if using a separate output directory +-prepare2: prepare3 outputmakefile ++prepare2: prepare3 outputmakefile pax-plugin +=20 + prepare1: prepare2 include/linux/version.h include/generated/utsrelease= .h \ + include/config/auto.conf +diff -urNp linux-2.6.39.1/mm/filemap.c linux-2.6.39.1/mm/filemap.c +--- linux-2.6.39.1/mm/filemap.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/filemap.c 2011-05-22 19:41:42.000000000 -0400 @@ -1724,7 +1724,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping =3D file->f_mapping; =20 @@ -71298,9 +71400,9 @@ diff -urNp linux-2.6.39/mm/filemap.c linux-2.6.39= /mm/filemap.c if (*pos >=3D limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.39/mm/fremap.c linux-2.6.39/mm/fremap.c ---- linux-2.6.39/mm/fremap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/fremap.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/fremap.c linux-2.6.39.1/mm/fremap.c +--- linux-2.6.39.1/mm/fremap.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/fremap.c 2011-05-22 19:36:33.000000000 -0400 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma =3D find_vma(mm, start); @@ -71322,9 +71424,9 @@ diff -urNp linux-2.6.39/mm/fremap.c linux-2.6.39/= mm/fremap.c munlock_vma_pages_range(vma, start, start + size); vma->vm_flags =3D saved_flags; } -diff -urNp linux-2.6.39/mm/highmem.c linux-2.6.39/mm/highmem.c ---- linux-2.6.39/mm/highmem.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/highmem.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/highmem.c linux-2.6.39.1/mm/highmem.c +--- linux-2.6.39.1/mm/highmem.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/highmem.c 2011-05-22 19:36:33.000000000 -0400 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -71350,9 +71452,9 @@ diff -urNp linux-2.6.39/mm/highmem.c linux-2.6.39= /mm/highmem.c pkmap_count[last_pkmap_nr] =3D 1; set_page_address(page, (void *)vaddr); =20 -diff -urNp linux-2.6.39/mm/huge_memory.c linux-2.6.39/mm/huge_memory.c ---- linux-2.6.39/mm/huge_memory.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/huge_memory.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/huge_memory.c linux-2.6.39.1/mm/huge_memory= .c +--- linux-2.6.39.1/mm/huge_memory.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/huge_memory.c 2011-05-22 19:36:33.000000000 -0400 @@ -702,7 +702,7 @@ out: * run pte_offset_map on the pmd, if an huge pmd could * materialize from under us from a different thread. @@ -71362,9 +71464,9 @@ diff -urNp linux-2.6.39/mm/huge_memory.c linux-2.= 6.39/mm/huge_memory.c return VM_FAULT_OOM; /* if an huge pmd materialized from under us just retry later */ if (unlikely(pmd_trans_huge(*pmd))) -diff -urNp linux-2.6.39/mm/hugetlb.c linux-2.6.39/mm/hugetlb.c ---- linux-2.6.39/mm/hugetlb.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/hugetlb.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/hugetlb.c linux-2.6.39.1/mm/hugetlb.c +--- linux-2.6.39.1/mm/hugetlb.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/hugetlb.c 2011-05-22 19:36:33.000000000 -0400 @@ -2331,6 +2331,27 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -71454,9 +71556,9 @@ diff -urNp linux-2.6.39/mm/hugetlb.c linux-2.6.39= /mm/hugetlb.c ptep =3D huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.39/mm/Kconfig linux-2.6.39/mm/Kconfig ---- linux-2.6.39/mm/Kconfig 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/Kconfig 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/Kconfig linux-2.6.39.1/mm/Kconfig +--- linux-2.6.39.1/mm/Kconfig 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/Kconfig 2011-05-22 19:41:42.000000000 -0400 @@ -240,7 +240,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -71466,9 +71568,9 @@ diff -urNp linux-2.6.39/mm/Kconfig linux-2.6.39/m= m/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.39/mm/kmemleak.c linux-2.6.39/mm/kmemleak.c ---- linux-2.6.39/mm/kmemleak.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/kmemleak.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/kmemleak.c linux-2.6.39.1/mm/kmemleak.c +--- linux-2.6.39.1/mm/kmemleak.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/mm/kmemleak.c 2011-06-03 00:32:08.000000000 -0400 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se =20 for (i =3D 0; i < object->trace_len; i++) { @@ -71478,9 +71580,9 @@ diff -urNp linux-2.6.39/mm/kmemleak.c linux-2.6.3= 9/mm/kmemleak.c } } =20 -diff -urNp linux-2.6.39/mm/maccess.c linux-2.6.39/mm/maccess.c ---- linux-2.6.39/mm/maccess.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/maccess.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/maccess.c linux-2.6.39.1/mm/maccess.c +--- linux-2.6.39.1/mm/maccess.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/maccess.c 2011-05-22 19:36:33.000000000 -0400 @@ -15,10 +15,10 @@ * happens, handle that and return -EFAULT. */ @@ -71507,9 +71609,9 @@ diff -urNp linux-2.6.39/mm/maccess.c linux-2.6.39= /mm/maccess.c { long ret; mm_segment_t old_fs =3D get_fs(); -diff -urNp linux-2.6.39/mm/madvise.c linux-2.6.39/mm/madvise.c ---- linux-2.6.39/mm/madvise.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/madvise.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/madvise.c linux-2.6.39.1/mm/madvise.c +--- linux-2.6.39.1/mm/madvise.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/madvise.c 2011-05-22 19:36:33.000000000 -0400 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags =3D vma->vm_flags; @@ -71586,9 +71688,9 @@ diff -urNp linux-2.6.39/mm/madvise.c linux-2.6.39= /mm/madvise.c error =3D 0; if (end =3D=3D start) goto out; -diff -urNp linux-2.6.39/mm/memory.c linux-2.6.39/mm/memory.c ---- linux-2.6.39/mm/memory.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/memory.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/memory.c linux-2.6.39.1/mm/memory.c +--- linux-2.6.39.1/mm/memory.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/memory.c 2011-05-22 19:36:33.000000000 -0400 @@ -259,8 +259,12 @@ static inline void free_pmd_range(struct return; =20 @@ -72152,9 +72254,9 @@ diff -urNp linux-2.6.39/mm/memory.c linux-2.6.39/= mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.39/mm/memory-failure.c linux-2.6.39/mm/memory-failu= re.c ---- linux-2.6.39/mm/memory-failure.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/memory-failure.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/memory-failure.c linux-2.6.39.1/mm/memory-f= ailure.c +--- linux-2.6.39.1/mm/memory-failure.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/mm/memory-failure.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r =20 int sysctl_memory_failure_recovery __read_mostly =3D 1; @@ -72227,9 +72329,9 @@ diff -urNp linux-2.6.39/mm/memory-failure.c linux= -2.6.39/mm/memory-failure.c SetPageHWPoison(page); /* keep elevated page count for bad page */ return ret; -diff -urNp linux-2.6.39/mm/mempolicy.c linux-2.6.39/mm/mempolicy.c ---- linux-2.6.39/mm/mempolicy.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/mempolicy.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/mempolicy.c linux-2.6.39.1/mm/mempolicy.c +--- linux-2.6.39.1/mm/mempolicy.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/mempolicy.c 2011-05-22 19:41:42.000000000 -0400 @@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct=20 unsigned long vmstart; unsigned long vmend; @@ -72310,9 +72412,9 @@ diff -urNp linux-2.6.39/mm/mempolicy.c linux-2.6.= 39/mm/mempolicy.c } else if (vma->vm_start <=3D mm->brk && vma->vm_end >=3D mm->start_br= k) { seq_printf(m, " heap"); } else if (vma->vm_start <=3D mm->start_stack && -diff -urNp linux-2.6.39/mm/migrate.c linux-2.6.39/mm/migrate.c ---- linux-2.6.39/mm/migrate.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/migrate.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/migrate.c linux-2.6.39.1/mm/migrate.c +--- linux-2.6.39.1/mm/migrate.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/migrate.c 2011-05-22 19:41:42.000000000 -0400 @@ -1133,6 +1133,8 @@ static int do_pages_move(struct mm_struc unsigned long chunk_start; int err; @@ -72347,9 +72449,9 @@ diff -urNp linux-2.6.39/mm/migrate.c linux-2.6.39= /mm/migrate.c rcu_read_unlock(); err =3D -EPERM; goto out; -diff -urNp linux-2.6.39/mm/mlock.c linux-2.6.39/mm/mlock.c ---- linux-2.6.39/mm/mlock.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/mlock.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/mlock.c linux-2.6.39.1/mm/mlock.c +--- linux-2.6.39.1/mm/mlock.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/mlock.c 2011-05-22 19:41:42.000000000 -0400 @@ -13,6 +13,7 @@ #include #include @@ -72424,9 +72526,9 @@ diff -urNp linux-2.6.39/mm/mlock.c linux-2.6.39/m= m/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <=3D lock_limit) = || capable(CAP_IPC_LOCK)) ret =3D do_mlockall(flags); -diff -urNp linux-2.6.39/mm/mmap.c linux-2.6.39/mm/mmap.c ---- linux-2.6.39/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/mmap.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/mmap.c linux-2.6.39.1/mm/mmap.c +--- linux-2.6.39.1/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/mmap.c 2011-05-22 19:41:42.000000000 -0400 @@ -46,6 +46,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -73688,9 +73790,9 @@ diff -urNp linux-2.6.39/mm/mmap.c linux-2.6.39/mm= /mmap.c vma->vm_flags =3D vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); =20 -diff -urNp linux-2.6.39/mm/mprotect.c linux-2.6.39/mm/mprotect.c ---- linux-2.6.39/mm/mprotect.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/mprotect.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/mprotect.c linux-2.6.39.1/mm/mprotect.c +--- linux-2.6.39.1/mm/mprotect.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/mprotect.c 2011-05-22 19:41:42.000000000 -0400 @@ -23,10 +23,16 @@ #include #include @@ -73917,9 +74019,9 @@ diff -urNp linux-2.6.39/mm/mprotect.c linux-2.6.3= 9/mm/mprotect.c nstart =3D tmp; =20 if (nstart < prev->vm_end) -diff -urNp linux-2.6.39/mm/mremap.c linux-2.6.39/mm/mremap.c ---- linux-2.6.39/mm/mremap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/mremap.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/mremap.c linux-2.6.39.1/mm/mremap.c +--- linux-2.6.39.1/mm/mremap.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/mremap.c 2011-05-22 19:36:33.000000000 -0400 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte =3D ptep_clear_flush(vma, old_addr, old_pte); @@ -74024,9 +74126,9 @@ diff -urNp linux-2.6.39/mm/mremap.c linux-2.6.39/= mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.39/mm/nobootmem.c linux-2.6.39/mm/nobootmem.c ---- linux-2.6.39/mm/nobootmem.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/nobootmem.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/nobootmem.c linux-2.6.39.1/mm/nobootmem.c +--- linux-2.6.39.1/mm/nobootmem.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/nobootmem.c 2011-05-22 19:36:33.000000000 -0400 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u unsigned long __init free_all_memory_core_early(int nodeid) { @@ -74060,9 +74162,9 @@ diff -urNp linux-2.6.39/mm/nobootmem.c linux-2.6.= 39/mm/nobootmem.c =20 return count; } -diff -urNp linux-2.6.39/mm/nommu.c linux-2.6.39/mm/nommu.c ---- linux-2.6.39/mm/nommu.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/nommu.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/nommu.c linux-2.6.39.1/mm/nommu.c +--- linux-2.6.39.1/mm/nommu.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/nommu.c 2011-05-22 19:36:33.000000000 -0400 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory =3D OVERCOMMI int sysctl_overcommit_ratio =3D 50; /* default is 50% */ int sysctl_max_map_count =3D DEFAULT_MAX_MAP_COUNT; @@ -74095,9 +74197,9 @@ diff -urNp linux-2.6.39/mm/nommu.c linux-2.6.39/m= m/nommu.c *region =3D *vma->vm_region; new->vm_region =3D region; =20 -diff -urNp linux-2.6.39/mm/page_alloc.c linux-2.6.39/mm/page_alloc.c ---- linux-2.6.39/mm/page_alloc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/page_alloc.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/page_alloc.c linux-2.6.39.1/mm/page_alloc.c +--- linux-2.6.39.1/mm/page_alloc.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/mm/page_alloc.c 2011-06-03 00:32:08.000000000 -0400 @@ -650,6 +650,10 @@ static bool free_pages_prepare(struct pa int i; int bad =3D 0; @@ -74142,9 +74244,9 @@ diff -urNp linux-2.6.39/mm/page_alloc.c linux-2.6= .39/mm/page_alloc.c for_each_populated_zone(zone) { if (skip_free_areas_zone(filter, zone)) continue; -diff -urNp linux-2.6.39/mm/percpu.c linux-2.6.39/mm/percpu.c ---- linux-2.6.39/mm/percpu.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/percpu.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/percpu.c linux-2.6.39.1/mm/percpu.c +--- linux-2.6.39.1/mm/percpu.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/percpu.c 2011-05-22 19:36:33.000000000 -0400 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu=20 static unsigned int pcpu_last_unit_cpu __read_mostly; =20 @@ -74154,9 +74256,9 @@ diff -urNp linux-2.6.39/mm/percpu.c linux-2.6.39/= mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); =20 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.39/mm/rmap.c linux-2.6.39/mm/rmap.c ---- linux-2.6.39/mm/rmap.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/rmap.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/rmap.c linux-2.6.39.1/mm/rmap.c +--- linux-2.6.39.1/mm/rmap.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/rmap.c 2011-05-22 19:36:33.000000000 -0400 @@ -131,6 +131,10 @@ int anon_vma_prepare(struct vm_area_stru struct anon_vma *anon_vma =3D vma->anon_vma; struct anon_vma_chain *avc; @@ -74246,9 +74348,9 @@ diff -urNp linux-2.6.39/mm/rmap.c linux-2.6.39/mm= /rmap.c { struct anon_vma_chain *avc; struct anon_vma *anon_vma; -diff -urNp linux-2.6.39/mm/shmem.c linux-2.6.39/mm/shmem.c ---- linux-2.6.39/mm/shmem.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/shmem.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/shmem.c linux-2.6.39.1/mm/shmem.c +--- linux-2.6.39.1/mm/shmem.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/mm/shmem.c 2011-06-03 00:32:08.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -74258,7 +74360,7 @@ diff -urNp linux-2.6.39/mm/shmem.c linux-2.6.39/m= m/shmem.c =20 #ifdef CONFIG_SHMEM /* -@@ -1086,6 +1086,8 @@ static int shmem_writepage(struct page * +@@ -1087,6 +1087,8 @@ static int shmem_writepage(struct page * goto unlock; } entry =3D shmem_swp_entry(info, index, NULL); @@ -74267,7 +74369,7 @@ diff -urNp linux-2.6.39/mm/shmem.c linux-2.6.39/m= m/shmem.c if (entry->val) { /* * The more uptodate page coming down from a stacked -@@ -1157,6 +1159,8 @@ static struct page *shmem_swapin(swp_ent +@@ -1158,6 +1160,8 @@ static struct page *shmem_swapin(swp_ent struct vm_area_struct pvma; struct page *page; =20 @@ -74276,7 +74378,7 @@ diff -urNp linux-2.6.39/mm/shmem.c linux-2.6.39/m= m/shmem.c spol =3D mpol_cond_copy(&mpol, mpol_shared_policy_lookup(&info->policy, idx)); =20 -@@ -2013,7 +2017,7 @@ static int shmem_symlink(struct inode *d +@@ -2014,7 +2018,7 @@ static int shmem_symlink(struct inode *d =20 info =3D SHMEM_I(inode); inode->i_size =3D len-1; @@ -74285,7 +74387,7 @@ diff -urNp linux-2.6.39/mm/shmem.c linux-2.6.39/m= m/shmem.c /* do it inline */ memcpy(info, symname, len); inode->i_op =3D &shmem_symlink_inline_operations; -@@ -2361,8 +2365,7 @@ int shmem_fill_super(struct super_block=20 +@@ -2362,8 +2366,7 @@ int shmem_fill_super(struct super_block=20 int err =3D -ENOMEM; =20 /* Round up to L1_CACHE_BYTES to resist false sharing */ @@ -74295,9 +74397,9 @@ diff -urNp linux-2.6.39/mm/shmem.c linux-2.6.39/m= m/shmem.c if (!sbinfo) return -ENOMEM; =20 -diff -urNp linux-2.6.39/mm/slab.c linux-2.6.39/mm/slab.c ---- linux-2.6.39/mm/slab.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/slab.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/slab.c linux-2.6.39.1/mm/slab.c +--- linux-2.6.39.1/mm/slab.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/slab.c 2011-05-22 19:41:42.000000000 -0400 @@ -150,7 +150,7 @@ =20 /* Legal flag mask for kmem_cache_create(). */ @@ -74469,9 +74571,9 @@ diff -urNp linux-2.6.39/mm/slab.c linux-2.6.39/mm= /slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.39/mm/slob.c linux-2.6.39/mm/slob.c ---- linux-2.6.39/mm/slob.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/slob.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/slob.c linux-2.6.39.1/mm/slob.c +--- linux-2.6.39.1/mm/slob.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/slob.c 2011-05-22 19:36:33.000000000 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * alloc_pages() directly, allocating compound pages so the page order @@ -74788,10 +74890,10 @@ diff -urNp linux-2.6.39/mm/slob.c linux-2.6.39/= mm/slob.c } =20 trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm/slub.c ---- linux-2.6.39/mm/slub.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/slub.c 2011-05-22 19:41:42.000000000 -0400 -@@ -419,7 +419,7 @@ static void print_track(const char *s, s +diff -urNp linux-2.6.39.1/mm/slub.c linux-2.6.39.1/mm/slub.c +--- linux-2.6.39.1/mm/slub.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/mm/slub.c 2011-06-03 00:32:08.000000000 -0400 +@@ -431,7 +431,7 @@ static void print_track(const char *s, s if (!t->addr) return; =20 @@ -74800,7 +74902,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid); } =20 -@@ -2171,6 +2171,8 @@ void kmem_cache_free(struct kmem_cache * +@@ -2183,6 +2183,8 @@ void kmem_cache_free(struct kmem_cache * =20 page =3D virt_to_head_page(x); =20 @@ -74809,7 +74911,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c slab_free(s, page, x, _RET_IP_); =20 trace_kmem_cache_free(_RET_IP_, x); -@@ -2204,7 +2206,7 @@ static int slub_min_objects; +@@ -2216,7 +2218,7 @@ static int slub_min_objects; * Merge control. If this is set then no merging of slab caches will oc= cur. * (Could be removed. This was introduced to pacify the merge skeptics.= ) */ @@ -74818,7 +74920,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c =20 /* * Calculate the order of allocation given an slab object size. -@@ -2632,7 +2634,7 @@ static int kmem_cache_open(struct kmem_c +@@ -2644,7 +2646,7 @@ static int kmem_cache_open(struct kmem_c * list to avoid pounding the page allocator excessively. */ set_min_partial(s, ilog2(s->size)); @@ -74827,7 +74929,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c #ifdef CONFIG_NUMA s->remote_node_defrag_ratio =3D 1000; #endif -@@ -2738,8 +2740,7 @@ static inline int kmem_cache_close(struc +@@ -2750,8 +2752,7 @@ static inline int kmem_cache_close(struc void kmem_cache_destroy(struct kmem_cache *s) { down_write(&slub_lock); @@ -74837,7 +74939,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c list_del(&s->list); if (kmem_cache_close(s)) { printk(KERN_ERR "SLUB %s: %s called for cache that " -@@ -2949,6 +2950,46 @@ void *__kmalloc_node(size_t size, gfp_t=20 +@@ -2961,6 +2962,46 @@ void *__kmalloc_node(size_t size, gfp_t=20 EXPORT_SYMBOL(__kmalloc_node); #endif =20 @@ -74884,7 +74986,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c size_t ksize(const void *object) { struct page *page; -@@ -3193,7 +3234,7 @@ static void __init kmem_cache_bootstrap_ +@@ -3205,7 +3246,7 @@ static void __init kmem_cache_bootstrap_ int node; =20 list_add(&s->list, &slab_caches); @@ -74893,7 +74995,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c =20 for_each_node_state(node, N_NORMAL_MEMORY) { struct kmem_cache_node *n =3D get_node(s, node); -@@ -3310,17 +3351,17 @@ void __init kmem_cache_init(void) +@@ -3322,17 +3363,17 @@ void __init kmem_cache_init(void) =20 /* Caches that are not of the two-to-the-power-of size */ if (KMALLOC_MIN_SIZE <=3D 32) { @@ -74914,7 +75016,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c caches++; } =20 -@@ -3388,7 +3429,7 @@ static int slab_unmergeable(struct kmem_ +@@ -3400,7 +3441,7 @@ static int slab_unmergeable(struct kmem_ /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -74923,7 +75025,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c return 1; =20 return 0; -@@ -3447,7 +3488,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3459,7 +3500,7 @@ struct kmem_cache *kmem_cache_create(con down_write(&slub_lock); s =3D find_mergeable(size, align, flags, name, ctor); if (s) { @@ -74932,7 +75034,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3456,7 +3497,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3468,7 +3509,7 @@ struct kmem_cache *kmem_cache_create(con s->inuse =3D max_t(int, s->inuse, ALIGN(size, sizeof(void *))); =20 if (sysfs_slab_alias(s, name)) { @@ -74941,7 +75043,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c goto err; } up_write(&slub_lock); -@@ -4189,7 +4230,7 @@ SLAB_ATTR_RO(ctor); +@@ -4201,7 +4242,7 @@ SLAB_ATTR_RO(ctor); =20 static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -74950,7 +75052,7 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c } SLAB_ATTR_RO(aliases); =20 -@@ -4933,7 +4974,13 @@ static const struct file_operations proc +@@ -4945,7 +4986,13 @@ static const struct file_operations proc =20 static int __init slab_proc_init(void) { @@ -74965,9 +75067,9 @@ diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm= /slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.39/mm/swapfile.c linux-2.6.39/mm/swapfile.c ---- linux-2.6.39/mm/swapfile.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/swapfile.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/swapfile.c linux-2.6.39.1/mm/swapfile.c +--- linux-2.6.39.1/mm/swapfile.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/swapfile.c 2011-05-22 19:36:33.000000000 -0400 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex); =20 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait); @@ -75015,9 +75117,9 @@ diff -urNp linux-2.6.39/mm/swapfile.c linux-2.6.3= 9/mm/swapfile.c wake_up_interruptible(&proc_poll_wait); =20 if (S_ISREG(inode->i_mode)) -diff -urNp linux-2.6.39/mm/util.c linux-2.6.39/mm/util.c ---- linux-2.6.39/mm/util.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/util.c 2011-05-23 17:07:00.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/util.c linux-2.6.39.1/mm/util.c +--- linux-2.6.39.1/mm/util.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/util.c 2011-05-23 17:07:00.000000000 -0400 @@ -112,6 +112,7 @@ EXPORT_SYMBOL(memdup_user); * allocated buffer. Use this if you don't want to free the buffer imme= diately * like, for example, with RCU. @@ -75047,9 +75149,9 @@ diff -urNp linux-2.6.39/mm/util.c linux-2.6.39/mm= /util.c mm->get_unmapped_area =3D arch_get_unmapped_area; mm->unmap_area =3D arch_unmap_area; } -diff -urNp linux-2.6.39/mm/vmalloc.c linux-2.6.39/mm/vmalloc.c ---- linux-2.6.39/mm/vmalloc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/vmalloc.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/vmalloc.c linux-2.6.39.1/mm/vmalloc.c +--- linux-2.6.39.1/mm/vmalloc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/vmalloc.c 2011-05-22 19:36:33.000000000 -0400 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, =20 pte =3D pte_offset_kernel(pmd, addr); @@ -75282,9 +75384,9 @@ diff -urNp linux-2.6.39/mm/vmalloc.c linux-2.6.39= /mm/vmalloc.c if ((PAGE_SIZE-1) & (unsigned long)addr) return -EINVAL; =20 -diff -urNp linux-2.6.39/mm/vmstat.c linux-2.6.39/mm/vmstat.c ---- linux-2.6.39/mm/vmstat.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/mm/vmstat.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/mm/vmstat.c linux-2.6.39.1/mm/vmstat.c +--- linux-2.6.39.1/mm/vmstat.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/mm/vmstat.c 2011-05-22 19:41:42.000000000 -0400 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -75337,9 +75439,9 @@ diff -urNp linux-2.6.39/mm/vmstat.c linux-2.6.39/= mm/vmstat.c #endif return 0; } -diff -urNp linux-2.6.39/net/8021q/vlan.c linux-2.6.39/net/8021q/vlan.c ---- linux-2.6.39/net/8021q/vlan.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/8021q/vlan.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/net/8021q/vlan.c linux-2.6.39.1/net/8021q/vlan= .c +--- linux-2.6.39.1/net/8021q/vlan.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/8021q/vlan.c 2011-05-22 19:36:33.000000000 -0400 @@ -592,8 +592,7 @@ static int vlan_ioctl_handler(struct net err =3D -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -75350,9 +75452,9 @@ diff -urNp linux-2.6.39/net/8021q/vlan.c linux-2.= 6.39/net/8021q/vlan.c struct vlan_net *vn; =20 vn =3D net_generic(net, vlan_net_id); -diff -urNp linux-2.6.39/net/atm/atm_misc.c linux-2.6.39/net/atm/atm_misc= .c ---- linux-2.6.39/net/atm/atm_misc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/atm/atm_misc.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/net/atm/atm_misc.c linux-2.6.39.1/net/atm/atm_= misc.c +--- linux-2.6.39.1/net/atm/atm_misc.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/atm/atm_misc.c 2011-05-22 19:36:33.000000000 -040= 0 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int=20 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <=3D sk_atm(vcc)->sk_rcvb= uf) return 1; @@ -75389,9 +75491,9 @@ diff -urNp linux-2.6.39/net/atm/atm_misc.c linux-= 2.6.39/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.39/net/atm/mpoa_caches.c linux-2.6.39/net/atm/mpoa_= caches.c ---- linux-2.6.39/net/atm/mpoa_caches.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/net/atm/mpoa_caches.c 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/net/atm/mpoa_caches.c linux-2.6.39.1/net/atm/m= poa_caches.c +--- linux-2.6.39.1/net/atm/mpoa_caches.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/net/atm/mpoa_caches.c 2011-05-22 19:36:33.000000000 -= 0400 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru struct timeval now; struct k_message msg; @@ -75401,9 +75503,9 @@ diff -urNp linux-2.6.39/net/atm/mpoa_caches.c lin= ux-2.6.39/net/atm/mpoa_caches.c do_gettimeofday(&now); =20 read_lock_bh(&client->ingress_lock); -diff -urNp linux-2.6.39/net/atm/proc.c linux-2.6.39/net/atm/proc.c ---- linux-2.6.39/net/atm/proc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/atm/proc.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/atm/proc.c linux-2.6.39.1/net/atm/proc.c +--- linux-2.6.39.1/net/atm/proc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/atm/proc.c 2011-05-22 19:41:42.000000000 -0400 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -75442,9 +75544,9 @@ diff -urNp linux-2.6.39/net/atm/proc.c linux-2.6.= 39/net/atm/proc.c else seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi, vcc->vci); -diff -urNp linux-2.6.39/net/atm/resources.c linux-2.6.39/net/atm/resourc= es.c ---- linux-2.6.39/net/atm/resources.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/atm/resources.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/net/atm/resources.c linux-2.6.39.1/net/atm/res= ources.c +--- linux-2.6.39.1/net/atm/resources.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/atm/resources.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister); static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -75463,9 +75565,9 @@ diff -urNp linux-2.6.39/net/atm/resources.c linux= -2.6.39/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.39/net/batman-adv/hard-interface.c linux-2.6.39/net= /batman-adv/hard-interface.c ---- linux-2.6.39/net/batman-adv/hard-interface.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/batman-adv/hard-interface.c 2011-05-22 19:36:33.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/batman-adv/hard-interface.c linux-2.6.39.1= /net/batman-adv/hard-interface.c +--- linux-2.6.39.1/net/batman-adv/hard-interface.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/batman-adv/hard-interface.c 2011-05-22 19:36:33.0= 00000000 -0400 @@ -339,8 +339,8 @@ int hardif_enable_interface(struct hard_ hard_iface->batman_adv_ptype.dev =3D hard_iface->net_dev; dev_add_pack(&hard_iface->batman_adv_ptype); @@ -75477,9 +75579,9 @@ diff -urNp linux-2.6.39/net/batman-adv/hard-inter= face.c linux-2.6.39/net/batman- bat_info(hard_iface->soft_iface, "Adding interface: %s\n", hard_iface->net_dev->name); =20 -diff -urNp linux-2.6.39/net/batman-adv/routing.c linux-2.6.39/net/batman= -adv/routing.c ---- linux-2.6.39/net/batman-adv/routing.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/batman-adv/routing.c 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/batman-adv/routing.c linux-2.6.39.1/net/ba= tman-adv/routing.c +--- linux-2.6.39.1/net/batman-adv/routing.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/batman-adv/routing.c 2011-05-22 19:36:33.00000000= 0 -0400 @@ -625,7 +625,7 @@ void receive_bat_packet(struct ethhdr *e return; =20 @@ -75489,9 +75591,9 @@ diff -urNp linux-2.6.39/net/batman-adv/routing.c = linux-2.6.39/net/batman-adv/rou =20 has_directlink_flag =3D (batman_packet->flags & DIRECTLINK ? 1 : 0); =20 -diff -urNp linux-2.6.39/net/batman-adv/send.c linux-2.6.39/net/batman-ad= v/send.c ---- linux-2.6.39/net/batman-adv/send.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/net/batman-adv/send.c 2011-05-22 19:36:33.000000000 -04= 00 +diff -urNp linux-2.6.39.1/net/batman-adv/send.c linux-2.6.39.1/net/batma= n-adv/send.c +--- linux-2.6.39.1/net/batman-adv/send.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/net/batman-adv/send.c 2011-05-22 19:36:33.000000000 -= 0400 @@ -277,7 +277,7 @@ void schedule_own_packet(struct hard_ifa =20 /* change sequence number to network order */ @@ -75510,9 +75612,9 @@ diff -urNp linux-2.6.39/net/batman-adv/send.c lin= ux-2.6.39/net/batman-adv/send.c =20 slide_own_bcast_window(hard_iface); send_time =3D own_send_time(bat_priv); -diff -urNp linux-2.6.39/net/batman-adv/soft-interface.c linux-2.6.39/net= /batman-adv/soft-interface.c ---- linux-2.6.39/net/batman-adv/soft-interface.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/batman-adv/soft-interface.c 2011-05-22 19:36:33.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/batman-adv/soft-interface.c linux-2.6.39.1= /net/batman-adv/soft-interface.c +--- linux-2.6.39.1/net/batman-adv/soft-interface.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/batman-adv/soft-interface.c 2011-05-22 19:36:33.0= 00000000 -0400 @@ -386,7 +386,7 @@ int interface_tx(struct sk_buff *skb, st =20 /* set broadcast sequence number */ @@ -75531,9 +75633,9 @@ diff -urNp linux-2.6.39/net/batman-adv/soft-inter= face.c linux-2.6.39/net/batman- atomic_set(&bat_priv->hna_local_changed, 0); =20 bat_priv->primary_if =3D NULL; -diff -urNp linux-2.6.39/net/batman-adv/types.h linux-2.6.39/net/batman-a= dv/types.h ---- linux-2.6.39/net/batman-adv/types.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/batman-adv/types.h 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/batman-adv/types.h linux-2.6.39.1/net/batm= an-adv/types.h +--- linux-2.6.39.1/net/batman-adv/types.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/batman-adv/types.h 2011-05-22 19:36:33.000000000 = -0400 @@ -38,8 +38,8 @@ struct hard_iface { int16_t if_num; char if_status; @@ -75554,9 +75656,9 @@ diff -urNp linux-2.6.39/net/batman-adv/types.h li= nux-2.6.39/net/batman-adv/types atomic_t bcast_queue_left; atomic_t batman_queue_left; char num_ifaces; -diff -urNp linux-2.6.39/net/batman-adv/unicast.c linux-2.6.39/net/batman= -adv/unicast.c ---- linux-2.6.39/net/batman-adv/unicast.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/batman-adv/unicast.c 2011-05-22 19:36:33.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/batman-adv/unicast.c linux-2.6.39.1/net/ba= tman-adv/unicast.c +--- linux-2.6.39.1/net/batman-adv/unicast.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/batman-adv/unicast.c 2011-05-22 19:36:33.00000000= 0 -0400 @@ -263,7 +263,7 @@ int frag_send_skb(struct sk_buff *skb, s frag1->flags =3D UNI_FRAG_HEAD | large_tail; frag2->flags =3D large_tail; @@ -75566,9 +75668,9 @@ diff -urNp linux-2.6.39/net/batman-adv/unicast.c = linux-2.6.39/net/batman-adv/uni frag1->seqno =3D htons(seqno - 1); frag2->seqno =3D htons(seqno); =20 -diff -urNp linux-2.6.39/net/bridge/br_multicast.c linux-2.6.39/net/bridg= e/br_multicast.c ---- linux-2.6.39/net/bridge/br_multicast.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/net/bridge/br_multicast.c 2011-05-22 19:36:33.000000000= -0400 +diff -urNp linux-2.6.39.1/net/bridge/br_multicast.c linux-2.6.39.1/net/b= ridge/br_multicast.c +--- linux-2.6.39.1/net/bridge/br_multicast.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/net/bridge/br_multicast.c 2011-05-22 19:36:33.0000000= 00 -0400 @@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct=20 nexthdr =3D ip6h->nexthdr; offset =3D ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr); @@ -75578,9 +75680,9 @@ diff -urNp linux-2.6.39/net/bridge/br_multicast.c= linux-2.6.39/net/bridge/br_mul return 0; =20 /* Okay, we found ICMPv6 header */ -diff -urNp linux-2.6.39/net/bridge/netfilter/ebtables.c linux-2.6.39/net= /bridge/netfilter/ebtables.c ---- linux-2.6.39/net/bridge/netfilter/ebtables.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/bridge/netfilter/ebtables.c 2011-05-22 19:36:33.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/bridge/netfilter/ebtables.c linux-2.6.39.1= /net/bridge/netfilter/ebtables.c +--- linux-2.6.39.1/net/bridge/netfilter/ebtables.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/bridge/netfilter/ebtables.c 2011-05-22 19:36:33.0= 00000000 -0400 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s tmp.valid_hooks =3D t->table->valid_hooks; } @@ -75599,9 +75701,9 @@ diff -urNp linux-2.6.39/net/bridge/netfilter/ebta= bles.c linux-2.6.39/net/bridge/ memset(&tinfo, 0, sizeof(tinfo)); =20 if (cmd =3D=3D EBT_SO_GET_ENTRIES) { -diff -urNp linux-2.6.39/net/caif/caif_socket.c linux-2.6.39/net/caif/cai= f_socket.c ---- linux-2.6.39/net/caif/caif_socket.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/caif/caif_socket.c 2011-05-22 19:36:33.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/caif/caif_socket.c linux-2.6.39.1/net/caif= /caif_socket.c +--- linux-2.6.39.1/net/caif/caif_socket.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/caif/caif_socket.c 2011-05-22 19:36:33.000000000 = -0400 @@ -48,18 +48,19 @@ static struct dentry *debugfsdir; #ifdef CONFIG_DEBUG_FS struct debug_fs_counter { @@ -75719,9 +75821,9 @@ diff -urNp linux-2.6.39/net/caif/caif_socket.c li= nux-2.6.39/net/caif/caif_socket =20 if (cf_sk->debugfs_socket_dir !=3D NULL) debugfs_remove_recursive(cf_sk->debugfs_socket_dir); -diff -urNp linux-2.6.39/net/caif/cfctrl.c linux-2.6.39/net/caif/cfctrl.c ---- linux-2.6.39/net/caif/cfctrl.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/caif/cfctrl.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/net/caif/cfctrl.c linux-2.6.39.1/net/caif/cfct= rl.c +--- linux-2.6.39.1/net/caif/cfctrl.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/caif/cfctrl.c 2011-05-22 19:36:33.000000000 -0400 @@ -9,6 +9,7 @@ #include #include @@ -75769,9 +75871,9 @@ diff -urNp linux-2.6.39/net/caif/cfctrl.c linux-2= .6.39/net/caif/cfctrl.c =20 cfpkt_extr_head(pkt, &cmdrsp, 1); cmd =3D cmdrsp & CFCTRL_CMD_MASK; -diff -urNp linux-2.6.39/net/can/bcm.c linux-2.6.39/net/can/bcm.c ---- linux-2.6.39/net/can/bcm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/can/bcm.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/can/bcm.c linux-2.6.39.1/net/can/bcm.c +--- linux-2.6.39.1/net/can/bcm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/can/bcm.c 2011-05-22 19:41:42.000000000 -0400 @@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file struct bcm_sock *bo =3D bcm_sk(sk); struct bcm_op *op; @@ -75788,9 +75890,9 @@ diff -urNp linux-2.6.39/net/can/bcm.c linux-2.6.3= 9/net/can/bcm.c seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs); seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex)); seq_printf(m, " <<<\n"); -diff -urNp linux-2.6.39/net/core/datagram.c linux-2.6.39/net/core/datagr= am.c ---- linux-2.6.39/net/core/datagram.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/core/datagram.c 2011-05-22 19:36:33.000000000 -0400 +diff -urNp linux-2.6.39.1/net/core/datagram.c linux-2.6.39.1/net/core/da= tagram.c +--- linux-2.6.39.1/net/core/datagram.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/core/datagram.c 2011-05-22 19:36:33.000000000 -04= 00 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s } =20 @@ -75800,9 +75902,9 @@ diff -urNp linux-2.6.39/net/core/datagram.c linux= -2.6.39/net/core/datagram.c sk_mem_reclaim_partial(sk); =20 return err; -diff -urNp linux-2.6.39/net/core/dev.c linux-2.6.39/net/core/dev.c ---- linux-2.6.39/net/core/dev.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/core/dev.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/core/dev.c linux-2.6.39.1/net/core/dev.c +--- linux-2.6.39.1/net/core/dev.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/net/core/dev.c 2011-06-03 00:32:08.000000000 -0400 @@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha if (no_module && capable(CAP_NET_ADMIN)) no_module =3D request_module("netdev-%s", name); @@ -75845,9 +75947,9 @@ diff -urNp linux-2.6.39/net/core/dev.c linux-2.6.= 39/net/core/dev.c { struct softnet_data *sd =3D &__get_cpu_var(softnet_data); unsigned long time_limit =3D jiffies + 2; -diff -urNp linux-2.6.39/net/core/flow.c linux-2.6.39/net/core/flow.c ---- linux-2.6.39/net/core/flow.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/core/flow.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/core/flow.c linux-2.6.39.1/net/core/flow.c +--- linux-2.6.39.1/net/core/flow.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/core/flow.c 2011-05-22 19:36:34.000000000 -0400 @@ -60,7 +60,7 @@ struct flow_cache { struct timer_list rnd_timer; }; @@ -75884,9 +75986,9 @@ diff -urNp linux-2.6.39/net/core/flow.c linux-2.6= .39/net/core/flow.c if (!IS_ERR(flo)) fle->object =3D flo; else -diff -urNp linux-2.6.39/net/core/skbuff.c linux-2.6.39/net/core/skbuff.c ---- linux-2.6.39/net/core/skbuff.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/core/skbuff.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/core/skbuff.c linux-2.6.39.1/net/core/skbu= ff.c +--- linux-2.6.39.1/net/core/skbuff.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/net/core/skbuff.c 2011-06-03 00:32:08.000000000 -0400 @@ -1542,6 +1542,8 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk =3D skb->sk; int ret =3D 0; @@ -75896,9 +75998,9 @@ diff -urNp linux-2.6.39/net/core/skbuff.c linux-2= .6.39/net/core/skbuff.c if (splice_grow_spd(pipe, &spd)) return -ENOMEM; =20 -diff -urNp linux-2.6.39/net/core/sock.c linux-2.6.39/net/core/sock.c ---- linux-2.6.39/net/core/sock.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/core/sock.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/core/sock.c linux-2.6.39.1/net/core/sock.c +--- linux-2.6.39.1/net/core/sock.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/core/sock.c 2011-05-22 19:36:34.000000000 -0400 @@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk,=20 */ if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=3D @@ -75971,9 +76073,9 @@ diff -urNp linux-2.6.39/net/core/sock.c linux-2.6= .39/net/core/sock.c } EXPORT_SYMBOL(sock_init_data); =20 -diff -urNp linux-2.6.39/net/decnet/sysctl_net_decnet.c linux-2.6.39/net/= decnet/sysctl_net_decnet.c ---- linux-2.6.39/net/decnet/sysctl_net_decnet.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/net/decnet/sysctl_net_decnet.c 2011-05-22 19:36:34.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/net/decnet/sysctl_net_decnet.c linux-2.6.39.1/= net/decnet/sysctl_net_decnet.c +--- linux-2.6.39.1/net/decnet/sysctl_net_decnet.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/net/decnet/sysctl_net_decnet.c 2011-05-22 19:36:34.00= 0000000 -0400 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t =20 if (len > *lenp) len =3D *lenp; @@ -75992,9 +76094,9 @@ diff -urNp linux-2.6.39/net/decnet/sysctl_net_dec= net.c linux-2.6.39/net/decnet/s return -EFAULT; =20 *lenp =3D len; -diff -urNp linux-2.6.39/net/econet/Kconfig linux-2.6.39/net/econet/Kconf= ig ---- linux-2.6.39/net/econet/Kconfig 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/econet/Kconfig 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/econet/Kconfig linux-2.6.39.1/net/econet/K= config +--- linux-2.6.39.1/net/econet/Kconfig 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/econet/Kconfig 2011-05-22 19:41:42.000000000 -040= 0 @@ -4,7 +4,7 @@ =20 config ECONET @@ -76004,9 +76106,9 @@ diff -urNp linux-2.6.39/net/econet/Kconfig linux-= 2.6.39/net/econet/Kconfig ---help--- Econet is a fairly old and slow networking protocol mainly used by Acorn computers to access file and print servers. It uses native -diff -urNp linux-2.6.39/net/ipv4/fib_frontend.c linux-2.6.39/net/ipv4/fi= b_frontend.c ---- linux-2.6.39/net/ipv4/fib_frontend.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/net/ipv4/fib_frontend.c 2011-05-22 19:36:34.000000000 -= 0400 +diff -urNp linux-2.6.39.1/net/ipv4/fib_frontend.c linux-2.6.39.1/net/ipv= 4/fib_frontend.c +--- linux-2.6.39.1/net/ipv4/fib_frontend.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/net/ipv4/fib_frontend.c 2011-05-22 19:36:34.000000000= -0400 @@ -968,12 +968,12 @@ static int fib_inetaddr_event(struct not #ifdef CONFIG_IP_ROUTE_MULTIPATH fib_sync_up(dev); @@ -76031,9 +76133,9 @@ diff -urNp linux-2.6.39/net/ipv4/fib_frontend.c l= inux-2.6.39/net/ipv4/fib_fronte rt_cache_flush(dev_net(dev), -1); break; case NETDEV_DOWN: -diff -urNp linux-2.6.39/net/ipv4/fib_semantics.c linux-2.6.39/net/ipv4/f= ib_semantics.c ---- linux-2.6.39/net/ipv4/fib_semantics.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/ipv4/fib_semantics.c 2011-05-22 19:36:34.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/ipv4/fib_semantics.c linux-2.6.39.1/net/ip= v4/fib_semantics.c +--- linux-2.6.39.1/net/ipv4/fib_semantics.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/ipv4/fib_semantics.c 2011-05-22 19:36:34.00000000= 0 -0400 @@ -701,7 +701,7 @@ __be32 fib_info_update_nh_saddr(struct n nh->nh_saddr =3D inet_select_addr(nh->nh_dev, nh->nh_gw, @@ -76043,9 +76145,9 @@ diff -urNp linux-2.6.39/net/ipv4/fib_semantics.c = linux-2.6.39/net/ipv4/fib_seman =20 return nh->nh_saddr; } -diff -urNp linux-2.6.39/net/ipv4/inet_diag.c linux-2.6.39/net/ipv4/inet_= diag.c ---- linux-2.6.39/net/ipv4/inet_diag.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/ipv4/inet_diag.c 2011-05-22 19:41:42.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/ipv4/inet_diag.c linux-2.6.39.1/net/ipv4/i= net_diag.c +--- linux-2.6.39.1/net/ipv4/inet_diag.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/ipv4/inet_diag.c 2011-05-22 19:41:42.000000000 -0= 400 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc r->idiag_retrans =3D 0; =20 @@ -76107,9 +76209,9 @@ diff -urNp linux-2.6.39/net/ipv4/inet_diag.c linu= x-2.6.39/net/ipv4/inet_diag.c =20 tmo =3D req->expires - jiffies; if (tmo < 0) -diff -urNp linux-2.6.39/net/ipv4/inet_hashtables.c linux-2.6.39/net/ipv4= /inet_hashtables.c ---- linux-2.6.39/net/ipv4/inet_hashtables.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/net/ipv4/inet_hashtables.c 2011-05-22 19:41:42.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/inet_hashtables.c linux-2.6.39.1/net/= ipv4/inet_hashtables.c +--- linux-2.6.39.1/net/ipv4/inet_hashtables.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/net/ipv4/inet_hashtables.c 2011-05-22 19:41:42.000000= 000 -0400 @@ -18,11 +18,14 @@ #include #include @@ -76134,9 +76236,9 @@ diff -urNp linux-2.6.39/net/ipv4/inet_hashtables.= c linux-2.6.39/net/ipv4/inet_ha if (tw) { inet_twsk_deschedule(tw, death_row); while (twrefcnt) { -diff -urNp linux-2.6.39/net/ipv4/inetpeer.c linux-2.6.39/net/ipv4/inetpe= er.c ---- linux-2.6.39/net/ipv4/inetpeer.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv4/inetpeer.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/inetpeer.c linux-2.6.39.1/net/ipv4/in= etpeer.c +--- linux-2.6.39.1/net/ipv4/inetpeer.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/ipv4/inetpeer.c 2011-05-22 19:36:34.000000000 -04= 00 @@ -467,6 +467,8 @@ struct inet_peer *inet_getpeer(struct in unsigned int sequence; int invalidated; @@ -76157,9 +76259,9 @@ diff -urNp linux-2.6.39/net/ipv4/inetpeer.c linux= -2.6.39/net/ipv4/inetpeer.c p->tcp_ts_stamp =3D 0; p->metrics[RTAX_LOCK-1] =3D INETPEER_METRICS_NEW; p->rate_tokens =3D 0; -diff -urNp linux-2.6.39/net/ipv4/ip_fragment.c linux-2.6.39/net/ipv4/ip_= fragment.c ---- linux-2.6.39/net/ipv4/ip_fragment.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/ipv4/ip_fragment.c 2011-05-22 19:36:34.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/ipv4/ip_fragment.c linux-2.6.39.1/net/ipv4= /ip_fragment.c +--- linux-2.6.39.1/net/ipv4/ip_fragment.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/ipv4/ip_fragment.c 2011-05-22 19:36:34.000000000 = -0400 @@ -297,7 +297,7 @@ static inline int ip_frag_too_far(struct return 0; =20 @@ -76169,9 +76271,9 @@ diff -urNp linux-2.6.39/net/ipv4/ip_fragment.c li= nux-2.6.39/net/ipv4/ip_fragment qp->rid =3D end; =20 rc =3D qp->q.fragments && (end - start) > max; -diff -urNp linux-2.6.39/net/ipv4/ip_sockglue.c linux-2.6.39/net/ipv4/ip_= sockglue.c ---- linux-2.6.39/net/ipv4/ip_sockglue.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/ipv4/ip_sockglue.c 2011-05-22 19:36:34.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/ipv4/ip_sockglue.c linux-2.6.39.1/net/ipv4= /ip_sockglue.c +--- linux-2.6.39.1/net/ipv4/ip_sockglue.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/ipv4/ip_sockglue.c 2011-05-22 19:36:34.000000000 = -0400 @@ -1064,6 +1064,8 @@ static int do_ip_getsockopt(struct sock=20 int val; int len; @@ -76181,9 +76283,9 @@ diff -urNp linux-2.6.39/net/ipv4/ip_sockglue.c li= nux-2.6.39/net/ipv4/ip_sockglue if (level !=3D SOL_IP) return -EOPNOTSUPP; =20 -diff -urNp linux-2.6.39/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6= .39/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-05-19 00:06= :34.000000000 -0400 -+++ linux-2.6.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-05-22 19:36= :34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2= .6.39.1/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.39.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-05-19 00:= 06:34.000000000 -0400 ++++ linux-2.6.39.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-05-22 19:= 36:34.000000000 -0400 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode( =20 *len =3D 0; @@ -76193,9 +76295,9 @@ diff -urNp linux-2.6.39/net/ipv4/netfilter/nf_nat= _snmp_basic.c linux-2.6.39/net/ if (*octets =3D=3D NULL) { if (net_ratelimit()) pr_notice("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.39/net/ipv4/raw.c linux-2.6.39/net/ipv4/raw.c ---- linux-2.6.39/net/ipv4/raw.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv4/raw.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/raw.c linux-2.6.39.1/net/ipv4/raw.c +--- linux-2.6.39.1/net/ipv4/raw.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/ipv4/raw.c 2011-05-22 19:41:42.000000000 -0400 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk, int raw_rcv(struct sock *sk, struct sk_buff *skb) { @@ -76252,9 +76354,9 @@ diff -urNp linux-2.6.39/net/ipv4/raw.c linux-2.6.= 39/net/ipv4/raw.c } =20 static int raw_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.39/net/ipv4/route.c linux-2.6.39/net/ipv4/route.c ---- linux-2.6.39/net/ipv4/route.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv4/route.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/route.c linux-2.6.39.1/net/ipv4/route= .c +--- linux-2.6.39.1/net/ipv4/route.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/ipv4/route.c 2011-05-22 19:36:34.000000000 -0400 @@ -303,7 +303,7 @@ static inline unsigned int rt_hash(__be3 =20 static inline int rt_genid(struct net *net) @@ -76282,9 +76384,9 @@ diff -urNp linux-2.6.39/net/ipv4/route.c linux-2.= 6.39/net/ipv4/route.c if (rt->peer->tcp_ts_stamp) { ts =3D rt->peer->tcp_ts; tsage =3D get_seconds() - rt->peer->tcp_ts_stamp; -diff -urNp linux-2.6.39/net/ipv4/tcp.c linux-2.6.39/net/ipv4/tcp.c ---- linux-2.6.39/net/ipv4/tcp.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv4/tcp.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/tcp.c linux-2.6.39.1/net/ipv4/tcp.c +--- linux-2.6.39.1/net/ipv4/tcp.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/ipv4/tcp.c 2011-05-22 19:36:34.000000000 -0400 @@ -2121,6 +2121,8 @@ static int do_tcp_setsockopt(struct sock int val; int err =3D 0; @@ -76303,9 +76405,9 @@ diff -urNp linux-2.6.39/net/ipv4/tcp.c linux-2.6.= 39/net/ipv4/tcp.c if (get_user(len, optlen)) return -EFAULT; =20 -diff -urNp linux-2.6.39/net/ipv4/tcp_ipv4.c linux-2.6.39/net/ipv4/tcp_ip= v4.c ---- linux-2.6.39/net/ipv4/tcp_ipv4.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv4/tcp_ipv4.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/tcp_ipv4.c linux-2.6.39.1/net/ipv4/tc= p_ipv4.c +--- linux-2.6.39.1/net/ipv4/tcp_ipv4.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/ipv4/tcp_ipv4.c 2011-05-22 19:41:42.000000000 -04= 00 @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; EXPORT_SYMBOL(sysctl_tcp_low_latency); @@ -76401,9 +76503,9 @@ diff -urNp linux-2.6.39/net/ipv4/tcp_ipv4.c linux= -2.6.39/net/ipv4/tcp_ipv4.c } =20 #define TMPSZ 150 -diff -urNp linux-2.6.39/net/ipv4/tcp_minisocks.c linux-2.6.39/net/ipv4/t= cp_minisocks.c ---- linux-2.6.39/net/ipv4/tcp_minisocks.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/ipv4/tcp_minisocks.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/ipv4/tcp_minisocks.c linux-2.6.39.1/net/ip= v4/tcp_minisocks.c +--- linux-2.6.39.1/net/ipv4/tcp_minisocks.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/ipv4/tcp_minisocks.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -27,6 +27,10 @@ #include #include @@ -76426,9 +76528,9 @@ diff -urNp linux-2.6.39/net/ipv4/tcp_minisocks.c = linux-2.6.39/net/ipv4/tcp_minis if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); =20 -diff -urNp linux-2.6.39/net/ipv4/tcp_output.c linux-2.6.39/net/ipv4/tcp_= output.c ---- linux-2.6.39/net/ipv4/tcp_output.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/net/ipv4/tcp_output.c 2011-05-22 19:36:34.000000000 -04= 00 +diff -urNp linux-2.6.39.1/net/ipv4/tcp_output.c linux-2.6.39.1/net/ipv4/= tcp_output.c +--- linux-2.6.39.1/net/ipv4/tcp_output.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/net/ipv4/tcp_output.c 2011-05-22 19:36:34.000000000 -= 0400 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s int mss; int s_data_desired =3D 0; @@ -76438,9 +76540,9 @@ diff -urNp linux-2.6.39/net/ipv4/tcp_output.c lin= ux-2.6.39/net/ipv4/tcp_output.c if (cvp !=3D NULL && cvp->s_data_constant && cvp->s_data_desired) s_data_desired =3D cvp->s_data_desired; skb =3D sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_= ATOMIC); -diff -urNp linux-2.6.39/net/ipv4/tcp_probe.c linux-2.6.39/net/ipv4/tcp_p= robe.c ---- linux-2.6.39/net/ipv4/tcp_probe.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/ipv4/tcp_probe.c 2011-05-22 19:36:34.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/ipv4/tcp_probe.c linux-2.6.39.1/net/ipv4/t= cp_probe.c +--- linux-2.6.39.1/net/ipv4/tcp_probe.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/ipv4/tcp_probe.c 2011-05-22 19:36:34.000000000 -0= 400 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >=3D len) break; @@ -76450,9 +76552,9 @@ diff -urNp linux-2.6.39/net/ipv4/tcp_probe.c linu= x-2.6.39/net/ipv4/tcp_probe.c return -EFAULT; cnt +=3D width; } -diff -urNp linux-2.6.39/net/ipv4/tcp_timer.c linux-2.6.39/net/ipv4/tcp_t= imer.c ---- linux-2.6.39/net/ipv4/tcp_timer.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/ipv4/tcp_timer.c 2011-05-22 19:41:42.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/ipv4/tcp_timer.c linux-2.6.39.1/net/ipv4/t= cp_timer.c +--- linux-2.6.39.1/net/ipv4/tcp_timer.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/ipv4/tcp_timer.c 2011-05-22 19:41:42.000000000 -0= 400 @@ -22,6 +22,10 @@ #include #include @@ -76478,9 +76580,9 @@ diff -urNp linux-2.6.39/net/ipv4/tcp_timer.c linu= x-2.6.39/net/ipv4/tcp_timer.c if (retransmits_timed_out(sk, retry_until, syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { /* Has it gone just too far? */ -diff -urNp linux-2.6.39/net/ipv4/udp.c linux-2.6.39/net/ipv4/udp.c ---- linux-2.6.39/net/ipv4/udp.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv4/udp.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv4/udp.c linux-2.6.39.1/net/ipv4/udp.c +--- linux-2.6.39.1/net/ipv4/udp.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/ipv4/udp.c 2011-05-22 19:41:42.000000000 -0400 @@ -86,6 +86,7 @@ #include #include @@ -76593,9 +76695,9 @@ diff -urNp linux-2.6.39/net/ipv4/udp.c linux-2.6.= 39/net/ipv4/udp.c } =20 int udp4_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.39/net/ipv6/inet6_connection_sock.c linux-2.6.39/ne= t/ipv6/inet6_connection_sock.c ---- linux-2.6.39/net/ipv6/inet6_connection_sock.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/net/ipv6/inet6_connection_sock.c 2011-05-22 19:36:34.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv6/inet6_connection_sock.c linux-2.6.39.= 1/net/ipv6/inet6_connection_sock.c +--- linux-2.6.39.1/net/ipv6/inet6_connection_sock.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/net/ipv6/inet6_connection_sock.c 2011-05-22 19:36:34.= 000000000 -0400 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock * #ifdef CONFIG_XFRM { @@ -76614,9 +76716,9 @@ diff -urNp linux-2.6.39/net/ipv6/inet6_connection= _sock.c linux-2.6.39/net/ipv6/i __sk_dst_reset(sk); dst =3D NULL; } -diff -urNp linux-2.6.39/net/ipv6/ipv6_sockglue.c linux-2.6.39/net/ipv6/i= pv6_sockglue.c ---- linux-2.6.39/net/ipv6/ipv6_sockglue.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/ipv6/ipv6_sockglue.c 2011-05-22 19:36:34.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/ipv6/ipv6_sockglue.c linux-2.6.39.1/net/ip= v6/ipv6_sockglue.c +--- linux-2.6.39.1/net/ipv6/ipv6_sockglue.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/ipv6/ipv6_sockglue.c 2011-05-22 19:36:34.00000000= 0 -0400 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc int val, valbool; int retv =3D -ENOPROTOOPT; @@ -76635,9 +76737,9 @@ diff -urNp linux-2.6.39/net/ipv6/ipv6_sockglue.c = linux-2.6.39/net/ipv6/ipv6_sock if (ip6_mroute_opt(optname)) return ip6_mroute_getsockopt(sk, optname, optval, optlen); =20 -diff -urNp linux-2.6.39/net/ipv6/raw.c linux-2.6.39/net/ipv6/raw.c ---- linux-2.6.39/net/ipv6/raw.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv6/raw.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv6/raw.c linux-2.6.39.1/net/ipv6/raw.c +--- linux-2.6.39.1/net/ipv6/raw.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/ipv6/raw.c 2011-05-22 19:41:42.000000000 -0400 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s { if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) && @@ -76733,9 +76835,9 @@ diff -urNp linux-2.6.39/net/ipv6/raw.c linux-2.6.= 39/net/ipv6/raw.c } =20 static int raw6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.39/net/ipv6/tcp_ipv6.c linux-2.6.39/net/ipv6/tcp_ip= v6.c ---- linux-2.6.39/net/ipv6/tcp_ipv6.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv6/tcp_ipv6.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv6/tcp_ipv6.c linux-2.6.39.1/net/ipv6/tc= p_ipv6.c +--- linux-2.6.39.1/net/ipv6/tcp_ipv6.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/ipv6/tcp_ipv6.c 2011-05-22 19:41:42.000000000 -04= 00 @@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -76835,9 +76937,9 @@ diff -urNp linux-2.6.39/net/ipv6/tcp_ipv6.c linux= -2.6.39/net/ipv6/tcp_ipv6.c } =20 static int tcp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.39/net/ipv6/udp.c linux-2.6.39/net/ipv6/udp.c ---- linux-2.6.39/net/ipv6/udp.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/ipv6/udp.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/ipv6/udp.c linux-2.6.39.1/net/ipv6/udp.c +--- linux-2.6.39.1/net/ipv6/udp.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/ipv6/udp.c 2011-05-22 19:41:42.000000000 -0400 @@ -50,6 +50,10 @@ #include #include "udp_impl.h" @@ -76902,9 +77004,9 @@ diff -urNp linux-2.6.39/net/ipv6/udp.c linux-2.6.= 39/net/ipv6/udp.c } =20 int udp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.39/net/irda/ircomm/ircomm_tty.c linux-2.6.39/net/ir= da/ircomm/ircomm_tty.c ---- linux-2.6.39/net/irda/ircomm/ircomm_tty.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/net/irda/ircomm/ircomm_tty.c 2011-05-22 19:36:34.000000= 000 -0400 +diff -urNp linux-2.6.39.1/net/irda/ircomm/ircomm_tty.c linux-2.6.39.1/ne= t/irda/ircomm/ircomm_tty.c +--- linux-2.6.39.1/net/irda/ircomm/ircomm_tty.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/net/irda/ircomm/ircomm_tty.c 2011-05-22 19:36:34.0000= 00000 -0400 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); =20 @@ -77027,9 +77129,9 @@ diff -urNp linux-2.6.39/net/irda/ircomm/ircomm_tt= y.c linux-2.6.39/net/irda/ircom seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); =20 -diff -urNp linux-2.6.39/net/iucv/af_iucv.c linux-2.6.39/net/iucv/af_iucv= .c ---- linux-2.6.39/net/iucv/af_iucv.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/iucv/af_iucv.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/iucv/af_iucv.c linux-2.6.39.1/net/iucv/af_= iucv.c +--- linux-2.6.39.1/net/iucv/af_iucv.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/iucv/af_iucv.c 2011-05-22 19:36:34.000000000 -040= 0 @@ -653,10 +653,10 @@ static int iucv_sock_autobind(struct soc =20 write_lock_bh(&iucv_sk_list.lock); @@ -77043,9 +77145,9 @@ diff -urNp linux-2.6.39/net/iucv/af_iucv.c linux-= 2.6.39/net/iucv/af_iucv.c } =20 write_unlock_bh(&iucv_sk_list.lock); -diff -urNp linux-2.6.39/net/key/af_key.c linux-2.6.39/net/key/af_key.c ---- linux-2.6.39/net/key/af_key.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/key/af_key.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/key/af_key.c linux-2.6.39.1/net/key/af_key= .c +--- linux-2.6.39.1/net/key/af_key.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/key/af_key.c 2011-05-22 19:41:42.000000000 -0400 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk struct xfrm_migrate m[XFRM_MAX_DEPTH]; struct xfrm_kmaddress k; @@ -77080,9 +77182,9 @@ diff -urNp linux-2.6.39/net/key/af_key.c linux-2.= 6.39/net/key/af_key.c atomic_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s), -diff -urNp linux-2.6.39/net/l2tp/l2tp_ip.c linux-2.6.39/net/l2tp/l2tp_ip= .c ---- linux-2.6.39/net/l2tp/l2tp_ip.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/l2tp/l2tp_ip.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/l2tp/l2tp_ip.c linux-2.6.39.1/net/l2tp/l2t= p_ip.c +--- linux-2.6.39.1/net/l2tp/l2tp_ip.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/l2tp/l2tp_ip.c 2011-05-22 19:36:34.000000000 -040= 0 @@ -625,7 +625,7 @@ static struct inet_protosw l2tp_ip_proto .no_check =3D 0, }; @@ -77092,9 +77194,9 @@ diff -urNp linux-2.6.39/net/l2tp/l2tp_ip.c linux-= 2.6.39/net/l2tp/l2tp_ip.c .handler =3D l2tp_ip_recv, }; =20 -diff -urNp linux-2.6.39/net/lapb/lapb_iface.c linux-2.6.39/net/lapb/lapb= _iface.c ---- linux-2.6.39/net/lapb/lapb_iface.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/net/lapb/lapb_iface.c 2011-05-22 19:36:34.000000000 -04= 00 +diff -urNp linux-2.6.39.1/net/lapb/lapb_iface.c linux-2.6.39.1/net/lapb/= lapb_iface.c +--- linux-2.6.39.1/net/lapb/lapb_iface.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/net/lapb/lapb_iface.c 2011-05-22 19:36:34.000000000 -= 0400 @@ -138,8 +138,7 @@ static struct lapb_cb *lapb_create_cb(vo out: return lapb; @@ -77105,10 +77207,10 @@ diff -urNp linux-2.6.39/net/lapb/lapb_iface.c l= inux-2.6.39/net/lapb/lapb_iface.c { struct lapb_cb *lapb; int rc =3D LAPB_BADTOKEN; -diff -urNp linux-2.6.39/net/mac80211/cfg.c linux-2.6.39/net/mac80211/cfg= .c ---- linux-2.6.39/net/mac80211/cfg.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/mac80211/cfg.c 2011-05-22 19:36:34.000000000 -0400 -@@ -2029,7 +2029,7 @@ static void ieee80211_get_ringparam(stru +diff -urNp linux-2.6.39.1/net/mac80211/cfg.c linux-2.6.39.1/net/mac80211= /cfg.c +--- linux-2.6.39.1/net/mac80211/cfg.c 2011-06-03 00:04:14.000000000 -040= 0 ++++ linux-2.6.39.1/net/mac80211/cfg.c 2011-06-03 00:32:08.000000000 -040= 0 +@@ -2031,7 +2031,7 @@ static void ieee80211_get_ringparam(stru drv_get_ringparam(local, tx, tx_max, rx, rx_max); } =20 @@ -77117,9 +77219,9 @@ diff -urNp linux-2.6.39/net/mac80211/cfg.c linux-= 2.6.39/net/mac80211/cfg.c .add_virtual_intf =3D ieee80211_add_iface, .del_virtual_intf =3D ieee80211_del_iface, .change_virtual_intf =3D ieee80211_change_iface, -diff -urNp linux-2.6.39/net/mac80211/cfg.h linux-2.6.39/net/mac80211/cfg= .h ---- linux-2.6.39/net/mac80211/cfg.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/mac80211/cfg.h 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/cfg.h linux-2.6.39.1/net/mac80211= /cfg.h +--- linux-2.6.39.1/net/mac80211/cfg.h 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/mac80211/cfg.h 2011-05-22 19:36:34.000000000 -040= 0 @@ -4,6 +4,6 @@ #ifndef __CFG_H #define __CFG_H @@ -77128,9 +77230,9 @@ diff -urNp linux-2.6.39/net/mac80211/cfg.h linux-= 2.6.39/net/mac80211/cfg.h +extern const struct cfg80211_ops mac80211_config_ops; =20 #endif /* __CFG_H */ -diff -urNp linux-2.6.39/net/mac80211/debugfs_sta.c linux-2.6.39/net/mac8= 0211/debugfs_sta.c ---- linux-2.6.39/net/mac80211/debugfs_sta.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/net/mac80211/debugfs_sta.c 2011-05-22 19:36:34.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/debugfs_sta.c linux-2.6.39.1/net/= mac80211/debugfs_sta.c +--- linux-2.6.39.1/net/mac80211/debugfs_sta.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/net/mac80211/debugfs_sta.c 2011-05-22 19:36:34.000000= 000 -0400 @@ -115,6 +115,8 @@ static ssize_t sta_agg_status_read(struc struct tid_ampdu_rx *tid_rx; struct tid_ampdu_tx *tid_tx; @@ -77149,9 +77251,9 @@ diff -urNp linux-2.6.39/net/mac80211/debugfs_sta.= c linux-2.6.39/net/mac80211/deb p +=3D scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n", htc->ht_supported ? "" : "not "); if (htc->ht_supported) { -diff -urNp linux-2.6.39/net/mac80211/ieee80211_i.h linux-2.6.39/net/mac8= 0211/ieee80211_i.h ---- linux-2.6.39/net/mac80211/ieee80211_i.h 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/net/mac80211/ieee80211_i.h 2011-05-22 19:36:34.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/ieee80211_i.h linux-2.6.39.1/net/= mac80211/ieee80211_i.h +--- linux-2.6.39.1/net/mac80211/ieee80211_i.h 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/net/mac80211/ieee80211_i.h 2011-05-22 19:36:34.000000= 000 -0400 @@ -27,6 +27,7 @@ #include #include @@ -77169,9 +77271,9 @@ diff -urNp linux-2.6.39/net/mac80211/ieee80211_i.= h linux-2.6.39/net/mac80211/iee int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll, -diff -urNp linux-2.6.39/net/mac80211/iface.c linux-2.6.39/net/mac80211/i= face.c ---- linux-2.6.39/net/mac80211/iface.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/mac80211/iface.c 2011-05-22 19:36:34.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/mac80211/iface.c linux-2.6.39.1/net/mac802= 11/iface.c +--- linux-2.6.39.1/net/mac80211/iface.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/mac80211/iface.c 2011-05-22 19:36:34.000000000 -0= 400 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_ break; } @@ -77226,9 +77328,9 @@ diff -urNp linux-2.6.39/net/mac80211/iface.c linu= x-2.6.39/net/mac80211/iface.c if (local->ops->napi_poll) napi_disable(&local->napi); ieee80211_clear_tx_pending(local); -diff -urNp linux-2.6.39/net/mac80211/main.c linux-2.6.39/net/mac80211/ma= in.c ---- linux-2.6.39/net/mac80211/main.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/mac80211/main.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/main.c linux-2.6.39.1/net/mac8021= 1/main.c +--- linux-2.6.39.1/net/mac80211/main.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/mac80211/main.c 2011-05-22 19:36:34.000000000 -04= 00 @@ -215,7 +215,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level =3D power; } @@ -77238,9 +77340,9 @@ diff -urNp linux-2.6.39/net/mac80211/main.c linux= -2.6.39/net/mac80211/main.c ret =3D drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.39/net/mac80211/mlme.c linux-2.6.39/net/mac80211/ml= me.c ---- linux-2.6.39/net/mac80211/mlme.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/mac80211/mlme.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/mlme.c linux-2.6.39.1/net/mac8021= 1/mlme.c +--- linux-2.6.39.1/net/mac80211/mlme.c 2011-06-03 00:04:14.000000000 -04= 00 ++++ linux-2.6.39.1/net/mac80211/mlme.c 2011-06-03 00:32:08.000000000 -04= 00 @@ -1431,6 +1431,8 @@ static bool ieee80211_assoc_success(stru bool have_higher_than_11mbit =3D false; u16 ap_ht_cap_flags; @@ -77250,9 +77352,9 @@ diff -urNp linux-2.6.39/net/mac80211/mlme.c linux= -2.6.39/net/mac80211/mlme.c /* AssocResp and ReassocResp have identical structure */ =20 aid =3D le16_to_cpu(mgmt->u.assoc_resp.aid); -diff -urNp linux-2.6.39/net/mac80211/pm.c linux-2.6.39/net/mac80211/pm.c ---- linux-2.6.39/net/mac80211/pm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/mac80211/pm.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/pm.c linux-2.6.39.1/net/mac80211/= pm.c +--- linux-2.6.39.1/net/mac80211/pm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/mac80211/pm.c 2011-05-22 19:36:34.000000000 -0400 @@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211 } =20 @@ -77262,9 +77364,9 @@ diff -urNp linux-2.6.39/net/mac80211/pm.c linux-2= .6.39/net/mac80211/pm.c ieee80211_stop_device(local); =20 local->suspended =3D true; -diff -urNp linux-2.6.39/net/mac80211/rate.c linux-2.6.39/net/mac80211/ra= te.c ---- linux-2.6.39/net/mac80211/rate.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/mac80211/rate.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/rate.c linux-2.6.39.1/net/mac8021= 1/rate.c +--- linux-2.6.39.1/net/mac80211/rate.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/mac80211/rate.c 2011-05-22 19:36:34.000000000 -04= 00 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct=20 =20 ASSERT_RTNL(); @@ -77274,9 +77376,9 @@ diff -urNp linux-2.6.39/net/mac80211/rate.c linux= -2.6.39/net/mac80211/rate.c return -EBUSY; =20 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) { -diff -urNp linux-2.6.39/net/mac80211/rc80211_pid_debugfs.c linux-2.6.39/= net/mac80211/rc80211_pid_debugfs.c ---- linux-2.6.39/net/mac80211/rc80211_pid_debugfs.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/net/mac80211/rc80211_pid_debugfs.c 2011-05-22 19:36:34.= 000000000 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/rc80211_pid_debugfs.c linux-2.6.3= 9.1/net/mac80211/rc80211_pid_debugfs.c +--- linux-2.6.39.1/net/mac80211/rc80211_pid_debugfs.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/net/mac80211/rc80211_pid_debugfs.c 2011-05-22 19:36:3= 4.000000000 -0400 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r =20 spin_unlock_irqrestore(&events->lock, status); @@ -77286,9 +77388,9 @@ diff -urNp linux-2.6.39/net/mac80211/rc80211_pid_= debugfs.c linux-2.6.39/net/mac8 return -EFAULT; =20 return p; -diff -urNp linux-2.6.39/net/mac80211/util.c linux-2.6.39/net/mac80211/ut= il.c ---- linux-2.6.39/net/mac80211/util.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/mac80211/util.c 2011-05-22 19:36:34.000000000 -0400 +diff -urNp linux-2.6.39.1/net/mac80211/util.c linux-2.6.39.1/net/mac8021= 1/util.c +--- linux-2.6.39.1/net/mac80211/util.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/mac80211/util.c 2011-05-22 19:36:34.000000000 -04= 00 @@ -1129,7 +1129,7 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming =3D true; =20 @@ -77298,9 +77400,9 @@ diff -urNp linux-2.6.39/net/mac80211/util.c linux= -2.6.39/net/mac80211/util.c /* * Upon resume hardware can sometimes be goofy due to * various platform / driver / bus issues, so restarting -diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.39/net= /netfilter/ipvs/ip_vs_conn.c ---- linux-2.6.39/net/netfilter/ipvs/ip_vs_conn.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/netfilter/ipvs/ip_vs_conn.c 2011-05-22 19:36:34.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.39.1= /net/netfilter/ipvs/ip_vs_conn.c +--- linux-2.6.39.1/net/netfilter/ipvs/ip_vs_conn.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/netfilter/ipvs/ip_vs_conn.c 2011-05-22 19:36:34.0= 00000000 -0400 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s /* Increase the refcnt counter of the dest */ atomic_inc(&dest->refcnt); @@ -77328,9 +77430,9 @@ diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_= conn.c linux-2.6.39/net/netfilt if (i > 8 || i < 0) return 0; =20 if (!todrop_rate[i]) return 0; -diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_core.c linux-2.6.39/net= /netfilter/ipvs/ip_vs_core.c ---- linux-2.6.39/net/netfilter/ipvs/ip_vs_core.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/netfilter/ipvs/ip_vs_core.c 2011-05-22 19:36:34.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/ipvs/ip_vs_core.c linux-2.6.39.1= /net/netfilter/ipvs/ip_vs_core.c +--- linux-2.6.39.1/net/netfilter/ipvs/ip_vs_core.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/netfilter/ipvs/ip_vs_core.c 2011-05-22 19:36:34.0= 00000000 -0400 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv ret =3D cp->packet_xmit(skb, cp, pd->pp); /* do not touch skb anymore */ @@ -77349,9 +77451,9 @@ diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_= core.c linux-2.6.39/net/netfilt =20 if ((ipvs->sync_state & IP_VS_STATE_MASTER) && cp->protocol =3D=3D IPPROTO_SCTP) { -diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.39/net/= netfilter/ipvs/ip_vs_ctl.c ---- linux-2.6.39/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-22 19:36:34.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.39.1/= net/netfilter/ipvs/ip_vs_ctl.c +--- linux-2.6.39.1/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-22 19:36:34.00= 0000000 -0400 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service ip_vs_rs_hash(ipvs, dest); write_unlock_bh(&ipvs->rs_lock); @@ -77406,9 +77508,9 @@ diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_= ctl.c linux-2.6.39/net/netfilte NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight)); NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold); NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold); -diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.39/net= /netfilter/ipvs/ip_vs_sync.c ---- linux-2.6.39/net/netfilter/ipvs/ip_vs_sync.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/netfilter/ipvs/ip_vs_sync.c 2011-05-22 19:36:34.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.39.1= /net/netfilter/ipvs/ip_vs_sync.c +--- linux-2.6.39.1/net/netfilter/ipvs/ip_vs_sync.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/netfilter/ipvs/ip_vs_sync.c 2011-05-22 19:36:34.0= 00000000 -0400 @@ -648,7 +648,7 @@ control: * i.e only increment in_pkts for Templates. */ @@ -77427,9 +77529,9 @@ diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_= sync.c linux-2.6.39/net/netfilt cp->state =3D state; cp->old_state =3D cp->state; /* -diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.39/net= /netfilter/ipvs/ip_vs_xmit.c ---- linux-2.6.39/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-22 19:36:34.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.39.1= /net/netfilter/ipvs/ip_vs_xmit.c +--- linux-2.6.39.1/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-22 19:36:34.0= 00000000 -0400 @@ -1127,7 +1127,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str else rc =3D NF_ACCEPT; @@ -77448,9 +77550,9 @@ diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_= xmit.c linux-2.6.39/net/netfilt goto out; } =20 -diff -urNp linux-2.6.39/net/netfilter/Kconfig linux-2.6.39/net/netfilter= /Kconfig ---- linux-2.6.39/net/netfilter/Kconfig 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/net/netfilter/Kconfig 2011-05-22 19:41:42.000000000 -04= 00 +diff -urNp linux-2.6.39.1/net/netfilter/Kconfig linux-2.6.39.1/net/netfi= lter/Kconfig +--- linux-2.6.39.1/net/netfilter/Kconfig 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/net/netfilter/Kconfig 2011-05-22 19:41:42.000000000 -= 0400 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP =20 To compile it as a module, choose M here. If unsure, say N. @@ -77468,9 +77570,9 @@ diff -urNp linux-2.6.39/net/netfilter/Kconfig lin= ux-2.6.39/net/netfilter/Kconfig config NETFILTER_XT_MATCH_HASHLIMIT tristate '"hashlimit" match support' depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=3Dn) -diff -urNp linux-2.6.39/net/netfilter/Makefile linux-2.6.39/net/netfilte= r/Makefile ---- linux-2.6.39/net/netfilter/Makefile 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/netfilter/Makefile 2011-05-22 20:40:16.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/netfilter/Makefile linux-2.6.39.1/net/netf= ilter/Makefile +--- linux-2.6.39.1/net/netfilter/Makefile 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/netfilter/Makefile 2011-05-22 20:40:16.000000000 = -0400 @@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=3D obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) +=3D xt_devgroup.o obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) +=3D xt_dscp.o @@ -77479,9 +77581,9 @@ diff -urNp linux-2.6.39/net/netfilter/Makefile li= nux-2.6.39/net/netfilter/Makefi obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) +=3D xt_hashlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) +=3D xt_helper.o obj-$(CONFIG_NETFILTER_XT_MATCH_HL) +=3D xt_hl.o -diff -urNp linux-2.6.39/net/netfilter/nfnetlink_log.c linux-2.6.39/net/n= etfilter/nfnetlink_log.c ---- linux-2.6.39/net/netfilter/nfnetlink_log.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/net/netfilter/nfnetlink_log.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/nfnetlink_log.c linux-2.6.39.1/n= et/netfilter/nfnetlink_log.c +--- linux-2.6.39.1/net/netfilter/nfnetlink_log.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/net/netfilter/nfnetlink_log.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -70,7 +70,7 @@ struct nfulnl_instance { }; =20 @@ -77500,9 +77602,9 @@ diff -urNp linux-2.6.39/net/netfilter/nfnetlink_l= og.c linux-2.6.39/net/netfilter =20 if (data_len) { struct nlattr *nla; -diff -urNp linux-2.6.39/net/netfilter/nfnetlink_queue.c linux-2.6.39/net= /netfilter/nfnetlink_queue.c ---- linux-2.6.39/net/netfilter/nfnetlink_queue.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/net/netfilter/nfnetlink_queue.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/nfnetlink_queue.c linux-2.6.39.1= /net/netfilter/nfnetlink_queue.c +--- linux-2.6.39.1/net/netfilter/nfnetlink_queue.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/net/netfilter/nfnetlink_queue.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -58,7 +58,7 @@ struct nfqnl_instance { */ spinlock_t lock; @@ -77530,9 +77632,9 @@ diff -urNp linux-2.6.39/net/netfilter/nfnetlink_q= ueue.c linux-2.6.39/net/netfilt } =20 static const struct seq_operations nfqnl_seq_ops =3D { -diff -urNp linux-2.6.39/net/netfilter/xt_gradm.c linux-2.6.39/net/netfil= ter/xt_gradm.c ---- linux-2.6.39/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.39/net/netfilter/xt_gradm.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/netfilter/xt_gradm.c linux-2.6.39.1/net/ne= tfilter/xt_gradm.c +--- linux-2.6.39.1/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.39.1/net/netfilter/xt_gradm.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -77585,9 +77687,9 @@ diff -urNp linux-2.6.39/net/netfilter/xt_gradm.c = linux-2.6.39/net/netfilter/xt_g +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_gradm"); +MODULE_ALIAS("ip6t_gradm"); -diff -urNp linux-2.6.39/net/netfilter/xt_statistic.c linux-2.6.39/net/ne= tfilter/xt_statistic.c ---- linux-2.6.39/net/netfilter/xt_statistic.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/net/netfilter/xt_statistic.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/net/netfilter/xt_statistic.c linux-2.6.39.1/ne= t/netfilter/xt_statistic.c +--- linux-2.6.39.1/net/netfilter/xt_statistic.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/net/netfilter/xt_statistic.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -18,7 +18,7 @@ #include =20 @@ -77618,9 +77720,9 @@ diff -urNp linux-2.6.39/net/netfilter/xt_statisti= c.c linux-2.6.39/net/netfilter/ =20 return 0; } -diff -urNp linux-2.6.39/net/netlink/af_netlink.c linux-2.6.39/net/netlin= k/af_netlink.c ---- linux-2.6.39/net/netlink/af_netlink.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/netlink/af_netlink.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/netlink/af_netlink.c linux-2.6.39.1/net/ne= tlink/af_netlink.c +--- linux-2.6.39.1/net/netlink/af_netlink.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/netlink/af_netlink.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock=20 sk->sk_error_report(sk); } @@ -77655,9 +77757,9 @@ diff -urNp linux-2.6.39/net/netlink/af_netlink.c = linux-2.6.39/net/netlink/af_net sock_i_ino(s) ); =20 -diff -urNp linux-2.6.39/net/netrom/af_netrom.c linux-2.6.39/net/netrom/a= f_netrom.c ---- linux-2.6.39/net/netrom/af_netrom.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/netrom/af_netrom.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/netrom/af_netrom.c linux-2.6.39.1/net/netr= om/af_netrom.c +--- linux-2.6.39.1/net/netrom/af_netrom.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/netrom/af_netrom.c 2011-05-22 19:41:42.000000000 = -0400 @@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc struct sock *sk =3D sock->sk; struct nr_sock *nr =3D nr_sk(sk); @@ -77674,9 +77776,9 @@ diff -urNp linux-2.6.39/net/netrom/af_netrom.c li= nux-2.6.39/net/netrom/af_netrom sax->fsa_ax25.sax25_call =3D nr->source_addr; *uaddr_len =3D sizeof(struct sockaddr_ax25); } -diff -urNp linux-2.6.39/net/packet/af_packet.c linux-2.6.39/net/packet/a= f_packet.c ---- linux-2.6.39/net/packet/af_packet.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/packet/af_packet.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/packet/af_packet.c linux-2.6.39.1/net/pack= et/af_packet.c +--- linux-2.6.39.1/net/packet/af_packet.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/packet/af_packet.c 2011-05-22 19:41:42.000000000 = -0400 @@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk =20 spin_lock(&sk->sk_receive_queue.lock); @@ -77724,9 +77826,9 @@ diff -urNp linux-2.6.39/net/packet/af_packet.c li= nux-2.6.39/net/packet/af_packet atomic_read(&s->sk_refcnt), s->sk_type, ntohs(po->num), -diff -urNp linux-2.6.39/net/phonet/af_phonet.c linux-2.6.39/net/phonet/a= f_phonet.c ---- linux-2.6.39/net/phonet/af_phonet.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/phonet/af_phonet.c 2011-05-22 19:41:42.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/phonet/af_phonet.c linux-2.6.39.1/net/phon= et/af_phonet.c +--- linux-2.6.39.1/net/phonet/af_phonet.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/phonet/af_phonet.c 2011-05-22 19:41:42.000000000 = -0400 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr { struct phonet_protocol *pp; @@ -77754,9 +77856,9 @@ diff -urNp linux-2.6.39/net/phonet/af_phonet.c li= nux-2.6.39/net/phonet/af_phonet return -EINVAL; =20 err =3D proto_register(pp->prot, 1); -diff -urNp linux-2.6.39/net/phonet/pep.c linux-2.6.39/net/phonet/pep.c ---- linux-2.6.39/net/phonet/pep.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/phonet/pep.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/phonet/pep.c linux-2.6.39.1/net/phonet/pep= .c +--- linux-2.6.39.1/net/phonet/pep.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/phonet/pep.c 2011-05-22 19:36:35.000000000 -0400 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk,=20 =20 case PNS_PEP_CTRL_REQ: @@ -77784,9 +77886,9 @@ diff -urNp linux-2.6.39/net/phonet/pep.c linux-2.= 6.39/net/phonet/pep.c err =3D NET_RX_DROP; break; } -diff -urNp linux-2.6.39/net/phonet/socket.c linux-2.6.39/net/phonet/sock= et.c ---- linux-2.6.39/net/phonet/socket.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/phonet/socket.c 2011-05-22 20:39:26.000000000 -0400 +diff -urNp linux-2.6.39.1/net/phonet/socket.c linux-2.6.39.1/net/phonet/= socket.c +--- linux-2.6.39.1/net/phonet/socket.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/phonet/socket.c 2011-05-22 20:39:26.000000000 -04= 00 @@ -613,8 +613,13 @@ static int pn_sock_seq_show(struct seq_f pn->resource, sk->sk_state, sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), @@ -77803,9 +77905,9 @@ diff -urNp linux-2.6.39/net/phonet/socket.c linux= -2.6.39/net/phonet/socket.c } seq_printf(seq, "%*s\n", 127 - len, ""); return 0; -diff -urNp linux-2.6.39/net/rds/cong.c linux-2.6.39/net/rds/cong.c ---- linux-2.6.39/net/rds/cong.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/cong.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/cong.c linux-2.6.39.1/net/rds/cong.c +--- linux-2.6.39.1/net/rds/cong.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/cong.c 2011-05-22 19:36:35.000000000 -0400 @@ -77,7 +77,7 @@ * finds that the saved generation number is smaller than the global ge= neration * number, it wakes up the process. @@ -77833,9 +77935,9 @@ diff -urNp linux-2.6.39/net/rds/cong.c linux-2.6.= 39/net/rds/cong.c =20 if (likely(*recent =3D=3D gen)) return 0; -diff -urNp linux-2.6.39/net/rds/ib_cm.c linux-2.6.39/net/rds/ib_cm.c ---- linux-2.6.39/net/rds/ib_cm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/ib_cm.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/ib_cm.c linux-2.6.39.1/net/rds/ib_cm.c +--- linux-2.6.39.1/net/rds/ib_cm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/ib_cm.c 2011-05-22 19:36:35.000000000 -0400 @@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con /* Clear the ACK state */ clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); @@ -77845,9 +77947,9 @@ diff -urNp linux-2.6.39/net/rds/ib_cm.c linux-2.6= .39/net/rds/ib_cm.c #else ic->i_ack_next =3D 0; #endif -diff -urNp linux-2.6.39/net/rds/ib.h linux-2.6.39/net/rds/ib.h ---- linux-2.6.39/net/rds/ib.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/ib.h 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/ib.h linux-2.6.39.1/net/rds/ib.h +--- linux-2.6.39.1/net/rds/ib.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/ib.h 2011-05-22 19:36:35.000000000 -0400 @@ -127,7 +127,7 @@ struct rds_ib_connection { /* sending acks */ unsigned long i_ack_flags; @@ -77857,9 +77959,9 @@ diff -urNp linux-2.6.39/net/rds/ib.h linux-2.6.39= /net/rds/ib.h #else spinlock_t i_ack_lock; /* protect i_ack_next */ u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-2.6.39/net/rds/ib_recv.c linux-2.6.39/net/rds/ib_recv.c ---- linux-2.6.39/net/rds/ib_recv.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/ib_recv.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/ib_recv.c linux-2.6.39.1/net/rds/ib_re= cv.c +--- linux-2.6.39.1/net/rds/ib_recv.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/ib_recv.c 2011-05-22 19:36:35.000000000 -0400 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_ static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq, int ack_required) @@ -77878,9 +77980,9 @@ diff -urNp linux-2.6.39/net/rds/ib_recv.c linux-2= .6.39/net/rds/ib_recv.c } #endif =20 -diff -urNp linux-2.6.39/net/rds/iw_cm.c linux-2.6.39/net/rds/iw_cm.c ---- linux-2.6.39/net/rds/iw_cm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/iw_cm.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/iw_cm.c linux-2.6.39.1/net/rds/iw_cm.c +--- linux-2.6.39.1/net/rds/iw_cm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/iw_cm.c 2011-05-22 19:36:35.000000000 -0400 @@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con /* Clear the ACK state */ clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); @@ -77890,9 +77992,9 @@ diff -urNp linux-2.6.39/net/rds/iw_cm.c linux-2.6= .39/net/rds/iw_cm.c #else ic->i_ack_next =3D 0; #endif -diff -urNp linux-2.6.39/net/rds/iw.h linux-2.6.39/net/rds/iw.h ---- linux-2.6.39/net/rds/iw.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/iw.h 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/iw.h linux-2.6.39.1/net/rds/iw.h +--- linux-2.6.39.1/net/rds/iw.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/iw.h 2011-05-22 19:36:35.000000000 -0400 @@ -133,7 +133,7 @@ struct rds_iw_connection { /* sending acks */ unsigned long i_ack_flags; @@ -77902,9 +78004,9 @@ diff -urNp linux-2.6.39/net/rds/iw.h linux-2.6.39= /net/rds/iw.h #else spinlock_t i_ack_lock; /* protect i_ack_next */ u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-2.6.39/net/rds/iw_rdma.c linux-2.6.39/net/rds/iw_rdma.c ---- linux-2.6.39/net/rds/iw_rdma.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/iw_rdma.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/iw_rdma.c linux-2.6.39.1/net/rds/iw_rd= ma.c +--- linux-2.6.39.1/net/rds/iw_rdma.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/iw_rdma.c 2011-05-22 19:36:35.000000000 -0400 @@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de struct rdma_cm_id *pcm_id; int rc; @@ -77914,9 +78016,9 @@ diff -urNp linux-2.6.39/net/rds/iw_rdma.c linux-2= .6.39/net/rds/iw_rdma.c src_addr =3D (struct sockaddr_in *)&cm_id->route.addr.src_addr; dst_addr =3D (struct sockaddr_in *)&cm_id->route.addr.dst_addr; =20 -diff -urNp linux-2.6.39/net/rds/iw_recv.c linux-2.6.39/net/rds/iw_recv.c ---- linux-2.6.39/net/rds/iw_recv.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rds/iw_recv.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rds/iw_recv.c linux-2.6.39.1/net/rds/iw_re= cv.c +--- linux-2.6.39.1/net/rds/iw_recv.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rds/iw_recv.c 2011-05-22 19:36:35.000000000 -0400 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_ static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq, int ack_required) @@ -77935,9 +78037,9 @@ diff -urNp linux-2.6.39/net/rds/iw_recv.c linux-2= .6.39/net/rds/iw_recv.c } #endif =20 -diff -urNp linux-2.6.39/net/rxrpc/af_rxrpc.c linux-2.6.39/net/rxrpc/af_r= xrpc.c ---- linux-2.6.39/net/rxrpc/af_rxrpc.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/rxrpc/af_rxrpc.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/rxrpc/af_rxrpc.c linux-2.6.39.1/net/rxrpc/= af_rxrpc.c +--- linux-2.6.39.1/net/rxrpc/af_rxrpc.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/rxrpc/af_rxrpc.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ __be32 rxrpc_epoch; =20 @@ -77947,9 +78049,9 @@ diff -urNp linux-2.6.39/net/rxrpc/af_rxrpc.c linu= x-2.6.39/net/rxrpc/af_rxrpc.c =20 /* count of skbs currently in use */ atomic_t rxrpc_n_skbs; -diff -urNp linux-2.6.39/net/rxrpc/ar-ack.c linux-2.6.39/net/rxrpc/ar-ack= .c ---- linux-2.6.39/net/rxrpc/ar-ack.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rxrpc/ar-ack.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-ack.c linux-2.6.39.1/net/rxrpc/ar= -ack.c +--- linux-2.6.39.1/net/rxrpc/ar-ack.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/rxrpc/ar-ack.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca =20 _enter("{%d,%d,%d,%d},", @@ -78022,9 +78124,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-ack.c linux-= 2.6.39/net/rxrpc/ar-ack.c _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial)); send_message_2: =20 -diff -urNp linux-2.6.39/net/rxrpc/ar-call.c linux-2.6.39/net/rxrpc/ar-ca= ll.c ---- linux-2.6.39/net/rxrpc/ar-call.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rxrpc/ar-call.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-call.c linux-2.6.39.1/net/rxrpc/a= r-call.c +--- linux-2.6.39.1/net/rxrpc/ar-call.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/rxrpc/ar-call.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca spin_lock_init(&call->lock); rwlock_init(&call->state_lock); @@ -78034,9 +78136,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-call.c linux= -2.6.39/net/rxrpc/ar-call.c call->state =3D RXRPC_CALL_CLIENT_SEND_REQUEST; =20 memset(&call->sock_node, 0xed, sizeof(call->sock_node)); -diff -urNp linux-2.6.39/net/rxrpc/ar-connection.c linux-2.6.39/net/rxrpc= /ar-connection.c ---- linux-2.6.39/net/rxrpc/ar-connection.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/net/rxrpc/ar-connection.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-connection.c linux-2.6.39.1/net/r= xrpc/ar-connection.c +--- linux-2.6.39.1/net/rxrpc/ar-connection.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/net/rxrpc/ar-connection.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al rwlock_init(&conn->lock); spin_lock_init(&conn->state_lock); @@ -78046,9 +78148,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-connection.c= linux-2.6.39/net/rxrpc/ar-conn conn->avail_calls =3D RXRPC_MAXCALLS; conn->size_align =3D 4; conn->header_size =3D sizeof(struct rxrpc_header); -diff -urNp linux-2.6.39/net/rxrpc/ar-connevent.c linux-2.6.39/net/rxrpc/= ar-connevent.c ---- linux-2.6.39/net/rxrpc/ar-connevent.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/rxrpc/ar-connevent.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-connevent.c linux-2.6.39.1/net/rx= rpc/ar-connevent.c +--- linux-2.6.39.1/net/rxrpc/ar-connevent.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/rxrpc/ar-connevent.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct =20 len =3D iov[0].iov_len + iov[1].iov_len; @@ -78058,9 +78160,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-connevent.c = linux-2.6.39/net/rxrpc/ar-conne _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code); =20 ret =3D kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len); -diff -urNp linux-2.6.39/net/rxrpc/ar-input.c linux-2.6.39/net/rxrpc/ar-i= nput.c ---- linux-2.6.39/net/rxrpc/ar-input.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/rxrpc/ar-input.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-input.c linux-2.6.39.1/net/rxrpc/= ar-input.c +--- linux-2.6.39.1/net/rxrpc/ar-input.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/rxrpc/ar-input.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx /* track the latest serial number on this connection for ACK packet * information */ @@ -78073,9 +78175,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-input.c linu= x-2.6.39/net/rxrpc/ar-input.c serial); =20 /* request ACK generation for any ACK or DATA packet that requests -diff -urNp linux-2.6.39/net/rxrpc/ar-internal.h linux-2.6.39/net/rxrpc/a= r-internal.h ---- linux-2.6.39/net/rxrpc/ar-internal.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/net/rxrpc/ar-internal.h 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-internal.h linux-2.6.39.1/net/rxr= pc/ar-internal.h +--- linux-2.6.39.1/net/rxrpc/ar-internal.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/net/rxrpc/ar-internal.h 2011-05-22 19:36:35.000000000= -0400 @@ -272,8 +272,8 @@ struct rxrpc_connection { int error; /* error code for local abort */ int debug_id; /* debug ID for printks */ @@ -78105,9 +78207,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-internal.h l= inux-2.6.39/net/rxrpc/ar-intern extern struct workqueue_struct *rxrpc_workqueue; =20 /* -diff -urNp linux-2.6.39/net/rxrpc/ar-local.c linux-2.6.39/net/rxrpc/ar-l= ocal.c ---- linux-2.6.39/net/rxrpc/ar-local.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/rxrpc/ar-local.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-local.c linux-2.6.39.1/net/rxrpc/= ar-local.c +--- linux-2.6.39.1/net/rxrpc/ar-local.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/rxrpc/ar-local.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st spin_lock_init(&local->lock); rwlock_init(&local->services_lock); @@ -78117,9 +78219,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-local.c linu= x-2.6.39/net/rxrpc/ar-local.c memcpy(&local->srx, srx, sizeof(*srx)); } =20 -diff -urNp linux-2.6.39/net/rxrpc/ar-output.c linux-2.6.39/net/rxrpc/ar-= output.c ---- linux-2.6.39/net/rxrpc/ar-output.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/net/rxrpc/ar-output.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-output.c linux-2.6.39.1/net/rxrpc= /ar-output.c +--- linux-2.6.39.1/net/rxrpc/ar-output.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/net/rxrpc/ar-output.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb=20 sp->hdr.cid =3D call->cid; sp->hdr.callNumber =3D call->call_id; @@ -78132,9 +78234,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-output.c lin= ux-2.6.39/net/rxrpc/ar-output.c sp->hdr.type =3D RXRPC_PACKET_TYPE_DATA; sp->hdr.userStatus =3D 0; sp->hdr.securityIndex =3D conn->security_ix; -diff -urNp linux-2.6.39/net/rxrpc/ar-peer.c linux-2.6.39/net/rxrpc/ar-pe= er.c ---- linux-2.6.39/net/rxrpc/ar-peer.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rxrpc/ar-peer.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-peer.c linux-2.6.39.1/net/rxrpc/a= r-peer.c +--- linux-2.6.39.1/net/rxrpc/ar-peer.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/rxrpc/ar-peer.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -71,7 +71,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe INIT_LIST_HEAD(&peer->error_targets); spin_lock_init(&peer->lock); @@ -78144,9 +78246,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-peer.c linux= -2.6.39/net/rxrpc/ar-peer.c memcpy(&peer->srx, srx, sizeof(*srx)); =20 rxrpc_assess_MTU_size(peer); -diff -urNp linux-2.6.39/net/rxrpc/ar-proc.c linux-2.6.39/net/rxrpc/ar-pr= oc.c ---- linux-2.6.39/net/rxrpc/ar-proc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rxrpc/ar-proc.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-proc.c linux-2.6.39.1/net/rxrpc/a= r-proc.c +--- linux-2.6.39.1/net/rxrpc/ar-proc.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/rxrpc/ar-proc.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str atomic_read(&conn->usage), rxrpc_conn_states[conn->state], @@ -78158,9 +78260,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-proc.c linux= -2.6.39/net/rxrpc/ar-proc.c =20 return 0; } -diff -urNp linux-2.6.39/net/rxrpc/ar-transport.c linux-2.6.39/net/rxrpc/= ar-transport.c ---- linux-2.6.39/net/rxrpc/ar-transport.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/rxrpc/ar-transport.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/ar-transport.c linux-2.6.39.1/net/rx= rpc/ar-transport.c +--- linux-2.6.39.1/net/rxrpc/ar-transport.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/rxrpc/ar-transport.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all spin_lock_init(&trans->client_lock); rwlock_init(&trans->conn_lock); @@ -78170,9 +78272,9 @@ diff -urNp linux-2.6.39/net/rxrpc/ar-transport.c = linux-2.6.39/net/rxrpc/ar-trans =20 if (peer->srx.transport.family =3D=3D AF_INET) { switch (peer->srx.transport_type) { -diff -urNp linux-2.6.39/net/rxrpc/rxkad.c linux-2.6.39/net/rxrpc/rxkad.c ---- linux-2.6.39/net/rxrpc/rxkad.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/rxrpc/rxkad.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/rxrpc/rxkad.c linux-2.6.39.1/net/rxrpc/rxk= ad.c +--- linux-2.6.39.1/net/rxrpc/rxkad.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/rxrpc/rxkad.c 2011-05-22 19:36:35.000000000 -0400 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c u16 check; int nsg; @@ -78209,9 +78311,9 @@ diff -urNp linux-2.6.39/net/rxrpc/rxkad.c linux-2= .6.39/net/rxrpc/rxkad.c _proto("Tx RESPONSE %%%u", ntohl(hdr->serial)); =20 ret =3D kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); -diff -urNp linux-2.6.39/net/sched/em_meta.c linux-2.6.39/net/sched/em_me= ta.c ---- linux-2.6.39/net/sched/em_meta.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/sched/em_meta.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sched/em_meta.c linux-2.6.39.1/net/sched/e= m_meta.c +--- linux-2.6.39.1/net/sched/em_meta.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/net/sched/em_meta.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -832,7 +832,7 @@ static int em_meta_dump(struct sk_buff * { struct meta_match *meta =3D (struct meta_match *) em->data; @@ -78221,9 +78323,9 @@ diff -urNp linux-2.6.39/net/sched/em_meta.c linux= -2.6.39/net/sched/em_meta.c =20 memset(&hdr, 0, sizeof(hdr)); memcpy(&hdr.left, &meta->lvalue.hdr, sizeof(hdr.left)); -diff -urNp linux-2.6.39/net/sctp/proc.c linux-2.6.39/net/sctp/proc.c ---- linux-2.6.39/net/sctp/proc.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/sctp/proc.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sctp/proc.c linux-2.6.39.1/net/sctp/proc.c +--- linux-2.6.39.1/net/sctp/proc.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/sctp/proc.c 2011-05-22 19:41:42.000000000 -0400 @@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_ sctp_for_each_hentry(epb, node, &head->chain) { ep =3D sctp_ep(epb); @@ -78252,9 +78354,9 @@ diff -urNp linux-2.6.39/net/sctp/proc.c linux-2.6= .39/net/sctp/proc.c assoc->state, hash, assoc->assoc_id, assoc->sndbuf_used, -diff -urNp linux-2.6.39/net/sctp/socket.c linux-2.6.39/net/sctp/socket.c ---- linux-2.6.39/net/sctp/socket.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/sctp/socket.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sctp/socket.c linux-2.6.39.1/net/sctp/sock= et.c +--- linux-2.6.39.1/net/sctp/socket.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/sctp/socket.c 2011-05-22 19:36:35.000000000 -0400 @@ -4433,7 +4433,7 @@ static int sctp_getsockopt_peer_addrs(st addrlen =3D sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) @@ -78264,9 +78366,9 @@ diff -urNp linux-2.6.39/net/sctp/socket.c linux-2= .6.39/net/sctp/socket.c return -EFAULT; to +=3D addrlen; cnt++; -diff -urNp linux-2.6.39/net/socket.c linux-2.6.39/net/socket.c ---- linux-2.6.39/net/socket.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/socket.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/socket.c linux-2.6.39.1/net/socket.c +--- linux-2.6.39.1/net/socket.c 2011-06-03 00:04:14.000000000 -0400 ++++ linux-2.6.39.1/net/socket.c 2011-06-03 00:32:08.000000000 -0400 @@ -88,6 +88,7 @@ #include #include @@ -78426,9 +78528,9 @@ diff -urNp linux-2.6.39/net/socket.c linux-2.6.39= /net/socket.c err =3D -EFAULT; if (MSG_CMSG_COMPAT & flags) { if (get_compat_msghdr(&msg_sys, msg_compat)) -diff -urNp linux-2.6.39/net/sunrpc/sched.c linux-2.6.39/net/sunrpc/sched= .c ---- linux-2.6.39/net/sunrpc/sched.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/sunrpc/sched.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sunrpc/sched.c linux-2.6.39.1/net/sunrpc/s= ched.c +--- linux-2.6.39.1/net/sunrpc/sched.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/sunrpc/sched.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w #ifdef RPC_DEBUG static void rpc_task_set_debuginfo(struct rpc_task *task) @@ -78441,9 +78543,9 @@ diff -urNp linux-2.6.39/net/sunrpc/sched.c linux-= 2.6.39/net/sunrpc/sched.c } #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) -diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.39/net/= sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.39.1/= net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size =3D RPCR static unsigned int min_max_inline =3D 4096; static unsigned int max_max_inline =3D 65536; @@ -78551,9 +78653,9 @@ diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_r= dma.c linux-2.6.39/net/sunrpc/x .mode =3D 0644, .proc_handler =3D read_reset_stat, }, -diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.= 6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c ---- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-05-22 19:3= 6:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-= 2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +--- linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-05-22 19= :36:35.000000000 -0400 @@ -499,7 +499,7 @@ next_sge: svc_rdma_put_context(ctxt, 0); goto out; @@ -78581,9 +78683,9 @@ diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_r= dma_recvfrom.c linux-2.6.39/net =20 /* Build up the XDR from the receive buffers. */ rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len); -diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.= 39/net/sunrpc/xprtrdma/svc_rdma_sendto.c ---- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-05-19 00:06:= 34.000000000 -0400 -+++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-05-22 19:36:= 35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.= 6.39.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c +--- linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-05-19 00:0= 6:34.000000000 -0400 ++++ linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-05-22 19:3= 6:35.000000000 -0400 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm write_wr.wr.rdma.remote_addr =3D to; =20 @@ -78593,9 +78695,9 @@ diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_r= dma_sendto.c linux-2.6.39/net/s if (svc_rdma_send(xprt, &write_wr)) goto err; return 0; -diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2= .6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c ---- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-05-19 00:= 06:34.000000000 -0400 -+++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-05-22 19:= 36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_transport.c linux= -2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_transport.c +--- linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-05-19 0= 0:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-05-22 1= 9:36:35.000000000 -0400 @@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd return; =20 @@ -78641,9 +78743,9 @@ diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_r= dma_transport.c linux-2.6.39/ne =20 /* See if we can opportunistically reap SQ WR to make room */ sq_cq_reap(xprt); -diff -urNp linux-2.6.39/net/sysctl_net.c linux-2.6.39/net/sysctl_net.c ---- linux-2.6.39/net/sysctl_net.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/sysctl_net.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/sysctl_net.c linux-2.6.39.1/net/sysctl_net= .c +--- linux-2.6.39.1/net/sysctl_net.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/net/sysctl_net.c 2011-05-22 19:41:42.000000000 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -78653,9 +78755,9 @@ diff -urNp linux-2.6.39/net/sysctl_net.c linux-2.= 6.39/net/sysctl_net.c int mode =3D (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.39/net/unix/af_unix.c linux-2.6.39/net/unix/af_unix= .c ---- linux-2.6.39/net/unix/af_unix.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/net/unix/af_unix.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/net/unix/af_unix.c linux-2.6.39.1/net/unix/af_= unix.c +--- linux-2.6.39.1/net/unix/af_unix.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/net/unix/af_unix.c 2011-05-22 19:41:42.000000000 -040= 0 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru err =3D -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -78726,9 +78828,9 @@ diff -urNp linux-2.6.39/net/unix/af_unix.c linux-= 2.6.39/net/unix/af_unix.c atomic_read(&s->sk_refcnt), 0, s->sk_state =3D=3D TCP_LISTEN ? __SO_ACCEPTCON : 0, -diff -urNp linux-2.6.39/net/wireless/wext-core.c linux-2.6.39/net/wirele= ss/wext-core.c ---- linux-2.6.39/net/wireless/wext-core.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/net/wireless/wext-core.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/net/wireless/wext-core.c linux-2.6.39.1/net/wi= reless/wext-core.c +--- linux-2.6.39.1/net/wireless/wext-core.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/net/wireless/wext-core.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc */ =20 @@ -78762,9 +78864,9 @@ diff -urNp linux-2.6.39/net/wireless/wext-core.c = linux-2.6.39/net/wireless/wext- err =3D handler(dev, info, (union iwreq_data *) iwp, extra); =20 iwp->length +=3D essid_compat; -diff -urNp linux-2.6.39/net/xfrm/xfrm_policy.c linux-2.6.39/net/xfrm/xfr= m_policy.c ---- linux-2.6.39/net/xfrm/xfrm_policy.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/net/xfrm/xfrm_policy.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/net/xfrm/xfrm_policy.c linux-2.6.39.1/net/xfrm= /xfrm_policy.c +--- linux-2.6.39.1/net/xfrm/xfrm_policy.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/net/xfrm/xfrm_policy.c 2011-05-22 19:36:35.000000000 = -0400 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm { policy->walk.dead =3D 1; @@ -78837,9 +78939,9 @@ diff -urNp linux-2.6.39/net/xfrm/xfrm_policy.c li= nux-2.6.39/net/xfrm/xfrm_policy } } =20 -diff -urNp linux-2.6.39/net/xfrm/xfrm_user.c linux-2.6.39/net/xfrm/xfrm_= user.c ---- linux-2.6.39/net/xfrm/xfrm_user.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/net/xfrm/xfrm_user.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/net/xfrm/xfrm_user.c linux-2.6.39.1/net/xfrm/x= frm_user.c +--- linux-2.6.39.1/net/xfrm/xfrm_user.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/net/xfrm/xfrm_user.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH]; int i; @@ -78858,9 +78960,9 @@ diff -urNp linux-2.6.39/net/xfrm/xfrm_user.c linu= x-2.6.39/net/xfrm/xfrm_user.c if (attrs[XFRMA_MIGRATE] =3D=3D NULL) return -EINVAL; =20 -diff -urNp linux-2.6.39/scripts/basic/fixdep.c linux-2.6.39/scripts/basi= c/fixdep.c ---- linux-2.6.39/scripts/basic/fixdep.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/scripts/basic/fixdep.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/scripts/basic/fixdep.c linux-2.6.39.1/scripts/= basic/fixdep.c +--- linux-2.6.39.1/scripts/basic/fixdep.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/scripts/basic/fixdep.c 2011-05-22 19:36:35.000000000 = -0400 @@ -235,9 +235,9 @@ static void use_config(const char *m, in =20 static void parse_config_file(const char *map, size_t len) @@ -78882,9 +78984,9 @@ diff -urNp linux-2.6.39/scripts/basic/fixdep.c li= nux-2.6.39/scripts/basic/fixdep =20 if (*p !=3D INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) !=3D 4 or wrong endianess? %#x\n= ", -diff -urNp linux-2.6.39/scripts/dtc/flattree.c linux-2.6.39/scripts/dtc/= flattree.c ---- linux-2.6.39/scripts/dtc/flattree.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/scripts/dtc/flattree.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/scripts/dtc/flattree.c linux-2.6.39.1/scripts/= dtc/flattree.c +--- linux-2.6.39.1/scripts/dtc/flattree.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/scripts/dtc/flattree.c 2011-05-22 19:36:35.000000000 = -0400 @@ -104,7 +104,7 @@ static void bin_emit_property(void *e, s bin_emit_cell(e, FDT_PROP); } @@ -78903,9 +79005,53 @@ diff -urNp linux-2.6.39/scripts/dtc/flattree.c l= inux-2.6.39/scripts/dtc/flattree .cell =3D asm_emit_cell, .string =3D asm_emit_string, .align =3D asm_emit_align, -diff -urNp linux-2.6.39/scripts/mod/file2alias.c linux-2.6.39/scripts/mo= d/file2alias.c ---- linux-2.6.39/scripts/mod/file2alias.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/scripts/mod/file2alias.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/scripts/Makefile.build linux-2.6.39.1/scripts/= Makefile.build +--- linux-2.6.39.1/scripts/Makefile.build 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/scripts/Makefile.build 2011-06-03 01:15:00.000000000 = -0400 +@@ -93,7 +93,7 @@ endif + endif +=20 + # Do not include host rules unless needed +-ifneq ($(hostprogs-y)$(hostprogs-m),) ++ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m),) + include scripts/Makefile.host + endif +=20 +diff -urNp linux-2.6.39.1/scripts/Makefile.clean linux-2.6.39.1/scripts/= Makefile.clean +--- linux-2.6.39.1/scripts/Makefile.clean 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/scripts/Makefile.clean 2011-06-03 01:16:02.000000000 = -0400 +@@ -43,7 +43,8 @@ subdir-ymn :=3D $(addprefix $(obj)/,$(subd + __clean-files :=3D $(extra-y) $(always) \ + $(targets) $(clean-files) \ + $(host-progs) \ +- $(hostprogs-y) $(hostprogs-m) $(hostprogs-) ++ $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \ ++ $(hostlibs-y) $(hostlibs-m) $(hostlibs-) +=20 + __clean-files :=3D $(filter-out $(no-clean-files), $(__clean-files)) +=20 +diff -urNp linux-2.6.39.1/scripts/Makefile.host linux-2.6.39.1/scripts/M= akefile.host +--- linux-2.6.39.1/scripts/Makefile.host 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/scripts/Makefile.host 2011-06-03 01:17:12.000000000 -= 0400 +@@ -31,6 +31,7 @@ + # Note: Shared libraries consisting of C++ files are not supported +=20 + __hostprogs :=3D $(sort $(hostprogs-y) $(hostprogs-m)) ++__hostlibs :=3D $(sort $(hostlibs-y) $(hostlibs-m)) +=20 + # C code + # Executables compiled from a single .c file +@@ -54,6 +55,7 @@ host-cxxobjs :=3D $(sort $(foreach m,$(hos + # Shared libaries (only .c supported) + # Shared libraries (.so) - all .so files referenced in "xxx-objs" + host-cshlib :=3D $(sort $(filter %.so, $(host-cobjs))) ++host-cshlib +=3D $(sort $(filter %.so, $(__hostlibs))) + # Remove .so files from "xxx-objs" + host-cobjs :=3D $(filter-out %.so,$(host-cobjs)) +=20 +diff -urNp linux-2.6.39.1/scripts/mod/file2alias.c linux-2.6.39.1/script= s/mod/file2alias.c +--- linux-2.6.39.1/scripts/mod/file2alias.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/scripts/mod/file2alias.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -78960,9 +79106,9 @@ diff -urNp linux-2.6.39/scripts/mod/file2alias.c = linux-2.6.39/scripts/mod/file2a =20 sprintf(alias, "dmi*"); =20 -diff -urNp linux-2.6.39/scripts/mod/modpost.c linux-2.6.39/scripts/mod/m= odpost.c ---- linux-2.6.39/scripts/mod/modpost.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/scripts/mod/modpost.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/scripts/mod/modpost.c linux-2.6.39.1/scripts/m= od/modpost.c +--- linux-2.6.39.1/scripts/mod/modpost.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/scripts/mod/modpost.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -896,6 +896,7 @@ enum mismatch { ANY_INIT_TO_ANY_EXIT, ANY_EXIT_TO_ANY_INIT, @@ -79030,9 +79176,9 @@ diff -urNp linux-2.6.39/scripts/mod/modpost.c lin= ux-2.6.39/scripts/mod/modpost.c goto close_write; =20 tmp =3D NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.39/scripts/mod/modpost.h linux-2.6.39/scripts/mod/m= odpost.h ---- linux-2.6.39/scripts/mod/modpost.h 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/scripts/mod/modpost.h 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/scripts/mod/modpost.h linux-2.6.39.1/scripts/m= od/modpost.h +--- linux-2.6.39.1/scripts/mod/modpost.h 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/scripts/mod/modpost.h 2011-05-22 19:36:35.000000000 -= 0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e =20 struct buffer { @@ -79052,9 +79198,9 @@ diff -urNp linux-2.6.39/scripts/mod/modpost.h lin= ux-2.6.39/scripts/mod/modpost.h =20 struct module { struct module *next; -diff -urNp linux-2.6.39/scripts/mod/sumversion.c linux-2.6.39/scripts/mo= d/sumversion.c ---- linux-2.6.39/scripts/mod/sumversion.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/scripts/mod/sumversion.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/scripts/mod/sumversion.c linux-2.6.39.1/script= s/mod/sumversion.c +--- linux-2.6.39.1/scripts/mod/sumversion.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/scripts/mod/sumversion.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -470,7 +470,7 @@ static void write_version(const char *fi goto out; } @@ -79064,9 +79210,9 @@ diff -urNp linux-2.6.39/scripts/mod/sumversion.c = linux-2.6.39/scripts/mod/sumver warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.39/scripts/pnmtologo.c linux-2.6.39/scripts/pnmtolo= go.c ---- linux-2.6.39/scripts/pnmtologo.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/scripts/pnmtologo.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/scripts/pnmtologo.c linux-2.6.39.1/scripts/pnm= tologo.c +--- linux-2.6.39.1/scripts/pnmtologo.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/scripts/pnmtologo.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -79093,10 +79239,10 @@ diff -urNp linux-2.6.39/scripts/pnmtologo.c lin= ux-2.6.39/scripts/pnmtologo.c logoname); write_hex_cnt =3D 0; for (i =3D 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.39/security/apparmor/lsm.c linux-2.6.39/security/ap= parmor/lsm.c ---- linux-2.6.39/security/apparmor/lsm.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/security/apparmor/lsm.c 2011-05-22 19:41:42.000000000 -= 0400 -@@ -620,7 +620,7 @@ static int apparmor_task_setrlimit(struc +diff -urNp linux-2.6.39.1/security/apparmor/lsm.c linux-2.6.39.1/securit= y/apparmor/lsm.c +--- linux-2.6.39.1/security/apparmor/lsm.c 2011-06-03 00:04:14.000000000= -0400 ++++ linux-2.6.39.1/security/apparmor/lsm.c 2011-06-03 00:32:08.000000000= -0400 +@@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc return error; } =20 @@ -79105,7 +79251,7 @@ diff -urNp linux-2.6.39/security/apparmor/lsm.c l= inux-2.6.39/security/apparmor/l .name =3D "apparmor", =20 .ptrace_access_check =3D apparmor_ptrace_access_check, -@@ -671,7 +671,7 @@ static struct security_operations apparm +@@ -672,7 +672,7 @@ static struct security_operations apparm static int param_set_aabool(const char *val, const struct kernel_param = *kp); static int param_get_aabool(char *buffer, const struct kernel_param *kp= ); #define param_check_aabool(name, p) __param_check(name, p, int) @@ -79114,7 +79260,7 @@ diff -urNp linux-2.6.39/security/apparmor/lsm.c l= inux-2.6.39/security/apparmor/l .set =3D param_set_aabool, .get =3D param_get_aabool }; -@@ -679,7 +679,7 @@ static struct kernel_param_ops param_ops +@@ -680,7 +680,7 @@ static struct kernel_param_ops param_ops static int param_set_aauint(const char *val, const struct kernel_param = *kp); static int param_get_aauint(char *buffer, const struct kernel_param *kp= ); #define param_check_aauint(name, p) __param_check(name, p, int) @@ -79123,7 +79269,7 @@ diff -urNp linux-2.6.39/security/apparmor/lsm.c l= inux-2.6.39/security/apparmor/l .set =3D param_set_aauint, .get =3D param_get_aauint }; -@@ -687,7 +687,7 @@ static struct kernel_param_ops param_ops +@@ -688,7 +688,7 @@ static struct kernel_param_ops param_ops static int param_set_aalockpolicy(const char *val, const struct kernel_= param *kp); static int param_get_aalockpolicy(char *buffer, const struct kernel_par= am *kp); #define param_check_aalockpolicy(name, p) __param_check(name, p, int) @@ -79132,9 +79278,9 @@ diff -urNp linux-2.6.39/security/apparmor/lsm.c l= inux-2.6.39/security/apparmor/l .set =3D param_set_aalockpolicy, .get =3D param_get_aalockpolicy }; -diff -urNp linux-2.6.39/security/commoncap.c linux-2.6.39/security/commo= ncap.c ---- linux-2.6.39/security/commoncap.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/security/commoncap.c 2011-05-22 20:28:59.000000000 -040= 0 +diff -urNp linux-2.6.39.1/security/commoncap.c linux-2.6.39.1/security/c= ommoncap.c +--- linux-2.6.39.1/security/commoncap.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/security/commoncap.c 2011-05-22 20:28:59.000000000 -0= 400 @@ -28,6 +28,7 @@ #include #include @@ -79162,9 +79308,9 @@ diff -urNp linux-2.6.39/security/commoncap.c linu= x-2.6.39/security/commoncap.c if (cred->uid !=3D 0) { if (bprm->cap_effective) return 1; -diff -urNp linux-2.6.39/security/integrity/ima/ima_api.c linux-2.6.39/se= curity/integrity/ima/ima_api.c ---- linux-2.6.39/security/integrity/ima/ima_api.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/security/integrity/ima/ima_api.c 2011-05-22 19:36:35.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/security/integrity/ima/ima_api.c linux-2.6.39.= 1/security/integrity/ima/ima_api.c +--- linux-2.6.39.1/security/integrity/ima/ima_api.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/security/integrity/ima/ima_api.c 2011-05-22 19:36:35.= 000000000 -0400 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino int result; =20 @@ -79174,9 +79320,9 @@ diff -urNp linux-2.6.39/security/integrity/ima/im= a_api.c linux-2.6.39/security/i =20 entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.39/security/integrity/ima/ima_fs.c linux-2.6.39/sec= urity/integrity/ima/ima_fs.c ---- linux-2.6.39/security/integrity/ima/ima_fs.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/security/integrity/ima/ima_fs.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/security/integrity/ima/ima_fs.c linux-2.6.39.1= /security/integrity/ima/ima_fs.c +--- linux-2.6.39.1/security/integrity/ima/ima_fs.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/security/integrity/ima/ima_fs.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -28,12 +28,12 @@ static int valid_policy =3D 1; #define TMPBUFLEN 12 @@ -79192,9 +79338,9 @@ diff -urNp linux-2.6.39/security/integrity/ima/im= a_fs.c linux-2.6.39/security/in return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } =20 -diff -urNp linux-2.6.39/security/integrity/ima/ima.h linux-2.6.39/securi= ty/integrity/ima/ima.h ---- linux-2.6.39/security/integrity/ima/ima.h 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/security/integrity/ima/ima.h 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/security/integrity/ima/ima.h linux-2.6.39.1/se= curity/integrity/ima/ima.h +--- linux-2.6.39.1/security/integrity/ima/ima.h 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/security/integrity/ima/ima.h 2011-05-22 19:36:35.0000= 00000 -0400 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; =20 @@ -79206,9 +79352,9 @@ diff -urNp linux-2.6.39/security/integrity/ima/im= a.h linux-2.6.39/security/integ struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.39/security/integrity/ima/ima_queue.c linux-2.6.39/= security/integrity/ima/ima_queue.c ---- linux-2.6.39/security/integrity/ima/ima_queue.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/security/integrity/ima/ima_queue.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/security/integrity/ima/ima_queue.c linux-2.6.3= 9.1/security/integrity/ima/ima_queue.c +--- linux-2.6.39.1/security/integrity/ima/ima_queue.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/security/integrity/ima/ima_queue.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -79218,10 +79364,10 @@ diff -urNp linux-2.6.39/security/integrity/ima/= ima_queue.c linux-2.6.39/security key =3D ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.39/security/Kconfig linux-2.6.39/security/Kconfig ---- linux-2.6.39/security/Kconfig 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/security/Kconfig 2011-05-22 19:41:42.000000000 -0400 -@@ -4,6 +4,548 @@ +diff -urNp linux-2.6.39.1/security/Kconfig linux-2.6.39.1/security/Kconf= ig +--- linux-2.6.39.1/security/Kconfig 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/security/Kconfig 2011-06-03 01:13:26.000000000 -0400 +@@ -4,6 +4,554 @@ =20 menu "Security options" =20 @@ -79696,6 +79842,12 @@ diff -urNp linux-2.6.39/security/Kconfig linux-2= .6.39/security/Kconfig + and you are advised to test this feature on your expected workload + before deploying it. + ++ Note: full support for this feature requires gcc with plugin support ++ so make sure your compiler is at least gcc 4.5.0 (cross compilation ++ is not supported). Using older gcc versions means that functions ++ with large enough stack frames may leave uninitialized memory behind ++ that may be exposed to a later syscall leaking the stack. ++ +config PAX_MEMORY_UDEREF + bool "Prevent invalid userland pointer dereference" + depends on X86 && !UML_X86 && !XEN @@ -79770,7 +79922,7 @@ diff -urNp linux-2.6.39/security/Kconfig linux-2.= 6.39/security/Kconfig config KEYS bool "Enable access key retention support" help -@@ -167,7 +709,7 @@ config INTEL_TXT +@@ -167,7 +715,7 @@ config INTEL_TXT config LSM_MMAP_MIN_ADDR int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX @@ -79779,9 +79931,9 @@ diff -urNp linux-2.6.39/security/Kconfig linux-2.= 6.39/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.39/security/keys/keyring.c linux-2.6.39/security/ke= ys/keyring.c ---- linux-2.6.39/security/keys/keyring.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/security/keys/keyring.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/security/keys/keyring.c linux-2.6.39.1/securit= y/keys/keyring.c +--- linux-2.6.39.1/security/keys/keyring.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/security/keys/keyring.c 2011-05-22 19:36:35.000000000= -0400 @@ -213,15 +213,15 @@ static long keyring_read(const struct ke ret =3D -EFAULT; =20 @@ -79801,9 +79953,9 @@ diff -urNp linux-2.6.39/security/keys/keyring.c l= inux-2.6.39/security/keys/keyri goto error; =20 buflen -=3D tmp; -diff -urNp linux-2.6.39/security/min_addr.c linux-2.6.39/security/min_ad= dr.c ---- linux-2.6.39/security/min_addr.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/security/min_addr.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/security/min_addr.c linux-2.6.39.1/security/mi= n_addr.c +--- linux-2.6.39.1/security/min_addr.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/security/min_addr.c 2011-05-22 19:41:42.000000000 -04= 00 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr =3D CONFIG */ static void update_mmap_min_addr(void) @@ -79820,9 +79972,9 @@ diff -urNp linux-2.6.39/security/min_addr.c linux= -2.6.39/security/min_addr.c } =20 /* -diff -urNp linux-2.6.39/security/security.c linux-2.6.39/security/securi= ty.c ---- linux-2.6.39/security/security.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/security/security.c 2011-05-22 19:41:42.000000000 -0400 +diff -urNp linux-2.6.39.1/security/security.c linux-2.6.39.1/security/se= curity.c +--- linux-2.6.39.1/security/security.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/security/security.c 2011-05-22 19:41:42.000000000 -04= 00 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI /* things that live in capability.c */ extern void __init security_fixup_ops(struct security_operations *ops); @@ -79844,9 +79996,9 @@ diff -urNp linux-2.6.39/security/security.c linux= -2.6.39/security/security.c } =20 /* Save user chosen LSM */ -diff -urNp linux-2.6.39/security/selinux/hooks.c linux-2.6.39/security/s= elinux/hooks.c ---- linux-2.6.39/security/selinux/hooks.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/security/selinux/hooks.c 2011-05-22 19:41:42.000000000 = -0400 +diff -urNp linux-2.6.39.1/security/selinux/hooks.c linux-2.6.39.1/securi= ty/selinux/hooks.c +--- linux-2.6.39.1/security/selinux/hooks.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/security/selinux/hooks.c 2011-05-22 19:41:42.00000000= 0 -0400 @@ -93,7 +93,6 @@ #define NUM_SEL_MNT_OPTS 5 =20 @@ -79864,9 +80016,9 @@ diff -urNp linux-2.6.39/security/selinux/hooks.c = linux-2.6.39/security/selinux/h .name =3D "selinux", =20 .ptrace_access_check =3D selinux_ptrace_access_check, -diff -urNp linux-2.6.39/security/selinux/include/xfrm.h linux-2.6.39/sec= urity/selinux/include/xfrm.h ---- linux-2.6.39/security/selinux/include/xfrm.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/security/selinux/include/xfrm.h 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/security/selinux/include/xfrm.h linux-2.6.39.1= /security/selinux/include/xfrm.h +--- linux-2.6.39.1/security/selinux/include/xfrm.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/security/selinux/include/xfrm.h 2011-05-22 19:36:35.0= 00000000 -0400 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s =20 static inline void selinux_xfrm_notify_policyload(void) @@ -79876,9 +80028,9 @@ diff -urNp linux-2.6.39/security/selinux/include/= xfrm.h linux-2.6.39/security/se } #else static inline int selinux_xfrm_enabled(void) -diff -urNp linux-2.6.39/security/selinux/ss/services.c linux-2.6.39/secu= rity/selinux/ss/services.c ---- linux-2.6.39/security/selinux/ss/services.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/security/selinux/ss/services.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/security/selinux/ss/services.c linux-2.6.39.1/= security/selinux/ss/services.c +--- linux-2.6.39.1/security/selinux/ss/services.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/security/selinux/ss/services.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -1806,6 +1806,8 @@ int security_load_policy(void *data, siz int rc =3D 0; struct policy_file file =3D { data, len }, *fp =3D &file; @@ -79888,9 +80040,9 @@ diff -urNp linux-2.6.39/security/selinux/ss/servi= ces.c linux-2.6.39/security/sel if (!ss_initialized) { avtab_cache_init(); rc =3D policydb_read(&policydb, fp); -diff -urNp linux-2.6.39/security/smack/smack_lsm.c linux-2.6.39/security= /smack/smack_lsm.c ---- linux-2.6.39/security/smack/smack_lsm.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/security/smack/smack_lsm.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/security/smack/smack_lsm.c linux-2.6.39.1/secu= rity/smack/smack_lsm.c +--- linux-2.6.39.1/security/smack/smack_lsm.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/security/smack/smack_lsm.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -3386,7 +3386,7 @@ static int smack_inode_getsecctx(struct=20 return 0; } @@ -79900,9 +80052,9 @@ diff -urNp linux-2.6.39/security/smack/smack_lsm.= c linux-2.6.39/security/smack/s .name =3D "smack", =20 .ptrace_access_check =3D smack_ptrace_access_check, -diff -urNp linux-2.6.39/security/tomoyo/tomoyo.c linux-2.6.39/security/t= omoyo/tomoyo.c ---- linux-2.6.39/security/tomoyo/tomoyo.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/security/tomoyo/tomoyo.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/security/tomoyo/tomoyo.c linux-2.6.39.1/securi= ty/tomoyo/tomoyo.c +--- linux-2.6.39.1/security/tomoyo/tomoyo.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/security/tomoyo/tomoyo.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa * tomoyo_security_ops is a "struct security_operations" which is used = for * registering TOMOYO. @@ -79912,9 +80064,9 @@ diff -urNp linux-2.6.39/security/tomoyo/tomoyo.c = linux-2.6.39/security/tomoyo/to .name =3D "tomoyo", .cred_alloc_blank =3D tomoyo_cred_alloc_blank, .cred_prepare =3D tomoyo_cred_prepare, -diff -urNp linux-2.6.39/sound/aoa/aoa.h linux-2.6.39/sound/aoa/aoa.h ---- linux-2.6.39/sound/aoa/aoa.h 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/aoa/aoa.h 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/aoa/aoa.h linux-2.6.39.1/sound/aoa/aoa.h +--- linux-2.6.39.1/sound/aoa/aoa.h 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/aoa/aoa.h 2011-05-22 19:36:35.000000000 -0400 @@ -122,8 +122,8 @@ extern struct snd_card *aoa_get_card(voi extern int aoa_snd_ctl_add(struct snd_kcontrol* control); =20 @@ -79926,9 +80078,9 @@ diff -urNp linux-2.6.39/sound/aoa/aoa.h linux-2.6= .39/sound/aoa/aoa.h /* extern struct gpio_methods *map_gpio_methods; */ =20 #endif /* __AOA_H */ -diff -urNp linux-2.6.39/sound/aoa/codecs/onyx.c linux-2.6.39/sound/aoa/c= odecs/onyx.c ---- linux-2.6.39/sound/aoa/codecs/onyx.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/aoa/codecs/onyx.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/aoa/codecs/onyx.c linux-2.6.39.1/sound/a= oa/codecs/onyx.c +--- linux-2.6.39.1/sound/aoa/codecs/onyx.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/aoa/codecs/onyx.c 2011-05-22 19:36:35.000000000= -0400 @@ -54,7 +54,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -79957,9 +80109,9 @@ diff -urNp linux-2.6.39/sound/aoa/codecs/onyx.c l= inux-2.6.39/sound/aoa/codecs/on onyx->spdif_locked =3D onyx->analog_locked =3D 0; mutex_unlock(&onyx->mutex); =20 -diff -urNp linux-2.6.39/sound/aoa/codecs/onyx.h linux-2.6.39/sound/aoa/c= odecs/onyx.h ---- linux-2.6.39/sound/aoa/codecs/onyx.h 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/aoa/codecs/onyx.h 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/aoa/codecs/onyx.h linux-2.6.39.1/sound/a= oa/codecs/onyx.h +--- linux-2.6.39.1/sound/aoa/codecs/onyx.h 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/aoa/codecs/onyx.h 2011-05-22 19:36:35.000000000= -0400 @@ -11,6 +11,7 @@ #include #include @@ -79968,9 +80120,9 @@ diff -urNp linux-2.6.39/sound/aoa/codecs/onyx.h l= inux-2.6.39/sound/aoa/codecs/on =20 /* PCM3052 register definitions */ =20 -diff -urNp linux-2.6.39/sound/arm/aaci.c linux-2.6.39/sound/arm/aaci.c ---- linux-2.6.39/sound/arm/aaci.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/arm/aaci.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/arm/aaci.c linux-2.6.39.1/sound/arm/aaci= .c +--- linux-2.6.39.1/sound/arm/aaci.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/arm/aaci.c 2011-05-22 19:36:35.000000000 -0400 @@ -635,7 +635,7 @@ static int aaci_pcm_playback_trigger(str return ret; } @@ -79998,9 +80150,9 @@ diff -urNp linux-2.6.39/sound/arm/aaci.c linux-2.= 6.39/sound/arm/aaci.c .write =3D aaci_ac97_write, .read =3D aaci_ac97_read, }; -diff -urNp linux-2.6.39/sound/arm/pxa2xx-ac97.c linux-2.6.39/sound/arm/p= xa2xx-ac97.c ---- linux-2.6.39/sound/arm/pxa2xx-ac97.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/arm/pxa2xx-ac97.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/arm/pxa2xx-ac97.c linux-2.6.39.1/sound/a= rm/pxa2xx-ac97.c +--- linux-2.6.39.1/sound/arm/pxa2xx-ac97.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/arm/pxa2xx-ac97.c 2011-05-22 19:36:35.000000000= -0400 @@ -34,7 +34,7 @@ static void pxa2xx_ac97_reset(struct snd pxa2xx_ac97_finish_reset(ac97); } @@ -80010,9 +80162,9 @@ diff -urNp linux-2.6.39/sound/arm/pxa2xx-ac97.c l= inux-2.6.39/sound/arm/pxa2xx-ac .read =3D pxa2xx_ac97_read, .write =3D pxa2xx_ac97_write, .reset =3D pxa2xx_ac97_reset, -diff -urNp linux-2.6.39/sound/atmel/abdac.c linux-2.6.39/sound/atmel/abd= ac.c ---- linux-2.6.39/sound/atmel/abdac.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/atmel/abdac.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/atmel/abdac.c linux-2.6.39.1/sound/atmel= /abdac.c +--- linux-2.6.39.1/sound/atmel/abdac.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/atmel/abdac.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -297,7 +297,7 @@ static irqreturn_t abdac_interrupt(int i return IRQ_HANDLED; } @@ -80022,9 +80174,9 @@ diff -urNp linux-2.6.39/sound/atmel/abdac.c linux= -2.6.39/sound/atmel/abdac.c .open =3D atmel_abdac_open, .close =3D atmel_abdac_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/atmel/ac97c.c linux-2.6.39/sound/atmel/ac9= 7c.c ---- linux-2.6.39/sound/atmel/ac97c.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/atmel/ac97c.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/atmel/ac97c.c linux-2.6.39.1/sound/atmel= /ac97c.c +--- linux-2.6.39.1/sound/atmel/ac97c.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/atmel/ac97c.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -626,7 +626,7 @@ atmel_ac97c_capture_pointer(struct snd_p return frames; } @@ -80052,9 +80204,9 @@ diff -urNp linux-2.6.39/sound/atmel/ac97c.c linux= -2.6.39/sound/atmel/ac97c.c .write =3D atmel_ac97c_write, .read =3D atmel_ac97c_read, }; -diff -urNp linux-2.6.39/sound/core/control.c linux-2.6.39/sound/core/con= trol.c ---- linux-2.6.39/sound/core/control.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/core/control.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/core/control.c linux-2.6.39.1/sound/core= /control.c +--- linux-2.6.39.1/sound/core/control.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/core/control.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -1520,7 +1520,7 @@ static int snd_ctl_dev_free(struct snd_d */ int snd_ctl_create(struct snd_card *card) @@ -80064,9 +80216,9 @@ diff -urNp linux-2.6.39/sound/core/control.c linu= x-2.6.39/sound/core/control.c .dev_free =3D snd_ctl_dev_free, .dev_register =3D snd_ctl_dev_register, .dev_disconnect =3D snd_ctl_dev_disconnect, -diff -urNp linux-2.6.39/sound/core/device.c linux-2.6.39/sound/core/devi= ce.c ---- linux-2.6.39/sound/core/device.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/core/device.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/core/device.c linux-2.6.39.1/sound/core/= device.c +--- linux-2.6.39.1/sound/core/device.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/core/device.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -41,7 +41,7 @@ * Returns zero if successful, or a negative error code on failure. */ @@ -80076,9 +80228,9 @@ diff -urNp linux-2.6.39/sound/core/device.c linux= -2.6.39/sound/core/device.c { struct snd_device *dev; =20 -diff -urNp linux-2.6.39/sound/core/hwdep.c linux-2.6.39/sound/core/hwdep= .c ---- linux-2.6.39/sound/core/hwdep.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/core/hwdep.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/core/hwdep.c linux-2.6.39.1/sound/core/h= wdep.c +--- linux-2.6.39.1/sound/core/hwdep.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/core/hwdep.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -348,7 +348,7 @@ int snd_hwdep_new(struct snd_card *card, { struct snd_hwdep *hwdep; @@ -80088,9 +80240,9 @@ diff -urNp linux-2.6.39/sound/core/hwdep.c linux-= 2.6.39/sound/core/hwdep.c .dev_free =3D snd_hwdep_dev_free, .dev_register =3D snd_hwdep_dev_register, .dev_disconnect =3D snd_hwdep_dev_disconnect, -diff -urNp linux-2.6.39/sound/core/info.c linux-2.6.39/sound/core/info.c ---- linux-2.6.39/sound/core/info.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/core/info.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/core/info.c linux-2.6.39.1/sound/core/in= fo.c +--- linux-2.6.39.1/sound/core/info.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/core/info.c 2011-05-22 19:36:35.000000000 -0400 @@ -897,7 +897,7 @@ static int snd_info_dev_register_entry(s int snd_card_proc_new(struct snd_card *card, const char *name, struct snd_info_entry **entryp) @@ -80100,9 +80252,9 @@ diff -urNp linux-2.6.39/sound/core/info.c linux-2= .6.39/sound/core/info.c .dev_free =3D snd_info_dev_free_entry, .dev_register =3D snd_info_dev_register_entry, /* disconnect is done via snd_info_card_disconnect() */ -diff -urNp linux-2.6.39/sound/core/jack.c linux-2.6.39/sound/core/jack.c ---- linux-2.6.39/sound/core/jack.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/core/jack.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/core/jack.c linux-2.6.39.1/sound/core/ja= ck.c +--- linux-2.6.39.1/sound/core/jack.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/core/jack.c 2011-05-22 19:36:35.000000000 -0400 @@ -105,7 +105,7 @@ int snd_jack_new(struct snd_card *card,=20 struct snd_jack *jack; int err; @@ -80112,9 +80264,9 @@ diff -urNp linux-2.6.39/sound/core/jack.c linux-2= .6.39/sound/core/jack.c .dev_free =3D snd_jack_dev_free, .dev_register =3D snd_jack_dev_register, }; -diff -urNp linux-2.6.39/sound/core/pcm.c linux-2.6.39/sound/core/pcm.c ---- linux-2.6.39/sound/core/pcm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/core/pcm.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/core/pcm.c linux-2.6.39.1/sound/core/pcm= .c +--- linux-2.6.39.1/sound/core/pcm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/core/pcm.c 2011-05-22 19:36:35.000000000 -0400 @@ -717,7 +717,7 @@ int snd_pcm_new(struct snd_card *card, c { struct snd_pcm *pcm; @@ -80124,9 +80276,9 @@ diff -urNp linux-2.6.39/sound/core/pcm.c linux-2.= 6.39/sound/core/pcm.c .dev_free =3D snd_pcm_dev_free, .dev_register =3D snd_pcm_dev_register, .dev_disconnect =3D snd_pcm_dev_disconnect, -diff -urNp linux-2.6.39/sound/core/pcm_lib.c linux-2.6.39/sound/core/pcm= _lib.c ---- linux-2.6.39/sound/core/pcm_lib.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/core/pcm_lib.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/core/pcm_lib.c linux-2.6.39.1/sound/core= /pcm_lib.c +--- linux-2.6.39.1/sound/core/pcm_lib.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/core/pcm_lib.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -505,7 +505,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm * * Sets the given PCM operators to the pcm instance. @@ -80136,9 +80288,9 @@ diff -urNp linux-2.6.39/sound/core/pcm_lib.c linu= x-2.6.39/sound/core/pcm_lib.c { struct snd_pcm_str *stream =3D &pcm->streams[direction]; struct snd_pcm_substream *substream; -diff -urNp linux-2.6.39/sound/core/pcm_native.c linux-2.6.39/sound/core/= pcm_native.c ---- linux-2.6.39/sound/core/pcm_native.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/core/pcm_native.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/core/pcm_native.c linux-2.6.39.1/sound/c= ore/pcm_native.c +--- linux-2.6.39.1/sound/core/pcm_native.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/core/pcm_native.c 2011-05-22 19:36:35.000000000= -0400 @@ -702,7 +702,7 @@ struct action_ops { * Note: the stream state might be changed also on failure * Note2: call with calling stream lock + link lock @@ -80256,9 +80408,9 @@ diff -urNp linux-2.6.39/sound/core/pcm_native.c l= inux-2.6.39/sound/core/pcm_nati .pre_action =3D snd_pcm_pre_drain_init, .do_action =3D snd_pcm_do_drain_init, .post_action =3D snd_pcm_post_drain_init -diff -urNp linux-2.6.39/sound/core/rawmidi.c linux-2.6.39/sound/core/raw= midi.c ---- linux-2.6.39/sound/core/rawmidi.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/core/rawmidi.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/core/rawmidi.c linux-2.6.39.1/sound/core= /rawmidi.c +--- linux-2.6.39.1/sound/core/rawmidi.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/core/rawmidi.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -1449,7 +1449,7 @@ int snd_rawmidi_new(struct snd_card *car { struct snd_rawmidi *rmidi; @@ -80277,9 +80429,9 @@ diff -urNp linux-2.6.39/sound/core/rawmidi.c linu= x-2.6.39/sound/core/rawmidi.c { struct snd_rawmidi_substream *substream; =09 -diff -urNp linux-2.6.39/sound/core/seq/seq_device.c linux-2.6.39/sound/c= ore/seq/seq_device.c ---- linux-2.6.39/sound/core/seq/seq_device.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/core/seq/seq_device.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/core/seq/seq_device.c linux-2.6.39.1/sou= nd/core/seq/seq_device.c +--- linux-2.6.39.1/sound/core/seq/seq_device.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/core/seq/seq_device.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -178,7 +178,7 @@ int snd_seq_device_new(struct snd_card * struct snd_seq_device *dev; struct ops_list *ops; @@ -80298,9 +80450,9 @@ diff -urNp linux-2.6.39/sound/core/seq/seq_device= .c linux-2.6.39/sound/core/seq/ int argsize) { struct ops_list *ops; -diff -urNp linux-2.6.39/sound/core/seq/seq_midi.c linux-2.6.39/sound/cor= e/seq/seq_midi.c ---- linux-2.6.39/sound/core/seq/seq_midi.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/core/seq/seq_midi.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/core/seq/seq_midi.c linux-2.6.39.1/sound= /core/seq/seq_midi.c +--- linux-2.6.39.1/sound/core/seq/seq_midi.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/core/seq/seq_midi.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -461,7 +461,7 @@ snd_seq_midisynth_unregister_port(struct =20 static int __init alsa_seq_midi_init(void) @@ -80310,9 +80462,9 @@ diff -urNp linux-2.6.39/sound/core/seq/seq_midi.c= linux-2.6.39/sound/core/seq/se snd_seq_midisynth_register_port, snd_seq_midisynth_unregister_port, }; -diff -urNp linux-2.6.39/sound/core/seq/seq_virmidi.c linux-2.6.39/sound/= core/seq/seq_virmidi.c ---- linux-2.6.39/sound/core/seq/seq_virmidi.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/core/seq/seq_virmidi.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/core/seq/seq_virmidi.c linux-2.6.39.1/so= und/core/seq/seq_virmidi.c +--- linux-2.6.39.1/sound/core/seq/seq_virmidi.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/core/seq/seq_virmidi.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -337,13 +337,13 @@ static int snd_virmidi_unuse(void *priva * Register functions */ @@ -80338,9 +80490,9 @@ diff -urNp linux-2.6.39/sound/core/seq/seq_virmid= i.c linux-2.6.39/sound/core/seq .dev_register =3D snd_virmidi_dev_register, .dev_unregister =3D snd_virmidi_dev_unregister, }; -diff -urNp linux-2.6.39/sound/core/timer.c linux-2.6.39/sound/core/timer= .c ---- linux-2.6.39/sound/core/timer.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/core/timer.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/core/timer.c linux-2.6.39.1/sound/core/t= imer.c +--- linux-2.6.39.1/sound/core/timer.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/core/timer.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -756,7 +756,7 @@ int snd_timer_new(struct snd_card *card, { struct snd_timer *timer; @@ -80350,9 +80502,9 @@ diff -urNp linux-2.6.39/sound/core/timer.c linux-= 2.6.39/sound/core/timer.c .dev_free =3D snd_timer_dev_free, .dev_register =3D snd_timer_dev_register, .dev_disconnect =3D snd_timer_dev_disconnect, -diff -urNp linux-2.6.39/sound/drivers/aloop.c linux-2.6.39/sound/drivers= /aloop.c ---- linux-2.6.39/sound/drivers/aloop.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/drivers/aloop.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/drivers/aloop.c linux-2.6.39.1/sound/dri= vers/aloop.c +--- linux-2.6.39.1/sound/drivers/aloop.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/drivers/aloop.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -731,7 +731,7 @@ static int loopback_close(struct snd_pcm return 0; } @@ -80371,9 +80523,9 @@ diff -urNp linux-2.6.39/sound/drivers/aloop.c lin= ux-2.6.39/sound/drivers/aloop.c .open =3D loopback_open, .close =3D loopback_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/drivers/dummy.c linux-2.6.39/sound/drivers= /dummy.c ---- linux-2.6.39/sound/drivers/dummy.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/drivers/dummy.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/drivers/dummy.c linux-2.6.39.1/sound/dri= vers/dummy.c +--- linux-2.6.39.1/sound/drivers/dummy.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/drivers/dummy.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -350,7 +350,7 @@ static void dummy_systimer_free(struct s kfree(substream->runtime->private_data); } @@ -80419,9 +80571,9 @@ diff -urNp linux-2.6.39/sound/drivers/dummy.c lin= ux-2.6.39/sound/drivers/dummy.c int err; =20 err =3D snd_pcm_new(dummy->card, "Dummy PCM", device, -diff -urNp linux-2.6.39/sound/drivers/ml403-ac97cr.c linux-2.6.39/sound/= drivers/ml403-ac97cr.c ---- linux-2.6.39/sound/drivers/ml403-ac97cr.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/drivers/ml403-ac97cr.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/drivers/ml403-ac97cr.c linux-2.6.39.1/so= und/drivers/ml403-ac97cr.c +--- linux-2.6.39.1/sound/drivers/ml403-ac97cr.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/drivers/ml403-ac97cr.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -759,7 +759,7 @@ static int snd_ml403_ac97cr_capture_clos return 0; } @@ -80458,9 +80610,9 @@ diff -urNp linux-2.6.39/sound/drivers/ml403-ac97c= r.c linux-2.6.39/sound/drivers/ .write =3D snd_ml403_ac97cr_codec_write, .read =3D snd_ml403_ac97cr_codec_read, }; -diff -urNp linux-2.6.39/sound/drivers/mtpav.c linux-2.6.39/sound/drivers= /mtpav.c ---- linux-2.6.39/sound/drivers/mtpav.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/drivers/mtpav.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/drivers/mtpav.c linux-2.6.39.1/sound/dri= vers/mtpav.c +--- linux-2.6.39.1/sound/drivers/mtpav.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/drivers/mtpav.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -601,13 +601,13 @@ static int __devinit snd_mtpav_get_ISA(s /* */ @@ -80477,9 +80629,9 @@ diff -urNp linux-2.6.39/sound/drivers/mtpav.c lin= ux-2.6.39/sound/drivers/mtpav.c .open =3D snd_mtpav_input_open, .close =3D snd_mtpav_input_close, .trigger =3D snd_mtpav_input_trigger, -diff -urNp linux-2.6.39/sound/drivers/mts64.c linux-2.6.39/sound/drivers= /mts64.c ---- linux-2.6.39/sound/drivers/mts64.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/drivers/mts64.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/drivers/mts64.c linux-2.6.39.1/sound/dri= vers/mts64.c +--- linux-2.6.39.1/sound/drivers/mts64.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/drivers/mts64.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -28,6 +28,7 @@ #include #include @@ -80552,9 +80704,9 @@ diff -urNp linux-2.6.39/sound/drivers/mts64.c lin= ux-2.6.39/sound/drivers/mts64.c .open =3D snd_mts64_rawmidi_open, .close =3D snd_mts64_rawmidi_close, .trigger =3D snd_mts64_rawmidi_input_trigger -diff -urNp linux-2.6.39/sound/drivers/pcsp/pcsp.c linux-2.6.39/sound/dri= vers/pcsp/pcsp.c ---- linux-2.6.39/sound/drivers/pcsp/pcsp.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/drivers/pcsp/pcsp.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/drivers/pcsp/pcsp.c linux-2.6.39.1/sound= /drivers/pcsp/pcsp.c +--- linux-2.6.39.1/sound/drivers/pcsp/pcsp.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/drivers/pcsp/pcsp.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -41,7 +41,7 @@ struct snd_pcsp pcsp_chip; =20 static int __devinit snd_pcsp_create(struct snd_card *card) @@ -80564,9 +80716,9 @@ diff -urNp linux-2.6.39/sound/drivers/pcsp/pcsp.c= linux-2.6.39/sound/drivers/pcs struct timespec tp; int err; int div, min_div, order; -diff -urNp linux-2.6.39/sound/drivers/pcsp/pcsp_lib.c linux-2.6.39/sound= /drivers/pcsp/pcsp_lib.c ---- linux-2.6.39/sound/drivers/pcsp/pcsp_lib.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/drivers/pcsp/pcsp_lib.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/drivers/pcsp/pcsp_lib.c linux-2.6.39.1/s= ound/drivers/pcsp/pcsp_lib.c +--- linux-2.6.39.1/sound/drivers/pcsp/pcsp_lib.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/drivers/pcsp/pcsp_lib.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -323,7 +323,7 @@ static int snd_pcsp_playback_open(struct return 0; } @@ -80576,9 +80728,9 @@ diff -urNp linux-2.6.39/sound/drivers/pcsp/pcsp_l= ib.c linux-2.6.39/sound/drivers .open =3D snd_pcsp_playback_open, .close =3D snd_pcsp_playback_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/drivers/portman2x4.c linux-2.6.39/sound/dr= ivers/portman2x4.c ---- linux-2.6.39/sound/drivers/portman2x4.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/drivers/portman2x4.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/drivers/portman2x4.c linux-2.6.39.1/soun= d/drivers/portman2x4.c +--- linux-2.6.39.1/sound/drivers/portman2x4.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/drivers/portman2x4.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -47,6 +47,7 @@ #include #include @@ -80612,9 +80764,9 @@ diff -urNp linux-2.6.39/sound/drivers/portman2x4.= c linux-2.6.39/sound/drivers/po .open =3D snd_portman_midi_open, .close =3D snd_portman_midi_close, .trigger =3D snd_portman_midi_input_trigger, -diff -urNp linux-2.6.39/sound/drivers/serial-u16550.c linux-2.6.39/sound= /drivers/serial-u16550.c ---- linux-2.6.39/sound/drivers/serial-u16550.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/drivers/serial-u16550.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/drivers/serial-u16550.c linux-2.6.39.1/s= ound/drivers/serial-u16550.c +--- linux-2.6.39.1/sound/drivers/serial-u16550.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/drivers/serial-u16550.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -754,15 +754,13 @@ static void snd_uart16550_output_trigger snd_uart16550_output_write(substream); } @@ -80642,9 +80794,9 @@ diff -urNp linux-2.6.39/sound/drivers/serial-u165= 50.c linux-2.6.39/sound/drivers .dev_free =3D snd_uart16550_dev_free, }; struct snd_uart16550 *uart; -diff -urNp linux-2.6.39/sound/drivers/vx/vx_pcm.c linux-2.6.39/sound/dri= vers/vx/vx_pcm.c ---- linux-2.6.39/sound/drivers/vx/vx_pcm.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/drivers/vx/vx_pcm.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/drivers/vx/vx_pcm.c linux-2.6.39.1/sound= /drivers/vx/vx_pcm.c +--- linux-2.6.39.1/sound/drivers/vx/vx_pcm.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/drivers/vx/vx_pcm.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -895,7 +895,7 @@ static int vx_pcm_prepare(struct snd_pcm /* * operators for PCM playback @@ -80663,9 +80815,9 @@ diff -urNp linux-2.6.39/sound/drivers/vx/vx_pcm.c= linux-2.6.39/sound/drivers/vx/ .open =3D vx_pcm_capture_open, .close =3D vx_pcm_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/firewire/amdtp.c linux-2.6.39/sound/firewi= re/amdtp.c ---- linux-2.6.39/sound/firewire/amdtp.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/firewire/amdtp.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/firewire/amdtp.c linux-2.6.39.1/sound/fi= rewire/amdtp.c +--- linux-2.6.39.1/sound/firewire/amdtp.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/firewire/amdtp.c 2011-05-22 19:36:35.000000000 = -0400 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt ptr =3D s->pcm_buffer_pointer + data_blocks; if (ptr >=3D pcm->runtime->buffer_size) @@ -80684,9 +80836,9 @@ diff -urNp linux-2.6.39/sound/firewire/amdtp.c li= nux-2.6.39/sound/firewire/amdtp (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24; } EXPORT_SYMBOL(amdtp_out_stream_update); -diff -urNp linux-2.6.39/sound/firewire/amdtp.h linux-2.6.39/sound/firewi= re/amdtp.h ---- linux-2.6.39/sound/firewire/amdtp.h 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/firewire/amdtp.h 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/firewire/amdtp.h linux-2.6.39.1/sound/fi= rewire/amdtp.h +--- linux-2.6.39.1/sound/firewire/amdtp.h 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/firewire/amdtp.h 2011-05-22 19:36:35.000000000 = -0400 @@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_ static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream= *s, struct snd_pcm_substream *pcm) @@ -80696,9 +80848,9 @@ diff -urNp linux-2.6.39/sound/firewire/amdtp.h li= nux-2.6.39/sound/firewire/amdtp } =20 /** -diff -urNp linux-2.6.39/sound/i2c/i2c.c linux-2.6.39/sound/i2c/i2c.c ---- linux-2.6.39/sound/i2c/i2c.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/i2c/i2c.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/i2c/i2c.c linux-2.6.39.1/sound/i2c/i2c.c +--- linux-2.6.39.1/sound/i2c/i2c.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/i2c/i2c.c 2011-05-22 19:36:35.000000000 -0400 @@ -80,7 +80,7 @@ int snd_i2c_bus_create(struct snd_card * { struct snd_i2c_bus *bus; @@ -80708,9 +80860,9 @@ diff -urNp linux-2.6.39/sound/i2c/i2c.c linux-2.6= .39/sound/i2c/i2c.c .dev_free =3D snd_i2c_bus_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/i2c/other/ak4113.c linux-2.6.39/sound/i2c/= other/ak4113.c ---- linux-2.6.39/sound/i2c/other/ak4113.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/i2c/other/ak4113.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/i2c/other/ak4113.c linux-2.6.39.1/sound/= i2c/other/ak4113.c +--- linux-2.6.39.1/sound/i2c/other/ak4113.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/i2c/other/ak4113.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -75,7 +75,7 @@ int snd_ak4113_create(struct snd_card *c struct ak4113 *chip; int err =3D 0; @@ -80720,9 +80872,9 @@ diff -urNp linux-2.6.39/sound/i2c/other/ak4113.c = linux-2.6.39/sound/i2c/other/ak .dev_free =3D snd_ak4113_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/i2c/other/ak4114.c linux-2.6.39/sound/i2c/= other/ak4114.c ---- linux-2.6.39/sound/i2c/other/ak4114.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/i2c/other/ak4114.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/i2c/other/ak4114.c linux-2.6.39.1/sound/= i2c/other/ak4114.c +--- linux-2.6.39.1/sound/i2c/other/ak4114.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/i2c/other/ak4114.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -86,7 +86,7 @@ int snd_ak4114_create(struct snd_card *c struct ak4114 *chip; int err =3D 0; @@ -80732,9 +80884,9 @@ diff -urNp linux-2.6.39/sound/i2c/other/ak4114.c = linux-2.6.39/sound/i2c/other/ak .dev_free =3D snd_ak4114_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/i2c/other/ak4117.c linux-2.6.39/sound/i2c/= other/ak4117.c ---- linux-2.6.39/sound/i2c/other/ak4117.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/i2c/other/ak4117.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/i2c/other/ak4117.c linux-2.6.39.1/sound/= i2c/other/ak4117.c +--- linux-2.6.39.1/sound/i2c/other/ak4117.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/i2c/other/ak4117.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -78,7 +78,7 @@ int snd_ak4117_create(struct snd_card *c struct ak4117 *chip; int err =3D 0; @@ -80744,9 +80896,9 @@ diff -urNp linux-2.6.39/sound/i2c/other/ak4117.c = linux-2.6.39/sound/i2c/other/ak .dev_free =3D snd_ak4117_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/isa/ad1816a/ad1816a_lib.c linux-2.6.39/sou= nd/isa/ad1816a/ad1816a_lib.c ---- linux-2.6.39/sound/isa/ad1816a/ad1816a_lib.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/isa/ad1816a/ad1816a_lib.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/isa/ad1816a/ad1816a_lib.c linux-2.6.39.1= /sound/isa/ad1816a/ad1816a_lib.c +--- linux-2.6.39.1/sound/isa/ad1816a/ad1816a_lib.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/isa/ad1816a/ad1816a_lib.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -575,7 +575,7 @@ int __devinit snd_ad1816a_create(struct=20 unsigned long port, int irq, int dma1, int dma2, struct snd_ad1816a **rchip) @@ -80756,9 +80908,9 @@ diff -urNp linux-2.6.39/sound/isa/ad1816a/ad1816a= _lib.c linux-2.6.39/sound/isa/a .dev_free =3D snd_ad1816a_dev_free, }; int error; -diff -urNp linux-2.6.39/sound/isa/es1688/es1688_lib.c linux-2.6.39/sound= /isa/es1688/es1688_lib.c ---- linux-2.6.39/sound/isa/es1688/es1688_lib.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/isa/es1688/es1688_lib.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/isa/es1688/es1688_lib.c linux-2.6.39.1/s= ound/isa/es1688/es1688_lib.c +--- linux-2.6.39.1/sound/isa/es1688/es1688_lib.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/isa/es1688/es1688_lib.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -646,7 +646,7 @@ int snd_es1688_create(struct snd_card *c int dma8, unsigned short hardware) @@ -80768,9 +80920,9 @@ diff -urNp linux-2.6.39/sound/isa/es1688/es1688_l= ib.c linux-2.6.39/sound/isa/es1 .dev_free =3D snd_es1688_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/isa/es18xx.c linux-2.6.39/sound/isa/es18xx= .c ---- linux-2.6.39/sound/isa/es18xx.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/isa/es18xx.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/isa/es18xx.c linux-2.6.39.1/sound/isa/es= 18xx.c +--- linux-2.6.39.1/sound/isa/es18xx.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/isa/es18xx.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -1658,7 +1658,7 @@ static int __devinit snd_es18xx_probe(st return snd_es18xx_initialize(chip, mpu_port, fm_port); } @@ -80798,9 +80950,9 @@ diff -urNp linux-2.6.39/sound/isa/es18xx.c linux-= 2.6.39/sound/isa/es18xx.c .dev_free =3D snd_es18xx_dev_free, }; int err; -diff -urNp linux-2.6.39/sound/isa/gus/gus_main.c linux-2.6.39/sound/isa/= gus/gus_main.c ---- linux-2.6.39/sound/isa/gus/gus_main.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/isa/gus/gus_main.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/isa/gus/gus_main.c linux-2.6.39.1/sound/= isa/gus/gus_main.c +--- linux-2.6.39.1/sound/isa/gus/gus_main.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/isa/gus/gus_main.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -139,7 +139,7 @@ int snd_gus_create(struct snd_card *card { struct snd_gus_card *gus; @@ -80810,9 +80962,9 @@ diff -urNp linux-2.6.39/sound/isa/gus/gus_main.c = linux-2.6.39/sound/isa/gus/gus_ .dev_free =3D snd_gus_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/isa/msnd/msnd.c linux-2.6.39/sound/isa/msn= d/msnd.c ---- linux-2.6.39/sound/isa/msnd/msnd.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/isa/msnd/msnd.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/isa/msnd/msnd.c linux-2.6.39.1/sound/isa= /msnd/msnd.c +--- linux-2.6.39.1/sound/isa/msnd/msnd.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/isa/msnd/msnd.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -570,7 +570,7 @@ snd_msnd_playback_pointer(struct snd_pcm } =20 @@ -80831,9 +80983,9 @@ diff -urNp linux-2.6.39/sound/isa/msnd/msnd.c lin= ux-2.6.39/sound/isa/msnd/msnd.c .open =3D snd_msnd_capture_open, .close =3D snd_msnd_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/isa/msnd/msnd_midi.c linux-2.6.39/sound/is= a/msnd/msnd_midi.c ---- linux-2.6.39/sound/isa/msnd/msnd_midi.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/isa/msnd/msnd_midi.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/isa/msnd/msnd_midi.c linux-2.6.39.1/soun= d/isa/msnd/msnd_midi.c +--- linux-2.6.39.1/sound/isa/msnd/msnd_midi.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/isa/msnd/msnd_midi.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -141,7 +141,7 @@ void snd_msndmidi_input_read(void *mpuv) } EXPORT_SYMBOL(snd_msndmidi_input_read); @@ -80843,9 +80995,9 @@ diff -urNp linux-2.6.39/sound/isa/msnd/msnd_midi.= c linux-2.6.39/sound/isa/msnd/m .open =3D snd_msndmidi_input_open, .close =3D snd_msndmidi_input_close, .trigger =3D snd_msndmidi_input_trigger, -diff -urNp linux-2.6.39/sound/isa/msnd/msnd_pinnacle.c linux-2.6.39/soun= d/isa/msnd/msnd_pinnacle.c ---- linux-2.6.39/sound/isa/msnd/msnd_pinnacle.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/isa/msnd/msnd_pinnacle.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/isa/msnd/msnd_pinnacle.c linux-2.6.39.1/= sound/isa/msnd/msnd_pinnacle.c +--- linux-2.6.39.1/sound/isa/msnd/msnd_pinnacle.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/isa/msnd/msnd_pinnacle.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -539,7 +539,7 @@ static int __devinit snd_msnd_attach(str { struct snd_msnd *chip =3D card->private_data; @@ -80855,9 +81007,9 @@ diff -urNp linux-2.6.39/sound/isa/msnd/msnd_pinna= cle.c linux-2.6.39/sound/isa/ms .dev_free =3D snd_msnd_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/isa/sb/emu8000.c linux-2.6.39/sound/isa/sb= /emu8000.c ---- linux-2.6.39/sound/isa/sb/emu8000.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/isa/sb/emu8000.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/isa/sb/emu8000.c linux-2.6.39.1/sound/is= a/sb/emu8000.c +--- linux-2.6.39.1/sound/isa/sb/emu8000.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/isa/sb/emu8000.c 2011-05-22 19:36:35.000000000 = -0400 @@ -1079,7 +1079,7 @@ snd_emu8000_new(struct snd_card *card, i struct snd_seq_device *awe; struct snd_emu8000 *hw; @@ -80867,9 +81019,9 @@ diff -urNp linux-2.6.39/sound/isa/sb/emu8000.c li= nux-2.6.39/sound/isa/sb/emu8000 .dev_free =3D snd_emu8000_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/isa/sb/emu8000_pcm.c linux-2.6.39/sound/is= a/sb/emu8000_pcm.c ---- linux-2.6.39/sound/isa/sb/emu8000_pcm.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/isa/sb/emu8000_pcm.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/isa/sb/emu8000_pcm.c linux-2.6.39.1/soun= d/isa/sb/emu8000_pcm.c +--- linux-2.6.39.1/sound/isa/sb/emu8000_pcm.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/isa/sb/emu8000_pcm.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -667,7 +667,7 @@ static snd_pcm_uframes_t emu8k_pcm_point } =20 @@ -80879,9 +81031,9 @@ diff -urNp linux-2.6.39/sound/isa/sb/emu8000_pcm.= c linux-2.6.39/sound/isa/sb/emu .open =3D emu8k_pcm_open, .close =3D emu8k_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/isa/sb/sb_common.c linux-2.6.39/sound/isa/= sb/sb_common.c ---- linux-2.6.39/sound/isa/sb/sb_common.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/isa/sb/sb_common.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/isa/sb/sb_common.c linux-2.6.39.1/sound/= isa/sb/sb_common.c +--- linux-2.6.39.1/sound/isa/sb/sb_common.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/isa/sb/sb_common.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -218,7 +218,7 @@ int snd_sbdsp_create(struct snd_card *ca { struct snd_sb *chip; @@ -80891,9 +81043,9 @@ diff -urNp linux-2.6.39/sound/isa/sb/sb_common.c = linux-2.6.39/sound/isa/sb/sb_co .dev_free =3D snd_sbdsp_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/isa/wavefront/wavefront_midi.c linux-2.6.3= 9/sound/isa/wavefront/wavefront_midi.c ---- linux-2.6.39/sound/isa/wavefront/wavefront_midi.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/sound/isa/wavefront/wavefront_midi.c 2011-05-22 19:36:3= 5.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/isa/wavefront/wavefront_midi.c linux-2.6= .39.1/sound/isa/wavefront/wavefront_midi.c +--- linux-2.6.39.1/sound/isa/wavefront/wavefront_midi.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/sound/isa/wavefront/wavefront_midi.c 2011-05-22 19:36= :35.000000000 -0400 @@ -561,14 +561,14 @@ snd_wavefront_midi_start (snd_wavefront_ return 0; } @@ -80911,9 +81063,9 @@ diff -urNp linux-2.6.39/sound/isa/wavefront/wavef= ront_midi.c linux-2.6.39/sound/ { .open =3D snd_wavefront_midi_input_open, .close =3D snd_wavefront_midi_input_close, -diff -urNp linux-2.6.39/sound/isa/wss/wss_lib.c linux-2.6.39/sound/isa/w= ss/wss_lib.c ---- linux-2.6.39/sound/isa/wss/wss_lib.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/isa/wss/wss_lib.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/isa/wss/wss_lib.c linux-2.6.39.1/sound/i= sa/wss/wss_lib.c +--- linux-2.6.39.1/sound/isa/wss/wss_lib.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/isa/wss/wss_lib.c 2011-05-22 19:36:35.000000000= -0400 @@ -1801,7 +1801,7 @@ int snd_wss_create(struct snd_card *card unsigned short hwshare, struct snd_wss **rchip) @@ -80923,9 +81075,9 @@ diff -urNp linux-2.6.39/sound/isa/wss/wss_lib.c l= inux-2.6.39/sound/isa/wss/wss_l .dev_free =3D snd_wss_dev_free, }; struct snd_wss *chip; -diff -urNp linux-2.6.39/sound/mips/au1x00.c linux-2.6.39/sound/mips/au1x= 00.c ---- linux-2.6.39/sound/mips/au1x00.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/mips/au1x00.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/mips/au1x00.c linux-2.6.39.1/sound/mips/= au1x00.c +--- linux-2.6.39.1/sound/mips/au1x00.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/mips/au1x00.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -416,7 +416,7 @@ snd_au1000_pointer(struct snd_pcm_substr return bytes_to_frames(runtime,location); } @@ -80953,9 +81105,9 @@ diff -urNp linux-2.6.39/sound/mips/au1x00.c linux= -2.6.39/sound/mips/au1x00.c .write =3D snd_au1000_ac97_write, .read =3D snd_au1000_ac97_read, }; -diff -urNp linux-2.6.39/sound/mips/hal2.c linux-2.6.39/sound/mips/hal2.c ---- linux-2.6.39/sound/mips/hal2.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/mips/hal2.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/mips/hal2.c linux-2.6.39.1/sound/mips/ha= l2.c +--- linux-2.6.39.1/sound/mips/hal2.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/mips/hal2.c 2011-05-22 19:36:35.000000000 -0400 @@ -708,7 +708,7 @@ static int hal2_capture_ack(struct snd_p return 0; } @@ -80983,9 +81135,9 @@ diff -urNp linux-2.6.39/sound/mips/hal2.c linux-2= .6.39/sound/mips/hal2.c .dev_free =3D hal2_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/mips/sgio2audio.c linux-2.6.39/sound/mips/= sgio2audio.c ---- linux-2.6.39/sound/mips/sgio2audio.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/mips/sgio2audio.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/mips/sgio2audio.c linux-2.6.39.1/sound/m= ips/sgio2audio.c +--- linux-2.6.39.1/sound/mips/sgio2audio.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/mips/sgio2audio.c 2011-05-22 19:36:35.000000000= -0400 @@ -681,7 +681,7 @@ snd_sgio2audio_pcm_pointer(struct snd_pc } =20 @@ -81022,9 +81174,9 @@ diff -urNp linux-2.6.39/sound/mips/sgio2audio.c l= inux-2.6.39/sound/mips/sgio2aud .dev_free =3D snd_sgio2audio_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/oss/ac97_codec.c linux-2.6.39/sound/oss/ac= 97_codec.c ---- linux-2.6.39/sound/oss/ac97_codec.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/oss/ac97_codec.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/oss/ac97_codec.c linux-2.6.39.1/sound/os= s/ac97_codec.c +--- linux-2.6.39.1/sound/oss/ac97_codec.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/oss/ac97_codec.c 2011-05-22 19:36:35.000000000 = -0400 @@ -99,23 +99,23 @@ static int generic_digital_control(struc * operations yet */ @@ -81066,9 +81218,9 @@ diff -urNp linux-2.6.39/sound/oss/ac97_codec.c li= nux-2.6.39/sound/oss/ac97_codec =20 /* sorted by vendor/device id */ static const struct { -diff -urNp linux-2.6.39/sound/oss/sb_audio.c linux-2.6.39/sound/oss/sb_a= udio.c ---- linux-2.6.39/sound/oss/sb_audio.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/oss/sb_audio.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/oss/sb_audio.c linux-2.6.39.1/sound/oss/= sb_audio.c +--- linux-2.6.39.1/sound/oss/sb_audio.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/oss/sb_audio.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 =3D (signed short *)(localbuf + localoffs); while (c) @@ -81078,9 +81230,9 @@ diff -urNp linux-2.6.39/sound/oss/sb_audio.c linu= x-2.6.39/sound/oss/sb_audio.c if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.39/sound/oss/swarm_cs4297a.c linux-2.6.39/sound/oss= /swarm_cs4297a.c ---- linux-2.6.39/sound/oss/swarm_cs4297a.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/oss/swarm_cs4297a.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/oss/swarm_cs4297a.c linux-2.6.39.1/sound= /oss/swarm_cs4297a.c +--- linux-2.6.39.1/sound/oss/swarm_cs4297a.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/oss/swarm_cs4297a.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void) { struct cs4297a_state *s; @@ -81115,9 +81267,9 @@ diff -urNp linux-2.6.39/sound/oss/swarm_cs4297a.c= linux-2.6.39/sound/oss/swarm_c =20 list_add(&s->list, &cs4297a_devs); =20 -diff -urNp linux-2.6.39/sound/parisc/harmony.c linux-2.6.39/sound/parisc= /harmony.c ---- linux-2.6.39/sound/parisc/harmony.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/parisc/harmony.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/parisc/harmony.c linux-2.6.39.1/sound/pa= risc/harmony.c +--- linux-2.6.39.1/sound/parisc/harmony.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/parisc/harmony.c 2011-05-22 19:36:35.000000000 = -0400 @@ -596,7 +596,7 @@ snd_harmony_hw_free(struct snd_pcm_subst return snd_pcm_lib_free_pages(ss); } @@ -81145,9 +81297,9 @@ diff -urNp linux-2.6.39/sound/parisc/harmony.c li= nux-2.6.39/sound/parisc/harmony .dev_free =3D snd_harmony_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/ac97/ac97_codec.c linux-2.6.39/sound/p= ci/ac97/ac97_codec.c ---- linux-2.6.39/sound/pci/ac97/ac97_codec.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/pci/ac97/ac97_codec.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ac97/ac97_codec.c linux-2.6.39.1/sou= nd/pci/ac97/ac97_codec.c +--- linux-2.6.39.1/sound/pci/ac97/ac97_codec.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/pci/ac97/ac97_codec.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -1910,12 +1910,12 @@ static int ac97_reset_wait(struct snd_ac * * Returns zero if successful, or a negative error code on failure. @@ -81172,9 +81324,9 @@ diff -urNp linux-2.6.39/sound/pci/ac97/ac97_codec= .c linux-2.6.39/sound/pci/ac97/ .dev_free =3D snd_ac97_dev_free, .dev_register =3D snd_ac97_dev_register, .dev_disconnect =3D snd_ac97_dev_disconnect, -diff -urNp linux-2.6.39/sound/pci/ad1889.c linux-2.6.39/sound/pci/ad1889= .c ---- linux-2.6.39/sound/pci/ad1889.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/ad1889.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ad1889.c linux-2.6.39.1/sound/pci/ad= 1889.c +--- linux-2.6.39.1/sound/pci/ad1889.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/ad1889.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -574,7 +574,7 @@ snd_ad1889_capture_pointer(struct snd_pc return bytes_to_frames(ss->runtime, ptr); } @@ -81211,9 +81363,9 @@ diff -urNp linux-2.6.39/sound/pci/ad1889.c linux-= 2.6.39/sound/pci/ad1889.c .dev_free =3D snd_ad1889_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/ak4531_codec.c linux-2.6.39/sound/pci/= ak4531_codec.c ---- linux-2.6.39/sound/pci/ak4531_codec.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/pci/ak4531_codec.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/pci/ak4531_codec.c linux-2.6.39.1/sound/= pci/ak4531_codec.c +--- linux-2.6.39.1/sound/pci/ak4531_codec.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/pci/ak4531_codec.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -389,7 +389,7 @@ int __devinit snd_ak4531_mixer(struct sn unsigned int idx; int err; @@ -81223,9 +81375,9 @@ diff -urNp linux-2.6.39/sound/pci/ak4531_codec.c = linux-2.6.39/sound/pci/ak4531_c .dev_free =3D snd_ak4531_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/ali5451/ali5451.c linux-2.6.39/sound/p= ci/ali5451/ali5451.c ---- linux-2.6.39/sound/pci/ali5451/ali5451.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/pci/ali5451/ali5451.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ali5451/ali5451.c linux-2.6.39.1/sou= nd/pci/ali5451/ali5451.c +--- linux-2.6.39.1/sound/pci/ali5451/ali5451.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/pci/ali5451/ali5451.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -1847,7 +1847,7 @@ static int __devinit snd_ali_mixer(struc struct snd_ac97_template ac97; unsigned int idx; @@ -81244,9 +81396,9 @@ diff -urNp linux-2.6.39/sound/pci/ali5451/ali5451= .c linux-2.6.39/sound/pci/ali54 .dev_free =3D snd_ali_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/als300.c linux-2.6.39/sound/pci/als300= .c ---- linux-2.6.39/sound/pci/als300.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/als300.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/als300.c linux-2.6.39.1/sound/pci/al= s300.c +--- linux-2.6.39.1/sound/pci/als300.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/als300.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -319,7 +319,7 @@ static int snd_als300_ac97(struct snd_al struct snd_ac97_bus *bus; struct snd_ac97_template ac97; @@ -81283,9 +81435,9 @@ diff -urNp linux-2.6.39/sound/pci/als300.c linux-= 2.6.39/sound/pci/als300.c .dev_free =3D snd_als300_dev_free, }; *rchip =3D NULL; -diff -urNp linux-2.6.39/sound/pci/als4000.c linux-2.6.39/sound/pci/als40= 00.c ---- linux-2.6.39/sound/pci/als4000.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/als4000.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/als4000.c linux-2.6.39.1/sound/pci/a= ls4000.c +--- linux-2.6.39.1/sound/pci/als4000.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/pci/als4000.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -672,7 +672,7 @@ static int snd_als4000_capture_close(str =20 /******************************************************************/ @@ -81304,9 +81456,9 @@ diff -urNp linux-2.6.39/sound/pci/als4000.c linux= -2.6.39/sound/pci/als4000.c .open =3D snd_als4000_capture_open, .close =3D snd_als4000_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/asihpi/asihpi.c linux-2.6.39/sound/pci= /asihpi/asihpi.c ---- linux-2.6.39/sound/pci/asihpi/asihpi.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/pci/asihpi/asihpi.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/pci/asihpi/asihpi.c linux-2.6.39.1/sound= /pci/asihpi/asihpi.c +--- linux-2.6.39.1/sound/pci/asihpi/asihpi.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/pci/asihpi/asihpi.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -1067,7 +1067,7 @@ static int snd_card_asihpi_playback_sile return 0; } @@ -81343,9 +81495,9 @@ diff -urNp linux-2.6.39/sound/pci/asihpi/asihpi.c= linux-2.6.39/sound/pci/asihpi/ .open =3D snd_card_asihpi_capture_open, .close =3D snd_card_asihpi_capture_close, .ioctl =3D snd_card_asihpi_capture_ioctl, -diff -urNp linux-2.6.39/sound/pci/atiixp.c linux-2.6.39/sound/pci/atiixp= .c ---- linux-2.6.39/sound/pci/atiixp.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/atiixp.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/atiixp.c linux-2.6.39.1/sound/pci/at= iixp.c +--- linux-2.6.39.1/sound/pci/atiixp.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/atiixp.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -1148,7 +1148,7 @@ static int snd_atiixp_spdif_close(struct } =20 @@ -81391,9 +81543,9 @@ diff -urNp linux-2.6.39/sound/pci/atiixp.c linux-= 2.6.39/sound/pci/atiixp.c .dev_free =3D snd_atiixp_dev_free, }; struct atiixp *chip; -diff -urNp linux-2.6.39/sound/pci/atiixp_modem.c linux-2.6.39/sound/pci/= atiixp_modem.c ---- linux-2.6.39/sound/pci/atiixp_modem.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/pci/atiixp_modem.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/pci/atiixp_modem.c linux-2.6.39.1/sound/= pci/atiixp_modem.c +--- linux-2.6.39.1/sound/pci/atiixp_modem.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/pci/atiixp_modem.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -947,7 +947,7 @@ static int snd_atiixp_capture_close(stru =20 =20 @@ -81430,9 +81582,9 @@ diff -urNp linux-2.6.39/sound/pci/atiixp_modem.c = linux-2.6.39/sound/pci/atiixp_m .dev_free =3D snd_atiixp_dev_free, }; struct atiixp_modem *chip; -diff -urNp linux-2.6.39/sound/pci/au88x0/au88x0_pcm.c linux-2.6.39/sound= /pci/au88x0/au88x0_pcm.c ---- linux-2.6.39/sound/pci/au88x0/au88x0_pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/pci/au88x0/au88x0_pcm.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/au88x0/au88x0_pcm.c linux-2.6.39.1/s= ound/pci/au88x0/au88x0_pcm.c +--- linux-2.6.39.1/sound/pci/au88x0/au88x0_pcm.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/pci/au88x0/au88x0_pcm.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -409,7 +409,7 @@ static snd_pcm_uframes_t snd_vortex_pcm_ } =20 @@ -81442,9 +81594,9 @@ diff -urNp linux-2.6.39/sound/pci/au88x0/au88x0_p= cm.c linux-2.6.39/sound/pci/au8 .open =3D snd_vortex_pcm_open, .close =3D snd_vortex_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/aw2/aw2-alsa.c linux-2.6.39/sound/pci/= aw2/aw2-alsa.c ---- linux-2.6.39/sound/pci/aw2/aw2-alsa.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/pci/aw2/aw2-alsa.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/pci/aw2/aw2-alsa.c linux-2.6.39.1/sound/= pci/aw2/aw2-alsa.c +--- linux-2.6.39.1/sound/pci/aw2/aw2-alsa.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/pci/aw2/aw2-alsa.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -178,7 +178,7 @@ static struct pci_driver driver =3D { }; =20 @@ -81472,9 +81624,9 @@ diff -urNp linux-2.6.39/sound/pci/aw2/aw2-alsa.c = linux-2.6.39/sound/pci/aw2/aw2- .dev_free =3D snd_aw2_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/azt3328.c linux-2.6.39/sound/pci/azt33= 28.c ---- linux-2.6.39/sound/pci/azt3328.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/azt3328.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/azt3328.c linux-2.6.39.1/sound/pci/a= zt3328.c +--- linux-2.6.39.1/sound/pci/azt3328.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/pci/azt3328.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -822,7 +822,7 @@ snd_azf3328_mixer_new(struct snd_azf3328 { struct snd_ac97_bus *bus; @@ -81520,9 +81672,9 @@ diff -urNp linux-2.6.39/sound/pci/azt3328.c linux= -2.6.39/sound/pci/azt3328.c .dev_free =3D snd_azf3328_dev_free, }; u8 dma_init; -diff -urNp linux-2.6.39/sound/pci/bt87x.c linux-2.6.39/sound/pci/bt87x.c ---- linux-2.6.39/sound/pci/bt87x.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/bt87x.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/bt87x.c linux-2.6.39.1/sound/pci/bt8= 7x.c +--- linux-2.6.39.1/sound/pci/bt87x.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/pci/bt87x.c 2011-05-22 19:36:35.000000000 -0400 @@ -542,7 +542,7 @@ static snd_pcm_uframes_t snd_bt87x_point return (snd_pcm_uframes_t)bytes_to_frames(runtime, chip->current_line = * chip->line_bytes); } @@ -81541,9 +81693,9 @@ diff -urNp linux-2.6.39/sound/pci/bt87x.c linux-2= .6.39/sound/pci/bt87x.c .dev_free =3D snd_bt87x_dev_free }; =20 -diff -urNp linux-2.6.39/sound/pci/ca0106/ca0106_main.c linux-2.6.39/soun= d/pci/ca0106/ca0106_main.c ---- linux-2.6.39/sound/pci/ca0106/ca0106_main.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/pci/ca0106/ca0106_main.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ca0106/ca0106_main.c linux-2.6.39.1/= sound/pci/ca0106/ca0106_main.c +--- linux-2.6.39.1/sound/pci/ca0106/ca0106_main.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/pci/ca0106/ca0106_main.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -1103,7 +1103,7 @@ snd_ca0106_pcm_pointer_capture(struct sn } =20 @@ -81634,9 +81786,9 @@ diff -urNp linux-2.6.39/sound/pci/ca0106/ca0106_m= ain.c linux-2.6.39/sound/pci/ca .dev_free =3D snd_ca0106_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/ca0106/ca_midi.c linux-2.6.39/sound/pc= i/ca0106/ca_midi.c ---- linux-2.6.39/sound/pci/ca0106/ca_midi.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/pci/ca0106/ca_midi.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ca0106/ca_midi.c linux-2.6.39.1/soun= d/pci/ca0106/ca_midi.c +--- linux-2.6.39.1/sound/pci/ca0106/ca_midi.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/pci/ca0106/ca_midi.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -255,15 +255,13 @@ static void ca_midi_output_trigger(struc } } @@ -81655,9 +81807,9 @@ diff -urNp linux-2.6.39/sound/pci/ca0106/ca_midi.= c linux-2.6.39/sound/pci/ca0106 .open =3D ca_midi_input_open, .close =3D ca_midi_input_close, .trigger =3D ca_midi_input_trigger, -diff -urNp linux-2.6.39/sound/pci/cmipci.c linux-2.6.39/sound/pci/cmipci= .c ---- linux-2.6.39/sound/pci/cmipci.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/cmipci.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/cmipci.c linux-2.6.39.1/sound/pci/cm= ipci.c +--- linux-2.6.39.1/sound/pci/cmipci.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/cmipci.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -1838,7 +1838,7 @@ static int snd_cmipci_capture_spdif_clos /* */ @@ -81712,9 +81864,9 @@ diff -urNp linux-2.6.39/sound/pci/cmipci.c linux-= 2.6.39/sound/pci/cmipci.c .dev_free =3D snd_cmipci_dev_free, }; unsigned int val; -diff -urNp linux-2.6.39/sound/pci/cs4281.c linux-2.6.39/sound/pci/cs4281= .c ---- linux-2.6.39/sound/pci/cs4281.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/cs4281.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/cs4281.c linux-2.6.39.1/sound/pci/cs= 4281.c +--- linux-2.6.39.1/sound/pci/cs4281.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/cs4281.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -947,7 +947,7 @@ static int snd_cs4281_capture_close(stru return 0; } @@ -81769,9 +81921,9 @@ diff -urNp linux-2.6.39/sound/pci/cs4281.c linux-= 2.6.39/sound/pci/cs4281.c .open =3D snd_cs4281_midi_input_open, .close =3D snd_cs4281_midi_input_close, .trigger =3D snd_cs4281_midi_input_trigger, -diff -urNp linux-2.6.39/sound/pci/cs46xx/cs46xx_lib.c linux-2.6.39/sound= /pci/cs46xx/cs46xx_lib.c ---- linux-2.6.39/sound/pci/cs46xx/cs46xx_lib.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/pci/cs46xx/cs46xx_lib.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/cs46xx/cs46xx_lib.c linux-2.6.39.1/s= ound/pci/cs46xx/cs46xx_lib.c +--- linux-2.6.39.1/sound/pci/cs46xx/cs46xx_lib.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/pci/cs46xx/cs46xx_lib.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -3722,7 +3722,7 @@ int __devinit snd_cs46xx_create(struct s struct snd_cs46xx_region *region; struct cs_card_type *cp; @@ -81781,9 +81933,9 @@ diff -urNp linux-2.6.39/sound/pci/cs46xx/cs46xx_l= ib.c linux-2.6.39/sound/pci/cs4 .dev_free =3D snd_cs46xx_dev_free, }; =09 -diff -urNp linux-2.6.39/sound/pci/cs5530.c linux-2.6.39/sound/pci/cs5530= .c ---- linux-2.6.39/sound/pci/cs5530.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/cs5530.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/cs5530.c linux-2.6.39.1/sound/pci/cs= 5530.c +--- linux-2.6.39.1/sound/pci/cs5530.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/cs5530.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -107,7 +107,7 @@ static int __devinit snd_cs5530_create(s void __iomem *mem; int err; @@ -81793,9 +81945,9 @@ diff -urNp linux-2.6.39/sound/pci/cs5530.c linux-= 2.6.39/sound/pci/cs5530.c .dev_free =3D snd_cs5530_dev_free, }; *rchip =3D NULL; -diff -urNp linux-2.6.39/sound/pci/cs5535audio/cs5535audio.c linux-2.6.39= /sound/pci/cs5535audio/cs5535audio.c ---- linux-2.6.39/sound/pci/cs5535audio/cs5535audio.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/sound/pci/cs5535audio/cs5535audio.c 2011-05-22 19:36:35= .000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/cs5535audio/cs5535audio.c linux-2.6.= 39.1/sound/pci/cs5535audio/cs5535audio.c +--- linux-2.6.39.1/sound/pci/cs5535audio/cs5535audio.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/sound/pci/cs5535audio/cs5535audio.c 2011-05-22 19:36:= 35.000000000 -0400 @@ -150,7 +150,7 @@ static int __devinit snd_cs5535audio_mix struct snd_ac97_bus *pbus; struct snd_ac97_template ac97; @@ -81814,9 +81966,9 @@ diff -urNp linux-2.6.39/sound/pci/cs5535audio/cs5= 535audio.c linux-2.6.39/sound/p .dev_free =3D snd_cs5535audio_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/cs5535audio/cs5535audio_pcm.c linux-2.= 6.39/sound/pci/cs5535audio/cs5535audio_pcm.c ---- linux-2.6.39/sound/pci/cs5535audio/cs5535audio_pcm.c 2011-05-19 00:0= 6:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/cs5535audio/cs5535audio_pcm.c 2011-05-22 19:3= 6:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/cs5535audio/cs5535audio_pcm.c linux-= 2.6.39.1/sound/pci/cs5535audio/cs5535audio_pcm.c +--- linux-2.6.39.1/sound/pci/cs5535audio/cs5535audio_pcm.c 2011-05-19 00= :06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/pci/cs5535audio/cs5535audio_pcm.c 2011-05-22 19= :36:35.000000000 -0400 @@ -380,7 +380,7 @@ static int snd_cs5535audio_capture_prepa substream->runtime->rate); } @@ -81835,9 +81987,9 @@ diff -urNp linux-2.6.39/sound/pci/cs5535audio/cs5= 535audio_pcm.c linux-2.6.39/sou .open =3D snd_cs5535audio_capture_open, .close =3D snd_cs5535audio_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/ctxfi/ctpcm.c linux-2.6.39/sound/pci/c= txfi/ctpcm.c ---- linux-2.6.39/sound/pci/ctxfi/ctpcm.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/pci/ctxfi/ctpcm.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/pci/ctxfi/ctpcm.c linux-2.6.39.1/sound/p= ci/ctxfi/ctpcm.c +--- linux-2.6.39.1/sound/pci/ctxfi/ctpcm.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/pci/ctxfi/ctpcm.c 2011-05-22 19:36:35.000000000= -0400 @@ -370,7 +370,7 @@ ct_pcm_capture_pointer(struct snd_pcm_su } =20 @@ -81856,9 +82008,9 @@ diff -urNp linux-2.6.39/sound/pci/ctxfi/ctpcm.c l= inux-2.6.39/sound/pci/ctxfi/ctp .open =3D ct_pcm_capture_open, .close =3D ct_pcm_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/echoaudio/echoaudio.c linux-2.6.39/sou= nd/pci/echoaudio/echoaudio.c ---- linux-2.6.39/sound/pci/echoaudio/echoaudio.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/pci/echoaudio/echoaudio.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/echoaudio/echoaudio.c linux-2.6.39.1= /sound/pci/echoaudio/echoaudio.c +--- linux-2.6.39.1/sound/pci/echoaudio/echoaudio.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/pci/echoaudio/echoaudio.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -831,7 +831,7 @@ static snd_pcm_uframes_t pcm_pointer(str =20 =20 @@ -81904,9 +82056,9 @@ diff -urNp linux-2.6.39/sound/pci/echoaudio/echoa= udio.c linux-2.6.39/sound/pci/e .dev_free =3D snd_echo_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/echoaudio/midi.c linux-2.6.39/sound/pc= i/echoaudio/midi.c ---- linux-2.6.39/sound/pci/echoaudio/midi.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/pci/echoaudio/midi.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/pci/echoaudio/midi.c linux-2.6.39.1/soun= d/pci/echoaudio/midi.c +--- linux-2.6.39.1/sound/pci/echoaudio/midi.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/pci/echoaudio/midi.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -292,13 +292,13 @@ static int snd_echo_midi_output_close(st =20 =20 @@ -81923,9 +82075,9 @@ diff -urNp linux-2.6.39/sound/pci/echoaudio/midi.= c linux-2.6.39/sound/pci/echoau .open =3D snd_echo_midi_output_open, .close =3D snd_echo_midi_output_close, .trigger =3D snd_echo_midi_output_trigger, -diff -urNp linux-2.6.39/sound/pci/emu10k1/emu10k1_main.c linux-2.6.39/so= und/pci/emu10k1/emu10k1_main.c ---- linux-2.6.39/sound/pci/emu10k1/emu10k1_main.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/sound/pci/emu10k1/emu10k1_main.c 2011-05-22 19:36:35.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/emu10k1/emu10k1_main.c linux-2.6.39.= 1/sound/pci/emu10k1/emu10k1_main.c +--- linux-2.6.39.1/sound/pci/emu10k1/emu10k1_main.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/sound/pci/emu10k1/emu10k1_main.c 2011-05-22 19:36:35.= 000000000 -0400 @@ -1722,7 +1722,7 @@ int __devinit snd_emu10k1_create(struct=20 int is_audigy; unsigned int silent_page; @@ -81935,9 +82087,9 @@ diff -urNp linux-2.6.39/sound/pci/emu10k1/emu10k1= _main.c linux-2.6.39/sound/pci/ .dev_free =3D snd_emu10k1_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/emu10k1/emu10k1x.c linux-2.6.39/sound/= pci/emu10k1/emu10k1x.c ---- linux-2.6.39/sound/pci/emu10k1/emu10k1x.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/pci/emu10k1/emu10k1x.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/emu10k1/emu10k1x.c linux-2.6.39.1/so= und/pci/emu10k1/emu10k1x.c +--- linux-2.6.39.1/sound/pci/emu10k1/emu10k1x.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/pci/emu10k1/emu10k1x.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -543,7 +543,7 @@ snd_emu10k1x_pcm_pointer(struct snd_pcm_ } =20 @@ -81992,9 +82144,9 @@ diff -urNp linux-2.6.39/sound/pci/emu10k1/emu10k1= x.c linux-2.6.39/sound/pci/emu1 .open =3D snd_emu10k1x_midi_input_open, .close =3D snd_emu10k1x_midi_input_close, .trigger =3D snd_emu10k1x_midi_input_trigger, -diff -urNp linux-2.6.39/sound/pci/emu10k1/p16v.c linux-2.6.39/sound/pci/= emu10k1/p16v.c ---- linux-2.6.39/sound/pci/emu10k1/p16v.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/pci/emu10k1/p16v.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/pci/emu10k1/p16v.c linux-2.6.39.1/sound/= pci/emu10k1/p16v.c +--- linux-2.6.39.1/sound/pci/emu10k1/p16v.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/pci/emu10k1/p16v.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -601,7 +601,7 @@ snd_p16v_pcm_pointer_capture(struct snd_ } =20 @@ -82013,9 +82165,9 @@ diff -urNp linux-2.6.39/sound/pci/emu10k1/p16v.c = linux-2.6.39/sound/pci/emu10k1/ .open =3D snd_p16v_pcm_open_capture, .close =3D snd_p16v_pcm_close_capture, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/ens1370.c linux-2.6.39/sound/pci/ens13= 70.c ---- linux-2.6.39/sound/pci/ens1370.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/ens1370.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ens1370.c linux-2.6.39.1/sound/pci/e= ns1370.c +--- linux-2.6.39.1/sound/pci/ens1370.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/pci/ens1370.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -1225,7 +1225,7 @@ static int snd_ensoniq_capture_close(str return 0; } @@ -82079,9 +82231,9 @@ diff -urNp linux-2.6.39/sound/pci/ens1370.c linux= -2.6.39/sound/pci/ens1370.c .open =3D snd_ensoniq_midi_input_open, .close =3D snd_ensoniq_midi_input_close, .trigger =3D snd_ensoniq_midi_input_trigger, -diff -urNp linux-2.6.39/sound/pci/es1938.c linux-2.6.39/sound/pci/es1938= .c ---- linux-2.6.39/sound/pci/es1938.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/es1938.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/es1938.c linux-2.6.39.1/sound/pci/es= 1938.c +--- linux-2.6.39.1/sound/pci/es1938.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/es1938.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -1004,7 +1004,7 @@ static int snd_es1938_playback_close(str return 0; } @@ -82109,9 +82261,9 @@ diff -urNp linux-2.6.39/sound/pci/es1938.c linux-= 2.6.39/sound/pci/es1938.c .dev_free =3D snd_es1938_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/es1968.c linux-2.6.39/sound/pci/es1968= .c ---- linux-2.6.39/sound/pci/es1968.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/es1968.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/es1968.c linux-2.6.39.1/sound/pci/es= 1968.c +--- linux-2.6.39.1/sound/pci/es1968.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/pci/es1968.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -1682,7 +1682,7 @@ static int snd_es1968_capture_close(stru return 0; } @@ -82148,9 +82300,9 @@ diff -urNp linux-2.6.39/sound/pci/es1968.c linux-= 2.6.39/sound/pci/es1968.c .dev_free =3D snd_es1968_dev_free, }; struct es1968 *chip; -diff -urNp linux-2.6.39/sound/pci/fm801.c linux-2.6.39/sound/pci/fm801.c ---- linux-2.6.39/sound/pci/fm801.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/fm801.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/fm801.c linux-2.6.39.1/sound/pci/fm8= 01.c +--- linux-2.6.39.1/sound/pci/fm801.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/pci/fm801.c 2011-05-22 19:36:35.000000000 -0400 @@ -662,7 +662,7 @@ static int snd_fm801_capture_close(struc return 0; } @@ -82187,9 +82339,9 @@ diff -urNp linux-2.6.39/sound/pci/fm801.c linux-2= .6.39/sound/pci/fm801.c .dev_free =3D snd_fm801_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/hda/hda_generic.c linux-2.6.39/sound/p= ci/hda/hda_generic.c ---- linux-2.6.39/sound/pci/hda/hda_generic.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/pci/hda/hda_generic.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/hda_generic.c linux-2.6.39.1/sou= nd/pci/hda/hda_generic.c +--- linux-2.6.39.1/sound/pci/hda/hda_generic.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/hda_generic.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -1038,7 +1038,7 @@ static int generic_check_power_status(st =20 /* @@ -82199,10 +82351,10 @@ diff -urNp linux-2.6.39/sound/pci/hda/hda_gener= ic.c linux-2.6.39/sound/pci/hda/h .build_controls =3D build_generic_controls, .build_pcms =3D build_generic_pcms, .free =3D snd_hda_generic_free, -diff -urNp linux-2.6.39/sound/pci/hda/hda_intel.c linux-2.6.39/sound/pci= /hda/hda_intel.c ---- linux-2.6.39/sound/pci/hda/hda_intel.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/pci/hda/hda_intel.c 2011-05-22 19:36:35.000000000= -0400 -@@ -2452,7 +2452,7 @@ static int __devinit azx_create(struct s +diff -urNp linux-2.6.39.1/sound/pci/hda/hda_intel.c linux-2.6.39.1/sound= /pci/hda/hda_intel.c +--- linux-2.6.39.1/sound/pci/hda/hda_intel.c 2011-06-03 00:04:14.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/pci/hda/hda_intel.c 2011-06-03 00:32:08.0000000= 00 -0400 +@@ -2459,7 +2459,7 @@ static int __devinit azx_create(struct s struct azx *chip; int i, err; unsigned short gcap; @@ -82211,9 +82363,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/hda_intel.c= linux-2.6.39/sound/pci/hda/hda .dev_free =3D azx_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/hda/patch_ca0110.c linux-2.6.39/sound/= pci/hda/patch_ca0110.c ---- linux-2.6.39/sound/pci/hda/patch_ca0110.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_ca0110.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_ca0110.c linux-2.6.39.1/so= und/pci/hda/patch_ca0110.c +--- linux-2.6.39.1/sound/pci/hda/patch_ca0110.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_ca0110.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -389,7 +389,7 @@ static void ca0110_free(struct hda_codec kfree(codec->spec); } @@ -82223,9 +82375,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_ca011= 0.c linux-2.6.39/sound/pci/hda/ .build_controls =3D ca0110_build_controls, .build_pcms =3D ca0110_build_pcms, .init =3D ca0110_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_cirrus.c linux-2.6.39/sound/= pci/hda/patch_cirrus.c ---- linux-2.6.39/sound/pci/hda/patch_cirrus.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_cirrus.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_cirrus.c linux-2.6.39.1/so= und/pci/hda/patch_cirrus.c +--- linux-2.6.39.1/sound/pci/hda/patch_cirrus.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_cirrus.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -1126,7 +1126,7 @@ static void cs_unsol_event(struct hda_co } } @@ -82235,9 +82387,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_cirru= s.c linux-2.6.39/sound/pci/hda/ .build_controls =3D cs_build_controls, .build_pcms =3D cs_build_pcms, .init =3D cs_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_cmedia.c linux-2.6.39/sound/= pci/hda/patch_cmedia.c ---- linux-2.6.39/sound/pci/hda/patch_cmedia.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_cmedia.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_cmedia.c linux-2.6.39.1/so= und/pci/hda/patch_cmedia.c +--- linux-2.6.39.1/sound/pci/hda/patch_cmedia.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_cmedia.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -624,7 +624,7 @@ static struct snd_pci_quirk cmi9880_cfg_ {} /* terminator */ }; @@ -82247,9 +82399,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_cmedi= a.c linux-2.6.39/sound/pci/hda/ .build_controls =3D cmi9880_build_controls, .build_pcms =3D cmi9880_build_pcms, .init =3D cmi9880_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_conexant.c linux-2.6.39/soun= d/pci/hda/patch_conexant.c ---- linux-2.6.39/sound/pci/hda/patch_conexant.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_conexant.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_conexant.c linux-2.6.39.1/= sound/pci/hda/patch_conexant.c +--- linux-2.6.39.1/sound/pci/hda/patch_conexant.c 2011-06-03 00:04:14.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_conexant.c 2011-06-03 00:32:08.00= 0000000 -0400 @@ -546,7 +546,7 @@ static int conexant_suspend(struct hda_c } #endif @@ -82259,7 +82411,7 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_conex= ant.c linux-2.6.39/sound/pci/hd .build_controls =3D conexant_build_controls, .build_pcms =3D conexant_build_pcms, .init =3D conexant_init, -@@ -3791,7 +3791,7 @@ static int cx_auto_build_controls(struct +@@ -3792,7 +3792,7 @@ static int cx_auto_build_controls(struct return conexant_build_controls(codec); } =20 @@ -82268,9 +82420,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_conex= ant.c linux-2.6.39/sound/pci/hd .build_controls =3D cx_auto_build_controls, .build_pcms =3D conexant_build_pcms, .init =3D cx_auto_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_hdmi.c linux-2.6.39/sound/pc= i/hda/patch_hdmi.c ---- linux-2.6.39/sound/pci/hda/patch_hdmi.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_hdmi.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_hdmi.c linux-2.6.39.1/soun= d/pci/hda/patch_hdmi.c +--- linux-2.6.39.1/sound/pci/hda/patch_hdmi.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_hdmi.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -1124,7 +1124,7 @@ static void generic_hdmi_free(struct hda kfree(spec); } @@ -82306,9 +82458,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_hdmi.= c linux-2.6.39/sound/pci/hda/pa .build_controls =3D generic_hdmi_build_controls, .build_pcms =3D generic_hdmi_build_pcms, .init =3D atihdmi_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_realtek.c linux-2.6.39/sound= /pci/hda/patch_realtek.c ---- linux-2.6.39/sound/pci/hda/patch_realtek.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_realtek.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_realtek.c linux-2.6.39.1/s= ound/pci/hda/patch_realtek.c +--- linux-2.6.39.1/sound/pci/hda/patch_realtek.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_realtek.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -4273,7 +4273,7 @@ static int alc_resume(struct hda_codec * =20 /* @@ -82318,9 +82470,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_realt= ek.c linux-2.6.39/sound/pci/hda .build_controls =3D alc_build_controls, .build_pcms =3D alc_build_pcms, .init =3D alc_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_si3054.c linux-2.6.39/sound/= pci/hda/patch_si3054.c ---- linux-2.6.39/sound/pci/hda/patch_si3054.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_si3054.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_si3054.c linux-2.6.39.1/so= und/pci/hda/patch_si3054.c +--- linux-2.6.39.1/sound/pci/hda/patch_si3054.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_si3054.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -263,7 +263,7 @@ static void si3054_free(struct hda_codec /* */ @@ -82330,9 +82482,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_si305= 4.c linux-2.6.39/sound/pci/hda/ .build_controls =3D si3054_build_controls, .build_pcms =3D si3054_build_pcms, .init =3D si3054_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_sigmatel.c linux-2.6.39/soun= d/pci/hda/patch_sigmatel.c ---- linux-2.6.39/sound/pci/hda/patch_sigmatel.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/pci/hda/patch_sigmatel.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_sigmatel.c linux-2.6.39.1/= sound/pci/hda/patch_sigmatel.c +--- linux-2.6.39.1/sound/pci/hda/patch_sigmatel.c 2011-06-03 00:04:14.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_sigmatel.c 2011-06-03 00:32:08.00= 0000000 -0400 @@ -4968,7 +4968,7 @@ static int stac92xx_suspend(struct hda_c } #endif @@ -82342,9 +82494,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_sigma= tel.c linux-2.6.39/sound/pci/hd .build_controls =3D stac92xx_build_controls, .build_pcms =3D stac92xx_build_pcms, .init =3D stac92xx_init, -diff -urNp linux-2.6.39/sound/pci/hda/patch_via.c linux-2.6.39/sound/pci= /hda/patch_via.c ---- linux-2.6.39/sound/pci/hda/patch_via.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/pci/hda/patch_via.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/pci/hda/patch_via.c linux-2.6.39.1/sound= /pci/hda/patch_via.c +--- linux-2.6.39.1/sound/pci/hda/patch_via.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/pci/hda/patch_via.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -2254,7 +2254,7 @@ static int via_check_power_status(struct =20 /* @@ -82354,9 +82506,9 @@ diff -urNp linux-2.6.39/sound/pci/hda/patch_via.c= linux-2.6.39/sound/pci/hda/pat .build_controls =3D via_build_controls, .build_pcms =3D via_build_pcms, .init =3D via_init, -diff -urNp linux-2.6.39/sound/pci/ice1712/ice1712.c linux-2.6.39/sound/p= ci/ice1712/ice1712.c ---- linux-2.6.39/sound/pci/ice1712/ice1712.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/pci/ice1712/ice1712.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ice1712/ice1712.c linux-2.6.39.1/sou= nd/pci/ice1712/ice1712.c +--- linux-2.6.39.1/sound/pci/ice1712/ice1712.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/pci/ice1712/ice1712.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -2541,7 +2541,7 @@ static int __devinit snd_ice1712_create( { struct snd_ice1712 *ice; @@ -82366,9 +82518,9 @@ diff -urNp linux-2.6.39/sound/pci/ice1712/ice1712= .c linux-2.6.39/sound/pci/ice17 .dev_free =3D snd_ice1712_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/ice1712/ice1724.c linux-2.6.39/sound/p= ci/ice1712/ice1724.c ---- linux-2.6.39/sound/pci/ice1712/ice1724.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/pci/ice1712/ice1724.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ice1712/ice1724.c linux-2.6.39.1/sou= nd/pci/ice1712/ice1724.c +--- linux-2.6.39.1/sound/pci/ice1712/ice1724.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/pci/ice1712/ice1724.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -367,7 +367,7 @@ static void vt1724_midi_output_drain(str } while (time_after(timeout, jiffies)); } @@ -82396,9 +82548,9 @@ diff -urNp linux-2.6.39/sound/pci/ice1712/ice1724= .c linux-2.6.39/sound/pci/ice17 .dev_free =3D snd_vt1724_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/intel8x0.c linux-2.6.39/sound/pci/inte= l8x0.c ---- linux-2.6.39/sound/pci/intel8x0.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/pci/intel8x0.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/pci/intel8x0.c linux-2.6.39.1/sound/pci/= intel8x0.c +--- linux-2.6.39.1/sound/pci/intel8x0.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/pci/intel8x0.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -2152,12 +2152,12 @@ static int __devinit snd_intel8x0_mixer( int err; unsigned int i, codecs; @@ -82424,9 +82576,9 @@ diff -urNp linux-2.6.39/sound/pci/intel8x0.c linu= x-2.6.39/sound/pci/intel8x0.c .dev_free =3D snd_intel8x0_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/intel8x0m.c linux-2.6.39/sound/pci/int= el8x0m.c ---- linux-2.6.39/sound/pci/intel8x0m.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/pci/intel8x0m.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/pci/intel8x0m.c linux-2.6.39.1/sound/pci= /intel8x0m.c +--- linux-2.6.39.1/sound/pci/intel8x0m.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/pci/intel8x0m.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -826,7 +826,7 @@ static int __devinit snd_intel8x0m_mixer struct snd_ac97 *x97; int err; @@ -82454,9 +82606,9 @@ diff -urNp linux-2.6.39/sound/pci/intel8x0m.c lin= ux-2.6.39/sound/pci/intel8x0m.c }; =20 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.39/sound/pci/korg1212/korg1212.c linux-2.6.39/sound= /pci/korg1212/korg1212.c ---- linux-2.6.39/sound/pci/korg1212/korg1212.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/pci/korg1212/korg1212.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/korg1212/korg1212.c linux-2.6.39.1/s= ound/pci/korg1212/korg1212.c +--- linux-2.6.39.1/sound/pci/korg1212/korg1212.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/pci/korg1212/korg1212.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -1682,7 +1682,7 @@ static int snd_korg1212_capture_copy(str return snd_korg1212_copy_to(korg1212, dst, pos, count, 0, korg1212->ch= annels * 2); } @@ -82484,9 +82636,9 @@ diff -urNp linux-2.6.39/sound/pci/korg1212/korg12= 12.c linux-2.6.39/sound/pci/kor .dev_free =3D snd_korg1212_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/maestro3.c linux-2.6.39/sound/pci/maes= tro3.c ---- linux-2.6.39/sound/pci/maestro3.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/pci/maestro3.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/pci/maestro3.c linux-2.6.39.1/sound/pci/= maestro3.c +--- linux-2.6.39.1/sound/pci/maestro3.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/pci/maestro3.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -1926,7 +1926,7 @@ snd_m3_capture_close(struct snd_pcm_subs * create pcm instance */ @@ -82523,9 +82675,9 @@ diff -urNp linux-2.6.39/sound/pci/maestro3.c linu= x-2.6.39/sound/pci/maestro3.c .dev_free =3D snd_m3_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/mixart/mixart.c linux-2.6.39/sound/pci= /mixart/mixart.c ---- linux-2.6.39/sound/pci/mixart/mixart.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/pci/mixart/mixart.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/pci/mixart/mixart.c linux-2.6.39.1/sound= /pci/mixart/mixart.c +--- linux-2.6.39.1/sound/pci/mixart/mixart.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/pci/mixart/mixart.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -887,7 +887,7 @@ static snd_pcm_uframes_t snd_mixart_stre =20 =20 @@ -82553,9 +82705,9 @@ diff -urNp linux-2.6.39/sound/pci/mixart/mixart.c= linux-2.6.39/sound/pci/mixart/ .dev_free =3D snd_mixart_chip_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/nm256/nm256.c linux-2.6.39/sound/pci/n= m256/nm256.c ---- linux-2.6.39/sound/pci/nm256/nm256.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/pci/nm256/nm256.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/pci/nm256/nm256.c linux-2.6.39.1/sound/p= ci/nm256/nm256.c +--- linux-2.6.39.1/sound/pci/nm256/nm256.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/pci/nm256/nm256.c 2011-05-22 19:36:35.000000000= -0400 @@ -899,7 +899,7 @@ snd_nm256_capture_close(struct snd_pcm_s /* * create a pcm instance @@ -82592,9 +82744,9 @@ diff -urNp linux-2.6.39/sound/pci/nm256/nm256.c l= inux-2.6.39/sound/pci/nm256/nm2 .dev_free =3D snd_nm256_dev_free, }; u32 addr; -diff -urNp linux-2.6.39/sound/pci/oxygen/oxygen_pcm.c linux-2.6.39/sound= /pci/oxygen/oxygen_pcm.c ---- linux-2.6.39/sound/pci/oxygen/oxygen_pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/pci/oxygen/oxygen_pcm.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/oxygen/oxygen_pcm.c linux-2.6.39.1/s= ound/pci/oxygen/oxygen_pcm.c +--- linux-2.6.39.1/sound/pci/oxygen/oxygen_pcm.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/pci/oxygen/oxygen_pcm.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -606,7 +606,7 @@ static snd_pcm_uframes_t oxygen_pointer( return bytes_to_frames(runtime, curr_addr - (u32)runtime->dma_addr); } @@ -82649,9 +82801,9 @@ diff -urNp linux-2.6.39/sound/pci/oxygen/oxygen_p= cm.c linux-2.6.39/sound/pci/oxy .open =3D oxygen_ac97_open, .close =3D oxygen_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/pcxhr/pcxhr.c linux-2.6.39/sound/pci/p= cxhr/pcxhr.c ---- linux-2.6.39/sound/pci/pcxhr/pcxhr.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/pci/pcxhr/pcxhr.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/pci/pcxhr/pcxhr.c linux-2.6.39.1/sound/p= ci/pcxhr/pcxhr.c +--- linux-2.6.39.1/sound/pci/pcxhr/pcxhr.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/pci/pcxhr/pcxhr.c 2011-05-22 19:36:35.000000000= -0400 @@ -1121,7 +1121,7 @@ static snd_pcm_uframes_t pcxhr_stream_po } =20 @@ -82670,9 +82822,9 @@ diff -urNp linux-2.6.39/sound/pci/pcxhr/pcxhr.c l= inux-2.6.39/sound/pci/pcxhr/pcx .dev_free =3D pcxhr_chip_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/riptide/riptide.c linux-2.6.39/sound/p= ci/riptide/riptide.c ---- linux-2.6.39/sound/pci/riptide/riptide.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/pci/riptide/riptide.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/pci/riptide/riptide.c linux-2.6.39.1/sou= nd/pci/riptide/riptide.c +--- linux-2.6.39.1/sound/pci/riptide/riptide.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/pci/riptide/riptide.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -1675,7 +1675,7 @@ static int snd_riptide_capture_close(str return 0; } @@ -82709,9 +82861,9 @@ diff -urNp linux-2.6.39/sound/pci/riptide/riptide= .c linux-2.6.39/sound/pci/ripti .write =3D snd_riptide_codec_write, .read =3D snd_riptide_codec_read, }; -diff -urNp linux-2.6.39/sound/pci/rme32.c linux-2.6.39/sound/pci/rme32.c ---- linux-2.6.39/sound/pci/rme32.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/rme32.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/rme32.c linux-2.6.39.1/sound/pci/rme= 32.c +--- linux-2.6.39.1/sound/pci/rme32.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/pci/rme32.c 2011-05-22 19:36:35.000000000 -0400 @@ -1197,7 +1197,7 @@ snd_rme32_capture_fd_pointer(struct snd_ } =20 @@ -82784,9 +82936,9 @@ diff -urNp linux-2.6.39/sound/pci/rme32.c linux-2= .6.39/sound/pci/rme32.c .open =3D snd_rme32_capture_adat_open, .close =3D snd_rme32_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/rme9652/hdsp.c linux-2.6.39/sound/pci/= rme9652/hdsp.c ---- linux-2.6.39/sound/pci/rme9652/hdsp.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/pci/rme9652/hdsp.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/pci/rme9652/hdsp.c linux-2.6.39.1/sound/= pci/rme9652/hdsp.c +--- linux-2.6.39.1/sound/pci/rme9652/hdsp.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/pci/rme9652/hdsp.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -1469,15 +1469,13 @@ static int snd_hdsp_midi_output_close(st return 0; } @@ -82823,9 +82975,9 @@ diff -urNp linux-2.6.39/sound/pci/rme9652/hdsp.c = linux-2.6.39/sound/pci/rme9652/ .open =3D snd_hdsp_capture_open, .close =3D snd_hdsp_capture_release, .ioctl =3D snd_hdsp_ioctl, -diff -urNp linux-2.6.39/sound/pci/rme9652/hdspm.c linux-2.6.39/sound/pci= /rme9652/hdspm.c ---- linux-2.6.39/sound/pci/rme9652/hdspm.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/pci/rme9652/hdspm.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/pci/rme9652/hdspm.c linux-2.6.39.1/sound= /pci/rme9652/hdspm.c +--- linux-2.6.39.1/sound/pci/rme9652/hdspm.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/pci/rme9652/hdspm.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -1773,15 +1773,13 @@ static int snd_hdspm_midi_output_close(s return 0; } @@ -82862,9 +83014,9 @@ diff -urNp linux-2.6.39/sound/pci/rme9652/hdspm.c= linux-2.6.39/sound/pci/rme9652 .open =3D snd_hdspm_capture_open, .close =3D snd_hdspm_capture_release, .ioctl =3D snd_hdspm_ioctl, -diff -urNp linux-2.6.39/sound/pci/rme9652/rme9652.c linux-2.6.39/sound/p= ci/rme9652/rme9652.c ---- linux-2.6.39/sound/pci/rme9652/rme9652.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/pci/rme9652/rme9652.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/pci/rme9652/rme9652.c linux-2.6.39.1/sou= nd/pci/rme9652/rme9652.c +--- linux-2.6.39.1/sound/pci/rme9652/rme9652.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/pci/rme9652/rme9652.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -2391,7 +2391,7 @@ static int snd_rme9652_capture_release(s return 0; } @@ -82883,9 +83035,9 @@ diff -urNp linux-2.6.39/sound/pci/rme9652/rme9652= .c linux-2.6.39/sound/pci/rme96 .open =3D snd_rme9652_capture_open, .close =3D snd_rme9652_capture_release, .ioctl =3D snd_rme9652_ioctl, -diff -urNp linux-2.6.39/sound/pci/rme96.c linux-2.6.39/sound/pci/rme96.c ---- linux-2.6.39/sound/pci/rme96.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/rme96.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/rme96.c linux-2.6.39.1/sound/pci/rme= 96.c +--- linux-2.6.39.1/sound/pci/rme96.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/pci/rme96.c 2011-05-22 19:36:35.000000000 -0400 @@ -1447,7 +1447,7 @@ snd_rme96_capture_pointer(struct snd_pcm return snd_rme96_capture_ptr(rme96); } @@ -82922,9 +83074,9 @@ diff -urNp linux-2.6.39/sound/pci/rme96.c linux-2= .6.39/sound/pci/rme96.c .open =3D snd_rme96_capture_adat_open, .close =3D snd_rme96_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/pci/sis7019.c linux-2.6.39/sound/pci/sis70= 19.c ---- linux-2.6.39/sound/pci/sis7019.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/sis7019.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/sis7019.c linux-2.6.39.1/sound/pci/s= is7019.c +--- linux-2.6.39.1/sound/pci/sis7019.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/pci/sis7019.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -1011,7 +1011,7 @@ static int __devinit sis_mixer_create(st { struct snd_ac97_bus *bus; @@ -82943,9 +83095,9 @@ diff -urNp linux-2.6.39/sound/pci/sis7019.c linux= -2.6.39/sound/pci/sis7019.c .dev_free =3D sis_dev_free, }; int rc; -diff -urNp linux-2.6.39/sound/pci/sonicvibes.c linux-2.6.39/sound/pci/so= nicvibes.c ---- linux-2.6.39/sound/pci/sonicvibes.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/pci/sonicvibes.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/pci/sonicvibes.c linux-2.6.39.1/sound/pc= i/sonicvibes.c +--- linux-2.6.39.1/sound/pci/sonicvibes.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/pci/sonicvibes.c 2011-05-22 19:36:35.000000000 = -0400 @@ -855,7 +855,7 @@ static int snd_sonicvibes_capture_close( return 0; } @@ -82973,9 +83125,9 @@ diff -urNp linux-2.6.39/sound/pci/sonicvibes.c li= nux-2.6.39/sound/pci/sonicvibes .dev_free =3D snd_sonicvibes_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/trident/trident_main.c linux-2.6.39/so= und/pci/trident/trident_main.c ---- linux-2.6.39/sound/pci/trident/trident_main.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/sound/pci/trident/trident_main.c 2011-05-22 19:36:35.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/trident/trident_main.c linux-2.6.39.= 1/sound/pci/trident/trident_main.c +--- linux-2.6.39.1/sound/pci/trident/trident_main.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/sound/pci/trident/trident_main.c 2011-05-22 19:36:35.= 000000000 -0400 @@ -3549,7 +3549,7 @@ int __devinit snd_trident_create(struct=20 int i, err; struct snd_trident_voice *voice; @@ -82985,9 +83137,9 @@ diff -urNp linux-2.6.39/sound/pci/trident/trident= _main.c linux-2.6.39/sound/pci/ .dev_free =3D snd_trident_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/via82xx.c linux-2.6.39/sound/pci/via82= xx.c ---- linux-2.6.39/sound/pci/via82xx.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/pci/via82xx.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/via82xx.c linux-2.6.39.1/sound/pci/v= ia82xx.c +--- linux-2.6.39.1/sound/pci/via82xx.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/pci/via82xx.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -1352,7 +1352,7 @@ static int snd_via8233_playback_close(st =20 =20 @@ -83051,9 +83203,9 @@ diff -urNp linux-2.6.39/sound/pci/via82xx.c linux= -2.6.39/sound/pci/via82xx.c .dev_free =3D snd_via82xx_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/via82xx_modem.c linux-2.6.39/sound/pci= /via82xx_modem.c ---- linux-2.6.39/sound/pci/via82xx_modem.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/pci/via82xx_modem.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/pci/via82xx_modem.c linux-2.6.39.1/sound= /pci/via82xx_modem.c +--- linux-2.6.39.1/sound/pci/via82xx_modem.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/pci/via82xx_modem.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -799,7 +799,7 @@ static int snd_via82xx_pcm_close(struct=20 =20 =20 @@ -83090,9 +83242,9 @@ diff -urNp linux-2.6.39/sound/pci/via82xx_modem.c= linux-2.6.39/sound/pci/via82xx .dev_free =3D snd_via82xx_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pci/vx222/vx222.c linux-2.6.39/sound/pci/v= x222/vx222.c ---- linux-2.6.39/sound/pci/vx222/vx222.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/pci/vx222/vx222.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/pci/vx222/vx222.c linux-2.6.39.1/sound/p= ci/vx222/vx222.c +--- linux-2.6.39.1/sound/pci/vx222/vx222.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/pci/vx222/vx222.c 2011-05-22 19:36:35.000000000= -0400 @@ -141,7 +141,7 @@ static int __devinit snd_vx222_create(st struct vx_core *chip; struct snd_vx222 *vx; @@ -83102,9 +83254,9 @@ diff -urNp linux-2.6.39/sound/pci/vx222/vx222.c l= inux-2.6.39/sound/pci/vx222/vx2 .dev_free =3D snd_vx222_dev_free, }; struct snd_vx_ops *vx_ops; -diff -urNp linux-2.6.39/sound/pci/ymfpci/ymfpci_main.c linux-2.6.39/soun= d/pci/ymfpci/ymfpci_main.c ---- linux-2.6.39/sound/pci/ymfpci/ymfpci_main.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/pci/ymfpci/ymfpci_main.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/pci/ymfpci/ymfpci_main.c linux-2.6.39.1/= sound/pci/ymfpci/ymfpci_main.c +--- linux-2.6.39.1/sound/pci/ymfpci/ymfpci_main.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/pci/ymfpci/ymfpci_main.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) =3D=3D 0) break; @@ -83154,9 +83306,9 @@ diff -urNp linux-2.6.39/sound/pci/ymfpci/ymfpci_m= ain.c linux-2.6.39/sound/pci/ym chip->card =3D card; chip->pci =3D pci; chip->irq =3D -1; -diff -urNp linux-2.6.39/sound/pcmcia/pdaudiocf/pdaudiocf.c linux-2.6.39/= sound/pcmcia/pdaudiocf/pdaudiocf.c ---- linux-2.6.39/sound/pcmcia/pdaudiocf/pdaudiocf.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/pcmcia/pdaudiocf/pdaudiocf.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/pcmcia/pdaudiocf/pdaudiocf.c linux-2.6.3= 9.1/sound/pcmcia/pdaudiocf/pdaudiocf.c +--- linux-2.6.39.1/sound/pcmcia/pdaudiocf/pdaudiocf.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/pcmcia/pdaudiocf/pdaudiocf.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -94,7 +94,7 @@ static int snd_pdacf_probe(struct pcmcia int i, err; struct snd_pdacf *pdacf; @@ -83166,9 +83318,9 @@ diff -urNp linux-2.6.39/sound/pcmcia/pdaudiocf/pd= audiocf.c linux-2.6.39/sound/pc .dev_free =3D snd_pdacf_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/pcmcia/vx/vxpocket.c linux-2.6.39/sound/pc= mcia/vx/vxpocket.c ---- linux-2.6.39/sound/pcmcia/vx/vxpocket.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/pcmcia/vx/vxpocket.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/pcmcia/vx/vxpocket.c linux-2.6.39.1/soun= d/pcmcia/vx/vxpocket.c +--- linux-2.6.39.1/sound/pcmcia/vx/vxpocket.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/pcmcia/vx/vxpocket.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -137,7 +137,7 @@ static int snd_vxpocket_new(struct snd_c { struct vx_core *chip; @@ -83178,9 +83330,9 @@ diff -urNp linux-2.6.39/sound/pcmcia/vx/vxpocket.= c linux-2.6.39/sound/pcmcia/vx/ .dev_free =3D snd_vxpocket_dev_free, }; int err; -diff -urNp linux-2.6.39/sound/ppc/pmac.c linux-2.6.39/sound/ppc/pmac.c ---- linux-2.6.39/sound/ppc/pmac.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/ppc/pmac.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/ppc/pmac.c linux-2.6.39.1/sound/ppc/pmac= .c +--- linux-2.6.39.1/sound/ppc/pmac.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/ppc/pmac.c 2011-05-22 19:36:35.000000000 -0400 @@ -1186,7 +1186,7 @@ int __devinit snd_pmac_new(struct snd_ca int i, err; unsigned int irq; @@ -83190,9 +83342,9 @@ diff -urNp linux-2.6.39/sound/ppc/pmac.c linux-2.= 6.39/sound/ppc/pmac.c .dev_free =3D snd_pmac_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/ppc/snd_ps3.c linux-2.6.39/sound/ppc/snd_p= s3.c ---- linux-2.6.39/sound/ppc/snd_ps3.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/ppc/snd_ps3.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/ppc/snd_ps3.c linux-2.6.39.1/sound/ppc/s= nd_ps3.c +--- linux-2.6.39.1/sound/ppc/snd_ps3.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/sound/ppc/snd_ps3.c 2011-05-22 19:36:35.000000000 -04= 00 @@ -773,7 +773,7 @@ static struct snd_kcontrol_new spdif_ctl }, }; @@ -83202,9 +83354,9 @@ diff -urNp linux-2.6.39/sound/ppc/snd_ps3.c linux= -2.6.39/sound/ppc/snd_ps3.c .open =3D snd_ps3_pcm_open, .close =3D snd_ps3_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/sh/aica.c linux-2.6.39/sound/sh/aica.c ---- linux-2.6.39/sound/sh/aica.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/sh/aica.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/sh/aica.c linux-2.6.39.1/sound/sh/aica.c +--- linux-2.6.39.1/sound/sh/aica.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/sh/aica.c 2011-05-22 19:36:35.000000000 -0400 @@ -441,7 +441,7 @@ static unsigned long snd_aicapcm_pcm_poi return readl(AICA_CONTROL_CHANNEL_SAMPLE_NUMBER); } @@ -83214,9 +83366,9 @@ diff -urNp linux-2.6.39/sound/sh/aica.c linux-2.6= .39/sound/sh/aica.c .open =3D snd_aicapcm_pcm_open, .close =3D snd_aicapcm_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/sh/sh_dac_audio.c linux-2.6.39/sound/sh/sh= _dac_audio.c ---- linux-2.6.39/sound/sh/sh_dac_audio.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/sh/sh_dac_audio.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/sh/sh_dac_audio.c linux-2.6.39.1/sound/s= h/sh_dac_audio.c +--- linux-2.6.39.1/sound/sh/sh_dac_audio.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/sh/sh_dac_audio.c 2011-05-22 19:36:35.000000000= -0400 @@ -246,7 +246,7 @@ snd_pcm_uframes_t snd_sh_dac_pcm_pointer } =20 @@ -83235,9 +83387,9 @@ diff -urNp linux-2.6.39/sound/sh/sh_dac_audio.c l= inux-2.6.39/sound/sh/sh_dac_aud .dev_free =3D snd_sh_dac_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/soc/atmel/atmel-pcm.c linux-2.6.39/sound/s= oc/atmel/atmel-pcm.c ---- linux-2.6.39/sound/soc/atmel/atmel-pcm.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/soc/atmel/atmel-pcm.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/soc/atmel/atmel-pcm.c linux-2.6.39.1/sou= nd/soc/atmel/atmel-pcm.c +--- linux-2.6.39.1/sound/soc/atmel/atmel-pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/soc/atmel/atmel-pcm.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -346,7 +346,7 @@ static int atmel_pcm_mmap(struct snd_pcm vma->vm_end - vma->vm_start, vma->vm_page_prot); } @@ -83247,9 +83399,9 @@ diff -urNp linux-2.6.39/sound/soc/atmel/atmel-pcm= .c linux-2.6.39/sound/soc/atmel .open =3D atmel_pcm_open, .close =3D atmel_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/atmel/playpaq_wm8510.c linux-2.6.39/so= und/soc/atmel/playpaq_wm8510.c ---- linux-2.6.39/sound/soc/atmel/playpaq_wm8510.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/sound/soc/atmel/playpaq_wm8510.c 2011-05-22 19:36:35.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/atmel/playpaq_wm8510.c linux-2.6.39.= 1/sound/soc/atmel/playpaq_wm8510.c +--- linux-2.6.39.1/sound/soc/atmel/playpaq_wm8510.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/sound/soc/atmel/playpaq_wm8510.c 2011-05-22 19:36:35.= 000000000 -0400 @@ -289,7 +289,7 @@ static int playpaq_wm8510_hw_params(stru =20 =20 @@ -83259,9 +83411,9 @@ diff -urNp linux-2.6.39/sound/soc/atmel/playpaq_w= m8510.c linux-2.6.39/sound/soc/ .hw_params =3D playpaq_wm8510_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/atmel/sam9g20_wm8731.c linux-2.6.39/so= und/soc/atmel/sam9g20_wm8731.c ---- linux-2.6.39/sound/soc/atmel/sam9g20_wm8731.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/sound/soc/atmel/sam9g20_wm8731.c 2011-05-22 19:36:35.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/atmel/sam9g20_wm8731.c linux-2.6.39.= 1/sound/soc/atmel/sam9g20_wm8731.c +--- linux-2.6.39.1/sound/soc/atmel/sam9g20_wm8731.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/sound/soc/atmel/sam9g20_wm8731.c 2011-05-22 19:36:35.= 000000000 -0400 @@ -87,7 +87,7 @@ static int at91sam9g20ek_hw_params(struc return 0; } @@ -83271,9 +83423,9 @@ diff -urNp linux-2.6.39/sound/soc/atmel/sam9g20_w= m8731.c linux-2.6.39/sound/soc/ .hw_params =3D at91sam9g20ek_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/atmel/snd-soc-afeb9260.c linux-2.6.39/= sound/soc/atmel/snd-soc-afeb9260.c ---- linux-2.6.39/sound/soc/atmel/snd-soc-afeb9260.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/atmel/snd-soc-afeb9260.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/atmel/snd-soc-afeb9260.c linux-2.6.3= 9.1/sound/soc/atmel/snd-soc-afeb9260.c +--- linux-2.6.39.1/sound/soc/atmel/snd-soc-afeb9260.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/atmel/snd-soc-afeb9260.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -81,7 +81,7 @@ static int afeb9260_hw_params(struct snd return err; } @@ -83283,9 +83435,9 @@ diff -urNp linux-2.6.39/sound/soc/atmel/snd-soc-a= feb9260.c linux-2.6.39/sound/so .hw_params =3D afeb9260_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/au1x/db1200.c linux-2.6.39/sound/soc/a= u1x/db1200.c ---- linux-2.6.39/sound/soc/au1x/db1200.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/soc/au1x/db1200.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/soc/au1x/db1200.c linux-2.6.39.1/sound/s= oc/au1x/db1200.c +--- linux-2.6.39.1/sound/soc/au1x/db1200.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/soc/au1x/db1200.c 2011-05-22 19:36:35.000000000= -0400 @@ -67,7 +67,7 @@ out: return ret; } @@ -83295,9 +83447,9 @@ diff -urNp linux-2.6.39/sound/soc/au1x/db1200.c l= inux-2.6.39/sound/soc/au1x/db12 .startup =3D db1200_i2s_startup, }; =20 -diff -urNp linux-2.6.39/sound/soc/au1x/dbdma2.c linux-2.6.39/sound/soc/a= u1x/dbdma2.c ---- linux-2.6.39/sound/soc/au1x/dbdma2.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/soc/au1x/dbdma2.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/soc/au1x/dbdma2.c linux-2.6.39.1/sound/s= oc/au1x/dbdma2.c +--- linux-2.6.39.1/sound/soc/au1x/dbdma2.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/soc/au1x/dbdma2.c 2011-05-22 19:36:35.000000000= -0400 @@ -303,7 +303,7 @@ static int au1xpsc_pcm_close(struct snd_ return 0; } @@ -83307,9 +83459,9 @@ diff -urNp linux-2.6.39/sound/soc/au1x/dbdma2.c l= inux-2.6.39/sound/soc/au1x/dbdm .open =3D au1xpsc_pcm_open, .close =3D au1xpsc_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.c linux-2.6.39/sou= nd/soc/blackfin/bf5xx-ac97.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97.c linux-2.6.39.1= /sound/soc/blackfin/bf5xx-ac97.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -244,7 +244,7 @@ static void bf5xx_ac97_cold_reset(struct #endif } @@ -83319,9 +83471,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ac97.c linux-2.6.39/sound/soc/b .read =3D bf5xx_ac97_read, .write =3D bf5xx_ac97_write, .warm_reset =3D bf5xx_ac97_warm_reset, -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.h linux-2.6.39/sou= nd/soc/blackfin/bf5xx-ac97.h ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.h 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.h 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97.h linux-2.6.39.1= /sound/soc/blackfin/bf5xx-ac97.h +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97.h 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97.h 2011-05-22 19:36:35.0= 00000000 -0400 @@ -9,7 +9,7 @@ #ifndef _BF5XX_AC97_H #define _BF5XX_AC97_H @@ -83331,9 +83483,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ac97.h linux-2.6.39/sound/soc/b extern struct snd_ac97 *ac97; /* Frame format in memory, only support stereo currently */ struct ac97_frame { -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ac97-pcm.c linux-2.6.39= /sound/soc/blackfin/bf5xx-ac97-pcm.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-05-22 19:36:35= .000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97-pcm.c linux-2.6.= 39.1/sound/soc/blackfin/bf5xx-ac97-pcm.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-05-22 19:36:= 35.000000000 -0400 @@ -297,7 +297,7 @@ static int bf5xx_pcm_copy(struct snd_pcm } #endif @@ -83343,9 +83495,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ac97-pcm.c linux-2.6.39/sound/s .open =3D bf5xx_pcm_open, .ioctl =3D snd_pcm_lib_ioctl, .hw_params =3D bf5xx_pcm_hw_params, -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ad1836.c linux-2.6.39/s= ound/soc/blackfin/bf5xx-ad1836.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ad1836.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ad1836.c 2011-05-22 19:36:35.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad1836.c linux-2.6.39= .1/sound/soc/blackfin/bf5xx-ad1836.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad1836.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad1836.c 2011-05-22 19:36:35= .000000000 -0400 @@ -74,7 +74,7 @@ static int bf5xx_ad1836_hw_params(struct return 0; } @@ -83355,9 +83507,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ad1836.c linux-2.6.39/sound/soc .startup =3D bf5xx_ad1836_startup, .hw_params =3D bf5xx_ad1836_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ad193x.c linux-2.6.39/s= ound/soc/blackfin/bf5xx-ad193x.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ad193x.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ad193x.c 2011-05-22 19:36:35.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad193x.c linux-2.6.39= .1/sound/soc/blackfin/bf5xx-ad193x.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad193x.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad193x.c 2011-05-22 19:36:35= .000000000 -0400 @@ -88,7 +88,7 @@ static int bf5xx_ad193x_hw_params(struct return 0; } @@ -83367,9 +83519,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ad193x.c linux-2.6.39/sound/soc .startup =3D bf5xx_ad193x_startup, .hw_params =3D bf5xx_ad193x_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ad1980.c linux-2.6.39/s= ound/soc/blackfin/bf5xx-ad1980.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ad1980.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ad1980.c 2011-05-22 19:36:35.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad1980.c linux-2.6.39= .1/sound/soc/blackfin/bf5xx-ad1980.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad1980.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad1980.c 2011-05-22 19:36:35= .000000000 -0400 @@ -63,7 +63,7 @@ static int bf5xx_board_startup(struct sn return 0; } @@ -83379,9 +83531,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ad1980.c linux-2.6.39/sound/soc .startup =3D bf5xx_board_startup, }; =20 -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ad73311.c linux-2.6.39/= sound/soc/blackfin/bf5xx-ad73311.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ad73311.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ad73311.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad73311.c linux-2.6.3= 9.1/sound/soc/blackfin/bf5xx-ad73311.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad73311.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ad73311.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -175,7 +175,7 @@ static int bf5xx_ad73311_hw_params(struc } =20 @@ -83391,9 +83543,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ad73311.c linux-2.6.39/sound/so .startup =3D bf5xx_ad73311_startup, .hw_params =3D bf5xx_ad73311_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-i2s-pcm.c linux-2.6.39/= sound/soc/blackfin/bf5xx-i2s-pcm.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-i2s-pcm.c linux-2.6.3= 9.1/sound/soc/blackfin/bf5xx-i2s-pcm.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -183,7 +183,7 @@ static int bf5xx_pcm_mmap(struct snd_pcm return 0 ; } @@ -83403,9 +83555,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= i2s-pcm.c linux-2.6.39/sound/so .open =3D bf5xx_pcm_open, .ioctl =3D snd_pcm_lib_ioctl, .hw_params =3D bf5xx_pcm_hw_params, -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-ssm2602.c linux-2.6.39/= sound/soc/blackfin/bf5xx-ssm2602.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-ssm2602.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-ssm2602.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-ssm2602.c linux-2.6.3= 9.1/sound/soc/blackfin/bf5xx-ssm2602.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-ssm2602.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-ssm2602.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -108,7 +108,7 @@ static int bf5xx_ssm2602_hw_params(struc return 0; } @@ -83415,9 +83567,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= ssm2602.c linux-2.6.39/sound/so .startup =3D bf5xx_ssm2602_startup, .hw_params =3D bf5xx_ssm2602_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-tdm-pcm.c linux-2.6.39/= sound/soc/blackfin/bf5xx-tdm-pcm.c ---- linux-2.6.39/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/blackfin/bf5xx-tdm-pcm.c linux-2.6.3= 9.1/sound/soc/blackfin/bf5xx-tdm-pcm.c +--- linux-2.6.39.1/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -220,7 +220,7 @@ static int bf5xx_pcm_silence(struct snd_ } =20 @@ -83427,9 +83579,9 @@ diff -urNp linux-2.6.39/sound/soc/blackfin/bf5xx-= tdm-pcm.c linux-2.6.39/sound/so .open =3D bf5xx_pcm_open, .ioctl =3D snd_pcm_lib_ioctl, .hw_params =3D bf5xx_pcm_hw_params, -diff -urNp linux-2.6.39/sound/soc/davinci/davinci-evm.c linux-2.6.39/sou= nd/soc/davinci/davinci-evm.c ---- linux-2.6.39/sound/soc/davinci/davinci-evm.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/davinci/davinci-evm.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/davinci/davinci-evm.c linux-2.6.39.1= /sound/soc/davinci/davinci-evm.c +--- linux-2.6.39.1/sound/soc/davinci/davinci-evm.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/davinci/davinci-evm.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -88,11 +88,11 @@ static int evm_spdif_hw_params(struct sn return snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT); } @@ -83444,9 +83596,9 @@ diff -urNp linux-2.6.39/sound/soc/davinci/davinci= -evm.c linux-2.6.39/sound/soc/d .hw_params =3D evm_spdif_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/davinci/davinci-pcm.c linux-2.6.39/sou= nd/soc/davinci/davinci-pcm.c ---- linux-2.6.39/sound/soc/davinci/davinci-pcm.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/davinci/davinci-pcm.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/davinci/davinci-pcm.c linux-2.6.39.1= /sound/soc/davinci/davinci-pcm.c +--- linux-2.6.39.1/sound/soc/davinci/davinci-pcm.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/davinci/davinci-pcm.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -748,7 +748,7 @@ static int davinci_pcm_mmap(struct snd_p runtime->dma_bytes); } @@ -83456,9 +83608,9 @@ diff -urNp linux-2.6.39/sound/soc/davinci/davinci= -pcm.c linux-2.6.39/sound/soc/d .open =3D davinci_pcm_open, .close =3D davinci_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/davinci/davinci-sffsdr.c linux-2.6.39/= sound/soc/davinci/davinci-sffsdr.c ---- linux-2.6.39/sound/soc/davinci/davinci-sffsdr.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/davinci/davinci-sffsdr.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/davinci/davinci-sffsdr.c linux-2.6.3= 9.1/sound/soc/davinci/davinci-sffsdr.c +--- linux-2.6.39.1/sound/soc/davinci/davinci-sffsdr.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/davinci/davinci-sffsdr.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -75,7 +75,7 @@ static int sffsdr_hw_params(struct snd_p #endif } @@ -83468,9 +83620,9 @@ diff -urNp linux-2.6.39/sound/soc/davinci/davinci= -sffsdr.c linux-2.6.39/sound/so .hw_params =3D sffsdr_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/ep93xx/edb93xx.c linux-2.6.39/sound/so= c/ep93xx/edb93xx.c ---- linux-2.6.39/sound/soc/ep93xx/edb93xx.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/soc/ep93xx/edb93xx.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/soc/ep93xx/edb93xx.c linux-2.6.39.1/soun= d/soc/ep93xx/edb93xx.c +--- linux-2.6.39.1/sound/soc/ep93xx/edb93xx.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/soc/ep93xx/edb93xx.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -74,7 +74,7 @@ static int edb93xx_hw_params(struct snd_ SND_SOC_CLOCK_OUT); } @@ -83480,9 +83632,9 @@ diff -urNp linux-2.6.39/sound/soc/ep93xx/edb93xx.= c linux-2.6.39/sound/soc/ep93xx .hw_params =3D edb93xx_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/ep93xx/ep93xx-ac97.c linux-2.6.39/soun= d/soc/ep93xx/ep93xx-ac97.c ---- linux-2.6.39/sound/soc/ep93xx/ep93xx-ac97.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/soc/ep93xx/ep93xx-ac97.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/ep93xx/ep93xx-ac97.c linux-2.6.39.1/= sound/soc/ep93xx/ep93xx-ac97.c +--- linux-2.6.39.1/sound/soc/ep93xx/ep93xx-ac97.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/soc/ep93xx/ep93xx-ac97.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -239,7 +239,7 @@ static irqreturn_t ep93xx_ac97_interrupt return IRQ_HANDLED; } @@ -83492,9 +83644,9 @@ diff -urNp linux-2.6.39/sound/soc/ep93xx/ep93xx-a= c97.c linux-2.6.39/sound/soc/ep .read =3D ep93xx_ac97_read, .write =3D ep93xx_ac97_write, .reset =3D ep93xx_ac97_cold_reset, -diff -urNp linux-2.6.39/sound/soc/ep93xx/ep93xx-pcm.c linux-2.6.39/sound= /soc/ep93xx/ep93xx-pcm.c ---- linux-2.6.39/sound/soc/ep93xx/ep93xx-pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/soc/ep93xx/ep93xx-pcm.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/ep93xx/ep93xx-pcm.c linux-2.6.39.1/s= ound/soc/ep93xx/ep93xx-pcm.c +--- linux-2.6.39.1/sound/soc/ep93xx/ep93xx-pcm.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/soc/ep93xx/ep93xx-pcm.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -216,7 +216,7 @@ static int ep93xx_pcm_mmap(struct snd_pc runtime->dma_bytes); } @@ -83504,9 +83656,9 @@ diff -urNp linux-2.6.39/sound/soc/ep93xx/ep93xx-p= cm.c linux-2.6.39/sound/soc/ep9 .open =3D ep93xx_pcm_open, .close =3D ep93xx_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/ep93xx/snappercl15.c linux-2.6.39/soun= d/soc/ep93xx/snappercl15.c ---- linux-2.6.39/sound/soc/ep93xx/snappercl15.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/soc/ep93xx/snappercl15.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/ep93xx/snappercl15.c linux-2.6.39.1/= sound/soc/ep93xx/snappercl15.c +--- linux-2.6.39.1/sound/soc/ep93xx/snappercl15.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/soc/ep93xx/snappercl15.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -55,7 +55,7 @@ static int snappercl15_hw_params(struct=20 return 0; } @@ -83516,9 +83668,9 @@ diff -urNp linux-2.6.39/sound/soc/ep93xx/snapperc= l15.c linux-2.6.39/sound/soc/ep .hw_params =3D snappercl15_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/fsl/fsl_dma.c linux-2.6.39/sound/soc/f= sl/fsl_dma.c ---- linux-2.6.39/sound/soc/fsl/fsl_dma.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/soc/fsl/fsl_dma.c 2011-05-22 19:36:35.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/soc/fsl/fsl_dma.c linux-2.6.39.1/sound/s= oc/fsl/fsl_dma.c +--- linux-2.6.39.1/sound/soc/fsl/fsl_dma.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/soc/fsl/fsl_dma.c 2011-05-22 19:36:35.000000000= -0400 @@ -887,7 +887,7 @@ static struct device_node *find_ssi_node return NULL; } @@ -83528,9 +83680,9 @@ diff -urNp linux-2.6.39/sound/soc/fsl/fsl_dma.c l= inux-2.6.39/sound/soc/fsl/fsl_d .open =3D fsl_dma_open, .close =3D fsl_dma_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/fsl/mpc8610_hpcd.c linux-2.6.39/sound/= soc/fsl/mpc8610_hpcd.c ---- linux-2.6.39/sound/soc/fsl/mpc8610_hpcd.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/soc/fsl/mpc8610_hpcd.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/fsl/mpc8610_hpcd.c linux-2.6.39.1/so= und/soc/fsl/mpc8610_hpcd.c +--- linux-2.6.39.1/sound/soc/fsl/mpc8610_hpcd.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/soc/fsl/mpc8610_hpcd.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -175,7 +175,7 @@ static int mpc8610_hpcd_machine_remove(s /** * mpc8610_hpcd_ops: ASoC machine driver operations @@ -83540,9 +83692,9 @@ diff -urNp linux-2.6.39/sound/soc/fsl/mpc8610_hpc= d.c linux-2.6.39/sound/soc/fsl/ .startup =3D mpc8610_hpcd_startup, }; =20 -diff -urNp linux-2.6.39/sound/soc/fsl/p1022_ds.c linux-2.6.39/sound/soc/= fsl/p1022_ds.c ---- linux-2.6.39/sound/soc/fsl/p1022_ds.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/soc/fsl/p1022_ds.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/soc/fsl/p1022_ds.c linux-2.6.39.1/sound/= soc/fsl/p1022_ds.c +--- linux-2.6.39.1/sound/soc/fsl/p1022_ds.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/soc/fsl/p1022_ds.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -185,7 +185,7 @@ static int p1022_ds_machine_remove(struc /** * p1022_ds_ops: ASoC machine driver operations @@ -83552,9 +83704,9 @@ diff -urNp linux-2.6.39/sound/soc/fsl/p1022_ds.c = linux-2.6.39/sound/soc/fsl/p102 .startup =3D p1022_ds_startup, }; =20 -diff -urNp linux-2.6.39/sound/soc/imx/eukrea-tlv320.c linux-2.6.39/sound= /soc/imx/eukrea-tlv320.c ---- linux-2.6.39/sound/soc/imx/eukrea-tlv320.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/soc/imx/eukrea-tlv320.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/imx/eukrea-tlv320.c linux-2.6.39.1/s= ound/soc/imx/eukrea-tlv320.c +--- linux-2.6.39.1/sound/soc/imx/eukrea-tlv320.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/soc/imx/eukrea-tlv320.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -71,7 +71,7 @@ static int eukrea_tlv320_hw_params(struc return 0; } @@ -83564,9 +83716,9 @@ diff -urNp linux-2.6.39/sound/soc/imx/eukrea-tlv3= 20.c linux-2.6.39/sound/soc/imx .hw_params =3D eukrea_tlv320_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/imx/imx-pcm-dma-mx2.c linux-2.6.39/sou= nd/soc/imx/imx-pcm-dma-mx2.c ---- linux-2.6.39/sound/soc/imx/imx-pcm-dma-mx2.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/imx/imx-pcm-dma-mx2.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/imx/imx-pcm-dma-mx2.c linux-2.6.39.1= /sound/soc/imx/imx-pcm-dma-mx2.c +--- linux-2.6.39.1/sound/soc/imx/imx-pcm-dma-mx2.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/imx/imx-pcm-dma-mx2.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -283,7 +283,7 @@ static int snd_imx_close(struct snd_pcm_ return 0; } @@ -83576,9 +83728,9 @@ diff -urNp linux-2.6.39/sound/soc/imx/imx-pcm-dma= -mx2.c linux-2.6.39/sound/soc/i .open =3D snd_imx_open, .close =3D snd_imx_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/imx/imx-pcm-fiq.c linux-2.6.39/sound/s= oc/imx/imx-pcm-fiq.c ---- linux-2.6.39/sound/soc/imx/imx-pcm-fiq.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/soc/imx/imx-pcm-fiq.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/soc/imx/imx-pcm-fiq.c linux-2.6.39.1/sou= nd/soc/imx/imx-pcm-fiq.c +--- linux-2.6.39.1/sound/soc/imx/imx-pcm-fiq.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/soc/imx/imx-pcm-fiq.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -225,7 +225,7 @@ static int snd_imx_close(struct snd_pcm_ return 0; } @@ -83588,9 +83740,9 @@ diff -urNp linux-2.6.39/sound/soc/imx/imx-pcm-fiq= .c linux-2.6.39/sound/soc/imx/i .open =3D snd_imx_open, .close =3D snd_imx_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/imx/mx27vis-aic32x4.c linux-2.6.39/sou= nd/soc/imx/mx27vis-aic32x4.c ---- linux-2.6.39/sound/soc/imx/mx27vis-aic32x4.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/imx/mx27vis-aic32x4.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/imx/mx27vis-aic32x4.c linux-2.6.39.1= /sound/soc/imx/mx27vis-aic32x4.c +--- linux-2.6.39.1/sound/soc/imx/mx27vis-aic32x4.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/imx/mx27vis-aic32x4.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -70,7 +70,7 @@ static int mx27vis_aic32x4_hw_params(str return 0; } @@ -83600,9 +83752,9 @@ diff -urNp linux-2.6.39/sound/soc/imx/mx27vis-aic= 32x4.c linux-2.6.39/sound/soc/i .hw_params =3D mx27vis_aic32x4_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/imx/phycore-ac97.c linux-2.6.39/sound/= soc/imx/phycore-ac97.c ---- linux-2.6.39/sound/soc/imx/phycore-ac97.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/soc/imx/phycore-ac97.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/imx/phycore-ac97.c linux-2.6.39.1/so= und/soc/imx/phycore-ac97.c +--- linux-2.6.39.1/sound/soc/imx/phycore-ac97.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/soc/imx/phycore-ac97.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -21,7 +21,7 @@ =20 static struct snd_soc_card imx_phycore; @@ -83612,9 +83764,9 @@ diff -urNp linux-2.6.39/sound/soc/imx/phycore-ac9= 7.c linux-2.6.39/sound/soc/imx/ }; =20 static struct snd_soc_dai_link imx_phycore_dai_ac97[] =3D { -diff -urNp linux-2.6.39/sound/soc/imx/wm1133-ev1.c linux-2.6.39/sound/so= c/imx/wm1133-ev1.c ---- linux-2.6.39/sound/soc/imx/wm1133-ev1.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/soc/imx/wm1133-ev1.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/soc/imx/wm1133-ev1.c linux-2.6.39.1/soun= d/soc/imx/wm1133-ev1.c +--- linux-2.6.39.1/sound/soc/imx/wm1133-ev1.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/soc/imx/wm1133-ev1.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -149,7 +149,7 @@ static int wm1133_ev1_hw_params(struct s return 0; } @@ -83624,9 +83776,9 @@ diff -urNp linux-2.6.39/sound/soc/imx/wm1133-ev1.= c linux-2.6.39/sound/soc/imx/wm .hw_params =3D wm1133_ev1_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/jz4740/jz4740-pcm.c linux-2.6.39/sound= /soc/jz4740/jz4740-pcm.c ---- linux-2.6.39/sound/soc/jz4740/jz4740-pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/soc/jz4740/jz4740-pcm.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/jz4740/jz4740-pcm.c linux-2.6.39.1/s= ound/soc/jz4740/jz4740-pcm.c +--- linux-2.6.39.1/sound/soc/jz4740/jz4740-pcm.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/soc/jz4740/jz4740-pcm.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -244,7 +244,7 @@ static int jz4740_pcm_mmap(struct snd_pc vma->vm_end - vma->vm_start, vma->vm_page_prot); } @@ -83636,9 +83788,9 @@ diff -urNp linux-2.6.39/sound/soc/jz4740/jz4740-p= cm.c linux-2.6.39/sound/soc/jz4 .open =3D jz4740_pcm_open, .close =3D jz4740_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/kirkwood/kirkwood-openrd.c linux-2.6.3= 9/sound/soc/kirkwood/kirkwood-openrd.c ---- linux-2.6.39/sound/soc/kirkwood/kirkwood-openrd.c 2011-05-19 00:06:3= 4.000000000 -0400 -+++ linux-2.6.39/sound/soc/kirkwood/kirkwood-openrd.c 2011-05-22 19:36:3= 5.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/kirkwood/kirkwood-openrd.c linux-2.6= .39.1/sound/soc/kirkwood/kirkwood-openrd.c +--- linux-2.6.39.1/sound/soc/kirkwood/kirkwood-openrd.c 2011-05-19 00:06= :34.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/kirkwood/kirkwood-openrd.c 2011-05-22 19:36= :35.000000000 -0400 @@ -56,7 +56,7 @@ static int openrd_client_hw_params(struc =20 } @@ -83648,9 +83800,9 @@ diff -urNp linux-2.6.39/sound/soc/kirkwood/kirkwo= od-openrd.c linux-2.6.39/sound/ .hw_params =3D openrd_client_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/kirkwood/kirkwood-t5325.c linux-2.6.39= /sound/soc/kirkwood/kirkwood-t5325.c ---- linux-2.6.39/sound/soc/kirkwood/kirkwood-t5325.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/sound/soc/kirkwood/kirkwood-t5325.c 2011-05-22 19:36:35= .000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/kirkwood/kirkwood-t5325.c linux-2.6.= 39.1/sound/soc/kirkwood/kirkwood-t5325.c +--- linux-2.6.39.1/sound/soc/kirkwood/kirkwood-t5325.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/kirkwood/kirkwood-t5325.c 2011-05-22 19:36:= 35.000000000 -0400 @@ -44,7 +44,7 @@ static int t5325_hw_params(struct snd_pc =20 } @@ -83660,9 +83812,9 @@ diff -urNp linux-2.6.39/sound/soc/kirkwood/kirkwo= od-t5325.c linux-2.6.39/sound/s .hw_params =3D t5325_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/mid-x86/sst_platform.c linux-2.6.39/so= und/soc/mid-x86/sst_platform.c ---- linux-2.6.39/sound/soc/mid-x86/sst_platform.c 2011-05-19 00:06:34.00= 0000000 -0400 -+++ linux-2.6.39/sound/soc/mid-x86/sst_platform.c 2011-05-22 19:36:35.00= 0000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/mid-x86/sst_platform.c linux-2.6.39.= 1/sound/soc/mid-x86/sst_platform.c +--- linux-2.6.39.1/sound/soc/mid-x86/sst_platform.c 2011-05-19 00:06:34.= 000000000 -0400 ++++ linux-2.6.39.1/sound/soc/mid-x86/sst_platform.c 2011-05-22 19:36:35.= 000000000 -0400 @@ -381,7 +381,7 @@ static int sst_platform_pcm_hw_free(stru return snd_pcm_lib_free_pages(substream); } @@ -83672,9 +83824,9 @@ diff -urNp linux-2.6.39/sound/soc/mid-x86/sst_pla= tform.c linux-2.6.39/sound/soc/ .open =3D sst_platform_open, .close =3D sst_platform_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/nuc900/nuc900-pcm.c linux-2.6.39/sound= /soc/nuc900/nuc900-pcm.c ---- linux-2.6.39/sound/soc/nuc900/nuc900-pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/soc/nuc900/nuc900-pcm.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/nuc900/nuc900-pcm.c linux-2.6.39.1/s= ound/soc/nuc900/nuc900-pcm.c +--- linux-2.6.39.1/sound/soc/nuc900/nuc900-pcm.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/soc/nuc900/nuc900-pcm.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -297,7 +297,7 @@ static int nuc900_dma_mmap(struct snd_pc runtime->dma_bytes); } @@ -83684,9 +83836,9 @@ diff -urNp linux-2.6.39/sound/soc/nuc900/nuc900-p= cm.c linux-2.6.39/sound/soc/nuc .open =3D nuc900_dma_open, .close =3D nuc900_dma_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/omap/am3517evm.c linux-2.6.39/sound/so= c/omap/am3517evm.c ---- linux-2.6.39/sound/soc/omap/am3517evm.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/soc/omap/am3517evm.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/am3517evm.c linux-2.6.39.1/soun= d/soc/omap/am3517evm.c +--- linux-2.6.39.1/sound/soc/omap/am3517evm.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/soc/omap/am3517evm.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -88,7 +88,7 @@ static int am3517evm_hw_params(struct sn return 0; } @@ -83696,9 +83848,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/am3517evm.= c linux-2.6.39/sound/soc/omap/a .hw_params =3D am3517evm_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/ams-delta.c linux-2.6.39/sound/so= c/omap/ams-delta.c ---- linux-2.6.39/sound/soc/omap/ams-delta.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/sound/soc/omap/ams-delta.c 2011-05-22 19:36:35.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/ams-delta.c linux-2.6.39.1/soun= d/soc/omap/ams-delta.c +--- linux-2.6.39.1/sound/soc/omap/ams-delta.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/sound/soc/omap/ams-delta.c 2011-05-22 19:36:35.000000= 000 -0400 @@ -420,7 +420,7 @@ static int ams_delta_hw_params(struct sn SND_SOC_DAIFMT_CBM_CFM); } @@ -83708,9 +83860,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/ams-delta.= c linux-2.6.39/sound/soc/omap/a .hw_params =3D ams_delta_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/igep0020.c linux-2.6.39/sound/soc= /omap/igep0020.c ---- linux-2.6.39/sound/soc/omap/igep0020.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/omap/igep0020.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/igep0020.c linux-2.6.39.1/sound= /soc/omap/igep0020.c +--- linux-2.6.39.1/sound/soc/omap/igep0020.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/omap/igep0020.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -72,7 +72,7 @@ static int igep2_hw_params(struct snd_pc return 0; } @@ -83720,9 +83872,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/igep0020.c= linux-2.6.39/sound/soc/omap/ig .hw_params =3D igep2_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/n810.c linux-2.6.39/sound/soc/oma= p/n810.c ---- linux-2.6.39/sound/soc/omap/n810.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/soc/omap/n810.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/soc/omap/n810.c linux-2.6.39.1/sound/soc= /omap/n810.c +--- linux-2.6.39.1/sound/soc/omap/n810.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/soc/omap/n810.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -141,7 +141,7 @@ static int n810_hw_params(struct snd_pcm return err; } @@ -83732,9 +83884,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/n810.c lin= ux-2.6.39/sound/soc/omap/n810.c .startup =3D n810_startup, .hw_params =3D n810_hw_params, .shutdown =3D n810_shutdown, -diff -urNp linux-2.6.39/sound/soc/omap/omap2evm.c linux-2.6.39/sound/soc= /omap/omap2evm.c ---- linux-2.6.39/sound/soc/omap/omap2evm.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/omap/omap2evm.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/omap2evm.c linux-2.6.39.1/sound= /soc/omap/omap2evm.c +--- linux-2.6.39.1/sound/soc/omap/omap2evm.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/omap/omap2evm.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -74,7 +74,7 @@ static int omap2evm_hw_params(struct snd return 0; } @@ -83744,9 +83896,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/omap2evm.c= linux-2.6.39/sound/soc/omap/om .hw_params =3D omap2evm_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/omap3beagle.c linux-2.6.39/sound/= soc/omap/omap3beagle.c ---- linux-2.6.39/sound/soc/omap/omap3beagle.c 2011-05-19 00:06:34.000000= 000 -0400 -+++ linux-2.6.39/sound/soc/omap/omap3beagle.c 2011-05-22 19:36:35.000000= 000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/omap3beagle.c linux-2.6.39.1/so= und/soc/omap/omap3beagle.c +--- linux-2.6.39.1/sound/soc/omap/omap3beagle.c 2011-05-19 00:06:34.0000= 00000 -0400 ++++ linux-2.6.39.1/sound/soc/omap/omap3beagle.c 2011-05-22 19:36:35.0000= 00000 -0400 @@ -82,7 +82,7 @@ static int omap3beagle_hw_params(struct=20 return 0; } @@ -83756,9 +83908,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/omap3beagl= e.c linux-2.6.39/sound/soc/omap .hw_params =3D omap3beagle_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/omap3evm.c linux-2.6.39/sound/soc= /omap/omap3evm.c ---- linux-2.6.39/sound/soc/omap/omap3evm.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/omap/omap3evm.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/omap3evm.c linux-2.6.39.1/sound= /soc/omap/omap3evm.c +--- linux-2.6.39.1/sound/soc/omap/omap3evm.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/omap/omap3evm.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -70,7 +70,7 @@ static int omap3evm_hw_params(struct snd return 0; } @@ -83768,9 +83920,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/omap3evm.c= linux-2.6.39/sound/soc/omap/om .hw_params =3D omap3evm_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/omap3pandora.c linux-2.6.39/sound= /soc/omap/omap3pandora.c ---- linux-2.6.39/sound/soc/omap/omap3pandora.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/soc/omap/omap3pandora.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/omap3pandora.c linux-2.6.39.1/s= ound/soc/omap/omap3pandora.c +--- linux-2.6.39.1/sound/soc/omap/omap3pandora.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/soc/omap/omap3pandora.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -218,7 +218,7 @@ static int omap3pandora_in_init(struct s return snd_soc_dapm_sync(dapm); } @@ -83780,9 +83932,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/omap3pando= ra.c linux-2.6.39/sound/soc/oma .hw_params =3D omap3pandora_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/omap-pcm.c linux-2.6.39/sound/soc= /omap/omap-pcm.c ---- linux-2.6.39/sound/soc/omap/omap-pcm.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/omap/omap-pcm.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/omap-pcm.c linux-2.6.39.1/sound= /soc/omap/omap-pcm.c +--- linux-2.6.39.1/sound/soc/omap/omap-pcm.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/omap/omap-pcm.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -311,7 +311,7 @@ static int omap_pcm_mmap(struct snd_pcm_ runtime->dma_bytes); } @@ -83792,9 +83944,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/omap-pcm.c= linux-2.6.39/sound/soc/omap/om .open =3D omap_pcm_open, .close =3D omap_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/omap/osk5912.c linux-2.6.39/sound/soc/= omap/osk5912.c ---- linux-2.6.39/sound/soc/omap/osk5912.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/soc/omap/osk5912.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/osk5912.c linux-2.6.39.1/sound/= soc/omap/osk5912.c +--- linux-2.6.39.1/sound/soc/omap/osk5912.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/soc/omap/osk5912.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -90,7 +90,7 @@ static int osk_hw_params(struct snd_pcm_ return err; } @@ -83804,9 +83956,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/osk5912.c = linux-2.6.39/sound/soc/omap/osk .startup =3D osk_startup, .hw_params =3D osk_hw_params, .shutdown =3D osk_shutdown, -diff -urNp linux-2.6.39/sound/soc/omap/overo.c linux-2.6.39/sound/soc/om= ap/overo.c ---- linux-2.6.39/sound/soc/omap/overo.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/soc/omap/overo.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/soc/omap/overo.c linux-2.6.39.1/sound/so= c/omap/overo.c +--- linux-2.6.39.1/sound/soc/omap/overo.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/soc/omap/overo.c 2011-05-22 19:36:35.000000000 = -0400 @@ -72,7 +72,7 @@ static int overo_hw_params(struct snd_pc return 0; } @@ -83816,9 +83968,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/overo.c li= nux-2.6.39/sound/soc/omap/overo .hw_params =3D overo_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/rx51.c linux-2.6.39/sound/soc/oma= p/rx51.c ---- linux-2.6.39/sound/soc/omap/rx51.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/soc/omap/rx51.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/soc/omap/rx51.c linux-2.6.39.1/sound/soc= /omap/rx51.c +--- linux-2.6.39.1/sound/soc/omap/rx51.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/soc/omap/rx51.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -139,7 +139,7 @@ static int rx51_hw_params(struct snd_pcm SND_SOC_CLOCK_IN); } @@ -83828,9 +83980,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/rx51.c lin= ux-2.6.39/sound/soc/omap/rx51.c .startup =3D rx51_startup, .hw_params =3D rx51_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/omap/sdp3430.c linux-2.6.39/sound/soc/= omap/sdp3430.c ---- linux-2.6.39/sound/soc/omap/sdp3430.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/soc/omap/sdp3430.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/sdp3430.c linux-2.6.39.1/sound/= soc/omap/sdp3430.c +--- linux-2.6.39.1/sound/soc/omap/sdp3430.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/soc/omap/sdp3430.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -87,7 +87,7 @@ static int sdp3430_hw_params(struct snd_ return 0; } @@ -83849,9 +84001,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/sdp3430.c = linux-2.6.39/sound/soc/omap/sdp .hw_params =3D sdp3430_hw_voice_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/sdp4430.c linux-2.6.39/sound/soc/= omap/sdp4430.c ---- linux-2.6.39/sound/soc/omap/sdp4430.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/soc/omap/sdp4430.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/soc/omap/sdp4430.c linux-2.6.39.1/sound/= soc/omap/sdp4430.c +--- linux-2.6.39.1/sound/soc/omap/sdp4430.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/soc/omap/sdp4430.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -62,7 +62,7 @@ static int sdp4430_hw_params(struct snd_ return ret; } @@ -83861,9 +84013,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/sdp4430.c = linux-2.6.39/sound/soc/omap/sdp .hw_params =3D sdp4430_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/omap/zoom2.c linux-2.6.39/sound/soc/om= ap/zoom2.c ---- linux-2.6.39/sound/soc/omap/zoom2.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/soc/omap/zoom2.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/soc/omap/zoom2.c linux-2.6.39.1/sound/so= c/omap/zoom2.c +--- linux-2.6.39.1/sound/soc/omap/zoom2.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/soc/omap/zoom2.c 2011-05-22 19:36:35.000000000 = -0400 @@ -78,7 +78,7 @@ static int zoom2_hw_params(struct snd_pc return 0; } @@ -83882,9 +84034,9 @@ diff -urNp linux-2.6.39/sound/soc/omap/zoom2.c li= nux-2.6.39/sound/soc/omap/zoom2 .hw_params =3D zoom2_hw_voice_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/pxa/corgi.c linux-2.6.39/sound/soc/pxa= /corgi.c ---- linux-2.6.39/sound/soc/pxa/corgi.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/soc/pxa/corgi.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/soc/pxa/corgi.c linux-2.6.39.1/sound/soc= /pxa/corgi.c +--- linux-2.6.39.1/sound/soc/pxa/corgi.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/soc/pxa/corgi.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -169,7 +169,7 @@ static int corgi_hw_params(struct snd_pc return 0; } @@ -83894,9 +84046,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/corgi.c lin= ux-2.6.39/sound/soc/pxa/corgi.c .startup =3D corgi_startup, .hw_params =3D corgi_hw_params, .shutdown =3D corgi_shutdown, -diff -urNp linux-2.6.39/sound/soc/pxa/imote2.c linux-2.6.39/sound/soc/px= a/imote2.c ---- linux-2.6.39/sound/soc/pxa/imote2.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/soc/pxa/imote2.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/imote2.c linux-2.6.39.1/sound/so= c/pxa/imote2.c +--- linux-2.6.39.1/sound/soc/pxa/imote2.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/soc/pxa/imote2.c 2011-05-22 19:36:35.000000000 = -0400 @@ -56,7 +56,7 @@ static int imote2_asoc_hw_params(struct=20 return ret; } @@ -83906,9 +84058,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/imote2.c li= nux-2.6.39/sound/soc/pxa/imote2 .hw_params =3D imote2_asoc_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/pxa/magician.c linux-2.6.39/sound/soc/= pxa/magician.c ---- linux-2.6.39/sound/soc/pxa/magician.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/soc/pxa/magician.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/magician.c linux-2.6.39.1/sound/= soc/pxa/magician.c +--- linux-2.6.39.1/sound/soc/pxa/magician.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/soc/pxa/magician.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -258,12 +258,12 @@ static int magician_capture_hw_params(st return 0; } @@ -83924,9 +84076,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/magician.c = linux-2.6.39/sound/soc/pxa/magi .startup =3D magician_startup, .hw_params =3D magician_playback_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/pxa/mioa701_wm9713.c linux-2.6.39/soun= d/soc/pxa/mioa701_wm9713.c ---- linux-2.6.39/sound/soc/pxa/mioa701_wm9713.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/soc/pxa/mioa701_wm9713.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/mioa701_wm9713.c linux-2.6.39.1/= sound/soc/pxa/mioa701_wm9713.c +--- linux-2.6.39.1/sound/soc/pxa/mioa701_wm9713.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/soc/pxa/mioa701_wm9713.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -156,7 +156,7 @@ static int mioa701_wm9713_init(struct sn return 0; } @@ -83936,9 +84088,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/mioa701_wm9= 713.c linux-2.6.39/sound/soc/px =20 static struct snd_soc_dai_link mioa701_dai[] =3D { { -diff -urNp linux-2.6.39/sound/soc/pxa/poodle.c linux-2.6.39/sound/soc/px= a/poodle.c ---- linux-2.6.39/sound/soc/pxa/poodle.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/soc/pxa/poodle.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/poodle.c linux-2.6.39.1/sound/so= c/pxa/poodle.c +--- linux-2.6.39.1/sound/soc/pxa/poodle.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/soc/pxa/poodle.c 2011-05-22 19:36:35.000000000 = -0400 @@ -148,7 +148,7 @@ static int poodle_hw_params(struct snd_p return 0; } @@ -83948,9 +84100,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/poodle.c li= nux-2.6.39/sound/soc/pxa/poodle .startup =3D poodle_startup, .hw_params =3D poodle_hw_params, .shutdown =3D poodle_shutdown, -diff -urNp linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.c linux-2.6.39/sound/s= oc/pxa/pxa2xx-ac97.c ---- linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/pxa2xx-ac97.c linux-2.6.39.1/sou= nd/soc/pxa/pxa2xx-ac97.c +--- linux-2.6.39.1/sound/soc/pxa/pxa2xx-ac97.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/soc/pxa/pxa2xx-ac97.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -40,7 +40,7 @@ static void pxa2xx_ac97_cold_reset(struc pxa2xx_ac97_finish_reset(ac97); } @@ -83960,9 +84112,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/pxa2xx-ac97= .c linux-2.6.39/sound/soc/pxa/p .read =3D pxa2xx_ac97_read, .write =3D pxa2xx_ac97_write, .warm_reset =3D pxa2xx_ac97_warm_reset, -diff -urNp linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.h linux-2.6.39/sound/s= oc/pxa/pxa2xx-ac97.h ---- linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.h 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.h 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/pxa2xx-ac97.h linux-2.6.39.1/sou= nd/soc/pxa/pxa2xx-ac97.h +--- linux-2.6.39.1/sound/soc/pxa/pxa2xx-ac97.h 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/soc/pxa/pxa2xx-ac97.h 2011-05-22 19:36:35.00000= 0000 -0400 @@ -15,6 +15,6 @@ #define PXA2XX_DAI_AC97_MIC 2 =20 @@ -83971,9 +84123,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/pxa2xx-ac97= .h linux-2.6.39/sound/soc/pxa/p +extern const struct snd_ac97_bus_ops pxa2xx_ac97_ops; =20 #endif -diff -urNp linux-2.6.39/sound/soc/pxa/raumfeld.c linux-2.6.39/sound/soc/= pxa/raumfeld.c ---- linux-2.6.39/sound/soc/pxa/raumfeld.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/soc/pxa/raumfeld.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/raumfeld.c linux-2.6.39.1/sound/= soc/pxa/raumfeld.c +--- linux-2.6.39.1/sound/soc/pxa/raumfeld.c 2011-06-03 00:04:14.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/soc/pxa/raumfeld.c 2011-06-03 00:32:09.00000000= 0 -0400 @@ -145,7 +145,7 @@ static int raumfeld_cs4270_hw_params(str return 0; } @@ -83992,9 +84144,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/raumfeld.c = linux-2.6.39/sound/soc/pxa/raum .hw_params =3D raumfeld_ak4104_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/pxa/saarb.c linux-2.6.39/sound/soc/pxa= /saarb.c ---- linux-2.6.39/sound/soc/pxa/saarb.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/soc/pxa/saarb.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/soc/pxa/saarb.c linux-2.6.39.1/sound/soc= /pxa/saarb.c +--- linux-2.6.39.1/sound/soc/pxa/saarb.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/soc/pxa/saarb.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -106,7 +106,7 @@ static int saarb_i2s_hw_params(struct sn return ret; } @@ -84004,9 +84156,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/saarb.c lin= ux-2.6.39/sound/soc/pxa/saarb.c .hw_params =3D saarb_i2s_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/pxa/spitz.c linux-2.6.39/sound/soc/pxa= /spitz.c ---- linux-2.6.39/sound/soc/pxa/spitz.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/soc/pxa/spitz.c 2011-05-22 19:36:35.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/soc/pxa/spitz.c linux-2.6.39.1/sound/soc= /pxa/spitz.c +--- linux-2.6.39.1/sound/soc/pxa/spitz.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/soc/pxa/spitz.c 2011-05-22 19:36:35.000000000 -= 0400 @@ -169,7 +169,7 @@ static int spitz_hw_params(struct snd_pc return 0; } @@ -84016,9 +84168,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/spitz.c lin= ux-2.6.39/sound/soc/pxa/spitz.c .startup =3D spitz_startup, .hw_params =3D spitz_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/pxa/tavorevb3.c linux-2.6.39/sound/soc= /pxa/tavorevb3.c ---- linux-2.6.39/sound/soc/pxa/tavorevb3.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/pxa/tavorevb3.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/tavorevb3.c linux-2.6.39.1/sound= /soc/pxa/tavorevb3.c +--- linux-2.6.39.1/sound/soc/pxa/tavorevb3.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/pxa/tavorevb3.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -106,7 +106,7 @@ static int evb3_i2s_hw_params(struct snd return ret; } @@ -84028,9 +84180,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/tavorevb3.c= linux-2.6.39/sound/soc/pxa/tav .hw_params =3D evb3_i2s_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/pxa/tosa.c linux-2.6.39/sound/soc/pxa/= tosa.c ---- linux-2.6.39/sound/soc/pxa/tosa.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/soc/pxa/tosa.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/soc/pxa/tosa.c linux-2.6.39.1/sound/soc/= pxa/tosa.c +--- linux-2.6.39.1/sound/soc/pxa/tosa.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/soc/pxa/tosa.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -92,7 +92,7 @@ static int tosa_startup(struct snd_pcm_s return 0; } @@ -84040,9 +84192,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/tosa.c linu= x-2.6.39/sound/soc/pxa/tosa.c .startup =3D tosa_startup, }; =20 -diff -urNp linux-2.6.39/sound/soc/pxa/z2.c linux-2.6.39/sound/soc/pxa/z2= .c ---- linux-2.6.39/sound/soc/pxa/z2.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/soc/pxa/z2.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/z2.c linux-2.6.39.1/sound/soc/px= a/z2.c +--- linux-2.6.39.1/sound/soc/pxa/z2.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/soc/pxa/z2.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -187,7 +187,7 @@ err: return ret; } @@ -84052,9 +84204,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/z2.c linux-= 2.6.39/sound/soc/pxa/z2.c .hw_params =3D z2_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/pxa/zylonite.c linux-2.6.39/sound/soc/= pxa/zylonite.c ---- linux-2.6.39/sound/soc/pxa/zylonite.c 2011-05-19 00:06:34.000000000 = -0400 -+++ linux-2.6.39/sound/soc/pxa/zylonite.c 2011-05-22 19:36:35.000000000 = -0400 +diff -urNp linux-2.6.39.1/sound/soc/pxa/zylonite.c linux-2.6.39.1/sound/= soc/pxa/zylonite.c +--- linux-2.6.39.1/sound/soc/pxa/zylonite.c 2011-05-19 00:06:34.00000000= 0 -0400 ++++ linux-2.6.39.1/sound/soc/pxa/zylonite.c 2011-05-22 19:36:35.00000000= 0 -0400 @@ -156,7 +156,7 @@ static int zylonite_voice_hw_params(stru return 0; } @@ -84064,9 +84216,9 @@ diff -urNp linux-2.6.39/sound/soc/pxa/zylonite.c = linux-2.6.39/sound/soc/pxa/zylo .hw_params =3D zylonite_voice_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/s6000/s6000-pcm.c linux-2.6.39/sound/s= oc/s6000/s6000-pcm.c ---- linux-2.6.39/sound/soc/s6000/s6000-pcm.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/soc/s6000/s6000-pcm.c 2011-05-22 19:36:35.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/soc/s6000/s6000-pcm.c linux-2.6.39.1/sou= nd/soc/s6000/s6000-pcm.c +--- linux-2.6.39.1/sound/soc/s6000/s6000-pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/soc/s6000/s6000-pcm.c 2011-05-22 19:36:35.00000= 0000 -0400 @@ -420,7 +420,7 @@ static int s6000_pcm_hw_free(struct snd_ return snd_pcm_lib_free_pages(substream); } @@ -84076,9 +84228,9 @@ diff -urNp linux-2.6.39/sound/soc/s6000/s6000-pcm= .c linux-2.6.39/sound/soc/s6000 .open =3D s6000_pcm_open, .close =3D s6000_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/s6000/s6105-ipcam.c linux-2.6.39/sound= /soc/s6000/s6105-ipcam.c ---- linux-2.6.39/sound/soc/s6000/s6105-ipcam.c 2011-05-19 00:06:34.00000= 0000 -0400 -+++ linux-2.6.39/sound/soc/s6000/s6105-ipcam.c 2011-05-22 19:36:35.00000= 0000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/s6000/s6105-ipcam.c linux-2.6.39.1/s= ound/soc/s6000/s6105-ipcam.c +--- linux-2.6.39.1/sound/soc/s6000/s6105-ipcam.c 2011-05-19 00:06:34.000= 000000 -0400 ++++ linux-2.6.39.1/sound/soc/s6000/s6105-ipcam.c 2011-05-22 19:36:35.000= 000000 -0400 @@ -55,7 +55,7 @@ static int s6105_hw_params(struct snd_pc return 0; } @@ -84088,9 +84240,9 @@ diff -urNp linux-2.6.39/sound/soc/s6000/s6105-ipc= am.c linux-2.6.39/sound/soc/s60 .hw_params =3D s6105_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/samsung/goni_wm8994.c linux-2.6.39/sou= nd/soc/samsung/goni_wm8994.c ---- linux-2.6.39/sound/soc/samsung/goni_wm8994.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/goni_wm8994.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/goni_wm8994.c linux-2.6.39.1= /sound/soc/samsung/goni_wm8994.c +--- linux-2.6.39.1/sound/soc/samsung/goni_wm8994.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/goni_wm8994.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -176,7 +176,7 @@ static int goni_hifi_hw_params(struct sn return 0; } @@ -84109,9 +84261,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/goni_wm= 8994.c linux-2.6.39/sound/soc/s .hw_params =3D goni_voice_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/samsung/h1940_uda1380.c linux-2.6.39/s= ound/soc/samsung/h1940_uda1380.c ---- linux-2.6.39/sound/soc/samsung/h1940_uda1380.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/h1940_uda1380.c 2011-05-22 19:36:35.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/h1940_uda1380.c linux-2.6.39= .1/sound/soc/samsung/h1940_uda1380.c +--- linux-2.6.39.1/sound/soc/samsung/h1940_uda1380.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/h1940_uda1380.c 2011-05-22 19:36:35= .000000000 -0400 @@ -136,7 +136,7 @@ static int h1940_hw_params(struct snd_pc return 0; } @@ -84121,9 +84273,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/h1940_u= da1380.c linux-2.6.39/sound/soc .startup =3D h1940_startup, .hw_params =3D h1940_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/samsung/jive_wm8750.c linux-2.6.39/sou= nd/soc/samsung/jive_wm8750.c ---- linux-2.6.39/sound/soc/samsung/jive_wm8750.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/jive_wm8750.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/jive_wm8750.c linux-2.6.39.1= /sound/soc/samsung/jive_wm8750.c +--- linux-2.6.39.1/sound/soc/samsung/jive_wm8750.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/jive_wm8750.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -92,7 +92,7 @@ static int jive_hw_params(struct snd_pcm return 0; } @@ -84133,9 +84285,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/jive_wm= 8750.c linux-2.6.39/sound/soc/s .hw_params =3D jive_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/samsung/neo1973_wm8753.c linux-2.6.39/= sound/soc/samsung/neo1973_wm8753.c ---- linux-2.6.39/sound/soc/samsung/neo1973_wm8753.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/neo1973_wm8753.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/neo1973_wm8753.c linux-2.6.3= 9.1/sound/soc/samsung/neo1973_wm8753.c +--- linux-2.6.39.1/sound/soc/samsung/neo1973_wm8753.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/neo1973_wm8753.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -128,7 +128,7 @@ static int neo1973_hifi_hw_free(struct s /* * Neo1973 WM8753 HiFi DAI opserations. @@ -84154,9 +84306,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/neo1973= _wm8753.c linux-2.6.39/sound/so .hw_params =3D neo1973_voice_hw_params, .hw_free =3D neo1973_voice_hw_free, }; -diff -urNp linux-2.6.39/sound/soc/samsung/rx1950_uda1380.c linux-2.6.39/= sound/soc/samsung/rx1950_uda1380.c ---- linux-2.6.39/sound/soc/samsung/rx1950_uda1380.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/rx1950_uda1380.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/rx1950_uda1380.c linux-2.6.3= 9.1/sound/soc/samsung/rx1950_uda1380.c +--- linux-2.6.39.1/sound/soc/samsung/rx1950_uda1380.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/rx1950_uda1380.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -70,7 +70,7 @@ static struct snd_soc_jack_gpio hp_jack_ }, }; @@ -84166,9 +84318,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/rx1950_= uda1380.c linux-2.6.39/sound/so .startup =3D rx1950_startup, .hw_params =3D rx1950_hw_params, }; -diff -urNp linux-2.6.39/sound/soc/samsung/s3c24xx_simtec.c linux-2.6.39/= sound/soc/samsung/s3c24xx_simtec.c ---- linux-2.6.39/sound/soc/samsung/s3c24xx_simtec.c 2011-05-19 00:06:34.= 000000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/s3c24xx_simtec.c 2011-05-22 19:36:35.= 000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/s3c24xx_simtec.c linux-2.6.3= 9.1/sound/soc/samsung/s3c24xx_simtec.c +--- linux-2.6.39.1/sound/soc/samsung/s3c24xx_simtec.c 2011-05-19 00:06:3= 4.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/s3c24xx_simtec.c 2011-05-22 19:36:3= 5.000000000 -0400 @@ -228,7 +228,7 @@ static int simtec_call_startup(struct s3 return 0; } @@ -84178,9 +84330,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/s3c24xx= _simtec.c linux-2.6.39/sound/so .hw_params =3D simtec_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/samsung/s3c24xx_uda134x.c linux-2.6.39= /sound/soc/samsung/s3c24xx_uda134x.c ---- linux-2.6.39/sound/soc/samsung/s3c24xx_uda134x.c 2011-05-19 00:06:34= .000000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/s3c24xx_uda134x.c 2011-05-22 19:36:35= .000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/s3c24xx_uda134x.c linux-2.6.= 39.1/sound/soc/samsung/s3c24xx_uda134x.c +--- linux-2.6.39.1/sound/soc/samsung/s3c24xx_uda134x.c 2011-05-19 00:06:= 34.000000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/s3c24xx_uda134x.c 2011-05-22 19:36:= 35.000000000 -0400 @@ -210,7 +210,7 @@ static int s3c24xx_uda134x_hw_params(str return 0; } @@ -84190,9 +84342,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/s3c24xx= _uda134x.c linux-2.6.39/sound/s .startup =3D s3c24xx_uda134x_startup, .shutdown =3D s3c24xx_uda134x_shutdown, .hw_params =3D s3c24xx_uda134x_hw_params, -diff -urNp linux-2.6.39/sound/soc/samsung/smartq_wm8987.c linux-2.6.39/s= ound/soc/samsung/smartq_wm8987.c ---- linux-2.6.39/sound/soc/samsung/smartq_wm8987.c 2011-05-19 00:06:34.0= 00000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/smartq_wm8987.c 2011-05-22 19:36:35.0= 00000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/smartq_wm8987.c linux-2.6.39= .1/sound/soc/samsung/smartq_wm8987.c +--- linux-2.6.39.1/sound/soc/samsung/smartq_wm8987.c 2011-05-19 00:06:34= .000000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/smartq_wm8987.c 2011-05-22 19:36:35= .000000000 -0400 @@ -92,7 +92,7 @@ static int smartq_hifi_hw_params(struct=20 /* * SmartQ WM8987 HiFi DAI operations. @@ -84202,9 +84354,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/smartq_= wm8987.c linux-2.6.39/sound/soc .hw_params =3D smartq_hifi_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/samsung/smdk_spdif.c linux-2.6.39/soun= d/soc/samsung/smdk_spdif.c ---- linux-2.6.39/sound/soc/samsung/smdk_spdif.c 2011-05-19 00:06:34.0000= 00000 -0400 -+++ linux-2.6.39/sound/soc/samsung/smdk_spdif.c 2011-05-22 19:36:35.0000= 00000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/smdk_spdif.c linux-2.6.39.1/= sound/soc/samsung/smdk_spdif.c +--- linux-2.6.39.1/sound/soc/samsung/smdk_spdif.c 2011-05-19 00:06:34.00= 0000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/smdk_spdif.c 2011-05-22 19:36:35.00= 0000000 -0400 @@ -143,7 +143,7 @@ static int smdk_hw_params(struct snd_pcm return ret; } @@ -84214,9 +84366,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/smdk_sp= dif.c linux-2.6.39/sound/soc/sa .hw_params =3D smdk_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/samsung/smdk_wm8580.c linux-2.6.39/sou= nd/soc/samsung/smdk_wm8580.c ---- linux-2.6.39/sound/soc/samsung/smdk_wm8580.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/soc/samsung/smdk_wm8580.c 2011-05-22 19:36:35.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/samsung/smdk_wm8580.c linux-2.6.39.1= /sound/soc/samsung/smdk_wm8580.c +--- linux-2.6.39.1/sound/soc/samsung/smdk_wm8580.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/soc/samsung/smdk_wm8580.c 2011-05-22 19:36:35.0= 00000000 -0400 @@ -114,7 +114,7 @@ static int smdk_hw_params(struct snd_pcm /* * SMDK WM8580 DAI operations. @@ -84226,9 +84378,9 @@ diff -urNp linux-2.6.39/sound/soc/samsung/smdk_wm= 8580.c linux-2.6.39/sound/soc/s .hw_params =3D smdk_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/sh/dma-sh7760.c linux-2.6.39/sound/soc= /sh/dma-sh7760.c ---- linux-2.6.39/sound/soc/sh/dma-sh7760.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/sh/dma-sh7760.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/sh/dma-sh7760.c linux-2.6.39.1/sound= /soc/sh/dma-sh7760.c +--- linux-2.6.39.1/sound/soc/sh/dma-sh7760.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/sh/dma-sh7760.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -311,7 +311,7 @@ static snd_pcm_uframes_t camelot_pos(str return bytes_to_frames(runtime, pos); } @@ -84238,9 +84390,9 @@ diff -urNp linux-2.6.39/sound/soc/sh/dma-sh7760.c= linux-2.6.39/sound/soc/sh/dma- .open =3D camelot_pcm_open, .close =3D camelot_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/sh/hac.c linux-2.6.39/sound/soc/sh/hac= .c ---- linux-2.6.39/sound/soc/sh/hac.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/soc/sh/hac.c 2011-05-22 19:36:35.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/soc/sh/hac.c linux-2.6.39.1/sound/soc/sh= /hac.c +--- linux-2.6.39.1/sound/soc/sh/hac.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/soc/sh/hac.c 2011-05-22 19:36:35.000000000 -040= 0 @@ -227,7 +227,7 @@ static void hac_ac97_coldrst(struct snd_ hac_ac97_warmrst(ac97); } @@ -84250,9 +84402,9 @@ diff -urNp linux-2.6.39/sound/soc/sh/hac.c linux-= 2.6.39/sound/soc/sh/hac.c .read =3D hac_ac97_read, .write =3D hac_ac97_write, .reset =3D hac_ac97_coldrst, -diff -urNp linux-2.6.39/sound/soc/sh/migor.c linux-2.6.39/sound/soc/sh/m= igor.c ---- linux-2.6.39/sound/soc/sh/migor.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/soc/sh/migor.c 2011-05-22 19:36:35.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/soc/sh/migor.c linux-2.6.39.1/sound/soc/= sh/migor.c +--- linux-2.6.39.1/sound/soc/sh/migor.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/soc/sh/migor.c 2011-05-22 19:36:35.000000000 -0= 400 @@ -108,7 +108,7 @@ static int migor_hw_free(struct snd_pcm_ return 0; } @@ -84262,9 +84414,9 @@ diff -urNp linux-2.6.39/sound/soc/sh/migor.c linu= x-2.6.39/sound/soc/sh/migor.c .hw_params =3D migor_hw_params, .hw_free =3D migor_hw_free, }; -diff -urNp linux-2.6.39/sound/soc/sh/siu_pcm.c linux-2.6.39/sound/soc/sh= /siu_pcm.c ---- linux-2.6.39/sound/soc/sh/siu_pcm.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/soc/sh/siu_pcm.c 2011-05-22 19:36:35.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/soc/sh/siu_pcm.c linux-2.6.39.1/sound/so= c/sh/siu_pcm.c +--- linux-2.6.39.1/sound/soc/sh/siu_pcm.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/soc/sh/siu_pcm.c 2011-05-22 19:36:35.000000000 = -0400 @@ -597,7 +597,7 @@ static void siu_pcm_free(struct snd_pcm=20 dev_dbg(pcm->card->dev, "%s\n", __func__); } @@ -84274,9 +84426,9 @@ diff -urNp linux-2.6.39/sound/soc/sh/siu_pcm.c li= nux-2.6.39/sound/soc/sh/siu_pcm .open =3D siu_pcm_open, .close =3D siu_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/tegra/harmony.c linux-2.6.39/sound/soc= /tegra/harmony.c ---- linux-2.6.39/sound/soc/tegra/harmony.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/tegra/harmony.c 2011-05-22 19:36:35.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/tegra/harmony.c linux-2.6.39.1/sound= /soc/tegra/harmony.c +--- linux-2.6.39.1/sound/soc/tegra/harmony.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/tegra/harmony.c 2011-05-22 19:36:35.0000000= 00 -0400 @@ -126,7 +126,7 @@ static int harmony_asoc_hw_params(struct return 0; } @@ -84286,9 +84438,9 @@ diff -urNp linux-2.6.39/sound/soc/tegra/harmony.c= linux-2.6.39/sound/soc/tegra/h .hw_params =3D harmony_asoc_hw_params, }; =20 -diff -urNp linux-2.6.39/sound/soc/tegra/tegra_pcm.c linux-2.6.39/sound/s= oc/tegra/tegra_pcm.c ---- linux-2.6.39/sound/soc/tegra/tegra_pcm.c 2011-05-19 00:06:34.0000000= 00 -0400 -+++ linux-2.6.39/sound/soc/tegra/tegra_pcm.c 2011-05-22 19:36:36.0000000= 00 -0400 +diff -urNp linux-2.6.39.1/sound/soc/tegra/tegra_pcm.c linux-2.6.39.1/sou= nd/soc/tegra/tegra_pcm.c +--- linux-2.6.39.1/sound/soc/tegra/tegra_pcm.c 2011-05-19 00:06:34.00000= 0000 -0400 ++++ linux-2.6.39.1/sound/soc/tegra/tegra_pcm.c 2011-05-22 19:36:36.00000= 0000 -0400 @@ -277,7 +277,7 @@ static int tegra_pcm_mmap(struct snd_pcm runtime->dma_bytes); } @@ -84298,9 +84450,9 @@ diff -urNp linux-2.6.39/sound/soc/tegra/tegra_pcm= .c linux-2.6.39/sound/soc/tegra .open =3D tegra_pcm_open, .close =3D tegra_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/soc/txx9/txx9aclc.c linux-2.6.39/sound/soc= /txx9/txx9aclc.c ---- linux-2.6.39/sound/soc/txx9/txx9aclc.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/sound/soc/txx9/txx9aclc.c 2011-05-22 19:36:36.000000000= -0400 +diff -urNp linux-2.6.39.1/sound/soc/txx9/txx9aclc.c linux-2.6.39.1/sound= /soc/txx9/txx9aclc.c +--- linux-2.6.39.1/sound/soc/txx9/txx9aclc.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/sound/soc/txx9/txx9aclc.c 2011-05-22 19:36:36.0000000= 00 -0400 @@ -272,7 +272,7 @@ static int txx9aclc_pcm_close(struct snd return 0; } @@ -84310,9 +84462,9 @@ diff -urNp linux-2.6.39/sound/soc/txx9/txx9aclc.c= linux-2.6.39/sound/soc/txx9/tx .open =3D txx9aclc_pcm_open, .close =3D txx9aclc_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/sparc/amd7930.c linux-2.6.39/sound/sparc/a= md7930.c ---- linux-2.6.39/sound/sparc/amd7930.c 2011-05-19 00:06:34.000000000 -04= 00 -+++ linux-2.6.39/sound/sparc/amd7930.c 2011-05-22 19:36:36.000000000 -04= 00 +diff -urNp linux-2.6.39.1/sound/sparc/amd7930.c linux-2.6.39.1/sound/spa= rc/amd7930.c +--- linux-2.6.39.1/sound/sparc/amd7930.c 2011-05-19 00:06:34.000000000 -= 0400 ++++ linux-2.6.39.1/sound/sparc/amd7930.c 2011-05-22 19:36:36.000000000 -= 0400 @@ -733,7 +733,7 @@ static int snd_amd7930_hw_free(struct sn return snd_pcm_lib_free_pages(substream); } @@ -84340,9 +84492,9 @@ diff -urNp linux-2.6.39/sound/sparc/amd7930.c lin= ux-2.6.39/sound/sparc/amd7930.c .dev_free =3D snd_amd7930_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/sparc/cs4231.c linux-2.6.39/sound/sparc/cs= 4231.c ---- linux-2.6.39/sound/sparc/cs4231.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/sparc/cs4231.c 2011-05-22 19:36:36.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/sparc/cs4231.c linux-2.6.39.1/sound/spar= c/cs4231.c +--- linux-2.6.39.1/sound/sparc/cs4231.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/sparc/cs4231.c 2011-05-22 19:36:36.000000000 -0= 400 @@ -1196,7 +1196,7 @@ static int snd_cs4231_capture_close(stru * XXX the audio AUXIO register... */ @@ -84379,9 +84531,9 @@ diff -urNp linux-2.6.39/sound/sparc/cs4231.c linu= x-2.6.39/sound/sparc/cs4231.c .dev_free =3D snd_cs4231_ebus_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/sparc/dbri.c linux-2.6.39/sound/sparc/dbri= .c ---- linux-2.6.39/sound/sparc/dbri.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/sparc/dbri.c 2011-05-22 19:36:36.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/sparc/dbri.c linux-2.6.39.1/sound/sparc/= dbri.c +--- linux-2.6.39.1/sound/sparc/dbri.c 2011-05-19 00:06:34.000000000 -040= 0 ++++ linux-2.6.39.1/sound/sparc/dbri.c 2011-05-22 19:36:36.000000000 -040= 0 @@ -2205,7 +2205,7 @@ static snd_pcm_uframes_t snd_dbri_pointe return ret; } @@ -84391,9 +84543,9 @@ diff -urNp linux-2.6.39/sound/sparc/dbri.c linux-= 2.6.39/sound/sparc/dbri.c .open =3D snd_dbri_open, .close =3D snd_dbri_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/spi/at73c213.c linux-2.6.39/sound/spi/at73= c213.c ---- linux-2.6.39/sound/spi/at73c213.c 2011-05-19 00:06:34.000000000 -040= 0 -+++ linux-2.6.39/sound/spi/at73c213.c 2011-05-22 19:36:36.000000000 -040= 0 +diff -urNp linux-2.6.39.1/sound/spi/at73c213.c linux-2.6.39.1/sound/spi/= at73c213.c +--- linux-2.6.39.1/sound/spi/at73c213.c 2011-05-19 00:06:34.000000000 -0= 400 ++++ linux-2.6.39.1/sound/spi/at73c213.c 2011-05-22 19:36:36.000000000 -0= 400 @@ -319,7 +319,7 @@ snd_at73c213_pcm_pointer(struct snd_pcm_ return pos; } @@ -84412,9 +84564,9 @@ diff -urNp linux-2.6.39/sound/spi/at73c213.c linu= x-2.6.39/sound/spi/at73c213.c .dev_free =3D snd_at73c213_dev_free, }; struct snd_at73c213 *chip =3D get_chip(card); -diff -urNp linux-2.6.39/sound/usb/6fire/midi.c linux-2.6.39/sound/usb/6f= ire/midi.c ---- linux-2.6.39/sound/usb/6fire/midi.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/usb/6fire/midi.c 2011-05-22 19:36:36.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/usb/6fire/midi.c linux-2.6.39.1/sound/us= b/6fire/midi.c +--- linux-2.6.39.1/sound/usb/6fire/midi.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/usb/6fire/midi.c 2011-05-22 19:36:36.000000000 = -0400 @@ -134,14 +134,14 @@ static void usb6fire_midi_in_trigger( spin_unlock_irqrestore(&rt->in_lock, flags); } @@ -84432,9 +84584,9 @@ diff -urNp linux-2.6.39/sound/usb/6fire/midi.c li= nux-2.6.39/sound/usb/6fire/midi .open =3D usb6fire_midi_in_open, .close =3D usb6fire_midi_in_close, .trigger =3D usb6fire_midi_in_trigger -diff -urNp linux-2.6.39/sound/usb/caiaq/audio.c linux-2.6.39/sound/usb/c= aiaq/audio.c ---- linux-2.6.39/sound/usb/caiaq/audio.c 2011-05-19 00:06:34.000000000 -= 0400 -+++ linux-2.6.39/sound/usb/caiaq/audio.c 2011-05-22 19:36:36.000000000 -= 0400 +diff -urNp linux-2.6.39.1/sound/usb/caiaq/audio.c linux-2.6.39.1/sound/u= sb/caiaq/audio.c +--- linux-2.6.39.1/sound/usb/caiaq/audio.c 2011-05-19 00:06:34.000000000= -0400 ++++ linux-2.6.39.1/sound/usb/caiaq/audio.c 2011-05-22 19:36:36.000000000= -0400 @@ -322,7 +322,7 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm } =20 @@ -84444,9 +84596,9 @@ diff -urNp linux-2.6.39/sound/usb/caiaq/audio.c l= inux-2.6.39/sound/usb/caiaq/aud .open =3D snd_usb_caiaq_substream_open, .close =3D snd_usb_caiaq_substream_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/usb/caiaq/midi.c linux-2.6.39/sound/usb/ca= iaq/midi.c ---- linux-2.6.39/sound/usb/caiaq/midi.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/usb/caiaq/midi.c 2011-05-22 19:36:36.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/usb/caiaq/midi.c linux-2.6.39.1/sound/us= b/caiaq/midi.c +--- linux-2.6.39.1/sound/usb/caiaq/midi.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/usb/caiaq/midi.c 2011-05-22 19:36:36.000000000 = -0400 @@ -100,15 +100,13 @@ static void snd_usb_caiaq_midi_output_tr } =20 @@ -84465,9 +84617,9 @@ diff -urNp linux-2.6.39/sound/usb/caiaq/midi.c li= nux-2.6.39/sound/usb/caiaq/midi .open =3D snd_usb_caiaq_midi_input_open, .close =3D snd_usb_caiaq_midi_input_close, .trigger =3D snd_usb_caiaq_midi_input_trigger, -diff -urNp linux-2.6.39/sound/usb/card.c linux-2.6.39/sound/usb/card.c ---- linux-2.6.39/sound/usb/card.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/usb/card.c 2011-05-22 19:36:36.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/usb/card.c linux-2.6.39.1/sound/usb/card= .c +--- linux-2.6.39.1/sound/usb/card.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/usb/card.c 2011-05-22 19:36:36.000000000 -0400 @@ -305,7 +305,7 @@ static int snd_usb_audio_create(struct u struct snd_usb_audio *chip; int err, len; @@ -84477,9 +84629,9 @@ diff -urNp linux-2.6.39/sound/usb/card.c linux-2.= 6.39/sound/usb/card.c .dev_free =3D snd_usb_audio_dev_free, }; =20 -diff -urNp linux-2.6.39/sound/usb/midi.c linux-2.6.39/sound/usb/midi.c ---- linux-2.6.39/sound/usb/midi.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/usb/midi.c 2011-05-22 19:36:36.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/usb/midi.c linux-2.6.39.1/sound/usb/midi= .c +--- linux-2.6.39.1/sound/usb/midi.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/usb/midi.c 2011-05-22 19:36:36.000000000 -0400 @@ -1146,14 +1146,14 @@ static void snd_usbmidi_input_trigger(st clear_bit(substream->number, &umidi->input_triggered); } @@ -84497,9 +84649,9 @@ diff -urNp linux-2.6.39/sound/usb/midi.c linux-2.= 6.39/sound/usb/midi.c .open =3D snd_usbmidi_input_open, .close =3D snd_usbmidi_input_close, .trigger =3D snd_usbmidi_input_trigger -diff -urNp linux-2.6.39/sound/usb/misc/ua101.c linux-2.6.39/sound/usb/mi= sc/ua101.c ---- linux-2.6.39/sound/usb/misc/ua101.c 2011-05-19 00:06:34.000000000 -0= 400 -+++ linux-2.6.39/sound/usb/misc/ua101.c 2011-05-22 19:36:36.000000000 -0= 400 +diff -urNp linux-2.6.39.1/sound/usb/misc/ua101.c linux-2.6.39.1/sound/us= b/misc/ua101.c +--- linux-2.6.39.1/sound/usb/misc/ua101.c 2011-05-19 00:06:34.000000000 = -0400 ++++ linux-2.6.39.1/sound/usb/misc/ua101.c 2011-05-22 19:36:36.000000000 = -0400 @@ -886,7 +886,7 @@ static snd_pcm_uframes_t playback_pcm_po return ua101_pcm_pointer(ua, &ua->playback); } @@ -84518,9 +84670,9 @@ diff -urNp linux-2.6.39/sound/usb/misc/ua101.c li= nux-2.6.39/sound/usb/misc/ua101 .open =3D playback_pcm_open, .close =3D playback_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/usb/mixer.c linux-2.6.39/sound/usb/mixer.c ---- linux-2.6.39/sound/usb/mixer.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/usb/mixer.c 2011-05-22 19:36:36.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/usb/mixer.c linux-2.6.39.1/sound/usb/mix= er.c +--- linux-2.6.39.1/sound/usb/mixer.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/usb/mixer.c 2011-05-22 19:36:36.000000000 -0400 @@ -2201,7 +2201,7 @@ static int snd_usb_mixer_status_create(s int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, int ignore_error) @@ -84530,9 +84682,9 @@ diff -urNp linux-2.6.39/sound/usb/mixer.c linux-2= .6.39/sound/usb/mixer.c .dev_free =3D snd_usb_mixer_dev_free }; struct usb_mixer_interface *mixer; -diff -urNp linux-2.6.39/sound/usb/pcm.c linux-2.6.39/sound/usb/pcm.c ---- linux-2.6.39/sound/usb/pcm.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/sound/usb/pcm.c 2011-05-22 19:36:36.000000000 -0400 +diff -urNp linux-2.6.39.1/sound/usb/pcm.c linux-2.6.39.1/sound/usb/pcm.c +--- linux-2.6.39.1/sound/usb/pcm.c 2011-05-19 00:06:34.000000000 -0400 ++++ linux-2.6.39.1/sound/usb/pcm.c 2011-05-22 19:36:36.000000000 -0400 @@ -844,7 +844,7 @@ static int snd_usb_capture_close(struct=20 return snd_usb_pcm_close(substream, SNDRV_PCM_STREAM_CAPTURE); } @@ -84551,9 +84703,9 @@ diff -urNp linux-2.6.39/sound/usb/pcm.c linux-2.6= .39/sound/usb/pcm.c .open =3D snd_usb_capture_open, .close =3D snd_usb_capture_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/sound/usb/usx2y/usbusx2yaudio.c linux-2.6.39/sou= nd/usb/usx2y/usbusx2yaudio.c ---- linux-2.6.39/sound/usb/usx2y/usbusx2yaudio.c 2011-05-19 00:06:34.000= 000000 -0400 -+++ linux-2.6.39/sound/usb/usx2y/usbusx2yaudio.c 2011-05-22 19:36:36.000= 000000 -0400 +diff -urNp linux-2.6.39.1/sound/usb/usx2y/usbusx2yaudio.c linux-2.6.39.1= /sound/usb/usx2y/usbusx2yaudio.c +--- linux-2.6.39.1/sound/usb/usx2y/usbusx2yaudio.c 2011-05-19 00:06:34.0= 00000000 -0400 ++++ linux-2.6.39.1/sound/usb/usx2y/usbusx2yaudio.c 2011-05-22 19:36:36.0= 00000000 -0400 @@ -919,8 +919,7 @@ static int snd_usX2Y_pcm_close(struct sn } =20 @@ -84564,9 +84716,271 @@ diff -urNp linux-2.6.39/sound/usb/usx2y/usbusx2= yaudio.c linux-2.6.39/sound/usb/u .open =3D snd_usX2Y_pcm_open, .close =3D snd_usX2Y_pcm_close, .ioctl =3D snd_pcm_lib_ioctl, -diff -urNp linux-2.6.39/tools/perf/builtin-lock.c linux-2.6.39/tools/per= f/builtin-lock.c ---- linux-2.6.39/tools/perf/builtin-lock.c 2011-05-19 00:06:34.000000000= -0400 -+++ linux-2.6.39/tools/perf/builtin-lock.c 2011-05-22 19:36:36.000000000= -0400 +diff -urNp linux-2.6.39.1/tools/gcc/Makefile linux-2.6.39.1/tools/gcc/Ma= kefile +--- linux-2.6.39.1/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.39.1/tools/gcc/Makefile 2011-06-03 01:19:01.000000000 -040= 0 +@@ -0,0 +1,11 @@ ++#CC :=3D gcc ++#PLUGIN_SOURCE_FILES :=3D pax_plugin.c ++#PLUGIN_OBJECT_FILES :=3D $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES)) ++GCCPLUGINS_DIR :=3D $(shell $(HOSTCC) -print-file-name=3Dplugin) ++#CFLAGS +=3D -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W ++ ++HOST_EXTRACFLAGS +=3D -I$(GCCPLUGINS_DIR)/include ++ ++hostlibs-y :=3D pax_plugin.so ++always :=3D $(hostlibs-y) ++pax_plugin-objs :=3D pax_plugin.o +diff -urNp linux-2.6.39.1/tools/gcc/pax_plugin.c linux-2.6.39.1/tools/gc= c/pax_plugin.c +--- linux-2.6.39.1/tools/gcc/pax_plugin.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.39.1/tools/gcc/pax_plugin.c 2011-06-03 23:14:36.000000000 = -0400 +@@ -0,0 +1,242 @@ ++/* ++ * Copyright 2011 by the PaX Team ++ * Licensed under the GPL v2 ++ * ++ * Note: the choice of the license means that the compilation process i= s ++ * NOT 'eligible' as defined by gcc's library exception to the GP= L v3, ++ * but for the kernel it doesn't matter since it doesn't link aga= inst ++ * any of the gcc libraries ++ * ++ * gcc plugin to help implement various PaX features ++ * ++ * - track lowest stack pointer ++ * ++ * TODO: ++ * - initialize all local variables ++ * ++ * BUGS: ++ */ ++#include "gcc-plugin.h" ++#include "plugin-version.h" ++#include "config.h" ++#include "system.h" ++#include "coretypes.h" ++#include "tm.h" ++#include "toplev.h" ++#include "basic-block.h" ++#include "gimple.h" ++//#include "expr.h" where are you... ++#include "diagnostic.h" ++#include "rtl.h" ++#include "emit-rtl.h" ++#include "function.h" ++#include "tree.h" ++#include "tree-pass.h" ++#include "intl.h" ++ ++int plugin_is_GPL_compatible; ++ ++static int track_frame_size =3D -1; ++static const char track_function[] =3D "pax_track_stack"; ++static bool init_locals; ++ ++static struct plugin_info pax_plugin_info =3D { ++ .version =3D "201106030000", ++ .help =3D "track-lowest-sp=3Dnn\ttrack sp in functions whose frame si= ze is at least nn bytes\n" ++// "initialize-locals\t\tforcibly initialize all stack frames\n" ++}; ++ ++static bool gate_pax_track_stack(void); ++static unsigned int execute_pax_tree_instrument(void); ++static unsigned int execute_pax_final(void); ++ ++static struct gimple_opt_pass pax_tree_instrument_pass =3D { ++ .pass =3D { ++ .type =3D GIMPLE_PASS, ++ .name =3D "pax_tree_instrument", ++ .gate =3D gate_pax_track_stack, ++ .execute =3D execute_pax_tree_instrument, ++ .sub =3D NULL, ++ .next =3D NULL, ++ .static_pass_number =3D 0, ++ .tv_id =3D TV_NONE, ++ .properties_required =3D PROP_gimple_leh | PROP_cfg, ++ .properties_provided =3D 0, ++ .properties_destroyed =3D 0, ++ .todo_flags_start =3D 0, //TODO_verify_ssa | TODO_verify_flow | TODO_= verify_stmts, ++ .todo_flags_finish =3D TODO_verify_stmts // | TODO_dump_func ++ } ++}; ++ ++static struct rtl_opt_pass pax_final_rtl_opt_pass =3D { ++ .pass =3D { ++ .type =3D RTL_PASS, ++ .name =3D "pax_final", ++ .gate =3D gate_pax_track_stack, ++ .execute =3D execute_pax_final, ++ .sub =3D NULL, ++ .next =3D NULL, ++ .static_pass_number =3D 0, ++ .tv_id =3D TV_NONE, ++ .properties_required =3D 0, ++ .properties_provided =3D 0, ++ .properties_destroyed =3D 0, ++ .todo_flags_start =3D 0, ++ .todo_flags_finish =3D 0 ++ } ++}; ++ ++static bool gate_pax_track_stack(void) ++{ ++ return track_frame_size >=3D 0; ++} ++ ++static void pax_add_instrumentation(gimple_stmt_iterator *gsi, bool bef= ore) ++{ ++ gimple call; ++ tree decl, type; ++ ++ // insert call to void pax_track_stack(void) ++ type =3D build_function_type_list(void_type_node, NULL_TREE); ++ decl =3D build_fn_decl(track_function, type); ++ DECL_ASSEMBLER_NAME(decl); // for LTO ++ call =3D gimple_build_call(decl, 0); ++ if (before) ++ gsi_insert_before(gsi, call, GSI_CONTINUE_LINKING); ++ else ++ gsi_insert_after(gsi, call, GSI_CONTINUE_LINKING); ++} ++ ++static unsigned int execute_pax_tree_instrument(void) ++{ ++ basic_block bb; ++ gimple_stmt_iterator gsi; ++ ++ // 1. loop through BBs and GIMPLE statements ++ FOR_EACH_BB(bb) { ++ for (gsi =3D gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) { ++ // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA at= tributes ++ tree decl; ++ gimple stmt =3D gsi_stmt(gsi); ++ ++ if (!is_gimple_call(stmt)) ++ continue; ++ decl =3D gimple_call_fndecl(stmt); ++ if (!decl) ++ continue; ++ if (TREE_CODE(decl) !=3D FUNCTION_DECL) ++ continue; ++ if (!DECL_BUILT_IN(decl)) ++ continue; ++ if (DECL_BUILT_IN_CLASS(decl) !=3D BUILT_IN_NORMAL) ++ continue; ++ if (DECL_FUNCTION_CODE(decl) !=3D BUILT_IN_ALLOCA) ++ continue; ++ ++ // 2. insert track call after each __builtin_alloca call ++ pax_add_instrumentation(&gsi, false); ++// print_node(stderr, "pax", decl, 4); ++ } ++ } ++ ++ // 3. insert track call at the beginning ++ bb =3D ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb; ++ gsi =3D gsi_start_bb(bb); ++ pax_add_instrumentation(&gsi, true); ++ ++ return 0; ++} ++ ++static unsigned int execute_pax_final(void) ++{ ++ rtx insn; ++ ++ if (cfun->calls_alloca) ++ return 0; ++ ++ // 1. find pax_track_stack calls ++ for (insn =3D get_insns(); insn; insn =3D NEXT_INSN(insn)) { ++ // rtl match: (call_insn 8 7 9 3 (call (mem (symbol_ref ("pax_track_s= tack") [flags 0x41] ) [0 S1 A8]= ) (4)) -1 (nil) (nil)) ++ rtx body; ++ ++ if (!CALL_P(insn)) ++ continue; ++ body =3D PATTERN(insn); ++ if (GET_CODE(body) !=3D CALL) ++ continue; ++ body =3D XEXP(body, 0); ++ if (GET_CODE(body) !=3D MEM) ++ continue; ++ body =3D XEXP(body, 0); ++ if (GET_CODE(body) !=3D SYMBOL_REF) ++ continue; ++ if (strcmp(XSTR(body, 0), track_function)) ++ continue; ++// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_f= rame_size(), track_frame_size); ++ // 2. delete call if function frame is not big enough ++ if (get_frame_size() >=3D track_frame_size) ++ continue; ++ delete_insn_and_edges(insn); ++ } ++ ++// print_simple_rtl(stderr, get_insns()); ++// print_rtl(stderr, get_insns()); ++// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_fr= ame_size(), track_frame_size); ++ ++ return 0; ++} ++ ++int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc= _version *version) ++{ ++ const char * const plugin_name =3D plugin_info->base_name; ++ const int argc =3D plugin_info->argc; ++ const struct plugin_argument * const argv =3D plugin_info->argv; ++ int i; ++ struct register_pass_info pax_tree_instrument_pass_info =3D { ++ .pass =3D &pax_tree_instrument_pass.pass, ++// .reference_pass_name =3D "tree_profile", ++ .reference_pass_name =3D "optimized", ++ .ref_pass_instance_number =3D 0, ++ .pos_op =3D PASS_POS_INSERT_AFTER ++ }; ++ struct register_pass_info pax_final_pass_info =3D { ++ .pass =3D &pax_final_rtl_opt_pass.pass, ++ .reference_pass_name =3D "final", ++ .ref_pass_instance_number =3D 0, ++ .pos_op =3D PASS_POS_INSERT_BEFORE ++ }; ++ ++ if (!plugin_default_version_check(version, &gcc_version)) { ++ error(G_("incompatible gcc/plugin versions")); ++ return 1; ++ } ++ ++ register_callback(plugin_name, PLUGIN_INFO, NULL, &pax_plugin_info); ++ ++ for (i =3D 0; i < argc; ++i) { ++ if (!strcmp(argv[i].key, "track-lowest-sp")) { ++ if (!argv[i].value) { ++ error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plug= in_name, argv[i].key); ++ continue; ++ } ++ track_frame_size =3D atoi(argv[i].value); ++ if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_= size < 0) ++ error(G_("invalid option argument '-fplugin-arg-%s-%s=3D%s'"), plug= in_name, argv[i].key, argv[i].value); ++ continue; ++ } ++ if (!strcmp(argv[i].key, "initialize-locals")) { ++ if (argv[i].value) { ++ error(G_("invalid option argument '-fplugin-arg-%s-%s=3D%s'"), plug= in_name, argv[i].key, argv[i].value); ++ continue; ++ } ++ init_locals =3D true; ++ continue; ++ } ++ error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].= key); ++ } ++ ++ register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_t= ree_instrument_pass_info); ++ register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_f= inal_pass_info); ++ ++ return 0; ++} +Binary files linux-2.6.39.1/tools/gcc/pax_plugin.so and linux-2.6.39.1/t= ools/gcc/pax_plugin.so differ +diff -urNp linux-2.6.39.1/tools/perf/builtin-lock.c linux-2.6.39.1/tools= /perf/builtin-lock.c +--- linux-2.6.39.1/tools/perf/builtin-lock.c 2011-05-19 00:06:34.0000000= 00 -0400 ++++ linux-2.6.39.1/tools/perf/builtin-lock.c 2011-05-22 19:36:36.0000000= 00 -0400 @@ -635,14 +635,14 @@ end: =20 /* lock oriented handlers */ @@ -84584,9 +84998,9 @@ diff -urNp linux-2.6.39/tools/perf/builtin-lock.c= linux-2.6.39/tools/perf/builti =20 static void process_lock_acquire_event(void *data, -diff -urNp linux-2.6.39/tools/perf/builtin-sched.c linux-2.6.39/tools/pe= rf/builtin-sched.c ---- linux-2.6.39/tools/perf/builtin-sched.c 2011-05-19 00:06:34.00000000= 0 -0400 -+++ linux-2.6.39/tools/perf/builtin-sched.c 2011-05-22 19:36:36.00000000= 0 -0400 +diff -urNp linux-2.6.39.1/tools/perf/builtin-sched.c linux-2.6.39.1/tool= s/perf/builtin-sched.c +--- linux-2.6.39.1/tools/perf/builtin-sched.c 2011-05-19 00:06:34.000000= 000 -0400 ++++ linux-2.6.39.1/tools/perf/builtin-sched.c 2011-05-22 19:36:36.000000= 000 -0400 @@ -845,7 +845,7 @@ replay_fork_event(struct trace_fork_even register_pid(fork_event->child_pid, fork_event->child_comm); } @@ -84623,9 +85037,9 @@ diff -urNp linux-2.6.39/tools/perf/builtin-sched.= c linux-2.6.39/tools/perf/built .wakeup_event =3D NULL, .switch_event =3D map_switch_event, .runtime_event =3D NULL, -diff -urNp linux-2.6.39/usr/gen_init_cpio.c linux-2.6.39/usr/gen_init_cp= io.c ---- linux-2.6.39/usr/gen_init_cpio.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/usr/gen_init_cpio.c 2011-05-22 19:36:36.000000000 -0400 +diff -urNp linux-2.6.39.1/usr/gen_init_cpio.c linux-2.6.39.1/usr/gen_ini= t_cpio.c +--- linux-2.6.39.1/usr/gen_init_cpio.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/usr/gen_init_cpio.c 2011-05-22 19:36:36.000000000 -04= 00 @@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name, int retval; int rc =3D -1; @@ -84648,9 +85062,9 @@ diff -urNp linux-2.6.39/usr/gen_init_cpio.c linux= -2.6.39/usr/gen_init_cpio.c } else break; } -diff -urNp linux-2.6.39/virt/kvm/kvm_main.c linux-2.6.39/virt/kvm/kvm_ma= in.c ---- linux-2.6.39/virt/kvm/kvm_main.c 2011-05-19 00:06:34.000000000 -0400 -+++ linux-2.6.39/virt/kvm/kvm_main.c 2011-05-22 19:36:36.000000000 -0400 +diff -urNp linux-2.6.39.1/virt/kvm/kvm_main.c linux-2.6.39.1/virt/kvm/kv= m_main.c +--- linux-2.6.39.1/virt/kvm/kvm_main.c 2011-05-19 00:06:34.000000000 -04= 00 ++++ linux-2.6.39.1/virt/kvm/kvm_main.c 2011-05-22 19:36:36.000000000 -04= 00 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list); =20 static cpumask_var_t cpus_hardware_enabled; diff --git a/2.6.39/4422_grsec-mute-warnings.patch b/2.6.39/4422_grsec-mu= te-warnings.patch index 0a80640..dde08c8 100644 --- a/2.6.39/4422_grsec-mute-warnings.patch +++ b/2.6.39/4422_grsec-mute-warnings.patch @@ -29,14 +29,14 @@ warning flags of vanilla kernel versions. Acked-by: Christian Heim --- =20 ---- a/Makefile 2011-05-20 08:12:41.000000000 -0400 -+++ b/Makefile 2011-05-20 08:18:18.000000000 -0400 +--- a/Makefile 2011-06-06 00:47:21.000000000 -0400 ++++ b/Makefile 2011-06-06 00:49:13.000000000 -0400 @@ -237,7 +237,7 @@ =20 HOSTCC =3D gcc HOSTCXX =3D g++ --HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fo= mit-frame-pointer -fno-delete-null-pointer-checks +-HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointe= r -fno-delete-null-pointer-checks +HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-em= pty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit= -frame-pointer -fno-delete-null-pointer-checks + HOSTCFLAGS +=3D $(call cc-option, -Wno-empty-body) HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 - # Decide whether to build built-in, modular, or both. diff --git a/2.6.39/4435_grsec-kconfig-gentoo.patch b/2.6.39/4435_grsec-k= config-gentoo.patch index 87bdcd3..5bae307 100644 --- a/2.6.39/4435_grsec-kconfig-gentoo.patch +++ b/2.6.39/4435_grsec-kconfig-gentoo.patch @@ -303,7 +303,7 @@ diff -Naur linux-2.6.38-hardened-r1.orig/security/Kco= nfig linux-2.6.38-hardened- help This is the kernel land equivalent of PAGEEXEC and MPROTECT, that is, enabling this option will make it harder to inject -@@ -477,8 +478,9 @@ +@@ -483,8 +484,9 @@ =20 config PAX_MEMORY_UDEREF bool "Prevent invalid userland pointer dereference"