Update Grsec/PaX20110805

 2.2.2-2.6.32.43-201108052033
 2.2.2-2.6.39.4-201108052113

13 files changed, 12055 insertions, 23237 deletions

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index d1f7ce8..781ce81 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,7 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-2.6.32.43-201107191826.patch
+Patch:	4420_grsecurity-2.2.2-2.6.32.43-201108052033.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201107191826.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201108052033.patch
index 27cdae4..4116dc7 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201107191826.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201108052033.patch
@@ -6226,6 +6226,17 @@ diff -urNp linux-2.6.32.43/arch/x86/boot/compressed/head_64.S linux-2.6.32.43/ar
  #endif
  
  	/* Target address to relocate to for decompression */
+diff -urNp linux-2.6.32.43/arch/x86/boot/compressed/Makefile linux-2.6.32.43/arch/x86/boot/compressed/Makefile
+--- linux-2.6.32.43/arch/x86/boot/compressed/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/arch/x86/boot/compressed/Makefile	2011-08-05 20:33:55.000000000 -0400
+@@ -13,6 +13,7 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
+ KBUILD_CFLAGS += $(cflags-y)
+ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
+ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
++KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
+ 
+ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
 diff -urNp linux-2.6.32.43/arch/x86/boot/compressed/misc.c linux-2.6.32.43/arch/x86/boot/compressed/misc.c
 --- linux-2.6.32.43/arch/x86/boot/compressed/misc.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/boot/compressed/misc.c	2011-04-17 15:56:46.000000000 -0400
@@ -6572,6 +6583,17 @@ diff -urNp linux-2.6.32.43/arch/x86/boot/header.S linux-2.6.32.43/arch/x86/boot/
  
  #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.32.43/arch/x86/boot/Makefile linux-2.6.32.43/arch/x86/boot/Makefile
+--- linux-2.6.32.43/arch/x86/boot/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/arch/x86/boot/Makefile	2011-08-05 20:33:55.000000000 -0400
+@@ -69,6 +69,7 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
+ 		   $(call cc-option, -fno-stack-protector) \
+ 		   $(call cc-option, -mpreferred-stack-boundary=2)
+ KBUILD_CFLAGS	+= $(call cc-option, -m32)
++KBUILD_CFLAGS	+= $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
+ KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+ 
 diff -urNp linux-2.6.32.43/arch/x86/boot/memory.c linux-2.6.32.43/arch/x86/boot/memory.c
 --- linux-2.6.32.43/arch/x86/boot/memory.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/boot/memory.c	2011-04-17 15:56:46.000000000 -0400
@@ -9262,7 +9284,48 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/paravirt.h linux-2.6.32.43/arch/
  #endif /* __ASSEMBLY__ */
 diff -urNp linux-2.6.32.43/arch/x86/include/asm/paravirt_types.h linux-2.6.32.43/arch/x86/include/asm/paravirt_types.h
 --- linux-2.6.32.43/arch/x86/include/asm/paravirt_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/arch/x86/include/asm/paravirt_types.h	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/arch/x86/include/asm/paravirt_types.h	2011-08-05 20:33:55.000000000 -0400
+@@ -78,19 +78,19 @@ struct pv_init_ops {
+ 	 */
+ 	unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
+ 			  unsigned long addr, unsigned len);
+-};
++} __no_const;
+ 
+ 
+ struct pv_lazy_ops {
+ 	/* Set deferred update mode, used for batching operations. */
+ 	void (*enter)(void);
+ 	void (*leave)(void);
+-};
++} __no_const;
+ 
+ struct pv_time_ops {
+ 	unsigned long long (*sched_clock)(void);
+ 	unsigned long (*get_tsc_khz)(void);
+-};
++} __no_const;
+ 
+ struct pv_cpu_ops {
+ 	/* hooks for various privileged instructions */
+@@ -186,7 +186,7 @@ struct pv_cpu_ops {
+ 
+ 	void (*start_context_switch)(struct task_struct *prev);
+ 	void (*end_context_switch)(struct task_struct *next);
+-};
++} __no_const;
+ 
+ struct pv_irq_ops {
+ 	/*
+@@ -217,7 +217,7 @@ struct pv_apic_ops {
+ 				 unsigned long start_eip,
+ 				 unsigned long start_esp);
+ #endif
+-};
++} __no_const;
+ 
+ struct pv_mmu_ops {
+ 	unsigned long (*read_cr2)(void);
 @@ -316,6 +316,12 @@ struct pv_mmu_ops {
  	   an mfn.  We can tell which is which from the index. */
  	void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -9276,6 +9339,15 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/paravirt_types.h linux-2.6.32.43
  };
  
  struct raw_spinlock;
+@@ -326,7 +332,7 @@ struct pv_lock_ops {
+ 	void (*spin_lock_flags)(struct raw_spinlock *lock, unsigned long flags);
+ 	int (*spin_trylock)(struct raw_spinlock *lock);
+ 	void (*spin_unlock)(struct raw_spinlock *lock);
+-};
++} __no_const;
+ 
+ /* This contains all the paravirt structures: we get a convenient
+  * number for each function using the offset which we use to indicate
 diff -urNp linux-2.6.32.43/arch/x86/include/asm/pci_x86.h linux-2.6.32.43/arch/x86/include/asm/pci_x86.h
 --- linux-2.6.32.43/arch/x86/include/asm/pci_x86.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/include/asm/pci_x86.h	2011-04-17 15:56:46.000000000 -0400
@@ -9923,7 +9995,7 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/ptrace.h linux-2.6.32.43/arch/x8
  
 diff -urNp linux-2.6.32.43/arch/x86/include/asm/reboot.h linux-2.6.32.43/arch/x86/include/asm/reboot.h
 --- linux-2.6.32.43/arch/x86/include/asm/reboot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/arch/x86/include/asm/reboot.h	2011-05-22 23:02:03.000000000 -0400
++++ linux-2.6.32.43/arch/x86/include/asm/reboot.h	2011-08-05 20:33:55.000000000 -0400
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -9937,8 +10009,9 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/reboot.h linux-2.6.32.43/arch/x8
  	void (*shutdown)(void);
  	void (*crash_shutdown)(struct pt_regs *);
 -	void (*emergency_restart)(void);
+-};
 +	void (* __noreturn emergency_restart)(void);
- };
++} __no_const;
  
  extern struct machine_ops machine_ops;
  
@@ -10149,7 +10222,7 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/segment.h linux-2.6.32.43/arch/x
  #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
 diff -urNp linux-2.6.32.43/arch/x86/include/asm/smp.h linux-2.6.32.43/arch/x86/include/asm/smp.h
 --- linux-2.6.32.43/arch/x86/include/asm/smp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/arch/x86/include/asm/smp.h	2011-07-01 19:00:40.000000000 -0400
++++ linux-2.6.32.43/arch/x86/include/asm/smp.h	2011-08-05 20:33:55.000000000 -0400
 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
  DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
  DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -10171,6 +10244,15 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/smp.h linux-2.6.32.43/arch/x86/i
  
  struct smp_ops {
  	void (*smp_prepare_boot_cpu)(void);
+@@ -60,7 +57,7 @@ struct smp_ops {
+ 
+ 	void (*send_call_func_ipi)(const struct cpumask *mask);
+ 	void (*send_call_func_single_ipi)(int cpu);
+-};
++} __no_const;
+ 
+ /* Globals due to paravirt */
+ extern void set_cpu_sibling_map(int cpu);
 @@ -175,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitd
  extern int safe_smp_processor_id(void);
  
@@ -11235,6 +11317,18 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/vmi.h linux-2.6.32.43/arch/x86/i
  } __attribute__((packed));
  
  struct pnp_header {
+diff -urNp linux-2.6.32.43/arch/x86/include/asm/vmi_time.h linux-2.6.32.43/arch/x86/include/asm/vmi_time.h
+--- linux-2.6.32.43/arch/x86/include/asm/vmi_time.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/arch/x86/include/asm/vmi_time.h	2011-08-05 20:33:55.000000000 -0400
+@@ -43,7 +43,7 @@ extern struct vmi_timer_ops {
+ 	int (*wallclock_updated)(void);
+ 	void (*set_alarm)(u32 flags, u64 expiry, u64 period);
+ 	void (*cancel_alarm)(u32 flags);
+-} vmi_timer_ops;
++} __no_const vmi_timer_ops;
+ 
+ /* Prototypes */
+ extern void __init vmi_time_init(void);
 diff -urNp linux-2.6.32.43/arch/x86/include/asm/vsyscall.h linux-2.6.32.43/arch/x86/include/asm/vsyscall.h
 --- linux-2.6.32.43/arch/x86/include/asm/vsyscall.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/include/asm/vsyscall.h	2011-04-17 15:56:46.000000000 -0400
@@ -11268,6 +11362,90 @@ diff -urNp linux-2.6.32.43/arch/x86/include/asm/vsyscall.h linux-2.6.32.43/arch/
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
+diff -urNp linux-2.6.32.43/arch/x86/include/asm/x86_init.h linux-2.6.32.43/arch/x86/include/asm/x86_init.h
+--- linux-2.6.32.43/arch/x86/include/asm/x86_init.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/arch/x86/include/asm/x86_init.h	2011-08-05 20:33:55.000000000 -0400
+@@ -28,7 +28,7 @@ struct x86_init_mpparse {
+ 	void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
+ 	void (*find_smp_config)(unsigned int reserve);
+ 	void (*get_smp_config)(unsigned int early);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_resources - platform specific resource related ops
+@@ -42,7 +42,7 @@ struct x86_init_resources {
+ 	void (*probe_roms)(void);
+ 	void (*reserve_resources)(void);
+ 	char *(*memory_setup)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_irqs - platform specific interrupt setup
+@@ -55,7 +55,7 @@ struct x86_init_irqs {
+ 	void (*pre_vector_init)(void);
+ 	void (*intr_init)(void);
+ 	void (*trap_init)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_oem - oem platform specific customizing functions
+@@ -65,7 +65,7 @@ struct x86_init_irqs {
+ struct x86_init_oem {
+ 	void (*arch_setup)(void);
+ 	void (*banner)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_paging - platform specific paging functions
+@@ -75,7 +75,7 @@ struct x86_init_oem {
+ struct x86_init_paging {
+ 	void (*pagetable_setup_start)(pgd_t *base);
+ 	void (*pagetable_setup_done)(pgd_t *base);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_timers - platform specific timer setup
+@@ -88,7 +88,7 @@ struct x86_init_timers {
+ 	void (*setup_percpu_clockev)(void);
+ 	void (*tsc_pre_init)(void);
+ 	void (*timer_init)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_ops - functions for platform specific setup
+@@ -101,7 +101,7 @@ struct x86_init_ops {
+ 	struct x86_init_oem		oem;
+ 	struct x86_init_paging		paging;
+ 	struct x86_init_timers		timers;
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_cpuinit_ops - platform specific cpu hotplug setups
+@@ -109,7 +109,7 @@ struct x86_init_ops {
+  */
+ struct x86_cpuinit_ops {
+ 	void (*setup_percpu_clockev)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_platform_ops - platform specific runtime functions
+@@ -121,7 +121,7 @@ struct x86_platform_ops {
+ 	unsigned long (*calibrate_tsc)(void);
+ 	unsigned long (*get_wallclock)(void);
+ 	int (*set_wallclock)(unsigned long nowtime);
+-};
++} __no_const;
+ 
+ extern struct x86_init_ops x86_init;
+ extern struct x86_cpuinit_ops x86_cpuinit;
 diff -urNp linux-2.6.32.43/arch/x86/include/asm/xsave.h linux-2.6.32.43/arch/x86/include/asm/xsave.h
 --- linux-2.6.32.43/arch/x86/include/asm/xsave.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/include/asm/xsave.h	2011-04-17 15:56:46.000000000 -0400
@@ -11422,6 +11600,17 @@ diff -urNp linux-2.6.32.43/arch/x86/Kconfig.debug linux-2.6.32.43/arch/x86/Kconf
  	---help---
  	  Mark the kernel read-only data as write-protected in the pagetables,
  	  in order to catch accidental (and incorrect) writes to such const
+diff -urNp linux-2.6.32.43/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.43/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-2.6.32.43/arch/x86/kernel/acpi/realmode/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/arch/x86/kernel/acpi/realmode/Makefile	2011-08-05 20:33:55.000000000 -0400
+@@ -41,6 +41,7 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
+ 		   $(call cc-option, -fno-stack-protector) \
+ 		   $(call cc-option, -mpreferred-stack-boundary=2)
+ KBUILD_CFLAGS	+= $(call cc-option, -m32)
++KBUILD_CFLAGS	+= $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
+ KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+ 
 diff -urNp linux-2.6.32.43/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.43/arch/x86/kernel/acpi/realmode/wakeup.S
 --- linux-2.6.32.43/arch/x86/kernel/acpi/realmode/wakeup.S	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-01 18:53:40.000000000 -0400
@@ -12178,6 +12367,20 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.43/arch
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
+diff -urNp linux-2.6.32.43/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.43/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-2.6.32.43/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-05 20:33:55.000000000 -0400
+@@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi
+ static int inject_init(void)
+ {
+ 	printk(KERN_INFO "Machine check injector initialized\n");
+-	mce_chrdev_ops.write = mce_write;
++	pax_open_kernel();
++	*(void **)&mce_chrdev_ops.write = mce_write;
++	pax_close_kernel();
+ 	register_die_notifier(&mce_raise_nb);
+ 	return 0;
+ }
 diff -urNp linux-2.6.32.43/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.43/arch/x86/kernel/cpu/mtrr/amd.c
 --- linux-2.6.32.43/arch/x86/kernel/cpu/mtrr/amd.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/kernel/cpu/mtrr/amd.c	2011-04-17 15:56:46.000000000 -0400
@@ -15572,7 +15775,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/module.c linux-2.6.32.43/arch/x86/ker
  				goto overflow;
 diff -urNp linux-2.6.32.43/arch/x86/kernel/paravirt.c linux-2.6.32.43/arch/x86/kernel/paravirt.c
 --- linux-2.6.32.43/arch/x86/kernel/paravirt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/arch/x86/kernel/paravirt.c	2011-07-19 18:26:50.000000000 -0400
++++ linux-2.6.32.43/arch/x86/kernel/paravirt.c	2011-08-05 20:33:55.000000000 -0400
 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
  {
  	return x;
@@ -15592,17 +15795,16 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/paravirt.c linux-2.6.32.43/arch/x86/k
  		.pv_init_ops = pv_init_ops,
  		.pv_time_ops = pv_time_ops,
  		.pv_cpu_ops = pv_cpu_ops,
-@@ -133,6 +136,9 @@ static void *get_call_destination(u8 typ
+@@ -133,6 +136,8 @@ static void *get_call_destination(u8 typ
  		.pv_lock_ops = pv_lock_ops,
  #endif
  	};
 +
 +	pax_track_stack();
-+
  	return *((void **)&tmpl + type);
  }
  
-@@ -145,15 +151,19 @@ unsigned paravirt_patch_default(u8 type,
+@@ -145,15 +150,19 @@ unsigned paravirt_patch_default(u8 type,
  	if (opfunc == NULL)
  		/* If there's no function, patch it with a ud2a (BUG) */
  		ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
@@ -15617,15 +15819,15 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/paravirt.c linux-2.6.32.43/arch/x86/k
  		ret = paravirt_patch_ident_32(insnbuf, len);
 -	else if (opfunc == _paravirt_ident_64)
 +	else if (opfunc == (void *)_paravirt_ident_64)
- 		ret = paravirt_patch_ident_64(insnbuf, len);
++		ret = paravirt_patch_ident_64(insnbuf, len);
 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
 +	else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
-+		ret = paravirt_patch_ident_64(insnbuf, len);
+ 		ret = paravirt_patch_ident_64(insnbuf, len);
 +#endif
  
  	else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
  		 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
-@@ -178,7 +188,7 @@ unsigned paravirt_patch_insns(void *insn
+@@ -178,7 +187,7 @@ unsigned paravirt_patch_insns(void *insn
  	if (insn_len > len || start == NULL)
  		insn_len = len;
  	else
@@ -15634,7 +15836,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/paravirt.c linux-2.6.32.43/arch/x86/k
  
  	return insn_len;
  }
-@@ -294,22 +304,22 @@ void arch_flush_lazy_mmu_mode(void)
+@@ -294,22 +303,22 @@ void arch_flush_lazy_mmu_mode(void)
  	preempt_enable();
  }
  
@@ -15661,7 +15863,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/paravirt.c linux-2.6.32.43/arch/x86/k
  	.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
  	.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
  	.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
-@@ -321,7 +331,7 @@ struct pv_irq_ops pv_irq_ops = {
+@@ -321,7 +330,7 @@ struct pv_irq_ops pv_irq_ops = {
  #endif
  };
  
@@ -15670,7 +15872,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/paravirt.c linux-2.6.32.43/arch/x86/k
  	.cpuid = native_cpuid,
  	.get_debugreg = native_get_debugreg,
  	.set_debugreg = native_set_debugreg,
-@@ -382,21 +392,26 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -382,21 +391,26 @@ struct pv_cpu_ops pv_cpu_ops = {
  	.end_context_switch = paravirt_nop,
  };
  
@@ -15700,7 +15902,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/paravirt.c linux-2.6.32.43/arch/x86/k
  
  	.read_cr2 = native_read_cr2,
  	.write_cr2 = native_write_cr2,
-@@ -467,6 +482,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -467,6 +481,12 @@ struct pv_mmu_ops pv_mmu_ops = {
  	},
  
  	.set_fixmap = native_set_fixmap,
@@ -17692,7 +17894,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/vm86_32.c linux-2.6.32.43/arch/x86/ke
  	if ((segoffs >> 16) == BIOSSEG)
 diff -urNp linux-2.6.32.43/arch/x86/kernel/vmi_32.c linux-2.6.32.43/arch/x86/kernel/vmi_32.c
 --- linux-2.6.32.43/arch/x86/kernel/vmi_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/arch/x86/kernel/vmi_32.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/arch/x86/kernel/vmi_32.c	2011-08-05 20:33:55.000000000 -0400
 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 
  typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
  
@@ -17719,7 +17921,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kernel/vmi_32.c linux-2.6.32.43/arch/x86/ker
  	void (*halt)(void);
    	void (*set_lazy_mode)(int mode);
 -} vmi_ops;
-+} vmi_ops __read_only;
++} __no_const vmi_ops __read_only;
  
  /* Cached VMI operations */
 -struct vmi_timer_ops vmi_timer_ops;
@@ -18277,12 +18479,10 @@ diff -urNp linux-2.6.32.43/arch/x86/kvm/paging_tmpl.h linux-2.6.32.43/arch/x86/k
  
 diff -urNp linux-2.6.32.43/arch/x86/kvm/svm.c linux-2.6.32.43/arch/x86/kvm/svm.c
 --- linux-2.6.32.43/arch/x86/kvm/svm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/arch/x86/kvm/svm.c	2011-04-17 15:56:46.000000000 -0400
-@@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k
- static void reload_tss(struct kvm_vcpu *vcpu)
- {
++++ linux-2.6.32.43/arch/x86/kvm/svm.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2485,7 +2485,11 @@ static void reload_tss(struct kvm_vcpu *
  	int cpu = raw_smp_processor_id();
--
+ 
  	struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu);
 +
 +	pax_open_kernel();
@@ -18292,7 +18492,7 @@ diff -urNp linux-2.6.32.43/arch/x86/kvm/svm.c linux-2.6.32.43/arch/x86/kvm/svm.c
  	load_TR_desc();
  }
  
-@@ -2946,7 +2949,7 @@ static bool svm_gb_page_enable(void)
+@@ -2946,7 +2950,7 @@ static bool svm_gb_page_enable(void)
  	return true;
  }
  
@@ -18476,6 +18676,21 @@ diff -urNp linux-2.6.32.43/arch/x86/kvm/x86.c linux-2.6.32.43/arch/x86/kvm/x86.c
  
  	if (kvm_x86_ops) {
  		printk(KERN_ERR "kvm: already loaded the other module\n");
+diff -urNp linux-2.6.32.43/arch/x86/lguest/boot.c linux-2.6.32.43/arch/x86/lguest/boot.c
+--- linux-2.6.32.43/arch/x86/lguest/boot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/arch/x86/lguest/boot.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vt
+  * Rebooting also tells the Host we're finished, but the RESTART flag tells the
+  * Launcher to reboot us.
+  */
+-static void lguest_restart(char *reason)
++static __noreturn void lguest_restart(char *reason)
+ {
+ 	kvm_hypercall2(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART);
++	BUG();
+ }
+ 
+ /*G:050
 diff -urNp linux-2.6.32.43/arch/x86/lib/atomic64_32.c linux-2.6.32.43/arch/x86/lib/atomic64_32.c
 --- linux-2.6.32.43/arch/x86/lib/atomic64_32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/arch/x86/lib/atomic64_32.c	2011-05-04 17:56:28.000000000 -0400
@@ -23776,6 +23991,18 @@ diff -urNp linux-2.6.32.43/block/scsi_ioctl.c linux-2.6.32.43/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
+diff -urNp linux-2.6.32.43/crypto/cryptd.c linux-2.6.32.43/crypto/cryptd.c
+--- linux-2.6.32.43/crypto/cryptd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/crypto/cryptd.c	2011-08-05 20:33:55.000000000 -0400
+@@ -214,7 +214,7 @@ static int cryptd_blkcipher_enqueue(stru
+ 	struct cryptd_queue *queue;
+ 
+ 	queue = cryptd_get_queue(crypto_ablkcipher_tfm(tfm));
+-	rctx->complete = req->base.complete;
++	*(void **)&rctx->complete = req->base.complete;
+ 	req->base.complete = complete;
+ 
+ 	return cryptd_enqueue_request(queue, &req->base);
 diff -urNp linux-2.6.32.43/crypto/gf128mul.c linux-2.6.32.43/crypto/gf128mul.c
 --- linux-2.6.32.43/crypto/gf128mul.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/crypto/gf128mul.c	2011-07-06 19:53:33.000000000 -0400
@@ -24252,7 +24479,7 @@ diff -urNp linux-2.6.32.43/drivers/ata/libata-acpi.c linux-2.6.32.43/drivers/ata
  };
 diff -urNp linux-2.6.32.43/drivers/ata/libata-core.c linux-2.6.32.43/drivers/ata/libata-core.c
 --- linux-2.6.32.43/drivers/ata/libata-core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/ata/libata-core.c	2011-04-23 12:56:10.000000000 -0400
++++ linux-2.6.32.43/drivers/ata/libata-core.c	2011-08-05 20:33:55.000000000 -0400
 @@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
@@ -24293,7 +24520,7 @@ diff -urNp linux-2.6.32.43/drivers/ata/libata-core.c linux-2.6.32.43/drivers/ata
  			*pp = NULL;
  
 -	ops->inherits = NULL;
-+	((struct ata_port_operations *)ops)->inherits = NULL;
++	*(struct ata_port_operations **)&ops->inherits = NULL;
  
 +	pax_close_kernel();
  	spin_unlock(&lock);
@@ -26798,7 +27025,7 @@ diff -urNp linux-2.6.32.43/drivers/base/sys.c linux-2.6.32.43/drivers/base/sys.c
  };
 diff -urNp linux-2.6.32.43/drivers/block/cciss.c linux-2.6.32.43/drivers/block/cciss.c
 --- linux-2.6.32.43/drivers/block/cciss.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/block/cciss.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/drivers/block/cciss.c	2011-08-05 20:33:55.000000000 -0400
 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
@@ -26808,9 +27035,157 @@ diff -urNp linux-2.6.32.43/drivers/block/cciss.c linux-2.6.32.43/drivers/block/c
  	err = 0;
  	err |=
  	    copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
+@@ -2852,7 +2854,7 @@ static unsigned long pollcomplete(int ct
+ 	/* Wait (up to 20 seconds) for a command to complete */
+ 
+ 	for (i = 20 * HZ; i > 0; i--) {
+-		done = hba[ctlr]->access.command_completed(hba[ctlr]);
++		done = hba[ctlr]->access->command_completed(hba[ctlr]);
+ 		if (done == FIFO_EMPTY)
+ 			schedule_timeout_uninterruptible(1);
+ 		else
+@@ -2876,7 +2878,7 @@ static int sendcmd_core(ctlr_info_t *h, 
+ resend_cmd1:
+ 
+ 	/* Disable interrupt on the board. */
+-	h->access.set_intr_mask(h, CCISS_INTR_OFF);
++	h->access->set_intr_mask(h, CCISS_INTR_OFF);
+ 
+ 	/* Make sure there is room in the command FIFO */
+ 	/* Actually it should be completely empty at this time */
+@@ -2884,13 +2886,13 @@ resend_cmd1:
+ 	/* tape side of the driver. */
+ 	for (i = 200000; i > 0; i--) {
+ 		/* if fifo isn't full go */
+-		if (!(h->access.fifo_full(h)))
++		if (!(h->access->fifo_full(h)))
+ 			break;
+ 		udelay(10);
+ 		printk(KERN_WARNING "cciss cciss%d: SendCmd FIFO full,"
+ 		       " waiting!\n", h->ctlr);
+ 	}
+-	h->access.submit_command(h, c); /* Send the cmd */
++	h->access->submit_command(h, c); /* Send the cmd */
+ 	do {
+ 		complete = pollcomplete(h->ctlr);
+ 
+@@ -3023,7 +3025,7 @@ static void start_io(ctlr_info_t *h)
+ 	while (!hlist_empty(&h->reqQ)) {
+ 		c = hlist_entry(h->reqQ.first, CommandList_struct, list);
+ 		/* can't do anything if fifo is full */
+-		if ((h->access.fifo_full(h))) {
++		if ((h->access->fifo_full(h))) {
+ 			printk(KERN_WARNING "cciss: fifo full\n");
+ 			break;
+ 		}
+@@ -3033,7 +3035,7 @@ static void start_io(ctlr_info_t *h)
+ 		h->Qdepth--;
+ 
+ 		/* Tell the controller execute command */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
+ 
+ 		/* Put job onto the completed Q */
+ 		addQ(&h->cmpQ, c);
+@@ -3393,17 +3395,17 @@ startio:
+ 
+ static inline unsigned long get_next_completion(ctlr_info_t *h)
+ {
+-	return h->access.command_completed(h);
++	return h->access->command_completed(h);
+ }
+ 
+ static inline int interrupt_pending(ctlr_info_t *h)
+ {
+-	return h->access.intr_pending(h);
++	return h->access->intr_pending(h);
+ }
+ 
+ static inline long interrupt_not_for_us(ctlr_info_t *h)
+ {
+-	return (((h->access.intr_pending(h) == 0) ||
++	return (((h->access->intr_pending(h) == 0) ||
+ 		 (h->interrupts_enabled == 0)));
+ }
+ 
+@@ -3892,7 +3894,7 @@ static int __devinit cciss_pci_init(ctlr
+ 	 */
+ 	c->max_commands = readl(&(c->cfgtable->CmdsOutMax));
+ 	c->product_name = products[prod_index].product_name;
+-	c->access = *(products[prod_index].access);
++	c->access = products[prod_index].access;
+ 	c->nr_cmds = c->max_commands - 4;
+ 	if ((readb(&c->cfgtable->Signature[0]) != 'C') ||
+ 	    (readb(&c->cfgtable->Signature[1]) != 'I') ||
+@@ -4291,7 +4293,7 @@ static int __devinit cciss_init_one(stru
+ 	}
+ 
+ 	/* make sure the board interrupts are off */
+-	hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
++	hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_OFF);
+ 	if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
+ 			IRQF_DISABLED | IRQF_SHARED, hba[i]->devname, hba[i])) {
+ 		printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
+@@ -4341,7 +4343,7 @@ static int __devinit cciss_init_one(stru
+ 	cciss_scsi_setup(i);
+ 
+ 	/* Turn the interrupts on so we can service requests */
+-	hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);
++	hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_ON);
+ 
+ 	/* Get the firmware version */
+ 	inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
+diff -urNp linux-2.6.32.43/drivers/block/cciss.h linux-2.6.32.43/drivers/block/cciss.h
+--- linux-2.6.32.43/drivers/block/cciss.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.43/drivers/block/cciss.h	2011-08-05 20:33:55.000000000 -0400
+@@ -90,7 +90,7 @@ struct ctlr_info 
+ 	// information about each logical volume
+ 	drive_info_struct *drv[CISS_MAX_LUN];
+ 
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	/* queue and queue Info */ 
+ 	struct hlist_head reqQ;
 diff -urNp linux-2.6.32.43/drivers/block/cpqarray.c linux-2.6.32.43/drivers/block/cpqarray.c
 --- linux-2.6.32.43/drivers/block/cpqarray.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/block/cpqarray.c	2011-05-16 21:46:57.000000000 -0400
++++ linux-2.6.32.43/drivers/block/cpqarray.c	2011-08-05 20:33:55.000000000 -0400
+@@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr
+ 	if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
+ 		goto Enomem4;
+ 	}
+-	hba[i]->access.set_intr_mask(hba[i], 0);
++	hba[i]->access->set_intr_mask(hba[i], 0);
+ 	if (request_irq(hba[i]->intr, do_ida_intr,
+ 		IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
+ 	{
+@@ -460,7 +460,7 @@ static int __init cpqarray_register_ctlr
+ 	add_timer(&hba[i]->timer);
+ 
+ 	/* Enable IRQ now that spinlock and rate limit timer are set up */
+-	hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
++	hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
+ 
+ 	for(j=0; j<NWD; j++) {
+ 		struct gendisk *disk = ida_gendisk[i][j];
+@@ -695,7 +695,7 @@ DBGINFO(
+ 	for(i=0; i<NR_PRODUCTS; i++) {
+ 		if (board_id == products[i].board_id) {
+ 			c->product_name = products[i].product_name;
+-			c->access = *(products[i].access);
++			c->access = products[i].access;
+ 			break;
+ 		}
+ 	}
+@@ -793,7 +793,7 @@ static int __init cpqarray_eisa_detect(v
+ 		hba[ctlr]->intr = intr;
+ 		sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
+ 		hba[ctlr]->product_name = products[j].product_name;
+-		hba[ctlr]->access = *(products[j].access);
++		hba[ctlr]->access = products[j].access;
+ 		hba[ctlr]->ctlr = ctlr;
+ 		hba[ctlr]->board_id = board_id;
+ 		hba[ctlr]->pci_dev = NULL; /* not PCI */
 @@ -896,6 +896,8 @@ static void do_ida_request(struct reques
  	struct scatterlist tmp_sg[SG_MAX];
  	int i, dir, seg;
@@ -26820,6 +27195,98 @@ diff -urNp linux-2.6.32.43/drivers/block/cpqarray.c linux-2.6.32.43/drivers/bloc
  	if (blk_queue_plugged(q))
  		goto startio;
  
+@@ -968,7 +970,7 @@ static void start_io(ctlr_info_t *h)
+ 
+ 	while((c = h->reqQ) != NULL) {
+ 		/* Can't do anything if we're busy */
+-		if (h->access.fifo_full(h) == 0)
++		if (h->access->fifo_full(h) == 0)
+ 			return;
+ 
+ 		/* Get the first entry from the request Q */
+@@ -976,7 +978,7 @@ static void start_io(ctlr_info_t *h)
+ 		h->Qdepth--;
+ 	
+ 		/* Tell the controller to do our bidding */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
+ 
+ 		/* Get onto the completion Q */
+ 		addQ(&h->cmpQ, c);
+@@ -1038,7 +1040,7 @@ static irqreturn_t do_ida_intr(int irq, 
+ 	unsigned long flags;
+ 	__u32 a,a1;
+ 
+-	istat = h->access.intr_pending(h);
++	istat = h->access->intr_pending(h);
+ 	/* Is this interrupt for us? */
+ 	if (istat == 0)
+ 		return IRQ_NONE;
+@@ -1049,7 +1051,7 @@ static irqreturn_t do_ida_intr(int irq, 
+ 	 */
+ 	spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
+ 	if (istat & FIFO_NOT_EMPTY) {
+-		while((a = h->access.command_completed(h))) {
++		while((a = h->access->command_completed(h))) {
+ 			a1 = a; a &= ~3;
+ 			if ((c = h->cmpQ) == NULL)
+ 			{  
+@@ -1434,11 +1436,11 @@ static int sendcmd(
+ 	/*
+ 	 * Disable interrupt
+ 	 */
+-	info_p->access.set_intr_mask(info_p, 0);
++	info_p->access->set_intr_mask(info_p, 0);
+ 	/* Make sure there is room in the command FIFO */
+ 	/* Actually it should be completely empty at this time. */
+ 	for (i = 200000; i > 0; i--) {
+-		temp = info_p->access.fifo_full(info_p);
++		temp = info_p->access->fifo_full(info_p);
+ 		if (temp != 0) {
+ 			break;
+ 		}
+@@ -1451,7 +1453,7 @@ DBG(
+ 	/*
+ 	 * Send the cmd
+ 	 */
+-	info_p->access.submit_command(info_p, c);
++	info_p->access->submit_command(info_p, c);
+ 	complete = pollcomplete(ctlr);
+ 	
+ 	pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr, 
+@@ -1534,9 +1536,9 @@ static int revalidate_allvol(ctlr_info_t
+ 	 * we check the new geometry.  Then turn interrupts back on when
+ 	 * we're done.
+ 	 */
+-	host->access.set_intr_mask(host, 0);
++	host->access->set_intr_mask(host, 0);
+ 	getgeometry(ctlr);
+-	host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
++	host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
+ 
+ 	for(i=0; i<NWD; i++) {
+ 		struct gendisk *disk = ida_gendisk[ctlr][i];
+@@ -1576,7 +1578,7 @@ static int pollcomplete(int ctlr)
+ 	/* Wait (up to 2 seconds) for a command to complete */
+ 
+ 	for (i = 200000; i > 0; i--) {
+-		done = hba[ctlr]->access.command_completed(hba[ctlr]);
++		done = hba[ctlr]->access->command_completed(hba[ctlr]);
+ 		if (done == 0) {
+ 			udelay(10);	/* a short fixed delay */
+ 		} else
+diff -urNp linux-2.6.32.43/drivers/block/cpqarray.h linux-2.6.32.43/drivers/block/cpqarray.h
+--- linux-2.6.32.43/drivers/block/cpqarray.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/block/cpqarray.h	2011-08-05 20:33:55.000000000 -0400
+@@ -99,7 +99,7 @@ struct ctlr_info {
+ 	drv_info_t	drv[NWD];
+ 	struct proc_dir_entry *proc;
+ 
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	cmdlist_t *reqQ;
+ 	cmdlist_t *cmpQ;
 diff -urNp linux-2.6.32.43/drivers/block/DAC960.c linux-2.6.32.43/drivers/block/DAC960.c
 --- linux-2.6.32.43/drivers/block/DAC960.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/block/DAC960.c	2011-05-16 21:46:57.000000000 -0400
@@ -27645,37 +28112,19 @@ diff -urNp linux-2.6.32.43/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.43/
  							     ttyj->channel_idx);
 diff -urNp linux-2.6.32.43/drivers/char/pty.c linux-2.6.32.43/drivers/char/pty.c
 --- linux-2.6.32.43/drivers/char/pty.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/char/pty.c	2011-04-17 15:56:46.000000000 -0400
-@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
- 	return ret;
- }
- 
--static struct file_operations ptmx_fops;
-+static const struct file_operations ptmx_fops = {
-+	.llseek		= no_llseek,
-+	.read		= tty_read,
-+	.write		= tty_write,
-+	.poll		= tty_poll,
-+	.unlocked_ioctl	= tty_ioctl,
-+	.compat_ioctl	= tty_compat_ioctl,
-+	.open		= ptmx_open,
-+	.release	= tty_release,
-+	.fasync		= tty_fasync,
-+};
-+
- 
- static void __init unix98_pty_init(void)
- {
-@@ -736,9 +747,6 @@ static void __init unix98_pty_init(void)
++++ linux-2.6.32.43/drivers/char/pty.c	2011-08-05 20:33:55.000000000 -0400
+@@ -736,8 +736,10 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
  	/* Now create the /dev/ptmx special device */
--	tty_default_fops(&ptmx_fops);
++	pax_open_kernel();
+ 	tty_default_fops(&ptmx_fops);
 -	ptmx_fops.open = ptmx_open;
--
++	*(void **)&ptmx_fops.open = ptmx_open;
++	pax_close_kernel();
+ 
  	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.32.43/drivers/char/random.c linux-2.6.32.43/drivers/char/random.c
 --- linux-2.6.32.43/drivers/char/random.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/char/random.c	2011-04-17 15:56:46.000000000 -0400
@@ -27851,113 +28300,8 @@ diff -urNp linux-2.6.32.43/drivers/char/tpm/tpm.c linux-2.6.32.43/drivers/char/t
  			"attempting to read the PUBEK");
 diff -urNp linux-2.6.32.43/drivers/char/tty_io.c linux-2.6.32.43/drivers/char/tty_io.c
 --- linux-2.6.32.43/drivers/char/tty_io.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/char/tty_io.c	2011-04-17 15:56:46.000000000 -0400
-@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers);			/* linked list
- DEFINE_MUTEX(tty_mutex);
- EXPORT_SYMBOL(tty_mutex);
- 
--static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
--static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
- ssize_t redirected_tty_write(struct file *, const char __user *,
- 							size_t, loff_t *);
--static unsigned int tty_poll(struct file *, poll_table *);
- static int tty_open(struct inode *, struct file *);
--static int tty_release(struct inode *, struct file *);
- long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
--#ifdef CONFIG_COMPAT
--static long tty_compat_ioctl(struct file *file, unsigned int cmd,
--				unsigned long arg);
--#else
--#define tty_compat_ioctl NULL
--#endif
--static int tty_fasync(int fd, struct file *filp, int on);
- static void release_tty(struct tty_struct *tty, int idx);
- static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
- static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-@@ -870,7 +859,7 @@ EXPORT_SYMBOL(start_tty);
-  *	read calls may be outstanding in parallel.
-  */
- 
--static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
-+ssize_t tty_read(struct file *file, char __user *buf, size_t count,
- 			loff_t *ppos)
- {
- 	int i;
-@@ -898,6 +887,8 @@ static ssize_t tty_read(struct file *fil
- 	return i;
- }
- 
-+EXPORT_SYMBOL(tty_read);
-+
- void tty_write_unlock(struct tty_struct *tty)
- {
- 	mutex_unlock(&tty->atomic_write_lock);
-@@ -1045,7 +1036,7 @@ void tty_write_message(struct tty_struct
-  *	write method will not be invoked in parallel for each device.
-  */
- 
--static ssize_t tty_write(struct file *file, const char __user *buf,
-+ssize_t tty_write(struct file *file, const char __user *buf,
- 						size_t count, loff_t *ppos)
- {
- 	struct tty_struct *tty;
-@@ -1072,6 +1063,8 @@ static ssize_t tty_write(struct file *fi
- 	return ret;
- }
- 
-+EXPORT_SYMBOL(tty_write);
-+
- ssize_t redirected_tty_write(struct file *file, const char __user *buf,
- 						size_t count, loff_t *ppos)
- {
-@@ -1867,7 +1860,7 @@ static int tty_open(struct inode *inode,
-  *		Takes bkl. See tty_release_dev
-  */
- 
--static int tty_release(struct inode *inode, struct file *filp)
-+int tty_release(struct inode *inode, struct file *filp)
- {
- 	lock_kernel();
- 	tty_release_dev(filp);
-@@ -1875,6 +1868,8 @@ static int tty_release(struct inode *ino
- 	return 0;
- }
- 
-+EXPORT_SYMBOL(tty_release);
-+
- /**
-  *	tty_poll	-	check tty status
-  *	@filp: file being polled
-@@ -1887,7 +1882,7 @@ static int tty_release(struct inode *ino
-  *	may be re-entered freely by other callers.
-  */
- 
--static unsigned int tty_poll(struct file *filp, poll_table *wait)
-+unsigned int tty_poll(struct file *filp, poll_table *wait)
- {
- 	struct tty_struct *tty;
- 	struct tty_ldisc *ld;
-@@ -1904,7 +1899,9 @@ static unsigned int tty_poll(struct file
- 	return ret;
- }
- 
--static int tty_fasync(int fd, struct file *filp, int on)
-+EXPORT_SYMBOL(tty_poll);
-+
-+int tty_fasync(int fd, struct file *filp, int on)
- {
- 	struct tty_struct *tty;
- 	unsigned long flags;
-@@ -1948,6 +1945,8 @@ out:
- 	return retval;
- }
- 
-+EXPORT_SYMBOL(tty_fasync);
-+
- /**
-  *	tiocsti			-	fake input character
-  *	@tty: tty to fake input into
-@@ -2582,8 +2581,10 @@ long tty_ioctl(struct file *file, unsign
++++ linux-2.6.32.43/drivers/char/tty_io.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2582,8 +2582,10 @@ long tty_ioctl(struct file *file, unsign
  	return retval;
  }
  
@@ -27969,7 +28313,7 @@ diff -urNp linux-2.6.32.43/drivers/char/tty_io.c linux-2.6.32.43/drivers/char/tt
  				unsigned long arg)
  {
  	struct inode *inode = file->f_dentry->d_inode;
-@@ -2607,6 +2608,8 @@ static long tty_compat_ioctl(struct file
+@@ -2607,6 +2609,8 @@ static long tty_compat_ioctl(struct file
  
  	return retval;
  }
@@ -27978,18 +28322,15 @@ diff -urNp linux-2.6.32.43/drivers/char/tty_io.c linux-2.6.32.43/drivers/char/tt
  #endif
  
  /*
-@@ -3050,11 +3053,6 @@ struct tty_struct *get_current_tty(void)
- }
- EXPORT_SYMBOL_GPL(get_current_tty);
+@@ -3052,7 +3056,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
--void tty_default_fops(struct file_operations *fops)
--{
+ void tty_default_fops(struct file_operations *fops)
+ {
 -	*fops = tty_fops;
--}
--
++	memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
+ }
+ 
  /*
-  * 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.32.43/drivers/char/tty_ldisc.c linux-2.6.32.43/drivers/char/tty_ldisc.c
 --- linux-2.6.32.43/drivers/char/tty_ldisc.c	2011-07-13 17:23:04.000000000 -0400
 +++ linux-2.6.32.43/drivers/char/tty_ldisc.c	2011-07-13 17:23:18.000000000 -0400
@@ -28040,15 +28381,37 @@ diff -urNp linux-2.6.32.43/drivers/char/tty_ldisc.c linux-2.6.32.43/drivers/char
  }
 diff -urNp linux-2.6.32.43/drivers/char/virtio_console.c linux-2.6.32.43/drivers/char/virtio_console.c
 --- linux-2.6.32.43/drivers/char/virtio_console.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/char/virtio_console.c	2011-04-17 15:56:46.000000000 -0400
-@@ -44,6 +44,7 @@ static unsigned int in_len;
- static char *in, *inbuf;
++++ linux-2.6.32.43/drivers/char/virtio_console.c	2011-08-05 20:33:55.000000000 -0400
+@@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char *
+  * virtqueue, so we let the drivers do some boutique early-output thing. */
+ int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))
+ {
+-	virtio_cons.put_chars = put_chars;
++	pax_open_kernel();
++	*(void **)&virtio_cons.put_chars = put_chars;
++	pax_close_kernel();
+ 	return hvc_instantiate(0, 0, &virtio_cons);
+ }
  
- /* The operations for our console. */
-+/* cannot be const */
- static struct hv_ops virtio_cons;
+@@ -213,11 +215,13 @@ static int __devinit virtcons_probe(stru
+ 	out_vq = vqs[1];
+ 
+ 	/* Start using the new console output. */
+-	virtio_cons.get_chars = get_chars;
+-	virtio_cons.put_chars = put_chars;
+-	virtio_cons.notifier_add = notifier_add_vio;
+-	virtio_cons.notifier_del = notifier_del_vio;
+-	virtio_cons.notifier_hangup = notifier_del_vio;
++	pax_open_kernel();
++	*(void **)&virtio_cons.get_chars = get_chars;
++	*(void **)&virtio_cons.put_chars = put_chars;
++	*(void **)&virtio_cons.notifier_add = notifier_add_vio;
++	*(void **)&virtio_cons.notifier_del = notifier_del_vio;
++	*(void **)&virtio_cons.notifier_hangup = notifier_del_vio;
++	pax_close_kernel();
  
- /* The hvc device */
+ 	/* The first argument of hvc_alloc() is the virtual console number, so
+ 	 * we use zero.  The second argument is the parameter for the
 diff -urNp linux-2.6.32.43/drivers/char/vt.c linux-2.6.32.43/drivers/char/vt.c
 --- linux-2.6.32.43/drivers/char/vt.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/char/vt.c	2011-04-17 15:56:46.000000000 -0400
@@ -28352,6 +28715,22 @@ diff -urNp linux-2.6.32.43/drivers/edac/edac_pci_sysfs.c linux-2.6.32.43/drivers
  			panic("EDAC: PCI Parity Error");
  	}
  }
+diff -urNp linux-2.6.32.43/drivers/firewire/core-card.c linux-2.6.32.43/drivers/firewire/core-card.c
+--- linux-2.6.32.43/drivers/firewire/core-card.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/firewire/core-card.c	2011-08-05 20:33:55.000000000 -0400
+@@ -569,8 +569,10 @@ void fw_core_remove_card(struct fw_card 
+ 	mutex_unlock(&card_mutex);
+ 
+ 	/* Switch off most of the card driver interface. */
+-	dummy_driver.free_iso_context	= card->driver->free_iso_context;
+-	dummy_driver.stop_iso		= card->driver->stop_iso;
++	pax_open_kernel();
++	*(void **)&dummy_driver.free_iso_context	= card->driver->free_iso_context;
++	*(void **)&dummy_driver.stop_iso		= card->driver->stop_iso;
++	pax_close_kernel();
+ 	card->driver = &dummy_driver;
+ 
+ 	fw_destroy_nodes(card);
 diff -urNp linux-2.6.32.43/drivers/firewire/core-cdev.c linux-2.6.32.43/drivers/firewire/core-cdev.c
 --- linux-2.6.32.43/drivers/firewire/core-cdev.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/firewire/core-cdev.c	2011-04-17 15:56:46.000000000 -0400
@@ -28930,7 +29309,16 @@ diff -urNp linux-2.6.32.43/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.43/drive
  	.close = drm_gem_vm_close,
 diff -urNp linux-2.6.32.43/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.43/drivers/gpu/drm/i915/i915_drv.h
 --- linux-2.6.32.43/drivers/gpu/drm/i915/i915_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/gpu/drm/i915/i915_drv.h	2011-05-04 17:56:28.000000000 -0400
++++ linux-2.6.32.43/drivers/gpu/drm/i915/i915_drv.h	2011-08-05 20:33:55.000000000 -0400
+@@ -168,7 +168,7 @@ struct drm_i915_display_funcs {
+ 	/* display clock increase/decrease */
+ 	/* pll clock increase/decrease */
+ 	/* clock gating init */
+-};
++} __no_const;
+ 
+ typedef struct drm_i915_private {
+ 	struct drm_device *dev;
 @@ -197,7 +197,7 @@ typedef struct drm_i915_private {
  	int page_flipping;
  
@@ -29046,6 +29434,20 @@ diff -urNp linux-2.6.32.43/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.43/drive
  
  	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.32.43/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.43/drivers/gpu/drm/i915/intel_sdvo.c
+--- linux-2.6.32.43/drivers/gpu/drm/i915/intel_sdvo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/gpu/drm/i915/intel_sdvo.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device *
+ 	sdvo_priv->slave_addr = intel_sdvo_get_slave_addr(dev, output_device);
+ 
+ 	/* Save the bit-banging i2c functionality for use by the DDC wrapper */
+-	intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
++	pax_open_kernel();
++	*(void **)&intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
++	pax_close_kernel();
+ 
+ 	/* Read the regs to test if we can talk to the device */
+ 	for (i = 0; i < 0x40; i++) {
 diff -urNp linux-2.6.32.43/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.43/drivers/gpu/drm/mga/mga_drv.h
 --- linux-2.6.32.43/drivers/gpu/drm/mga/mga_drv.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/gpu/drm/mga/mga_drv.h	2011-05-04 17:56:28.000000000 -0400
@@ -29284,7 +29686,7 @@ diff -urNp linux-2.6.32.43/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.43
  	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
 diff -urNp linux-2.6.32.43/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.43/drivers/gpu/drm/radeon/radeon.h
 --- linux-2.6.32.43/drivers/gpu/drm/radeon/radeon.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/gpu/drm/radeon/radeon.h	2011-05-04 17:56:28.000000000 -0400
++++ linux-2.6.32.43/drivers/gpu/drm/radeon/radeon.h	2011-08-05 20:33:55.000000000 -0400
 @@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device 
   */
  struct radeon_fence_driver {
@@ -29294,6 +29696,15 @@ diff -urNp linux-2.6.32.43/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.43/drive
  	uint32_t			last_seq;
  	unsigned long			count_timeout;
  	wait_queue_head_t		queue;
+@@ -640,7 +640,7 @@ struct radeon_asic {
+ 			       uint32_t offset, uint32_t obj_size);
+ 	int (*clear_surface_reg)(struct radeon_device *rdev, int reg);
+ 	void (*bandwidth_update)(struct radeon_device *rdev);
+-};
++} __no_const;
+ 
+ /*
+  * Asic structures
 diff -urNp linux-2.6.32.43/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.43/drivers/gpu/drm/radeon/radeon_ioc32.c
 --- linux-2.6.32.43/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-23 13:57:24.000000000 -0400
@@ -29761,6 +30172,75 @@ diff -urNp linux-2.6.32.43/drivers/hwmon/w83791d.c linux-2.6.32.43/drivers/hwmon
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
+diff -urNp linux-2.6.32.43/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.43/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-2.6.32.43/drivers/i2c/busses/i2c-amd756-s4882.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-05 20:33:55.000000000 -0400
+@@ -189,23 +189,23 @@ static int __init amd756_s4882_init(void
+ 	}
+ 
+ 	/* Fill in the new structures */
+-	s4882_algo[0] = *(amd756_smbus.algo);
+-	s4882_algo[0].smbus_xfer = amd756_access_virt0;
++	memcpy((void *)&s4882_algo[0], amd756_smbus.algo, sizeof(s4882_algo[0]));
++	*(void **)&s4882_algo[0].smbus_xfer = amd756_access_virt0;
+ 	s4882_adapter[0] = amd756_smbus;
+ 	s4882_adapter[0].algo = s4882_algo;
+-	s4882_adapter[0].dev.parent = amd756_smbus.dev.parent;
++	*(void **)&s4882_adapter[0].dev.parent = amd756_smbus.dev.parent;
+ 	for (i = 1; i < 5; i++) {
+-		s4882_algo[i] = *(amd756_smbus.algo);
++		memcpy((void *)&s4882_algo[i], amd756_smbus.algo, sizeof(s4882_algo[i]));
+ 		s4882_adapter[i] = amd756_smbus;
+ 		snprintf(s4882_adapter[i].name, sizeof(s4882_adapter[i].name),
+ 			 "SMBus 8111 adapter (CPU%d)", i-1);
+ 		s4882_adapter[i].algo = s4882_algo+i;
+ 		s4882_adapter[i].dev.parent = amd756_smbus.dev.parent;
+ 	}
+-	s4882_algo[1].smbus_xfer = amd756_access_virt1;
+-	s4882_algo[2].smbus_xfer = amd756_access_virt2;
+-	s4882_algo[3].smbus_xfer = amd756_access_virt3;
+-	s4882_algo[4].smbus_xfer = amd756_access_virt4;
++	*(void **)&s4882_algo[1].smbus_xfer = amd756_access_virt1;
++	*(void **)&s4882_algo[2].smbus_xfer = amd756_access_virt2;
++	*(void **)&s4882_algo[3].smbus_xfer = amd756_access_virt3;
++	*(void **)&s4882_algo[4].smbus_xfer = amd756_access_virt4;
+ 
+ 	/* Register virtual adapters */
+ 	for (i = 0; i < 5; i++) {
+diff -urNp linux-2.6.32.43/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.43/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-2.6.32.43/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-05 20:33:55.000000000 -0400
+@@ -184,23 +184,23 @@ static int __init nforce2_s4985_init(voi
+ 	}
+ 
+ 	/* Fill in the new structures */
+-	s4985_algo[0] = *(nforce2_smbus->algo);
+-	s4985_algo[0].smbus_xfer = nforce2_access_virt0;
++	memcpy((void *)&s4985_algo[0], nforce2_smbus->algo, sizeof(s4985_algo[0]));
++	*(void **)&s4985_algo[0].smbus_xfer = nforce2_access_virt0;
+ 	s4985_adapter[0] = *nforce2_smbus;
+ 	s4985_adapter[0].algo = s4985_algo;
+ 	s4985_adapter[0].dev.parent = nforce2_smbus->dev.parent;
+ 	for (i = 1; i < 5; i++) {
+-		s4985_algo[i] = *(nforce2_smbus->algo);
++		memcpy((void *)&s4985_algo[i], nforce2_smbus->algo, sizeof(s4985_algo[i]));
+ 		s4985_adapter[i] = *nforce2_smbus;
+ 		snprintf(s4985_adapter[i].name, sizeof(s4985_adapter[i].name),
+ 			 "SMBus nForce2 adapter (CPU%d)", i - 1);
+ 		s4985_adapter[i].algo = s4985_algo + i;
+ 		s4985_adapter[i].dev.parent = nforce2_smbus->dev.parent;
+ 	}
+-	s4985_algo[1].smbus_xfer = nforce2_access_virt1;
+-	s4985_algo[2].smbus_xfer = nforce2_access_virt2;
+-	s4985_algo[3].smbus_xfer = nforce2_access_virt3;
+-	s4985_algo[4].smbus_xfer = nforce2_access_virt4;
++	*(void **)&s4985_algo[1].smbus_xfer = nforce2_access_virt1;
++	*(void **)&s4985_algo[2].smbus_xfer = nforce2_access_virt2;
++	*(void **)&s4985_algo[3].smbus_xfer = nforce2_access_virt3;
++	*(void **)&s4985_algo[4].smbus_xfer = nforce2_access_virt4;
+ 
+ 	/* Register virtual adapters */
+ 	for (i = 0; i < 5; i++) {
 diff -urNp linux-2.6.32.43/drivers/ide/ide-cd.c linux-2.6.32.43/drivers/ide/ide-cd.c
 --- linux-2.6.32.43/drivers/ide/ide-cd.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/ide/ide-cd.c	2011-04-17 15:56:46.000000000 -0400
@@ -30753,6 +31233,18 @@ diff -urNp linux-2.6.32.43/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
+diff -urNp linux-2.6.32.43/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.43/drivers/isdn/hardware/eicon/divasync.h
+--- linux-2.6.32.43/drivers/isdn/hardware/eicon/divasync.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/isdn/hardware/eicon/divasync.h	2011-08-05 20:33:55.000000000 -0400
+@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
+ } diva_didd_add_adapter_t;
+ typedef struct _diva_didd_remove_adapter {
+  IDI_CALL p_request;
+-} diva_didd_remove_adapter_t;
++} __no_const diva_didd_remove_adapter_t;
+ typedef struct _diva_didd_read_adapter_array {
+  void   * buffer;
+  dword length;
 diff -urNp linux-2.6.32.43/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.43/drivers/isdn/hardware/eicon/idifunc.c
 --- linux-2.6.32.43/drivers/isdn/hardware/eicon/idifunc.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/isdn/hardware/eicon/idifunc.c	2011-05-16 21:46:57.000000000 -0400
@@ -30816,6 +31308,18 @@ diff -urNp linux-2.6.32.43/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.43
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
+diff -urNp linux-2.6.32.43/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.32.43/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-2.6.32.43/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-05 20:33:55.000000000 -0400
+@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
+ typedef struct _diva_os_idi_adapter_interface {
+ 	diva_init_card_proc_t cleanup_adapter_proc;
+ 	diva_cmd_card_proc_t cmd_proc;
+-} diva_os_idi_adapter_interface_t;
++} __no_const diva_os_idi_adapter_interface_t;
+ 
+ typedef struct _diva_os_xdi_adapter {
+ 	struct list_head link;
 diff -urNp linux-2.6.32.43/drivers/isdn/i4l/isdn_common.c linux-2.6.32.43/drivers/isdn/i4l/isdn_common.c
 --- linux-2.6.32.43/drivers/isdn/i4l/isdn_common.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/isdn/i4l/isdn_common.c	2011-05-16 21:46:57.000000000 -0400
@@ -31533,6 +32037,18 @@ diff -urNp linux-2.6.32.43/drivers/md/raid5.c linux-2.6.32.43/drivers/md/raid5.c
  
  	chunk_offset = sector_div(new_sector, sectors_per_chunk);
  	stripe = new_sector;
+diff -urNp linux-2.6.32.43/drivers/media/common/saa7146_fops.c linux-2.6.32.43/drivers/media/common/saa7146_fops.c
+--- linux-2.6.32.43/drivers/media/common/saa7146_fops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/common/saa7146_fops.c	2011-08-05 20:33:55.000000000 -0400
+@@ -458,7 +458,7 @@ int saa7146_vv_init(struct saa7146_dev* 
+ 		ERR(("out of memory. aborting.\n"));
+ 		return -ENOMEM;
+ 	}
+-	ext_vv->ops = saa7146_video_ioctl_ops;
++	memcpy((void *)&ext_vv->ops, &saa7146_video_ioctl_ops, sizeof(saa7146_video_ioctl_ops));
+ 	ext_vv->core_ops = &saa7146_video_ioctl_ops;
+ 
+ 	DEB_EE(("dev:%p\n",dev));
 diff -urNp linux-2.6.32.43/drivers/media/common/saa7146_hlp.c linux-2.6.32.43/drivers/media/common/saa7146_hlp.c
 --- linux-2.6.32.43/drivers/media/common/saa7146_hlp.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/common/saa7146_hlp.c	2011-05-16 21:46:57.000000000 -0400
@@ -31566,17 +32082,44 @@ diff -urNp linux-2.6.32.43/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6
  	dprintk("%s\n", __func__);
  
  	/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
+diff -urNp linux-2.6.32.43/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.43/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-2.6.32.43/drivers/media/dvb/dvb-core/dvb_demux.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-05 20:33:55.000000000 -0400
+@@ -71,7 +71,7 @@ struct dvb_demux_feed {
+ 	union {
+ 		dmx_ts_cb ts;
+ 		dmx_section_cb sec;
+-	} cb;
++	} __no_const cb;
+ 
+ 	struct dvb_demux *demux;
+ 	void *priv;
 diff -urNp linux-2.6.32.43/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.43/drivers/media/dvb/dvb-core/dvbdev.c
 --- linux-2.6.32.43/drivers/media/dvb/dvb-core/dvbdev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/media/dvb/dvb-core/dvbdev.c	2011-04-17 15:56:46.000000000 -0400
-@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
- 			const struct dvb_device *template, void *priv, int type)
- {
- 	struct dvb_device *dvbdev;
-+	/* cannot be const */
- 	struct file_operations *dvbdevfops;
- 	struct device *clsdev;
- 	int minor;
++++ linux-2.6.32.43/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-05 20:33:55.000000000 -0400
+@@ -228,8 +228,8 @@ int dvb_register_device(struct dvb_adapt
+ 	dvbdev->fops = dvbdevfops;
+ 	init_waitqueue_head (&dvbdev->wait_queue);
+ 
+-	memcpy(dvbdevfops, template->fops, sizeof(struct file_operations));
+-	dvbdevfops->owner = adap->module;
++	memcpy((void *)dvbdevfops, template->fops, sizeof(struct file_operations));
++	*(void **)&dvbdevfops->owner = adap->module;
+ 
+ 	list_add_tail (&dvbdev->list_head, &adap->device_list);
+ 
+diff -urNp linux-2.6.32.43/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.43/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-2.6.32.43/drivers/media/dvb/dvb-usb/cxusb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_di
+ struct dib0700_adapter_state {
+ 	int (*set_param_save) (struct dvb_frontend *,
+ 			       struct dvb_frontend_parameters *);
+-};
++} __no_const;
+ 
+ static int dib7070_set_param_override(struct dvb_frontend *fe,
+ 				      struct dvb_frontend_parameters *fep)
 diff -urNp linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_core.c
 --- linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-05-16 21:46:57.000000000 -0400
@@ -31589,6 +32132,30 @@ diff -urNp linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32
  	while ((ret = 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.32.43/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_devices.c
+--- linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_devices.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.43/drivers/media/dvb/dvb-usb/dib0700_devices.c	2011-08-05 20:33:55.000000000 -0400
+@@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, "
+ 
+ struct dib0700_adapter_state {
+ 	int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_parameters *);
+-};
++} __no_const;
+ 
+ /* Hauppauge Nova-T 500 (aka Bristol)
+  *  has a LNA on GPIO0 which is enabled by setting 1 */
+diff -urNp linux-2.6.32.43/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.43/drivers/media/dvb/frontends/dib3000.h
+--- linux-2.6.32.43/drivers/media/dvb/frontends/dib3000.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/dvb/frontends/dib3000.h	2011-08-05 20:33:55.000000000 -0400
+@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
+ 	int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
+ 	int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
+ 	int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
+-};
++} __no_const;
+ 
+ #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
+ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
 diff -urNp linux-2.6.32.43/drivers/media/dvb/frontends/or51211.c linux-2.6.32.43/drivers/media/dvb/frontends/or51211.c
 --- linux-2.6.32.43/drivers/media/dvb/frontends/or51211.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/dvb/frontends/or51211.c	2011-05-16 21:46:57.000000000 -0400
@@ -31601,6 +32168,56 @@ diff -urNp linux-2.6.32.43/drivers/media/dvb/frontends/or51211.c linux-2.6.32.43
  	dprintk("Firmware is %zd bytes\n",fw->size);
  
  	/* Get eprom data */
+diff -urNp linux-2.6.32.43/drivers/media/dvb/ttpci/av7110_v4l.c linux-2.6.32.43/drivers/media/dvb/ttpci/av7110_v4l.c
+--- linux-2.6.32.43/drivers/media/dvb/ttpci/av7110_v4l.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/dvb/ttpci/av7110_v4l.c	2011-08-05 20:33:55.000000000 -0400
+@@ -796,18 +796,18 @@ int av7110_init_v4l(struct av7110 *av711
+ 		ERR(("cannot init capture device. skipping.\n"));
+ 		return -ENODEV;
+ 	}
+-	vv_data->ops.vidioc_enum_input = vidioc_enum_input;
+-	vv_data->ops.vidioc_g_input = vidioc_g_input;
+-	vv_data->ops.vidioc_s_input = vidioc_s_input;
+-	vv_data->ops.vidioc_g_tuner = vidioc_g_tuner;
+-	vv_data->ops.vidioc_s_tuner = vidioc_s_tuner;
+-	vv_data->ops.vidioc_g_frequency = vidioc_g_frequency;
+-	vv_data->ops.vidioc_s_frequency = vidioc_s_frequency;
+-	vv_data->ops.vidioc_g_audio = vidioc_g_audio;
+-	vv_data->ops.vidioc_s_audio = vidioc_s_audio;
+-	vv_data->ops.vidioc_g_sliced_vbi_cap = vidioc_g_sliced_vbi_cap;
+-	vv_data->ops.vidioc_g_fmt_sliced_vbi_out = vidioc_g_fmt_sliced_vbi_out;
+-	vv_data->ops.vidioc_s_fmt_sliced_vbi_out = vidioc_s_fmt_sliced_vbi_out;
++	*(void **)&vv_data->ops.vidioc_enum_input = vidioc_enum_input;
++	*(void **)&vv_data->ops.vidioc_g_input = vidioc_g_input;
++	*(void **)&vv_data->ops.vidioc_s_input = vidioc_s_input;
++	*(void **)&vv_data->ops.vidioc_g_tuner = vidioc_g_tuner;
++	*(void **)&vv_data->ops.vidioc_s_tuner = vidioc_s_tuner;
++	*(void **)&vv_data->ops.vidioc_g_frequency = vidioc_g_frequency;
++	*(void **)&vv_data->ops.vidioc_s_frequency = vidioc_s_frequency;
++	*(void **)&vv_data->ops.vidioc_g_audio = vidioc_g_audio;
++	*(void **)&vv_data->ops.vidioc_s_audio = vidioc_s_audio;
++	*(void **)&vv_data->ops.vidioc_g_sliced_vbi_cap = vidioc_g_sliced_vbi_cap;
++	*(void **)&vv_data->ops.vidioc_g_fmt_sliced_vbi_out = vidioc_g_fmt_sliced_vbi_out;
++	*(void **)&vv_data->ops.vidioc_s_fmt_sliced_vbi_out = vidioc_s_fmt_sliced_vbi_out;
+ 
+ 	if (saa7146_register_device(&av7110->v4l_dev, dev, "av7110", VFL_TYPE_GRABBER)) {
+ 		ERR(("cannot register capture device. skipping.\n"));
+diff -urNp linux-2.6.32.43/drivers/media/dvb/ttpci/budget-av.c linux-2.6.32.43/drivers/media/dvb/ttpci/budget-av.c
+--- linux-2.6.32.43/drivers/media/dvb/ttpci/budget-av.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/dvb/ttpci/budget-av.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1477,9 +1477,9 @@ static int budget_av_attach(struct saa71
+ 			ERR(("cannot init vv subsystem.\n"));
+ 			return err;
+ 		}
+-		vv_data.ops.vidioc_enum_input = vidioc_enum_input;
+-		vv_data.ops.vidioc_g_input = vidioc_g_input;
+-		vv_data.ops.vidioc_s_input = vidioc_s_input;
++		*(void **)&vv_data.ops.vidioc_enum_input = vidioc_enum_input;
++		*(void **)&vv_data.ops.vidioc_g_input = vidioc_g_input;
++		*(void **)&vv_data.ops.vidioc_s_input = vidioc_s_input;
+ 
+ 		if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_GRABBER))) {
+ 			/* fixme: proper cleanup here */
 diff -urNp linux-2.6.32.43/drivers/media/radio/radio-cadet.c linux-2.6.32.43/drivers/media/radio/radio-cadet.c
 --- linux-2.6.32.43/drivers/media/radio/radio-cadet.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/radio/radio-cadet.c	2011-04-17 15:56:46.000000000 -0400
@@ -31643,6 +32260,44 @@ diff -urNp linux-2.6.32.43/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.4
  	if (i >= 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.32.43/drivers/media/video/hexium_gemini.c linux-2.6.32.43/drivers/media/video/hexium_gemini.c
+--- linux-2.6.32.43/drivers/media/video/hexium_gemini.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/video/hexium_gemini.c	2011-08-05 20:33:55.000000000 -0400
+@@ -394,12 +394,12 @@ static int hexium_attach(struct saa7146_
+ 	hexium->cur_input = 0;
+ 
+ 	saa7146_vv_init(dev, &vv_data);
+-	vv_data.ops.vidioc_queryctrl = vidioc_queryctrl;
+-	vv_data.ops.vidioc_g_ctrl = vidioc_g_ctrl;
+-	vv_data.ops.vidioc_s_ctrl = vidioc_s_ctrl;
+-	vv_data.ops.vidioc_enum_input = vidioc_enum_input;
+-	vv_data.ops.vidioc_g_input = vidioc_g_input;
+-	vv_data.ops.vidioc_s_input = vidioc_s_input;
++	*(void **)&vv_data.ops.vidioc_queryctrl = vidioc_queryctrl;
++	*(void **)&vv_data.ops.vidioc_g_ctrl = vidioc_g_ctrl;
++	*(void **)&vv_data.ops.vidioc_s_ctrl = vidioc_s_ctrl;
++	*(void **)&vv_data.ops.vidioc_enum_input = vidioc_enum_input;
++	*(void **)&vv_data.ops.vidioc_g_input = vidioc_g_input;
++	*(void **)&vv_data.ops.vidioc_s_input = vidioc_s_input;
+ 	if (0 != saa7146_register_device(&hexium->video_dev, dev, "hexium gemini", VFL_TYPE_GRABBER)) {
+ 		printk("hexium_gemini: cannot register capture v4l2 device. skipping.\n");
+ 		return -1;
+diff -urNp linux-2.6.32.43/drivers/media/video/hexium_orion.c linux-2.6.32.43/drivers/media/video/hexium_orion.c
+--- linux-2.6.32.43/drivers/media/video/hexium_orion.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/video/hexium_orion.c	2011-08-05 20:33:55.000000000 -0400
+@@ -369,9 +369,9 @@ static int hexium_attach(struct saa7146_
+ 	DEB_EE((".\n"));
+ 
+ 	saa7146_vv_init(dev, &vv_data);
+-	vv_data.ops.vidioc_enum_input = vidioc_enum_input;
+-	vv_data.ops.vidioc_g_input = vidioc_g_input;
+-	vv_data.ops.vidioc_s_input = vidioc_s_input;
++	*(void **)&vv_data.ops.vidioc_enum_input = vidioc_enum_input;
++	*(void **)&vv_data.ops.vidioc_g_input = vidioc_g_input;
++	*(void **)&vv_data.ops.vidioc_s_input = vidioc_s_input;
+ 	if (0 != saa7146_register_device(&hexium->video_dev, dev, "hexium orion", VFL_TYPE_GRABBER)) {
+ 		printk("hexium_orion: cannot register capture v4l2 device. skipping.\n");
+ 		return -1;
 diff -urNp linux-2.6.32.43/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.43/drivers/media/video/ivtv/ivtv-driver.c
 --- linux-2.6.32.43/drivers/media/video/ivtv/ivtv-driver.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/video/ivtv/ivtv-driver.c	2011-05-04 17:56:28.000000000 -0400
@@ -31655,6 +32310,48 @@ diff -urNp linux-2.6.32.43/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.4
  
  /* Parameter declarations */
  static int cardtype[IVTV_MAX_CARDS];
+diff -urNp linux-2.6.32.43/drivers/media/video/mxb.c linux-2.6.32.43/drivers/media/video/mxb.c
+--- linux-2.6.32.43/drivers/media/video/mxb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/video/mxb.c	2011-08-05 20:33:55.000000000 -0400
+@@ -703,23 +703,23 @@ static int mxb_attach(struct saa7146_dev
+ 	   already did this in "mxb_vl42_probe" */
+ 
+ 	saa7146_vv_init(dev, &vv_data);
+-	vv_data.ops.vidioc_queryctrl = vidioc_queryctrl;
+-	vv_data.ops.vidioc_g_ctrl = vidioc_g_ctrl;
+-	vv_data.ops.vidioc_s_ctrl = vidioc_s_ctrl;
+-	vv_data.ops.vidioc_enum_input = vidioc_enum_input;
+-	vv_data.ops.vidioc_g_input = vidioc_g_input;
+-	vv_data.ops.vidioc_s_input = vidioc_s_input;
+-	vv_data.ops.vidioc_g_tuner = vidioc_g_tuner;
+-	vv_data.ops.vidioc_s_tuner = vidioc_s_tuner;
+-	vv_data.ops.vidioc_g_frequency = vidioc_g_frequency;
+-	vv_data.ops.vidioc_s_frequency = vidioc_s_frequency;
+-	vv_data.ops.vidioc_g_audio = vidioc_g_audio;
+-	vv_data.ops.vidioc_s_audio = vidioc_s_audio;
++	*(void **)&vv_data.ops.vidioc_queryctrl = vidioc_queryctrl;
++	*(void **)&vv_data.ops.vidioc_g_ctrl = vidioc_g_ctrl;
++	*(void **)&vv_data.ops.vidioc_s_ctrl = vidioc_s_ctrl;
++	*(void **)&vv_data.ops.vidioc_enum_input = vidioc_enum_input;
++	*(void **)&vv_data.ops.vidioc_g_input = vidioc_g_input;
++	*(void **)&vv_data.ops.vidioc_s_input = vidioc_s_input;
++	*(void **)&vv_data.ops.vidioc_g_tuner = vidioc_g_tuner;
++	*(void **)&vv_data.ops.vidioc_s_tuner = vidioc_s_tuner;
++	*(void **)&vv_data.ops.vidioc_g_frequency = vidioc_g_frequency;
++	*(void **)&vv_data.ops.vidioc_s_frequency = vidioc_s_frequency;
++	*(void **)&vv_data.ops.vidioc_g_audio = vidioc_g_audio;
++	*(void **)&vv_data.ops.vidioc_s_audio = vidioc_s_audio;
+ #ifdef CONFIG_VIDEO_ADV_DEBUG
+-	vv_data.ops.vidioc_g_register = vidioc_g_register;
+-	vv_data.ops.vidioc_s_register = vidioc_s_register;
++	*(void **)&vv_data.ops.vidioc_g_register = vidioc_g_register;
++	*(void **)&vv_data.ops.vidioc_s_register = vidioc_s_register;
+ #endif
+-	vv_data.ops.vidioc_default = vidioc_default;
++	*(void **)&vv_data.ops.vidioc_default = vidioc_default;
+ 	if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
+ 		ERR(("cannot register capture v4l2 device. skipping.\n"));
+ 		return -1;
 diff -urNp linux-2.6.32.43/drivers/media/video/omap24xxcam.c linux-2.6.32.43/drivers/media/video/omap24xxcam.c
 --- linux-2.6.32.43/drivers/media/video/omap24xxcam.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/video/omap24xxcam.c	2011-05-04 17:56:28.000000000 -0400
@@ -31724,9 +32421,37 @@ diff -urNp linux-2.6.32.43/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.3
  	while (loop) {
  
  		tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
+diff -urNp linux-2.6.32.43/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.43/drivers/media/video/usbvideo/ibmcam.c
+--- linux-2.6.32.43/drivers/media/video/usbvideo/ibmcam.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/video/usbvideo/ibmcam.c	2011-08-05 20:33:55.000000000 -0400
+@@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] =
+ static int __init ibmcam_init(void)
+ {
+ 	struct usbvideo_cb cbTbl;
+-	memset(&cbTbl, 0, sizeof(cbTbl));
+-	cbTbl.probe = ibmcam_probe;
+-	cbTbl.setupOnOpen = ibmcam_setup_on_open;
+-	cbTbl.videoStart = ibmcam_video_start;
+-	cbTbl.videoStop = ibmcam_video_stop;
+-	cbTbl.processData = ibmcam_ProcessIsocData;
+-	cbTbl.postProcess = usbvideo_DeinterlaceFrame;
+-	cbTbl.adjustPicture = ibmcam_adjust_picture;
+-	cbTbl.getFPS = ibmcam_calculate_fps;
++	memset((void *)&cbTbl, 0, sizeof(cbTbl));
++	*(void **)&cbTbl.probe = ibmcam_probe;
++	*(void **)&cbTbl.setupOnOpen = ibmcam_setup_on_open;
++	*(void **)&cbTbl.videoStart = ibmcam_video_start;
++	*(void **)&cbTbl.videoStop = ibmcam_video_stop;
++	*(void **)&cbTbl.processData = ibmcam_ProcessIsocData;
++	*(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
++	*(void **)&cbTbl.adjustPicture = ibmcam_adjust_picture;
++	*(void **)&cbTbl.getFPS = ibmcam_calculate_fps;
+ 	return usbvideo_register(
+ 		&cams,
+ 		MAX_IBMCAM,
 diff -urNp linux-2.6.32.43/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.43/drivers/media/video/usbvideo/konicawc.c
 --- linux-2.6.32.43/drivers/media/video/usbvideo/konicawc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/media/video/usbvideo/konicawc.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/drivers/media/video/usbvideo/konicawc.c	2011-08-05 20:33:55.000000000 -0400
 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru
  	int error;
  
@@ -31736,6 +32461,33 @@ diff -urNp linux-2.6.32.43/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
  
  	cam->input = input_dev = input_allocate_device();
  	if (!input_dev) {
+@@ -935,16 +935,16 @@ static int __init konicawc_init(void)
+ 	struct usbvideo_cb cbTbl;
+ 	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+ 	       DRIVER_DESC "\n");
+-	memset(&cbTbl, 0, sizeof(cbTbl));
+-	cbTbl.probe = konicawc_probe;
+-	cbTbl.setupOnOpen = konicawc_setup_on_open;
+-	cbTbl.processData = konicawc_process_isoc;
+-	cbTbl.getFPS = konicawc_calculate_fps;
+-	cbTbl.setVideoMode = konicawc_set_video_mode;
+-	cbTbl.startDataPump = konicawc_start_data;
+-	cbTbl.stopDataPump = konicawc_stop_data;
+-	cbTbl.adjustPicture = konicawc_adjust_picture;
+-	cbTbl.userFree = konicawc_free_uvd;
++	memset((void * )&cbTbl, 0, sizeof(cbTbl));
++	*(void **)&cbTbl.probe = konicawc_probe;
++	*(void **)&cbTbl.setupOnOpen = konicawc_setup_on_open;
++	*(void **)&cbTbl.processData = konicawc_process_isoc;
++	*(void **)&cbTbl.getFPS = konicawc_calculate_fps;
++	*(void **)&cbTbl.setVideoMode = konicawc_set_video_mode;
++	*(void **)&cbTbl.startDataPump = konicawc_start_data;
++	*(void **)&cbTbl.stopDataPump = konicawc_stop_data;
++	*(void **)&cbTbl.adjustPicture = konicawc_adjust_picture;
++	*(void **)&cbTbl.userFree = konicawc_free_uvd;
+ 	return usbvideo_register(
+ 		&cams,
+ 		MAX_CAMERAS,
 diff -urNp linux-2.6.32.43/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.43/drivers/media/video/usbvideo/quickcam_messenger.c
 --- linux-2.6.32.43/drivers/media/video/usbvideo/quickcam_messenger.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/video/usbvideo/quickcam_messenger.c	2011-04-17 15:56:46.000000000 -0400
@@ -31748,6 +32500,56 @@ diff -urNp linux-2.6.32.43/drivers/media/video/usbvideo/quickcam_messenger.c lin
  
  	cam->input = input_dev = input_allocate_device();
  	if (!input_dev) {
+diff -urNp linux-2.6.32.43/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.43/drivers/media/video/usbvideo/ultracam.c
+--- linux-2.6.32.43/drivers/media/video/usbvideo/ultracam.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/video/usbvideo/ultracam.c	2011-08-05 20:33:55.000000000 -0400
+@@ -655,14 +655,14 @@ static int __init ultracam_init(void)
+ {
+ 	struct usbvideo_cb cbTbl;
+ 	memset(&cbTbl, 0, sizeof(cbTbl));
+-	cbTbl.probe = ultracam_probe;
+-	cbTbl.setupOnOpen = ultracam_setup_on_open;
+-	cbTbl.videoStart = ultracam_video_start;
+-	cbTbl.videoStop = ultracam_video_stop;
+-	cbTbl.processData = ultracam_ProcessIsocData;
+-	cbTbl.postProcess = usbvideo_DeinterlaceFrame;
+-	cbTbl.adjustPicture = ultracam_adjust_picture;
+-	cbTbl.getFPS = ultracam_calculate_fps;
++	*(void **)&cbTbl.probe = ultracam_probe;
++	*(void **)&cbTbl.setupOnOpen = ultracam_setup_on_open;
++	*(void **)&cbTbl.videoStart = ultracam_video_start;
++	*(void **)&cbTbl.videoStop = ultracam_video_stop;
++	*(void **)&cbTbl.processData = ultracam_ProcessIsocData;
++	*(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
++	*(void **)&cbTbl.adjustPicture = ultracam_adjust_picture;
++	*(void **)&cbTbl.getFPS = ultracam_calculate_fps;
+ 	return usbvideo_register(
+ 		&cams,
+ 		MAX_CAMERAS,
+diff -urNp linux-2.6.32.43/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.43/drivers/media/video/usbvideo/usbvideo.c
+--- linux-2.6.32.43/drivers/media/video/usbvideo/usbvideo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/media/video/usbvideo/usbvideo.c	2011-08-05 20:33:55.000000000 -0400
+@@ -697,15 +697,15 @@ int usbvideo_register(
+ 	    __func__, cams, base_size, num_cams);
+ 
+ 	/* Copy callbacks, apply defaults for those that are not set */
+-	memmove(&cams->cb, cbTbl, sizeof(cams->cb));
++	memmove((void *)&cams->cb, cbTbl, sizeof(cams->cb));
+ 	if (cams->cb.getFrame == NULL)
+-		cams->cb.getFrame = usbvideo_GetFrame;
++		*(void **)&cams->cb.getFrame = usbvideo_GetFrame;
+ 	if (cams->cb.disconnect == NULL)
+-		cams->cb.disconnect = usbvideo_Disconnect;
++		*(void **)&cams->cb.disconnect = usbvideo_Disconnect;
+ 	if (cams->cb.startDataPump == NULL)
+-		cams->cb.startDataPump = usbvideo_StartDataPump;
++		*(void **)&cams->cb.startDataPump = usbvideo_StartDataPump;
+ 	if (cams->cb.stopDataPump == NULL)
+-		cams->cb.stopDataPump = usbvideo_StopDataPump;
++		*(void **)&cams->cb.stopDataPump = usbvideo_StopDataPump;
+ 
+ 	cams->num_cameras = num_cams;
+ 	cams->cam = (struct uvd *) &cams[1];
 diff -urNp linux-2.6.32.43/drivers/media/video/usbvision/usbvision-core.c linux-2.6.32.43/drivers/media/video/usbvision/usbvision-core.c
 --- linux-2.6.32.43/drivers/media/video/usbvision/usbvision-core.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/media/video/usbvision/usbvision-core.c	2011-05-16 21:46:57.000000000 -0400
@@ -32270,6 +33072,88 @@ diff -urNp linux-2.6.32.43/drivers/misc/sgi-gru/grutables.h linux-2.6.32.43/driv
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
+diff -urNp linux-2.6.32.43/drivers/misc/sgi-xp/xpc.h linux-2.6.32.43/drivers/misc/sgi-xp/xpc.h
+--- linux-2.6.32.43/drivers/misc/sgi-xp/xpc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/misc/sgi-xp/xpc.h	2011-08-05 20:33:55.000000000 -0400
+@@ -876,7 +876,7 @@ extern struct xpc_registration xpc_regis
+ /* found in xpc_main.c */
+ extern struct device *xpc_part;
+ extern struct device *xpc_chan;
+-extern struct xpc_arch_operations xpc_arch_ops;
++extern const struct xpc_arch_operations xpc_arch_ops;
+ extern int xpc_disengage_timelimit;
+ extern int xpc_disengage_timedout;
+ extern int xpc_activate_IRQ_rcvd;
+diff -urNp linux-2.6.32.43/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.43/drivers/misc/sgi-xp/xpc_main.c
+--- linux-2.6.32.43/drivers/misc/sgi-xp/xpc_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/misc/sgi-xp/xpc_main.c	2011-08-05 20:33:55.000000000 -0400
+@@ -169,7 +169,7 @@ static struct notifier_block xpc_die_not
+ 	.notifier_call = xpc_system_die,
+ };
+ 
+-struct xpc_arch_operations xpc_arch_ops;
++const struct xpc_arch_operations xpc_arch_ops;
+ 
+ /*
+  * Timer function to enforce the timelimit on the partition disengage.
+diff -urNp linux-2.6.32.43/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.43/drivers/misc/sgi-xp/xpc_sn2.c
+--- linux-2.6.32.43/drivers/misc/sgi-xp/xpc_sn2.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/misc/sgi-xp/xpc_sn2.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_chan
+ 		xpc_acknowledge_msgs_sn2(ch, get, msg->flags);
+ }
+ 
+-static struct xpc_arch_operations xpc_arch_ops_sn2 = {
++static const struct xpc_arch_operations xpc_arch_ops_sn2 = {
+ 	.setup_partitions = xpc_setup_partitions_sn2,
+ 	.teardown_partitions = xpc_teardown_partitions_sn2,
+ 	.process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_sn2,
+@@ -2413,7 +2413,9 @@ xpc_init_sn2(void)
+ 	int ret;
+ 	size_t buf_size;
+ 
+-	xpc_arch_ops = xpc_arch_ops_sn2;
++	pax_open_kernel();
++	memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_sn2, sizeof(xpc_arch_ops_sn2));
++	pax_close_kernel();
+ 
+ 	if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) {
+ 		dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is "
+diff -urNp linux-2.6.32.43/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.43/drivers/misc/sgi-xp/xpc_uv.c
+--- linux-2.6.32.43/drivers/misc/sgi-xp/xpc_uv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/misc/sgi-xp/xpc_uv.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_chann
+ 		XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
+ }
+ 
+-static struct xpc_arch_operations xpc_arch_ops_uv = {
++static const struct xpc_arch_operations xpc_arch_ops_uv = {
+ 	.setup_partitions = xpc_setup_partitions_uv,
+ 	.teardown_partitions = xpc_teardown_partitions_uv,
+ 	.process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv,
+@@ -1729,7 +1729,9 @@ static struct xpc_arch_operations xpc_ar
+ int
+ xpc_init_uv(void)
+ {
+-	xpc_arch_ops = xpc_arch_ops_uv;
++	pax_open_kernel();
++	memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_uv, sizeof(xpc_arch_ops_uv));
++	pax_close_kernel();
+ 
+ 	if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
+ 		dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
+diff -urNp linux-2.6.32.43/drivers/misc/sgi-xp/xp.h linux-2.6.32.43/drivers/misc/sgi-xp/xp.h
+--- linux-2.6.32.43/drivers/misc/sgi-xp/xp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/misc/sgi-xp/xp.h	2011-08-05 20:33:55.000000000 -0400
+@@ -289,7 +289,7 @@ struct xpc_interface {
+ 					xpc_notify_func, void *);
+ 	void (*received) (short, int, void *);
+ 	enum xp_retval (*partid_to_nasids) (short, void *);
+-};
++} __no_const;
+ 
+ extern struct xpc_interface xpc_interface;
+ 
 diff -urNp linux-2.6.32.43/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.43/drivers/mtd/chips/cfi_cmdset_0001.c
 --- linux-2.6.32.43/drivers/mtd/chips/cfi_cmdset_0001.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/mtd/chips/cfi_cmdset_0001.c	2011-05-16 21:46:57.000000000 -0400
@@ -32518,6 +33402,18 @@ diff -urNp linux-2.6.32.43/drivers/net/bnx2.c linux-2.6.32.43/drivers/net/bnx2.c
  	if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
  		goto test_nvram_done;
  
+diff -urNp linux-2.6.32.43/drivers/net/cxgb3/l2t.h linux-2.6.32.43/drivers/net/cxgb3/l2t.h
+--- linux-2.6.32.43/drivers/net/cxgb3/l2t.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/cxgb3/l2t.h	2011-08-05 20:33:55.000000000 -0400
+@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
+  */
+ struct l2t_skb_cb {
+ 	arp_failure_handler_func arp_failure_handler;
+-};
++} __no_const;
+ 
+ #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
+ 
 diff -urNp linux-2.6.32.43/drivers/net/cxgb3/t3_hw.c linux-2.6.32.43/drivers/net/cxgb3/t3_hw.c
 --- linux-2.6.32.43/drivers/net/cxgb3/t3_hw.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/cxgb3/t3_hw.c	2011-05-16 21:46:57.000000000 -0400
@@ -32532,16 +33428,57 @@ diff -urNp linux-2.6.32.43/drivers/net/cxgb3/t3_hw.c linux-2.6.32.43/drivers/net
  	 * it at 0.
 diff -urNp linux-2.6.32.43/drivers/net/e1000e/82571.c linux-2.6.32.43/drivers/net/e1000e/82571.c
 --- linux-2.6.32.43/drivers/net/e1000e/82571.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/net/e1000e/82571.c	2011-04-17 15:56:46.000000000 -0400
-@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
- {
- 	struct e1000_hw *hw = &adapter->hw;
- 	struct e1000_mac_info *mac = &hw->mac;
-+	/* cannot be const */
- 	struct e1000_mac_operations *func = &mac->ops;
- 	u32 swsm = 0;
- 	u32 swsm2 = 0;
-@@ -1656,7 +1657,7 @@ static void e1000_clear_hw_cntrs_82571(s
++++ linux-2.6.32.43/drivers/net/e1000e/82571.c	2011-08-05 20:33:55.000000000 -0400
+@@ -245,22 +245,22 @@ static s32 e1000_init_mac_params_82571(s
+ 	/* check for link */
+ 	switch (hw->phy.media_type) {
+ 	case e1000_media_type_copper:
+-		func->setup_physical_interface = e1000_setup_copper_link_82571;
+-		func->check_for_link = e1000e_check_for_copper_link;
+-		func->get_link_up_info = e1000e_get_speed_and_duplex_copper;
++		*(void **)&func->setup_physical_interface = e1000_setup_copper_link_82571;
++		*(void **)&func->check_for_link = e1000e_check_for_copper_link;
++		*(void **)&func->get_link_up_info = e1000e_get_speed_and_duplex_copper;
+ 		break;
+ 	case e1000_media_type_fiber:
+-		func->setup_physical_interface =
++		*(void **)&func->setup_physical_interface =
+ 			e1000_setup_fiber_serdes_link_82571;
+-		func->check_for_link = e1000e_check_for_fiber_link;
+-		func->get_link_up_info =
++		*(void **)&func->check_for_link = e1000e_check_for_fiber_link;
++		*(void **)&func->get_link_up_info =
+ 			e1000e_get_speed_and_duplex_fiber_serdes;
+ 		break;
+ 	case e1000_media_type_internal_serdes:
+-		func->setup_physical_interface =
++		*(void **)&func->setup_physical_interface =
+ 			e1000_setup_fiber_serdes_link_82571;
+-		func->check_for_link = e1000_check_for_serdes_link_82571;
+-		func->get_link_up_info =
++		*(void **)&func->check_for_link = e1000_check_for_serdes_link_82571;
++		*(void **)&func->get_link_up_info =
+ 			e1000e_get_speed_and_duplex_fiber_serdes;
+ 		break;
+ 	default:
+@@ -271,12 +271,12 @@ static s32 e1000_init_mac_params_82571(s
+ 	switch (hw->mac.type) {
+ 	case e1000_82574:
+ 	case e1000_82583:
+-		func->check_mng_mode = e1000_check_mng_mode_82574;
+-		func->led_on = e1000_led_on_82574;
++		*(void **)&func->check_mng_mode = e1000_check_mng_mode_82574;
++		*(void **)&func->led_on = e1000_led_on_82574;
+ 		break;
+ 	default:
+-		func->check_mng_mode = e1000e_check_mng_mode_generic;
+-		func->led_on = e1000e_led_on_generic;
++		*(void **)&func->check_mng_mode = e1000e_check_mng_mode_generic;
++		*(void **)&func->led_on = e1000e_led_on_generic;
+ 		break;
+ 	}
+ 
+@@ -1656,7 +1656,7 @@ static void e1000_clear_hw_cntrs_82571(s
  	temp = er32(ICRXDMTC);
  }
  
@@ -32550,7 +33487,7 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/82571.c linux-2.6.32.43/drivers/ne
  	/* .check_mng_mode: mac type dependent */
  	/* .check_for_link: media type dependent */
  	.id_led_init		= e1000e_id_led_init,
-@@ -1674,7 +1675,7 @@ static struct e1000_mac_operations e8257
+@@ -1674,7 +1674,7 @@ static struct e1000_mac_operations e8257
  	.setup_led		= e1000e_setup_led_generic,
  };
  
@@ -32559,7 +33496,7 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/82571.c linux-2.6.32.43/drivers/ne
  	.acquire_phy		= e1000_get_hw_semaphore_82571,
  	.check_reset_block	= e1000e_check_reset_block_generic,
  	.commit_phy		= NULL,
-@@ -1691,7 +1692,7 @@ static struct e1000_phy_operations e82_p
+@@ -1691,7 +1691,7 @@ static struct e1000_phy_operations e82_p
  	.cfg_on_link_up      	= NULL,
  };
  
@@ -32568,7 +33505,7 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/82571.c linux-2.6.32.43/drivers/ne
  	.acquire_phy		= e1000_get_hw_semaphore_82571,
  	.check_reset_block	= e1000e_check_reset_block_generic,
  	.commit_phy		= e1000e_phy_sw_reset,
-@@ -1708,7 +1709,7 @@ static struct e1000_phy_operations e82_p
+@@ -1708,7 +1708,7 @@ static struct e1000_phy_operations e82_p
  	.cfg_on_link_up      	= NULL,
  };
  
@@ -32577,7 +33514,7 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/82571.c linux-2.6.32.43/drivers/ne
  	.acquire_phy		= e1000_get_hw_semaphore_82571,
  	.check_reset_block	= e1000e_check_reset_block_generic,
  	.commit_phy		= e1000e_phy_sw_reset,
-@@ -1725,7 +1726,7 @@ static struct e1000_phy_operations e82_p
+@@ -1725,7 +1725,7 @@ static struct e1000_phy_operations e82_p
  	.cfg_on_link_up      	= NULL,
  };
  
@@ -32604,16 +33541,31 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/e1000.h linux-2.6.32.43/drivers/ne
  /* hardware capability, feature, and workaround flags */
 diff -urNp linux-2.6.32.43/drivers/net/e1000e/es2lan.c linux-2.6.32.43/drivers/net/e1000e/es2lan.c
 --- linux-2.6.32.43/drivers/net/e1000e/es2lan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/net/e1000e/es2lan.c	2011-04-17 15:56:46.000000000 -0400
-@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
- {
- 	struct e1000_hw *hw = &adapter->hw;
- 	struct e1000_mac_info *mac = &hw->mac;
-+	/* cannot be const */
- 	struct e1000_mac_operations *func = &mac->ops;
- 
- 	/* Set media type */
-@@ -1365,7 +1366,7 @@ static void e1000_clear_hw_cntrs_80003es
++++ linux-2.6.32.43/drivers/net/e1000e/es2lan.c	2011-08-05 20:33:55.000000000 -0400
+@@ -229,16 +229,16 @@ static s32 e1000_init_mac_params_80003es
+ 	/* check for link */
+ 	switch (hw->phy.media_type) {
+ 	case e1000_media_type_copper:
+-		func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
+-		func->check_for_link = e1000e_check_for_copper_link;
++		*(void **)&func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
++		*(void **)&func->check_for_link = e1000e_check_for_copper_link;
+ 		break;
+ 	case e1000_media_type_fiber:
+-		func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
+-		func->check_for_link = e1000e_check_for_fiber_link;
++		*(void **)&func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
++		*(void **)&func->check_for_link = e1000e_check_for_fiber_link;
+ 		break;
+ 	case e1000_media_type_internal_serdes:
+-		func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
+-		func->check_for_link = e1000e_check_for_serdes_link;
++		*(void **)&func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
++		*(void **)&func->check_for_link = e1000e_check_for_serdes_link;
+ 		break;
+ 	default:
+ 		return -E1000_ERR_CONFIG;
+@@ -1365,7 +1365,7 @@ static void e1000_clear_hw_cntrs_80003es
  	temp = er32(ICRXDMTC);
  }
  
@@ -32622,7 +33574,7 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/es2lan.c linux-2.6.32.43/drivers/n
  	.id_led_init		= e1000e_id_led_init,
  	.check_mng_mode		= e1000e_check_mng_mode_generic,
  	/* check_for_link dependent on media type */
-@@ -1383,7 +1384,7 @@ static struct e1000_mac_operations es2_m
+@@ -1383,7 +1383,7 @@ static struct e1000_mac_operations es2_m
  	.setup_led		= e1000e_setup_led_generic,
  };
  
@@ -32631,7 +33583,7 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/es2lan.c linux-2.6.32.43/drivers/n
  	.acquire_phy		= e1000_acquire_phy_80003es2lan,
  	.check_reset_block	= e1000e_check_reset_block_generic,
  	.commit_phy	 	= e1000e_phy_sw_reset,
-@@ -1400,7 +1401,7 @@ static struct e1000_phy_operations es2_p
+@@ -1400,7 +1400,7 @@ static struct e1000_phy_operations es2_p
  	.cfg_on_link_up      	= e1000_cfg_on_link_up_80003es2lan,
  };
  
@@ -32704,7 +33656,125 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/hw.h linux-2.6.32.43/drivers/net/e
  struct e1000_mac_info {
 diff -urNp linux-2.6.32.43/drivers/net/e1000e/ich8lan.c linux-2.6.32.43/drivers/net/e1000e/ich8lan.c
 --- linux-2.6.32.43/drivers/net/e1000e/ich8lan.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.43/drivers/net/e1000e/ich8lan.c	2011-05-10 22:12:32.000000000 -0400
++++ linux-2.6.32.43/drivers/net/e1000e/ich8lan.c	2011-08-05 20:33:55.000000000 -0400
+@@ -265,13 +265,13 @@ static s32 e1000_init_phy_params_pchlan(
+ 	phy->addr                     = 1;
+ 	phy->reset_delay_us           = 100;
+ 
+-	phy->ops.check_polarity       = e1000_check_polarity_ife_ich8lan;
+-	phy->ops.read_phy_reg         = e1000_read_phy_reg_hv;
+-	phy->ops.read_phy_reg_locked  = e1000_read_phy_reg_hv_locked;
+-	phy->ops.set_d0_lplu_state    = e1000_set_lplu_state_pchlan;
+-	phy->ops.set_d3_lplu_state    = e1000_set_lplu_state_pchlan;
+-	phy->ops.write_phy_reg        = e1000_write_phy_reg_hv;
+-	phy->ops.write_phy_reg_locked = e1000_write_phy_reg_hv_locked;
++	*(void **)&phy->ops.check_polarity       = e1000_check_polarity_ife_ich8lan;
++	*(void **)&phy->ops.read_phy_reg         = e1000_read_phy_reg_hv;
++	*(void **)&phy->ops.read_phy_reg_locked  = e1000_read_phy_reg_hv_locked;
++	*(void **)&phy->ops.set_d0_lplu_state    = e1000_set_lplu_state_pchlan;
++	*(void **)&phy->ops.set_d3_lplu_state    = e1000_set_lplu_state_pchlan;
++	*(void **)&phy->ops.write_phy_reg        = e1000_write_phy_reg_hv;
++	*(void **)&phy->ops.write_phy_reg_locked = e1000_write_phy_reg_hv_locked;
+ 	phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+ 
+ 	/*
+@@ -289,12 +289,12 @@ static s32 e1000_init_phy_params_pchlan(
+ 	phy->type = e1000e_get_phy_type_from_id(phy->id);
+ 
+ 	if (phy->type == e1000_phy_82577) {
+-		phy->ops.check_polarity = e1000_check_polarity_82577;
+-		phy->ops.force_speed_duplex =
++		*(void **)&phy->ops.check_polarity = e1000_check_polarity_82577;
++		*(void **)&phy->ops.force_speed_duplex =
+ 			e1000_phy_force_speed_duplex_82577;
+-		phy->ops.get_cable_length   = e1000_get_cable_length_82577;
+-		phy->ops.get_phy_info = e1000_get_phy_info_82577;
+-		phy->ops.commit_phy = e1000e_phy_sw_reset;
++		*(void **)&phy->ops.get_cable_length   = e1000_get_cable_length_82577;
++		*(void **)&phy->ops.get_phy_info = e1000_get_phy_info_82577;
++		*(void **)&phy->ops.commit_phy = e1000e_phy_sw_reset;
+ 	}
+ 
+  out:
+@@ -322,8 +322,8 @@ static s32 e1000_init_phy_params_ich8lan
+ 	 */
+ 	ret_val = e1000e_determine_phy_address(hw);
+ 	if (ret_val) {
+-		hw->phy.ops.write_phy_reg = e1000e_write_phy_reg_bm;
+-		hw->phy.ops.read_phy_reg  = e1000e_read_phy_reg_bm;
++		*(void **)&hw->phy.ops.write_phy_reg = e1000e_write_phy_reg_bm;
++		*(void **)&hw->phy.ops.read_phy_reg  = e1000e_read_phy_reg_bm;
+ 		ret_val = e1000e_determine_phy_address(hw);
+ 		if (ret_val)
+ 			return ret_val;
+@@ -343,8 +343,8 @@ static s32 e1000_init_phy_params_ich8lan
+ 	case IGP03E1000_E_PHY_ID:
+ 		phy->type = e1000_phy_igp_3;
+ 		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+-		phy->ops.read_phy_reg_locked = e1000e_read_phy_reg_igp_locked;
+-		phy->ops.write_phy_reg_locked = e1000e_write_phy_reg_igp_locked;
++		*(void **)&phy->ops.read_phy_reg_locked = e1000e_read_phy_reg_igp_locked;
++		*(void **)&phy->ops.write_phy_reg_locked = e1000e_write_phy_reg_igp_locked;
+ 		break;
+ 	case IFE_E_PHY_ID:
+ 	case IFE_PLUS_E_PHY_ID:
+@@ -355,16 +355,16 @@ static s32 e1000_init_phy_params_ich8lan
+ 	case BME1000_E_PHY_ID:
+ 		phy->type = e1000_phy_bm;
+ 		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+-		hw->phy.ops.read_phy_reg = e1000e_read_phy_reg_bm;
+-		hw->phy.ops.write_phy_reg = e1000e_write_phy_reg_bm;
+-		hw->phy.ops.commit_phy = e1000e_phy_sw_reset;
++		*(void **)&hw->phy.ops.read_phy_reg = e1000e_read_phy_reg_bm;
++		*(void **)&hw->phy.ops.write_phy_reg = e1000e_write_phy_reg_bm;
++		*(void **)&hw->phy.ops.commit_phy = e1000e_phy_sw_reset;
+ 		break;
+ 	default:
+ 		return -E1000_ERR_PHY;
+ 		break;
+ 	}
+ 
+-	phy->ops.check_polarity = e1000_check_polarity_ife_ich8lan;
++	*(void **)&phy->ops.check_polarity = e1000_check_polarity_ife_ich8lan;
+ 
+ 	return 0;
+ }
+@@ -455,25 +455,25 @@ static s32 e1000_init_mac_params_ich8lan
+ 	case e1000_ich9lan:
+ 	case e1000_ich10lan:
+ 		/* ID LED init */
+-		mac->ops.id_led_init = e1000e_id_led_init;
++		*(void **)&mac->ops.id_led_init = e1000e_id_led_init;
+ 		/* setup LED */
+-		mac->ops.setup_led = e1000e_setup_led_generic;
++		*(void **)&mac->ops.setup_led = e1000e_setup_led_generic;
+ 		/* cleanup LED */
+-		mac->ops.cleanup_led = e1000_cleanup_led_ich8lan;
++		*(void **)&mac->ops.cleanup_led = e1000_cleanup_led_ich8lan;
+ 		/* turn on/off LED */
+-		mac->ops.led_on = e1000_led_on_ich8lan;
+-		mac->ops.led_off = e1000_led_off_ich8lan;
++		*(void **)&mac->ops.led_on = e1000_led_on_ich8lan;
++		*(void **)&mac->ops.led_off = e1000_led_off_ich8lan;
+ 		break;
+ 	case e1000_pchlan:
+ 		/* ID LED init */
+-		mac->ops.id_led_init = e1000_id_led_init_pchlan;
++		*(void **)&mac->ops.id_led_init = e1000_id_led_init_pchlan;
+ 		/* setup LED */
+-		mac->ops.setup_led = e1000_setup_led_pchlan;
++		*(void **)&mac->ops.setup_led = e1000_setup_led_pchlan;
+ 		/* cleanup LED */
+-		mac->ops.cleanup_led = e1000_cleanup_led_pchlan;
++		*(void **)&mac->ops.cleanup_led = e1000_cleanup_led_pchlan;
+ 		/* turn on/off LED */
+-		mac->ops.led_on = e1000_led_on_pchlan;
+-		mac->ops.led_off = e1000_led_off_pchlan;
++		*(void **)&mac->ops.led_on = e1000_led_on_pchlan;
++		*(void **)&mac->ops.led_off = e1000_led_off_pchlan;
+ 		break;
+ 	default:
+ 		break;
 @@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan
  	}
  }
@@ -32732,6 +33802,22 @@ diff -urNp linux-2.6.32.43/drivers/net/e1000e/ich8lan.c linux-2.6.32.43/drivers/
  	.acquire_nvm		= e1000_acquire_nvm_ich8lan,
  	.read_nvm	 	= e1000_read_nvm_ich8lan,
  	.release_nvm		= e1000_release_nvm_ich8lan,
+diff -urNp linux-2.6.32.43/drivers/net/e1000e/netdev.c linux-2.6.32.43/drivers/net/e1000e/netdev.c
+--- linux-2.6.32.43/drivers/net/e1000e/netdev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/e1000e/netdev.c	2011-08-05 20:33:55.000000000 -0400
+@@ -5071,9 +5071,9 @@ static int __devinit e1000_probe(struct 
+ 
+ 	err = -EIO;
+ 
+-	memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
+-	memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
+-	memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
++	memcpy((void *)&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
++	memcpy((void *)&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
++	memcpy((void *)&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
+ 
+ 	err = ei->get_variants(adapter);
+ 	if (err)
 diff -urNp linux-2.6.32.43/drivers/net/hamradio/6pack.c linux-2.6.32.43/drivers/net/hamradio/6pack.c
 --- linux-2.6.32.43/drivers/net/hamradio/6pack.c	2011-07-13 17:23:04.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/hamradio/6pack.c	2011-07-13 17:23:18.000000000 -0400
@@ -32758,7 +33844,62 @@ diff -urNp linux-2.6.32.43/drivers/net/ibmveth.c linux-2.6.32.43/drivers/net/ibm
  };
 diff -urNp linux-2.6.32.43/drivers/net/igb/e1000_82575.c linux-2.6.32.43/drivers/net/igb/e1000_82575.c
 --- linux-2.6.32.43/drivers/net/igb/e1000_82575.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/net/igb/e1000_82575.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/drivers/net/igb/e1000_82575.c	2011-08-05 20:33:55.000000000 -0400
+@@ -135,7 +135,7 @@ static s32 igb_get_invariants_82575(stru
+ 			? true : false;
+ 
+ 	/* physical interface link setup */
+-	mac->ops.setup_physical_interface =
++	*(void **)&mac->ops.setup_physical_interface =
+ 		(hw->phy.media_type == e1000_media_type_copper)
+ 			? igb_setup_copper_link_82575
+ 			: igb_setup_serdes_link_82575;
+@@ -191,13 +191,13 @@ static s32 igb_get_invariants_82575(stru
+ 
+ 	/* PHY function pointers */
+ 	if (igb_sgmii_active_82575(hw)) {
+-		phy->ops.reset              = igb_phy_hw_reset_sgmii_82575;
+-		phy->ops.read_reg           = igb_read_phy_reg_sgmii_82575;
+-		phy->ops.write_reg          = igb_write_phy_reg_sgmii_82575;
++		*(void **)&phy->ops.reset              = igb_phy_hw_reset_sgmii_82575;
++		*(void **)&phy->ops.read_reg           = igb_read_phy_reg_sgmii_82575;
++		*(void **)&phy->ops.write_reg          = igb_write_phy_reg_sgmii_82575;
+ 	} else {
+-		phy->ops.reset              = igb_phy_hw_reset;
+-		phy->ops.read_reg           = igb_read_phy_reg_igp;
+-		phy->ops.write_reg          = igb_write_phy_reg_igp;
++		*(void **)&phy->ops.reset              = igb_phy_hw_reset;
++		*(void **)&phy->ops.read_reg           = igb_read_phy_reg_igp;
++		*(void **)&phy->ops.write_reg          = igb_write_phy_reg_igp;
+ 	}
+ 
+ 	/* set lan id */
+@@ -213,17 +213,17 @@ static s32 igb_get_invariants_82575(stru
+ 	switch (phy->id) {
+ 	case M88E1111_I_PHY_ID:
+ 		phy->type                   = e1000_phy_m88;
+-		phy->ops.get_phy_info       = igb_get_phy_info_m88;
+-		phy->ops.get_cable_length   = igb_get_cable_length_m88;
+-		phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
++		*(void **)&phy->ops.get_phy_info       = igb_get_phy_info_m88;
++		*(void **)&phy->ops.get_cable_length   = igb_get_cable_length_m88;
++		*(void **)&phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
+ 		break;
+ 	case IGP03E1000_E_PHY_ID:
+ 		phy->type                   = e1000_phy_igp_3;
+-		phy->ops.get_phy_info       = igb_get_phy_info_igp;
+-		phy->ops.get_cable_length   = igb_get_cable_length_igp_2;
+-		phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_igp;
+-		phy->ops.set_d0_lplu_state  = igb_set_d0_lplu_state_82575;
+-		phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state;
++		*(void **)&phy->ops.get_phy_info       = igb_get_phy_info_igp;
++		*(void **)&phy->ops.get_cable_length   = igb_get_cable_length_igp_2;
++		*(void **)&phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_igp;
++		*(void **)&phy->ops.set_d0_lplu_state  = igb_set_d0_lplu_state_82575;
++		*(void **)&phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state;
+ 		break;
+ 	default:
+ 		return -E1000_ERR_PHY;
 @@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct 
  	wr32(E1000_VT_CTL, vt_ctl);
  }
@@ -32812,6 +33953,114 @@ diff -urNp linux-2.6.32.43/drivers/net/igb/e1000_hw.h linux-2.6.32.43/drivers/ne
  };
  
  extern const struct e1000_info e1000_82575_info;
+diff -urNp linux-2.6.32.43/drivers/net/igb/e1000_mbx.c linux-2.6.32.43/drivers/net/igb/e1000_mbx.c
+--- linux-2.6.32.43/drivers/net/igb/e1000_mbx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/igb/e1000_mbx.c	2011-08-05 20:33:55.000000000 -0400
+@@ -414,13 +414,13 @@ s32 igb_init_mbx_params_pf(struct e1000_
+ 
+ 		mbx->size = E1000_VFMAILBOX_SIZE;
+ 
+-		mbx->ops.read = igb_read_mbx_pf;
+-		mbx->ops.write = igb_write_mbx_pf;
+-		mbx->ops.read_posted = igb_read_posted_mbx;
+-		mbx->ops.write_posted = igb_write_posted_mbx;
+-		mbx->ops.check_for_msg = igb_check_for_msg_pf;
+-		mbx->ops.check_for_ack = igb_check_for_ack_pf;
+-		mbx->ops.check_for_rst = igb_check_for_rst_pf;
++		*(void **)&mbx->ops.read = igb_read_mbx_pf;
++		*(void **)&mbx->ops.write = igb_write_mbx_pf;
++		*(void **)&mbx->ops.read_posted = igb_read_posted_mbx;
++		*(void **)&mbx->ops.write_posted = igb_write_posted_mbx;
++		*(void **)&mbx->ops.check_for_msg = igb_check_for_msg_pf;
++		*(void **)&mbx->ops.check_for_ack = igb_check_for_ack_pf;
++		*(void **)&mbx->ops.check_for_rst = igb_check_for_rst_pf;
+ 
+ 		mbx->stats.msgs_tx = 0;
+ 		mbx->stats.msgs_rx = 0;
+diff -urNp linux-2.6.32.43/drivers/net/igb/igb_main.c linux-2.6.32.43/drivers/net/igb/igb_main.c
+--- linux-2.6.32.43/drivers/net/igb/igb_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/igb/igb_main.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1295,9 +1295,9 @@ static int __devinit igb_probe(struct pc
+ 	/* setup the private structure */
+ 	hw->back = adapter;
+ 	/* Copy the default MAC, PHY and NVM function pointers */
+-	memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
+-	memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
+-	memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
++	memcpy((void *)&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
++	memcpy((void *)&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
++	memcpy((void *)&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
+ 	/* Initialize skew-specific constants */
+ 	err = ei->get_invariants(hw);
+ 	if (err)
+diff -urNp linux-2.6.32.43/drivers/net/igbvf/mbx.c linux-2.6.32.43/drivers/net/igbvf/mbx.c
+--- linux-2.6.32.43/drivers/net/igbvf/mbx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/igbvf/mbx.c	2011-08-05 20:33:55.000000000 -0400
+@@ -331,13 +331,13 @@ s32 e1000_init_mbx_params_vf(struct e100
+ 
+ 	mbx->size = E1000_VFMAILBOX_SIZE;
+ 
+-	mbx->ops.read = e1000_read_mbx_vf;
+-	mbx->ops.write = e1000_write_mbx_vf;
+-	mbx->ops.read_posted = e1000_read_posted_mbx;
+-	mbx->ops.write_posted = e1000_write_posted_mbx;
+-	mbx->ops.check_for_msg = e1000_check_for_msg_vf;
+-	mbx->ops.check_for_ack = e1000_check_for_ack_vf;
+-	mbx->ops.check_for_rst = e1000_check_for_rst_vf;
++	*(void **)&mbx->ops.read = e1000_read_mbx_vf;
++	*(void **)&mbx->ops.write = e1000_write_mbx_vf;
++	*(void **)&mbx->ops.read_posted = e1000_read_posted_mbx;
++	*(void **)&mbx->ops.write_posted = e1000_write_posted_mbx;
++	*(void **)&mbx->ops.check_for_msg = e1000_check_for_msg_vf;
++	*(void **)&mbx->ops.check_for_ack = e1000_check_for_ack_vf;
++	*(void **)&mbx->ops.check_for_rst = e1000_check_for_rst_vf;
+ 
+ 	mbx->stats.msgs_tx = 0;
+ 	mbx->stats.msgs_rx = 0;
+diff -urNp linux-2.6.32.43/drivers/net/igbvf/vf.c linux-2.6.32.43/drivers/net/igbvf/vf.c
+--- linux-2.6.32.43/drivers/net/igbvf/vf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/igbvf/vf.c	2011-08-05 20:33:55.000000000 -0400
+@@ -55,21 +55,21 @@ static s32 e1000_init_mac_params_vf(stru
+ 
+ 	/* Function pointers */
+ 	/* reset */
+-	mac->ops.reset_hw = e1000_reset_hw_vf;
++	*(void **)&mac->ops.reset_hw = e1000_reset_hw_vf;
+ 	/* hw initialization */
+-	mac->ops.init_hw = e1000_init_hw_vf;
++	*(void **)&mac->ops.init_hw = e1000_init_hw_vf;
+ 	/* check for link */
+-	mac->ops.check_for_link = e1000_check_for_link_vf;
++	*(void **)&mac->ops.check_for_link = e1000_check_for_link_vf;
+ 	/* link info */
+-	mac->ops.get_link_up_info = e1000_get_link_up_info_vf;
++	*(void **)&mac->ops.get_link_up_info = e1000_get_link_up_info_vf;
+ 	/* multicast address update */
+-	mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_vf;
++	*(void **)&mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_vf;
+ 	/* set mac address */
+-	mac->ops.rar_set = e1000_rar_set_vf;
++	*(void **)&mac->ops.rar_set = e1000_rar_set_vf;
+ 	/* read mac address */
+-	mac->ops.read_mac_addr = e1000_read_mac_addr_vf;
++	*(void **)&mac->ops.read_mac_addr = e1000_read_mac_addr_vf;
+ 	/* set vlan filter table array */
+-	mac->ops.set_vfta = e1000_set_vfta_vf;
++	*(void **)&mac->ops.set_vfta = e1000_set_vfta_vf;
+ 
+ 	return E1000_SUCCESS;
+ }
+@@ -80,8 +80,8 @@ static s32 e1000_init_mac_params_vf(stru
+  **/
+ void e1000_init_function_pointers_vf(struct e1000_hw *hw)
+ {
+-	hw->mac.ops.init_params = e1000_init_mac_params_vf;
+-	hw->mbx.ops.init_params = e1000_init_mbx_params_vf;
++	*(void **)&hw->mac.ops.init_params = e1000_init_mac_params_vf;
++	*(void **)&hw->mbx.ops.init_params = e1000_init_mbx_params_vf;
+ }
+ 
+ /**
 diff -urNp linux-2.6.32.43/drivers/net/iseries_veth.c linux-2.6.32.43/drivers/net/iseries_veth.c
 --- linux-2.6.32.43/drivers/net/iseries_veth.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/iseries_veth.c	2011-04-17 15:56:46.000000000 -0400
@@ -32858,6 +34107,105 @@ diff -urNp linux-2.6.32.43/drivers/net/ixgb/ixgb_param.c linux-2.6.32.43/drivers
  	if (bd >= IXGB_MAX_NIC) {
  		printk(KERN_NOTICE
  			   "Warning: no configuration for board #%i\n", bd);
+diff -urNp linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82598.c linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82598.c
+--- linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82598.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82598.c	2011-08-05 20:33:55.000000000 -0400
+@@ -154,19 +154,19 @@ static s32 ixgbe_init_phy_ops_82598(stru
+ 
+ 	/* Overwrite the link function pointers if copper PHY */
+ 	if (mac->ops.get_media_type(hw) == ixgbe_media_type_copper) {
+-		mac->ops.setup_link = &ixgbe_setup_copper_link_82598;
+-		mac->ops.get_link_capabilities =
++		*(void **)&mac->ops.setup_link = &ixgbe_setup_copper_link_82598;
++		*(void **)&mac->ops.get_link_capabilities =
+ 		                  &ixgbe_get_copper_link_capabilities_82598;
+ 	}
+ 
+ 	switch (hw->phy.type) {
+ 	case ixgbe_phy_tn:
+-		phy->ops.check_link = &ixgbe_check_phy_link_tnx;
+-		phy->ops.get_firmware_version =
++		*(void **)&phy->ops.check_link = &ixgbe_check_phy_link_tnx;
++		*(void **)&phy->ops.get_firmware_version =
+ 		             &ixgbe_get_phy_firmware_version_tnx;
+ 		break;
+ 	case ixgbe_phy_nl:
+-		phy->ops.reset = &ixgbe_reset_phy_nl;
++		*(void **)&phy->ops.reset = &ixgbe_reset_phy_nl;
+ 
+ 		/* Call SFP+ identify routine to get the SFP+ module type */
+ 		ret_val = phy->ops.identify_sfp(hw);
+diff -urNp linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82599.c linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82599.c
+--- linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82599.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/ixgbe/ixgbe_82599.c	2011-08-05 20:33:55.000000000 -0400
+@@ -62,9 +62,9 @@ static void ixgbe_init_mac_link_ops_8259
+ 	struct ixgbe_mac_info *mac = &hw->mac;
+ 	if (hw->phy.multispeed_fiber) {
+ 		/* Set up dual speed SFP+ support */
+-		mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber;
++		*(void **)&mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber;
+ 	} else {
+-		mac->ops.setup_link = &ixgbe_setup_mac_link_82599;
++		*(void **)&mac->ops.setup_link = &ixgbe_setup_mac_link_82599;
+ 	}
+ }
+ 
+@@ -76,7 +76,7 @@ static s32 ixgbe_setup_sfp_modules_82599
+ 	if (hw->phy.sfp_type != ixgbe_sfp_type_unknown) {
+ 		ixgbe_init_mac_link_ops_82599(hw);
+ 
+-		hw->phy.ops.reset = NULL;
++		*(void **)&hw->phy.ops.reset = NULL;
+ 
+ 		ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,
+ 		                                              &data_offset);
+@@ -171,16 +171,16 @@ static s32 ixgbe_init_phy_ops_82599(stru
+ 
+ 	/* If copper media, overwrite with copper function pointers */
+ 	if (mac->ops.get_media_type(hw) == ixgbe_media_type_copper) {
+-		mac->ops.setup_link = &ixgbe_setup_copper_link_82599;
+-		mac->ops.get_link_capabilities =
++		*(void **)&mac->ops.setup_link = &ixgbe_setup_copper_link_82599;
++		*(void **)&mac->ops.get_link_capabilities =
+ 		                  &ixgbe_get_copper_link_capabilities_82599;
+ 	}
+ 
+ 	/* Set necessary function pointers based on phy type */
+ 	switch (hw->phy.type) {
+ 	case ixgbe_phy_tn:
+-		phy->ops.check_link = &ixgbe_check_phy_link_tnx;
+-		phy->ops.get_firmware_version =
++		*(void **)&phy->ops.check_link = &ixgbe_check_phy_link_tnx;
++		*(void **)&phy->ops.get_firmware_version =
+ 		             &ixgbe_get_phy_firmware_version_tnx;
+ 		break;
+ 	default:
+diff -urNp linux-2.6.32.43/drivers/net/ixgbe/ixgbe_main.c linux-2.6.32.43/drivers/net/ixgbe/ixgbe_main.c
+--- linux-2.6.32.43/drivers/net/ixgbe/ixgbe_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/ixgbe/ixgbe_main.c	2011-08-05 20:33:55.000000000 -0400
+@@ -5638,18 +5638,18 @@ static int __devinit ixgbe_probe(struct 
+ 	adapter->bd_number = cards_found;
+ 
+ 	/* Setup hw api */
+-	memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
++	memcpy((void *)&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
+ 	hw->mac.type  = ii->mac;
+ 
+ 	/* EEPROM */
+-	memcpy(&hw->eeprom.ops, ii->eeprom_ops, sizeof(hw->eeprom.ops));
++	memcpy((void *)&hw->eeprom.ops, ii->eeprom_ops, sizeof(hw->eeprom.ops));
+ 	eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+ 	/* If EEPROM is valid (bit 8 = 1), use default otherwise use bit bang */
+ 	if (!(eec & (1 << 8)))
+-		hw->eeprom.ops.read = &ixgbe_read_eeprom_bit_bang_generic;
++		*(void **)&hw->eeprom.ops.read = &ixgbe_read_eeprom_bit_bang_generic;
+ 
+ 	/* PHY */
+-	memcpy(&hw->phy.ops, ii->phy_ops, sizeof(hw->phy.ops));
++	memcpy((void *)&hw->phy.ops, ii->phy_ops, sizeof(hw->phy.ops));
+ 	hw->phy.sfp_type = ixgbe_sfp_type_unknown;
+ 	/* ixgbe_identify_phy_generic will set prtad and mmds properly */
+ 	hw->phy.mdio.prtad = MDIO_PRTAD_NONE;
 diff -urNp linux-2.6.32.43/drivers/net/mlx4/main.c linux-2.6.32.43/drivers/net/mlx4/main.c
 --- linux-2.6.32.43/drivers/net/mlx4/main.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/mlx4/main.c	2011-05-18 20:09:37.000000000 -0400
@@ -32892,7 +34240,7 @@ diff -urNp linux-2.6.32.43/drivers/net/niu.c linux-2.6.32.43/drivers/net/niu.c
  		ldg_num_map[i] = first_ldg + i;
 diff -urNp linux-2.6.32.43/drivers/net/pcnet32.c linux-2.6.32.43/drivers/net/pcnet32.c
 --- linux-2.6.32.43/drivers/net/pcnet32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/net/pcnet32.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/drivers/net/pcnet32.c	2011-08-05 20:33:55.000000000 -0400
 @@ -79,7 +79,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -32902,6 +34250,633 @@ diff -urNp linux-2.6.32.43/drivers/net/pcnet32.c linux-2.6.32.43/drivers/net/pcn
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
  static int pcnet32_debug = 0;
+@@ -267,7 +267,7 @@ struct pcnet32_private {
+ 	struct sk_buff		**rx_skbuff;
+ 	dma_addr_t		*tx_dma_addr;
+ 	dma_addr_t		*rx_dma_addr;
+-	struct pcnet32_access	a;
++	struct pcnet32_access	*a;
+ 	spinlock_t		lock;		/* Guard lock */
+ 	unsigned int		cur_rx, cur_tx;	/* The next free ring entry */
+ 	unsigned int		rx_ring_size;	/* current rx ring size */
+@@ -457,9 +457,9 @@ static void pcnet32_netif_start(struct n
+ 	u16 val;
+ 
+ 	netif_wake_queue(dev);
+-	val = lp->a.read_csr(ioaddr, CSR3);
++	val = lp->a->read_csr(ioaddr, CSR3);
+ 	val &= 0x00ff;
+-	lp->a.write_csr(ioaddr, CSR3, val);
++	lp->a->write_csr(ioaddr, CSR3, val);
+ 	napi_enable(&lp->napi);
+ }
+ 
+@@ -744,7 +744,7 @@ static u32 pcnet32_get_link(struct net_d
+ 		r = mii_link_ok(&lp->mii_if);
+ 	} else if (lp->chip_version >= PCNET32_79C970A) {
+ 		ulong ioaddr = dev->base_addr;	/* card base I/O address */
+-		r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
++		r = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
+ 	} else {	/* can not detect link on really old chips */
+ 		r = 1;
+ 	}
+@@ -806,7 +806,7 @@ static int pcnet32_set_ringparam(struct 
+ 		pcnet32_netif_stop(dev);
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
+ 
+ 	size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
+ 
+@@ -886,7 +886,7 @@ static void pcnet32_ethtool_test(struct 
+ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;	/* access to registers */
++	struct pcnet32_access *a = lp->a;	/* access to registers */
+ 	ulong ioaddr = dev->base_addr;	/* card base I/O address */
+ 	struct sk_buff *skb;	/* sk buff */
+ 	int x, i;		/* counters */
+@@ -906,21 +906,21 @@ static int pcnet32_loopback_test(struct 
+ 		pcnet32_netif_stop(dev);
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
+ 
+ 	numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
+ 
+ 	/* Reset the PCNET32 */
+-	lp->a.reset(ioaddr);
+-	lp->a.write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
++	lp->a->reset(ioaddr);
++	lp->a->write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
+ 
+ 	/* switch pcnet32 to 32bit mode */
+-	lp->a.write_bcr(ioaddr, 20, 2);
++	lp->a->write_bcr(ioaddr, 20, 2);
+ 
+ 	/* purge & init rings but don't actually restart */
+ 	pcnet32_restart(dev, 0x0000);
+ 
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
+ 
+ 	/* Initialize Transmit buffers. */
+ 	size = data_len + 15;
+@@ -966,10 +966,10 @@ static int pcnet32_loopback_test(struct 
+ 
+ 	/* set int loopback in CSR15 */
+ 	x = a->read_csr(ioaddr, CSR15) & 0xfffc;
+-	lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
++	lp->a->write_csr(ioaddr, CSR15, x | 0x0044);
+ 
+ 	teststatus = cpu_to_le16(0x8000);
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_START);	/* Set STRT bit */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_START);	/* Set STRT bit */
+ 
+ 	/* Check status of descriptors */
+ 	for (x = 0; x < numbuffs; x++) {
+@@ -990,7 +990,7 @@ static int pcnet32_loopback_test(struct 
+ 		}
+ 	}
+ 
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
+ 	wmb();
+ 	if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
+ 		printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
+@@ -1039,7 +1039,7 @@ static int pcnet32_loopback_test(struct 
+ 		pcnet32_restart(dev, CSR0_NORMAL);
+ 	} else {
+ 		pcnet32_purge_rx_ring(dev);
+-		lp->a.write_bcr(ioaddr, 20, 4);	/* return to 16bit mode */
++		lp->a->write_bcr(ioaddr, 20, 4);	/* return to 16bit mode */
+ 	}
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+@@ -1049,7 +1049,7 @@ static int pcnet32_loopback_test(struct 
+ static void pcnet32_led_blink_callback(struct net_device *dev)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 	int i;
+@@ -1066,7 +1066,7 @@ static void pcnet32_led_blink_callback(s
+ static int pcnet32_phys_id(struct net_device *dev, u32 data)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 	int i, regs[4];
+@@ -1112,7 +1112,7 @@ static int pcnet32_suspend(struct net_de
+ {
+ 	int csr5;
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	int ticks;
+ 
+@@ -1388,8 +1388,8 @@ static int pcnet32_poll(struct napi_stru
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 	if (pcnet32_tx(dev)) {
+ 		/* reset the chip to clear the error condition, then restart */
+-		lp->a.reset(ioaddr);
+-		lp->a.write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
++		lp->a->reset(ioaddr);
++		lp->a->write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
+ 		pcnet32_restart(dev, CSR0_START);
+ 		netif_wake_queue(dev);
+ 	}
+@@ -1401,12 +1401,12 @@ static int pcnet32_poll(struct napi_stru
+ 		__napi_complete(napi);
+ 
+ 		/* clear interrupt masks */
+-		val = lp->a.read_csr(ioaddr, CSR3);
++		val = lp->a->read_csr(ioaddr, CSR3);
+ 		val &= 0x00ff;
+-		lp->a.write_csr(ioaddr, CSR3, val);
++		lp->a->write_csr(ioaddr, CSR3, val);
+ 
+ 		/* Set interrupt enable. */
+-		lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
++		lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN);
+ 
+ 		spin_unlock_irqrestore(&lp->lock, flags);
+ 	}
+@@ -1429,7 +1429,7 @@ static void pcnet32_get_regs(struct net_
+ 	int i, csr0;
+ 	u16 *buff = ptr;
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 
+@@ -1466,9 +1466,9 @@ static void pcnet32_get_regs(struct net_
+ 		for (j = 0; j < PCNET32_MAX_PHYS; j++) {
+ 			if (lp->phymask & (1 << j)) {
+ 				for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
+-					lp->a.write_bcr(ioaddr, 33,
++					lp->a->write_bcr(ioaddr, 33,
+ 							(j << 5) | i);
+-					*buff++ = lp->a.read_bcr(ioaddr, 34);
++					*buff++ = lp->a->read_bcr(ioaddr, 34);
+ 				}
+ 			}
+ 		}
+@@ -1858,7 +1858,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 	    ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
+ 		lp->options |= PCNET32_PORT_FD;
+ 
+-	lp->a = *a;
++	lp->a = a;
+ 
+ 	/* prior to register_netdev, dev->name is not yet correct */
+ 	if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
+@@ -1917,7 +1917,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 	if (lp->mii) {
+ 		/* lp->phycount and lp->phymask are set to 0 by memset above */
+ 
+-		lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
++		lp->mii_if.phy_id = ((lp->a->read_bcr(ioaddr, 33)) >> 5) & 0x1f;
+ 		/* scan for PHYs */
+ 		for (i = 0; i < PCNET32_MAX_PHYS; i++) {
+ 			unsigned short id1, id2;
+@@ -1938,7 +1938,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 				       "Found PHY %04x:%04x at address %d.\n",
+ 				       id1, id2, i);
+ 		}
+-		lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
++		lp->a->write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
+ 		if (lp->phycount > 1) {
+ 			lp->options |= PCNET32_PORT_MII;
+ 		}
+@@ -2109,10 +2109,10 @@ static int pcnet32_open(struct net_devic
+ 	}
+ 
+ 	/* Reset the PCNET32 */
+-	lp->a.reset(ioaddr);
++	lp->a->reset(ioaddr);
+ 
+ 	/* switch pcnet32 to 32bit mode */
+-	lp->a.write_bcr(ioaddr, 20, 2);
++	lp->a->write_bcr(ioaddr, 20, 2);
+ 
+ 	if (netif_msg_ifup(lp))
+ 		printk(KERN_DEBUG
+@@ -2122,14 +2122,14 @@ static int pcnet32_open(struct net_devic
+ 		       (u32) (lp->init_dma_addr));
+ 
+ 	/* set/reset autoselect bit */
+-	val = lp->a.read_bcr(ioaddr, 2) & ~2;
++	val = lp->a->read_bcr(ioaddr, 2) & ~2;
+ 	if (lp->options & PCNET32_PORT_ASEL)
+ 		val |= 2;
+-	lp->a.write_bcr(ioaddr, 2, val);
++	lp->a->write_bcr(ioaddr, 2, val);
+ 
+ 	/* handle full duplex setting */
+ 	if (lp->mii_if.full_duplex) {
+-		val = lp->a.read_bcr(ioaddr, 9) & ~3;
++		val = lp->a->read_bcr(ioaddr, 9) & ~3;
+ 		if (lp->options & PCNET32_PORT_FD) {
+ 			val |= 1;
+ 			if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
+@@ -2139,14 +2139,14 @@ static int pcnet32_open(struct net_devic
+ 			if (lp->chip_version == 0x2627)
+ 				val |= 3;
+ 		}
+-		lp->a.write_bcr(ioaddr, 9, val);
++		lp->a->write_bcr(ioaddr, 9, val);
+ 	}
+ 
+ 	/* set/reset GPSI bit in test register */
+-	val = lp->a.read_csr(ioaddr, 124) & ~0x10;
++	val = lp->a->read_csr(ioaddr, 124) & ~0x10;
+ 	if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
+ 		val |= 0x10;
+-	lp->a.write_csr(ioaddr, 124, val);
++	lp->a->write_csr(ioaddr, 124, val);
+ 
+ 	/* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate */
+ 	if (pdev && pdev->subsystem_vendor == PCI_VENDOR_ID_AT &&
+@@ -2167,24 +2167,24 @@ static int pcnet32_open(struct net_devic
+ 		 * duplex, and/or enable auto negotiation, and clear DANAS
+ 		 */
+ 		if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
+-			lp->a.write_bcr(ioaddr, 32,
+-					lp->a.read_bcr(ioaddr, 32) | 0x0080);
++			lp->a->write_bcr(ioaddr, 32,
++					lp->a->read_bcr(ioaddr, 32) | 0x0080);
+ 			/* disable Auto Negotiation, set 10Mpbs, HD */
+-			val = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
++			val = lp->a->read_bcr(ioaddr, 32) & ~0xb8;
+ 			if (lp->options & PCNET32_PORT_FD)
+ 				val |= 0x10;
+ 			if (lp->options & PCNET32_PORT_100)
+ 				val |= 0x08;
+-			lp->a.write_bcr(ioaddr, 32, val);
++			lp->a->write_bcr(ioaddr, 32, val);
+ 		} else {
+ 			if (lp->options & PCNET32_PORT_ASEL) {
+-				lp->a.write_bcr(ioaddr, 32,
+-						lp->a.read_bcr(ioaddr,
++				lp->a->write_bcr(ioaddr, 32,
++						lp->a->read_bcr(ioaddr,
+ 							       32) | 0x0080);
+ 				/* enable auto negotiate, setup, disable fd */
+-				val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
++				val = lp->a->read_bcr(ioaddr, 32) & ~0x98;
+ 				val |= 0x20;
+-				lp->a.write_bcr(ioaddr, 32, val);
++				lp->a->write_bcr(ioaddr, 32, val);
+ 			}
+ 		}
+ 	} else {
+@@ -2197,10 +2197,10 @@ static int pcnet32_open(struct net_devic
+ 		 * There is really no good other way to handle multiple PHYs
+ 		 * other than turning off all automatics
+ 		 */
+-		val = lp->a.read_bcr(ioaddr, 2);
+-		lp->a.write_bcr(ioaddr, 2, val & ~2);
+-		val = lp->a.read_bcr(ioaddr, 32);
+-		lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7));	/* stop MII manager */
++		val = lp->a->read_bcr(ioaddr, 2);
++		lp->a->write_bcr(ioaddr, 2, val & ~2);
++		val = lp->a->read_bcr(ioaddr, 32);
++		lp->a->write_bcr(ioaddr, 32, val & ~(1 << 7));	/* stop MII manager */
+ 
+ 		if (!(lp->options & PCNET32_PORT_ASEL)) {
+ 			/* setup ecmd */
+@@ -2210,7 +2210,7 @@ static int pcnet32_open(struct net_devic
+ 			ecmd.speed =
+ 			    lp->
+ 			    options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10;
+-			bcr9 = lp->a.read_bcr(ioaddr, 9);
++			bcr9 = lp->a->read_bcr(ioaddr, 9);
+ 
+ 			if (lp->options & PCNET32_PORT_FD) {
+ 				ecmd.duplex = DUPLEX_FULL;
+@@ -2219,7 +2219,7 @@ static int pcnet32_open(struct net_devic
+ 				ecmd.duplex = DUPLEX_HALF;
+ 				bcr9 |= ~(1 << 0);
+ 			}
+-			lp->a.write_bcr(ioaddr, 9, bcr9);
++			lp->a->write_bcr(ioaddr, 9, bcr9);
+ 		}
+ 
+ 		for (i = 0; i < PCNET32_MAX_PHYS; i++) {
+@@ -2252,9 +2252,9 @@ static int pcnet32_open(struct net_devic
+ 
+ #ifdef DO_DXSUFLO
+ 	if (lp->dxsuflo) {	/* Disable transmit stop on underflow */
+-		val = lp->a.read_csr(ioaddr, CSR3);
++		val = lp->a->read_csr(ioaddr, CSR3);
+ 		val |= 0x40;
+-		lp->a.write_csr(ioaddr, CSR3, val);
++		lp->a->write_csr(ioaddr, CSR3, val);
+ 	}
+ #endif
+ 
+@@ -2270,11 +2270,11 @@ static int pcnet32_open(struct net_devic
+ 	napi_enable(&lp->napi);
+ 
+ 	/* Re-initialize the PCNET32, and start it when done. */
+-	lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
+-	lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
++	lp->a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
++	lp->a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
+ 
+-	lp->a.write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
++	lp->a->write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
+ 
+ 	netif_start_queue(dev);
+ 
+@@ -2286,20 +2286,20 @@ static int pcnet32_open(struct net_devic
+ 
+ 	i = 0;
+ 	while (i++ < 100)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
+ 			break;
+ 	/*
+ 	 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
+ 	 * reports that doing so triggers a bug in the '974.
+ 	 */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_NORMAL);
+ 
+ 	if (netif_msg_ifup(lp))
+ 		printk(KERN_DEBUG
+ 		       "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n",
+ 		       dev->name, i,
+ 		       (u32) (lp->init_dma_addr),
+-		       lp->a.read_csr(ioaddr, CSR0));
++		       lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+@@ -2313,7 +2313,7 @@ static int pcnet32_open(struct net_devic
+ 	 * Switch back to 16bit mode to avoid problems with dumb
+ 	 * DOS packet driver after a warm reboot
+ 	 */
+-	lp->a.write_bcr(ioaddr, 20, 4);
++	lp->a->write_bcr(ioaddr, 20, 4);
+ 
+       err_free_irq:
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+@@ -2420,7 +2420,7 @@ static void pcnet32_restart(struct net_d
+ 
+ 	/* wait for stop */
+ 	for (i = 0; i < 100; i++)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_STOP)
+ 			break;
+ 
+ 	if (i >= 100 && netif_msg_drv(lp))
+@@ -2433,13 +2433,13 @@ static void pcnet32_restart(struct net_d
+ 		return;
+ 
+ 	/* ReInit Ring */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
+ 	i = 0;
+ 	while (i++ < 1000)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
+ 			break;
+ 
+-	lp->a.write_csr(ioaddr, CSR0, csr0_bits);
++	lp->a->write_csr(ioaddr, CSR0, csr0_bits);
+ }
+ 
+ static void pcnet32_tx_timeout(struct net_device *dev)
+@@ -2452,8 +2452,8 @@ static void pcnet32_tx_timeout(struct ne
+ 	if (pcnet32_debug & NETIF_MSG_DRV)
+ 		printk(KERN_ERR
+ 		       "%s: transmit timed out, status %4.4x, resetting.\n",
+-		       dev->name, lp->a.read_csr(ioaddr, CSR0));
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
++		       dev->name, lp->a->read_csr(ioaddr, CSR0));
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
+ 	dev->stats.tx_errors++;
+ 	if (netif_msg_tx_err(lp)) {
+ 		int i;
+@@ -2497,7 +2497,7 @@ static netdev_tx_t pcnet32_start_xmit(st
+ 	if (netif_msg_tx_queued(lp)) {
+ 		printk(KERN_DEBUG
+ 		       "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
+-		       dev->name, lp->a.read_csr(ioaddr, CSR0));
++		       dev->name, lp->a->read_csr(ioaddr, CSR0));
+ 	}
+ 
+ 	/* Default status -- will not enable Successful-TxDone
+@@ -2528,7 +2528,7 @@ static netdev_tx_t pcnet32_start_xmit(st
+ 	dev->stats.tx_bytes += skb->len;
+ 
+ 	/* Trigger an immediate send poll. */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
+ 
+ 	dev->trans_start = jiffies;
+ 
+@@ -2555,18 +2555,18 @@ pcnet32_interrupt(int irq, void *dev_id)
+ 
+ 	spin_lock(&lp->lock);
+ 
+-	csr0 = lp->a.read_csr(ioaddr, CSR0);
++	csr0 = lp->a->read_csr(ioaddr, CSR0);
+ 	while ((csr0 & 0x8f00) && --boguscnt >= 0) {
+ 		if (csr0 == 0xffff) {
+ 			break;	/* PCMCIA remove happened */
+ 		}
+ 		/* Acknowledge all of the current interrupt sources ASAP. */
+-		lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
++		lp->a->write_csr(ioaddr, CSR0, csr0 & ~0x004f);
+ 
+ 		if (netif_msg_intr(lp))
+ 			printk(KERN_DEBUG
+ 			       "%s: interrupt  csr0=%#2.2x new csr=%#2.2x.\n",
+-			       dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
++			       dev->name, csr0, lp->a->read_csr(ioaddr, CSR0));
+ 
+ 		/* Log misc errors. */
+ 		if (csr0 & 0x4000)
+@@ -2595,19 +2595,19 @@ pcnet32_interrupt(int irq, void *dev_id)
+ 		if (napi_schedule_prep(&lp->napi)) {
+ 			u16 val;
+ 			/* set interrupt masks */
+-			val = lp->a.read_csr(ioaddr, CSR3);
++			val = lp->a->read_csr(ioaddr, CSR3);
+ 			val |= 0x5f00;
+-			lp->a.write_csr(ioaddr, CSR3, val);
++			lp->a->write_csr(ioaddr, CSR3, val);
+ 
+ 			__napi_schedule(&lp->napi);
+ 			break;
+ 		}
+-		csr0 = lp->a.read_csr(ioaddr, CSR0);
++		csr0 = lp->a->read_csr(ioaddr, CSR0);
+ 	}
+ 
+ 	if (netif_msg_intr(lp))
+ 		printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
+-		       dev->name, lp->a.read_csr(ioaddr, CSR0));
++		       dev->name, lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	spin_unlock(&lp->lock);
+ 
+@@ -2627,21 +2627,21 @@ static int pcnet32_close(struct net_devi
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 
+-	dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
++	dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
+ 
+ 	if (netif_msg_ifdown(lp))
+ 		printk(KERN_DEBUG
+ 		       "%s: Shutting down ethercard, status was %2.2x.\n",
+-		       dev->name, lp->a.read_csr(ioaddr, CSR0));
++		       dev->name, lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	/* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
+ 
+ 	/*
+ 	 * Switch back to 16bit mode to avoid problems with dumb
+ 	 * DOS packet driver after a warm reboot
+ 	 */
+-	lp->a.write_bcr(ioaddr, 20, 4);
++	lp->a->write_bcr(ioaddr, 20, 4);
+ 
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+@@ -2664,7 +2664,7 @@ static struct net_device_stats *pcnet32_
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
++	dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+ 	return &dev->stats;
+@@ -2686,10 +2686,10 @@ static void pcnet32_load_multicast(struc
+ 	if (dev->flags & IFF_ALLMULTI) {
+ 		ib->filter[0] = cpu_to_le32(~0U);
+ 		ib->filter[1] = cpu_to_le32(~0U);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
+ 		return;
+ 	}
+ 	/* clear the multicast filter */
+@@ -2710,7 +2710,7 @@ static void pcnet32_load_multicast(struc
+ 		mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
+ 	}
+ 	for (i = 0; i < 4; i++)
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER + i,
+ 				le16_to_cpu(mcast_table[i]));
+ 	return;
+ }
+@@ -2726,7 +2726,7 @@ static void pcnet32_set_multicast_list(s
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 	suspended = pcnet32_suspend(dev, &flags, 0);
+-	csr15 = lp->a.read_csr(ioaddr, CSR15);
++	csr15 = lp->a->read_csr(ioaddr, CSR15);
+ 	if (dev->flags & IFF_PROMISC) {
+ 		/* Log any net taps. */
+ 		if (netif_msg_hw(lp))
+@@ -2735,21 +2735,21 @@ static void pcnet32_set_multicast_list(s
+ 		lp->init_block->mode =
+ 		    cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
+ 				7);
+-		lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
++		lp->a->write_csr(ioaddr, CSR15, csr15 | 0x8000);
+ 	} else {
+ 		lp->init_block->mode =
+ 		    cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
+-		lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
++		lp->a->write_csr(ioaddr, CSR15, csr15 & 0x7fff);
+ 		pcnet32_load_multicast(dev);
+ 	}
+ 
+ 	if (suspended) {
+ 		int csr5;
+ 		/* clear SUSPEND (SPND) - CSR5 bit 0 */
+-		csr5 = lp->a.read_csr(ioaddr, CSR5);
+-		lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
++		csr5 = lp->a->read_csr(ioaddr, CSR5);
++		lp->a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
+ 	} else {
+-		lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
++		lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
+ 		pcnet32_restart(dev, CSR0_NORMAL);
+ 		netif_wake_queue(dev);
+ 	}
+@@ -2767,8 +2767,8 @@ static int mdio_read(struct net_device *
+ 	if (!lp->mii)
+ 		return 0;
+ 
+-	lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
+-	val_out = lp->a.read_bcr(ioaddr, 34);
++	lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
++	val_out = lp->a->read_bcr(ioaddr, 34);
+ 
+ 	return val_out;
+ }
+@@ -2782,8 +2782,8 @@ static void mdio_write(struct net_device
+ 	if (!lp->mii)
+ 		return;
+ 
+-	lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
+-	lp->a.write_bcr(ioaddr, 34, val);
++	lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
++	lp->a->write_bcr(ioaddr, 34, val);
+ }
+ 
+ static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -2862,7 +2862,7 @@ static void pcnet32_check_media(struct n
+ 		curr_link = mii_link_ok(&lp->mii_if);
+ 	} else {
+ 		ulong ioaddr = dev->base_addr;	/* card base I/O address */
+-		curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
++		curr_link = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
+ 	}
+ 	if (!curr_link) {
+ 		if (prev_link || verbose) {
+@@ -2887,13 +2887,13 @@ static void pcnet32_check_media(struct n
+ 				       (ecmd.duplex ==
+ 					DUPLEX_FULL) ? "full" : "half");
+ 			}
+-			bcr9 = lp->a.read_bcr(dev->base_addr, 9);
++			bcr9 = lp->a->read_bcr(dev->base_addr, 9);
+ 			if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
+ 				if (lp->mii_if.full_duplex)
+ 					bcr9 |= (1 << 0);
+ 				else
+ 					bcr9 &= ~(1 << 0);
+-				lp->a.write_bcr(dev->base_addr, 9, bcr9);
++				lp->a->write_bcr(dev->base_addr, 9, bcr9);
+ 			}
+ 		} else {
+ 			if (netif_msg_link(lp))
 diff -urNp linux-2.6.32.43/drivers/net/tg3.h linux-2.6.32.43/drivers/net/tg3.h
 --- linux-2.6.32.43/drivers/net/tg3.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/tg3.h	2011-04-17 15:56:46.000000000 -0400
@@ -32913,6 +34888,79 @@ diff -urNp linux-2.6.32.43/drivers/net/tg3.h linux-2.6.32.43/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.32.43/drivers/net/tokenring/abyss.c linux-2.6.32.43/drivers/net/tokenring/abyss.c
+--- linux-2.6.32.43/drivers/net/tokenring/abyss.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/tokenring/abyss.c	2011-08-05 20:33:55.000000000 -0400
+@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
+ 
+ static int __init abyss_init (void)
+ {
+-	abyss_netdev_ops = tms380tr_netdev_ops;
++	pax_open_kernel();
++	memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
+ 
+-	abyss_netdev_ops.ndo_open = abyss_open;
+-	abyss_netdev_ops.ndo_stop = abyss_close;
++	*(void **)&abyss_netdev_ops.ndo_open = abyss_open;
++	*(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
++	pax_close_kernel();
+ 
+ 	return pci_register_driver(&abyss_driver);
+ }
+diff -urNp linux-2.6.32.43/drivers/net/tokenring/madgemc.c linux-2.6.32.43/drivers/net/tokenring/madgemc.c
+--- linux-2.6.32.43/drivers/net/tokenring/madgemc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/tokenring/madgemc.c	2011-08-05 20:33:55.000000000 -0400
+@@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver 
+ 
+ static int __init madgemc_init (void)
+ {
+-	madgemc_netdev_ops = tms380tr_netdev_ops;
+-	madgemc_netdev_ops.ndo_open = madgemc_open;
+-	madgemc_netdev_ops.ndo_stop = madgemc_close;
++	pax_open_kernel();
++	memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
++	*(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
++	pax_close_kernel();
+ 
+ 	return mca_register_driver (&madgemc_driver);
+ }
+diff -urNp linux-2.6.32.43/drivers/net/tokenring/proteon.c linux-2.6.32.43/drivers/net/tokenring/proteon.c
+--- linux-2.6.32.43/drivers/net/tokenring/proteon.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/tokenring/proteon.c	2011-08-05 20:33:55.000000000 -0400
+@@ -353,9 +353,11 @@ static int __init proteon_init(void)
+ 	struct platform_device *pdev;
+ 	int i, num = 0, err = 0;
+ 
+-	proteon_netdev_ops = tms380tr_netdev_ops;
+-	proteon_netdev_ops.ndo_open = proteon_open;
+-	proteon_netdev_ops.ndo_stop = tms380tr_close;
++	pax_open_kernel();
++	memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&proteon_netdev_ops.ndo_open = proteon_open;
++	*(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
++	pax_close_kernel();
+ 
+ 	err = platform_driver_register(&proteon_driver);
+ 	if (err)
+diff -urNp linux-2.6.32.43/drivers/net/tokenring/skisa.c linux-2.6.32.43/drivers/net/tokenring/skisa.c
+--- linux-2.6.32.43/drivers/net/tokenring/skisa.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/tokenring/skisa.c	2011-08-05 20:33:55.000000000 -0400
+@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
+ 	struct platform_device *pdev;
+ 	int i, num = 0, err = 0;
+ 
+-	sk_isa_netdev_ops = tms380tr_netdev_ops;
+-	sk_isa_netdev_ops.ndo_open = sk_isa_open;
+-	sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++	pax_open_kernel();
++	memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
++	*(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++	pax_close_kernel();
+ 
+ 	err = platform_driver_register(&sk_isa_driver);
+ 	if (err)
 diff -urNp linux-2.6.32.43/drivers/net/tulip/de2104x.c linux-2.6.32.43/drivers/net/tulip/de2104x.c
 --- linux-2.6.32.43/drivers/net/tulip/de2104x.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/tulip/de2104x.c	2011-05-16 21:46:57.000000000 -0400
@@ -33036,6 +35084,18 @@ diff -urNp linux-2.6.32.43/drivers/net/usb/hso.c linux-2.6.32.43/drivers/net/usb
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
+diff -urNp linux-2.6.32.43/drivers/net/vxge/vxge-config.h linux-2.6.32.43/drivers/net/vxge/vxge-config.h
+--- linux-2.6.32.43/drivers/net/vxge/vxge-config.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/vxge/vxge-config.h	2011-08-05 20:33:55.000000000 -0400
+@@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs {
+ 	void (*link_down)(struct __vxge_hw_device *devh);
+ 	void (*crit_err)(struct __vxge_hw_device *devh,
+ 			enum vxge_hw_event type, u64 ext_data);
+-};
++} __no_const;
+ 
+ /*
+  * struct __vxge_hw_blockpool_entry - Block private data structure
 diff -urNp linux-2.6.32.43/drivers/net/vxge/vxge-main.c linux-2.6.32.43/drivers/net/vxge/vxge-main.c
 --- linux-2.6.32.43/drivers/net/vxge/vxge-main.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/vxge/vxge-main.c	2011-05-16 21:46:57.000000000 -0400
@@ -33057,6 +35117,18 @@ diff -urNp linux-2.6.32.43/drivers/net/vxge/vxge-main.c linux-2.6.32.43/drivers/
  	/*
  	 * Filling
  	 * 	- itable with bucket numbers
+diff -urNp linux-2.6.32.43/drivers/net/vxge/vxge-traffic.h linux-2.6.32.43/drivers/net/vxge/vxge-traffic.h
+--- linux-2.6.32.43/drivers/net/vxge/vxge-traffic.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/vxge/vxge-traffic.h	2011-08-05 20:33:55.000000000 -0400
+@@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs {
+ 			struct vxge_hw_mempool_dma	*dma_object,
+ 			u32			index,
+ 			u32			is_last);
+-};
++} __no_const;
+ 
+ void
+ __vxge_hw_mempool_destroy(
 diff -urNp linux-2.6.32.43/drivers/net/wan/cycx_x25.c linux-2.6.32.43/drivers/net/wan/cycx_x25.c
 --- linux-2.6.32.43/drivers/net/wan/cycx_x25.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/wan/cycx_x25.c	2011-05-16 21:46:57.000000000 -0400
@@ -33069,6 +35141,34 @@ diff -urNp linux-2.6.32.43/drivers/net/wan/cycx_x25.c linux-2.6.32.43/drivers/ne
  	if (len >= (sizeof(hex) / 2))
  		len = (sizeof(hex) / 2) - 1;
  
+diff -urNp linux-2.6.32.43/drivers/net/wan/hdlc_x25.c linux-2.6.32.43/drivers/net/wan/hdlc_x25.c
+--- linux-2.6.32.43/drivers/net/wan/hdlc_x25.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/wan/hdlc_x25.c	2011-08-05 20:33:55.000000000 -0400
+@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
+ 
+ static int x25_open(struct net_device *dev)
+ {
+-	struct lapb_register_struct cb;
++	static struct lapb_register_struct cb = {
++		.connect_confirmation = x25_connected,
++		.connect_indication = x25_connected,
++		.disconnect_confirmation = x25_disconnected,
++		.disconnect_indication = x25_disconnected,
++		.data_indication = x25_data_indication,
++		.data_transmit = x25_data_transmit
++	};
+ 	int result;
+ 
+-	cb.connect_confirmation = x25_connected;
+-	cb.connect_indication = x25_connected;
+-	cb.disconnect_confirmation = x25_disconnected;
+-	cb.disconnect_indication = x25_disconnected;
+-	cb.data_indication = x25_data_indication;
+-	cb.data_transmit = x25_data_transmit;
+-
+ 	result = lapb_register(dev, &cb);
+ 	if (result != LAPB_OK)
+ 		return result;
 diff -urNp linux-2.6.32.43/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.43/drivers/net/wimax/i2400m/usb-fw.c
 --- linux-2.6.32.43/drivers/net/wimax/i2400m/usb-fw.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/wimax/i2400m/usb-fw.c	2011-05-16 21:46:57.000000000 -0400
@@ -33249,6 +35349,20 @@ diff -urNp linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl1000_lib,
  	.hcmd = &iwl5000_hcmd,
+diff -urNp linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl3945-base.c
+--- linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-08-05 20:33:55.000000000 -0400
+@@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_
+ 	 */
+ 	if (iwl3945_mod_params.disable_hw_scan) {
+ 		IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
+-		iwl3945_hw_ops.hw_scan = NULL;
++		pax_open_kernel();
++		*(void **)&iwl3945_hw_ops.hw_scan = NULL;
++		pax_close_kernel();
+ 	}
+ 
+ 
 diff -urNp linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-3945.c
 --- linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-04-17 15:56:46.000000000 -0400
@@ -33305,6 +35419,20 @@ diff -urNp linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl6000_lib,
  	.hcmd = &iwl5000_hcmd,
+diff -urNp linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn.c
+--- linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev 
+ 		if (iwl_debug_level & IWL_DL_INFO)
+ 			dev_printk(KERN_DEBUG, &(pdev->dev),
+ 				   "Disabling hw_scan\n");
+-		iwl_hw_ops.hw_scan = NULL;
++		pax_open_kernel();
++		*(void **)&iwl_hw_ops.hw_scan = NULL;
++		pax_close_kernel();
+ 	}
+ 
+ 	hw = iwl_alloc_all(cfg, &iwl_hw_ops);
 diff -urNp linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
 --- linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-05-16 21:46:57.000000000 -0400
@@ -33568,6 +35696,18 @@ diff -urNp linux-2.6.32.43/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.43/dr
  	.handler = handle_hotplug_event_func,
  };
  
+diff -urNp linux-2.6.32.43/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.43/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-2.6.32.43/drivers/pci/hotplug/cpci_hotplug.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/pci/hotplug/cpci_hotplug.h	2011-08-05 20:33:55.000000000 -0400
+@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
+ 	int (*hardware_test) (struct slot* slot, u32 value);
+ 	u8  (*get_power) (struct slot* slot);
+ 	int (*set_power) (struct slot* slot, int value);
+-};
++} __no_const;
+ 
+ struct cpci_hp_controller {
+ 	unsigned int irq;
 diff -urNp linux-2.6.32.43/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.43/drivers/pci/hotplug/cpqphp_nvram.c
 --- linux-2.6.32.43/drivers/pci/hotplug/cpqphp_nvram.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/pci/hotplug/cpqphp_nvram.c	2011-04-17 15:56:46.000000000 -0400
@@ -33871,7 +36011,16 @@ diff -urNp linux-2.6.32.43/drivers/platform/x86/sony-laptop.c linux-2.6.32.43/dr
  };
 diff -urNp linux-2.6.32.43/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.43/drivers/platform/x86/thinkpad_acpi.c
 --- linux-2.6.32.43/drivers/platform/x86/thinkpad_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/platform/x86/thinkpad_acpi.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/drivers/platform/x86/thinkpad_acpi.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2137,7 +2137,7 @@ static int hotkey_mask_get(void)
+ 	return 0;
+ }
+ 
+-void static hotkey_mask_warn_incomplete_mask(void)
++static void hotkey_mask_warn_incomplete_mask(void)
+ {
+ 	/* log only what the user can fix... */
+ 	const u32 wantedmask = hotkey_driver_mask &
 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
  			       BACKLIGHT_UPDATE_HOTKEY);
  }
@@ -33973,6 +36122,18 @@ diff -urNp linux-2.6.32.43/drivers/pnp/resource.c linux-2.6.32.43/drivers/pnp/re
  		return 0;
  
  	/* check if the resource is reserved */
+diff -urNp linux-2.6.32.43/drivers/power/bq27x00_battery.c linux-2.6.32.43/drivers/power/bq27x00_battery.c
+--- linux-2.6.32.43/drivers/power/bq27x00_battery.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/power/bq27x00_battery.c	2011-08-05 20:33:55.000000000 -0400
+@@ -44,7 +44,7 @@ struct bq27x00_device_info;
+ struct bq27x00_access_methods {
+ 	int (*read)(u8 reg, int *rt_value, int b_single,
+ 		struct bq27x00_device_info *di);
+-};
++} __no_const;
+ 
+ struct bq27x00_device_info {
+ 	struct device 		*dev;
 diff -urNp linux-2.6.32.43/drivers/rtc/rtc-dev.c linux-2.6.32.43/drivers/rtc/rtc-dev.c
 --- linux-2.6.32.43/drivers/rtc/rtc-dev.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/rtc/rtc-dev.c	2011-04-17 15:56:46.000000000 -0400
@@ -34146,6 +36307,18 @@ diff -urNp linux-2.6.32.43/drivers/s390/cio/qdio_perf.h linux-2.6.32.43/drivers/
  }
  
  int qdio_setup_perf_stats(void);
+diff -urNp linux-2.6.32.43/drivers/scsi/aacraid/aacraid.h linux-2.6.32.43/drivers/scsi/aacraid/aacraid.h
+--- linux-2.6.32.43/drivers/scsi/aacraid/aacraid.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/aacraid/aacraid.h	2011-08-05 20:33:55.000000000 -0400
+@@ -471,7 +471,7 @@ struct adapter_ops
+ 	int  (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
+ 	/* Administrative operations */
+ 	int  (*adapter_comm)(struct aac_dev * dev, int comm);
+-};
++} __no_const;
+ 
+ /*
+  *	Define which interrupt handler needs to be installed
 diff -urNp linux-2.6.32.43/drivers/scsi/aacraid/commctrl.c linux-2.6.32.43/drivers/scsi/aacraid/commctrl.c
 --- linux-2.6.32.43/drivers/scsi/aacraid/commctrl.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/scsi/aacraid/commctrl.c	2011-05-16 21:46:57.000000000 -0400
@@ -34169,6 +36342,30 @@ diff -urNp linux-2.6.32.43/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.43/d
  	asd_show_update_bios, asd_store_update_bios);
  
  static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
+diff -urNp linux-2.6.32.43/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.43/drivers/scsi/bfa/bfa_iocfc.h
+--- linux-2.6.32.43/drivers/scsi/bfa/bfa_iocfc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/bfa/bfa_iocfc.h	2011-08-05 20:33:55.000000000 -0400
+@@ -61,7 +61,7 @@ struct bfa_hwif_s {
+ 	void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
+ 	void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
+ 			u32 *nvecs, u32 *maxvec);
+-};
++} __no_const;
+ typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
+ 
+ struct bfa_iocfc_s {
+diff -urNp linux-2.6.32.43/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.43/drivers/scsi/bfa/bfa_ioc.h
+--- linux-2.6.32.43/drivers/scsi/bfa/bfa_ioc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/bfa/bfa_ioc.h	2011-08-05 20:33:55.000000000 -0400
+@@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s {
+ 	bfa_ioc_disable_cbfn_t	disable_cbfn;
+ 	bfa_ioc_hbfail_cbfn_t	hbfail_cbfn;
+ 	bfa_ioc_reset_cbfn_t	reset_cbfn;
+-};
++} __no_const;
+ 
+ /**
+  * Heartbeat failure notification queue element.
 diff -urNp linux-2.6.32.43/drivers/scsi/BusLogic.c linux-2.6.32.43/drivers/scsi/BusLogic.c
 --- linux-2.6.32.43/drivers/scsi/BusLogic.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/scsi/BusLogic.c	2011-05-16 21:46:57.000000000 -0400
@@ -34226,6 +36423,18 @@ diff -urNp linux-2.6.32.43/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.43/drivers/s
  	fiph = (struct fip_header *)skb->data;
  	sub = fiph->fip_subcode;
  	if (sub != FIP_SC_REQ && sub != FIP_SC_REP)
+diff -urNp linux-2.6.32.43/drivers/scsi/fnic/fnic_main.c linux-2.6.32.43/drivers/scsi/fnic/fnic_main.c
+--- linux-2.6.32.43/drivers/scsi/fnic/fnic_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/fnic/fnic_main.c	2011-08-05 20:33:55.000000000 -0400
+@@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct p
+ 	/* Start local port initiatialization */
+ 
+ 	lp->link_up = 0;
+-	lp->tt = fnic_transport_template;
++	memcpy((void *)&lp->tt, &fnic_transport_template, sizeof(fnic_transport_template));
+ 
+ 	lp->max_retry_count = fnic->config.flogi_retries;
+ 	lp->max_rport_retry_count = fnic->config.plogi_retries;
 diff -urNp linux-2.6.32.43/drivers/scsi/gdth.c linux-2.6.32.43/drivers/scsi/gdth.c
 --- linux-2.6.32.43/drivers/scsi/gdth.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/scsi/gdth.c	2011-05-16 21:46:57.000000000 -0400
@@ -34321,9 +36530,57 @@ diff -urNp linux-2.6.32.43/drivers/scsi/ipr.c linux-2.6.32.43/drivers/scsi/ipr.c
  	.phy_reset = ipr_ata_phy_reset,
  	.hardreset = ipr_sata_reset,
  	.post_internal_cmd = ipr_ata_post_internal,
+diff -urNp linux-2.6.32.43/drivers/scsi/ips.h linux-2.6.32.43/drivers/scsi/ips.h
+--- linux-2.6.32.43/drivers/scsi/ips.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/ips.h	2011-08-05 20:33:55.000000000 -0400
+@@ -1027,7 +1027,7 @@ typedef struct {
+    int       (*intr)(struct ips_ha *);
+    void      (*enableint)(struct ips_ha *);
+    uint32_t (*statupd)(struct ips_ha *);
+-} ips_hw_func_t;
++} __no_const ips_hw_func_t;
+ 
+ typedef struct ips_ha {
+    uint8_t            ha_id[IPS_MAX_CHANNELS+1];
+diff -urNp linux-2.6.32.43/drivers/scsi/libfc/fc_disc.c linux-2.6.32.43/drivers/scsi/libfc/fc_disc.c
+--- linux-2.6.32.43/drivers/scsi/libfc/fc_disc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/libfc/fc_disc.c	2011-08-05 20:33:55.000000000 -0400
+@@ -715,16 +715,16 @@ int fc_disc_init(struct fc_lport *lport)
+ 	struct fc_disc *disc;
+ 
+ 	if (!lport->tt.disc_start)
+-		lport->tt.disc_start = fc_disc_start;
++		*(void **)&lport->tt.disc_start = fc_disc_start;
+ 
+ 	if (!lport->tt.disc_stop)
+-		lport->tt.disc_stop = fc_disc_stop;
++		*(void **)&lport->tt.disc_stop = fc_disc_stop;
+ 
+ 	if (!lport->tt.disc_stop_final)
+-		lport->tt.disc_stop_final = fc_disc_stop_final;
++		*(void **)&lport->tt.disc_stop_final = fc_disc_stop_final;
+ 
+ 	if (!lport->tt.disc_recv_req)
+-		lport->tt.disc_recv_req = fc_disc_recv_req;
++		*(void **)&lport->tt.disc_recv_req = fc_disc_recv_req;
+ 
+ 	disc = &lport->disc;
+ 	INIT_DELAYED_WORK(&disc->disc_work, fc_disc_timeout);
+diff -urNp linux-2.6.32.43/drivers/scsi/libfc/fc_elsct.c linux-2.6.32.43/drivers/scsi/libfc/fc_elsct.c
+--- linux-2.6.32.43/drivers/scsi/libfc/fc_elsct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/libfc/fc_elsct.c	2011-08-05 20:33:55.000000000 -0400
+@@ -67,7 +67,7 @@ static struct fc_seq *fc_elsct_send(stru
+ int fc_elsct_init(struct fc_lport *lport)
+ {
+ 	if (!lport->tt.elsct_send)
+-		lport->tt.elsct_send = fc_elsct_send;
++		*(void **)&lport->tt.elsct_send = fc_elsct_send;
+ 
+ 	return 0;
+ }
 diff -urNp linux-2.6.32.43/drivers/scsi/libfc/fc_exch.c linux-2.6.32.43/drivers/scsi/libfc/fc_exch.c
 --- linux-2.6.32.43/drivers/scsi/libfc/fc_exch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/scsi/libfc/fc_exch.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/libfc/fc_exch.c	2011-08-05 20:33:55.000000000 -0400
 @@ -86,12 +86,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -34445,6 +36702,120 @@ diff -urNp linux-2.6.32.43/drivers/scsi/libfc/fc_exch.c linux-2.6.32.43/drivers/
  
  	fc_frame_free(fp);
  }
+@@ -2027,25 +2027,25 @@ EXPORT_SYMBOL(fc_exch_recv);
+ int fc_exch_init(struct fc_lport *lp)
+ {
+ 	if (!lp->tt.seq_start_next)
+-		lp->tt.seq_start_next = fc_seq_start_next;
++		*(void **)&lp->tt.seq_start_next = fc_seq_start_next;
+ 
+ 	if (!lp->tt.exch_seq_send)
+-		lp->tt.exch_seq_send = fc_exch_seq_send;
++		*(void **)&lp->tt.exch_seq_send = fc_exch_seq_send;
+ 
+ 	if (!lp->tt.seq_send)
+-		lp->tt.seq_send = fc_seq_send;
++		*(void **)&lp->tt.seq_send = fc_seq_send;
+ 
+ 	if (!lp->tt.seq_els_rsp_send)
+-		lp->tt.seq_els_rsp_send = fc_seq_els_rsp_send;
++		*(void **)&lp->tt.seq_els_rsp_send = fc_seq_els_rsp_send;
+ 
+ 	if (!lp->tt.exch_done)
+-		lp->tt.exch_done = fc_exch_done;
++		*(void **)&lp->tt.exch_done = fc_exch_done;
+ 
+ 	if (!lp->tt.exch_mgr_reset)
+-		lp->tt.exch_mgr_reset = fc_exch_mgr_reset;
++		*(void **)&lp->tt.exch_mgr_reset = fc_exch_mgr_reset;
+ 
+ 	if (!lp->tt.seq_exch_abort)
+-		lp->tt.seq_exch_abort = fc_seq_exch_abort;
++		*(void **)&lp->tt.seq_exch_abort = fc_seq_exch_abort;
+ 
+ 	/*
+ 	 * Initialize fc_cpu_mask and fc_cpu_order. The
+diff -urNp linux-2.6.32.43/drivers/scsi/libfc/fc_fcp.c linux-2.6.32.43/drivers/scsi/libfc/fc_fcp.c
+--- linux-2.6.32.43/drivers/scsi/libfc/fc_fcp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/libfc/fc_fcp.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2105,13 +2105,13 @@ int fc_fcp_init(struct fc_lport *lp)
+ 	struct fc_fcp_internal *si;
+ 
+ 	if (!lp->tt.fcp_cmd_send)
+-		lp->tt.fcp_cmd_send = fc_fcp_cmd_send;
++		*(void **)&lp->tt.fcp_cmd_send = fc_fcp_cmd_send;
+ 
+ 	if (!lp->tt.fcp_cleanup)
+-		lp->tt.fcp_cleanup = fc_fcp_cleanup;
++		*(void **)&lp->tt.fcp_cleanup = fc_fcp_cleanup;
+ 
+ 	if (!lp->tt.fcp_abort_io)
+-		lp->tt.fcp_abort_io = fc_fcp_abort_io;
++		*(void **)&lp->tt.fcp_abort_io = fc_fcp_abort_io;
+ 
+ 	si = kzalloc(sizeof(struct fc_fcp_internal), GFP_KERNEL);
+ 	if (!si)
+diff -urNp linux-2.6.32.43/drivers/scsi/libfc/fc_lport.c linux-2.6.32.43/drivers/scsi/libfc/fc_lport.c
+--- linux-2.6.32.43/drivers/scsi/libfc/fc_lport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/libfc/fc_lport.c	2011-08-05 20:33:55.000000000 -0400
+@@ -569,7 +569,7 @@ int fc_lport_destroy(struct fc_lport *lp
+ 	mutex_lock(&lport->lp_mutex);
+ 	lport->state = LPORT_ST_DISABLED;
+ 	lport->link_up = 0;
+-	lport->tt.frame_send = fc_frame_drop;
++	*(void **)&lport->tt.frame_send = fc_frame_drop;
+ 	mutex_unlock(&lport->lp_mutex);
+ 
+ 	lport->tt.fcp_abort_io(lport);
+@@ -1477,10 +1477,10 @@ EXPORT_SYMBOL(fc_lport_config);
+ int fc_lport_init(struct fc_lport *lport)
+ {
+ 	if (!lport->tt.lport_recv)
+-		lport->tt.lport_recv = fc_lport_recv_req;
++		*(void **)&lport->tt.lport_recv = fc_lport_recv_req;
+ 
+ 	if (!lport->tt.lport_reset)
+-		lport->tt.lport_reset = fc_lport_reset;
++		*(void **)&lport->tt.lport_reset = fc_lport_reset;
+ 
+ 	fc_host_port_type(lport->host) = FC_PORTTYPE_NPORT;
+ 	fc_host_node_name(lport->host) = lport->wwnn;
+diff -urNp linux-2.6.32.43/drivers/scsi/libfc/fc_rport.c linux-2.6.32.43/drivers/scsi/libfc/fc_rport.c
+--- linux-2.6.32.43/drivers/scsi/libfc/fc_rport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/libfc/fc_rport.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1566,25 +1566,25 @@ static void fc_rport_flush_queue(void)
+ int fc_rport_init(struct fc_lport *lport)
+ {
+ 	if (!lport->tt.rport_lookup)
+-		lport->tt.rport_lookup = fc_rport_lookup;
++		*(void **)&lport->tt.rport_lookup = fc_rport_lookup;
+ 
+ 	if (!lport->tt.rport_create)
+-		lport->tt.rport_create = fc_rport_create;
++		*(void **)&lport->tt.rport_create = fc_rport_create;
+ 
+ 	if (!lport->tt.rport_login)
+-		lport->tt.rport_login = fc_rport_login;
++		*(void **)&lport->tt.rport_login = fc_rport_login;
+ 
+ 	if (!lport->tt.rport_logoff)
+-		lport->tt.rport_logoff = fc_rport_logoff;
++		*(void **)&lport->tt.rport_logoff = fc_rport_logoff;
+ 
+ 	if (!lport->tt.rport_recv_req)
+-		lport->tt.rport_recv_req = fc_rport_recv_req;
++		*(void **)&lport->tt.rport_recv_req = fc_rport_recv_req;
+ 
+ 	if (!lport->tt.rport_flush_queue)
+-		lport->tt.rport_flush_queue = fc_rport_flush_queue;
++		*(void **)&lport->tt.rport_flush_queue = fc_rport_flush_queue;
+ 
+ 	if (!lport->tt.rport_destroy)
+-		lport->tt.rport_destroy = fc_rport_destroy;
++		*(void **)&lport->tt.rport_destroy = fc_rport_destroy;
+ 
+ 	return 0;
+ }
 diff -urNp linux-2.6.32.43/drivers/scsi/libsas/sas_ata.c linux-2.6.32.43/drivers/scsi/libsas/sas_ata.c
 --- linux-2.6.32.43/drivers/scsi/libsas/sas_ata.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/scsi/libsas/sas_ata.c	2011-04-23 12:56:11.000000000 -0400
@@ -34580,6 +36951,22 @@ diff -urNp linux-2.6.32.43/drivers/scsi/lpfc/lpfc.h linux-2.6.32.43/drivers/scsi
  #endif
  
  	/* Used for deferred freeing of ELS data buffers */
+diff -urNp linux-2.6.32.43/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.43/drivers/scsi/lpfc/lpfc_init.c
+--- linux-2.6.32.43/drivers/scsi/lpfc/lpfc_init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/lpfc/lpfc_init.c	2011-08-05 20:33:55.000000000 -0400
+@@ -8021,8 +8021,10 @@ lpfc_init(void)
+ 	printk(LPFC_COPYRIGHT "\n");
+ 
+ 	if (lpfc_enable_npiv) {
+-		lpfc_transport_functions.vport_create = lpfc_vport_create;
+-		lpfc_transport_functions.vport_delete = lpfc_vport_delete;
++		pax_open_kernel();
++		*(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
++		*(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
++		pax_close_kernel();
+ 	}
+ 	lpfc_transport_template =
+ 				fc_attach_transport(&lpfc_transport_functions);
 diff -urNp linux-2.6.32.43/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.43/drivers/scsi/lpfc/lpfc_scsi.c
 --- linux-2.6.32.43/drivers/scsi/lpfc/lpfc_scsi.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/scsi/lpfc/lpfc_scsi.c	2011-05-04 17:56:28.000000000 -0400
@@ -34734,6 +37121,18 @@ diff -urNp linux-2.6.32.43/drivers/scsi/pmcraid.h linux-2.6.32.43/drivers/scsi/p
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
+diff -urNp linux-2.6.32.43/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.43/drivers/scsi/qla2xxx/qla_def.h
+--- linux-2.6.32.43/drivers/scsi/qla2xxx/qla_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/scsi/qla2xxx/qla_def.h	2011-08-05 20:33:55.000000000 -0400
+@@ -2089,7 +2089,7 @@ struct isp_operations {
+ 
+ 	int (*get_flash_version) (struct scsi_qla_host *, void *);
+ 	int (*start_scsi) (srb_t *);
+-};
++} __no_const;
+ 
+ /* MSI-X Support *************************************************************/
+ 
 diff -urNp linux-2.6.32.43/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.43/drivers/scsi/qla4xxx/ql4_def.h
 --- linux-2.6.32.43/drivers/scsi/qla4xxx/ql4_def.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/scsi/qla4xxx/ql4_def.h	2011-05-04 17:56:28.000000000 -0400
@@ -35011,6 +37410,20 @@ diff -urNp linux-2.6.32.43/drivers/spi/spi.c linux-2.6.32.43/drivers/spi/spi.c
  
  static u8	*buf;
  
+diff -urNp linux-2.6.32.43/drivers/ssb/driver_gige.c linux-2.6.32.43/drivers/ssb/driver_gige.c
+--- linux-2.6.32.43/drivers/ssb/driver_gige.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/drivers/ssb/driver_gige.c	2011-08-05 20:33:55.000000000 -0400
+@@ -180,8 +180,8 @@ static int ssb_gige_probe(struct ssb_dev
+ 	dev->pci_controller.io_resource = &dev->io_resource;
+ 	dev->pci_controller.mem_resource = &dev->mem_resource;
+ 	dev->pci_controller.io_map_base = 0x800;
+-	dev->pci_ops.read = ssb_gige_pci_read_config;
+-	dev->pci_ops.write = ssb_gige_pci_write_config;
++	*(void **)&dev->pci_ops.read = ssb_gige_pci_read_config;
++	*(void **)&dev->pci_ops.write = ssb_gige_pci_write_config;
+ 
+ 	dev->io_resource.name = SSB_GIGE_IO_RES_NAME;
+ 	dev->io_resource.start = 0x800;
 diff -urNp linux-2.6.32.43/drivers/staging/android/binder.c linux-2.6.32.43/drivers/staging/android/binder.c
 --- linux-2.6.32.43/drivers/staging/android/binder.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/drivers/staging/android/binder.c	2011-04-17 15:56:46.000000000 -0400
@@ -36434,7 +38847,7 @@ diff -urNp linux-2.6.32.43/drivers/video/uvesafb.c linux-2.6.32.43/drivers/video
  		framebuffer_release(info);
 diff -urNp linux-2.6.32.43/drivers/video/vesafb.c linux-2.6.32.43/drivers/video/vesafb.c
 --- linux-2.6.32.43/drivers/video/vesafb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/drivers/video/vesafb.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/drivers/video/vesafb.c	2011-08-05 20:33:55.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -36501,17 +38914,16 @@ diff -urNp linux-2.6.32.43/drivers/video/vesafb.c linux-2.6.32.43/drivers/video/
  
  	if (ypan || pmi_setpal) {
  		unsigned short *pmi_base;
--		pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
++
+ 		pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
 -		pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
 -		pmi_pal   = (void*)((char*)pmi_base + pmi_base[2]);
 +
-+		pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
-+
 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
 +		pax_open_kernel();
 +		memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
 +#else
-+		pmi_code = pmi_base;
++		pmi_code  = pmi_base;
 +#endif
 +
 +		pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
@@ -40727,62 +43139,28 @@ diff -urNp linux-2.6.32.43/fs/fs_struct.c linux-2.6.32.43/fs/fs_struct.c
  		task_unlock(current);
 diff -urNp linux-2.6.32.43/fs/fuse/cuse.c linux-2.6.32.43/fs/fuse/cuse.c
 --- linux-2.6.32.43/fs/fuse/cuse.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/fs/fuse/cuse.c	2011-04-17 15:56:46.000000000 -0400
-@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
- 	return rc;
- }
- 
--static struct file_operations cuse_channel_fops; /* initialized during init */
--
-+static const struct file_operations cuse_channel_fops = { /* initialized during init */
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.read		= do_sync_read,
-+	.aio_read	= fuse_dev_read,
-+	.write		= do_sync_write,
-+	.aio_write	= fuse_dev_write,
-+	.poll		= fuse_dev_poll,
-+	.open		= cuse_channel_open,
-+	.release	= cuse_channel_release,
-+	.fasync		= fuse_dev_fasync,
-+};
- 
- /**************************************************************************
-  * Misc stuff and module initializatiion
-@@ -575,12 +585,6 @@ static int __init cuse_init(void)
- 	for (i = 0; i < CUSE_CONNTBL_LEN; i++)
++++ linux-2.6.32.43/fs/fuse/cuse.c	2011-08-05 20:33:55.000000000 -0400
+@@ -576,10 +576,12 @@ static int __init cuse_init(void)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
--	/* inherit and extend fuse_dev_operations */
+ 	/* inherit and extend fuse_dev_operations */
 -	cuse_channel_fops		= fuse_dev_operations;
 -	cuse_channel_fops.owner		= THIS_MODULE;
 -	cuse_channel_fops.open		= cuse_channel_open;
 -	cuse_channel_fops.release	= cuse_channel_release;
--
++	pax_open_kernel();
++	memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
++	*(void **)&cuse_channel_fops.owner	= THIS_MODULE;
++	*(void **)&cuse_channel_fops.open	= cuse_channel_open;
++	*(void **)&cuse_channel_fops.release	= cuse_channel_release;
++	pax_close_kernel();
+ 
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
- 		return PTR_ERR(cuse_class);
 diff -urNp linux-2.6.32.43/fs/fuse/dev.c linux-2.6.32.43/fs/fuse/dev.c
 --- linux-2.6.32.43/fs/fuse/dev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/fs/fuse/dev.c	2011-04-17 15:56:46.000000000 -0400
-@@ -745,7 +745,7 @@ __releases(&fc->lock)
-  * request_end().  Otherwise add it to the processing list, and set
-  * the 'sent' flag.
-  */
--static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
-+ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
- 			      unsigned long nr_segs, loff_t pos)
- {
- 	int err;
-@@ -827,6 +827,7 @@ static ssize_t fuse_dev_read(struct kioc
- 	spin_unlock(&fc->lock);
- 	return err;
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_read);
- 
- static int fuse_notify_poll(struct fuse_conn *fc, unsigned int size,
- 			    struct fuse_copy_state *cs)
-@@ -885,7 +886,7 @@ static int fuse_notify_inval_entry(struc
++++ linux-2.6.32.43/fs/fuse/dev.c	2011-08-05 20:33:55.000000000 -0400
+@@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struc
  {
  	struct fuse_notify_inval_entry_out outarg;
  	int err = -EINVAL;
@@ -40791,7 +43169,7 @@ diff -urNp linux-2.6.32.43/fs/fuse/dev.c linux-2.6.32.43/fs/fuse/dev.c
  	struct qstr name;
  
  	if (size < sizeof(outarg))
-@@ -899,6 +900,11 @@ static int fuse_notify_inval_entry(struc
+@@ -899,6 +899,11 @@ static int fuse_notify_inval_entry(struc
  	if (outarg.namelen > FUSE_NAME_MAX)
  		goto err;
  
@@ -40803,7 +43181,7 @@ diff -urNp linux-2.6.32.43/fs/fuse/dev.c linux-2.6.32.43/fs/fuse/dev.c
  	name.name = buf;
  	name.len = outarg.namelen;
  	err = fuse_copy_one(cs, buf, outarg.namelen + 1);
-@@ -910,17 +916,15 @@ static int fuse_notify_inval_entry(struc
+@@ -910,17 +915,15 @@ static int fuse_notify_inval_entry(struc
  
  	down_read(&fc->killsb);
  	err = -ENOENT;
@@ -40825,51 +43203,6 @@ diff -urNp linux-2.6.32.43/fs/fuse/dev.c linux-2.6.32.43/fs/fuse/dev.c
  	return err;
  }
  
-@@ -987,7 +991,7 @@ static int copy_out_args(struct fuse_cop
-  * it from the list and copy the rest of the buffer to the request.
-  * The request is finished by calling request_end()
-  */
--static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
-+ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
- 			       unsigned long nr_segs, loff_t pos)
- {
- 	int err;
-@@ -1083,8 +1087,9 @@ static ssize_t fuse_dev_write(struct kio
- 	fuse_copy_finish(&cs);
- 	return err;
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_write);
- 
--static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
-+unsigned fuse_dev_poll(struct file *file, poll_table *wait)
- {
- 	unsigned mask = POLLOUT | POLLWRNORM;
- 	struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1102,6 +1107,7 @@ static unsigned fuse_dev_poll(struct fil
- 
- 	return mask;
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_poll);
- 
- /*
-  * Abort all requests on the given list (pending or processing)
-@@ -1218,7 +1224,7 @@ int fuse_dev_release(struct inode *inode
- }
- EXPORT_SYMBOL_GPL(fuse_dev_release);
- 
--static int fuse_dev_fasync(int fd, struct file *file, int on)
-+int fuse_dev_fasync(int fd, struct file *file, int on)
- {
- 	struct fuse_conn *fc = fuse_get_conn(file);
- 	if (!fc)
-@@ -1227,6 +1233,7 @@ static int fuse_dev_fasync(int fd, struc
- 	/* No locking - fasync_helper does its own locking */
- 	return fasync_helper(fd, file, on, &fc->fasync);
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_fasync);
- 
- const struct file_operations fuse_dev_operations = {
- 	.owner		= THIS_MODULE,
 diff -urNp linux-2.6.32.43/fs/fuse/dir.c linux-2.6.32.43/fs/fuse/dir.c
 --- linux-2.6.32.43/fs/fuse/dir.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/fs/fuse/dir.c	2011-04-17 15:56:46.000000000 -0400
@@ -40882,26 +43215,6 @@ diff -urNp linux-2.6.32.43/fs/fuse/dir.c linux-2.6.32.43/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-2.6.32.43/fs/fuse/fuse_i.h linux-2.6.32.43/fs/fuse/fuse_i.h
---- linux-2.6.32.43/fs/fuse/fuse_i.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/fs/fuse/fuse_i.h	2011-04-17 15:56:46.000000000 -0400
-@@ -525,6 +525,16 @@ extern const struct file_operations fuse
- 
- extern const struct dentry_operations fuse_dentry_operations;
- 
-+extern ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
-+			      unsigned long nr_segs, loff_t pos);
-+
-+extern ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
-+			       unsigned long nr_segs, loff_t pos);
-+
-+extern unsigned fuse_dev_poll(struct file *file, poll_table *wait);
-+
-+extern int fuse_dev_fasync(int fd, struct file *file, int on);
-+
- /**
-  * Inode to nodeid comparison.
-  */
 diff -urNp linux-2.6.32.43/fs/gfs2/ops_inode.c linux-2.6.32.43/fs/gfs2/ops_inode.c
 --- linux-2.6.32.43/fs/gfs2/ops_inode.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/fs/gfs2/ops_inode.c	2011-05-16 21:46:57.000000000 -0400
@@ -41316,6 +43629,21 @@ diff -urNp linux-2.6.32.43/fs/locks.c linux-2.6.32.43/fs/locks.c
  	}
  
  	lock_kernel();
+diff -urNp linux-2.6.32.43/fs/mbcache.c linux-2.6.32.43/fs/mbcache.c
+--- linux-2.6.32.43/fs/mbcache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/fs/mbcache.c	2011-08-05 20:33:55.000000000 -0400
+@@ -266,9 +266,9 @@ mb_cache_create(const char *name, struct
+ 	if (!cache)
+ 		goto fail;
+ 	cache->c_name = name;
+-	cache->c_op.free = NULL;
++	*(void **)&cache->c_op.free = NULL;
+ 	if (cache_op)
+-		cache->c_op.free = cache_op->free;
++		*(void **)&cache->c_op.free = cache_op->free;
+ 	atomic_set(&cache->c_entry_count, 0);
+ 	cache->c_bucket_bits = bucket_bits;
+ #ifdef MB_CACHE_INDEXES_COUNT
 diff -urNp linux-2.6.32.43/fs/namei.c linux-2.6.32.43/fs/namei.c
 --- linux-2.6.32.43/fs/namei.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/fs/namei.c	2011-05-16 21:46:57.000000000 -0400
@@ -43870,7 +46198,7 @@ diff -urNp linux-2.6.32.43/fs/select.c linux-2.6.32.43/fs/select.c
  
 diff -urNp linux-2.6.32.43/fs/seq_file.c linux-2.6.32.43/fs/seq_file.c
 --- linux-2.6.32.43/fs/seq_file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/fs/seq_file.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/fs/seq_file.c	2011-08-05 20:33:55.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
@@ -43911,6 +46239,57 @@ diff -urNp linux-2.6.32.43/fs/seq_file.c linux-2.6.32.43/fs/seq_file.c
  		if (!m->buf)
  			goto Enomem;
  		m->count = 0;
+@@ -555,10 +559,10 @@ int single_open(struct file *file, int (
+ 	int res = -ENOMEM;
+ 
+ 	if (op) {
+-		op->start = single_start;
+-		op->next = single_next;
+-		op->stop = single_stop;
+-		op->show = show;
++		*(void **)&op->start = single_start;
++		*(void **)&op->next = single_next;
++		*(void **)&op->stop = single_stop;
++		*(void **)&op->show = show;
+ 		res = seq_open(file, op);
+ 		if (!res)
+ 			((struct seq_file *)file->private_data)->private = data;
+diff -urNp linux-2.6.32.43/fs/smbfs/proc.c linux-2.6.32.43/fs/smbfs/proc.c
+--- linux-2.6.32.43/fs/smbfs/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/fs/smbfs/proc.c	2011-08-05 20:33:55.000000000 -0400
+@@ -266,9 +266,9 @@ int smb_setcodepage(struct smb_sb_info *
+ 
+ out:
+ 	if (server->local_nls != NULL && server->remote_nls != NULL)
+-		server->ops->convert = convert_cp;
++		*(void **)&server->ops->convert = convert_cp;
+ 	else
+-		server->ops->convert = convert_memcpy;
++		*(void **)&server->ops->convert = convert_memcpy;
+ 
+ 	smb_unlock_server(server);
+ 	return n;
+@@ -933,9 +933,9 @@ smb_newconn(struct smb_sb_info *server, 
+ 
+ 	/* FIXME: the win9x code wants to modify these ... (seek/trunc bug) */
+ 	if (server->mnt->flags & SMB_MOUNT_OLDATTR) {
+-		server->ops->getattr = smb_proc_getattr_core;
++		*(void **)&server->ops->getattr = smb_proc_getattr_core;
+ 	} else if (server->mnt->flags & SMB_MOUNT_DIRATTR) {
+-		server->ops->getattr = smb_proc_getattr_ff;
++		*(void **)&server->ops->getattr = smb_proc_getattr_ff;
+ 	}
+ 
+ 	/* Decode server capabilities */
+@@ -3439,7 +3439,7 @@ out:
+ static void
+ install_ops(struct smb_ops *dst, struct smb_ops *src)
+ {
+-	memcpy(dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
++	memcpy((void *)dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
+ }
+ 
+ /* < LANMAN2 */
 diff -urNp linux-2.6.32.43/fs/smbfs/symlink.c linux-2.6.32.43/fs/smbfs/symlink.c
 --- linux-2.6.32.43/fs/smbfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/fs/smbfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
@@ -54278,6 +56657,18 @@ diff -urNp linux-2.6.32.43/grsecurity/Makefile linux-2.6.32.43/grsecurity/Makefi
 +	@-chmod -f 700 .
 +	@echo '  grsec: protected kernel image paths'
 +endif
+diff -urNp linux-2.6.32.43/include/acpi/acpi_bus.h linux-2.6.32.43/include/acpi/acpi_bus.h
+--- linux-2.6.32.43/include/acpi/acpi_bus.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/acpi/acpi_bus.h	2011-08-05 20:33:55.000000000 -0400
+@@ -107,7 +107,7 @@ struct acpi_device_ops {
+ 	acpi_op_bind bind;
+ 	acpi_op_unbind unbind;
+ 	acpi_op_notify notify;
+-};
++} __no_const;
+ 
+ #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
+ 
 diff -urNp linux-2.6.32.43/include/acpi/acpi_drivers.h linux-2.6.32.43/include/acpi/acpi_drivers.h
 --- linux-2.6.32.43/include/acpi/acpi_drivers.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/acpi/acpi_drivers.h	2011-04-17 15:56:46.000000000 -0400
@@ -54892,6 +57283,27 @@ diff -urNp linux-2.6.32.43/include/asm-generic/vmlinux.lds.h linux-2.6.32.43/inc
  
  /**
   * PERCPU - define output section for percpu area, simple version
+diff -urNp linux-2.6.32.43/include/drm/drm_crtc_helper.h linux-2.6.32.43/include/drm/drm_crtc_helper.h
+--- linux-2.6.32.43/include/drm/drm_crtc_helper.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/drm/drm_crtc_helper.h	2011-08-05 20:33:55.000000000 -0400
+@@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
+ 
+ 	/* reload the current crtc LUT */
+ 	void (*load_lut)(struct drm_crtc *crtc);
+-};
++} __no_const;
+ 
+ struct drm_encoder_helper_funcs {
+ 	void (*dpms)(struct drm_encoder *encoder, int mode);
+@@ -85,7 +85,7 @@ struct drm_encoder_helper_funcs {
+ 					    struct drm_connector *connector);
+ 	/* disable encoder when not in use - more explicit than dpms off */
+ 	void (*disable)(struct drm_encoder *encoder);
+-};
++} __no_const;
+ 
+ struct drm_connector_helper_funcs {
+ 	int (*get_modes)(struct drm_connector *connector);
 diff -urNp linux-2.6.32.43/include/drm/drmP.h linux-2.6.32.43/include/drm/drmP.h
 --- linux-2.6.32.43/include/drm/drmP.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/drm/drmP.h	2011-04-17 15:56:46.000000000 -0400
@@ -54954,6 +57366,18 @@ diff -urNp linux-2.6.32.43/include/drm/drmP.h linux-2.6.32.43/include/drm/drmP.h
  	uint32_t gtt_total;
  	uint32_t invalidate_domains;    /* domains pending invalidation */
  	uint32_t flush_domains;         /* domains pending flush */
+diff -urNp linux-2.6.32.43/include/drm/ttm/ttm_memory.h linux-2.6.32.43/include/drm/ttm/ttm_memory.h
+--- linux-2.6.32.43/include/drm/ttm/ttm_memory.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/drm/ttm/ttm_memory.h	2011-08-05 20:33:55.000000000 -0400
+@@ -47,7 +47,7 @@
+ 
+ struct ttm_mem_shrink {
+ 	int (*do_shrink) (struct ttm_mem_shrink *);
+-};
++} __no_const;
+ 
+ /**
+  * struct ttm_mem_global - Global memory accounting structure.
 diff -urNp linux-2.6.32.43/include/linux/a.out.h linux-2.6.32.43/include/linux/a.out.h
 --- linux-2.6.32.43/include/linux/a.out.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/linux/a.out.h	2011-04-17 15:56:46.000000000 -0400
@@ -55179,8 +57603,8 @@ diff -urNp linux-2.6.32.43/include/linux/capability.h linux-2.6.32.43/include/li
  struct dentry;
 diff -urNp linux-2.6.32.43/include/linux/compiler-gcc4.h linux-2.6.32.43/include/linux/compiler-gcc4.h
 --- linux-2.6.32.43/include/linux/compiler-gcc4.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/compiler-gcc4.h	2011-04-17 15:56:46.000000000 -0400
-@@ -36,4 +36,8 @@
++++ linux-2.6.32.43/include/linux/compiler-gcc4.h	2011-08-05 20:33:55.000000000 -0400
+@@ -36,4 +36,13 @@
     the kernel context */
  #define __cold			__attribute__((__cold__))
  
@@ -55188,34 +57612,50 @@ diff -urNp linux-2.6.32.43/include/linux/compiler-gcc4.h linux-2.6.32.43/include
 +#define __bos(ptr, arg)		__builtin_object_size((ptr), (arg))
 +#define __bos0(ptr)		__bos((ptr), 0)
 +#define __bos1(ptr)		__bos((ptr), 1)
++
++#if __GNUC_MINOR__ >= 5
++#define __no_const __attribute__((no_const))
++#endif
++
  #endif
 diff -urNp linux-2.6.32.43/include/linux/compiler.h linux-2.6.32.43/include/linux/compiler.h
 --- linux-2.6.32.43/include/linux/compiler.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/compiler.h	2011-04-17 15:56:46.000000000 -0400
-@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
++++ linux-2.6.32.43/include/linux/compiler.h	2011-08-05 20:33:55.000000000 -0400
+@@ -247,6 +247,10 @@ void ftrace_likely_update(struct ftrace_
+ # define __attribute_const__	/* unimplemented */
+ #endif
+ 
++#ifndef __no_const
++# define __no_const
++#endif
++
+ /*
+  * Tell gcc if a function is cold. The compiler will assume any path
+  * directly leading to the call is unlikely.
+@@ -256,6 +260,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
  
 +#ifndef __alloc_size
-+#define __alloc_size
++#define __alloc_size(...)
 +#endif
 +
 +#ifndef __bos
-+#define __bos
++#define __bos(ptr, arg)
 +#endif
 +
 +#ifndef __bos0
-+#define __bos0
++#define __bos0(ptr)
 +#endif
 +
 +#ifndef __bos1
-+#define __bos1
++#define __bos1(ptr)
 +#endif
 +
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-@@ -278,6 +294,7 @@ void ftrace_likely_update(struct ftrace_
+@@ -278,6 +298,7 @@ void ftrace_likely_update(struct ftrace_
   * use is to mediate communication between process-level code and irq/NMI
   * handlers, all running on the same CPU.
   */
@@ -55224,6 +57664,34 @@ diff -urNp linux-2.6.32.43/include/linux/compiler.h linux-2.6.32.43/include/linu
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
+diff -urNp linux-2.6.32.43/include/linux/crypto.h linux-2.6.32.43/include/linux/crypto.h
+--- linux-2.6.32.43/include/linux/crypto.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/crypto.h	2011-08-05 20:33:55.000000000 -0400
+@@ -394,7 +394,7 @@ struct cipher_tfm {
+ 	                  const u8 *key, unsigned int keylen);
+ 	void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+ 	void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+-};
++} __no_const;
+ 
+ struct hash_tfm {
+ 	int (*init)(struct hash_desc *desc);
+@@ -415,13 +415,13 @@ struct compress_tfm {
+ 	int (*cot_decompress)(struct crypto_tfm *tfm,
+ 	                      const u8 *src, unsigned int slen,
+ 	                      u8 *dst, unsigned int *dlen);
+-};
++} __no_const;
+ 
+ struct rng_tfm {
+ 	int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
+ 			      unsigned int dlen);
+ 	int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
+-};
++} __no_const;
+ 
+ #define crt_ablkcipher	crt_u.ablkcipher
+ #define crt_aead	crt_u.aead
 diff -urNp linux-2.6.32.43/include/linux/dcache.h linux-2.6.32.43/include/linux/dcache.h
 --- linux-2.6.32.43/include/linux/dcache.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/linux/dcache.h	2011-04-23 13:34:46.000000000 -0400
@@ -55427,7 +57895,7 @@ diff -urNp linux-2.6.32.43/include/linux/fscache-cache.h linux-2.6.32.43/include
  	fscache_set_op_state(op, "Init");
 diff -urNp linux-2.6.32.43/include/linux/fs.h linux-2.6.32.43/include/linux/fs.h
 --- linux-2.6.32.43/include/linux/fs.h	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.43/include/linux/fs.h	2011-07-13 17:23:19.000000000 -0400
++++ linux-2.6.32.43/include/linux/fs.h	2011-08-05 20:33:55.000000000 -0400
 @@ -90,6 +90,11 @@ struct inodes_stat_t {
  /* Expect random access pattern */
  #define FMODE_RANDOM		((__force fmode_t)4096)
@@ -55538,6 +58006,15 @@ diff -urNp linux-2.6.32.43/include/linux/fs.h linux-2.6.32.43/include/linux/fs.h
  						 * array */
  };
  int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
+@@ -1486,7 +1491,7 @@ struct block_device_operations;
+  * can be called without the big kernel lock held in all filesystems.
+  */
+ struct file_operations {
+-	struct module *owner;
++	struct module * const owner;
+ 	loff_t (*llseek) (struct file *, loff_t, int);
+ 	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+ 	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
 @@ -1559,30 +1564,30 @@ extern ssize_t vfs_writev(struct file *,
  		unsigned long, loff_t *);
  
@@ -56439,8 +58916,8 @@ diff -urNp linux-2.6.32.43/include/linux/grmsg.h linux-2.6.32.43/include/linux/g
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
 diff -urNp linux-2.6.32.43/include/linux/grsecurity.h linux-2.6.32.43/include/linux/grsecurity.h
 --- linux-2.6.32.43/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.43/include/linux/grsecurity.h	2011-07-14 20:35:17.000000000 -0400
-@@ -0,0 +1,215 @@
++++ linux-2.6.32.43/include/linux/grsecurity.h	2011-08-05 19:53:46.000000000 -0400
+@@ -0,0 +1,218 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -56450,6 +58927,9 @@ diff -urNp linux-2.6.32.43/include/linux/grsecurity.h linux-2.6.32.43/include/li
 +#include <linux/compat.h>
 +
 +/* notify of brain-dead configs */
++#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
++#endif
 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
 +#endif
@@ -56726,6 +59206,18 @@ diff -urNp linux-2.6.32.43/include/linux/init_task.h linux-2.6.32.43/include/lin
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
+diff -urNp linux-2.6.32.43/include/linux/intel-iommu.h linux-2.6.32.43/include/linux/intel-iommu.h
+--- linux-2.6.32.43/include/linux/intel-iommu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/intel-iommu.h	2011-08-05 20:33:55.000000000 -0400
+@@ -296,7 +296,7 @@ struct iommu_flush {
+ 			      u8 fm, u64 type);
+ 	void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
+ 			    unsigned int size_order, u64 type);
+-};
++} __no_const;
+ 
+ enum {
+ 	SR_DMAR_FECTL_REG,
 diff -urNp linux-2.6.32.43/include/linux/interrupt.h linux-2.6.32.43/include/linux/interrupt.h
 --- linux-2.6.32.43/include/linux/interrupt.h	2011-06-25 12:55:35.000000000 -0400
 +++ linux-2.6.32.43/include/linux/interrupt.h	2011-06-25 12:56:37.000000000 -0400
@@ -56801,7 +59293,7 @@ diff -urNp linux-2.6.32.43/include/linux/kallsyms.h linux-2.6.32.43/include/linu
  static void __check_printsym_format(const char *fmt, ...)
 diff -urNp linux-2.6.32.43/include/linux/kgdb.h linux-2.6.32.43/include/linux/kgdb.h
 --- linux-2.6.32.43/include/linux/kgdb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/kgdb.h	2011-05-04 17:56:20.000000000 -0400
++++ linux-2.6.32.43/include/linux/kgdb.h	2011-08-05 20:33:55.000000000 -0400
 @@ -74,8 +74,8 @@ void kgdb_breakpoint(void);
  
  extern int kgdb_connected;
@@ -56813,6 +59305,17 @@ diff -urNp linux-2.6.32.43/include/linux/kgdb.h linux-2.6.32.43/include/linux/kg
  
  extern struct task_struct	*kgdb_usethread;
  extern struct task_struct	*kgdb_contthread;
+@@ -226,8 +226,8 @@ extern int kgdb_arch_remove_breakpoint(u
+  * hardware debug registers.
+  */
+ struct kgdb_arch {
+-	unsigned char		gdb_bpt_instr[BREAK_INSTR_SIZE];
+-	unsigned long		flags;
++	const unsigned char	gdb_bpt_instr[BREAK_INSTR_SIZE];
++	const unsigned long	flags;
+ 
+ 	int	(*set_breakpoint)(unsigned long, char *);
+ 	int	(*remove_breakpoint)(unsigned long, char *);
 @@ -251,20 +251,20 @@ struct kgdb_arch {
   */
  struct kgdb_io {
@@ -56929,7 +59432,7 @@ diff -urNp linux-2.6.32.43/include/linux/kvm_host.h linux-2.6.32.43/include/linu
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
 diff -urNp linux-2.6.32.43/include/linux/libata.h linux-2.6.32.43/include/linux/libata.h
 --- linux-2.6.32.43/include/linux/libata.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/libata.h	2011-04-23 12:56:11.000000000 -0400
++++ linux-2.6.32.43/include/linux/libata.h	2011-08-05 20:33:55.000000000 -0400
 @@ -525,11 +525,11 @@ struct ata_ioports {
  
  struct ata_host {
@@ -56953,6 +59456,15 @@ diff -urNp linux-2.6.32.43/include/linux/libata.h linux-2.6.32.43/include/linux/
  	spinlock_t		*lock;
  	/* Flags owned by the EH context. Only EH should touch these once the
  	   port is active */
+@@ -883,7 +883,7 @@ struct ata_port_operations {
+ 	 * ->inherits must be the last field and all the preceding
+ 	 * fields must be pointers.
+ 	 */
+-	const struct ata_port_operations	*inherits;
++	const struct ata_port_operations * const inherits;
+ };
+ 
+ struct ata_port_info {
 @@ -892,7 +892,7 @@ struct ata_port_info {
  	unsigned long		pio_mask;
  	unsigned long		mwdma_mask;
@@ -57000,6 +59512,30 @@ diff -urNp linux-2.6.32.43/include/linux/lockd/bind.h linux-2.6.32.43/include/li
  
  /*
   * Similar to nfs_client_initdata, but without the NFS-specific
+diff -urNp linux-2.6.32.43/include/linux/mca.h linux-2.6.32.43/include/linux/mca.h
+--- linux-2.6.32.43/include/linux/mca.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/mca.h	2011-08-05 20:33:55.000000000 -0400
+@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
+ 						  int region);
+ 	void *		(*mca_transform_memory)(struct mca_device *,
+ 						void *memory);
+-};
++} __no_const;
+ 
+ struct mca_bus {
+ 	u64			default_dma_mask;
+diff -urNp linux-2.6.32.43/include/linux/memory.h linux-2.6.32.43/include/linux/memory.h
+--- linux-2.6.32.43/include/linux/memory.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/memory.h	2011-08-05 20:33:55.000000000 -0400
+@@ -108,7 +108,7 @@ struct memory_accessor {
+ 			size_t count);
+ 	ssize_t (*write)(struct memory_accessor *, const char *buf,
+ 			 off_t offset, size_t count);
+-};
++} __no_const;
+ 
+ /*
+  * Kernel text modification mutex, used for code patching. Users of this lock
 diff -urNp linux-2.6.32.43/include/linux/mm.h linux-2.6.32.43/include/linux/mm.h
 --- linux-2.6.32.43/include/linux/mm.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/linux/mm.h	2011-04-17 15:56:46.000000000 -0400
@@ -57173,8 +59709,16 @@ diff -urNp linux-2.6.32.43/include/linux/mod_devicetable.h linux-2.6.32.43/inclu
  	__u16 bus;
 diff -urNp linux-2.6.32.43/include/linux/module.h linux-2.6.32.43/include/linux/module.h
 --- linux-2.6.32.43/include/linux/module.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/module.h	2011-04-17 15:56:46.000000000 -0400
-@@ -287,16 +287,16 @@ struct module
++++ linux-2.6.32.43/include/linux/module.h	2011-08-05 20:33:55.000000000 -0400
+@@ -16,6 +16,7 @@
+ #include <linux/kobject.h>
+ #include <linux/moduleparam.h>
+ #include <linux/tracepoint.h>
++#include <linux/fs.h>
+ 
+ #include <asm/local.h>
+ #include <asm/module.h>
+@@ -287,16 +288,16 @@ struct module
  	int (*init)(void);
  
  	/* If this is non-NULL, vfree after init() returns */
@@ -57195,7 +59739,18 @@ diff -urNp linux-2.6.32.43/include/linux/module.h linux-2.6.32.43/include/linux/
  
  	/* Arch-specific module values */
  	struct mod_arch_specific arch;
-@@ -393,16 +393,46 @@ struct module *__module_address(unsigned
+@@ -345,6 +346,10 @@ struct module
+ #ifdef CONFIG_EVENT_TRACING
+ 	struct ftrace_event_call *trace_events;
+ 	unsigned int num_trace_events;
++	struct file_operations trace_id;
++	struct file_operations trace_enable;
++	struct file_operations trace_format;
++	struct file_operations trace_filter;
+ #endif
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ 	unsigned long *ftrace_callsites;
+@@ -393,16 +398,46 @@ struct module *__module_address(unsigned
  bool is_module_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -57440,9 +59995,33 @@ diff -urNp linux-2.6.32.43/include/linux/poison.h linux-2.6.32.43/include/linux/
  
  /********** include/linux/timer.h **********/
  /*
+diff -urNp linux-2.6.32.43/include/linux/posix-timers.h linux-2.6.32.43/include/linux/posix-timers.h
+--- linux-2.6.32.43/include/linux/posix-timers.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/posix-timers.h	2011-08-05 20:33:55.000000000 -0400
+@@ -67,7 +67,7 @@ struct k_itimer {
+ };
+ 
+ struct k_clock {
+-	int res;		/* in nanoseconds */
++	const int res;		/* in nanoseconds */
+ 	int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
+ 	int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
+ 	int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
+diff -urNp linux-2.6.32.43/include/linux/preempt.h linux-2.6.32.43/include/linux/preempt.h
+--- linux-2.6.32.43/include/linux/preempt.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/preempt.h	2011-08-05 20:33:55.000000000 -0400
+@@ -110,7 +110,7 @@ struct preempt_ops {
+ 	void (*sched_in)(struct preempt_notifier *notifier, int cpu);
+ 	void (*sched_out)(struct preempt_notifier *notifier,
+ 			  struct task_struct *next);
+-};
++} __no_const;
+ 
+ /**
+  * preempt_notifier - key for installing preemption notifiers
 diff -urNp linux-2.6.32.43/include/linux/proc_fs.h linux-2.6.32.43/include/linux/proc_fs.h
 --- linux-2.6.32.43/include/linux/proc_fs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/proc_fs.h	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/include/linux/proc_fs.h	2011-08-05 20:33:55.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -57463,6 +60042,15 @@ diff -urNp linux-2.6.32.43/include/linux/proc_fs.h linux-2.6.32.43/include/linux
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
  	mode_t mode, struct proc_dir_entry *base, 
  	read_proc_t *read_proc, void * data)
+@@ -256,7 +269,7 @@ union proc_op {
+ 	int (*proc_show)(struct seq_file *m,
+ 		struct pid_namespace *ns, struct pid *pid,
+ 		struct task_struct *task);
+-};
++} __no_const;
+ 
+ struct ctl_table_header;
+ struct ctl_table;
 diff -urNp linux-2.6.32.43/include/linux/ptrace.h linux-2.6.32.43/include/linux/ptrace.h
 --- linux-2.6.32.43/include/linux/ptrace.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/linux/ptrace.h	2011-04-17 15:56:46.000000000 -0400
@@ -57593,9 +60181,21 @@ diff -urNp linux-2.6.32.43/include/linux/reiserfs_fs_sb.h linux-2.6.32.43/includ
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
+diff -urNp linux-2.6.32.43/include/linux/relay.h linux-2.6.32.43/include/linux/relay.h
+--- linux-2.6.32.43/include/linux/relay.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/relay.h	2011-08-05 20:33:55.000000000 -0400
+@@ -159,7 +159,7 @@ struct rchan_callbacks
+ 	 * The callback should return 0 if successful, negative if not.
+ 	 */
+ 	int (*remove_buf_file)(struct dentry *dentry);
+-};
++} __no_const;
+ 
+ /*
+  * CONFIG_RELAY kernel API, kernel/relay.c
 diff -urNp linux-2.6.32.43/include/linux/sched.h linux-2.6.32.43/include/linux/sched.h
 --- linux-2.6.32.43/include/linux/sched.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/sched.h	2011-07-14 19:16:12.000000000 -0400
++++ linux-2.6.32.43/include/linux/sched.h	2011-08-05 20:33:55.000000000 -0400
 @@ -101,6 +101,7 @@ struct bio;
  struct fs_struct;
  struct bts_context;
@@ -57754,7 +60354,7 @@ diff -urNp linux-2.6.32.43/include/linux/sched.h linux-2.6.32.43/include/linux/s
 +#define MF_PAX_SEGMEXEC		0x20000000	/* Segmentation based non-executable pages */
 +
 +#ifdef CONFIG_PAX_SOFTMODE
-+extern unsigned int pax_softmode;
++extern int pax_softmode;
 +#endif
 +
 +extern int pax_check_flags(unsigned long *);
@@ -58031,7 +60631,7 @@ diff -urNp linux-2.6.32.43/include/linux/slab.h linux-2.6.32.43/include/linux/sl
  #endif	/* _LINUX_SLAB_H */
 diff -urNp linux-2.6.32.43/include/linux/slub_def.h linux-2.6.32.43/include/linux/slub_def.h
 --- linux-2.6.32.43/include/linux/slub_def.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/slub_def.h	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/include/linux/slub_def.h	2011-08-05 20:33:55.000000000 -0400
 @@ -86,7 +86,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
@@ -58041,6 +60641,15 @@ diff -urNp linux-2.6.32.43/include/linux/slub_def.h linux-2.6.32.43/include/linu
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
+@@ -215,7 +215,7 @@ static __always_inline struct kmem_cache
+ #endif
+ 
+ void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
+-void *__kmalloc(size_t size, gfp_t flags);
++void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
+ 
+ #ifdef CONFIG_KMEMTRACE
+ extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
 diff -urNp linux-2.6.32.43/include/linux/sonet.h linux-2.6.32.43/include/linux/sonet.h
 --- linux-2.6.32.43/include/linux/sonet.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/linux/sonet.h	2011-04-17 15:56:46.000000000 -0400
@@ -58053,6 +60662,18 @@ diff -urNp linux-2.6.32.43/include/linux/sonet.h linux-2.6.32.43/include/linux/s
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
+diff -urNp linux-2.6.32.43/include/linux/sunrpc/cache.h linux-2.6.32.43/include/linux/sunrpc/cache.h
+--- linux-2.6.32.43/include/linux/sunrpc/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/linux/sunrpc/cache.h	2011-08-05 20:33:55.000000000 -0400
+@@ -125,7 +125,7 @@ struct cache_detail {
+  */
+ struct cache_req {
+ 	struct cache_deferred_req *(*defer)(struct cache_req *req);
+-};
++} __no_const;
+ /* this must be embedded in a deferred_request that is being
+  * delayed awaiting cache-fill
+  */
 diff -urNp linux-2.6.32.43/include/linux/sunrpc/clnt.h linux-2.6.32.43/include/linux/sunrpc/clnt.h
 --- linux-2.6.32.43/include/linux/sunrpc/clnt.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/linux/sunrpc/clnt.h	2011-04-17 15:56:46.000000000 -0400
@@ -58266,42 +60887,15 @@ diff -urNp linux-2.6.32.43/include/linux/thread_info.h linux-2.6.32.43/include/l
  			u32 bitset;
 diff -urNp linux-2.6.32.43/include/linux/tty.h linux-2.6.32.43/include/linux/tty.h
 --- linux-2.6.32.43/include/linux/tty.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/include/linux/tty.h	2011-04-17 15:56:46.000000000 -0400
-@@ -13,6 +13,7 @@
- #include <linux/tty_driver.h>
- #include <linux/tty_ldisc.h>
- #include <linux/mutex.h>
-+#include <linux/poll.h>
- 
- #include <asm/system.h>
- 
-@@ -443,7 +444,6 @@ extern int tty_perform_flush(struct tty_
- extern dev_t tty_devnum(struct tty_struct *tty);
- extern void proc_clear_tty(struct task_struct *p);
- extern struct tty_struct *get_current_tty(void);
--extern void tty_default_fops(struct file_operations *fops);
- extern struct tty_struct *alloc_tty_struct(void);
- extern void free_tty_struct(struct tty_struct *tty);
- extern void initialize_tty_struct(struct tty_struct *tty,
-@@ -493,6 +493,18 @@ extern void tty_ldisc_begin(void);
++++ linux-2.6.32.43/include/linux/tty.h	2011-08-05 20:33:55.000000000 -0400
+@@ -493,7 +493,6 @@ extern void tty_ldisc_begin(void);
  /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
  extern void tty_ldisc_enable(struct tty_struct *tty);
  
-+/* tty_io.c */
-+extern ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
-+extern ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
-+extern unsigned int tty_poll(struct file *, poll_table *);
-+#ifdef CONFIG_COMPAT
-+extern long tty_compat_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg);
-+#else
-+#define tty_compat_ioctl NULL
-+#endif
-+extern int tty_release(struct inode *, struct file *);
-+extern int tty_fasync(int fd, struct file *filp, int on);
- 
+-
  /* n_tty.c */
  extern struct tty_ldisc_ops tty_ldisc_N_TTY;
+ 
 diff -urNp linux-2.6.32.43/include/linux/tty_ldisc.h linux-2.6.32.43/include/linux/tty_ldisc.h
 --- linux-2.6.32.43/include/linux/tty_ldisc.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/linux/tty_ldisc.h	2011-04-17 15:56:46.000000000 -0400
@@ -58583,6 +61177,18 @@ diff -urNp linux-2.6.32.43/include/linux/vmstat.h linux-2.6.32.43/include/linux/
  }
  
  static inline void __dec_zone_page_state(struct page *page,
+diff -urNp linux-2.6.32.43/include/media/v4l2-dev.h linux-2.6.32.43/include/media/v4l2-dev.h
+--- linux-2.6.32.43/include/media/v4l2-dev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/media/v4l2-dev.h	2011-08-05 20:33:55.000000000 -0400
+@@ -34,7 +34,7 @@ struct v4l2_device;
+ #define V4L2_FL_UNREGISTERED	(0)
+ 
+ struct v4l2_file_operations {
+-	struct module *owner;
++	struct module * const owner;
+ 	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+ 	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+ 	unsigned int (*poll) (struct file *, struct poll_table_struct *);
 diff -urNp linux-2.6.32.43/include/media/v4l2-device.h linux-2.6.32.43/include/media/v4l2-device.h
 --- linux-2.6.32.43/include/media/v4l2-device.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/media/v4l2-device.h	2011-05-04 17:56:28.000000000 -0400
@@ -58640,6 +61246,18 @@ diff -urNp linux-2.6.32.43/include/net/ip_vs.h linux-2.6.32.43/include/net/ip_vs
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
+diff -urNp linux-2.6.32.43/include/net/irda/ircomm_core.h linux-2.6.32.43/include/net/irda/ircomm_core.h
+--- linux-2.6.32.43/include/net/irda/ircomm_core.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/net/irda/ircomm_core.h	2011-08-05 20:33:55.000000000 -0400
+@@ -51,7 +51,7 @@ typedef struct {
+ 	int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
+ 	int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
+ 				  struct ircomm_info *);	
+-} call_t;
++} __no_const call_t;
+ 
+ struct ircomm_cb {
+ 	irda_queue_t queue;
 diff -urNp linux-2.6.32.43/include/net/irda/ircomm_tty.h linux-2.6.32.43/include/net/irda/ircomm_tty.h
 --- linux-2.6.32.43/include/net/irda/ircomm_tty.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/net/irda/ircomm_tty.h	2011-04-17 15:56:46.000000000 -0400
@@ -58674,6 +61292,18 @@ diff -urNp linux-2.6.32.43/include/net/iucv/af_iucv.h linux-2.6.32.43/include/ne
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
+diff -urNp linux-2.6.32.43/include/net/lapb.h linux-2.6.32.43/include/net/lapb.h
+--- linux-2.6.32.43/include/net/lapb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/net/lapb.h	2011-08-05 20:33:55.000000000 -0400
+@@ -95,7 +95,7 @@ struct lapb_cb {
+ 	struct sk_buff_head	write_queue;
+ 	struct sk_buff_head	ack_queue;
+ 	unsigned char		window;
+-	struct lapb_register_struct callbacks;
++	struct lapb_register_struct *callbacks;
+ 
+ 	/* FRMR control information */
+ 	struct lapb_frame	frmr_data;
 diff -urNp linux-2.6.32.43/include/net/neighbour.h linux-2.6.32.43/include/net/neighbour.h
 --- linux-2.6.32.43/include/net/neighbour.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/net/neighbour.h	2011-04-17 15:56:46.000000000 -0400
@@ -58768,6 +61398,18 @@ diff -urNp linux-2.6.32.43/include/net/udp.h linux-2.6.32.43/include/net/udp.h
  	struct file_operations	seq_fops;
  	struct seq_operations	seq_ops;
  };
+diff -urNp linux-2.6.32.43/include/rdma/iw_cm.h linux-2.6.32.43/include/rdma/iw_cm.h
+--- linux-2.6.32.43/include/rdma/iw_cm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/rdma/iw_cm.h	2011-08-05 20:33:55.000000000 -0400
+@@ -129,7 +129,7 @@ struct iw_cm_verbs {
+ 					 int backlog);
+ 
+ 	int		(*destroy_listen)(struct iw_cm_id *cm_id);
+-};
++} __no_const;
+ 
+ /**
+  * iw_create_cm_id - Create an IW CM identifier.
 diff -urNp linux-2.6.32.43/include/scsi/scsi_device.h linux-2.6.32.43/include/scsi/scsi_device.h
 --- linux-2.6.32.43/include/scsi/scsi_device.h	2011-04-17 17:00:52.000000000 -0400
 +++ linux-2.6.32.43/include/scsi/scsi_device.h	2011-05-04 17:56:28.000000000 -0400
@@ -58784,6 +61426,85 @@ diff -urNp linux-2.6.32.43/include/scsi/scsi_device.h linux-2.6.32.43/include/sc
  
  	struct device		sdev_gendev,
  				sdev_dev;
+diff -urNp linux-2.6.32.43/include/scsi/scsi_transport_fc.h linux-2.6.32.43/include/scsi/scsi_transport_fc.h
+--- linux-2.6.32.43/include/scsi/scsi_transport_fc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/scsi/scsi_transport_fc.h	2011-08-05 20:33:55.000000000 -0400
+@@ -663,9 +663,9 @@ struct fc_function_template {
+ 	int	(*bsg_timeout)(struct fc_bsg_job *);
+ 
+ 	/* allocation lengths for host-specific data */
+-	u32	 			dd_fcrport_size;
+-	u32	 			dd_fcvport_size;
+-	u32				dd_bsg_size;
++	const u32			dd_fcrport_size;
++	const u32			dd_fcvport_size;
++	const u32			dd_bsg_size;
+ 
+ 	/*
+ 	 * The driver sets these to tell the transport class it
+@@ -675,39 +675,39 @@ struct fc_function_template {
+ 	 */
+ 
+ 	/* remote port fixed attributes */
+-	unsigned long	show_rport_maxframe_size:1;
+-	unsigned long	show_rport_supported_classes:1;
+-	unsigned long   show_rport_dev_loss_tmo:1;
++	const unsigned long	show_rport_maxframe_size:1;
++	const unsigned long	show_rport_supported_classes:1;
++	const unsigned long   show_rport_dev_loss_tmo:1;
+ 
+ 	/*
+ 	 * target dynamic attributes
+ 	 * These should all be "1" if the driver uses the remote port
+ 	 * add/delete functions (so attributes reflect rport values).
+ 	 */
+-	unsigned long	show_starget_node_name:1;
+-	unsigned long	show_starget_port_name:1;
+-	unsigned long	show_starget_port_id:1;
++	const unsigned long	show_starget_node_name:1;
++	const unsigned long	show_starget_port_name:1;
++	const unsigned long	show_starget_port_id:1;
+ 
+ 	/* host fixed attributes */
+-	unsigned long	show_host_node_name:1;
+-	unsigned long	show_host_port_name:1;
+-	unsigned long	show_host_permanent_port_name:1;
+-	unsigned long	show_host_supported_classes:1;
+-	unsigned long	show_host_supported_fc4s:1;
+-	unsigned long	show_host_supported_speeds:1;
+-	unsigned long	show_host_maxframe_size:1;
+-	unsigned long	show_host_serial_number:1;
++	const unsigned long	show_host_node_name:1;
++	const unsigned long	show_host_port_name:1;
++	const unsigned long	show_host_permanent_port_name:1;
++	const unsigned long	show_host_supported_classes:1;
++	const unsigned long	show_host_supported_fc4s:1;
++	const unsigned long	show_host_supported_speeds:1;
++	const unsigned long	show_host_maxframe_size:1;
++	const unsigned long	show_host_serial_number:1;
+ 	/* host dynamic attributes */
+-	unsigned long	show_host_port_id:1;
+-	unsigned long	show_host_port_type:1;
+-	unsigned long	show_host_port_state:1;
+-	unsigned long	show_host_active_fc4s:1;
+-	unsigned long	show_host_speed:1;
+-	unsigned long	show_host_fabric_name:1;
+-	unsigned long	show_host_symbolic_name:1;
+-	unsigned long	show_host_system_hostname:1;
++	const unsigned long	show_host_port_id:1;
++	const unsigned long	show_host_port_type:1;
++	const unsigned long	show_host_port_state:1;
++	const unsigned long	show_host_active_fc4s:1;
++	const unsigned long	show_host_speed:1;
++	const unsigned long	show_host_fabric_name:1;
++	const unsigned long	show_host_symbolic_name:1;
++	const unsigned long	show_host_system_hostname:1;
+ 
+-	unsigned long	disable_target_scan:1;
++	const unsigned long	disable_target_scan:1;
+ };
+ 
+ 
 diff -urNp linux-2.6.32.43/include/sound/ac97_codec.h linux-2.6.32.43/include/sound/ac97_codec.h
 --- linux-2.6.32.43/include/sound/ac97_codec.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/sound/ac97_codec.h	2011-04-17 15:56:46.000000000 -0400
@@ -58819,6 +61540,54 @@ diff -urNp linux-2.6.32.43/include/sound/ac97_codec.h linux-2.6.32.43/include/so
  	void *private_data;
  	void (*private_free) (struct snd_ac97 *ac97);
  	/* --- */
+diff -urNp linux-2.6.32.43/include/sound/ak4xxx-adda.h linux-2.6.32.43/include/sound/ak4xxx-adda.h
+--- linux-2.6.32.43/include/sound/ak4xxx-adda.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/sound/ak4xxx-adda.h	2011-08-05 20:33:55.000000000 -0400
+@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
+ 	void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
+ 		      unsigned char val);
+ 	void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
+-};
++} __no_const;
+ 
+ #define AK4XXX_IMAGE_SIZE	(AK4XXX_MAX_CHIPS * 16)	/* 64 bytes */
+ 
+diff -urNp linux-2.6.32.43/include/sound/hwdep.h linux-2.6.32.43/include/sound/hwdep.h
+--- linux-2.6.32.43/include/sound/hwdep.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/sound/hwdep.h	2011-08-05 20:33:55.000000000 -0400
+@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
+ 			  struct snd_hwdep_dsp_status *status);
+ 	int (*dsp_load)(struct snd_hwdep *hw,
+ 			struct snd_hwdep_dsp_image *image);
+-};
++} __no_const;
+ 
+ struct snd_hwdep {
+ 	struct snd_card *card;
+diff -urNp linux-2.6.32.43/include/sound/info.h linux-2.6.32.43/include/sound/info.h
+--- linux-2.6.32.43/include/sound/info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/sound/info.h	2011-08-05 20:33:55.000000000 -0400
+@@ -44,7 +44,7 @@ struct snd_info_entry_text {
+ 		     struct snd_info_buffer *buffer);
+ 	void (*write)(struct snd_info_entry *entry,
+ 		      struct snd_info_buffer *buffer);
+-};
++} __no_const;
+ 
+ struct snd_info_entry_ops {
+ 	int (*open)(struct snd_info_entry *entry,
+diff -urNp linux-2.6.32.43/include/sound/sb16_csp.h linux-2.6.32.43/include/sound/sb16_csp.h
+--- linux-2.6.32.43/include/sound/sb16_csp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/include/sound/sb16_csp.h	2011-08-05 20:33:55.000000000 -0400
+@@ -139,7 +139,7 @@ struct snd_sb_csp_ops {
+ 	int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
+ 	int (*csp_stop) (struct snd_sb_csp * p);
+ 	int (*csp_qsound_transfer) (struct snd_sb_csp * p);
+-};
++} __no_const;
+ 
+ /*
+  * CSP private data
 diff -urNp linux-2.6.32.43/include/sound/ymfpci.h linux-2.6.32.43/include/sound/ymfpci.h
 --- linux-2.6.32.43/include/sound/ymfpci.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/include/sound/ymfpci.h	2011-05-04 17:56:28.000000000 -0400
@@ -59192,7 +61961,7 @@ diff -urNp linux-2.6.32.43/init/Kconfig linux-2.6.32.43/init/Kconfig
  	  also breaks ancient binaries (including anything libc5 based).
 diff -urNp linux-2.6.32.43/init/main.c linux-2.6.32.43/init/main.c
 --- linux-2.6.32.43/init/main.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.43/init/main.c	2011-05-22 23:02:06.000000000 -0400
++++ linux-2.6.32.43/init/main.c	2011-08-05 20:33:55.000000000 -0400
 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 
  #ifdef CONFIG_TC
  extern void tc_init(void);
@@ -59238,7 +62007,7 @@ diff -urNp linux-2.6.32.43/init/main.c linux-2.6.32.43/init/main.c
 +#endif
 +
 +#ifdef CONFIG_PAX_SOFTMODE
-+unsigned int pax_softmode;
++int pax_softmode;
 +
 +static int __init setup_pax_softmode(char *str)
 +{
@@ -59368,10 +62137,66 @@ diff -urNp linux-2.6.32.43/ipc/mqueue.c linux-2.6.32.43/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.32.43/ipc/msg.c linux-2.6.32.43/ipc/msg.c
+--- linux-2.6.32.43/ipc/msg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/ipc/msg.c	2011-08-05 20:33:55.000000000 -0400
+@@ -310,18 +310,19 @@ static inline int msg_security(struct ke
+ 	return security_msg_queue_associate(msq, msgflg);
+ }
+ 
++static struct ipc_ops msg_ops = {
++	.getnew		= newque,
++	.associate	= msg_security,
++	.more_checks	= NULL
++};
++
+ SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops msg_ops;
+ 	struct ipc_params msg_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+ 
+-	msg_ops.getnew = newque;
+-	msg_ops.associate = msg_security;
+-	msg_ops.more_checks = NULL;
+-
+ 	msg_params.key = key;
+ 	msg_params.flg = msgflg;
+ 
 diff -urNp linux-2.6.32.43/ipc/sem.c linux-2.6.32.43/ipc/sem.c
 --- linux-2.6.32.43/ipc/sem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/ipc/sem.c	2011-05-16 21:46:57.000000000 -0400
-@@ -671,6 +671,8 @@ static int semctl_main(struct ipc_namesp
++++ linux-2.6.32.43/ipc/sem.c	2011-08-05 20:33:55.000000000 -0400
+@@ -309,10 +309,15 @@ static inline int sem_more_checks(struct
+ 	return 0;
+ }
+ 
++static struct ipc_ops sem_ops = {
++	.getnew		= newary,
++	.associate	= sem_security,
++	.more_checks	= sem_more_checks
++};
++
+ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops sem_ops;
+ 	struct ipc_params sem_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+@@ -320,10 +325,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int,
+ 	if (nsems < 0 || nsems > ns->sc_semmsl)
+ 		return -EINVAL;
+ 
+-	sem_ops.getnew = newary;
+-	sem_ops.associate = sem_security;
+-	sem_ops.more_checks = sem_more_checks;
+-
+ 	sem_params.key = key;
+ 	sem_params.flg = semflg;
+ 	sem_params.u.nsems = nsems;
+@@ -671,6 +672,8 @@ static int semctl_main(struct ipc_namesp
  	ushort* sem_io = fast_sem_io;
  	int nsems;
  
@@ -59380,7 +62205,7 @@ diff -urNp linux-2.6.32.43/ipc/sem.c linux-2.6.32.43/ipc/sem.c
  	sma = sem_lock_check(ns, semid);
  	if (IS_ERR(sma))
  		return PTR_ERR(sma);
-@@ -1071,6 +1073,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
+@@ -1071,6 +1074,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
  	unsigned long jiffies_left = 0;
  	struct ipc_namespace *ns;
  
@@ -59391,7 +62216,7 @@ diff -urNp linux-2.6.32.43/ipc/sem.c linux-2.6.32.43/ipc/sem.c
  	if (nsops < 1 || semid < 0)
 diff -urNp linux-2.6.32.43/ipc/shm.c linux-2.6.32.43/ipc/shm.c
 --- linux-2.6.32.43/ipc/shm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/ipc/shm.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/ipc/shm.c	2011-08-05 20:33:55.000000000 -0400
 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -59422,7 +62247,32 @@ diff -urNp linux-2.6.32.43/ipc/shm.c linux-2.6.32.43/ipc/shm.c
  	shp->shm_segsz = size;
  	shp->shm_nattch = 0;
  	shp->shm_file = file;
-@@ -880,9 +896,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -446,18 +462,19 @@ static inline int shm_more_checks(struct
+ 	return 0;
+ }
+ 
++static struct ipc_ops shm_ops = {
++	.getnew		= newseg,
++	.associate	= shm_security,
++	.more_checks	= shm_more_checks
++};
++
+ SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops shm_ops;
+ 	struct ipc_params shm_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+ 
+-	shm_ops.getnew = newseg;
+-	shm_ops.associate = shm_security;
+-	shm_ops.more_checks = shm_more_checks;
+-
+ 	shm_params.key = key;
+ 	shm_params.flg = shmflg;
+ 	shm_params.u.size = size;
+@@ -880,9 +897,21 @@ long do_shmat(int shmid, char __user *sh
  	if (err)
  		goto out_unlock;
  
@@ -61730,7 +64580,7 @@ diff -urNp linux-2.6.32.43/kernel/posix-cpu-timers.c linux-2.6.32.43/kernel/posi
  #include <trace/events/timer.h>
 diff -urNp linux-2.6.32.43/kernel/posix-timers.c linux-2.6.32.43/kernel/posix-timers.c
 --- linux-2.6.32.43/kernel/posix-timers.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/kernel/posix-timers.c	2011-05-16 21:46:57.000000000 -0400
++++ linux-2.6.32.43/kernel/posix-timers.c	2011-08-05 20:33:55.000000000 -0400
 @@ -42,6 +42,7 @@
  #include <linux/compiler.h>
  #include <linux/idr.h>
@@ -61739,6 +64589,47 @@ diff -urNp linux-2.6.32.43/kernel/posix-timers.c linux-2.6.32.43/kernel/posix-ti
  #include <linux/syscalls.h>
  #include <linux/wait.h>
  #include <linux/workqueue.h>
+@@ -131,7 +132,7 @@ static DEFINE_SPINLOCK(idr_lock);
+  *	    which we beg off on and pass to do_sys_settimeofday().
+  */
+ 
+-static struct k_clock posix_clocks[MAX_CLOCKS];
++static struct k_clock *posix_clocks[MAX_CLOCKS];
+ 
+ /*
+  * These ones are defined below.
+@@ -157,8 +158,8 @@ static inline void unlock_timer(struct k
+  */
+ #define CLOCK_DISPATCH(clock, call, arglist) \
+  	((clock) < 0 ? posix_cpu_##call arglist : \
+- 	 (posix_clocks[clock].call != NULL \
+- 	  ? (*posix_clocks[clock].call) arglist : common_##call arglist))
++ 	 (posix_clocks[clock]->call != NULL \
++ 	  ? (*posix_clocks[clock]->call) arglist : common_##call arglist))
+ 
+ /*
+  * Default clock hook functions when the struct k_clock passed
+@@ -172,7 +173,7 @@ static inline int common_clock_getres(co
+ 				      struct timespec *tp)
+ {
+ 	tp->tv_sec = 0;
+-	tp->tv_nsec = posix_clocks[which_clock].res;
++	tp->tv_nsec = posix_clocks[which_clock]->res;
+ 	return 0;
+ }
+ 
+@@ -217,9 +218,9 @@ static inline int invalid_clockid(const 
+ 		return 0;
+ 	if ((unsigned) which_clock >= MAX_CLOCKS)
+ 		return 1;
+-	if (posix_clocks[which_clock].clock_getres != NULL)
++	if (posix_clocks[which_clock]->clock_getres != NULL)
+ 		return 0;
+-	if (posix_clocks[which_clock].res != 0)
++	if (posix_clocks[which_clock]->res != 0)
+ 		return 0;
+ 	return 1;
+ }
 @@ -296,6 +297,8 @@ static __init int init_posix_timers(void
  		.nsleep = no_nsleep,
  	};
@@ -61748,6 +64639,15 @@ diff -urNp linux-2.6.32.43/kernel/posix-timers.c linux-2.6.32.43/kernel/posix-ti
  	register_posix_clock(CLOCK_REALTIME, &clock_realtime);
  	register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
  	register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
+@@ -484,7 +487,7 @@ void register_posix_clock(const clockid_
+ 		return;
+ 	}
+ 
+-	posix_clocks[clock_id] = *new_clock;
++	posix_clocks[clock_id] = new_clock;
+ }
+ EXPORT_SYMBOL_GPL(register_posix_clock);
+ 
 @@ -948,6 +951,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
  	if (copy_from_user(&new_tp, tp, sizeof (*tp)))
  		return -EFAULT;
@@ -62694,7 +65594,7 @@ diff -urNp linux-2.6.32.43/kernel/smp.c linux-2.6.32.43/kernel/smp.c
  }
 diff -urNp linux-2.6.32.43/kernel/softirq.c linux-2.6.32.43/kernel/softirq.c
 --- linux-2.6.32.43/kernel/softirq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/kernel/softirq.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/kernel/softirq.c	2011-08-05 20:33:55.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -62722,16 +65622,21 @@ diff -urNp linux-2.6.32.43/kernel/softirq.c linux-2.6.32.43/kernel/softirq.c
  			trace_softirq_exit(h, softirq_vec);
  			if (unlikely(prev_count != preempt_count())) {
  				printk(KERN_ERR "huh, entered softirq %td %s %p"
-@@ -363,7 +363,7 @@ void raise_softirq(unsigned int nr)
+@@ -363,9 +363,11 @@ void raise_softirq(unsigned int nr)
  	local_irq_restore(flags);
  }
  
 -void open_softirq(int nr, void (*action)(struct softirq_action *))
 +void open_softirq(int nr, void (*action)(void))
  {
- 	softirq_vec[nr].action = action;
+-	softirq_vec[nr].action = action;
++	pax_open_kernel();
++	*(void **)&softirq_vec[nr].action = action;
++	pax_close_kernel();
  }
-@@ -419,7 +419,7 @@ void __tasklet_hi_schedule_first(struct 
+ 
+ /*
+@@ -419,7 +421,7 @@ void __tasklet_hi_schedule_first(struct 
  
  EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  
@@ -62740,7 +65645,7 @@ diff -urNp linux-2.6.32.43/kernel/softirq.c linux-2.6.32.43/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-@@ -454,7 +454,7 @@ static void tasklet_action(struct softir
+@@ -454,7 +456,7 @@ static void tasklet_action(struct softir
  	}
  }
  
@@ -63477,16 +66382,57 @@ diff -urNp linux-2.6.32.43/kernel/trace/trace.c linux-2.6.32.43/kernel/trace/tra
  
 diff -urNp linux-2.6.32.43/kernel/trace/trace_events.c linux-2.6.32.43/kernel/trace/trace_events.c
 --- linux-2.6.32.43/kernel/trace/trace_events.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/kernel/trace/trace_events.c	2011-04-17 15:56:46.000000000 -0400
-@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
++++ linux-2.6.32.43/kernel/trace/trace_events.c	2011-08-05 20:33:55.000000000 -0400
+@@ -951,13 +951,10 @@ static LIST_HEAD(ftrace_module_file_list
   * Modules must own their file_operations to keep up with
   * reference counting.
   */
 +
-+/* cannot be const */
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
+-	struct file_operations		id;
+-	struct file_operations		enable;
+-	struct file_operations		format;
+-	struct file_operations		filter;
+ };
+ 
+ static void remove_subsystem_dir(const char *name)
+@@ -1004,17 +1001,12 @@ trace_create_file_ops(struct module *mod
+ 
+ 	file_ops->mod = mod;
+ 
+-	file_ops->id = ftrace_event_id_fops;
+-	file_ops->id.owner = mod;
+-
+-	file_ops->enable = ftrace_enable_fops;
+-	file_ops->enable.owner = mod;
+-
+-	file_ops->filter = ftrace_event_filter_fops;
+-	file_ops->filter.owner = mod;
+-
+-	file_ops->format = ftrace_event_format_fops;
+-	file_ops->format.owner = mod;
++	pax_open_kernel();
++	*(void **)&mod->trace_id.owner = mod;
++	*(void **)&mod->trace_enable.owner = mod;
++	*(void **)&mod->trace_filter.owner = mod;
++	*(void **)&mod->trace_format.owner = mod;
++	pax_close_kernel();
+ 
+ 	list_add(&file_ops->list, &ftrace_module_file_list);
+ 
+@@ -1063,8 +1055,8 @@ static void trace_module_add_events(stru
+ 		call->mod = mod;
+ 		list_add(&call->list, &ftrace_events);
+ 		event_create_dir(call, d_events,
+-				 &file_ops->id, &file_ops->enable,
+-				 &file_ops->filter, &file_ops->format);
++				 &mod->trace_id, &mod->trace_enable,
++				 &mod->trace_filter, &mod->trace_format);
+ 	}
+ }
+ 
 diff -urNp linux-2.6.32.43/kernel/trace/trace_mmiotrace.c linux-2.6.32.43/kernel/trace/trace_mmiotrace.c
 --- linux-2.6.32.43/kernel/trace/trace_mmiotrace.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/kernel/trace/trace_mmiotrace.c	2011-05-04 17:56:28.000000000 -0400
@@ -63863,7 +66809,7 @@ diff -urNp linux-2.6.32.43/localversion-grsec linux-2.6.32.43/localversion-grsec
 +-grsec
 diff -urNp linux-2.6.32.43/Makefile linux-2.6.32.43/Makefile
 --- linux-2.6.32.43/Makefile	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.43/Makefile	2011-07-13 17:23:18.000000000 -0400
++++ linux-2.6.32.43/Makefile	2011-08-05 20:33:55.000000000 -0400
 @@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -63895,8 +66841,8 @@ diff -urNp linux-2.6.32.43/Makefile linux-2.6.32.43/Makefile
  # Basic helpers built in scripts/
 -PHONY += scripts_basic
 -scripts_basic:
-+PHONY += scripts_basic pax-plugin
-+scripts_basic: pax-plugin
++PHONY += scripts_basic gcc-plugins
++scripts_basic: gcc-plugins
  	$(Q)$(MAKE) $(build)=scripts/basic
  
  # To avoid any implicit rule to kick in, define an empty command.
@@ -63909,26 +66855,33 @@ diff -urNp linux-2.6.32.43/Makefile linux-2.6.32.43/Makefile
  			 include/linux/version.h headers_% \
  			 kernelrelease kernelversion
  
-@@ -528,6 +531,18 @@ endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
+@@ -526,6 +529,25 @@ else
+ KBUILD_CFLAGS	+= -O2
+ endif
  
-+ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y)
-+KBUILD_CFLAGS += $(call cc-ifversion, -ge, 0405, -fplugin=$(objtree)/tools/gcc/pax_plugin.so -fplugin-arg-pax_plugin-track-lowest-sp=100)
++ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh $(HOSTCC)), y)
++CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so
++ifdef CONFIG_PAX_MEMORY_STACKLEAK
++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
-+pax-plugin:
-+ifneq (,$(findstring pax_plugin, $(KBUILD_CFLAGS)))
++KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
++gcc-plugins:
 +	$(Q)$(MAKE) $(build)=tools/gcc
 +else
-+ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y)
-+	$(Q)echo "warning, your gcc does not support plugins, PAX_MEMORY_STACKLEAK will be less secure"
++gcc-plugins:
++ifeq ($(call cc-ifversion, -ge, 0405, y), y)
++	$(Q)echo "warning, your gcc installation does not support plugins, perhaps the necessary headers are missing?"
++else
++	$(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
 +endif
++	$(Q)echo "PAX_MEMORY_STACKLEAK and other  will be less secure"
 +endif
 +
+ include $(srctree)/arch/$(SRCARCH)/Makefile
+ 
  ifneq ($(CONFIG_FRAME_WARN),0)
- KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
- endif
-@@ -644,7 +659,7 @@ export mod_strip_cmd
+@@ -644,7 +666,7 @@ export mod_strip_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -63937,16 +66890,16 @@ diff -urNp linux-2.6.32.43/Makefile linux-2.6.32.43/Makefile
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -970,7 +985,7 @@ ifneq ($(KBUILD_SRC),)
+@@ -970,7 +992,7 @@ ifneq ($(KBUILD_SRC),)
  endif
  
  # prepare2 creates a makefile if using a separate output directory
 -prepare2: prepare3 outputmakefile
-+prepare2: prepare3 outputmakefile pax-plugin
++prepare2: prepare3 outputmakefile gcc-plugins
  
  prepare1: prepare2 include/linux/version.h include/linux/utsrelease.h \
                     include/asm include/config/auto.conf
-@@ -1198,7 +1213,7 @@ MRPROPER_FILES += .config .config.old in
+@@ -1198,7 +1220,7 @@ MRPROPER_FILES += .config .config.old in
                    include/linux/autoconf.h include/linux/version.h      \
                    include/linux/utsrelease.h                            \
                    include/linux/bounds.h include/asm*/asm-offsets.h     \
@@ -63955,7 +66908,7 @@ diff -urNp linux-2.6.32.43/Makefile linux-2.6.32.43/Makefile
  
  # clean - Delete most, but leave enough to build external modules
  #
-@@ -1289,6 +1304,7 @@ help:
+@@ -1289,6 +1311,7 @@ help:
  	@echo  '  modules_prepare - Set up for building external modules'
  	@echo  '  tags/TAGS	  - Generate tags file for editors'
  	@echo  '  cscope	  - Generate cscope index'
@@ -63963,7 +66916,7 @@ diff -urNp linux-2.6.32.43/Makefile linux-2.6.32.43/Makefile
  	@echo  '  kernelrelease	  - Output the release version string'
  	@echo  '  kernelversion	  - Output the version stored in Makefile'
  	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
-@@ -1421,7 +1437,7 @@ clean: $(clean-dirs)
+@@ -1421,7 +1444,7 @@ clean: $(clean-dirs)
  	$(call cmd,rmdirs)
  	$(call cmd,rmfiles)
  	@find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \
@@ -63972,7 +66925,7 @@ diff -urNp linux-2.6.32.43/Makefile linux-2.6.32.43/Makefile
  		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
  		-o -name '*.gcno' \) -type f -print | xargs rm -f
  
-@@ -1445,7 +1461,7 @@ endif # KBUILD_EXTMOD
+@@ -1445,7 +1468,7 @@ endif # KBUILD_EXTMOD
  quiet_cmd_tags = GEN     $@
        cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
  
@@ -67917,6 +70870,32 @@ diff -urNp linux-2.6.32.43/net/atm/atm_misc.c linux-2.6.32.43/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
+diff -urNp linux-2.6.32.43/net/atm/lec.h linux-2.6.32.43/net/atm/lec.h
+--- linux-2.6.32.43/net/atm/lec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/net/atm/lec.h	2011-08-05 20:33:55.000000000 -0400
+@@ -48,7 +48,7 @@ struct lane2_ops {
+ 			      const u8 *tlvs, u32 sizeoftlvs);
+ 	void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
+ 				     const u8 *tlvs, u32 sizeoftlvs);
+-};
++} __no_const;
+ 
+ /*
+  * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
+diff -urNp linux-2.6.32.43/net/atm/mpc.c linux-2.6.32.43/net/atm/mpc.c
+--- linux-2.6.32.43/net/atm/mpc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/net/atm/mpc.c	2011-08-05 20:33:55.000000000 -0400
+@@ -291,8 +291,8 @@ static void start_mpc(struct mpoa_client
+ 		printk("mpoa: (%s) start_mpc  not starting\n", dev->name);
+ 	else {
+ 		mpc->old_ops = dev->netdev_ops;
+-		mpc->new_ops = *mpc->old_ops;
+-		mpc->new_ops.ndo_start_xmit = mpc_send_packet;
++		memcpy((void *)&mpc->new_ops, mpc->old_ops, sizeof(mpc->new_ops));
++		*(void **)&mpc->new_ops.ndo_start_xmit = mpc_send_packet;
+ 		dev->netdev_ops = &mpc->new_ops;
+ 	}
+ }
 diff -urNp linux-2.6.32.43/net/atm/mpoa_caches.c linux-2.6.32.43/net/atm/mpoa_caches.c
 --- linux-2.6.32.43/net/atm/mpoa_caches.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/net/atm/mpoa_caches.c	2011-05-16 21:46:57.000000000 -0400
@@ -68092,7 +71071,7 @@ diff -urNp linux-2.6.32.43/net/can/bcm.c linux-2.6.32.43/net/can/bcm.c
  	seq_printf(m, " <<<\n");
 diff -urNp linux-2.6.32.43/net/core/dev.c linux-2.6.32.43/net/core/dev.c
 --- linux-2.6.32.43/net/core/dev.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.43/net/core/dev.c	2011-04-17 17:04:18.000000000 -0400
++++ linux-2.6.32.43/net/core/dev.c	2011-08-05 20:33:55.000000000 -0400
 @@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
@@ -68108,6 +71087,15 @@ diff -urNp linux-2.6.32.43/net/core/dev.c linux-2.6.32.43/net/core/dev.c
  	}
  }
  EXPORT_SYMBOL(dev_load);
+@@ -1654,7 +1658,7 @@ static inline int illegal_highdma(struct
+ 
+ struct dev_gso_cb {
+ 	void (*destructor)(struct sk_buff *skb);
+-};
++} __no_const;
+ 
+ #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
+ 
 @@ -2063,7 +2067,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
@@ -68188,6 +71176,18 @@ diff -urNp linux-2.6.32.43/net/core/flow.c linux-2.6.32.43/net/core/flow.c
  
  			if (!fle->object || fle->genid == genid)
  				continue;
+diff -urNp linux-2.6.32.43/net/core/rtnetlink.c linux-2.6.32.43/net/core/rtnetlink.c
+--- linux-2.6.32.43/net/core/rtnetlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/net/core/rtnetlink.c	2011-08-05 20:33:55.000000000 -0400
+@@ -57,7 +57,7 @@ struct rtnl_link
+ {
+ 	rtnl_doit_func		doit;
+ 	rtnl_dumpit_func	dumpit;
+-};
++} __no_const;
+ 
+ static DEFINE_MUTEX(rtnl_mutex);
+ 
 diff -urNp linux-2.6.32.43/net/core/skbuff.c linux-2.6.32.43/net/core/skbuff.c
 --- linux-2.6.32.43/net/core/skbuff.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/net/core/skbuff.c	2011-05-16 21:46:57.000000000 -0400
@@ -68579,7 +71579,7 @@ diff -urNp linux-2.6.32.43/net/ipv4/tcp.c linux-2.6.32.43/net/ipv4/tcp.c
  
 diff -urNp linux-2.6.32.43/net/ipv4/tcp_ipv4.c linux-2.6.32.43/net/ipv4/tcp_ipv4.c
 --- linux-2.6.32.43/net/ipv4/tcp_ipv4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/net/ipv4/tcp_ipv4.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/net/ipv4/tcp_ipv4.c	2011-08-05 20:33:55.000000000 -0400
 @@ -84,6 +84,9 @@
  int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
@@ -68634,6 +71634,29 @@ diff -urNp linux-2.6.32.43/net/ipv4/tcp_ipv4.c linux-2.6.32.43/net/ipv4/tcp_ipv4
  		tcp_v4_send_reset(NULL, skb);
  	}
  
+@@ -2194,14 +2212,14 @@ int tcp_proc_register(struct net *net, s
+ 	int rc = 0;
+ 	struct proc_dir_entry *p;
+ 
+-	afinfo->seq_fops.open		= tcp_seq_open;
+-	afinfo->seq_fops.read		= seq_read;
+-	afinfo->seq_fops.llseek		= seq_lseek;
+-	afinfo->seq_fops.release	= seq_release_net;
+-
+-	afinfo->seq_ops.start		= tcp_seq_start;
+-	afinfo->seq_ops.next		= tcp_seq_next;
+-	afinfo->seq_ops.stop		= tcp_seq_stop;
++	*(void **)&afinfo->seq_fops.open	= tcp_seq_open;
++	*(void **)&afinfo->seq_fops.read	= seq_read;
++	*(void **)&afinfo->seq_fops.llseek	= seq_lseek;
++	*(void **)&afinfo->seq_fops.release	= seq_release_net;
++
++	*(void **)&afinfo->seq_ops.start	= tcp_seq_start;
++	*(void **)&afinfo->seq_ops.next		= tcp_seq_next;
++	*(void **)&afinfo->seq_ops.stop		= tcp_seq_stop;
+ 
+ 	p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
+ 			     &afinfo->seq_fops, afinfo);
 @@ -2237,7 +2255,11 @@ static void get_openreq4(struct sock *sk
  		0,  /* non standard timer */
  		0, /* open_requests have no inode */
@@ -68754,7 +71777,7 @@ diff -urNp linux-2.6.32.43/net/ipv4/tcp_timer.c linux-2.6.32.43/net/ipv4/tcp_tim
  		tcp_write_err(sk);
 diff -urNp linux-2.6.32.43/net/ipv4/udp.c linux-2.6.32.43/net/ipv4/udp.c
 --- linux-2.6.32.43/net/ipv4/udp.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.43/net/ipv4/udp.c	2011-07-13 17:23:27.000000000 -0400
++++ linux-2.6.32.43/net/ipv4/udp.c	2011-08-05 20:33:55.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -68833,6 +71856,29 @@ diff -urNp linux-2.6.32.43/net/ipv4/udp.c linux-2.6.32.43/net/ipv4/udp.c
  	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
  	/*
+@@ -1719,14 +1743,14 @@ int udp_proc_register(struct net *net, s
+ 	struct proc_dir_entry *p;
+ 	int rc = 0;
+ 
+-	afinfo->seq_fops.open		= udp_seq_open;
+-	afinfo->seq_fops.read		= seq_read;
+-	afinfo->seq_fops.llseek		= seq_lseek;
+-	afinfo->seq_fops.release	= seq_release_net;
+-
+-	afinfo->seq_ops.start		= udp_seq_start;
+-	afinfo->seq_ops.next		= udp_seq_next;
+-	afinfo->seq_ops.stop		= udp_seq_stop;
++	*(void **)&afinfo->seq_fops.open	= udp_seq_open;
++	*(void **)&afinfo->seq_fops.read	= seq_read;
++	*(void **)&afinfo->seq_fops.llseek	= seq_lseek;
++	*(void **)&afinfo->seq_fops.release	= seq_release_net;
++
++	*(void **)&afinfo->seq_ops.start	= udp_seq_start;
++	*(void **)&afinfo->seq_ops.next		= udp_seq_next;
++	*(void **)&afinfo->seq_ops.stop		= udp_seq_stop;
+ 
+ 	p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
+ 			     &afinfo->seq_fops, afinfo);
 @@ -1758,8 +1782,13 @@ static void udp4_format_sock(struct sock
  		sk_wmem_alloc_get(sp),
  		sk_rmem_alloc_get(sp),
@@ -69347,6 +72393,72 @@ diff -urNp linux-2.6.32.43/net/key/af_key.c linux-2.6.32.43/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.32.43/net/lapb/lapb_iface.c linux-2.6.32.43/net/lapb/lapb_iface.c
+--- linux-2.6.32.43/net/lapb/lapb_iface.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/net/lapb/lapb_iface.c	2011-08-05 20:33:55.000000000 -0400
+@@ -157,7 +157,7 @@ int lapb_register(struct net_device *dev
+ 		goto out;
+ 
+ 	lapb->dev       = dev;
+-	lapb->callbacks = *callbacks;
++	lapb->callbacks = callbacks;
+ 
+ 	__lapb_insert_cb(lapb);
+ 
+@@ -379,32 +379,32 @@ int lapb_data_received(struct net_device
+ 
+ void lapb_connect_confirmation(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.connect_confirmation)
+-		lapb->callbacks.connect_confirmation(lapb->dev, reason);
++	if (lapb->callbacks->connect_confirmation)
++		lapb->callbacks->connect_confirmation(lapb->dev, reason);
+ }
+ 
+ void lapb_connect_indication(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.connect_indication)
+-		lapb->callbacks.connect_indication(lapb->dev, reason);
++	if (lapb->callbacks->connect_indication)
++		lapb->callbacks->connect_indication(lapb->dev, reason);
+ }
+ 
+ void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.disconnect_confirmation)
+-		lapb->callbacks.disconnect_confirmation(lapb->dev, reason);
++	if (lapb->callbacks->disconnect_confirmation)
++		lapb->callbacks->disconnect_confirmation(lapb->dev, reason);
+ }
+ 
+ void lapb_disconnect_indication(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.disconnect_indication)
+-		lapb->callbacks.disconnect_indication(lapb->dev, reason);
++	if (lapb->callbacks->disconnect_indication)
++		lapb->callbacks->disconnect_indication(lapb->dev, reason);
+ }
+ 
+ int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
+ {
+-	if (lapb->callbacks.data_indication)
+-		return lapb->callbacks.data_indication(lapb->dev, skb);
++	if (lapb->callbacks->data_indication)
++		return lapb->callbacks->data_indication(lapb->dev, skb);
+ 
+ 	kfree_skb(skb);
+ 	return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
+@@ -414,8 +414,8 @@ int lapb_data_transmit(struct lapb_cb *l
+ {
+ 	int used = 0;
+ 
+-	if (lapb->callbacks.data_transmit) {
+-		lapb->callbacks.data_transmit(lapb->dev, skb);
++	if (lapb->callbacks->data_transmit) {
++		lapb->callbacks->data_transmit(lapb->dev, skb);
+ 		used = 1;
+ 	}
+ 
 diff -urNp linux-2.6.32.43/net/mac80211/cfg.c linux-2.6.32.43/net/mac80211/cfg.c
 --- linux-2.6.32.43/net/mac80211/cfg.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/net/mac80211/cfg.c	2011-04-17 15:56:46.000000000 -0400
@@ -70875,6 +73987,27 @@ diff -urNp linux-2.6.32.43/net/unix/af_unix.c linux-2.6.32.43/net/unix/af_unix.c
  			atomic_read(&s->sk_refcnt),
  			0,
  			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
+diff -urNp linux-2.6.32.43/net/wireless/core.c linux-2.6.32.43/net/wireless/core.c
+--- linux-2.6.32.43/net/wireless/core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/net/wireless/core.c	2011-08-05 20:33:55.000000000 -0400
+@@ -367,7 +367,7 @@ struct wiphy *wiphy_new(const struct cfg
+ 
+ 	wiphy_net_set(&rdev->wiphy, &init_net);
+ 
+-	rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block;
++	*(void **)&rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block;
+ 	rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev),
+ 				   &rdev->wiphy.dev, RFKILL_TYPE_WLAN,
+ 				   &rdev->rfkill_ops, rdev);
+@@ -505,7 +505,7 @@ void wiphy_rfkill_start_polling(struct w
+ 
+ 	if (!rdev->ops->rfkill_poll)
+ 		return;
+-	rdev->rfkill_ops.poll = cfg80211_rfkill_poll;
++	*(void **)&rdev->rfkill_ops.poll = cfg80211_rfkill_poll;
+ 	rfkill_resume_polling(rdev->rfkill);
+ }
+ EXPORT_SYMBOL(wiphy_rfkill_start_polling);
 diff -urNp linux-2.6.32.43/net/wireless/wext.c linux-2.6.32.43/net/wireless/wext.c
 --- linux-2.6.32.43/net/wireless/wext.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/net/wireless/wext.c	2011-04-17 15:56:46.000000000 -0400
@@ -71061,6 +74194,13 @@ diff -urNp linux-2.6.32.43/scripts/basic/fixdep.c linux-2.6.32.43/scripts/basic/
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
+diff -urNp linux-2.6.32.43/scripts/gcc-plugin.sh linux-2.6.32.43/scripts/gcc-plugin.sh
+--- linux-2.6.32.43/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.43/scripts/gcc-plugin.sh	2011-08-05 20:33:55.000000000 -0400
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++echo "#include \"gcc-plugin.h\"" | $* -x c - -c -o /dev/null -I`$* -print-file-name=plugin`/include>/dev/null 2>&1 && echo "y"
 diff -urNp linux-2.6.32.43/scripts/Makefile.build linux-2.6.32.43/scripts/Makefile.build
 --- linux-2.6.32.43/scripts/Makefile.build	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/scripts/Makefile.build	2011-06-04 20:46:51.000000000 -0400
@@ -72208,6 +75348,45 @@ diff -urNp linux-2.6.32.43/sound/aoa/codecs/onyx.h linux-2.6.32.43/sound/aoa/cod
  
  /* PCM3052 register definitions */
  
+diff -urNp linux-2.6.32.43/sound/core/seq/seq_device.c linux-2.6.32.43/sound/core/seq/seq_device.c
+--- linux-2.6.32.43/sound/core/seq/seq_device.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/core/seq/seq_device.c	2011-08-05 20:33:55.000000000 -0400
+@@ -63,7 +63,7 @@ struct ops_list {
+ 	int argsize;		/* argument size */
+ 
+ 	/* operators */
+-	struct snd_seq_dev_ops ops;
++	struct snd_seq_dev_ops *ops;
+ 
+ 	/* registred devices */
+ 	struct list_head dev_list;	/* list of devices */
+@@ -332,7 +332,7 @@ int snd_seq_device_register_driver(char 
+ 
+ 	mutex_lock(&ops->reg_mutex);
+ 	/* copy driver operators */
+-	ops->ops = *entry;
++	ops->ops = entry;
+ 	ops->driver |= DRIVER_LOADED;
+ 	ops->argsize = argsize;
+ 
+@@ -462,7 +462,7 @@ static int init_device(struct snd_seq_de
+ 			   dev->name, ops->id, ops->argsize, dev->argsize);
+ 		return -EINVAL;
+ 	}
+-	if (ops->ops.init_device(dev) >= 0) {
++	if (ops->ops->init_device(dev) >= 0) {
+ 		dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
+ 		ops->num_init_devices++;
+ 	} else {
+@@ -489,7 +489,7 @@ static int free_device(struct snd_seq_de
+ 			   dev->name, ops->id, ops->argsize, dev->argsize);
+ 		return -EINVAL;
+ 	}
+-	if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
++	if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
+ 		dev->status = SNDRV_SEQ_DEVICE_FREE;
+ 		dev->driver_data = NULL;
+ 		ops->num_init_devices--;
 diff -urNp linux-2.6.32.43/sound/drivers/mts64.c linux-2.6.32.43/sound/drivers/mts64.c
 --- linux-2.6.32.43/sound/drivers/mts64.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/sound/drivers/mts64.c	2011-04-17 15:56:46.000000000 -0400
@@ -72267,6 +75446,18 @@ diff -urNp linux-2.6.32.43/sound/drivers/mts64.c linux-2.6.32.43/sound/drivers/m
  
  	return 0;
  }
+diff -urNp linux-2.6.32.43/sound/drivers/opl4/opl4_lib.c linux-2.6.32.43/sound/drivers/opl4/opl4_lib.c
+--- linux-2.6.32.43/sound/drivers/opl4/opl4_lib.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/drivers/opl4/opl4_lib.c	2011-08-05 20:33:55.000000000 -0400
+@@ -27,7 +27,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
+ MODULE_DESCRIPTION("OPL4 driver");
+ MODULE_LICENSE("GPL");
+ 
+-static void inline snd_opl4_wait(struct snd_opl4 *opl4)
++static inline void snd_opl4_wait(struct snd_opl4 *opl4)
+ {
+ 	int timeout = 10;
+ 	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
 diff -urNp linux-2.6.32.43/sound/drivers/portman2x4.c linux-2.6.32.43/sound/drivers/portman2x4.c
 --- linux-2.6.32.43/sound/drivers/portman2x4.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/sound/drivers/portman2x4.c	2011-04-17 15:56:46.000000000 -0400
@@ -72287,6 +75478,30 @@ diff -urNp linux-2.6.32.43/sound/drivers/portman2x4.c linux-2.6.32.43/sound/driv
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
+diff -urNp linux-2.6.32.43/sound/isa/cmi8330.c linux-2.6.32.43/sound/isa/cmi8330.c
+--- linux-2.6.32.43/sound/isa/cmi8330.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/isa/cmi8330.c	2011-08-05 20:33:55.000000000 -0400
+@@ -455,16 +455,16 @@ static int __devinit snd_cmi8330_pcm(str
+ 	
+ 	/* SB16 */
+ 	ops = snd_sb16dsp_get_pcm_ops(CMI_SB_STREAM);
+-	chip->streams[CMI_SB_STREAM].ops = *ops;
++	memcpy((void *)&chip->streams[CMI_SB_STREAM].ops, ops, sizeof(*ops));
+ 	chip->streams[CMI_SB_STREAM].open = ops->open;
+-	chip->streams[CMI_SB_STREAM].ops.open = cmi_open_callbacks[CMI_SB_STREAM];
++	*(void **)&chip->streams[CMI_SB_STREAM].ops.open = cmi_open_callbacks[CMI_SB_STREAM];
+ 	chip->streams[CMI_SB_STREAM].private_data = chip->sb;
+ 
+ 	/* AD1848 */
+ 	ops = snd_wss_get_pcm_ops(CMI_AD_STREAM);
+-	chip->streams[CMI_AD_STREAM].ops = *ops;
++	memcpy((void *)&chip->streams[CMI_AD_STREAM].ops, ops, sizeof(*ops));
+ 	chip->streams[CMI_AD_STREAM].open = ops->open;
+-	chip->streams[CMI_AD_STREAM].ops.open = cmi_open_callbacks[CMI_AD_STREAM];
++	*(void **)&chip->streams[CMI_AD_STREAM].ops.open = cmi_open_callbacks[CMI_AD_STREAM];
+ 	chip->streams[CMI_AD_STREAM].private_data = chip->wss;
+ 
+ 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &chip->streams[SNDRV_PCM_STREAM_PLAYBACK].ops);
 diff -urNp linux-2.6.32.43/sound/oss/sb_audio.c linux-2.6.32.43/sound/oss/sb_audio.c
 --- linux-2.6.32.43/sound/oss/sb_audio.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/sound/oss/sb_audio.c	2011-04-17 15:56:46.000000000 -0400
@@ -72639,9 +75854,424 @@ diff -urNp linux-2.6.32.43/sound/pci/ac97/ac97_patch.c linux-2.6.32.43/sound/pci
  	.build_specific	= patch_ucb1400_specific,
  };
  
+diff -urNp linux-2.6.32.43/sound/pci/hda/hda_codec.h linux-2.6.32.43/sound/pci/hda/hda_codec.h
+--- linux-2.6.32.43/sound/pci/hda/hda_codec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/hda_codec.h	2011-08-05 20:33:55.000000000 -0400
+@@ -580,7 +580,7 @@ struct hda_bus_ops {
+ 	/* notify power-up/down from codec to controller */
+ 	void (*pm_notify)(struct hda_bus *bus);
+ #endif
+-};
++} __no_const;
+ 
+ /* template to pass to the bus constructor */
+ struct hda_bus_template {
+@@ -705,7 +705,7 @@ struct hda_pcm_ops {
+ 		       struct snd_pcm_substream *substream);
+ 	int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
+ 		       struct snd_pcm_substream *substream);
+-};
++} __no_const;
+ 
+ /* PCM information for each substream */
+ struct hda_pcm_stream {
+diff -urNp linux-2.6.32.43/sound/pci/hda/hda_generic.c linux-2.6.32.43/sound/pci/hda/hda_generic.c
+--- linux-2.6.32.43/sound/pci/hda/hda_generic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/hda_generic.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1097,7 +1097,7 @@ int snd_hda_parse_generic_codec(struct h
+ 	    (err = parse_output(codec)) < 0)
+ 		goto error;
+ 
+-	codec->patch_ops = generic_patch_ops;
++	memcpy((void *)&codec->patch_ops, &generic_patch_ops, sizeof(generic_patch_ops));
+ 
+ 	return 0;
+ 
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_analog.c linux-2.6.32.43/sound/pci/hda/patch_analog.c
+--- linux-2.6.32.43/sound/pci/hda/patch_analog.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_analog.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1069,7 +1069,7 @@ static int patch_ad1986a(struct hda_code
+ #endif
+ 	spec->vmaster_nid = 0x1b;
+ 
+-	codec->patch_ops = ad198x_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ad198x_patch_ops, sizeof(ad198x_patch_ops));
+ 
+ 	/* override some parameters */
+ 	board_config = snd_hda_check_board_config(codec, AD1986A_MODELS,
+@@ -1120,8 +1120,8 @@ static int patch_ad1986a(struct hda_code
+ 		if (!is_jack_available(codec, 0x25))
+ 			spec->multiout.dig_out_nid = 0;
+ 		spec->input_mux = &ad1986a_automic_capture_source;
+-		codec->patch_ops.unsol_event = ad1986a_automic_unsol_event;
+-		codec->patch_ops.init = ad1986a_automic_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1986a_automic_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1986a_automic_init;
+ 		break;
+ 	case AD1986A_SAMSUNG_P50:
+ 		spec->num_mixers = 2;
+@@ -1137,8 +1137,8 @@ static int patch_ad1986a(struct hda_code
+ 		if (!is_jack_available(codec, 0x25))
+ 			spec->multiout.dig_out_nid = 0;
+ 		spec->input_mux = &ad1986a_automic_capture_source;
+-		codec->patch_ops.unsol_event = ad1986a_samsung_p50_unsol_event;
+-		codec->patch_ops.init = ad1986a_samsung_p50_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1986a_samsung_p50_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1986a_samsung_p50_init;
+ 		break;
+ 	case AD1986A_LAPTOP_AUTOMUTE:
+ 		spec->num_mixers = 3;
+@@ -1154,8 +1154,8 @@ static int patch_ad1986a(struct hda_code
+ 		if (!is_jack_available(codec, 0x25))
+ 			spec->multiout.dig_out_nid = 0;
+ 		spec->input_mux = &ad1986a_laptop_eapd_capture_source;
+-		codec->patch_ops.unsol_event = ad1986a_hp_unsol_event;
+-		codec->patch_ops.init = ad1986a_hp_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1986a_hp_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1986a_hp_init;
+ 		/* Lenovo N100 seems to report the reversed bit
+ 		 * for HP jack-sensing
+ 		 */
+@@ -1363,7 +1363,7 @@ static int patch_ad1983(struct hda_codec
+ #endif
+ 	spec->vmaster_nid = 0x05;
+ 
+-	codec->patch_ops = ad198x_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ad198x_patch_ops, sizeof(ad198x_patch_ops));
+ 
+ 	return 0;
+ }
+@@ -1769,7 +1769,7 @@ static int patch_ad1981(struct hda_codec
+ #endif
+ 	spec->vmaster_nid = 0x05;
+ 
+-	codec->patch_ops = ad198x_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ad198x_patch_ops, sizeof(ad198x_patch_ops));
+ 
+ 	/* override some parameters */
+ 	board_config = snd_hda_check_board_config(codec, AD1981_MODELS,
+@@ -1783,8 +1783,8 @@ static int patch_ad1981(struct hda_codec
+ 		spec->multiout.dig_out_nid = 0;
+ 		spec->input_mux = &ad1981_hp_capture_source;
+ 
+-		codec->patch_ops.init = ad1981_hp_init;
+-		codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1981_hp_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
+ 		break;
+ 	case AD1981_THINKPAD:
+ 		spec->mixers[0] = ad1981_thinkpad_mixers;
+@@ -1805,8 +1805,8 @@ static int patch_ad1981(struct hda_codec
+ 		spec->init_verbs[1] = ad1981_toshiba_init_verbs;
+ 		spec->multiout.dig_out_nid = 0;
+ 		spec->input_mux = &ad1981_hp_capture_source;
+-		codec->patch_ops.init = ad1981_hp_init;
+-		codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1981_hp_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
+ 		break;
+ 	}
+ 	return 0;
+@@ -3096,14 +3096,14 @@ static int patch_ad1988(struct hda_codec
+ 	if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a)
+ 		spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers;
+ 
+-	codec->patch_ops = ad198x_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ad198x_patch_ops, sizeof(ad198x_patch_ops));
+ 	switch (board_config) {
+ 	case AD1988_AUTO:
+-		codec->patch_ops.init = ad1988_auto_init;
++		*(void **)&codec->patch_ops.init = ad1988_auto_init;
+ 		break;
+ 	case AD1988_LAPTOP:
+ 	case AD1988_LAPTOP_DIG:
+-		codec->patch_ops.unsol_event = ad1988_laptop_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = ad1988_laptop_unsol_event;
+ 		break;
+ 	}
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+@@ -3321,7 +3321,7 @@ static int patch_ad1884(struct hda_codec
+ 	/* we need to cover all playback volumes */
+ 	spec->slave_vols = ad1884_slave_vols;
+ 
+-	codec->patch_ops = ad198x_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ad198x_patch_ops, sizeof(ad198x_patch_ops));
+ 
+ 	return 0;
+ }
+@@ -3529,7 +3529,7 @@ static int patch_ad1984(struct hda_codec
+ 	case AD1984_BASIC:
+ 		/* additional digital mics */
+ 		spec->mixers[spec->num_mixers++] = ad1984_dmic_mixers;
+-		codec->patch_ops.build_pcms = ad1984_build_pcms;
++		*(void **)&codec->patch_ops.build_pcms = ad1984_build_pcms;
+ 		break;
+ 	case AD1984_THINKPAD:
+ 		spec->multiout.dig_out_nid = AD1884_SPDIF_OUT;
+@@ -4229,7 +4229,7 @@ static int patch_ad1884a(struct hda_code
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = ad1884a_loopbacks;
+ #endif
+-	codec->patch_ops = ad198x_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ad198x_patch_ops, sizeof(ad198x_patch_ops));
+ 
+ 	/* override some parameters */
+ 	board_config = snd_hda_check_board_config(codec, AD1884A_MODELS,
+@@ -4240,8 +4240,8 @@ static int patch_ad1884a(struct hda_code
+ 		spec->mixers[0] = ad1884a_laptop_mixers;
+ 		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;
+ 		spec->multiout.dig_out_nid = 0;
+-		codec->patch_ops.unsol_event = ad1884a_laptop_unsol_event;
+-		codec->patch_ops.init = ad1884a_laptop_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1884a_laptop_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1884a_laptop_init;
+ 		/* set the upper-limit for mixer amp to 0dB for avoiding the
+ 		 * possible damage by overloading
+ 		 */
+@@ -4255,8 +4255,8 @@ static int patch_ad1884a(struct hda_code
+ 		spec->mixers[0] = ad1884a_mobile_mixers;
+ 		spec->init_verbs[0] = ad1884a_mobile_verbs;
+ 		spec->multiout.dig_out_nid = 0;
+-		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
+-		codec->patch_ops.init = ad1884a_hp_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1884a_hp_init;
+ 		/* set the upper-limit for mixer amp to 0dB for avoiding the
+ 		 * possible damage by overloading
+ 		 */
+@@ -4272,15 +4272,15 @@ static int patch_ad1884a(struct hda_code
+ 			ad1984a_thinkpad_verbs;
+ 		spec->multiout.dig_out_nid = 0;
+ 		spec->input_mux = &ad1984a_thinkpad_capture_source;
+-		codec->patch_ops.unsol_event = ad1984a_thinkpad_unsol_event;
+-		codec->patch_ops.init = ad1984a_thinkpad_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1984a_thinkpad_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1984a_thinkpad_init;
+ 		break;
+ 	case AD1984A_TOUCHSMART:
+ 		spec->mixers[0] = ad1984a_touchsmart_mixers;
+ 		spec->init_verbs[0] = ad1984a_touchsmart_verbs;
+ 		spec->multiout.dig_out_nid = 0;
+-		codec->patch_ops.unsol_event = ad1984a_touchsmart_unsol_event;
+-		codec->patch_ops.init = ad1984a_touchsmart_init;
++		*(void **)&codec->patch_ops.unsol_event = ad1984a_touchsmart_unsol_event;
++		*(void **)&codec->patch_ops.init = ad1984a_touchsmart_init;
+ 		/* set the upper-limit for mixer amp to 0dB for avoiding the
+ 		 * possible damage by overloading
+ 		 */
+@@ -4607,7 +4607,7 @@ static int patch_ad1882(struct hda_codec
+ #endif
+ 	spec->vmaster_nid = 0x04;
+ 
+-	codec->patch_ops = ad198x_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ad198x_patch_ops, sizeof(ad198x_patch_ops));
+ 
+ 	/* override some parameters */
+ 	board_config = snd_hda_check_board_config(codec, AD1882_MODELS,
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_atihdmi.c linux-2.6.32.43/sound/pci/hda/patch_atihdmi.c
+--- linux-2.6.32.43/sound/pci/hda/patch_atihdmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_atihdmi.c	2011-08-05 20:33:55.000000000 -0400
+@@ -177,7 +177,7 @@ static int patch_atihdmi(struct hda_code
+ 	 */
+ 	spec->multiout.dig_out_nid = CVT_NID;
+ 
+-	codec->patch_ops = atihdmi_patch_ops;
++	memcpy((void *)&codec->patch_ops, &atihdmi_patch_ops, sizeof(atihdmi_patch_ops));
+ 
+ 	return 0;
+ }
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_ca0110.c linux-2.6.32.43/sound/pci/hda/patch_ca0110.c
+--- linux-2.6.32.43/sound/pci/hda/patch_ca0110.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_ca0110.c	2011-08-05 20:33:55.000000000 -0400
+@@ -525,7 +525,7 @@ static int patch_ca0110(struct hda_codec
+ 	if (err < 0)
+ 		goto error;
+ 
+-	codec->patch_ops = ca0110_patch_ops;
++	memcpy((void *)&codec->patch_ops, &ca0110_patch_ops, sizeof(ca0110_patch_ops));
+ 
+ 	return 0;
+ 
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_cirrus.c linux-2.6.32.43/sound/pci/hda/patch_cirrus.c
+--- linux-2.6.32.43/sound/pci/hda/patch_cirrus.c	2011-05-10 22:12:02.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_cirrus.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1191,7 +1191,7 @@ static int patch_cs420x(struct hda_codec
+ 	if (err < 0)
+ 		goto error;
+ 
+-	codec->patch_ops = cs_patch_ops;
++	memcpy((void *)&codec->patch_ops, &cs_patch_ops, sizeof(cs_patch_ops));
+ 
+ 	return 0;
+ 
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_cmedia.c linux-2.6.32.43/sound/pci/hda/patch_cmedia.c
+--- linux-2.6.32.43/sound/pci/hda/patch_cmedia.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_cmedia.c	2011-08-05 20:33:55.000000000 -0400
+@@ -728,7 +728,7 @@ static int patch_cmi9880(struct hda_code
+ 
+ 	spec->adc_nids = cmi9880_adc_nids;
+ 
+-	codec->patch_ops = cmi9880_patch_ops;
++	memcpy((void *)&codec->patch_ops, &cmi9880_patch_ops, sizeof(cmi9880_patch_ops));
+ 
+ 	return 0;
+ }
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_conexant.c linux-2.6.32.43/sound/pci/hda/patch_conexant.c
+--- linux-2.6.32.43/sound/pci/hda/patch_conexant.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_conexant.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1119,55 +1119,55 @@ static int patch_cxt5045(struct hda_code
+ 	spec->channel_mode = cxt5045_modes,
+ 
+ 
+-	codec->patch_ops = conexant_patch_ops;
++	memcpy((void *)&codec->patch_ops, &conexant_patch_ops, sizeof(conexant_patch_ops));
+ 
+ 	board_config = snd_hda_check_board_config(codec, CXT5045_MODELS,
+ 						  cxt5045_models,
+ 						  cxt5045_cfg_tbl);
+ 	switch (board_config) {
+ 	case CXT5045_LAPTOP_HPSENSE:
+-		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
+ 		spec->input_mux = &cxt5045_capture_source;
+ 		spec->num_init_verbs = 2;
+ 		spec->init_verbs[1] = cxt5045_hp_sense_init_verbs;
+ 		spec->mixers[0] = cxt5045_mixers;
+-		codec->patch_ops.init = cxt5045_init;
++		*(void **)&codec->patch_ops.init = cxt5045_init;
+ 		break;
+ 	case CXT5045_LAPTOP_MICSENSE:
+-		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
+ 		spec->input_mux = &cxt5045_capture_source;
+ 		spec->num_init_verbs = 2;
+ 		spec->init_verbs[1] = cxt5045_mic_sense_init_verbs;
+ 		spec->mixers[0] = cxt5045_mixers;
+-		codec->patch_ops.init = cxt5045_init;
++		*(void **)&codec->patch_ops.init = cxt5045_init;
+ 		break;
+ 	default:
+ 	case CXT5045_LAPTOP_HPMICSENSE:
+-		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
+ 		spec->input_mux = &cxt5045_capture_source;
+ 		spec->num_init_verbs = 3;
+ 		spec->init_verbs[1] = cxt5045_hp_sense_init_verbs;
+ 		spec->init_verbs[2] = cxt5045_mic_sense_init_verbs;
+ 		spec->mixers[0] = cxt5045_mixers;
+-		codec->patch_ops.init = cxt5045_init;
++		*(void **)&codec->patch_ops.init = cxt5045_init;
+ 		break;
+ 	case CXT5045_BENQ:
+-		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
+ 		spec->input_mux = &cxt5045_capture_source_benq;
+ 		spec->num_init_verbs = 1;
+ 		spec->init_verbs[0] = cxt5045_benq_init_verbs;
+ 		spec->mixers[0] = cxt5045_mixers;
+ 		spec->mixers[1] = cxt5045_benq_mixers;
+ 		spec->num_mixers = 2;
+-		codec->patch_ops.init = cxt5045_init;
++		*(void **)&codec->patch_ops.init = cxt5045_init;
+ 		break;
+ 	case CXT5045_LAPTOP_HP530:
+-		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
+ 		spec->input_mux = &cxt5045_capture_source_hp530;
+ 		spec->num_init_verbs = 2;
+ 		spec->init_verbs[1] = cxt5045_hp_sense_init_verbs;
+ 		spec->mixers[0] = cxt5045_mixers_hp530;
+-		codec->patch_ops.init = cxt5045_init;
++		*(void **)&codec->patch_ops.init = cxt5045_init;
+ 		break;
+ #ifdef CONFIG_SND_DEBUG
+ 	case CXT5045_TEST:
+@@ -1556,7 +1556,7 @@ static int patch_cxt5047(struct hda_code
+ 	spec->num_channel_mode = ARRAY_SIZE(cxt5047_modes),
+ 	spec->channel_mode = cxt5047_modes,
+ 
+-	codec->patch_ops = conexant_patch_ops;
++	memcpy((void *)&codec->patch_ops, &conexant_patch_ops, sizeof(conexant_patch_ops));
+ 
+ 	board_config = snd_hda_check_board_config(codec, CXT5047_MODELS,
+ 						  cxt5047_models,
+@@ -1565,13 +1565,13 @@ static int patch_cxt5047(struct hda_code
+ 	case CXT5047_LAPTOP:
+ 		spec->num_mixers = 2;
+ 		spec->mixers[1] = cxt5047_hp_spk_mixers;
+-		codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
+ 		break;
+ 	case CXT5047_LAPTOP_HP:
+ 		spec->num_mixers = 2;
+ 		spec->mixers[1] = cxt5047_hp_only_mixers;
+-		codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
+-		codec->patch_ops.init = cxt5047_hp_init;
++		*(void **)&codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
++		*(void **)&codec->patch_ops.init = cxt5047_hp_init;
+ 		break;
+ 	case CXT5047_LAPTOP_EAPD:
+ 		spec->input_mux = &cxt5047_toshiba_capture_source;
+@@ -1579,14 +1579,14 @@ static int patch_cxt5047(struct hda_code
+ 		spec->mixers[1] = cxt5047_hp_spk_mixers;
+ 		spec->num_init_verbs = 2;
+ 		spec->init_verbs[1] = cxt5047_toshiba_init_verbs;
+-		codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
+ 		break;
+ #ifdef CONFIG_SND_DEBUG
+ 	case CXT5047_TEST:
+ 		spec->input_mux = &cxt5047_test_capture_source;
+ 		spec->mixers[0] = cxt5047_test_mixer;
+ 		spec->init_verbs[0] = cxt5047_test_init_verbs;
+-		codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
+ #endif	
+ 	}
+ 	spec->vmaster_nid = 0x13;
+@@ -1904,8 +1904,8 @@ static int patch_cxt5051(struct hda_code
+ 	codec->spec = spec;
+ 	codec->pin_amp_workaround = 1;
+ 
+-	codec->patch_ops = conexant_patch_ops;
+-	codec->patch_ops.init = cxt5051_init;
++	memcpy((void *)&codec->patch_ops, &conexant_patch_ops, sizeof(conexant_patch_ops));
++	*(void **)&codec->patch_ops.init = cxt5051_init;
+ 
+ 	spec->multiout.max_channels = 2;
+ 	spec->multiout.num_dacs = ARRAY_SIZE(cxt5051_dac_nids);
+@@ -1923,7 +1923,7 @@ static int patch_cxt5051(struct hda_code
+ 	spec->cur_adc = 0;
+ 	spec->cur_adc_idx = 0;
+ 
+-	codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
++	*(void **)&codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
+ 
+ 	board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
+ 						  cxt5051_models,
+@@ -2372,8 +2372,8 @@ static int patch_cxt5066(struct hda_code
+ 		return -ENOMEM;
+ 	codec->spec = spec;
+ 
+-	codec->patch_ops = conexant_patch_ops;
+-	codec->patch_ops.init = cxt5066_init;
++	memcpy((void *)&codec->patch_ops, &conexant_patch_ops, sizeof(conexant_patch_ops));
++	*(void **)&codec->patch_ops.init = cxt5066_init;
+ 
+ 	spec->dell_automute = 0;
+ 	spec->multiout.max_channels = 2;
+@@ -2413,7 +2413,7 @@ static int patch_cxt5066(struct hda_code
+ 		spec->dell_automute = 1;
+ 		break;
+ 	case CXT5066_OLPC_XO_1_5:
+-		codec->patch_ops.unsol_event = cxt5066_unsol_event;
++		*(void **)&codec->patch_ops.unsol_event = cxt5066_unsol_event;
+ 		spec->init_verbs[0] = cxt5066_init_verbs_olpc;
+ 		spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc;
+ 		spec->mixers[spec->num_mixers++] = cxt5066_mixers;
 diff -urNp linux-2.6.32.43/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.43/sound/pci/hda/patch_intelhdmi.c
 --- linux-2.6.32.43/sound/pci/hda/patch_intelhdmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/sound/pci/hda/patch_intelhdmi.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_intelhdmi.c	2011-08-05 20:33:55.000000000 -0400
 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
  		cp_ready);
  
@@ -72657,6 +76287,345 @@ diff -urNp linux-2.6.32.43/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.43/sound
  }
  
  
+@@ -656,7 +656,7 @@ static int do_patch_intel_hdmi(struct hd
+ 	spec->multiout.dig_out_nid = cvt_nid;
+ 
+ 	codec->spec = spec;
+-	codec->patch_ops = intel_hdmi_patch_ops;
++	memcpy((void *)&codec->patch_ops, &intel_hdmi_patch_ops, sizeof(intel_hdmi_patch_ops));
+ 
+ 	snd_hda_eld_proc_new(codec, &spec->sink_eld);
+ 
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.43/sound/pci/hda/patch_nvhdmi.c
+--- linux-2.6.32.43/sound/pci/hda/patch_nvhdmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_nvhdmi.c	2011-08-05 20:33:55.000000000 -0400
+@@ -367,7 +367,7 @@ static int patch_nvhdmi_8ch(struct hda_c
+ 	spec->multiout.max_channels = 8;
+ 	spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
+ 
+-	codec->patch_ops = nvhdmi_patch_ops_8ch;
++	memcpy((void *)&codec->patch_ops, &nvhdmi_patch_ops_8ch, sizeof(nvhdmi_patch_ops_8ch));
+ 
+ 	return 0;
+ }
+@@ -386,7 +386,7 @@ static int patch_nvhdmi_2ch(struct hda_c
+ 	spec->multiout.max_channels = 2;
+ 	spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
+ 
+-	codec->patch_ops = nvhdmi_patch_ops_2ch;
++	memcpy((void *)&codec->patch_ops, &nvhdmi_patch_ops_2ch, sizeof(nvhdmi_patch_ops_2ch));
+ 
+ 	return 0;
+ }
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_realtek.c linux-2.6.32.43/sound/pci/hda/patch_realtek.c
+--- linux-2.6.32.43/sound/pci/hda/patch_realtek.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_realtek.c	2011-08-05 20:33:55.000000000 -0400
+@@ -4856,7 +4856,7 @@ static int patch_alc880(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x0c;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC880_AUTO)
+ 		spec->init_hook = alc880_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+@@ -6479,7 +6479,7 @@ static int patch_alc260(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x08;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC260_AUTO)
+ 		spec->init_hook = alc260_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+@@ -9997,7 +9997,7 @@ static int patch_alc882(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x0c;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC882_AUTO)
+ 		spec->init_hook = alc882_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+@@ -11871,7 +11871,7 @@ static int patch_alc262(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x0c;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC262_AUTO)
+ 		spec->init_hook = alc262_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+@@ -12950,7 +12950,7 @@ static int patch_alc268(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x02;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC268_AUTO)
+ 		spec->init_hook = alc268_auto_init;
+ 
+@@ -13636,7 +13636,7 @@ static int patch_alc269(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x02;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC269_AUTO)
+ 		spec->init_hook = alc269_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+@@ -14741,7 +14741,7 @@ static int patch_alc861(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x03;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC861_AUTO)
+ 		spec->init_hook = alc861_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+@@ -15727,7 +15727,7 @@ static int patch_alc861vd(struct hda_cod
+ 
+ 	spec->vmaster_nid = 0x02;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 
+ 	if (board_config == ALC861VD_AUTO)
+ 		spec->init_hook = alc861vd_auto_init;
+@@ -17652,7 +17652,7 @@ static int patch_alc662(struct hda_codec
+ 
+ 	spec->vmaster_nid = 0x02;
+ 
+-	codec->patch_ops = alc_patch_ops;
++	memcpy((void *)&codec->patch_ops, &alc_patch_ops, sizeof(alc_patch_ops));
+ 	if (board_config == ALC662_AUTO)
+ 		spec->init_hook = alc662_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_si3054.c linux-2.6.32.43/sound/pci/hda/patch_si3054.c
+--- linux-2.6.32.43/sound/pci/hda/patch_si3054.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_si3054.c	2011-08-05 20:33:55.000000000 -0400
+@@ -275,7 +275,7 @@ static int patch_si3054(struct hda_codec
+ 	if (spec == NULL)
+ 		return -ENOMEM;
+ 	codec->spec = spec;
+-	codec->patch_ops = si3054_patch_ops;
++	memcpy((void *)&codec->patch_ops, &si3054_patch_ops, sizeof(si3054_patch_ops));
+ 	return 0;
+ }
+ 
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_sigmatel.c linux-2.6.32.43/sound/pci/hda/patch_sigmatel.c
+--- linux-2.6.32.43/sound/pci/hda/patch_sigmatel.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_sigmatel.c	2011-08-05 20:33:55.000000000 -0400
+@@ -4899,7 +4899,7 @@ static int patch_stac9200(struct hda_cod
+ 	if (spec->board_config == STAC_9200_PANASONIC)
+ 		spec->hp_detect = 0;
+ 
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 
+ 	return 0;
+ }
+@@ -4981,7 +4981,7 @@ static int patch_stac925x(struct hda_cod
+ 		return err;
+ 	}
+ 
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 
+ 	return 0;
+ }
+@@ -5125,7 +5125,7 @@ again:
+ 	if (spec->board_config == STAC_92HD73XX_NO_JD)
+ 		spec->hp_detect = 0;
+ 
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 
+ 	codec->proc_widget_hook = stac92hd7x_proc_hook;
+ 
+@@ -5220,7 +5220,7 @@ again:
+ 	snd_hda_codec_write_cache(codec, nid, 0,
+ 			AC_VERB_SET_CONNECT_SEL, num_dacs);
+ 
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 
+ 	codec->proc_widget_hook = stac92hd_proc_hook;
+ 
+@@ -5294,7 +5294,7 @@ static int patch_stac92hd71bxx(struct hd
+ 		return -ENOMEM;
+ 
+ 	codec->spec = spec;
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 	spec->num_pins = STAC92HD71BXX_NUM_PINS;
+ 	switch (codec->vendor_id) {
+ 	case 0x111d76b6:
+@@ -5515,7 +5515,7 @@ again:
+ 		spec->gpio_dir |= spec->gpio_led;
+ 		spec->gpio_data |= spec->gpio_led;
+ 		/* register check_power_status callback. */
+-		codec->patch_ops.check_power_status =
++		*(void **)&codec->patch_ops.check_power_status =
+ 			stac92xx_hp_check_power_status;
+ 	}
+ #endif	
+@@ -5634,7 +5634,7 @@ static int patch_stac922x(struct hda_cod
+ 		return err;
+ 	}
+ 
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 
+ 	/* Fix Mux capture level; max to 2 */
+ 	snd_hda_override_amp_caps(codec, 0x12, HDA_OUTPUT,
+@@ -5757,7 +5757,7 @@ static int patch_stac927x(struct hda_cod
+ 		return err;
+ 	}
+ 
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 
+ 	codec->proc_widget_hook = stac927x_proc_hook;
+ 
+@@ -5880,7 +5880,7 @@ static int patch_stac9205(struct hda_cod
+ 		return err;
+ 	}
+ 
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 
+ 	codec->proc_widget_hook = stac9205_proc_hook;
+ 
+@@ -5974,7 +5974,7 @@ static int patch_stac9872(struct hda_cod
+ 		return -EINVAL;
+ 	}
+ 	spec->input_mux = &spec->private_imux;
+-	codec->patch_ops = stac92xx_patch_ops;
++	memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
+ 	return 0;
+ }
+ 
+diff -urNp linux-2.6.32.43/sound/pci/hda/patch_via.c linux-2.6.32.43/sound/pci/hda/patch_via.c
+--- linux-2.6.32.43/sound/pci/hda/patch_via.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/hda/patch_via.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1399,9 +1399,9 @@ static int patch_vt1708(struct hda_codec
+ 		spec->num_mixers++;
+ 	}
+ 
+-	codec->patch_ops = via_patch_ops;
++	memcpy((void *)&codec->patch_ops, &via_patch_ops, sizeof(via_patch_ops));
+ 
+-	codec->patch_ops.init = via_auto_init;
++	*(void **)&codec->patch_ops.init = via_auto_init;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = vt1708_loopbacks;
+ #endif
+@@ -1870,10 +1870,10 @@ static int patch_vt1709_10ch(struct hda_
+ 		spec->num_mixers++;
+ 	}
+ 
+-	codec->patch_ops = via_patch_ops;
++	memcpy((void *)&codec->patch_ops, &via_patch_ops, sizeof(via_patch_ops));
+ 
+-	codec->patch_ops.init = via_auto_init;
+-	codec->patch_ops.unsol_event = via_unsol_event;
++	*(void **)&codec->patch_ops.init = via_auto_init;
++	*(void **)&codec->patch_ops.unsol_event = via_unsol_event;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = vt1709_loopbacks;
+ #endif
+@@ -1964,10 +1964,10 @@ static int patch_vt1709_6ch(struct hda_c
+ 		spec->num_mixers++;
+ 	}
+ 
+-	codec->patch_ops = via_patch_ops;
++	memcpy((void *)&codec->patch_ops, &via_patch_ops, sizeof(via_patch_ops));
+ 
+-	codec->patch_ops.init = via_auto_init;
+-	codec->patch_ops.unsol_event = via_unsol_event;
++	*(void **)&codec->patch_ops.init = via_auto_init;
++	*(void **)&codec->patch_ops.unsol_event = via_unsol_event;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = vt1709_loopbacks;
+ #endif
+@@ -2418,10 +2418,10 @@ static int patch_vt1708B_8ch(struct hda_
+ 		spec->num_mixers++;
+ 	}
+ 
+-	codec->patch_ops = via_patch_ops;
++	memcpy((void *)&codec->patch_ops, &via_patch_ops, sizeof(via_patch_ops));
+ 
+-	codec->patch_ops.init = via_auto_init;
+-	codec->patch_ops.unsol_event = via_unsol_event;
++	*(void **)&codec->patch_ops.init = via_auto_init;
++	*(void **)&codec->patch_ops.unsol_event = via_unsol_event;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = vt1708B_loopbacks;
+ #endif
+@@ -2470,10 +2470,10 @@ static int patch_vt1708B_4ch(struct hda_
+ 		spec->num_mixers++;
+ 	}
+ 
+-	codec->patch_ops = via_patch_ops;
++	memcpy((void *)&codec->patch_ops, &via_patch_ops, sizeof(via_patch_ops));
+ 
+-	codec->patch_ops.init = via_auto_init;
+-	codec->patch_ops.unsol_event = via_unsol_event;
++	*(void **)&codec->patch_ops.init = via_auto_init;
++	*(void **)&codec->patch_ops.unsol_event = via_unsol_event;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = vt1708B_loopbacks;
+ #endif
+@@ -2905,10 +2905,10 @@ static int patch_vt1708S(struct hda_code
+ 		spec->num_mixers++;
+ 	}
+ 
+-	codec->patch_ops = via_patch_ops;
++	memcpy((void *)&codec->patch_ops, &via_patch_ops, sizeof(via_patch_ops));
+ 
+-	codec->patch_ops.init = via_auto_init;
+-	codec->patch_ops.unsol_event = via_unsol_event;
++	*(void **)&codec->patch_ops.init = via_auto_init;
++	*(void **)&codec->patch_ops.unsol_event = via_unsol_event;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = vt1708S_loopbacks;
+ #endif
+@@ -3223,10 +3223,10 @@ static int patch_vt1702(struct hda_codec
+ 		spec->num_mixers++;
+ 	}
+ 
+-	codec->patch_ops = via_patch_ops;
++	memcpy((void *)&codec->patch_ops, &via_patch_ops, sizeof(via_patch_ops));
+ 
+-	codec->patch_ops.init = via_auto_init;
+-	codec->patch_ops.unsol_event = via_unsol_event;
++	*(void **)&codec->patch_ops.init = via_auto_init;
++	*(void **)&codec->patch_ops.unsol_event = via_unsol_event;
+ #ifdef CONFIG_SND_HDA_POWER_SAVE
+ 	spec->loopback.amplist = vt1702_loopbacks;
+ #endif
+diff -urNp linux-2.6.32.43/sound/pci/ice1712/ice1712.h linux-2.6.32.43/sound/pci/ice1712/ice1712.h
+--- linux-2.6.32.43/sound/pci/ice1712/ice1712.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/pci/ice1712/ice1712.h	2011-08-05 20:33:55.000000000 -0400
+@@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
+ 	unsigned int mask_flags;	/* total mask bits */
+ 	struct snd_akm4xxx_ops {
+ 		void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
+-	} ops;
++	} __no_const ops;
+ };
+ 
+ struct snd_ice1712_spdif {
+@@ -285,7 +285,7 @@ struct snd_ice1712_spdif {
+ 		int (*default_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+ 		void (*stream_get)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+ 		int (*stream_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+-	} ops;
++	} __no_const ops;
+ };
+ 
+ 
 diff -urNp linux-2.6.32.43/sound/pci/intel8x0m.c linux-2.6.32.43/sound/pci/intel8x0m.c
 --- linux-2.6.32.43/sound/pci/intel8x0m.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/sound/pci/intel8x0m.c	2011-04-23 12:56:12.000000000 -0400
@@ -72712,10 +76681,250 @@ diff -urNp linux-2.6.32.43/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.43/sound/
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
+diff -urNp linux-2.6.32.43/sound/soc/soc-core.c linux-2.6.32.43/sound/soc/soc-core.c
+--- linux-2.6.32.43/sound/soc/soc-core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/soc/soc-core.c	2011-08-05 20:33:55.000000000 -0400
+@@ -1107,13 +1107,13 @@ static int soc_new_pcm(struct snd_soc_de
+ 
+ 	dai_link->pcm = pcm;
+ 	pcm->private_data = rtd;
+-	soc_pcm_ops.mmap = platform->pcm_ops->mmap;
+-	soc_pcm_ops.pointer = platform->pcm_ops->pointer;
+-	soc_pcm_ops.ioctl = platform->pcm_ops->ioctl;
+-	soc_pcm_ops.copy = platform->pcm_ops->copy;
+-	soc_pcm_ops.silence = platform->pcm_ops->silence;
+-	soc_pcm_ops.ack = platform->pcm_ops->ack;
+-	soc_pcm_ops.page = platform->pcm_ops->page;
++	*(void **)&soc_pcm_ops.mmap = platform->pcm_ops->mmap;
++	*(void **)&soc_pcm_ops.pointer = platform->pcm_ops->pointer;
++	*(void **)&soc_pcm_ops.ioctl = platform->pcm_ops->ioctl;
++	*(void **)&soc_pcm_ops.copy = platform->pcm_ops->copy;
++	*(void **)&soc_pcm_ops.silence = platform->pcm_ops->silence;
++	*(void **)&soc_pcm_ops.ack = platform->pcm_ops->ack;
++	*(void **)&soc_pcm_ops.page = platform->pcm_ops->page;
+ 
+ 	if (playback)
+ 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &soc_pcm_ops);
+diff -urNp linux-2.6.32.43/sound/usb/usbaudio.c linux-2.6.32.43/sound/usb/usbaudio.c
+--- linux-2.6.32.43/sound/usb/usbaudio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.43/sound/usb/usbaudio.c	2011-08-05 20:33:55.000000000 -0400
+@@ -963,12 +963,12 @@ static int snd_usb_pcm_playback_trigger(
+ 	switch (cmd) {
+ 	case SNDRV_PCM_TRIGGER_START:
+ 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+-		subs->ops.prepare = prepare_playback_urb;
++		*(void **)&subs->ops.prepare = prepare_playback_urb;
+ 		return 0;
+ 	case SNDRV_PCM_TRIGGER_STOP:
+ 		return deactivate_urbs(subs, 0, 0);
+ 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+-		subs->ops.prepare = prepare_nodata_playback_urb;
++		*(void **)&subs->ops.prepare = prepare_nodata_playback_urb;
+ 		return 0;
+ 	default:
+ 		return -EINVAL;
+@@ -985,15 +985,15 @@ static int snd_usb_pcm_capture_trigger(s
+ 
+ 	switch (cmd) {
+ 	case SNDRV_PCM_TRIGGER_START:
+-		subs->ops.retire = retire_capture_urb;
++		*(void **)&subs->ops.retire = retire_capture_urb;
+ 		return start_urbs(subs, substream->runtime);
+ 	case SNDRV_PCM_TRIGGER_STOP:
+ 		return deactivate_urbs(subs, 0, 0);
+ 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+-		subs->ops.retire = retire_paused_capture_urb;
++		*(void **)&subs->ops.retire = retire_paused_capture_urb;
+ 		return 0;
+ 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+-		subs->ops.retire = retire_capture_urb;
++		*(void **)&subs->ops.retire = retire_capture_urb;
+ 		return 0;
+ 	default:
+ 		return -EINVAL;
+@@ -1542,7 +1542,7 @@ static int snd_usb_pcm_prepare(struct sn
+ 	/* for playback, submit the URBs now; otherwise, the first hwptr_done
+ 	 * updates for all URBs would happen at the same time when starting */
+ 	if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) {
+-		subs->ops.prepare = prepare_nodata_playback_urb;
++		*(void **)&subs->ops.prepare = prepare_nodata_playback_urb;
+ 		return start_urbs(subs, runtime);
+ 	} else
+ 		return 0;
+@@ -2228,14 +2228,14 @@ static void init_substream(struct snd_us
+ 	subs->direction = stream;
+ 	subs->dev = as->chip->dev;
+ 	if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL) {
+-		subs->ops = audio_urb_ops[stream];
++		memcpy((void *)&subs->ops, &audio_urb_ops[stream], sizeof(subs->ops));
+ 	} else {
+-		subs->ops = audio_urb_ops_high_speed[stream];
++		memcpy((void *)&subs->ops, &audio_urb_ops_high_speed[stream], sizeof(subs->ops));
+ 		switch (as->chip->usb_id) {
+ 		case USB_ID(0x041e, 0x3f02): /* E-Mu 0202 USB */
+ 		case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */
+ 		case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */
+-			subs->ops.retire_sync = retire_playback_sync_urb_hs_emu;
++			*(void **)&subs->ops.retire_sync = retire_playback_sync_urb_hs_emu;
+ 			break;
+ 		}
+ 	}
+diff -urNp linux-2.6.32.43/tools/gcc/constify_plugin.c linux-2.6.32.43/tools/gcc/constify_plugin.c
+--- linux-2.6.32.43/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.43/tools/gcc/constify_plugin.c	2011-08-05 20:33:55.000000000 -0400
+@@ -0,0 +1,147 @@
++/*
++ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
++ * Licensed under the GPL v2, or (at your option) v3
++ *
++ * This gcc plugin constifies all structures which contain only function pointers and const fields.
++ *
++ * Usage:
++ * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o const_plugin.so const_plugin.c
++ * $ gcc -fplugin=const_plugin.so test.c  -O2
++ */
++
++#include "gcc-plugin.h"
++#include "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include "tree.h"
++#include "tree-pass.h"
++#include "intl.h"
++#include "plugin-version.h"
++#include "tm.h"
++#include "toplev.h"
++#include "function.h"
++#include "tree-flow.h"
++#include "plugin.h"
++
++int plugin_is_GPL_compatible;
++
++static struct plugin_info const_plugin_info = {
++	.version	= "20110706",
++	.help		= "no-constify\tturn off constification\n",
++};
++
++static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
++{
++	return NULL_TREE;
++}
++
++static struct attribute_spec no_const_attr = {
++	.name			= "no_const",
++	.min_length		= 0,
++	.max_length		= 0,
++	.decl_required		= false,
++	.type_required		= false,
++	.function_type_required	= false,
++	.handler		= handle_no_const_attribute
++};
++
++static void register_attributes(void *event_data, void *data)
++{
++	register_attribute(&no_const_attr);
++}
++
++/*
++static void printnode(char *prefix, tree node)
++{
++	enum tree_code code;
++	enum tree_code_class tclass;
++
++	tclass = TREE_CODE_CLASS(TREE_CODE (node));
++
++	code = TREE_CODE(node);
++	fprintf(stderr, "\n%s node: %p, code: %d type: %s\n", prefix, node, code, tree_code_name[(int)code]);
++	if (DECL_CONTEXT(node) != NULL_TREE && TYPE_NAME(DECL_CONTEXT(node)) != NULL_TREE)
++		fprintf(stderr, "struct name: %s\n", IDENTIFIER_POINTER(TYPE_NAME(DECL_CONTEXT(node))));
++	if (tclass == tcc_declaration && DECL_NAME(node) != NULL_TREE)
++		fprintf(stderr, "field name: %s\n", IDENTIFIER_POINTER(DECL_NAME(node)));
++}
++*/
++
++static void constify_node(tree node)
++{
++	TREE_READONLY(node) = 1;
++}
++
++static bool is_fptr(tree field)
++{
++	tree ptr = TREE_TYPE(field);
++
++	if (TREE_CODE(ptr) != POINTER_TYPE)
++		return false;
++
++	return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
++}
++
++static bool walk_struct(tree node)
++{
++	tree field;
++
++	for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
++		enum tree_code code = TREE_CODE(TREE_TYPE(field));
++		if (code == RECORD_TYPE) {
++			if (!(walk_struct(TREE_TYPE(field))))
++				return false;
++		} else if (is_fptr(field) == false && !TREE_READONLY(field))
++			return false;
++	}
++	return true;
++}
++
++static void finish_type(void *event_data, void *data)
++{
++	tree node = (tree)event_data;
++
++	if (node == NULL_TREE)
++		return;
++
++	if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node)))
++		return;
++
++	if (TREE_READONLY(node))
++		return;
++
++	if (TYPE_FIELDS(node) == NULL_TREE)
++		return;
++
++	if (walk_struct(node))
++		constify_node(node);
++}
++
++int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
++{
++	const char * const plugin_name = plugin_info->base_name;
++	const int argc = plugin_info->argc;
++	const struct plugin_argument * const argv = plugin_info->argv;
++	int i;
++	bool constify = true;
++
++	if (!plugin_default_version_check(version, &gcc_version)) {
++		error(G_("incompatible gcc/plugin versions"));
++		return 1;
++	}
++
++	for (i = 0; i < argc; ++i) {
++		if (!(strcmp(argv[i].key, "no-constify"))) {
++			constify = false;
++			continue;
++		}
++		error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
++	}
++
++	register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
++	if (constify)
++		register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
++	register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
++
++	return 0;
++}
+Binary files linux-2.6.32.43/tools/gcc/constify_plugin.so and linux-2.6.32.43/tools/gcc/constify_plugin.so differ
 diff -urNp linux-2.6.32.43/tools/gcc/Makefile linux-2.6.32.43/tools/gcc/Makefile
 --- linux-2.6.32.43/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.43/tools/gcc/Makefile	2011-06-04 20:52:13.000000000 -0400
-@@ -0,0 +1,11 @@
++++ linux-2.6.32.43/tools/gcc/Makefile	2011-08-05 20:33:55.000000000 -0400
+@@ -0,0 +1,12 @@
 +#CC := gcc
 +#PLUGIN_SOURCE_FILES := pax_plugin.c
 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
@@ -72724,12 +76933,14 @@ diff -urNp linux-2.6.32.43/tools/gcc/Makefile linux-2.6.32.43/tools/gcc/Makefile
 +
 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include
 +
-+hostlibs-y := pax_plugin.so
++hostlibs-y := stackleak_plugin.so constify_plugin.so
 +always := $(hostlibs-y)
-+pax_plugin-objs := pax_plugin.o
-diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_plugin.c
---- linux-2.6.32.43/tools/gcc/pax_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.43/tools/gcc/pax_plugin.c	2011-07-06 19:53:33.000000000 -0400
++stackleak_plugin-objs := stackleak_plugin.o
++constify_plugin-objs := constify_plugin.o
+Binary files linux-2.6.32.43/tools/gcc/pax_plugin.so and linux-2.6.32.43/tools/gcc/pax_plugin.so differ
+diff -urNp linux-2.6.32.43/tools/gcc/stackleak_plugin.c linux-2.6.32.43/tools/gcc/stackleak_plugin.c
+--- linux-2.6.32.43/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.43/tools/gcc/stackleak_plugin.c	2011-08-05 20:33:55.000000000 -0400
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -72774,22 +76985,22 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +static const char track_function[] = "pax_track_stack";
 +static bool init_locals;
 +
-+static struct plugin_info pax_plugin_info = {
++static struct plugin_info stackleak_plugin_info = {
 +	.version	= "201106030000",
 +	.help		= "track-lowest-sp=nn\ttrack sp in functions whose frame size 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 bool gate_stackleak_track_stack(void);
++static unsigned int execute_stackleak_tree_instrument(void);
++static unsigned int execute_stackleak_final(void);
 +
-+static struct gimple_opt_pass pax_tree_instrument_pass = {
++static struct gimple_opt_pass stackleak_tree_instrument_pass = {
 +	.pass = {
 +		.type			= GIMPLE_PASS,
-+		.name			= "pax_tree_instrument",
-+		.gate			= gate_pax_track_stack,
-+		.execute		= execute_pax_tree_instrument,
++		.name			= "stackleak_tree_instrument",
++		.gate			= gate_stackleak_track_stack,
++		.execute		= execute_stackleak_tree_instrument,
 +		.sub			= NULL,
 +		.next			= NULL,
 +		.static_pass_number	= 0,
@@ -72802,12 +77013,12 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +	}
 +};
 +
-+static struct rtl_opt_pass pax_final_rtl_opt_pass = {
++static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
 +	.pass = {
 +		.type			= RTL_PASS,
-+		.name			= "pax_final",
-+		.gate			= gate_pax_track_stack,
-+		.execute		= execute_pax_final,
++		.name			= "stackleak_final",
++		.gate			= gate_stackleak_track_stack,
++		.execute		= execute_stackleak_final,
 +		.sub			= NULL,
 +		.next			= NULL,
 +		.static_pass_number	= 0,
@@ -72820,12 +77031,12 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +	}
 +};
 +
-+static bool gate_pax_track_stack(void)
++static bool gate_stackleak_track_stack(void)
 +{
 +	return track_frame_size >= 0;
 +}
 +
-+static void pax_add_instrumentation(gimple_stmt_iterator *gsi, bool before)
++static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi, bool before)
 +{
 +	gimple call;
 +	tree decl, type;
@@ -72841,7 +77052,7 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +		gsi_insert_after(gsi, call, GSI_CONTINUE_LINKING);
 +}
 +
-+static unsigned int execute_pax_tree_instrument(void)
++static unsigned int execute_stackleak_tree_instrument(void)
 +{
 +	basic_block bb;
 +	gimple_stmt_iterator gsi;
@@ -72868,7 +77079,7 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +				continue;
 +
 +			// 2. insert track call after each __builtin_alloca call
-+			pax_add_instrumentation(&gsi, false);
++			stackleak_add_instrumentation(&gsi, false);
 +//			print_node(stderr, "pax", decl, 4);
 +		}
 +	}
@@ -72876,12 +77087,12 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +	// 3. insert track call at the beginning
 +	bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
 +	gsi = gsi_start_bb(bb);
-+	pax_add_instrumentation(&gsi, true);
++	stackleak_add_instrumentation(&gsi, true);
 +
 +	return 0;
 +}
 +
-+static unsigned int execute_pax_final(void)
++static unsigned int execute_stackleak_final(void)
 +{
 +	rtx insn;
 +
@@ -72926,15 +77137,15 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +	const int argc = plugin_info->argc;
 +	const struct plugin_argument * const argv = plugin_info->argv;
 +	int i;
-+	struct register_pass_info pax_tree_instrument_pass_info = {
-+		.pass				= &pax_tree_instrument_pass.pass,
++	struct register_pass_info stackleak_tree_instrument_pass_info = {
++		.pass				= &stackleak_tree_instrument_pass.pass,
 +//		.reference_pass_name		= "tree_profile",
 +		.reference_pass_name		= "optimized",
 +		.ref_pass_instance_number	= 0,
 +		.pos_op 			= PASS_POS_INSERT_AFTER
 +	};
-+	struct register_pass_info pax_final_pass_info = {
-+		.pass				= &pax_final_rtl_opt_pass.pass,
++	struct register_pass_info stackleak_final_pass_info = {
++		.pass				= &stackleak_final_rtl_opt_pass.pass,
 +		.reference_pass_name		= "final",
 +		.ref_pass_instance_number	= 0,
 +		.pos_op 			= PASS_POS_INSERT_BEFORE
@@ -72945,7 +77156,7 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +		return 1;
 +	}
 +
-+	register_callback(plugin_name, PLUGIN_INFO, NULL, &pax_plugin_info);
++	register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
 +
 +	for (i = 0; i < argc; ++i) {
 +		if (!strcmp(argv[i].key, "track-lowest-sp")) {
@@ -72969,12 +77180,12 @@ diff -urNp linux-2.6.32.43/tools/gcc/pax_plugin.c linux-2.6.32.43/tools/gcc/pax_
 +		error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
 +	}
 +
-+	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_tree_instrument_pass_info);
-+	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_final_pass_info);
++	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
++	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
 +
 +	return 0;
 +}
-Binary files linux-2.6.32.43/tools/gcc/pax_plugin.so and linux-2.6.32.43/tools/gcc/pax_plugin.so differ
+Binary files linux-2.6.32.43/tools/gcc/stackleak_plugin.so and linux-2.6.32.43/tools/gcc/stackleak_plugin.so differ
 diff -urNp linux-2.6.32.43/usr/gen_init_cpio.c linux-2.6.32.43/usr/gen_init_cpio.c
 --- linux-2.6.32.43/usr/gen_init_cpio.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.43/usr/gen_init_cpio.c	2011-04-17 15:56:46.000000000 -0400
@@ -73002,32 +77213,8 @@ diff -urNp linux-2.6.32.43/usr/gen_init_cpio.c linux-2.6.32.43/usr/gen_init_cpio
         }
 diff -urNp linux-2.6.32.43/virt/kvm/kvm_main.c linux-2.6.32.43/virt/kvm/kvm_main.c
 --- linux-2.6.32.43/virt/kvm/kvm_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/virt/kvm/kvm_main.c	2011-04-23 21:41:37.000000000 -0400
-@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
- 	return 0;
- }
- 
-+/* cannot be const */
- static struct file_operations kvm_vcpu_fops = {
- 	.release        = kvm_vcpu_release,
- 	.unlocked_ioctl = kvm_vcpu_ioctl,
-@@ -2344,6 +2345,7 @@ static int kvm_vm_mmap(struct file *file
- 	return 0;
- }
- 
-+/* cannot be const */
- static struct file_operations kvm_vm_fops = {
- 	.release        = kvm_vm_release,
- 	.unlocked_ioctl = kvm_vm_ioctl,
-@@ -2431,6 +2433,7 @@ out:
- 	return r;
- }
- 
-+/* cannot be const */
- static struct file_operations kvm_chardev_ops = {
- 	.unlocked_ioctl = kvm_dev_ioctl,
- 	.compat_ioctl   = kvm_dev_ioctl,
-@@ -2494,7 +2497,7 @@ asmlinkage void kvm_handle_fault_on_rebo
++++ linux-2.6.32.43/virt/kvm/kvm_main.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2494,7 +2494,7 @@ asmlinkage void kvm_handle_fault_on_rebo
  	if (kvm_rebooting)
  		/* spin while reset goes on */
  		while (true)
@@ -73036,7 +77223,7 @@ diff -urNp linux-2.6.32.43/virt/kvm/kvm_main.c linux-2.6.32.43/virt/kvm/kvm_main
  	/* Fault while not rebooting.  We want the trace. */
  	BUG();
  }
-@@ -2714,7 +2717,7 @@ static void kvm_sched_out(struct preempt
+@@ -2714,7 +2714,7 @@ static void kvm_sched_out(struct preempt
  	kvm_arch_vcpu_put(vcpu);
  }
  
@@ -73045,7 +77232,7 @@ diff -urNp linux-2.6.32.43/virt/kvm/kvm_main.c linux-2.6.32.43/virt/kvm/kvm_main
  		  struct module *module)
  {
  	int r;
-@@ -2767,7 +2770,7 @@ int kvm_init(void *opaque, unsigned int 
+@@ -2767,15 +2767,17 @@ int kvm_init(void *opaque, unsigned int 
  	/* A kmem cache lets us meet the alignment requirements of fx_save. */
  	kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size,
  					   __alignof__(struct kvm_vcpu),
@@ -73054,3 +77241,16 @@ diff -urNp linux-2.6.32.43/virt/kvm/kvm_main.c linux-2.6.32.43/virt/kvm/kvm_main
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
  		goto out_free_5;
+ 	}
+ 
+-	kvm_chardev_ops.owner = module;
+-	kvm_vm_fops.owner = module;
+-	kvm_vcpu_fops.owner = module;
++	pax_open_kernel();
++	*(void **)&kvm_chardev_ops.owner = module;
++	*(void **)&kvm_vm_fops.owner = module;
++	*(void **)&kvm_vcpu_fops.owner = module;
++	pax_close_kernel();
+ 
+ 	r = misc_register(&kvm_dev);
+ 	if (r) {
diff --git a/2.6.32/4425_grsec-pax-without-grsec.patch b/2.6.32/4425_grsec-pax-without-grsec.patch
index 6e15250..48357e9 100644
--- a/2.6.32/4425_grsec-pax-without-grsec.patch
+++ b/2.6.32/4425_grsec-pax-without-grsec.patch
@@ -63,7 +63,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/fs/exec.c linux-2.6.32-hardened-r44/fs
  	print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
 @@ -1871,10 +1875,12 @@
  
- void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
+ NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
  {
 +#ifdef CONFIG_GRKERNSEC
  	if (current->signal->curr_ip)
diff --git a/2.6.32/4430_grsec-kconfig-default-gids.patch b/2.6.32/4430_grsec-kconfig-default-gids.patch
index 8d4ec95..498bea8 100644
--- a/2.6.32/4430_grsec-kconfig-default-gids.patch
+++ b/2.6.32/4430_grsec-kconfig-default-gids.patch
@@ -12,7 +12,7 @@ from shooting themselves in the foot.
 diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-hardened-r44/grsecurity/Kconfig
 --- linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig	2011-04-17 18:15:55.000000000 -0400
 +++ linux-2.6.32-hardened-r44/grsecurity/Kconfig	2011-04-17 18:37:33.000000000 -0400
-@@ -434,7 +434,7 @@
+@@ -436,7 +436,7 @@
  config GRKERNSEC_PROC_GID
  	int "GID for special group"
  	depends on GRKERNSEC_PROC_USERGROUP
@@ -21,7 +21,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  
  config GRKERNSEC_PROC_ADD
  	bool "Additional restrictions"
-@@ -658,7 +658,7 @@
+@@ -660,7 +660,7 @@
  config GRKERNSEC_AUDIT_GID
  	int "GID for auditing"
  	depends on GRKERNSEC_AUDIT_GROUP
@@ -30,7 +30,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  
  config GRKERNSEC_EXECLOG
  	bool "Exec logging"
-@@ -844,7 +844,7 @@
+@@ -846,7 +846,7 @@
  config GRKERNSEC_TPE_GID
  	int "GID for untrusted users"
  	depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
@@ -39,7 +39,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Setting this GID determines what group TPE restrictions will be
  	  *enabled* for.  If the sysctl option is enabled, a sysctl option
-@@ -853,7 +853,7 @@
+@@ -855,7 +855,7 @@
  config GRKERNSEC_TPE_GID
  	int "GID for trusted users"
  	depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
@@ -48,7 +48,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Setting this GID determines what group TPE restrictions will be
  	  *disabled* for.  If the sysctl option is enabled, a sysctl option
-@@ -924,7 +924,7 @@
+@@ -926,7 +926,7 @@
  config GRKERNSEC_SOCKET_ALL_GID
  	int "GID to deny all sockets for"
  	depends on GRKERNSEC_SOCKET_ALL
@@ -57,7 +57,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Here you can choose the GID to disable socket access for. Remember to
  	  add the users you want socket access disabled for to the GID
-@@ -945,7 +945,7 @@
+@@ -947,7 +947,7 @@
  config GRKERNSEC_SOCKET_CLIENT_GID
  	int "GID to deny client sockets for"
  	depends on GRKERNSEC_SOCKET_CLIENT
@@ -66,7 +66,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Here you can choose the GID to disable client socket access for.
  	  Remember to add the users you want client socket access disabled for to
-@@ -963,7 +963,7 @@
+@@ -965,7 +965,7 @@
  config GRKERNSEC_SOCKET_SERVER_GID
  	int "GID to deny server sockets for"
  	depends on GRKERNSEC_SOCKET_SERVER
diff --git a/2.6.32/4437-grsec-kconfig-proc-user.patch b/2.6.32/4437-grsec-kconfig-proc-user.patch
index de044fb..58187fc 100644
--- a/2.6.32/4437-grsec-kconfig-proc-user.patch
+++ b/2.6.32/4437-grsec-kconfig-proc-user.patch
@@ -6,7 +6,7 @@ in a different way to avoid bug #366019.  This patch should eventually go upstre
 diff -Naur linux-2.6.32-hardened-r54.orig//grsecurity/Kconfig linux-2.6.32-hardened-r54/grsecurity/Kconfig
 --- a/grsecurity/Kconfig	2011-06-29 07:46:02.000000000 -0400
 +++ b/grsecurity/Kconfig	2011-06-29 07:47:20.000000000 -0400
-@@ -670,7 +670,7 @@
+@@ -672,7 +672,7 @@
  
  config GRKERNSEC_PROC_USER
  	bool "Restrict /proc to user only"
@@ -15,7 +15,7 @@ diff -Naur linux-2.6.32-hardened-r54.orig//grsecurity/Kconfig linux-2.6.32-harde
  	help
  	  If you say Y here, non-root users will only be able to view their own
  	  processes, and restricts them from viewing network-related information,
-@@ -678,7 +678,7 @@
+@@ -680,7 +680,7 @@
  
  config GRKERNSEC_PROC_USERGROUP
  	bool "Allow special group"
diff --git a/2.6.32/4440_selinux-avc_audit-log-curr_ip.patch b/2.6.32/4440_selinux-avc_audit-log-curr_ip.patch
index 926a630..ebb44f7 100644
--- a/2.6.32/4440_selinux-avc_audit-log-curr_ip.patch
+++ b/2.6.32/4440_selinux-avc_audit-log-curr_ip.patch
@@ -28,7 +28,7 @@ Signed-off-by: Lorenzo Hernandez Garcia-Hierro <lorenzo@gnu.org>
 diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-hardened-r44/grsecurity/Kconfig
 --- linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig	2011-04-17 18:47:02.000000000 -0400
 +++ linux-2.6.32-hardened-r44/grsecurity/Kconfig	2011-04-17 18:51:15.000000000 -0400
-@@ -1275,6 +1275,27 @@
+@@ -1277,6 +1277,27 @@
  menu "Logging Options"
  depends on GRKERNSEC
  
diff --git a/2.6.32/4450_check_ssp_fix.patch b/2.6.32/4450_check_ssp_fix.patch
index b22bc77..40e0467 100644
--- a/2.6.32/4450_check_ssp_fix.patch
+++ b/2.6.32/4450_check_ssp_fix.patch
@@ -6,7 +6,7 @@
 
 --- a/arch/x86/Makefile	2010-03-31 16:39:32.000000000 +0200
 +++ b/arch/x86/Makefile	2010-03-31 16:36:53.000000000 +0200
-@@ -74,7 +74,7 @@
+@@ -75,7 +75,7 @@
  
  ifdef CONFIG_CC_STACKPROTECTOR
  	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
diff --git a/2.6.39/0000_README b/2.6.39/0000_README
index 66fcae4..c7b2f4b 100644
--- a/2.6.39/0000_README
+++ b/2.6.39/0000_README
@@ -3,7 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-2.6.39.3-201107191826.patch
+Patch:	4420_grsecurity-2.2.2-2.6.39.4-201108052113.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.39/4420_grsecurity-2.2.2-2.6.39.3-201107191826.patch b/2.6.39/4420_grsecurity-2.2.2-2.6.39.4-201108052113.patch
index f85e905..6d7cdae 100644
--- a/2.6.39/4420_grsecurity-2.2.2-2.6.39.3-201107191826.patch
+++ b/2.6.39/4420_grsecurity-2.2.2-2.6.39.4-201108052113.patch
@@ -1,21 +1,6 @@
-diff -urNp linux-2.6.39.3/arch/alpha/include/asm/dma-mapping.h linux-2.6.39.3/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/alpha/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/include/asm/dma-mapping.h	2011-05-22 19:36:30.000000000 -0400
-@@ -3,9 +3,9 @@
- 
- #include <linux/dma-attrs.h>
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	return dma_ops;
- }
-diff -urNp linux-2.6.39.3/arch/alpha/include/asm/elf.h linux-2.6.39.3/arch/alpha/include/asm/elf.h
---- linux-2.6.39.3/arch/alpha/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/alpha/include/asm/elf.h linux-2.6.39.4/arch/alpha/include/asm/elf.h
+--- linux-2.6.39.4/arch/alpha/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/alpha/include/asm/elf.h	2011-08-05 19:44:33.000000000 -0400
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -30,9 +15,9 @@ diff -urNp linux-2.6.39.3/arch/alpha/include/asm/elf.h linux-2.6.39.3/arch/alpha
  /* $0 is set by ld.so to a pointer to a function which might be 
     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.3/arch/alpha/include/asm/pgtable.h linux-2.6.39.3/arch/alpha/include/asm/pgtable.h
---- linux-2.6.39.3/arch/alpha/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/include/asm/pgtable.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/alpha/include/asm/pgtable.h linux-2.6.39.4/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.39.4/arch/alpha/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/alpha/include/asm/pgtable.h	2011-08-05 19:44:33.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,141 +36,9 @@ diff -urNp linux-2.6.39.3/arch/alpha/include/asm/pgtable.h linux-2.6.39.3/arch/a
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_apecs.c linux-2.6.39.3/arch/alpha/kernel/core_apecs.c
---- linux-2.6.39.3/arch/alpha/kernel/core_apecs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/core_apecs.c	2011-05-22 19:36:30.000000000 -0400
-@@ -305,7 +305,7 @@ apecs_write_config(struct pci_bus *bus, 
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops apecs_pci_ops = 
-+const struct pci_ops apecs_pci_ops = 
- {
- 	.read =		apecs_read_config,
- 	.write =	apecs_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_cia.c linux-2.6.39.3/arch/alpha/kernel/core_cia.c
---- linux-2.6.39.3/arch/alpha/kernel/core_cia.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/core_cia.c	2011-05-22 19:36:30.000000000 -0400
-@@ -239,7 +239,7 @@ cia_write_config(struct pci_bus *bus, un
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops cia_pci_ops = 
-+const struct pci_ops cia_pci_ops = 
- {
- 	.read = 	cia_read_config,
- 	.write =	cia_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_irongate.c linux-2.6.39.3/arch/alpha/kernel/core_irongate.c
---- linux-2.6.39.3/arch/alpha/kernel/core_irongate.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops irongate_pci_ops =
-+const struct pci_ops irongate_pci_ops =
- {
- 	.read =		irongate_read_config,
- 	.write =	irongate_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_lca.c linux-2.6.39.3/arch/alpha/kernel/core_lca.c
---- linux-2.6.39.3/arch/alpha/kernel/core_lca.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/core_lca.c	2011-05-22 19:36:30.000000000 -0400
-@@ -231,7 +231,7 @@ lca_write_config(struct pci_bus *bus, un
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops lca_pci_ops = 
-+const struct pci_ops lca_pci_ops = 
- {
- 	.read =		lca_read_config,
- 	.write =	lca_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_marvel.c linux-2.6.39.3/arch/alpha/kernel/core_marvel.c
---- linux-2.6.39.3/arch/alpha/kernel/core_marvel.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/core_marvel.c	2011-05-22 19:36:30.000000000 -0400
-@@ -588,7 +588,7 @@ marvel_write_config(struct pci_bus *bus,
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops marvel_pci_ops =
-+const struct pci_ops marvel_pci_ops =
- {
- 	.read =		marvel_read_config,
- 	.write = 	marvel_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_mcpcia.c linux-2.6.39.3/arch/alpha/kernel/core_mcpcia.c
---- linux-2.6.39.3/arch/alpha/kernel/core_mcpcia.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/core_mcpcia.c	2011-05-22 19:36:30.000000000 -0400
-@@ -235,7 +235,7 @@ mcpcia_write_config(struct pci_bus *bus,
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops mcpcia_pci_ops = 
-+const struct pci_ops mcpcia_pci_ops = 
- {
- 	.read =		mcpcia_read_config,
- 	.write =	mcpcia_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_polaris.c linux-2.6.39.3/arch/alpha/kernel/core_polaris.c
---- linux-2.6.39.3/arch/alpha/kernel/core_polaris.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops polaris_pci_ops = 
-+const struct pci_ops polaris_pci_ops = 
- {
- 	.read =		polaris_read_config,
- 	.write =	polaris_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_t2.c linux-2.6.39.3/arch/alpha/kernel/core_t2.c
---- linux-2.6.39.3/arch/alpha/kernel/core_t2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/core_t2.c	2011-05-22 19:36:30.000000000 -0400
-@@ -314,7 +314,7 @@ t2_write_config(struct pci_bus *bus, uns
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops t2_pci_ops = 
-+const struct pci_ops t2_pci_ops = 
- {
- 	.read =		t2_read_config,
- 	.write =	t2_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_titan.c linux-2.6.39.3/arch/alpha/kernel/core_titan.c
---- linux-2.6.39.3/arch/alpha/kernel/core_titan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/core_titan.c	2011-05-22 19:36:30.000000000 -0400
-@@ -191,7 +191,7 @@ titan_write_config(struct pci_bus *bus, 
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops titan_pci_ops = 
-+const struct pci_ops titan_pci_ops = 
- {
- 	.read =		titan_read_config,
- 	.write =	titan_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_tsunami.c linux-2.6.39.3/arch/alpha/kernel/core_tsunami.c
---- linux-2.6.39.3/arch/alpha/kernel/core_tsunami.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops tsunami_pci_ops = 
-+const struct pci_ops tsunami_pci_ops = 
- {
- 	.read =		tsunami_read_config,
- 	.write = 	tsunami_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/core_wildfire.c linux-2.6.39.3/arch/alpha/kernel/core_wildfire.c
---- linux-2.6.39.3/arch/alpha/kernel/core_wildfire.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops wildfire_pci_ops = 
-+const struct pci_ops wildfire_pci_ops = 
- {
- 	.read =		wildfire_read_config,
- 	.write =	wildfire_write_config,
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/module.c linux-2.6.39.3/arch/alpha/kernel/module.c
---- linux-2.6.39.3/arch/alpha/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/module.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/alpha/kernel/module.c linux-2.6.39.4/arch/alpha/kernel/module.c
+--- linux-2.6.39.4/arch/alpha/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/alpha/kernel/module.c	2011-08-05 19:44:33.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -195,62 +48,10 @@ diff -urNp linux-2.6.39.3/arch/alpha/kernel/module.c linux-2.6.39.3/arch/alpha/k
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/osf_sys.c linux-2.6.39.3/arch/alpha/kernel/osf_sys.c
---- linux-2.6.39.3/arch/alpha/kernel/osf_sys.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/osf_sys.c	2011-06-13 17:19:07.000000000 -0400
-@@ -409,7 +409,7 @@ SYSCALL_DEFINE2(osf_getdomainname, char 
- 		return -EFAULT;
- 
- 	len = namelen;
--	if (namelen > 32)
-+	if (len > 32)
- 		len = 32;
- 
- 	down_read(&uts_sem);
-@@ -594,7 +594,7 @@ SYSCALL_DEFINE3(osf_sysinfo, int, comman
- 	down_read(&uts_sem);
- 	res = sysinfo_table[offset];
- 	len = strlen(res)+1;
--	if (len > count)
-+	if ((unsigned long)len > (unsigned long)count)
- 		len = count;
- 	if (copy_to_user(buf, res, len))
- 		err = -EFAULT;
-@@ -649,7 +649,7 @@ SYSCALL_DEFINE5(osf_getsysinfo, unsigned
- 		return 1;
- 
- 	case GSI_GET_HWRPB:
--		if (nbytes < sizeof(*hwrpb))
-+		if (nbytes > sizeof(*hwrpb))
- 			return -EINVAL;
- 		if (copy_to_user(buffer, hwrpb, nbytes) != 0)
- 			return -EFAULT;
-@@ -1008,6 +1008,7 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, i
- {
- 	struct rusage r;
- 	long ret, err;
-+	unsigned int status = 0;
- 	mm_segment_t old_fs;
- 
- 	if (!ur)
-@@ -1016,13 +1017,15 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, i
- 	old_fs = get_fs();
- 		
- 	set_fs (KERNEL_DS);
--	ret = sys_wait4(pid, ustatus, options, (struct rusage __user *) &r);
-+	ret = sys_wait4(pid, (unsigned int __user *) &status, options,
-+			(struct rusage __user *) &r);
- 	set_fs (old_fs);
- 
- 	if (!access_ok(VERIFY_WRITE, ur, sizeof(*ur)))
- 		return -EFAULT;
- 
- 	err = 0;
-+	err |= put_user(status, ustatus);
- 	err |= __put_user(r.ru_utime.tv_sec, &ur->ru_utime.tv_sec);
- 	err |= __put_user(r.ru_utime.tv_usec, &ur->ru_utime.tv_usec);
- 	err |= __put_user(r.ru_stime.tv_sec, &ur->ru_stime.tv_sec);
-@@ -1142,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
+diff -urNp linux-2.6.39.4/arch/alpha/kernel/osf_sys.c linux-2.6.39.4/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.39.4/arch/alpha/kernel/osf_sys.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/arch/alpha/kernel/osf_sys.c	2011-08-05 19:44:33.000000000 -0400
+@@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
  			return -ENOMEM;
@@ -259,7 +60,7 @@ diff -urNp linux-2.6.39.3/arch/alpha/kernel/osf_sys.c linux-2.6.39.3/arch/alpha/
  			return addr;
  		addr = vma->vm_end;
  		vma = vma->vm_next;
-@@ -1178,6 +1181,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1181,6 +1181,10 @@ arch_get_unmapped_area(struct file *filp
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
  
@@ -270,7 +71,7 @@ diff -urNp linux-2.6.39.3/arch/alpha/kernel/osf_sys.c linux-2.6.39.3/arch/alpha/
  	if (addr) {
  		addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
  		if (addr != (unsigned long) -ENOMEM)
-@@ -1185,8 +1192,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1188,8 +1192,8 @@ arch_get_unmapped_area(struct file *filp
  	}
  
  	/* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -281,143 +82,9 @@ diff -urNp linux-2.6.39.3/arch/alpha/kernel/osf_sys.c linux-2.6.39.3/arch/alpha/
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/pci_iommu.c linux-2.6.39.3/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.39.3/arch/alpha/kernel/pci_iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/pci_iommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
- 	return 0;
- }
- 
--struct dma_map_ops alpha_pci_ops = {
-+const struct dma_map_ops alpha_pci_ops = {
- 	.alloc_coherent		= alpha_pci_alloc_coherent,
- 	.free_coherent		= alpha_pci_free_coherent,
- 	.map_page		= alpha_pci_map_page,
-@@ -962,5 +962,5 @@ struct dma_map_ops alpha_pci_ops = {
- 	.set_dma_mask		= alpha_pci_set_mask,
- };
- 
--struct dma_map_ops *dma_ops = &alpha_pci_ops;
-+const struct dma_map_ops *dma_ops = &alpha_pci_ops;
- EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/pci-noop.c linux-2.6.39.3/arch/alpha/kernel/pci-noop.c
---- linux-2.6.39.3/arch/alpha/kernel/pci-noop.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/pci-noop.c	2011-05-22 19:36:30.000000000 -0400
-@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
- 	return 0;
- }
- 
--struct dma_map_ops alpha_noop_ops = {
-+const struct dma_map_ops alpha_noop_ops = {
- 	.alloc_coherent		= alpha_noop_alloc_coherent,
- 	.free_coherent		= alpha_noop_free_coherent,
- 	.map_page		= alpha_noop_map_page,
-@@ -183,7 +183,7 @@ struct dma_map_ops alpha_noop_ops = {
- 	.set_dma_mask		= alpha_noop_set_mask,
- };
- 
--struct dma_map_ops *dma_ops = &alpha_noop_ops;
-+const struct dma_map_ops *dma_ops = &alpha_noop_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff -urNp linux-2.6.39.3/arch/alpha/kernel/proto.h linux-2.6.39.3/arch/alpha/kernel/proto.h
---- linux-2.6.39.3/arch/alpha/kernel/proto.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/kernel/proto.h	2011-05-22 19:36:30.000000000 -0400
-@@ -17,14 +17,14 @@ struct pci_dev;
- struct pci_controller;
- 
- /* core_apecs.c */
--extern struct pci_ops apecs_pci_ops;
-+extern const struct pci_ops apecs_pci_ops;
- extern void apecs_init_arch(void);
- extern void apecs_pci_clr_err(void);
- extern void apecs_machine_check(unsigned long vector, unsigned long la_ptr);
- extern void apecs_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
- 
- /* core_cia.c */
--extern struct pci_ops cia_pci_ops;
-+extern const struct pci_ops cia_pci_ops;
- extern void cia_init_pci(void);
- extern void cia_init_arch(void);
- extern void pyxis_init_arch(void);
-@@ -33,19 +33,19 @@ extern void cia_machine_check(unsigned l
- extern void cia_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
- 
- /* core_irongate.c */
--extern struct pci_ops irongate_pci_ops;
-+extern const struct pci_ops irongate_pci_ops;
- extern int irongate_pci_clr_err(void);
- extern void irongate_init_arch(void);
- #define irongate_pci_tbi ((void *)0)
- 
- /* core_lca.c */
--extern struct pci_ops lca_pci_ops;
-+extern const struct pci_ops lca_pci_ops;
- extern void lca_init_arch(void);
- extern void lca_machine_check(unsigned long vector, unsigned long la_ptr);
- extern void lca_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
- 
- /* core_marvel.c */
--extern struct pci_ops marvel_pci_ops;
-+extern const struct pci_ops marvel_pci_ops;
- extern void marvel_init_arch(void);
- extern void marvel_kill_arch(int);
- extern void marvel_machine_check(unsigned long, unsigned long);
-@@ -60,14 +60,14 @@ struct io7 *marvel_next_io7(struct io7 *
- void io7_clear_errors(struct io7 *io7);
- 
- /* core_mcpcia.c */
--extern struct pci_ops mcpcia_pci_ops;
-+extern const struct pci_ops mcpcia_pci_ops;
- extern void mcpcia_init_arch(void);
- extern void mcpcia_init_hoses(void);
- extern void mcpcia_machine_check(unsigned long vector, unsigned long la_ptr);
- extern void mcpcia_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
- 
- /* core_polaris.c */
--extern struct pci_ops polaris_pci_ops;
-+extern const struct pci_ops polaris_pci_ops;
- extern int polaris_read_config_dword(struct pci_dev *, int, u32 *);
- extern int polaris_write_config_dword(struct pci_dev *, int, u32);
- extern void polaris_init_arch(void);
-@@ -75,14 +75,14 @@ extern void polaris_machine_check(unsign
- #define polaris_pci_tbi ((void *)0)
- 
- /* core_t2.c */
--extern struct pci_ops t2_pci_ops;
-+extern const struct pci_ops t2_pci_ops;
- extern void t2_init_arch(void);
- extern void t2_kill_arch(int);
- extern void t2_machine_check(unsigned long vector, unsigned long la_ptr);
- extern void t2_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
- 
- /* core_titan.c */
--extern struct pci_ops titan_pci_ops;
-+extern const struct pci_ops titan_pci_ops;
- extern void titan_init_arch(void);
- extern void titan_kill_arch(int);
- extern void titan_machine_check(unsigned long, unsigned long);
-@@ -90,14 +90,14 @@ extern void titan_pci_tbi(struct pci_con
- extern struct _alpha_agp_info *titan_agp_info(void);
- 
- /* core_tsunami.c */
--extern struct pci_ops tsunami_pci_ops;
-+extern const struct pci_ops tsunami_pci_ops;
- extern void tsunami_init_arch(void);
- extern void tsunami_kill_arch(int);
- extern void tsunami_machine_check(unsigned long vector, unsigned long la_ptr);
- extern void tsunami_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
- 
- /* core_wildfire.c */
--extern struct pci_ops wildfire_pci_ops;
-+extern const struct pci_ops wildfire_pci_ops;
- 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.3/arch/alpha/mm/fault.c linux-2.6.39.3/arch/alpha/mm/fault.c
---- linux-2.6.39.3/arch/alpha/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/alpha/mm/fault.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/alpha/mm/fault.c linux-2.6.39.4/arch/alpha/mm/fault.c
+--- linux-2.6.39.4/arch/alpha/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/alpha/mm/fault.c	2011-08-05 19:44:33.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -574,45 +241,9 @@ diff -urNp linux-2.6.39.3/arch/alpha/mm/fault.c linux-2.6.39.3/arch/alpha/mm/fau
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.39.3/arch/arm/common/it8152.c linux-2.6.39.3/arch/arm/common/it8152.c
---- linux-2.6.39.3/arch/arm/common/it8152.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/common/it8152.c	2011-05-22 19:36:30.000000000 -0400
-@@ -221,7 +221,7 @@ static int it8152_pci_write_config(struc
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops it8152_ops = {
-+static const struct pci_ops it8152_ops = {
- 	.read = it8152_pci_read_config,
- 	.write = it8152_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/common/via82c505.c linux-2.6.39.3/arch/arm/common/via82c505.c
---- linux-2.6.39.3/arch/arm/common/via82c505.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/common/via82c505.c	2011-05-22 19:36:30.000000000 -0400
-@@ -52,7 +52,7 @@ via82c505_write_config(struct pci_bus *b
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops via82c505_ops = {
-+static const struct pci_ops via82c505_ops = {
- 	.read	= via82c505_read_config,
- 	.write	= via82c505_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/include/asm/cacheflush.h linux-2.6.39.3/arch/arm/include/asm/cacheflush.h
---- linux-2.6.39.3/arch/arm/include/asm/cacheflush.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
--extern struct cpu_cache_fns cpu_cache;
-+extern const struct cpu_cache_fns cpu_cache;
- 
- #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.3/arch/arm/include/asm/elf.h linux-2.6.39.3/arch/arm/include/asm/elf.h
---- linux-2.6.39.3/arch/arm/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/include/asm/elf.h linux-2.6.39.4/arch/arm/include/asm/elf.h
+--- linux-2.6.39.4/arch/arm/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/include/asm/elf.h	2011-08-05 19:44:33.000000000 -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 program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -640,9 +271,9 @@ diff -urNp linux-2.6.39.3/arch/arm/include/asm/elf.h linux-2.6.39.3/arch/arm/inc
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-2.6.39.3/arch/arm/include/asm/kmap_types.h linux-2.6.39.3/arch/arm/include/asm/kmap_types.h
---- linux-2.6.39.3/arch/arm/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/include/asm/kmap_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/include/asm/kmap_types.h linux-2.6.39.4/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.39.4/arch/arm/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/include/asm/kmap_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -21,6 +21,7 @@ enum km_type {
  	KM_L1_CACHE,
  	KM_L2_CACHE,
@@ -651,33 +282,9 @@ diff -urNp linux-2.6.39.3/arch/arm/include/asm/kmap_types.h linux-2.6.39.3/arch/
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.39.3/arch/arm/include/asm/outercache.h linux-2.6.39.3/arch/arm/include/asm/outercache.h
---- linux-2.6.39.3/arch/arm/include/asm/outercache.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/include/asm/outercache.h	2011-05-22 19:36:30.000000000 -0400
-@@ -38,7 +38,7 @@ struct outer_cache_fns {
- 
- #ifdef CONFIG_OUTER_CACHE
- 
--extern struct outer_cache_fns outer_cache;
-+extern const struct outer_cache_fns outer_cache;
- 
- static inline void outer_inv_range(phys_addr_t start, phys_addr_t end)
- {
-diff -urNp linux-2.6.39.3/arch/arm/include/asm/page.h linux-2.6.39.3/arch/arm/include/asm/page.h
---- linux-2.6.39.3/arch/arm/include/asm/page.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/include/asm/page.h	2011-05-22 19:36:30.000000000 -0400
-@@ -126,7 +126,7 @@ struct cpu_user_fns {
- };
- 
- #ifdef MULTI_USER
--extern struct cpu_user_fns cpu_user;
-+extern const struct cpu_user_fns cpu_user;
- 
- #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.3/arch/arm/include/asm/uaccess.h linux-2.6.39.3/arch/arm/include/asm/uaccess.h
---- linux-2.6.39.3/arch/arm/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/include/asm/uaccess.h	2011-06-29 21:04:12.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/include/asm/uaccess.h linux-2.6.39.4/arch/arm/include/asm/uaccess.h
+--- linux-2.6.39.4/arch/arm/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/include/asm/uaccess.h	2011-08-05 19:44:33.000000000 -0400
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -733,9 +340,9 @@ diff -urNp linux-2.6.39.3/arch/arm/include/asm/uaccess.h linux-2.6.39.3/arch/arm
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-2.6.39.3/arch/arm/kernel/armksyms.c linux-2.6.39.3/arch/arm/kernel/armksyms.c
---- linux-2.6.39.3/arch/arm/kernel/armksyms.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/kernel/armksyms.c	2011-07-06 19:52:45.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/kernel/armksyms.c linux-2.6.39.4/arch/arm/kernel/armksyms.c
+--- linux-2.6.39.4/arch/arm/kernel/armksyms.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/kernel/armksyms.c	2011-08-05 19:44:33.000000000 -0400
 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -747,21 +354,9 @@ diff -urNp linux-2.6.39.3/arch/arm/kernel/armksyms.c linux-2.6.39.3/arch/arm/ker
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-2.6.39.3/arch/arm/kernel/kgdb.c linux-2.6.39.3/arch/arm/kernel/kgdb.c
---- linux-2.6.39.3/arch/arm/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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.
-  */
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- #ifndef __ARMEB__
- 	.gdb_bpt_instr		= {0xfe, 0xde, 0xff, 0xe7}
- #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.39.3/arch/arm/kernel/process.c linux-2.6.39.3/arch/arm/kernel/process.c
---- linux-2.6.39.3/arch/arm/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/kernel/process.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/kernel/process.c linux-2.6.39.4/arch/arm/kernel/process.c
+--- linux-2.6.39.4/arch/arm/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/kernel/process.c	2011-08-05 19:44:33.000000000 -0400
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
@@ -783,9 +378,9 @@ diff -urNp linux-2.6.39.3/arch/arm/kernel/process.c linux-2.6.39.3/arch/arm/kern
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-2.6.39.3/arch/arm/kernel/traps.c linux-2.6.39.3/arch/arm/kernel/traps.c
---- linux-2.6.39.3/arch/arm/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/kernel/traps.c	2011-06-13 21:30:34.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/kernel/traps.c linux-2.6.39.4/arch/arm/kernel/traps.c
+--- linux-2.6.39.4/arch/arm/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/kernel/traps.c	2011-08-05 19:44:33.000000000 -0400
 @@ -258,6 +258,8 @@ static int __die(const char *str, int er
  
  static DEFINE_SPINLOCK(die_lock);
@@ -805,9 +400,9 @@ diff -urNp linux-2.6.39.3/arch/arm/kernel/traps.c linux-2.6.39.3/arch/arm/kernel
  	if (ret != NOTIFY_STOP)
  		do_exit(SIGSEGV);
  }
-diff -urNp linux-2.6.39.3/arch/arm/lib/copy_from_user.S linux-2.6.39.3/arch/arm/lib/copy_from_user.S
---- linux-2.6.39.3/arch/arm/lib/copy_from_user.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/lib/copy_from_user.S	2011-06-29 20:58:18.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/lib/copy_from_user.S linux-2.6.39.4/arch/arm/lib/copy_from_user.S
+--- linux-2.6.39.4/arch/arm/lib/copy_from_user.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/lib/copy_from_user.S	2011-08-05 19:44:33.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -831,9 +426,9 @@ diff -urNp linux-2.6.39.3/arch/arm/lib/copy_from_user.S linux-2.6.39.3/arch/arm/
  
  	.pushsection .fixup,"ax"
  	.align 0
-diff -urNp linux-2.6.39.3/arch/arm/lib/copy_to_user.S linux-2.6.39.3/arch/arm/lib/copy_to_user.S
---- linux-2.6.39.3/arch/arm/lib/copy_to_user.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/lib/copy_to_user.S	2011-06-29 20:59:20.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/lib/copy_to_user.S linux-2.6.39.4/arch/arm/lib/copy_to_user.S
+--- linux-2.6.39.4/arch/arm/lib/copy_to_user.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/lib/copy_to_user.S	2011-08-05 19:44:33.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -857,9 +452,9 @@ diff -urNp linux-2.6.39.3/arch/arm/lib/copy_to_user.S linux-2.6.39.3/arch/arm/li
  ENDPROC(__copy_to_user_std)
  
  	.pushsection .fixup,"ax"
-diff -urNp linux-2.6.39.3/arch/arm/lib/uaccess.S linux-2.6.39.3/arch/arm/lib/uaccess.S
---- linux-2.6.39.3/arch/arm/lib/uaccess.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/lib/uaccess.S	2011-06-29 20:59:01.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/lib/uaccess.S linux-2.6.39.4/arch/arm/lib/uaccess.S
+--- linux-2.6.39.4/arch/arm/lib/uaccess.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/lib/uaccess.S	2011-08-05 19:44:33.000000000 -0400
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -913,9 +508,9 @@ diff -urNp linux-2.6.39.3/arch/arm/lib/uaccess.S linux-2.6.39.3/arch/arm/lib/uac
  
  		.pushsection .fixup,"ax"
  		.align	0
-diff -urNp linux-2.6.39.3/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.39.3/arch/arm/lib/uaccess_with_memcpy.c
---- linux-2.6.39.3/arch/arm/lib/uaccess_with_memcpy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/lib/uaccess_with_memcpy.c	2011-06-29 20:59:55.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.39.4/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-2.6.39.4/arch/arm/lib/uaccess_with_memcpy.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/lib/uaccess_with_memcpy.c	2011-08-05 19:44:33.000000000 -0400
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -925,251 +520,9 @@ diff -urNp linux-2.6.39.3/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.39.3/arch
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
-diff -urNp linux-2.6.39.3/arch/arm/mach-cns3xxx/pcie.c linux-2.6.39.3/arch/arm/mach-cns3xxx/pcie.c
---- linux-2.6.39.3/arch/arm/mach-cns3xxx/pcie.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-cns3xxx/pcie.c	2011-05-22 19:36:30.000000000 -0400
-@@ -162,7 +162,7 @@ static int cns3xxx_pci_setup(int nr, str
- 	return 1;
- }
- 
--static struct pci_ops cns3xxx_pcie_ops = {
-+static const struct pci_ops cns3xxx_pcie_ops = {
- 	.read = cns3xxx_pci_read_config,
- 	.write = cns3xxx_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-dove/pcie.c linux-2.6.39.3/arch/arm/mach-dove/pcie.c
---- linux-2.6.39.3/arch/arm/mach-dove/pcie.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-dove/pcie.c	2011-05-22 19:36:30.000000000 -0400
-@@ -155,7 +155,7 @@ static int pcie_wr_conf(struct pci_bus *
- 	return ret;
- }
- 
--static struct pci_ops pcie_ops = {
-+static const struct pci_ops pcie_ops = {
- 	.read = pcie_rd_conf,
- 	.write = pcie_wr_conf,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-footbridge/dc21285.c linux-2.6.39.3/arch/arm/mach-footbridge/dc21285.c
---- linux-2.6.39.3/arch/arm/mach-footbridge/dc21285.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-footbridge/dc21285.c	2011-05-22 19:36:30.000000000 -0400
-@@ -129,7 +129,7 @@ dc21285_write_config(struct pci_bus *bus
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops dc21285_ops = {
-+static const struct pci_ops dc21285_ops = {
- 	.read	= dc21285_read_config,
- 	.write	= dc21285_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-integrator/pci_v3.c linux-2.6.39.3/arch/arm/mach-integrator/pci_v3.c
---- linux-2.6.39.3/arch/arm/mach-integrator/pci_v3.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops pci_v3_ops = {
-+static const struct pci_ops pci_v3_ops = {
- 	.read	= v3_read_config,
- 	.write	= v3_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-iop13xx/pci.c linux-2.6.39.3/arch/arm/mach-iop13xx/pci.c
---- linux-2.6.39.3/arch/arm/mach-iop13xx/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-iop13xx/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -324,7 +324,7 @@ iop13xx_atux_write_config(struct pci_bus
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops iop13xx_atux_ops = {
-+static const struct pci_ops iop13xx_atux_ops = {
- 	.read	= iop13xx_atux_read_config,
- 	.write	= iop13xx_atux_write_config,
- };
-@@ -471,7 +471,7 @@ iop13xx_atue_write_config(struct pci_bus
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops iop13xx_atue_ops = {
-+static const struct pci_ops iop13xx_atue_ops = {
- 	.read	= iop13xx_atue_read_config,
- 	.write	= iop13xx_atue_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-ixp2000/enp2611.c linux-2.6.39.3/arch/arm/mach-ixp2000/enp2611.c
---- linux-2.6.39.3/arch/arm/mach-ixp2000/enp2611.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-ixp2000/enp2611.c	2011-05-22 19:36:30.000000000 -0400
-@@ -137,7 +137,7 @@ static int enp2611_pci_write_config(stru
- 	return PCIBIOS_DEVICE_NOT_FOUND;
- }
- 
--static struct pci_ops enp2611_pci_ops = {
-+static const struct pci_ops enp2611_pci_ops = {
- 	.read   = enp2611_pci_read_config,
- 	.write  = enp2611_pci_write_config
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-ixp2000/pci.c linux-2.6.39.3/arch/arm/mach-ixp2000/pci.c
---- linux-2.6.39.3/arch/arm/mach-ixp2000/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-ixp2000/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -125,7 +125,7 @@ int ixp2000_pci_write_config(struct pci_
- }
- 
- 
--static struct pci_ops ixp2000_pci_ops = {
-+static const struct pci_ops ixp2000_pci_ops = {
- 	.read	= ixp2000_pci_read_config,
- 	.write	= ixp2000_pci_write_config
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-ixp23xx/pci.c linux-2.6.39.3/arch/arm/mach-ixp23xx/pci.c
---- linux-2.6.39.3/arch/arm/mach-ixp23xx/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-ixp23xx/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -136,7 +136,7 @@ static int ixp23xx_pci_write_config(stru
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops ixp23xx_pci_ops = {
-+const struct pci_ops ixp23xx_pci_ops = {
- 	.read	= ixp23xx_pci_read_config,
- 	.write	= ixp23xx_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-ixp4xx/common-pci.c linux-2.6.39.3/arch/arm/mach-ixp4xx/common-pci.c
---- linux-2.6.39.3/arch/arm/mach-ixp4xx/common-pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops ixp4xx_ops = {
-+const struct pci_ops ixp4xx_ops = {
- 	.read =  ixp4xx_pci_read_config,
- 	.write = ixp4xx_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-kirkwood/pcie.c linux-2.6.39.3/arch/arm/mach-kirkwood/pcie.c
---- linux-2.6.39.3/arch/arm/mach-kirkwood/pcie.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-kirkwood/pcie.c	2011-05-22 19:36:30.000000000 -0400
-@@ -111,7 +111,7 @@ static int pcie_wr_conf(struct pci_bus *
- 	return ret;
- }
- 
--static struct pci_ops pcie_ops = {
-+static const struct pci_ops pcie_ops = {
- 	.read = pcie_rd_conf,
- 	.write = pcie_wr_conf,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-ks8695/pci.c linux-2.6.39.3/arch/arm/mach-ks8695/pci.c
---- linux-2.6.39.3/arch/arm/mach-ks8695/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-ks8695/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -136,7 +136,7 @@ static void ks8695_local_writeconfig(int
- 	__raw_writel(value, KS8695_PCI_VA + KS8695_PBCD);
- }
- 
--static struct pci_ops ks8695_pci_ops = {
-+static const struct pci_ops ks8695_pci_ops = {
- 	.read	= ks8695_pci_readconfig,
- 	.write	= ks8695_pci_writeconfig,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-mmp/clock.c linux-2.6.39.3/arch/arm/mach-mmp/clock.c
---- linux-2.6.39.3/arch/arm/mach-mmp/clock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-mmp/clock.c	2011-05-22 19:36:30.000000000 -0400
-@@ -29,7 +29,7 @@ static void apbc_clk_disable(struct clk 
- 	__raw_writel(0, clk->clk_rst);
- }
- 
--struct clkops apbc_clk_ops = {
-+const struct clkops apbc_clk_ops = {
- 	.enable		= apbc_clk_enable,
- 	.disable	= apbc_clk_disable,
- };
-@@ -44,7 +44,7 @@ static void apmu_clk_disable(struct clk 
- 	__raw_writel(0, clk->clk_rst);
- }
- 
--struct clkops apmu_clk_ops = {
-+const struct clkops apmu_clk_ops = {
- 	.enable		= apmu_clk_enable,
- 	.disable	= apmu_clk_disable,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-msm/iommu.c linux-2.6.39.3/arch/arm/mach-msm/iommu.c
---- linux-2.6.39.3/arch/arm/mach-msm/iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-msm/iommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -669,7 +669,7 @@ fail:
- 	return 0;
- }
- 
--static struct iommu_ops msm_iommu_ops = {
-+static const struct iommu_ops msm_iommu_ops = {
- 	.domain_init = msm_iommu_domain_init,
- 	.domain_destroy = msm_iommu_domain_destroy,
- 	.attach_dev = msm_iommu_attach_dev,
-diff -urNp linux-2.6.39.3/arch/arm/mach-msm/last_radio_log.c linux-2.6.39.3/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.39.3/arch/arm/mach-msm/last_radio_log.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-msm/last_radio_log.c	2011-05-22 19:36:30.000000000 -0400
-@@ -48,6 +48,7 @@ static ssize_t last_radio_log_read(struc
- }
- 
- static struct file_operations last_radio_log_fops = {
-+	/* cannot be const, see msm_init_last_radio_log */
- 	.read = last_radio_log_read,
- 	.llseek = default_llseek,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-mv78xx0/pcie.c linux-2.6.39.3/arch/arm/mach-mv78xx0/pcie.c
---- linux-2.6.39.3/arch/arm/mach-mv78xx0/pcie.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-mv78xx0/pcie.c	2011-05-22 19:36:30.000000000 -0400
-@@ -222,7 +222,7 @@ static int pcie_wr_conf(struct pci_bus *
- 	return ret;
- }
- 
--static struct pci_ops pcie_ops = {
-+static const struct pci_ops pcie_ops = {
- 	.read = pcie_rd_conf,
- 	.write = pcie_wr_conf,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-orion5x/pci.c linux-2.6.39.3/arch/arm/mach-orion5x/pci.c
---- linux-2.6.39.3/arch/arm/mach-orion5x/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-orion5x/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -130,7 +130,7 @@ static int pcie_wr_conf(struct pci_bus *
- 	return ret;
- }
- 
--static struct pci_ops pcie_ops = {
-+static const struct pci_ops pcie_ops = {
- 	.read = pcie_rd_conf,
- 	.write = pcie_wr_conf,
- };
-@@ -368,7 +368,7 @@ static int orion5x_pci_wr_conf(struct pc
- 					PCI_FUNC(devfn), where, size, val);
- }
- 
--static struct pci_ops pci_ops = {
-+static const struct pci_ops pci_ops = {
- 	.read = orion5x_pci_rd_conf,
- 	.write = orion5x_pci_wr_conf,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-sa1100/pci-nanoengine.c linux-2.6.39.3/arch/arm/mach-sa1100/pci-nanoengine.c
---- linux-2.6.39.3/arch/arm/mach-sa1100/pci-nanoengine.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-sa1100/pci-nanoengine.c	2011-05-22 19:36:30.000000000 -0400
-@@ -117,7 +117,7 @@ static int nanoengine_write_config(struc
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops pci_nano_ops = {
-+static const struct pci_ops pci_nano_ops = {
- 	.read	= nanoengine_read_config,
- 	.write	= nanoengine_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-tegra/pcie.c linux-2.6.39.3/arch/arm/mach-tegra/pcie.c
---- linux-2.6.39.3/arch/arm/mach-tegra/pcie.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-tegra/pcie.c	2011-05-22 19:36:30.000000000 -0400
-@@ -336,7 +336,7 @@ static int tegra_pcie_write_conf(struct 
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops tegra_pcie_ops = {
-+static const struct pci_ops tegra_pcie_ops = {
- 	.read	= tegra_pcie_read_conf,
- 	.write	= tegra_pcie_write_conf,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.39.3/arch/arm/mach-ux500/mbox-db5500.c
---- linux-2.6.39.3/arch/arm/mach-ux500/mbox-db5500.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-ux500/mbox-db5500.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.39.4/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-2.6.39.4/arch/arm/mach-ux500/mbox-db5500.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/mach-ux500/mbox-db5500.c	2011-08-05 19:44:33.000000000 -0400
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
  	return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -1179,21 +532,9 @@ diff -urNp linux-2.6.39.3/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.39.3/arch/
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-2.6.39.3/arch/arm/mach-versatile/pci.c linux-2.6.39.3/arch/arm/mach-versatile/pci.c
---- linux-2.6.39.3/arch/arm/mach-versatile/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mach-versatile/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -165,7 +165,7 @@ static int versatile_write_config(struct
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops pci_versatile_ops = {
-+static const struct pci_ops pci_versatile_ops = {
- 	.read	= versatile_read_config,
- 	.write	= versatile_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/arm/mm/fault.c linux-2.6.39.3/arch/arm/mm/fault.c
---- linux-2.6.39.3/arch/arm/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mm/fault.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/mm/fault.c linux-2.6.39.4/arch/arm/mm/fault.c
+--- linux-2.6.39.4/arch/arm/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/mm/fault.c	2011-08-05 19:44:33.000000000 -0400
 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -1242,9 +583,9 @@ diff -urNp linux-2.6.39.3/arch/arm/mm/fault.c linux-2.6.39.3/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.39.3/arch/arm/mm/mmap.c linux-2.6.39.3/arch/arm/mm/mmap.c
---- linux-2.6.39.3/arch/arm/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/arm/mm/mmap.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/arm/mm/mmap.c linux-2.6.39.4/arch/arm/mm/mmap.c
+--- linux-2.6.39.4/arch/arm/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/arm/mm/mmap.c	2011-08-05 19:44:33.000000000 -0400
 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -1294,21 +635,9 @@ diff -urNp linux-2.6.39.3/arch/arm/mm/mmap.c linux-2.6.39.3/arch/arm/mm/mmap.c
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-2.6.39.3/arch/arm/plat-iop/pci.c linux-2.6.39.3/arch/arm/plat-iop/pci.c
---- linux-2.6.39.3/arch/arm/plat-iop/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops iop3xx_ops = {
-+static const struct pci_ops iop3xx_ops = {
- 	.read	= iop3xx_read_config,
- 	.write	= iop3xx_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/avr32/include/asm/elf.h linux-2.6.39.3/arch/avr32/include/asm/elf.h
---- linux-2.6.39.3/arch/avr32/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/avr32/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/avr32/include/asm/elf.h linux-2.6.39.4/arch/avr32/include/asm/elf.h
+--- linux-2.6.39.4/arch/avr32/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/avr32/include/asm/elf.h	2011-08-05 19:44:33.000000000 -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 program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -1325,9 +654,9 @@ diff -urNp linux-2.6.39.3/arch/avr32/include/asm/elf.h linux-2.6.39.3/arch/avr32
  
  /* 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.3/arch/avr32/include/asm/kmap_types.h linux-2.6.39.3/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.39.3/arch/avr32/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/avr32/include/asm/kmap_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/avr32/include/asm/kmap_types.h linux-2.6.39.4/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.39.4/arch/avr32/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/avr32/include/asm/kmap_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -1338,9 +667,9 @@ diff -urNp linux-2.6.39.3/arch/avr32/include/asm/kmap_types.h linux-2.6.39.3/arc
  };
  
  #undef D
-diff -urNp linux-2.6.39.3/arch/avr32/mm/fault.c linux-2.6.39.3/arch/avr32/mm/fault.c
---- linux-2.6.39.3/arch/avr32/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/avr32/mm/fault.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/avr32/mm/fault.c linux-2.6.39.4/arch/avr32/mm/fault.c
+--- linux-2.6.39.4/arch/avr32/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/avr32/mm/fault.c	2011-08-05 19:44:33.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -1382,42 +711,9 @@ diff -urNp linux-2.6.39.3/arch/avr32/mm/fault.c linux-2.6.39.3/arch/avr32/mm/fau
  		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.3/arch/blackfin/kernel/kgdb.c linux-2.6.39.3/arch/blackfin/kernel/kgdb.c
---- linux-2.6.39.3/arch/blackfin/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/blackfin/kernel/kgdb.c	2011-05-22 19:36:30.000000000 -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 */
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	.gdb_bpt_instr = {0xa1},
- 	.flags = KGDB_HW_BREAKPOINT,
- 	.set_hw_breakpoint = bfin_set_hw_break,
-diff -urNp linux-2.6.39.3/arch/blackfin/mm/maccess.c linux-2.6.39.3/arch/blackfin/mm/maccess.c
---- linux-2.6.39.3/arch/blackfin/mm/maccess.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/blackfin/mm/maccess.c	2011-05-22 19:36:30.000000000 -0400
-@@ -16,7 +16,7 @@ static int validate_memory_access_addres
- 	return bfin_mem_access_type(addr, size);
- }
- 
--long probe_kernel_read(void *dst, void *src, size_t size)
-+long probe_kernel_read(void *dst, const void *src, size_t size)
- {
- 	unsigned long lsrc = (unsigned long)src;
- 	int mem_type;
-@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *
- 	return -EFAULT;
- }
- 
--long probe_kernel_write(void *dst, void *src, size_t size)
-+long probe_kernel_write(void *dst, const void *src, size_t size)
- {
- 	unsigned long ldst = (unsigned long)dst;
- 	int mem_type;
-diff -urNp linux-2.6.39.3/arch/frv/include/asm/kmap_types.h linux-2.6.39.3/arch/frv/include/asm/kmap_types.h
---- linux-2.6.39.3/arch/frv/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/frv/include/asm/kmap_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/frv/include/asm/kmap_types.h linux-2.6.39.4/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.39.4/arch/frv/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/frv/include/asm/kmap_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -1426,51 +722,9 @@ diff -urNp linux-2.6.39.3/arch/frv/include/asm/kmap_types.h linux-2.6.39.3/arch/
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.39.3/arch/frv/mb93090-mb00/pci-frv.h linux-2.6.39.3/arch/frv/mb93090-mb00/pci-frv.h
---- linux-2.6.39.3/arch/frv/mb93090-mb00/pci-frv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/frv/mb93090-mb00/pci-frv.h	2011-05-22 19:36:30.000000000 -0400
-@@ -34,7 +34,7 @@ void pcibios_resource_survey(void);
- 
- extern int __nongpreldata pcibios_last_bus;
- extern struct pci_bus *__nongpreldata pci_root_bus;
--extern struct pci_ops *__nongpreldata pci_root_ops;
-+extern const struct pci_ops *__nongpreldata pci_root_ops;
- 
- /* pci-irq.c */
- extern unsigned int pcibios_irq_mask;
-diff -urNp linux-2.6.39.3/arch/frv/mb93090-mb00/pci-vdk.c linux-2.6.39.3/arch/frv/mb93090-mb00/pci-vdk.c
---- linux-2.6.39.3/arch/frv/mb93090-mb00/pci-vdk.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/frv/mb93090-mb00/pci-vdk.c	2011-05-22 19:36:30.000000000 -0400
-@@ -27,7 +27,7 @@ unsigned int __nongpreldata pci_probe = 
- 
- int  __nongpreldata pcibios_last_bus = -1;
- struct pci_bus *__nongpreldata pci_root_bus;
--struct pci_ops *__nongpreldata pci_root_ops;
-+const struct pci_ops *__nongpreldata pci_root_ops;
- 
- /*
-  * The accessible PCI window does not cover the entire CPU address space, but
-@@ -169,7 +169,7 @@ static int pci_frv_write_config(struct p
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops pci_direct_frv = {
-+static const struct pci_ops pci_direct_frv = {
- 	pci_frv_read_config,
- 	pci_frv_write_config,
- };
-@@ -356,7 +356,7 @@ void __init pcibios_fixup_bus(struct pci
- 
- int __init pcibios_init(void)
- {
--	struct pci_ops *dir = NULL;
-+	const struct pci_ops *dir = NULL;
- 
- 	if (!mb93090_mb00_detected)
- 		return -ENXIO;
-diff -urNp linux-2.6.39.3/arch/frv/mm/elf-fdpic.c linux-2.6.39.3/arch/frv/mm/elf-fdpic.c
---- linux-2.6.39.3/arch/frv/mm/elf-fdpic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/frv/mm/elf-fdpic.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/frv/mm/elf-fdpic.c linux-2.6.39.4/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.39.4/arch/frv/mm/elf-fdpic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/frv/mm/elf-fdpic.c	2011-08-05 19:44:33.000000000 -0400
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
@@ -1499,97 +753,9 @@ diff -urNp linux-2.6.39.3/arch/frv/mm/elf-fdpic.c linux-2.6.39.3/arch/frv/mm/elf
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-2.6.39.3/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.39.3/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.39.3/arch/ia64/hp/common/hwsw_iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/hp/common/hwsw_iommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -17,7 +17,7 @@
- #include <linux/swiotlb.h>
- #include <asm/machvec.h>
- 
--extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
-+extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
- 
- /* swiotlb declarations & definitions: */
- extern int swiotlb_late_init_with_default_size (size_t size);
-@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct dev
- 		!sba_dma_ops.dma_supported(dev, *dev->dma_mask);
- }
- 
--struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
-+const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
- {
- 	if (use_swiotlb(dev))
- 		return &swiotlb_dma_ops;
-diff -urNp linux-2.6.39.3/arch/ia64/hp/common/sba_iommu.c linux-2.6.39.3/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.39.3/arch/ia64/hp/common/sba_iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/hp/common/sba_iommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
- 	},
- };
- 
--extern struct dma_map_ops swiotlb_dma_ops;
-+extern const struct dma_map_ops swiotlb_dma_ops;
- 
- static int __init
- sba_init(void)
-@@ -2211,7 +2211,7 @@ sba_page_override(char *str)
- 
- __setup("sbapagesize=",sba_page_override);
- 
--struct dma_map_ops sba_dma_ops = {
-+const struct dma_map_ops sba_dma_ops = {
- 	.alloc_coherent		= sba_alloc_coherent,
- 	.free_coherent		= sba_free_coherent,
- 	.map_page		= sba_map_page,
-diff -urNp linux-2.6.39.3/arch/ia64/include/asm/dma-mapping.h linux-2.6.39.3/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/ia64/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/include/asm/dma-mapping.h	2011-05-22 19:36:30.000000000 -0400
-@@ -14,7 +14,7 @@
- 
- #define DMA_ERROR_CODE 0
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- extern struct ia64_machine_vector ia64_mv;
- extern void set_iommu_machvec(void);
- 
-@@ -26,7 +26,7 @@ extern void machvec_dma_sync_sg(struct d
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *daddr, gfp_t gfp)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	void *caddr;
- 
- 	caddr = ops->alloc_coherent(dev, size, daddr, gfp);
-@@ -37,7 +37,7 @@ static inline void *dma_alloc_coherent(s
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *caddr, dma_addr_t daddr)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	debug_dma_free_coherent(dev, size, caddr, daddr);
- 	ops->free_coherent(dev, size, caddr, daddr);
- }
-@@ -51,13 +51,13 @@ static inline void dma_free_coherent(str
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	return ops->mapping_error(dev, daddr);
- }
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	return ops->dma_supported(dev, mask);
- }
- 
-diff -urNp linux-2.6.39.3/arch/ia64/include/asm/elf.h linux-2.6.39.3/arch/ia64/include/asm/elf.h
---- linux-2.6.39.3/arch/ia64/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/include/asm/elf.h linux-2.6.39.4/arch/ia64/include/asm/elf.h
+--- linux-2.6.39.4/arch/ia64/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/include/asm/elf.h	2011-08-05 19:44:33.000000000 -0400
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -1604,30 +770,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/include/asm/elf.h linux-2.6.39.3/arch/ia64/i
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.39.3/arch/ia64/include/asm/machvec.h linux-2.6.39.3/arch/ia64/include/asm/machvec.h
---- linux-2.6.39.3/arch/ia64/include/asm/machvec.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/include/asm/machvec.h	2011-05-22 19:36:30.000000000 -0400
-@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
- /* DMA-mapping interface: */
- typedef void ia64_mv_dma_init (void);
- typedef u64 ia64_mv_dma_get_required_mask (struct device *);
--typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
-+typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
- 
- /*
-  * WARNING: The legacy I/O space is _architected_.  Platforms are
-@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(co
- # endif /* CONFIG_IA64_GENERIC */
- 
- extern void swiotlb_dma_init(void);
--extern struct dma_map_ops *dma_get_ops(struct device *);
-+extern const struct dma_map_ops *dma_get_ops(struct device *);
- 
- /*
-  * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.39.3/arch/ia64/include/asm/pgtable.h linux-2.6.39.3/arch/ia64/include/asm/pgtable.h
---- linux-2.6.39.3/arch/ia64/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/include/asm/pgtable.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/include/asm/pgtable.h linux-2.6.39.4/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.39.4/arch/ia64/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/include/asm/pgtable.h	2011-08-05 19:44:33.000000000 -0400
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -1655,9 +800,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/include/asm/pgtable.h linux-2.6.39.3/arch/ia
  #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.3/arch/ia64/include/asm/spinlock.h linux-2.6.39.3/arch/ia64/include/asm/spinlock.h
---- linux-2.6.39.3/arch/ia64/include/asm/spinlock.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/include/asm/spinlock.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/include/asm/spinlock.h linux-2.6.39.4/arch/ia64/include/asm/spinlock.h
+--- linux-2.6.39.4/arch/ia64/include/asm/spinlock.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/include/asm/spinlock.h	2011-08-05 19:44:33.000000000 -0400
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -1667,9 +812,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/include/asm/spinlock.h linux-2.6.39.3/arch/i
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-2.6.39.3/arch/ia64/include/asm/uaccess.h linux-2.6.39.3/arch/ia64/include/asm/uaccess.h
---- linux-2.6.39.3/arch/ia64/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/include/asm/uaccess.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/include/asm/uaccess.h linux-2.6.39.4/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.39.4/arch/ia64/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/include/asm/uaccess.h	2011-08-05 19:44:33.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -1688,30 +833,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/include/asm/uaccess.h linux-2.6.39.3/arch/ia
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-2.6.39.3/arch/ia64/kernel/dma-mapping.c linux-2.6.39.3/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.39.3/arch/ia64/kernel/dma-mapping.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/kernel/dma-mapping.c	2011-05-22 19:36:30.000000000 -0400
-@@ -3,7 +3,7 @@
- /* Set this to 1 if there is a HW IOMMU in the system */
- int iommu_detected __read_mostly;
- 
--struct dma_map_ops *dma_ops;
-+const struct dma_map_ops *dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-@@ -16,7 +16,7 @@ static int __init dma_init(void)
- }
- fs_initcall(dma_init);
- 
--struct dma_map_ops *dma_get_ops(struct device *dev)
-+const struct dma_map_ops *dma_get_ops(struct device *dev)
- {
- 	return dma_ops;
- }
-diff -urNp linux-2.6.39.3/arch/ia64/kernel/module.c linux-2.6.39.3/arch/ia64/kernel/module.c
---- linux-2.6.39.3/arch/ia64/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/kernel/module.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/kernel/module.c linux-2.6.39.4/arch/ia64/kernel/module.c
+--- linux-2.6.39.4/arch/ia64/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/kernel/module.c	2011-08-05 19:44:33.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -1800,33 +924,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/kernel/module.c linux-2.6.39.3/arch/ia64/ker
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-2.6.39.3/arch/ia64/kernel/pci-dma.c linux-2.6.39.3/arch/ia64/kernel/pci-dma.c
---- linux-2.6.39.3/arch/ia64/kernel/pci-dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/kernel/pci-dma.c	2011-05-22 19:36:30.000000000 -0400
-@@ -43,7 +43,7 @@ struct device fallback_dev = {
- 	.dma_mask = &fallback_dev.coherent_dma_mask,
- };
- 
--extern struct dma_map_ops intel_dma_ops;
-+extern const struct dma_map_ops intel_dma_ops;
- 
- static int __init pci_iommu_init(void)
- {
-diff -urNp linux-2.6.39.3/arch/ia64/kernel/pci-swiotlb.c linux-2.6.39.3/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.39.3/arch/ia64/kernel/pci-swiotlb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/kernel/pci-swiotlb.c	2011-05-22 19:36:30.000000000 -0400
-@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
- 	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
- }
- 
--struct dma_map_ops swiotlb_dma_ops = {
-+const struct dma_map_ops swiotlb_dma_ops = {
- 	.alloc_coherent = ia64_swiotlb_alloc_coherent,
- 	.free_coherent = swiotlb_free_coherent,
- 	.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.39.3/arch/ia64/kernel/sys_ia64.c linux-2.6.39.3/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.39.3/arch/ia64/kernel/sys_ia64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/kernel/sys_ia64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/kernel/sys_ia64.c linux-2.6.39.4/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.39.4/arch/ia64/kernel/sys_ia64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/kernel/sys_ia64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -1859,9 +959,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/kernel/sys_ia64.c linux-2.6.39.3/arch/ia64/k
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-2.6.39.3/arch/ia64/kernel/vmlinux.lds.S linux-2.6.39.3/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.39.3/arch/ia64/kernel/vmlinux.lds.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/kernel/vmlinux.lds.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.39.4/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.39.4/arch/ia64/kernel/vmlinux.lds.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/kernel/vmlinux.lds.S	2011-08-05 19:44:33.000000000 -0400
 @@ -199,7 +199,7 @@ SECTIONS {
  	/* Per-cpu data: */
  	. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1871,9 +971,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/kernel/vmlinux.lds.S linux-2.6.39.3/arch/ia6
  	/*
  	 * ensure percpu data fits
  	 * into percpu page size
-diff -urNp linux-2.6.39.3/arch/ia64/mm/fault.c linux-2.6.39.3/arch/ia64/mm/fault.c
---- linux-2.6.39.3/arch/ia64/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/mm/fault.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/mm/fault.c linux-2.6.39.4/arch/ia64/mm/fault.c
+--- linux-2.6.39.4/arch/ia64/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/mm/fault.c	2011-08-05 19:44:33.000000000 -0400
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
@@ -1923,9 +1023,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/mm/fault.c linux-2.6.39.3/arch/ia64/mm/fault
  	/*
  	 * 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.3/arch/ia64/mm/hugetlbpage.c linux-2.6.39.3/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.39.3/arch/ia64/mm/hugetlbpage.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/mm/hugetlbpage.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/mm/hugetlbpage.c linux-2.6.39.4/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.39.4/arch/ia64/mm/hugetlbpage.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/mm/hugetlbpage.c	2011-08-05 19:44:33.000000000 -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)
@@ -1935,9 +1035,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/mm/hugetlbpage.c linux-2.6.39.3/arch/ia64/mm
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-2.6.39.3/arch/ia64/mm/init.c linux-2.6.39.3/arch/ia64/mm/init.c
---- linux-2.6.39.3/arch/ia64/mm/init.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/mm/init.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/ia64/mm/init.c linux-2.6.39.4/arch/ia64/mm/init.c
+--- linux-2.6.39.4/arch/ia64/mm/init.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/ia64/mm/init.c	2011-08-05 19:44:33.000000000 -0400
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1958,33 +1058,9 @@ diff -urNp linux-2.6.39.3/arch/ia64/mm/init.c linux-2.6.39.3/arch/ia64/mm/init.c
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.39.3/arch/ia64/pci/pci.c linux-2.6.39.3/arch/ia64/pci/pci.c
---- linux-2.6.39.3/arch/ia64/pci/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/pci/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -109,7 +109,7 @@ static int pci_write(struct pci_bus *bus
- 				  devfn, where, size, value);
- }
- 
--struct pci_ops pci_root_ops = {
-+const struct pci_ops pci_root_ops = {
- 	.read = pci_read,
- 	.write = pci_write,
- };
-diff -urNp linux-2.6.39.3/arch/ia64/sn/pci/pci_dma.c linux-2.6.39.3/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.39.3/arch/ia64/sn/pci/pci_dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/ia64/sn/pci/pci_dma.c	2011-05-22 19:36:30.000000000 -0400
-@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
- 	return ret;
- }
- 
--static struct dma_map_ops sn_dma_ops = {
-+static const struct dma_map_ops sn_dma_ops = {
- 	.alloc_coherent		= sn_dma_alloc_coherent,
- 	.free_coherent		= sn_dma_free_coherent,
- 	.map_page		= sn_dma_map_page,
-diff -urNp linux-2.6.39.3/arch/m32r/lib/usercopy.c linux-2.6.39.3/arch/m32r/lib/usercopy.c
---- linux-2.6.39.3/arch/m32r/lib/usercopy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/m32r/lib/usercopy.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/m32r/lib/usercopy.c linux-2.6.39.4/arch/m32r/lib/usercopy.c
+--- linux-2.6.39.4/arch/m32r/lib/usercopy.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/m32r/lib/usercopy.c	2011-08-05 19:44:33.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -2005,281 +1081,9 @@ diff -urNp linux-2.6.39.3/arch/m32r/lib/usercopy.c linux-2.6.39.3/arch/m32r/lib/
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.39.3/arch/microblaze/include/asm/device.h linux-2.6.39.3/arch/microblaze/include/asm/device.h
---- linux-2.6.39.3/arch/microblaze/include/asm/device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/microblaze/include/asm/device.h	2011-05-22 19:36:30.000000000 -0400
-@@ -13,7 +13,7 @@ struct device_node;
- 
- struct dev_archdata {
- 	/* DMA operations on that device */
--	struct dma_map_ops	*dma_ops;
-+	const struct dma_map_ops	*dma_ops;
- 	void                    *dma_data;
- };
- 
-diff -urNp linux-2.6.39.3/arch/microblaze/include/asm/dma-mapping.h linux-2.6.39.3/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/microblaze/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- 
- /*
-  * Available generic sets of operations
-  */
--extern struct dma_map_ops dma_direct_ops;
-+extern const struct dma_map_ops dma_direct_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	/* We don't handle the NULL dev case for ISA for now. We could
- 	 * do it via an out of line call but it is not needed for now. The
-@@ -63,14 +63,14 @@ static inline struct dma_map_ops *get_dm
- 	return dev->archdata.dma_ops;
- }
- 
--static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
-+static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
- {
- 	dev->archdata.dma_ops = ops;
- }
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (unlikely(!ops))
- 		return 0;
-@@ -81,7 +81,7 @@ static inline int dma_supported(struct d
- 
- static inline int dma_set_mask(struct device *dev, u64 dma_mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (unlikely(ops == NULL))
- 		return -EIO;
-@@ -97,7 +97,7 @@ static inline int dma_set_mask(struct de
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	if (ops->mapping_error)
- 		return ops->mapping_error(dev, dma_addr);
- 
-@@ -110,7 +110,7 @@ static inline int dma_mapping_error(stru
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 					dma_addr_t *dma_handle, gfp_t flag)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *memory;
- 
- 	BUG_ON(!ops);
-@@ -124,7 +124,7 @@ static inline void *dma_alloc_coherent(s
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *cpu_addr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!ops);
- 	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.39.3/arch/microblaze/include/asm/pci.h linux-2.6.39.3/arch/microblaze/include/asm/pci.h
---- linux-2.6.39.3/arch/microblaze/include/asm/pci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/microblaze/include/asm/pci.h	2011-05-22 19:36:30.000000000 -0400
-@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
- }
- 
- #ifdef CONFIG_PCI
--extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
--extern struct dma_map_ops *get_pci_dma_ops(void);
-+extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
-+extern const struct dma_map_ops *get_pci_dma_ops(void);
- #else	/* CONFIG_PCI */
- #define set_pci_dma_ops(d)
- #define get_pci_dma_ops()	NULL
-diff -urNp linux-2.6.39.3/arch/microblaze/kernel/dma.c linux-2.6.39.3/arch/microblaze/kernel/dma.c
---- linux-2.6.39.3/arch/microblaze/kernel/dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/microblaze/kernel/dma.c	2011-05-22 19:36:30.000000000 -0400
-@@ -134,7 +134,7 @@ static inline void dma_direct_unmap_page
- 	__dma_sync_page(dma_address, 0 , size, direction);
- }
- 
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- 	.alloc_coherent	= dma_direct_alloc_coherent,
- 	.free_coherent	= dma_direct_free_coherent,
- 	.map_sg		= dma_direct_map_sg,
-diff -urNp linux-2.6.39.3/arch/microblaze/kernel/kgdb.c linux-2.6.39.3/arch/microblaze/kernel/kgdb.c
---- linux-2.6.39.3/arch/microblaze/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/microblaze/kernel/kgdb.c	2011-05-22 19:36:30.000000000 -0400
-@@ -141,7 +141,7 @@ void kgdb_arch_exit(void)
- /*
-  * Global data
-  */
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- #ifdef __MICROBLAZEEL__
- 	.gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
- #else
-diff -urNp linux-2.6.39.3/arch/microblaze/pci/indirect_pci.c linux-2.6.39.3/arch/microblaze/pci/indirect_pci.c
---- linux-2.6.39.3/arch/microblaze/pci/indirect_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/microblaze/pci/indirect_pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -140,7 +140,7 @@ indirect_write_config(struct pci_bus *bu
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops indirect_pci_ops = {
-+static const struct pci_ops indirect_pci_ops = {
- 	.read = indirect_read_config,
- 	.write = indirect_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/microblaze/pci/pci-common.c linux-2.6.39.3/arch/microblaze/pci/pci-common.c
---- linux-2.6.39.3/arch/microblaze/pci/pci-common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 
--static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
-+static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
- 
--void set_pci_dma_ops(struct dma_map_ops *dma_ops)
-+void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
- {
- 	pci_dma_ops = dma_ops;
- }
- 
--struct dma_map_ops *get_pci_dma_ops(void)
-+const struct dma_map_ops *get_pci_dma_ops(void)
- {
- 	return pci_dma_ops;
- }
-@@ -1583,7 +1583,7 @@ null_write_config(struct pci_bus *bus, u
- 	return PCIBIOS_DEVICE_NOT_FOUND;
- }
- 
--static struct pci_ops null_pci_ops = {
-+static const struct pci_ops null_pci_ops = {
- 	.read = null_read_config,
- 	.write = null_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/mips/alchemy/common/pci.c linux-2.6.39.3/arch/mips/alchemy/common/pci.c
---- linux-2.6.39.3/arch/mips/alchemy/common/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/alchemy/common/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -51,7 +51,7 @@ static struct resource pci_mem_resource 
- 	.flags	= IORESOURCE_MEM
- };
- 
--extern struct pci_ops au1x_pci_ops;
-+extern const struct pci_ops au1x_pci_ops;
- 
- static struct pci_controller au1x_controller = {
- 	.pci_ops	= &au1x_pci_ops,
-diff -urNp linux-2.6.39.3/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.39.3/arch/mips/cavium-octeon/dma-octeon.c
---- linux-2.6.39.3/arch/mips/cavium-octeon/dma-octeon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- struct octeon_dma_map_ops {
--	struct dma_map_ops dma_map_ops;
-+	const struct dma_map_ops dma_map_ops;
- 	dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
- 	phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
- };
-@@ -324,7 +324,7 @@ static struct octeon_dma_map_ops _octeon
- 	},
- };
- 
--struct dma_map_ops *octeon_pci_dma_map_ops;
-+const struct dma_map_ops *octeon_pci_dma_map_ops;
- 
- void __init octeon_pci_dma_init(void)
- {
-diff -urNp linux-2.6.39.3/arch/mips/cobalt/pci.c linux-2.6.39.3/arch/mips/cobalt/pci.c
---- linux-2.6.39.3/arch/mips/cobalt/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/cobalt/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -14,7 +14,7 @@
- 
- #include <asm/gt64120.h>
- 
--extern struct pci_ops gt64xxx_pci0_ops;
-+extern const struct pci_ops gt64xxx_pci0_ops;
- 
- static struct resource cobalt_mem_resource = {
- 	.start	= GT_DEF_PCI0_MEM0_BASE,
-diff -urNp linux-2.6.39.3/arch/mips/include/asm/device.h linux-2.6.39.3/arch/mips/include/asm/device.h
---- linux-2.6.39.3/arch/mips/include/asm/device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/include/asm/device.h	2011-05-22 19:36:30.000000000 -0400
-@@ -10,7 +10,7 @@ struct dma_map_ops;
- 
- struct dev_archdata {
- 	/* DMA operations on that device */
--	struct dma_map_ops *dma_ops;
-+	const struct dma_map_ops *dma_ops;
- };
- 
- struct pdev_archdata {
-diff -urNp linux-2.6.39.3/arch/mips/include/asm/dma-mapping.h linux-2.6.39.3/arch/mips/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/mips/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/include/asm/dma-mapping.h	2011-05-22 19:36:30.000000000 -0400
-@@ -9,9 +9,9 @@
- #include <dma-coherence.h>
- #endif
- 
--extern struct dma_map_ops *mips_dma_map_ops;
-+extern const struct dma_map_ops *mips_dma_map_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	if (dev && dev->archdata.dma_ops)
- 		return dev->archdata.dma_ops;
-@@ -33,13 +33,13 @@ static inline void dma_mark_clean(void *
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	return ops->dma_supported(dev, mask);
- }
- 
- static inline int dma_mapping_error(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	return ops->mapping_error(dev, mask);
- }
- 
-@@ -61,7 +61,7 @@ static inline void *dma_alloc_coherent(s
- 				       dma_addr_t *dma_handle, gfp_t gfp)
- {
- 	void *ret;
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	ret = ops->alloc_coherent(dev, size, dma_handle, gfp);
- 
-@@ -73,7 +73,7 @@ static inline void *dma_alloc_coherent(s
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *vaddr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	ops->free_coherent(dev, size, vaddr, dma_handle);
- 
-diff -urNp linux-2.6.39.3/arch/mips/include/asm/elf.h linux-2.6.39.3/arch/mips/include/asm/elf.h
---- linux-2.6.39.3/arch/mips/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/include/asm/elf.h linux-2.6.39.4/arch/mips/include/asm/elf.h
+--- linux-2.6.39.4/arch/mips/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/include/asm/elf.h	2011-08-05 19:44:33.000000000 -0400
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -2301,21 +1105,9 @@ diff -urNp linux-2.6.39.3/arch/mips/include/asm/elf.h linux-2.6.39.3/arch/mips/i
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.39.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.39.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
---- linux-2.6.39.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.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);
- 
- struct dma_map_ops;
--extern struct dma_map_ops *octeon_pci_dma_map_ops;
-+extern const struct dma_map_ops *octeon_pci_dma_map_ops;
- extern char *octeon_swiotlb;
- 
- #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
-diff -urNp linux-2.6.39.3/arch/mips/include/asm/page.h linux-2.6.39.3/arch/mips/include/asm/page.h
---- linux-2.6.39.3/arch/mips/include/asm/page.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/include/asm/page.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/include/asm/page.h linux-2.6.39.4/arch/mips/include/asm/page.h
+--- linux-2.6.39.4/arch/mips/include/asm/page.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/include/asm/page.h	2011-08-05 19:44:33.000000000 -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;
@@ -2325,20 +1117,9 @@ diff -urNp linux-2.6.39.3/arch/mips/include/asm/page.h linux-2.6.39.3/arch/mips/
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-2.6.39.3/arch/mips/include/asm/pci/bridge.h linux-2.6.39.3/arch/mips/include/asm/pci/bridge.h
---- linux-2.6.39.3/arch/mips/include/asm/pci/bridge.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/include/asm/pci/bridge.h	2011-05-22 19:36:30.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);
- 
--extern struct pci_ops bridge_pci_ops;
-+extern const struct pci_ops bridge_pci_ops;
- 
- #endif /* _ASM_PCI_BRIDGE_H */
-diff -urNp linux-2.6.39.3/arch/mips/include/asm/system.h linux-2.6.39.3/arch/mips/include/asm/system.h
---- linux-2.6.39.3/arch/mips/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/include/asm/system.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/include/asm/system.h linux-2.6.39.4/arch/mips/include/asm/system.h
+--- linux-2.6.39.4/arch/mips/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/include/asm/system.h	2011-08-05 19:44:33.000000000 -0400
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -2347,9 +1128,9 @@ diff -urNp linux-2.6.39.3/arch/mips/include/asm/system.h linux-2.6.39.3/arch/mip
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.39.3/arch/mips/kernel/binfmt_elfn32.c linux-2.6.39.3/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.39.3/arch/mips/kernel/binfmt_elfn32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/kernel/binfmt_elfn32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.39.4/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.39.4/arch/mips/kernel/binfmt_elfn32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/kernel/binfmt_elfn32.c	2011-08-05 19:44:33.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)
@@ -2364,9 +1145,9 @@ diff -urNp linux-2.6.39.3/arch/mips/kernel/binfmt_elfn32.c linux-2.6.39.3/arch/m
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-2.6.39.3/arch/mips/kernel/binfmt_elfo32.c linux-2.6.39.3/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.39.3/arch/mips/kernel/binfmt_elfo32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/kernel/binfmt_elfo32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.39.4/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.39.4/arch/mips/kernel/binfmt_elfo32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/kernel/binfmt_elfo32.c	2011-08-05 19:44:33.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)
@@ -2381,21 +1162,9 @@ diff -urNp linux-2.6.39.3/arch/mips/kernel/binfmt_elfo32.c linux-2.6.39.3/arch/m
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-2.6.39.3/arch/mips/kernel/kgdb.c linux-2.6.39.3/arch/mips/kernel/kgdb.c
---- linux-2.6.39.3/arch/mips/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct kgdb_arch arch_kgdb_ops;
-+struct kgdb_arch arch_kgdb_ops;	/* cannot be const, see kgdb_arch_init */
- 
- /*
-  * We use kgdb_early_setup so that functions we need to call now don't
-diff -urNp linux-2.6.39.3/arch/mips/kernel/process.c linux-2.6.39.3/arch/mips/kernel/process.c
---- linux-2.6.39.3/arch/mips/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/kernel/process.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/kernel/process.c linux-2.6.39.4/arch/mips/kernel/process.c
+--- linux-2.6.39.4/arch/mips/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/kernel/process.c	2011-08-05 19:44:33.000000000 -0400
 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
  out:
  	return pc;
@@ -2412,9 +1181,9 @@ diff -urNp linux-2.6.39.3/arch/mips/kernel/process.c linux-2.6.39.3/arch/mips/ke
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-2.6.39.3/arch/mips/kernel/syscall.c linux-2.6.39.3/arch/mips/kernel/syscall.c
---- linux-2.6.39.3/arch/mips/kernel/syscall.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/kernel/syscall.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/kernel/syscall.c linux-2.6.39.4/arch/mips/kernel/syscall.c
+--- linux-2.6.39.4/arch/mips/kernel/syscall.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/kernel/syscall.c	2011-08-05 19:44:33.000000000 -0400
 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
@@ -2479,30 +1248,9 @@ diff -urNp linux-2.6.39.3/arch/mips/kernel/syscall.c linux-2.6.39.3/arch/mips/ke
  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.3/arch/mips/mm/dma-default.c linux-2.6.39.3/arch/mips/mm/dma-default.c
---- linux-2.6.39.3/arch/mips/mm/dma-default.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/mm/dma-default.c	2011-05-22 19:36:30.000000000 -0400
-@@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, 
- 
- EXPORT_SYMBOL(dma_cache_sync);
- 
--static struct dma_map_ops mips_default_dma_map_ops = {
-+static const struct dma_map_ops mips_default_dma_map_ops = {
- 	.alloc_coherent = mips_dma_alloc_coherent,
- 	.free_coherent = mips_dma_free_coherent,
- 	.map_page = mips_dma_map_page,
-@@ -315,7 +315,7 @@ static struct dma_map_ops mips_default_d
- 	.dma_supported = mips_dma_supported
- };
- 
--struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
-+const struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
- EXPORT_SYMBOL(mips_dma_map_ops);
- 
- #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-diff -urNp linux-2.6.39.3/arch/mips/mm/fault.c linux-2.6.39.3/arch/mips/mm/fault.c
---- linux-2.6.39.3/arch/mips/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/mm/fault.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/mips/mm/fault.c linux-2.6.39.4/arch/mips/mm/fault.c
+--- linux-2.6.39.4/arch/mips/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/mips/mm/fault.c	2011-08-05 19:44:33.000000000 -0400
 @@ -28,6 +28,23 @@
  #include <asm/highmem.h>		/* For VMALLOC_END */
  #include <linux/kdebug.h>
@@ -2527,542 +1275,9 @@ diff -urNp linux-2.6.39.3/arch/mips/mm/fault.c linux-2.6.39.3/arch/mips/mm/fault
  /*
   * 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.3/arch/mips/mti-malta/malta-pci.c linux-2.6.39.3/arch/mips/mti-malta/malta-pci.c
---- linux-2.6.39.3/arch/mips/mti-malta/malta-pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/mti-malta/malta-pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -64,9 +64,9 @@ static struct resource msc_io_resource =
- 	.flags	= IORESOURCE_IO,
- };
- 
--extern struct pci_ops bonito64_pci_ops;
--extern struct pci_ops gt64xxx_pci0_ops;
--extern struct pci_ops msc_pci_ops;
-+extern const struct pci_ops bonito64_pci_ops;
-+extern const struct pci_ops gt64xxx_pci0_ops;
-+extern const struct pci_ops msc_pci_ops;
- 
- static struct pci_controller bonito64_controller = {
- 	.pci_ops	= &bonito64_pci_ops,
-diff -urNp linux-2.6.39.3/arch/mips/nxp/pnx8550/common/pci.c linux-2.6.39.3/arch/mips/nxp/pnx8550/common/pci.c
---- linux-2.6.39.3/arch/mips/nxp/pnx8550/common/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/nxp/pnx8550/common/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -40,7 +40,7 @@ static struct resource pci_mem_resource 
- 	.flags	= IORESOURCE_MEM
- };
- 
--extern struct pci_ops pnx8550_pci_ops;
-+extern const struct pci_ops pnx8550_pci_ops;
- 
- static struct pci_controller pnx8550_controller = {
- 	.pci_ops	= &pnx8550_pci_ops,
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-au1000.c linux-2.6.39.3/arch/mips/pci/ops-au1000.c
---- linux-2.6.39.3/arch/mips/pci/ops-au1000.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-au1000.c	2011-05-22 19:36:30.000000000 -0400
-@@ -302,7 +302,7 @@ static int config_write(struct pci_bus *
- 	}
- }
- 
--struct pci_ops au1x_pci_ops = {
-+const struct pci_ops au1x_pci_ops = {
- 	config_read,
- 	config_write
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-bcm63xx.c linux-2.6.39.3/arch/mips/pci/ops-bcm63xx.c
---- linux-2.6.39.3/arch/mips/pci/ops-bcm63xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-bcm63xx.c	2011-05-22 19:36:30.000000000 -0400
-@@ -173,7 +173,7 @@ static int bcm63xx_pci_write(struct pci_
- 				     where, size, val);
- }
- 
--struct pci_ops bcm63xx_pci_ops = {
-+const struct pci_ops bcm63xx_pci_ops = {
- 	.read   = bcm63xx_pci_read,
- 	.write  = bcm63xx_pci_write
- };
-@@ -402,7 +402,7 @@ static int bcm63xx_cb_write(struct pci_b
- 	return PCIBIOS_DEVICE_NOT_FOUND;
- }
- 
--struct pci_ops bcm63xx_cb_ops = {
-+const struct pci_ops bcm63xx_cb_ops = {
- 	.read   = bcm63xx_cb_read,
- 	.write   = bcm63xx_cb_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-bonito64.c linux-2.6.39.3/arch/mips/pci/ops-bonito64.c
---- linux-2.6.39.3/arch/mips/pci/ops-bonito64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-bonito64.c	2011-05-22 19:36:30.000000000 -0400
-@@ -155,7 +155,7 @@ static int bonito64_pcibios_write(struct
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops bonito64_pci_ops = {
-+const struct pci_ops bonito64_pci_ops = {
- 	.read = bonito64_pcibios_read,
- 	.write = bonito64_pcibios_write
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-bridge.c linux-2.6.39.3/arch/mips/pci/ops-bridge.c
---- linux-2.6.39.3/arch/mips/pci/ops-bridge.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-bridge.c	2011-05-22 19:36:30.000000000 -0400
-@@ -316,7 +316,7 @@ static int pci_write_config(struct pci_b
- 	return pci_conf0_write_config(bus, devfn, where, size, value);
- }
- 
--struct pci_ops bridge_pci_ops = {
-+const struct pci_ops bridge_pci_ops = {
- 	.read	= pci_read_config,
- 	.write	= pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-emma2rh.c linux-2.6.39.3/arch/mips/pci/ops-emma2rh.c
---- linux-2.6.39.3/arch/mips/pci/ops-emma2rh.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-emma2rh.c	2011-05-22 19:36:30.000000000 -0400
-@@ -176,7 +176,7 @@ static int pci_config_write(struct pci_b
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops emma2rh_pci_ops = {
-+const struct pci_ops emma2rh_pci_ops = {
- 	.read = pci_config_read,
- 	.write = pci_config_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-gt64xxx_pci0.c linux-2.6.39.3/arch/mips/pci/ops-gt64xxx_pci0.c
---- linux-2.6.39.3/arch/mips/pci/ops-gt64xxx_pci0.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops gt64xxx_pci0_ops = {
-+const struct pci_ops gt64xxx_pci0_ops = {
- 	.read	= gt64xxx_pci0_pcibios_read,
- 	.write	= gt64xxx_pci0_pcibios_write
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-loongson2.c linux-2.6.39.3/arch/mips/pci/ops-loongson2.c
---- linux-2.6.39.3/arch/mips/pci/ops-loongson2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-loongson2.c	2011-05-22 19:36:30.000000000 -0400
-@@ -174,7 +174,7 @@ static int loongson_pcibios_write(struct
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops loongson_pci_ops = {
-+const struct pci_ops loongson_pci_ops = {
- 	.read = loongson_pcibios_read,
- 	.write = loongson_pcibios_write
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-mace.c linux-2.6.39.3/arch/mips/pci/ops-mace.c
---- linux-2.6.39.3/arch/mips/pci/ops-mace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-mace.c	2011-05-22 19:36:30.000000000 -0400
-@@ -96,7 +96,7 @@ mace_pci_write_config(struct pci_bus *bu
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops mace_pci_ops = {
-+const struct pci_ops mace_pci_ops = {
- 	.read = mace_pci_read_config,
- 	.write = mace_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-msc.c linux-2.6.39.3/arch/mips/pci/ops-msc.c
---- linux-2.6.39.3/arch/mips/pci/ops-msc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops msc_pci_ops = {
-+const struct pci_ops msc_pci_ops = {
- 	.read = msc_pcibios_read,
- 	.write = msc_pcibios_write
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-nile4.c linux-2.6.39.3/arch/mips/pci/ops-nile4.c
---- linux-2.6.39.3/arch/mips/pci/ops-nile4.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-nile4.c	2011-05-22 19:36:30.000000000 -0400
-@@ -141,7 +141,7 @@ static int nile4_pcibios_write(struct pc
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops nile4_pci_ops = {
-+const struct pci_ops nile4_pci_ops = {
- 	.read = nile4_pcibios_read,
- 	.write = nile4_pcibios_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-pmcmsp.c linux-2.6.39.3/arch/mips/pci/ops-pmcmsp.c
---- linux-2.6.39.3/arch/mips/pci/ops-pmcmsp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-pmcmsp.c	2011-05-22 19:36:30.000000000 -0400
-@@ -904,7 +904,7 @@ msp_pcibios_write_config(struct pci_bus 
-  *    write     - function for Linux to generate PCI Configuration writes.
-  *
-  ****************************************************************************/
--struct pci_ops msp_pci_ops = {
-+const struct pci_ops msp_pci_ops = {
- 	.read = msp_pcibios_read_config,
- 	.write = msp_pcibios_write_config
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-pnx8550.c linux-2.6.39.3/arch/mips/pci/ops-pnx8550.c
---- linux-2.6.39.3/arch/mips/pci/ops-pnx8550.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-pnx8550.c	2011-05-22 19:36:30.000000000 -0400
-@@ -276,7 +276,7 @@ static int config_write(struct pci_bus *
- 	}
- }
- 
--struct pci_ops pnx8550_pci_ops = {
-+const struct pci_ops pnx8550_pci_ops = {
- 	config_read,
- 	config_write
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-rc32434.c linux-2.6.39.3/arch/mips/pci/ops-rc32434.c
---- linux-2.6.39.3/arch/mips/pci/ops-rc32434.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-rc32434.c	2011-05-22 19:36:30.000000000 -0400
-@@ -201,7 +201,7 @@ static int pci_config_write(struct pci_b
- 	}
- }
- 
--struct pci_ops rc32434_pci_ops = {
-+const struct pci_ops rc32434_pci_ops = {
- 	.read = pci_config_read,
- 	.write = pci_config_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-sni.c linux-2.6.39.3/arch/mips/pci/ops-sni.c
---- linux-2.6.39.3/arch/mips/pci/ops-sni.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct pci_ops sni_pcimt_ops = {
-+const struct pci_ops sni_pcimt_ops = {
- 	.read = pcimt_read,
- 	.write = pcimt_write,
- };
-@@ -158,7 +158,7 @@ static int pcit_write(struct pci_bus *bu
- }
- 
- 
--struct pci_ops sni_pcit_ops = {
-+const struct pci_ops sni_pcit_ops = {
- 	.read = pcit_read,
- 	.write = pcit_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-titan.c linux-2.6.39.3/arch/mips/pci/ops-titan.c
---- linux-2.6.39.3/arch/mips/pci/ops-titan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-titan.c	2011-05-22 19:36:30.000000000 -0400
-@@ -105,7 +105,7 @@ static int titan_write_config(struct pci
- /*
-  * Titan PCI structure
-  */
--struct pci_ops titan_pci_ops = {
-+const struct pci_ops titan_pci_ops = {
- 	titan_read_config,
- 	titan_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-titan-ht.c linux-2.6.39.3/arch/mips/pci/ops-titan-ht.c
---- linux-2.6.39.3/arch/mips/pci/ops-titan-ht.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-titan-ht.c	2011-05-22 19:36:30.000000000 -0400
-@@ -118,7 +118,7 @@ static int titan_ht_config_write(struct 
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops titan_ht_pci_ops = {
-+const struct pci_ops titan_ht_pci_ops = {
- 	.read	= titan_ht_config_read,
- 	.write	= titan_ht_config_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-tx3927.c linux-2.6.39.3/arch/mips/pci/ops-tx3927.c
---- linux-2.6.39.3/arch/mips/pci/ops-tx3927.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-tx3927.c	2011-05-22 19:36:30.000000000 -0400
-@@ -121,7 +121,7 @@ static int tx3927_pci_write_config(struc
- 	return check_abort();
- }
- 
--static struct pci_ops tx3927_pci_ops = {
-+static const struct pci_ops tx3927_pci_ops = {
- 	.read = tx3927_pci_read_config,
- 	.write = tx3927_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/ops-vr41xx.c linux-2.6.39.3/arch/mips/pci/ops-vr41xx.c
---- linux-2.6.39.3/arch/mips/pci/ops-vr41xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/ops-vr41xx.c	2011-05-22 19:36:30.000000000 -0400
-@@ -120,7 +120,7 @@ static int pci_config_write(struct pci_b
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops vr41xx_pci_ops = {
-+const struct pci_ops vr41xx_pci_ops = {
- 	.read	= pci_config_read,
- 	.write	= pci_config_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-bcm1480.c linux-2.6.39.3/arch/mips/pci/pci-bcm1480.c
---- linux-2.6.39.3/arch/mips/pci/pci-bcm1480.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-bcm1480.c	2011-05-22 19:36:30.000000000 -0400
-@@ -171,7 +171,7 @@ static int bcm1480_pcibios_write(struct 
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops bcm1480_pci_ops = {
-+const struct pci_ops bcm1480_pci_ops = {
- 	bcm1480_pcibios_read,
- 	bcm1480_pcibios_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-bcm1480ht.c linux-2.6.39.3/arch/mips/pci/pci-bcm1480ht.c
---- linux-2.6.39.3/arch/mips/pci/pci-bcm1480ht.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-bcm1480ht.c	2011-05-22 19:36:30.000000000 -0400
-@@ -166,7 +166,7 @@ static int bcm1480ht_pcibios_get_busno(v
- 	return 0;
- }
- 
--struct pci_ops bcm1480ht_pci_ops = {
-+const struct pci_ops bcm1480ht_pci_ops = {
- 	.read	= bcm1480ht_pcibios_read,
- 	.write	= bcm1480ht_pcibios_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-bcm63xx.h linux-2.6.39.3/arch/mips/pci/pci-bcm63xx.h
---- linux-2.6.39.3/arch/mips/pci/pci-bcm63xx.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-bcm63xx.h	2011-05-22 19:36:30.000000000 -0400
-@@ -16,8 +16,8 @@
- /*
-  * defined in ops-bcm63xx.c
-  */
--extern struct pci_ops bcm63xx_pci_ops;
--extern struct pci_ops bcm63xx_cb_ops;
-+extern const struct pci_ops bcm63xx_pci_ops;
-+extern const struct pci_ops bcm63xx_cb_ops;
- 
- /*
-  * defined in pci-bcm63xx.c
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-emma2rh.c linux-2.6.39.3/arch/mips/pci/pci-emma2rh.c
---- linux-2.6.39.3/arch/mips/pci/pci-emma2rh.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-emma2rh.c	2011-05-22 19:36:30.000000000 -0400
-@@ -43,7 +43,7 @@ static struct resource pci_mem_resource 
- 	.flags = IORESOURCE_MEM,
- };
- 
--extern struct pci_ops emma2rh_pci_ops;
-+extern const struct pci_ops emma2rh_pci_ops;
- 
- static struct pci_controller emma2rh_pci_controller = {
- 	.pci_ops = &emma2rh_pci_ops,
-diff -urNp linux-2.6.39.3/arch/mips/pci/pcie-octeon.c linux-2.6.39.3/arch/mips/pci/pcie-octeon.c
---- linux-2.6.39.3/arch/mips/pci/pcie-octeon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pcie-octeon.c	2011-05-22 19:36:30.000000000 -0400
-@@ -1237,7 +1237,7 @@ static int octeon_pcie1_write_config(str
- 	return octeon_pcie_write_config(1, bus, devfn, reg, size, val);
- }
- 
--static struct pci_ops octeon_pcie0_ops = {
-+static const struct pci_ops octeon_pcie0_ops = {
- 	octeon_pcie0_read_config,
- 	octeon_pcie0_write_config,
- };
-@@ -1258,7 +1258,7 @@ static struct pci_controller octeon_pcie
- 	.io_resource = &octeon_pcie0_io_resource,
- };
- 
--static struct pci_ops octeon_pcie1_ops = {
-+static const struct pci_ops octeon_pcie1_ops = {
- 	octeon_pcie1_read_config,
- 	octeon_pcie1_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-ip27.c linux-2.6.39.3/arch/mips/pci/pci-ip27.c
---- linux-2.6.39.3/arch/mips/pci/pci-ip27.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-ip27.c	2011-05-22 19:36:30.000000000 -0400
-@@ -39,7 +39,7 @@ static struct bridge_controller bridges[
- struct bridge_controller *irq_to_bridge[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS];
- int irq_to_slot[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS];
- 
--extern struct pci_ops bridge_pci_ops;
-+extern const struct pci_ops bridge_pci_ops;
- 
- int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)
- {
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-ip32.c linux-2.6.39.3/arch/mips/pci/pci-ip32.c
---- linux-2.6.39.3/arch/mips/pci/pci-ip32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-ip32.c	2011-05-22 19:36:30.000000000 -0400
-@@ -82,7 +82,7 @@ static irqreturn_t macepci_error(int irq
- }
- 
- 
--extern struct pci_ops mace_pci_ops;
-+extern const struct pci_ops mace_pci_ops;
- #ifdef CONFIG_64BIT
- static struct resource mace_pci_mem_resource = {
- 	.name	= "SGI O2 PCI MEM",
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-lasat.c linux-2.6.39.3/arch/mips/pci/pci-lasat.c
---- linux-2.6.39.3/arch/mips/pci/pci-lasat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-lasat.c	2011-05-22 19:36:30.000000000 -0400
-@@ -14,8 +14,8 @@
- 
- #include <irq.h>
- 
--extern struct pci_ops nile4_pci_ops;
--extern struct pci_ops gt64xxx_pci0_ops;
-+extern const struct pci_ops nile4_pci_ops;
-+extern const struct pci_ops gt64xxx_pci0_ops;
- static struct resource lasat_pci_mem_resource = {
- 	.name	= "LASAT PCI MEM",
- 	.start	= 0x18000000,
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-octeon.c linux-2.6.39.3/arch/mips/pci/pci-octeon.c
---- linux-2.6.39.3/arch/mips/pci/pci-octeon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-octeon.c	2011-05-22 19:36:30.000000000 -0400
-@@ -334,7 +334,7 @@ static int octeon_write_config(struct pc
- }
- 
- 
--static struct pci_ops octeon_pci_ops = {
-+static const struct pci_ops octeon_pci_ops = {
- 	octeon_read_config,
- 	octeon_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-rc32434.c linux-2.6.39.3/arch/mips/pci/pci-rc32434.c
---- linux-2.6.39.3/arch/mips/pci/pci-rc32434.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-rc32434.c	2011-05-22 19:36:30.000000000 -0400
-@@ -75,7 +75,7 @@ static struct resource rc32434_res_pci_i
- 	.flags = IORESOURCE_IO,
- };
- 
--extern struct pci_ops rc32434_pci_ops;
-+extern const struct pci_ops rc32434_pci_ops;
- 
- #define PCI_MEM1_START	PCI_ADDR_START
- #define PCI_MEM1_END	(PCI_ADDR_START + CPUTOPCI_MEM_WIN - 1)
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-sb1250.c linux-2.6.39.3/arch/mips/pci/pci-sb1250.c
---- linux-2.6.39.3/arch/mips/pci/pci-sb1250.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-sb1250.c	2011-05-22 19:36:30.000000000 -0400
-@@ -181,7 +181,7 @@ static int sb1250_pcibios_write(struct p
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops sb1250_pci_ops = {
-+const struct pci_ops sb1250_pci_ops = {
- 	.read	= sb1250_pcibios_read,
- 	.write	= sb1250_pcibios_write,
- };
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-vr41xx.c linux-2.6.39.3/arch/mips/pci/pci-vr41xx.c
---- linux-2.6.39.3/arch/mips/pci/pci-vr41xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-vr41xx.c	2011-05-22 19:36:30.000000000 -0400
-@@ -36,7 +36,7 @@
- 
- #include "pci-vr41xx.h"
- 
--extern struct pci_ops vr41xx_pci_ops;
-+extern const struct pci_ops vr41xx_pci_ops;
- 
- static void __iomem *pciu_base;
- 
-diff -urNp linux-2.6.39.3/arch/mips/pci/pci-yosemite.c linux-2.6.39.3/arch/mips/pci/pci-yosemite.c
---- linux-2.6.39.3/arch/mips/pci/pci-yosemite.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pci/pci-yosemite.c	2011-05-22 19:36:30.000000000 -0400
-@@ -11,7 +11,7 @@
- #include <linux/pci.h>
- #include <asm/titan_dep.h>
- 
--extern struct pci_ops titan_pci_ops;
-+extern const struct pci_ops titan_pci_ops;
- 
- static struct resource py_mem_resource = {
- 	.start	= 0xe0000000UL,
-diff -urNp linux-2.6.39.3/arch/mips/pmc-sierra/yosemite/ht.c linux-2.6.39.3/arch/mips/pmc-sierra/yosemite/ht.c
---- linux-2.6.39.3/arch/mips/pmc-sierra/yosemite/ht.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pmc-sierra/yosemite/ht.c	2011-05-22 19:36:30.000000000 -0400
-@@ -366,7 +366,7 @@ resource_size_t pcibios_align_resource(v
- 	return start;
- }
- 
--struct pci_ops titan_pci_ops = {
-+const struct pci_ops titan_pci_ops = {
-         titan_ht_config_read_byte,
-         titan_ht_config_read_word,
-         titan_ht_config_read_dword,
-diff -urNp linux-2.6.39.3/arch/mips/pnx8550/common/pci.c linux-2.6.39.3/arch/mips/pnx8550/common/pci.c
---- linux-2.6.39.3/arch/mips/pnx8550/common/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/pnx8550/common/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -40,7 +40,7 @@ static struct resource pci_mem_resource 
- 	.flags	= IORESOURCE_MEM
- };
- 
--extern struct pci_ops pnx8550_pci_ops;
-+extern const struct pci_ops pnx8550_pci_ops;
- 
- static struct pci_controller pnx8550_controller = {
- 	.pci_ops	= &pnx8550_pci_ops,
-diff -urNp linux-2.6.39.3/arch/mips/sni/pcimt.c linux-2.6.39.3/arch/mips/sni/pcimt.c
---- linux-2.6.39.3/arch/mips/sni/pcimt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--extern struct pci_ops sni_pcimt_ops;
-+extern const struct pci_ops sni_pcimt_ops;
- 
- static struct pci_controller sni_controller = {
- 	.pci_ops	= &sni_pcimt_ops,
-diff -urNp linux-2.6.39.3/arch/mips/sni/pcit.c linux-2.6.39.3/arch/mips/sni/pcit.c
---- linux-2.6.39.3/arch/mips/sni/pcit.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/sni/pcit.c	2011-05-22 19:36:30.000000000 -0400
-@@ -145,7 +145,7 @@ static void __init sni_pcit_resource_ini
- }
- 
- 
--extern struct pci_ops sni_pcit_ops;
-+extern const struct pci_ops sni_pcit_ops;
- 
- static struct pci_controller sni_pcit_controller = {
- 	.pci_ops	= &sni_pcit_ops,
-diff -urNp linux-2.6.39.3/arch/mips/wrppmc/pci.c linux-2.6.39.3/arch/mips/wrppmc/pci.c
---- linux-2.6.39.3/arch/mips/wrppmc/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mips/wrppmc/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -14,7 +14,7 @@
- 
- #include <asm/gt64120.h>
- 
--extern struct pci_ops gt64xxx_pci0_ops;
-+extern const struct pci_ops gt64xxx_pci0_ops;
- 
- static struct resource pci0_io_resource = {
- 	.name  = "pci_0 io",
-diff -urNp linux-2.6.39.3/arch/mn10300/unit-asb2305/pci-asb2305.h linux-2.6.39.3/arch/mn10300/unit-asb2305/pci-asb2305.h
---- linux-2.6.39.3/arch/mn10300/unit-asb2305/pci-asb2305.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- extern int pcibios_last_bus;
- extern struct pci_bus *pci_root_bus;
--extern struct pci_ops *pci_root_ops;
-+extern const struct pci_ops *pci_root_ops;
- 
- extern struct irq_routing_table *pcibios_get_irq_routing_table(void);
- extern int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
-diff -urNp linux-2.6.39.3/arch/mn10300/unit-asb2305/pci.c linux-2.6.39.3/arch/mn10300/unit-asb2305/pci.c
---- linux-2.6.39.3/arch/mn10300/unit-asb2305/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/mn10300/unit-asb2305/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -24,7 +24,7 @@ unsigned int pci_probe = 1;
- 
- int pcibios_last_bus = -1;
- struct pci_bus *pci_root_bus;
--struct pci_ops *pci_root_ops;
-+const struct pci_ops *pci_root_ops;
- 
- /*
-  * The accessible PCI window does not cover the entire CPU address space, but
-@@ -274,7 +274,7 @@ static int pci_ampci_write_config(struct
- 	}
- }
- 
--static struct pci_ops pci_direct_ampci = {
-+static const struct pci_ops pci_direct_ampci = {
- 	pci_ampci_read_config,
- 	pci_ampci_write_config,
- };
-@@ -289,7 +289,7 @@ static struct pci_ops pci_direct_ampci =
-  * This should be close to trivial, but it isn't, because there are buggy
-  * chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID.
-  */
--static int __init pci_sanity_check(struct pci_ops *o)
-+static int __init pci_sanity_check(const struct pci_ops *o)
- {
- 	struct pci_bus bus;		/* Fake bus and device */
- 	u32 x;
-diff -urNp linux-2.6.39.3/arch/parisc/include/asm/elf.h linux-2.6.39.3/arch/parisc/include/asm/elf.h
---- linux-2.6.39.3/arch/parisc/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/parisc/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/parisc/include/asm/elf.h linux-2.6.39.4/arch/parisc/include/asm/elf.h
+--- linux-2.6.39.4/arch/parisc/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/parisc/include/asm/elf.h	2011-08-05 19:44:33.000000000 -0400
 @@ -342,6 +342,13 @@ struct pt_regs;	/* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -3077,9 +1292,9 @@ diff -urNp linux-2.6.39.3/arch/parisc/include/asm/elf.h linux-2.6.39.3/arch/pari
  /* 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.3/arch/parisc/include/asm/pgtable.h linux-2.6.39.3/arch/parisc/include/asm/pgtable.h
---- linux-2.6.39.3/arch/parisc/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/parisc/include/asm/pgtable.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/parisc/include/asm/pgtable.h linux-2.6.39.4/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.39.4/arch/parisc/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/parisc/include/asm/pgtable.h	2011-08-05 19:44:33.000000000 -0400
 @@ -207,6 +207,17 @@ struct vm_area_struct;
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -3098,9 +1313,9 @@ diff -urNp linux-2.6.39.3/arch/parisc/include/asm/pgtable.h linux-2.6.39.3/arch/
  #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.3/arch/parisc/kernel/module.c linux-2.6.39.3/arch/parisc/kernel/module.c
---- linux-2.6.39.3/arch/parisc/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/parisc/kernel/module.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/parisc/kernel/module.c linux-2.6.39.4/arch/parisc/kernel/module.c
+--- linux-2.6.39.4/arch/parisc/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/parisc/kernel/module.c	2011-08-05 19:44:33.000000000 -0400
 @@ -96,16 +96,38 @@
  
  /* three functions to determine where in the module core
@@ -3201,9 +1416,9 @@ diff -urNp linux-2.6.39.3/arch/parisc/kernel/module.c linux-2.6.39.3/arch/parisc
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.39.3/arch/parisc/kernel/sys_parisc.c linux-2.6.39.3/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.39.3/arch/parisc/kernel/sys_parisc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/parisc/kernel/sys_parisc.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/parisc/kernel/sys_parisc.c linux-2.6.39.4/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.39.4/arch/parisc/kernel/sys_parisc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/parisc/kernel/sys_parisc.c	2011-08-05 19:44:33.000000000 -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)
@@ -3231,9 +1446,9 @@ diff -urNp linux-2.6.39.3/arch/parisc/kernel/sys_parisc.c linux-2.6.39.3/arch/pa
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.39.3/arch/parisc/kernel/traps.c linux-2.6.39.3/arch/parisc/kernel/traps.c
---- linux-2.6.39.3/arch/parisc/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/parisc/kernel/traps.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/parisc/kernel/traps.c linux-2.6.39.4/arch/parisc/kernel/traps.c
+--- linux-2.6.39.4/arch/parisc/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/parisc/kernel/traps.c	2011-08-05 19:44:33.000000000 -0400
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
  			down_read(&current->mm->mmap_sem);
@@ -3245,9 +1460,9 @@ diff -urNp linux-2.6.39.3/arch/parisc/kernel/traps.c linux-2.6.39.3/arch/parisc/
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-2.6.39.3/arch/parisc/mm/fault.c linux-2.6.39.3/arch/parisc/mm/fault.c
---- linux-2.6.39.3/arch/parisc/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/parisc/mm/fault.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/parisc/mm/fault.c linux-2.6.39.4/arch/parisc/mm/fault.c
+--- linux-2.6.39.4/arch/parisc/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/parisc/mm/fault.c	2011-08-05 19:44:33.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -3417,86 +1632,9 @@ diff -urNp linux-2.6.39.3/arch/parisc/mm/fault.c linux-2.6.39.3/arch/parisc/mm/f
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/device.h linux-2.6.39.3/arch/powerpc/include/asm/device.h
---- linux-2.6.39.3/arch/powerpc/include/asm/device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/device.h	2011-05-22 19:36:30.000000000 -0400
-@@ -17,7 +17,7 @@ struct device_node;
-  */
- struct dev_archdata {
- 	/* DMA operations on that device */
--	struct dma_map_ops	*dma_ops;
-+	const struct dma_map_ops	*dma_ops;
- 
- 	/*
- 	 * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/dma-mapping.h linux-2.6.39.3/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/powerpc/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
-+/* cannot be const */
- #ifdef CONFIG_PPC64
--extern struct dma_map_ops dma_iommu_ops;
-+extern const struct dma_map_ops dma_iommu_ops;
- #endif
--extern struct dma_map_ops dma_direct_ops;
-+extern const struct dma_map_ops dma_direct_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	/* We don't handle the NULL dev case for ISA for now. We could
- 	 * do it via an out of line call but it is not needed for now. The
-@@ -85,7 +86,7 @@ static inline struct dma_map_ops *get_dm
- 	return dev->archdata.dma_ops;
- }
- 
--static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
-+static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
- {
- 	dev->archdata.dma_ops = ops;
- }
-@@ -119,7 +120,7 @@ static inline void set_dma_offset(struct
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	if (unlikely(dma_ops == NULL))
- 		return 0;
-@@ -133,7 +134,7 @@ extern int dma_set_mask(struct device *d
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *dma_handle, gfp_t flag)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 	void *cpu_addr;
- 
- 	BUG_ON(!dma_ops);
-@@ -148,7 +149,7 @@ static inline void *dma_alloc_coherent(s
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *cpu_addr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	BUG_ON(!dma_ops);
- 
-@@ -159,7 +160,7 @@ static inline void dma_free_coherent(str
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	if (dma_ops->mapping_error)
- 		return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/elf.h linux-2.6.39.3/arch/powerpc/include/asm/elf.h
---- linux-2.6.39.3/arch/powerpc/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/elf.h linux-2.6.39.4/arch/powerpc/include/asm/elf.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/elf.h	2011-08-05 19:44:33.000000000 -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 program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -3529,22 +1667,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/elf.h linux-2.6.39.3/arch/pow
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/iommu.h linux-2.6.39.3/arch/powerpc/include/asm/iommu.h
---- linux-2.6.39.3/arch/powerpc/include/asm/iommu.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
-+/* dma-iommu.c */
-+extern int dma_iommu_dma_supported(struct device *dev, u64 mask);
-+
- #ifdef CONFIG_PCI
- extern void pci_iommu_init(void);
- extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/kmap_types.h linux-2.6.39.3/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.39.3/arch/powerpc/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/kmap_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.39.4/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/kmap_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -27,6 +27,7 @@ enum km_type {
  	KM_PPC_SYNC_PAGE,
  	KM_PPC_SYNC_ICACHE,
@@ -3553,9 +1678,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/kmap_types.h linux-2.6.39.3/a
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/page_64.h linux-2.6.39.3/arch/powerpc/include/asm/page_64.h
---- linux-2.6.39.3/arch/powerpc/include/asm/page_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/page_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/page_64.h linux-2.6.39.4/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/page_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/page_64.h	2011-08-05 19:44:33.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.
@@ -3577,9 +1702,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/page_64.h linux-2.6.39.3/arch
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/page.h linux-2.6.39.3/arch/powerpc/include/asm/page.h
---- linux-2.6.39.3/arch/powerpc/include/asm/page.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/page.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/page.h linux-2.6.39.4/arch/powerpc/include/asm/page.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/page.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/page.h	2011-08-05 19:44:33.000000000 -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.
@@ -3602,23 +1727,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/page.h linux-2.6.39.3/arch/po
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/pci.h linux-2.6.39.3/arch/powerpc/include/asm/pci.h
---- linux-2.6.39.3/arch/powerpc/include/asm/pci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/pci.h	2011-05-22 19:36:30.000000000 -0400
-@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
- }
- 
- #ifdef CONFIG_PCI
--extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
--extern struct dma_map_ops *get_pci_dma_ops(void);
-+extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
-+extern const struct dma_map_ops *get_pci_dma_ops(void);
- #else	/* CONFIG_PCI */
- #define set_pci_dma_ops(d)
- #define get_pci_dma_ops()	NULL
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/pgtable.h linux-2.6.39.3/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.39.3/arch/powerpc/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/pgtable.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/pgtable.h linux-2.6.39.4/arch/powerpc/include/asm/pgtable.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/pgtable.h	2011-08-05 19:44:33.000000000 -0400
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -3627,9 +1738,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/pgtable.h linux-2.6.39.3/arch
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/pte-hash32.h linux-2.6.39.3/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.39.3/arch/powerpc/include/asm/pte-hash32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/pte-hash32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.39.4/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/pte-hash32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/pte-hash32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -3638,9 +1749,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/pte-hash32.h linux-2.6.39.3/a
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/reg.h linux-2.6.39.3/arch/powerpc/include/asm/reg.h
---- linux-2.6.39.3/arch/powerpc/include/asm/reg.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/reg.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/reg.h linux-2.6.39.4/arch/powerpc/include/asm/reg.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/reg.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/reg.h	2011-08-05 19:44:33.000000000 -0400
 @@ -201,6 +201,7 @@
  #define SPRN_DBCR	0x136	/* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */
@@ -3649,21 +1760,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/reg.h linux-2.6.39.3/arch/pow
  #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.3/arch/powerpc/include/asm/swiotlb.h linux-2.6.39.3/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.39.3/arch/powerpc/include/asm/swiotlb.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/swiotlb.h	2011-05-22 19:36:30.000000000 -0400
-@@ -13,7 +13,7 @@
- 
- #include <linux/swiotlb.h>
- 
--extern struct dma_map_ops swiotlb_dma_ops;
-+extern const struct dma_map_ops swiotlb_dma_ops;
- 
- static inline void dma_mark_clean(void *addr, size_t size) {}
- 
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/system.h linux-2.6.39.3/arch/powerpc/include/asm/system.h
---- linux-2.6.39.3/arch/powerpc/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/system.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/system.h linux-2.6.39.4/arch/powerpc/include/asm/system.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/system.h	2011-08-05 19:44:33.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
@@ -3673,9 +1772,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/system.h linux-2.6.39.3/arch/
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/uaccess.h linux-2.6.39.3/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.39.3/arch/powerpc/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/include/asm/uaccess.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/include/asm/uaccess.h linux-2.6.39.4/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.39.4/arch/powerpc/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/include/asm/uaccess.h	2011-08-05 19:44:33.000000000 -0400
 @@ -13,6 +13,8 @@
  #define VERIFY_READ	0
  #define VERIFY_WRITE	1
@@ -3853,63 +1952,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/include/asm/uaccess.h linux-2.6.39.3/arch
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/dma.c linux-2.6.39.3/arch/powerpc/kernel/dma.c
---- linux-2.6.39.3/arch/powerpc/kernel/dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/dma.c	2011-05-22 19:36:30.000000000 -0400
-@@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl
- }
- #endif
- 
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- 	.alloc_coherent	= dma_direct_alloc_coherent,
- 	.free_coherent	= dma_direct_free_coherent,
- 	.map_sg		= dma_direct_map_sg,
-@@ -157,7 +157,7 @@ EXPORT_SYMBOL(dma_direct_ops);
- 
- int dma_set_mask(struct device *dev, u64 dma_mask)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	if (ppc_md.dma_set_mask)
- 		return ppc_md.dma_set_mask(dev, dma_mask);
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/dma-iommu.c linux-2.6.39.3/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.39.3/arch/powerpc/kernel/dma-iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/dma-iommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
- }
- 
- /* We support DMA to/from any memory page via the iommu */
--static int dma_iommu_dma_supported(struct device *dev, u64 mask)
-+int dma_iommu_dma_supported(struct device *dev, u64 mask)
- {
- 	struct iommu_table *tbl = get_iommu_table_base(dev);
- 
-@@ -90,7 +90,7 @@ static int dma_iommu_dma_supported(struc
- 		return 1;
- }
- 
--struct dma_map_ops dma_iommu_ops = {
-+struct dma_map_ops dma_iommu_ops = {	/* cannot be const, see arch/powerpc/platforms/cell/iommu.c */
- 	.alloc_coherent	= dma_iommu_alloc_coherent,
- 	.free_coherent	= dma_iommu_free_coherent,
- 	.map_sg		= dma_iommu_map_sg,
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.39.3/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.39.3/arch/powerpc/kernel/dma-swiotlb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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.
-  */
--struct dma_map_ops swiotlb_dma_ops = {
-+const struct dma_map_ops swiotlb_dma_ops = {
- 	.alloc_coherent = dma_direct_alloc_coherent,
- 	.free_coherent = dma_direct_free_coherent,
- 	.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/exceptions-64e.S linux-2.6.39.3/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.39.3/arch/powerpc/kernel/exceptions-64e.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/exceptions-64e.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.39.4/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.39.4/arch/powerpc/kernel/exceptions-64e.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/exceptions-64e.S	2011-08-05 19:44:33.000000000 -0400
 @@ -495,6 +495,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
@@ -3928,9 +1973,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/exceptions-64e.S linux-2.6.39.3/ar
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/exceptions-64s.S linux-2.6.39.3/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.39.3/arch/powerpc/kernel/exceptions-64s.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/exceptions-64s.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.39.4/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.39.4/arch/powerpc/kernel/exceptions-64s.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/exceptions-64s.S	2011-08-05 19:44:33.000000000 -0400
 @@ -848,10 +848,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
@@ -3943,33 +1988,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/exceptions-64s.S linux-2.6.39.3/ar
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/ibmebus.c linux-2.6.39.3/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.39.3/arch/powerpc/kernel/ibmebus.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/ibmebus.c	2011-05-22 19:36:30.000000000 -0400
-@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct 
- 	return 1;
- }
- 
--static struct dma_map_ops ibmebus_dma_ops = {
-+static const struct dma_map_ops ibmebus_dma_ops = {
- 	.alloc_coherent = ibmebus_alloc_coherent,
- 	.free_coherent  = ibmebus_free_coherent,
- 	.map_sg         = ibmebus_map_sg,
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/kgdb.c linux-2.6.39.3/arch/powerpc/kernel/kgdb.c
---- linux-2.6.39.3/arch/powerpc/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/kgdb.c	2011-05-22 19:36:30.000000000 -0400
-@@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto
- /*
-  * Global data
-  */
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
- };
- 
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/module_32.c linux-2.6.39.3/arch/powerpc/kernel/module_32.c
---- linux-2.6.39.3/arch/powerpc/kernel/module_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/module_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/module_32.c linux-2.6.39.4/arch/powerpc/kernel/module_32.c
+--- linux-2.6.39.4/arch/powerpc/kernel/module_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/module_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
  			me->arch.core_plt_section = i;
  	}
@@ -3999,9 +2020,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/module_32.c linux-2.6.39.3/arch/po
  
  	/* Find this entry, or if that fails, the next avail. entry */
  	while (entry->jump[0]) {
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/module.c linux-2.6.39.3/arch/powerpc/kernel/module.c
---- linux-2.6.39.3/arch/powerpc/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/module.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/module.c linux-2.6.39.4/arch/powerpc/kernel/module.c
+--- linux-2.6.39.4/arch/powerpc/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/module.c	2011-08-05 19:44:33.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -4041,39 +2062,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/module.c linux-2.6.39.3/arch/power
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/pci-common.c linux-2.6.39.3/arch/powerpc/kernel/pci-common.c
---- linux-2.6.39.3/arch/powerpc/kernel/pci-common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 = 0;
- 
- 
--static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
-+static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
- 
--void set_pci_dma_ops(struct dma_map_ops *dma_ops)
-+void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
- {
- 	pci_dma_ops = dma_ops;
- }
- 
--struct dma_map_ops *get_pci_dma_ops(void)
-+const struct dma_map_ops *get_pci_dma_ops(void)
- {
- 	return pci_dma_ops;
- }
-@@ -1639,7 +1639,7 @@ null_write_config(struct pci_bus *bus, u
- 	return PCIBIOS_DEVICE_NOT_FOUND;
- }
- 
--static struct pci_ops null_pci_ops =
-+static const struct pci_ops null_pci_ops =
- {
- 	.read = null_read_config,
- 	.write = null_write_config,
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/process.c linux-2.6.39.3/arch/powerpc/kernel/process.c
---- linux-2.6.39.3/arch/powerpc/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/process.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/process.c linux-2.6.39.4/arch/powerpc/kernel/process.c
+--- linux-2.6.39.4/arch/powerpc/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/process.c	2011-08-05 19:44:33.000000000 -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
@@ -4166,21 +2157,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/process.c linux-2.6.39.3/arch/powe
 -
 -	return ret;
 -}
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/rtas_pci.c linux-2.6.39.3/arch/powerpc/kernel/rtas_pci.c
---- linux-2.6.39.3/arch/powerpc/kernel/rtas_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/rtas_pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -149,7 +149,7 @@ static int rtas_pci_write_config(struct 
- 	return PCIBIOS_DEVICE_NOT_FOUND;
- }
- 
--static struct pci_ops rtas_pci_ops = {
-+static const struct pci_ops rtas_pci_ops = {
- 	.read = rtas_pci_read_config,
- 	.write = rtas_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/signal_32.c linux-2.6.39.3/arch/powerpc/kernel/signal_32.c
---- linux-2.6.39.3/arch/powerpc/kernel/signal_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/signal_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/signal_32.c linux-2.6.39.4/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.39.4/arch/powerpc/kernel/signal_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/signal_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig
  	/* Save user registers on the stack */
  	frame = &rt_sf->uc.uc_mcontext;
@@ -4190,9 +2169,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/signal_32.c linux-2.6.39.3/arch/po
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/signal_64.c linux-2.6.39.3/arch/powerpc/kernel/signal_64.c
---- linux-2.6.39.3/arch/powerpc/kernel/signal_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/signal_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/signal_64.c linux-2.6.39.4/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.39.4/arch/powerpc/kernel/signal_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/signal_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
  	current->thread.fpscr.val = 0;
  
@@ -4202,9 +2181,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/signal_64.c linux-2.6.39.3/arch/po
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/traps.c linux-2.6.39.3/arch/powerpc/kernel/traps.c
---- linux-2.6.39.3/arch/powerpc/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/traps.c	2011-06-13 21:33:04.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/traps.c linux-2.6.39.4/arch/powerpc/kernel/traps.c
+--- linux-2.6.39.4/arch/powerpc/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/traps.c	2011-08-05 19:44:33.000000000 -0400
 @@ -96,6 +96,8 @@ static void pmac_backlight_unblank(void)
  static inline void pmac_backlight_unblank(void) { }
  #endif
@@ -4223,9 +2202,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/traps.c linux-2.6.39.3/arch/powerp
  	oops_exit();
  	do_exit(err);
  
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/vdso.c linux-2.6.39.3/arch/powerpc/kernel/vdso.c
---- linux-2.6.39.3/arch/powerpc/kernel/vdso.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/vdso.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/kernel/vdso.c linux-2.6.39.4/arch/powerpc/kernel/vdso.c
+--- linux-2.6.39.4/arch/powerpc/kernel/vdso.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/kernel/vdso.c	2011-08-05 19:44:33.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -4252,26 +2231,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/kernel/vdso.c linux-2.6.39.3/arch/powerpc
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-2.6.39.3/arch/powerpc/kernel/vio.c linux-2.6.39.3/arch/powerpc/kernel/vio.c
---- linux-2.6.39.3/arch/powerpc/kernel/vio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/kernel/vio.c	2011-05-22 19:36:30.000000000 -0400
-@@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s
-         return dma_iommu_ops.dma_supported(dev, mask);
- }
- 
--struct dma_map_ops vio_dma_mapping_ops = {
-+const struct dma_map_ops vio_dma_mapping_ops = {
- 	.alloc_coherent = vio_dma_iommu_alloc_coherent,
- 	.free_coherent  = vio_dma_iommu_free_coherent,
- 	.map_sg         = vio_dma_iommu_map_sg,
- 	.unmap_sg       = vio_dma_iommu_unmap_sg,
-+	.dma_supported  = dma_iommu_dma_supported,
- 	.map_page       = vio_dma_iommu_map_page,
- 	.unmap_page     = vio_dma_iommu_unmap_page,
- 	.dma_supported  = vio_dma_iommu_dma_supported,
-diff -urNp linux-2.6.39.3/arch/powerpc/lib/usercopy_64.c linux-2.6.39.3/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.39.3/arch/powerpc/lib/usercopy_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/lib/usercopy_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/lib/usercopy_64.c linux-2.6.39.4/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.39.4/arch/powerpc/lib/usercopy_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/lib/usercopy_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -4303,9 +2265,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/lib/usercopy_64.c linux-2.6.39.3/arch/pow
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.39.3/arch/powerpc/mm/fault.c linux-2.6.39.3/arch/powerpc/mm/fault.c
---- linux-2.6.39.3/arch/powerpc/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/mm/fault.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/mm/fault.c linux-2.6.39.4/arch/powerpc/mm/fault.c
+--- linux-2.6.39.4/arch/powerpc/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/mm/fault.c	2011-08-05 19:44:33.000000000 -0400
 @@ -31,6 +31,10 @@
  #include <linux/kdebug.h>
  #include <linux/perf_event.h>
@@ -4410,9 +2372,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/mm/fault.c linux-2.6.39.3/arch/powerpc/mm
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-2.6.39.3/arch/powerpc/mm/mmap_64.c linux-2.6.39.3/arch/powerpc/mm/mmap_64.c
---- linux-2.6.39.3/arch/powerpc/mm/mmap_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/mm/mmap_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/mm/mmap_64.c linux-2.6.39.4/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.39.4/arch/powerpc/mm/mmap_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/mm/mmap_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -4436,9 +2398,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/mm/mmap_64.c linux-2.6.39.3/arch/powerpc/
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.39.3/arch/powerpc/mm/slice.c linux-2.6.39.3/arch/powerpc/mm/slice.c
---- linux-2.6.39.3/arch/powerpc/mm/slice.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/mm/slice.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/powerpc/mm/slice.c linux-2.6.39.4/arch/powerpc/mm/slice.c
+--- linux-2.6.39.4/arch/powerpc/mm/slice.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/powerpc/mm/slice.c	2011-08-05 19:44:33.000000000 -0400
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
  	if ((mm->task_size - len) < addr)
  		return 0;
@@ -4505,234 +2467,9 @@ diff -urNp linux-2.6.39.3/arch/powerpc/mm/slice.c linux-2.6.39.3/arch/powerpc/mm
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/52xx/efika.c linux-2.6.39.3/arch/powerpc/platforms/52xx/efika.c
---- linux-2.6.39.3/arch/powerpc/platforms/52xx/efika.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops rtas_pci_ops = {
-+static const struct pci_ops rtas_pci_ops = {
- 	.read = rtas_read_config,
- 	.write = rtas_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_pci.c linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_pci.c
---- linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -234,7 +234,7 @@ static int celleb_fake_pci_write_config(
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops celleb_fake_pci_ops = {
-+static const struct pci_ops celleb_fake_pci_ops = {
- 	.read = celleb_fake_pci_read_config,
- 	.write = celleb_fake_pci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_scc_epci.c linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_scc_epci.c
---- linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_scc_epci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--struct pci_ops celleb_epci_ops = {
-+const struct pci_ops celleb_epci_ops = {
- 	.read = celleb_epci_read_config,
- 	.write = celleb_epci_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_scc_pciex.c linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_scc_pciex.c
---- linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_scc_pciex.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/platforms/cell/celleb_scc_pciex.c	2011-05-22 19:36:30.000000000 -0400
-@@ -399,7 +399,7 @@ static int scc_pciex_write_config(struct
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops scc_pciex_pci_ops = {
-+static const struct pci_ops scc_pciex_pci_ops = {
- 	scc_pciex_read_config,
- 	scc_pciex_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/cell/iommu.c linux-2.6.39.3/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.39.3/arch/powerpc/platforms/cell/iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
- 
--struct dma_map_ops dma_iommu_fixed_ops = {
-+const struct dma_map_ops dma_iommu_fixed_ops = {
- 	.alloc_coherent = dma_fixed_alloc_coherent,
- 	.free_coherent  = dma_fixed_free_coherent,
- 	.map_sg         = dma_fixed_map_sg,
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/chrp/pci.c linux-2.6.39.3/arch/powerpc/platforms/chrp/pci.c
---- linux-2.6.39.3/arch/powerpc/platforms/chrp/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops gg2_pci_ops =
-+static const struct pci_ops gg2_pci_ops =
- {
- 	.read = gg2_read_config,
- 	.write = gg2_write_config,
-@@ -122,7 +122,7 @@ int rtas_write_config(struct pci_bus *bu
- 	return rval? PCIBIOS_DEVICE_NOT_FOUND: PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops rtas_pci_ops =
-+static const struct pci_ops rtas_pci_ops =
- {
- 	.read = rtas_read_config,
- 	.write = rtas_write_config,
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/iseries/pci.c linux-2.6.39.3/arch/powerpc/platforms/iseries/pci.c
---- linux-2.6.39.3/arch/powerpc/platforms/iseries/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops iSeries_pci_ops = {
-+static const struct pci_ops iSeries_pci_ops = {
- 	.read = iSeries_pci_read_config,
- 	.write = iSeries_pci_write_config
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/maple/pci.c linux-2.6.39.3/arch/powerpc/platforms/maple/pci.c
---- linux-2.6.39.3/arch/powerpc/platforms/maple/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/platforms/maple/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -180,7 +180,7 @@ static int u3_agp_write_config(struct pc
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops u3_agp_pci_ops =
-+static const struct pci_ops u3_agp_pci_ops =
- {
- 	.read = u3_agp_read_config,
- 	.write = u3_agp_write_config,
-@@ -276,7 +276,7 @@ static int u3_ht_write_config(struct pci
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops u3_ht_pci_ops =
-+static const struct pci_ops u3_ht_pci_ops =
- {
- 	.read = u3_ht_read_config,
- 	.write = u3_ht_write_config,
-@@ -381,7 +381,7 @@ static int u4_pcie_write_config(struct p
-         return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops u4_pcie_pci_ops =
-+static const struct pci_ops u4_pcie_pci_ops =
- {
- 	.read = u4_pcie_read_config,
- 	.write = u4_pcie_write_config,
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/pasemi/pci.c linux-2.6.39.3/arch/powerpc/platforms/pasemi/pci.c
---- linux-2.6.39.3/arch/powerpc/platforms/pasemi/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops pa_pxp_ops = {
-+static const struct pci_ops pa_pxp_ops = {
- 	.read = pa_pxp_read_config,
- 	.write = pa_pxp_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/powermac/pci.c linux-2.6.39.3/arch/powerpc/platforms/powermac/pci.c
---- linux-2.6.39.3/arch/powerpc/platforms/powermac/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/platforms/powermac/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -218,7 +218,7 @@ static int macrisc_write_config(struct p
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops macrisc_pci_ops =
-+static const struct pci_ops macrisc_pci_ops =
- {
- 	.read = macrisc_read_config,
- 	.write = macrisc_write_config,
-@@ -273,7 +273,7 @@ chaos_write_config(struct pci_bus *bus, 
- 	return macrisc_write_config(bus, devfn, offset, len, val);
- }
- 
--static struct pci_ops chaos_pci_ops =
-+static const struct pci_ops chaos_pci_ops =
- {
- 	.read = chaos_read_config,
- 	.write = chaos_write_config,
-diff -urNp linux-2.6.39.3/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.39.3/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.39.3/arch/powerpc/platforms/ps3/system-bus.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 >= DMA_BIT_MASK(32);
- }
- 
--static struct dma_map_ops ps3_sb_dma_ops = {
-+static const struct dma_map_ops ps3_sb_dma_ops = {
- 	.alloc_coherent = ps3_alloc_coherent,
- 	.free_coherent = ps3_free_coherent,
- 	.map_sg = ps3_sb_map_sg,
-@@ -705,7 +705,7 @@ static struct dma_map_ops ps3_sb_dma_ops
- 	.unmap_page = ps3_unmap_page,
- };
- 
--static struct dma_map_ops ps3_ioc0_dma_ops = {
-+static const struct dma_map_ops ps3_ioc0_dma_ops = {
- 	.alloc_coherent = ps3_alloc_coherent,
- 	.free_coherent = ps3_free_coherent,
- 	.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.39.3/arch/powerpc/sysdev/fsl_pci.c linux-2.6.39.3/arch/powerpc/sysdev/fsl_pci.c
---- linux-2.6.39.3/arch/powerpc/sysdev/fsl_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/sysdev/fsl_pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -573,7 +573,7 @@ static int mpc83xx_pcie_write_config(str
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops mpc83xx_pcie_ops = {
-+static const struct pci_ops mpc83xx_pcie_ops = {
- 	.read = mpc83xx_pcie_read_config,
- 	.write = mpc83xx_pcie_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/powerpc/sysdev/indirect_pci.c linux-2.6.39.3/arch/powerpc/sysdev/indirect_pci.c
---- linux-2.6.39.3/arch/powerpc/sysdev/indirect_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/powerpc/sysdev/indirect_pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -148,7 +148,7 @@ indirect_write_config(struct pci_bus *bu
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops indirect_pci_ops =
-+static const struct pci_ops indirect_pci_ops =
- {
- 	.read = indirect_read_config,
- 	.write = indirect_write_config,
-diff -urNp linux-2.6.39.3/arch/powerpc/sysdev/ppc4xx_pci.c linux-2.6.39.3/arch/powerpc/sysdev/ppc4xx_pci.c
---- linux-2.6.39.3/arch/powerpc/sysdev/ppc4xx_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops ppc4xx_pciex_pci_ops =
-+static const struct pci_ops ppc4xx_pciex_pci_ops =
- {
- 	.read  = ppc4xx_pciex_read_config,
- 	.write = ppc4xx_pciex_write_config,
-diff -urNp linux-2.6.39.3/arch/powerpc/sysdev/tsi108_pci.c linux-2.6.39.3/arch/powerpc/sysdev/tsi108_pci.c
---- linux-2.6.39.3/arch/powerpc/sysdev/tsi108_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct pci_ops tsi108_direct_pci_ops = {
-+static const struct pci_ops tsi108_direct_pci_ops = {
- 	.read = tsi108_direct_read_config,
- 	.write = tsi108_direct_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/s390/include/asm/elf.h linux-2.6.39.3/arch/s390/include/asm/elf.h
---- linux-2.6.39.3/arch/s390/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/include/asm/elf.h linux-2.6.39.4/arch/s390/include/asm/elf.h
+--- linux-2.6.39.4/arch/s390/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/include/asm/elf.h	2011-08-05 19:44:33.000000000 -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 program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -4758,9 +2495,9 @@ diff -urNp linux-2.6.39.3/arch/s390/include/asm/elf.h linux-2.6.39.3/arch/s390/i
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff -urNp linux-2.6.39.3/arch/s390/include/asm/system.h linux-2.6.39.3/arch/s390/include/asm/system.h
---- linux-2.6.39.3/arch/s390/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/include/asm/system.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/include/asm/system.h linux-2.6.39.4/arch/s390/include/asm/system.h
+--- linux-2.6.39.4/arch/s390/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/include/asm/system.h	2011-08-05 19:44:33.000000000 -0400
 @@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
  extern void (*_machine_halt)(void);
  extern void (*_machine_power_off)(void);
@@ -4770,9 +2507,9 @@ diff -urNp linux-2.6.39.3/arch/s390/include/asm/system.h linux-2.6.39.3/arch/s39
  
  static inline int tprot(unsigned long addr)
  {
-diff -urNp linux-2.6.39.3/arch/s390/include/asm/uaccess.h linux-2.6.39.3/arch/s390/include/asm/uaccess.h
---- linux-2.6.39.3/arch/s390/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/include/asm/uaccess.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/include/asm/uaccess.h linux-2.6.39.4/arch/s390/include/asm/uaccess.h
+--- linux-2.6.39.4/arch/s390/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/include/asm/uaccess.h	2011-08-05 19:44:33.000000000 -0400
 @@ -234,6 +234,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -4805,9 +2542,9 @@ diff -urNp linux-2.6.39.3/arch/s390/include/asm/uaccess.h linux-2.6.39.3/arch/s3
  	if (unlikely(sz != -1 && sz < n)) {
  		copy_from_user_overflow();
  		return n;
-diff -urNp linux-2.6.39.3/arch/s390/Kconfig linux-2.6.39.3/arch/s390/Kconfig
---- linux-2.6.39.3/arch/s390/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/Kconfig	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/Kconfig linux-2.6.39.4/arch/s390/Kconfig
+--- linux-2.6.39.4/arch/s390/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/Kconfig	2011-08-05 19:44:33.000000000 -0400
 @@ -234,11 +234,9 @@ config S390_EXEC_PROTECT
  	prompt "Data execute protection"
  	help
@@ -4823,9 +2560,9 @@ diff -urNp linux-2.6.39.3/arch/s390/Kconfig linux-2.6.39.3/arch/s390/Kconfig
  
  comment "Code generation options"
  
-diff -urNp linux-2.6.39.3/arch/s390/kernel/module.c linux-2.6.39.3/arch/s390/kernel/module.c
---- linux-2.6.39.3/arch/s390/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/kernel/module.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/kernel/module.c linux-2.6.39.4/arch/s390/kernel/module.c
+--- linux-2.6.39.4/arch/s390/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/kernel/module.c	2011-08-05 19:44:33.000000000 -0400
 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
  	/* Increase core size by size of got & plt and set start
@@ -4897,9 +2634,9 @@ diff -urNp linux-2.6.39.3/arch/s390/kernel/module.c linux-2.6.39.3/arch/s390/ker
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-2.6.39.3/arch/s390/kernel/process.c linux-2.6.39.3/arch/s390/kernel/process.c
---- linux-2.6.39.3/arch/s390/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/kernel/process.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/kernel/process.c linux-2.6.39.4/arch/s390/kernel/process.c
+--- linux-2.6.39.4/arch/s390/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/kernel/process.c	2011-08-05 19:44:33.000000000 -0400
 @@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru
  	}
  	return 0;
@@ -4940,9 +2677,9 @@ diff -urNp linux-2.6.39.3/arch/s390/kernel/process.c linux-2.6.39.3/arch/s390/ke
 -		return base;
 -	return ret;
 -}
-diff -urNp linux-2.6.39.3/arch/s390/kernel/setup.c linux-2.6.39.3/arch/s390/kernel/setup.c
---- linux-2.6.39.3/arch/s390/kernel/setup.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/kernel/setup.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/kernel/setup.c linux-2.6.39.4/arch/s390/kernel/setup.c
+--- linux-2.6.39.4/arch/s390/kernel/setup.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/kernel/setup.c	2011-08-05 19:44:33.000000000 -0400
 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
@@ -4991,21 +2728,9 @@ diff -urNp linux-2.6.39.3/arch/s390/kernel/setup.c linux-2.6.39.3/arch/s390/kern
  static void setup_addressing_mode(void)
  {
  	if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.39.3/arch/s390/mm/maccess.c linux-2.6.39.3/arch/s390/mm/maccess.c
---- linux-2.6.39.3/arch/s390/mm/maccess.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/mm/maccess.c	2011-05-22 19:36:30.000000000 -0400
-@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void 
- 	return rc ? rc : count;
- }
- 
--long probe_kernel_write(void *dst, void *src, size_t size)
-+long probe_kernel_write(void *dst, const void *src, size_t size)
- {
- 	long copied = 0;
- 
-diff -urNp linux-2.6.39.3/arch/s390/mm/mmap.c linux-2.6.39.3/arch/s390/mm/mmap.c
---- linux-2.6.39.3/arch/s390/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/s390/mm/mmap.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/s390/mm/mmap.c linux-2.6.39.4/arch/s390/mm/mmap.c
+--- linux-2.6.39.4/arch/s390/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/s390/mm/mmap.c	2011-08-05 19:44:33.000000000 -0400
 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -5052,9 +2777,9 @@ diff -urNp linux-2.6.39.3/arch/s390/mm/mmap.c linux-2.6.39.3/arch/s390/mm/mmap.c
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.39.3/arch/score/include/asm/system.h linux-2.6.39.3/arch/score/include/asm/system.h
---- linux-2.6.39.3/arch/score/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/score/include/asm/system.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/score/include/asm/system.h linux-2.6.39.4/arch/score/include/asm/system.h
+--- linux-2.6.39.4/arch/score/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/score/include/asm/system.h	2011-08-05 19:44:33.000000000 -0400
 @@ -17,7 +17,7 @@ do {								\
  #define finish_arch_switch(prev)	do {} while (0)
  
@@ -5064,9 +2789,9 @@ diff -urNp linux-2.6.39.3/arch/score/include/asm/system.h linux-2.6.39.3/arch/sc
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff -urNp linux-2.6.39.3/arch/score/kernel/process.c linux-2.6.39.3/arch/score/kernel/process.c
---- linux-2.6.39.3/arch/score/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/score/kernel/process.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/score/kernel/process.c linux-2.6.39.4/arch/score/kernel/process.c
+--- linux-2.6.39.4/arch/score/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/score/kernel/process.c	2011-08-05 19:44:33.000000000 -0400
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
  	return task_pt_regs(task)->cp0_epc;
@@ -5076,189 +2801,9 @@ diff -urNp linux-2.6.39.3/arch/score/kernel/process.c linux-2.6.39.3/arch/score/
 -{
 -	return sp;
 -}
-diff -urNp linux-2.6.39.3/arch/sh/drivers/pci/ops-dreamcast.c linux-2.6.39.3/arch/sh/drivers/pci/ops-dreamcast.c
---- linux-2.6.39.3/arch/sh/drivers/pci/ops-dreamcast.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 
-         return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops gapspci_pci_ops = {
-+const struct pci_ops gapspci_pci_ops = {
- 	.read	= gapspci_read,
- 	.write	= gapspci_write,
- };
-diff -urNp linux-2.6.39.3/arch/sh/drivers/pci/ops-sh4.c linux-2.6.39.3/arch/sh/drivers/pci/ops-sh4.c
---- linux-2.6.39.3/arch/sh/drivers/pci/ops-sh4.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/drivers/pci/ops-sh4.c	2011-05-22 19:36:30.000000000 -0400
-@@ -96,7 +96,7 @@ static int sh4_pci_write(struct pci_bus 
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops sh4_pci_ops = {
-+const struct pci_ops sh4_pci_ops = {
- 	.read		= sh4_pci_read,
- 	.write		= sh4_pci_write,
- };
-diff -urNp linux-2.6.39.3/arch/sh/drivers/pci/ops-sh5.c linux-2.6.39.3/arch/sh/drivers/pci/ops-sh5.c
---- linux-2.6.39.3/arch/sh/drivers/pci/ops-sh5.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/drivers/pci/ops-sh5.c	2011-05-22 19:36:30.000000000 -0400
-@@ -62,7 +62,7 @@ static int sh5pci_write(struct pci_bus *
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops sh5_pci_ops = {
-+const struct pci_ops sh5_pci_ops = {
- 	.read		= sh5pci_read,
- 	.write		= sh5pci_write,
- };
-diff -urNp linux-2.6.39.3/arch/sh/drivers/pci/ops-sh7786.c linux-2.6.39.3/arch/sh/drivers/pci/ops-sh7786.c
---- linux-2.6.39.3/arch/sh/drivers/pci/ops-sh7786.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/drivers/pci/ops-sh7786.c	2011-05-22 19:36:30.000000000 -0400
-@@ -165,7 +165,7 @@ out:
- 	return ret;
- }
- 
--struct pci_ops sh7786_pci_ops = {
-+const struct pci_ops sh7786_pci_ops = {
- 	.read	= sh7786_pcie_read,
- 	.write	= sh7786_pcie_write,
- };
-diff -urNp linux-2.6.39.3/arch/sh/drivers/pci/pcie-sh7786.c linux-2.6.39.3/arch/sh/drivers/pci/pcie-sh7786.c
---- linux-2.6.39.3/arch/sh/drivers/pci/pcie-sh7786.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 	},
- };
- 
--extern struct pci_ops sh7786_pci_ops;
-+extern const struct pci_ops sh7786_pci_ops;
- 
- #define DEFINE_CONTROLLER(start, idx)					\
- {									\
-diff -urNp linux-2.6.39.3/arch/sh/drivers/pci/pci-sh4.h linux-2.6.39.3/arch/sh/drivers/pci/pci-sh4.h
---- linux-2.6.39.3/arch/sh/drivers/pci/pci-sh4.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/drivers/pci/pci-sh4.h	2011-05-22 19:36:30.000000000 -0400
-@@ -161,7 +161,7 @@
- #define SH4_PCIPDR		0x220		/* Port IO Data Register */
- 
- /* arch/sh/kernel/drivers/pci/ops-sh4.c */
--extern struct pci_ops sh4_pci_ops;
-+extern const struct pci_ops sh4_pci_ops;
- int pci_fixup_pcic(struct pci_channel *chan);
- 
- struct sh4_pci_address_space {
-diff -urNp linux-2.6.39.3/arch/sh/drivers/pci/pci-sh5.h linux-2.6.39.3/arch/sh/drivers/pci/pci-sh5.h
---- linux-2.6.39.3/arch/sh/drivers/pci/pci-sh5.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/drivers/pci/pci-sh5.h	2011-05-22 19:36:30.000000000 -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)
- 
--extern struct pci_ops sh5_pci_ops;
-+extern const struct pci_ops sh5_pci_ops;
- 
- #endif /* __PCI_SH5_H */
-diff -urNp linux-2.6.39.3/arch/sh/include/asm/dma-mapping.h linux-2.6.39.3/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/sh/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- extern void no_iommu_init(void);
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	return dma_ops;
- }
-@@ -14,7 +14,7 @@ static inline struct dma_map_ops *get_dm
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (ops->dma_supported)
- 		return ops->dma_supported(dev, mask);
-@@ -24,7 +24,7 @@ static inline int dma_supported(struct d
- 
- static inline int dma_set_mask(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (!dev->dma_mask || !dma_supported(dev, mask))
- 		return -EIO;
-@@ -44,7 +44,7 @@ void dma_cache_sync(struct device *dev, 
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (ops->mapping_error)
- 		return ops->mapping_error(dev, dma_addr);
-@@ -55,7 +55,7 @@ static inline int dma_mapping_error(stru
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *dma_handle, gfp_t gfp)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *memory;
- 
- 	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
-@@ -72,7 +72,7 @@ static inline void *dma_alloc_coherent(s
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *vaddr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (dma_release_from_coherent(dev, get_order(size), vaddr))
- 		return;
-diff -urNp linux-2.6.39.3/arch/sh/kernel/dma-nommu.c linux-2.6.39.3/arch/sh/kernel/dma-nommu.c
---- linux-2.6.39.3/arch/sh/kernel/dma-nommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/kernel/dma-nommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device 
- }
- #endif
- 
--struct dma_map_ops nommu_dma_ops = {
-+const struct dma_map_ops nommu_dma_ops = {
- 	.alloc_coherent		= dma_generic_alloc_coherent,
- 	.free_coherent		= dma_generic_free_coherent,
- 	.map_page		= nommu_map_page,
-diff -urNp linux-2.6.39.3/arch/sh/kernel/kgdb.c linux-2.6.39.3/arch/sh/kernel/kgdb.c
---- linux-2.6.39.3/arch/sh/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: trapa #0x3c */
- #ifdef CONFIG_CPU_LITTLE_ENDIAN
- 	.gdb_bpt_instr		= { 0x3c, 0xc3 },
-diff -urNp linux-2.6.39.3/arch/sh/mm/consistent.c linux-2.6.39.3/arch/sh/mm/consistent.c
---- linux-2.6.39.3/arch/sh/mm/consistent.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/mm/consistent.c	2011-05-22 19:36:30.000000000 -0400
-@@ -22,7 +22,7 @@
- 
- #define PREALLOC_DMA_DEBUG_ENTRIES	4096
- 
--struct dma_map_ops *dma_ops;
-+const struct dma_map_ops *dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- static int __init dma_init(void)
-diff -urNp linux-2.6.39.3/arch/sh/mm/mmap.c linux-2.6.39.3/arch/sh/mm/mmap.c
---- linux-2.6.39.3/arch/sh/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sh/mm/mmap.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sh/mm/mmap.c linux-2.6.39.4/arch/sh/mm/mmap.c
+--- linux-2.6.39.4/arch/sh/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sh/mm/mmap.c	2011-08-05 19:44:33.000000000 -0400
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
@@ -5333,9 +2878,9 @@ diff -urNp linux-2.6.39.3/arch/sh/mm/mmap.c linux-2.6.39.3/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/atomic_64.h linux-2.6.39.4/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.39.4/arch/sparc/include/asm/atomic_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/atomic_64.h	2011-08-05 20:34:06.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -5377,7 +2922,7 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h linux-2.6.39.3/arch
  extern int atomic_sub_ret(int, atomic_t *);
  extern long atomic64_sub_ret(long, atomic64_t *);
  
-@@ -33,12 +55,24 @@ extern long atomic64_sub_ret(long, atomi
+@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomi
  #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
  
  #define atomic_inc_return(v) atomic_add_ret(1, v)
@@ -5400,9 +2945,14 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h linux-2.6.39.3/arch
 +	return atomic_add_ret_unchecked(i, v);
 +}
  #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
++static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
++{
++	return atomic64_add_ret_unchecked(i, v);
++}
  
  /*
-@@ -50,6 +84,7 @@ extern long atomic64_sub_ret(long, atomi
+  * atomic_inc_and_test - increment and test
+@@ -50,6 +88,7 @@ extern long atomic64_sub_ret(long, atomi
   * other cases.
   */
  #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
@@ -5410,7 +2960,7 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h linux-2.6.39.3/arch
  #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
  
  #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
-@@ -59,30 +94,59 @@ extern long atomic64_sub_ret(long, atomi
+@@ -59,30 +98,59 @@ extern long atomic64_sub_ret(long, atomi
  #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
  
  #define atomic_inc(v) atomic_add(1, v)
@@ -5474,7 +3024,7 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h linux-2.6.39.3/arch
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -93,17 +157,28 @@ static inline int atomic_add_unless(atom
+@@ -93,17 +161,28 @@ static inline int atomic_add_unless(atom
  
  static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@ -5507,9 +3057,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/atomic_64.h linux-2.6.39.3/arch
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/cache.h linux-2.6.39.3/arch/sparc/include/asm/cache.h
---- linux-2.6.39.3/arch/sparc/include/asm/cache.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/cache.h	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/cache.h linux-2.6.39.4/arch/sparc/include/asm/cache.h
+--- linux-2.6.39.4/arch/sparc/include/asm/cache.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/cache.h	2011-08-05 19:44:33.000000000 -0400
 @@ -10,7 +10,7 @@
  #define ARCH_SLAB_MINALIGN	__alignof__(unsigned long long)
  
@@ -5519,43 +3069,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/cache.h linux-2.6.39.3/arch/spa
  
  #ifdef CONFIG_SPARC32
  #define SMP_CACHE_BYTES_SHIFT 5
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/dma-mapping.h linux-2.6.39.3/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/sparc/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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)
- 
--extern struct dma_map_ops *dma_ops, pci32_dma_ops;
-+extern const struct dma_map_ops *dma_ops, pci32_dma_ops;
- extern struct bus_type pci_bus_type;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- 	if (dev->bus == &pci_bus_type)
-@@ -29,7 +29,7 @@ static inline struct dma_map_ops *get_dm
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *dma_handle, gfp_t flag)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *cpu_addr;
- 
- 	cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
-@@ -40,7 +40,7 @@ static inline void *dma_alloc_coherent(s
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *cpu_addr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	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.3/arch/sparc/include/asm/elf_32.h linux-2.6.39.3/arch/sparc/include/asm/elf_32.h
---- linux-2.6.39.3/arch/sparc/include/asm/elf_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/elf_32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/elf_32.h linux-2.6.39.4/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.39.4/arch/sparc/include/asm/elf_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/elf_32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -5570,9 +3086,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/elf_32.h linux-2.6.39.3/arch/sp
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/elf_64.h linux-2.6.39.3/arch/sparc/include/asm/elf_64.h
---- linux-2.6.39.3/arch/sparc/include/asm/elf_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/elf_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/elf_64.h linux-2.6.39.4/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.39.4/arch/sparc/include/asm/elf_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/elf_64.h	2011-08-05 19:44:33.000000000 -0400
 @@ -162,6 +162,12 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
@@ -5586,9 +3102,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/elf_64.h linux-2.6.39.3/arch/sp
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/pgtable_32.h linux-2.6.39.3/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.39.3/arch/sparc/include/asm/pgtable_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/pgtable_32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.39.4/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.39.4/arch/sparc/include/asm/pgtable_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/pgtable_32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -5620,9 +3136,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/pgtable_32.h linux-2.6.39.3/arc
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.39.3/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.39.3/arch/sparc/include/asm/pgtsrmmu.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/pgtsrmmu.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.39.4/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.39.4/arch/sparc/include/asm/pgtsrmmu.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/pgtsrmmu.h	2011-08-05 19:44:33.000000000 -0400
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -5637,9 +3153,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.39.3/arch/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/spinlock_64.h linux-2.6.39.3/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.39.3/arch/sparc/include/asm/spinlock_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/spinlock_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.39.4/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.39.4/arch/sparc/include/asm/spinlock_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/spinlock_64.h	2011-08-05 19:44:33.000000000 -0400
 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
  
  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -5737,9 +3253,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/spinlock_64.h linux-2.6.39.3/ar
  {
  	unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/thread_info_32.h linux-2.6.39.3/arch/sparc/include/asm/thread_info_32.h
---- linux-2.6.39.3/arch/sparc/include/asm/thread_info_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/thread_info_32.h	2011-06-03 01:14:03.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/thread_info_32.h linux-2.6.39.4/arch/sparc/include/asm/thread_info_32.h
+--- linux-2.6.39.4/arch/sparc/include/asm/thread_info_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/thread_info_32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -50,6 +50,8 @@ struct thread_info {
  	unsigned long		w_saved;
  
@@ -5749,9 +3265,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/thread_info_32.h linux-2.6.39.3
  };
  
  /*
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/thread_info_64.h linux-2.6.39.3/arch/sparc/include/asm/thread_info_64.h
---- linux-2.6.39.3/arch/sparc/include/asm/thread_info_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/thread_info_64.h	2011-06-03 01:14:21.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/thread_info_64.h linux-2.6.39.4/arch/sparc/include/asm/thread_info_64.h
+--- linux-2.6.39.4/arch/sparc/include/asm/thread_info_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/thread_info_64.h	2011-08-05 19:44:33.000000000 -0400
 @@ -63,6 +63,8 @@ struct thread_info {
  	struct pt_regs		*kern_una_regs;
  	unsigned int		kern_una_insn;
@@ -5761,9 +3277,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/thread_info_64.h linux-2.6.39.3
  	unsigned long		fpregs[0] __attribute__ ((aligned(64)));
  };
  
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/uaccess_32.h linux-2.6.39.3/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.39.3/arch/sparc/include/asm/uaccess_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/uaccess_32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.39.4/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.39.4/arch/sparc/include/asm/uaccess_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/uaccess_32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -5815,9 +3331,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/uaccess_32.h linux-2.6.39.3/arc
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/uaccess_64.h linux-2.6.39.3/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.39.3/arch/sparc/include/asm/uaccess_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/uaccess_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.39.4/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.39.4/arch/sparc/include/asm/uaccess_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/uaccess_64.h	2011-08-05 19:44:33.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -5860,9 +3376,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/uaccess_64.h linux-2.6.39.3/arc
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-2.6.39.3/arch/sparc/include/asm/uaccess.h linux-2.6.39.3/arch/sparc/include/asm/uaccess.h
---- linux-2.6.39.3/arch/sparc/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/include/asm/uaccess.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/include/asm/uaccess.h linux-2.6.39.4/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.39.4/arch/sparc/include/asm/uaccess.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/include/asm/uaccess.h	2011-08-05 19:44:33.000000000 -0400
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -5877,75 +3393,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/include/asm/uaccess.h linux-2.6.39.3/arch/s
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/iommu.c linux-2.6.39.3/arch/sparc/kernel/iommu.c
---- linux-2.6.39.3/arch/sparc/kernel/iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/iommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc
- 	spin_unlock_irqrestore(&iommu->lock, flags);
- }
- 
--static struct dma_map_ops sun4u_dma_ops = {
-+static const struct dma_map_ops sun4u_dma_ops = {
- 	.alloc_coherent		= dma_4u_alloc_coherent,
- 	.free_coherent		= dma_4u_free_coherent,
- 	.map_page		= dma_4u_map_page,
-@@ -835,7 +835,7 @@ static struct dma_map_ops sun4u_dma_ops 
- 	.sync_sg_for_cpu	= dma_4u_sync_sg_for_cpu,
- };
- 
--struct dma_map_ops *dma_ops = &sun4u_dma_ops;
-+const struct dma_map_ops *dma_ops = &sun4u_dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/ioport.c linux-2.6.39.3/arch/sparc/kernel/ioport.c
---- linux-2.6.39.3/arch/sparc/kernel/ioport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/ioport.c	2011-05-22 19:36:30.000000000 -0400
-@@ -402,7 +402,7 @@ static void sbus_sync_sg_for_device(stru
- 	BUG();
- }
- 
--struct dma_map_ops sbus_dma_ops = {
-+const struct dma_map_ops sbus_dma_ops = {
- 	.alloc_coherent		= sbus_alloc_coherent,
- 	.free_coherent		= sbus_free_coherent,
- 	.map_page		= sbus_map_page,
-@@ -653,7 +653,7 @@ static void pci32_sync_sg_for_device(str
- 	}
- }
- 
--struct dma_map_ops pci32_dma_ops = {
-+const struct dma_map_ops pci32_dma_ops = {
- 	.alloc_coherent		= pci32_alloc_coherent,
- 	.free_coherent		= pci32_free_coherent,
- 	.map_page		= pci32_map_page,
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/kgdb_32.c linux-2.6.39.3/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.39.3/arch/sparc/kernel/kgdb_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/kgdb_32.c	2011-05-22 19:36:30.000000000 -0400
-@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
- 	regs->npc = regs->pc + 4;
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: ta 0x7d */
- 	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x7d },
- };
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/kgdb_64.c linux-2.6.39.3/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.39.3/arch/sparc/kernel/kgdb_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/kgdb_64.c	2011-05-22 19:36:30.000000000 -0400
-@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
- 	regs->tnpc = regs->tpc + 4;
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: ta 0x72 */
- 	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x72 },
- };
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/Makefile linux-2.6.39.3/arch/sparc/kernel/Makefile
---- linux-2.6.39.3/arch/sparc/kernel/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/Makefile	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/Makefile linux-2.6.39.4/arch/sparc/kernel/Makefile
+--- linux-2.6.39.4/arch/sparc/kernel/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/Makefile	2011-08-05 19:44:33.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -5955,68 +3405,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/Makefile linux-2.6.39.3/arch/sparc/k
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/pcic.c linux-2.6.39.3/arch/sparc/kernel/pcic.c
---- linux-2.6.39.3/arch/sparc/kernel/pcic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/pcic.c	2011-05-22 19:36:30.000000000 -0400
-@@ -268,7 +268,7 @@ static int pcic_write_config(struct pci_
- 	return -EINVAL;
- }
- 
--static struct pci_ops pcic_ops = {
-+static const struct pci_ops pcic_ops = {
- 	.read =		pcic_read_config,
- 	.write =	pcic_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/pci_common.c linux-2.6.39.3/arch/sparc/kernel/pci_common.c
---- linux-2.6.39.3/arch/sparc/kernel/pci_common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/pci_common.c	2011-05-22 19:36:30.000000000 -0400
-@@ -249,7 +249,7 @@ static int sun4u_write_pci_cfg(struct pc
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops sun4u_pci_ops = {
-+const struct pci_ops sun4u_pci_ops = {
- 	.read =		sun4u_read_pci_cfg,
- 	.write =	sun4u_write_pci_cfg,
- };
-@@ -310,7 +310,7 @@ static int sun4v_write_pci_cfg(struct pc
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops sun4v_pci_ops = {
-+const struct pci_ops sun4v_pci_ops = {
- 	.read =		sun4v_read_pci_cfg,
- 	.write =	sun4v_write_pci_cfg,
- };
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/pci_impl.h linux-2.6.39.3/arch/sparc/kernel/pci_impl.h
---- linux-2.6.39.3/arch/sparc/kernel/pci_impl.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/pci_impl.h	2011-05-22 19:36:30.000000000 -0400
-@@ -175,8 +175,8 @@ extern void pci_config_write8(u8 *addr, 
- extern void pci_config_write16(u16 *addr, u16 val);
- extern void pci_config_write32(u32 *addr, u32 val);
- 
--extern struct pci_ops sun4u_pci_ops;
--extern struct pci_ops sun4v_pci_ops;
-+extern const struct pci_ops sun4u_pci_ops;
-+extern const struct pci_ops sun4v_pci_ops;
- 
- extern volatile int pci_poke_in_progress;
- extern volatile int pci_poke_cpu;
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/pci_sun4v.c linux-2.6.39.3/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.39.3/arch/sparc/kernel/pci_sun4v.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/pci_sun4v.c	2011-05-22 19:36:30.000000000 -0400
-@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
- 	spin_unlock_irqrestore(&iommu->lock, flags);
- }
- 
--static struct dma_map_ops sun4v_dma_ops = {
-+static const struct dma_map_ops sun4v_dma_ops = {
- 	.alloc_coherent			= dma_4v_alloc_coherent,
- 	.free_coherent			= dma_4v_free_coherent,
- 	.map_page			= dma_4v_map_page,
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/process_32.c linux-2.6.39.3/arch/sparc/kernel/process_32.c
---- linux-2.6.39.3/arch/sparc/kernel/process_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/process_32.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/process_32.c linux-2.6.39.4/arch/sparc/kernel/process_32.c
+--- linux-2.6.39.4/arch/sparc/kernel/process_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/process_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
  		       rw->ins[4], rw->ins[5],
  		       rw->ins[6],
@@ -6052,9 +3443,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/process_32.c linux-2.6.39.3/arch/spa
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/process_64.c linux-2.6.39.3/arch/sparc/kernel/process_64.c
---- linux-2.6.39.3/arch/sparc/kernel/process_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/process_64.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/process_64.c linux-2.6.39.4/arch/sparc/kernel/process_64.c
+--- linux-2.6.39.4/arch/sparc/kernel/process_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/process_64.c	2011-08-05 19:44:33.000000000 -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]);
@@ -6090,9 +3481,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/process_64.c linux-2.6.39.3/arch/spa
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/sys_sparc_32.c linux-2.6.39.3/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.39.3/arch/sparc/kernel/sys_sparc_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/sys_sparc_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.39.4/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.39.4/arch/sparc/kernel/sys_sparc_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/sys_sparc_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
@@ -6111,9 +3502,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/sys_sparc_32.c linux-2.6.39.3/arch/s
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.39.3/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.39.3/arch/sparc/kernel/sys_sparc_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/sys_sparc_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.39.4/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.39.4/arch/sparc/kernel/sys_sparc_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/sys_sparc_64.c	2011-08-05 19:44:33.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.
@@ -6261,9 +3652,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.39.3/arch/s
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/traps_32.c linux-2.6.39.3/arch/sparc/kernel/traps_32.c
---- linux-2.6.39.3/arch/sparc/kernel/traps_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/traps_32.c	2011-06-13 21:29:23.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/traps_32.c linux-2.6.39.4/arch/sparc/kernel/traps_32.c
+--- linux-2.6.39.4/arch/sparc/kernel/traps_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/traps_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
  #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
  #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -6293,9 +3684,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/traps_32.c linux-2.6.39.3/arch/sparc
  	do_exit(SIGSEGV);
  }
  
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/traps_64.c linux-2.6.39.3/arch/sparc/kernel/traps_64.c
---- linux-2.6.39.3/arch/sparc/kernel/traps_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/traps_64.c	2011-06-13 21:28:54.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/traps_64.c linux-2.6.39.4/arch/sparc/kernel/traps_64.c
+--- linux-2.6.39.4/arch/sparc/kernel/traps_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/traps_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
  		       i + 1,
  		       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -6433,9 +3824,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/traps_64.c linux-2.6.39.3/arch/sparc
  	do_exit(SIGSEGV);
  }
  EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-2.6.39.3/arch/sparc/kernel/unaligned_64.c linux-2.6.39.3/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.39.3/arch/sparc/kernel/unaligned_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/kernel/unaligned_64.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/kernel/unaligned_64.c linux-2.6.39.4/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.39.4/arch/sparc/kernel/unaligned_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/kernel/unaligned_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs
  	static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
  
@@ -6445,9 +3836,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/kernel/unaligned_64.c linux-2.6.39.3/arch/s
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff -urNp linux-2.6.39.3/arch/sparc/lib/atomic_64.S linux-2.6.39.3/arch/sparc/lib/atomic_64.S
---- linux-2.6.39.3/arch/sparc/lib/atomic_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/lib/atomic_64.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/lib/atomic_64.S linux-2.6.39.4/arch/sparc/lib/atomic_64.S
+--- linux-2.6.39.4/arch/sparc/lib/atomic_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/lib/atomic_64.S	2011-08-05 19:44:33.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -6682,9 +4073,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/lib/atomic_64.S linux-2.6.39.3/arch/sparc/l
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-2.6.39.3/arch/sparc/lib/ksyms.c linux-2.6.39.3/arch/sparc/lib/ksyms.c
---- linux-2.6.39.3/arch/sparc/lib/ksyms.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/lib/ksyms.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/lib/ksyms.c linux-2.6.39.4/arch/sparc/lib/ksyms.c
+--- linux-2.6.39.4/arch/sparc/lib/ksyms.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/lib/ksyms.c	2011-08-05 19:44:33.000000000 -0400
 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -6703,9 +4094,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/lib/ksyms.c linux-2.6.39.3/arch/sparc/lib/k
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-2.6.39.3/arch/sparc/lib/Makefile linux-2.6.39.3/arch/sparc/lib/Makefile
---- linux-2.6.39.3/arch/sparc/lib/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/lib/Makefile	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/lib/Makefile linux-2.6.39.4/arch/sparc/lib/Makefile
+--- linux-2.6.39.4/arch/sparc/lib/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/lib/Makefile	2011-08-05 19:44:33.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -6715,9 +4106,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/lib/Makefile linux-2.6.39.3/arch/sparc/lib/
  
  lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
  lib-$(CONFIG_SPARC32) += memcpy.o memset.o
-diff -urNp linux-2.6.39.3/arch/sparc/Makefile linux-2.6.39.3/arch/sparc/Makefile
---- linux-2.6.39.3/arch/sparc/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/Makefile	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/Makefile linux-2.6.39.4/arch/sparc/Makefile
+--- linux-2.6.39.4/arch/sparc/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/Makefile	2011-08-05 19:44:33.000000000 -0400
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -6727,9 +4118,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/Makefile linux-2.6.39.3/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-2.6.39.3/arch/sparc/mm/fault_32.c linux-2.6.39.3/arch/sparc/mm/fault_32.c
---- linux-2.6.39.3/arch/sparc/mm/fault_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/mm/fault_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/mm/fault_32.c linux-2.6.39.4/arch/sparc/mm/fault_32.c
+--- linux-2.6.39.4/arch/sparc/mm/fault_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/mm/fault_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -7034,9 +4425,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/mm/fault_32.c linux-2.6.39.3/arch/sparc/mm/
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-2.6.39.3/arch/sparc/mm/fault_64.c linux-2.6.39.3/arch/sparc/mm/fault_64.c
---- linux-2.6.39.3/arch/sparc/mm/fault_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/mm/fault_64.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/mm/fault_64.c linux-2.6.39.4/arch/sparc/mm/fault_64.c
+--- linux-2.6.39.4/arch/sparc/mm/fault_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/mm/fault_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -7544,9 +4935,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/mm/fault_64.c linux-2.6.39.3/arch/sparc/mm/
  	/* 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.3/arch/sparc/mm/hugetlbpage.c linux-2.6.39.3/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.39.3/arch/sparc/mm/hugetlbpage.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/mm/hugetlbpage.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/mm/hugetlbpage.c linux-2.6.39.4/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.39.4/arch/sparc/mm/hugetlbpage.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/mm/hugetlbpage.c	2011-08-05 19:44:33.000000000 -0400
 @@ -68,7 +68,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -7606,9 +4997,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/mm/hugetlbpage.c linux-2.6.39.3/arch/sparc/
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.39.3/arch/sparc/mm/init_32.c linux-2.6.39.3/arch/sparc/mm/init_32.c
---- linux-2.6.39.3/arch/sparc/mm/init_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/mm/init_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/mm/init_32.c linux-2.6.39.4/arch/sparc/mm/init_32.c
+--- linux-2.6.39.4/arch/sparc/mm/init_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/mm/init_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -318,6 +318,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -7643,9 +5034,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/mm/init_32.c linux-2.6.39.3/arch/sparc/mm/i
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.39.3/arch/sparc/mm/Makefile linux-2.6.39.3/arch/sparc/mm/Makefile
---- linux-2.6.39.3/arch/sparc/mm/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/mm/Makefile	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/mm/Makefile linux-2.6.39.4/arch/sparc/mm/Makefile
+--- linux-2.6.39.4/arch/sparc/mm/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/mm/Makefile	2011-08-05 19:44:33.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -7655,9 +5046,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/mm/Makefile linux-2.6.39.3/arch/sparc/mm/Ma
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-2.6.39.3/arch/sparc/mm/srmmu.c linux-2.6.39.3/arch/sparc/mm/srmmu.c
---- linux-2.6.39.3/arch/sparc/mm/srmmu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/sparc/mm/srmmu.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/sparc/mm/srmmu.c linux-2.6.39.4/arch/sparc/mm/srmmu.c
+--- linux-2.6.39.4/arch/sparc/mm/srmmu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/sparc/mm/srmmu.c	2011-08-05 19:44:33.000000000 -0400
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -7672,30 +5063,9 @@ diff -urNp linux-2.6.39.3/arch/sparc/mm/srmmu.c linux-2.6.39.3/arch/sparc/mm/srm
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-2.6.39.3/arch/tile/kernel/pci.c linux-2.6.39.3/arch/tile/kernel/pci.c
---- linux-2.6.39.3/arch/tile/kernel/pci.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/arch/tile/kernel/pci.c	2011-06-25 13:00:25.000000000 -0400
-@@ -60,7 +60,7 @@ int __write_once tile_plx_gen1;
- static struct pci_controller controllers[TILE_NUM_PCIE];
- static int num_controllers;
- 
--static struct pci_ops tile_cfg_ops;
-+static const struct pci_ops tile_cfg_ops;
- 
- 
- /*
-@@ -563,7 +563,7 @@ static int __devinit tile_cfg_write(stru
- }
- 
- 
--static struct pci_ops tile_cfg_ops = {
-+static const struct pci_ops tile_cfg_ops = {
- 	.read =         tile_cfg_read,
- 	.write =        tile_cfg_write,
- };
-diff -urNp linux-2.6.39.3/arch/um/include/asm/kmap_types.h linux-2.6.39.3/arch/um/include/asm/kmap_types.h
---- linux-2.6.39.3/arch/um/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/um/include/asm/kmap_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/um/include/asm/kmap_types.h linux-2.6.39.4/arch/um/include/asm/kmap_types.h
+--- linux-2.6.39.4/arch/um/include/asm/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/um/include/asm/kmap_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -7704,9 +5074,9 @@ diff -urNp linux-2.6.39.3/arch/um/include/asm/kmap_types.h linux-2.6.39.3/arch/u
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.39.3/arch/um/include/asm/page.h linux-2.6.39.3/arch/um/include/asm/page.h
---- linux-2.6.39.3/arch/um/include/asm/page.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/um/include/asm/page.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/um/include/asm/page.h linux-2.6.39.4/arch/um/include/asm/page.h
+--- linux-2.6.39.4/arch/um/include/asm/page.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/um/include/asm/page.h	2011-08-05 19:44:33.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -7717,9 +5087,9 @@ diff -urNp linux-2.6.39.3/arch/um/include/asm/page.h linux-2.6.39.3/arch/um/incl
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-2.6.39.3/arch/um/kernel/process.c linux-2.6.39.3/arch/um/kernel/process.c
---- linux-2.6.39.3/arch/um/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/um/kernel/process.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/um/kernel/process.c linux-2.6.39.4/arch/um/kernel/process.c
+--- linux-2.6.39.4/arch/um/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/um/kernel/process.c	2011-08-05 19:44:33.000000000 -0400
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -7743,9 +5113,9 @@ diff -urNp linux-2.6.39.3/arch/um/kernel/process.c linux-2.6.39.3/arch/um/kernel
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff -urNp linux-2.6.39.3/arch/um/sys-i386/syscalls.c linux-2.6.39.3/arch/um/sys-i386/syscalls.c
---- linux-2.6.39.3/arch/um/sys-i386/syscalls.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/um/sys-i386/syscalls.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/um/sys-i386/syscalls.c linux-2.6.39.4/arch/um/sys-i386/syscalls.c
+--- linux-2.6.39.4/arch/um/sys-i386/syscalls.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/um/sys-i386/syscalls.c	2011-08-05 19:44:33.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -7768,21 +5138,9 @@ diff -urNp linux-2.6.39.3/arch/um/sys-i386/syscalls.c linux-2.6.39.3/arch/um/sys
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-2.6.39.3/arch/unicore32/kernel/pci.c linux-2.6.39.3/arch/unicore32/kernel/pci.c
---- linux-2.6.39.3/arch/unicore32/kernel/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/unicore32/kernel/pci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -66,7 +66,7 @@ puv3_write_config(struct pci_bus *bus, u
- 	return PCIBIOS_SUCCESSFUL;
- }
- 
--struct pci_ops pci_puv3_ops = {
-+const struct pci_ops pci_puv3_ops = {
- 	.read  = puv3_read_config,
- 	.write = puv3_write_config,
- };
-diff -urNp linux-2.6.39.3/arch/x86/boot/bitops.h linux-2.6.39.3/arch/x86/boot/bitops.h
---- linux-2.6.39.3/arch/x86/boot/bitops.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/bitops.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/bitops.h linux-2.6.39.4/arch/x86/boot/bitops.h
+--- linux-2.6.39.4/arch/x86/boot/bitops.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/bitops.h	2011-08-05 19:44:33.000000000 -0400
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
  	u8 v;
  	const u32 *p = (const u32 *)addr;
@@ -7801,9 +5159,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/bitops.h linux-2.6.39.3/arch/x86/boot/bi
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.39.3/arch/x86/boot/boot.h linux-2.6.39.3/arch/x86/boot/boot.h
---- linux-2.6.39.3/arch/x86/boot/boot.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/boot.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/boot.h linux-2.6.39.4/arch/x86/boot/boot.h
+--- linux-2.6.39.4/arch/x86/boot/boot.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/boot.h	2011-08-05 19:44:33.000000000 -0400
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -7822,9 +5180,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/boot.h linux-2.6.39.3/arch/x86/boot/boot
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/head_32.S linux-2.6.39.3/arch/x86/boot/compressed/head_32.S
---- linux-2.6.39.3/arch/x86/boot/compressed/head_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/compressed/head_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/compressed/head_32.S linux-2.6.39.4/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.39.4/arch/x86/boot/compressed/head_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/compressed/head_32.S	2011-08-05 19:44:33.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -7853,9 +5211,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/head_32.S linux-2.6.39.3/arch
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/head_64.S linux-2.6.39.3/arch/x86/boot/compressed/head_64.S
---- linux-2.6.39.3/arch/x86/boot/compressed/head_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/compressed/head_64.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/compressed/head_64.S linux-2.6.39.4/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.39.4/arch/x86/boot/compressed/head_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/compressed/head_64.S	2011-08-05 19:44:33.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -7874,9 +5232,22 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/head_64.S linux-2.6.39.3/arch
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/misc.c linux-2.6.39.3/arch/x86/boot/compressed/misc.c
---- linux-2.6.39.3/arch/x86/boot/compressed/misc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/compressed/misc.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/compressed/Makefile linux-2.6.39.4/arch/x86/boot/compressed/Makefile
+--- linux-2.6.39.4/arch/x86/boot/compressed/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/compressed/Makefile	2011-08-05 20:34:06.000000000 -0400
+@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
+ KBUILD_CFLAGS += $(cflags-y)
+ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
+ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
++ifdef CONSTIFY_PLUGIN
++KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
++endif
+ 
+ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+diff -urNp linux-2.6.39.4/arch/x86/boot/compressed/misc.c linux-2.6.39.4/arch/x86/boot/compressed/misc.c
+--- linux-2.6.39.4/arch/x86/boot/compressed/misc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/compressed/misc.c	2011-08-05 19:44:33.000000000 -0400
 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -7895,9 +5266,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/misc.c linux-2.6.39.3/arch/x8
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/relocs.c linux-2.6.39.3/arch/x86/boot/compressed/relocs.c
---- linux-2.6.39.3/arch/x86/boot/compressed/relocs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/compressed/relocs.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/compressed/relocs.c linux-2.6.39.4/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.39.4/arch/x86/boot/compressed/relocs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/compressed/relocs.c	2011-08-05 19:44:33.000000000 -0400
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -8090,9 +5461,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/compressed/relocs.c linux-2.6.39.3/arch/
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-2.6.39.3/arch/x86/boot/cpucheck.c linux-2.6.39.3/arch/x86/boot/cpucheck.c
---- linux-2.6.39.3/arch/x86/boot/cpucheck.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/cpucheck.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/cpucheck.c linux-2.6.39.4/arch/x86/boot/cpucheck.c
+--- linux-2.6.39.4/arch/x86/boot/cpucheck.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/cpucheck.c	2011-08-05 19:44:33.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -8188,9 +5559,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/cpucheck.c linux-2.6.39.3/arch/x86/boot/
  
  		err = check_flags();
  	}
-diff -urNp linux-2.6.39.3/arch/x86/boot/header.S linux-2.6.39.3/arch/x86/boot/header.S
---- linux-2.6.39.3/arch/x86/boot/header.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/header.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/header.S linux-2.6.39.4/arch/x86/boot/header.S
+--- linux-2.6.39.4/arch/x86/boot/header.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/header.S	2011-08-05 19:44:33.000000000 -0400
 @@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
  						# single linked list of
  						# struct setup_data
@@ -8200,9 +5571,22 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/header.S linux-2.6.39.3/arch/x86/boot/he
  
  #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.3/arch/x86/boot/memory.c linux-2.6.39.3/arch/x86/boot/memory.c
---- linux-2.6.39.3/arch/x86/boot/memory.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/memory.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/Makefile linux-2.6.39.4/arch/x86/boot/Makefile
+--- linux-2.6.39.4/arch/x86/boot/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/Makefile	2011-08-05 20:34:06.000000000 -0400
+@@ -69,6 +69,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
+ 		   $(call cc-option, -fno-stack-protector) \
+ 		   $(call cc-option, -mpreferred-stack-boundary=2)
+ KBUILD_CFLAGS	+= $(call cc-option, -m32)
++ifdef CONSTIFY_PLUGIN
++KBUILD_CFLAGS	+= $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
++endif
+ KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+ 
+diff -urNp linux-2.6.39.4/arch/x86/boot/memory.c linux-2.6.39.4/arch/x86/boot/memory.c
+--- linux-2.6.39.4/arch/x86/boot/memory.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/memory.c	2011-08-05 19:44:33.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -8212,9 +5596,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/memory.c linux-2.6.39.3/arch/x86/boot/me
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.39.3/arch/x86/boot/video.c linux-2.6.39.3/arch/x86/boot/video.c
---- linux-2.6.39.3/arch/x86/boot/video.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/video.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/video.c linux-2.6.39.4/arch/x86/boot/video.c
+--- linux-2.6.39.4/arch/x86/boot/video.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/video.c	2011-08-05 19:44:33.000000000 -0400
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -8224,9 +5608,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/video.c linux-2.6.39.3/arch/x86/boot/vid
  	int key;
  	unsigned int v;
  
-diff -urNp linux-2.6.39.3/arch/x86/boot/video-vesa.c linux-2.6.39.3/arch/x86/boot/video-vesa.c
---- linux-2.6.39.3/arch/x86/boot/video-vesa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/boot/video-vesa.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/boot/video-vesa.c linux-2.6.39.4/arch/x86/boot/video-vesa.c
+--- linux-2.6.39.4/arch/x86/boot/video-vesa.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/boot/video-vesa.c	2011-08-05 19:44:33.000000000 -0400
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
  	boot_params.screen_info.vesapm_seg = oreg.es;
@@ -8235,9 +5619,9 @@ diff -urNp linux-2.6.39.3/arch/x86/boot/video-vesa.c linux-2.6.39.3/arch/x86/boo
  }
  
  /*
-diff -urNp linux-2.6.39.3/arch/x86/ia32/ia32_aout.c linux-2.6.39.3/arch/x86/ia32/ia32_aout.c
---- linux-2.6.39.3/arch/x86/ia32/ia32_aout.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/ia32/ia32_aout.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/ia32/ia32_aout.c linux-2.6.39.4/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.39.4/arch/x86/ia32/ia32_aout.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/ia32/ia32_aout.c	2011-08-05 19:44:33.000000000 -0400
 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
  	unsigned long dump_start, dump_size;
  	struct user32 dump;
@@ -8247,9 +5631,9 @@ diff -urNp linux-2.6.39.3/arch/x86/ia32/ia32_aout.c linux-2.6.39.3/arch/x86/ia32
  	fs = get_fs();
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
-diff -urNp linux-2.6.39.3/arch/x86/ia32/ia32entry.S linux-2.6.39.3/arch/x86/ia32/ia32entry.S
---- linux-2.6.39.3/arch/x86/ia32/ia32entry.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/ia32/ia32entry.S	2011-05-23 17:16:01.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/ia32/ia32entry.S linux-2.6.39.4/arch/x86/ia32/ia32entry.S
+--- linux-2.6.39.4/arch/x86/ia32/ia32entry.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/ia32/ia32entry.S	2011-08-05 19:44:33.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -8427,9 +5811,9 @@ diff -urNp linux-2.6.39.3/arch/x86/ia32/ia32entry.S linux-2.6.39.3/arch/x86/ia32
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq $(IA32_NR_syscalls-1),%rax
-diff -urNp linux-2.6.39.3/arch/x86/ia32/ia32_signal.c linux-2.6.39.3/arch/x86/ia32/ia32_signal.c
---- linux-2.6.39.3/arch/x86/ia32/ia32_signal.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/ia32/ia32_signal.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/ia32/ia32_signal.c linux-2.6.39.4/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.39.4/arch/x86/ia32/ia32_signal.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/ia32/ia32_signal.c	2011-08-05 19:44:33.000000000 -0400
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
  	sp -= frame_size;
  	/* Align the stack pointer according to the i386 ABI,
@@ -8479,9 +5863,9 @@ diff -urNp linux-2.6.39.3/arch/x86/ia32/ia32_signal.c linux-2.6.39.3/arch/x86/ia
  	} put_user_catch(err);
  
  	if (err)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/alternative.h linux-2.6.39.3/arch/x86/include/asm/alternative.h
---- linux-2.6.39.3/arch/x86/include/asm/alternative.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/alternative.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/alternative.h linux-2.6.39.4/arch/x86/include/asm/alternative.h
+--- linux-2.6.39.4/arch/x86/include/asm/alternative.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/alternative.h	2011-08-05 19:44:33.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 <= slen */	\
@@ -8491,9 +5875,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/alternative.h linux-2.6.39.3/arch
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/apm.h linux-2.6.39.3/arch/x86/include/asm/apm.h
---- linux-2.6.39.3/arch/x86/include/asm/apm.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/apm.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/apm.h linux-2.6.39.4/arch/x86/include/asm/apm.h
+--- linux-2.6.39.4/arch/x86/include/asm/apm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/apm.h	2011-08-05 19:44:33.000000000 -0400
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -8512,9 +5896,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/apm.h linux-2.6.39.3/arch/x86/inc
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/atomic64_32.h linux-2.6.39.3/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.39.3/arch/x86/include/asm/atomic64_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/atomic64_32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/atomic64_32.h linux-2.6.39.4/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.39.4/arch/x86/include/asm/atomic64_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/atomic64_32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -12,6 +12,14 @@ typedef struct {
  	u64 __aligned(8) counter;
  } atomic64_t;
@@ -8664,9 +6048,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/atomic64_32.h linux-2.6.39.3/arch
   * atomic64_sub - subtract the atomic64 variable
   * @i: integer value to subtract
   * @v: pointer to type atomic64_t
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/atomic64_64.h linux-2.6.39.3/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.39.3/arch/x86/include/asm/atomic64_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/atomic64_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/atomic64_64.h linux-2.6.39.4/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.39.4/arch/x86/include/asm/atomic64_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/atomic64_64.h	2011-08-05 19:44:33.000000000 -0400
 @@ -18,7 +18,19 @@
   */
  static inline long atomic64_read(const atomic64_t *v)
@@ -8988,9 +6372,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/atomic64_64.h linux-2.6.39.3/arch
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/atomic.h linux-2.6.39.3/arch/x86/include/asm/atomic.h
---- linux-2.6.39.3/arch/x86/include/asm/atomic.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/atomic.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/atomic.h linux-2.6.39.4/arch/x86/include/asm/atomic.h
+--- linux-2.6.39.4/arch/x86/include/asm/atomic.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/atomic.h	2011-08-05 19:44:33.000000000 -0400
 @@ -22,7 +22,18 @@
   */
  static inline int atomic_read(const atomic_t *v)
@@ -9403,9 +6787,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/atomic.h linux-2.6.39.3/arch/x86/
  /*
   * atomic_dec_if_positive - decrement by 1 if old value positive
   * @v: pointer of type atomic_t
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/bitops.h linux-2.6.39.3/arch/x86/include/asm/bitops.h
---- linux-2.6.39.3/arch/x86/include/asm/bitops.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/bitops.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/bitops.h linux-2.6.39.4/arch/x86/include/asm/bitops.h
+--- linux-2.6.39.4/arch/x86/include/asm/bitops.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/bitops.h	2011-08-05 19:44:33.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -9415,9 +6799,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/bitops.h linux-2.6.39.3/arch/x86/
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/boot.h linux-2.6.39.3/arch/x86/include/asm/boot.h
---- linux-2.6.39.3/arch/x86/include/asm/boot.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/boot.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/boot.h linux-2.6.39.4/arch/x86/include/asm/boot.h
+--- linux-2.6.39.4/arch/x86/include/asm/boot.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/boot.h	2011-08-05 19:44:33.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -9435,9 +6819,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/boot.h linux-2.6.39.3/arch/x86/in
  /* 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.3/arch/x86/include/asm/cacheflush.h linux-2.6.39.3/arch/x86/include/asm/cacheflush.h
---- linux-2.6.39.3/arch/x86/include/asm/cacheflush.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/cacheflush.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/cacheflush.h linux-2.6.39.4/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.39.4/arch/x86/include/asm/cacheflush.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/cacheflush.h	2011-08-05 19:44:33.000000000 -0400
 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
  	unsigned long pg_flags = pg->flags & _PGMT_MASK;
  
@@ -9447,9 +6831,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/cacheflush.h linux-2.6.39.3/arch/
  	else if (pg_flags == _PGMT_WC)
  		return _PAGE_CACHE_WC;
  	else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/cache.h linux-2.6.39.3/arch/x86/include/asm/cache.h
---- linux-2.6.39.3/arch/x86/include/asm/cache.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/cache.h	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/cache.h linux-2.6.39.4/arch/x86/include/asm/cache.h
+--- linux-2.6.39.4/arch/x86/include/asm/cache.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/cache.h	2011-08-05 19:44:33.000000000 -0400
 @@ -5,12 +5,13 @@
  
  /* L1 cache line size */
@@ -9466,9 +6850,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/cache.h linux-2.6.39.3/arch/x86/i
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/checksum_32.h linux-2.6.39.3/arch/x86/include/asm/checksum_32.h
---- linux-2.6.39.3/arch/x86/include/asm/checksum_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/checksum_32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/checksum_32.h linux-2.6.39.4/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.39.4/arch/x86/include/asm/checksum_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/checksum_32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
@@ -9502,9 +6886,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/checksum_32.h linux-2.6.39.3/arch
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/cpufeature.h linux-2.6.39.3/arch/x86/include/asm/cpufeature.h
---- linux-2.6.39.3/arch/x86/include/asm/cpufeature.h	2011-06-03 00:04:13.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/cpufeature.h	2011-06-03 00:32:04.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/cpufeature.h linux-2.6.39.4/arch/x86/include/asm/cpufeature.h
+--- linux-2.6.39.4/arch/x86/include/asm/cpufeature.h	2011-06-03 00:04:13.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/cpufeature.h	2011-08-05 19:44:33.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 */
@@ -9514,9 +6898,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/cpufeature.h linux-2.6.39.3/arch/
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/desc_defs.h linux-2.6.39.3/arch/x86/include/asm/desc_defs.h
---- linux-2.6.39.3/arch/x86/include/asm/desc_defs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/desc_defs.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/desc_defs.h linux-2.6.39.4/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.39.4/arch/x86/include/asm/desc_defs.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/desc_defs.h	2011-08-05 19:44:33.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;
@@ -9530,9 +6914,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/desc_defs.h linux-2.6.39.3/arch/x
  	};
  } __attribute__((packed));
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/desc.h linux-2.6.39.3/arch/x86/include/asm/desc.h
---- linux-2.6.39.3/arch/x86/include/asm/desc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/desc.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/desc.h linux-2.6.39.4/arch/x86/include/asm/desc.h
+--- linux-2.6.39.4/arch/x86/include/asm/desc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/desc.h	2011-08-05 19:44:33.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -9713,63 +7097,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/desc.h linux-2.6.39.3/arch/x86/in
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/device.h linux-2.6.39.3/arch/x86/include/asm/device.h
---- linux-2.6.39.3/arch/x86/include/asm/device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/device.h	2011-05-22 19:36:30.000000000 -0400
-@@ -6,7 +6,7 @@ struct dev_archdata {
- 	void	*acpi_handle;
- #endif
- #ifdef CONFIG_X86_64
--struct dma_map_ops *dma_ops;
-+	const struct dma_map_ops *dma_ops;
- #endif
- #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
- 	void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/dma-mapping.h linux-2.6.39.3/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.39.3/arch/x86/include/asm/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/dma-mapping.h	2011-05-22 19:36:30.000000000 -0400
-@@ -26,9 +26,9 @@ extern int iommu_merge;
- extern struct device x86_dma_fallback_dev;
- extern int panic_on_overflow;
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- #ifdef CONFIG_X86_32
- 	return dma_ops;
-@@ -45,7 +45,7 @@ static inline struct dma_map_ops *get_dm
- /* Make sure we keep the same behaviour */
- static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	if (ops->mapping_error)
- 		return ops->mapping_error(dev, dma_addr);
- 
-@@ -115,7 +115,7 @@ static inline void *
- dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
- 		gfp_t gfp)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *memory;
- 
- 	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
-@@ -142,7 +142,7 @@ dma_alloc_coherent(struct device *dev, s
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *vaddr, dma_addr_t bus)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	WARN_ON(irqs_disabled());       /* for portability */
- 
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/e820.h linux-2.6.39.3/arch/x86/include/asm/e820.h
---- linux-2.6.39.3/arch/x86/include/asm/e820.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/e820.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/e820.h linux-2.6.39.4/arch/x86/include/asm/e820.h
+--- linux-2.6.39.4/arch/x86/include/asm/e820.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/e820.h	2011-08-05 19:44:33.000000000 -0400
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS	0xa0000
  #define ISA_END_ADDRESS		0x100000
@@ -9779,9 +7109,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/e820.h linux-2.6.39.3/arch/x86/in
  #define BIOS_END		0x00100000
  
  #define BIOS_ROM_BASE		0xffe00000
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/elf.h linux-2.6.39.3/arch/x86/include/asm/elf.h
---- linux-2.6.39.3/arch/x86/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/elf.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/elf.h linux-2.6.39.4/arch/x86/include/asm/elf.h
+--- linux-2.6.39.4/arch/x86/include/asm/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/elf.h	2011-08-05 19:44:33.000000000 -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 program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -9835,9 +7165,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/elf.h linux-2.6.39.3/arch/x86/inc
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/emergency-restart.h linux-2.6.39.3/arch/x86/include/asm/emergency-restart.h
---- linux-2.6.39.3/arch/x86/include/asm/emergency-restart.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/emergency-restart.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/emergency-restart.h linux-2.6.39.4/arch/x86/include/asm/emergency-restart.h
+--- linux-2.6.39.4/arch/x86/include/asm/emergency-restart.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/emergency-restart.h	2011-08-05 19:44:33.000000000 -0400
 @@ -15,6 +15,6 @@ enum reboot_type {
  
  extern enum reboot_type reboot_type;
@@ -9846,9 +7176,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/emergency-restart.h linux-2.6.39.
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/futex.h linux-2.6.39.3/arch/x86/include/asm/futex.h
---- linux-2.6.39.3/arch/x86/include/asm/futex.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/futex.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/futex.h linux-2.6.39.4/arch/x86/include/asm/futex.h
+--- linux-2.6.39.4/arch/x86/include/asm/futex.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/futex.h	2011-08-05 19:44:33.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -9907,9 +7237,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/futex.h linux-2.6.39.3/arch/x86/i
  		     : "i" (-EFAULT), "r" (newval), "1" (oldval)
  		     : "memory"
  	);
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/hw_irq.h linux-2.6.39.3/arch/x86/include/asm/hw_irq.h
---- linux-2.6.39.3/arch/x86/include/asm/hw_irq.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/hw_irq.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/hw_irq.h linux-2.6.39.4/arch/x86/include/asm/hw_irq.h
+--- linux-2.6.39.4/arch/x86/include/asm/hw_irq.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/hw_irq.h	2011-08-05 19:44:33.000000000 -0400
 @@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
@@ -9921,9 +7251,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/hw_irq.h linux-2.6.39.3/arch/x86/
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/i387.h linux-2.6.39.3/arch/x86/include/asm/i387.h
---- linux-2.6.39.3/arch/x86/include/asm/i387.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/i387.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/i387.h linux-2.6.39.4/arch/x86/include/asm/i387.h
+--- linux-2.6.39.4/arch/x86/include/asm/i387.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/i387.h	2011-08-05 19:44:33.000000000 -0400
 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
@@ -9973,9 +7303,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/i387.h linux-2.6.39.3/arch/x86/in
  	else
  		clts();
  }
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/io.h linux-2.6.39.3/arch/x86/include/asm/io.h
---- linux-2.6.39.3/arch/x86/include/asm/io.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/io.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/io.h linux-2.6.39.4/arch/x86/include/asm/io.h
+--- linux-2.6.39.4/arch/x86/include/asm/io.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/io.h	2011-08-05 19:44:33.000000000 -0400
 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
@@ -9994,21 +7324,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/io.h linux-2.6.39.3/arch/x86/incl
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/iommu.h linux-2.6.39.3/arch/x86/include/asm/iommu.h
---- linux-2.6.39.3/arch/x86/include/asm/iommu.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/iommu.h	2011-05-22 19:36:30.000000000 -0400
-@@ -1,7 +1,7 @@
- #ifndef _ASM_X86_IOMMU_H
- #define _ASM_X86_IOMMU_H
- 
--extern struct dma_map_ops nommu_dma_ops;
-+extern const struct dma_map_ops nommu_dma_ops;
- extern int force_iommu, no_iommu;
- extern int iommu_detected;
- extern int iommu_pass_through;
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/irqflags.h linux-2.6.39.3/arch/x86/include/asm/irqflags.h
---- linux-2.6.39.3/arch/x86/include/asm/irqflags.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/irqflags.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/irqflags.h linux-2.6.39.4/arch/x86/include/asm/irqflags.h
+--- linux-2.6.39.4/arch/x86/include/asm/irqflags.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/irqflags.h	2011-08-05 19:44:33.000000000 -0400
 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
  	sti;					\
  	sysexit
@@ -10021,9 +7339,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/irqflags.h linux-2.6.39.3/arch/x8
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/kprobes.h linux-2.6.39.3/arch/x86/include/asm/kprobes.h
---- linux-2.6.39.3/arch/x86/include/asm/kprobes.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/kprobes.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/kprobes.h linux-2.6.39.4/arch/x86/include/asm/kprobes.h
+--- linux-2.6.39.4/arch/x86/include/asm/kprobes.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/kprobes.h	2011-08-05 19:44:33.000000000 -0400
 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
  #define RELATIVEJUMP_SIZE 5
  #define RELATIVECALL_OPCODE 0xe8
@@ -10040,9 +7358,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/kprobes.h linux-2.6.39.3/arch/x86
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/kvm_host.h linux-2.6.39.3/arch/x86/include/asm/kvm_host.h
---- linux-2.6.39.3/arch/x86/include/asm/kvm_host.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/kvm_host.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/kvm_host.h linux-2.6.39.4/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.39.4/arch/x86/include/asm/kvm_host.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/kvm_host.h	2011-08-05 20:34:06.000000000 -0400
 @@ -419,7 +419,7 @@ struct kvm_arch {
  	unsigned int n_used_mmu_pages;
  	unsigned int n_requested_mmu_pages;
@@ -10052,18 +7370,18 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/kvm_host.h linux-2.6.39.3/arch/x8
  	struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
  	/*
  	 * Hash table of struct kvm_mmu_page.
-@@ -599,7 +599,7 @@ struct kvm_arch_async_pf {
- 	bool direct_map;
- };
+@@ -589,7 +589,7 @@ struct kvm_x86_ops {
+ 	void (*write_tsc_offset)(struct kvm_vcpu *vcpu, u64 offset);
  
--extern struct kvm_x86_ops *kvm_x86_ops;
-+extern const struct kvm_x86_ops *kvm_x86_ops;
+ 	void (*get_exit_info)(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2);
+-	const struct trace_print_flags *exit_reasons_str;
++	const struct trace_print_flags * const exit_reasons_str;
+ };
  
- int kvm_mmu_module_init(void);
- void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/local.h linux-2.6.39.3/arch/x86/include/asm/local.h
---- linux-2.6.39.3/arch/x86/include/asm/local.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/local.h	2011-05-22 19:36:30.000000000 -0400
+ struct kvm_arch_async_pf {
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/local.h linux-2.6.39.4/arch/x86/include/asm/local.h
+--- linux-2.6.39.4/arch/x86/include/asm/local.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/local.h	2011-08-05 19:44:33.000000000 -0400
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -10216,70 +7534,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/local.h linux-2.6.39.3/arch/x86/i
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/mce.h linux-2.6.39.3/arch/x86/include/asm/mce.h
---- linux-2.6.39.3/arch/x86/include/asm/mce.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/mce.h	2011-05-22 19:36:30.000000000 -0400
-@@ -198,7 +198,7 @@ int mce_notify_irq(void);
- void mce_notify_process(void);
- 
- DECLARE_PER_CPU(struct mce, injectm);
--extern struct file_operations mce_chrdev_ops;
-+extern struct file_operations mce_chrdev_ops;	/* cannot be const, see arch/x86/kernel/cpu/mcheck/mce. */
- 
- /*
-  * Exception handler
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/microcode.h linux-2.6.39.3/arch/x86/include/asm/microcode.h
---- linux-2.6.39.3/arch/x86/include/asm/microcode.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 };
- 
- struct microcode_ops {
--	enum ucode_state (*request_microcode_user) (int cpu,
-+	enum ucode_state (* const request_microcode_user) (int cpu,
- 				const void __user *buf, size_t size);
- 
--	enum ucode_state (*request_microcode_fw) (int cpu,
-+	enum ucode_state (* const request_microcode_fw) (int cpu,
- 				struct device *device);
- 
--	void (*microcode_fini_cpu) (int cpu);
-+	void (* const microcode_fini_cpu) (int cpu);
- 
- 	/*
- 	 * The generic 'microcode_core' part guarantees that
-@@ -38,16 +38,16 @@ struct ucode_cpu_info {
- extern struct ucode_cpu_info ucode_cpu_info[];
- 
- #ifdef CONFIG_MICROCODE_INTEL
--extern struct microcode_ops * __init init_intel_microcode(void);
-+extern const struct microcode_ops * __init init_intel_microcode(void);
- #else
--static inline struct microcode_ops * __init init_intel_microcode(void)
-+static inline const struct microcode_ops * __init init_intel_microcode(void)
- {
- 	return NULL;
- }
- #endif /* CONFIG_MICROCODE_INTEL */
- 
- #ifdef CONFIG_MICROCODE_AMD
--extern struct microcode_ops * __init init_amd_microcode(void);
-+extern const struct microcode_ops * __init init_amd_microcode(void);
- 
- static inline void get_ucode_data(void *to, const u8 *from, size_t n)
- {
-@@ -55,7 +55,7 @@ static inline void get_ucode_data(void *
- }
- 
- #else
--static inline struct microcode_ops * __init init_amd_microcode(void)
-+static inline const struct microcode_ops * __init init_amd_microcode(void)
- {
- 	return NULL;
- }
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/mman.h linux-2.6.39.3/arch/x86/include/asm/mman.h
---- linux-2.6.39.3/arch/x86/include/asm/mman.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/mman.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/mman.h linux-2.6.39.4/arch/x86/include/asm/mman.h
+--- linux-2.6.39.4/arch/x86/include/asm/mman.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/mman.h	2011-08-05 19:44:33.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -10295,9 +7552,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/mman.h linux-2.6.39.3/arch/x86/in
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/mmu_context.h linux-2.6.39.3/arch/x86/include/asm/mmu_context.h
---- linux-2.6.39.3/arch/x86/include/asm/mmu_context.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/mmu_context.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/mmu_context.h linux-2.6.39.4/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.39.4/arch/x86/include/asm/mmu_context.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/mmu_context.h	2011-08-05 19:44:33.000000000 -0400
 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -10421,9 +7678,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/mmu_context.h linux-2.6.39.3/arch
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/mmu.h linux-2.6.39.3/arch/x86/include/asm/mmu.h
---- linux-2.6.39.3/arch/x86/include/asm/mmu.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/mmu.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/mmu.h linux-2.6.39.4/arch/x86/include/asm/mmu.h
+--- linux-2.6.39.4/arch/x86/include/asm/mmu.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/mmu.h	2011-08-05 19:44:33.000000000 -0400
 @@ -9,10 +9,22 @@
   * we put the segment information here.
   */
@@ -10449,9 +7706,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/mmu.h linux-2.6.39.3/arch/x86/inc
  
  #ifdef CONFIG_X86_64
  	/* True if mm supports a task running in 32 bit compatibility mode. */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/module.h linux-2.6.39.3/arch/x86/include/asm/module.h
---- linux-2.6.39.3/arch/x86/include/asm/module.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/module.h	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/module.h linux-2.6.39.4/arch/x86/include/asm/module.h
+--- linux-2.6.39.4/arch/x86/include/asm/module.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/module.h	2011-08-05 19:44:33.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -10493,9 +7750,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/module.h linux-2.6.39.3/arch/x86/
 +#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.3/arch/x86/include/asm/page_64_types.h linux-2.6.39.3/arch/x86/include/asm/page_64_types.h
---- linux-2.6.39.3/arch/x86/include/asm/page_64_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/page_64_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/page_64_types.h linux-2.6.39.4/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.39.4/arch/x86/include/asm/page_64_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/page_64_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -10505,9 +7762,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/page_64_types.h linux-2.6.39.3/ar
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/paravirt.h linux-2.6.39.3/arch/x86/include/asm/paravirt.h
---- linux-2.6.39.3/arch/x86/include/asm/paravirt.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/paravirt.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/paravirt.h linux-2.6.39.4/arch/x86/include/asm/paravirt.h
+--- linux-2.6.39.4/arch/x86/include/asm/paravirt.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/paravirt.h	2011-08-05 19:44:33.000000000 -0400
 @@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned
  	pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
@@ -10561,9 +7818,50 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/paravirt.h linux-2.6.39.3/arch/x8
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/paravirt_types.h linux-2.6.39.3/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.39.3/arch/x86/include/asm/paravirt_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/paravirt_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/paravirt_types.h linux-2.6.39.4/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.39.4/arch/x86/include/asm/paravirt_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/paravirt_types.h	2011-08-05 20:34:06.000000000 -0400
+@@ -78,19 +78,19 @@ struct pv_init_ops {
+ 	 */
+ 	unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
+ 			  unsigned long addr, unsigned len);
+-};
++} __no_const;
+ 
+ 
+ struct pv_lazy_ops {
+ 	/* Set deferred update mode, used for batching operations. */
+ 	void (*enter)(void);
+ 	void (*leave)(void);
+-};
++} __no_const;
+ 
+ struct pv_time_ops {
+ 	unsigned long long (*sched_clock)(void);
+ 	unsigned long (*get_tsc_khz)(void);
+-};
++} __no_const;
+ 
+ struct pv_cpu_ops {
+ 	/* hooks for various privileged instructions */
+@@ -186,7 +186,7 @@ struct pv_cpu_ops {
+ 
+ 	void (*start_context_switch)(struct task_struct *prev);
+ 	void (*end_context_switch)(struct task_struct *next);
+-};
++} __no_const;
+ 
+ struct pv_irq_ops {
+ 	/*
+@@ -217,7 +217,7 @@ struct pv_apic_ops {
+ 				 unsigned long start_eip,
+ 				 unsigned long start_esp);
+ #endif
+-};
++} __no_const;
+ 
+ struct pv_mmu_ops {
+ 	unsigned long (*read_cr2)(void);
 @@ -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,
@@ -10577,34 +7875,18 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/paravirt_types.h linux-2.6.39.3/a
  };
  
  struct arch_spinlock;
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pci_x86.h linux-2.6.39.3/arch/x86/include/asm/pci_x86.h
---- linux-2.6.39.3/arch/x86/include/asm/pci_x86.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pci_x86.h	2011-05-22 19:36:30.000000000 -0400
-@@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct 
- extern void (*pcibios_disable_irq)(struct pci_dev *dev);
- 
- struct pci_raw_ops {
--	int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,
-+	int (* const read)(unsigned int domain, unsigned int bus, unsigned int devfn,
- 						int reg, int len, u32 *val);
--	int (*write)(unsigned int domain, unsigned int bus, unsigned int devfn,
-+	int (* const write)(unsigned int domain, unsigned int bus, unsigned int devfn,
- 						int reg, int len, u32 val);
- };
- 
--extern struct pci_raw_ops *raw_pci_ops;
--extern struct pci_raw_ops *raw_pci_ext_ops;
-+extern const struct pci_raw_ops *raw_pci_ops;
-+extern const struct pci_raw_ops *raw_pci_ext_ops;
- 
--extern struct pci_raw_ops pci_direct_conf1;
-+extern const struct pci_raw_ops pci_direct_conf1;
- extern bool port_cf9_safe;
- 
- /* arch_initcall level */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgalloc.h linux-2.6.39.3/arch/x86/include/asm/pgalloc.h
---- linux-2.6.39.3/arch/x86/include/asm/pgalloc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgalloc.h	2011-05-22 19:36:30.000000000 -0400
+@@ -327,7 +333,7 @@ struct pv_lock_ops {
+ 	void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
+ 	int (*spin_trylock)(struct arch_spinlock *lock);
+ 	void (*spin_unlock)(struct arch_spinlock *lock);
+-};
++} __no_const;
+ 
+ /* This contains all the paravirt structures: we get a convenient
+  * number for each function using the offset which we use to indicate
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgalloc.h linux-2.6.39.4/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgalloc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgalloc.h	2011-08-05 19:44:33.000000000 -0400
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
  				       pmd_t *pmd, pte_t *pte)
  {
@@ -10619,9 +7901,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgalloc.h linux-2.6.39.3/arch/x86
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable-2level.h linux-2.6.39.3/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable-2level.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable-2level.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.39.4/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable-2level.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable-2level.h	2011-08-05 19:44:33.000000000 -0400
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -10632,9 +7914,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable-2level.h linux-2.6.39.3/a
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_32.h linux-2.6.39.3/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable_32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable_32.h linux-2.6.39.4/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable_32.h	2011-08-05 19:44:33.000000000 -0400
 @@ -25,9 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -10678,9 +7960,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_32.h linux-2.6.39.3/arch/
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_32_types.h linux-2.6.39.3/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable_32_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable_32_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.39.4/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable_32_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable_32_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -10710,9 +7992,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_32_types.h linux-2.6.39.3
  #define MODULES_VADDR	VMALLOC_START
  #define MODULES_END	VMALLOC_END
  #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable-3level.h linux-2.6.39.3/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable-3level.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable-3level.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.39.4/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable-3level.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable-3level.h	2011-08-05 19:44:33.000000000 -0400
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -10730,9 +8012,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable-3level.h linux-2.6.39.3/a
  }
  
  /*
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_64.h linux-2.6.39.3/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable_64.h linux-2.6.39.4/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable_64.h	2011-08-05 19:44:33.000000000 -0400
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -10769,9 +8051,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_64.h linux-2.6.39.3/arch/
  }
  
  static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_64_types.h linux-2.6.39.3/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable_64_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable_64_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.39.4/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable_64_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable_64_types.h	2011-08-05 19:44:33.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)
@@ -10783,9 +8065,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_64_types.h linux-2.6.39.3
 +#define ktva_ktla(addr)		(addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable.h linux-2.6.39.3/arch/x86/include/asm/pgtable.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable.h linux-2.6.39.4/arch/x86/include/asm/pgtable.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable.h	2011-08-05 19:44:33.000000000 -0400
 @@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm
  
  #define arch_end_context_switch(prev)	do {} while(0)
@@ -10955,9 +8237,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable.h linux-2.6.39.3/arch/x86
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_types.h linux-2.6.39.3/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.39.3/arch/x86/include/asm/pgtable_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/pgtable_types.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/pgtable_types.h linux-2.6.39.4/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.39.4/arch/x86/include/asm/pgtable_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/pgtable_types.h	2011-08-05 19:44:33.000000000 -0400
 @@ -16,13 +16,12 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -11071,9 +8353,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/pgtable_types.h linux-2.6.39.3/ar
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/processor.h linux-2.6.39.3/arch/x86/include/asm/processor.h
---- linux-2.6.39.3/arch/x86/include/asm/processor.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/processor.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/processor.h linux-2.6.39.4/arch/x86/include/asm/processor.h
+--- linux-2.6.39.4/arch/x86/include/asm/processor.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/processor.h	2011-08-05 19:44:33.000000000 -0400
 @@ -266,7 +266,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -11176,9 +8458,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/processor.h linux-2.6.39.3/arch/x
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/ptrace.h linux-2.6.39.3/arch/x86/include/asm/ptrace.h
---- linux-2.6.39.3/arch/x86/include/asm/ptrace.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/ptrace.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/ptrace.h linux-2.6.39.4/arch/x86/include/asm/ptrace.h
+--- linux-2.6.39.4/arch/x86/include/asm/ptrace.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/ptrace.h	2011-08-05 19:44:33.000000000 -0400
 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_
  }
  
@@ -11215,9 +8497,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/ptrace.h linux-2.6.39.3/arch/x86/
  #endif
  }
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/reboot.h linux-2.6.39.3/arch/x86/include/asm/reboot.h
---- linux-2.6.39.3/arch/x86/include/asm/reboot.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/reboot.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/reboot.h linux-2.6.39.4/arch/x86/include/asm/reboot.h
+--- linux-2.6.39.4/arch/x86/include/asm/reboot.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/reboot.h	2011-08-05 20:34:06.000000000 -0400
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -11231,8 +8513,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/reboot.h linux-2.6.39.3/arch/x86/
  	void (*shutdown)(void);
  	void (*crash_shutdown)(struct pt_regs *);
 -	void (*emergency_restart)(void);
+-};
 +	void (* __noreturn emergency_restart)(void);
- };
++} __no_const;
  
  extern struct machine_ops machine_ops;
  
@@ -11243,9 +8526,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/reboot.h linux-2.6.39.3/arch/x86/
  /* These must match dispatch_table in reboot_32.S */
  #define MRR_BIOS	0
  #define MRR_APM		1
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/rwsem.h linux-2.6.39.3/arch/x86/include/asm/rwsem.h
---- linux-2.6.39.3/arch/x86/include/asm/rwsem.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/rwsem.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/rwsem.h linux-2.6.39.4/arch/x86/include/asm/rwsem.h
+--- linux-2.6.39.4/arch/x86/include/asm/rwsem.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/rwsem.h	2011-08-05 19:44:33.000000000 -0400
 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw
  {
  	asm volatile("# beginning down_read\n\t"
@@ -11370,9 +8653,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/rwsem.h linux-2.6.39.3/arch/x86/i
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/segment.h linux-2.6.39.3/arch/x86/include/asm/segment.h
---- linux-2.6.39.3/arch/x86/include/asm/segment.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/segment.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/segment.h linux-2.6.39.4/arch/x86/include/asm/segment.h
+--- linux-2.6.39.4/arch/x86/include/asm/segment.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/segment.h	2011-08-05 19:44:33.000000000 -0400
 @@ -64,8 +64,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -11432,9 +8715,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/segment.h linux-2.6.39.3/arch/x86
  #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.3/arch/x86/include/asm/smp.h linux-2.6.39.3/arch/x86/include/asm/smp.h
---- linux-2.6.39.3/arch/x86/include/asm/smp.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/smp.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/smp.h linux-2.6.39.4/arch/x86/include/asm/smp.h
+--- linux-2.6.39.4/arch/x86/include/asm/smp.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/smp.h	2011-08-05 20:34:06.000000000 -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);
@@ -11444,6 +8727,15 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/smp.h linux-2.6.39.3/arch/x86/inc
  
  static inline struct cpumask *cpu_sibling_mask(int cpu)
  {
+@@ -77,7 +77,7 @@ struct smp_ops {
+ 
+ 	void (*send_call_func_ipi)(const struct cpumask *mask);
+ 	void (*send_call_func_single_ipi)(int cpu);
+-};
++} __no_const;
+ 
+ /* Globals due to paravirt */
+ extern void set_cpu_sibling_map(int cpu);
 @@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitd
  extern int safe_smp_processor_id(void);
  
@@ -11461,9 +8753,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/smp.h linux-2.6.39.3/arch/x86/inc
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/spinlock.h linux-2.6.39.3/arch/x86/include/asm/spinlock.h
---- linux-2.6.39.3/arch/x86/include/asm/spinlock.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/spinlock.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/spinlock.h linux-2.6.39.4/arch/x86/include/asm/spinlock.h
+--- linux-2.6.39.4/arch/x86/include/asm/spinlock.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/spinlock.h	2011-08-05 19:44:33.000000000 -0400
 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
@@ -11526,9 +8818,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/spinlock.h linux-2.6.39.3/arch/x8
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/stackprotector.h linux-2.6.39.3/arch/x86/include/asm/stackprotector.h
---- linux-2.6.39.3/arch/x86/include/asm/stackprotector.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/stackprotector.h	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/stackprotector.h linux-2.6.39.4/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.39.4/arch/x86/include/asm/stackprotector.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/stackprotector.h	2011-08-05 19:44:33.000000000 -0400
 @@ -48,7 +48,7 @@
   * head_32 for boot CPU and setup_per_cpu_areas() for others.
   */
@@ -11547,9 +8839,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/stackprotector.h linux-2.6.39.3/a
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/stacktrace.h linux-2.6.39.3/arch/x86/include/asm/stacktrace.h
---- linux-2.6.39.3/arch/x86/include/asm/stacktrace.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/stacktrace.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/stacktrace.h linux-2.6.39.4/arch/x86/include/asm/stacktrace.h
+--- linux-2.6.39.4/arch/x86/include/asm/stacktrace.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/stacktrace.h	2011-08-05 19:44:33.000000000 -0400
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -11600,9 +8892,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/stacktrace.h linux-2.6.39.3/arch/
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/system.h linux-2.6.39.3/arch/x86/include/asm/system.h
---- linux-2.6.39.3/arch/x86/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/system.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/system.h linux-2.6.39.4/arch/x86/include/asm/system.h
+--- linux-2.6.39.4/arch/x86/include/asm/system.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/system.h	2011-08-05 19:44:33.000000000 -0400
 @@ -129,7 +129,7 @@ do {									\
  	     "call __switch_to\n\t"					  \
  	     "movq "__percpu_arg([current_task])",%%rsi\n\t"		  \
@@ -11645,9 +8937,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/system.h linux-2.6.39.3/arch/x86/
  
  /*
   * Force strict CPU ordering.
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/thread_info.h linux-2.6.39.3/arch/x86/include/asm/thread_info.h
---- linux-2.6.39.3/arch/x86/include/asm/thread_info.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/thread_info.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/thread_info.h linux-2.6.39.4/arch/x86/include/asm/thread_info.h
+--- linux-2.6.39.4/arch/x86/include/asm/thread_info.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/thread_info.h	2011-08-05 19:44:33.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -11795,9 +9087,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/thread_info.h linux-2.6.39.3/arch
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/uaccess_32.h linux-2.6.39.3/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.39.3/arch/x86/include/asm/uaccess_32.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/uaccess_32.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/uaccess_32.h linux-2.6.39.4/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.39.4/arch/x86/include/asm/uaccess_32.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/uaccess_32.h	2011-08-05 19:44:33.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 long n)
@@ -11965,9 +9257,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/uaccess_32.h linux-2.6.39.3/arch/
  	return n;
  }
  
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/uaccess_64.h linux-2.6.39.3/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.39.3/arch/x86/include/asm/uaccess_64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/uaccess_64.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/uaccess_64.h linux-2.6.39.4/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.39.4/arch/x86/include/asm/uaccess_64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/uaccess_64.h	2011-08-05 19:44:33.000000000 -0400
 @@ -11,6 +11,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -12372,9 +9664,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/uaccess_64.h linux-2.6.39.3/arch/
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/uaccess.h linux-2.6.39.3/arch/x86/include/asm/uaccess.h
---- linux-2.6.39.3/arch/x86/include/asm/uaccess.h	2011-06-03 00:04:13.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/uaccess.h	2011-06-03 00:32:04.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/uaccess.h linux-2.6.39.4/arch/x86/include/asm/uaccess.h
+--- linux-2.6.39.4/arch/x86/include/asm/uaccess.h	2011-06-03 00:04:13.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/uaccess.h	2011-08-05 19:44:33.000000000 -0400
 @@ -8,12 +8,15 @@
  #include <linux/thread_info.h>
  #include <linux/prefetch.h>
@@ -12593,9 +9885,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/uaccess.h linux-2.6.39.3/arch/x86
  #ifdef CONFIG_X86_32
  # include "uaccess_32.h"
  #else
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/vgtod.h linux-2.6.39.3/arch/x86/include/asm/vgtod.h
---- linux-2.6.39.3/arch/x86/include/asm/vgtod.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/vgtod.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/vgtod.h linux-2.6.39.4/arch/x86/include/asm/vgtod.h
+--- linux-2.6.39.4/arch/x86/include/asm/vgtod.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/vgtod.h	2011-08-05 19:44:33.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
  	int		sysctl_enabled;
  	struct timezone sys_tz;
@@ -12604,9 +9896,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/vgtod.h linux-2.6.39.3/arch/x86/i
  		cycle_t (*vread)(void);
  		cycle_t	cycle_last;
  		cycle_t	mask;
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/vsyscall.h linux-2.6.39.3/arch/x86/include/asm/vsyscall.h
---- linux-2.6.39.3/arch/x86/include/asm/vsyscall.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/vsyscall.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/vsyscall.h linux-2.6.39.4/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.39.4/arch/x86/include/asm/vsyscall.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/vsyscall.h	2011-08-05 19:44:33.000000000 -0400
 @@ -15,9 +15,10 @@ enum vsyscall_num {
  
  #ifdef __KERNEL__
@@ -12637,21 +9929,129 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/vsyscall.h linux-2.6.39.3/arch/x8
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/xen/pci.h linux-2.6.39.3/arch/x86/include/asm/xen/pci.h
---- linux-2.6.39.3/arch/x86/include/asm/xen/pci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/xen/pci.h	2011-05-22 19:36:30.000000000 -0400
-@@ -33,7 +33,7 @@ struct xen_pci_frontend_ops {
- 	void (*disable_msix)(struct pci_dev *dev);
- };
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/x86_init.h linux-2.6.39.4/arch/x86/include/asm/x86_init.h
+--- linux-2.6.39.4/arch/x86/include/asm/x86_init.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/x86_init.h	2011-08-05 20:34:06.000000000 -0400
+@@ -28,7 +28,7 @@ struct x86_init_mpparse {
+ 	void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
+ 	void (*find_smp_config)(void);
+ 	void (*get_smp_config)(unsigned int early);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_resources - platform specific resource related ops
+@@ -42,7 +42,7 @@ struct x86_init_resources {
+ 	void (*probe_roms)(void);
+ 	void (*reserve_resources)(void);
+ 	char *(*memory_setup)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_irqs - platform specific interrupt setup
+@@ -55,7 +55,7 @@ struct x86_init_irqs {
+ 	void (*pre_vector_init)(void);
+ 	void (*intr_init)(void);
+ 	void (*trap_init)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_oem - oem platform specific customizing functions
+@@ -65,7 +65,7 @@ struct x86_init_irqs {
+ struct x86_init_oem {
+ 	void (*arch_setup)(void);
+ 	void (*banner)(void);
+-};
++} __no_const;
  
--extern struct xen_pci_frontend_ops *xen_pci_frontend;
-+extern const struct xen_pci_frontend_ops *xen_pci_frontend;
+ /**
+  * struct x86_init_mapping - platform specific initial kernel pagetable setup
+@@ -76,7 +76,7 @@ struct x86_init_oem {
+  */
+ struct x86_init_mapping {
+ 	void (*pagetable_reserve)(u64 start, u64 end);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_paging - platform specific paging functions
+@@ -86,7 +86,7 @@ struct x86_init_mapping {
+ struct x86_init_paging {
+ 	void (*pagetable_setup_start)(pgd_t *base);
+ 	void (*pagetable_setup_done)(pgd_t *base);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_timers - platform specific timer setup
+@@ -101,7 +101,7 @@ struct x86_init_timers {
+ 	void (*tsc_pre_init)(void);
+ 	void (*timer_init)(void);
+ 	void (*wallclock_init)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_iommu - platform specific iommu setup
+@@ -109,7 +109,7 @@ struct x86_init_timers {
+  */
+ struct x86_init_iommu {
+ 	int (*iommu_init)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_pci - platform specific pci init functions
+@@ -123,7 +123,7 @@ struct x86_init_pci {
+ 	int (*init)(void);
+ 	void (*init_irq)(void);
+ 	void (*fixup_irqs)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_ops - functions for platform specific setup
+@@ -139,7 +139,7 @@ struct x86_init_ops {
+ 	struct x86_init_timers		timers;
+ 	struct x86_init_iommu		iommu;
+ 	struct x86_init_pci		pci;
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_cpuinit_ops - platform specific cpu hotplug setups
+@@ -147,7 +147,7 @@ struct x86_init_ops {
+  */
+ struct x86_cpuinit_ops {
+ 	void (*setup_percpu_clockev)(void);
+-};
++} __no_const;
  
- static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev,
- 					      int vectors[])
-diff -urNp linux-2.6.39.3/arch/x86/include/asm/xsave.h linux-2.6.39.3/arch/x86/include/asm/xsave.h
---- linux-2.6.39.3/arch/x86/include/asm/xsave.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/include/asm/xsave.h	2011-05-22 19:36:30.000000000 -0400
+ /**
+  * struct x86_platform_ops - platform specific runtime functions
+@@ -166,7 +166,7 @@ struct x86_platform_ops {
+ 	bool (*is_untracked_pat_range)(u64 start, u64 end);
+ 	void (*nmi_init)(void);
+ 	int (*i8042_detect)(void);
+-};
++} __no_const;
+ 
+ struct pci_dev;
+ 
+@@ -174,7 +174,7 @@ struct x86_msi_ops {
+ 	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
+ 	void (*teardown_msi_irq)(unsigned int irq);
+ 	void (*teardown_msi_irqs)(struct pci_dev *dev);
+-};
++} __no_const;
+ 
+ extern struct x86_init_ops x86_init;
+ extern struct x86_cpuinit_ops x86_cpuinit;
+diff -urNp linux-2.6.39.4/arch/x86/include/asm/xsave.h linux-2.6.39.4/arch/x86/include/asm/xsave.h
+--- linux-2.6.39.4/arch/x86/include/asm/xsave.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/include/asm/xsave.h	2011-08-05 19:44:33.000000000 -0400
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
  	int err;
@@ -12676,9 +10076,9 @@ diff -urNp linux-2.6.39.3/arch/x86/include/asm/xsave.h linux-2.6.39.3/arch/x86/i
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.39.3/arch/x86/Kconfig linux-2.6.39.3/arch/x86/Kconfig
---- linux-2.6.39.3/arch/x86/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/Kconfig	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/Kconfig linux-2.6.39.4/arch/x86/Kconfig
+--- linux-2.6.39.4/arch/x86/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/Kconfig	2011-08-05 19:44:33.000000000 -0400
 @@ -224,7 +224,7 @@ config X86_HT
  
  config X86_32_LAZY_GS
@@ -12760,9 +10160,9 @@ diff -urNp linux-2.6.39.3/arch/x86/Kconfig linux-2.6.39.3/arch/x86/Kconfig
  	---help---
  	  Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-2.6.39.3/arch/x86/Kconfig.cpu linux-2.6.39.3/arch/x86/Kconfig.cpu
---- linux-2.6.39.3/arch/x86/Kconfig.cpu	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/Kconfig.cpu	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/Kconfig.cpu linux-2.6.39.4/arch/x86/Kconfig.cpu
+--- linux-2.6.39.4/arch/x86/Kconfig.cpu	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/Kconfig.cpu	2011-08-05 19:44:33.000000000 -0400
 @@ -334,7 +334,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -12790,9 +10190,9 @@ diff -urNp linux-2.6.39.3/arch/x86/Kconfig.cpu linux-2.6.39.3/arch/x86/Kconfig.c
  
  config X86_MINIMUM_CPU_FAMILY
  	int
-diff -urNp linux-2.6.39.3/arch/x86/Kconfig.debug linux-2.6.39.3/arch/x86/Kconfig.debug
---- linux-2.6.39.3/arch/x86/Kconfig.debug	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/Kconfig.debug	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/Kconfig.debug linux-2.6.39.4/arch/x86/Kconfig.debug
+--- linux-2.6.39.4/arch/x86/Kconfig.debug	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/Kconfig.debug	2011-08-05 19:44:33.000000000 -0400
 @@ -101,7 +101,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
  	bool "Write protect kernel read-only data structures"
@@ -12811,9 +10211,22 @@ diff -urNp linux-2.6.39.3/arch/x86/Kconfig.debug linux-2.6.39.3/arch/x86/Kconfig
  	---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.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.39.3/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.39.3/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.39.4/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-2.6.39.4/arch/x86/kernel/acpi/realmode/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/acpi/realmode/Makefile	2011-08-05 20:34:06.000000000 -0400
+@@ -41,6 +41,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
+ 		   $(call cc-option, -fno-stack-protector) \
+ 		   $(call cc-option, -mpreferred-stack-boundary=2)
+ KBUILD_CFLAGS	+= $(call cc-option, -m32)
++ifdef CONSTIFY_PLUGIN
++KBUILD_CFLAGS	+= $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
++endif
+ KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+ 
+diff -urNp linux-2.6.39.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.39.4/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.39.4/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/acpi/realmode/wakeup.S	2011-08-05 19:44:33.000000000 -0400
 @@ -108,6 +108,9 @@ wakeup_code:
  	/* Do any other stuff... */
  
@@ -12832,9 +10245,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.39.3/
  #else
  	pushw	$0
  	pushw	trampoline_segment
-diff -urNp linux-2.6.39.3/arch/x86/kernel/acpi/sleep.c linux-2.6.39.3/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.39.3/arch/x86/kernel/acpi/sleep.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/acpi/sleep.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/acpi/sleep.c linux-2.6.39.4/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.39.4/arch/x86/kernel/acpi/sleep.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/acpi/sleep.c	2011-08-05 19:44:33.000000000 -0400
 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
  	header->trampoline_segment = trampoline_address() >> 4;
  #ifdef CONFIG_SMP
@@ -12848,9 +10261,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/acpi/sleep.c linux-2.6.39.3/arch/x86/k
  	initial_gs = per_cpu_offset(smp_processor_id());
  #endif
  	initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.39.3/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.39.3/arch/x86/kernel/acpi/wakeup_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/acpi/wakeup_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.39.4/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.39.4/arch/x86/kernel/acpi/wakeup_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/acpi/wakeup_32.S	2011-08-05 19:44:33.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
@@ -12867,9 +10280,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.39.3/arch/x
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-2.6.39.3/arch/x86/kernel/alternative.c linux-2.6.39.3/arch/x86/kernel/alternative.c
---- linux-2.6.39.3/arch/x86/kernel/alternative.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/alternative.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/alternative.c linux-2.6.39.4/arch/x86/kernel/alternative.c
+--- linux-2.6.39.4/arch/x86/kernel/alternative.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/alternative.c	2011-08-05 19:44:33.000000000 -0400
 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const 
  		if (!*poff || ptr < text || ptr >= text_end)
  			continue;
@@ -12983,39 +10396,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/alternative.c linux-2.6.39.3/arch/x86/
  #endif
  
  void __init arch_init_ideal_nop5(void)
-diff -urNp linux-2.6.39.3/arch/x86/kernel/amd_iommu.c linux-2.6.39.3/arch/x86/kernel/amd_iommu.c
---- linux-2.6.39.3/arch/x86/kernel/amd_iommu.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/amd_iommu.c	2011-06-25 13:00:25.000000000 -0400
-@@ -49,7 +49,7 @@ static DEFINE_SPINLOCK(iommu_pd_list_loc
-  */
- static struct protection_domain *pt_domain;
- 
--static struct iommu_ops amd_iommu_ops;
-+static const struct iommu_ops amd_iommu_ops;
- 
- /*
-  * general struct to manage commands send to an IOMMU
-@@ -2307,7 +2307,7 @@ static void prealloc_protection_domains(
- 	}
- }
- 
--static struct dma_map_ops amd_iommu_dma_ops = {
-+static const struct dma_map_ops amd_iommu_dma_ops = {
- 	.alloc_coherent = alloc_coherent,
- 	.free_coherent = free_coherent,
- 	.map_page = map_page,
-@@ -2624,7 +2624,7 @@ static int amd_iommu_domain_has_cap(stru
- 	return 0;
- }
- 
--static struct iommu_ops amd_iommu_ops = {
-+static const struct iommu_ops amd_iommu_ops = {
- 	.domain_init = amd_iommu_domain_init,
- 	.domain_destroy = amd_iommu_domain_destroy,
- 	.attach_dev = amd_iommu_attach_device,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/apic/apic.c linux-2.6.39.3/arch/x86/kernel/apic/apic.c
---- linux-2.6.39.3/arch/x86/kernel/apic/apic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/apic/apic.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/apic/apic.c linux-2.6.39.4/arch/x86/kernel/apic/apic.c
+--- linux-2.6.39.4/arch/x86/kernel/apic/apic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/apic/apic.c	2011-08-05 19:44:33.000000000 -0400
 @@ -1821,7 +1821,7 @@ void smp_error_interrupt(struct pt_regs 
  	apic_write(APIC_ESR, 0);
  	v1 = apic_read(APIC_ESR);
@@ -13034,9 +10417,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/apic/apic.c linux-2.6.39.3/arch/x86/ke
  	bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
  	bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
  
-diff -urNp linux-2.6.39.3/arch/x86/kernel/apic/io_apic.c linux-2.6.39.3/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.39.3/arch/x86/kernel/apic/io_apic.c	2011-06-03 00:04:13.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/apic/io_apic.c	2011-06-03 00:42:37.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/apic/io_apic.c linux-2.6.39.4/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.39.4/arch/x86/kernel/apic/io_apic.c	2011-06-03 00:04:13.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/apic/io_apic.c	2011-08-05 19:44:33.000000000 -0400
 @@ -623,7 +623,7 @@ struct IO_APIC_route_entry **alloc_ioapi
  	ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
  				GFP_ATOMIC);
@@ -13091,9 +10474,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/apic/io_apic.c linux-2.6.39.3/arch/x86
  
  		eoi_ioapic_irq(irq, cfg);
  	}
-diff -urNp linux-2.6.39.3/arch/x86/kernel/apm_32.c linux-2.6.39.3/arch/x86/kernel/apm_32.c
---- linux-2.6.39.3/arch/x86/kernel/apm_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/apm_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/apm_32.c linux-2.6.39.4/arch/x86/kernel/apm_32.c
+--- linux-2.6.39.4/arch/x86/kernel/apm_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/apm_32.c	2011-08-05 19:44:33.000000000 -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.
@@ -13165,9 +10548,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/apm_32.c linux-2.6.39.3/arch/x86/kerne
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-2.6.39.3/arch/x86/kernel/asm-offsets_64.c linux-2.6.39.3/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.39.3/arch/x86/kernel/asm-offsets_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/asm-offsets_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.39.4/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.39.4/arch/x86/kernel/asm-offsets_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/asm-offsets_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -69,6 +69,7 @@ int main(void)
  	BLANK();
  #undef ENTRY
@@ -13176,9 +10559,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/asm-offsets_64.c linux-2.6.39.3/arch/x
  	OFFSET(TSS_ist, tss_struct, x86_tss.ist);
  	BLANK();
  
-diff -urNp linux-2.6.39.3/arch/x86/kernel/asm-offsets.c linux-2.6.39.3/arch/x86/kernel/asm-offsets.c
---- linux-2.6.39.3/arch/x86/kernel/asm-offsets.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/asm-offsets.c	2011-05-25 17:35:48.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/asm-offsets.c linux-2.6.39.4/arch/x86/kernel/asm-offsets.c
+--- linux-2.6.39.4/arch/x86/kernel/asm-offsets.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/asm-offsets.c	2011-08-05 19:44:33.000000000 -0400
 @@ -33,6 +33,8 @@ void common(void) {
  	OFFSET(TI_status, thread_info, status);
  	OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -13215,9 +10598,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/asm-offsets.c linux-2.6.39.3/arch/x86/
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/amd.c linux-2.6.39.3/arch/x86/kernel/cpu/amd.c
---- linux-2.6.39.3/arch/x86/kernel/cpu/amd.c	2011-06-03 00:04:13.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/amd.c	2011-06-03 00:32:04.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/amd.c linux-2.6.39.4/arch/x86/kernel/cpu/amd.c
+--- linux-2.6.39.4/arch/x86/kernel/cpu/amd.c	2011-06-03 00:04:13.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/amd.c	2011-08-05 19:44:33.000000000 -0400
 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
  							unsigned int size)
  {
@@ -13227,9 +10610,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/amd.c linux-2.6.39.3/arch/x86/kern
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/common.c linux-2.6.39.3/arch/x86/kernel/cpu/common.c
---- linux-2.6.39.3/arch/x86/kernel/cpu/common.c	2011-06-03 00:04:13.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/common.c	2011-06-03 00:32:04.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/common.c linux-2.6.39.4/arch/x86/kernel/cpu/common.c
+--- linux-2.6.39.4/arch/x86/kernel/cpu/common.c	2011-06-03 00:04:13.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/common.c	2011-08-05 19:44:33.000000000 -0400
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -13374,9 +10757,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/common.c linux-2.6.39.3/arch/x86/k
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/intel.c linux-2.6.39.3/arch/x86/kernel/cpu/intel.c
---- linux-2.6.39.3/arch/x86/kernel/cpu/intel.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/intel.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/intel.c linux-2.6.39.4/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.39.4/arch/x86/kernel/cpu/intel.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/intel.c	2011-08-05 19:44:33.000000000 -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.
@@ -13386,9 +10769,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/intel.c linux-2.6.39.3/arch/x86/ke
  	load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/Makefile linux-2.6.39.3/arch/x86/kernel/cpu/Makefile
---- linux-2.6.39.3/arch/x86/kernel/cpu/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/Makefile	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/Makefile linux-2.6.39.4/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.39.4/arch/x86/kernel/cpu/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/Makefile	2011-08-05 19:44:33.000000000 -0400
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -13400,9 +10783,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/Makefile linux-2.6.39.3/arch/x86/k
  obj-y			:= intel_cacheinfo.o scattered.o topology.o
  obj-y			+= proc.o capflags.o powerflags.o common.o
  obj-y			+= vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.39.3/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.39.3/arch/x86/kernel/cpu/mcheck/mce.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/mcheck/mce.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-08-05 19:44:33.000000000 -0400
 @@ -46,6 +46,7 @@
  #include <asm/ipi.h>
  #include <asm/mce.h>
@@ -13504,9 +10887,23 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.39.3/arch/x
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/main.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-05 20:34:06.000000000 -0400
+@@ -215,7 +215,9 @@ static int inject_init(void)
+ 	if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
+ 		return -ENOMEM;
+ 	printk(KERN_INFO "Machine check injector initialized\n");
+-	mce_chrdev_ops.write = mce_write;
++	pax_open_kernel();
++	*(void **)&mce_chrdev_ops.write = mce_write;
++	pax_close_kernel();
+ 	register_die_notifier(&mce_raise_nb);
+ 	return 0;
+ }
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/main.c	2011-08-05 19:44:33.000000000 -0400
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -13516,40 +10913,23 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.39.3/arch/x8
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-05-22 19:36:30.000000000 -0400
-@@ -12,19 +12,19 @@
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-05 20:34:06.000000000 -0400
+@@ -12,8 +12,8 @@
  extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
  
  struct mtrr_ops {
 -	u32	vendor;
 -	u32	use_intel_if;
--	void	(*set)(unsigned int reg, unsigned long base,
 +	const u32	vendor;
 +	const u32	use_intel_if;
-+	void	(* const set)(unsigned int reg, unsigned long base,
+ 	void	(*set)(unsigned int reg, unsigned long base,
  		       unsigned long size, mtrr_type type);
--	void	(*set_all)(void);
-+	void	(* const set_all)(void);
- 
--	void	(*get)(unsigned int reg, unsigned long *base,
-+	void	(* const get)(unsigned int reg, unsigned long *base,
- 		       unsigned long *size, mtrr_type *type);
--	int	(*get_free_region)(unsigned long base, unsigned long size,
-+	int	(* const get_free_region)(unsigned long base, unsigned long size,
- 				   int replace_reg);
--	int	(*validate_add_page)(unsigned long base, unsigned long size,
-+	int	(* const validate_add_page)(unsigned long base, unsigned long size,
- 				     unsigned int type);
--	int	(*have_wrcomb)(void);
-+	int	(* const have_wrcomb)(void);
- };
- 
- extern int generic_get_free_region(unsigned long base, unsigned long size,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/perf_event.c linux-2.6.39.3/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.39.3/arch/x86/kernel/cpu/perf_event.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/cpu/perf_event.c	2011-05-22 19:36:30.000000000 -0400
+ 	void	(*set_all)(void);
+diff -urNp linux-2.6.39.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.39.4/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.39.4/arch/x86/kernel/cpu/perf_event.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/cpu/perf_event.c	2011-08-05 19:44:33.000000000 -0400
 @@ -774,6 +774,8 @@ static int x86_schedule_events(struct cp
  	int i, j, w, wmax, num = 0;
  	struct hw_perf_event *hwc;
@@ -13568,9 +10948,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/cpu/perf_event.c linux-2.6.39.3/arch/x
  	}
  }
  
-diff -urNp linux-2.6.39.3/arch/x86/kernel/crash.c linux-2.6.39.3/arch/x86/kernel/crash.c
---- linux-2.6.39.3/arch/x86/kernel/crash.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/crash.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/crash.c linux-2.6.39.4/arch/x86/kernel/crash.c
+--- linux-2.6.39.4/arch/x86/kernel/crash.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/crash.c	2011-08-05 19:44:33.000000000 -0400
 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
  	regs = args->regs;
  
@@ -13580,9 +10960,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/crash.c linux-2.6.39.3/arch/x86/kernel
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-2.6.39.3/arch/x86/kernel/doublefault_32.c linux-2.6.39.3/arch/x86/kernel/doublefault_32.c
---- linux-2.6.39.3/arch/x86/kernel/doublefault_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/doublefault_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/doublefault_32.c linux-2.6.39.4/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.39.4/arch/x86/kernel/doublefault_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/doublefault_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -13614,9 +10994,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/doublefault_32.c linux-2.6.39.3/arch/x
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.39.3/arch/x86/kernel/dumpstack_32.c linux-2.6.39.3/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.39.3/arch/x86/kernel/dumpstack_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/dumpstack_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/dumpstack_32.c linux-2.6.39.4/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.39.4/arch/x86/kernel/dumpstack_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/dumpstack_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
  		bp = stack_frame(task, regs);
  
@@ -13680,9 +11060,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/dumpstack_32.c linux-2.6.39.3/arch/x86
  	if (ip < PAGE_OFFSET)
  		return 0;
  	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.39.3/arch/x86/kernel/dumpstack_64.c linux-2.6.39.3/arch/x86/kernel/dumpstack_64.c
---- linux-2.6.39.3/arch/x86/kernel/dumpstack_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/dumpstack_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/dumpstack_64.c linux-2.6.39.4/arch/x86/kernel/dumpstack_64.c
+--- linux-2.6.39.4/arch/x86/kernel/dumpstack_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/dumpstack_64.c	2011-08-05 19:44:33.000000000 -0400
 @@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task
  	unsigned long *irq_stack_end =
  		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -13734,9 +11114,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/dumpstack_64.c linux-2.6.39.3/arch/x86
  	put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/dumpstack.c linux-2.6.39.3/arch/x86/kernel/dumpstack.c
---- linux-2.6.39.3/arch/x86/kernel/dumpstack.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/dumpstack.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/dumpstack.c linux-2.6.39.4/arch/x86/kernel/dumpstack.c
+--- linux-2.6.39.4/arch/x86/kernel/dumpstack.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/dumpstack.c	2011-08-05 19:44:33.000000000 -0400
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -13880,9 +11260,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/dumpstack.c linux-2.6.39.3/arch/x86/ke
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff -urNp linux-2.6.39.3/arch/x86/kernel/early_printk.c linux-2.6.39.3/arch/x86/kernel/early_printk.c
---- linux-2.6.39.3/arch/x86/kernel/early_printk.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/early_printk.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/early_printk.c linux-2.6.39.4/arch/x86/kernel/early_printk.c
+--- linux-2.6.39.4/arch/x86/kernel/early_printk.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/early_printk.c	2011-08-05 19:44:33.000000000 -0400
 @@ -7,6 +7,7 @@
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
@@ -13900,9 +11280,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/early_printk.c linux-2.6.39.3/arch/x86
  	va_start(ap, fmt);
  	n = vscnprintf(buf, sizeof(buf), fmt, ap);
  	early_console->write(early_console, buf, n);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/entry_32.S linux-2.6.39.3/arch/x86/kernel/entry_32.S
---- linux-2.6.39.3/arch/x86/kernel/entry_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/entry_32.S	2011-05-23 17:07:00.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/entry_32.S linux-2.6.39.4/arch/x86/kernel/entry_32.S
+--- linux-2.6.39.4/arch/x86/kernel/entry_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/entry_32.S	2011-08-05 19:44:33.000000000 -0400
 @@ -185,13 +185,146 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
@@ -14385,9 +11765,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/entry_32.S linux-2.6.39.3/arch/x86/ker
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.39.3/arch/x86/kernel/entry_64.S linux-2.6.39.3/arch/x86/kernel/entry_64.S
---- linux-2.6.39.3/arch/x86/kernel/entry_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/entry_64.S	2011-05-23 17:10:49.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/entry_64.S linux-2.6.39.4/arch/x86/kernel/entry_64.S
+--- linux-2.6.39.4/arch/x86/kernel/entry_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/entry_64.S	2011-08-05 19:44:33.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -14960,9 +12340,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/entry_64.S linux-2.6.39.3/arch/x86/ker
  	RESTORE_ALL 8
  	jmp irq_return
  nmi_userspace:
-diff -urNp linux-2.6.39.3/arch/x86/kernel/ftrace.c linux-2.6.39.3/arch/x86/kernel/ftrace.c
---- linux-2.6.39.3/arch/x86/kernel/ftrace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/ftrace.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/ftrace.c linux-2.6.39.4/arch/x86/kernel/ftrace.c
+--- linux-2.6.39.4/arch/x86/kernel/ftrace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/ftrace.c	2011-08-05 19:44:33.000000000 -0400
 @@ -126,7 +126,7 @@ static void *mod_code_ip;		/* holds the 
  static void *mod_code_newcode;		/* holds the text to write to the IP */
  
@@ -15020,9 +12400,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/ftrace.c linux-2.6.39.3/arch/x86/kerne
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-2.6.39.3/arch/x86/kernel/head32.c linux-2.6.39.3/arch/x86/kernel/head32.c
---- linux-2.6.39.3/arch/x86/kernel/head32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/head32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/head32.c linux-2.6.39.4/arch/x86/kernel/head32.c
+--- linux-2.6.39.4/arch/x86/kernel/head32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/head32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -15040,9 +12420,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/head32.c linux-2.6.39.3/arch/x86/kerne
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-2.6.39.3/arch/x86/kernel/head_32.S linux-2.6.39.3/arch/x86/kernel/head_32.S
---- linux-2.6.39.3/arch/x86/kernel/head_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/head_32.S	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/head_32.S linux-2.6.39.4/arch/x86/kernel/head_32.S
+--- linux-2.6.39.4/arch/x86/kernel/head_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/head_32.S	2011-08-05 19:44:33.000000000 -0400
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -15477,9 +12857,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/head_32.S linux-2.6.39.3/arch/x86/kern
 +	/* 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.3/arch/x86/kernel/head_64.S linux-2.6.39.3/arch/x86/kernel/head_64.S
---- linux-2.6.39.3/arch/x86/kernel/head_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/head_64.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/head_64.S linux-2.6.39.4/arch/x86/kernel/head_64.S
+--- linux-2.6.39.4/arch/x86/kernel/head_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/head_64.S	2011-08-05 19:44:33.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -15749,9 +13129,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/head_64.S linux-2.6.39.3/arch/x86/kern
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-2.6.39.3/arch/x86/kernel/i386_ksyms_32.c linux-2.6.39.3/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.39.3/arch/x86/kernel/i386_ksyms_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/i386_ksyms_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.39.4/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.39.4/arch/x86/kernel/i386_ksyms_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/i386_ksyms_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -15773,9 +13153,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/i386_ksyms_32.c linux-2.6.39.3/arch/x8
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-2.6.39.3/arch/x86/kernel/i8259.c linux-2.6.39.3/arch/x86/kernel/i8259.c
---- linux-2.6.39.3/arch/x86/kernel/i8259.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/i8259.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/i8259.c linux-2.6.39.4/arch/x86/kernel/i8259.c
+--- linux-2.6.39.4/arch/x86/kernel/i8259.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/i8259.c	2011-08-05 19:44:33.000000000 -0400
 @@ -210,7 +210,7 @@ spurious_8259A_irq:
  			       "spurious 8259A interrupt: IRQ%d.\n", irq);
  			spurious_irq_mask |= irqmask;
@@ -15785,9 +13165,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/i8259.c linux-2.6.39.3/arch/x86/kernel
  		/*
  		 * 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.3/arch/x86/kernel/init_task.c linux-2.6.39.3/arch/x86/kernel/init_task.c
---- linux-2.6.39.3/arch/x86/kernel/init_task.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/init_task.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/init_task.c linux-2.6.39.4/arch/x86/kernel/init_task.c
+--- linux-2.6.39.4/arch/x86/kernel/init_task.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/init_task.c	2011-08-05 19:44:33.000000000 -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..
@@ -15806,9 +13186,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/init_task.c linux-2.6.39.3/arch/x86/ke
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/ioport.c linux-2.6.39.3/arch/x86/kernel/ioport.c
---- linux-2.6.39.3/arch/x86/kernel/ioport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/ioport.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/ioport.c linux-2.6.39.4/arch/x86/kernel/ioport.c
+--- linux-2.6.39.4/arch/x86/kernel/ioport.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/ioport.c	2011-08-05 19:44:33.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -15852,9 +13232,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/ioport.c linux-2.6.39.3/arch/x86/kerne
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff -urNp linux-2.6.39.3/arch/x86/kernel/irq_32.c linux-2.6.39.3/arch/x86/kernel/irq_32.c
---- linux-2.6.39.3/arch/x86/kernel/irq_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/irq_32.c	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/irq_32.c linux-2.6.39.4/arch/x86/kernel/irq_32.c
+--- linux-2.6.39.4/arch/x86/kernel/irq_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/irq_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
  	__asm__ __volatile__("andl %%esp,%0" :
  			     "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -15994,9 +13374,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/irq_32.c linux-2.6.39.3/arch/x86/kerne
  		/*
  		 * Shouldn't happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-2.6.39.3/arch/x86/kernel/irq.c linux-2.6.39.3/arch/x86/kernel/irq.c
---- linux-2.6.39.3/arch/x86/kernel/irq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/irq.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/irq.c linux-2.6.39.4/arch/x86/kernel/irq.c
+--- linux-2.6.39.4/arch/x86/kernel/irq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/irq.c	2011-08-05 19:44:33.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <asm/mce.h>
  #include <asm/hw_irq.h>
@@ -16031,9 +13411,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/irq.c linux-2.6.39.3/arch/x86/kernel/i
  #endif
  	return sum;
  }
-diff -urNp linux-2.6.39.3/arch/x86/kernel/kgdb.c linux-2.6.39.3/arch/x86/kernel/kgdb.c
---- linux-2.6.39.3/arch/x86/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/kgdb.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/kgdb.c linux-2.6.39.4/arch/x86/kernel/kgdb.c
+--- linux-2.6.39.4/arch/x86/kernel/kgdb.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/kgdb.c	2011-08-05 20:34:06.000000000 -0400
 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, 
  #ifdef CONFIG_X86_32
  	switch (regno) {
@@ -16072,18 +13452,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/kgdb.c linux-2.6.39.3/arch/x86/kernel/
  			if (user_mode(regs))
  				return single_step_cont(regs, args);
  			break;
-@@ -710,7 +710,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
- 	regs->ip = ip;
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: */
- 	.gdb_bpt_instr		= { 0xcc },
- 	.flags			= KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/kprobes.c linux-2.6.39.3/arch/x86/kernel/kprobes.c
---- linux-2.6.39.3/arch/x86/kernel/kprobes.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/kprobes.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/kprobes.c linux-2.6.39.4/arch/x86/kernel/kprobes.c
+--- linux-2.6.39.4/arch/x86/kernel/kprobes.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/kprobes.c	2011-08-05 19:44:33.000000000 -0400
 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
  	} __attribute__((packed)) *insn;
  
@@ -16217,9 +13588,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/kprobes.c linux-2.6.39.3/arch/x86/kern
  	       RELATIVE_ADDR_SIZE);
  
  	insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/ldt.c linux-2.6.39.3/arch/x86/kernel/ldt.c
---- linux-2.6.39.3/arch/x86/kernel/ldt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/ldt.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/ldt.c linux-2.6.39.4/arch/x86/kernel/ldt.c
+--- linux-2.6.39.4/arch/x86/kernel/ldt.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/ldt.c	2011-08-05 19:44:33.000000000 -0400
 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
  	if (reload) {
  #ifdef CONFIG_SMP
@@ -16284,9 +13655,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/ldt.c linux-2.6.39.3/arch/x86/kernel/l
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/machine_kexec_32.c linux-2.6.39.3/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.39.3/arch/x86/kernel/machine_kexec_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/machine_kexec_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.39.4/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.39.4/arch/x86/kernel/machine_kexec_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/machine_kexec_32.c	2011-08-05 19:44:33.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -16314,42 +13685,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/machine_kexec_32.c linux-2.6.39.3/arch
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/microcode_amd.c linux-2.6.39.3/arch/x86/kernel/microcode_amd.c
---- linux-2.6.39.3/arch/x86/kernel/microcode_amd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/microcode_amd.c	2011-05-22 19:36:30.000000000 -0400
-@@ -339,7 +339,7 @@ static void microcode_fini_cpu_amd(int c
- 	uci->mc = NULL;
- }
- 
--static struct microcode_ops microcode_amd_ops = {
-+static const struct microcode_ops microcode_amd_ops = {
- 	.request_microcode_user           = request_microcode_user,
- 	.request_microcode_fw             = request_microcode_amd,
- 	.collect_cpu_info                 = collect_cpu_info_amd,
-@@ -347,7 +347,7 @@ static struct microcode_ops microcode_am
- 	.microcode_fini_cpu               = microcode_fini_cpu_amd,
- };
- 
--struct microcode_ops * __init init_amd_microcode(void)
-+const struct microcode_ops * __init init_amd_microcode(void)
- {
- 	return &microcode_amd_ops;
- }
-diff -urNp linux-2.6.39.3/arch/x86/kernel/microcode_core.c linux-2.6.39.3/arch/x86/kernel/microcode_core.c
---- linux-2.6.39.3/arch/x86/kernel/microcode_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/microcode_core.c	2011-05-22 19:36:30.000000000 -0400
-@@ -93,7 +93,7 @@ MODULE_LICENSE("GPL");
- 
- #define MICROCODE_VERSION	"2.00"
- 
--static struct microcode_ops	*microcode_ops;
-+static const struct microcode_ops	*microcode_ops;
- 
- /*
-  * Synchronization.
-diff -urNp linux-2.6.39.3/arch/x86/kernel/microcode_intel.c linux-2.6.39.3/arch/x86/kernel/microcode_intel.c
---- linux-2.6.39.3/arch/x86/kernel/microcode_intel.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/microcode_intel.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/microcode_intel.c linux-2.6.39.4/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.39.4/arch/x86/kernel/microcode_intel.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/microcode_intel.c	2011-08-05 20:34:06.000000000 -0400
 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -16366,27 +13704,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/microcode_intel.c linux-2.6.39.3/arch/
  }
  
  static void microcode_fini_cpu(int cpu)
-@@ -457,7 +457,7 @@ static void microcode_fini_cpu(int cpu)
- 	uci->mc = NULL;
- }
- 
--static struct microcode_ops microcode_intel_ops = {
-+static const struct microcode_ops microcode_intel_ops = {
- 	.request_microcode_user		  = request_microcode_user,
- 	.request_microcode_fw             = request_microcode_fw,
- 	.collect_cpu_info                 = collect_cpu_info,
-@@ -465,7 +465,7 @@ static struct microcode_ops microcode_in
- 	.microcode_fini_cpu               = microcode_fini_cpu,
- };
- 
--struct microcode_ops * __init init_intel_microcode(void)
-+const struct microcode_ops * __init init_intel_microcode(void)
- {
- 	return &microcode_intel_ops;
- }
-diff -urNp linux-2.6.39.3/arch/x86/kernel/module.c linux-2.6.39.3/arch/x86/kernel/module.c
---- linux-2.6.39.3/arch/x86/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/module.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/module.c linux-2.6.39.4/arch/x86/kernel/module.c
+--- linux-2.6.39.4/arch/x86/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/module.c	2011-08-05 19:44:33.000000000 -0400
 @@ -35,21 +35,66 @@
  #define DEBUGP(fmt...)
  #endif
@@ -16525,9 +13845,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/module.c linux-2.6.39.3/arch/x86/kerne
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/paravirt.c linux-2.6.39.3/arch/x86/kernel/paravirt.c
---- linux-2.6.39.3/arch/x86/kernel/paravirt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/paravirt.c	2011-07-19 18:26:58.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/paravirt.c linux-2.6.39.4/arch/x86/kernel/paravirt.c
+--- linux-2.6.39.4/arch/x86/kernel/paravirt.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/paravirt.c	2011-08-05 19:44:33.000000000 -0400
 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
  {
  	return x;
@@ -16668,9 +13988,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/paravirt.c linux-2.6.39.3/arch/x86/ker
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.39.3/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.39.3/arch/x86/kernel/paravirt-spinlocks.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/paravirt-spinlocks.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.39.4/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.39.4/arch/x86/kernel/paravirt-spinlocks.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/paravirt-spinlocks.c	2011-08-05 19:44:33.000000000 -0400
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
  	arch_spin_lock(lock);
  }
@@ -16680,70 +14000,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.39.3/ar
  #ifdef CONFIG_SMP
  	.spin_is_locked = __ticket_spin_is_locked,
  	.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/pci-calgary_64.c linux-2.6.39.3/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.39.3/arch/x86/kernel/pci-calgary_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
--static struct cal_chipset_ops calgary_chip_ops = {
-+static const struct cal_chipset_ops calgary_chip_ops = {
- 	.handle_quirks = calgary_handle_quirks,
- 	.tce_cache_blast = calgary_tce_cache_blast,
- 	.dump_error_regs = calgary_dump_error_regs
- };
- 
--static struct cal_chipset_ops calioc2_chip_ops = {
-+static const struct cal_chipset_ops calioc2_chip_ops = {
- 	.handle_quirks = calioc2_handle_quirks,
- 	.tce_cache_blast = calioc2_tce_cache_blast,
- 	.dump_error_regs = calioc2_dump_error_regs
-@@ -476,7 +476,7 @@ static void calgary_free_coherent(struct
- 	free_pages((unsigned long)vaddr, get_order(size));
- }
- 
--static struct dma_map_ops calgary_dma_ops = {
-+static const struct dma_map_ops calgary_dma_ops = {
- 	.alloc_coherent = calgary_alloc_coherent,
- 	.free_coherent = calgary_free_coherent,
- 	.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/pci-dma.c linux-2.6.39.3/arch/x86/kernel/pci-dma.c
---- linux-2.6.39.3/arch/x86/kernel/pci-dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/pci-dma.c	2011-05-22 19:36:30.000000000 -0400
-@@ -16,7 +16,7 @@
- 
- static int forbid_dac __read_mostly;
- 
--struct dma_map_ops *dma_ops = &nommu_dma_ops;
-+const struct dma_map_ops *dma_ops = &nommu_dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- static int iommu_sac_force __read_mostly;
-@@ -250,7 +250,7 @@ early_param("iommu", iommu_setup);
- 
- int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- #ifdef CONFIG_PCI
- 	if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.39.3/arch/x86/kernel/pci-gart_64.c linux-2.6.39.3/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.39.3/arch/x86/kernel/pci-gart_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/pci-gart_64.c	2011-05-22 19:36:30.000000000 -0400
-@@ -695,7 +695,7 @@ static __init int init_amd_gatt(struct a
- 	return -1;
- }
- 
--static struct dma_map_ops gart_dma_ops = {
-+static const struct dma_map_ops gart_dma_ops = {
- 	.map_sg				= gart_map_sg,
- 	.unmap_sg			= gart_unmap_sg,
- 	.map_page			= gart_map_page,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/pci-iommu_table.c linux-2.6.39.3/arch/x86/kernel/pci-iommu_table.c
---- linux-2.6.39.3/arch/x86/kernel/pci-iommu_table.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/pci-iommu_table.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/pci-iommu_table.c linux-2.6.39.4/arch/x86/kernel/pci-iommu_table.c
+--- linux-2.6.39.4/arch/x86/kernel/pci-iommu_table.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/pci-iommu_table.c	2011-08-05 19:44:35.000000000 -0400
 @@ -2,7 +2,7 @@
  #include <asm/iommu_table.h>
  #include <linux/string.h>
@@ -16762,33 +14021,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/pci-iommu_table.c linux-2.6.39.3/arch/
  	/* Simple cyclic dependency checker. */
  	for (p = start; p < finish; p++) {
  		q = find_dependents_of(start, finish, p);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/pci-nommu.c linux-2.6.39.3/arch/x86/kernel/pci-nommu.c
---- linux-2.6.39.3/arch/x86/kernel/pci-nommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/pci-nommu.c	2011-05-22 19:36:30.000000000 -0400
-@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
- 	flush_write_buffers();
- }
- 
--struct dma_map_ops nommu_dma_ops = {
-+const struct dma_map_ops nommu_dma_ops = {
- 	.alloc_coherent		= dma_generic_alloc_coherent,
- 	.free_coherent		= nommu_free_coherent,
- 	.map_sg			= nommu_map_sg,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/pci-swiotlb.c linux-2.6.39.3/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.39.3/arch/x86/kernel/pci-swiotlb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/pci-swiotlb.c	2011-05-22 19:36:30.000000000 -0400
-@@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(
- 	return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
- }
- 
--static struct dma_map_ops swiotlb_dma_ops = {
-+static const struct dma_map_ops swiotlb_dma_ops = {
- 	.mapping_error = swiotlb_dma_mapping_error,
- 	.alloc_coherent = x86_swiotlb_alloc_coherent,
- 	.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.39.3/arch/x86/kernel/process_32.c linux-2.6.39.3/arch/x86/kernel/process_32.c
---- linux-2.6.39.3/arch/x86/kernel/process_32.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/process_32.c	2011-06-25 13:00:25.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/process_32.c linux-2.6.39.4/arch/x86/kernel/process_32.c
+--- linux-2.6.39.4/arch/x86/kernel/process_32.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/process_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -16875,9 +14110,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/process_32.c linux-2.6.39.3/arch/x86/k
  	return 0;
  }
 -
-diff -urNp linux-2.6.39.3/arch/x86/kernel/process_64.c linux-2.6.39.3/arch/x86/kernel/process_64.c
---- linux-2.6.39.3/arch/x86/kernel/process_64.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/process_64.c	2011-06-25 13:00:25.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/process_64.c linux-2.6.39.4/arch/x86/kernel/process_64.c
+--- linux-2.6.39.4/arch/x86/kernel/process_64.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/process_64.c	2011-08-05 19:44:35.000000000 -0400
 @@ -87,7 +87,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -16942,9 +14177,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/process_64.c linux-2.6.39.3/arch/x86/k
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-2.6.39.3/arch/x86/kernel/process.c linux-2.6.39.3/arch/x86/kernel/process.c
---- linux-2.6.39.3/arch/x86/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/process.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/process.c linux-2.6.39.4/arch/x86/kernel/process.c
+--- linux-2.6.39.4/arch/x86/kernel/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/process.c	2011-08-05 19:44:35.000000000 -0400
 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -17079,9 +14314,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/process.c linux-2.6.39.3/arch/x86/kern
 +#endif
 +}
 +#endif
-diff -urNp linux-2.6.39.3/arch/x86/kernel/ptrace.c linux-2.6.39.3/arch/x86/kernel/ptrace.c
---- linux-2.6.39.3/arch/x86/kernel/ptrace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/ptrace.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/ptrace.c linux-2.6.39.4/arch/x86/kernel/ptrace.c
+--- linux-2.6.39.4/arch/x86/kernel/ptrace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/ptrace.c	2011-08-05 19:44:35.000000000 -0400
 @@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
  		 unsigned long addr, unsigned long data)
  {
@@ -17135,9 +14370,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/ptrace.c linux-2.6.39.3/arch/x86/kerne
  {
  	bool step;
  
-diff -urNp linux-2.6.39.3/arch/x86/kernel/pvclock.c linux-2.6.39.3/arch/x86/kernel/pvclock.c
---- linux-2.6.39.3/arch/x86/kernel/pvclock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/pvclock.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/pvclock.c linux-2.6.39.4/arch/x86/kernel/pvclock.c
+--- linux-2.6.39.4/arch/x86/kernel/pvclock.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/pvclock.c	2011-08-05 19:44:35.000000000 -0400
 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
  	return pv_tsc_khz;
  }
@@ -17166,9 +14401,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/pvclock.c linux-2.6.39.3/arch/x86/kern
  	} while (unlikely(last != ret));
  
  	return ret;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/reboot.c linux-2.6.39.3/arch/x86/kernel/reboot.c
---- linux-2.6.39.3/arch/x86/kernel/reboot.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/reboot.c	2011-05-23 17:07:00.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/reboot.c linux-2.6.39.4/arch/x86/kernel/reboot.c
+--- linux-2.6.39.4/arch/x86/kernel/reboot.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/reboot.c	2011-08-05 21:12:20.000000000 -0400
 @@ -35,7 +35,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -17249,7 +14484,7 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/reboot.c linux-2.6.39.3/arch/x86/kerne
  }
  #ifdef CONFIG_APM_MODULE
  EXPORT_SYMBOL(machine_real_restart);
-@@ -478,7 +508,7 @@ void __attribute__((weak)) mach_reboot_f
+@@ -486,7 +516,7 @@ void __attribute__((weak)) mach_reboot_f
  {
  }
  
@@ -17258,7 +14493,7 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/reboot.c linux-2.6.39.3/arch/x86/kerne
  {
  	int i;
  
-@@ -593,13 +623,13 @@ void native_machine_shutdown(void)
+@@ -601,13 +631,13 @@ void native_machine_shutdown(void)
  #endif
  }
  
@@ -17274,7 +14509,7 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/reboot.c linux-2.6.39.3/arch/x86/kerne
  {
  	printk("machine restart\n");
  
-@@ -608,7 +638,7 @@ static void native_machine_restart(char 
+@@ -616,7 +646,7 @@ static void native_machine_restart(char 
  	__machine_emergency_restart(0);
  }
  
@@ -17283,7 +14518,7 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/reboot.c linux-2.6.39.3/arch/x86/kerne
  {
  	/* stop other cpus and apics */
  	machine_shutdown();
-@@ -619,7 +649,7 @@ static void native_machine_halt(void)
+@@ -627,7 +657,7 @@ static void native_machine_halt(void)
  	stop_this_cpu(NULL);
  }
  
@@ -17292,7 +14527,7 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/reboot.c linux-2.6.39.3/arch/x86/kerne
  {
  	if (pm_power_off) {
  		if (!reboot_force)
-@@ -628,6 +658,7 @@ static void native_machine_power_off(voi
+@@ -636,6 +666,7 @@ static void native_machine_power_off(voi
  	}
  	/* a fallback in case there is no PM info available */
  	tboot_shutdown(TB_SHUTDOWN_HALT);
@@ -17300,9 +14535,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/reboot.c linux-2.6.39.3/arch/x86/kerne
  }
  
  struct machine_ops machine_ops = {
-diff -urNp linux-2.6.39.3/arch/x86/kernel/setup.c linux-2.6.39.3/arch/x86/kernel/setup.c
---- linux-2.6.39.3/arch/x86/kernel/setup.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/setup.c	2011-06-25 13:00:25.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/setup.c linux-2.6.39.4/arch/x86/kernel/setup.c
+--- linux-2.6.39.4/arch/x86/kernel/setup.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/setup.c	2011-08-05 19:44:35.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.
@@ -17332,9 +14567,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/setup.c linux-2.6.39.3/arch/x86/kernel
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/setup_percpu.c linux-2.6.39.3/arch/x86/kernel/setup_percpu.c
---- linux-2.6.39.3/arch/x86/kernel/setup_percpu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/setup_percpu.c	2011-06-04 20:08:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/setup_percpu.c linux-2.6.39.4/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.39.4/arch/x86/kernel/setup_percpu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/setup_percpu.c	2011-08-05 19:44:35.000000000 -0400
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -17398,9 +14633,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/setup_percpu.c linux-2.6.39.3/arch/x86
  		/*
  		 * 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.3/arch/x86/kernel/signal.c linux-2.6.39.3/arch/x86/kernel/signal.c
---- linux-2.6.39.3/arch/x86/kernel/signal.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/signal.c	2011-05-23 17:07:00.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/signal.c linux-2.6.39.4/arch/x86/kernel/signal.c
+--- linux-2.6.39.4/arch/x86/kernel/signal.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/signal.c	2011-08-05 19:44:35.000000000 -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) == 0.
@@ -17484,9 +14719,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/signal.c linux-2.6.39.3/arch/x86/kerne
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.39.3/arch/x86/kernel/smpboot.c linux-2.6.39.3/arch/x86/kernel/smpboot.c
---- linux-2.6.39.3/arch/x86/kernel/smpboot.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/smpboot.c	2011-06-25 13:00:25.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/smpboot.c linux-2.6.39.4/arch/x86/kernel/smpboot.c
+--- linux-2.6.39.4/arch/x86/kernel/smpboot.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/smpboot.c	2011-08-05 19:44:35.000000000 -0400
 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
  	set_idle_for_cpu(cpu, c_idle.idle);
  do_rest:
@@ -17524,9 +14759,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/smpboot.c linux-2.6.39.3/arch/x86/kern
  	err = do_boot_cpu(apicid, cpu);
  	if (err) {
  		pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/step.c linux-2.6.39.3/arch/x86/kernel/step.c
---- linux-2.6.39.3/arch/x86/kernel/step.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/step.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/step.c linux-2.6.39.4/arch/x86/kernel/step.c
+--- linux-2.6.39.4/arch/x86/kernel/step.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/step.c	2011-08-05 19:44:35.000000000 -0400
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
  		struct desc_struct *desc;
  		unsigned long base;
@@ -17569,17 +14804,17 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/step.c linux-2.6.39.3/arch/x86/kernel/
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.39.3/arch/x86/kernel/syscall_table_32.S linux-2.6.39.3/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.39.3/arch/x86/kernel/syscall_table_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/syscall_table_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/syscall_table_32.S linux-2.6.39.4/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.39.4/arch/x86/kernel/syscall_table_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/syscall_table_32.S	2011-08-05 19:44:35.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 restarting */
  	.long sys_exit
-diff -urNp linux-2.6.39.3/arch/x86/kernel/sys_i386_32.c linux-2.6.39.3/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.39.3/arch/x86/kernel/sys_i386_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/sys_i386_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/sys_i386_32.c linux-2.6.39.4/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.39.4/arch/x86/kernel/sys_i386_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/sys_i386_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -17817,9 +15052,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/sys_i386_32.c linux-2.6.39.3/arch/x86/
 +
 +	return addr;
  }
-diff -urNp linux-2.6.39.3/arch/x86/kernel/sys_x86_64.c linux-2.6.39.3/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.39.3/arch/x86/kernel/sys_x86_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/sys_x86_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/sys_x86_64.c linux-2.6.39.4/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.39.4/arch/x86/kernel/sys_x86_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/sys_x86_64.c	2011-08-05 19:44:35.000000000 -0400
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -17957,9 +15192,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/sys_x86_64.c linux-2.6.39.3/arch/x86/k
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/tboot.c linux-2.6.39.3/arch/x86/kernel/tboot.c
---- linux-2.6.39.3/arch/x86/kernel/tboot.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/tboot.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/tboot.c linux-2.6.39.4/arch/x86/kernel/tboot.c
+--- linux-2.6.39.4/arch/x86/kernel/tboot.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/tboot.c	2011-08-05 19:44:35.000000000 -0400
 @@ -218,7 +218,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
@@ -18008,9 +15243,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/tboot.c linux-2.6.39.3/arch/x86/kernel
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  	return 0;
  }
-diff -urNp linux-2.6.39.3/arch/x86/kernel/time.c linux-2.6.39.3/arch/x86/kernel/time.c
---- linux-2.6.39.3/arch/x86/kernel/time.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/time.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/time.c linux-2.6.39.4/arch/x86/kernel/time.c
+--- linux-2.6.39.4/arch/x86/kernel/time.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/time.c	2011-08-05 19:44:35.000000000 -0400
 @@ -22,17 +22,13 @@
  #include <asm/hpet.h>
  #include <asm/time.h>
@@ -18049,9 +15284,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/time.c linux-2.6.39.3/arch/x86/kernel/
  	}
  	return pc;
  }
-diff -urNp linux-2.6.39.3/arch/x86/kernel/tls.c linux-2.6.39.3/arch/x86/kernel/tls.c
---- linux-2.6.39.3/arch/x86/kernel/tls.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/tls.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/tls.c linux-2.6.39.4/arch/x86/kernel/tls.c
+--- linux-2.6.39.4/arch/x86/kernel/tls.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/tls.c	2011-08-05 19:44:35.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;
@@ -18064,9 +15299,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/tls.c linux-2.6.39.3/arch/x86/kernel/t
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-2.6.39.3/arch/x86/kernel/trampoline_32.S linux-2.6.39.3/arch/x86/kernel/trampoline_32.S
---- linux-2.6.39.3/arch/x86/kernel/trampoline_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/trampoline_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/trampoline_32.S linux-2.6.39.4/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.39.4/arch/x86/kernel/trampoline_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/trampoline_32.S	2011-08-05 19:44:35.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -18089,9 +15324,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/trampoline_32.S linux-2.6.39.3/arch/x8
  
  	# 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.3/arch/x86/kernel/trampoline_64.S linux-2.6.39.3/arch/x86/kernel/trampoline_64.S
---- linux-2.6.39.3/arch/x86/kernel/trampoline_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/trampoline_64.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/trampoline_64.S linux-2.6.39.4/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.39.4/arch/x86/kernel/trampoline_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/trampoline_64.S	2011-08-05 19:44:35.000000000 -0400
 @@ -90,7 +90,7 @@ startup_32:
  	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
  	movl	%eax, %ds
@@ -18110,9 +15345,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/trampoline_64.S linux-2.6.39.3/arch/x8
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff -urNp linux-2.6.39.3/arch/x86/kernel/traps.c linux-2.6.39.3/arch/x86/kernel/traps.c
---- linux-2.6.39.3/arch/x86/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/traps.c	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/traps.c linux-2.6.39.4/arch/x86/kernel/traps.c
+--- linux-2.6.39.4/arch/x86/kernel/traps.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/traps.c	2011-08-05 19:44:35.000000000 -0400
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -18292,9 +15527,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/traps.c linux-2.6.39.3/arch/x86/kernel
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-2.6.39.3/arch/x86/kernel/verify_cpu.S linux-2.6.39.3/arch/x86/kernel/verify_cpu.S
---- linux-2.6.39.3/arch/x86/kernel/verify_cpu.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/verify_cpu.S	2011-07-01 18:28:04.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/verify_cpu.S linux-2.6.39.4/arch/x86/kernel/verify_cpu.S
+--- linux-2.6.39.4/arch/x86/kernel/verify_cpu.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/verify_cpu.S	2011-08-05 19:44:35.000000000 -0400
 @@ -20,6 +20,7 @@
   *	arch/x86/boot/compressed/head_64.S: Boot cpu verification
   *	arch/x86/kernel/trampoline_64.S: secondary processor verification
@@ -18303,9 +15538,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/verify_cpu.S linux-2.6.39.3/arch/x86/k
   *
   *	verify_cpu, returns the status of longmode and SSE in register %eax.
   *		0: Success    1: Failure
-diff -urNp linux-2.6.39.3/arch/x86/kernel/vm86_32.c linux-2.6.39.3/arch/x86/kernel/vm86_32.c
---- linux-2.6.39.3/arch/x86/kernel/vm86_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/vm86_32.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/vm86_32.c linux-2.6.39.4/arch/x86/kernel/vm86_32.c
+--- linux-2.6.39.4/arch/x86/kernel/vm86_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/vm86_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -18370,9 +15605,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/vm86_32.c linux-2.6.39.3/arch/x86/kern
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.39.3/arch/x86/kernel/vmlinux.lds.S linux-2.6.39.3/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.39.3/arch/x86/kernel/vmlinux.lds.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/vmlinux.lds.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.39.4/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.39.4/arch/x86/kernel/vmlinux.lds.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/vmlinux.lds.S	2011-08-05 19:44:35.000000000 -0400
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -18669,9 +15904,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/vmlinux.lds.S linux-2.6.39.3/arch/x86/
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.39.3/arch/x86/kernel/vsyscall_64.c linux-2.6.39.3/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.39.3/arch/x86/kernel/vsyscall_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/vsyscall_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/vsyscall_64.c linux-2.6.39.4/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.39.4/arch/x86/kernel/vsyscall_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/vsyscall_64.c	2011-08-05 19:44:35.000000000 -0400
 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
  
  	write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -18689,9 +15924,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/vsyscall_64.c linux-2.6.39.3/arch/x86/
  		p = tcache->blob[1];
  	} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
  		/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.39.3/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.39.3/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.39.3/arch/x86/kernel/x8664_ksyms_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/x8664_ksyms_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.39.4/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.39.4/arch/x86/kernel/x8664_ksyms_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/x8664_ksyms_64.c	2011-08-05 19:44:35.000000000 -0400
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -18701,9 +15936,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.39.3/arch/x
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-2.6.39.3/arch/x86/kernel/xsave.c linux-2.6.39.3/arch/x86/kernel/xsave.c
---- linux-2.6.39.3/arch/x86/kernel/xsave.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kernel/xsave.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kernel/xsave.c linux-2.6.39.4/arch/x86/kernel/xsave.c
+--- linux-2.6.39.4/arch/x86/kernel/xsave.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kernel/xsave.c	2011-08-05 19:44:35.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;
@@ -18731,9 +15966,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kernel/xsave.c linux-2.6.39.3/arch/x86/kernel
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-2.6.39.3/arch/x86/kvm/emulate.c linux-2.6.39.3/arch/x86/kvm/emulate.c
---- linux-2.6.39.3/arch/x86/kvm/emulate.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kvm/emulate.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kvm/emulate.c linux-2.6.39.4/arch/x86/kvm/emulate.c
+--- linux-2.6.39.4/arch/x86/kvm/emulate.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kvm/emulate.c	2011-08-05 19:44:35.000000000 -0400
 @@ -89,7 +89,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
@@ -18768,9 +16003,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/emulate.c linux-2.6.39.3/arch/x86/kvm/emu
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-2.6.39.3/arch/x86/kvm/lapic.c linux-2.6.39.3/arch/x86/kvm/lapic.c
---- linux-2.6.39.3/arch/x86/kvm/lapic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kvm/lapic.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kvm/lapic.c linux-2.6.39.4/arch/x86/kvm/lapic.c
+--- linux-2.6.39.4/arch/x86/kvm/lapic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kvm/lapic.c	2011-08-05 19:44:35.000000000 -0400
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -18780,9 +16015,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/lapic.c linux-2.6.39.3/arch/x86/kvm/lapic
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.39.3/arch/x86/kvm/mmu.c linux-2.6.39.3/arch/x86/kvm/mmu.c
---- linux-2.6.39.3/arch/x86/kvm/mmu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kvm/mmu.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kvm/mmu.c linux-2.6.39.4/arch/x86/kvm/mmu.c
+--- linux-2.6.39.4/arch/x86/kvm/mmu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kvm/mmu.c	2011-08-05 19:44:35.000000000 -0400
 @@ -3240,7 +3240,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  
  	pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
@@ -18801,9 +16036,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/mmu.c linux-2.6.39.3/arch/x86/kvm/mmu.c
  		gentry = 0;
  	kvm_mmu_free_some_pages(vcpu);
  	++vcpu->kvm->stat.mmu_pte_write;
-diff -urNp linux-2.6.39.3/arch/x86/kvm/paging_tmpl.h linux-2.6.39.3/arch/x86/kvm/paging_tmpl.h
---- linux-2.6.39.3/arch/x86/kvm/paging_tmpl.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kvm/paging_tmpl.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kvm/paging_tmpl.h linux-2.6.39.4/arch/x86/kvm/paging_tmpl.h
+--- linux-2.6.39.4/arch/x86/kvm/paging_tmpl.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kvm/paging_tmpl.h	2011-08-05 19:44:35.000000000 -0400
 @@ -552,6 +552,8 @@ static int FNAME(page_fault)(struct kvm_
  	unsigned long mmu_seq;
  	bool map_writable;
@@ -18822,9 +16057,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/paging_tmpl.h linux-2.6.39.3/arch/x86/kvm
  
  	spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff -urNp linux-2.6.39.3/arch/x86/kvm/svm.c linux-2.6.39.3/arch/x86/kvm/svm.c
---- linux-2.6.39.3/arch/x86/kvm/svm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kvm/svm.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kvm/svm.c linux-2.6.39.4/arch/x86/kvm/svm.c
+--- linux-2.6.39.4/arch/x86/kvm/svm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kvm/svm.c	2011-08-05 20:34:06.000000000 -0400
 @@ -3278,7 +3278,11 @@ static void reload_tss(struct kvm_vcpu *
  	int cpu = raw_smp_processor_id();
  
@@ -18848,18 +16083,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/svm.c linux-2.6.39.3/arch/x86/kvm/svm.c
  	reload_tss(vcpu);
  
  	local_irq_disable();
-@@ -3871,7 +3879,7 @@ static void svm_fpu_deactivate(struct kv
- 	update_cr0_intercept(svm);
- }
- 
--static struct kvm_x86_ops svm_x86_ops = {
-+static const struct kvm_x86_ops svm_x86_ops = {
- 	.cpu_has_kvm_support = has_svm,
- 	.disabled_by_bios = is_disabled,
- 	.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.39.3/arch/x86/kvm/vmx.c linux-2.6.39.3/arch/x86/kvm/vmx.c
---- linux-2.6.39.3/arch/x86/kvm/vmx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kvm/vmx.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/kvm/vmx.c linux-2.6.39.4/arch/x86/kvm/vmx.c
+--- linux-2.6.39.4/arch/x86/kvm/vmx.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kvm/vmx.c	2011-08-05 20:34:06.000000000 -0400
 @@ -725,7 +725,11 @@ static void reload_tss(void)
  	struct desc_struct *descs;
  
@@ -18938,27 +16164,9 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/vmx.c linux-2.6.39.3/arch/x86/kvm/vmx.c
  	vmx->launched = 1;
  
  	vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-@@ -4368,7 +4395,7 @@ static void vmx_set_supported_cpuid(u32 
- {
- }
- 
--static struct kvm_x86_ops vmx_x86_ops = {
-+static const struct kvm_x86_ops vmx_x86_ops = {
- 	.cpu_has_kvm_support = cpu_has_kvm_support,
- 	.disabled_by_bios = vmx_disabled_by_bios,
- 	.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.39.3/arch/x86/kvm/x86.c linux-2.6.39.3/arch/x86/kvm/x86.c
---- linux-2.6.39.3/arch/x86/kvm/x86.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/kvm/x86.c	2011-05-22 19:36:30.000000000 -0400
-@@ -94,7 +94,7 @@ static void update_cr8_intercept(struct 
- static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
- 				    struct kvm_cpuid_entry2 __user *entries);
- 
--struct kvm_x86_ops *kvm_x86_ops;
-+const struct kvm_x86_ops *kvm_x86_ops;
- EXPORT_SYMBOL_GPL(kvm_x86_ops);
- 
- int ignore_msrs = 0;
+diff -urNp linux-2.6.39.4/arch/x86/kvm/x86.c linux-2.6.39.4/arch/x86/kvm/x86.c
+--- linux-2.6.39.4/arch/x86/kvm/x86.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/kvm/x86.c	2011-08-05 20:34:06.000000000 -0400
 @@ -2050,6 +2050,8 @@ long kvm_arch_dev_ioctl(struct file *fil
  		if (n < msr_list.nmsrs)
  			goto out;
@@ -19024,16 +16232,7 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/x86.c linux-2.6.39.3/arch/x86/kvm/x86.c
  		return -EINVAL;
  	if (irqchip_in_kernel(vcpu->kvm))
  		return -ENXIO;
-@@ -4672,7 +4683,7 @@ static unsigned long kvm_get_guest_ip(vo
- 	return ip;
- }
- 
--static struct perf_guest_info_callbacks kvm_guest_cbs = {
-+static const struct perf_guest_info_callbacks kvm_guest_cbs = {
- 	.is_in_guest		= kvm_is_in_guest,
- 	.is_user_mode		= kvm_is_user_mode,
- 	.get_guest_ip		= kvm_get_guest_ip,
-@@ -4690,10 +4701,10 @@ void kvm_after_handle_nmi(struct kvm_vcp
+@@ -4690,7 +4701,7 @@ void kvm_after_handle_nmi(struct kvm_vcp
  }
  EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);
  
@@ -19041,14 +16240,25 @@ diff -urNp linux-2.6.39.3/arch/x86/kvm/x86.c linux-2.6.39.3/arch/x86/kvm/x86.c
 +int kvm_arch_init(const void *opaque)
  {
  	int r;
--	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-+	const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque;
- 
- 	if (kvm_x86_ops) {
- 		printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.39.3/arch/x86/lib/atomic64_32.c linux-2.6.39.3/arch/x86/lib/atomic64_32.c
---- linux-2.6.39.3/arch/x86/lib/atomic64_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/atomic64_32.c	2011-05-22 19:36:30.000000000 -0400
+ 	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
+diff -urNp linux-2.6.39.4/arch/x86/lguest/boot.c linux-2.6.39.4/arch/x86/lguest/boot.c
+--- linux-2.6.39.4/arch/x86/lguest/boot.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lguest/boot.c	2011-08-05 20:34:06.000000000 -0400
+@@ -1178,9 +1178,10 @@ static __init int early_put_chars(u32 vt
+  * Rebooting also tells the Host we're finished, but the RESTART flag tells the
+  * Launcher to reboot us.
+  */
+-static void lguest_restart(char *reason)
++static __noreturn void lguest_restart(char *reason)
+ {
+ 	hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
++	BUG();
+ }
+ 
+ /*G:050
+diff -urNp linux-2.6.39.4/arch/x86/lib/atomic64_32.c linux-2.6.39.4/arch/x86/lib/atomic64_32.c
+--- linux-2.6.39.4/arch/x86/lib/atomic64_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/atomic64_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -8,18 +8,30 @@
  
  long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -19127,9 +16337,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/atomic64_32.c linux-2.6.39.3/arch/x86/lib
  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.3/arch/x86/lib/atomic64_386_32.S linux-2.6.39.3/arch/x86/lib/atomic64_386_32.S
---- linux-2.6.39.3/arch/x86/lib/atomic64_386_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/atomic64_386_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/atomic64_386_32.S linux-2.6.39.4/arch/x86/lib/atomic64_386_32.S
+--- linux-2.6.39.4/arch/x86/lib/atomic64_386_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/atomic64_386_32.S	2011-08-05 19:44:35.000000000 -0400
 @@ -48,6 +48,10 @@ BEGIN(read)
  	movl  (v), %eax
  	movl 4(v), %edx
@@ -19385,9 +16595,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/atomic64_386_32.S linux-2.6.39.3/arch/x86
  	js 1f
  	movl %eax,  (v)
  	movl %edx, 4(v)
-diff -urNp linux-2.6.39.3/arch/x86/lib/atomic64_cx8_32.S linux-2.6.39.3/arch/x86/lib/atomic64_cx8_32.S
---- linux-2.6.39.3/arch/x86/lib/atomic64_cx8_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/atomic64_cx8_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.39.4/arch/x86/lib/atomic64_cx8_32.S
+--- linux-2.6.39.4/arch/x86/lib/atomic64_cx8_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/atomic64_cx8_32.S	2011-08-05 19:44:35.000000000 -0400
 @@ -39,6 +39,14 @@ ENTRY(atomic64_read_cx8)
  	CFI_ENDPROC
  ENDPROC(atomic64_read_cx8)
@@ -19566,9 +16776,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/atomic64_cx8_32.S linux-2.6.39.3/arch/x86
  	LOCK_PREFIX
  	cmpxchg8b (%esi)
  	jne 1b
-diff -urNp linux-2.6.39.3/arch/x86/lib/checksum_32.S linux-2.6.39.3/arch/x86/lib/checksum_32.S
---- linux-2.6.39.3/arch/x86/lib/checksum_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/checksum_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/checksum_32.S linux-2.6.39.4/arch/x86/lib/checksum_32.S
+--- linux-2.6.39.4/arch/x86/lib/checksum_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/checksum_32.S	2011-08-05 19:44:35.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -19813,9 +17023,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/checksum_32.S linux-2.6.39.3/arch/x86/lib
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-2.6.39.3/arch/x86/lib/clear_page_64.S linux-2.6.39.3/arch/x86/lib/clear_page_64.S
---- linux-2.6.39.3/arch/x86/lib/clear_page_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/clear_page_64.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/clear_page_64.S linux-2.6.39.4/arch/x86/lib/clear_page_64.S
+--- linux-2.6.39.4/arch/x86/lib/clear_page_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/clear_page_64.S	2011-08-05 19:44:35.000000000 -0400
 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -19825,9 +17035,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/clear_page_64.S linux-2.6.39.3/arch/x86/l
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.39.3/arch/x86/lib/copy_page_64.S linux-2.6.39.3/arch/x86/lib/copy_page_64.S
---- linux-2.6.39.3/arch/x86/lib/copy_page_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/copy_page_64.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/copy_page_64.S linux-2.6.39.4/arch/x86/lib/copy_page_64.S
+--- linux-2.6.39.4/arch/x86/lib/copy_page_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/copy_page_64.S	2011-08-05 19:44:35.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -19837,9 +17047,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/copy_page_64.S linux-2.6.39.3/arch/x86/li
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.39.3/arch/x86/lib/copy_user_64.S linux-2.6.39.3/arch/x86/lib/copy_user_64.S
---- linux-2.6.39.3/arch/x86/lib/copy_user_64.S	2011-06-03 00:04:13.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/copy_user_64.S	2011-06-03 00:32:05.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/copy_user_64.S linux-2.6.39.4/arch/x86/lib/copy_user_64.S
+--- linux-2.6.39.4/arch/x86/lib/copy_user_64.S	2011-06-03 00:04:13.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/copy_user_64.S	2011-08-05 19:44:35.000000000 -0400
 @@ -15,13 +15,14 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -19896,9 +17106,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/copy_user_64.S linux-2.6.39.3/arch/x86/li
  	movl %edx,%ecx
  	xorl %eax,%eax
  	rep
-diff -urNp linux-2.6.39.3/arch/x86/lib/copy_user_nocache_64.S linux-2.6.39.3/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.39.3/arch/x86/lib/copy_user_nocache_64.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/copy_user_nocache_64.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.39.4/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.39.4/arch/x86/lib/copy_user_nocache_64.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/copy_user_nocache_64.S	2011-08-05 19:44:35.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -19923,9 +17133,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/copy_user_nocache_64.S linux-2.6.39.3/arc
  	cmpl $8,%edx
  	jb 20f		/* less then 8 bytes, go to byte copy loop */
  	ALIGN_DESTINATION
-diff -urNp linux-2.6.39.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.39.3/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.39.3/arch/x86/lib/csum-wrappers_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/csum-wrappers_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.39.4/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.39.4/arch/x86/lib/csum-wrappers_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/csum-wrappers_64.c	2011-08-05 19:44:35.000000000 -0400
 @@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
@@ -19952,9 +17162,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.39.3/arch/x8
  	return csum_partial_copy_generic(src, (void __force *)dst,
  					 len, isum, NULL, errp);
  }
-diff -urNp linux-2.6.39.3/arch/x86/lib/getuser.S linux-2.6.39.3/arch/x86/lib/getuser.S
---- linux-2.6.39.3/arch/x86/lib/getuser.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/getuser.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/getuser.S linux-2.6.39.4/arch/x86/lib/getuser.S
+--- linux-2.6.39.4/arch/x86/lib/getuser.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/getuser.S	2011-08-05 19:44:35.000000000 -0400
 @@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -20060,9 +17270,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/getuser.S linux-2.6.39.3/arch/x86/lib/get
  4:	movq -7(%_ASM_AX),%_ASM_DX
  	xor %eax,%eax
  	ret
-diff -urNp linux-2.6.39.3/arch/x86/lib/insn.c linux-2.6.39.3/arch/x86/lib/insn.c
---- linux-2.6.39.3/arch/x86/lib/insn.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/insn.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/insn.c linux-2.6.39.4/arch/x86/lib/insn.c
+--- linux-2.6.39.4/arch/x86/lib/insn.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/insn.c	2011-08-05 19:44:35.000000000 -0400
 @@ -21,6 +21,11 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -20086,9 +17296,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/insn.c linux-2.6.39.3/arch/x86/lib/insn.c
  	insn->x86_64 = x86_64 ? 1 : 0;
  	insn->opnd_bytes = 4;
  	if (x86_64)
-diff -urNp linux-2.6.39.3/arch/x86/lib/mmx_32.c linux-2.6.39.3/arch/x86/lib/mmx_32.c
---- linux-2.6.39.3/arch/x86/lib/mmx_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/mmx_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/mmx_32.c linux-2.6.39.4/arch/x86/lib/mmx_32.c
+--- linux-2.6.39.4/arch/x86/lib/mmx_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/mmx_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
  	void *p;
@@ -20404,9 +17614,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/mmx_32.c linux-2.6.39.3/arch/x86/lib/mmx_
  
  		from += 64;
  		to += 64;
-diff -urNp linux-2.6.39.3/arch/x86/lib/putuser.S linux-2.6.39.3/arch/x86/lib/putuser.S
---- linux-2.6.39.3/arch/x86/lib/putuser.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/putuser.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/putuser.S linux-2.6.39.4/arch/x86/lib/putuser.S
+--- linux-2.6.39.4/arch/x86/lib/putuser.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/putuser.S	2011-08-05 19:44:35.000000000 -0400
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -20544,9 +17754,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/putuser.S linux-2.6.39.3/arch/x86/lib/put
  #endif
  	xor %eax,%eax
  	EXIT
-diff -urNp linux-2.6.39.3/arch/x86/lib/usercopy_32.c linux-2.6.39.3/arch/x86/lib/usercopy_32.c
---- linux-2.6.39.3/arch/x86/lib/usercopy_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/usercopy_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/usercopy_32.c linux-2.6.39.4/arch/x86/lib/usercopy_32.c
+--- linux-2.6.39.4/arch/x86/lib/usercopy_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/usercopy_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -43,7 +43,7 @@ do {									   \
  	__asm__ __volatile__(						   \
  		"	testl %1,%1\n"					   \
@@ -21167,9 +18377,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/usercopy_32.c linux-2.6.39.3/arch/x86/lib
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-2.6.39.3/arch/x86/lib/usercopy_64.c linux-2.6.39.3/arch/x86/lib/usercopy_64.c
---- linux-2.6.39.3/arch/x86/lib/usercopy_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/lib/usercopy_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/lib/usercopy_64.c linux-2.6.39.4/arch/x86/lib/usercopy_64.c
+--- linux-2.6.39.4/arch/x86/lib/usercopy_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/lib/usercopy_64.c	2011-08-05 19:44:35.000000000 -0400
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -21218,9 +18428,9 @@ diff -urNp linux-2.6.39.3/arch/x86/lib/usercopy_64.c linux-2.6.39.3/arch/x86/lib
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.39.3/arch/x86/Makefile linux-2.6.39.3/arch/x86/Makefile
---- linux-2.6.39.3/arch/x86/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/Makefile	2011-07-19 18:16:36.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/Makefile linux-2.6.39.4/arch/x86/Makefile
+--- linux-2.6.39.4/arch/x86/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/Makefile	2011-08-05 19:44:35.000000000 -0400
 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
  else
          BITS := 64
@@ -21242,9 +18452,9 @@ diff -urNp linux-2.6.39.3/arch/x86/Makefile linux-2.6.39.3/arch/x86/Makefile
 +
 +archprepare:
 +	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.39.3/arch/x86/mm/extable.c linux-2.6.39.3/arch/x86/mm/extable.c
---- linux-2.6.39.3/arch/x86/mm/extable.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/extable.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/extable.c linux-2.6.39.4/arch/x86/mm/extable.c
+--- linux-2.6.39.4/arch/x86/mm/extable.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/extable.c	2011-08-05 19:44:35.000000000 -0400
 @@ -1,14 +1,71 @@
  #include <linux/module.h>
  #include <linux/spinlock.h>
@@ -21318,9 +18528,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/extable.c linux-2.6.39.3/arch/x86/mm/extab
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.39.3/arch/x86/mm/fault.c linux-2.6.39.3/arch/x86/mm/fault.c
---- linux-2.6.39.3/arch/x86/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/fault.c	2011-06-06 17:34:04.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/fault.c linux-2.6.39.4/arch/x86/mm/fault.c
+--- linux-2.6.39.4/arch/x86/mm/fault.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/fault.c	2011-08-05 19:44:35.000000000 -0400
 @@ -12,10 +12,18 @@
  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
  #include <linux/perf_event.h>		/* perf_sw_event		*/
@@ -21990,9 +19200,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/fault.c linux-2.6.39.3/arch/x86/mm/fault.c
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-2.6.39.3/arch/x86/mm/gup.c linux-2.6.39.3/arch/x86/mm/gup.c
---- linux-2.6.39.3/arch/x86/mm/gup.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/gup.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/gup.c linux-2.6.39.4/arch/x86/mm/gup.c
+--- linux-2.6.39.4/arch/x86/mm/gup.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/gup.c	2011-08-05 19:44:35.000000000 -0400
 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long 
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -22002,9 +19212,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/gup.c linux-2.6.39.3/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-2.6.39.3/arch/x86/mm/highmem_32.c linux-2.6.39.3/arch/x86/mm/highmem_32.c
---- linux-2.6.39.3/arch/x86/mm/highmem_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/highmem_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/highmem_32.c linux-2.6.39.4/arch/x86/mm/highmem_32.c
+--- linux-2.6.39.4/arch/x86/mm/highmem_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/highmem_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -22016,9 +19226,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/highmem_32.c linux-2.6.39.3/arch/x86/mm/hi
  
  	return (void *)vaddr;
  }
-diff -urNp linux-2.6.39.3/arch/x86/mm/hugetlbpage.c linux-2.6.39.3/arch/x86/mm/hugetlbpage.c
---- linux-2.6.39.3/arch/x86/mm/hugetlbpage.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/hugetlbpage.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/hugetlbpage.c linux-2.6.39.4/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.39.4/arch/x86/mm/hugetlbpage.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/hugetlbpage.c	2011-08-05 19:44:35.000000000 -0400
 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
@@ -22226,9 +19436,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/hugetlbpage.c linux-2.6.39.3/arch/x86/mm/h
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.39.3/arch/x86/mm/init_32.c linux-2.6.39.3/arch/x86/mm/init_32.c
---- linux-2.6.39.3/arch/x86/mm/init_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/init_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/init_32.c linux-2.6.39.4/arch/x86/mm/init_32.c
+--- linux-2.6.39.4/arch/x86/mm/init_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/init_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -22503,9 +19713,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/init_32.c linux-2.6.39.3/arch/x86/mm/init_
  	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.3/arch/x86/mm/init_64.c linux-2.6.39.3/arch/x86/mm/init_64.c
---- linux-2.6.39.3/arch/x86/mm/init_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/init_64.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/init_64.c linux-2.6.39.4/arch/x86/mm/init_64.c
+--- linux-2.6.39.4/arch/x86/mm/init_64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/init_64.c	2011-08-05 19:44:35.000000000 -0400
 @@ -74,7 +74,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
@@ -22617,9 +19827,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/init_64.c linux-2.6.39.3/arch/x86/mm/init_
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-2.6.39.3/arch/x86/mm/init.c linux-2.6.39.3/arch/x86/mm/init.c
---- linux-2.6.39.3/arch/x86/mm/init.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/init.c	2011-06-07 19:41:11.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/init.c linux-2.6.39.4/arch/x86/mm/init.c
+--- linux-2.6.39.4/arch/x86/mm/init.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/init.c	2011-08-05 19:44:35.000000000 -0400
 @@ -33,7 +33,7 @@ int direct_gbpages
  static void __init find_early_table_space(unsigned long end, int use_pse,
  					  int use_gbpages)
@@ -22752,9 +19962,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/init.c linux-2.6.39.3/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.3/arch/x86/mm/iomap_32.c linux-2.6.39.3/arch/x86/mm/iomap_32.c
---- linux-2.6.39.3/arch/x86/mm/iomap_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/iomap_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/iomap_32.c linux-2.6.39.4/arch/x86/mm/iomap_32.c
+--- linux-2.6.39.4/arch/x86/mm/iomap_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/iomap_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
  	type = kmap_atomic_idx_push();
  	idx = type + KM_TYPE_NR * smp_processor_id();
@@ -22767,9 +19977,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/iomap_32.c linux-2.6.39.3/arch/x86/mm/ioma
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-2.6.39.3/arch/x86/mm/ioremap.c linux-2.6.39.3/arch/x86/mm/ioremap.c
---- linux-2.6.39.3/arch/x86/mm/ioremap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/ioremap.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/ioremap.c linux-2.6.39.4/arch/x86/mm/ioremap.c
+--- linux-2.6.39.4/arch/x86/mm/ioremap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/ioremap.c	2011-08-05 19:44:35.000000000 -0400
 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re
  	for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
  		int is_ram = page_is_ram(pfn);
@@ -22798,9 +20008,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/ioremap.c linux-2.6.39.3/arch/x86/mm/iorem
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.39.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.39.3/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.39.3/arch/x86/mm/kmemcheck/kmemcheck.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/kmemcheck/kmemcheck.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.39.4/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.39.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-08-05 19:44:35.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.
@@ -22813,9 +20023,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.39.3/arch/
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.39.3/arch/x86/mm/mmap.c linux-2.6.39.3/arch/x86/mm/mmap.c
---- linux-2.6.39.3/arch/x86/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/mmap.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/mmap.c linux-2.6.39.4/arch/x86/mm/mmap.c
+--- linux-2.6.39.4/arch/x86/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/mmap.c	2011-08-05 19:44:35.000000000 -0400
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -22897,9 +20107,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/mmap.c linux-2.6.39.3/arch/x86/mm/mmap.c
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.39.3/arch/x86/mm/mmio-mod.c linux-2.6.39.3/arch/x86/mm/mmio-mod.c
---- linux-2.6.39.3/arch/x86/mm/mmio-mod.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/mmio-mod.c	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/mmio-mod.c linux-2.6.39.4/arch/x86/mm/mmio-mod.c
+--- linux-2.6.39.4/arch/x86/mm/mmio-mod.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/mmio-mod.c	2011-08-05 19:44:35.000000000 -0400
 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
  		break;
  	default:
@@ -22927,9 +20137,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/mmio-mod.c linux-2.6.39.3/arch/x86/mm/mmio
  	};
  	map.map_id = trace->id;
  
-diff -urNp linux-2.6.39.3/arch/x86/mm/numa_32.c linux-2.6.39.3/arch/x86/mm/numa_32.c
---- linux-2.6.39.3/arch/x86/mm/numa_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/numa_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/numa_32.c linux-2.6.39.4/arch/x86/mm/numa_32.c
+--- linux-2.6.39.4/arch/x86/mm/numa_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/numa_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int
  }
  #endif
@@ -22938,9 +20148,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/numa_32.c linux-2.6.39.3/arch/x86/mm/numa_
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.39.3/arch/x86/mm/pageattr.c linux-2.6.39.3/arch/x86/mm/pageattr.c
---- linux-2.6.39.3/arch/x86/mm/pageattr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/pageattr.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/pageattr.c linux-2.6.39.4/arch/x86/mm/pageattr.c
+--- linux-2.6.39.4/arch/x86/mm/pageattr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/pageattr.c	2011-08-05 19:44:35.000000000 -0400
 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection
  	 */
  #ifdef CONFIG_PCI_BIOS
@@ -23025,9 +20235,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/pageattr.c linux-2.6.39.3/arch/x86/mm/page
  }
  
  static int
-diff -urNp linux-2.6.39.3/arch/x86/mm/pageattr-test.c linux-2.6.39.3/arch/x86/mm/pageattr-test.c
---- linux-2.6.39.3/arch/x86/mm/pageattr-test.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/pageattr-test.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/pageattr-test.c linux-2.6.39.4/arch/x86/mm/pageattr-test.c
+--- linux-2.6.39.4/arch/x86/mm/pageattr-test.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/pageattr-test.c	2011-08-05 19:44:35.000000000 -0400
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -23037,9 +20247,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/pageattr-test.c linux-2.6.39.3/arch/x86/mm
  }
  
  struct split_state {
-diff -urNp linux-2.6.39.3/arch/x86/mm/pat.c linux-2.6.39.3/arch/x86/mm/pat.c
---- linux-2.6.39.3/arch/x86/mm/pat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/pat.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/pat.c linux-2.6.39.4/arch/x86/mm/pat.c
+--- linux-2.6.39.4/arch/x86/mm/pat.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/pat.c	2011-08-05 19:44:35.000000000 -0400
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
  	if (!entry) {
@@ -23087,9 +20297,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/pat.c linux-2.6.39.3/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.39.3/arch/x86/mm/pf_in.c linux-2.6.39.3/arch/x86/mm/pf_in.c
---- linux-2.6.39.3/arch/x86/mm/pf_in.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/pf_in.c	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/pf_in.c linux-2.6.39.4/arch/x86/mm/pf_in.c
+--- linux-2.6.39.4/arch/x86/mm/pf_in.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/pf_in.c	2011-08-05 19:44:35.000000000 -0400
 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
  	int i;
  	enum reason_type rv = OTHERS;
@@ -23135,9 +20345,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/pf_in.c linux-2.6.39.3/arch/x86/mm/pf_in.c
  	p += skip_prefix(p, &prf);
  	p += get_opcode(p, &opcode);
  	for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-2.6.39.3/arch/x86/mm/pgtable_32.c linux-2.6.39.3/arch/x86/mm/pgtable_32.c
---- linux-2.6.39.3/arch/x86/mm/pgtable_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/pgtable_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/pgtable_32.c linux-2.6.39.4/arch/x86/mm/pgtable_32.c
+--- linux-2.6.39.4/arch/x86/mm/pgtable_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/pgtable_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
  		return;
  	}
@@ -23152,9 +20362,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/pgtable_32.c linux-2.6.39.3/arch/x86/mm/pg
  
  	/*
  	 * It's enough to flush this one mapping.
-diff -urNp linux-2.6.39.3/arch/x86/mm/pgtable.c linux-2.6.39.3/arch/x86/mm/pgtable.c
---- linux-2.6.39.3/arch/x86/mm/pgtable.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/pgtable.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/pgtable.c linux-2.6.39.4/arch/x86/mm/pgtable.c
+--- linux-2.6.39.4/arch/x86/mm/pgtable.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/pgtable.c	2011-08-05 19:44:35.000000000 -0400
 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
  	list_del(&page->lru);
  }
@@ -23400,9 +20610,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/pgtable.c linux-2.6.39.3/arch/x86/mm/pgtab
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-2.6.39.3/arch/x86/mm/setup_nx.c linux-2.6.39.3/arch/x86/mm/setup_nx.c
---- linux-2.6.39.3/arch/x86/mm/setup_nx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/setup_nx.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/setup_nx.c linux-2.6.39.4/arch/x86/mm/setup_nx.c
+--- linux-2.6.39.4/arch/x86/mm/setup_nx.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/setup_nx.c	2011-08-05 19:44:35.000000000 -0400
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -23432,9 +20642,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/setup_nx.c linux-2.6.39.3/arch/x86/mm/setu
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-2.6.39.3/arch/x86/mm/tlb.c linux-2.6.39.3/arch/x86/mm/tlb.c
---- linux-2.6.39.3/arch/x86/mm/tlb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/mm/tlb.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/mm/tlb.c linux-2.6.39.4/arch/x86/mm/tlb.c
+--- linux-2.6.39.4/arch/x86/mm/tlb.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/mm/tlb.c	2011-08-05 19:44:35.000000000 -0400
 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
@@ -23447,9 +20657,9 @@ diff -urNp linux-2.6.39.3/arch/x86/mm/tlb.c linux-2.6.39.3/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-2.6.39.3/arch/x86/oprofile/backtrace.c linux-2.6.39.3/arch/x86/oprofile/backtrace.c
---- linux-2.6.39.3/arch/x86/oprofile/backtrace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/oprofile/backtrace.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/oprofile/backtrace.c linux-2.6.39.4/arch/x86/oprofile/backtrace.c
+--- linux-2.6.39.4/arch/x86/oprofile/backtrace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/oprofile/backtrace.c	2011-08-05 19:44:35.000000000 -0400
 @@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram
  	struct stack_frame_ia32 *fp;
  
@@ -23468,137 +20678,23 @@ diff -urNp linux-2.6.39.3/arch/x86/oprofile/backtrace.c linux-2.6.39.3/arch/x86/
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.39.3/arch/x86/pci/ce4100.c linux-2.6.39.3/arch/x86/pci/ce4100.c
---- linux-2.6.39.3/arch/x86/pci/ce4100.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--struct pci_raw_ops ce4100_pci_conf = {
-+const struct pci_raw_ops ce4100_pci_conf = {
- 	.read =	ce4100_conf_read,
- 	.write = ce4100_conf_write,
- };
-diff -urNp linux-2.6.39.3/arch/x86/pci/common.c linux-2.6.39.3/arch/x86/pci/common.c
---- linux-2.6.39.3/arch/x86/pci/common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/common.c	2011-05-22 19:36:30.000000000 -0400
-@@ -33,8 +33,8 @@ int noioapicreroute = 1;
- int pcibios_last_bus = -1;
- unsigned long pirq_table_addr;
- struct pci_bus *pci_root_bus;
--struct pci_raw_ops *raw_pci_ops;
--struct pci_raw_ops *raw_pci_ext_ops;
-+const struct pci_raw_ops *raw_pci_ops;
-+const struct pci_raw_ops *raw_pci_ext_ops;
- 
- int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
- 						int reg, int len, u32 *val)
-diff -urNp linux-2.6.39.3/arch/x86/pci/direct.c linux-2.6.39.3/arch/x86/pci/direct.c
---- linux-2.6.39.3/arch/x86/pci/direct.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/direct.c	2011-05-22 19:36:30.000000000 -0400
-@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 
- 
- #undef PCI_CONF1_ADDRESS
- 
--struct pci_raw_ops pci_direct_conf1 = {
-+const struct pci_raw_ops pci_direct_conf1 = {
- 	.read =		pci_conf1_read,
- 	.write =	pci_conf1_write,
- };
-@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int 
- 
- #undef PCI_CONF2_ADDRESS
- 
--struct pci_raw_ops pci_direct_conf2 = {
-+const struct pci_raw_ops pci_direct_conf2 = {
- 	.read =		pci_conf2_read,
- 	.write =	pci_conf2_write,
- };
-@@ -189,7 +189,7 @@ struct pci_raw_ops pci_direct_conf2 = {
-  * This should be close to trivial, but it isn't, because there are buggy
-  * chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID.
-  */
--static int __init pci_sanity_check(struct pci_raw_ops *o)
-+static int __init pci_sanity_check(const struct pci_raw_ops *o)
- {
- 	u32 x = 0;
- 	int year, devfn;
-diff -urNp linux-2.6.39.3/arch/x86/pci/fixup.c linux-2.6.39.3/arch/x86/pci/fixup.c
---- linux-2.6.39.3/arch/x86/pci/fixup.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/fixup.c	2011-05-22 19:36:30.000000000 -0400
-@@ -435,7 +435,7 @@ static const struct dmi_system_id __devi
- 			DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"),
- 		},
- 	},
--	{ }
-+	{}
- };
- 
- static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.39.3/arch/x86/pci/mmconfig_32.c linux-2.6.39.3/arch/x86/pci/mmconfig_32.c
---- linux-2.6.39.3/arch/x86/pci/mmconfig_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/mmconfig_32.c	2011-05-22 19:36:30.000000000 -0400
-@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int 
- 	return 0;
- }
- 
--static struct pci_raw_ops pci_mmcfg = {
-+static const struct pci_raw_ops pci_mmcfg = {
- 	.read =		pci_mmcfg_read,
- 	.write =	pci_mmcfg_write,
- };
-diff -urNp linux-2.6.39.3/arch/x86/pci/mmconfig_64.c linux-2.6.39.3/arch/x86/pci/mmconfig_64.c
---- linux-2.6.39.3/arch/x86/pci/mmconfig_64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/mmconfig_64.c	2011-05-22 19:36:30.000000000 -0400
-@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int 
- 	return 0;
- }
- 
--static struct pci_raw_ops pci_mmcfg = {
-+static const struct pci_raw_ops pci_mmcfg = {
- 	.read =		pci_mmcfg_read,
- 	.write =	pci_mmcfg_write,
- };
-diff -urNp linux-2.6.39.3/arch/x86/pci/mrst.c linux-2.6.39.3/arch/x86/pci/mrst.c
---- linux-2.6.39.3/arch/x86/pci/mrst.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/mrst.c	2011-05-22 19:36:30.000000000 -0400
-@@ -218,7 +218,7 @@ static int mrst_pci_irq_enable(struct pc
- 	return 0;
- }
- 
--struct pci_ops pci_mrst_ops = {
-+const struct pci_ops pci_mrst_ops = {
- 	.read = pci_read,
- 	.write = pci_write,
- };
-diff -urNp linux-2.6.39.3/arch/x86/pci/numaq_32.c linux-2.6.39.3/arch/x86/pci/numaq_32.c
---- linux-2.6.39.3/arch/x86/pci/numaq_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- #undef PCI_CONF1_MQ_ADDRESS
- 
--static struct pci_raw_ops pci_direct_conf1_mq = {
-+static const struct pci_raw_ops pci_direct_conf1_mq = {
- 	.read	= pci_conf1_mq_read,
- 	.write	= pci_conf1_mq_write
- };
-diff -urNp linux-2.6.39.3/arch/x86/pci/olpc.c linux-2.6.39.3/arch/x86/pci/olpc.c
---- linux-2.6.39.3/arch/x86/pci/olpc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/olpc.c	2011-05-22 19:36:30.000000000 -0400
-@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
- 	return 0;
+diff -urNp linux-2.6.39.4/arch/x86/pci/mrst.c linux-2.6.39.4/arch/x86/pci/mrst.c
+--- linux-2.6.39.4/arch/x86/pci/mrst.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/pci/mrst.c	2011-08-05 20:34:06.000000000 -0400
+@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
+ 	printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
+ 	pci_mmcfg_late_init();
+ 	pcibios_enable_irq = mrst_pci_irq_enable;
+-	pci_root_ops = pci_mrst_ops;
++	pax_open_kernel();
++	memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
++	pax_close_kernel();
+ 	/* Continue with standard init */
+ 	return 1;
  }
- 
--static struct pci_raw_ops pci_olpc_conf = {
-+static const struct pci_raw_ops pci_olpc_conf = {
- 	.read =	pci_olpc_read,
- 	.write = pci_olpc_write,
- };
-diff -urNp linux-2.6.39.3/arch/x86/pci/pcbios.c linux-2.6.39.3/arch/x86/pci/pcbios.c
---- linux-2.6.39.3/arch/x86/pci/pcbios.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/pcbios.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/pci/pcbios.c linux-2.6.39.4/arch/x86/pci/pcbios.c
+--- linux-2.6.39.4/arch/x86/pci/pcbios.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/pci/pcbios.c	2011-08-05 20:34:06.000000000 -0400
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -23856,24 +20952,6 @@ diff -urNp linux-2.6.39.3/arch/x86/pci/pcbios.c linux-2.6.39.3/arch/x86/pci/pcbi
  		break;
  	}
  
-@@ -301,7 +371,7 @@ static int pci_bios_write(unsigned int s
-  * Function table for BIOS32 access
-  */
- 
--static struct pci_raw_ops pci_bios_access = {
-+static const struct pci_raw_ops pci_bios_access = {
- 	.read =		pci_bios_read,
- 	.write =	pci_bios_write
- };
-@@ -310,7 +380,7 @@ static struct pci_raw_ops pci_bios_acces
-  * Try to find PCI BIOS.
-  */
- 
--static struct pci_raw_ops * __devinit pci_find_bios(void)
-+static const struct pci_raw_ops * __devinit pci_find_bios(void)
- {
- 	union bios32 *check;
- 	unsigned char sum;
 @@ -392,10 +462,13 @@ struct irq_routing_table * pcibios_get_i
  
  	DBG("PCI: Fetching IRQ routing table... ");
@@ -23921,21 +20999,9 @@ diff -urNp linux-2.6.39.3/arch/x86/pci/pcbios.c linux-2.6.39.3/arch/x86/pci/pcbi
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.39.3/arch/x86/pci/xen.c linux-2.6.39.3/arch/x86/pci/xen.c
---- linux-2.6.39.3/arch/x86/pci/xen.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/pci/xen.c	2011-07-09 09:19:18.000000000 -0400
-@@ -62,7 +62,7 @@ static int acpi_register_gsi_xen_hvm(str
- #include <linux/msi.h>
- #include <asm/msidef.h>
- 
--struct xen_pci_frontend_ops *xen_pci_frontend;
-+const struct xen_pci_frontend_ops *xen_pci_frontend;
- EXPORT_SYMBOL_GPL(xen_pci_frontend);
- 
- #define XEN_PIRQ_MSI_DATA  (MSI_DATA_TRIGGER_EDGE | \
-diff -urNp linux-2.6.39.3/arch/x86/platform/efi/efi_32.c linux-2.6.39.3/arch/x86/platform/efi/efi_32.c
---- linux-2.6.39.3/arch/x86/platform/efi/efi_32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/platform/efi/efi_32.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/platform/efi/efi_32.c linux-2.6.39.4/arch/x86/platform/efi/efi_32.c
+--- linux-2.6.39.4/arch/x86/platform/efi/efi_32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/platform/efi/efi_32.c	2011-08-05 19:44:35.000000000 -0400
 @@ -38,70 +38,37 @@
   */
  
@@ -24016,9 +21082,9 @@ diff -urNp linux-2.6.39.3/arch/x86/platform/efi/efi_32.c linux-2.6.39.3/arch/x86
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.39.3/arch/x86/platform/efi/efi_stub_32.S linux-2.6.39.3/arch/x86/platform/efi/efi_stub_32.S
---- linux-2.6.39.3/arch/x86/platform/efi/efi_stub_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/platform/efi/efi_stub_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.39.4/arch/x86/platform/efi/efi_stub_32.S
+--- linux-2.6.39.4/arch/x86/platform/efi/efi_stub_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/platform/efi/efi_stub_32.S	2011-08-05 19:44:35.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -24117,21 +21183,31 @@ diff -urNp linux-2.6.39.3/arch/x86/platform/efi/efi_stub_32.S linux-2.6.39.3/arc
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-2.6.39.3/arch/x86/platform/olpc/olpc_dt.c linux-2.6.39.3/arch/x86/platform/olpc/olpc_dt.c
---- linux-2.6.39.3/arch/x86/platform/olpc/olpc_dt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 
- 	return res;
+diff -urNp linux-2.6.39.4/arch/x86/platform/mrst/mrst.c linux-2.6.39.4/arch/x86/platform/mrst/mrst.c
+--- linux-2.6.39.4/arch/x86/platform/mrst/mrst.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/platform/mrst/mrst.c	2011-08-05 20:34:06.000000000 -0400
+@@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
+ }
+ 
+ /* Reboot and power off are handled by the SCU on a MID device */
+-static void mrst_power_off(void)
++static __noreturn void mrst_power_off(void)
+ {
+ 	intel_scu_ipc_simple_command(0xf1, 1);
++	BUG();
  }
  
--static struct of_pdt_ops prom_olpc_ops __initdata = {
-+static const struct of_pdt_ops prom_olpc_ops = {
- 	.nextprop = olpc_dt_nextprop,
- 	.getproplen = olpc_dt_getproplen,
- 	.getproperty = olpc_dt_getproperty,
-diff -urNp linux-2.6.39.3/arch/x86/platform/uv/tlb_uv.c linux-2.6.39.3/arch/x86/platform/uv/tlb_uv.c
---- linux-2.6.39.3/arch/x86/platform/uv/tlb_uv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/platform/uv/tlb_uv.c	2011-05-22 19:36:30.000000000 -0400
+-static void mrst_reboot(void)
++static __noreturn void mrst_reboot(void)
+ {
+ 	intel_scu_ipc_simple_command(0xf1, 0);
++	BUG();
+ }
+ 
+ /*
+diff -urNp linux-2.6.39.4/arch/x86/platform/uv/tlb_uv.c linux-2.6.39.4/arch/x86/platform/uv/tlb_uv.c
+--- linux-2.6.39.4/arch/x86/platform/uv/tlb_uv.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/platform/uv/tlb_uv.c	2011-08-05 19:44:35.000000000 -0400
 @@ -342,6 +342,8 @@ static void uv_reset_with_ipi(struct bau
  	cpumask_t mask;
  	struct reset_args reset_args;
@@ -24141,9 +21217,9 @@ diff -urNp linux-2.6.39.3/arch/x86/platform/uv/tlb_uv.c linux-2.6.39.3/arch/x86/
  	reset_args.sender = sender;
  
  	cpus_clear(mask);
-diff -urNp linux-2.6.39.3/arch/x86/power/cpu.c linux-2.6.39.3/arch/x86/power/cpu.c
---- linux-2.6.39.3/arch/x86/power/cpu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/power/cpu.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/power/cpu.c linux-2.6.39.4/arch/x86/power/cpu.c
+--- linux-2.6.39.4/arch/x86/power/cpu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/power/cpu.c	2011-08-05 19:44:35.000000000 -0400
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -24163,9 +21239,9 @@ diff -urNp linux-2.6.39.3/arch/x86/power/cpu.c linux-2.6.39.3/arch/x86/power/cpu
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-2.6.39.3/arch/x86/vdso/Makefile linux-2.6.39.3/arch/x86/vdso/Makefile
---- linux-2.6.39.3/arch/x86/vdso/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/vdso/Makefile	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/vdso/Makefile linux-2.6.39.4/arch/x86/vdso/Makefile
+--- linux-2.6.39.4/arch/x86/vdso/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/vdso/Makefile	2011-08-05 19:44:35.000000000 -0400
 @@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO    $@
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
  		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -24175,9 +21251,9 @@ diff -urNp linux-2.6.39.3/arch/x86/vdso/Makefile linux-2.6.39.3/arch/x86/vdso/Ma
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-2.6.39.3/arch/x86/vdso/vclock_gettime.c linux-2.6.39.3/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.39.3/arch/x86/vdso/vclock_gettime.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/vdso/vclock_gettime.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/vdso/vclock_gettime.c linux-2.6.39.4/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.39.4/arch/x86/vdso/vclock_gettime.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/vdso/vclock_gettime.c	2011-08-05 19:44:35.000000000 -0400
 @@ -22,24 +22,48 @@
  #include <asm/hpet.h>
  #include <asm/unistd.h>
@@ -24276,9 +21352,9 @@ diff -urNp linux-2.6.39.3/arch/x86/vdso/vclock_gettime.c linux-2.6.39.3/arch/x86
  }
  int gettimeofday(struct timeval *, struct timezone *)
  	__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.39.3/arch/x86/vdso/vdso32-setup.c linux-2.6.39.3/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.39.3/arch/x86/vdso/vdso32-setup.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/vdso/vdso32-setup.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/vdso/vdso32-setup.c linux-2.6.39.4/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.39.4/arch/x86/vdso/vdso32-setup.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/vdso/vdso32-setup.c	2011-08-05 19:44:35.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -24361,9 +21437,9 @@ diff -urNp linux-2.6.39.3/arch/x86/vdso/vdso32-setup.c linux-2.6.39.3/arch/x86/v
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-2.6.39.3/arch/x86/vdso/vdso.lds.S linux-2.6.39.3/arch/x86/vdso/vdso.lds.S
---- linux-2.6.39.3/arch/x86/vdso/vdso.lds.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/vdso/vdso.lds.S	2011-06-06 17:34:26.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/vdso/vdso.lds.S linux-2.6.39.4/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.39.4/arch/x86/vdso/vdso.lds.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/vdso/vdso.lds.S	2011-08-05 19:44:35.000000000 -0400
 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
  #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
  #include "vextern.h"
@@ -24374,9 +21450,9 @@ diff -urNp linux-2.6.39.3/arch/x86/vdso/vdso.lds.S linux-2.6.39.3/arch/x86/vdso/
 +VEXTERN(fallback_time)
 +VEXTERN(getcpu)
 +#undef	VEXTERN
-diff -urNp linux-2.6.39.3/arch/x86/vdso/vextern.h linux-2.6.39.3/arch/x86/vdso/vextern.h
---- linux-2.6.39.3/arch/x86/vdso/vextern.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/vdso/vextern.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/vdso/vextern.h linux-2.6.39.4/arch/x86/vdso/vextern.h
+--- linux-2.6.39.4/arch/x86/vdso/vextern.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/vdso/vextern.h	2011-08-05 19:44:35.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.   */
@@ -24384,9 +21460,9 @@ diff -urNp linux-2.6.39.3/arch/x86/vdso/vextern.h linux-2.6.39.3/arch/x86/vdso/v
 -VEXTERN(jiffies)
  VEXTERN(vgetcpu_mode)
  VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.39.3/arch/x86/vdso/vma.c linux-2.6.39.3/arch/x86/vdso/vma.c
---- linux-2.6.39.3/arch/x86/vdso/vma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/vdso/vma.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/vdso/vma.c linux-2.6.39.4/arch/x86/vdso/vma.c
+--- linux-2.6.39.4/arch/x86/vdso/vma.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/vdso/vma.c	2011-08-05 19:44:35.000000000 -0400
 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
  	if (!vbase)
  		goto oom;
@@ -24425,9 +21501,9 @@ diff -urNp linux-2.6.39.3/arch/x86/vdso/vma.c linux-2.6.39.3/arch/x86/vdso/vma.c
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.39.3/arch/x86/xen/enlighten.c linux-2.6.39.3/arch/x86/xen/enlighten.c
---- linux-2.6.39.3/arch/x86/xen/enlighten.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/xen/enlighten.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/xen/enlighten.c linux-2.6.39.4/arch/x86/xen/enlighten.c
+--- linux-2.6.39.4/arch/x86/xen/enlighten.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/xen/enlighten.c	2011-08-05 19:44:35.000000000 -0400
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -24500,9 +21576,9 @@ diff -urNp linux-2.6.39.3/arch/x86/xen/enlighten.c linux-2.6.39.3/arch/x86/xen/e
  	xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-2.6.39.3/arch/x86/xen/mmu.c linux-2.6.39.3/arch/x86/xen/mmu.c
---- linux-2.6.39.3/arch/x86/xen/mmu.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/xen/mmu.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/xen/mmu.c linux-2.6.39.4/arch/x86/xen/mmu.c
+--- linux-2.6.39.4/arch/x86/xen/mmu.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/arch/x86/xen/mmu.c	2011-08-05 19:44:35.000000000 -0400
 @@ -1801,6 +1801,8 @@ __init pgd_t *xen_setup_kernel_pagetable
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
@@ -24523,21 +21599,9 @@ diff -urNp linux-2.6.39.3/arch/x86/xen/mmu.c linux-2.6.39.3/arch/x86/xen/mmu.c
  	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-diff -urNp linux-2.6.39.3/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.39.3/arch/x86/xen/pci-swiotlb-xen.c
---- linux-2.6.39.3/arch/x86/xen/pci-swiotlb-xen.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/xen/pci-swiotlb-xen.c	2011-05-22 19:36:30.000000000 -0400
-@@ -10,7 +10,7 @@
- 
- int xen_swiotlb __read_mostly;
- 
--static struct dma_map_ops xen_swiotlb_dma_ops = {
-+static const struct dma_map_ops xen_swiotlb_dma_ops = {
- 	.mapping_error = xen_swiotlb_dma_mapping_error,
- 	.alloc_coherent = xen_swiotlb_alloc_coherent,
- 	.free_coherent = xen_swiotlb_free_coherent,
-diff -urNp linux-2.6.39.3/arch/x86/xen/smp.c linux-2.6.39.3/arch/x86/xen/smp.c
---- linux-2.6.39.3/arch/x86/xen/smp.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/xen/smp.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/xen/smp.c linux-2.6.39.4/arch/x86/xen/smp.c
+--- linux-2.6.39.4/arch/x86/xen/smp.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/arch/x86/xen/smp.c	2011-08-05 19:44:35.000000000 -0400
 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
@@ -24582,9 +21646,9 @@ diff -urNp linux-2.6.39.3/arch/x86/xen/smp.c linux-2.6.39.3/arch/x86/xen/smp.c
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff -urNp linux-2.6.39.3/arch/x86/xen/xen-asm_32.S linux-2.6.39.3/arch/x86/xen/xen-asm_32.S
---- linux-2.6.39.3/arch/x86/xen/xen-asm_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/xen/xen-asm_32.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/xen/xen-asm_32.S linux-2.6.39.4/arch/x86/xen/xen-asm_32.S
+--- linux-2.6.39.4/arch/x86/xen/xen-asm_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/xen/xen-asm_32.S	2011-08-05 19:44:35.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -24606,9 +21670,9 @@ diff -urNp linux-2.6.39.3/arch/x86/xen/xen-asm_32.S linux-2.6.39.3/arch/x86/xen/
  #else
  	movl xen_vcpu, %eax
  #endif
-diff -urNp linux-2.6.39.3/arch/x86/xen/xen-head.S linux-2.6.39.3/arch/x86/xen/xen-head.S
---- linux-2.6.39.3/arch/x86/xen/xen-head.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/xen/xen-head.S	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/xen/xen-head.S linux-2.6.39.4/arch/x86/xen/xen-head.S
+--- linux-2.6.39.4/arch/x86/xen/xen-head.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/xen/xen-head.S	2011-08-05 19:44:35.000000000 -0400
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -24627,9 +21691,9 @@ diff -urNp linux-2.6.39.3/arch/x86/xen/xen-head.S linux-2.6.39.3/arch/x86/xen/xe
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.39.3/arch/x86/xen/xen-ops.h linux-2.6.39.3/arch/x86/xen/xen-ops.h
---- linux-2.6.39.3/arch/x86/xen/xen-ops.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/arch/x86/xen/xen-ops.h	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/arch/x86/xen/xen-ops.h linux-2.6.39.4/arch/x86/xen/xen-ops.h
+--- linux-2.6.39.4/arch/x86/xen/xen-ops.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/arch/x86/xen/xen-ops.h	2011-08-05 19:44:35.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -24639,9 +21703,9 @@ diff -urNp linux-2.6.39.3/arch/x86/xen/xen-ops.h linux-2.6.39.3/arch/x86/xen/xen
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-2.6.39.3/block/blk-iopoll.c linux-2.6.39.3/block/blk-iopoll.c
---- linux-2.6.39.3/block/blk-iopoll.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/block/blk-iopoll.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/block/blk-iopoll.c linux-2.6.39.4/block/blk-iopoll.c
+--- linux-2.6.39.4/block/blk-iopoll.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/block/blk-iopoll.c	2011-08-05 19:44:35.000000000 -0400
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -24651,9 +21715,9 @@ diff -urNp linux-2.6.39.3/block/blk-iopoll.c linux-2.6.39.3/block/blk-iopoll.c
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.39.3/block/blk-map.c linux-2.6.39.3/block/blk-map.c
---- linux-2.6.39.3/block/blk-map.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/block/blk-map.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/block/blk-map.c linux-2.6.39.4/block/blk-map.c
+--- linux-2.6.39.4/block/blk-map.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/block/blk-map.c	2011-08-05 19:44:35.000000000 -0400
 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
  	if (!len || !kbuf)
  		return -EINVAL;
@@ -24663,9 +21727,9 @@ diff -urNp linux-2.6.39.3/block/blk-map.c linux-2.6.39.3/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-2.6.39.3/block/blk-softirq.c linux-2.6.39.3/block/blk-softirq.c
---- linux-2.6.39.3/block/blk-softirq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/block/blk-softirq.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/block/blk-softirq.c linux-2.6.39.4/block/blk-softirq.c
+--- linux-2.6.39.4/block/blk-softirq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/block/blk-softirq.c	2011-08-05 19:44:35.000000000 -0400
 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
@@ -24675,9 +21739,9 @@ diff -urNp linux-2.6.39.3/block/blk-softirq.c linux-2.6.39.3/block/blk-softirq.c
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-2.6.39.3/block/bsg.c linux-2.6.39.3/block/bsg.c
---- linux-2.6.39.3/block/bsg.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/block/bsg.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/block/bsg.c linux-2.6.39.4/block/bsg.c
+--- linux-2.6.39.4/block/bsg.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/block/bsg.c	2011-08-05 19:44:35.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)
@@ -24705,9 +21769,9 @@ diff -urNp linux-2.6.39.3/block/bsg.c linux-2.6.39.3/block/bsg.c
  	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
-diff -urNp linux-2.6.39.3/block/scsi_ioctl.c linux-2.6.39.3/block/scsi_ioctl.c
---- linux-2.6.39.3/block/scsi_ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/block/scsi_ioctl.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/block/scsi_ioctl.c linux-2.6.39.4/block/scsi_ioctl.c
+--- linux-2.6.39.4/block/scsi_ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/block/scsi_ioctl.c	2011-08-05 19:44:35.000000000 -0400
 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
  			     struct sg_io_hdr *hdr, fmode_t mode)
@@ -24759,9 +21823,30 @@ diff -urNp linux-2.6.39.3/block/scsi_ioctl.c linux-2.6.39.3/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff -urNp linux-2.6.39.3/crypto/gf128mul.c linux-2.6.39.3/crypto/gf128mul.c
---- linux-2.6.39.3/crypto/gf128mul.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/crypto/gf128mul.c	2011-07-06 20:00:14.000000000 -0400
+diff -urNp linux-2.6.39.4/crypto/cryptd.c linux-2.6.39.4/crypto/cryptd.c
+--- linux-2.6.39.4/crypto/cryptd.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/crypto/cryptd.c	2011-08-05 20:34:06.000000000 -0400
+@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
+ 
+ struct cryptd_blkcipher_request_ctx {
+ 	crypto_completion_t complete;
+-};
++} __no_const;
+ 
+ struct cryptd_hash_ctx {
+ 	struct crypto_shash *child;
+@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
+ 
+ struct cryptd_aead_request_ctx {
+ 	crypto_completion_t complete;
+-};
++} __no_const;
+ 
+ static void cryptd_queue_worker(struct work_struct *work);
+ 
+diff -urNp linux-2.6.39.4/crypto/gf128mul.c linux-2.6.39.4/crypto/gf128mul.c
+--- linux-2.6.39.4/crypto/gf128mul.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/crypto/gf128mul.c	2011-08-05 19:44:35.000000000 -0400
 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 
  	for (i = 0; i < 7; ++i)
  		gf128mul_x_lle(&p[i + 1], &p[i]);
@@ -24780,9 +21865,9 @@ diff -urNp linux-2.6.39.3/crypto/gf128mul.c linux-2.6.39.3/crypto/gf128mul.c
  	for (i = 0;;) {
  		u8 ch = ((u8 *)b)[i];
  
-diff -urNp linux-2.6.39.3/crypto/serpent.c linux-2.6.39.3/crypto/serpent.c
---- linux-2.6.39.3/crypto/serpent.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/crypto/serpent.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/crypto/serpent.c linux-2.6.39.4/crypto/serpent.c
+--- linux-2.6.39.4/crypto/serpent.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/crypto/serpent.c	2011-08-05 19:44:35.000000000 -0400
 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
  	u32 r0,r1,r2,r3,r4;
  	int i;
@@ -24792,9 +21877,9 @@ diff -urNp linux-2.6.39.3/crypto/serpent.c linux-2.6.39.3/crypto/serpent.c
  	/* Copy key, add padding */
  
  	for (i = 0; i < keylen; ++i)
-diff -urNp linux-2.6.39.3/Documentation/dontdiff linux-2.6.39.3/Documentation/dontdiff
---- linux-2.6.39.3/Documentation/dontdiff	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/Documentation/dontdiff	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/Documentation/dontdiff linux-2.6.39.4/Documentation/dontdiff
+--- linux-2.6.39.4/Documentation/dontdiff	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/Documentation/dontdiff	2011-08-05 19:44:35.000000000 -0400
 @@ -1,13 +1,16 @@
  *.a
  *.aux
@@ -24934,35 +22019,9 @@ diff -urNp linux-2.6.39.3/Documentation/dontdiff linux-2.6.39.3/Documentation/do
  wakeup.bin
  wakeup.elf
  wakeup.lds
-diff -urNp linux-2.6.39.3/Documentation/filesystems/configfs/configfs_example_macros.c linux-2.6.39.3/Documentation/filesystems/configfs/configfs_example_macros.c
---- linux-2.6.39.3/Documentation/filesystems/configfs/configfs_example_macros.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/Documentation/filesystems/configfs/configfs_example_macros.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.
-  */
--static struct configfs_group_operations group_children_group_ops = {
-+static const struct configfs_group_operations group_children_group_ops = {
- 	.make_group	= group_children_make_group,
- };
- 
-diff -urNp linux-2.6.39.3/Documentation/filesystems/sysfs.txt linux-2.6.39.3/Documentation/filesystems/sysfs.txt
---- linux-2.6.39.3/Documentation/filesystems/sysfs.txt	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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. 
- 
- struct sysfs_ops {
--        ssize_t (*show)(struct kobject *, struct attribute *, char *);
--        ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t);
-+        ssize_t (* const show)(struct kobject *, struct attribute *, char *);
-+        ssize_t (* const store)(struct kobject *, struct attribute *, const char *, size_t);
- };
- 
- [ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.39.3/Documentation/kernel-parameters.txt linux-2.6.39.3/Documentation/kernel-parameters.txt
---- linux-2.6.39.3/Documentation/kernel-parameters.txt	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/Documentation/kernel-parameters.txt	2011-06-25 13:00:25.000000000 -0400
+diff -urNp linux-2.6.39.4/Documentation/kernel-parameters.txt linux-2.6.39.4/Documentation/kernel-parameters.txt
+--- linux-2.6.39.4/Documentation/kernel-parameters.txt	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/Documentation/kernel-parameters.txt	2011-08-05 19:44:35.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.
@@ -24977,21 +22036,9 @@ diff -urNp linux-2.6.39.3/Documentation/kernel-parameters.txt linux-2.6.39.3/Doc
  	pcbit=		[HW,ISDN]
  
  	pcd.		[PARIDE]
-diff -urNp linux-2.6.39.3/drivers/acpi/acpi_ipmi.c linux-2.6.39.3/drivers/acpi/acpi_ipmi.c
---- linux-2.6.39.3/drivers/acpi/acpi_ipmi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/acpi_ipmi.c	2011-05-22 19:36:30.000000000 -0400
-@@ -70,7 +70,7 @@ struct acpi_ipmi_device {
- struct ipmi_driver_data {
- 	struct list_head	ipmi_devices;
- 	struct ipmi_smi_watcher	bmc_events;
--	struct ipmi_user_hndl	ipmi_hndlrs;
-+	const struct ipmi_user_hndl ipmi_hndlrs;
- 	struct mutex		ipmi_lock;
- };
- 
-diff -urNp linux-2.6.39.3/drivers/acpi/apei/cper.c linux-2.6.39.3/drivers/acpi/apei/cper.c
---- linux-2.6.39.3/drivers/acpi/apei/cper.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/apei/cper.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/acpi/apei/cper.c linux-2.6.39.4/drivers/acpi/apei/cper.c
+--- linux-2.6.39.4/drivers/acpi/apei/cper.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/acpi/apei/cper.c	2011-08-05 19:44:35.000000000 -0400
 @@ -38,12 +38,12 @@
   */
  u64 cper_next_record_id(void)
@@ -25009,66 +22056,9 @@ diff -urNp linux-2.6.39.3/drivers/acpi/apei/cper.c linux-2.6.39.3/drivers/acpi/a
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff -urNp linux-2.6.39.3/drivers/acpi/battery.c linux-2.6.39.3/drivers/acpi/battery.c
---- linux-2.6.39.3/drivers/acpi/battery.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/battery.c	2011-05-22 19:36:30.000000000 -0400
-@@ -864,7 +864,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
- 	}
- 
- static struct battery_file {
--	struct file_operations ops;
-+	const struct file_operations ops;
- 	mode_t mode;
- 	const char *name;
- } acpi_battery_file[] = {
-diff -urNp linux-2.6.39.3/drivers/acpi/dock.c linux-2.6.39.3/drivers/acpi/dock.c
---- linux-2.6.39.3/drivers/acpi/dock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/dock.c	2011-05-22 19:36:30.000000000 -0400
-@@ -77,7 +77,7 @@ struct dock_dependent_device {
- 	struct list_head list;
- 	struct list_head hotplug_list;
- 	acpi_handle handle;
--	struct acpi_dock_ops *ops;
-+	const struct acpi_dock_ops *ops;
- 	void *context;
- };
- 
-@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi
-  * the dock driver after _DCK is executed.
-  */
- int
--register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
-+register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops,
- 			     void *context)
- {
- 	struct dock_dependent_device *dd;
-diff -urNp linux-2.6.39.3/drivers/acpi/ec_sys.c linux-2.6.39.3/drivers/acpi/ec_sys.c
---- linux-2.6.39.3/drivers/acpi/ec_sys.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct file_operations acpi_ec_io_ops = {
-+static const struct file_operations acpi_ec_io_ops = {
- 	.owner = THIS_MODULE,
- 	.open  = acpi_ec_open_io,
- 	.read  = acpi_ec_read_io,
-diff -urNp linux-2.6.39.3/drivers/acpi/fan.c linux-2.6.39.3/drivers/acpi/fan.c
---- linux-2.6.39.3/drivers/acpi/fan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/fan.c	2011-05-22 19:36:30.000000000 -0400
-@@ -110,7 +110,7 @@ fan_set_cur_state(struct thermal_cooling
- 	return result;
- }
- 
--static struct thermal_cooling_device_ops fan_cooling_ops = {
-+static const struct thermal_cooling_device_ops fan_cooling_ops = {
- 	.get_max_state = fan_get_max_state,
- 	.get_cur_state = fan_get_cur_state,
- 	.set_cur_state = fan_set_cur_state,
-diff -urNp linux-2.6.39.3/drivers/acpi/power_meter.c linux-2.6.39.3/drivers/acpi/power_meter.c
---- linux-2.6.39.3/drivers/acpi/power_meter.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/power_meter.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/acpi/power_meter.c linux-2.6.39.4/drivers/acpi/power_meter.c
+--- linux-2.6.39.4/drivers/acpi/power_meter.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/acpi/power_meter.c	2011-08-05 19:44:35.000000000 -0400
 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
  		return res;
  
@@ -25078,9 +22068,9 @@ diff -urNp linux-2.6.39.3/drivers/acpi/power_meter.c linux-2.6.39.3/drivers/acpi
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.39.3/drivers/acpi/proc.c linux-2.6.39.3/drivers/acpi/proc.c
---- linux-2.6.39.3/drivers/acpi/proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/proc.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/acpi/proc.c linux-2.6.39.4/drivers/acpi/proc.c
+--- linux-2.6.39.4/drivers/acpi/proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/acpi/proc.c	2011-08-05 19:44:35.000000000 -0400
 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
  				size_t count, loff_t * ppos)
  {
@@ -25115,9 +22105,9 @@ diff -urNp linux-2.6.39.3/drivers/acpi/proc.c linux-2.6.39.3/drivers/acpi/proc.c
  			if (device_can_wakeup(&dev->dev)) {
  				bool enable = !device_may_wakeup(&dev->dev);
  				device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-2.6.39.3/drivers/acpi/processor_driver.c linux-2.6.39.3/drivers/acpi/processor_driver.c
---- linux-2.6.39.3/drivers/acpi/processor_driver.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/processor_driver.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/acpi/processor_driver.c linux-2.6.39.4/drivers/acpi/processor_driver.c
+--- linux-2.6.39.4/drivers/acpi/processor_driver.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/acpi/processor_driver.c	2011-08-05 19:44:35.000000000 -0400
 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
  		return 0;
  #endif
@@ -25127,207 +22117,9 @@ diff -urNp linux-2.6.39.3/drivers/acpi/processor_driver.c linux-2.6.39.3/drivers
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-2.6.39.3/drivers/acpi/processor_idle.c linux-2.6.39.3/drivers/acpi/processor_idle.c
---- linux-2.6.39.3/drivers/acpi/processor_idle.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/processor_idle.c	2011-05-22 19:36:30.000000000 -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")},
- 	 (void *)1},
--	{},
-+	{}
- };
- 
- 
-diff -urNp linux-2.6.39.3/drivers/acpi/processor_thermal.c linux-2.6.39.3/drivers/acpi/processor_thermal.c
---- linux-2.6.39.3/drivers/acpi/processor_thermal.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct thermal_cooling_device_ops processor_cooling_ops = {
-+const struct thermal_cooling_device_ops processor_cooling_ops = {
- 	.get_max_state = processor_get_max_state,
- 	.get_cur_state = processor_get_cur_state,
- 	.set_cur_state = processor_set_cur_state,
-diff -urNp linux-2.6.39.3/drivers/acpi/sysfs.c linux-2.6.39.3/drivers/acpi/sysfs.c
---- linux-2.6.39.3/drivers/acpi/sysfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/sysfs.c	2011-05-22 19:36:30.000000000 -0400
-@@ -149,12 +149,12 @@ static int param_get_debug_level(char *b
- 	return result;
- }
- 
--static struct kernel_param_ops param_ops_debug_layer = {
-+static const struct kernel_param_ops param_ops_debug_layer = {
- 	.set = param_set_uint,
- 	.get = param_get_debug_layer,
- };
- 
--static struct kernel_param_ops param_ops_debug_level = {
-+static const struct kernel_param_ops param_ops_debug_level = {
- 	.set = param_set_uint,
- 	.get = param_get_debug_level,
- };
-diff -urNp linux-2.6.39.3/drivers/acpi/thermal.c linux-2.6.39.3/drivers/acpi/thermal.c
---- linux-2.6.39.3/drivers/acpi/thermal.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
-+static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
- 	.bind = acpi_thermal_bind_cooling_device,
- 	.unbind	= acpi_thermal_unbind_cooling_device,
- 	.get_temp = thermal_get_temp,
-diff -urNp linux-2.6.39.3/drivers/acpi/video.c linux-2.6.39.3/drivers/acpi/video.c
---- linux-2.6.39.3/drivers/acpi/video.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/acpi/video.c	2011-05-22 19:36:30.000000000 -0400
-@@ -308,7 +308,7 @@ video_set_cur_state(struct thermal_cooli
- 	return acpi_video_device_lcd_set_level(video, level);
- }
- 
--static struct thermal_cooling_device_ops video_cooling_ops = {
-+static const struct thermal_cooling_device_ops video_cooling_ops = {
- 	.get_max_state = video_get_max_state,
- 	.get_cur_state = video_get_cur_state,
- 	.set_cur_state = video_set_cur_state,
-diff -urNp linux-2.6.39.3/drivers/ata/acard-ahci.c linux-2.6.39.3/drivers/ata/acard-ahci.c
---- linux-2.6.39.3/drivers/ata/acard-ahci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/acard-ahci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -87,7 +87,7 @@ static struct scsi_host_template acard_a
- 	AHCI_SHT("acard-ahci"),
- };
- 
--static struct ata_port_operations acard_ops = {
-+static const struct ata_port_operations acard_ops = {
- 	.inherits		= &ahci_ops,
- 	.qc_prep		= acard_ahci_qc_prep,
- 	.qc_fill_rtf		= acard_ahci_qc_fill_rtf,
-diff -urNp linux-2.6.39.3/drivers/ata/ahci.c linux-2.6.39.3/drivers/ata/ahci.c
---- linux-2.6.39.3/drivers/ata/ahci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/ahci.c	2011-05-22 19:36:30.000000000 -0400
-@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
- 	AHCI_SHT("ahci"),
- };
- 
--static struct ata_port_operations ahci_vt8251_ops = {
-+static const struct ata_port_operations ahci_vt8251_ops = {
- 	.inherits		= &ahci_ops,
- 	.hardreset		= ahci_vt8251_hardreset,
- };
- 
--static struct ata_port_operations ahci_p5wdh_ops = {
-+static const struct ata_port_operations ahci_p5wdh_ops = {
- 	.inherits		= &ahci_ops,
- 	.hardreset		= ahci_p5wdh_hardreset,
- };
- 
--static struct ata_port_operations ahci_sb600_ops = {
-+static const struct ata_port_operations ahci_sb600_ops = {
- 	.inherits		= &ahci_ops,
- 	.softreset		= ahci_sb600_softreset,
- 	.pmp_softreset		= ahci_sb600_softreset,
-diff -urNp linux-2.6.39.3/drivers/ata/ahci.h linux-2.6.39.3/drivers/ata/ahci.h
---- linux-2.6.39.3/drivers/ata/ahci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/ahci.h	2011-05-22 19:36:30.000000000 -0400
-@@ -311,7 +311,7 @@ extern struct device_attribute *ahci_sde
- 	.shost_attrs		= ahci_shost_attrs,			\
- 	.sdev_attrs		= ahci_sdev_attrs
- 
--extern struct ata_port_operations ahci_ops;
-+extern const struct ata_port_operations ahci_ops;
- 
- void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,
- 			u32 opts);
-diff -urNp linux-2.6.39.3/drivers/ata/ata_generic.c linux-2.6.39.3/drivers/ata/ata_generic.c
---- linux-2.6.39.3/drivers/ata/ata_generic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/ata_generic.c	2011-05-22 19:36:30.000000000 -0400
-@@ -101,7 +101,7 @@ static struct scsi_host_template generic
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations generic_port_ops = {
-+static const struct ata_port_operations generic_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_mode	= generic_set_mode,
-diff -urNp linux-2.6.39.3/drivers/ata/ata_piix.c linux-2.6.39.3/drivers/ata/ata_piix.c
---- linux-2.6.39.3/drivers/ata/ata_piix.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations piix_sata_ops = {
-+static const struct ata_port_operations piix_sata_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.sff_irq_check		= piix_irq_check,
- };
- 
--static struct ata_port_operations piix_pata_ops = {
-+static const struct ata_port_operations piix_pata_ops = {
- 	.inherits		= &piix_sata_ops,
- 	.cable_detect		= ata_cable_40wire,
- 	.set_piomode		= piix_set_piomode,
-@@ -348,12 +348,12 @@ static struct ata_port_operations piix_p
- 	.prereset		= piix_pata_prereset,
- };
- 
--static struct ata_port_operations piix_vmw_ops = {
-+static const struct ata_port_operations piix_vmw_ops = {
- 	.inherits		= &piix_pata_ops,
- 	.bmdma_status		= piix_vmw_bmdma_status,
- };
- 
--static struct ata_port_operations ich_pata_ops = {
-+static const struct ata_port_operations ich_pata_ops = {
- 	.inherits		= &piix_pata_ops,
- 	.cable_detect		= ich_pata_cable_detect,
- 	.set_dmamode		= ich_set_dmamode,
-@@ -369,7 +369,7 @@ static struct scsi_host_template piix_si
- 	.shost_attrs		= piix_sidpr_shost_attrs,
- };
- 
--static struct ata_port_operations piix_sidpr_sata_ops = {
-+static const struct ata_port_operations piix_sidpr_sata_ops = {
- 	.inherits		= &piix_sata_ops,
- 	.hardreset		= sata_std_hardreset,
- 	.scr_read		= piix_sidpr_scr_read,
-diff -urNp linux-2.6.39.3/drivers/ata/libahci.c linux-2.6.39.3/drivers/ata/libahci.c
---- linux-2.6.39.3/drivers/ata/libahci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
--struct ata_port_operations ahci_ops = {
-+const struct ata_port_operations ahci_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer		= ahci_pmp_qc_defer,
-diff -urNp linux-2.6.39.3/drivers/ata/libata-acpi.c linux-2.6.39.3/drivers/ata/libata-acpi.c
---- linux-2.6.39.3/drivers/ata/libata-acpi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/libata-acpi.c	2011-05-22 19:36:30.000000000 -0400
-@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han
- 	ata_acpi_uevent(dev->link->ap, dev, event);
- }
- 
--static struct acpi_dock_ops ata_acpi_dev_dock_ops = {
-+static const struct acpi_dock_ops ata_acpi_dev_dock_ops = {
- 	.handler = ata_acpi_dev_notify_dock,
- 	.uevent = ata_acpi_dev_uevent,
- };
- 
--static struct acpi_dock_ops ata_acpi_ap_dock_ops = {
-+static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
- 	.handler = ata_acpi_ap_notify_dock,
- 	.uevent = ata_acpi_ap_uevent,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/libata-core.c linux-2.6.39.3/drivers/ata/libata-core.c
---- linux-2.6.39.3/drivers/ata/libata-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/libata-core.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/ata/libata-core.c linux-2.6.39.4/drivers/ata/libata-core.c
+--- linux-2.6.39.4/drivers/ata/libata-core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/ata/libata-core.c	2011-08-05 20:34:06.000000000 -0400
 @@ -4747,7 +4747,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
@@ -25346,15 +22138,6 @@ diff -urNp linux-2.6.39.3/drivers/ata/libata-core.c linux-2.6.39.3/drivers/ata/l
  	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
  	ap = qc->ap;
  	link = qc->dev->link;
-@@ -5756,7 +5756,7 @@ static void ata_host_stop(struct device 
-  *	LOCKING:
-  *	None.
-  */
--static void ata_finalize_port_ops(struct ata_port_operations *ops)
-+static void ata_finalize_port_ops(const struct ata_port_operations *ops)
- {
- 	static DEFINE_SPINLOCK(lock);
- 	const struct ata_port_operations *cur;
 @@ -5768,6 +5768,7 @@ static void ata_finalize_port_ops(struct
  		return;
  
@@ -25368,33 +22151,15 @@ diff -urNp linux-2.6.39.3/drivers/ata/libata-core.c linux-2.6.39.3/drivers/ata/l
  			*pp = NULL;
  
 -	ops->inherits = NULL;
-+	((struct ata_port_operations *)ops)->inherits = NULL;
++	*(struct ata_port_operations **)&ops->inherits = NULL;
  
 +	pax_close_kernel();
  	spin_unlock(&lock);
  }
  
-@@ -5879,7 +5881,7 @@ int ata_host_start(struct ata_host *host
-  */
- /* KILLME - the only user left is ipr */
- void ata_host_init(struct ata_host *host, struct device *dev,
--		   unsigned long flags, struct ata_port_operations *ops)
-+		   unsigned long flags, const struct ata_port_operations *ops)
- {
- 	spin_lock_init(&host->lock);
- 	mutex_init(&host->eh_mutex);
-@@ -6583,7 +6585,7 @@ static void ata_dummy_error_handler(stru
- 	/* truly dummy */
- }
- 
--struct ata_port_operations ata_dummy_port_ops = {
-+const struct ata_port_operations ata_dummy_port_ops = {
- 	.qc_prep		= ata_noop_qc_prep,
- 	.qc_issue		= ata_dummy_qc_issue,
- 	.error_handler		= ata_dummy_error_handler,
-diff -urNp linux-2.6.39.3/drivers/ata/libata-eh.c linux-2.6.39.3/drivers/ata/libata-eh.c
---- linux-2.6.39.3/drivers/ata/libata-eh.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/libata-eh.c	2011-05-22 19:36:30.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/ata/libata-eh.c linux-2.6.39.4/drivers/ata/libata-eh.c
+--- linux-2.6.39.4/drivers/ata/libata-eh.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/drivers/ata/libata-eh.c	2011-08-05 21:12:20.000000000 -0400
 @@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
  {
  	struct ata_link *link;
@@ -25404,1483 +22169,23 @@ diff -urNp linux-2.6.39.3/drivers/ata/libata-eh.c linux-2.6.39.3/drivers/ata/lib
  	ata_for_each_link(link, ap, HOST_FIRST)
  		ata_eh_link_report(link);
  }
-@@ -3922,7 +3924,7 @@ void ata_do_eh(struct ata_port *ap, ata_
-  */
- void ata_std_error_handler(struct ata_port *ap)
- {
--	struct ata_port_operations *ops = ap->ops;
-+	const struct ata_port_operations *ops = ap->ops;
- 	ata_reset_fn_t hardreset = ops->hardreset;
- 
- 	/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.39.3/drivers/ata/libata-pmp.c linux-2.6.39.3/drivers/ata/libata-pmp.c
---- linux-2.6.39.3/drivers/ata/libata-pmp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/libata-pmp.c	2011-05-22 19:36:30.000000000 -0400
-@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str
-  */
- static int sata_pmp_eh_recover(struct ata_port *ap)
- {
--	struct ata_port_operations *ops = ap->ops;
-+	const struct ata_port_operations *ops = ap->ops;
- 	int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
- 	struct ata_link *pmp_link = &ap->link;
- 	struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.39.3/drivers/ata/pata_acpi.c linux-2.6.39.3/drivers/ata/pata_acpi.c
---- linux-2.6.39.3/drivers/ata/pata_acpi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations pacpi_ops = {
-+static const struct ata_port_operations pacpi_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_issue		= pacpi_qc_issue,
- 	.cable_detect		= pacpi_cable_detect,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_ali.c linux-2.6.39.3/drivers/ata/pata_ali.c
---- linux-2.6.39.3/drivers/ata/pata_ali.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
- 
--static struct ata_port_operations ali_early_port_ops = {
-+static const struct ata_port_operations ali_early_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= ali_set_piomode,
-@@ -380,7 +380,7 @@ static const struct ata_port_operations 
-  *	Port operations for DMA capable ALi without cable
-  *	detect
-  */
--static struct ata_port_operations ali_20_port_ops = {
-+static const struct ata_port_operations ali_20_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.mode_filter	= ali_20_filter,
-@@ -391,7 +391,7 @@ static struct ata_port_operations ali_20
- /*
-  *	Port operations for DMA capable ALi with cable detect
-  */
--static struct ata_port_operations ali_c2_port_ops = {
-+static const struct ata_port_operations ali_c2_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.check_atapi_dma = ali_check_atapi_dma,
- 	.cable_detect	= ali_c2_cable_detect,
-@@ -402,7 +402,7 @@ static struct ata_port_operations ali_c2
- /*
-  *	Port operations for DMA capable ALi with cable detect
-  */
--static struct ata_port_operations ali_c4_port_ops = {
-+static const struct ata_port_operations ali_c4_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.check_atapi_dma = ali_check_atapi_dma,
- 	.cable_detect	= ali_c2_cable_detect,
-@@ -412,7 +412,7 @@ static struct ata_port_operations ali_c4
- /*
-  *	Port operations for DMA capable ALi with cable detect and LBA48
-  */
--static struct ata_port_operations ali_c5_port_ops = {
-+static const struct ata_port_operations ali_c5_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.check_atapi_dma = ali_check_atapi_dma,
- 	.dev_config	= ali_warn_atapi_dma,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_amd.c linux-2.6.39.3/drivers/ata/pata_amd.c
---- linux-2.6.39.3/drivers/ata/pata_amd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_amd.c	2011-05-22 19:36:31.000000000 -0400
-@@ -397,28 +397,28 @@ static const struct ata_port_operations 
- 	.prereset	= amd_pre_reset,
- };
- 
--static struct ata_port_operations amd33_port_ops = {
-+static const struct ata_port_operations amd33_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= amd33_set_piomode,
- 	.set_dmamode	= amd33_set_dmamode,
- };
- 
--static struct ata_port_operations amd66_port_ops = {
-+static const struct ata_port_operations amd66_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_piomode	= amd66_set_piomode,
- 	.set_dmamode	= amd66_set_dmamode,
- };
- 
--static struct ata_port_operations amd100_port_ops = {
-+static const struct ata_port_operations amd100_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_piomode	= amd100_set_piomode,
- 	.set_dmamode	= amd100_set_dmamode,
- };
- 
--static struct ata_port_operations amd133_port_ops = {
-+static const struct ata_port_operations amd133_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= amd_cable_detect,
- 	.set_piomode	= amd133_set_piomode,
-@@ -433,13 +433,13 @@ static const struct ata_port_operations 
- 	.host_stop	= nv_host_stop,
- };
- 
--static struct ata_port_operations nv100_port_ops = {
-+static const struct ata_port_operations nv100_port_ops = {
- 	.inherits	= &nv_base_port_ops,
- 	.set_piomode	= nv100_set_piomode,
- 	.set_dmamode	= nv100_set_dmamode,
- };
- 
--static struct ata_port_operations nv133_port_ops = {
-+static const struct ata_port_operations nv133_port_ops = {
- 	.inherits	= &nv_base_port_ops,
- 	.set_piomode	= nv133_set_piomode,
- 	.set_dmamode	= nv133_set_dmamode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_arasan_cf.c linux-2.6.39.3/drivers/ata/pata_arasan_cf.c
---- linux-2.6.39.3/drivers/ata/pata_arasan_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_arasan_cf.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/ata/pata_arasan_cf.c linux-2.6.39.4/drivers/ata/pata_arasan_cf.c
+--- linux-2.6.39.4/drivers/ata/pata_arasan_cf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/ata/pata_arasan_cf.c	2011-08-05 20:34:06.000000000 -0400
 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
  	/* Handle platform specific quirks */
  	if (pdata->quirk) {
  		if (pdata->quirk & CF_BROKEN_PIO) {
 -			ap->ops->set_piomode = NULL;
 +			pax_open_kernel();
-+			*(void**)&ap->ops->set_piomode = NULL;
++			*(void **)&ap->ops->set_piomode = NULL;
 +			pax_close_kernel();
  			ap->pio_mask = 0;
  		}
  		if (pdata->quirk & CF_BROKEN_MWDMA)
-diff -urNp linux-2.6.39.3/drivers/ata/pata_artop.c linux-2.6.39.3/drivers/ata/pata_artop.c
---- linux-2.6.39.3/drivers/ata/pata_artop.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_artop.c	2011-05-22 19:36:31.000000000 -0400
-@@ -312,7 +312,7 @@ static struct scsi_host_template artop_s
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations artop6210_ops = {
-+static const struct ata_port_operations artop6210_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= ata_cable_40wire,
- 	.set_piomode		= artop6210_set_piomode,
-@@ -321,7 +321,7 @@ static struct ata_port_operations artop6
- 	.qc_defer		= artop6210_qc_defer,
- };
- 
--static struct ata_port_operations artop6260_ops = {
-+static const struct ata_port_operations artop6260_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= artop6260_cable_detect,
- 	.set_piomode		= artop6260_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_at32.c linux-2.6.39.3/drivers/ata/pata_at32.c
---- linux-2.6.39.3/drivers/ata/pata_at32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations at32_port_ops = {
-+static const struct ata_port_operations at32_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.cable_detect		= ata_cable_40wire,
- 	.set_piomode		= pata_at32_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_at91.c linux-2.6.39.3/drivers/ata/pata_at91.c
---- linux-2.6.39.3/drivers/ata/pata_at91.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations pata_at91_port_ops = {
-+static const struct ata_port_operations pata_at91_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 
- 	.sff_data_xfer	= pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_atiixp.c linux-2.6.39.3/drivers/ata/pata_atiixp.c
---- linux-2.6.39.3/drivers/ata/pata_atiixp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_atiixp.c	2011-05-22 19:36:31.000000000 -0400
-@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
- 	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations atiixp_port_ops = {
-+static const struct ata_port_operations atiixp_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_atp867x.c linux-2.6.39.3/drivers/ata/pata_atp867x.c
---- linux-2.6.39.3/drivers/ata/pata_atp867x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_atp867x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations atp867x_ops = {
-+static const struct ata_port_operations atp867x_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= atp867x_cable_detect,
- 	.set_piomode		= atp867x_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_bf54x.c linux-2.6.39.3/drivers/ata/pata_bf54x.c
---- linux-2.6.39.3/drivers/ata/pata_bf54x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_bf54x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations bfin_pata_ops = {
-+static const struct ata_port_operations bfin_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.set_piomode		= bfin_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_cmd640.c linux-2.6.39.3/drivers/ata/pata_cmd640.c
---- linux-2.6.39.3/drivers/ata/pata_cmd640.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_cmd640.c	2011-05-22 19:36:31.000000000 -0400
-@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cmd640_port_ops = {
-+static const struct ata_port_operations cmd640_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	/* In theory xfer_noirq is not needed once we kill the prefetcher */
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_cmd64x.c linux-2.6.39.3/drivers/ata/pata_cmd64x.c
---- linux-2.6.39.3/drivers/ata/pata_cmd64x.c	2011-06-03 00:04:13.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_cmd64x.c	2011-06-03 00:32:05.000000000 -0400
-@@ -271,18 +271,18 @@ static const struct ata_port_operations 
- 	.set_dmamode	= cmd64x_set_dmamode,
- };
- 
--static struct ata_port_operations cmd64x_port_ops = {
-+static const struct ata_port_operations cmd64x_port_ops = {
- 	.inherits	= &cmd64x_base_ops,
- 	.cable_detect	= ata_cable_40wire,
- };
- 
--static struct ata_port_operations cmd646r1_port_ops = {
-+static const struct ata_port_operations cmd646r1_port_ops = {
- 	.inherits	= &cmd64x_base_ops,
- 	.bmdma_stop	= cmd646r1_bmdma_stop,
- 	.cable_detect	= ata_cable_40wire,
- };
- 
--static struct ata_port_operations cmd648_port_ops = {
-+static const struct ata_port_operations cmd648_port_ops = {
- 	.inherits	= &cmd64x_base_ops,
- 	.bmdma_stop	= cmd648_bmdma_stop,
- 	.cable_detect	= cmd648_cable_detect,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_cs5520.c linux-2.6.39.3/drivers/ata/pata_cs5520.c
---- linux-2.6.39.3/drivers/ata/pata_cs5520.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_cs5520.c	2011-05-22 19:36:31.000000000 -0400
-@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
- 	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations cs5520_port_ops = {
-+static const struct ata_port_operations cs5520_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_prep		= ata_bmdma_dumb_qc_prep,
- 	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_cs5530.c linux-2.6.39.3/drivers/ata/pata_cs5530.c
---- linux-2.6.39.3/drivers/ata/pata_cs5530.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_cs5530.c	2011-05-22 19:36:31.000000000 -0400
-@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
- 	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations cs5530_port_ops = {
-+static const struct ata_port_operations cs5530_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_cs5535.c linux-2.6.39.3/drivers/ata/pata_cs5535.c
---- linux-2.6.39.3/drivers/ata/pata_cs5535.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_cs5535.c	2011-05-22 19:36:31.000000000 -0400
-@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cs5535_port_ops = {
-+static const struct ata_port_operations cs5535_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= cs5535_cable_detect,
- 	.set_piomode	= cs5535_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_cs5536.c linux-2.6.39.3/drivers/ata/pata_cs5536.c
---- linux-2.6.39.3/drivers/ata/pata_cs5536.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_cs5536.c	2011-05-22 19:36:31.000000000 -0400
-@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cs5536_port_ops = {
-+static const struct ata_port_operations cs5536_port_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.cable_detect		= cs5536_cable_detect,
- 	.set_piomode		= cs5536_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_cypress.c linux-2.6.39.3/drivers/ata/pata_cypress.c
---- linux-2.6.39.3/drivers/ata/pata_cypress.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_cypress.c	2011-05-22 19:36:31.000000000 -0400
-@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cy82c693_port_ops = {
-+static const struct ata_port_operations cy82c693_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= cy82c693_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_efar.c linux-2.6.39.3/drivers/ata/pata_efar.c
---- linux-2.6.39.3/drivers/ata/pata_efar.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations efar_ops = {
-+static const struct ata_port_operations efar_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= efar_cable_detect,
- 	.set_piomode		= efar_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_hpt366.c linux-2.6.39.3/drivers/ata/pata_hpt366.c
---- linux-2.6.39.3/drivers/ata/pata_hpt366.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_hpt366.c	2011-05-22 19:36:31.000000000 -0400
-@@ -276,7 +276,7 @@ static struct scsi_host_template hpt36x_
-  *	Configuration for HPT366/68
-  */
- 
--static struct ata_port_operations hpt366_port_ops = {
-+static const struct ata_port_operations hpt366_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= hpt36x_cable_detect,
- 	.mode_filter	= hpt366_filter,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_hpt37x.c linux-2.6.39.3/drivers/ata/pata_hpt37x.c
---- linux-2.6.39.3/drivers/ata/pata_hpt37x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_hpt37x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -589,7 +589,7 @@ static struct scsi_host_template hpt37x_
-  *	Configuration for HPT370
-  */
- 
--static struct ata_port_operations hpt370_port_ops = {
-+static const struct ata_port_operations hpt370_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.bmdma_stop	= hpt370_bmdma_stop,
-@@ -605,7 +605,7 @@ static struct ata_port_operations hpt370
-  *	Configuration for HPT370A. Close to 370 but less filters
-  */
- 
--static struct ata_port_operations hpt370a_port_ops = {
-+static const struct ata_port_operations hpt370a_port_ops = {
- 	.inherits	= &hpt370_port_ops,
- 	.mode_filter	= hpt370a_filter,
- };
-@@ -615,7 +615,7 @@ static struct ata_port_operations hpt370
-  *	mode setting functionality.
-  */
- 
--static struct ata_port_operations hpt302_port_ops = {
-+static const struct ata_port_operations hpt302_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.bmdma_stop	= hpt37x_bmdma_stop,
-@@ -631,7 +631,7 @@ static struct ata_port_operations hpt302
-  *	but we have a mode filter.
-  */
- 
--static struct ata_port_operations hpt372_port_ops = {
-+static const struct ata_port_operations hpt372_port_ops = {
- 	.inherits	= &hpt302_port_ops,
- 	.mode_filter	= hpt372_filter,
- };
-@@ -641,7 +641,7 @@ static struct ata_port_operations hpt372
-  *	but we have a different cable detection procedure for function 1.
-  */
- 
--static struct ata_port_operations hpt374_fn1_port_ops = {
-+static const struct ata_port_operations hpt374_fn1_port_ops = {
- 	.inherits	= &hpt372_port_ops,
- 	.cable_detect	= hpt374_fn1_cable_detect,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pata_hpt3x2n.c linux-2.6.39.3/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.39.3/drivers/ata/pata_hpt3x2n.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_hpt3x2n.c	2011-05-22 19:36:31.000000000 -0400
-@@ -350,7 +350,7 @@ static struct scsi_host_template hpt3x2n
-  *	Configuration for HPT302N/371N.
-  */
- 
--static struct ata_port_operations hpt3xxn_port_ops = {
-+static const struct ata_port_operations hpt3xxn_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.bmdma_stop	= hpt3x2n_bmdma_stop,
-@@ -368,7 +368,7 @@ static struct ata_port_operations hpt3xx
-  *	Configuration for HPT372N. Same as 302N/371N but we have a mode filter.
-  */
- 
--static struct ata_port_operations hpt372n_port_ops = {
-+static const struct ata_port_operations hpt372n_port_ops = {
- 	.inherits	= &hpt3xxn_port_ops,
- 	.mode_filter	= &hpt372n_filter,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pata_hpt3x3.c linux-2.6.39.3/drivers/ata/pata_hpt3x3.c
---- linux-2.6.39.3/drivers/ata/pata_hpt3x3.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_hpt3x3.c	2011-05-22 19:36:31.000000000 -0400
-@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations hpt3x3_port_ops = {
-+static const struct ata_port_operations hpt3x3_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= hpt3x3_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_icside.c linux-2.6.39.3/drivers/ata/pata_icside.c
---- linux-2.6.39.3/drivers/ata/pata_icside.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_icside.c	2011-05-22 19:36:31.000000000 -0400
-@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
- 	}
- }
- 
--static struct ata_port_operations pata_icside_port_ops = {
-+static const struct ata_port_operations pata_icside_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	/* no need to build any PRD tables for DMA */
- 	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_isapnp.c linux-2.6.39.3/drivers/ata/pata_isapnp.c
---- linux-2.6.39.3/drivers/ata/pata_isapnp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_isapnp.c	2011-05-22 19:36:31.000000000 -0400
-@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations isapnp_port_ops = {
-+static const struct ata_port_operations isapnp_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- };
- 
--static struct ata_port_operations isapnp_noalt_port_ops = {
-+static const struct ata_port_operations isapnp_noalt_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	/* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.39.3/drivers/ata/pata_it8213.c linux-2.6.39.3/drivers/ata/pata_it8213.c
---- linux-2.6.39.3/drivers/ata/pata_it8213.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_it8213.c	2011-05-22 19:36:31.000000000 -0400
-@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
- };
- 
- 
--static struct ata_port_operations it8213_ops = {
-+static const struct ata_port_operations it8213_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= it8213_cable_detect,
- 	.set_piomode		= it8213_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_it821x.c linux-2.6.39.3/drivers/ata/pata_it821x.c
---- linux-2.6.39.3/drivers/ata/pata_it821x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_it821x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations it821x_smart_port_ops = {
-+static const struct ata_port_operations it821x_smart_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma= it821x_check_atapi_dma,
-@@ -815,7 +815,7 @@ static struct ata_port_operations it821x
- 	.port_start	= it821x_port_start,
- };
- 
--static struct ata_port_operations it821x_passthru_port_ops = {
-+static const struct ata_port_operations it821x_passthru_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma= it821x_check_atapi_dma,
-@@ -831,7 +831,7 @@ static struct ata_port_operations it821x
- 	.port_start	= it821x_port_start,
- };
- 
--static struct ata_port_operations it821x_rdc_port_ops = {
-+static const struct ata_port_operations it821x_rdc_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_ixp4xx_cf.c linux-2.6.39.3/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.39.3/drivers/ata/pata_ixp4xx_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_ixp4xx_cf.c	2011-05-22 19:36:31.000000000 -0400
-@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations ixp4xx_port_ops = {
-+static const struct ata_port_operations ixp4xx_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ixp4xx_mmio_data_xfer,
- 	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_jmicron.c linux-2.6.39.3/drivers/ata/pata_jmicron.c
---- linux-2.6.39.3/drivers/ata/pata_jmicron.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_jmicron.c	2011-05-22 19:36:31.000000000 -0400
-@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations jmicron_ops = {
-+static const struct ata_port_operations jmicron_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.prereset		= jmicron_pre_reset,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pata_legacy.c linux-2.6.39.3/drivers/ata/pata_legacy.c
---- linux-2.6.39.3/drivers/ata/pata_legacy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_legacy.c	2011-05-22 19:36:31.000000000 -0400
-@@ -116,7 +116,7 @@ struct legacy_probe {
- 
- struct legacy_controller {
- 	const char *name;
--	struct ata_port_operations *ops;
-+	const struct ata_port_operations *ops;
- 	unsigned int pio_mask;
- 	unsigned int flags;
- 	unsigned int pflags;
-@@ -239,12 +239,12 @@ static const struct ata_port_operations 
-  *	pio_mask as well.
-  */
- 
--static struct ata_port_operations simple_port_ops = {
-+static const struct ata_port_operations simple_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- };
- 
--static struct ata_port_operations legacy_port_ops = {
-+static const struct ata_port_operations legacy_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- 	.set_mode	= legacy_set_mode,
-@@ -340,7 +340,7 @@ static unsigned int pdc_data_xfer_vlb(st
- 	return buflen;
- }
- 
--static struct ata_port_operations pdc20230_port_ops = {
-+static const struct ata_port_operations pdc20230_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= pdc20230_set_piomode,
- 	.sff_data_xfer	= pdc_data_xfer_vlb,
-@@ -373,7 +373,7 @@ static void ht6560a_set_piomode(struct a
- 	ioread8(ap->ioaddr.status_addr);
- }
- 
--static struct ata_port_operations ht6560a_port_ops = {
-+static const struct ata_port_operations ht6560a_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= ht6560a_set_piomode,
- };
-@@ -416,7 +416,7 @@ static void ht6560b_set_piomode(struct a
- 	ioread8(ap->ioaddr.status_addr);
- }
- 
--static struct ata_port_operations ht6560b_port_ops = {
-+static const struct ata_port_operations ht6560b_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= ht6560b_set_piomode,
- };
-@@ -515,7 +515,7 @@ static void opti82c611a_set_piomode(stru
- }
- 
- 
--static struct ata_port_operations opti82c611a_port_ops = {
-+static const struct ata_port_operations opti82c611a_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= opti82c611a_set_piomode,
- };
-@@ -625,7 +625,7 @@ static unsigned int opti82c46x_qc_issue(
- 	return ata_sff_qc_issue(qc);
- }
- 
--static struct ata_port_operations opti82c46x_port_ops = {
-+static const struct ata_port_operations opti82c46x_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= opti82c46x_set_piomode,
- 	.qc_issue	= opti82c46x_qc_issue,
-@@ -787,20 +787,20 @@ static int qdi_port(struct platform_devi
- 	return 0;
- }
- 
--static struct ata_port_operations qdi6500_port_ops = {
-+static const struct ata_port_operations qdi6500_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= qdi6500_set_piomode,
- 	.qc_issue	= qdi_qc_issue,
- 	.sff_data_xfer	= vlb32_data_xfer,
- };
- 
--static struct ata_port_operations qdi6580_port_ops = {
-+static const struct ata_port_operations qdi6580_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= qdi6580_set_piomode,
- 	.sff_data_xfer	= vlb32_data_xfer,
- };
- 
--static struct ata_port_operations qdi6580dp_port_ops = {
-+static const struct ata_port_operations qdi6580dp_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= qdi6580dp_set_piomode,
- 	.qc_issue	= qdi_qc_issue,
-@@ -872,7 +872,7 @@ static int winbond_port(struct platform_
- 	return 0;
- }
- 
--static struct ata_port_operations winbond_port_ops = {
-+static const struct ata_port_operations winbond_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= winbond_set_piomode,
- 	.sff_data_xfer	= vlb32_data_xfer,
-@@ -995,7 +995,7 @@ static __init int legacy_init_one(struct
- 	int pio_modes = controller->pio_mask;
- 	unsigned long io = probe->port;
- 	u32 mask = (1 << probe->slot);
--	struct ata_port_operations *ops = controller->ops;
-+	const struct ata_port_operations *ops = controller->ops;
- 	struct legacy_data *ld = &legacy_data[probe->slot];
- 	struct ata_host *host = NULL;
- 	struct ata_port *ap;
-diff -urNp linux-2.6.39.3/drivers/ata/pata_macio.c linux-2.6.39.3/drivers/ata/pata_macio.c
---- linux-2.6.39.3/drivers/ata/pata_macio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_macio.c	2011-05-22 19:36:31.000000000 -0400
-@@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
- 	.slave_configure	= pata_macio_slave_config,
- };
- 
--static struct ata_port_operations pata_macio_ops = {
-+static const struct ata_port_operations pata_macio_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
--
- 	.freeze			= pata_macio_freeze,
- 	.set_piomode		= pata_macio_set_timings,
- 	.set_dmamode		= pata_macio_set_timings,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_marvell.c linux-2.6.39.3/drivers/ata/pata_marvell.c
---- linux-2.6.39.3/drivers/ata/pata_marvell.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_marvell.c	2011-05-22 19:36:31.000000000 -0400
-@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations marvell_ops = {
-+static const struct ata_port_operations marvell_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= marvell_cable_detect,
- 	.prereset		= marvell_pre_reset,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_mpc52xx.c linux-2.6.39.3/drivers/ata/pata_mpc52xx.c
---- linux-2.6.39.3/drivers/ata/pata_mpc52xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_mpc52xx.c	2011-05-22 19:36:31.000000000 -0400
-@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations mpc52xx_ata_port_ops = {
-+static const struct ata_port_operations mpc52xx_ata_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.sff_dev_select		= mpc52xx_ata_dev_select,
- 	.set_piomode		= mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_mpiix.c linux-2.6.39.3/drivers/ata/pata_mpiix.c
---- linux-2.6.39.3/drivers/ata/pata_mpiix.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_mpiix.c	2011-05-22 19:36:31.000000000 -0400
-@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations mpiix_port_ops = {
-+static const struct ata_port_operations mpiix_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.qc_issue	= mpiix_qc_issue,
- 	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_netcell.c linux-2.6.39.3/drivers/ata/pata_netcell.c
---- linux-2.6.39.3/drivers/ata/pata_netcell.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_netcell.c	2011-05-22 19:36:31.000000000 -0400
-@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations netcell_ops = {
-+static const struct ata_port_operations netcell_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_80wire,
- 	.read_id	= netcell_read_id,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_ninja32.c linux-2.6.39.3/drivers/ata/pata_ninja32.c
---- linux-2.6.39.3/drivers/ata/pata_ninja32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_ninja32.c	2011-05-22 19:36:31.000000000 -0400
-@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations ninja32_port_ops = {
-+static const struct ata_port_operations ninja32_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.sff_dev_select = ninja32_dev_select,
- 	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_ns87410.c linux-2.6.39.3/drivers/ata/pata_ns87410.c
---- linux-2.6.39.3/drivers/ata/pata_ns87410.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_ns87410.c	2011-05-22 19:36:31.000000000 -0400
-@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations ns87410_port_ops = {
-+static const struct ata_port_operations ns87410_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.qc_issue	= ns87410_qc_issue,
- 	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_ns87415.c linux-2.6.39.3/drivers/ata/pata_ns87415.c
---- linux-2.6.39.3/drivers/ata/pata_ns87415.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_ns87415.c	2011-05-22 19:36:31.000000000 -0400
-@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
- }
- #endif		/* 87560 SuperIO Support */
- 
--static struct ata_port_operations ns87415_pata_ops = {
-+static const struct ata_port_operations ns87415_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma	= ns87415_check_atapi_dma,
-@@ -313,7 +313,7 @@ static struct ata_port_operations ns8741
- };
- 
- #if defined(CONFIG_SUPERIO)
--static struct ata_port_operations ns87560_pata_ops = {
-+static const struct ata_port_operations ns87560_pata_ops = {
- 	.inherits		= &ns87415_pata_ops,
- 	.sff_tf_read		= ns87560_tf_read,
- 	.sff_check_status	= ns87560_check_status,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_octeon_cf.c linux-2.6.39.3/drivers/ata/pata_octeon_cf.c
---- linux-2.6.39.3/drivers/ata/pata_octeon_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_octeon_cf.c	2011-05-22 19:36:31.000000000 -0400
-@@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s
- 	return 0;
- }
- 
--static struct ata_port_operations octeon_cf_ops = {
-+static struct ata_port_operations octeon_cf_ops = {	/* cannot be const */
- 	.inherits		= &ata_sff_port_ops,
- 	.check_atapi_dma	= octeon_cf_check_atapi_dma,
- 	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_oldpiix.c linux-2.6.39.3/drivers/ata/pata_oldpiix.c
---- linux-2.6.39.3/drivers/ata/pata_oldpiix.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_oldpiix.c	2011-05-22 19:36:31.000000000 -0400
-@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations oldpiix_pata_ops = {
-+static const struct ata_port_operations oldpiix_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_issue		= oldpiix_qc_issue,
- 	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_opti.c linux-2.6.39.3/drivers/ata/pata_opti.c
---- linux-2.6.39.3/drivers/ata/pata_opti.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations opti_port_ops = {
-+static const struct ata_port_operations opti_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= opti_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_optidma.c linux-2.6.39.3/drivers/ata/pata_optidma.c
---- linux-2.6.39.3/drivers/ata/pata_optidma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_optidma.c	2011-05-22 19:36:31.000000000 -0400
-@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations optidma_port_ops = {
-+static const struct ata_port_operations optidma_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= optidma_set_pio_mode,
-@@ -346,7 +346,7 @@ static struct ata_port_operations optidm
- 	.prereset	= optidma_pre_reset,
- };
- 
--static struct ata_port_operations optiplus_port_ops = {
-+static const struct ata_port_operations optiplus_port_ops = {
- 	.inherits	= &optidma_port_ops,
- 	.set_piomode	= optiplus_set_pio_mode,
- 	.set_dmamode	= optiplus_set_dma_mode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_palmld.c linux-2.6.39.3/drivers/ata/pata_palmld.c
---- linux-2.6.39.3/drivers/ata/pata_palmld.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_palmld.c	2011-05-22 19:36:31.000000000 -0400
-@@ -42,7 +42,7 @@ static struct scsi_host_template palmld_
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations palmld_port_ops = {
-+static const struct ata_port_operations palmld_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ata_sff_data_xfer_noirq,
- 	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_pcmcia.c linux-2.6.39.3/drivers/ata/pata_pcmcia.c
---- linux-2.6.39.3/drivers/ata/pata_pcmcia.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_pcmcia.c	2011-05-22 19:36:31.000000000 -0400
-@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pcmcia_port_ops = {
-+static const struct ata_port_operations pcmcia_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_mode	= pcmcia_set_mode,
- };
- 
--static struct ata_port_operations pcmcia_8bit_port_ops = {
-+static const struct ata_port_operations pcmcia_8bit_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.sff_data_xfer	= ata_data_xfer_8bit,
- 	.cable_detect	= ata_cable_40wire,
-@@ -205,7 +205,7 @@ static int pcmcia_init_one(struct pcmcia
- 	unsigned long io_base, ctl_base;
- 	void __iomem *io_addr, *ctl_addr;
- 	int n_ports = 1;
--	struct ata_port_operations *ops = &pcmcia_port_ops;
-+	const struct ata_port_operations *ops = &pcmcia_port_ops;
- 
- 	/* Set up attributes in order to probe card and get resources */
- 	pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |
-diff -urNp linux-2.6.39.3/drivers/ata/pata_pdc2027x.c linux-2.6.39.3/drivers/ata/pata_pdc2027x.c
---- linux-2.6.39.3/drivers/ata/pata_pdc2027x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_pdc2027x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pdc2027x_pata100_ops = {
-+static const struct ata_port_operations pdc2027x_pata100_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.check_atapi_dma	= pdc2027x_check_atapi_dma,
- 	.cable_detect		= pdc2027x_cable_detect,
- 	.prereset		= pdc2027x_prereset,
- };
- 
--static struct ata_port_operations pdc2027x_pata133_ops = {
-+static const struct ata_port_operations pdc2027x_pata133_ops = {
- 	.inherits		= &pdc2027x_pata100_ops,
- 	.mode_filter		= pdc2027x_mode_filter,
- 	.set_piomode		= pdc2027x_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_pdc202xx_old.c linux-2.6.39.3/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.39.3/drivers/ata/pata_pdc202xx_old.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_pdc202xx_old.c	2011-05-22 19:36:31.000000000 -0400
-@@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pdc2024x_port_ops = {
-+static const struct ata_port_operations pdc2024x_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.cable_detect		= ata_cable_40wire,
-@@ -306,7 +306,7 @@ static struct ata_port_operations pdc202
- 	.sff_irq_check		= pdc202xx_irq_check,
- };
- 
--static struct ata_port_operations pdc2026x_port_ops = {
-+static const struct ata_port_operations pdc2026x_port_ops = {
- 	.inherits		= &pdc2024x_port_ops,
- 
- 	.check_atapi_dma	= pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_piccolo.c linux-2.6.39.3/drivers/ata/pata_piccolo.c
---- linux-2.6.39.3/drivers/ata/pata_piccolo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_piccolo.c	2011-05-22 19:36:31.000000000 -0400
-@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations tosh_port_ops = {
-+static const struct ata_port_operations tosh_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_piomode	= tosh_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_platform.c linux-2.6.39.3/drivers/ata/pata_platform.c
---- linux-2.6.39.3/drivers/ata/pata_platform.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_platform.c	2011-05-22 19:36:31.000000000 -0400
-@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pata_platform_port_ops = {
-+static const struct ata_port_operations pata_platform_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ata_sff_data_xfer_noirq,
- 	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_pxa.c linux-2.6.39.3/drivers/ata/pata_pxa.c
---- linux-2.6.39.3/drivers/ata/pata_pxa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations pxa_ata_port_ops = {
-+static const struct ata_port_operations pxa_ata_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= ata_cable_40wire,
- 
-diff -urNp linux-2.6.39.3/drivers/ata/pata_qdi.c linux-2.6.39.3/drivers/ata/pata_qdi.c
---- linux-2.6.39.3/drivers/ata/pata_qdi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations qdi6500_port_ops = {
-+static const struct ata_port_operations qdi6500_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.qc_issue	= qdi_qc_issue,
- 	.sff_data_xfer	= qdi_data_xfer,
-@@ -165,7 +165,7 @@ static struct ata_port_operations qdi650
- 	.set_piomode	= qdi6500_set_piomode,
- };
- 
--static struct ata_port_operations qdi6580_port_ops = {
-+static const struct ata_port_operations qdi6580_port_ops = {
- 	.inherits	= &qdi6500_port_ops,
- 	.set_piomode	= qdi6580_set_piomode,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pata_radisys.c linux-2.6.39.3/drivers/ata/pata_radisys.c
---- linux-2.6.39.3/drivers/ata/pata_radisys.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_radisys.c	2011-05-22 19:36:31.000000000 -0400
-@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations radisys_pata_ops = {
-+static const struct ata_port_operations radisys_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_issue		= radisys_qc_issue,
- 	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_rb532_cf.c linux-2.6.39.3/drivers/ata/pata_rb532_cf.c
---- linux-2.6.39.3/drivers/ata/pata_rb532_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_rb532_cf.c	2011-05-22 19:36:31.000000000 -0400
-@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
- 	return IRQ_HANDLED;
- }
- 
--static struct ata_port_operations rb532_pata_port_ops = {
-+static const struct ata_port_operations rb532_pata_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ata_sff_data_xfer32,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pata_rdc.c linux-2.6.39.3/drivers/ata/pata_rdc.c
---- linux-2.6.39.3/drivers/ata/pata_rdc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct ata_port_operations rdc_pata_ops = {
-+static const struct ata_port_operations rdc_pata_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.cable_detect		= rdc_pata_cable_detect,
- 	.set_piomode		= rdc_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_rz1000.c linux-2.6.39.3/drivers/ata/pata_rz1000.c
---- linux-2.6.39.3/drivers/ata/pata_rz1000.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_rz1000.c	2011-05-22 19:36:31.000000000 -0400
-@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations rz1000_port_ops = {
-+static const struct ata_port_operations rz1000_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_mode	= rz1000_set_mode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_samsung_cf.c linux-2.6.39.3/drivers/ata/pata_samsung_cf.c
---- linux-2.6.39.3/drivers/ata/pata_samsung_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_samsung_cf.c	2011-05-22 19:36:31.000000000 -0400
-@@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pata_s3c_port_ops = {
-+static const struct ata_port_operations pata_s3c_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_check_status	= pata_s3c_check_status,
- 	.sff_check_altstatus    = pata_s3c_check_altstatus,
-@@ -413,7 +413,7 @@ static struct ata_port_operations pata_s
- 	.set_piomode		= pata_s3c_set_piomode,
- };
- 
--static struct ata_port_operations pata_s5p_port_ops = {
-+static const struct ata_port_operations pata_s5p_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.set_piomode		= pata_s3c_set_piomode,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pata_sc1200.c linux-2.6.39.3/drivers/ata/pata_sc1200.c
---- linux-2.6.39.3/drivers/ata/pata_sc1200.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_sc1200.c	2011-05-22 19:36:31.000000000 -0400
-@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
- 	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations sc1200_port_ops = {
-+static const struct ata_port_operations sc1200_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
- 	.qc_issue	= sc1200_qc_issue,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_scc.c linux-2.6.39.3/drivers/ata/pata_scc.c
---- linux-2.6.39.3/drivers/ata/pata_scc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations scc_pata_ops = {
-+static const struct ata_port_operations scc_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.set_piomode		= scc_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_sch.c linux-2.6.39.3/drivers/ata/pata_sch.c
---- linux-2.6.39.3/drivers/ata/pata_sch.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations sch_pata_ops = {
-+static const struct ata_port_operations sch_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= ata_cable_unknown,
- 	.set_piomode		= sch_set_piomode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_serverworks.c linux-2.6.39.3/drivers/ata/pata_serverworks.c
---- linux-2.6.39.3/drivers/ata/pata_serverworks.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_serverworks.c	2011-05-22 19:36:31.000000000 -0400
-@@ -300,7 +300,7 @@ static struct scsi_host_template serverw
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations serverworks_osb4_port_ops = {
-+static const struct ata_port_operations serverworks_osb4_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= serverworks_cable_detect,
- 	.mode_filter	= serverworks_osb4_filter,
-@@ -308,7 +308,7 @@ static struct ata_port_operations server
- 	.set_dmamode	= serverworks_set_dmamode,
- };
- 
--static struct ata_port_operations serverworks_csb_port_ops = {
-+static const struct ata_port_operations serverworks_csb_port_ops = {
- 	.inherits	= &serverworks_osb4_port_ops,
- 	.mode_filter	= serverworks_csb_filter,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pata_sil680.c linux-2.6.39.3/drivers/ata/pata_sil680.c
---- linux-2.6.39.3/drivers/ata/pata_sil680.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_sil680.c	2011-05-22 19:36:31.000000000 -0400
-@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--
--static struct ata_port_operations sil680_port_ops = {
-+static const struct ata_port_operations sil680_port_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.sff_exec_command	= sil680_sff_exec_command,
- 	.sff_irq_check		= sil680_sff_irq_check,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_sis.c linux-2.6.39.3/drivers/ata/pata_sis.c
---- linux-2.6.39.3/drivers/ata/pata_sis.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations sis_133_for_sata_ops = {
-+static const struct ata_port_operations sis_133_for_sata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.set_piomode		= sis_133_set_piomode,
- 	.set_dmamode		= sis_133_set_dmamode,
- 	.cable_detect		= sis_133_cable_detect,
- };
- 
--static struct ata_port_operations sis_base_ops = {
-+static const struct ata_port_operations sis_base_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.prereset		= sis_pre_reset,
- };
- 
--static struct ata_port_operations sis_133_ops = {
-+static const struct ata_port_operations sis_133_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_133_set_piomode,
- 	.set_dmamode		= sis_133_set_dmamode,
- 	.cable_detect		= sis_133_cable_detect,
- };
- 
--static struct ata_port_operations sis_133_early_ops = {
-+static const struct ata_port_operations sis_133_early_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_100_set_piomode,
- 	.set_dmamode		= sis_133_early_set_dmamode,
- 	.cable_detect		= sis_66_cable_detect,
- };
- 
--static struct ata_port_operations sis_100_ops = {
-+static const struct ata_port_operations sis_100_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_100_set_piomode,
- 	.set_dmamode		= sis_100_set_dmamode,
- 	.cable_detect		= sis_66_cable_detect,
- };
- 
--static struct ata_port_operations sis_66_ops = {
-+static const struct ata_port_operations sis_66_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_old_set_piomode,
- 	.set_dmamode		= sis_66_set_dmamode,
- 	.cable_detect		= sis_66_cable_detect,
- };
- 
--static struct ata_port_operations sis_old_ops = {
-+static const struct ata_port_operations sis_old_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_old_set_piomode,
- 	.set_dmamode		= sis_old_set_dmamode,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_sl82c105.c linux-2.6.39.3/drivers/ata/pata_sl82c105.c
---- linux-2.6.39.3/drivers/ata/pata_sl82c105.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_sl82c105.c	2011-05-22 19:36:31.000000000 -0400
-@@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations sl82c105_port_ops = {
-+static const struct ata_port_operations sl82c105_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.qc_defer	= sl82c105_qc_defer,
- 	.bmdma_start 	= sl82c105_bmdma_start,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_triflex.c linux-2.6.39.3/drivers/ata/pata_triflex.c
---- linux-2.6.39.3/drivers/ata/pata_triflex.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/pata_triflex.c	2011-05-22 19:36:31.000000000 -0400
-@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations triflex_port_ops = {
-+static const struct ata_port_operations triflex_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.bmdma_start 	= triflex_bmdma_start,
- 	.bmdma_stop	= triflex_bmdma_stop,
-diff -urNp linux-2.6.39.3/drivers/ata/pata_via.c linux-2.6.39.3/drivers/ata/pata_via.c
---- linux-2.6.39.3/drivers/ata/pata_via.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations via_port_ops = {
-+static const struct ata_port_operations via_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= via_cable_detect,
- 	.set_piomode	= via_set_piomode,
-@@ -452,7 +452,7 @@ static struct ata_port_operations via_po
- 	.mode_filter	= via_mode_filter,
- };
- 
--static struct ata_port_operations via_port_ops_noirq = {
-+static const struct ata_port_operations via_port_ops_noirq = {
- 	.inherits	= &via_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- };
-diff -urNp linux-2.6.39.3/drivers/ata/pdc_adma.c linux-2.6.39.3/drivers/ata/pdc_adma.c
---- linux-2.6.39.3/drivers/ata/pdc_adma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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		= ADMA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations adma_ata_ops = {
-+static const struct ata_port_operations adma_ata_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.lost_interrupt		= ATA_OP_NULL,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_dwc_460ex.c linux-2.6.39.3/drivers/ata/sata_dwc_460ex.c
---- linux-2.6.39.3/drivers/ata/sata_dwc_460ex.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_dwc_460ex.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1598,7 +1598,7 @@ static struct scsi_host_template sata_dw
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sata_dwc_ops = {
-+static const struct ata_port_operations sata_dwc_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.error_handler		= sata_dwc_error_handler,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_fsl.c linux-2.6.39.3/drivers/ata/sata_fsl.c
---- linux-2.6.39.3/drivers/ata/sata_fsl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 = ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sata_fsl_ops = {
-+static const struct ata_port_operations sata_fsl_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_inic162x.c linux-2.6.39.3/drivers/ata/sata_inic162x.c
---- linux-2.6.39.3/drivers/ata/sata_inic162x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_inic162x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po
- 	return 0;
- }
- 
--static struct ata_port_operations inic_port_ops = {
-+static const struct ata_port_operations inic_port_ops = {
- 	.inherits		= &sata_port_ops,
- 
- 	.check_atapi_dma	= inic_check_atapi_dma,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_mv.c linux-2.6.39.3/drivers/ata/sata_mv.c
---- linux-2.6.39.3/drivers/ata/sata_mv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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		= MV_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations mv5_ops = {
-+static const struct ata_port_operations mv5_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.lost_interrupt		= ATA_OP_NULL,
-@@ -682,7 +682,7 @@ static struct ata_port_operations mv5_op
- 	.port_stop		= mv_port_stop,
- };
- 
--static struct ata_port_operations mv6_ops = {
-+static const struct ata_port_operations mv6_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.lost_interrupt		= ATA_OP_NULL,
-@@ -716,7 +716,7 @@ static struct ata_port_operations mv6_op
- 	.port_stop		= mv_port_stop,
- };
- 
--static struct ata_port_operations mv_iie_ops = {
-+static const struct ata_port_operations mv_iie_ops = {
- 	.inherits		= &mv6_ops,
- 	.dev_config		= ATA_OP_NULL,
- 	.qc_prep		= mv_qc_prep_iie,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_nv.c linux-2.6.39.3/drivers/ata/sata_nv.c
---- linux-2.6.39.3/drivers/ata/sata_nv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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.
-  */
--static struct ata_port_operations nv_generic_ops = {
-+static const struct ata_port_operations nv_generic_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.lost_interrupt		= ATA_OP_NULL,
- 	.scr_read		= nv_scr_read,
-@@ -473,20 +473,20 @@ static struct ata_port_operations nv_gen
- 	.hardreset		= nv_hardreset,
- };
- 
--static struct ata_port_operations nv_nf2_ops = {
-+static const struct ata_port_operations nv_nf2_ops = {
- 	.inherits		= &nv_generic_ops,
- 	.freeze			= nv_nf2_freeze,
- 	.thaw			= nv_nf2_thaw,
- };
- 
--static struct ata_port_operations nv_ck804_ops = {
-+static const struct ata_port_operations nv_ck804_ops = {
- 	.inherits		= &nv_generic_ops,
- 	.freeze			= nv_ck804_freeze,
- 	.thaw			= nv_ck804_thaw,
- 	.host_stop		= nv_ck804_host_stop,
- };
- 
--static struct ata_port_operations nv_adma_ops = {
-+static const struct ata_port_operations nv_adma_ops = {
- 	.inherits		= &nv_ck804_ops,
- 
- 	.check_atapi_dma	= nv_adma_check_atapi_dma,
-@@ -510,7 +510,7 @@ static struct ata_port_operations nv_adm
- 	.host_stop		= nv_adma_host_stop,
- };
- 
--static struct ata_port_operations nv_swncq_ops = {
-+static const struct ata_port_operations nv_swncq_ops = {
- 	.inherits		= &nv_generic_ops,
- 
- 	.qc_defer		= ata_std_qc_defer,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_promise.c linux-2.6.39.3/drivers/ata/sata_promise.c
---- linux-2.6.39.3/drivers/ata/sata_promise.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_promise.c	2011-05-22 19:36:31.000000000 -0400
-@@ -194,7 +194,7 @@ static const struct ata_port_operations 
- 	.error_handler		= pdc_error_handler,
- };
- 
--static struct ata_port_operations pdc_sata_ops = {
-+static const struct ata_port_operations pdc_sata_ops = {
- 	.inherits		= &pdc_common_ops,
- 	.cable_detect		= pdc_sata_cable_detect,
- 	.freeze			= pdc_sata_freeze,
-@@ -207,14 +207,14 @@ static struct ata_port_operations pdc_sa
- 
- /* First-generation chips need a more restrictive ->check_atapi_dma op,
-    and ->freeze/thaw that ignore the hotplug controls. */
--static struct ata_port_operations pdc_old_sata_ops = {
-+static const struct ata_port_operations pdc_old_sata_ops = {
- 	.inherits		= &pdc_sata_ops,
- 	.freeze			= pdc_freeze,
- 	.thaw			= pdc_thaw,
- 	.check_atapi_dma	= pdc_old_sata_check_atapi_dma,
- };
- 
--static struct ata_port_operations pdc_pata_ops = {
-+static const struct ata_port_operations pdc_pata_ops = {
- 	.inherits		= &pdc_common_ops,
- 	.cable_detect		= pdc_pata_cable_detect,
- 	.freeze			= pdc_freeze,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_qstor.c linux-2.6.39.3/drivers/ata/sata_qstor.c
---- linux-2.6.39.3/drivers/ata/sata_qstor.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_qstor.c	2011-05-22 19:36:31.000000000 -0400
-@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
- 	.dma_boundary		= QS_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations qs_ata_ops = {
-+static const struct ata_port_operations qs_ata_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.check_atapi_dma	= qs_check_atapi_dma,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_sil24.c linux-2.6.39.3/drivers/ata/sata_sil24.c
---- linux-2.6.39.3/drivers/ata/sata_sil24.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_sil24.c	2011-05-22 19:36:31.000000000 -0400
-@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sil24_ops = {
-+static const struct ata_port_operations sil24_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer		= sil24_qc_defer,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_sil.c linux-2.6.39.3/drivers/ata/sata_sil.c
---- linux-2.6.39.3/drivers/ata/sata_sil.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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		= ATA_MAX_PRD
- };
- 
--static struct ata_port_operations sil_ops = {
-+static const struct ata_port_operations sil_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.dev_config		= sil_dev_config,
- 	.set_mode		= sil_set_mode,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_sis.c linux-2.6.39.3/drivers/ata/sata_sis.c
---- linux-2.6.39.3/drivers/ata/sata_sis.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations sis_ops = {
-+static const struct ata_port_operations sis_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.scr_read		= sis_scr_read,
- 	.scr_write		= sis_scr_write,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_svw.c linux-2.6.39.3/drivers/ata/sata_svw.c
---- linux-2.6.39.3/drivers/ata/sata_svw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_svw.c	2011-05-22 19:36:31.000000000 -0400
-@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
- };
- 
- 
--static struct ata_port_operations k2_sata_ops = {
-+static const struct ata_port_operations k2_sata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.sff_tf_load		= k2_sata_tf_load,
- 	.sff_tf_read		= k2_sata_tf_read,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_sx4.c linux-2.6.39.3/drivers/ata/sata_sx4.c
---- linux-2.6.39.3/drivers/ata/sata_sx4.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_sx4.c	2011-05-22 19:36:31.000000000 -0400
-@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
- };
- 
- /* TODO: inherit from base port_ops after converting to new EH */
--static struct ata_port_operations pdc_20621_ops = {
-+static const struct ata_port_operations pdc_20621_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.check_atapi_dma	= pdc_check_atapi_dma,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_uli.c linux-2.6.39.3/drivers/ata/sata_uli.c
---- linux-2.6.39.3/drivers/ata/sata_uli.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations uli_ops = {
-+static const struct ata_port_operations uli_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.scr_read		= uli_scr_read,
- 	.scr_write		= uli_scr_write,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_via.c linux-2.6.39.3/drivers/ata/sata_via.c
---- linux-2.6.39.3/drivers/ata/sata_via.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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),
- };
- 
--static struct ata_port_operations svia_base_ops = {
-+static const struct ata_port_operations svia_base_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.sff_tf_load		= svia_tf_load,
- };
- 
--static struct ata_port_operations vt6420_sata_ops = {
-+static const struct ata_port_operations vt6420_sata_ops = {
- 	.inherits		= &svia_base_ops,
- 	.freeze			= svia_noop_freeze,
- 	.prereset		= vt6420_prereset,
- 	.bmdma_start		= vt6420_bmdma_start,
- };
- 
--static struct ata_port_operations vt6421_pata_ops = {
-+static const struct ata_port_operations vt6421_pata_ops = {
- 	.inherits		= &svia_base_ops,
- 	.cable_detect		= vt6421_pata_cable_detect,
- 	.set_piomode		= vt6421_set_pio_mode,
- 	.set_dmamode		= vt6421_set_dma_mode,
- };
- 
--static struct ata_port_operations vt6421_sata_ops = {
-+static const struct ata_port_operations vt6421_sata_ops = {
- 	.inherits		= &svia_base_ops,
- 	.scr_read		= svia_scr_read,
- 	.scr_write		= svia_scr_write,
- };
- 
--static struct ata_port_operations vt8251_ops = {
-+static const struct ata_port_operations vt8251_ops = {
- 	.inherits		= &svia_base_ops,
- 	.hardreset		= sata_std_hardreset,
- 	.scr_read		= vt8251_scr_read,
-diff -urNp linux-2.6.39.3/drivers/ata/sata_vsc.c linux-2.6.39.3/drivers/ata/sata_vsc.c
---- linux-2.6.39.3/drivers/ata/sata_vsc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ata/sata_vsc.c	2011-05-22 19:36:31.000000000 -0400
-@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
- };
- 
- 
--static struct ata_port_operations vsc_sata_ops = {
-+static const struct ata_port_operations vsc_sata_ops = {
- 	.inherits		= &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.3/drivers/atm/adummy.c linux-2.6.39.3/drivers/atm/adummy.c
---- linux-2.6.39.3/drivers/atm/adummy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/adummy.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/adummy.c linux-2.6.39.4/drivers/atm/adummy.c
+--- linux-2.6.39.4/drivers/atm/adummy.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/adummy.c	2011-08-05 19:44:36.000000000 -0400
 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
  		vcc->pop(vcc, skb);
  	else
@@ -26890,9 +22195,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/adummy.c linux-2.6.39.3/drivers/atm/adummy
  
  	return 0;
  }
-diff -urNp linux-2.6.39.3/drivers/atm/ambassador.c linux-2.6.39.3/drivers/atm/ambassador.c
---- linux-2.6.39.3/drivers/atm/ambassador.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/ambassador.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/ambassador.c linux-2.6.39.4/drivers/atm/ambassador.c
+--- linux-2.6.39.4/drivers/atm/ambassador.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/ambassador.c	2011-08-05 19:44:36.000000000 -0400
 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -26929,9 +22234,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/ambassador.c linux-2.6.39.3/drivers/atm/am
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-2.6.39.3/drivers/atm/atmtcp.c linux-2.6.39.3/drivers/atm/atmtcp.c
---- linux-2.6.39.3/drivers/atm/atmtcp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/atmtcp.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/atmtcp.c linux-2.6.39.4/drivers/atm/atmtcp.c
+--- linux-2.6.39.4/drivers/atm/atmtcp.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/atmtcp.c	2011-08-05 19:44:36.000000000 -0400
 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -26981,9 +22286,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/atmtcp.c linux-2.6.39.3/drivers/atm/atmtcp
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-2.6.39.3/drivers/atm/eni.c linux-2.6.39.3/drivers/atm/eni.c
---- linux-2.6.39.3/drivers/atm/eni.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/eni.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/eni.c linux-2.6.39.4/drivers/atm/eni.c
+--- linux-2.6.39.4/drivers/atm/eni.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/eni.c	2011-08-05 19:44:36.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);
@@ -27029,9 +22334,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/eni.c linux-2.6.39.3/drivers/atm/eni.c
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff -urNp linux-2.6.39.3/drivers/atm/firestream.c linux-2.6.39.3/drivers/atm/firestream.c
---- linux-2.6.39.3/drivers/atm/firestream.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/firestream.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/firestream.c linux-2.6.39.4/drivers/atm/firestream.c
+--- linux-2.6.39.4/drivers/atm/firestream.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/firestream.c	2011-08-05 19:44:36.000000000 -0400
 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
  				}
  			}
@@ -27065,9 +22370,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/firestream.c linux-2.6.39.3/drivers/atm/fi
  			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", 
-diff -urNp linux-2.6.39.3/drivers/atm/fore200e.c linux-2.6.39.3/drivers/atm/fore200e.c
---- linux-2.6.39.3/drivers/atm/fore200e.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/fore200e.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/fore200e.c linux-2.6.39.4/drivers/atm/fore200e.c
+--- linux-2.6.39.4/drivers/atm/fore200e.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/fore200e.c	2011-08-05 19:44:36.000000000 -0400
 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
  		/* check error condition */
@@ -27124,9 +22429,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/fore200e.c linux-2.6.39.3/drivers/atm/fore
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.39.3/drivers/atm/he.c linux-2.6.39.3/drivers/atm/he.c
---- linux-2.6.39.3/drivers/atm/he.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/he.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/he.c linux-2.6.39.4/drivers/atm/he.c
+--- linux-2.6.39.4/drivers/atm/he.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/he.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -27208,9 +22513,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/he.c linux-2.6.39.3/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-2.6.39.3/drivers/atm/horizon.c linux-2.6.39.3/drivers/atm/horizon.c
---- linux-2.6.39.3/drivers/atm/horizon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/horizon.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/horizon.c linux-2.6.39.4/drivers/atm/horizon.c
+--- linux-2.6.39.4/drivers/atm/horizon.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/horizon.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -27229,9 +22534,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/horizon.c linux-2.6.39.3/drivers/atm/horiz
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-2.6.39.3/drivers/atm/idt77252.c linux-2.6.39.3/drivers/atm/idt77252.c
---- linux-2.6.39.3/drivers/atm/idt77252.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/idt77252.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/idt77252.c linux-2.6.39.4/drivers/atm/idt77252.c
+--- linux-2.6.39.4/drivers/atm/idt77252.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/idt77252.c	2011-08-05 19:44:36.000000000 -0400
 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
  		else
  			dev_kfree_skb(skb);
@@ -27386,9 +22691,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/idt77252.c linux-2.6.39.3/drivers/atm/idt7
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.39.3/drivers/atm/iphase.c linux-2.6.39.3/drivers/atm/iphase.c
---- linux-2.6.39.3/drivers/atm/iphase.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/iphase.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/iphase.c linux-2.6.39.4/drivers/atm/iphase.c
+--- linux-2.6.39.4/drivers/atm/iphase.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/iphase.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	status = (u_short) (buf_desc_ptr->desc_mode);  
  	if (status & (RX_CER | RX_PTE | RX_OFL))  
@@ -27485,9 +22790,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/iphase.c linux-2.6.39.3/drivers/atm/iphase
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.39.3/drivers/atm/lanai.c linux-2.6.39.3/drivers/atm/lanai.c
---- linux-2.6.39.3/drivers/atm/lanai.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/lanai.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/lanai.c linux-2.6.39.4/drivers/atm/lanai.c
+--- linux-2.6.39.4/drivers/atm/lanai.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/lanai.c	2011-08-05 19:44:36.000000000 -0400
 @@ -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);
@@ -27542,9 +22847,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/lanai.c linux-2.6.39.3/drivers/atm/lanai.c
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.39.3/drivers/atm/nicstar.c linux-2.6.39.3/drivers/atm/nicstar.c
---- linux-2.6.39.3/drivers/atm/nicstar.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/nicstar.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/nicstar.c linux-2.6.39.4/drivers/atm/nicstar.c
+--- linux-2.6.39.4/drivers/atm/nicstar.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/nicstar.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, 
  	if ((vc = (vc_map *) vcc->dev_data) == NULL) {
  		printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
@@ -27746,9 +23051,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/nicstar.c linux-2.6.39.3/drivers/atm/nicst
  			}
  		}
  
-diff -urNp linux-2.6.39.3/drivers/atm/solos-pci.c linux-2.6.39.3/drivers/atm/solos-pci.c
---- linux-2.6.39.3/drivers/atm/solos-pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/solos-pci.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/solos-pci.c linux-2.6.39.4/drivers/atm/solos-pci.c
+--- linux-2.6.39.4/drivers/atm/solos-pci.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/solos-pci.c	2011-08-05 19:44:36.000000000 -0400
 @@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
@@ -27776,9 +23081,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/solos-pci.c linux-2.6.39.3/drivers/atm/sol
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.39.3/drivers/atm/suni.c linux-2.6.39.3/drivers/atm/suni.c
---- linux-2.6.39.3/drivers/atm/suni.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/suni.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/suni.c linux-2.6.39.4/drivers/atm/suni.c
+--- linux-2.6.39.4/drivers/atm/suni.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/suni.c	2011-08-05 19:44:36.000000000 -0400
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -27790,9 +23095,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/suni.c linux-2.6.39.3/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.39.3/drivers/atm/uPD98402.c linux-2.6.39.3/drivers/atm/uPD98402.c
---- linux-2.6.39.3/drivers/atm/uPD98402.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/uPD98402.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/uPD98402.c linux-2.6.39.4/drivers/atm/uPD98402.c
+--- linux-2.6.39.4/drivers/atm/uPD98402.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/uPD98402.c	2011-08-05 19:44:36.000000000 -0400
 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
  	struct sonet_stats tmp;
   	int error = 0;
@@ -27837,9 +23142,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/uPD98402.c linux-2.6.39.3/drivers/atm/uPD9
  	return 0;
  }
  
-diff -urNp linux-2.6.39.3/drivers/atm/zatm.c linux-2.6.39.3/drivers/atm/zatm.c
---- linux-2.6.39.3/drivers/atm/zatm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/atm/zatm.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/atm/zatm.c linux-2.6.39.4/drivers/atm/zatm.c
+--- linux-2.6.39.4/drivers/atm/zatm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/atm/zatm.c	2011-08-05 19:44:36.000000000 -0400
 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		}
  		if (!size) {
@@ -27867,36 +23172,9 @@ diff -urNp linux-2.6.39.3/drivers/atm/zatm.c linux-2.6.39.3/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-2.6.39.3/drivers/base/iommu.c linux-2.6.39.3/drivers/base/iommu.c
---- linux-2.6.39.3/drivers/base/iommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/base/iommu.c	2011-05-22 19:36:31.000000000 -0400
-@@ -23,9 +23,8 @@
- #include <linux/errno.h>
- #include <linux/iommu.h>
- 
--static struct iommu_ops *iommu_ops;
--
--void register_iommu(struct iommu_ops *ops)
-+static const struct iommu_ops *iommu_ops;
-+void register_iommu(const struct iommu_ops *ops)
- {
- 	if (iommu_ops)
- 		BUG();
-diff -urNp linux-2.6.39.3/drivers/base/power/generic_ops.c linux-2.6.39.3/drivers/base/power/generic_ops.c
---- linux-2.6.39.3/drivers/base/power/generic_ops.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 */
- 
--struct dev_pm_ops generic_subsys_pm_ops = {
-+const struct dev_pm_ops generic_subsys_pm_ops = {
- #ifdef CONFIG_PM_SLEEP
- 	.suspend = pm_generic_suspend,
- 	.resume = pm_generic_resume,
-diff -urNp linux-2.6.39.3/drivers/base/power/wakeup.c linux-2.6.39.3/drivers/base/power/wakeup.c
---- linux-2.6.39.3/drivers/base/power/wakeup.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/base/power/wakeup.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/base/power/wakeup.c linux-2.6.39.4/drivers/base/power/wakeup.c
+--- linux-2.6.39.4/drivers/base/power/wakeup.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/base/power/wakeup.c	2011-08-05 19:44:36.000000000 -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.
@@ -27932,18 +23210,9 @@ diff -urNp linux-2.6.39.3/drivers/base/power/wakeup.c linux-2.6.39.3/drivers/bas
  }
  
  /**
-diff -urNp linux-2.6.39.3/drivers/block/cciss.c linux-2.6.39.3/drivers/block/cciss.c
---- linux-2.6.39.3/drivers/block/cciss.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/cciss.c	2011-05-22 19:41:32.000000000 -0400
-@@ -103,7 +103,7 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_devic
-  *  product = Marketing Name for the board
-  *  access = Address of the struct of function pointers
-  */
--static struct board_type products[] = {
-+static const struct board_type products[] = {
- 	{0x40700E11, "Smart Array 5300", &SA5_access},
- 	{0x40800E11, "Smart Array 5i", &SA5B_access},
- 	{0x40820E11, "Smart Array 532", &SA5B_access},
+diff -urNp linux-2.6.39.4/drivers/block/cciss.c linux-2.6.39.4/drivers/block/cciss.c
+--- linux-2.6.39.4/drivers/block/cciss.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/cciss.c	2011-08-05 20:34:06.000000000 -0400
 @@ -1151,6 +1151,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
@@ -27953,57 +23222,150 @@ diff -urNp linux-2.6.39.3/drivers/block/cciss.c linux-2.6.39.3/drivers/block/cci
  	err = 0;
  	err |=
  	    copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-diff -urNp linux-2.6.39.3/drivers/block/cciss.h linux-2.6.39.3/drivers/block/cciss.h
---- linux-2.6.39.3/drivers/block/cciss.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct access_method SA5_access = {
-+static const struct access_method SA5_access = {
- 	SA5_submit_command,
- 	SA5_intr_mask,
- 	SA5_fifo_full,
-@@ -401,7 +401,7 @@ static struct access_method SA5_access =
- 	SA5_completed,
- };
+@@ -2933,7 +2935,7 @@ static void start_io(ctlr_info_t *h)
+ 	while (!list_empty(&h->reqQ)) {
+ 		c = list_entry(h->reqQ.next, CommandList_struct, list);
+ 		/* can't do anything if fifo is full */
+-		if ((h->access.fifo_full(h))) {
++		if ((h->access->fifo_full(h))) {
+ 			dev_warn(&h->pdev->dev, "fifo full\n");
+ 			break;
+ 		}
+@@ -2943,7 +2945,7 @@ static void start_io(ctlr_info_t *h)
+ 		h->Qdepth--;
  
--static struct access_method SA5B_access = {
-+static const struct access_method SA5B_access = {
-         SA5_submit_command,
-         SA5B_intr_mask,
-         SA5_fifo_full,
-@@ -409,7 +409,7 @@ static struct access_method SA5B_access 
-         SA5_completed,
- };
+ 		/* Tell the controller execute command */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
  
--static struct access_method SA5_performant_access = {
-+static const struct access_method SA5_performant_access = {
- 	SA5_submit_command,
- 	SA5_performant_intr_mask,
- 	SA5_fifo_full,
-@@ -420,7 +420,7 @@ static struct access_method SA5_performa
- struct board_type {
- 	__u32	board_id;
- 	char	*product_name;
--	struct access_method *access;
-+	const struct access_method *access;
- 	int nr_cmds; /* Max cmds this kind of ctlr can handle. */
- };
+ 		/* Put job onto the completed Q */
+ 		addQ(&h->cmpQ, c);
+@@ -3369,17 +3371,17 @@ startio:
  
-diff -urNp linux-2.6.39.3/drivers/block/cpqarray.c linux-2.6.39.3/drivers/block/cpqarray.c
---- linux-2.6.39.3/drivers/block/cpqarray.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/cpqarray.c	2011-05-22 19:36:31.000000000 -0400
-@@ -80,7 +80,7 @@ static int eisa[8];
-  *  product = Marketing Name for the board
-  *  access = Address of the struct of function pointers
-  */
--static struct board_type products[] = {
-+static const struct board_type products[] = {
- 	{ 0x0040110E, "IDA",			&smart1_access },
- 	{ 0x0140110E, "IDA-2",			&smart1_access },
- 	{ 0x1040110E, "IAES",			&smart1_access },
+ static inline unsigned long get_next_completion(ctlr_info_t *h)
+ {
+-	return h->access.command_completed(h);
++	return h->access->command_completed(h);
+ }
+ 
+ static inline int interrupt_pending(ctlr_info_t *h)
+ {
+-	return h->access.intr_pending(h);
++	return h->access->intr_pending(h);
+ }
+ 
+ static inline long interrupt_not_for_us(ctlr_info_t *h)
+ {
+-	return ((h->access.intr_pending(h) == 0) ||
++	return ((h->access->intr_pending(h) == 0) ||
+ 		(h->interrupts_enabled == 0));
+ }
+ 
+@@ -3412,7 +3414,7 @@ static inline u32 next_command(ctlr_info
+ 	u32 a;
+ 
+ 	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
+-		return h->access.command_completed(h);
++		return h->access->command_completed(h);
+ 
+ 	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
+ 		a = *(h->reply_pool_head); /* Next cmd in ring buffer */
+@@ -3910,7 +3912,7 @@ static void __devinit cciss_put_controll
+ 		trans_support & CFGTBL_Trans_use_short_tags);
+ 
+ 	/* Change the access methods to the performant access methods */
+-	h->access = SA5_performant_access;
++	h->access = &SA5_performant_access;
+ 	h->transMethod = CFGTBL_Trans_Performant;
+ 
+ 	return;
+@@ -4179,7 +4181,7 @@ static int __devinit cciss_pci_init(ctlr
+ 	if (prod_index < 0)
+ 		return -ENODEV;
+ 	h->product_name = products[prod_index].product_name;
+-	h->access = *(products[prod_index].access);
++	h->access = products[prod_index].access;
+ 
+ 	if (cciss_board_disabled(h)) {
+ 		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
+@@ -4661,7 +4663,7 @@ static int __devinit cciss_init_one(stru
+ 	}
+ 
+ 	/* make sure the board interrupts are off */
+-	h->access.set_intr_mask(h, CCISS_INTR_OFF);
++	h->access->set_intr_mask(h, CCISS_INTR_OFF);
+ 	if (h->msi_vector || h->msix_vector) {
+ 		if (request_irq(h->intr[PERF_MODE_INT],
+ 				do_cciss_msix_intr,
+@@ -4744,7 +4746,7 @@ static int __devinit cciss_init_one(stru
+ 	cciss_scsi_setup(h);
+ 
+ 	/* Turn the interrupts on so we can service requests */
+-	h->access.set_intr_mask(h, CCISS_INTR_ON);
++	h->access->set_intr_mask(h, CCISS_INTR_ON);
+ 
+ 	/* Get the firmware version */
+ 	inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
+@@ -4828,7 +4830,7 @@ static void cciss_shutdown(struct pci_de
+ 	kfree(flush_buf);
+ 	if (return_code != IO_OK)
+ 		dev_warn(&h->pdev->dev, "Error flushing cache\n");
+-	h->access.set_intr_mask(h, CCISS_INTR_OFF);
++	h->access->set_intr_mask(h, CCISS_INTR_OFF);
+ 	free_irq(h->intr[PERF_MODE_INT], h);
+ }
+ 
+diff -urNp linux-2.6.39.4/drivers/block/cciss.h linux-2.6.39.4/drivers/block/cciss.h
+--- linux-2.6.39.4/drivers/block/cciss.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/cciss.h	2011-08-05 20:34:06.000000000 -0400
+@@ -100,7 +100,7 @@ struct ctlr_info
+ 	/* information about each logical volume */
+ 	drive_info_struct *drv[CISS_MAX_LUN];
+ 
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	/* queue and queue Info */ 
+ 	struct list_head reqQ;
+diff -urNp linux-2.6.39.4/drivers/block/cpqarray.c linux-2.6.39.4/drivers/block/cpqarray.c
+--- linux-2.6.39.4/drivers/block/cpqarray.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/cpqarray.c	2011-08-05 20:34:06.000000000 -0400
+@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
+ 	if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
+ 		goto Enomem4;
+ 	}
+-	hba[i]->access.set_intr_mask(hba[i], 0);
++	hba[i]->access->set_intr_mask(hba[i], 0);
+ 	if (request_irq(hba[i]->intr, do_ida_intr,
+ 		IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
+ 	{
+@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_c
+ 	add_timer(&hba[i]->timer);
+ 
+ 	/* Enable IRQ now that spinlock and rate limit timer are set up */
+-	hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
++	hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
+ 
+ 	for(j=0; j<NWD; j++) {
+ 		struct gendisk *disk = ida_gendisk[i][j];
+@@ -694,7 +694,7 @@ DBGINFO(
+ 	for(i=0; i<NR_PRODUCTS; i++) {
+ 		if (board_id == products[i].board_id) {
+ 			c->product_name = products[i].product_name;
+-			c->access = *(products[i].access);
++			c->access = products[i].access;
+ 			break;
+ 		}
+ 	}
+@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detec
+ 		hba[ctlr]->intr = intr;
+ 		sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
+ 		hba[ctlr]->product_name = products[j].product_name;
+-		hba[ctlr]->access = *(products[j].access);
++		hba[ctlr]->access = products[j].access;
+ 		hba[ctlr]->ctlr = ctlr;
+ 		hba[ctlr]->board_id = board_id;
+ 		hba[ctlr]->pci_dev = NULL; /* not PCI */
 @@ -911,6 +911,8 @@ static void do_ida_request(struct reques
  	struct scatterlist tmp_sg[SG_MAX];
  	int i, dir, seg;
@@ -28013,21 +23375,101 @@ diff -urNp linux-2.6.39.3/drivers/block/cpqarray.c linux-2.6.39.3/drivers/block/
  queue_next:
  	creq = blk_peek_request(q);
  	if (!creq)
-diff -urNp linux-2.6.39.3/drivers/block/cpqarray.h linux-2.6.39.3/drivers/block/cpqarray.h
---- linux-2.6.39.3/drivers/block/cpqarray.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/cpqarray.h	2011-05-22 19:36:31.000000000 -0400
-@@ -69,7 +69,7 @@ struct access_method {
- struct board_type {
- 	__u32	board_id;
- 	char	*product_name;
--	struct access_method *access;
-+	const struct access_method *access;
- };
+@@ -980,7 +982,7 @@ static void start_io(ctlr_info_t *h)
  
- struct ctlr_info {
-diff -urNp linux-2.6.39.3/drivers/block/DAC960.c linux-2.6.39.3/drivers/block/DAC960.c
---- linux-2.6.39.3/drivers/block/DAC960.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/DAC960.c	2011-05-22 19:36:31.000000000 -0400
+ 	while((c = h->reqQ) != NULL) {
+ 		/* Can't do anything if we're busy */
+-		if (h->access.fifo_full(h) == 0)
++		if (h->access->fifo_full(h) == 0)
+ 			return;
+ 
+ 		/* Get the first entry from the request Q */
+@@ -988,7 +990,7 @@ static void start_io(ctlr_info_t *h)
+ 		h->Qdepth--;
+ 	
+ 		/* Tell the controller to do our bidding */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
+ 
+ 		/* Get onto the completion Q */
+ 		addQ(&h->cmpQ, c);
+@@ -1050,7 +1052,7 @@ static irqreturn_t do_ida_intr(int irq, 
+ 	unsigned long flags;
+ 	__u32 a,a1;
+ 
+-	istat = h->access.intr_pending(h);
++	istat = h->access->intr_pending(h);
+ 	/* Is this interrupt for us? */
+ 	if (istat == 0)
+ 		return IRQ_NONE;
+@@ -1061,7 +1063,7 @@ static irqreturn_t do_ida_intr(int irq, 
+ 	 */
+ 	spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
+ 	if (istat & FIFO_NOT_EMPTY) {
+-		while((a = h->access.command_completed(h))) {
++		while((a = h->access->command_completed(h))) {
+ 			a1 = a; a &= ~3;
+ 			if ((c = h->cmpQ) == NULL)
+ 			{  
+@@ -1449,11 +1451,11 @@ static int sendcmd(
+ 	/*
+ 	 * Disable interrupt
+ 	 */
+-	info_p->access.set_intr_mask(info_p, 0);
++	info_p->access->set_intr_mask(info_p, 0);
+ 	/* Make sure there is room in the command FIFO */
+ 	/* Actually it should be completely empty at this time. */
+ 	for (i = 200000; i > 0; i--) {
+-		temp = info_p->access.fifo_full(info_p);
++		temp = info_p->access->fifo_full(info_p);
+ 		if (temp != 0) {
+ 			break;
+ 		}
+@@ -1466,7 +1468,7 @@ DBG(
+ 	/*
+ 	 * Send the cmd
+ 	 */
+-	info_p->access.submit_command(info_p, c);
++	info_p->access->submit_command(info_p, c);
+ 	complete = pollcomplete(ctlr);
+ 	
+ 	pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr, 
+@@ -1549,9 +1551,9 @@ static int revalidate_allvol(ctlr_info_t
+ 	 * we check the new geometry.  Then turn interrupts back on when
+ 	 * we're done.
+ 	 */
+-	host->access.set_intr_mask(host, 0);
++	host->access->set_intr_mask(host, 0);
+ 	getgeometry(ctlr);
+-	host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
++	host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
+ 
+ 	for(i=0; i<NWD; i++) {
+ 		struct gendisk *disk = ida_gendisk[ctlr][i];
+@@ -1591,7 +1593,7 @@ static int pollcomplete(int ctlr)
+ 	/* Wait (up to 2 seconds) for a command to complete */
+ 
+ 	for (i = 200000; i > 0; i--) {
+-		done = hba[ctlr]->access.command_completed(hba[ctlr]);
++		done = hba[ctlr]->access->command_completed(hba[ctlr]);
+ 		if (done == 0) {
+ 			udelay(10);	/* a short fixed delay */
+ 		} else
+diff -urNp linux-2.6.39.4/drivers/block/cpqarray.h linux-2.6.39.4/drivers/block/cpqarray.h
+--- linux-2.6.39.4/drivers/block/cpqarray.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/cpqarray.h	2011-08-05 20:34:06.000000000 -0400
+@@ -99,7 +99,7 @@ struct ctlr_info {
+ 	drv_info_t	drv[NWD];
+ 	struct proc_dir_entry *proc;
+ 
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	cmdlist_t *reqQ;
+ 	cmdlist_t *cmpQ;
+diff -urNp linux-2.6.39.4/drivers/block/DAC960.c linux-2.6.39.4/drivers/block/DAC960.c
+--- linux-2.6.39.4/drivers/block/DAC960.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/DAC960.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
    unsigned long flags;
    int Channel, TargetID;
@@ -28037,9 +23479,9 @@ diff -urNp linux-2.6.39.3/drivers/block/DAC960.c linux-2.6.39.3/drivers/block/DA
    if (!init_dma_loaf(Controller->PCIDevice, &local_dma, 
  		DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
  			sizeof(DAC960_SCSI_Inquiry_T) +
-diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_int.h linux-2.6.39.3/drivers/block/drbd/drbd_int.h
---- linux-2.6.39.3/drivers/block/drbd/drbd_int.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/drbd/drbd_int.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/block/drbd/drbd_int.h linux-2.6.39.4/drivers/block/drbd/drbd_int.h
+--- linux-2.6.39.4/drivers/block/drbd/drbd_int.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/drbd/drbd_int.h	2011-08-05 19:44:36.000000000 -0400
 @@ -736,7 +736,7 @@ struct drbd_request;
  struct drbd_epoch {
  	struct list_head list;
@@ -28058,9 +23500,9 @@ diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_int.h linux-2.6.39.3/drivers/b
  	unsigned int peer_seq;
  	spinlock_t peer_seq_lock;
  	unsigned int minor;
-diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_main.c linux-2.6.39.3/drivers/block/drbd/drbd_main.c
---- linux-2.6.39.3/drivers/block/drbd/drbd_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/drbd/drbd_main.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/block/drbd/drbd_main.c linux-2.6.39.4/drivers/block/drbd/drbd_main.c
+--- linux-2.6.39.4/drivers/block/drbd/drbd_main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/drbd/drbd_main.c	2011-08-05 19:44:36.000000000 -0400
 @@ -2387,7 +2387,7 @@ static int _drbd_send_ack(struct drbd_co
  	p.sector   = sector;
  	p.block_id = block_id;
@@ -28099,9 +23541,9 @@ diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_main.c linux-2.6.39.3/drivers/
  	mdev->al_writ_cnt  =
  	mdev->bm_writ_cnt  =
  	mdev->read_cnt     =
-diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_nl.c linux-2.6.39.3/drivers/block/drbd/drbd_nl.c
---- linux-2.6.39.3/drivers/block/drbd/drbd_nl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/drbd/drbd_nl.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/block/drbd/drbd_nl.c linux-2.6.39.4/drivers/block/drbd/drbd_nl.c
+--- linux-2.6.39.4/drivers/block/drbd/drbd_nl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/drbd/drbd_nl.c	2011-08-05 19:44:36.000000000 -0400
 @@ -2298,7 +2298,7 @@ static void drbd_connector_callback(stru
  	module_put(THIS_MODULE);
  }
@@ -28147,9 +23589,9 @@ diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_nl.c linux-2.6.39.3/drivers/bl
  	cn_reply->ack = 0; /* not used here. */
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char *)tl - (char *)reply->tag_list);
-diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_receiver.c linux-2.6.39.3/drivers/block/drbd/drbd_receiver.c
---- linux-2.6.39.3/drivers/block/drbd/drbd_receiver.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/drbd/drbd_receiver.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/block/drbd/drbd_receiver.c linux-2.6.39.4/drivers/block/drbd/drbd_receiver.c
+--- linux-2.6.39.4/drivers/block/drbd/drbd_receiver.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/block/drbd/drbd_receiver.c	2011-08-05 19:44:36.000000000 -0400
 @@ -894,7 +894,7 @@ retry:
  	sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
  	sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -28235,9 +23677,9 @@ diff -urNp linux-2.6.39.3/drivers/block/drbd/drbd_receiver.c linux-2.6.39.3/driv
  	D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff -urNp linux-2.6.39.3/drivers/block/nbd.c linux-2.6.39.3/drivers/block/nbd.c
---- linux-2.6.39.3/drivers/block/nbd.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/nbd.c	2011-06-25 13:00:25.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/block/nbd.c linux-2.6.39.4/drivers/block/nbd.c
+--- linux-2.6.39.4/drivers/block/nbd.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/drivers/block/nbd.c	2011-08-05 19:44:36.000000000 -0400
 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
  	struct kvec iov;
  	sigset_t blocked, oldset;
@@ -28256,77 +23698,9 @@ diff -urNp linux-2.6.39.3/drivers/block/nbd.c linux-2.6.39.3/drivers/block/nbd.c
  	switch (cmd) {
  	case NBD_DISCONNECT: {
  		struct request sreq;
-diff -urNp linux-2.6.39.3/drivers/block/smart1,2.h linux-2.6.39.3/drivers/block/smart1,2.h
---- linux-2.6.39.3/drivers/block/smart1,2.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/block/smart1,2.h	2011-05-22 19:36:31.000000000 -0400
-@@ -107,7 +107,7 @@ static unsigned long smart4_intr_pending
- 	return 0 ;
- }
- 
--static struct access_method smart4_access = {
-+static const struct access_method smart4_access = {
- 	smart4_submit_command,
- 	smart4_intr_mask,
- 	smart4_fifo_full,
-@@ -143,7 +143,7 @@ static unsigned long smart2_intr_pending
- 	return readl(h->vaddr + INTR_PENDING);
- }
- 
--static struct access_method smart2_access = {
-+static const struct access_method smart2_access = {
- 	smart2_submit_command,
- 	smart2_intr_mask,
- 	smart2_fifo_full,
-@@ -179,7 +179,7 @@ static unsigned long smart2e_intr_pendin
- 	return inl(h->io_mem_addr + INTR_PENDING);
- }
- 
--static struct access_method smart2e_access = {
-+static const struct access_method smart2e_access = {
- 	smart2e_submit_command,
- 	smart2e_intr_mask,
- 	smart2e_fifo_full,
-@@ -269,7 +269,7 @@ static unsigned long smart1_intr_pending
- 	return chan;
- }
- 
--static struct access_method smart1_access = {
-+static const struct access_method smart1_access = {
- 	smart1_submit_command,
- 	smart1_intr_mask,
- 	smart1_fifo_full,
-diff -urNp linux-2.6.39.3/drivers/block/xsysace.c linux-2.6.39.3/drivers/block/xsysace.c
---- linux-2.6.39.3/drivers/block/xsysace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 = src;
- }
- 
--static struct ace_reg_ops ace_reg_8_ops = {
-+static const struct ace_reg_ops ace_reg_8_ops = {
- 	.in = ace_in_8,
- 	.out = ace_out_8,
- 	.datain = ace_datain_8,
-@@ -327,14 +327,14 @@ static void ace_dataout_le16(struct ace_
- 	ace->data_ptr = src;
- }
- 
--static struct ace_reg_ops ace_reg_be16_ops = {
-+static const struct ace_reg_ops ace_reg_be16_ops = {
- 	.in = ace_in_be16,
- 	.out = ace_out_be16,
- 	.datain = ace_datain_be16,
- 	.dataout = ace_dataout_be16,
- };
- 
--static struct ace_reg_ops ace_reg_le16_ops = {
-+static const struct ace_reg_ops ace_reg_le16_ops = {
- 	.in = ace_in_le16,
- 	.out = ace_out_le16,
- 	.datain = ace_datain_le16,
-diff -urNp linux-2.6.39.3/drivers/char/agp/frontend.c linux-2.6.39.3/drivers/char/agp/frontend.c
---- linux-2.6.39.3/drivers/char/agp/frontend.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/agp/frontend.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/agp/frontend.c linux-2.6.39.4/drivers/char/agp/frontend.c
+--- linux-2.6.39.4/drivers/char/agp/frontend.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/agp/frontend.c	2011-08-05 19:44:36.000000000 -0400
 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
@@ -28336,9 +23710,9 @@ diff -urNp linux-2.6.39.3/drivers/char/agp/frontend.c linux-2.6.39.3/drivers/cha
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.39.3/drivers/char/briq_panel.c linux-2.6.39.3/drivers/char/briq_panel.c
---- linux-2.6.39.3/drivers/char/briq_panel.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/briq_panel.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/briq_panel.c linux-2.6.39.4/drivers/char/briq_panel.c
+--- linux-2.6.39.4/drivers/char/briq_panel.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/briq_panel.c	2011-08-05 19:44:36.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -28380,9 +23754,9 @@ diff -urNp linux-2.6.39.3/drivers/char/briq_panel.c linux-2.6.39.3/drivers/char/
  
  	return len;
  }
-diff -urNp linux-2.6.39.3/drivers/char/genrtc.c linux-2.6.39.3/drivers/char/genrtc.c
---- linux-2.6.39.3/drivers/char/genrtc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/genrtc.c	2011-05-22 19:41:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/genrtc.c linux-2.6.39.4/drivers/char/genrtc.c
+--- linux-2.6.39.4/drivers/char/genrtc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/genrtc.c	2011-08-05 19:44:36.000000000 -0400
 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
  	switch (cmd) {
  
@@ -28391,9 +23765,9 @@ diff -urNp linux-2.6.39.3/drivers/char/genrtc.c linux-2.6.39.3/drivers/char/genr
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff -urNp linux-2.6.39.3/drivers/char/hpet.c linux-2.6.39.3/drivers/char/hpet.c
---- linux-2.6.39.3/drivers/char/hpet.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/hpet.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/hpet.c linux-2.6.39.4/drivers/char/hpet.c
+--- linux-2.6.39.4/drivers/char/hpet.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/hpet.c	2011-08-05 19:44:36.000000000 -0400
 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di
  }
  
@@ -28403,31 +23777,9 @@ diff -urNp linux-2.6.39.3/drivers/char/hpet.c linux-2.6.39.3/drivers/char/hpet.c
  		  struct hpet_info *info)
  {
  	struct hpet_timer __iomem *timer;
-diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_devintf.c linux-2.6.39.3/drivers/char/ipmi/ipmi_devintf.c
---- linux-2.6.39.3/drivers/char/ipmi/ipmi_devintf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct ipmi_user_hndl ipmi_hndlrs =
--{
-+static const struct ipmi_user_hndl ipmi_hndlrs = {
- 	.ipmi_recv_hndl	= file_receive_handler,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.39.3/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.39.3/drivers/char/ipmi/ipmi_msghandler.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/ipmi/ipmi_msghandler.c	2011-05-22 19:36:31.000000000 -0400
-@@ -82,7 +82,7 @@ struct ipmi_user {
- 	struct kref refcount;
- 
- 	/* The upper layer that handles receive messages. */
--	struct ipmi_user_hndl *handler;
-+	const struct ipmi_user_hndl *handler;
- 	void             *handler_data;
- 
- 	/* The interface this user is bound to. */
+diff -urNp linux-2.6.39.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.39.4/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.39.4/drivers/char/ipmi/ipmi_msghandler.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/ipmi/ipmi_msghandler.c	2011-08-05 20:34:06.000000000 -0400
 @@ -414,7 +414,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
@@ -28449,15 +23801,6 @@ diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.39.3/dri
  
  static int is_lan_addr(struct ipmi_addr *addr)
  {
-@@ -875,7 +875,7 @@ static int intf_err_seq(ipmi_smi_t   int
- 
- 
- int ipmi_create_user(unsigned int          if_num,
--		     struct ipmi_user_hndl *handler,
-+		     const struct ipmi_user_hndl *handler,
- 		     void                  *handler_data,
- 		     ipmi_user_t           *user)
- {
 @@ -2844,7 +2844,7 @@ int ipmi_register_smi(struct ipmi_smi_ha
  	INIT_LIST_HEAD(&intf->cmd_rcvrs);
  	init_waitqueue_head(&intf->waitq);
@@ -28476,21 +23819,9 @@ diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.39.3/dri
  	si = (struct ipmi_system_interface_addr *) &addr;
  	si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
  	si->channel = IPMI_BMC_CHANNEL;
-diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_poweroff.c linux-2.6.39.3/drivers/char/ipmi/ipmi_poweroff.c
---- linux-2.6.39.3/drivers/char/ipmi/ipmi_poweroff.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct ipmi_user_hndl ipmi_poweroff_handler = {
-+static const struct ipmi_user_hndl ipmi_poweroff_handler = {
- 	.ipmi_recv_hndl = receive_handler
- };
- 
-diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.39.3/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.39.3/drivers/char/ipmi/ipmi_si_intf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/ipmi/ipmi_si_intf.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.39.4/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.39.4/drivers/char/ipmi/ipmi_si_intf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/ipmi/ipmi_si_intf.c	2011-08-05 19:44:36.000000000 -0400
 @@ -276,7 +276,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
@@ -28521,47 +23852,9 @@ diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.39.3/driver
  
  	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.39.3/drivers/char/ipmi/ipmi_watchdog.c linux-2.6.39.3/drivers/char/ipmi/ipmi_watchdog.c
---- linux-2.6.39.3/drivers/char/ipmi/ipmi_watchdog.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 
- 	return rv;
- }
- 
--static struct kernel_param_ops param_ops_timeout = {
-+static const struct kernel_param_ops param_ops_timeout = {
- 	.set = set_param_timeout,
- 	.get = param_get_int,
- };
-@@ -278,14 +278,14 @@ static int set_param_wdog_ifnum(const ch
- 	return 0;
- }
- 
--static struct kernel_param_ops param_ops_wdog_ifnum = {
-+static const struct kernel_param_ops param_ops_wdog_ifnum = {
- 	.set = set_param_wdog_ifnum,
- 	.get = param_get_int,
- };
- 
- #define param_check_wdog_ifnum param_check_int
- 
--static struct kernel_param_ops param_ops_str = {
-+static const struct kernel_param_ops param_ops_str = {
- 	.set = set_param_str,
- 	.get = get_param_str,
- };
-@@ -953,7 +953,7 @@ static void ipmi_wdog_pretimeout_handler
- 	pretimeout_since_last_heartbeat = 1;
- }
- 
--static struct ipmi_user_hndl ipmi_hndlrs = {
-+static const struct ipmi_user_hndl ipmi_hndlrs = {
- 	.ipmi_recv_hndl           = ipmi_wdog_msg_handler,
- 	.ipmi_watchdog_pretimeout = ipmi_wdog_pretimeout_handler
- };
-diff -urNp linux-2.6.39.3/drivers/char/Kconfig linux-2.6.39.3/drivers/char/Kconfig
---- linux-2.6.39.3/drivers/char/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/Kconfig	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/Kconfig linux-2.6.39.4/drivers/char/Kconfig
+--- linux-2.6.39.4/drivers/char/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/Kconfig	2011-08-05 19:44:36.000000000 -0400
 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
  
  config DEVKMEM
@@ -28580,9 +23873,9 @@ diff -urNp linux-2.6.39.3/drivers/char/Kconfig linux-2.6.39.3/drivers/char/Kconf
  	default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-2.6.39.3/drivers/char/mem.c linux-2.6.39.3/drivers/char/mem.c
---- linux-2.6.39.3/drivers/char/mem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/mem.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/mem.c linux-2.6.39.4/drivers/char/mem.c
+--- linux-2.6.39.4/drivers/char/mem.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/mem.c	2011-08-05 19:44:36.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -28715,30 +24008,9 @@ diff -urNp linux-2.6.39.3/drivers/char/mem.c linux-2.6.39.3/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.39.3/drivers/char/mmtimer.c linux-2.6.39.3/drivers/char/mmtimer.c
---- linux-2.6.39.3/drivers/char/mmtimer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/mmtimer.c	2011-05-22 19:36:31.000000000 -0400
-@@ -53,7 +53,7 @@ MODULE_LICENSE("GPL");
- 
- #define RTC_BITS 55 /* 55 bits for this implementation */
- 
--static struct k_clock sgi_clock;
-+static const struct k_clock sgi_clock;
- 
- extern unsigned long sn_rtc_cycles_per_second;
- 
-@@ -772,7 +772,7 @@ static int sgi_clock_getres(const clocki
- 	return 0;
- }
- 
--static struct k_clock sgi_clock = {
-+static const struct k_clock sgi_clock = {
- 	.clock_set	= sgi_clock_set,
- 	.clock_get	= sgi_clock_get,
- 	.clock_getres	= sgi_clock_getres,
-diff -urNp linux-2.6.39.3/drivers/char/nvram.c linux-2.6.39.3/drivers/char/nvram.c
---- linux-2.6.39.3/drivers/char/nvram.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/nvram.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/nvram.c linux-2.6.39.4/drivers/char/nvram.c
+--- linux-2.6.39.4/drivers/char/nvram.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/nvram.c	2011-08-05 19:44:36.000000000 -0400
 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
  
  	spin_unlock_irq(&rtc_lock);
@@ -28748,9 +24020,9 @@ diff -urNp linux-2.6.39.3/drivers/char/nvram.c linux-2.6.39.3/drivers/char/nvram
  		return -EFAULT;
  
  	*ppos = i;
-diff -urNp linux-2.6.39.3/drivers/char/random.c linux-2.6.39.3/drivers/char/random.c
---- linux-2.6.39.3/drivers/char/random.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/random.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/random.c linux-2.6.39.4/drivers/char/random.c
+--- linux-2.6.39.4/drivers/char/random.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/random.c	2011-08-05 19:44:36.000000000 -0400
 @@ -261,8 +261,13 @@
  /*
   * Configuration information
@@ -28801,9 +24073,9 @@ diff -urNp linux-2.6.39.3/drivers/char/random.c linux-2.6.39.3/drivers/char/rand
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-2.6.39.3/drivers/char/sonypi.c linux-2.6.39.3/drivers/char/sonypi.c
---- linux-2.6.39.3/drivers/char/sonypi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/sonypi.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/sonypi.c linux-2.6.39.4/drivers/char/sonypi.c
+--- linux-2.6.39.4/drivers/char/sonypi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/sonypi.c	2011-08-05 19:44:36.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -28842,9 +24114,9 @@ diff -urNp linux-2.6.39.3/drivers/char/sonypi.c linux-2.6.39.3/drivers/char/sony
  	mutex_unlock(&sonypi_device.lock);
  
  	return 0;
-diff -urNp linux-2.6.39.3/drivers/char/tpm/tpm_bios.c linux-2.6.39.3/drivers/char/tpm/tpm_bios.c
---- linux-2.6.39.3/drivers/char/tpm/tpm_bios.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/tpm/tpm_bios.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/tpm/tpm_bios.c linux-2.6.39.4/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.39.4/drivers/char/tpm/tpm_bios.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/tpm/tpm_bios.c	2011-08-05 19:44:36.000000000 -0400
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
@@ -28885,9 +24157,9 @@ diff -urNp linux-2.6.39.3/drivers/char/tpm/tpm_bios.c linux-2.6.39.3/drivers/cha
  
  	memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-2.6.39.3/drivers/char/tpm/tpm.c linux-2.6.39.3/drivers/char/tpm/tpm.c
---- linux-2.6.39.3/drivers/char/tpm/tpm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/tpm/tpm.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/char/tpm/tpm.c linux-2.6.39.4/drivers/char/tpm/tpm.c
+--- linux-2.6.39.4/drivers/char/tpm/tpm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/char/tpm/tpm.c	2011-08-05 19:44:36.000000000 -0400
 @@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
  		    chip->vendor.req_complete_val)
  			goto out_recv;
@@ -28906,41 +24178,9 @@ diff -urNp linux-2.6.39.3/drivers/char/tpm/tpm.c linux-2.6.39.3/drivers/char/tpm
  	tpm_cmd.header.in = tpm_readpubek_header;
  	err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
  			"attempting to read the PUBEK");
-diff -urNp linux-2.6.39.3/drivers/char/ttyprintk.c linux-2.6.39.3/drivers/char/ttyprintk.c
---- linux-2.6.39.3/drivers/char/ttyprintk.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/char/ttyprintk.c	2011-05-22 19:36:31.000000000 -0400
-@@ -170,7 +170,7 @@ static const struct tty_operations ttypr
- 	.ioctl = tpk_ioctl,
- };
- 
--struct tty_port_operations null_ops = { };
-+const struct tty_port_operations null_ops = { };
- 
- static struct tty_driver *ttyprintk_driver;
- 
-diff -urNp linux-2.6.39.3/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.39.3/drivers/char/xilinx_hwicap/xilinx_hwicap.c
---- linux-2.6.39.3/drivers/char/xilinx_hwicap/xilinx_hwicap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct hwicap_driver_config buffer_icap_config = {
-+static const struct hwicap_driver_config buffer_icap_config = {
- 	.get_configuration = buffer_icap_get_configuration,
- 	.set_configuration = buffer_icap_set_configuration,
- 	.get_status = buffer_icap_get_status,
- 	.reset = buffer_icap_reset,
- };
- 
--static struct hwicap_driver_config fifo_icap_config = {
-+static const struct hwicap_driver_config fifo_icap_config = {
- 	.get_configuration = fifo_icap_get_configuration,
- 	.set_configuration = fifo_icap_set_configuration,
- 	.get_status = fifo_icap_get_status,
-diff -urNp linux-2.6.39.3/drivers/crypto/hifn_795x.c linux-2.6.39.3/drivers/crypto/hifn_795x.c
---- linux-2.6.39.3/drivers/crypto/hifn_795x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/crypto/hifn_795x.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/crypto/hifn_795x.c linux-2.6.39.4/drivers/crypto/hifn_795x.c
+--- linux-2.6.39.4/drivers/crypto/hifn_795x.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/crypto/hifn_795x.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 
  		0xCA, 0x34, 0x2B, 0x2E};
  	struct scatterlist sg;
@@ -28950,9 +24190,9 @@ diff -urNp linux-2.6.39.3/drivers/crypto/hifn_795x.c linux-2.6.39.3/drivers/cryp
  	memset(src, 0, sizeof(src));
  	memset(ctx.key, 0, sizeof(ctx.key));
  
-diff -urNp linux-2.6.39.3/drivers/crypto/padlock-aes.c linux-2.6.39.3/drivers/crypto/padlock-aes.c
---- linux-2.6.39.3/drivers/crypto/padlock-aes.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/crypto/padlock-aes.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/crypto/padlock-aes.c linux-2.6.39.4/drivers/crypto/padlock-aes.c
+--- linux-2.6.39.4/drivers/crypto/padlock-aes.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/crypto/padlock-aes.c	2011-08-05 19:44:36.000000000 -0400
 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
  	struct crypto_aes_ctx gen_aes;
  	int cpu;
@@ -28962,84 +24202,9 @@ diff -urNp linux-2.6.39.3/drivers/crypto/padlock-aes.c linux-2.6.39.3/drivers/cr
  	if (key_len % 8) {
  		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
  		return -EINVAL;
-diff -urNp linux-2.6.39.3/drivers/dca/dca-core.c linux-2.6.39.3/drivers/dca/dca-core.c
---- linux-2.6.39.3/drivers/dca/dca-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
--struct dca_provider *alloc_dca_provider(struct dca_ops *ops, int priv_size)
-+struct dca_provider *alloc_dca_provider(const struct dca_ops *ops, int priv_size)
- {
- 	struct dca_provider *dca;
- 	int alloc_size;
-diff -urNp linux-2.6.39.3/drivers/dma/ioat/dca.c linux-2.6.39.3/drivers/dma/ioat/dca.c
---- linux-2.6.39.3/drivers/dma/ioat/dca.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct dca_ops ioat_dca_ops = {
-+static const struct dca_ops ioat_dca_ops = {
- 	.add_requester		= ioat_dca_add_requester,
- 	.remove_requester	= ioat_dca_remove_requester,
- 	.get_tag		= ioat_dca_get_tag,
-@@ -384,7 +384,7 @@ static u8 ioat2_dca_get_tag(struct dca_p
- 	return tag;
- }
- 
--static struct dca_ops ioat2_dca_ops = {
-+static const struct dca_ops ioat2_dca_ops = {
- 	.add_requester		= ioat2_dca_add_requester,
- 	.remove_requester	= ioat2_dca_remove_requester,
- 	.get_tag		= ioat2_dca_get_tag,
-@@ -579,7 +579,7 @@ static u8 ioat3_dca_get_tag(struct dca_p
- 	return tag;
- }
- 
--static struct dca_ops ioat3_dca_ops = {
-+static const struct dca_ops ioat3_dca_ops = {
- 	.add_requester		= ioat3_dca_add_requester,
- 	.remove_requester	= ioat3_dca_remove_requester,
- 	.get_tag		= ioat3_dca_get_tag,
-diff -urNp linux-2.6.39.3/drivers/edac/amd64_edac.h linux-2.6.39.3/drivers/edac/amd64_edac.h
---- linux-2.6.39.3/drivers/edac/amd64_edac.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/edac/amd64_edac.h	2011-05-22 19:36:31.000000000 -0400
-@@ -333,7 +333,7 @@ struct chip_select {
- };
- 
- struct amd64_pvt {
--	struct low_ops *ops;
-+	const struct low_ops *ops;
- 
- 	/* pci_device handles which we utilize */
- 	struct pci_dev *F1, *F2, *F3;
-@@ -443,7 +443,7 @@ struct low_ops {
- struct amd64_family_type {
- 	const char *ctl_name;
- 	u16 f1_id, f3_id;
--	struct low_ops ops;
-+	const struct low_ops ops;
- };
- 
- int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset,
-diff -urNp linux-2.6.39.3/drivers/edac/edac_mc_sysfs.c linux-2.6.39.3/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.39.3/drivers/edac/edac_mc_sysfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/edac/edac_mc_sysfs.c	2011-05-22 19:36:31.000000000 -0400
-@@ -760,7 +760,7 @@ static void edac_inst_grp_release(struct
- }
- 
- /* Intermediate show/store table */
--static struct sysfs_ops inst_grp_ops = {
-+static const struct sysfs_ops inst_grp_ops = {
- 	.show = inst_grp_show,
- 	.store = inst_grp_store
- };
-diff -urNp linux-2.6.39.3/drivers/edac/edac_pci_sysfs.c linux-2.6.39.3/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.39.3/drivers/edac/edac_pci_sysfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/edac/edac_pci_sysfs.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/edac/edac_pci_sysfs.c linux-2.6.39.4/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.39.4/drivers/edac/edac_pci_sysfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/edac/edac_pci_sysfs.c	2011-08-05 19:44:36.000000000 -0400
 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1;		/* log 
  static int edac_pci_log_npe = 1;	/* log PCI non-parity error errors */
  static int edac_pci_poll_msec = 1000;	/* one second workq period */
@@ -29123,9 +24288,9 @@ diff -urNp linux-2.6.39.3/drivers/edac/edac_pci_sysfs.c linux-2.6.39.3/drivers/e
  			panic("EDAC: PCI Parity Error");
  	}
  }
-diff -urNp linux-2.6.39.3/drivers/edac/i7core_edac.c linux-2.6.39.3/drivers/edac/i7core_edac.c
---- linux-2.6.39.3/drivers/edac/i7core_edac.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/edac/i7core_edac.c	2011-07-06 20:00:14.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/edac/i7core_edac.c linux-2.6.39.4/drivers/edac/i7core_edac.c
+--- linux-2.6.39.4/drivers/edac/i7core_edac.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/edac/i7core_edac.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1670,7 +1670,7 @@ static void i7core_mce_output_error(stru
  	char *type, *optype, *err, *msg;
  	unsigned long error = m->status & 0x1ff0000l;
@@ -29135,9 +24300,33 @@ diff -urNp linux-2.6.39.3/drivers/edac/i7core_edac.c linux-2.6.39.3/drivers/edac
  	u32 dimm = (m->misc >> 16) & 0x3;
  	u32 channel = (m->misc >> 18) & 0x3;
  	u32 syndrome = m->misc >> 32;
-diff -urNp linux-2.6.39.3/drivers/firewire/core-cdev.c linux-2.6.39.3/drivers/firewire/core-cdev.c
---- linux-2.6.39.3/drivers/firewire/core-cdev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/firewire/core-cdev.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/edac/mce_amd.h linux-2.6.39.4/drivers/edac/mce_amd.h
+--- linux-2.6.39.4/drivers/edac/mce_amd.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/edac/mce_amd.h	2011-08-05 20:34:06.000000000 -0400
+@@ -83,7 +83,7 @@ struct amd_decoder_ops {
+ 	bool (*dc_mce)(u16, u8);
+ 	bool (*ic_mce)(u16, u8);
+ 	bool (*nb_mce)(u16, u8);
+-};
++} __no_const;
+ 
+ void amd_report_gart_errors(bool);
+ void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
+diff -urNp linux-2.6.39.4/drivers/firewire/core-card.c linux-2.6.39.4/drivers/firewire/core-card.c
+--- linux-2.6.39.4/drivers/firewire/core-card.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/firewire/core-card.c	2011-08-05 20:34:06.000000000 -0400
+@@ -652,7 +652,7 @@ void fw_card_release(struct kref *kref)
+ 
+ void fw_core_remove_card(struct fw_card *card)
+ {
+-	struct fw_card_driver dummy_driver = dummy_driver_template;
++	fw_card_driver_no_const dummy_driver = dummy_driver_template;
+ 
+ 	card->driver->update_phy_reg(card, 4,
+ 				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
+diff -urNp linux-2.6.39.4/drivers/firewire/core-cdev.c linux-2.6.39.4/drivers/firewire/core-cdev.c
+--- linux-2.6.39.4/drivers/firewire/core-cdev.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/firewire/core-cdev.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1312,8 +1312,7 @@ static int init_iso_resource(struct clie
  	int ret;
  
@@ -29148,9 +24337,20 @@ diff -urNp linux-2.6.39.3/drivers/firewire/core-cdev.c linux-2.6.39.3/drivers/fi
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.39.3/drivers/firewire/core-transaction.c linux-2.6.39.3/drivers/firewire/core-transaction.c
---- linux-2.6.39.3/drivers/firewire/core-transaction.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/firewire/core-transaction.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/firewire/core.h linux-2.6.39.4/drivers/firewire/core.h
+--- linux-2.6.39.4/drivers/firewire/core.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/firewire/core.h	2011-08-05 20:34:06.000000000 -0400
+@@ -99,6 +99,7 @@ struct fw_card_driver {
+ 
+ 	int (*stop_iso)(struct fw_iso_context *ctx);
+ };
++typedef struct fw_card_driver __no_const fw_card_driver_no_const;
+ 
+ void fw_card_initialize(struct fw_card *card,
+ 		const struct fw_card_driver *driver, struct device *device);
+diff -urNp linux-2.6.39.4/drivers/firewire/core-transaction.c linux-2.6.39.4/drivers/firewire/core-transaction.c
+--- linux-2.6.39.4/drivers/firewire/core-transaction.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/firewire/core-transaction.c	2011-08-05 19:44:36.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <linux/string.h>
  #include <linux/timer.h>
@@ -29168,9 +24368,9 @@ diff -urNp linux-2.6.39.3/drivers/firewire/core-transaction.c linux-2.6.39.3/dri
  	init_timer_on_stack(&t.split_timeout_timer);
  	init_completion(&d.done);
  	d.payload = payload;
-diff -urNp linux-2.6.39.3/drivers/firmware/dmi_scan.c linux-2.6.39.3/drivers/firmware/dmi_scan.c
---- linux-2.6.39.3/drivers/firmware/dmi_scan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/firmware/dmi_scan.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/firmware/dmi_scan.c linux-2.6.39.4/drivers/firmware/dmi_scan.c
+--- linux-2.6.39.4/drivers/firmware/dmi_scan.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/firmware/dmi_scan.c	2011-08-05 19:44:36.000000000 -0400
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -29183,9 +24383,9 @@ diff -urNp linux-2.6.39.3/drivers/firmware/dmi_scan.c linux-2.6.39.3/drivers/fir
  		p = dmi_ioremap(0xF0000, 0x10000);
  		if (p == NULL)
  			goto error;
-diff -urNp linux-2.6.39.3/drivers/gpio/vr41xx_giu.c linux-2.6.39.3/drivers/gpio/vr41xx_giu.c
---- linux-2.6.39.3/drivers/gpio/vr41xx_giu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpio/vr41xx_giu.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpio/vr41xx_giu.c linux-2.6.39.4/drivers/gpio/vr41xx_giu.c
+--- linux-2.6.39.4/drivers/gpio/vr41xx_giu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpio/vr41xx_giu.c	2011-08-05 19:44:36.000000000 -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);
@@ -29195,9 +24395,9 @@ diff -urNp linux-2.6.39.3/drivers/gpio/vr41xx_giu.c linux-2.6.39.3/drivers/gpio/
  
  	return -EINVAL;
  }
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.39.3/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.39.3/drivers/gpu/drm/drm_crtc_helper.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/drm_crtc_helper.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.39.4/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.39.4/drivers/gpu/drm/drm_crtc_helper.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/drm_crtc_helper.c	2011-08-05 19:44:36.000000000 -0400
 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
@@ -29216,9 +24416,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.39.3/drive
  	crtc->enabled = drm_helper_crtc_in_use(crtc);
  	if (!crtc->enabled)
  		return true;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_drv.c linux-2.6.39.3/drivers/gpu/drm/drm_drv.c
---- linux-2.6.39.3/drivers/gpu/drm/drm_drv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/drm_drv.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/drm_drv.c linux-2.6.39.4/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.39.4/drivers/gpu/drm/drm_drv.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/drm_drv.c	2011-08-05 19:44:36.000000000 -0400
 @@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp,
  
  	dev = file_priv->minor->dev;
@@ -29228,9 +24428,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_drv.c linux-2.6.39.3/drivers/gpu/d
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_fops.c linux-2.6.39.3/drivers/gpu/drm/drm_fops.c
---- linux-2.6.39.3/drivers/gpu/drm/drm_fops.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/drm_fops.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/drm_fops.c linux-2.6.39.4/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.39.4/drivers/gpu/drm/drm_fops.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/drm_fops.c	2011-08-05 19:44:36.000000000 -0400
 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
  	}
  
@@ -29280,9 +24480,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_fops.c linux-2.6.39.3/drivers/gpu/
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_global.c linux-2.6.39.3/drivers/gpu/drm/drm_global.c
---- linux-2.6.39.3/drivers/gpu/drm/drm_global.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/drm_global.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/drm_global.c linux-2.6.39.4/drivers/gpu/drm/drm_global.c
+--- linux-2.6.39.4/drivers/gpu/drm/drm_global.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/drm_global.c	2011-08-05 19:44:36.000000000 -0400
 @@ -36,7 +36,7 @@
  struct drm_global_item {
  	struct mutex mutex;
@@ -29340,9 +24540,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_global.c linux-2.6.39.3/drivers/gp
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_info.c linux-2.6.39.3/drivers/gpu/drm/drm_info.c
---- linux-2.6.39.3/drivers/gpu/drm/drm_info.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/drm_info.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/drm_info.c linux-2.6.39.4/drivers/gpu/drm/drm_info.c
+--- linux-2.6.39.4/drivers/gpu/drm/drm_info.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/drm_info.c	2011-08-05 19:44:36.000000000 -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;
@@ -29383,9 +24583,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_info.c linux-2.6.39.3/drivers/gpu/
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.39.3/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.39.3/drivers/gpu/drm/drm_ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/drm_ioctl.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.39.4/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.39.4/drivers/gpu/drm/drm_ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/drm_ioctl.c	2011-08-05 19:44:36.000000000 -0400
 @@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev,
  			stats->data[i].value =
  			    (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -29395,9 +24595,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.39.3/drivers/gpu
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_lock.c linux-2.6.39.3/drivers/gpu/drm/drm_lock.c
---- linux-2.6.39.3/drivers/gpu/drm/drm_lock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/drm_lock.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/drm_lock.c linux-2.6.39.4/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.39.4/drivers/gpu/drm/drm_lock.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/drm_lock.c	2011-08-05 19:44:36.000000000 -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 = file_priv;
@@ -29416,9 +24616,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/drm_lock.c linux-2.6.39.3/drivers/gpu/
  
  	if (drm_lock_free(&master->lock, lock->context)) {
  		/* FIXME: Should really bail out here. */
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i810/i810_dma.c linux-2.6.39.3/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.39.3/drivers/gpu/drm/i810/i810_dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i810/i810_dma.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.39.4/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.39.4/drivers/gpu/drm/i810/i810_dma.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i810/i810_dma.c	2011-08-05 19:44:36.000000000 -0400
 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
@@ -29441,9 +24641,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i810/i810_dma.c linux-2.6.39.3/drivers
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i810/i810_drv.h linux-2.6.39.3/drivers/gpu/drm/i810/i810_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/i810/i810_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i810/i810_drv.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i810/i810_drv.h linux-2.6.39.4/drivers/gpu/drm/i810/i810_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/i810/i810_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i810/i810_drv.h	2011-08-05 19:44:36.000000000 -0400
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
  	int page_flipping;
  
@@ -29455,104 +24655,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i810/i810_drv.h linux-2.6.39.3/drivers
  
  	int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ch7017.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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_
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7017_ops = {
-+const struct intel_dvo_dev_ops ch7017_ops = {
- 	.init = ch7017_init,
- 	.detect = ch7017_detect,
- 	.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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_
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7xxx_ops = {
-+const struct intel_dvo_dev_ops ch7xxx_ops = {
- 	.init = ch7xxx_init,
- 	.detect = ch7xxx_detect,
- 	.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/dvo.h linux-2.6.39.3/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.39.3/drivers/gpu/drm/i915/dvo.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/dvo.h	2011-05-22 19:36:31.000000000 -0400
-@@ -122,23 +122,23 @@ struct intel_dvo_dev_ops {
- 	 *
- 	 * \return singly-linked list of modes or NULL if no modes found.
- 	 */
--	struct drm_display_mode *(*get_modes)(struct intel_dvo_device *dvo);
-+	struct drm_display_mode *(* const get_modes)(struct intel_dvo_device *dvo);
- 
- 	/**
- 	 * Clean up driver-specific bits of the output
- 	 */
--	void (*destroy) (struct intel_dvo_device *dvo);
-+	void (* const destroy) (struct intel_dvo_device *dvo);
- 
- 	/**
- 	 * Debugging hook to dump device registers to log file
- 	 */
--	void (*dump_regs)(struct intel_dvo_device *dvo);
-+	void (* const dump_regs)(struct intel_dvo_device *dvo);
- };
- 
--extern struct intel_dvo_dev_ops sil164_ops;
--extern struct intel_dvo_dev_ops ch7xxx_ops;
--extern struct intel_dvo_dev_ops ivch_ops;
--extern struct intel_dvo_dev_ops tfp410_ops;
--extern struct intel_dvo_dev_ops ch7017_ops;
-+extern const struct intel_dvo_dev_ops sil164_ops;
-+extern const struct intel_dvo_dev_ops ch7xxx_ops;
-+extern const struct intel_dvo_dev_ops ivch_ops;
-+extern const struct intel_dvo_dev_ops tfp410_ops;
-+extern const struct intel_dvo_dev_ops ch7017_ops;
- 
- #endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ivch.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/dvo_ivch.c	2011-05-22 19:36:31.000000000 -0400
-@@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv
- 	}
- }
- 
--struct intel_dvo_dev_ops ivch_ops= {
-+const struct intel_dvo_dev_ops ivch_ops= {
- 	.init = ivch_init,
- 	.dpms = ivch_dpms,
- 	.mode_valid = ivch_mode_valid,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.39.3/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/dvo_sil164.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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_
- 	}
- }
- 
--struct intel_dvo_dev_ops sil164_ops = {
-+const struct intel_dvo_dev_ops sil164_ops = {
- 	.init = sil164_init,
- 	.detect = sil164_detect,
- 	.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.39.3/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/dvo_tfp410.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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_
- 	}
- }
- 
--struct intel_dvo_dev_ops tfp410_ops = {
-+const struct intel_dvo_dev_ops tfp410_ops = {
- 	.init = tfp410_init,
- 	.detect = tfp410_detect,
- 	.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.39.3/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/i915_debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/i915_debugfs.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.39.4/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-2.6.39.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-08-05 19:44:36.000000000 -0400
 @@ -496,7 +496,7 @@ static int i915_interrupt_info(struct se
  			   I915_READ(GTIMR));
  	}
@@ -29562,9 +24667,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.39.3/dri
  	for (i = 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.3/drivers/gpu/drm/i915/i915_dma.c linux-2.6.39.3/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/i915_dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/i915_dma.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.39.4/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.39.4/drivers/gpu/drm/i915/i915_dma.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i915/i915_dma.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s
  	bool can_switch;
  
@@ -29574,21 +24679,18 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_dma.c linux-2.6.39.3/drivers
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.c	2011-05-22 19:36:31.000000000 -0400
-@@ -679,7 +679,7 @@ static const struct dev_pm_ops i915_pm_o
-      .restore = i915_pm_resume,
- };
- 
--static struct vm_operations_struct i915_gem_vm_ops = {
-+static const struct vm_operations_struct i915_gem_vm_ops = {
- 	.fault = i915_gem_fault,
- 	.open = drm_gem_vm_open,
- 	.close = drm_gem_vm_close,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.h linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i915/i915_drv.h linux-2.6.39.4/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/i915/i915_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i915/i915_drv.h	2011-08-05 20:34:06.000000000 -0400
+@@ -209,7 +209,7 @@ struct drm_i915_display_funcs {
+ 	/* display clock increase/decrease */
+ 	/* pll clock increase/decrease */
+ 	/* clock gating init */
+-};
++} __no_const;
+ 
+ struct intel_device_info {
+ 	u8 gen;
 @@ -287,7 +287,7 @@ typedef struct drm_i915_private {
  	int current_page;
  	int page_flipping;
@@ -29616,9 +24718,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_drv.h linux-2.6.39.3/drivers
  {
  	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.39.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.39.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-2.6.39.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-08-05 19:44:36.000000000 -0400
 @@ -192,7 +192,7 @@ i915_gem_object_set_to_gpu_domain(struct
  		i915_gem_release_mmap(obj);
  
@@ -29628,9 +24730,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.3
  
  	/* 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.3/drivers/gpu/drm/i915/i915_irq.c linux-2.6.39.3/drivers/gpu/drm/i915/i915_irq.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/i915_irq.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/i915_irq.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i915/i915_irq.c linux-2.6.39.4/drivers/gpu/drm/i915/i915_irq.c
+--- linux-2.6.39.4/drivers/gpu/drm/i915/i915_irq.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i915/i915_irq.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1101,7 +1101,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
  	int ret = IRQ_NONE, pipe;
  	bool blc_event = false;
@@ -29649,9 +24751,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/i915_irq.c linux-2.6.39.3/drivers
  
  	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.3/drivers/gpu/drm/i915/intel_display.c linux-2.6.39.3/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.39.3/drivers/gpu/drm/i915/intel_display.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/i915/intel_display.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/i915/intel_display.c linux-2.6.39.4/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.39.4/drivers/gpu/drm/i915/intel_display.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/i915/intel_display.c	2011-08-05 19:44:36.000000000 -0400
 @@ -2244,7 +2244,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  
  		wait_event(dev_priv->pending_flip_queue,
@@ -29688,9 +24790,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/i915/intel_display.c linux-2.6.39.3/dr
  
  	switch (INTEL_INFO(dev)->gen) {
  	case 2:
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/mga/mga_drv.h linux-2.6.39.3/drivers/gpu/drm/mga/mga_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/mga/mga_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/mga/mga_drv.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/mga/mga_drv.h linux-2.6.39.4/drivers/gpu/drm/mga/mga_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/mga/mga_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/mga/mga_drv.h	2011-08-05 19:44:36.000000000 -0400
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
  	u32 clear_cmd;
  	u32 maccess;
@@ -29703,9 +24805,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/mga/mga_drv.h linux-2.6.39.3/drivers/g
  	u32 next_fence_to_post;
  
  	unsigned int fb_cpp;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/mga/mga_irq.c linux-2.6.39.3/drivers/gpu/drm/mga/mga_irq.c
---- linux-2.6.39.3/drivers/gpu/drm/mga/mga_irq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/mga/mga_irq.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/mga/mga_irq.c linux-2.6.39.4/drivers/gpu/drm/mga/mga_irq.c
+--- linux-2.6.39.4/drivers/gpu/drm/mga/mga_irq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/mga/mga_irq.c	2011-08-05 19:44:36.000000000 -0400
 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -29742,21 +24844,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/mga/mga_irq.c linux-2.6.39.3/drivers/g
  		      - *sequence) <= (1 << 23)));
  
  	*sequence = cur_fence;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_acpi.c linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_acpi.c
---- linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_acpi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct vga_switcheroo_handler nouveau_dsm_handler = {
-+static const struct vga_switcheroo_handler nouveau_dsm_handler = {
- 	.switchto = nouveau_dsm_switchto,
- 	.power_state = nouveau_dsm_power_state,
- 	.init = nouveau_dsm_init,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-06-07 18:07:24.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-08-05 20:34:06.000000000 -0400
 @@ -228,7 +228,7 @@ struct nouveau_channel {
  		struct list_head pending;
  		uint32_t sequence;
@@ -29766,6 +24856,31 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.39.3/d
  	} fence;
  
  	/* DMA push buffer */
+@@ -317,13 +317,13 @@ struct nouveau_instmem_engine {
+ struct nouveau_mc_engine {
+ 	int  (*init)(struct drm_device *dev);
+ 	void (*takedown)(struct drm_device *dev);
+-};
++} __no_const;
+ 
+ struct nouveau_timer_engine {
+ 	int      (*init)(struct drm_device *dev);
+ 	void     (*takedown)(struct drm_device *dev);
+ 	uint64_t (*read)(struct drm_device *dev);
+-};
++} __no_const;
+ 
+ struct nouveau_fb_engine {
+ 	int num_tiles;
+@@ -516,7 +516,7 @@ struct nouveau_vram_engine {
+ 	void (*put)(struct drm_device *, struct nouveau_mem **);
+ 
+ 	bool (*flags_valid)(struct drm_device *, u32 tile_flags);
+-};
++} __no_const;
+ 
+ struct nouveau_engine {
+ 	struct nouveau_instmem_engine instmem;
 @@ -662,7 +662,7 @@ struct drm_nouveau_private {
  		struct drm_global_reference mem_global_ref;
  		struct ttm_bo_global_ref bo_global_ref;
@@ -29775,9 +24890,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.39.3/d
  	} ttm;
  
  	struct {
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-08-05 19:44:36.000000000 -0400
 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
  		if (USE_REFCNT(dev))
  			sequence = nvchan_rd32(chan, 0x48);
@@ -29796,9 +24911,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.39.3
  	return 0;
  }
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-08-05 19:44:36.000000000 -0400
 @@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
  	int trycnt = 0;
  	int ret, i;
@@ -29808,9 +24923,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.39.3/d
  retry:
  	if (++trycnt > 100000) {
  		NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_state.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_state.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-08-05 19:44:36.000000000 -0400
 @@ -583,7 +583,7 @@ static bool nouveau_switcheroo_can_switc
  	bool can_switch;
  
@@ -29820,9 +24935,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.39.3
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.39.3/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-2.6.39.3/drivers/gpu/drm/nouveau/nv04_graph.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/nouveau/nv04_graph.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.39.4/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-2.6.39.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-08-05 19:44:36.000000000 -0400
 @@ -552,7 +552,7 @@ static int
  nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
  			u32 class, u32 mthd, u32 data)
@@ -29832,9 +24947,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.39.3/dr
  	return 0;
  }
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/r128/r128_cce.c linux-2.6.39.3/drivers/gpu/drm/r128/r128_cce.c
---- linux-2.6.39.3/drivers/gpu/drm/r128/r128_cce.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/r128/r128_cce.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/r128/r128_cce.c linux-2.6.39.4/drivers/gpu/drm/r128/r128_cce.c
+--- linux-2.6.39.4/drivers/gpu/drm/r128/r128_cce.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/r128/r128_cce.c	2011-08-05 19:44:36.000000000 -0400
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
  	/* GH: Simple idle check.
@@ -29844,9 +24959,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/r128/r128_cce.c linux-2.6.39.3/drivers
  
  	/* 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.3/drivers/gpu/drm/r128/r128_drv.h linux-2.6.39.3/drivers/gpu/drm/r128/r128_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/r128/r128_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/r128/r128_drv.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/r128/r128_drv.h linux-2.6.39.4/drivers/gpu/drm/r128/r128_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/r128/r128_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/r128/r128_drv.h	2011-08-05 19:44:36.000000000 -0400
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
  	int is_pci;
  	unsigned long cce_buffers_offset;
@@ -29864,9 +24979,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/r128/r128_drv.h linux-2.6.39.3/drivers
  
  	u32 color_fmt;
  	unsigned int front_offset;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/r128/r128_irq.c linux-2.6.39.3/drivers/gpu/drm/r128/r128_irq.c
---- linux-2.6.39.3/drivers/gpu/drm/r128/r128_irq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/r128/r128_irq.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/r128/r128_irq.c linux-2.6.39.4/drivers/gpu/drm/r128/r128_irq.c
+--- linux-2.6.39.4/drivers/gpu/drm/r128/r128_irq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/r128/r128_irq.c	2011-08-05 19:44:36.000000000 -0400
 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
  	if (crtc != 0)
  		return 0;
@@ -29885,9 +25000,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/r128/r128_irq.c linux-2.6.39.3/drivers
  		drm_handle_vblank(dev, 0);
  		return IRQ_HANDLED;
  	}
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/r128/r128_state.c linux-2.6.39.3/drivers/gpu/drm/r128/r128_state.c
---- linux-2.6.39.3/drivers/gpu/drm/r128/r128_state.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/r128/r128_state.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/r128/r128_state.c linux-2.6.39.4/drivers/gpu/drm/r128/r128_state.c
+--- linux-2.6.39.4/drivers/gpu/drm/r128/r128_state.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/r128/r128_state.c	2011-08-05 19:44:36.000000000 -0400
 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
@@ -29901,9 +25016,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/r128/r128_state.c linux-2.6.39.3/drive
  }
  
  #endif
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/atom.c linux-2.6.39.3/drivers/gpu/drm/radeon/atom.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/atom.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/atom.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/atom.c linux-2.6.39.4/drivers/gpu/drm/radeon/atom.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/atom.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/atom.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c
  	char name[512];
  	int i;
@@ -29913,9 +25028,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/atom.c linux-2.6.39.3/drivers/g
  	ctx->card = card;
  	ctx->bios = bios;
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.39.3/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/mkregtable.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/mkregtable.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.39.4/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/mkregtable.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/mkregtable.c	2011-08-05 19:44:36.000000000 -0400
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
  	regex_t mask_rex;
  	regmatch_t match[4];
@@ -29933,9 +25048,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.39.3/dri
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atombios.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atombios.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_atombios.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_atombios.c	2011-08-05 19:44:36.000000000 -0400
 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
  	struct radeon_gpio_rec gpio;
  	struct radeon_hpd hpd;
@@ -29945,21 +25060,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.39.
  	if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
  		return false;
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atpx_handler.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atpx_handler.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_atpx_handler.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct vga_switcheroo_handler radeon_atpx_handler = {
-+static const struct vga_switcheroo_handler radeon_atpx_handler = {
- 	.switchto = radeon_atpx_switchto,
- 	.power_state = radeon_atpx_power_state,
- 	.init = radeon_atpx_init,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_device.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_device.c	2011-06-25 13:00:25.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_device.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_device.c	2011-08-05 19:44:36.000000000 -0400
 @@ -674,7 +674,7 @@ static bool radeon_switcheroo_can_switch
  	bool can_switch;
  
@@ -29969,10 +25072,10 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.39.3/
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_display.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_display.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_display.c	2011-08-05 21:12:20.000000000 -0400
+@@ -937,6 +937,8 @@ void radeon_compute_pll_legacy(struct ra
  	uint32_t post_div;
  	u32 pll_out_min, pll_out_max;
  
@@ -29981,9 +25084,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.39.3
  	DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
  	freq = freq * 1000;
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_drv.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-08-05 19:44:36.000000000 -0400
 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
  
  	/* SW interrupt */
@@ -29993,9 +25096,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.39.3/dri
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_fence.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_fence.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-08-05 19:44:36.000000000 -0400
 @@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_devi
  		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
  		return 0;
@@ -30014,9 +25117,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.39.3/d
  	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.3/drivers/gpu/drm/radeon/radeon.h linux-2.6.39.3/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon.h linux-2.6.39.4/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon.h	2011-08-05 20:34:06.000000000 -0400
 @@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_d
   */
  struct radeon_fence_driver {
@@ -30026,9 +25129,18 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon.h linux-2.6.39.3/drivers
  	uint32_t			last_seq;
  	unsigned long			last_jiffies;
  	unsigned long			last_timeout;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-05-22 19:36:31.000000000 -0400
+@@ -958,7 +958,7 @@ struct radeon_asic {
+ 	void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
+ 	u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
+ 	void (*post_page_flip)(struct radeon_device *rdev, int crtc);
+-};
++} __no_const;
+ 
+ /*
+  * Asic structures
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-08-05 19:44:36.000000000 -0400
 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
  	request = compat_alloc_user_space(sizeof(*request));
  	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -30038,9 +25150,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.39.3/d
  			  &request->value))
  		return -EFAULT;
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_irq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_irq.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-08-05 19:44:36.000000000 -0400
 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
  	unsigned int ret;
  	RING_LOCALS;
@@ -30061,9 +25173,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.39.3/dri
  	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
  	dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_state.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_state.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_state.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_state.c	2011-08-05 19:44:36.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 = RADEON_NR_SAREA_CLIPRECTS;
@@ -30082,72 +25194,25 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.39.3/d
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/radeon_ttm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 = size >> PAGE_SHIFT;
- }
- 
--static struct vm_operations_struct radeon_ttm_vm_ops;
--static const struct vm_operations_struct *ttm_vm_ops = NULL;
-+extern int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
-+extern void ttm_bo_vm_open(struct vm_area_struct *vma);
-+extern void ttm_bo_vm_close(struct vm_area_struct *vma);
- 
- static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
-@@ -612,17 +613,22 @@ static int radeon_ttm_fault(struct vm_ar
- 	struct radeon_device *rdev;
- 	int r;
- 
--	bo = (struct ttm_buffer_object *)vma->vm_private_data;	
--	if (bo == NULL) {
-+	bo = (struct ttm_buffer_object *)vma->vm_private_data;
-+	if (!bo)
- 		return VM_FAULT_NOPAGE;
--	}
- 	rdev = radeon_get_rdev(bo->bdev);
- 	mutex_lock(&rdev->vram_mutex);
--	r = ttm_vm_ops->fault(vma, vmf);
-+	r = ttm_bo_vm_fault(vma, vmf);
- 	mutex_unlock(&rdev->vram_mutex);
- 	return r;
- }
- 
-+static const struct vm_operations_struct radeon_ttm_vm_ops = {
-+	.fault = radeon_ttm_fault,
-+	.open = ttm_bo_vm_open,
-+	.close = ttm_bo_vm_close
-+};
-+
- int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
- {
- 	struct drm_file *file_priv;
-@@ -635,18 +641,11 @@ int radeon_mmap(struct file *filp, struc
- 
- 	file_priv = filp->private_data;
- 	rdev = file_priv->minor->dev->dev_private;
--	if (rdev == NULL) {
-+	if (!rdev)
- 		return -EINVAL;
--	}
- 	r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
--	if (unlikely(r != 0)) {
-+	if (r)
- 		return r;
--	}
--	if (unlikely(ttm_vm_ops == NULL)) {
--		ttm_vm_ops = vma->vm_ops;
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ttm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/radeon_ttm.c	2011-08-05 20:34:06.000000000 -0400
+@@ -644,8 +644,10 @@ int radeon_mmap(struct file *filp, struc
+ 	}
+ 	if (unlikely(ttm_vm_ops == NULL)) {
+ 		ttm_vm_ops = vma->vm_ops;
 -		radeon_ttm_vm_ops = *ttm_vm_ops;
 -		radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
--	}
++		pax_open_kernel();
++		memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
++		*(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
++		pax_close_kernel();
+ 	}
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
- }
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/rs690.c linux-2.6.39.3/drivers/gpu/drm/radeon/rs690.c
---- linux-2.6.39.3/drivers/gpu/drm/radeon/rs690.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/radeon/rs690.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/radeon/rs690.c linux-2.6.39.4/drivers/gpu/drm/radeon/rs690.c
+--- linux-2.6.39.4/drivers/gpu/drm/radeon/rs690.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/radeon/rs690.c	2011-08-05 19:44:36.000000000 -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)
@@ -30161,69 +25226,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/radeon/rs690.c linux-2.6.39.3/drivers/
  	} else {
  		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-05-22 19:36:31.000000000 -0400
-@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
- 	return best_bo;
- }
- 
--static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
- 	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
- 	    vma->vm_private_data;
--	struct ttm_bo_device *bdev = bo->bdev;
-+	struct ttm_bo_device *bdev;
- 	unsigned long page_offset;
- 	unsigned long page_last;
- 	unsigned long pfn;
-@@ -83,8 +83,12 @@ static int ttm_bo_vm_fault(struct vm_are
- 	int i;
- 	unsigned long address = (unsigned long)vmf->virtual_address;
- 	int retval = VM_FAULT_NOPAGE;
--	struct ttm_mem_type_manager *man =
--		&bdev->man[bo->mem.mem_type];
-+	struct ttm_mem_type_manager *man;
-+
-+	if (!bo)
-+		return VM_FAULT_NOPAGE;
-+	bdev = bo->bdev;
-+	man = &bdev->man[bo->mem.mem_type];
- 
- 	/*
- 	 * Work around locking order reversal in fault / nopfn
-@@ -219,22 +223,25 @@ out_unlock:
- 	ttm_bo_unreserve(bo);
- 	return retval;
- }
-+EXPORT_SYMBOL(ttm_bo_vm_fault);
- 
--static void ttm_bo_vm_open(struct vm_area_struct *vma)
-+void ttm_bo_vm_open(struct vm_area_struct *vma)
- {
- 	struct ttm_buffer_object *bo =
- 	    (struct ttm_buffer_object *)vma->vm_private_data;
- 
- 	(void)ttm_bo_reference(bo);
- }
-+EXPORT_SYMBOL(ttm_bo_vm_open);
- 
--static void ttm_bo_vm_close(struct vm_area_struct *vma)
-+void ttm_bo_vm_close(struct vm_area_struct *vma)
- {
- 	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data;
- 
- 	ttm_bo_unref(&bo);
- 	vma->vm_private_data = NULL;
- }
-+EXPORT_SYMBOL(ttm_bo_vm_close);
- 
- static const struct vm_operations_struct ttm_bo_vm_ops = {
- 	.fault = ttm_bo_vm_fault,
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.39.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-2.6.39.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-08-05 19:44:36.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)
@@ -30236,9 +25241,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.39.3/dr
  	struct ttm_page_pool *pool;
  
  	pool_offset = pool_offset % NUM_POOLS;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/via/via_drv.h linux-2.6.39.3/drivers/gpu/drm/via/via_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/via/via_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/via/via_drv.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/via/via_drv.h linux-2.6.39.4/drivers/gpu/drm/via/via_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/via/via_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/via/via_drv.h	2011-08-05 19:44:36.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -30257,9 +25262,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/via/via_drv.h linux-2.6.39.3/drivers/g
  	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.3/drivers/gpu/drm/via/via_irq.c linux-2.6.39.3/drivers/gpu/drm/via/via_irq.c
---- linux-2.6.39.3/drivers/gpu/drm/via/via_irq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/via/via_irq.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/via/via_irq.c linux-2.6.39.4/drivers/gpu/drm/via/via_irq.c
+--- linux-2.6.39.4/drivers/gpu/drm/via/via_irq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/via/via_irq.c	2011-08-05 19:44:36.000000000 -0400
 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -30330,9 +25335,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/via/via_irq.c linux-2.6.39.3/drivers/g
  		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
  	case VIA_IRQ_ABSOLUTE:
  		break;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-08-05 19:44:36.000000000 -0400
 @@ -240,7 +240,7 @@ struct vmw_private {
  	 * Fencing and IRQs.
  	 */
@@ -30342,9 +25347,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.39.3/dri
  	wait_queue_head_t fence_queue;
  	wait_queue_head_t fifo_queue;
  	atomic_t fence_queue_waiters;
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-08-05 19:44:36.000000000 -0400
 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
  	while (!vmw_lag_lt(queue, us)) {
  		spin_lock(&queue->lock);
@@ -30354,9 +25359,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.39.3/d
  		else {
  			fence = list_first_entry(&queue->head,
  						 struct vmw_fence, head);
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-08-05 20:34:06.000000000 -0400
 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
  		 (unsigned int) min,
  		 (unsigned int) fifo->capabilities);
@@ -30384,18 +25389,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.39.3/dr
  	} while (*sequence == 0);
  
  	if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-@@ -534,7 +534,7 @@ static int vmw_fifo_vm_fault(struct vm_a
- 	return VM_FAULT_SIGBUS;
- }
- 
--static struct vm_operations_struct vmw_fifo_vm_ops = {
-+static const struct vm_operations_struct vmw_fifo_vm_ops = {
- 	.fault = vmw_fifo_vm_fault,
- 	.open = NULL,
- 	.close = NULL
-diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-08-05 19:44:36.000000000 -0400
 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
  	 * emitted. Then the fence is stale and signaled.
  	 */
@@ -30414,30 +25410,9 @@ diff -urNp linux-2.6.39.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.39.3/dri
  	ret = 0;
  
  	for (;;) {
-diff -urNp linux-2.6.39.3/drivers/gpu/vga/vga_switcheroo.c linux-2.6.39.3/drivers/gpu/vga/vga_switcheroo.c
---- linux-2.6.39.3/drivers/gpu/vga/vga_switcheroo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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];
- 
--	struct vga_switcheroo_handler *handler;
-+	const struct vga_switcheroo_handler *handler;
- };
- 
- static int vga_switcheroo_debugfs_init(struct vgasr_priv *priv);
-@@ -62,7 +62,7 @@ static void vga_switcheroo_debugfs_fini(
- /* only one switcheroo per system */
- static struct vgasr_priv vgasr_priv;
- 
--int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler)
-+int vga_switcheroo_register_handler(const struct vga_switcheroo_handler *handler)
- {
- 	mutex_lock(&vgasr_mutex);
- 	if (vgasr_priv.handler) {
-diff -urNp linux-2.6.39.3/drivers/hid/hid-core.c linux-2.6.39.3/drivers/hid/hid-core.c
---- linux-2.6.39.3/drivers/hid/hid-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/hid/hid-core.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/hid/hid-core.c linux-2.6.39.4/drivers/hid/hid-core.c
+--- linux-2.6.39.4/drivers/hid/hid-core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/hid/hid-core.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1888,7 +1888,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
@@ -30456,21 +25431,9 @@ diff -urNp linux-2.6.39.3/drivers/hid/hid-core.c linux-2.6.39.3/drivers/hid/hid-
  
  	hid_debug_register(hdev, dev_name(&hdev->dev));
  	ret = device_add(&hdev->dev);
-diff -urNp linux-2.6.39.3/drivers/hid/hid-picolcd.c linux-2.6.39.3/drivers/hid/hid-picolcd.c
---- linux-2.6.39.3/drivers/hid/hid-picolcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/hid/hid-picolcd.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1037,7 +1037,7 @@ static int picolcd_check_lcd_fb(struct l
- 	return fb && fb == picolcd_fbinfo((struct picolcd_data *)lcd_get_data(ldev));
- }
- 
--static struct lcd_ops picolcd_lcdops = {
-+static const struct lcd_ops picolcd_lcdops = {
- 	.get_contrast   = picolcd_get_contrast,
- 	.set_contrast   = picolcd_set_contrast,
- 	.check_fb       = picolcd_check_lcd_fb,
-diff -urNp linux-2.6.39.3/drivers/hid/usbhid/hiddev.c linux-2.6.39.3/drivers/hid/usbhid/hiddev.c
---- linux-2.6.39.3/drivers/hid/usbhid/hiddev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/hid/usbhid/hiddev.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/hid/usbhid/hiddev.c linux-2.6.39.4/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.39.4/drivers/hid/usbhid/hiddev.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/hid/usbhid/hiddev.c	2011-08-05 19:44:36.000000000 -0400
 @@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi
  		break;
  
@@ -30480,33 +25443,9 @@ diff -urNp linux-2.6.39.3/drivers/hid/usbhid/hiddev.c linux-2.6.39.3/drivers/hid
  			break;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.39.3/drivers/hwmon/ibmaem.c linux-2.6.39.3/drivers/hwmon/ibmaem.c
---- linux-2.6.39.3/drivers/hwmon/ibmaem.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/hwmon/ibmaem.c	2011-07-09 09:19:18.000000000 -0400
-@@ -238,7 +238,7 @@ struct aem_read_sensor_resp {
- struct aem_driver_data {
- 	struct list_head	aem_devices;
- 	struct ipmi_smi_watcher	bmc_events;
--	struct ipmi_user_hndl	ipmi_hndlrs;
-+	const struct ipmi_user_hndl ipmi_hndlrs;
- };
- 
- static void aem_register_bmc(int iface, struct device *dev);
-diff -urNp linux-2.6.39.3/drivers/hwmon/ibmpex.c linux-2.6.39.3/drivers/hwmon/ibmpex.c
---- linux-2.6.39.3/drivers/hwmon/ibmpex.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/hwmon/ibmpex.c	2011-07-09 09:19:18.000000000 -0400
-@@ -110,7 +110,7 @@ struct ibmpex_bmc_data {
- struct ibmpex_driver_data {
- 	struct list_head	bmc_data;
- 	struct ipmi_smi_watcher	bmc_events;
--	struct ipmi_user_hndl	ipmi_hndlrs;
-+	const struct ipmi_user_hndl ipmi_hndlrs;
- };
- 
- static struct ibmpex_driver_data driver_data = {
-diff -urNp linux-2.6.39.3/drivers/hwmon/sht15.c linux-2.6.39.3/drivers/hwmon/sht15.c
---- linux-2.6.39.3/drivers/hwmon/sht15.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/hwmon/sht15.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/hwmon/sht15.c linux-2.6.39.4/drivers/hwmon/sht15.c
+--- linux-2.6.39.4/drivers/hwmon/sht15.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/hwmon/sht15.c	2011-08-05 19:44:36.000000000 -0400
 @@ -113,7 +113,7 @@ struct sht15_data {
  	int				supply_uV;
  	int				supply_uV_valid;
@@ -30555,9 +25494,9 @@ diff -urNp linux-2.6.39.3/drivers/hwmon/sht15.c linux-2.6.39.3/drivers/hwmon/sht
  			return;
  	}
  	/* Read the data back from the device */
-diff -urNp linux-2.6.39.3/drivers/hwmon/w83791d.c linux-2.6.39.3/drivers/hwmon/w83791d.c
---- linux-2.6.39.3/drivers/hwmon/w83791d.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/hwmon/w83791d.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/hwmon/w83791d.c linux-2.6.39.4/drivers/hwmon/w83791d.c
+--- linux-2.6.39.4/drivers/hwmon/w83791d.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/hwmon/w83791d.c	2011-08-05 19:44:36.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);
@@ -30569,165 +25508,45 @@ diff -urNp linux-2.6.39.3/drivers/hwmon/w83791d.c linux-2.6.39.3/drivers/hwmon/w
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-at91.c linux-2.6.39.3/drivers/i2c/busses/i2c-at91.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-at91.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-at91.c	2011-05-22 19:36:31.000000000 -0400
-@@ -181,7 +181,7 @@ static u32 at91_func(struct i2c_adapter 
- 	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
- }
- 
--static struct i2c_algorithm at91_algorithm = {
-+static const struct i2c_algorithm at91_algorithm = {
- 	.master_xfer	= at91_xfer,
- 	.functionality	= at91_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-bfin-twi.c linux-2.6.39.3/drivers/i2c/busses/i2c-bfin-twi.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-bfin-twi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct i2c_algorithm bfin_twi_algorithm = {
-+static const struct i2c_algorithm bfin_twi_algorithm = {
- 	.master_xfer   = bfin_twi_master_xfer,
- 	.smbus_xfer    = bfin_twi_smbus_xfer,
- 	.functionality = bfin_twi_functionality,
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-davinci.c linux-2.6.39.3/drivers/i2c/busses/i2c-davinci.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-davinci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
--static struct i2c_algorithm i2c_davinci_algo = {
-+static const struct i2c_algorithm i2c_davinci_algo = {
- 	.master_xfer	= i2c_davinci_xfer,
- 	.functionality	= i2c_davinci_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-designware.c linux-2.6.39.3/drivers/i2c/busses/i2c-designware.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-designware.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-designware.c	2011-05-22 19:36:31.000000000 -0400
-@@ -689,7 +689,7 @@ tx_aborted:
- 	return IRQ_HANDLED;
- }
- 
--static struct i2c_algorithm i2c_dw_algo = {
-+static const struct i2c_algorithm i2c_dw_algo = {
- 	.master_xfer	= i2c_dw_xfer,
- 	.functionality	= i2c_dw_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-eg20t.c linux-2.6.39.3/drivers/i2c/busses/i2c-eg20t.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-eg20t.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-eg20t.c	2011-05-22 19:36:31.000000000 -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;
- }
- 
--static struct i2c_algorithm pch_algorithm = {
-+static const struct i2c_algorithm pch_algorithm = {
- 	.master_xfer = pch_i2c_xfer,
- 	.functionality = pch_i2c_func
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-imx.c linux-2.6.39.3/drivers/i2c/busses/i2c-imx.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-imx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-imx.c	2011-05-22 19:36:31.000000000 -0400
-@@ -457,7 +457,7 @@ static u32 i2c_imx_func(struct i2c_adapt
- 	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
- }
- 
--static struct i2c_algorithm i2c_imx_algo = {
-+static const struct i2c_algorithm i2c_imx_algo = {
- 	.master_xfer	= i2c_imx_xfer,
- 	.functionality	= i2c_imx_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-intel-mid.c linux-2.6.39.3/drivers/i2c/busses/i2c-intel-mid.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-intel-mid.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-intel-mid.c	2011-05-22 19:36:31.000000000 -0400
-@@ -917,7 +917,7 @@ err:
- 	return IRQ_HANDLED;
- }
- 
--static struct i2c_algorithm intel_mid_i2c_algorithm = {
-+static const struct i2c_algorithm intel_mid_i2c_algorithm = {
- 	.master_xfer	= intel_mid_i2c_xfer,
- 	.functionality	= intel_mid_i2c_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-nforce2.c linux-2.6.39.3/drivers/i2c/busses/i2c-nforce2.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-nforce2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct i2c_algorithm smbus_algorithm = {
-+static const struct i2c_algorithm smbus_algorithm = {
- 	.smbus_xfer	= nforce2_access,
- 	.functionality	= nforce2_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-pmcmsp.c linux-2.6.39.3/drivers/i2c/busses/i2c-pmcmsp.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-pmcmsp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-pmcmsp.c	2011-05-22 19:36:31.000000000 -0400
-@@ -615,7 +615,7 @@ static u32 pmcmsptwi_i2c_func(struct i2c
- 
- /* -- Initialization -- */
- 
--static struct i2c_algorithm pmcmsptwi_algo = {
-+static const struct i2c_algorithm pmcmsptwi_algo = {
- 	.master_xfer	= pmcmsptwi_master_xfer,
- 	.functionality	= pmcmsptwi_i2c_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-pnx.c linux-2.6.39.3/drivers/i2c/busses/i2c-pnx.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-pnx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-pnx.c	2011-05-22 19:36:31.000000000 -0400
-@@ -535,7 +535,7 @@ static u32 i2c_pnx_func(struct i2c_adapt
- 	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
- }
- 
--static struct i2c_algorithm pnx_algorithm = {
-+static const struct i2c_algorithm pnx_algorithm = {
- 	.master_xfer = i2c_pnx_xfer,
- 	.functionality = i2c_pnx_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-puv3.c linux-2.6.39.3/drivers/i2c/busses/i2c-puv3.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-puv3.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-puv3.c	2011-05-22 19:36:31.000000000 -0400
-@@ -176,7 +176,7 @@ static u32 puv3_i2c_func(struct i2c_adap
- 	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
- }
- 
--static struct i2c_algorithm puv3_i2c_algorithm = {
-+static const struct i2c_algorithm puv3_i2c_algorithm = {
- 	.master_xfer	= puv3_i2c_xfer,
- 	.functionality	= puv3_i2c_func,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-s6000.c linux-2.6.39.3/drivers/i2c/busses/i2c-s6000.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-s6000.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-s6000.c	2011-05-22 19:36:31.000000000 -0400
-@@ -243,7 +243,7 @@ static u32 s6i2c_functionality(struct i2
- 	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
- }
+diff -urNp linux-2.6.39.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.39.4/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-2.6.39.4/drivers/i2c/busses/i2c-amd756-s4882.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-05 20:34:06.000000000 -0400
+@@ -43,7 +43,7 @@
+ extern struct i2c_adapter amd756_smbus;
+ 
+ static struct i2c_adapter *s4882_adapter;
+-static struct i2c_algorithm *s4882_algo;
++static i2c_algorithm_no_const *s4882_algo;
+ 
+ /* Wrapper access functions for multiplexed SMBus */
+ static DEFINE_MUTEX(amd756_lock);
+diff -urNp linux-2.6.39.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.39.4/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-2.6.39.4/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-05 20:34:06.000000000 -0400
+@@ -41,7 +41,7 @@
+ extern struct i2c_adapter *nforce2_smbus;
  
--static struct i2c_algorithm s6i2c_algorithm = {
-+static const struct i2c_algorithm s6i2c_algorithm = {
- 	.master_xfer   = s6i2c_master_xfer,
- 	.functionality = s6i2c_functionality,
- };
-diff -urNp linux-2.6.39.3/drivers/i2c/busses/i2c-sh_mobile.c linux-2.6.39.3/drivers/i2c/busses/i2c-sh_mobile.c
---- linux-2.6.39.3/drivers/i2c/busses/i2c-sh_mobile.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/i2c/busses/i2c-sh_mobile.c	2011-05-22 19:36:31.000000000 -0400
-@@ -529,7 +529,7 @@ static u32 sh_mobile_i2c_func(struct i2c
- 	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
- }
+ static struct i2c_adapter *s4985_adapter;
+-static struct i2c_algorithm *s4985_algo;
++static i2c_algorithm_no_const *s4985_algo;
  
--static struct i2c_algorithm sh_mobile_i2c_algorithm = {
-+static const struct i2c_algorithm sh_mobile_i2c_algorithm = {
- 	.functionality	= sh_mobile_i2c_func,
- 	.master_xfer	= sh_mobile_i2c_xfer,
- };
-diff -urNp linux-2.6.39.3/drivers/ide/ide-cd.c linux-2.6.39.3/drivers/ide/ide-cd.c
---- linux-2.6.39.3/drivers/ide/ide-cd.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/ide/ide-cd.c	2011-06-03 00:32:05.000000000 -0400
+ /* Wrapper access functions for multiplexed SMBus */
+ static DEFINE_MUTEX(nforce2_lock);
+diff -urNp linux-2.6.39.4/drivers/i2c/i2c-mux.c linux-2.6.39.4/drivers/i2c/i2c-mux.c
+--- linux-2.6.39.4/drivers/i2c/i2c-mux.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/i2c/i2c-mux.c	2011-08-05 20:34:06.000000000 -0400
+@@ -28,7 +28,7 @@
+ /* multiplexer per channel data */
+ struct i2c_mux_priv {
+ 	struct i2c_adapter adap;
+-	struct i2c_algorithm algo;
++	i2c_algorithm_no_const algo;
+ 
+ 	struct i2c_adapter *parent;
+ 	void *mux_dev;	/* the mux chip/device */
+diff -urNp linux-2.6.39.4/drivers/ide/ide-cd.c linux-2.6.39.4/drivers/ide/ide-cd.c
+--- linux-2.6.39.4/drivers/ide/ide-cd.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/drivers/ide/ide-cd.c	2011-08-05 19:44:36.000000000 -0400
 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
  		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
  		if ((unsigned long)buf & alignment
@@ -30737,9 +25556,9 @@ diff -urNp linux-2.6.39.3/drivers/ide/ide-cd.c linux-2.6.39.3/drivers/ide/ide-cd
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-2.6.39.3/drivers/ide/ide-floppy.c linux-2.6.39.3/drivers/ide/ide-floppy.c
---- linux-2.6.39.3/drivers/ide/ide-floppy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ide/ide-floppy.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/ide/ide-floppy.c linux-2.6.39.4/drivers/ide/ide-floppy.c
+--- linux-2.6.39.4/drivers/ide/ide-floppy.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/ide/ide-floppy.c	2011-08-05 19:44:36.000000000 -0400
 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
  	u8 pc_buf[256], header_len, desc_cnt;
  	int i, rc = 1, blocks, length;
@@ -30749,21 +25568,9 @@ diff -urNp linux-2.6.39.3/drivers/ide/ide-floppy.c linux-2.6.39.3/drivers/ide/id
  	ide_debug_log(IDE_DBG_FUNC, "enter");
  
  	drive->bios_cyl = 0;
-diff -urNp linux-2.6.39.3/drivers/ide/it821x.c linux-2.6.39.3/drivers/ide/it821x.c
---- linux-2.6.39.3/drivers/ide/it821x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ide/it821x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -508,7 +508,7 @@ static void it821x_quirkproc(ide_drive_t
- 
- }
- 
--static struct ide_dma_ops it821x_pass_through_dma_ops = {
-+static const struct ide_dma_ops it821x_pass_through_dma_ops = {
- 	.dma_host_set		= ide_dma_host_set,
- 	.dma_setup		= ide_dma_setup,
- 	.dma_start		= it821x_dma_start,
-diff -urNp linux-2.6.39.3/drivers/ide/setup-pci.c linux-2.6.39.3/drivers/ide/setup-pci.c
---- linux-2.6.39.3/drivers/ide/setup-pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ide/setup-pci.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/ide/setup-pci.c linux-2.6.39.4/drivers/ide/setup-pci.c
+--- linux-2.6.39.4/drivers/ide/setup-pci.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/ide/setup-pci.c	2011-08-05 19:44:36.000000000 -0400
 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
  	int ret, i, n_ports = dev2 ? 4 : 2;
  	struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
@@ -30773,21 +25580,9 @@ diff -urNp linux-2.6.39.3/drivers/ide/setup-pci.c linux-2.6.39.3/drivers/ide/set
  	for (i = 0; i < n_ports / 2; i++) {
  		ret = ide_setup_pci_controller(pdev[i], d, !i);
  		if (ret < 0)
-diff -urNp linux-2.6.39.3/drivers/ide/trm290.c linux-2.6.39.3/drivers/ide/trm290.c
---- linux-2.6.39.3/drivers/ide/trm290.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ide/trm290.c	2011-05-22 19:36:31.000000000 -0400
-@@ -314,7 +314,7 @@ static const struct ide_tp_ops trm290_tp
- 	.output_data		= ide_output_data,
- };
- 
--static struct ide_dma_ops trm290_dma_ops = {
-+static const struct ide_dma_ops trm290_dma_ops = {
- 	.dma_host_set		= trm290_dma_host_set,
- 	.dma_setup 		= trm290_dma_setup,
- 	.dma_start 		= trm290_dma_start,
-diff -urNp linux-2.6.39.3/drivers/infiniband/core/cm.c linux-2.6.39.3/drivers/infiniband/core/cm.c
---- linux-2.6.39.3/drivers/infiniband/core/cm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/core/cm.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/core/cm.c linux-2.6.39.4/drivers/infiniband/core/cm.c
+--- linux-2.6.39.4/drivers/infiniband/core/cm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/core/cm.c	2011-08-05 19:44:36.000000000 -0400
 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -30927,9 +25722,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/core/cm.c linux-2.6.39.3/drivers/in
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-2.6.39.3/drivers/infiniband/core/fmr_pool.c linux-2.6.39.3/drivers/infiniband/core/fmr_pool.c
---- linux-2.6.39.3/drivers/infiniband/core/fmr_pool.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/core/fmr_pool.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/core/fmr_pool.c linux-2.6.39.4/drivers/infiniband/core/fmr_pool.c
+--- linux-2.6.39.4/drivers/infiniband/core/fmr_pool.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/core/fmr_pool.c	2011-08-05 19:44:36.000000000 -0400
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
  	struct task_struct       *thread;
@@ -30997,9 +25792,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/core/fmr_pool.c linux-2.6.39.3/driv
  				wake_up_process(pool->thread);
  			}
  		}
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.39.3/drivers/infiniband/hw/cxgb4/mem.c
---- linux-2.6.39.3/drivers/infiniband/hw/cxgb4/mem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/cxgb4/mem.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.39.4/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-2.6.39.4/drivers/infiniband/hw/cxgb4/mem.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/cxgb4/mem.c	2011-08-05 19:44:36.000000000 -0400
 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
  	int err;
  	struct fw_ri_tpte tpt;
@@ -31018,21 +25813,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.39.3/drive
  	}
  	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.3/drivers/infiniband/hw/ipath/ipath_dma.c linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_dma.c
---- linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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));
- }
- 
--struct ib_dma_mapping_ops ipath_dma_mapping_ops = {
-+const struct ib_dma_mapping_ops ipath_dma_mapping_ops = {
- 	ipath_mapping_error,
- 	ipath_dma_map_single,
- 	ipath_dma_unmap_single,
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_fs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_fs.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_fs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_fs.c	2011-08-05 19:44:36.000000000 -0400
 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
  	struct infinipath_counters counters;
  	struct ipath_devdata *dd;
@@ -31042,9 +25825,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.39.3/
  	dd = file->f_path.dentry->d_inode->i_private;
  	dd->ipath_f_read_counters(dd, &counters);
  
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_rc.c
---- linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_rc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_rc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_rc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_rc.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
  		struct ib_atomic_eth *ateth;
  		struct ipath_ack_entry *e;
@@ -31068,9 +25851,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.39.3/
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      be64_to_cpu(ateth->compare_data),
  				      sdata);
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_ruc.c
---- linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-08-05 19:44:36.000000000 -0400
 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
  	unsigned long flags;
  	struct ib_wc wc;
@@ -31094,20 +25877,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.39.3
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      sdata, wqe->wr.wr.atomic.swap);
  		goto send_comp;
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_verbs.h linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_verbs.h
---- linux-2.6.39.3/drivers/infiniband/hw/ipath/ipath_verbs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- extern const u32 ib_ipath_rnr_table[];
- 
--extern struct ib_dma_mapping_ops ipath_dma_mapping_ops;
-+extern const struct ib_dma_mapping_ops ipath_dma_mapping_ops;
- 
- #endif				/* IPATH_VERBS_H */
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes.c linux-2.6.39.3/drivers/infiniband/hw/nes/nes.c
---- linux-2.6.39.3/drivers/infiniband/hw/nes/nes.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/nes/nes.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/nes/nes.c linux-2.6.39.4/drivers/infiniband/hw/nes/nes.c
+--- linux-2.6.39.4/drivers/infiniband/hw/nes/nes.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/nes/nes.c	2011-08-05 19:44:36.000000000 -0400
 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
@@ -31126,9 +25898,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes.c linux-2.6.39.3/drivers
  
  	/* Free the control structures */
  
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.39.3/drivers/infiniband/hw/nes/nes_cm.c
---- linux-2.6.39.3/drivers/infiniband/hw/nes/nes_cm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/nes/nes_cm.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.39.4/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-2.6.39.4/drivers/infiniband/hw/nes/nes_cm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/nes/nes_cm.c	2011-08-05 19:44:36.000000000 -0400
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
  u32 cm_packets_retrans;
  u32 cm_packets_created;
@@ -31325,9 +26097,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.39.3/driv
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes.h linux-2.6.39.3/drivers/infiniband/hw/nes/nes.h
---- linux-2.6.39.3/drivers/infiniband/hw/nes/nes.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/nes/nes.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/nes/nes.h linux-2.6.39.4/drivers/infiniband/hw/nes/nes.h
+--- linux-2.6.39.4/drivers/infiniband/hw/nes/nes.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/nes/nes.h	2011-08-05 19:44:36.000000000 -0400
 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
  extern unsigned int wqm_quanta;
  extern struct list_head nes_adapter_list;
@@ -31379,9 +26151,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes.h linux-2.6.39.3/drivers
  
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.39.3/drivers/infiniband/hw/nes/nes_nic.c
---- linux-2.6.39.3/drivers/infiniband/hw/nes/nes_nic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/nes/nes_nic.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.39.4/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-2.6.39.4/drivers/infiniband/hw/nes/nes_nic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/nes/nes_nic.c	2011-08-05 19:44:36.000000000 -0400
 @@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats
  	target_stat_values[++index] = mh_detected;
  	target_stat_values[++index] = mh_pauses_sent;
@@ -31432,9 +26204,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.39.3/dri
  	target_stat_values[++index] = nesadapter->free_4kpbl;
  	target_stat_values[++index] = nesadapter->free_256pbl;
  	target_stat_values[++index] = int_mod_timer_init;
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.39.3/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-2.6.39.3/drivers/infiniband/hw/nes/nes_verbs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/nes/nes_verbs.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.39.4/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-2.6.39.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-08-05 19:44:36.000000000 -0400
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -31466,9 +26238,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.39.3/d
  	nesqp->destroyed = 1;
  
  	/* Blow away the connection if it exists. */
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/qib/qib.h linux-2.6.39.3/drivers/infiniband/hw/qib/qib.h
---- linux-2.6.39.3/drivers/infiniband/hw/qib/qib.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/infiniband/hw/qib/qib.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/infiniband/hw/qib/qib.h linux-2.6.39.4/drivers/infiniband/hw/qib/qib.h
+--- linux-2.6.39.4/drivers/infiniband/hw/qib/qib.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/infiniband/hw/qib/qib.h	2011-08-05 20:34:06.000000000 -0400
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -31477,42 +26249,9 @@ diff -urNp linux-2.6.39.3/drivers/infiniband/hw/qib/qib.h linux-2.6.39.3/drivers
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-@@ -87,7 +88,7 @@ struct qlogic_ib_stats {
- };
- 
- extern struct qlogic_ib_stats qib_stats;
--extern struct pci_error_handlers qib_pci_err_handler;
-+extern const struct pci_error_handlers qib_pci_err_handler;
- extern struct pci_driver qib_driver;
- 
- #define QIB_CHIP_SWVERSION QIB_CHIP_VERS_MAJ
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/qib/qib_mmap.c linux-2.6.39.3/drivers/infiniband/hw/qib/qib_mmap.c
---- linux-2.6.39.3/drivers/infiniband/hw/qib/qib_mmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct vm_operations_struct qib_vm_ops = {
-+static const struct vm_operations_struct qib_vm_ops = {
- 	.open =     qib_vma_open,
- 	.close =    qib_vma_close,
- };
-diff -urNp linux-2.6.39.3/drivers/infiniband/hw/qib/qib_pcie.c linux-2.6.39.3/drivers/infiniband/hw/qib/qib_pcie.c
---- linux-2.6.39.3/drivers/infiniband/hw/qib/qib_pcie.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 */
- }
- 
--struct pci_error_handlers qib_pci_err_handler = {
-+const struct pci_error_handlers qib_pci_err_handler = {
- 	.error_detected = qib_pci_error_detected,
- 	.mmio_enabled = qib_pci_mmio_enabled,
- 	.link_reset = qib_pci_link_reset,
-diff -urNp linux-2.6.39.3/drivers/input/gameport/gameport.c linux-2.6.39.3/drivers/input/gameport/gameport.c
---- linux-2.6.39.3/drivers/input/gameport/gameport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/input/gameport/gameport.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/input/gameport/gameport.c linux-2.6.39.4/drivers/input/gameport/gameport.c
+--- linux-2.6.39.4/drivers/input/gameport/gameport.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/input/gameport/gameport.c	2011-08-05 19:44:37.000000000 -0400
 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -31530,9 +26269,9 @@ diff -urNp linux-2.6.39.3/drivers/input/gameport/gameport.c linux-2.6.39.3/drive
  	gameport->dev.bus = &gameport_bus;
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
-diff -urNp linux-2.6.39.3/drivers/input/input.c linux-2.6.39.3/drivers/input/input.c
---- linux-2.6.39.3/drivers/input/input.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/input/input.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/input/input.c linux-2.6.39.4/drivers/input/input.c
+--- linux-2.6.39.4/drivers/input/input.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/drivers/input/input.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1815,7 +1815,7 @@ static void input_cleanse_bitmasks(struc
   */
  int input_register_device(struct input_dev *dev)
@@ -31551,9 +26290,9 @@ diff -urNp linux-2.6.39.3/drivers/input/input.c linux-2.6.39.3/drivers/input/inp
  
  	error = device_add(&dev->dev);
  	if (error)
-diff -urNp linux-2.6.39.3/drivers/input/joystick/sidewinder.c linux-2.6.39.3/drivers/input/joystick/sidewinder.c
---- linux-2.6.39.3/drivers/input/joystick/sidewinder.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/input/joystick/sidewinder.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/input/joystick/sidewinder.c linux-2.6.39.4/drivers/input/joystick/sidewinder.c
+--- linux-2.6.39.4/drivers/input/joystick/sidewinder.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/input/joystick/sidewinder.c	2011-08-05 19:44:37.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -31571,9 +26310,9 @@ diff -urNp linux-2.6.39.3/drivers/input/joystick/sidewinder.c linux-2.6.39.3/dri
  	i = sw_read_packet(sw->gameport, buf, sw->length, 0);
  
  	if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) {		/* Broken packet, try to fix */
-diff -urNp linux-2.6.39.3/drivers/input/joystick/xpad.c linux-2.6.39.3/drivers/input/joystick/xpad.c
---- linux-2.6.39.3/drivers/input/joystick/xpad.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/input/joystick/xpad.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/input/joystick/xpad.c linux-2.6.39.4/drivers/input/joystick/xpad.c
+--- linux-2.6.39.4/drivers/input/joystick/xpad.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/input/joystick/xpad.c	2011-08-05 19:44:37.000000000 -0400
 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
@@ -31592,9 +26331,9 @@ diff -urNp linux-2.6.39.3/drivers/input/joystick/xpad.c linux-2.6.39.3/drivers/i
  
  	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
  	led->xpad = xpad;
-diff -urNp linux-2.6.39.3/drivers/input/mousedev.c linux-2.6.39.3/drivers/input/mousedev.c
---- linux-2.6.39.3/drivers/input/mousedev.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/input/mousedev.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/input/mousedev.c linux-2.6.39.4/drivers/input/mousedev.c
+--- linux-2.6.39.4/drivers/input/mousedev.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/drivers/input/mousedev.c	2011-08-05 19:44:37.000000000 -0400
 @@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file
  
  	spin_unlock_irq(&client->packet_lock);
@@ -31604,9 +26343,9 @@ diff -urNp linux-2.6.39.3/drivers/input/mousedev.c linux-2.6.39.3/drivers/input/
  		return -EFAULT;
  
  	return count;
-diff -urNp linux-2.6.39.3/drivers/input/serio/serio.c linux-2.6.39.3/drivers/input/serio/serio.c
---- linux-2.6.39.3/drivers/input/serio/serio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/input/serio/serio.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/input/serio/serio.c linux-2.6.39.4/drivers/input/serio/serio.c
+--- linux-2.6.39.4/drivers/input/serio/serio.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/input/serio/serio.c	2011-08-05 19:44:37.000000000 -0400
 @@ -497,7 +497,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
@@ -31625,9 +26364,9 @@ diff -urNp linux-2.6.39.3/drivers/input/serio/serio.c linux-2.6.39.3/drivers/inp
  	serio->dev.bus = &serio_bus;
  	serio->dev.release = serio_release_port;
  	serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-2.6.39.3/drivers/isdn/capi/capi.c linux-2.6.39.3/drivers/isdn/capi/capi.c
---- linux-2.6.39.3/drivers/isdn/capi/capi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/capi/capi.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/capi/capi.c linux-2.6.39.4/drivers/isdn/capi/capi.c
+--- linux-2.6.39.4/drivers/isdn/capi/capi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/capi/capi.c	2011-08-05 19:44:37.000000000 -0400
 @@ -89,8 +89,8 @@ struct capiminor {
  
  	struct capi20_appl	*ap;
@@ -31665,9 +26404,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/capi/capi.c linux-2.6.39.3/drivers/isdn/c
  		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.3/drivers/isdn/gigaset/common.c linux-2.6.39.3/drivers/isdn/gigaset/common.c
---- linux-2.6.39.3/drivers/isdn/gigaset/common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/gigaset/common.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/gigaset/common.c linux-2.6.39.4/drivers/isdn/gigaset/common.c
+--- linux-2.6.39.4/drivers/isdn/gigaset/common.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/gigaset/common.c	2011-08-05 19:44:37.000000000 -0400
 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
@@ -31677,9 +26416,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/gigaset/common.c linux-2.6.39.3/drivers/i
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-2.6.39.3/drivers/isdn/gigaset/gigaset.h linux-2.6.39.3/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.39.3/drivers/isdn/gigaset/gigaset.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/gigaset/gigaset.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/gigaset/gigaset.h linux-2.6.39.4/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.39.4/drivers/isdn/gigaset/gigaset.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/gigaset/gigaset.h	2011-08-05 19:44:37.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
@@ -31697,9 +26436,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/gigaset/gigaset.h linux-2.6.39.3/drivers/
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-2.6.39.3/drivers/isdn/gigaset/interface.c linux-2.6.39.3/drivers/isdn/gigaset/interface.c
---- linux-2.6.39.3/drivers/isdn/gigaset/interface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/gigaset/interface.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/gigaset/interface.c linux-2.6.39.4/drivers/isdn/gigaset/interface.c
+--- linux-2.6.39.4/drivers/isdn/gigaset/interface.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/gigaset/interface.c	2011-08-05 19:44:37.000000000 -0400
 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
  		return -ERESTARTSYS;
  	tty->driver_data = cs;
@@ -31787,9 +26526,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/gigaset/interface.c linux-2.6.39.3/driver
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/avm/b1.c linux-2.6.39.3/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.39.3/drivers/isdn/hardware/avm/b1.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/avm/b1.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/avm/b1.c linux-2.6.39.4/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.39.4/drivers/isdn/hardware/avm/b1.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/avm/b1.c	2011-08-05 19:44:37.000000000 -0400
 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
  	}
  	if (left) {
@@ -31808,9 +26547,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/avm/b1.c linux-2.6.39.3/drivers/
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.39.3/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-2.6.39.3/drivers/isdn/hardware/eicon/capidtmf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/eicon/capidtmf.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.39.4/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/capidtmf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/capidtmf.c	2011-08-05 19:44:37.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];
@@ -31819,9 +26558,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.39.3/
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.39.3/drivers/isdn/hardware/eicon/capifunc.c
---- linux-2.6.39.3/drivers/isdn/hardware/eicon/capifunc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/eicon/capifunc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.39.4/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/capifunc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/capifunc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31831,9 +26570,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.39.3/
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.39.3/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-2.6.39.3/drivers/isdn/hardware/eicon/diddfunc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/eicon/diddfunc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.39.4/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/diddfunc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/diddfunc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31843,9 +26582,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.39.3/
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.39.3/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-2.6.39.3/drivers/isdn/hardware/eicon/divasfunc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/eicon/divasfunc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.39.4/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/divasfunc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/divasfunc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31855,9 +26594,21 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.39.3
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.39.3/drivers/isdn/hardware/eicon/idifunc.c
---- linux-2.6.39.3/drivers/isdn/hardware/eicon/idifunc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/eicon/idifunc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/divasync.h linux-2.6.39.4/drivers/isdn/hardware/eicon/divasync.h
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/divasync.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/divasync.h	2011-08-05 20:34:06.000000000 -0400
+@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
+ } diva_didd_add_adapter_t;
+ typedef struct _diva_didd_remove_adapter {
+  IDI_CALL p_request;
+-} diva_didd_remove_adapter_t;
++} __no_const diva_didd_remove_adapter_t;
+ typedef struct _diva_didd_read_adapter_array {
+  void   * buffer;
+  dword length;
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.39.4/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/idifunc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/idifunc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31867,9 +26618,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.39.3/d
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/message.c linux-2.6.39.3/drivers/isdn/hardware/eicon/message.c
---- linux-2.6.39.3/drivers/isdn/hardware/eicon/message.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/eicon/message.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/message.c linux-2.6.39.4/drivers/isdn/hardware/eicon/message.c
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/message.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/message.c	2011-08-05 19:44:37.000000000 -0400
 @@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
    dword d;
    word w;
@@ -31906,9 +26657,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/message.c linux-2.6.39.3/d
    set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
  
    if(!a->group_optimization_enabled)
-diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.39.3/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-2.6.39.3/drivers/isdn/hardware/eicon/mntfunc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/hardware/eicon/mntfunc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.39.4/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/mntfunc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/mntfunc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31918,9 +26669,21 @@ diff -urNp linux-2.6.39.3/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.39.3/d
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.39.3/drivers/isdn/i4l/isdn_common.c linux-2.6.39.3/drivers/isdn/i4l/isdn_common.c
---- linux-2.6.39.3/drivers/isdn/i4l/isdn_common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/i4l/isdn_common.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.39.4/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-2.6.39.4/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-05 20:34:06.000000000 -0400
+@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
+ typedef struct _diva_os_idi_adapter_interface {
+ 	diva_init_card_proc_t cleanup_adapter_proc;
+ 	diva_cmd_card_proc_t cmd_proc;
+-} diva_os_idi_adapter_interface_t;
++} __no_const diva_os_idi_adapter_interface_t;
+ 
+ typedef struct _diva_os_xdi_adapter {
+ 	struct list_head link;
+diff -urNp linux-2.6.39.4/drivers/isdn/i4l/isdn_common.c linux-2.6.39.4/drivers/isdn/i4l/isdn_common.c
+--- linux-2.6.39.4/drivers/isdn/i4l/isdn_common.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/i4l/isdn_common.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1292,6 +1292,8 @@ isdn_ioctl(struct file *file, uint cmd, 
  	} iocpar;
  	void __user *argp = (void __user *)arg;
@@ -31930,54 +26693,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/i4l/isdn_common.c linux-2.6.39.3/drivers/
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff -urNp linux-2.6.39.3/drivers/isdn/i4l/isdn_net.c linux-2.6.39.3/drivers/isdn/i4l/isdn_net.c
---- linux-2.6.39.3/drivers/isdn/i4l/isdn_net.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/i4l/isdn_net.c	2011-05-22 19:36:31.000000000 -0400
-@@ -400,7 +400,7 @@ isdn_net_stat_callback(int idx, isdn_ctr
- 		isdn_net_local *lp = p->local;
- #ifdef CONFIG_ISDN_X25
- 		struct concap_proto *cprot = lp->netdev->cprot;
--		struct concap_proto_ops *pops = cprot ? cprot->pops : NULL;
-+		const struct concap_proto_ops *pops = cprot ? cprot->pops : NULL;
- #endif
- 		switch (cmd) {
- 			case ISDN_STAT_BSENT:
-@@ -831,7 +831,7 @@ isdn_net_hangup(struct net_device *d)
- 	isdn_ctrl cmd;
- #ifdef CONFIG_ISDN_X25
- 	struct concap_proto *cprot = lp->netdev->cprot;
--	struct concap_proto_ops *pops = cprot ? cprot->pops : NULL;
-+	const struct concap_proto_ops *pops = cprot ? cprot->pops : NULL;
- #endif
- 
- 	if (lp->flags & ISDN_NET_CONNECTED) {
-diff -urNp linux-2.6.39.3/drivers/isdn/i4l/isdn_x25iface.c linux-2.6.39.3/drivers/isdn/i4l/isdn_x25iface.c
---- linux-2.6.39.3/drivers/isdn/i4l/isdn_x25iface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 * );
- 
- 
--static struct concap_proto_ops ix25_pops = {
-+static const struct concap_proto_ops ix25_pops = {
- 	&isdn_x25iface_proto_new,
- 	&isdn_x25iface_proto_del,
- 	&isdn_x25iface_proto_restart,
-diff -urNp linux-2.6.39.3/drivers/isdn/i4l/isdn_x25iface.h linux-2.6.39.3/drivers/isdn/i4l/isdn_x25iface.h
---- linux-2.6.39.3/drivers/isdn/i4l/isdn_x25iface.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/i4l/isdn_x25iface.h	2011-05-22 19:36:31.000000000 -0400
-@@ -23,7 +23,7 @@
- #include <linux/isdn.h>
- #include <linux/concap.h>
- 
--extern struct concap_proto_ops * isdn_x25iface_concap_proto_ops_pt;
-+extern const struct concap_proto_ops *isdn_x25iface_concap_proto_ops_pt;
- extern struct concap_proto     * isdn_x25iface_proto_new(void);
- 
- 
-diff -urNp linux-2.6.39.3/drivers/isdn/icn/icn.c linux-2.6.39.3/drivers/isdn/icn/icn.c
---- linux-2.6.39.3/drivers/isdn/icn/icn.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/isdn/icn/icn.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/isdn/icn/icn.c linux-2.6.39.4/drivers/isdn/icn/icn.c
+--- linux-2.6.39.4/drivers/isdn/icn/icn.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/isdn/icn/icn.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
  		if (count > len)
  			count = len;
@@ -31987,9 +26705,9 @@ diff -urNp linux-2.6.39.3/drivers/isdn/icn/icn.c linux-2.6.39.3/drivers/isdn/icn
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-2.6.39.3/drivers/lguest/core.c linux-2.6.39.3/drivers/lguest/core.c
---- linux-2.6.39.3/drivers/lguest/core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/lguest/core.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/lguest/core.c linux-2.6.39.4/drivers/lguest/core.c
+--- linux-2.6.39.4/drivers/lguest/core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/lguest/core.c	2011-08-05 19:44:37.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.
@@ -32017,21 +26735,9 @@ diff -urNp linux-2.6.39.3/drivers/lguest/core.c linux-2.6.39.3/drivers/lguest/co
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-2.6.39.3/drivers/lguest/lguest_device.c linux-2.6.39.3/drivers/lguest/lguest_device.c
---- linux-2.6.39.3/drivers/lguest/lguest_device.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/lguest/lguest_device.c	2011-05-22 19:36:31.000000000 -0400
-@@ -374,7 +374,7 @@ error:
- }
- 
- /* The ops structure which hooks everything together. */
--static struct virtio_config_ops lguest_config_ops = {
-+static const struct virtio_config_ops lguest_config_ops = {
- 	.get_features = lg_get_features,
- 	.finalize_features = lg_finalize_features,
- 	.get = lg_get,
-diff -urNp linux-2.6.39.3/drivers/lguest/x86/core.c linux-2.6.39.3/drivers/lguest/x86/core.c
---- linux-2.6.39.3/drivers/lguest/x86/core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/lguest/x86/core.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/lguest/x86/core.c linux-2.6.39.4/drivers/lguest/x86/core.c
+--- linux-2.6.39.4/drivers/lguest/x86/core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/lguest/x86/core.c	2011-08-05 19:44:37.000000000 -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)
@@ -32073,9 +26779,9 @@ diff -urNp linux-2.6.39.3/drivers/lguest/x86/core.c linux-2.6.39.3/drivers/lgues
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff -urNp linux-2.6.39.3/drivers/lguest/x86/switcher_32.S linux-2.6.39.3/drivers/lguest/x86/switcher_32.S
---- linux-2.6.39.3/drivers/lguest/x86/switcher_32.S	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/lguest/x86/switcher_32.S	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/lguest/x86/switcher_32.S linux-2.6.39.4/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.39.4/drivers/lguest/x86/switcher_32.S	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/lguest/x86/switcher_32.S	2011-08-05 19:44:37.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -32134,9 +26840,9 @@ diff -urNp linux-2.6.39.3/drivers/lguest/x86/switcher_32.S linux-2.6.39.3/driver
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-2.6.39.3/drivers/md/dm.c linux-2.6.39.3/drivers/md/dm.c
---- linux-2.6.39.3/drivers/md/dm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/dm.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/dm.c linux-2.6.39.4/drivers/md/dm.c
+--- linux-2.6.39.4/drivers/md/dm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/md/dm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -162,9 +162,9 @@ struct mapped_device {
  	/*
  	 * Event handling.
@@ -32191,61 +26897,9 @@ diff -urNp linux-2.6.39.3/drivers/md/dm.c linux-2.6.39.3/drivers/md/dm.c
  }
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-2.6.39.3/drivers/md/dm-crypt.c linux-2.6.39.3/drivers/md/dm-crypt.c
---- linux-2.6.39.3/drivers/md/dm-crypt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 
--	struct crypt_iv_operations *iv_gen_ops;
-+	const struct crypt_iv_operations *iv_gen_ops;
- 	union {
- 		struct iv_essiv_private essiv;
- 		struct iv_benbi_private benbi;
-@@ -620,15 +620,15 @@ static int crypt_iv_lmk_post(struct cryp
- 	return r;
- }
- 
--static struct crypt_iv_operations crypt_iv_plain_ops = {
-+static const struct crypt_iv_operations crypt_iv_plain_ops = {
- 	.generator = crypt_iv_plain_gen
- };
- 
--static struct crypt_iv_operations crypt_iv_plain64_ops = {
-+static const struct crypt_iv_operations crypt_iv_plain64_ops = {
- 	.generator = crypt_iv_plain64_gen
- };
- 
--static struct crypt_iv_operations crypt_iv_essiv_ops = {
-+static const struct crypt_iv_operations crypt_iv_essiv_ops = {
- 	.ctr       = crypt_iv_essiv_ctr,
- 	.dtr       = crypt_iv_essiv_dtr,
- 	.init      = crypt_iv_essiv_init,
-@@ -636,17 +636,17 @@ static struct crypt_iv_operations crypt_
- 	.generator = crypt_iv_essiv_gen
- };
- 
--static struct crypt_iv_operations crypt_iv_benbi_ops = {
-+static const struct crypt_iv_operations crypt_iv_benbi_ops = {
- 	.ctr	   = crypt_iv_benbi_ctr,
- 	.dtr	   = crypt_iv_benbi_dtr,
- 	.generator = crypt_iv_benbi_gen
- };
- 
--static struct crypt_iv_operations crypt_iv_null_ops = {
-+static const struct crypt_iv_operations crypt_iv_null_ops = {
- 	.generator = crypt_iv_null_gen
- };
- 
--static struct crypt_iv_operations crypt_iv_lmk_ops = {
-+static const struct crypt_iv_operations crypt_iv_lmk_ops = {
- 	.ctr	   = crypt_iv_lmk_ctr,
- 	.dtr	   = crypt_iv_lmk_dtr,
- 	.init	   = crypt_iv_lmk_init,
-diff -urNp linux-2.6.39.3/drivers/md/dm-ioctl.c linux-2.6.39.3/drivers/md/dm-ioctl.c
---- linux-2.6.39.3/drivers/md/dm-ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/dm-ioctl.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/dm-ioctl.c linux-2.6.39.4/drivers/md/dm-ioctl.c
+--- linux-2.6.39.4/drivers/md/dm-ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/md/dm-ioctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
@@ -32255,9 +26909,9 @@ diff -urNp linux-2.6.39.3/drivers/md/dm-ioctl.c linux-2.6.39.3/drivers/md/dm-ioc
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff -urNp linux-2.6.39.3/drivers/md/dm-raid1.c linux-2.6.39.3/drivers/md/dm-raid1.c
---- linux-2.6.39.3/drivers/md/dm-raid1.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/dm-raid1.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/dm-raid1.c linux-2.6.39.4/drivers/md/dm-raid1.c
+--- linux-2.6.39.4/drivers/md/dm-raid1.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/md/dm-raid1.c	2011-08-05 19:44:37.000000000 -0400
 @@ -42,7 +42,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -32330,9 +26984,9 @@ diff -urNp linux-2.6.39.3/drivers/md/dm-raid1.c linux-2.6.39.3/drivers/md/dm-rai
  		return 'A';
  
  	return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-2.6.39.3/drivers/md/dm-stripe.c linux-2.6.39.3/drivers/md/dm-stripe.c
---- linux-2.6.39.3/drivers/md/dm-stripe.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/dm-stripe.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/dm-stripe.c linux-2.6.39.4/drivers/md/dm-stripe.c
+--- linux-2.6.39.4/drivers/md/dm-stripe.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/md/dm-stripe.c	2011-08-05 19:44:37.000000000 -0400
 @@ -20,7 +20,7 @@ struct stripe {
  	struct dm_dev *dev;
  	sector_t physical_start;
@@ -32371,9 +27025,9 @@ diff -urNp linux-2.6.39.3/drivers/md/dm-stripe.c linux-2.6.39.3/drivers/md/dm-st
  			    DM_IO_ERROR_THRESHOLD)
  				schedule_work(&sc->trigger_event);
  		}
-diff -urNp linux-2.6.39.3/drivers/md/dm-table.c linux-2.6.39.3/drivers/md/dm-table.c
---- linux-2.6.39.3/drivers/md/dm-table.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/dm-table.c	2011-06-03 00:32:05.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/dm-table.c linux-2.6.39.4/drivers/md/dm-table.c
+--- linux-2.6.39.4/drivers/md/dm-table.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/drivers/md/dm-table.c	2011-08-05 19:44:37.000000000 -0400
 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
@@ -32383,9 +27037,9 @@ diff -urNp linux-2.6.39.3/drivers/md/dm-table.c linux-2.6.39.3/drivers/md/dm-tab
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.39.3/drivers/md/md.c linux-2.6.39.3/drivers/md/md.c
---- linux-2.6.39.3/drivers/md/md.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/md.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/md.c linux-2.6.39.4/drivers/md/md.c
+--- linux-2.6.39.4/drivers/md/md.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/drivers/md/md.c	2011-08-05 19:44:37.000000000 -0400
 @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
   *  start build, activate spare
   */
@@ -32500,9 +27154,9 @@ diff -urNp linux-2.6.39.3/drivers/md/md.c linux-2.6.39.3/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.3/drivers/md/md.h linux-2.6.39.3/drivers/md/md.h
---- linux-2.6.39.3/drivers/md/md.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/md.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/md.h linux-2.6.39.4/drivers/md/md.h
+--- linux-2.6.39.4/drivers/md/md.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/md/md.h	2011-08-05 19:44:37.000000000 -0400
 @@ -97,13 +97,13 @@ struct mdk_rdev_s
  					 * only maintained for arrays that
  					 * support hot removal
@@ -32528,9 +27182,9 @@ diff -urNp linux-2.6.39.3/drivers/md/md.h linux-2.6.39.3/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.39.3/drivers/md/raid10.c linux-2.6.39.3/drivers/md/raid10.c
---- linux-2.6.39.3/drivers/md/raid10.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/raid10.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/raid10.c linux-2.6.39.4/drivers/md/raid10.c
+--- linux-2.6.39.4/drivers/md/raid10.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/md/raid10.c	2011-08-05 19:44:37.000000000 -0400
 @@ -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);
@@ -32581,9 +27235,9 @@ diff -urNp linux-2.6.39.3/drivers/md/raid10.c linux-2.6.39.3/drivers/md/raid10.c
  				if (sync_page_io(rdev,
  						 r10_bio->devs[sl].addr +
  						 sect,
-diff -urNp linux-2.6.39.3/drivers/md/raid1.c linux-2.6.39.3/drivers/md/raid1.c
---- linux-2.6.39.3/drivers/md/raid1.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/raid1.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/raid1.c linux-2.6.39.4/drivers/md/raid1.c
+--- linux-2.6.39.4/drivers/md/raid1.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/md/raid1.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1342,7 +1342,7 @@ static void sync_request_write(mddev_t *
  					if (r1_bio->bios[d]->bi_end_io != end_sync_read)
  						continue;
@@ -32602,9 +27256,9 @@ diff -urNp linux-2.6.39.3/drivers/md/raid1.c linux-2.6.39.3/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.3/drivers/md/raid5.c linux-2.6.39.3/drivers/md/raid5.c
---- linux-2.6.39.3/drivers/md/raid5.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/md/raid5.c	2011-06-25 13:01:13.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/md/raid5.c linux-2.6.39.4/drivers/md/raid5.c
+--- linux-2.6.39.4/drivers/md/raid5.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/drivers/md/raid5.c	2011-08-05 19:44:37.000000000 -0400
 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
  			bi->bi_next = NULL;
  			if ((rw & WRITE) &&
@@ -32650,9 +27304,9 @@ diff -urNp linux-2.6.39.3/drivers/md/raid5.c linux-2.6.39.3/drivers/md/raid5.c
  
  	chunk_offset = sector_div(new_sector, sectors_per_chunk);
  	stripe = new_sector;
-diff -urNp linux-2.6.39.3/drivers/media/common/saa7146_hlp.c linux-2.6.39.3/drivers/media/common/saa7146_hlp.c
---- linux-2.6.39.3/drivers/media/common/saa7146_hlp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/common/saa7146_hlp.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/common/saa7146_hlp.c linux-2.6.39.4/drivers/media/common/saa7146_hlp.c
+--- linux-2.6.39.4/drivers/media/common/saa7146_hlp.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/common/saa7146_hlp.c	2011-08-05 19:44:37.000000000 -0400
 @@ -353,6 +353,8 @@ static void calculate_clipping_registers
  
  	int x[32], y[32], w[32], h[32];
@@ -32662,45 +27316,9 @@ diff -urNp linux-2.6.39.3/drivers/media/common/saa7146_hlp.c linux-2.6.39.3/driv
  	/* 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.3/drivers/media/common/saa7146_vbi.c linux-2.6.39.3/drivers/media/common/saa7146_vbi.c
---- linux-2.6.39.3/drivers/media/common/saa7146_vbi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/common/saa7146_vbi.c	2011-05-22 19:36:31.000000000 -0400
-@@ -501,7 +501,7 @@ static ssize_t vbi_read(struct file *fil
- 	return ret;
- }
- 
--struct saa7146_use_ops saa7146_vbi_uops = {
-+const struct saa7146_use_ops saa7146_vbi_uops = {
- 	.init		= vbi_init,
- 	.open		= vbi_open,
- 	.release	= vbi_close,
-diff -urNp linux-2.6.39.3/drivers/media/common/saa7146_video.c linux-2.6.39.3/drivers/media/common/saa7146_video.c
---- linux-2.6.39.3/drivers/media/common/saa7146_video.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/common/saa7146_video.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1420,7 +1420,7 @@ out:
- 	return ret;
- }
- 
--struct saa7146_use_ops saa7146_video_uops = {
-+const struct saa7146_use_ops saa7146_video_uops = {
- 	.init = video_init,
- 	.open = video_open,
- 	.release = video_close,
-diff -urNp linux-2.6.39.3/drivers/media/dvb/dm1105/dm1105.c linux-2.6.39.3/drivers/media/dvb/dm1105/dm1105.c
---- linux-2.6.39.3/drivers/media/dvb/dm1105/dm1105.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct i2c_algorithm dm1105_algo = {
-+static const struct i2c_algorithm dm1105_algo = {
- 	.master_xfer   = dm1105_i2c_xfer,
- 	.functionality = functionality,
- };
-diff -urNp linux-2.6.39.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.39.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-2.6.39.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-08-05 19:44:37.000000000 -0400
 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
  	u8 buf[HOST_LINK_BUF_SIZE];
  	int i;
@@ -32719,21 +27337,45 @@ diff -urNp linux-2.6.39.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.
  	dprintk("%s\n", __func__);
  
  	/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff -urNp linux-2.6.39.3/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.39.3/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.39.3/drivers/media/dvb/dvb-core/dvbdev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/dvb-core/dvbdev.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_demux.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-05 20:34:06.000000000 -0400
+@@ -73,7 +73,7 @@ struct dvb_demux_feed {
+ 	union {
+ 		dmx_ts_cb ts;
+ 		dmx_section_cb sec;
+-	} cb;
++	} __no_const cb;
+ 
+ 	struct dvb_demux *demux;
+ 	void *priv;
+diff -urNp linux-2.6.39.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.39.4/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.39.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-05 20:34:06.000000000 -0400
 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
  			const struct dvb_device *template, void *priv, int type)
  {
  	struct dvb_device *dvbdev;
 -	struct file_operations *dvbdevfops;
-+	struct file_operations *dvbdevfops;	/* cannot be const, see this function */
++	file_operations_no_const *dvbdevfops;
  	struct device *clsdev;
  	int minor;
  	int id;
-diff -urNp linux-2.6.39.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.39.3/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-2.6.39.3/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.39.4/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-2.6.39.4/drivers/media/dvb/dvb-usb/cxusb.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-05 20:34:06.000000000 -0400
+@@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
+ struct dib0700_adapter_state {
+ 	int (*set_param_save) (struct dvb_frontend *,
+ 			       struct dvb_frontend_parameters *);
+-};
++} __no_const;
+ 
+ static int dib7070_set_param_override(struct dvb_frontend *fe,
+ 				      struct dvb_frontend_parameters *fep)
+diff -urNp linux-2.6.39.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.39.4/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-2.6.39.4/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-08-05 19:44:37.000000000 -0400
 @@ -391,6 +391,8 @@ int dib0700_download_firmware(struct usb
  
  	u8 buf[260];
@@ -32743,9 +27385,21 @@ diff -urNp linux-2.6.39.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.39.
  	while ((ret = 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.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.39.3/drivers/media/dvb/dvb-usb/lmedm04.c
---- linux-2.6.39.3/drivers/media/dvb/dvb-usb/lmedm04.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/dvb-usb/lmedm04.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/dvb/dvb-usb/dw2102.c linux-2.6.39.4/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-2.6.39.4/drivers/media/dvb/dvb-usb/dw2102.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/dvb-usb/dw2102.c	2011-08-05 20:34:06.000000000 -0400
+@@ -95,7 +95,7 @@ struct su3000_state {
+ 
+ struct s6x0_state {
+ 	int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
+-};
++} __no_const;
+ 
+ /* debug */
+ static int dvb_usb_dw2102_debug;
+diff -urNp linux-2.6.39.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.39.4/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-2.6.39.4/drivers/media/dvb/dvb-usb/lmedm04.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/dvb-usb/lmedm04.c	2011-08-05 19:44:37.000000000 -0400
 @@ -663,6 +663,7 @@ static int lme2510_download_firmware(str
  	packet_size = 0x31;
  	len_in = 1;
@@ -32763,84 +27417,21 @@ diff -urNp linux-2.6.39.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.39.3/dri
  	data[0] = 0x0a;
  	len_in = 1;
  	info("FRM Firmware Cold Reset");
-diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/dib7000p.c linux-2.6.39.3/drivers/media/dvb/frontends/dib7000p.c
---- linux-2.6.39.3/drivers/media/dvb/frontends/dib7000p.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct i2c_algorithm dib7090_tuner_xfer_algo = {
-+static const struct i2c_algorithm dib7090_tuner_xfer_algo = {
- 	.master_xfer = dib7090_tuner_xfer,
- 	.functionality = dib7000p_i2c_func,
- };
-diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/dib9000.c linux-2.6.39.3/drivers/media/dvb/frontends/dib9000.c
---- linux-2.6.39.3/drivers/media/dvb/frontends/dib9000.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/frontends/dib9000.c	2011-06-03 00:32:05.000000000 -0400
-@@ -1676,12 +1676,12 @@ static u32 dib9000_i2c_func(struct i2c_a
- 	return I2C_FUNC_I2C;
- }
- 
--static struct i2c_algorithm dib9000_tuner_algo = {
-+static const struct i2c_algorithm dib9000_tuner_algo = {
- 	.master_xfer = dib9000_tuner_xfer,
- 	.functionality = dib9000_i2c_func,
- };
- 
--static struct i2c_algorithm dib9000_component_bus_algo = {
-+static const struct i2c_algorithm dib9000_component_bus_algo = {
- 	.master_xfer = dib9000_fw_component_bus_xfer,
- 	.functionality = dib9000_i2c_func,
- };
-diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/dibx000_common.c linux-2.6.39.3/drivers/media/dvb/frontends/dibx000_common.c
---- linux-2.6.39.3/drivers/media/dvb/frontends/dibx000_common.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct i2c_algorithm dibx000_i2c_master_gpio12_xfer_algo = {
-+static const struct i2c_algorithm dibx000_i2c_master_gpio12_xfer_algo = {
- 	.master_xfer = dibx000_i2c_master_xfer_gpio12,
- 	.functionality = dibx000_i2c_func,
- };
- 
--static struct i2c_algorithm dibx000_i2c_master_gpio34_xfer_algo = {
-+static const struct i2c_algorithm dibx000_i2c_master_gpio34_xfer_algo = {
- 	.master_xfer = dibx000_i2c_master_xfer_gpio34,
- 	.functionality = dibx000_i2c_func,
- };
-@@ -285,7 +285,7 @@ static int dibx000_i2c_gated_gpio67_xfer
- 	return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO;
- }
- 
--static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = {
-+static const struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = {
- 	.master_xfer = dibx000_i2c_gated_gpio67_xfer,
- 	.functionality = dibx000_i2c_func,
- };
-@@ -322,7 +322,7 @@ static int dibx000_i2c_gated_tuner_xfer(
- 	return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO;
- }
- 
--static struct i2c_algorithm dibx000_i2c_gated_tuner_algo = {
-+static const struct i2c_algorithm dibx000_i2c_gated_tuner_algo = {
- 	.master_xfer = dibx000_i2c_gated_tuner_xfer,
- 	.functionality = dibx000_i2c_func,
- };
-@@ -375,7 +375,7 @@ void dibx000_reset_i2c_master(struct dib
- EXPORT_SYMBOL(dibx000_reset_i2c_master);
- 
- static int i2c_adapter_init(struct i2c_adapter *i2c_adap,
--				struct i2c_algorithm *algo, const char *name,
-+				const struct i2c_algorithm *algo, const char *name,
- 				struct dibx000_i2c_master *mst)
- {
- 	strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));
-diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/mb86a16.c linux-2.6.39.3/drivers/media/dvb/frontends/mb86a16.c
---- linux-2.6.39.3/drivers/media/dvb/frontends/mb86a16.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/frontends/mb86a16.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/dvb/frontends/dib3000.h linux-2.6.39.4/drivers/media/dvb/frontends/dib3000.h
+--- linux-2.6.39.4/drivers/media/dvb/frontends/dib3000.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/frontends/dib3000.h	2011-08-05 20:34:06.000000000 -0400
+@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
+ 	int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
+ 	int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
+ 	int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
+-};
++} __no_const;
+ 
+ #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
+ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+diff -urNp linux-2.6.39.4/drivers/media/dvb/frontends/mb86a16.c linux-2.6.39.4/drivers/media/dvb/frontends/mb86a16.c
+--- linux-2.6.39.4/drivers/media/dvb/frontends/mb86a16.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/frontends/mb86a16.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
  	int ret = -1;
  	int sync;
@@ -32850,9 +27441,9 @@ diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/mb86a16.c linux-2.6.39.3/d
  	dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
  
  	fcp = 3000;
-diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/or51211.c linux-2.6.39.3/drivers/media/dvb/frontends/or51211.c
---- linux-2.6.39.3/drivers/media/dvb/frontends/or51211.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/frontends/or51211.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/dvb/frontends/or51211.c linux-2.6.39.4/drivers/media/dvb/frontends/or51211.c
+--- linux-2.6.39.4/drivers/media/dvb/frontends/or51211.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/dvb/frontends/or51211.c	2011-08-05 19:44:37.000000000 -0400
 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
  	u8 tudata[585];
  	int i;
@@ -32862,45 +27453,9 @@ diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/or51211.c linux-2.6.39.3/d
  	dprintk("Firmware is %zd bytes\n",fw->size);
  
  	/* Get eprom data */
-diff -urNp linux-2.6.39.3/drivers/media/dvb/frontends/s5h1420.c linux-2.6.39.3/drivers/media/dvb/frontends/s5h1420.c
---- linux-2.6.39.3/drivers/media/dvb/frontends/s5h1420.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/frontends/s5h1420.c	2011-05-22 19:36:31.000000000 -0400
-@@ -870,7 +870,7 @@ static int s5h1420_tuner_i2c_tuner_xfer(
- 	return i2c_transfer(state->i2c, m, 1+num) == 1 + num ? num : -EIO;
- }
- 
--static struct i2c_algorithm s5h1420_tuner_i2c_algo = {
-+static const struct i2c_algorithm s5h1420_tuner_i2c_algo = {
- 	.master_xfer   = s5h1420_tuner_i2c_tuner_xfer,
- 	.functionality = s5h1420_tuner_i2c_func,
- };
-diff -urNp linux-2.6.39.3/drivers/media/dvb/mantis/mantis_i2c.c linux-2.6.39.3/drivers/media/dvb/mantis/mantis_i2c.c
---- linux-2.6.39.3/drivers/media/dvb/mantis/mantis_i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/dvb/mantis/mantis_i2c.c	2011-05-22 19:36:31.000000000 -0400
-@@ -212,7 +212,7 @@ static u32 mantis_i2c_func(struct i2c_ad
- 	return I2C_FUNC_SMBUS_EMUL;
- }
- 
--static struct i2c_algorithm mantis_algo = {
-+static const struct i2c_algorithm mantis_algo = {
- 	.master_xfer		= mantis_i2c_xfer,
- 	.functionality		= mantis_i2c_func,
- };
-diff -urNp linux-2.6.39.3/drivers/media/dvb/ttusb-dec/ttusb_dec.c linux-2.6.39.3/drivers/media/dvb/ttusb-dec/ttusb_dec.c
---- linux-2.6.39.3/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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, result_length, cmd_result);
- }
- 
--static struct ttusbdecfe_config fe_config = {
-+static const struct ttusbdecfe_config fe_config = {
- 	.send_command = fe_send_command
- };
- 
-diff -urNp linux-2.6.39.3/drivers/media/radio/radio-cadet.c linux-2.6.39.3/drivers/media/radio/radio-cadet.c
---- linux-2.6.39.3/drivers/media/radio/radio-cadet.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/radio/radio-cadet.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/radio/radio-cadet.c linux-2.6.39.4/drivers/media/radio/radio-cadet.c
+--- linux-2.6.39.4/drivers/media/radio/radio-cadet.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/radio/radio-cadet.c	2011-08-05 19:44:37.000000000 -0400
 @@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f
  		readbuf[i++] = dev->rdsbuf[dev->rdsout++];
  	mutex_unlock(&dev->lock);
@@ -32910,45 +27465,9 @@ diff -urNp linux-2.6.39.3/drivers/media/radio/radio-cadet.c linux-2.6.39.3/drive
  		return -EFAULT;
  	return i;
  }
-diff -urNp linux-2.6.39.3/drivers/media/radio/radio-si4713.c linux-2.6.39.3/drivers/media/radio/radio-si4713.c
---- linux-2.6.39.3/drivers/media/radio/radio-si4713.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/radio/radio-si4713.c	2011-05-22 19:36:31.000000000 -0400
-@@ -231,7 +231,7 @@ static long radio_si4713_default(struct 
- 							ioctl, cmd, arg);
- }
- 
--static struct v4l2_ioctl_ops radio_si4713_ioctl_ops = {
-+static const struct v4l2_ioctl_ops radio_si4713_ioctl_ops = {
- 	.vidioc_enumaudout	= radio_si4713_enumaudout,
- 	.vidioc_g_audout	= radio_si4713_g_audout,
- 	.vidioc_s_audout	= radio_si4713_s_audout,
-diff -urNp linux-2.6.39.3/drivers/media/rc/ir-lirc-codec.c linux-2.6.39.3/drivers/media/rc/ir-lirc-codec.c
---- linux-2.6.39.3/drivers/media/rc/ir-lirc-codec.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct file_operations lirc_fops = {
-+static const struct file_operations lirc_fops = {
- 	.owner		= THIS_MODULE,
- 	.write		= ir_lirc_transmit_ir,
- 	.unlocked_ioctl	= ir_lirc_ioctl,
-diff -urNp linux-2.6.39.3/drivers/media/rc/lirc_dev.c linux-2.6.39.3/drivers/media/rc/lirc_dev.c
---- linux-2.6.39.3/drivers/media/rc/lirc_dev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/rc/lirc_dev.c	2011-05-22 19:36:31.000000000 -0400
-@@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
- }
- 
- 
--static struct file_operations lirc_dev_fops = {
-+static const struct file_operations lirc_dev_fops = {
- 	.owner		= THIS_MODULE,
- 	.read		= lirc_dev_fop_read,
- 	.write		= lirc_dev_fop_write,
-diff -urNp linux-2.6.39.3/drivers/media/rc/rc-main.c linux-2.6.39.3/drivers/media/rc/rc-main.c
---- linux-2.6.39.3/drivers/media/rc/rc-main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/rc/rc-main.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/rc/rc-main.c linux-2.6.39.4/drivers/media/rc/rc-main.c
+--- linux-2.6.39.4/drivers/media/rc/rc-main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/rc/rc-main.c	2011-08-05 19:44:37.000000000 -0400
 @@ -996,7 +996,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
  
  int rc_register_device(struct rc_dev *dev)
@@ -32967,33 +27486,9 @@ diff -urNp linux-2.6.39.3/drivers/media/rc/rc-main.c linux-2.6.39.3/drivers/medi
  	dev_set_name(&dev->dev, "rc%ld", dev->devno);
  	dev_set_drvdata(&dev->dev, dev);
  	rc = device_add(&dev->dev);
-diff -urNp linux-2.6.39.3/drivers/media/video/cafe_ccic.c linux-2.6.39.3/drivers/media/video/cafe_ccic.c
---- linux-2.6.39.3/drivers/media/video/cafe_ccic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/cafe_ccic.c	2011-05-22 19:36:31.000000000 -0400
-@@ -520,7 +520,7 @@ static u32 cafe_smbus_func(struct i2c_ad
- 	       I2C_FUNC_SMBUS_WRITE_BYTE_DATA;
- }
- 
--static struct i2c_algorithm cafe_smbus_algo = {
-+static const struct i2c_algorithm cafe_smbus_algo = {
- 	.smbus_xfer = cafe_smbus_xfer,
- 	.functionality = cafe_smbus_func
- };
-diff -urNp linux-2.6.39.3/drivers/media/video/cx18/cx18-alsa-pcm.c linux-2.6.39.3/drivers/media/video/cx18/cx18-alsa-pcm.c
---- linux-2.6.39.3/drivers/media/video/cx18/cx18-alsa-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/cx18/cx18-alsa-pcm.c	2011-05-22 19:36:31.000000000 -0400
-@@ -314,7 +314,7 @@ static struct page *snd_pcm_get_vmalloc_
- 	return vmalloc_to_page(pageptr);
- }
- 
--static struct snd_pcm_ops snd_cx18_pcm_capture_ops = {
-+static const struct snd_pcm_ops snd_cx18_pcm_capture_ops = {
- 	.open		= snd_cx18_pcm_capture_open,
- 	.close		= snd_cx18_pcm_capture_close,
- 	.ioctl		= snd_cx18_pcm_ioctl,
-diff -urNp linux-2.6.39.3/drivers/media/video/cx18/cx18-driver.c linux-2.6.39.3/drivers/media/video/cx18/cx18-driver.c
---- linux-2.6.39.3/drivers/media/video/cx18/cx18-driver.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/cx18/cx18-driver.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/cx18/cx18-driver.c linux-2.6.39.4/drivers/media/video/cx18/cx18-driver.c
+--- linux-2.6.39.4/drivers/media/video/cx18/cx18-driver.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/cx18/cx18-driver.c	2011-08-05 19:44:37.000000000 -0400
 @@ -61,7 +61,7 @@ static struct pci_device_id cx18_pci_tbl
  
  MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
@@ -33021,33 +27516,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/cx18/cx18-driver.c linux-2.6.39.3/
  	if (i >= 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.3/drivers/media/video/cx231xx/cx231xx-audio.c linux-2.6.39.3/drivers/media/video/cx231xx/cx231xx-audio.c
---- linux-2.6.39.3/drivers/media/video/cx231xx/cx231xx-audio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/cx231xx/cx231xx-audio.c	2011-05-22 19:36:31.000000000 -0400
-@@ -613,7 +613,7 @@ static struct page *snd_pcm_get_vmalloc_
- 	return vmalloc_to_page(pageptr);
- }
- 
--static struct snd_pcm_ops snd_cx231xx_pcm_capture = {
-+static const struct snd_pcm_ops snd_cx231xx_pcm_capture = {
- 	.open = snd_cx231xx_capture_open,
- 	.close = snd_cx231xx_pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/media/video/cx231xx/cx231xx-i2c.c linux-2.6.39.3/drivers/media/video/cx231xx/cx231xx-i2c.c
---- linux-2.6.39.3/drivers/media/video/cx231xx/cx231xx-i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct i2c_algorithm cx231xx_algo = {
-+static const struct i2c_algorithm cx231xx_algo = {
- 	.master_xfer = cx231xx_i2c_xfer,
- 	.functionality = functionality,
- };
-diff -urNp linux-2.6.39.3/drivers/media/video/cx23885/cx23885-input.c linux-2.6.39.3/drivers/media/video/cx23885/cx23885-input.c
---- linux-2.6.39.3/drivers/media/video/cx23885/cx23885-input.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/cx23885/cx23885-input.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/cx23885/cx23885-input.c linux-2.6.39.4/drivers/media/video/cx23885/cx23885-input.c
+--- linux-2.6.39.4/drivers/media/video/cx23885/cx23885-input.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/cx23885/cx23885-input.c	2011-08-05 19:44:37.000000000 -0400
 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur
  	bool handle = false;
  	struct ir_raw_event ir_core_event[64];
@@ -33057,102 +27528,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/cx23885/cx23885-input.c linux-2.6.
  	do {
  		num = 0;
  		v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff -urNp linux-2.6.39.3/drivers/media/video/cx88/cx88-alsa.c linux-2.6.39.3/drivers/media/video/cx88/cx88-alsa.c
---- linux-2.6.39.3/drivers/media/video/cx88/cx88-alsa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
--static struct snd_pcm_ops snd_cx88_pcm_ops = {
-+static const struct snd_pcm_ops snd_cx88_pcm_ops = {
- 	.open = snd_cx88_pcm_open,
- 	.close = snd_cx88_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/media/video/davinci/ccdc_hw_device.h linux-2.6.39.3/drivers/media/video/davinci/ccdc_hw_device.h
---- linux-2.6.39.3/drivers/media/video/davinci/ccdc_hw_device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	/* hw ops */
--	struct ccdc_hw_ops hw_ops;
-+	const struct ccdc_hw_ops hw_ops;
- };
- 
- /* Used by CCDC module to register & unregister with vpfe capture driver */
-diff -urNp linux-2.6.39.3/drivers/media/video/davinci/vpss.c linux-2.6.39.3/drivers/media/video/davinci/vpss.c
---- linux-2.6.39.3/drivers/media/video/davinci/vpss.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/davinci/vpss.c	2011-05-22 19:36:31.000000000 -0400
-@@ -103,7 +103,7 @@ struct vpss_oper_config {
- 	__iomem void *vpss_regs_base1;
- 	enum vpss_platform_type platform;
- 	spinlock_t vpss_lock;
--	struct vpss_hw_ops hw_ops;
-+	const struct vpss_hw_ops hw_ops;
- };
- 
- static struct vpss_oper_config oper_cfg;
-diff -urNp linux-2.6.39.3/drivers/media/video/em28xx/em28xx-audio.c linux-2.6.39.3/drivers/media/video/em28xx/em28xx-audio.c
---- linux-2.6.39.3/drivers/media/video/em28xx/em28xx-audio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops snd_em28xx_pcm_capture = {
-+static const struct snd_pcm_ops snd_em28xx_pcm_capture = {
- 	.open      = snd_em28xx_capture_open,
- 	.close     = snd_em28xx_pcm_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/media/video/em28xx/em28xx-i2c.c linux-2.6.39.3/drivers/media/video/em28xx/em28xx-i2c.c
---- linux-2.6.39.3/drivers/media/video/em28xx/em28xx-i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct i2c_algorithm em28xx_algo = {
-+static const struct i2c_algorithm em28xx_algo = {
- 	.master_xfer   = em28xx_i2c_xfer,
- 	.functionality = functionality,
- };
-diff -urNp linux-2.6.39.3/drivers/media/video/hdpvr/hdpvr-i2c.c linux-2.6.39.3/drivers/media/video/hdpvr/hdpvr-i2c.c
---- linux-2.6.39.3/drivers/media/video/hdpvr/hdpvr-i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/hdpvr/hdpvr-i2c.c	2011-05-22 19:36:31.000000000 -0400
-@@ -179,7 +179,7 @@ static u32 hdpvr_functionality(struct i2
- 	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
- }
- 
--static struct i2c_algorithm hdpvr_algo = {
-+static const struct i2c_algorithm hdpvr_algo = {
- 	.master_xfer   = hdpvr_transfer,
- 	.functionality = hdpvr_functionality,
- };
-diff -urNp linux-2.6.39.3/drivers/media/video/imx074.c linux-2.6.39.3/drivers/media/video/imx074.c
---- linux-2.6.39.3/drivers/media/video/imx074.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/imx074.c	2011-05-22 19:36:31.000000000 -0400
-@@ -267,7 +267,7 @@ static int imx074_g_chip_ident(struct v4
- 	return 0;
- }
- 
--static struct v4l2_subdev_video_ops imx074_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops imx074_subdev_video_ops = {
- 	.s_stream	= imx074_s_stream,
- 	.s_mbus_fmt	= imx074_s_fmt,
- 	.g_mbus_fmt	= imx074_g_fmt,
-@@ -277,7 +277,7 @@ static struct v4l2_subdev_video_ops imx0
- 	.cropcap	= imx074_cropcap,
- };
- 
--static struct v4l2_subdev_core_ops imx074_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops imx074_subdev_core_ops = {
- 	.g_chip_ident	= imx074_g_chip_ident,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.39.3/drivers/media/video/ivtv/ivtv-driver.c
---- linux-2.6.39.3/drivers/media/video/ivtv/ivtv-driver.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/ivtv/ivtv-driver.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.39.4/drivers/media/video/ivtv/ivtv-driver.c
+--- linux-2.6.39.4/drivers/media/video/ivtv/ivtv-driver.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/ivtv/ivtv-driver.c	2011-08-05 19:44:37.000000000 -0400
 @@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl
  MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
  
@@ -33162,120 +27540,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.39.3/
  
  /* Parameter declarations */
  static int cardtype[IVTV_MAX_CARDS];
-diff -urNp linux-2.6.39.3/drivers/media/video/mt9m001.c linux-2.6.39.3/drivers/media/video/mt9m001.c
---- linux-2.6.39.3/drivers/media/video/mt9m001.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/mt9m001.c	2011-05-22 19:36:31.000000000 -0400
-@@ -691,7 +691,7 @@ static int mt9m001_g_skip_top_lines(stru
- 	return 0;
- }
- 
--static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
- 	.g_ctrl		= mt9m001_g_ctrl,
- 	.s_ctrl		= mt9m001_s_ctrl,
- 	.g_chip_ident	= mt9m001_g_chip_ident,
-@@ -714,7 +714,7 @@ static int mt9m001_enum_fmt(struct v4l2_
- 	return 0;
- }
- 
--static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {
- 	.s_stream	= mt9m001_s_stream,
- 	.s_mbus_fmt	= mt9m001_s_fmt,
- 	.g_mbus_fmt	= mt9m001_g_fmt,
-@@ -725,7 +725,7 @@ static struct v4l2_subdev_video_ops mt9m
- 	.enum_mbus_fmt	= mt9m001_enum_fmt,
- };
- 
--static struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = {
-+static const struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = {
- 	.g_skip_top_lines	= mt9m001_g_skip_top_lines,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/media/video/mt9t031.c linux-2.6.39.3/drivers/media/video/mt9t031.c
---- linux-2.6.39.3/drivers/media/video/mt9t031.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/mt9t031.c	2011-05-22 19:36:31.000000000 -0400
-@@ -725,7 +725,7 @@ static int mt9t031_runtime_resume(struct
- 	return 0;
- }
- 
--static struct dev_pm_ops mt9t031_dev_pm_ops = {
-+static const struct dev_pm_ops mt9t031_dev_pm_ops = {
- 	.runtime_suspend	= mt9t031_runtime_suspend,
- 	.runtime_resume		= mt9t031_runtime_resume,
- };
-@@ -788,7 +788,7 @@ static int mt9t031_g_skip_top_lines(stru
- 	return 0;
- }
- 
--static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
- 	.g_ctrl		= mt9t031_g_ctrl,
- 	.s_ctrl		= mt9t031_s_ctrl,
- 	.g_chip_ident	= mt9t031_g_chip_ident,
-@@ -808,7 +808,7 @@ static int mt9t031_enum_fmt(struct v4l2_
- 	return 0;
- }
- 
--static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {
- 	.s_stream	= mt9t031_s_stream,
- 	.s_mbus_fmt	= mt9t031_s_fmt,
- 	.g_mbus_fmt	= mt9t031_g_fmt,
-@@ -819,7 +819,7 @@ static struct v4l2_subdev_video_ops mt9t
- 	.enum_mbus_fmt	= mt9t031_enum_fmt,
- };
- 
--static struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = {
-+static const struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = {
- 	.g_skip_top_lines	= mt9t031_g_skip_top_lines,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/media/video/mt9v022.c linux-2.6.39.3/drivers/media/video/mt9v022.c
---- linux-2.6.39.3/drivers/media/video/mt9v022.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/mt9v022.c	2011-05-22 19:36:31.000000000 -0400
-@@ -825,7 +825,7 @@ static int mt9v022_g_skip_top_lines(stru
- 	return 0;
- }
- 
--static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
- 	.g_ctrl		= mt9v022_g_ctrl,
- 	.s_ctrl		= mt9v022_s_ctrl,
- 	.g_chip_ident	= mt9v022_g_chip_ident,
-@@ -848,7 +848,7 @@ static int mt9v022_enum_fmt(struct v4l2_
- 	return 0;
- }
- 
--static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = {
- 	.s_stream	= mt9v022_s_stream,
- 	.s_mbus_fmt	= mt9v022_s_fmt,
- 	.g_mbus_fmt	= mt9v022_g_fmt,
-@@ -859,7 +859,7 @@ static struct v4l2_subdev_video_ops mt9v
- 	.enum_mbus_fmt	= mt9v022_enum_fmt,
- };
- 
--static struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = {
-+static const struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = {
- 	.g_skip_top_lines	= mt9v022_g_skip_top_lines,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/media/video/mx2_camera.c linux-2.6.39.3/drivers/media/video/mx2_camera.c
---- linux-2.6.39.3/drivers/media/video/mx2_camera.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/mx2_camera.c	2011-05-22 19:36:31.000000000 -0400
-@@ -668,7 +668,7 @@ static void mx2_videobuf_release(struct 
- 	free_buffer(vq, buf);
- }
- 
--static struct videobuf_queue_ops mx2_videobuf_ops = {
-+static const struct videobuf_queue_ops mx2_videobuf_ops = {
- 	.buf_setup      = mx2_videobuf_setup,
- 	.buf_prepare    = mx2_videobuf_prepare,
- 	.buf_queue      = mx2_videobuf_queue,
-diff -urNp linux-2.6.39.3/drivers/media/video/omap24xxcam.c linux-2.6.39.3/drivers/media/video/omap24xxcam.c
---- linux-2.6.39.3/drivers/media/video/omap24xxcam.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/omap24xxcam.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/omap24xxcam.c linux-2.6.39.4/drivers/media/video/omap24xxcam.c
+--- linux-2.6.39.4/drivers/media/video/omap24xxcam.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/omap24xxcam.c	2011-08-05 19:44:37.000000000 -0400
 @@ -403,7 +403,7 @@ static void omap24xxcam_vbq_complete(str
  	spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
  
@@ -33285,9 +27552,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/omap24xxcam.c linux-2.6.39.3/drive
  	if (csr & csr_error) {
  		vb->state = VIDEOBUF_ERROR;
  		if (!atomic_read(&fh->cam->in_reset)) {
-diff -urNp linux-2.6.39.3/drivers/media/video/omap24xxcam.h linux-2.6.39.3/drivers/media/video/omap24xxcam.h
---- linux-2.6.39.3/drivers/media/video/omap24xxcam.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/omap24xxcam.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/omap24xxcam.h linux-2.6.39.4/drivers/media/video/omap24xxcam.h
+--- linux-2.6.39.4/drivers/media/video/omap24xxcam.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/omap24xxcam.h	2011-08-05 19:44:37.000000000 -0400
 @@ -533,7 +533,7 @@ struct omap24xxcam_fh {
  	spinlock_t vbq_lock; /* spinlock for the videobuf queue */
  	struct videobuf_queue vbq;
@@ -33297,63 +27564,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/omap24xxcam.h linux-2.6.39.3/drive
  	/* accessing cam here doesn't need serialisation: it's constant */
  	struct omap24xxcam_device *cam;
  };
-diff -urNp linux-2.6.39.3/drivers/media/video/omap3isp/isp.h linux-2.6.39.3/drivers/media/video/omap3isp/isp.h
---- linux-2.6.39.3/drivers/media/video/omap3isp/isp.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/omap3isp/isp.h	2011-05-22 19:36:31.000000000 -0400
-@@ -290,7 +290,7 @@ struct isp_device {
- 
- 	struct iommu *iommu;
- 
--	struct isp_platform_callback platform_cb;
-+	const struct isp_platform_callback platform_cb;
- };
- 
- #define v4l2_dev_to_isp_device(dev) \
-diff -urNp linux-2.6.39.3/drivers/media/video/ov2640.c linux-2.6.39.3/drivers/media/video/ov2640.c
---- linux-2.6.39.3/drivers/media/video/ov2640.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/ov2640.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1080,7 +1080,7 @@ static struct soc_camera_ops ov2640_ops 
- 	.num_controls		= ARRAY_SIZE(ov2640_controls),
- };
- 
--static struct v4l2_subdev_core_ops ov2640_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops ov2640_subdev_core_ops = {
- 	.g_ctrl		= ov2640_g_ctrl,
- 	.s_ctrl		= ov2640_s_ctrl,
- 	.g_chip_ident	= ov2640_g_chip_ident,
-@@ -1090,7 +1090,7 @@ static struct v4l2_subdev_core_ops ov264
- #endif
- };
- 
--static struct v4l2_subdev_video_ops ov2640_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops ov2640_subdev_video_ops = {
- 	.s_stream	= ov2640_s_stream,
- 	.g_mbus_fmt	= ov2640_g_fmt,
- 	.s_mbus_fmt	= ov2640_s_fmt,
-diff -urNp linux-2.6.39.3/drivers/media/video/ov772x.c linux-2.6.39.3/drivers/media/video/ov772x.c
---- linux-2.6.39.3/drivers/media/video/ov772x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/ov772x.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1079,7 +1079,7 @@ static struct soc_camera_ops ov772x_ops 
- 	.num_controls		= ARRAY_SIZE(ov772x_controls),
- };
- 
--static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
- 	.g_ctrl		= ov772x_g_ctrl,
- 	.s_ctrl		= ov772x_s_ctrl,
- 	.g_chip_ident	= ov772x_g_chip_ident,
-@@ -1099,7 +1099,7 @@ static int ov772x_enum_fmt(struct v4l2_s
- 	return 0;
- }
- 
--static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
- 	.s_stream	= ov772x_s_stream,
- 	.g_mbus_fmt	= ov772x_g_fmt,
- 	.s_mbus_fmt	= ov772x_s_fmt,
-diff -urNp linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-08-05 19:44:37.000000000 -0400
 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw 
  	u8 *eeprom;
  	struct tveeprom tvdata;
@@ -33363,66 +27576,21 @@ diff -urNp linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6
  	memset(&tvdata,0,sizeof(tvdata));
  
  	eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
---- linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c	2011-05-22 19:36:31.000000000 -0400
-@@ -527,7 +527,7 @@ static u32 pvr2_i2c_functionality(struct
- 	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
- }
- 
--static struct i2c_algorithm pvr2_i2c_algo_template = {
-+static const struct i2c_algorithm pvr2_i2c_algo_template = {
- 	.master_xfer   = pvr2_i2c_xfer,
- 	.functionality = pvr2_i2c_functionality,
- };
-diff -urNp linux-2.6.39.3/drivers/media/video/rj54n1cb0c.c linux-2.6.39.3/drivers/media/video/rj54n1cb0c.c
---- linux-2.6.39.3/drivers/media/video/rj54n1cb0c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = {
- 	.g_ctrl		= rj54n1_g_ctrl,
- 	.s_ctrl		= rj54n1_s_ctrl,
- 	.g_chip_ident	= rj54n1_g_chip_ident,
-@@ -1337,7 +1337,7 @@ static struct v4l2_subdev_core_ops rj54n
- #endif
- };
- 
--static struct v4l2_subdev_video_ops rj54n1_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops rj54n1_subdev_video_ops = {
- 	.s_stream	= rj54n1_s_stream,
- 	.s_mbus_fmt	= rj54n1_s_fmt,
- 	.g_mbus_fmt	= rj54n1_g_fmt,
-diff -urNp linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-capture.c linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-capture.c
---- linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-capture.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-capture.c	2011-05-22 19:36:31.000000000 -0400
-@@ -376,7 +376,7 @@ static void fimc_unlock(struct vb2_queue
- 	mutex_unlock(&ctx->fimc_dev->lock);
- }
- 
--static struct vb2_ops fimc_capture_qops = {
-+static const struct vb2_ops fimc_capture_qops = {
- 	.queue_setup		= queue_setup,
- 	.buf_prepare		= buffer_prepare,
- 	.buf_queue		= buffer_queue,
-diff -urNp linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-core.c linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-core.c
---- linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/s5p-fimc/fimc-core.c	2011-05-22 19:36:31.000000000 -0400
-@@ -768,7 +768,7 @@ static void fimc_unlock(struct vb2_queue
- 	mutex_unlock(&ctx->fimc_dev->lock);
- }
- 
--static struct vb2_ops fimc_qops = {
-+static const struct vb2_ops fimc_qops = {
- 	.queue_setup	 = fimc_queue_setup,
- 	.buf_prepare	 = fimc_buf_prepare,
- 	.buf_queue	 = fimc_buf_queue,
-diff -urNp linux-2.6.39.3/drivers/media/video/saa7134/saa6752hs.c linux-2.6.39.3/drivers/media/video/saa7134/saa6752hs.c
---- linux-2.6.39.3/drivers/media/video/saa7134/saa6752hs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/saa7134/saa6752hs.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+--- linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-08-05 20:34:06.000000000 -0400
+@@ -196,7 +196,7 @@ struct pvr2_hdw {
+ 
+ 	/* I2C stuff */
+ 	struct i2c_adapter i2c_adap;
+-	struct i2c_algorithm i2c_algo;
++	i2c_algorithm_no_const i2c_algo;
+ 	pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
+ 	int i2c_cx25840_hack_state;
+ 	int i2c_linked;
+diff -urNp linux-2.6.39.4/drivers/media/video/saa7134/saa6752hs.c linux-2.6.39.4/drivers/media/video/saa7134/saa6752hs.c
+--- linux-2.6.39.4/drivers/media/video/saa7134/saa6752hs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/saa7134/saa6752hs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
  	unsigned char localPAT[256];
  	unsigned char localPMT[256];
@@ -33432,21 +27600,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/saa7134/saa6752hs.c linux-2.6.39.3
  	/* Set video format - must be done first as it resets other settings */
  	set_reg8(client, 0x41, h->video_format);
  
-diff -urNp linux-2.6.39.3/drivers/media/video/saa7134/saa7134-alsa.c linux-2.6.39.3/drivers/media/video/saa7134/saa7134-alsa.c
---- linux-2.6.39.3/drivers/media/video/saa7134/saa7134-alsa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
- 
--static struct snd_pcm_ops snd_card_saa7134_capture_ops = {
-+static const struct snd_pcm_ops snd_card_saa7134_capture_ops = {
- 	.open =			snd_card_saa7134_capture_open,
- 	.close =		snd_card_saa7134_capture_close,
- 	.ioctl =		snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.39.3/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-2.6.39.3/drivers/media/video/saa7164/saa7164-cmd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/saa7164/saa7164-cmd.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.39.4/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-2.6.39.4/drivers/media/video/saa7164/saa7164-cmd.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/saa7164/saa7164-cmd.c	2011-08-05 19:44:37.000000000 -0400
 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
  	u8 tmp[512];
  	dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -33465,81 +27621,30 @@ diff -urNp linux-2.6.39.3/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.39
  	while (loop) {
  
  		struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-2.6.39.3/drivers/media/video/sh_mobile_csi2.c linux-2.6.39.3/drivers/media/video/sh_mobile_csi2.c
---- linux-2.6.39.3/drivers/media/video/sh_mobile_csi2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
+diff -urNp linux-2.6.39.4/drivers/media/video/timblogiw.c linux-2.6.39.4/drivers/media/video/timblogiw.c
+--- linux-2.6.39.4/drivers/media/video/timblogiw.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/timblogiw.c	2011-08-05 20:34:06.000000000 -0400
+@@ -746,7 +746,7 @@ static int timblogiw_mmap(struct file *f
  
--static struct v4l2_subdev_video_ops sh_csi2_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops sh_csi2_subdev_video_ops = {
- 	.s_mbus_fmt	= sh_csi2_s_fmt,
- 	.try_mbus_fmt	= sh_csi2_try_fmt,
- };
+ /* Platform device functions */
  
--static struct v4l2_subdev_core_ops sh_csi2_subdev_core_ops;
-+static const struct v4l2_subdev_core_ops sh_csi2_subdev_core_ops;
- 
- static struct v4l2_subdev_ops sh_csi2_subdev_ops = {
- 	.core	= &sh_csi2_subdev_core_ops,
-diff -urNp linux-2.6.39.3/drivers/media/video/soc_camera_platform.c linux-2.6.39.3/drivers/media/video/soc_camera_platform.c
---- linux-2.6.39.3/drivers/media/video/soc_camera_platform.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct v4l2_subdev_core_ops platform_subdev_core_ops;
-+static const struct v4l2_subdev_core_ops platform_subdev_core_ops;
- 
- static int soc_camera_platform_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
- 					enum v4l2_mbus_pixelcode *code)
-@@ -115,7 +115,7 @@ static int soc_camera_platform_cropcap(s
- 	return 0;
- }
- 
--static struct v4l2_subdev_video_ops platform_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops platform_subdev_video_ops = {
- 	.s_stream	= soc_camera_platform_s_stream,
- 	.enum_mbus_fmt	= soc_camera_platform_enum_fmt,
- 	.cropcap	= soc_camera_platform_cropcap,
-diff -urNp linux-2.6.39.3/drivers/media/video/tlg2300/pd-alsa.c linux-2.6.39.3/drivers/media/video/tlg2300/pd-alsa.c
---- linux-2.6.39.3/drivers/media/video/tlg2300/pd-alsa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/tlg2300/pd-alsa.c	2011-05-22 19:36:31.000000000 -0400
-@@ -265,7 +265,7 @@ static struct page *snd_pcm_pd_get_page(
- 	return vmalloc_to_page(pageptr);
- }
- 
--static struct snd_pcm_ops pcm_capture_ops = {
-+static const struct snd_pcm_ops pcm_capture_ops = {
- 	.open      = snd_pd_capture_open,
- 	.close     = snd_pd_pcm_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/media/video/tw9910.c linux-2.6.39.3/drivers/media/video/tw9910.c
---- linux-2.6.39.3/drivers/media/video/tw9910.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/tw9910.c	2011-05-22 19:36:31.000000000 -0400
-@@ -894,7 +894,7 @@ static struct soc_camera_ops tw9910_ops 
- 	.enum_input		= tw9910_enum_input,
+-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
++static __devinitdata struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
+ 	.vidioc_querycap		= timblogiw_querycap,
+ 	.vidioc_enum_fmt_vid_cap	= timblogiw_enum_fmt,
+ 	.vidioc_g_fmt_vid_cap		= timblogiw_g_fmt,
+@@ -768,7 +768,7 @@ static __devinitconst struct v4l2_ioctl_
+ 	.vidioc_enum_framesizes		= timblogiw_enum_framesizes,
  };
  
--static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
-+static const struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
- 	.g_chip_ident	= tw9910_g_chip_ident,
- 	.s_std		= tw9910_s_std,
- #ifdef CONFIG_VIDEO_ADV_DEBUG
-@@ -913,7 +913,7 @@ static int tw9910_enum_fmt(struct v4l2_s
- 	return 0;
- }
- 
--static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {
-+static const struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {
- 	.s_stream	= tw9910_s_stream,
- 	.g_mbus_fmt	= tw9910_g_fmt,
- 	.s_mbus_fmt	= tw9910_s_fmt,
-diff -urNp linux-2.6.39.3/drivers/media/video/usbvision/usbvision-core.c linux-2.6.39.3/drivers/media/video/usbvision/usbvision-core.c
---- linux-2.6.39.3/drivers/media/video/usbvision/usbvision-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/usbvision/usbvision-core.c	2011-05-22 19:36:31.000000000 -0400
+-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
++static __devinitdata struct v4l2_file_operations timblogiw_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.open		= timblogiw_open,
+ 	.release	= timblogiw_close,
+diff -urNp linux-2.6.39.4/drivers/media/video/usbvision/usbvision-core.c linux-2.6.39.4/drivers/media/video/usbvision/usbvision-core.c
+--- linux-2.6.39.4/drivers/media/video/usbvision/usbvision-core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/usbvision/usbvision-core.c	2011-08-05 19:44:37.000000000 -0400
 @@ -799,6 +799,8 @@ static enum parse_state usbvision_parse_
  	unsigned char rv, gv, bv;
  	static unsigned char *Y, *U, *V;
@@ -33549,21 +27654,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/usbvision/usbvision-core.c linux-2
  	frame = usbvision->cur_frame;
  	image_size = frame->frmwidth * frame->frmheight;
  	if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff -urNp linux-2.6.39.3/drivers/media/video/usbvision/usbvision-i2c.c linux-2.6.39.3/drivers/media/video/usbvision/usbvision-i2c.c
---- linux-2.6.39.3/drivers/media/video/usbvision/usbvision-i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- /* -----exported algorithm data: -------------------------------------	*/
- 
--static struct i2c_algorithm usbvision_algo = {
-+static const struct i2c_algorithm usbvision_algo = {
- 	.master_xfer   = usbvision_i2c_xfer,
- 	.smbus_xfer    = NULL,
- 	.functionality = functionality,
-diff -urNp linux-2.6.39.3/drivers/media/video/v4l2-device.c linux-2.6.39.3/drivers/media/video/v4l2-device.c
---- linux-2.6.39.3/drivers/media/video/v4l2-device.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/v4l2-device.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/v4l2-device.c linux-2.6.39.4/drivers/media/video/v4l2-device.c
+--- linux-2.6.39.4/drivers/media/video/v4l2-device.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/v4l2-device.c	2011-08-05 19:44:37.000000000 -0400
 @@ -71,9 +71,9 @@ int v4l2_device_put(struct v4l2_device *
  EXPORT_SYMBOL_GPL(v4l2_device_put);
  
@@ -33576,9 +27669,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/v4l2-device.c linux-2.6.39.3/drive
  	int len = strlen(basename);
  
  	if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
-diff -urNp linux-2.6.39.3/drivers/media/video/videobuf-dma-sg.c linux-2.6.39.3/drivers/media/video/videobuf-dma-sg.c
---- linux-2.6.39.3/drivers/media/video/videobuf-dma-sg.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/media/video/videobuf-dma-sg.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/media/video/videobuf-dma-sg.c linux-2.6.39.4/drivers/media/video/videobuf-dma-sg.c
+--- linux-2.6.39.4/drivers/media/video/videobuf-dma-sg.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/media/video/videobuf-dma-sg.c	2011-08-05 19:44:37.000000000 -0400
 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
  {
  	struct videobuf_queue q;
@@ -33588,36 +27681,9 @@ diff -urNp linux-2.6.39.3/drivers/media/video/videobuf-dma-sg.c linux-2.6.39.3/d
  	/* Required to make generic handler to call __videobuf_alloc */
  	q.int_ops = &sg_ops;
  
-diff -urNp linux-2.6.39.3/drivers/message/fusion/mptbase.c linux-2.6.39.3/drivers/message/fusion/mptbase.c
---- linux-2.6.39.3/drivers/message/fusion/mptbase.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 */
- static MPT_RESETHANDLER		 MptResetHandlers[MPT_MAX_PROTOCOL_DRIVERS];
--static struct mpt_pci_driver 	*MptDeviceDriverHandlers[MPT_MAX_PROTOCOL_DRIVERS];
-+static const struct mpt_pci_driver 	*MptDeviceDriverHandlers[MPT_MAX_PROTOCOL_DRIVERS];
- 
- #ifdef CONFIG_PROC_FS
- static struct proc_dir_entry 	*mpt_proc_root_dir;
-@@ -772,7 +772,7 @@ mpt_reset_deregister(u8 cb_idx)
-  *	@cb_idx: MPT protocol driver index
-  */
- int
--mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, u8 cb_idx)
-+mpt_device_driver_register(const struct mpt_pci_driver * dd_cbfunc, u8 cb_idx)
- {
- 	MPT_ADAPTER	*ioc;
- 	const struct pci_device_id *id;
-@@ -801,7 +801,7 @@ mpt_device_driver_register(struct mpt_pc
- void
- mpt_device_driver_deregister(u8 cb_idx)
- {
--	struct mpt_pci_driver *dd_cbfunc;
-+	const struct mpt_pci_driver *dd_cbfunc;
- 	MPT_ADAPTER	*ioc;
- 
- 	if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS)
+diff -urNp linux-2.6.39.4/drivers/message/fusion/mptbase.c linux-2.6.39.4/drivers/message/fusion/mptbase.c
+--- linux-2.6.39.4/drivers/message/fusion/mptbase.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/message/fusion/mptbase.c	2011-08-05 20:34:06.000000000 -0400
 @@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct 
  	seq_printf(m, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
  	seq_printf(m, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -33632,33 +27698,9 @@ diff -urNp linux-2.6.39.3/drivers/message/fusion/mptbase.c linux-2.6.39.3/driver
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff -urNp linux-2.6.39.3/drivers/message/fusion/mptbase.h linux-2.6.39.3/drivers/message/fusion/mptbase.h
---- linux-2.6.39.3/drivers/message/fusion/mptbase.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- extern void	 mpt_reset_deregister(u8 cb_idx);
--extern int	 mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, u8 cb_idx);
-+extern int	 mpt_device_driver_register(const struct mpt_pci_driver * dd_cbfunc, u8 cb_idx);
- 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.3/drivers/message/fusion/mptctl.c linux-2.6.39.3/drivers/message/fusion/mptctl.c
---- linux-2.6.39.3/drivers/message/fusion/mptctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/message/fusion/mptctl.c	2011-05-22 19:36:31.000000000 -0400
-@@ -3000,7 +3000,7 @@ mptctl_remove(struct pci_dev *pdev)
- {
- }
- 
--static struct mpt_pci_driver mptctl_driver = {
-+static const struct mpt_pci_driver mptctl_driver = {
-   .probe		= mptctl_probe,
-   .remove		= mptctl_remove,
- };
-diff -urNp linux-2.6.39.3/drivers/message/fusion/mptsas.c linux-2.6.39.3/drivers/message/fusion/mptsas.c
---- linux-2.6.39.3/drivers/message/fusion/mptsas.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/message/fusion/mptsas.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/message/fusion/mptsas.c linux-2.6.39.4/drivers/message/fusion/mptsas.c
+--- linux-2.6.39.4/drivers/message/fusion/mptsas.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/message/fusion/mptsas.c	2011-08-05 19:44:37.000000000 -0400
 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
  		return 0;
  }
@@ -33707,9 +27749,9 @@ diff -urNp linux-2.6.39.3/drivers/message/fusion/mptsas.c linux-2.6.39.3/drivers
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-2.6.39.3/drivers/message/fusion/mptscsih.c linux-2.6.39.3/drivers/message/fusion/mptscsih.c
---- linux-2.6.39.3/drivers/message/fusion/mptscsih.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/message/fusion/mptscsih.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/message/fusion/mptscsih.c linux-2.6.39.4/drivers/message/fusion/mptscsih.c
+--- linux-2.6.39.4/drivers/message/fusion/mptscsih.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/message/fusion/mptscsih.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
  	h = shost_priv(SChost);
@@ -33735,9 +27777,9 @@ diff -urNp linux-2.6.39.3/drivers/message/fusion/mptscsih.c linux-2.6.39.3/drive
  
  	return h->info_kbuf;
  }
-diff -urNp linux-2.6.39.3/drivers/message/i2o/i2o_config.c linux-2.6.39.3/drivers/message/i2o/i2o_config.c
---- linux-2.6.39.3/drivers/message/i2o/i2o_config.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/message/i2o/i2o_config.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/message/i2o/i2o_config.c linux-2.6.39.4/drivers/message/i2o/i2o_config.c
+--- linux-2.6.39.4/drivers/message/i2o/i2o_config.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/message/i2o/i2o_config.c	2011-08-05 19:44:37.000000000 -0400
 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
  	struct i2o_message *msg;
  	unsigned int iop;
@@ -33747,9 +27789,9 @@ diff -urNp linux-2.6.39.3/drivers/message/i2o/i2o_config.c linux-2.6.39.3/driver
  	if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
  		return -EFAULT;
  
-diff -urNp linux-2.6.39.3/drivers/message/i2o/i2o_proc.c linux-2.6.39.3/drivers/message/i2o/i2o_proc.c
---- linux-2.6.39.3/drivers/message/i2o/i2o_proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/message/i2o/i2o_proc.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/message/i2o/i2o_proc.c linux-2.6.39.4/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.39.4/drivers/message/i2o/i2o_proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/message/i2o/i2o_proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
@@ -33836,9 +27878,9 @@ diff -urNp linux-2.6.39.3/drivers/message/i2o/i2o_proc.c linux-2.6.39.3/drivers/
  
  	return 0;
  }
-diff -urNp linux-2.6.39.3/drivers/message/i2o/iop.c linux-2.6.39.3/drivers/message/i2o/iop.c
---- linux-2.6.39.3/drivers/message/i2o/iop.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/message/i2o/iop.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/message/i2o/iop.c linux-2.6.39.4/drivers/message/i2o/iop.c
+--- linux-2.6.39.4/drivers/message/i2o/iop.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/message/i2o/iop.c	2011-08-05 19:44:37.000000000 -0400
 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
  	spin_lock_irqsave(&c->context_list_lock, flags);
@@ -33862,129 +27904,21 @@ diff -urNp linux-2.6.39.3/drivers/message/i2o/iop.c linux-2.6.39.3/drivers/messa
  	INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-2.6.39.3/drivers/mfd/ab3100-core.c linux-2.6.39.3/drivers/mfd/ab3100-core.c
---- linux-2.6.39.3/drivers/mfd/ab3100-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mfd/ab3100-core.c	2011-05-22 19:36:31.000000000 -0400
-@@ -385,7 +385,7 @@ static int ab3100_event_registers_startu
- 	return 0;
- }
+diff -urNp linux-2.6.39.4/drivers/mfd/abx500-core.c linux-2.6.39.4/drivers/mfd/abx500-core.c
+--- linux-2.6.39.4/drivers/mfd/abx500-core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mfd/abx500-core.c	2011-08-05 20:34:06.000000000 -0400
+@@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
  
--static struct abx500_ops ab3100_ops = {
-+static const struct abx500_ops ab3100_ops = {
- 	.get_chip_id = ab3100_get_chip_id,
- 	.set_register = set_register_interruptible,
- 	.get_register = get_register_interruptible,
-diff -urNp linux-2.6.39.3/drivers/mfd/ab3550-core.c linux-2.6.39.3/drivers/mfd/ab3550-core.c
---- linux-2.6.39.3/drivers/mfd/ab3550-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mfd/ab3550-core.c	2011-05-22 19:36:31.000000000 -0400
-@@ -676,7 +676,7 @@ static int ab3550_startup_irq_enabled(st
- 	return val;
- }
- 
--static struct abx500_ops ab3550_ops = {
-+static const struct abx500_ops ab3550_ops = {
- 	.get_chip_id = ab3550_get_chip_id,
- 	.get_register = ab3550_get_register_interruptible,
- 	.set_register = ab3550_set_register_interruptible,
-diff -urNp linux-2.6.39.3/drivers/mfd/ab8500-core.c linux-2.6.39.3/drivers/mfd/ab8500-core.c
---- linux-2.6.39.3/drivers/mfd/ab8500-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mfd/ab8500-core.c	2011-05-22 19:36:31.000000000 -0400
-@@ -223,7 +223,7 @@ static int ab8500_mask_and_set_register(
- 
- }
- 
--static struct abx500_ops ab8500_ops = {
-+static const struct abx500_ops ab8500_ops = {
- 	.get_chip_id = ab8500_get_chip_id,
- 	.get_register = ab8500_get_register,
- 	.set_register = ab8500_set_register,
-diff -urNp linux-2.6.39.3/drivers/mfd/abx500-core.c linux-2.6.39.3/drivers/mfd/abx500-core.c
---- linux-2.6.39.3/drivers/mfd/abx500-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mfd/abx500-core.c	2011-05-22 19:36:31.000000000 -0400
-@@ -18,7 +18,7 @@ struct abx500_device_entry {
+ struct abx500_device_entry {
+ 	struct list_head list;
+-	struct abx500_ops ops;
++	abx500_ops_no_const ops;
  	struct device *dev;
  };
  
--static void lookup_ops(struct device *dev, struct abx500_ops **ops)
-+static void lookup_ops(struct device *dev, const struct abx500_ops **ops)
- {
- 	struct abx500_device_entry *dev_entry;
- 
-@@ -31,7 +31,7 @@ static void lookup_ops(struct device *de
- 	}
- }
- 
--int abx500_register_ops(struct device *dev, struct abx500_ops *ops)
-+int abx500_register_ops(struct device *dev, const struct abx500_ops *ops)
- {
- 	struct abx500_device_entry *dev_entry;
- 
-@@ -65,7 +65,7 @@ EXPORT_SYMBOL(abx500_remove_ops);
- int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg,
- 	u8 value)
- {
--	struct abx500_ops *ops;
-+	const struct abx500_ops *ops;
- 
- 	lookup_ops(dev->parent, &ops);
- 	if ((ops != NULL) && (ops->set_register != NULL))
-@@ -78,7 +78,7 @@ EXPORT_SYMBOL(abx500_set_register_interr
- int abx500_get_register_interruptible(struct device *dev, u8 bank, u8 reg,
- 	u8 *value)
- {
--	struct abx500_ops *ops;
-+	const struct abx500_ops *ops;
- 
- 	lookup_ops(dev->parent, &ops);
- 	if ((ops != NULL) && (ops->get_register != NULL))
-@@ -91,7 +91,7 @@ EXPORT_SYMBOL(abx500_get_register_interr
- int abx500_get_register_page_interruptible(struct device *dev, u8 bank,
- 	u8 first_reg, u8 *regvals, u8 numregs)
- {
--	struct abx500_ops *ops;
-+	const struct abx500_ops *ops;
- 
- 	lookup_ops(dev->parent, &ops);
- 	if ((ops != NULL) && (ops->get_register_page != NULL))
-@@ -105,7 +105,7 @@ EXPORT_SYMBOL(abx500_get_register_page_i
- int abx500_mask_and_set_register_interruptible(struct device *dev, u8 bank,
- 	u8 reg, u8 bitmask, u8 bitvalues)
- {
--	struct abx500_ops *ops;
-+	const struct abx500_ops *ops;
- 
- 	lookup_ops(dev->parent, &ops);
- 	if ((ops != NULL) && (ops->mask_and_set_register != NULL))
-@@ -118,7 +118,7 @@ EXPORT_SYMBOL(abx500_mask_and_set_regist
- 
- int abx500_get_chip_id(struct device *dev)
- {
--	struct abx500_ops *ops;
-+	const struct abx500_ops *ops;
- 
- 	lookup_ops(dev->parent, &ops);
- 	if ((ops != NULL) && (ops->get_chip_id != NULL))
-@@ -130,7 +130,7 @@ EXPORT_SYMBOL(abx500_get_chip_id);
- 
- int abx500_event_registers_startup_state_get(struct device *dev, u8 *event)
- {
--	struct abx500_ops *ops;
-+	const struct abx500_ops *ops;
- 
- 	lookup_ops(dev->parent, &ops);
- 	if ((ops != NULL) && (ops->event_registers_startup_state_get != NULL))
-@@ -142,7 +142,7 @@ EXPORT_SYMBOL(abx500_event_registers_sta
- 
- int abx500_startup_irq_enabled(struct device *dev, unsigned int irq)
- {
--	struct abx500_ops *ops;
-+	const struct abx500_ops *ops;
- 
- 	lookup_ops(dev->parent, &ops);
- 	if ((ops != NULL) && (ops->startup_irq_enabled != NULL))
-diff -urNp linux-2.6.39.3/drivers/mfd/janz-cmodio.c linux-2.6.39.3/drivers/mfd/janz-cmodio.c
---- linux-2.6.39.3/drivers/mfd/janz-cmodio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mfd/janz-cmodio.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mfd/janz-cmodio.c linux-2.6.39.4/drivers/mfd/janz-cmodio.c
+--- linux-2.6.39.4/drivers/mfd/janz-cmodio.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mfd/janz-cmodio.c	2011-08-05 19:44:37.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -33993,21 +27927,9 @@ diff -urNp linux-2.6.39.3/drivers/mfd/janz-cmodio.c linux-2.6.39.3/drivers/mfd/j
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-2.6.39.3/drivers/mfd/mcp-sa11x0.c linux-2.6.39.3/drivers/mfd/mcp-sa11x0.c
---- linux-2.6.39.3/drivers/mfd/mcp-sa11x0.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mfd/mcp-sa11x0.c	2011-05-22 19:36:31.000000000 -0400
-@@ -128,7 +128,7 @@ static void mcp_sa11x0_disable(struct mc
- /*
-  * Our methods.
-  */
--static struct mcp_ops mcp_sa11x0 = {
-+static const struct mcp_ops mcp_sa11x0 = {
- 	.set_telecom_divisor	= mcp_sa11x0_set_telecom_divisor,
- 	.set_audio_divisor	= mcp_sa11x0_set_audio_divisor,
- 	.reg_write		= mcp_sa11x0_write,
-diff -urNp linux-2.6.39.3/drivers/mfd/wm8350-i2c.c linux-2.6.39.3/drivers/mfd/wm8350-i2c.c
---- linux-2.6.39.3/drivers/mfd/wm8350-i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mfd/wm8350-i2c.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mfd/wm8350-i2c.c linux-2.6.39.4/drivers/mfd/wm8350-i2c.c
+--- linux-2.6.39.4/drivers/mfd/wm8350-i2c.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mfd/wm8350-i2c.c	2011-08-05 19:44:37.000000000 -0400
 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
  	u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
  	int ret;
@@ -34017,42 +27939,9 @@ diff -urNp linux-2.6.39.3/drivers/mfd/wm8350-i2c.c linux-2.6.39.3/drivers/mfd/wm
  	if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
  		return -EINVAL;
  
-diff -urNp linux-2.6.39.3/drivers/misc/enclosure.c linux-2.6.39.3/drivers/misc/enclosure.c
---- linux-2.6.39.3/drivers/misc/enclosure.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/enclosure.c	2011-05-22 19:36:31.000000000 -0400
-@@ -161,7 +161,7 @@ enclosure_register(struct device *dev, c
- }
- EXPORT_SYMBOL_GPL(enclosure_register);
- 
--static struct enclosure_component_callbacks enclosure_null_callbacks;
-+static const struct enclosure_component_callbacks enclosure_null_callbacks;
- 
- /**
-  * enclosure_unregister - remove an enclosure
-diff -urNp linux-2.6.39.3/drivers/misc/kgdbts.c linux-2.6.39.3/drivers/misc/kgdbts.c
---- linux-2.6.39.3/drivers/misc/kgdbts.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/kgdbts.c	2011-05-22 19:36:31.000000000 -0400
-@@ -118,7 +118,7 @@
- 	} while (0)
- #define MAX_CONFIG_LEN		40
- 
--static struct kgdb_io kgdbts_io_ops;
-+static const struct kgdb_io kgdbts_io_ops;
- static char get_buf[BUFMAX];
- static int get_buf_cnt;
- static char put_buf[BUFMAX];
-@@ -1103,7 +1103,7 @@ static void kgdbts_post_exp_handler(void
- 		module_put(THIS_MODULE);
- }
- 
--static struct kgdb_io kgdbts_io_ops = {
-+static const struct kgdb_io kgdbts_io_ops = {
- 	.name			= "kgdbts",
- 	.read_char		= kgdbts_get_char,
- 	.write_char		= kgdbts_put_char,
-diff -urNp linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.c
---- linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.c	2011-08-05 19:44:37.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 move
  	 * is done.
@@ -34089,9 +27978,9 @@ diff -urNp linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-2.6.39.3/driv
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-diff -urNp linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.h
---- linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/misc/lis3lv02d/lis3lv02d.h	2011-08-05 19:44:37.000000000 -0400
 @@ -265,7 +265,7 @@ struct lis3lv02d {
  	struct input_polled_dev	*idev;     /* input device */
  	struct platform_device	*pdev;     /* platform device */
@@ -34101,9 +27990,9 @@ diff -urNp linux-2.6.39.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-2.6.39.3/driv
  	union axis_conversion	ac;        /* hw -> logical axis */
  	int			mapped_btns[3];
  
-diff -urNp linux-2.6.39.3/drivers/misc/sgi-gru/gruhandles.c linux-2.6.39.3/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.39.3/drivers/misc/sgi-gru/gruhandles.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/sgi-gru/gruhandles.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.39.4/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.39.4/drivers/misc/sgi-gru/gruhandles.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/misc/sgi-gru/gruhandles.c	2011-08-05 19:44:37.000000000 -0400
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
  	unsigned long nsec;
  
@@ -34115,9 +28004,9 @@ diff -urNp linux-2.6.39.3/drivers/misc/sgi-gru/gruhandles.c linux-2.6.39.3/drive
  	if (mcs_op_statistics[op].max < nsec)
  		mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-2.6.39.3/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.39.3/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.39.3/drivers/misc/sgi-gru/gruprocfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/sgi-gru/gruprocfs.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.39.4/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.39.4/drivers/misc/sgi-gru/gruprocfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/misc/sgi-gru/gruprocfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -34141,9 +28030,9 @@ diff -urNp linux-2.6.39.3/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.39.3/driver
  		max = 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.3/drivers/misc/sgi-gru/grutables.h linux-2.6.39.3/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.39.3/drivers/misc/sgi-gru/grutables.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/sgi-gru/grutables.h	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/misc/sgi-gru/grutables.h linux-2.6.39.4/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.39.4/drivers/misc/sgi-gru/grutables.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/misc/sgi-gru/grutables.h	2011-08-05 19:44:37.000000000 -0400
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -34323,225 +28212,21 @@ diff -urNp linux-2.6.39.3/drivers/misc/sgi-gru/grutables.h linux-2.6.39.3/driver
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.39.3/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.39.3/drivers/misc/sgi-xp/xpc_sn2.c
---- linux-2.6.39.3/drivers/misc/sgi-xp/xpc_sn2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/sgi-xp/xpc_sn2.c	2011-05-22 19:36:31.000000000 -0400
-@@ -2351,7 +2351,7 @@ xpc_received_payload_sn2(struct xpc_chan
- 		xpc_acknowledge_msgs_sn2(ch, get, msg->flags);
- }
- 
--static struct xpc_arch_operations xpc_arch_ops_sn2 = {
-+static const struct xpc_arch_operations xpc_arch_ops_sn2 = {
- 	.setup_partitions = xpc_setup_partitions_sn2,
- 	.teardown_partitions = xpc_teardown_partitions_sn2,
- 	.process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_sn2,
-diff -urNp linux-2.6.39.3/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.39.3/drivers/misc/sgi-xp/xpc_uv.c
---- linux-2.6.39.3/drivers/misc/sgi-xp/xpc_uv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/misc/sgi-xp/xpc_uv.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1674,7 +1674,7 @@ xpc_received_payload_uv(struct xpc_chann
- 		XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
- }
- 
--static struct xpc_arch_operations xpc_arch_ops_uv = {
-+static const struct xpc_arch_operations xpc_arch_ops_uv = {
- 	.setup_partitions = xpc_setup_partitions_uv,
- 	.teardown_partitions = xpc_teardown_partitions_uv,
- 	.process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv,
-diff -urNp linux-2.6.39.3/drivers/misc/spear13xx_pcie_gadget.c linux-2.6.39.3/drivers/misc/spear13xx_pcie_gadget.c
---- linux-2.6.39.3/drivers/misc/spear13xx_pcie_gadget.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct configfs_item_operations pcie_gadget_target_item_ops = {
-+static const struct configfs_item_operations pcie_gadget_target_item_ops = {
- 	.show_attribute		= pcie_gadget_target_attr_show,
- 	.store_attribute	= pcie_gadget_target_attr_store,
- };
-diff -urNp linux-2.6.39.3/drivers/mmc/host/davinci_mmc.c linux-2.6.39.3/drivers/mmc/host/davinci_mmc.c
---- linux-2.6.39.3/drivers/mmc/host/davinci_mmc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/davinci_mmc.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1133,7 +1133,7 @@ static void mmc_davinci_enable_sdio_irq(
- 	}
- }
- 
--static struct mmc_host_ops mmc_davinci_ops = {
-+static const struct mmc_host_ops mmc_davinci_ops = {
- 	.request	= mmc_davinci_request,
- 	.set_ios	= mmc_davinci_set_ios,
- 	.get_cd		= mmc_davinci_get_cd,
-diff -urNp linux-2.6.39.3/drivers/mmc/host/dw_mmc.c linux-2.6.39.3/drivers/mmc/host/dw_mmc.c
---- linux-2.6.39.3/drivers/mmc/host/dw_mmc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/dw_mmc.c	2011-05-22 19:36:31.000000000 -0400
-@@ -417,7 +417,7 @@ static int dw_mci_idmac_init(struct dw_m
- 	return 0;
- }
- 
--static struct dw_mci_dma_ops dw_mci_idmac_ops = {
-+static const struct dw_mci_dma_ops dw_mci_idmac_ops = {
- 	.init = dw_mci_idmac_init,
- 	.start = dw_mci_idmac_start_dma,
- 	.stop = dw_mci_idmac_stop_dma,
-diff -urNp linux-2.6.39.3/drivers/mmc/host/s3cmci.c linux-2.6.39.3/drivers/mmc/host/s3cmci.c
---- linux-2.6.39.3/drivers/mmc/host/s3cmci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/s3cmci.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1349,7 +1349,7 @@ static void s3cmci_enable_sdio_irq(struc
- 	s3cmci_check_sdio_irq(host);
- }
- 
--static struct mmc_host_ops s3cmci_ops = {
-+static const struct mmc_host_ops s3cmci_ops = {
- 	.request	= s3cmci_request,
- 	.set_ios	= s3cmci_set_ios,
- 	.get_ro		= s3cmci_get_ro,
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-cns3xxx.c linux-2.6.39.3/drivers/mmc/host/sdhci-cns3xxx.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-cns3xxx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-cns3xxx.c	2011-05-22 19:36:31.000000000 -0400
-@@ -81,7 +81,7 @@ out:
- 	host->clock = clock;
- }
- 
--static struct sdhci_ops sdhci_cns3xxx_ops = {
-+static const struct sdhci_ops sdhci_cns3xxx_ops = {
- 	.get_max_clock	= sdhci_cns3xxx_get_max_clk,
- 	.set_clock	= sdhci_cns3xxx_set_clock,
- };
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-dove.c linux-2.6.39.3/drivers/mmc/host/sdhci-dove.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-dove.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-dove.c	2011-05-22 19:36:31.000000000 -0400
-@@ -56,7 +56,7 @@ static u32 sdhci_dove_readl(struct sdhci
- 	return ret;
- }
- 
--static struct sdhci_ops sdhci_dove_ops = {
-+static const struct sdhci_ops sdhci_dove_ops = {
- 	.read_w	= sdhci_dove_readw,
- 	.read_l	= sdhci_dove_readl,
- };
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-esdhc-imx.c linux-2.6.39.3/drivers/mmc/host/sdhci-esdhc-imx.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-esdhc-imx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-esdhc-imx.c	2011-05-22 19:36:31.000000000 -0400
-@@ -201,7 +201,7 @@ static unsigned int esdhc_pltfm_get_ro(s
- 		return -ENOSYS;
- }
- 
--static struct sdhci_ops sdhci_esdhc_ops = {
-+static const struct sdhci_ops sdhci_esdhc_ops = {
- 	.read_l = esdhc_readl_le,
- 	.read_w = esdhc_readw_le,
- 	.write_l = esdhc_writel_le,
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-of.h linux-2.6.39.3/drivers/mmc/host/sdhci-of.h
---- linux-2.6.39.3/drivers/mmc/host/sdhci-of.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-of.h	2011-05-22 19:36:31.000000000 -0400
-@@ -21,7 +21,7 @@
- 
- struct sdhci_of_data {
- 	unsigned int quirks;
--	struct sdhci_ops ops;
-+	const struct sdhci_ops ops;
- };
- 
- struct sdhci_of_host {
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-pci.c linux-2.6.39.3/drivers/mmc/host/sdhci-pci.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-pci.c	2011-05-22 19:36:31.000000000 -0400
-@@ -786,7 +786,7 @@ static int sdhci_pci_enable_dma(struct s
- 	return 0;
- }
- 
--static struct sdhci_ops sdhci_pci_ops = {
-+static const struct sdhci_ops sdhci_pci_ops = {
- 	.enable_dma	= sdhci_pci_enable_dma,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-pltfm.c linux-2.6.39.3/drivers/mmc/host/sdhci-pltfm.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-pltfm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-pltfm.c	2011-05-22 19:36:31.000000000 -0400
-@@ -41,7 +41,7 @@
-  *                                                                           *
- \*****************************************************************************/
- 
--static struct sdhci_ops sdhci_pltfm_ops = {
-+static const struct sdhci_ops sdhci_pltfm_ops = {
- };
- 
- /*****************************************************************************\
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-pxa.c linux-2.6.39.3/drivers/mmc/host/sdhci-pxa.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-pxa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-pxa.c	2011-05-22 19:36:31.000000000 -0400
-@@ -69,7 +69,7 @@ static void set_clock(struct sdhci_host 
- 	}
- }
- 
--static struct sdhci_ops sdhci_pxa_ops = {
-+static const struct sdhci_ops sdhci_pxa_ops = {
- 	.set_clock = set_clock,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-s3c.c linux-2.6.39.3/drivers/mmc/host/sdhci-s3c.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-s3c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-s3c.c	2011-05-22 19:36:31.000000000 -0400
-@@ -309,7 +309,7 @@ static int sdhci_s3c_platform_8bit_width
- 	return 0;
- }
- 
--static struct sdhci_ops sdhci_s3c_ops = {
-+static const struct sdhci_ops sdhci_s3c_ops = {
- 	.get_max_clock		= sdhci_s3c_get_max_clk,
- 	.set_clock		= sdhci_s3c_set_clock,
- 	.get_min_clock		= sdhci_s3c_get_min_clock,
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-spear.c linux-2.6.39.3/drivers/mmc/host/sdhci-spear.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-spear.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-spear.c	2011-05-22 19:36:31.000000000 -0400
-@@ -32,7 +32,7 @@ struct spear_sdhci {
- };
- 
- /* sdhci ops */
--static struct sdhci_ops sdhci_pltfm_ops = {
-+static const struct sdhci_ops sdhci_pltfm_ops = {
- 	/* Nothing to do for now. */
- };
- 
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdhci-tegra.c linux-2.6.39.3/drivers/mmc/host/sdhci-tegra.c
---- linux-2.6.39.3/drivers/mmc/host/sdhci-tegra.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdhci-tegra.c	2011-05-22 19:36:31.000000000 -0400
-@@ -242,7 +242,7 @@ static void tegra_sdhci_pltfm_exit(struc
- 	clk_put(pltfm_host->clk);
- }
- 
--static struct sdhci_ops tegra_sdhci_ops = {
-+static const struct sdhci_ops tegra_sdhci_ops = {
- 	.get_ro     = tegra_sdhci_get_ro,
- 	.read_l     = tegra_sdhci_readl,
- 	.read_w     = tegra_sdhci_readw,
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sdricoh_cs.c linux-2.6.39.3/drivers/mmc/host/sdricoh_cs.c
---- linux-2.6.39.3/drivers/mmc/host/sdricoh_cs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sdricoh_cs.c	2011-05-22 19:36:31.000000000 -0400
-@@ -387,7 +387,7 @@ static int sdricoh_get_ro(struct mmc_hos
- 	return (status & STATUS_CARD_LOCKED);
- }
- 
--static struct mmc_host_ops sdricoh_ops = {
-+static const struct mmc_host_ops sdricoh_ops = {
- 	.request = sdricoh_request,
- 	.set_ios = sdricoh_set_ios,
- 	.get_ro = sdricoh_get_ro,
-diff -urNp linux-2.6.39.3/drivers/mmc/host/sh_mmcif.c linux-2.6.39.3/drivers/mmc/host/sh_mmcif.c
---- linux-2.6.39.3/drivers/mmc/host/sh_mmcif.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mmc/host/sh_mmcif.c	2011-05-22 19:36:31.000000000 -0400
-@@ -872,7 +872,7 @@ static int sh_mmcif_get_cd(struct mmc_ho
- 		return p->get_cd(host->pd);
- }
- 
--static struct mmc_host_ops sh_mmcif_ops = {
-+static const struct mmc_host_ops sh_mmcif_ops = {
- 	.request	= sh_mmcif_request,
- 	.set_ios	= sh_mmcif_set_ios,
- 	.get_cd		= sh_mmcif_get_cd,
-diff -urNp linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0001.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0001.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/misc/sgi-xp/xp.h linux-2.6.39.4/drivers/misc/sgi-xp/xp.h
+--- linux-2.6.39.4/drivers/misc/sgi-xp/xp.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/misc/sgi-xp/xp.h	2011-08-05 20:34:06.000000000 -0400
+@@ -289,7 +289,7 @@ struct xpc_interface {
+ 					xpc_notify_func, void *);
+ 	void (*received) (short, int, void *);
+ 	enum xp_retval (*partid_to_nasids) (short, void *);
+-};
++} __no_const;
+ 
+ extern struct xpc_interface xpc_interface;
+ 
+diff -urNp linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0001.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0001.c	2011-08-05 19:44:37.000000000 -0400
 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
  	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  	unsigned long timeo = jiffies + HZ;
@@ -34569,9 +28254,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.39.3/dri
  	adr += chip->start;
  
   retry:
-diff -urNp linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0020.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0020.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0020.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/chips/cfi_cmdset_0020.c	2011-08-05 19:44:37.000000000 -0400
 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
  	unsigned long cmd_addr;
  	struct cfi_private *cfi = map->fldrv_priv;
@@ -34617,9 +28302,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.39.3/dri
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-diff -urNp linux-2.6.39.3/drivers/mtd/devices/doc2000.c linux-2.6.39.3/drivers/mtd/devices/doc2000.c
---- linux-2.6.39.3/drivers/mtd/devices/doc2000.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/devices/doc2000.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/devices/doc2000.c linux-2.6.39.4/drivers/mtd/devices/doc2000.c
+--- linux-2.6.39.4/drivers/mtd/devices/doc2000.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/devices/doc2000.c	2011-08-05 19:44:37.000000000 -0400
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
@@ -34629,9 +28314,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/devices/doc2000.c linux-2.6.39.3/drivers/m
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff -urNp linux-2.6.39.3/drivers/mtd/devices/doc2001.c linux-2.6.39.3/drivers/mtd/devices/doc2001.c
---- linux-2.6.39.3/drivers/mtd/devices/doc2001.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/devices/doc2001.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/devices/doc2001.c linux-2.6.39.4/drivers/mtd/devices/doc2001.c
+--- linux-2.6.39.4/drivers/mtd/devices/doc2001.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/devices/doc2001.c	2011-08-05 19:44:37.000000000 -0400
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -34641,9 +28326,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/devices/doc2001.c linux-2.6.39.3/drivers/m
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.39.3/drivers/mtd/ftl.c linux-2.6.39.3/drivers/mtd/ftl.c
---- linux-2.6.39.3/drivers/mtd/ftl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/ftl.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/ftl.c linux-2.6.39.4/drivers/mtd/ftl.c
+--- linux-2.6.39.4/drivers/mtd/ftl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/ftl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
      loff_t offset;
      uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -34653,9 +28338,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/ftl.c linux-2.6.39.3/drivers/mtd/ftl.c
      eun = &part->EUNInfo[srcunit];
      xfer = &part->XferInfo[xferunit];
      DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff -urNp linux-2.6.39.3/drivers/mtd/inftlcore.c linux-2.6.39.3/drivers/mtd/inftlcore.c
---- linux-2.6.39.3/drivers/mtd/inftlcore.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/inftlcore.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/inftlcore.c linux-2.6.39.4/drivers/mtd/inftlcore.c
+--- linux-2.6.39.4/drivers/mtd/inftlcore.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/inftlcore.c	2011-08-05 19:44:37.000000000 -0400
 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
  	struct inftl_oob oob;
  	size_t retlen;
@@ -34665,9 +28350,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/inftlcore.c linux-2.6.39.3/drivers/mtd/inf
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
  		"pending=%d)\n", inftl, thisVUC, pendingblock);
  
-diff -urNp linux-2.6.39.3/drivers/mtd/inftlmount.c linux-2.6.39.3/drivers/mtd/inftlmount.c
---- linux-2.6.39.3/drivers/mtd/inftlmount.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/inftlmount.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/inftlmount.c linux-2.6.39.4/drivers/mtd/inftlmount.c
+--- linux-2.6.39.4/drivers/mtd/inftlmount.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/inftlmount.c	2011-08-05 19:44:37.000000000 -0400
 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
  	struct INFTLPartition *ip;
  	size_t retlen;
@@ -34677,9 +28362,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/inftlmount.c linux-2.6.39.3/drivers/mtd/in
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff -urNp linux-2.6.39.3/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.39.3/drivers/mtd/lpddr/qinfo_probe.c
---- linux-2.6.39.3/drivers/mtd/lpddr/qinfo_probe.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/lpddr/qinfo_probe.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.39.4/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-2.6.39.4/drivers/mtd/lpddr/qinfo_probe.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/lpddr/qinfo_probe.c	2011-08-05 19:44:37.000000000 -0400
 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
  {
  	map_word pfow_val[4];
@@ -34689,9 +28374,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.39.3/drivers
  	/* Check identification string */
  	pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
  	pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
-diff -urNp linux-2.6.39.3/drivers/mtd/mtdchar.c linux-2.6.39.3/drivers/mtd/mtdchar.c
---- linux-2.6.39.3/drivers/mtd/mtdchar.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/mtdchar.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/mtdchar.c linux-2.6.39.4/drivers/mtd/mtdchar.c
+--- linux-2.6.39.4/drivers/mtd/mtdchar.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/mtdchar.c	2011-08-05 19:44:37.000000000 -0400
 @@ -560,6 +560,8 @@ static int mtd_ioctl(struct file *file, 
  	u_long size;
  	struct mtd_info_user info;
@@ -34701,9 +28386,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/mtdchar.c linux-2.6.39.3/drivers/mtd/mtdch
  	DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
  	size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-2.6.39.3/drivers/mtd/nand/denali.c linux-2.6.39.3/drivers/mtd/nand/denali.c
---- linux-2.6.39.3/drivers/mtd/nand/denali.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/nand/denali.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/nand/denali.c linux-2.6.39.4/drivers/mtd/nand/denali.c
+--- linux-2.6.39.4/drivers/mtd/nand/denali.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/nand/denali.c	2011-08-05 19:44:37.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
@@ -34712,9 +28397,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/nand/denali.c linux-2.6.39.3/drivers/mtd/n
  
  #include "denali.h"
  
-diff -urNp linux-2.6.39.3/drivers/mtd/nftlcore.c linux-2.6.39.3/drivers/mtd/nftlcore.c
---- linux-2.6.39.3/drivers/mtd/nftlcore.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/nftlcore.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/nftlcore.c linux-2.6.39.4/drivers/mtd/nftlcore.c
+--- linux-2.6.39.4/drivers/mtd/nftlcore.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/nftlcore.c	2011-08-05 19:44:37.000000000 -0400
 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
  	int inplace = 1;
  	size_t retlen;
@@ -34724,9 +28409,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/nftlcore.c linux-2.6.39.3/drivers/mtd/nftl
  	memset(BlockMap, 0xff, sizeof(BlockMap));
  	memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff -urNp linux-2.6.39.3/drivers/mtd/nftlmount.c linux-2.6.39.3/drivers/mtd/nftlmount.c
---- linux-2.6.39.3/drivers/mtd/nftlmount.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/nftlmount.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/nftlmount.c linux-2.6.39.4/drivers/mtd/nftlmount.c
+--- linux-2.6.39.4/drivers/mtd/nftlmount.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/nftlmount.c	2011-08-05 19:44:37.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -34744,9 +28429,9 @@ diff -urNp linux-2.6.39.3/drivers/mtd/nftlmount.c linux-2.6.39.3/drivers/mtd/nft
          /* Assume logical EraseSize == physical erasesize for starting the scan.
  	   We'll sort it out later if we find a MediaHeader which says otherwise */
  	/* Actually, we won't.  The new DiskOnChip driver has already scanned
-diff -urNp linux-2.6.39.3/drivers/mtd/ubi/build.c linux-2.6.39.3/drivers/mtd/ubi/build.c
---- linux-2.6.39.3/drivers/mtd/ubi/build.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/mtd/ubi/build.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/mtd/ubi/build.c linux-2.6.39.4/drivers/mtd/ubi/build.c
+--- linux-2.6.39.4/drivers/mtd/ubi/build.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/mtd/ubi/build.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
@@ -34786,33 +28471,120 @@ diff -urNp linux-2.6.39.3/drivers/mtd/ubi/build.c linux-2.6.39.3/drivers/mtd/ubi
  }
  
  /**
-diff -urNp linux-2.6.39.3/drivers/net/bcm63xx_enet.c linux-2.6.39.3/drivers/net/bcm63xx_enet.c
---- linux-2.6.39.3/drivers/net/bcm63xx_enet.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/bcm63xx_enet.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1469,7 +1469,7 @@ static int bcm_enet_set_pauseparam(struc
- 	return 0;
- }
+diff -urNp linux-2.6.39.4/drivers/net/bna/bfa_ioc_ct.c linux-2.6.39.4/drivers/net/bna/bfa_ioc_ct.c
+--- linux-2.6.39.4/drivers/net/bna/bfa_ioc_ct.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/bna/bfa_ioc_ct.c	2011-08-05 20:34:06.000000000 -0400
+@@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
+ static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
+ static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
+ 
+-static struct bfa_ioc_hwif nw_hwif_ct;
++static struct bfa_ioc_hwif nw_hwif_ct = {
++	.ioc_pll_init = bfa_ioc_ct_pll_init,
++	.ioc_firmware_lock = bfa_ioc_ct_firmware_lock,
++	.ioc_firmware_unlock = bfa_ioc_ct_firmware_unlock,
++	.ioc_reg_init = bfa_ioc_ct_reg_init,
++	.ioc_map_port = bfa_ioc_ct_map_port,
++	.ioc_isr_mode_set = bfa_ioc_ct_isr_mode_set,
++	.ioc_notify_fail = bfa_ioc_ct_notify_fail,
++	.ioc_ownership_reset = bfa_ioc_ct_ownership_reset,
++	.ioc_sync_start = bfa_ioc_ct_sync_start,
++	.ioc_sync_join = bfa_ioc_ct_sync_join,
++	.ioc_sync_leave = bfa_ioc_ct_sync_leave,
++	.ioc_sync_ack = bfa_ioc_ct_sync_ack,
++	.ioc_sync_complete = bfa_ioc_ct_sync_complete
++};
  
--static struct ethtool_ops bcm_enet_ethtool_ops = {
-+static const struct ethtool_ops bcm_enet_ethtool_ops = {
- 	.get_strings		= bcm_enet_get_strings,
- 	.get_sset_count		= bcm_enet_get_sset_count,
- 	.get_ethtool_stats      = bcm_enet_get_ethtool_stats,
-diff -urNp linux-2.6.39.3/drivers/net/bna/bnad_ethtool.c linux-2.6.39.3/drivers/net/bna/bnad_ethtool.c
---- linux-2.6.39.3/drivers/net/bna/bnad_ethtool.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/bna/bnad_ethtool.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1242,7 +1242,7 @@ bnad_get_sset_count(struct net_device *n
- 	}
- }
+ /**
+  * Called from bfa_ioc_attach() to map asic specific calls.
+@@ -56,20 +70,6 @@ static struct bfa_ioc_hwif nw_hwif_ct;
+ void
+ bfa_nw_ioc_set_ct_hwif(struct bfa_ioc *ioc)
+ {
+-	nw_hwif_ct.ioc_pll_init = bfa_ioc_ct_pll_init;
+-	nw_hwif_ct.ioc_firmware_lock = bfa_ioc_ct_firmware_lock;
+-	nw_hwif_ct.ioc_firmware_unlock = bfa_ioc_ct_firmware_unlock;
+-	nw_hwif_ct.ioc_reg_init = bfa_ioc_ct_reg_init;
+-	nw_hwif_ct.ioc_map_port = bfa_ioc_ct_map_port;
+-	nw_hwif_ct.ioc_isr_mode_set = bfa_ioc_ct_isr_mode_set;
+-	nw_hwif_ct.ioc_notify_fail = bfa_ioc_ct_notify_fail;
+-	nw_hwif_ct.ioc_ownership_reset = bfa_ioc_ct_ownership_reset;
+-	nw_hwif_ct.ioc_sync_start = bfa_ioc_ct_sync_start;
+-	nw_hwif_ct.ioc_sync_join = bfa_ioc_ct_sync_join;
+-	nw_hwif_ct.ioc_sync_leave = bfa_ioc_ct_sync_leave;
+-	nw_hwif_ct.ioc_sync_ack = bfa_ioc_ct_sync_ack;
+-	nw_hwif_ct.ioc_sync_complete = bfa_ioc_ct_sync_complete;
+-
+ 	ioc->ioc_hwif = &nw_hwif_ct;
+ }
+ 
+diff -urNp linux-2.6.39.4/drivers/net/bna/bnad.c linux-2.6.39.4/drivers/net/bna/bnad.c
+--- linux-2.6.39.4/drivers/net/bna/bnad.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/bna/bnad.c	2011-08-05 20:34:06.000000000 -0400
+@@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+ 	struct bna_intr_info *intr_info =
+ 			&res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
+ 	struct bna_tx_config *tx_config = &bnad->tx_config[tx_id];
+-	struct bna_tx_event_cbfn tx_cbfn;
++	static struct bna_tx_event_cbfn tx_cbfn = {
++		/* Initialize the tx event handlers */
++		.tcb_setup_cbfn = bnad_cb_tcb_setup,
++		.tcb_destroy_cbfn = bnad_cb_tcb_destroy,
++		.tx_stall_cbfn = bnad_cb_tx_stall,
++		.tx_resume_cbfn = bnad_cb_tx_resume,
++		.tx_cleanup_cbfn = bnad_cb_tx_cleanup
++	};
+ 	struct bna_tx *tx;
+ 	unsigned long flags;
  
--static struct ethtool_ops bnad_ethtool_ops = {
-+static const struct ethtool_ops bnad_ethtool_ops = {
- 	.get_settings = bnad_get_settings,
- 	.set_settings = bnad_set_settings,
- 	.get_drvinfo = bnad_get_drvinfo,
-diff -urNp linux-2.6.39.3/drivers/net/bnx2.c linux-2.6.39.3/drivers/net/bnx2.c
---- linux-2.6.39.3/drivers/net/bnx2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/bnx2.c	2011-05-22 19:36:31.000000000 -0400
+@@ -1690,13 +1697,6 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+ 	tx_config->txq_depth = bnad->txq_depth;
+ 	tx_config->tx_type = BNA_TX_T_REGULAR;
+ 
+-	/* Initialize the tx event handlers */
+-	tx_cbfn.tcb_setup_cbfn = bnad_cb_tcb_setup;
+-	tx_cbfn.tcb_destroy_cbfn = bnad_cb_tcb_destroy;
+-	tx_cbfn.tx_stall_cbfn = bnad_cb_tx_stall;
+-	tx_cbfn.tx_resume_cbfn = bnad_cb_tx_resume;
+-	tx_cbfn.tx_cleanup_cbfn = bnad_cb_tx_cleanup;
+-
+ 	/* Get BNA's resource requirement for one tx object */
+ 	spin_lock_irqsave(&bnad->bna_lock, flags);
+ 	bna_tx_res_req(bnad->num_txq_per_tx,
+@@ -1827,21 +1827,21 @@ bnad_setup_rx(struct bnad *bnad, uint rx
+ 	struct bna_intr_info *intr_info =
+ 			&res_info[BNA_RX_RES_T_INTR].res_u.intr_info;
+ 	struct bna_rx_config *rx_config = &bnad->rx_config[rx_id];
+-	struct bna_rx_event_cbfn rx_cbfn;
++	static struct bna_rx_event_cbfn rx_cbfn = {
++		/* Initialize the Rx event handlers */
++		.rcb_setup_cbfn = bnad_cb_rcb_setup,
++		.rcb_destroy_cbfn = bnad_cb_rcb_destroy,
++		.ccb_setup_cbfn = bnad_cb_ccb_setup,
++		.ccb_destroy_cbfn = bnad_cb_ccb_destroy,
++		.rx_cleanup_cbfn = bnad_cb_rx_cleanup,
++		.rx_post_cbfn = bnad_cb_rx_post
++	};
+ 	struct bna_rx *rx;
+ 	unsigned long flags;
+ 
+ 	/* Initialize the Rx object configuration */
+ 	bnad_init_rx_config(bnad, rx_config);
+ 
+-	/* Initialize the Rx event handlers */
+-	rx_cbfn.rcb_setup_cbfn = bnad_cb_rcb_setup;
+-	rx_cbfn.rcb_destroy_cbfn = bnad_cb_rcb_destroy;
+-	rx_cbfn.ccb_setup_cbfn = bnad_cb_ccb_setup;
+-	rx_cbfn.ccb_destroy_cbfn = bnad_cb_ccb_destroy;
+-	rx_cbfn.rx_cleanup_cbfn = bnad_cb_rx_cleanup;
+-	rx_cbfn.rx_post_cbfn = bnad_cb_rx_post;
+-
+ 	/* Get BNA's resource requirement for one Rx object */
+ 	spin_lock_irqsave(&bnad->bna_lock, flags);
+ 	bna_rx_res_req(rx_config, res_info);
+diff -urNp linux-2.6.39.4/drivers/net/bnx2.c linux-2.6.39.4/drivers/net/bnx2.c
+--- linux-2.6.39.4/drivers/net/bnx2.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/bnx2.c	2011-08-05 19:44:37.000000000 -0400
 @@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp)
  	int rc = 0;
  	u32 magic, csum;
@@ -34822,9 +28594,9 @@ diff -urNp linux-2.6.39.3/drivers/net/bnx2.c linux-2.6.39.3/drivers/net/bnx2.c
  	if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
  		goto test_nvram_done;
  
-diff -urNp linux-2.6.39.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.39.3/drivers/net/bnx2x/bnx2x_ethtool.c
---- linux-2.6.39.3/drivers/net/bnx2x/bnx2x_ethtool.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/bnx2x/bnx2x_ethtool.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.39.4/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-2.6.39.4/drivers/net/bnx2x/bnx2x_ethtool.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/bnx2x/bnx2x_ethtool.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1788,6 +1788,8 @@ static int bnx2x_test_nvram(struct bnx2x
  	int i, rc;
  	u32 magic, crc;
@@ -34834,33 +28606,21 @@ diff -urNp linux-2.6.39.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.39.3/drive
  	if (BP_NOMCP(bp))
  		return 0;
  
-diff -urNp linux-2.6.39.3/drivers/net/chelsio/pm3393.c linux-2.6.39.3/drivers/net/chelsio/pm3393.c
---- linux-2.6.39.3/drivers/net/chelsio/pm3393.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/chelsio/pm3393.c	2011-05-22 19:36:31.000000000 -0400
-@@ -571,7 +571,7 @@ static void pm3393_destroy(struct cmac *
- 	kfree(cmac);
- }
- 
--static struct cmac_ops pm3393_ops = {
-+static const struct cmac_ops pm3393_ops = {
- 	.destroy                 = pm3393_destroy,
- 	.reset                   = pm3393_reset,
- 	.interrupt_enable        = pm3393_interrupt_enable,
-diff -urNp linux-2.6.39.3/drivers/net/chelsio/vsc7326.c linux-2.6.39.3/drivers/net/chelsio/vsc7326.c
---- linux-2.6.39.3/drivers/net/chelsio/vsc7326.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/chelsio/vsc7326.c	2011-05-22 19:36:31.000000000 -0400
-@@ -666,7 +666,7 @@ static void mac_destroy(struct cmac *mac
- 	kfree(mac);
- }
- 
--static struct cmac_ops vsc7326_ops = {
-+static const struct cmac_ops vsc7326_ops = {
- 	.destroy                  = mac_destroy,
- 	.reset                    = mac_reset,
- 	.interrupt_handler        = mac_intr_handler,
-diff -urNp linux-2.6.39.3/drivers/net/cxgb4/cxgb4_main.c linux-2.6.39.3/drivers/net/cxgb4/cxgb4_main.c
---- linux-2.6.39.3/drivers/net/cxgb4/cxgb4_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/cxgb4/cxgb4_main.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/cxgb3/l2t.h linux-2.6.39.4/drivers/net/cxgb3/l2t.h
+--- linux-2.6.39.4/drivers/net/cxgb3/l2t.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/cxgb3/l2t.h	2011-08-05 20:34:06.000000000 -0400
+@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
+  */
+ struct l2t_skb_cb {
+ 	arp_failure_handler_func arp_failure_handler;
+-};
++} __no_const;
+ 
+ #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
+ 
+diff -urNp linux-2.6.39.4/drivers/net/cxgb4/cxgb4_main.c linux-2.6.39.4/drivers/net/cxgb4/cxgb4_main.c
+--- linux-2.6.39.4/drivers/net/cxgb4/cxgb4_main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/cxgb4/cxgb4_main.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3428,6 +3428,8 @@ static int __devinit enable_msix(struct 
  	unsigned int nchan = adap->params.nports;
  	struct msix_entry entries[MAX_INGQ + 1];
@@ -34870,9 +28630,9 @@ diff -urNp linux-2.6.39.3/drivers/net/cxgb4/cxgb4_main.c linux-2.6.39.3/drivers/
  	for (i = 0; i < ARRAY_SIZE(entries); ++i)
  		entries[i].entry = i;
  
-diff -urNp linux-2.6.39.3/drivers/net/cxgb4/t4_hw.c linux-2.6.39.3/drivers/net/cxgb4/t4_hw.c
---- linux-2.6.39.3/drivers/net/cxgb4/t4_hw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/cxgb4/t4_hw.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/cxgb4/t4_hw.c linux-2.6.39.4/drivers/net/cxgb4/t4_hw.c
+--- linux-2.6.39.4/drivers/net/cxgb4/t4_hw.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/cxgb4/t4_hw.c	2011-08-05 19:44:37.000000000 -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;
@@ -34882,202 +28642,82 @@ diff -urNp linux-2.6.39.3/drivers/net/cxgb4/t4_hw.c linux-2.6.39.3/drivers/net/c
  	ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-2.6.39.3/drivers/net/cxgb4vf/cxgb4vf_main.c linux-2.6.39.3/drivers/net/cxgb4vf/cxgb4vf_main.c
---- linux-2.6.39.3/drivers/net/cxgb4vf/cxgb4vf_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/cxgb4vf/cxgb4vf_main.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1572,7 +1572,7 @@ static int cxgb4vf_set_tso(struct net_de
- 	return 0;
- }
- 
--static struct ethtool_ops cxgb4vf_ethtool_ops = {
-+static const struct ethtool_ops cxgb4vf_ethtool_ops = {
- 	.get_settings		= cxgb4vf_get_settings,
- 	.get_drvinfo		= cxgb4vf_get_drvinfo,
- 	.get_msglevel		= cxgb4vf_get_msglevel,
-diff -urNp linux-2.6.39.3/drivers/net/e1000e/82571.c linux-2.6.39.3/drivers/net/e1000e/82571.c
---- linux-2.6.39.3/drivers/net/e1000e/82571.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/e1000e/82571.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/e1000e/82571.c linux-2.6.39.4/drivers/net/e1000e/82571.c
+--- linux-2.6.39.4/drivers/net/e1000e/82571.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/e1000e/82571.c	2011-08-05 20:34:06.000000000 -0400
 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
  {
  	struct e1000_hw *hw = &adapter->hw;
  	struct e1000_mac_info *mac = &hw->mac;
 -	struct e1000_mac_operations *func = &mac->ops;
-+	struct e1000_mac_operations *func = &mac->ops;	/* cannot be const */
++	e1000_mac_operations_no_const *func = &mac->ops;
  	u32 swsm = 0;
  	u32 swsm2 = 0;
  	bool force_clear_smbi = false;
-@@ -1930,7 +1930,7 @@ static void e1000_clear_hw_cntrs_82571(s
- 	er32(ICRXDMTC);
- }
- 
--static struct e1000_mac_operations e82571_mac_ops = {
-+static const struct e1000_mac_operations e82571_mac_ops = {
- 	/* .check_mng_mode: mac type dependent */
- 	/* .check_for_link: media type dependent */
- 	.id_led_init		= e1000e_id_led_init,
-@@ -1952,7 +1952,7 @@ static struct e1000_mac_operations e8257
- 	.read_mac_addr		= e1000_read_mac_addr_82571,
- };
- 
--static struct e1000_phy_operations e82_phy_ops_igp = {
-+static const struct e1000_phy_operations e82_phy_ops_igp = {
- 	.acquire		= e1000_get_hw_semaphore_82571,
- 	.check_polarity		= e1000_check_polarity_igp,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -1970,7 +1970,7 @@ static struct e1000_phy_operations e82_p
- 	.cfg_on_link_up      	= NULL,
- };
- 
--static struct e1000_phy_operations e82_phy_ops_m88 = {
-+static const struct e1000_phy_operations e82_phy_ops_m88 = {
- 	.acquire		= e1000_get_hw_semaphore_82571,
- 	.check_polarity		= e1000_check_polarity_m88,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -1988,7 +1988,7 @@ static struct e1000_phy_operations e82_p
- 	.cfg_on_link_up      	= NULL,
- };
- 
--static struct e1000_phy_operations e82_phy_ops_bm = {
-+static const struct e1000_phy_operations e82_phy_ops_bm = {
- 	.acquire		= e1000_get_hw_semaphore_82571,
- 	.check_polarity		= e1000_check_polarity_m88,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -2006,7 +2006,7 @@ static struct e1000_phy_operations e82_p
- 	.cfg_on_link_up      	= NULL,
- };
- 
--static struct e1000_nvm_operations e82571_nvm_ops = {
-+static const struct e1000_nvm_operations e82571_nvm_ops = {
- 	.acquire		= e1000_acquire_nvm_82571,
- 	.read			= e1000e_read_nvm_eerd,
- 	.release		= e1000_release_nvm_82571,
-diff -urNp linux-2.6.39.3/drivers/net/e1000e/e1000.h linux-2.6.39.3/drivers/net/e1000e/e1000.h
---- linux-2.6.39.3/drivers/net/e1000e/e1000.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/e1000e/e1000.h	2011-05-22 19:36:31.000000000 -0400
-@@ -409,9 +409,9 @@ struct e1000_info {
- 	u32			pba;
- 	u32			max_hw_frame_size;
- 	s32			(*get_variants)(struct e1000_adapter *);
--	struct e1000_mac_operations *mac_ops;
--	struct e1000_phy_operations *phy_ops;
--	struct e1000_nvm_operations *nvm_ops;
-+	const struct e1000_mac_operations *mac_ops;
-+	const struct e1000_phy_operations *phy_ops;
-+	const struct e1000_nvm_operations *nvm_ops;
- };
- 
- /* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.39.3/drivers/net/e1000e/es2lan.c linux-2.6.39.3/drivers/net/e1000e/es2lan.c
---- linux-2.6.39.3/drivers/net/e1000e/es2lan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/e1000e/es2lan.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/e1000e/es2lan.c linux-2.6.39.4/drivers/net/e1000e/es2lan.c
+--- linux-2.6.39.4/drivers/net/e1000e/es2lan.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/e1000e/es2lan.c	2011-08-05 20:34:06.000000000 -0400
 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
  	struct e1000_hw *hw = &adapter->hw;
  	struct e1000_mac_info *mac = &hw->mac;
 -	struct e1000_mac_operations *func = &mac->ops;
-+	struct e1000_mac_operations *func = &mac->ops;	/* cannot be const */
++	e1000_mac_operations_no_const *func = &mac->ops;
  
  	/* Set media type */
  	switch (adapter->pdev->device) {
-@@ -1431,7 +1431,7 @@ static void e1000_clear_hw_cntrs_80003es
- 	er32(ICRXDMTC);
- }
- 
--static struct e1000_mac_operations es2_mac_ops = {
-+static const struct e1000_mac_operations es2_mac_ops = {
- 	.read_mac_addr		= e1000_read_mac_addr_80003es2lan,
- 	.id_led_init		= e1000e_id_led_init,
- 	.check_mng_mode		= e1000e_check_mng_mode_generic,
-@@ -1453,7 +1453,7 @@ static struct e1000_mac_operations es2_m
- 	.setup_led		= e1000e_setup_led_generic,
+diff -urNp linux-2.6.39.4/drivers/net/e1000e/hw.h linux-2.6.39.4/drivers/net/e1000e/hw.h
+--- linux-2.6.39.4/drivers/net/e1000e/hw.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/e1000e/hw.h	2011-08-05 20:34:06.000000000 -0400
+@@ -775,6 +775,7 @@ struct e1000_mac_operations {
+ 	void (*write_vfta)(struct e1000_hw *, u32, u32);
+ 	s32  (*read_mac_addr)(struct e1000_hw *);
  };
++typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
  
--static struct e1000_phy_operations es2_phy_ops = {
-+static const struct e1000_phy_operations es2_phy_ops = {
- 	.acquire		= e1000_acquire_phy_80003es2lan,
- 	.check_polarity		= e1000_check_polarity_m88,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -1471,7 +1471,7 @@ static struct e1000_phy_operations es2_p
- 	.cfg_on_link_up      	= e1000_cfg_on_link_up_80003es2lan,
+ /* Function pointers for the PHY. */
+ struct e1000_phy_operations {
+@@ -798,6 +799,7 @@ struct e1000_phy_operations {
+ 	void (*power_up)(struct e1000_hw *);
+ 	void (*power_down)(struct e1000_hw *);
  };
++typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
  
--static struct e1000_nvm_operations es2_nvm_ops = {
-+static const struct e1000_nvm_operations es2_nvm_ops = {
- 	.acquire		= e1000_acquire_nvm_80003es2lan,
- 	.read			= e1000e_read_nvm_eerd,
- 	.release		= e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.39.3/drivers/net/e1000e/hw.h linux-2.6.39.3/drivers/net/e1000e/hw.h
---- linux-2.6.39.3/drivers/net/e1000e/hw.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/e1000e/hw.h	2011-05-22 19:36:31.000000000 -0400
-@@ -811,6 +811,7 @@ struct e1000_nvm_operations {
+ /* Function pointers for the NVM. */
+ struct e1000_nvm_operations {
+@@ -809,9 +811,10 @@ struct e1000_nvm_operations {
+ 	s32  (*validate)(struct e1000_hw *);
+ 	s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
  };
++typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
  
  struct e1000_mac_info {
-+	/* cannot be const see e1000_init_mac_params_ich8lan */
- 	struct e1000_mac_operations ops;
+-	struct e1000_mac_operations ops;
++	e1000_mac_operations_no_const ops;
  	u8 addr[ETH_ALEN];
  	u8 perm_addr[ETH_ALEN];
-@@ -852,6 +853,7 @@ struct e1000_mac_info {
+ 
+@@ -852,7 +855,7 @@ struct e1000_mac_info {
  };
  
  struct e1000_phy_info {
-+	/* Cannot be const see e1000_init_phy_params_82571() */
- 	struct e1000_phy_operations ops;
+-	struct e1000_phy_operations ops;
++	e1000_phy_operations_no_const ops;
  
  	enum e1000_phy_type type;
-@@ -886,6 +888,7 @@ struct e1000_phy_info {
+ 
+@@ -886,7 +889,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
-+	/* cannot be const */
- 	struct e1000_nvm_operations ops;
+-	struct e1000_nvm_operations ops;
++	e1000_nvm_operations_no_const ops;
  
  	enum e1000_nvm_type type;
-diff -urNp linux-2.6.39.3/drivers/net/e1000e/ich8lan.c linux-2.6.39.3/drivers/net/e1000e/ich8lan.c
---- linux-2.6.39.3/drivers/net/e1000e/ich8lan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/e1000e/ich8lan.c	2011-05-22 19:36:31.000000000 -0400
-@@ -3866,7 +3866,7 @@ static void e1000_clear_hw_cntrs_ich8lan
- 	}
- }
- 
--static struct e1000_mac_operations ich8_mac_ops = {
-+static const struct e1000_mac_operations ich8_mac_ops = {
- 	.id_led_init		= e1000e_id_led_init,
- 	/* check_mng_mode dependent on mac type */
- 	.check_for_link		= e1000_check_for_copper_link_ich8lan,
-@@ -3885,7 +3885,7 @@ static struct e1000_mac_operations ich8_
- 	/* id_led_init dependent on mac type */
- };
- 
--static struct e1000_phy_operations ich8_phy_ops = {
-+static const struct e1000_phy_operations ich8_phy_ops = {
- 	.acquire		= e1000_acquire_swflag_ich8lan,
- 	.check_reset_block	= e1000_check_reset_block_ich8lan,
- 	.commit			= NULL,
-@@ -3899,7 +3899,7 @@ static struct e1000_phy_operations ich8_
- 	.write_reg		= e1000e_write_phy_reg_igp,
- };
- 
--static struct e1000_nvm_operations ich8_nvm_ops = {
-+static const struct e1000_nvm_operations ich8_nvm_ops = {
- 	.acquire		= e1000_acquire_nvm_ich8lan,
- 	.read		 	= e1000_read_nvm_ich8lan,
- 	.release		= e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.39.3/drivers/net/greth.c linux-2.6.39.3/drivers/net/greth.c
---- linux-2.6.39.3/drivers/net/greth.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/greth.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1192,7 +1192,7 @@ static const struct ethtool_ops greth_et
- 	.get_link		= ethtool_op_get_link,
- };
- 
--static struct net_device_ops greth_netdev_ops = {
-+static const struct net_device_ops greth_netdev_ops = {
- 	.ndo_open		= greth_open,
- 	.ndo_stop		= greth_close,
- 	.ndo_start_xmit		= greth_start_xmit,
-diff -urNp linux-2.6.39.3/drivers/net/hamradio/6pack.c linux-2.6.39.3/drivers/net/hamradio/6pack.c
---- linux-2.6.39.3/drivers/net/hamradio/6pack.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/hamradio/6pack.c	2011-07-09 09:19:18.000000000 -0400
+ 	enum e1000_nvm_override override;
+diff -urNp linux-2.6.39.4/drivers/net/hamradio/6pack.c linux-2.6.39.4/drivers/net/hamradio/6pack.c
+--- linux-2.6.39.4/drivers/net/hamradio/6pack.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/drivers/net/hamradio/6pack.c	2011-08-05 19:44:37.000000000 -0400
 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
  	unsigned char buf[512];
  	int count1;
@@ -35087,185 +28727,112 @@ diff -urNp linux-2.6.39.3/drivers/net/hamradio/6pack.c linux-2.6.39.3/drivers/ne
  	if (!count)
  		return;
  
-diff -urNp linux-2.6.39.3/drivers/net/ibm_newemac/phy.c linux-2.6.39.3/drivers/net/ibm_newemac/phy.c
---- linux-2.6.39.3/drivers/net/ibm_newemac/phy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ibm_newemac/phy.c	2011-05-22 19:36:31.000000000 -0400
-@@ -273,7 +273,7 @@ static int genmii_read_link(struct mii_p
- }
- 
- /* Generic implementation for most 10/100/1000 PHYs */
--static struct mii_phy_ops generic_phy_ops = {
-+static const struct mii_phy_ops generic_phy_ops = {
- 	.setup_aneg	= genmii_setup_aneg,
- 	.setup_forced	= genmii_setup_forced,
- 	.poll_link	= genmii_poll_link,
-@@ -337,7 +337,7 @@ static int cis8201_init(struct mii_phy *
- 	return 0;
- }
- 
--static struct mii_phy_ops cis8201_phy_ops = {
-+static const struct mii_phy_ops cis8201_phy_ops = {
- 	.init		= cis8201_init,
- 	.setup_aneg	= genmii_setup_aneg,
- 	.setup_forced	= genmii_setup_forced,
-@@ -417,7 +417,7 @@ static int et1011c_init(struct mii_phy *
- 	return 0;
- }
- 
--static struct mii_phy_ops et1011c_phy_ops = {
-+static const struct mii_phy_ops et1011c_phy_ops = {
- 	.init		= et1011c_init,
- 	.setup_aneg	= genmii_setup_aneg,
- 	.setup_forced	= genmii_setup_forced,
-@@ -436,7 +436,7 @@ static struct mii_phy_def et1011c_phy_de
- 
- 
- 
--static struct mii_phy_ops m88e1111_phy_ops = {
-+static const struct mii_phy_ops m88e1111_phy_ops = {
- 	.init		= m88e1111_init,
- 	.setup_aneg	= genmii_setup_aneg,
- 	.setup_forced	= genmii_setup_forced,
-@@ -452,7 +452,7 @@ static struct mii_phy_def m88e1111_phy_d
- 	.ops		= &m88e1111_phy_ops,
+diff -urNp linux-2.6.39.4/drivers/net/igb/e1000_hw.h linux-2.6.39.4/drivers/net/igb/e1000_hw.h
+--- linux-2.6.39.4/drivers/net/igb/e1000_hw.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/igb/e1000_hw.h	2011-08-05 20:34:06.000000000 -0400
+@@ -314,6 +314,7 @@ struct e1000_mac_operations {
+ 	s32  (*read_mac_addr)(struct e1000_hw *);
+ 	s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
  };
++typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
  
--static struct mii_phy_ops m88e1112_phy_ops = {
-+static const struct mii_phy_ops m88e1112_phy_ops = {
- 	.init		= m88e1112_init,
- 	.setup_aneg	= genmii_setup_aneg,
- 	.setup_forced	= genmii_setup_forced,
-diff -urNp linux-2.6.39.3/drivers/net/ibmveth.c linux-2.6.39.3/drivers/net/ibmveth.c
---- linux-2.6.39.3/drivers/net/ibmveth.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ibmveth.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1625,7 +1625,7 @@ static struct vio_device_id ibmveth_devi
+ struct e1000_phy_operations {
+ 	s32  (*acquire)(struct e1000_hw *);
+@@ -330,6 +331,7 @@ struct e1000_phy_operations {
+ 	s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);
+ 	s32  (*write_reg)(struct e1000_hw *, u32, u16);
  };
- MODULE_DEVICE_TABLE(vio, ibmveth_device_table);
++typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
  
--static struct dev_pm_ops ibmveth_pm_ops = {
-+static const struct dev_pm_ops ibmveth_pm_ops = {
- 	.resume = ibmveth_resume
+ struct e1000_nvm_operations {
+ 	s32  (*acquire)(struct e1000_hw *);
+@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
+ 	s32  (*update)(struct e1000_hw *);
+ 	s32  (*validate)(struct e1000_hw *);
  };
- 
-diff -urNp linux-2.6.39.3/drivers/net/igb/e1000_82575.c linux-2.6.39.3/drivers/net/igb/e1000_82575.c
---- linux-2.6.39.3/drivers/net/igb/e1000_82575.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/igb/e1000_82575.c	2011-05-22 19:36:31.000000000 -0400
-@@ -2029,7 +2029,7 @@ out:
- 	return ret_val;
- }
- 
--static struct e1000_mac_operations e1000_mac_ops_82575 = {
-+static const struct e1000_mac_operations e1000_mac_ops_82575 = {
- 	.init_hw              = igb_init_hw_82575,
- 	.check_for_link       = igb_check_for_link_82575,
- 	.rar_set              = igb_rar_set,
-@@ -2037,13 +2037,13 @@ static struct e1000_mac_operations e1000
- 	.get_speed_and_duplex = igb_get_speed_and_duplex_copper,
- };
- 
--static struct e1000_phy_operations e1000_phy_ops_82575 = {
-+static const struct e1000_phy_operations e1000_phy_ops_82575 = {
- 	.acquire              = igb_acquire_phy_82575,
- 	.get_cfg_done         = igb_get_cfg_done_82575,
- 	.release              = igb_release_phy_82575,
- };
- 
--static struct e1000_nvm_operations e1000_nvm_ops_82575 = {
-+static const struct e1000_nvm_operations e1000_nvm_ops_82575 = {
- 	.acquire              = igb_acquire_nvm_82575,
- 	.read                 = igb_read_nvm_eerd,
- 	.release              = igb_release_nvm_82575,
-diff -urNp linux-2.6.39.3/drivers/net/igb/e1000_hw.h linux-2.6.39.3/drivers/net/igb/e1000_hw.h
---- linux-2.6.39.3/drivers/net/igb/e1000_hw.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/igb/e1000_hw.h	2011-05-22 19:36:31.000000000 -0400
-@@ -342,14 +342,15 @@ struct e1000_nvm_operations {
++typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
  
  struct e1000_info {
  	s32 (*get_invariants)(struct e1000_hw *);
--	struct e1000_mac_operations *mac_ops;
--	struct e1000_phy_operations *phy_ops;
--	struct e1000_nvm_operations *nvm_ops;
-+	const struct e1000_mac_operations *mac_ops;
-+	const struct e1000_phy_operations *phy_ops;
-+	const struct e1000_nvm_operations *nvm_ops;
- };
- 
+@@ -350,7 +353,7 @@ struct e1000_info {
  extern const struct e1000_info e1000_82575_info;
  
  struct e1000_mac_info {
-+	/* cannot be const see igb_get_invariants_82575() */
- 	struct e1000_mac_operations ops;
+-	struct e1000_mac_operations ops;
++	e1000_mac_operations_no_const ops;
  
  	u8 addr[6];
-@@ -388,6 +389,7 @@ struct e1000_mac_info {
+ 	u8 perm_addr[6];
+@@ -388,7 +391,7 @@ struct e1000_mac_info {
  };
  
  struct e1000_phy_info {
-+	/* cannot be const see igb_get_invariants_82575() */
- 	struct e1000_phy_operations ops;
+-	struct e1000_phy_operations ops;
++	e1000_phy_operations_no_const ops;
  
  	enum e1000_phy_type type;
-@@ -423,6 +425,7 @@ struct e1000_phy_info {
+ 
+@@ -423,7 +426,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
-+	/* cannot be const */
- 	struct e1000_nvm_operations ops;
+-	struct e1000_nvm_operations ops;
++	e1000_nvm_operations_no_const ops;
  	enum e1000_nvm_type type;
  	enum e1000_nvm_override override;
-diff -urNp linux-2.6.39.3/drivers/net/igbvf/vf.h linux-2.6.39.3/drivers/net/igbvf/vf.h
---- linux-2.6.39.3/drivers/net/igbvf/vf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/igbvf/vf.h	2011-05-22 19:36:31.000000000 -0400
-@@ -191,6 +191,7 @@ struct e1000_mac_operations {
+ 
+@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
+ 	s32 (*check_for_ack)(struct e1000_hw *, u16);
+ 	s32 (*check_for_rst)(struct e1000_hw *, u16);
  };
++typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
+ 
+ struct e1000_mbx_stats {
+ 	u32 msgs_tx;
+@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
+ };
+ 
+ struct e1000_mbx_info {
+-	struct e1000_mbx_operations ops;
++	e1000_mbx_operations_no_const ops;
+ 	struct e1000_mbx_stats stats;
+ 	u32 timeout;
+ 	u32 usec_delay;
+diff -urNp linux-2.6.39.4/drivers/net/igbvf/vf.h linux-2.6.39.4/drivers/net/igbvf/vf.h
+--- linux-2.6.39.4/drivers/net/igbvf/vf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/igbvf/vf.h	2011-08-05 20:34:06.000000000 -0400
+@@ -189,9 +189,10 @@ struct e1000_mac_operations {
+ 	s32  (*read_mac_addr)(struct e1000_hw *);
+ 	s32  (*set_vfta)(struct e1000_hw *, u16, bool);
+ };
++typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
  
  struct e1000_mac_info {
-+	/* cannot be const see e1000_init_mac_params_vf() */
- 	struct e1000_mac_operations ops;
+-	struct e1000_mac_operations ops;
++	e1000_mac_operations_no_const ops;
  	u8 addr[6];
  	u8 perm_addr[6];
-diff -urNp linux-2.6.39.3/drivers/net/irda/sh_irda.c linux-2.6.39.3/drivers/net/irda/sh_irda.c
---- linux-2.6.39.3/drivers/net/irda/sh_irda.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/irda/sh_irda.c	2011-05-22 19:36:31.000000000 -0400
-@@ -307,7 +307,7 @@ static int xir_fte(struct sh_irda_self *
- 	return 0;
- }
  
--static struct sh_irda_xir_func xir_func = {
-+static const struct sh_irda_xir_func xir_func = {
- 	.xir_fre	= xir_fre,
- 	.xir_trov	= xir_trov,
- 	.xir_9		= xir_9,
-@@ -321,7 +321,7 @@ static struct sh_irda_xir_func xir_func 
-  *
-  * MIR/FIR are not supported now
-  *=====================================*/
--static struct sh_irda_xir_func mfir_func = {
-+static const struct sh_irda_xir_func mfir_func = {
- 	.xir_fre	= xir_fre,
- 	.xir_trov	= xir_trov,
- 	.xir_9		= xir_9,
-@@ -400,7 +400,7 @@ static int sir_fte(struct sh_irda_self *
- 	return 0;
- }
+@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
+ 	s32 (*check_for_ack)(struct e1000_hw *);
+ 	s32 (*check_for_rst)(struct e1000_hw *);
+ };
++typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
  
--static struct sh_irda_xir_func sir_func = {
-+static const struct sh_irda_xir_func sir_func = {
- 	.xir_fre	= sir_fre,
- 	.xir_trov	= sir_trov,
- 	.xir_9		= sir_tot,
-@@ -411,7 +411,7 @@ static struct sh_irda_xir_func sir_func 
- static void sh_irda_set_mode(struct sh_irda_self *self, enum sh_irda_mode mode)
- {
- 	struct device *dev = &self->ndev->dev;
--	struct sh_irda_xir_func	*func;
-+	const struct sh_irda_xir_func *func;
- 	const char *name;
- 	u16 data;
+ struct e1000_mbx_stats {
+ 	u32 msgs_tx;
+@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
+ };
  
-diff -urNp linux-2.6.39.3/drivers/net/ixgb/ixgb_main.c linux-2.6.39.3/drivers/net/ixgb/ixgb_main.c
---- linux-2.6.39.3/drivers/net/ixgb/ixgb_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgb/ixgb_main.c	2011-05-22 19:36:31.000000000 -0400
+ struct e1000_mbx_info {
+-	struct e1000_mbx_operations ops;
++	e1000_mbx_operations_no_const ops;
+ 	struct e1000_mbx_stats stats;
+ 	u32 timeout;
+ 	u32 usec_delay;
+diff -urNp linux-2.6.39.4/drivers/net/ixgb/ixgb_main.c linux-2.6.39.4/drivers/net/ixgb/ixgb_main.c
+--- linux-2.6.39.4/drivers/net/ixgb/ixgb_main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/ixgb/ixgb_main.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1069,6 +1069,8 @@ ixgb_set_multi(struct net_device *netdev
  	u32 rctl;
  	int i;
@@ -35275,9 +28842,9 @@ diff -urNp linux-2.6.39.3/drivers/net/ixgb/ixgb_main.c linux-2.6.39.3/drivers/ne
  	/* Check for Promiscuous and All Multicast modes */
  
  	rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-2.6.39.3/drivers/net/ixgb/ixgb_param.c linux-2.6.39.3/drivers/net/ixgb/ixgb_param.c
---- linux-2.6.39.3/drivers/net/ixgb/ixgb_param.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgb/ixgb_param.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/ixgb/ixgb_param.c linux-2.6.39.4/drivers/net/ixgb/ixgb_param.c
+--- linux-2.6.39.4/drivers/net/ixgb/ixgb_param.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/ixgb/ixgb_param.c	2011-08-05 19:44:37.000000000 -0400
 @@ -261,6 +261,9 @@ void __devinit
  ixgb_check_options(struct ixgb_adapter *adapter)
  {
@@ -35288,110 +28855,112 @@ diff -urNp linux-2.6.39.3/drivers/net/ixgb/ixgb_param.c linux-2.6.39.3/drivers/n
  	if (bd >= 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.3/drivers/net/ixgbe/ixgbe_82599.c linux-2.6.39.3/drivers/net/ixgbe/ixgbe_82599.c
---- linux-2.6.39.3/drivers/net/ixgbe/ixgbe_82599.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgbe/ixgbe_82599.c	2011-05-22 19:36:31.000000000 -0400
-@@ -2099,7 +2099,7 @@ static struct ixgbe_phy_operations phy_o
- 	.check_overtemp		= &ixgbe_tn_check_overtemp,
- };
- 
--struct ixgbe_info ixgbe_82599_info = {
-+const struct ixgbe_info ixgbe_82599_info = {
- 	.mac                    = ixgbe_mac_82599EB,
- 	.get_invariants         = &ixgbe_get_invariants_82599,
- 	.mac_ops                = &mac_ops_82599,
-diff -urNp linux-2.6.39.3/drivers/net/ixgbe/ixgbe.h linux-2.6.39.3/drivers/net/ixgbe/ixgbe.h
---- linux-2.6.39.3/drivers/net/ixgbe/ixgbe.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgbe/ixgbe.h	2011-05-22 19:36:31.000000000 -0400
-@@ -493,8 +493,8 @@ enum ixgbe_boards {
- };
- 
- extern struct ixgbe_info ixgbe_82598_info;
--extern struct ixgbe_info ixgbe_82599_info;
--extern struct ixgbe_info ixgbe_X540_info;
-+extern const struct ixgbe_info ixgbe_82599_info;
-+extern const struct ixgbe_info ixgbe_X540_info;
- #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.3/drivers/net/ixgbe/ixgbe_x540.c linux-2.6.39.3/drivers/net/ixgbe/ixgbe_x540.c
---- linux-2.6.39.3/drivers/net/ixgbe/ixgbe_x540.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgbe/ixgbe_x540.c	2011-05-22 19:36:31.000000000 -0400
-@@ -727,7 +727,7 @@ static struct ixgbe_phy_operations phy_o
- 	.check_overtemp         = &ixgbe_tn_check_overtemp,
- };
- 
--struct ixgbe_info ixgbe_X540_info = {
-+const struct ixgbe_info ixgbe_X540_info = {
- 	.mac                    = ixgbe_mac_X540,
- 	.get_invariants         = &ixgbe_get_invariants_X540,
- 	.mac_ops                = &mac_ops_X540,
-diff -urNp linux-2.6.39.3/drivers/net/ixgbevf/ethtool.c linux-2.6.39.3/drivers/net/ixgbevf/ethtool.c
---- linux-2.6.39.3/drivers/net/ixgbevf/ethtool.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgbevf/ethtool.c	2011-05-22 19:36:31.000000000 -0400
-@@ -709,7 +709,7 @@ static int ixgbevf_nway_reset(struct net
- 	return 0;
- }
- 
--static struct ethtool_ops ixgbevf_ethtool_ops = {
-+static const struct ethtool_ops ixgbevf_ethtool_ops = {
- 	.get_settings           = ixgbevf_get_settings,
- 	.get_drvinfo            = ixgbevf_get_drvinfo,
- 	.get_regs_len           = ixgbevf_get_regs_len,
-diff -urNp linux-2.6.39.3/drivers/net/ixgbevf/ixgbevf.h linux-2.6.39.3/drivers/net/ixgbevf/ixgbevf.h
---- linux-2.6.39.3/drivers/net/ixgbevf/ixgbevf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgbevf/ixgbevf.h	2011-05-22 19:36:31.000000000 -0400
-@@ -279,7 +279,7 @@ enum ixgbevf_boards {
- 
- extern struct ixgbevf_info ixgbevf_82599_vf_info;
- extern struct ixgbevf_info ixgbevf_X540_vf_info;
--extern struct ixgbe_mac_operations ixgbevf_mbx_ops;
-+extern const struct ixgbe_mac_operations ixgbevf_mbx_ops;
- 
- /* needed by ethtool.c */
- extern char ixgbevf_driver_name[];
-diff -urNp linux-2.6.39.3/drivers/net/ixgbevf/vf.c linux-2.6.39.3/drivers/net/ixgbevf/vf.c
---- linux-2.6.39.3/drivers/net/ixgbevf/vf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgbevf/vf.c	2011-05-22 19:36:31.000000000 -0400
-@@ -368,7 +368,7 @@ static s32 ixgbevf_check_mac_link_vf(str
- 	return 0;
- }
- 
--static struct ixgbe_mac_operations ixgbevf_mac_ops = {
-+static const struct ixgbe_mac_operations ixgbevf_mac_ops = {
- 	.init_hw             = ixgbevf_init_hw_vf,
- 	.reset_hw            = ixgbevf_reset_hw_vf,
- 	.start_hw            = ixgbevf_start_hw_vf,
-@@ -381,12 +381,12 @@ static struct ixgbe_mac_operations ixgbe
- 	.set_vfta            = ixgbevf_set_vfta_vf,
- };
+diff -urNp linux-2.6.39.4/drivers/net/ixgbe/ixgbe_type.h linux-2.6.39.4/drivers/net/ixgbe/ixgbe_type.h
+--- linux-2.6.39.4/drivers/net/ixgbe/ixgbe_type.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/ixgbe/ixgbe_type.h	2011-08-05 20:34:06.000000000 -0400
+@@ -2496,6 +2496,7 @@ struct ixgbe_eeprom_operations {
+ 	s32 (*update_checksum)(struct ixgbe_hw *);
+ 	u16 (*calc_checksum)(struct ixgbe_hw *);
+ };
++typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
+ 
+ struct ixgbe_mac_operations {
+ 	s32 (*init_hw)(struct ixgbe_hw *);
+@@ -2551,6 +2552,7 @@ struct ixgbe_mac_operations {
+ 	/* Flow Control */
+ 	s32 (*fc_enable)(struct ixgbe_hw *, s32);
+ };
++typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
+ 
+ struct ixgbe_phy_operations {
+ 	s32 (*identify)(struct ixgbe_hw *);
+@@ -2570,9 +2572,10 @@ struct ixgbe_phy_operations {
+ 	s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
+ 	s32 (*check_overtemp)(struct ixgbe_hw *);
+ };
++typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
+ 
+ struct ixgbe_eeprom_info {
+-	struct ixgbe_eeprom_operations  ops;
++	ixgbe_eeprom_operations_no_const ops;
+ 	enum ixgbe_eeprom_type          type;
+ 	u32                             semaphore_delay;
+ 	u16                             word_size;
+@@ -2581,7 +2584,7 @@ struct ixgbe_eeprom_info {
+ 
+ #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED	0x01
+ struct ixgbe_mac_info {
+-	struct ixgbe_mac_operations     ops;
++	ixgbe_mac_operations_no_const   ops;
+ 	enum ixgbe_mac_type             type;
+ 	u8                              addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
+ 	u8                              perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
+@@ -2608,7 +2611,7 @@ struct ixgbe_mac_info {
+ };
+ 
+ struct ixgbe_phy_info {
+-	struct ixgbe_phy_operations     ops;
++	ixgbe_phy_operations_no_const   ops;
+ 	struct mdio_if_info		mdio;
+ 	enum ixgbe_phy_type             type;
+ 	u32                             id;
+@@ -2636,6 +2639,7 @@ struct ixgbe_mbx_operations {
+ 	s32 (*check_for_ack)(struct ixgbe_hw *, u16);
+ 	s32 (*check_for_rst)(struct ixgbe_hw *, u16);
+ };
++typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
+ 
+ struct ixgbe_mbx_stats {
+ 	u32 msgs_tx;
+@@ -2647,7 +2651,7 @@ struct ixgbe_mbx_stats {
+ };
+ 
+ struct ixgbe_mbx_info {
+-	struct ixgbe_mbx_operations ops;
++	ixgbe_mbx_operations_no_const ops;
+ 	struct ixgbe_mbx_stats stats;
+ 	u32 timeout;
+ 	u32 usec_delay;
+diff -urNp linux-2.6.39.4/drivers/net/ixgbevf/vf.h linux-2.6.39.4/drivers/net/ixgbevf/vf.h
+--- linux-2.6.39.4/drivers/net/ixgbevf/vf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/ixgbevf/vf.h	2011-08-05 20:34:06.000000000 -0400
+@@ -69,6 +69,7 @@ struct ixgbe_mac_operations {
+ 	s32 (*clear_vfta)(struct ixgbe_hw *);
+ 	s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
+ };
++typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
+ 
+ enum ixgbe_mac_type {
+ 	ixgbe_mac_unknown = 0,
+@@ -78,7 +79,7 @@ enum ixgbe_mac_type {
+ };
+ 
+ struct ixgbe_mac_info {
+-	struct ixgbe_mac_operations ops;
++	ixgbe_mac_operations_no_const ops;
+ 	u8 addr[6];
+ 	u8 perm_addr[6];
  
--struct ixgbevf_info ixgbevf_82599_vf_info = {
-+const struct ixgbevf_info ixgbevf_82599_vf_info = {
- 	.mac = ixgbe_mac_82599_vf,
- 	.mac_ops = &ixgbevf_mac_ops,
+@@ -102,6 +103,7 @@ struct ixgbe_mbx_operations {
+ 	s32 (*check_for_ack)(struct ixgbe_hw *);
+ 	s32 (*check_for_rst)(struct ixgbe_hw *);
  };
++typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
  
--struct ixgbevf_info ixgbevf_X540_vf_info = {
-+const struct ixgbevf_info ixgbevf_X540_vf_info = {
- 	.mac = ixgbe_mac_X540_vf,
- 	.mac_ops = &ixgbevf_mac_ops,
- };
-diff -urNp linux-2.6.39.3/drivers/net/ixgbevf/vf.h linux-2.6.39.3/drivers/net/ixgbevf/vf.h
---- linux-2.6.39.3/drivers/net/ixgbevf/vf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ixgbevf/vf.h	2011-05-22 19:36:31.000000000 -0400
-@@ -166,7 +166,7 @@ struct ixgbevf_hw_stats {
- 
- struct ixgbevf_info {
- 	enum ixgbe_mac_type		mac;
--	struct ixgbe_mac_operations	*mac_ops;
-+	const struct ixgbe_mac_operations	*mac_ops;
+ struct ixgbe_mbx_stats {
+ 	u32 msgs_tx;
+@@ -113,7 +115,7 @@ struct ixgbe_mbx_stats {
  };
  
- #endif /* __IXGBE_VF_H__ */
-diff -urNp linux-2.6.39.3/drivers/net/ksz884x.c linux-2.6.39.3/drivers/net/ksz884x.c
---- linux-2.6.39.3/drivers/net/ksz884x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ksz884x.c	2011-05-22 19:36:31.000000000 -0400
+ struct ixgbe_mbx_info {
+-	struct ixgbe_mbx_operations ops;
++	ixgbe_mbx_operations_no_const ops;
+ 	struct ixgbe_mbx_stats stats;
+ 	u32 timeout;
+ 	u32 udelay;
+diff -urNp linux-2.6.39.4/drivers/net/ksz884x.c linux-2.6.39.4/drivers/net/ksz884x.c
+--- linux-2.6.39.4/drivers/net/ksz884x.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/ksz884x.c	2011-08-05 20:34:06.000000000 -0400
 @@ -6536,6 +6536,8 @@ static void netdev_get_ethtool_stats(str
  	int rc;
  	u64 counter[TOTAL_PORT_COUNTER_NUM];
@@ -35401,18 +28970,9 @@ diff -urNp linux-2.6.39.3/drivers/net/ksz884x.c linux-2.6.39.3/drivers/net/ksz88
  	mutex_lock(&hw_priv->lock);
  	n = SWITCH_PORT_NUM;
  	for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
-@@ -6637,7 +6639,7 @@ static int netdev_set_rx_csum(struct net
- 	return 0;
- }
- 
--static struct ethtool_ops netdev_ethtool_ops = {
-+static const struct ethtool_ops netdev_ethtool_ops = {
- 	.get_settings		= netdev_get_settings,
- 	.set_settings		= netdev_set_settings,
- 	.nway_reset		= netdev_nway_reset,
-diff -urNp linux-2.6.39.3/drivers/net/mlx4/main.c linux-2.6.39.3/drivers/net/mlx4/main.c
---- linux-2.6.39.3/drivers/net/mlx4/main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/mlx4/main.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/mlx4/main.c linux-2.6.39.4/drivers/net/mlx4/main.c
+--- linux-2.6.39.4/drivers/net/mlx4/main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/mlx4/main.c	2011-08-05 19:44:37.000000000 -0400
 @@ -40,6 +40,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/slab.h>
@@ -35430,21 +28990,9 @@ diff -urNp linux-2.6.39.3/drivers/net/mlx4/main.c linux-2.6.39.3/drivers/net/mlx
  	err = mlx4_QUERY_FW(dev);
  	if (err) {
  		if (err == -EACCES)
-diff -urNp linux-2.6.39.3/drivers/net/netconsole.c linux-2.6.39.3/drivers/net/netconsole.c
---- linux-2.6.39.3/drivers/net/netconsole.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/netconsole.c	2011-05-22 19:36:31.000000000 -0400
-@@ -634,7 +634,7 @@ static void drop_netconsole_target(struc
- 	config_item_put(&nt->item);
- }
- 
--static struct configfs_group_operations netconsole_subsys_group_ops = {
-+static const struct configfs_group_operations netconsole_subsys_group_ops = {
- 	.make_item	= make_netconsole_target,
- 	.drop_item	= drop_netconsole_target,
- };
-diff -urNp linux-2.6.39.3/drivers/net/niu.c linux-2.6.39.3/drivers/net/niu.c
---- linux-2.6.39.3/drivers/net/niu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/niu.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/niu.c linux-2.6.39.4/drivers/net/niu.c
+--- linux-2.6.39.4/drivers/net/niu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/niu.c	2011-08-05 19:44:37.000000000 -0400
 @@ -9067,6 +9067,8 @@ static void __devinit niu_try_msix(struc
  	int i, num_irqs, err;
  	u8 first_ldg;
@@ -35454,9 +29002,9 @@ diff -urNp linux-2.6.39.3/drivers/net/niu.c linux-2.6.39.3/drivers/net/niu.c
  	first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
  	for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
  		ldg_num_map[i] = first_ldg + i;
-diff -urNp linux-2.6.39.3/drivers/net/pcnet32.c linux-2.6.39.3/drivers/net/pcnet32.c
---- linux-2.6.39.3/drivers/net/pcnet32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/pcnet32.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/pcnet32.c linux-2.6.39.4/drivers/net/pcnet32.c
+--- linux-2.6.39.4/drivers/net/pcnet32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/pcnet32.c	2011-08-05 20:34:06.000000000 -0400
 @@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -35466,332 +29014,670 @@ diff -urNp linux-2.6.39.3/drivers/net/pcnet32.c linux-2.6.39.3/drivers/net/pcnet
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
  static int pcnet32_debug;
-@@ -379,7 +379,7 @@ static int pcnet32_wio_check(unsigned lo
- 	return inw(addr + PCNET32_WIO_RAP) == 88;
- }
- 
--static struct pcnet32_access pcnet32_wio = {
-+static const struct pcnet32_access pcnet32_wio = {
- 	.read_csr = pcnet32_wio_read_csr,
- 	.write_csr = pcnet32_wio_write_csr,
- 	.read_bcr = pcnet32_wio_read_bcr,
-@@ -434,7 +434,7 @@ static int pcnet32_dwio_check(unsigned l
- 	return (inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88;
- }
- 
--static struct pcnet32_access pcnet32_dwio = {
-+static const struct pcnet32_access pcnet32_dwio = {
- 	.read_csr = pcnet32_dwio_read_csr,
- 	.write_csr = pcnet32_dwio_write_csr,
- 	.read_bcr = pcnet32_dwio_read_bcr,
-@@ -1546,7 +1546,7 @@ pcnet32_probe1(unsigned long ioaddr, int
- 	int chip_version;
- 	char *chipname;
- 	struct net_device *dev;
--	struct pcnet32_access *a = NULL;
-+	const struct pcnet32_access *a = NULL;
- 	u8 promaddr[6];
- 	int ret = -ENODEV;
- 
-diff -urNp linux-2.6.39.3/drivers/net/ppp_generic.c linux-2.6.39.3/drivers/net/ppp_generic.c
---- linux-2.6.39.3/drivers/net/ppp_generic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/ppp_generic.c	2011-05-22 19:36:31.000000000 -0400
-@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
- 	void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
- 	struct ppp_stats stats;
- 	struct ppp_comp_stats cstats;
--	char *vers;
+@@ -270,7 +270,7 @@ struct pcnet32_private {
+ 	struct sk_buff		**rx_skbuff;
+ 	dma_addr_t		*tx_dma_addr;
+ 	dma_addr_t		*rx_dma_addr;
+-	struct pcnet32_access	a;
++	struct pcnet32_access	*a;
+ 	spinlock_t		lock;		/* Guard lock */
+ 	unsigned int		cur_rx, cur_tx;	/* The next free ring entry */
+ 	unsigned int		rx_ring_size;	/* current rx ring size */
+@@ -460,9 +460,9 @@ static void pcnet32_netif_start(struct n
+ 	u16 val;
+ 
+ 	netif_wake_queue(dev);
+-	val = lp->a.read_csr(ioaddr, CSR3);
++	val = lp->a->read_csr(ioaddr, CSR3);
+ 	val &= 0x00ff;
+-	lp->a.write_csr(ioaddr, CSR3, val);
++	lp->a->write_csr(ioaddr, CSR3, val);
+ 	napi_enable(&lp->napi);
+ }
+ 
+@@ -730,7 +730,7 @@ static u32 pcnet32_get_link(struct net_d
+ 		r = mii_link_ok(&lp->mii_if);
+ 	} else if (lp->chip_version >= PCNET32_79C970A) {
+ 		ulong ioaddr = dev->base_addr;	/* card base I/O address */
+-		r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
++		r = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
+ 	} else {	/* can not detect link on really old chips */
+ 		r = 1;
+ 	}
+@@ -792,7 +792,7 @@ static int pcnet32_set_ringparam(struct 
+ 		pcnet32_netif_stop(dev);
  
- 	switch (cmd) {
- 	case SIOCGPPPSTATS:
-@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, st
- 		break;
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
  
- 	case SIOCGPPPVER:
--		vers = PPP_VERSION;
--		if (copy_to_user(addr, vers, strlen(vers) + 1))
-+		if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
- 			break;
- 		err = 0;
- 		break;
-diff -urNp linux-2.6.39.3/drivers/net/qlcnic/qlcnic.h linux-2.6.39.3/drivers/net/qlcnic/qlcnic.h
---- linux-2.6.39.3/drivers/net/qlcnic/qlcnic.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/qlcnic/qlcnic.h	2011-05-22 19:36:31.000000000 -0400
-@@ -1037,7 +1037,7 @@ struct qlcnic_adapter {
- 	struct vlan_group *vlgrp;
- 	struct qlcnic_npar_info *npars;
- 	struct qlcnic_eswitch *eswitch;
--	struct qlcnic_nic_template *nic_ops;
-+	const struct qlcnic_nic_template *nic_ops;
- 
- 	struct qlcnic_adapter_stats stats;
- 
-diff -urNp linux-2.6.39.3/drivers/net/qlcnic/qlcnic_main.c linux-2.6.39.3/drivers/net/qlcnic/qlcnic_main.c
---- linux-2.6.39.3/drivers/net/qlcnic/qlcnic_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
+ 	size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
+ 
+@@ -868,7 +868,7 @@ static void pcnet32_ethtool_test(struct 
+ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;	/* access to registers */
++	struct pcnet32_access *a = lp->a;	/* access to registers */
+ 	ulong ioaddr = dev->base_addr;	/* card base I/O address */
+ 	struct sk_buff *skb;	/* sk buff */
+ 	int x, i;		/* counters */
+@@ -888,21 +888,21 @@ static int pcnet32_loopback_test(struct 
+ 		pcnet32_netif_stop(dev);
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */
+ 
+ 	numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
+ 
+ 	/* Reset the PCNET32 */
+-	lp->a.reset(ioaddr);
+-	lp->a.write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
++	lp->a->reset(ioaddr);
++	lp->a->write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
+ 
+ 	/* switch pcnet32 to 32bit mode */
+-	lp->a.write_bcr(ioaddr, 20, 2);
++	lp->a->write_bcr(ioaddr, 20, 2);
+ 
+ 	/* purge & init rings but don't actually restart */
+ 	pcnet32_restart(dev, 0x0000);
+ 
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
+ 
+ 	/* Initialize Transmit buffers. */
+ 	size = data_len + 15;
+@@ -947,10 +947,10 @@ static int pcnet32_loopback_test(struct 
+ 
+ 	/* set int loopback in CSR15 */
+ 	x = a->read_csr(ioaddr, CSR15) & 0xfffc;
+-	lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
++	lp->a->write_csr(ioaddr, CSR15, x | 0x0044);
+ 
+ 	teststatus = cpu_to_le16(0x8000);
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_START);	/* Set STRT bit */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_START);	/* Set STRT bit */
+ 
+ 	/* Check status of descriptors */
+ 	for (x = 0; x < numbuffs; x++) {
+@@ -969,7 +969,7 @@ static int pcnet32_loopback_test(struct 
+ 		}
+ 	}
+ 
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
+ 	wmb();
+ 	if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
+ 		netdev_printk(KERN_DEBUG, dev, "RX loopback packets:\n");
+@@ -1015,7 +1015,7 @@ clean_up:
+ 		pcnet32_restart(dev, CSR0_NORMAL);
+ 	} else {
+ 		pcnet32_purge_rx_ring(dev);
+-		lp->a.write_bcr(ioaddr, 20, 4);	/* return to 16bit mode */
++		lp->a->write_bcr(ioaddr, 20, 4);	/* return to 16bit mode */
+ 	}
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+@@ -1025,7 +1025,7 @@ clean_up:
+ static void pcnet32_led_blink_callback(struct net_device *dev)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 	int i;
+@@ -1041,7 +1041,7 @@ static void pcnet32_led_blink_callback(s
+ static int pcnet32_phys_id(struct net_device *dev, u32 data)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 	int i, regs[4];
+@@ -1085,7 +1085,7 @@ static int pcnet32_suspend(struct net_de
+ {
+ 	int csr5;
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	int ticks;
+ 
+@@ -1342,8 +1342,8 @@ static int pcnet32_poll(struct napi_stru
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 	if (pcnet32_tx(dev)) {
+ 		/* reset the chip to clear the error condition, then restart */
+-		lp->a.reset(ioaddr);
+-		lp->a.write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
++		lp->a->reset(ioaddr);
++		lp->a->write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
+ 		pcnet32_restart(dev, CSR0_START);
+ 		netif_wake_queue(dev);
+ 	}
+@@ -1355,12 +1355,12 @@ static int pcnet32_poll(struct napi_stru
+ 		__napi_complete(napi);
+ 
+ 		/* clear interrupt masks */
+-		val = lp->a.read_csr(ioaddr, CSR3);
++		val = lp->a->read_csr(ioaddr, CSR3);
+ 		val &= 0x00ff;
+-		lp->a.write_csr(ioaddr, CSR3, val);
++		lp->a->write_csr(ioaddr, CSR3, val);
+ 
+ 		/* Set interrupt enable. */
+-		lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
++		lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN);
+ 
+ 		spin_unlock_irqrestore(&lp->lock, flags);
+ 	}
+@@ -1383,7 +1383,7 @@ static void pcnet32_get_regs(struct net_
+ 	int i, csr0;
+ 	u16 *buff = ptr;
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 
+@@ -1419,9 +1419,9 @@ static void pcnet32_get_regs(struct net_
+ 		for (j = 0; j < PCNET32_MAX_PHYS; j++) {
+ 			if (lp->phymask & (1 << j)) {
+ 				for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
+-					lp->a.write_bcr(ioaddr, 33,
++					lp->a->write_bcr(ioaddr, 33,
+ 							(j << 5) | i);
+-					*buff++ = lp->a.read_bcr(ioaddr, 34);
++					*buff++ = lp->a->read_bcr(ioaddr, 34);
+ 				}
+ 			}
+ 		}
+@@ -1803,7 +1803,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 	    ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
+ 		lp->options |= PCNET32_PORT_FD;
+ 
+-	lp->a = *a;
++	lp->a = a;
+ 
+ 	/* prior to register_netdev, dev->name is not yet correct */
+ 	if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
+@@ -1862,7 +1862,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 	if (lp->mii) {
+ 		/* lp->phycount and lp->phymask are set to 0 by memset above */
+ 
+-		lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
++		lp->mii_if.phy_id = ((lp->a->read_bcr(ioaddr, 33)) >> 5) & 0x1f;
+ 		/* scan for PHYs */
+ 		for (i = 0; i < PCNET32_MAX_PHYS; i++) {
+ 			unsigned short id1, id2;
+@@ -1882,7 +1882,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 				pr_info("Found PHY %04x:%04x at address %d\n",
+ 					id1, id2, i);
+ 		}
+-		lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
++		lp->a->write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
+ 		if (lp->phycount > 1)
+ 			lp->options |= PCNET32_PORT_MII;
+ 	}
+@@ -2038,10 +2038,10 @@ static int pcnet32_open(struct net_devic
+ 	}
+ 
+ 	/* Reset the PCNET32 */
+-	lp->a.reset(ioaddr);
++	lp->a->reset(ioaddr);
+ 
+ 	/* switch pcnet32 to 32bit mode */
+-	lp->a.write_bcr(ioaddr, 20, 2);
++	lp->a->write_bcr(ioaddr, 20, 2);
+ 
+ 	netif_printk(lp, ifup, KERN_DEBUG, dev,
+ 		     "%s() irq %d tx/rx rings %#x/%#x init %#x\n",
+@@ -2050,14 +2050,14 @@ static int pcnet32_open(struct net_devic
+ 		     (u32) (lp->init_dma_addr));
+ 
+ 	/* set/reset autoselect bit */
+-	val = lp->a.read_bcr(ioaddr, 2) & ~2;
++	val = lp->a->read_bcr(ioaddr, 2) & ~2;
+ 	if (lp->options & PCNET32_PORT_ASEL)
+ 		val |= 2;
+-	lp->a.write_bcr(ioaddr, 2, val);
++	lp->a->write_bcr(ioaddr, 2, val);
+ 
+ 	/* handle full duplex setting */
+ 	if (lp->mii_if.full_duplex) {
+-		val = lp->a.read_bcr(ioaddr, 9) & ~3;
++		val = lp->a->read_bcr(ioaddr, 9) & ~3;
+ 		if (lp->options & PCNET32_PORT_FD) {
+ 			val |= 1;
+ 			if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
+@@ -2067,14 +2067,14 @@ static int pcnet32_open(struct net_devic
+ 			if (lp->chip_version == 0x2627)
+ 				val |= 3;
+ 		}
+-		lp->a.write_bcr(ioaddr, 9, val);
++		lp->a->write_bcr(ioaddr, 9, val);
+ 	}
+ 
+ 	/* set/reset GPSI bit in test register */
+-	val = lp->a.read_csr(ioaddr, 124) & ~0x10;
++	val = lp->a->read_csr(ioaddr, 124) & ~0x10;
+ 	if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
+ 		val |= 0x10;
+-	lp->a.write_csr(ioaddr, 124, val);
++	lp->a->write_csr(ioaddr, 124, val);
+ 
+ 	/* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate */
+ 	if (pdev && pdev->subsystem_vendor == PCI_VENDOR_ID_AT &&
+@@ -2093,24 +2093,24 @@ static int pcnet32_open(struct net_devic
+ 		 * duplex, and/or enable auto negotiation, and clear DANAS
+ 		 */
+ 		if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
+-			lp->a.write_bcr(ioaddr, 32,
+-					lp->a.read_bcr(ioaddr, 32) | 0x0080);
++			lp->a->write_bcr(ioaddr, 32,
++					lp->a->read_bcr(ioaddr, 32) | 0x0080);
+ 			/* disable Auto Negotiation, set 10Mpbs, HD */
+-			val = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
++			val = lp->a->read_bcr(ioaddr, 32) & ~0xb8;
+ 			if (lp->options & PCNET32_PORT_FD)
+ 				val |= 0x10;
+ 			if (lp->options & PCNET32_PORT_100)
+ 				val |= 0x08;
+-			lp->a.write_bcr(ioaddr, 32, val);
++			lp->a->write_bcr(ioaddr, 32, val);
+ 		} else {
+ 			if (lp->options & PCNET32_PORT_ASEL) {
+-				lp->a.write_bcr(ioaddr, 32,
+-						lp->a.read_bcr(ioaddr,
++				lp->a->write_bcr(ioaddr, 32,
++						lp->a->read_bcr(ioaddr,
+ 							       32) | 0x0080);
+ 				/* enable auto negotiate, setup, disable fd */
+-				val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
++				val = lp->a->read_bcr(ioaddr, 32) & ~0x98;
+ 				val |= 0x20;
+-				lp->a.write_bcr(ioaddr, 32, val);
++				lp->a->write_bcr(ioaddr, 32, val);
+ 			}
+ 		}
+ 	} else {
+@@ -2123,10 +2123,10 @@ static int pcnet32_open(struct net_devic
+ 		 * There is really no good other way to handle multiple PHYs
+ 		 * other than turning off all automatics
+ 		 */
+-		val = lp->a.read_bcr(ioaddr, 2);
+-		lp->a.write_bcr(ioaddr, 2, val & ~2);
+-		val = lp->a.read_bcr(ioaddr, 32);
+-		lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7));	/* stop MII manager */
++		val = lp->a->read_bcr(ioaddr, 2);
++		lp->a->write_bcr(ioaddr, 2, val & ~2);
++		val = lp->a->read_bcr(ioaddr, 32);
++		lp->a->write_bcr(ioaddr, 32, val & ~(1 << 7));	/* stop MII manager */
+ 
+ 		if (!(lp->options & PCNET32_PORT_ASEL)) {
+ 			/* setup ecmd */
+@@ -2136,7 +2136,7 @@ static int pcnet32_open(struct net_devic
+ 			ecmd.speed =
+ 			    lp->
+ 			    options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10;
+-			bcr9 = lp->a.read_bcr(ioaddr, 9);
++			bcr9 = lp->a->read_bcr(ioaddr, 9);
+ 
+ 			if (lp->options & PCNET32_PORT_FD) {
+ 				ecmd.duplex = DUPLEX_FULL;
+@@ -2145,7 +2145,7 @@ static int pcnet32_open(struct net_devic
+ 				ecmd.duplex = DUPLEX_HALF;
+ 				bcr9 |= ~(1 << 0);
+ 			}
+-			lp->a.write_bcr(ioaddr, 9, bcr9);
++			lp->a->write_bcr(ioaddr, 9, bcr9);
+ 		}
+ 
+ 		for (i = 0; i < PCNET32_MAX_PHYS; i++) {
+@@ -2176,9 +2176,9 @@ static int pcnet32_open(struct net_devic
+ 
+ #ifdef DO_DXSUFLO
+ 	if (lp->dxsuflo) {	/* Disable transmit stop on underflow */
+-		val = lp->a.read_csr(ioaddr, CSR3);
++		val = lp->a->read_csr(ioaddr, CSR3);
+ 		val |= 0x40;
+-		lp->a.write_csr(ioaddr, CSR3, val);
++		lp->a->write_csr(ioaddr, CSR3, val);
+ 	}
  #endif
- };
  
--static struct qlcnic_nic_template qlcnic_ops = {
-+static const struct qlcnic_nic_template qlcnic_ops = {
- 	.config_bridged_mode = qlcnic_config_bridged_mode,
- 	.config_led = qlcnic_config_led,
- 	.start_firmware = qlcnic_start_firmware
- };
+@@ -2194,11 +2194,11 @@ static int pcnet32_open(struct net_devic
+ 	napi_enable(&lp->napi);
  
--static struct qlcnic_nic_template qlcnic_vf_ops = {
-+static const struct qlcnic_nic_template qlcnic_vf_ops = {
- 	.config_bridged_mode = qlcnicvf_config_bridged_mode,
- 	.config_led = qlcnicvf_config_led,
- 	.start_firmware = qlcnicvf_start_firmware
-diff -urNp linux-2.6.39.3/drivers/net/qlge/qlge.h linux-2.6.39.3/drivers/net/qlge/qlge.h
---- linux-2.6.39.3/drivers/net/qlge/qlge.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	struct completion ide_completion;
--	struct nic_operations *nic_ops;
-+	const struct nic_operations *nic_ops;
- 	u16 device_id;
- 	struct timer_list timer;
- 	atomic_t lb_count;
-diff -urNp linux-2.6.39.3/drivers/net/qlge/qlge_main.c linux-2.6.39.3/drivers/net/qlge/qlge_main.c
---- linux-2.6.39.3/drivers/net/qlge/qlge_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/qlge/qlge_main.c	2011-05-22 19:36:31.000000000 -0400
-@@ -4412,12 +4412,12 @@ error:
- 	rtnl_unlock();
- }
- 
--static struct nic_operations qla8012_nic_ops = {
-+static const struct nic_operations qla8012_nic_ops = {
- 	.get_flash		= ql_get_8012_flash_params,
- 	.port_initialize	= ql_8012_port_initialize,
- };
+ 	/* Re-initialize the PCNET32, and start it when done. */
+-	lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
+-	lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
++	lp->a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
++	lp->a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
  
--static struct nic_operations qla8000_nic_ops = {
-+static const struct nic_operations qla8000_nic_ops = {
- 	.get_flash		= ql_get_8000_flash_params,
- 	.port_initialize	= ql_8000_port_initialize,
- };
-diff -urNp linux-2.6.39.3/drivers/net/sfc/falcon.c linux-2.6.39.3/drivers/net/sfc/falcon.c
---- linux-2.6.39.3/drivers/net/sfc/falcon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/sfc/falcon.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1703,7 +1703,7 @@ static int falcon_set_wol(struct efx_nic
-  **************************************************************************
-  */
+-	lp->a.write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
++	lp->a->write_csr(ioaddr, CSR4, 0x0915);	/* auto tx pad */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
  
--struct efx_nic_type falcon_a1_nic_type = {
-+const struct efx_nic_type falcon_a1_nic_type = {
- 	.probe = falcon_probe_nic,
- 	.remove = falcon_remove_nic,
- 	.init = falcon_init_nic,
-@@ -1744,7 +1744,7 @@ struct efx_nic_type falcon_a1_nic_type =
- 	.reset_world_flags = ETH_RESET_IRQ,
- };
+ 	netif_start_queue(dev);
  
--struct efx_nic_type falcon_b0_nic_type = {
-+const struct efx_nic_type falcon_b0_nic_type = {
- 	.probe = falcon_probe_nic,
- 	.remove = falcon_remove_nic,
- 	.init = falcon_init_nic,
-diff -urNp linux-2.6.39.3/drivers/net/sfc/mtd.c linux-2.6.39.3/drivers/net/sfc/mtd.c
---- linux-2.6.39.3/drivers/net/sfc/mtd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
+@@ -2210,19 +2210,19 @@ static int pcnet32_open(struct net_devic
  
--static struct efx_mtd_ops falcon_mtd_ops = {
-+static const struct efx_mtd_ops falcon_mtd_ops = {
- 	.read	= falcon_mtd_read,
- 	.erase	= falcon_mtd_erase,
- 	.write	= falcon_mtd_write,
-@@ -560,7 +560,7 @@ static int siena_mtd_sync(struct mtd_inf
- 	return rc;
- }
+ 	i = 0;
+ 	while (i++ < 100)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
+ 			break;
+ 	/*
+ 	 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
+ 	 * reports that doing so triggers a bug in the '974.
+ 	 */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_NORMAL);
  
--static struct efx_mtd_ops siena_mtd_ops = {
-+static const struct efx_mtd_ops siena_mtd_ops = {
- 	.read	= siena_mtd_read,
- 	.erase	= siena_mtd_erase,
- 	.write	= siena_mtd_write,
-diff -urNp linux-2.6.39.3/drivers/net/sfc/nic.h linux-2.6.39.3/drivers/net/sfc/nic.h
---- linux-2.6.39.3/drivers/net/sfc/nic.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- };
+ 	netif_printk(lp, ifup, KERN_DEBUG, dev,
+ 		     "pcnet32 open after %d ticks, init block %#x csr0 %4.4x\n",
+ 		     i,
+ 		     (u32) (lp->init_dma_addr),
+-		     lp->a.read_csr(ioaddr, CSR0));
++		     lp->a->read_csr(ioaddr, CSR0));
  
--extern struct efx_nic_type falcon_a1_nic_type;
--extern struct efx_nic_type falcon_b0_nic_type;
--extern struct efx_nic_type siena_a0_nic_type;
-+extern const struct efx_nic_type falcon_a1_nic_type;
-+extern const struct efx_nic_type falcon_b0_nic_type;
-+extern const struct efx_nic_type siena_a0_nic_type;
+ 	spin_unlock_irqrestore(&lp->lock, flags);
  
- /**************************************************************************
-  *
-diff -urNp linux-2.6.39.3/drivers/net/sfc/siena.c linux-2.6.39.3/drivers/net/sfc/siena.c
---- linux-2.6.39.3/drivers/net/sfc/siena.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  **************************************************************************
-  */
+@@ -2236,7 +2236,7 @@ err_free_ring:
+ 	 * Switch back to 16bit mode to avoid problems with dumb
+ 	 * DOS packet driver after a warm reboot
+ 	 */
+-	lp->a.write_bcr(ioaddr, 20, 4);
++	lp->a->write_bcr(ioaddr, 20, 4);
  
--struct efx_nic_type siena_a0_nic_type = {
-+const struct efx_nic_type siena_a0_nic_type = {
- 	.probe = siena_probe_nic,
- 	.remove = siena_remove_nic,
- 	.init = siena_init_nic,
-diff -urNp linux-2.6.39.3/drivers/net/sh_eth.c linux-2.6.39.3/drivers/net/sh_eth.c
---- linux-2.6.39.3/drivers/net/sh_eth.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/sh_eth.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1360,7 +1360,7 @@ static void sh_eth_get_strings(struct ne
- 	}
- }
- 
--static struct ethtool_ops sh_eth_ethtool_ops = {
-+static const struct ethtool_ops sh_eth_ethtool_ops = {
- 	.get_settings	= sh_eth_get_settings,
- 	.set_settings	= sh_eth_set_settings,
- 	.nway_reset		= sh_eth_nway_reset,
-diff -urNp linux-2.6.39.3/drivers/net/stmmac/stmmac_ethtool.c linux-2.6.39.3/drivers/net/stmmac/stmmac_ethtool.c
---- linux-2.6.39.3/drivers/net/stmmac/stmmac_ethtool.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
+ err_free_irq:
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+@@ -2341,7 +2341,7 @@ static void pcnet32_restart(struct net_d
  
--static struct ethtool_ops stmmac_ethtool_ops = {
-+static const struct ethtool_ops stmmac_ethtool_ops = {
- 	.begin = stmmac_check_if_running,
- 	.get_drvinfo = stmmac_ethtool_getdrvinfo,
- 	.get_settings = stmmac_ethtool_getsettings,
-diff -urNp linux-2.6.39.3/drivers/net/sungem_phy.c linux-2.6.39.3/drivers/net/sungem_phy.c
---- linux-2.6.39.3/drivers/net/sungem_phy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/sungem_phy.c	2011-05-22 19:36:31.000000000 -0400
-@@ -886,7 +886,7 @@ static int marvell_read_link(struct mii_
- 	 SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full)
- 
- /* Broadcom BCM 5201 */
--static struct mii_phy_ops bcm5201_phy_ops = {
-+static const struct mii_phy_ops bcm5201_phy_ops = {
- 	.init		= bcm5201_init,
- 	.suspend	= bcm5201_suspend,
- 	.setup_aneg	= genmii_setup_aneg,
-@@ -905,7 +905,7 @@ static struct mii_phy_def bcm5201_phy_de
- };
+ 	/* wait for stop */
+ 	for (i = 0; i < 100; i++)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_STOP)
+ 			break;
  
- /* Broadcom BCM 5221 */
--static struct mii_phy_ops bcm5221_phy_ops = {
-+static const struct mii_phy_ops bcm5221_phy_ops = {
- 	.suspend	= bcm5221_suspend,
- 	.init		= bcm5221_init,
- 	.setup_aneg	= genmii_setup_aneg,
-@@ -924,7 +924,7 @@ static struct mii_phy_def bcm5221_phy_de
- };
+ 	if (i >= 100)
+@@ -2353,13 +2353,13 @@ static void pcnet32_restart(struct net_d
+ 		return;
  
- /* Broadcom BCM 5241 */
--static struct mii_phy_ops bcm5241_phy_ops = {
-+static const struct mii_phy_ops bcm5241_phy_ops = {
- 	.suspend	= bcm5241_suspend,
- 	.init		= bcm5241_init,
- 	.setup_aneg	= genmii_setup_aneg,
-@@ -942,7 +942,7 @@ static struct mii_phy_def bcm5241_phy_de
- };
+ 	/* ReInit Ring */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
+ 	i = 0;
+ 	while (i++ < 1000)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
+ 			break;
  
- /* Broadcom BCM 5400 */
--static struct mii_phy_ops bcm5400_phy_ops = {
-+static const struct mii_phy_ops bcm5400_phy_ops = {
- 	.init		= bcm5400_init,
- 	.suspend	= bcm5400_suspend,
- 	.setup_aneg	= bcm54xx_setup_aneg,
-@@ -961,7 +961,7 @@ static struct mii_phy_def bcm5400_phy_de
- };
+-	lp->a.write_csr(ioaddr, CSR0, csr0_bits);
++	lp->a->write_csr(ioaddr, CSR0, csr0_bits);
+ }
+ 
+ static void pcnet32_tx_timeout(struct net_device *dev)
+@@ -2371,8 +2371,8 @@ static void pcnet32_tx_timeout(struct ne
+ 	/* Transmitter timeout, serious problems. */
+ 	if (pcnet32_debug & NETIF_MSG_DRV)
+ 		pr_err("%s: transmit timed out, status %4.4x, resetting\n",
+-		       dev->name, lp->a.read_csr(ioaddr, CSR0));
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
++		       dev->name, lp->a->read_csr(ioaddr, CSR0));
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
+ 	dev->stats.tx_errors++;
+ 	if (netif_msg_tx_err(lp)) {
+ 		int i;
+@@ -2415,7 +2415,7 @@ static netdev_tx_t pcnet32_start_xmit(st
+ 
+ 	netif_printk(lp, tx_queued, KERN_DEBUG, dev,
+ 		     "%s() called, csr0 %4.4x\n",
+-		     __func__, lp->a.read_csr(ioaddr, CSR0));
++		     __func__, lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	/* Default status -- will not enable Successful-TxDone
+ 	 * interrupt when that option is available to us.
+@@ -2445,7 +2445,7 @@ static netdev_tx_t pcnet32_start_xmit(st
+ 	dev->stats.tx_bytes += skb->len;
+ 
+ 	/* Trigger an immediate send poll. */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
+ 
+ 	if (lp->tx_ring[(entry + 1) & lp->tx_mod_mask].base != 0) {
+ 		lp->tx_full = 1;
+@@ -2470,16 +2470,16 @@ pcnet32_interrupt(int irq, void *dev_id)
+ 
+ 	spin_lock(&lp->lock);
+ 
+-	csr0 = lp->a.read_csr(ioaddr, CSR0);
++	csr0 = lp->a->read_csr(ioaddr, CSR0);
+ 	while ((csr0 & 0x8f00) && --boguscnt >= 0) {
+ 		if (csr0 == 0xffff)
+ 			break;	/* PCMCIA remove happened */
+ 		/* Acknowledge all of the current interrupt sources ASAP. */
+-		lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
++		lp->a->write_csr(ioaddr, CSR0, csr0 & ~0x004f);
+ 
+ 		netif_printk(lp, intr, KERN_DEBUG, dev,
+ 			     "interrupt  csr0=%#2.2x new csr=%#2.2x\n",
+-			     csr0, lp->a.read_csr(ioaddr, CSR0));
++			     csr0, lp->a->read_csr(ioaddr, CSR0));
+ 
+ 		/* Log misc errors. */
+ 		if (csr0 & 0x4000)
+@@ -2506,19 +2506,19 @@ pcnet32_interrupt(int irq, void *dev_id)
+ 		if (napi_schedule_prep(&lp->napi)) {
+ 			u16 val;
+ 			/* set interrupt masks */
+-			val = lp->a.read_csr(ioaddr, CSR3);
++			val = lp->a->read_csr(ioaddr, CSR3);
+ 			val |= 0x5f00;
+-			lp->a.write_csr(ioaddr, CSR3, val);
++			lp->a->write_csr(ioaddr, CSR3, val);
+ 
+ 			__napi_schedule(&lp->napi);
+ 			break;
+ 		}
+-		csr0 = lp->a.read_csr(ioaddr, CSR0);
++		csr0 = lp->a->read_csr(ioaddr, CSR0);
+ 	}
  
- /* Broadcom BCM 5401 */
--static struct mii_phy_ops bcm5401_phy_ops = {
-+static const struct mii_phy_ops bcm5401_phy_ops = {
- 	.init		= bcm5401_init,
- 	.suspend	= bcm5401_suspend,
- 	.setup_aneg	= bcm54xx_setup_aneg,
-@@ -980,7 +980,7 @@ static struct mii_phy_def bcm5401_phy_de
- };
+ 	netif_printk(lp, intr, KERN_DEBUG, dev,
+ 		     "exiting interrupt, csr0=%#4.4x\n",
+-		     lp->a.read_csr(ioaddr, CSR0));
++		     lp->a->read_csr(ioaddr, CSR0));
  
- /* Broadcom BCM 5411 */
--static struct mii_phy_ops bcm5411_phy_ops = {
-+static const struct mii_phy_ops bcm5411_phy_ops = {
- 	.init		= bcm5411_init,
- 	.suspend	= generic_suspend,
- 	.setup_aneg	= bcm54xx_setup_aneg,
-@@ -999,7 +999,7 @@ static struct mii_phy_def bcm5411_phy_de
- };
+ 	spin_unlock(&lp->lock);
  
- /* Broadcom BCM 5421 */
--static struct mii_phy_ops bcm5421_phy_ops = {
-+static const struct mii_phy_ops bcm5421_phy_ops = {
- 	.init		= bcm5421_init,
- 	.suspend	= generic_suspend,
- 	.setup_aneg	= bcm54xx_setup_aneg,
-@@ -1019,7 +1019,7 @@ static struct mii_phy_def bcm5421_phy_de
- };
+@@ -2538,20 +2538,20 @@ static int pcnet32_close(struct net_devi
  
- /* Broadcom BCM 5421 built-in K2 */
--static struct mii_phy_ops bcm5421k2_phy_ops = {
-+static const struct mii_phy_ops bcm5421k2_phy_ops = {
- 	.init		= bcm5421_init,
- 	.suspend	= generic_suspend,
- 	.setup_aneg	= bcm54xx_setup_aneg,
-@@ -1037,7 +1037,7 @@ static struct mii_phy_def bcm5421k2_phy_
- 	.ops		= &bcm5421k2_phy_ops
- };
+ 	spin_lock_irqsave(&lp->lock, flags);
  
--static struct mii_phy_ops bcm5461_phy_ops = {
-+static const struct mii_phy_ops bcm5461_phy_ops = {
- 	.init		= bcm5421_init,
- 	.suspend	= generic_suspend,
- 	.setup_aneg	= bcm54xx_setup_aneg,
-@@ -1057,7 +1057,7 @@ static struct mii_phy_def bcm5461_phy_de
- };
+-	dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
++	dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
  
- /* Broadcom BCM 5462 built-in Vesta */
--static struct mii_phy_ops bcm5462V_phy_ops = {
-+static const struct mii_phy_ops bcm5462V_phy_ops = {
- 	.init		= bcm5421_init,
- 	.suspend	= generic_suspend,
- 	.setup_aneg	= bcm54xx_setup_aneg,
-@@ -1076,7 +1076,7 @@ static struct mii_phy_def bcm5462V_phy_d
- };
+ 	netif_printk(lp, ifdown, KERN_DEBUG, dev,
+ 		     "Shutting down ethercard, status was %2.2x\n",
+-		     lp->a.read_csr(ioaddr, CSR0));
++		     lp->a->read_csr(ioaddr, CSR0));
  
- /* Marvell 88E1101 amd 88E1111 */
--static struct mii_phy_ops marvell88e1101_phy_ops = {
-+static const struct mii_phy_ops marvell88e1101_phy_ops = {
- 	.suspend	= generic_suspend,
- 	.setup_aneg	= marvell_setup_aneg,
- 	.setup_forced	= marvell_setup_forced,
-@@ -1084,7 +1084,7 @@ static struct mii_phy_ops marvell88e1101
- 	.read_link	= marvell_read_link
- };
+ 	/* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
  
--static struct mii_phy_ops marvell88e1111_phy_ops = {
-+static const struct mii_phy_ops marvell88e1111_phy_ops = {
- 	.init		= marvell88e1111_init,
- 	.suspend	= generic_suspend,
- 	.setup_aneg	= marvell_setup_aneg,
-@@ -1122,7 +1122,7 @@ static struct mii_phy_def marvell88e1111
- };
+ 	/*
+ 	 * Switch back to 16bit mode to avoid problems with dumb
+ 	 * DOS packet driver after a warm reboot
+ 	 */
+-	lp->a.write_bcr(ioaddr, 20, 4);
++	lp->a->write_bcr(ioaddr, 20, 4);
+ 
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+@@ -2574,7 +2574,7 @@ static struct net_device_stats *pcnet32_
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
++	dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+ 	return &dev->stats;
+@@ -2596,10 +2596,10 @@ static void pcnet32_load_multicast(struc
+ 	if (dev->flags & IFF_ALLMULTI) {
+ 		ib->filter[0] = cpu_to_le32(~0U);
+ 		ib->filter[1] = cpu_to_le32(~0U);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
+ 		return;
+ 	}
+ 	/* clear the multicast filter */
+@@ -2619,7 +2619,7 @@ static void pcnet32_load_multicast(struc
+ 		mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
+ 	}
+ 	for (i = 0; i < 4; i++)
+-		lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
++		lp->a->write_csr(ioaddr, PCNET32_MC_FILTER + i,
+ 				le16_to_cpu(mcast_table[i]));
+ }
+ 
+@@ -2634,28 +2634,28 @@ static void pcnet32_set_multicast_list(s
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 	suspended = pcnet32_suspend(dev, &flags, 0);
+-	csr15 = lp->a.read_csr(ioaddr, CSR15);
++	csr15 = lp->a->read_csr(ioaddr, CSR15);
+ 	if (dev->flags & IFF_PROMISC) {
+ 		/* Log any net taps. */
+ 		netif_info(lp, hw, dev, "Promiscuous mode enabled\n");
+ 		lp->init_block->mode =
+ 		    cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
+ 				7);
+-		lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
++		lp->a->write_csr(ioaddr, CSR15, csr15 | 0x8000);
+ 	} else {
+ 		lp->init_block->mode =
+ 		    cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
+-		lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
++		lp->a->write_csr(ioaddr, CSR15, csr15 & 0x7fff);
+ 		pcnet32_load_multicast(dev);
+ 	}
+ 
+ 	if (suspended) {
+ 		int csr5;
+ 		/* clear SUSPEND (SPND) - CSR5 bit 0 */
+-		csr5 = lp->a.read_csr(ioaddr, CSR5);
+-		lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
++		csr5 = lp->a->read_csr(ioaddr, CSR5);
++		lp->a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
+ 	} else {
+-		lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
++		lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
+ 		pcnet32_restart(dev, CSR0_NORMAL);
+ 		netif_wake_queue(dev);
+ 	}
+@@ -2673,8 +2673,8 @@ static int mdio_read(struct net_device *
+ 	if (!lp->mii)
+ 		return 0;
+ 
+-	lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
+-	val_out = lp->a.read_bcr(ioaddr, 34);
++	lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
++	val_out = lp->a->read_bcr(ioaddr, 34);
+ 
+ 	return val_out;
+ }
+@@ -2688,8 +2688,8 @@ static void mdio_write(struct net_device
+ 	if (!lp->mii)
+ 		return;
+ 
+-	lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
+-	lp->a.write_bcr(ioaddr, 34, val);
++	lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
++	lp->a->write_bcr(ioaddr, 34, val);
+ }
  
- /* Generic implementation for most 10/100 PHYs */
--static struct mii_phy_ops generic_phy_ops = {
-+static const struct mii_phy_ops generic_phy_ops = {
- 	.setup_aneg	= genmii_setup_aneg,
- 	.setup_forced	= genmii_setup_forced,
- 	.poll_link	= genmii_poll_link,
-diff -urNp linux-2.6.39.3/drivers/net/tg3.h linux-2.6.39.3/drivers/net/tg3.h
---- linux-2.6.39.3/drivers/net/tg3.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/tg3.h	2011-05-22 19:36:31.000000000 -0400
+ static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -2766,7 +2766,7 @@ static void pcnet32_check_media(struct n
+ 		curr_link = mii_link_ok(&lp->mii_if);
+ 	} else {
+ 		ulong ioaddr = dev->base_addr;	/* card base I/O address */
+-		curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
++		curr_link = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
+ 	}
+ 	if (!curr_link) {
+ 		if (prev_link || verbose) {
+@@ -2789,13 +2789,13 @@ static void pcnet32_check_media(struct n
+ 					    (ecmd.duplex == DUPLEX_FULL)
+ 					    ? "full" : "half");
+ 			}
+-			bcr9 = lp->a.read_bcr(dev->base_addr, 9);
++			bcr9 = lp->a->read_bcr(dev->base_addr, 9);
+ 			if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
+ 				if (lp->mii_if.full_duplex)
+ 					bcr9 |= (1 << 0);
+ 				else
+ 					bcr9 &= ~(1 << 0);
+-				lp->a.write_bcr(dev->base_addr, 9, bcr9);
++				lp->a->write_bcr(dev->base_addr, 9, bcr9);
+ 			}
+ 		} else {
+ 			netif_info(lp, link, dev, "link up\n");
+diff -urNp linux-2.6.39.4/drivers/net/ppp_generic.c linux-2.6.39.4/drivers/net/ppp_generic.c
+--- linux-2.6.39.4/drivers/net/ppp_generic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/ppp_generic.c	2011-08-05 19:44:37.000000000 -0400
+@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
+ 	void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
+ 	struct ppp_stats stats;
+ 	struct ppp_comp_stats cstats;
+-	char *vers;
+ 
+ 	switch (cmd) {
+ 	case SIOCGPPPSTATS:
+@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, st
+ 		break;
+ 
+ 	case SIOCGPPPVER:
+-		vers = PPP_VERSION;
+-		if (copy_to_user(addr, vers, strlen(vers) + 1))
++		if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
+ 			break;
+ 		err = 0;
+ 		break;
+diff -urNp linux-2.6.39.4/drivers/net/r8169.c linux-2.6.39.4/drivers/net/r8169.c
+--- linux-2.6.39.4/drivers/net/r8169.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/r8169.c	2011-08-05 20:34:06.000000000 -0400
+@@ -552,12 +552,12 @@ struct rtl8169_private {
+ 	struct mdio_ops {
+ 		void (*write)(void __iomem *, int, int);
+ 		int (*read)(void __iomem *, int);
+-	} mdio_ops;
++	} __no_const mdio_ops;
+ 
+ 	struct pll_power_ops {
+ 		void (*down)(struct rtl8169_private *);
+ 		void (*up)(struct rtl8169_private *);
+-	} pll_power_ops;
++	} __no_const pll_power_ops;
+ 
+ 	int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
+ 	int (*get_settings)(struct net_device *, struct ethtool_cmd *);
+diff -urNp linux-2.6.39.4/drivers/net/tg3.h linux-2.6.39.4/drivers/net/tg3.h
+--- linux-2.6.39.4/drivers/net/tg3.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/tg3.h	2011-08-05 19:44:37.000000000 -0400
 @@ -131,6 +131,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
@@ -35800,21 +29686,82 @@ diff -urNp linux-2.6.39.3/drivers/net/tg3.h linux-2.6.39.3/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.3/drivers/net/tile/tilepro.c linux-2.6.39.3/drivers/net/tile/tilepro.c
---- linux-2.6.39.3/drivers/net/tile/tilepro.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/tile/tilepro.c	2011-05-22 19:36:31.000000000 -0400
-@@ -2263,7 +2263,7 @@ static int tile_net_get_mac(struct net_d
+diff -urNp linux-2.6.39.4/drivers/net/tokenring/abyss.c linux-2.6.39.4/drivers/net/tokenring/abyss.c
+--- linux-2.6.39.4/drivers/net/tokenring/abyss.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/tokenring/abyss.c	2011-08-05 20:34:06.000000000 -0400
+@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
+ 
+ static int __init abyss_init (void)
+ {
+-	abyss_netdev_ops = tms380tr_netdev_ops;
++	pax_open_kernel();
++	memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
+ 
+-	abyss_netdev_ops.ndo_open = abyss_open;
+-	abyss_netdev_ops.ndo_stop = abyss_close;
++	*(void **)&abyss_netdev_ops.ndo_open = abyss_open;
++	*(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
++	pax_close_kernel();
+ 
+ 	return pci_register_driver(&abyss_driver);
+ }
+diff -urNp linux-2.6.39.4/drivers/net/tokenring/madgemc.c linux-2.6.39.4/drivers/net/tokenring/madgemc.c
+--- linux-2.6.39.4/drivers/net/tokenring/madgemc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/tokenring/madgemc.c	2011-08-05 20:34:06.000000000 -0400
+@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver 
+ 
+ static int __init madgemc_init (void)
+ {
+-	madgemc_netdev_ops = tms380tr_netdev_ops;
+-	madgemc_netdev_ops.ndo_open = madgemc_open;
+-	madgemc_netdev_ops.ndo_stop = madgemc_close;
++	pax_open_kernel();
++	memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
++	*(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
++	pax_close_kernel();
+ 
+ 	return mca_register_driver (&madgemc_driver);
  }
+diff -urNp linux-2.6.39.4/drivers/net/tokenring/proteon.c linux-2.6.39.4/drivers/net/tokenring/proteon.c
+--- linux-2.6.39.4/drivers/net/tokenring/proteon.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/tokenring/proteon.c	2011-08-05 20:34:06.000000000 -0400
+@@ -353,9 +353,11 @@ static int __init proteon_init(void)
+ 	struct platform_device *pdev;
+ 	int i, num = 0, err = 0;
  
+-	proteon_netdev_ops = tms380tr_netdev_ops;
+-	proteon_netdev_ops.ndo_open = proteon_open;
+-	proteon_netdev_ops.ndo_stop = tms380tr_close;
++	pax_open_kernel();
++	memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&proteon_netdev_ops.ndo_open = proteon_open;
++	*(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
++	pax_close_kernel();
  
--static struct net_device_ops tile_net_ops = {
-+static const struct net_device_ops tile_net_ops = {
- 	.ndo_open = tile_net_open,
- 	.ndo_stop = tile_net_stop,
- 	.ndo_start_xmit = tile_net_tx,
-diff -urNp linux-2.6.39.3/drivers/net/tulip/de2104x.c linux-2.6.39.3/drivers/net/tulip/de2104x.c
---- linux-2.6.39.3/drivers/net/tulip/de2104x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/tulip/de2104x.c	2011-05-22 19:36:31.000000000 -0400
+ 	err = platform_driver_register(&proteon_driver);
+ 	if (err)
+diff -urNp linux-2.6.39.4/drivers/net/tokenring/skisa.c linux-2.6.39.4/drivers/net/tokenring/skisa.c
+--- linux-2.6.39.4/drivers/net/tokenring/skisa.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/tokenring/skisa.c	2011-08-05 20:34:06.000000000 -0400
+@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
+ 	struct platform_device *pdev;
+ 	int i, num = 0, err = 0;
+ 
+-	sk_isa_netdev_ops = tms380tr_netdev_ops;
+-	sk_isa_netdev_ops.ndo_open = sk_isa_open;
+-	sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++	pax_open_kernel();
++	memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
++	*(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++	pax_close_kernel();
+ 
+ 	err = platform_driver_register(&sk_isa_driver);
+ 	if (err)
+diff -urNp linux-2.6.39.4/drivers/net/tulip/de2104x.c linux-2.6.39.4/drivers/net/tulip/de2104x.c
+--- linux-2.6.39.4/drivers/net/tulip/de2104x.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/tulip/de2104x.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1817,6 +1817,8 @@ static void __devinit de21041_get_srom_i
  	struct de_srom_info_leaf *il;
  	void *bufp;
@@ -35824,9 +29771,9 @@ diff -urNp linux-2.6.39.3/drivers/net/tulip/de2104x.c linux-2.6.39.3/drivers/net
  	/* download entire eeprom */
  	for (i = 0; i < DE_EEPROM_WORDS; i++)
  		((__le16 *)ee_data)[i] =
-diff -urNp linux-2.6.39.3/drivers/net/tulip/de4x5.c linux-2.6.39.3/drivers/net/tulip/de4x5.c
---- linux-2.6.39.3/drivers/net/tulip/de4x5.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/tulip/de4x5.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/tulip/de4x5.c linux-2.6.39.4/drivers/net/tulip/de4x5.c
+--- linux-2.6.39.4/drivers/net/tulip/de4x5.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/tulip/de4x5.c	2011-08-05 19:44:37.000000000 -0400
 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
@@ -35845,42 +29792,9 @@ diff -urNp linux-2.6.39.3/drivers/net/tulip/de4x5.c linux-2.6.39.3/drivers/net/t
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-2.6.39.3/drivers/net/usb/asix.c linux-2.6.39.3/drivers/net/usb/asix.c
---- linux-2.6.39.3/drivers/net/usb/asix.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/usb/asix.c	2011-05-22 19:36:31.000000000 -0400
-@@ -1098,7 +1098,7 @@ out:
- 	return ret;
- }
- 
--static struct ethtool_ops ax88178_ethtool_ops = {
-+static const struct ethtool_ops ax88178_ethtool_ops = {
- 	.get_drvinfo		= asix_get_drvinfo,
- 	.get_link		= asix_get_link,
- 	.get_msglevel		= usbnet_get_msglevel,
-diff -urNp linux-2.6.39.3/drivers/net/usb/cdc_ncm.c linux-2.6.39.3/drivers/net/usb/cdc_ncm.c
---- linux-2.6.39.3/drivers/net/usb/cdc_ncm.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/usb/cdc_ncm.c	2011-06-25 13:00:26.000000000 -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;
- static struct usb_driver cdc_ncm_driver;
--static struct ethtool_ops cdc_ncm_ethtool_ops;
-+static const struct ethtool_ops cdc_ncm_ethtool_ops;
- 
- static const struct usb_device_id cdc_devs[] = {
- 	{ USB_INTERFACE_INFO(USB_CLASS_COMM,
-@@ -1258,7 +1258,7 @@ static struct usb_driver cdc_ncm_driver 
- 	.supports_autosuspend = 1,
- };
- 
--static struct ethtool_ops cdc_ncm_ethtool_ops = {
-+static const struct ethtool_ops cdc_ncm_ethtool_ops = {
- 	.get_drvinfo = cdc_ncm_get_drvinfo,
- 	.get_link = usbnet_get_link,
- 	.get_msglevel = usbnet_get_msglevel,
-diff -urNp linux-2.6.39.3/drivers/net/usb/hso.c linux-2.6.39.3/drivers/net/usb/hso.c
---- linux-2.6.39.3/drivers/net/usb/hso.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/usb/hso.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/usb/hso.c linux-2.6.39.4/drivers/net/usb/hso.c
+--- linux-2.6.39.4/drivers/net/usb/hso.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/usb/hso.c	2011-08-05 19:44:37.000000000 -0400
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -35977,33 +29891,9 @@ diff -urNp linux-2.6.39.3/drivers/net/usb/hso.c linux-2.6.39.3/drivers/net/usb/h
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.39.3/drivers/net/usb/ipheth.c linux-2.6.39.3/drivers/net/usb/ipheth.c
---- linux-2.6.39.3/drivers/net/usb/ipheth.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/usb/ipheth.c	2011-05-22 19:36:31.000000000 -0400
-@@ -421,7 +421,7 @@ static u32 ipheth_ethtool_op_get_link(st
- 	return netif_carrier_ok(dev->net);
- }
- 
--static struct ethtool_ops ops = {
-+static const struct ethtool_ops ops = {
- 	.get_link = ipheth_ethtool_op_get_link
- };
- 
-diff -urNp linux-2.6.39.3/drivers/net/usb/sierra_net.c linux-2.6.39.3/drivers/net/usb/sierra_net.c
---- linux-2.6.39.3/drivers/net/usb/sierra_net.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/usb/sierra_net.c	2011-05-22 19:36:31.000000000 -0400
-@@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct ne
- 	return sierra_net_get_private(dev)->link_up && netif_running(net);
- }
- 
--static struct ethtool_ops sierra_net_ethtool_ops = {
-+static const struct ethtool_ops sierra_net_ethtool_ops = {
- 	.get_drvinfo = sierra_net_get_drvinfo,
- 	.get_link = sierra_net_get_link,
- 	.get_msglevel = usbnet_get_msglevel,
-diff -urNp linux-2.6.39.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.39.3/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-2.6.39.3/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.39.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-2.6.39.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-08-05 19:44:37.000000000 -0400
 @@ -631,8 +631,7 @@ vmxnet3_set_rss_indir(struct net_device 
  		 * Return with error code if any of the queue indices
  		 * is out of range
@@ -36014,9 +29904,21 @@ diff -urNp linux-2.6.39.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.39.3/d
  			return -EINVAL;
  	}
  
-diff -urNp linux-2.6.39.3/drivers/net/vxge/vxge-main.c linux-2.6.39.3/drivers/net/vxge/vxge-main.c
---- linux-2.6.39.3/drivers/net/vxge/vxge-main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/vxge/vxge-main.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/vxge/vxge-config.h linux-2.6.39.4/drivers/net/vxge/vxge-config.h
+--- linux-2.6.39.4/drivers/net/vxge/vxge-config.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/vxge/vxge-config.h	2011-08-05 20:34:06.000000000 -0400
+@@ -508,7 +508,7 @@ struct vxge_hw_uld_cbs {
+ 	void (*link_down)(struct __vxge_hw_device *devh);
+ 	void (*crit_err)(struct __vxge_hw_device *devh,
+ 			enum vxge_hw_event type, u64 ext_data);
+-};
++} __no_const;
+ 
+ /*
+  * struct __vxge_hw_blockpool_entry - Block private data structure
+diff -urNp linux-2.6.39.4/drivers/net/vxge/vxge-main.c linux-2.6.39.4/drivers/net/vxge/vxge-main.c
+--- linux-2.6.39.4/drivers/net/vxge/vxge-main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/vxge/vxge-main.c	2011-08-05 19:44:37.000000000 -0400
 @@ -97,6 +97,8 @@ static inline void VXGE_COMPLETE_VPATH_T
  	struct sk_buff *completed[NR_SKB_COMPLETED];
  	int more;
@@ -36035,9 +29937,21 @@ diff -urNp linux-2.6.39.3/drivers/net/vxge/vxge-main.c linux-2.6.39.3/drivers/ne
  	/*
  	 * Filling
  	 * 	- itable with bucket numbers
-diff -urNp linux-2.6.39.3/drivers/net/wan/cycx_x25.c linux-2.6.39.3/drivers/net/wan/cycx_x25.c
---- linux-2.6.39.3/drivers/net/wan/cycx_x25.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wan/cycx_x25.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/vxge/vxge-traffic.h linux-2.6.39.4/drivers/net/vxge/vxge-traffic.h
+--- linux-2.6.39.4/drivers/net/vxge/vxge-traffic.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/vxge/vxge-traffic.h	2011-08-05 20:34:06.000000000 -0400
+@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
+ 			struct vxge_hw_mempool_dma	*dma_object,
+ 			u32			index,
+ 			u32			is_last);
+-};
++} __no_const;
+ 
+ #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath)				\
+ 		((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
+diff -urNp linux-2.6.39.4/drivers/net/wan/cycx_x25.c linux-2.6.39.4/drivers/net/wan/cycx_x25.c
+--- linux-2.6.39.4/drivers/net/wan/cycx_x25.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wan/cycx_x25.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
  	unsigned char hex[1024],
  	    	* phex = hex;
@@ -36047,33 +29961,37 @@ diff -urNp linux-2.6.39.3/drivers/net/wan/cycx_x25.c linux-2.6.39.3/drivers/net/
  	if (len >= (sizeof(hex) / 2))
  		len = (sizeof(hex) / 2) - 1;
  
-diff -urNp linux-2.6.39.3/drivers/net/wan/lapbether.c linux-2.6.39.3/drivers/net/wan/lapbether.c
---- linux-2.6.39.3/drivers/net/wan/lapbether.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wan/lapbether.c	2011-05-22 19:36:31.000000000 -0400
-@@ -259,7 +259,7 @@ static int lapbeth_set_mac_address(struc
- }
- 
- 
--static struct lapb_register_struct lapbeth_callbacks = {
-+static const struct lapb_register_struct lapbeth_callbacks = {
- 	.connect_confirmation    = lapbeth_connected,
- 	.connect_indication      = lapbeth_connected,
- 	.disconnect_confirmation = lapbeth_disconnected,
-diff -urNp linux-2.6.39.3/drivers/net/wan/x25_asy.c linux-2.6.39.3/drivers/net/wan/x25_asy.c
---- linux-2.6.39.3/drivers/net/wan/x25_asy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wan/x25_asy.c	2011-05-22 19:36:31.000000000 -0400
-@@ -434,7 +434,7 @@ static void x25_asy_disconnected(struct 
- 	netif_rx(skb);
- }
- 
--static struct lapb_register_struct x25_asy_callbacks = {
-+static const struct lapb_register_struct x25_asy_callbacks = {
- 	.connect_confirmation = x25_asy_connected,
- 	.connect_indication = x25_asy_connected,
- 	.disconnect_confirmation = x25_asy_disconnected,
-diff -urNp linux-2.6.39.3/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.39.3/drivers/net/wimax/i2400m/usb-fw.c
---- linux-2.6.39.3/drivers/net/wimax/i2400m/usb-fw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wimax/i2400m/usb-fw.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wan/hdlc_x25.c linux-2.6.39.4/drivers/net/wan/hdlc_x25.c
+--- linux-2.6.39.4/drivers/net/wan/hdlc_x25.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wan/hdlc_x25.c	2011-08-05 20:34:06.000000000 -0400
+@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
+ 
+ static int x25_open(struct net_device *dev)
+ {
+-	struct lapb_register_struct cb;
++	static struct lapb_register_struct cb = {
++		.connect_confirmation = x25_connected,
++		.connect_indication = x25_connected,
++		.disconnect_confirmation = x25_disconnected,
++		.disconnect_indication = x25_disconnected,
++		.data_indication = x25_data_indication,
++		.data_transmit = x25_data_transmit
++	};
+ 	int result;
+ 
+-	cb.connect_confirmation = x25_connected;
+-	cb.connect_indication = x25_connected;
+-	cb.disconnect_confirmation = x25_disconnected;
+-	cb.disconnect_indication = x25_disconnected;
+-	cb.data_indication = x25_data_indication;
+-	cb.data_transmit = x25_data_transmit;
+-
+ 	result = lapb_register(dev, &cb);
+ 	if (result != LAPB_OK)
+ 		return result;
+diff -urNp linux-2.6.39.4/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.39.4/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-2.6.39.4/drivers/net/wimax/i2400m/usb-fw.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wimax/i2400m/usb-fw.c	2011-08-05 19:44:37.000000000 -0400
 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
  	int do_autopm = 1;
  	DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -36083,9 +30001,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.39.3/drive
  	d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
  		  i2400m, ack, ack_size);
  	BUG_ON(_ack == i2400m->bm_ack_buf);
-diff -urNp linux-2.6.39.3/drivers/net/wireless/airo.c linux-2.6.39.3/drivers/net/wireless/airo.c
---- linux-2.6.39.3/drivers/net/wireless/airo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/airo.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/airo.c linux-2.6.39.4/drivers/net/wireless/airo.c
+--- linux-2.6.39.4/drivers/net/wireless/airo.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/airo.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3001,6 +3001,8 @@ static void airo_process_scan_results (s
  	BSSListElement * loop_net;
  	BSSListElement * tmp_net;
@@ -36140,9 +30058,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/airo.c linux-2.6.39.3/drivers/net
  	/* Get stats out of the card */
  	clear_bit(JOB_WSTATS, &local->jobs);
  	if (local->power.event) {
-diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.39.3/drivers/net/wireless/ath/ath5k/debug.c
---- linux-2.6.39.3/drivers/net/wireless/ath/ath5k/debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/ath/ath5k/debug.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.39.4/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-2.6.39.4/drivers/net/wireless/ath/ath5k/debug.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ath/ath5k/debug.c	2011-08-05 19:44:37.000000000 -0400
 @@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
  	unsigned int v;
  	u64 tsf;
@@ -36206,9 +30124,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.39.3/
  	len += snprintf(buf+len, sizeof(buf)-len,
  			"available txbuffers: %d\n", sc->txbuf_len);
  
-diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c
---- linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-08-05 19:44:37.000000000 -0400
 @@ -734,6 +734,8 @@ static void ar9003_hw_tx_iq_cal(struct a
  	s32 i, j, ip, im, nmeasurement;
  	u8 nchains = get_streams(common->tx_chainmask);
@@ -36227,9 +30145,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2.
  	for (i = 0; i < AR9300_MAX_CHAINS; i++) {
  		if (ah->txchainmask & (1 << i))
  			num_chains++;
-diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
---- linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-08-05 19:44:37.000000000 -0400
 @@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
  	int theta_low_bin = 0;
  	int i;
@@ -36239,9 +30157,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-2.
  	/* disregard any bin that contains <= 16 samples */
  	thresh_accum_cnt = 16;
  	scale_factor = 5;
-diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.39.3/drivers/net/wireless/ath/ath9k/debug.c
---- linux-2.6.39.3/drivers/net/wireless/ath/ath9k/debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/ath/ath9k/debug.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.39.4/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-2.6.39.4/drivers/net/wireless/ath/ath9k/debug.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ath/ath9k/debug.c	2011-08-05 19:44:37.000000000 -0400
 @@ -335,6 +335,8 @@ static ssize_t read_file_interrupt(struc
  	char buf[512];
  	unsigned int len = 0;
@@ -36260,9 +30178,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.39.3/
  	len += snprintf(buf + len, sizeof(buf) - len,
  			"%s (chan=%d  center-freq: %d MHz  channel-type: %d (%s))\n",
  			wiphy_name(sc->hw->wiphy),
-diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc_drv_main.c
---- linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc_drv_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc_drv_main.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2.6.39.4/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+--- linux-2.6.39.4/drivers/net/wireless/ath/ath9k/htc_drv_main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ath/ath9k/htc_drv_main.c	2011-08-05 20:34:06.000000000 -0400
 @@ -737,6 +737,8 @@ static ssize_t read_file_tgt_stats(struc
  	unsigned int len = 0;
  	int ret = 0;
@@ -36290,54 +30208,30 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2.
  	len += snprintf(buf + len, sizeof(buf) - len,
  			"%20s : %10u\n", "SKBs allocated",
  			priv->debug.rx_stats.skb_allocated);
-@@ -1816,7 +1822,7 @@ static void ath9k_htc_set_coverage_class
- 	mutex_unlock(&priv->mutex);
- }
- 
--struct ieee80211_ops ath9k_htc_ops = {
-+const struct ieee80211_ops ath9k_htc_ops = {
- 	.tx                 = ath9k_htc_tx,
- 	.start              = ath9k_htc_start,
- 	.stop               = ath9k_htc_stop,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc.h linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc.h
---- linux-2.6.39.3/drivers/net/wireless/ath/ath9k/htc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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))
- 
--extern struct ieee80211_ops ath9k_htc_ops;
-+extern const struct ieee80211_ops ath9k_htc_ops;
- extern int htc_modparam_nohwcrypt;
- 
- enum htc_phymode {
-diff -urNp linux-2.6.39.3/drivers/net/wireless/b43/debugfs.c linux-2.6.39.3/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.39.3/drivers/net/wireless/b43/debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/b43/debugfs.c	2011-05-22 19:36:31.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);
- 	int (*write)(struct b43_wldev *dev, const char *buf, size_t count);
--	struct file_operations fops;
-+	const struct file_operations fops;
- 	/* Offset of struct b43_dfs_file in struct b43_dfsentry */
- 	size_t file_struct_offset;
- };
-diff -urNp linux-2.6.39.3/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.39.3/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.39.3/drivers/net/wireless/b43legacy/debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/b43legacy/debugfs.c	2011-05-22 19: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);
- 	int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count);
--	struct file_operations fops;
-+	const struct file_operations fops;
- 	/* 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.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.39.3/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-2.6.39.3/drivers/net/wireless/ipw2x00/ipw2100.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/ipw2x00/ipw2100.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ath/ath9k/hw.h linux-2.6.39.4/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-2.6.39.4/drivers/net/wireless/ath/ath9k/hw.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ath/ath9k/hw.h	2011-08-05 20:34:06.000000000 -0400
+@@ -592,7 +592,7 @@ struct ath_hw_private_ops {
+ 
+ 	/* ANI */
+ 	void (*ani_cache_ini_regs)(struct ath_hw *ah);
+-};
++} __no_const;
+ 
+ /**
+  * struct ath_hw_ops - callbacks used by hardware code and driver code
+@@ -642,7 +642,7 @@ struct ath_hw_ops {
+ 				     u32 burstDuration);
+ 	void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds,
+ 				       u32 vmf);
+-};
++} __no_const;
+ 
+ struct ath_nf_limits {
+ 	s16 max;
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.39.4/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-2.6.39.4/drivers/net/wireless/ipw2x00/ipw2100.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ipw2x00/ipw2100.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
  	int err;
  	DECLARE_SSID_BUF(ssid);
@@ -36356,9 +30250,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.39.3/
  	IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
  		     idx, keylen, len);
  
-diff -urNp linux-2.6.39.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.39.3/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-2.6.39.3/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-05-22 19:36:31.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.39.4/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-2.6.39.4/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
  	unsigned long flags;
  	DECLARE_SSID_BUF(ssid);
@@ -36368,162 +30262,37 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.39.
  	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.3/drivers/net/wireless/iwlegacy/iwl-3945.c linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-3945.c
---- linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-3945.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-3945.c	2011-05-22 19:36:31.000000000 -0400
-@@ -2630,7 +2630,7 @@ static int iwl3945_load_bsm(struct iwl_p
- 	return 0;
- }
- 
--static struct iwl_hcmd_ops iwl3945_hcmd = {
-+static const struct iwl_hcmd_ops iwl3945_hcmd = {
- 	.rxon_assoc = iwl3945_send_rxon_assoc,
- 	.commit_rxon = iwl3945_commit_rxon,
- };
-@@ -2675,7 +2675,7 @@ static const struct iwl_legacy_ops iwl39
- 	.manage_ibss_station = iwl3945_manage_ibss_station,
- };
- 
--static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
-+static const struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
- 	.get_hcmd_size = iwl3945_get_hcmd_size,
- 	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
- 	.request_scan = iwl3945_request_scan,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.c linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.c
---- linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.c	2011-06-25 13:00:26.000000000 -0400
-@@ -1902,7 +1902,7 @@ static void iwl4965_rx_handler_setup(str
- 	priv->rx_handlers[BEACON_NOTIFICATION] = iwl4965_rx_beacon_notif;
- }
- 
--static struct iwl_hcmd_ops iwl4965_hcmd = {
-+static const struct iwl_hcmd_ops iwl4965_hcmd = {
- 	.rxon_assoc = iwl4965_send_rxon_assoc,
- 	.commit_rxon = iwl4965_commit_rxon,
- 	.set_rxon_chain = iwl4965_set_rxon_chain,
-@@ -2054,7 +2054,7 @@ static void iwl4965_config_ap(struct iwl
- 	iwl4965_send_beacon_cmd(priv);
- }
- 
--static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {
-+static const struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {
- 	.get_hcmd_size = iwl4965_get_hcmd_size,
- 	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,
- 	.request_scan = iwl4965_request_scan,
-@@ -2112,7 +2112,7 @@ static const struct iwl_legacy_ops iwl49
- 	.update_bcast_stations = iwl4965_update_bcast_stations,
- };
- 
--struct ieee80211_ops iwl4965_hw_ops = {
-+const struct ieee80211_ops iwl4965_hw_ops = {
- 	.tx = iwl4965_mac_tx,
- 	.start = iwl4965_mac_start,
- 	.stop = iwl4965_mac_stop,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.h linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.h
---- linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-4965.h	2011-05-22 19:36:32.000000000 -0400
-@@ -70,7 +70,7 @@ extern struct iwl_cfg iwl4965_cfg;
- 
- extern struct iwl_mod_params iwl4965_mod_params;
- 
--extern struct ieee80211_ops iwl4965_hw_ops;
-+extern const struct ieee80211_ops iwl4965_hw_ops;
- 
- /* tx queue */
- void iwl4965_free_tfds_in_queue(struct iwl_priv *priv,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-core.h linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-core.h
---- linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-core.h	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlegacy/iwl-core.h	2011-06-25 13:00:26.000000000 -0400
-@@ -150,7 +150,7 @@ struct iwl_lib_ops {
- 	int (*set_channel_switch)(struct iwl_priv *priv,
- 				  struct ieee80211_channel_switch *ch_switch);
- 	/* power management */
--	struct iwl_apm_ops apm_ops;
-+	const struct iwl_apm_ops apm_ops;
- 
- 	/* power */
- 	int (*send_tx_power) (struct iwl_priv *priv);
-@@ -160,12 +160,12 @@ struct iwl_lib_ops {
- 	struct iwl_eeprom_ops eeprom_ops;
- 
- 	/* temperature */
--	struct iwl_temp_ops temp_ops;
-+	const struct iwl_temp_ops temp_ops;
- 	/* check for plcp health */
- 	bool (*check_plcp_health)(struct iwl_priv *priv,
- 					struct iwl_rx_packet *pkt);
- 
--	struct iwl_debugfs_ops debugfs_ops;
-+	const struct iwl_debugfs_ops debugfs_ops;
- 
- };
- 
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-06-25 13:00:26.000000000 -0400
-@@ -420,11 +420,11 @@ static struct iwl_lib_ops iwl6030_lib = 
+diff -urNp linux-2.6.39.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-2.6.39.4/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-2.6.39.4/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-08-05 20:34:06.000000000 -0400
+@@ -3958,7 +3958,9 @@ static int iwl3945_pci_probe(struct pci_
+ 	 */
+ 	if (iwl3945_mod_params.disable_hw_scan) {
+ 		IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
+-		iwl3945_hw_ops.hw_scan = NULL;
++		pax_open_kernel();
++		*(void **)&iwl3945_hw_ops.hw_scan = NULL;
++		pax_close_kernel();
  	}
- };
- 
--static struct iwl_nic_ops iwl6050_nic_ops = {
-+static const struct iwl_nic_ops iwl6050_nic_ops = {
- 	.additional_nic_config = &iwl6050_additional_nic_config,
- };
  
--static struct iwl_nic_ops iwl6150_nic_ops = {
-+static const struct iwl_nic_ops iwl6150_nic_ops = {
- 	.additional_nic_config = &iwl6150_additional_nic_config,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn.h linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn.h
---- linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 
- extern struct iwl_mod_params iwlagn_mod_params;
--extern struct iwl_hcmd_ops iwlagn_hcmd;
--extern struct iwl_hcmd_ops iwlagn_bt_hcmd;
--extern struct iwl_hcmd_utils_ops iwlagn_hcmd_utils;
-+extern const struct iwl_hcmd_ops iwlagn_hcmd;
-+extern const struct iwl_hcmd_ops iwlagn_bt_hcmd;
-+extern const struct iwl_hcmd_utils_ops iwlagn_hcmd_utils;
- 
- extern struct ieee80211_ops iwlagn_hw_ops;
- extern struct ieee80211_ops iwl4965_hw_ops;
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
---- linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c	2011-06-25 13:00:26.000000000 -0400
-@@ -355,7 +355,7 @@ static int iwlagn_set_pan_params(struct 
- 	return ret;
- }
- 
--struct iwl_hcmd_ops iwlagn_hcmd = {
-+const struct iwl_hcmd_ops iwlagn_hcmd = {
- 	.rxon_assoc = iwlagn_send_rxon_assoc,
- 	.commit_rxon = iwlagn_commit_rxon,
- 	.set_rxon_chain = iwlagn_set_rxon_chain,
-@@ -364,7 +364,7 @@ struct iwl_hcmd_ops iwlagn_hcmd = {
- 	.set_pan_params = iwlagn_set_pan_params,
- };
- 
--struct iwl_hcmd_ops iwlagn_bt_hcmd = {
-+const struct iwl_hcmd_ops iwlagn_bt_hcmd = {
- 	.rxon_assoc = iwlagn_send_rxon_assoc,
- 	.commit_rxon = iwlagn_commit_rxon,
- 	.set_rxon_chain = iwlagn_set_rxon_chain,
-@@ -373,7 +373,7 @@ struct iwl_hcmd_ops iwlagn_bt_hcmd = {
- 	.set_pan_params = iwlagn_set_pan_params,
- };
+ 	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
+diff -urNp linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn.c
+--- linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-08-05 20:34:06.000000000 -0400
+@@ -3974,7 +3974,9 @@ static int iwl_pci_probe(struct pci_dev 
+ 	if (cfg->mod_params->disable_hw_scan) {
+ 		dev_printk(KERN_DEBUG, &(pdev->dev),
+ 			"sw scan support is deprecated\n");
+-		iwlagn_hw_ops.hw_scan = NULL;
++		pax_open_kernel();
++		*(void **)&iwlagn_hw_ops.hw_scan = NULL;
++		pax_close_kernel();
+ 	}
  
--struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = {
-+const struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = {
- 	.get_hcmd_size = iwlagn_get_hcmd_size,
- 	.build_addsta_hcmd = iwlagn_build_addsta_hcmd,
- 	.gain_computation = iwlagn_gain_computation,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-05-22 19:36:32.000000000 -0400
+ 	hw = iwl_alloc_all(cfg);
+diff -urNp linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -883,6 +883,8 @@ static void rs_tx_status(void *priv_r, s
  	struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
  	struct iwl_rxon_context *ctx = sta_priv->common.ctx;
@@ -36542,45 +30311,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.39
  	/* Override starting rate (index 0) if needed for debug purposes */
  	rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-core.h linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-core.h
---- linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-core.h	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-core.h	2011-06-25 13:00:26.000000000 -0400
-@@ -198,28 +198,25 @@ struct iwl_lib_ops {
- 	int (*set_channel_switch)(struct iwl_priv *priv,
- 				  struct ieee80211_channel_switch *ch_switch);
- 	/* power management */
--	struct iwl_apm_ops apm_ops;
-+	const struct iwl_apm_ops apm_ops;
- 
- 	/* power */
- 	int (*send_tx_power) (struct iwl_priv *priv);
- 	void (*update_chain_flags)(struct iwl_priv *priv);
- 
- 	/* isr */
--	struct iwl_isr_ops isr_ops;
-+	const struct iwl_isr_ops isr_ops;
- 
- 	/* eeprom operations (as defined in iwl-eeprom.h) */
- 	struct iwl_eeprom_ops eeprom_ops;
- 
- 	/* temperature */
--	struct iwl_temp_ops temp_ops;
-+	const struct iwl_temp_ops temp_ops;
- 
- 	int (*txfifo_flush)(struct iwl_priv *priv, u16 flush_control);
- 	void (*dev_txfifo_flush)(struct iwl_priv *priv, u16 flush_control);
- 
--	struct iwl_debugfs_ops debugfs_ops;
--
--	/* thermal throttling */
--	struct iwl_tt_ops tt_ops;
-+	const struct iwl_debugfs_ops debugfs_ops;const struct iwl_tt_ops tt_ops;
- };
- 
- struct iwl_led_ops {
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -549,6 +549,8 @@ static ssize_t iwl_dbgfs_status_read(str
  	int pos = 0;
  	const size_t bufsz = sizeof(buf);
@@ -36599,9 +30332,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.3
  	for_each_context(priv, ctx) {
  		pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
  				 ctx->ctxid);
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-08-05 19:44:37.000000000 -0400
 @@ -68,8 +68,8 @@ do {                                    
  } while (0)
  
@@ -36613,21 +30346,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.39.
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
  				      const void *p, u32 len)
  {}
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/cfg80211.c linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/cfg80211.c
---- linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/cfg80211.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- 
--static struct cfg80211_ops iwm_cfg80211_ops = {
-+static const struct cfg80211_ops iwm_cfg80211_ops = {
- 	.change_virtual_intf = iwm_cfg80211_change_iface,
- 	.add_key = iwm_cfg80211_add_key,
- 	.get_key = iwm_cfg80211_get_key,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.39.4/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-2.6.39.4/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
  	int buf_len = 512;
  	size_t len = 0;
@@ -36637,33 +30358,27 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.
  	if (*ppos != 0)
  		return 0;
  	if (count < sizeof(buf))
-diff -urNp linux-2.6.39.3/drivers/net/wireless/libertas/cfg.c linux-2.6.39.3/drivers/net/wireless/libertas/cfg.c
---- linux-2.6.39.3/drivers/net/wireless/libertas/cfg.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
+diff -urNp linux-2.6.39.4/drivers/net/wireless/mac80211_hwsim.c linux-2.6.39.4/drivers/net/wireless/mac80211_hwsim.c
+--- linux-2.6.39.4/drivers/net/wireless/mac80211_hwsim.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/mac80211_hwsim.c	2011-08-05 20:34:06.000000000 -0400
+@@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo
+ 		return -EINVAL;
  
--static struct cfg80211_ops lbs_cfg80211_ops = {
-+static const struct cfg80211_ops lbs_cfg80211_ops = {
- 	.set_channel = lbs_cfg_set_channel,
- 	.scan = lbs_cfg_scan,
- 	.connect = lbs_cfg_connect,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/libertas/debugfs.c linux-2.6.39.3/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.39.3/drivers/net/wireless/libertas/debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	int perm;
--	struct file_operations fops;
-+	const struct file_operations fops;
- };
+ 	if (fake_hw_scan) {
+-		mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
+-		mac80211_hwsim_ops.sw_scan_start = NULL;
+-		mac80211_hwsim_ops.sw_scan_complete = NULL;
++		pax_open_kernel();
++		*(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
++		*(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
++		*(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
++		pax_close_kernel();
+ 	}
  
- static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rndis_wlan.c linux-2.6.39.3/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.39.3/drivers/net/wireless/rndis_wlan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/rndis_wlan.c	2011-05-22 19:36:32.000000000 -0400
+ 	spin_lock_init(&hwsim_radio_lock);
+diff -urNp linux-2.6.39.4/drivers/net/wireless/rndis_wlan.c linux-2.6.39.4/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.39.4/drivers/net/wireless/rndis_wlan.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/rndis_wlan.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
  
  	netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -36673,33 +30388,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/rndis_wlan.c linux-2.6.39.3/drive
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.c linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.c
---- linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1869,7 +1869,7 @@ int rtl_pci_resume(struct pci_dev *pdev)
- }
- EXPORT_SYMBOL(rtl_pci_resume);
- 
--struct rtl_intf_ops rtl_pci_ops = {
-+const struct rtl_intf_ops rtl_pci_ops = {
- 	.adapter_start = rtl_pci_start,
- 	.adapter_stop = rtl_pci_stop,
- 	.adapter_tx = rtl_pci_tx,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.h linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.h
---- linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/rtlwifi/pci.h	2011-05-22 19:36:32.000000000 -0400
-@@ -234,7 +234,7 @@ struct rtl_pci_priv {
- 
- int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw);
- 
--extern struct rtl_intf_ops rtl_pci_ops;
-+extern const struct rtl_intf_ops rtl_pci_ops;
- 
- int __devinit rtl_pci_probe(struct pci_dev *pdev,
- 			    const struct pci_device_id *id);
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
---- linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-2.6.39.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-2.6.39.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-08-05 19:44:37.000000000 -0400
 @@ -827,6 +827,8 @@ static bool _rtl92c_phy_sw_chnl_step_by_
  	u8 rfpath;
  	u8 num_total_rfpath = rtlphy->num_total_rfpath;
@@ -36709,84 +30400,21 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c lin
  	precommoncmdcnt = 0;
  	_rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
  					 MAX_PRECMD_CNT,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
---- linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c	2011-05-22 19:36:32.000000000 -0400
-@@ -96,7 +96,7 @@ void rtl92c_deinit_sw_vars(struct ieee80
- 	}
- }
- 
--static struct rtl_hal_ops rtl8192ce_hal_ops = {
-+static const struct rtl_hal_ops rtl8192ce_hal_ops = {
- 	.init_sw_vars = rtl92c_init_sw_vars,
- 	.deinit_sw_vars = rtl92c_deinit_sw_vars,
- 	.read_eeprom_info = rtl92ce_read_eeprom_info,
-@@ -151,7 +151,7 @@ static struct rtl_mod_params rtl92ce_mod
- 	.sw_crypto = 0,
- };
- 
--static struct rtl_hal_cfg rtl92ce_hal_cfg = {
-+static const struct rtl_hal_cfg rtl92ce_hal_cfg = {
- 	.name = "rtl92c_pci",
- 	.fw_name = "rtlwifi/rtl8192cfw.bin",
- 	.ops = &rtl8192ce_hal_ops,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
---- linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c	2011-05-22 19:36:32.000000000 -0400
-@@ -77,7 +77,7 @@ static void rtl92cu_deinit_sw_vars(struc
- 	}
- }
- 
--static struct rtl_hal_ops rtl8192cu_hal_ops = {
-+static const struct rtl_hal_ops rtl8192cu_hal_ops = {
- 	.init_sw_vars = rtl92cu_init_sw_vars,
- 	.deinit_sw_vars = rtl92cu_deinit_sw_vars,
- 	.read_chip_version = rtl92c_read_chip_version,
-@@ -147,7 +147,7 @@ static struct rtl_hal_usbint_cfg rtl92cu
- 	.usb_mq_to_hwq = rtl8192cu_mq_to_hwq,
- };
- 
--static struct rtl_hal_cfg rtl92cu_hal_cfg = {
-+static const struct rtl_hal_cfg rtl92cu_hal_cfg = {
- 	.name = "rtl92c_usb",
- 	.fw_name = "rtlwifi/rtl8192cufw.bin",
- 	.ops = &rtl8192cu_hal_ops,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/usb.c linux-2.6.39.3/drivers/net/wireless/rtlwifi/usb.c
---- linux-2.6.39.3/drivers/net/wireless/rtlwifi/usb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/rtlwifi/usb.c	2011-05-22 19:36:32.000000000 -0400
-@@ -913,7 +913,7 @@ static bool rtl_usb_tx_chk_waitq_insert(
- 	return false;
- }
- 
--static struct rtl_intf_ops rtl_usb_ops = {
-+static const struct rtl_intf_ops rtl_usb_ops = {
- 	.adapter_start = rtl_usb_start,
- 	.adapter_stop = rtl_usb_stop,
- 	.adapter_tx = rtl_usb_tx,
-diff -urNp linux-2.6.39.3/drivers/net/wireless/rtlwifi/wifi.h linux-2.6.39.3/drivers/net/wireless/rtlwifi/wifi.h
---- linux-2.6.39.3/drivers/net/wireless/rtlwifi/wifi.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	char *fw_name;
--	struct rtl_hal_ops *ops;
-+	const struct rtl_hal_ops *ops;
- 	struct rtl_mod_params *mod_params;
- 	struct rtl_hal_usbint_cfg *usb_interface_cfg;
- 
-@@ -1533,7 +1533,7 @@ struct rtl_priv {
- 	 *intf_ops : for diff interrface usb/pcie
- 	 */
- 	struct rtl_hal_cfg *cfg;
--	struct rtl_intf_ops *intf_ops;
-+	const struct rtl_intf_ops *intf_ops;
- 
- 	/*this var will be set by set_bit,
- 	   and was used to indicate status of
-diff -urNp linux-2.6.39.3/drivers/net/wireless/wl12xx/spi.c linux-2.6.39.3/drivers/net/wireless/wl12xx/spi.c
---- linux-2.6.39.3/drivers/net/wireless/wl12xx/spi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/wireless/wl12xx/spi.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/net/wireless/wl1251/wl1251.h linux-2.6.39.4/drivers/net/wireless/wl1251/wl1251.h
+--- linux-2.6.39.4/drivers/net/wireless/wl1251/wl1251.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/wl1251/wl1251.h	2011-08-05 20:34:06.000000000 -0400
+@@ -260,7 +260,7 @@ struct wl1251_if_operations {
+ 	void (*reset)(struct wl1251 *wl);
+ 	void (*enable_irq)(struct wl1251 *wl);
+ 	void (*disable_irq)(struct wl1251 *wl);
+-};
++} __no_const;
+ 
+ struct wl1251 {
+ 	struct ieee80211_hw *hw;
+diff -urNp linux-2.6.39.4/drivers/net/wireless/wl12xx/spi.c linux-2.6.39.4/drivers/net/wireless/wl12xx/spi.c
+--- linux-2.6.39.4/drivers/net/wireless/wl12xx/spi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/net/wireless/wl12xx/spi.c	2011-08-05 19:44:37.000000000 -0400
 @@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct 
  	u32 chunk_len;
  	int i;
@@ -36796,93 +30424,9 @@ diff -urNp linux-2.6.39.3/drivers/net/wireless/wl12xx/spi.c linux-2.6.39.3/drive
  	WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
  
  	spi_message_init(&m);
-diff -urNp linux-2.6.39.3/drivers/net/xen-netback/interface.c linux-2.6.39.3/drivers/net/xen-netback/interface.c
---- linux-2.6.39.3/drivers/net/xen-netback/interface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 	}
- }
- 
--static struct ethtool_ops xenvif_ethtool_ops = {
-+static const struct ethtool_ops xenvif_ethtool_ops = {
- 	.get_tx_csum	= ethtool_op_get_tx_csum,
- 	.set_tx_csum	= xenvif_set_tx_csum,
- 	.get_sg		= ethtool_op_get_sg,
-diff -urNp linux-2.6.39.3/drivers/net/xilinx_emaclite.c linux-2.6.39.3/drivers/net/xilinx_emaclite.c
---- linux-2.6.39.3/drivers/net/xilinx_emaclite.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/net/xilinx_emaclite.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1085,7 +1085,7 @@ static bool get_bool(struct platform_dev
- 	}
- }
- 
--static struct net_device_ops xemaclite_netdev_ops;
-+static const struct net_device_ops xemaclite_netdev_ops;
- 
- /**
-  * xemaclite_of_probe - Probe method for the Emaclite device.
-@@ -1264,7 +1264,7 @@ xemaclite_poll_controller(struct net_dev
- }
- #endif
- 
--static struct net_device_ops xemaclite_netdev_ops = {
-+static const struct net_device_ops xemaclite_netdev_ops = {
- 	.ndo_open		= xemaclite_open,
- 	.ndo_stop		= xemaclite_close,
- 	.ndo_start_xmit		= xemaclite_send,
-diff -urNp linux-2.6.39.3/drivers/nfc/pn544.c linux-2.6.39.3/drivers/nfc/pn544.c
---- linux-2.6.39.3/drivers/nfc/pn544.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/nfc/pn544.c	2011-05-22 19:36:32.000000000 -0400
-@@ -89,7 +89,7 @@ static ssize_t pn544_test(struct device 
- 
- static int pn544_enable(struct pn544_info *info, int mode)
- {
--	struct pn544_nfc_platform_data *pdata;
-+	const struct pn544_nfc_platform_data *pdata;
- 	struct i2c_client *client = info->i2c_dev;
- 
- 	int r;
-@@ -118,7 +118,7 @@ static int pn544_enable(struct pn544_inf
- 
- static void pn544_disable(struct pn544_info *info)
- {
--	struct pn544_nfc_platform_data *pdata;
-+	const struct pn544_nfc_platform_data *pdata;
- 	struct i2c_client *client = info->i2c_dev;
- 
- 	pdata = client->dev.platform_data;
-@@ -509,7 +509,7 @@ static long pn544_ioctl(struct file *fil
- 	struct pn544_info *info = container_of(file->private_data,
- 					       struct pn544_info, miscdev);
- 	struct i2c_client *client = info->i2c_dev;
--	struct pn544_nfc_platform_data *pdata;
-+	const struct pn544_nfc_platform_data *pdata;
- 	unsigned int val;
- 	int r = 0;
- 
-@@ -715,7 +715,7 @@ static int __devinit pn544_probe(struct 
- 				 const struct i2c_device_id *id)
- {
- 	struct pn544_info *info;
--	struct pn544_nfc_platform_data *pdata;
-+	const struct pn544_nfc_platform_data *pdata;
- 	int r = 0;
- 
- 	dev_dbg(&client->dev, "%s\n", __func__);
-diff -urNp linux-2.6.39.3/drivers/of/pdt.c linux-2.6.39.3/drivers/of/pdt.c
---- linux-2.6.39.3/drivers/of/pdt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/of/pdt.c	2011-05-22 19:36:32.000000000 -0400
-@@ -24,7 +24,7 @@
- #include <linux/of_pdt.h>
- #include <asm/prom.h>
- 
--static struct of_pdt_ops *of_pdt_prom_ops __initdata;
-+static const struct of_pdt_ops *of_pdt_prom_ops;
- 
- void __initdata (*of_pdt_build_more)(struct device_node *dp,
- 		struct device_node ***nextp);
-diff -urNp linux-2.6.39.3/drivers/oprofile/buffer_sync.c linux-2.6.39.3/drivers/oprofile/buffer_sync.c
---- linux-2.6.39.3/drivers/oprofile/buffer_sync.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/oprofile/buffer_sync.c	2011-06-25 13:00:26.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/oprofile/buffer_sync.c linux-2.6.39.4/drivers/oprofile/buffer_sync.c
+--- linux-2.6.39.4/drivers/oprofile/buffer_sync.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/drivers/oprofile/buffer_sync.c	2011-08-05 19:44:37.000000000 -0400
 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
  		if (cookie == NO_COOKIE)
  			offset = pc;
@@ -36918,9 +30462,9 @@ diff -urNp linux-2.6.39.3/drivers/oprofile/buffer_sync.c linux-2.6.39.3/drivers/
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-2.6.39.3/drivers/oprofile/event_buffer.c linux-2.6.39.3/drivers/oprofile/event_buffer.c
---- linux-2.6.39.3/drivers/oprofile/event_buffer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/oprofile/event_buffer.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/oprofile/event_buffer.c linux-2.6.39.4/drivers/oprofile/event_buffer.c
+--- linux-2.6.39.4/drivers/oprofile/event_buffer.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/oprofile/event_buffer.c	2011-08-05 19:44:37.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
@@ -36930,9 +30474,9 @@ diff -urNp linux-2.6.39.3/drivers/oprofile/event_buffer.c linux-2.6.39.3/drivers
  		return;
  	}
  
-diff -urNp linux-2.6.39.3/drivers/oprofile/oprof.c linux-2.6.39.3/drivers/oprofile/oprof.c
---- linux-2.6.39.3/drivers/oprofile/oprof.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/oprofile/oprof.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/oprofile/oprof.c linux-2.6.39.4/drivers/oprofile/oprof.c
+--- linux-2.6.39.4/drivers/oprofile/oprof.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/oprofile/oprof.c	2011-08-05 19:44:37.000000000 -0400
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
  	if (oprofile_ops.switch_events())
  		return;
@@ -36942,9 +30486,9 @@ diff -urNp linux-2.6.39.3/drivers/oprofile/oprof.c linux-2.6.39.3/drivers/oprofi
  	start_switch_worker();
  }
  
-diff -urNp linux-2.6.39.3/drivers/oprofile/oprofilefs.c linux-2.6.39.3/drivers/oprofile/oprofilefs.c
---- linux-2.6.39.3/drivers/oprofile/oprofilefs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/oprofile/oprofilefs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/oprofile/oprofilefs.c linux-2.6.39.4/drivers/oprofile/oprofilefs.c
+--- linux-2.6.39.4/drivers/oprofile/oprofilefs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/oprofile/oprofilefs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -186,7 +186,7 @@ static const struct file_operations atom
  
  
@@ -36954,9 +30498,9 @@ diff -urNp linux-2.6.39.3/drivers/oprofile/oprofilefs.c linux-2.6.39.3/drivers/o
  {
  	return __oprofilefs_create_file(sb, root, name,
  					&atomic_ro_fops, 0444, val);
-diff -urNp linux-2.6.39.3/drivers/oprofile/oprofile_stats.c linux-2.6.39.3/drivers/oprofile/oprofile_stats.c
---- linux-2.6.39.3/drivers/oprofile/oprofile_stats.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/oprofile/oprofile_stats.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/oprofile/oprofile_stats.c linux-2.6.39.4/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.39.4/drivers/oprofile/oprofile_stats.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/oprofile/oprofile_stats.c	2011-08-05 19:44:37.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -36974,9 +30518,9 @@ diff -urNp linux-2.6.39.3/drivers/oprofile/oprofile_stats.c linux-2.6.39.3/drive
  }
  
  
-diff -urNp linux-2.6.39.3/drivers/oprofile/oprofile_stats.h linux-2.6.39.3/drivers/oprofile/oprofile_stats.h
---- linux-2.6.39.3/drivers/oprofile/oprofile_stats.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/oprofile/oprofile_stats.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/oprofile/oprofile_stats.h linux-2.6.39.4/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.39.4/drivers/oprofile/oprofile_stats.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/oprofile/oprofile_stats.h	2011-08-05 19:44:37.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -36994,51 +30538,9 @@ diff -urNp linux-2.6.39.3/drivers/oprofile/oprofile_stats.h linux-2.6.39.3/drive
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.39.3/drivers/parisc/dino.c linux-2.6.39.3/drivers/parisc/dino.c
---- linux-2.6.39.3/drivers/parisc/dino.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_ops dino_cfg_ops = {
-+static const struct pci_ops dino_cfg_ops = {
- 	.read =		dino_cfg_read,
- 	.write =	dino_cfg_write,
- };
-diff -urNp linux-2.6.39.3/drivers/parisc/lba_pci.c linux-2.6.39.3/drivers/parisc/lba_pci.c
---- linux-2.6.39.3/drivers/parisc/lba_pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/parisc/lba_pci.c	2011-05-22 19:36:32.000000000 -0400
-@@ -468,7 +468,7 @@ static int elroy_cfg_write(struct pci_bu
- }
- 
- 
--static struct pci_ops elroy_cfg_ops = {
-+static const struct pci_ops elroy_cfg_ops = {
- 	.read =		elroy_cfg_read,
- 	.write =	elroy_cfg_write,
- };
-@@ -541,7 +541,7 @@ static int mercury_cfg_write(struct pci_
- 	return 0;
- }
- 
--static struct pci_ops mercury_cfg_ops = {
-+static const struct pci_ops mercury_cfg_ops = {
- 	.read =		mercury_cfg_read,
- 	.write =	mercury_cfg_write,
- };
-@@ -1405,7 +1405,7 @@ lba_driver_probe(struct parisc_device *d
- {
- 	struct lba_device *lba_dev;
- 	struct pci_bus *lba_bus;
--	struct pci_ops *cfg_ops;
-+	const struct pci_ops *cfg_ops;
- 	u32 func_class;
- 	void *tmp_obj;
- 	char *version;
-diff -urNp linux-2.6.39.3/drivers/parport/procfs.c linux-2.6.39.3/drivers/parport/procfs.c
---- linux-2.6.39.3/drivers/parport/procfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/parport/procfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/parport/procfs.c linux-2.6.39.4/drivers/parport/procfs.c
+--- linux-2.6.39.4/drivers/parport/procfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/parport/procfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
  	*ppos += len;
@@ -37057,36 +30559,21 @@ diff -urNp linux-2.6.39.3/drivers/parport/procfs.c linux-2.6.39.3/drivers/parpor
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-2.6.39.3/drivers/pci/access.c linux-2.6.39.3/drivers/pci/access.c
---- linux-2.6.39.3/drivers/pci/access.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/access.c	2011-05-22 19:36:32.000000000 -0400
-@@ -74,9 +74,9 @@ EXPORT_SYMBOL(pci_bus_write_config_dword
-  *
-  * Return previous raw operations
-  */
--struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops)
-+const struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, const struct pci_ops *ops)
- {
--	struct pci_ops *old_ops;
-+	const struct pci_ops *old_ops;
- 	unsigned long flags;
- 
- 	raw_spin_lock_irqsave(&pci_lock, flags);
-diff -urNp linux-2.6.39.3/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.39.3/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.39.3/drivers/pci/hotplug/acpiphp_glue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/hotplug/acpiphp_glue.c	2011-05-22 19:36:32.000000000 -0400
-@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
- }
- 
- 
--static struct acpi_dock_ops acpiphp_dock_ops = {
-+static const struct acpi_dock_ops acpiphp_dock_ops = {
- 	.handler = handle_hotplug_event_func,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.39.3/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.39.3/drivers/pci/hotplug/cpqphp_nvram.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/hotplug/cpqphp_nvram.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.39.4/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-2.6.39.4/drivers/pci/hotplug/cpci_hotplug.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pci/hotplug/cpci_hotplug.h	2011-08-05 20:34:06.000000000 -0400
+@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
+ 	int (*hardware_test) (struct slot* slot, u32 value);
+ 	u8  (*get_power) (struct slot* slot);
+ 	int (*set_power) (struct slot* slot, int value);
+-};
++} __no_const;
+ 
+ struct cpci_hp_controller {
+ 	unsigned int irq;
+diff -urNp linux-2.6.39.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.39.4/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.39.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-08-05 19:44:37.000000000 -0400
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -37101,195 +30588,9 @@ diff -urNp linux-2.6.39.3/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.39.3/driv
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-2.6.39.3/drivers/pci/hotplug/shpchp.h linux-2.6.39.3/drivers/pci/hotplug/shpchp.h
---- linux-2.6.39.3/drivers/pci/hotplug/shpchp.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/hotplug/shpchp.h	2011-05-22 19:36:32.000000000 -0400
-@@ -86,7 +86,7 @@ struct slot {
- 	u8 presence_save;
- 	u8 pwr_save;
- 	struct controller *ctrl;
--	struct hpc_ops *hpc_ops;
-+	const struct hpc_ops *hpc_ops;
- 	struct hotplug_slot *hotplug_slot;
- 	struct list_head	slot_list;
- 	struct delayed_work work;	/* work for button event */
-@@ -107,7 +107,7 @@ struct controller {
- 	int slot_num_inc;		/* 1 or -1 */
- 	struct pci_dev *pci_dev;
- 	struct list_head slot_list;
--	struct hpc_ops *hpc_ops;
-+	const struct hpc_ops *hpc_ops;
- 	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.3/drivers/pci/hotplug/shpchp_hpc.c linux-2.6.39.3/drivers/pci/hotplug/shpchp_hpc.c
---- linux-2.6.39.3/drivers/pci/hotplug/shpchp_hpc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct hpc_ops shpchp_hpc_ops = {
-+static const struct hpc_ops shpchp_hpc_ops = {
- 	.power_on_slot			= hpc_power_on_slot,
- 	.slot_enable			= hpc_slot_enable,
- 	.slot_disable			= hpc_slot_disable,
-diff -urNp linux-2.6.39.3/drivers/pci/intel-iommu.c linux-2.6.39.3/drivers/pci/intel-iommu.c
---- linux-2.6.39.3/drivers/pci/intel-iommu.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/intel-iommu.c	2011-06-25 13:00:26.000000000 -0400
-@@ -393,7 +393,7 @@ static int intel_iommu_strict;
- static DEFINE_SPINLOCK(device_domain_lock);
- static LIST_HEAD(device_domain_list);
- 
--static struct iommu_ops intel_iommu_ops;
-+static const struct iommu_ops intel_iommu_ops;
- 
- static int __init intel_iommu_setup(char *str)
- {
-@@ -2964,7 +2964,7 @@ static int intel_mapping_error(struct de
- 	return !dma_addr;
- }
- 
--struct dma_map_ops intel_dma_ops = {
-+const struct dma_map_ops intel_dma_ops = {
- 	.alloc_coherent = intel_alloc_coherent,
- 	.free_coherent = intel_free_coherent,
- 	.map_sg = intel_map_sg,
-@@ -3761,7 +3761,7 @@ static int intel_iommu_domain_has_cap(st
- 	return 0;
- }
- 
--static struct iommu_ops intel_iommu_ops = {
-+static const struct iommu_ops intel_iommu_ops = {
- 	.domain_init	= intel_iommu_domain_init,
- 	.domain_destroy = intel_iommu_domain_destroy,
- 	.attach_dev	= intel_iommu_attach_device,
-diff -urNp linux-2.6.39.3/drivers/pci/pci-acpi.c linux-2.6.39.3/drivers/pci/pci-acpi.c
---- linux-2.6.39.3/drivers/pci/pci-acpi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct pci_platform_pm_ops acpi_pci_platform_pm = {
-+static const struct pci_platform_pm_ops acpi_pci_platform_pm = {
- 	.is_manageable = acpi_pci_power_manageable,
- 	.set_state = acpi_pci_set_power_state,
- 	.choose_state = acpi_pci_choose_state,
-diff -urNp linux-2.6.39.3/drivers/pci/pci.c linux-2.6.39.3/drivers/pci/pci.c
---- linux-2.6.39.3/drivers/pci/pci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct pci_platform_pm_ops *pci_platform_pm;
-+static const struct pci_platform_pm_ops *pci_platform_pm;
- 
--int pci_set_platform_pm(struct pci_platform_pm_ops *ops)
-+int pci_set_platform_pm(const struct pci_platform_pm_ops *ops)
- {
- 	if (!ops->is_manageable || !ops->set_state || !ops->choose_state
- 	    || !ops->sleep_wake || !ops->can_wakeup)
-diff -urNp linux-2.6.39.3/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.39.3/drivers/pci/pcie/aer/aerdrv_core.c
---- linux-2.6.39.3/drivers/pci/pcie/aer/aerdrv_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/pcie/aer/aerdrv_core.c	2011-05-22 19:36:32.000000000 -0400
-@@ -239,7 +239,7 @@ static bool find_source_device(struct pc
- static int report_error_detected(struct pci_dev *dev, void *data)
- {
- 	pci_ers_result_t vote;
--	struct pci_error_handlers *err_handler;
-+	const struct pci_error_handlers *err_handler;
- 	struct aer_broadcast_data *result_data;
- 	result_data = (struct aer_broadcast_data *) data;
- 
-@@ -273,7 +273,7 @@ static int report_error_detected(struct 
- static int report_mmio_enabled(struct pci_dev *dev, void *data)
- {
- 	pci_ers_result_t vote;
--	struct pci_error_handlers *err_handler;
-+	const struct pci_error_handlers *err_handler;
- 	struct aer_broadcast_data *result_data;
- 	result_data = (struct aer_broadcast_data *) data;
- 
-@@ -291,7 +291,7 @@ static int report_mmio_enabled(struct pc
- static int report_slot_reset(struct pci_dev *dev, void *data)
- {
- 	pci_ers_result_t vote;
--	struct pci_error_handlers *err_handler;
-+	const struct pci_error_handlers *err_handler;
- 	struct aer_broadcast_data *result_data;
- 	result_data = (struct aer_broadcast_data *) data;
- 
-@@ -308,7 +308,7 @@ static int report_slot_reset(struct pci_
- 
- static int report_resume(struct pci_dev *dev, void *data)
- {
--	struct pci_error_handlers *err_handler;
-+	const struct pci_error_handlers *err_handler;
- 
- 	dev->error_state = pci_channel_io_normal;
- 
-diff -urNp linux-2.6.39.3/drivers/pci/pcie/aer/aer_inject.c linux-2.6.39.3/drivers/pci/pcie/aer/aer_inject.c
---- linux-2.6.39.3/drivers/pci/pcie/aer/aer_inject.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	struct pci_bus *bus;
--	struct pci_ops *ops;
-+	const struct pci_ops *ops;
- };
- 
- static LIST_HEAD(einjected);
-@@ -110,7 +110,7 @@ static struct aer_error *__find_aer_erro
- }
- 
- /* inject_lock must be held before calling */
--static struct pci_ops *__find_pci_bus_ops(struct pci_bus *bus)
-+static const struct pci_ops *__find_pci_bus_ops(struct pci_bus *bus)
- {
- 	struct pci_bus_ops *bus_ops;
- 
-@@ -187,7 +187,7 @@ static int pci_read_aer(struct pci_bus *
- 	u32 *sim;
- 	struct aer_error *err;
- 	unsigned long flags;
--	struct pci_ops *ops;
-+	const struct pci_ops *ops;
- 	int domain;
- 
- 	spin_lock_irqsave(&inject_lock, flags);
-@@ -219,7 +219,7 @@ int pci_write_aer(struct pci_bus *bus, u
- 	struct aer_error *err;
- 	unsigned long flags;
- 	int rw1cs;
--	struct pci_ops *ops;
-+	const struct pci_ops *ops;
- 	int domain;
- 
- 	spin_lock_irqsave(&inject_lock, flags);
-@@ -254,7 +254,7 @@ static struct pci_ops pci_ops_aer = {
- 
- static void pci_bus_ops_init(struct pci_bus_ops *bus_ops,
- 			     struct pci_bus *bus,
--			     struct pci_ops *ops)
-+			     const struct pci_ops *ops)
- {
- 	INIT_LIST_HEAD(&bus_ops->list);
- 	bus_ops->bus = bus;
-@@ -263,7 +263,7 @@ static void pci_bus_ops_init(struct pci_
- 
- static int pci_bus_set_aer_ops(struct pci_bus *bus)
- {
--	struct pci_ops *ops;
-+	const struct pci_ops *ops;
- 	struct pci_bus_ops *bus_ops;
- 	unsigned long flags;
- 
-diff -urNp linux-2.6.39.3/drivers/pci/pcie/aspm.c linux-2.6.39.3/drivers/pci/pcie/aspm.c
---- linux-2.6.39.3/drivers/pci/pcie/aspm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/pcie/aspm.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/pci/pcie/aspm.c linux-2.6.39.4/drivers/pci/pcie/aspm.c
+--- linux-2.6.39.4/drivers/pci/pcie/aspm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pci/pcie/aspm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -37303,21 +30604,9 @@ diff -urNp linux-2.6.39.3/drivers/pci/pcie/aspm.c linux-2.6.39.3/drivers/pci/pci
  #define ASPM_STATE_L0S		(ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-2.6.39.3/drivers/pci/pci.h linux-2.6.39.3/drivers/pci/pci.h
---- linux-2.6.39.3/drivers/pci/pci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- };
- 
--extern int pci_set_platform_pm(struct pci_platform_pm_ops *ops);
-+extern int pci_set_platform_pm(const struct pci_platform_pm_ops *ops);
- extern void pci_update_current_state(struct pci_dev *dev, pci_power_t state);
- 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.3/drivers/pci/probe.c linux-2.6.39.3/drivers/pci/probe.c
---- linux-2.6.39.3/drivers/pci/probe.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/probe.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/pci/probe.c linux-2.6.39.4/drivers/pci/probe.c
+--- linux-2.6.39.4/drivers/pci/probe.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pci/probe.c	2011-08-05 20:34:06.000000000 -0400
 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
  	return ret;
  }
@@ -37344,27 +30633,9 @@ diff -urNp linux-2.6.39.3/drivers/pci/probe.c linux-2.6.39.3/drivers/pci/probe.c
  
  	if (!dev->mmio_always_on) {
  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-@@ -1407,7 +1407,7 @@ unsigned int __devinit pci_scan_child_bu
- }
- 
- struct pci_bus * pci_create_bus(struct device *parent,
--		int bus, struct pci_ops *ops, void *sysdata)
-+		int bus, const struct pci_ops *ops, void *sysdata)
- {
- 	int error;
- 	struct pci_bus *b, *b2;
-@@ -1483,7 +1483,7 @@ err_out:
- }
- 
- struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
--		int bus, struct pci_ops *ops, void *sysdata)
-+		int bus, const struct pci_ops *ops, void *sysdata)
- {
- 	struct pci_bus *b;
- 
-diff -urNp linux-2.6.39.3/drivers/pci/proc.c linux-2.6.39.3/drivers/pci/proc.c
---- linux-2.6.39.3/drivers/pci/proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/proc.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/pci/proc.c linux-2.6.39.4/drivers/pci/proc.c
+--- linux-2.6.39.4/drivers/pci/proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pci/proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -37382,9 +30653,9 @@ diff -urNp linux-2.6.39.3/drivers/pci/proc.c linux-2.6.39.3/drivers/pci/proc.c
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff -urNp linux-2.6.39.3/drivers/pci/xen-pcifront.c linux-2.6.39.3/drivers/pci/xen-pcifront.c
---- linux-2.6.39.3/drivers/pci/xen-pcifront.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pci/xen-pcifront.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/pci/xen-pcifront.c linux-2.6.39.4/drivers/pci/xen-pcifront.c
+--- linux-2.6.39.4/drivers/pci/xen-pcifront.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pci/xen-pcifront.c	2011-08-05 20:34:06.000000000 -0400
 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
  	struct pcifront_sd *sd = bus->sysdata;
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
@@ -37403,15 +30674,6 @@ diff -urNp linux-2.6.39.3/drivers/pci/xen-pcifront.c linux-2.6.39.3/drivers/pci/
  	if (verbose_request)
  		dev_info(&pdev->xdev->dev,
  			 "write dev=%04x:%02x:%02x.%01x - "
-@@ -236,7 +240,7 @@ static int pcifront_bus_write(struct pci
- 	return errno_to_pcibios_err(do_pci_op(pdev, &op));
- }
- 
--struct pci_ops pcifront_bus_ops = {
-+const struct pci_ops pcifront_bus_ops = {
- 	.read = pcifront_bus_read,
- 	.write = pcifront_bus_write,
- };
 @@ -258,6 +262,8 @@ static int pci_frontend_enable_msix(stru
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
  	struct msi_desc *entry;
@@ -37439,243 +30701,21 @@ diff -urNp linux-2.6.39.3/drivers/pci/xen-pcifront.c linux-2.6.39.3/drivers/pci/
  	err = do_pci_op(pdev, &op);
  	if (likely(!err)) {
  		vector[0] = op.value;
-@@ -368,7 +378,7 @@ static void pci_frontend_disable_msi(str
- 		printk(KERN_DEBUG "get fake response frombackend\n");
- }
- 
--static struct xen_pci_frontend_ops pci_frontend_ops = {
-+static const struct xen_pci_frontend_ops pci_frontend_ops = {
- 	.enable_msi = pci_frontend_enable_msi,
- 	.disable_msi = pci_frontend_disable_msi,
- 	.enable_msix = pci_frontend_enable_msix,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/at91_cf.c linux-2.6.39.3/drivers/pcmcia/at91_cf.c
---- linux-2.6.39.3/drivers/pcmcia/at91_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/at91_cf.c	2011-05-22 19:36:32.000000000 -0400
-@@ -203,7 +203,7 @@ at91_cf_set_mem_map(struct pcmcia_socket
- 	return 0;
- }
- 
--static struct pccard_operations at91_cf_ops = {
-+static const struct pccard_operations at91_cf_ops = {
- 	.init			= at91_cf_ss_init,
- 	.suspend		= at91_cf_ss_suspend,
- 	.get_status		= at91_cf_get_status,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/bfin_cf_pcmcia.c linux-2.6.39.3/drivers/pcmcia/bfin_cf_pcmcia.c
---- linux-2.6.39.3/drivers/pcmcia/bfin_cf_pcmcia.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/bfin_cf_pcmcia.c	2011-05-22 19:36:32.000000000 -0400
-@@ -184,7 +184,7 @@ bfin_cf_set_mem_map(struct pcmcia_socket
- 	return 0;
- }
- 
--static struct pccard_operations bfin_cf_ops = {
-+static const struct pccard_operations bfin_cf_ops = {
- 	.init = bfin_cf_ss_init,
- 	.suspend = bfin_cf_ss_suspend,
- 	.get_status = bfin_cf_get_status,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/db1xxx_ss.c linux-2.6.39.3/drivers/pcmcia/db1xxx_ss.c
---- linux-2.6.39.3/drivers/pcmcia/db1xxx_ss.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/db1xxx_ss.c	2011-05-22 19:36:32.000000000 -0400
-@@ -384,7 +384,7 @@ static int au1x00_pcmcia_set_mem_map(str
- 	return 0;
- }
- 
--static struct pccard_operations db1x_pcmcia_operations = {
-+static const struct pccard_operations db1x_pcmcia_operations = {
- 	.init			= db1x_pcmcia_sock_init,
- 	.suspend		= db1x_pcmcia_sock_suspend,
- 	.get_status		= db1x_pcmcia_get_status,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/electra_cf.c linux-2.6.39.3/drivers/pcmcia/electra_cf.c
---- linux-2.6.39.3/drivers/pcmcia/electra_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/electra_cf.c	2011-05-22 19:36:32.000000000 -0400
-@@ -173,7 +173,7 @@ static int electra_cf_set_mem_map(struct
- 	return 0;
- }
- 
--static struct pccard_operations electra_cf_ops = {
-+static const struct pccard_operations electra_cf_ops = {
- 	.init			= electra_cf_ss_init,
- 	.get_status		= electra_cf_get_status,
- 	.set_socket		= electra_cf_set_socket,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/m32r_cfc.c linux-2.6.39.3/drivers/pcmcia/m32r_cfc.c
---- linux-2.6.39.3/drivers/pcmcia/m32r_cfc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/m32r_cfc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -674,7 +674,7 @@ static int pcc_init(struct pcmcia_socket
- 	return 0;
- }
- 
--static struct pccard_operations pcc_operations = {
-+static const struct pccard_operations pcc_operations = {
- 	.init			= pcc_init,
- 	.get_status		= pcc_get_status,
- 	.set_socket		= pcc_set_socket,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/m32r_pcc.c linux-2.6.39.3/drivers/pcmcia/m32r_pcc.c
---- linux-2.6.39.3/drivers/pcmcia/m32r_pcc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/m32r_pcc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -652,7 +652,7 @@ static int pcc_init(struct pcmcia_socket
- 	return 0;
- }
- 
--static struct pccard_operations pcc_operations = {
-+static const struct pccard_operations pcc_operations = {
- 	.init			= pcc_init,
- 	.get_status		= pcc_get_status,
- 	.set_socket		= pcc_set_socket,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/m8xx_pcmcia.c linux-2.6.39.3/drivers/pcmcia/m8xx_pcmcia.c
---- linux-2.6.39.3/drivers/pcmcia/m8xx_pcmcia.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/m8xx_pcmcia.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1139,7 +1139,7 @@ static int m8xx_sock_suspend(struct pcmc
- 	return m8xx_set_socket(sock, &dead_socket);
- }
- 
--static struct pccard_operations m8xx_services = {
-+static const struct pccard_operations m8xx_services = {
- 	.init = m8xx_sock_init,
- 	.suspend = m8xx_sock_suspend,
- 	.get_status = m8xx_get_status,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/omap_cf.c linux-2.6.39.3/drivers/pcmcia/omap_cf.c
---- linux-2.6.39.3/drivers/pcmcia/omap_cf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/omap_cf.c	2011-05-22 19:36:32.000000000 -0400
-@@ -185,7 +185,7 @@ omap_cf_set_mem_map(struct pcmcia_socket
- 	return 0;
- }
- 
--static struct pccard_operations omap_cf_ops = {
-+static const struct pccard_operations omap_cf_ops = {
- 	.init			= omap_cf_ss_init,
- 	.suspend		= omap_cf_ss_suspend,
- 	.get_status		= omap_cf_get_status,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/rsrc_iodyn.c linux-2.6.39.3/drivers/pcmcia/rsrc_iodyn.c
---- linux-2.6.39.3/drivers/pcmcia/rsrc_iodyn.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/rsrc_iodyn.c	2011-05-22 19:36:32.000000000 -0400
-@@ -161,7 +161,7 @@ static int iodyn_find_io(struct pcmcia_s
- }
- 
- 
--struct pccard_resource_ops pccard_iodyn_ops = {
-+const struct pccard_resource_ops pccard_iodyn_ops = {
- 	.validate_mem = NULL,
- 	.find_io = iodyn_find_io,
- 	.find_mem = NULL,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/rsrc_mgr.c linux-2.6.39.3/drivers/pcmcia/rsrc_mgr.c
---- linux-2.6.39.3/drivers/pcmcia/rsrc_mgr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/rsrc_mgr.c	2011-05-22 19:36:32.000000000 -0400
-@@ -57,7 +57,7 @@ static int static_find_io(struct pcmcia_
- }
- 
- 
--struct pccard_resource_ops pccard_static_ops = {
-+const struct pccard_resource_ops pccard_static_ops = {
- 	.validate_mem = NULL,
- 	.find_io = static_find_io,
- 	.find_mem = NULL,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/vrc4171_card.c linux-2.6.39.3/drivers/pcmcia/vrc4171_card.c
---- linux-2.6.39.3/drivers/pcmcia/vrc4171_card.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/vrc4171_card.c	2011-05-22 19:36:32.000000000 -0400
-@@ -479,7 +479,7 @@ static int pccard_set_mem_map(struct pcm
+diff -urNp linux-2.6.39.4/drivers/platform/x86/thinkpad_acpi.c linux-2.6.39.4/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.39.4/drivers/platform/x86/thinkpad_acpi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/platform/x86/thinkpad_acpi.c	2011-08-05 20:34:06.000000000 -0400
+@@ -2109,7 +2109,7 @@ static int hotkey_mask_get(void)
  	return 0;
  }
  
--static struct pccard_operations vrc4171_pccard_operations = {
-+static const struct pccard_operations vrc4171_pccard_operations = {
- 	.init			= pccard_init,
- 	.get_status		= pccard_get_status,
- 	.set_socket		= pccard_set_socket,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/vrc4173_cardu.c linux-2.6.39.3/drivers/pcmcia/vrc4173_cardu.c
---- linux-2.6.39.3/drivers/pcmcia/vrc4173_cardu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/vrc4173_cardu.c	2011-05-22 19:36:32.000000000 -0400
-@@ -384,7 +384,7 @@ static void cardu_proc_setup(unsigned in
+-void static hotkey_mask_warn_incomplete_mask(void)
++static void hotkey_mask_warn_incomplete_mask(void)
  {
- }
- 
--static struct pccard_operations cardu_operations = {
-+static const struct pccard_operations cardu_operations = {
- 	.init			= cardu_init,
- 	.register_callback	= cardu_register_callback,
- 	.inquire_socket		= cardu_inquire_socket,
-diff -urNp linux-2.6.39.3/drivers/pcmcia/xxs1500_ss.c linux-2.6.39.3/drivers/pcmcia/xxs1500_ss.c
---- linux-2.6.39.3/drivers/pcmcia/xxs1500_ss.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pcmcia/xxs1500_ss.c	2011-05-22 19:36:32.000000000 -0400
-@@ -196,7 +196,7 @@ static int au1x00_pcmcia_set_mem_map(str
- 	return 0;
- }
- 
--static struct pccard_operations xxs1500_pcmcia_operations = {
-+static const struct pccard_operations xxs1500_pcmcia_operations = {
- 	.init			= xxs1500_pcmcia_sock_init,
- 	.suspend		= xxs1500_pcmcia_sock_suspend,
- 	.get_status		= xxs1500_pcmcia_get_status,
-diff -urNp linux-2.6.39.3/drivers/platform/x86/acerhdf.c linux-2.6.39.3/drivers/platform/x86/acerhdf.c
---- linux-2.6.39.3/drivers/platform/x86/acerhdf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/platform/x86/acerhdf.c	2011-05-22 19:36:32.000000000 -0400
-@@ -406,7 +406,7 @@ static int acerhdf_get_crit_temp(struct 
- }
- 
- /* bind callback functions to thermalzone */
--static struct thermal_zone_device_ops acerhdf_dev_ops = {
-+static const struct thermal_zone_device_ops acerhdf_dev_ops = {
- 	.bind = acerhdf_bind,
- 	.unbind = acerhdf_unbind,
- 	.get_temp = acerhdf_get_ec_temp,
-@@ -481,7 +481,7 @@ err_out:
- }
- 
- /* bind fan callbacks to fan device */
--static struct thermal_cooling_device_ops acerhdf_cooling_ops = {
-+static const struct thermal_cooling_device_ops acerhdf_cooling_ops = {
- 	.get_max_state = acerhdf_get_max_state,
- 	.get_cur_state = acerhdf_get_cur_state,
- 	.set_cur_state = acerhdf_set_cur_state,
-diff -urNp linux-2.6.39.3/drivers/platform/x86/ideapad-laptop.c linux-2.6.39.3/drivers/platform/x86/ideapad-laptop.c
---- linux-2.6.39.3/drivers/platform/x86/ideapad-laptop.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/platform/x86/ideapad-laptop.c	2011-05-22 19:36:32.000000000 -0400
-@@ -207,7 +207,7 @@ static int ideapad_rfk_set(void *data, b
- 	return write_ec_cmd(ideapad_handle, opcode, !blocked);
- }
- 
--static struct rfkill_ops ideapad_rfk_ops = {
-+static const struct rfkill_ops ideapad_rfk_ops = {
- 	.set_block = ideapad_rfk_set,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/platform/x86/intel_menlow.c linux-2.6.39.3/drivers/platform/x86/intel_menlow.c
---- linux-2.6.39.3/drivers/platform/x86/intel_menlow.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct thermal_cooling_device_ops memory_cooling_ops = {
-+static const struct thermal_cooling_device_ops memory_cooling_ops = {
- 	.get_max_state = memory_get_max_bandwidth,
- 	.get_cur_state = memory_get_cur_bandwidth,
- 	.set_cur_state = memory_set_cur_bandwidth,
-diff -urNp linux-2.6.39.3/drivers/platform/x86/intel_mid_thermal.c linux-2.6.39.3/drivers/platform/x86/intel_mid_thermal.c
---- linux-2.6.39.3/drivers/platform/x86/intel_mid_thermal.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/platform/x86/intel_mid_thermal.c	2011-05-22 19:36:32.000000000 -0400
-@@ -458,7 +458,7 @@ static int read_curr_temp(struct thermal
- }
- 
- /* Can't be const */
--static struct thermal_zone_device_ops tzd_ops = {
-+static const struct thermal_zone_device_ops tzd_ops = {
-        .get_temp = read_curr_temp,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/platform/x86/samsung-laptop.c linux-2.6.39.3/drivers/platform/x86/samsung-laptop.c
---- linux-2.6.39.3/drivers/platform/x86/samsung-laptop.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/platform/x86/samsung-laptop.c	2011-05-22 19:36:32.000000000 -0400
-@@ -419,7 +419,7 @@ static int rfkill_set(void *data, bool b
- 	return 0;
- }
- 
--static struct rfkill_ops rfkill_ops = {
-+static const struct rfkill_ops rfkill_ops = {
- 	.set_block = rfkill_set,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/pnp/pnpbios/bioscalls.c linux-2.6.39.3/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.39.3/drivers/pnp/pnpbios/bioscalls.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pnp/pnpbios/bioscalls.c	2011-05-22 19:36:32.000000000 -0400
+ 	/* log only what the user can fix... */
+ 	const u32 wantedmask = hotkey_driver_mask &
+diff -urNp linux-2.6.39.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.39.4/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.39.4/drivers/pnp/pnpbios/bioscalls.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pnp/pnpbios/bioscalls.c	2011-08-05 19:44:37.000000000 -0400
 @@ -59,7 +59,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -37732,9 +30772,9 @@ diff -urNp linux-2.6.39.3/drivers/pnp/pnpbios/bioscalls.c linux-2.6.39.3/drivers
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-2.6.39.3/drivers/pnp/resource.c linux-2.6.39.3/drivers/pnp/resource.c
---- linux-2.6.39.3/drivers/pnp/resource.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/pnp/resource.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/pnp/resource.c linux-2.6.39.4/drivers/pnp/resource.c
+--- linux-2.6.39.4/drivers/pnp/resource.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/pnp/resource.c	2011-08-05 19:44:37.000000000 -0400
 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
  		return 1;
  
@@ -37753,93 +30793,55 @@ diff -urNp linux-2.6.39.3/drivers/pnp/resource.c linux-2.6.39.3/drivers/pnp/reso
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-2.6.39.3/drivers/power/max8925_power.c linux-2.6.39.3/drivers/power/max8925_power.c
---- linux-2.6.39.3/drivers/power/max8925_power.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/power/max8925_power.c	2011-05-22 19:36:32.000000000 -0400
-@@ -426,7 +426,7 @@ static __devinit int max8925_power_probe
- {
- 	struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
- 	struct max8925_platform_data *max8925_pdata;
--	struct max8925_power_pdata *pdata = NULL;
-+	const struct max8925_power_pdata *pdata = NULL;
- 	struct max8925_power_info *info;
- 	int ret;
- 
-diff -urNp linux-2.6.39.3/drivers/regulator/core.c linux-2.6.39.3/drivers/regulator/core.c
---- linux-2.6.39.3/drivers/regulator/core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/regulator/core.c	2011-05-22 19:36:32.000000000 -0400
-@@ -2883,7 +2883,7 @@ core_initcall(regulator_init);
- static int __init regulator_init_complete(void)
- {
- 	struct regulator_dev *rdev;
--	struct regulator_ops *ops;
-+	const struct regulator_ops *ops;
- 	struct regulation_constraints *c;
- 	int enabled, ret;
- 
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-at32ap700x.c linux-2.6.39.3/drivers/rtc/rtc-at32ap700x.c
---- linux-2.6.39.3/drivers/rtc/rtc-at32ap700x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-at32ap700x.c	2011-05-22 19:36:32.000000000 -0400
-@@ -187,7 +187,7 @@ static irqreturn_t at32_rtc_interrupt(in
- 	return ret;
- }
- 
--static struct rtc_class_ops at32_rtc_ops = {
-+static const struct rtc_class_ops at32_rtc_ops = {
- 	.read_time	= at32_rtc_readtime,
- 	.set_time	= at32_rtc_settime,
- 	.read_alarm	= at32_rtc_readalarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-au1xxx.c linux-2.6.39.3/drivers/rtc/rtc-au1xxx.c
---- linux-2.6.39.3/drivers/rtc/rtc-au1xxx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-au1xxx.c	2011-05-22 19:36:32.000000000 -0400
-@@ -57,7 +57,7 @@ static int au1xtoy_rtc_set_time(struct d
- 	return 0;
- }
- 
--static struct rtc_class_ops au1xtoy_rtc_ops = {
-+static const struct rtc_class_ops au1xtoy_rtc_ops = {
- 	.read_time	= au1xtoy_rtc_read_time,
- 	.set_time	= au1xtoy_rtc_set_time,
- };
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-bfin.c linux-2.6.39.3/drivers/rtc/rtc-bfin.c
---- linux-2.6.39.3/drivers/rtc/rtc-bfin.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
--static struct rtc_class_ops bfin_rtc_ops = {
-+static const struct rtc_class_ops bfin_rtc_ops = {
- 	.read_time     = bfin_rtc_read_time,
- 	.set_time      = bfin_rtc_set_time,
- 	.read_alarm    = bfin_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-coh901331.c linux-2.6.39.3/drivers/rtc/rtc-coh901331.c
---- linux-2.6.39.3/drivers/rtc/rtc-coh901331.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-coh901331.c	2011-05-22 19:36:32.000000000 -0400
-@@ -142,7 +142,7 @@ static int coh901331_alarm_irq_enable(st
- 	return 0;
- }
+diff -urNp linux-2.6.39.4/drivers/power/bq27x00_battery.c linux-2.6.39.4/drivers/power/bq27x00_battery.c
+--- linux-2.6.39.4/drivers/power/bq27x00_battery.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/power/bq27x00_battery.c	2011-08-05 20:34:06.000000000 -0400
+@@ -66,7 +66,7 @@
+ struct bq27x00_device_info;
+ struct bq27x00_access_methods {
+ 	int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
+-};
++} __no_const;
+ 
+ enum bq27x00_chip { BQ27000, BQ27500 };
+ 
+diff -urNp linux-2.6.39.4/drivers/regulator/max8660.c linux-2.6.39.4/drivers/regulator/max8660.c
+--- linux-2.6.39.4/drivers/regulator/max8660.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/regulator/max8660.c	2011-08-05 20:34:06.000000000 -0400
+@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
+ 		max8660->shadow_regs[MAX8660_OVER1] = 5;
+ 	} else {
+ 		/* Otherwise devices can be toggled via software */
+-		max8660_dcdc_ops.enable = max8660_dcdc_enable;
+-		max8660_dcdc_ops.disable = max8660_dcdc_disable;
++		pax_open_kernel();
++		*(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
++		*(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
++		pax_close_kernel();
+ 	}
  
--static struct rtc_class_ops coh901331_ops = {
-+static const struct rtc_class_ops coh901331_ops = {
- 	.read_time = coh901331_read_time,
- 	.set_mmss = coh901331_set_mmss,
- 	.read_alarm = coh901331_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-davinci.c linux-2.6.39.3/drivers/rtc/rtc-davinci.c
---- linux-2.6.39.3/drivers/rtc/rtc-davinci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-davinci.c	2011-05-22 19:36:32.000000000 -0400
-@@ -469,7 +469,7 @@ static int davinci_rtc_set_alarm(struct 
- 	return 0;
- }
+ 	/*
+diff -urNp linux-2.6.39.4/drivers/regulator/mc13892-regulator.c linux-2.6.39.4/drivers/regulator/mc13892-regulator.c
+--- linux-2.6.39.4/drivers/regulator/mc13892-regulator.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/regulator/mc13892-regulator.c	2011-08-05 20:34:06.000000000 -0400
+@@ -560,10 +560,12 @@ static int __devinit mc13892_regulator_p
+ 	}
+ 	mc13xxx_unlock(mc13892);
  
--static struct rtc_class_ops davinci_rtc_ops = {
-+static const struct rtc_class_ops davinci_rtc_ops = {
- 	.ioctl			= davinci_rtc_ioctl,
- 	.read_time		= davinci_rtc_read_time,
- 	.set_time		= davinci_rtc_set_time,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-dev.c linux-2.6.39.3/drivers/rtc/rtc-dev.c
---- linux-2.6.39.3/drivers/rtc/rtc-dev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-dev.c	2011-05-22 19:41:37.000000000 -0400
+-	mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
++	pax_open_kernel();
++	*(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
+ 		= mc13892_vcam_set_mode;
+-	mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
++	*(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
+ 		= mc13892_vcam_get_mode;
++	pax_close_kernel();
+ 	for (i = 0; i < pdata->num_regulators; i++) {
+ 		init_data = &pdata->regulators[i];
+ 		priv->regulators[i] = regulator_register(
+diff -urNp linux-2.6.39.4/drivers/rtc/rtc-dev.c linux-2.6.39.4/drivers/rtc/rtc-dev.c
+--- linux-2.6.39.4/drivers/rtc/rtc-dev.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/rtc/rtc-dev.c	2011-08-05 19:44:37.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -37857,415 +30859,21 @@ diff -urNp linux-2.6.39.3/drivers/rtc/rtc-dev.c linux-2.6.39.3/drivers/rtc/rtc-d
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-dm355evm.c linux-2.6.39.3/drivers/rtc/rtc-dm355evm.c
---- linux-2.6.39.3/drivers/rtc/rtc-dm355evm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-dm355evm.c	2011-05-22 19:36:32.000000000 -0400
-@@ -115,7 +115,7 @@ static int dm355evm_rtc_set_time(struct 
- 	return 0;
- }
- 
--static struct rtc_class_ops dm355evm_rtc_ops = {
-+static const struct rtc_class_ops dm355evm_rtc_ops = {
- 	.read_time	= dm355evm_rtc_read_time,
- 	.set_time	= dm355evm_rtc_set_time,
- };
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-ds1302.c linux-2.6.39.3/drivers/rtc/rtc-ds1302.c
---- linux-2.6.39.3/drivers/rtc/rtc-ds1302.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-ds1302.c	2011-05-22 19:36:32.000000000 -0400
-@@ -199,7 +199,7 @@ static int ds1302_rtc_ioctl(struct devic
- 	return -ENOIOCTLCMD;
- }
- 
--static struct rtc_class_ops ds1302_rtc_ops = {
-+static const struct rtc_class_ops ds1302_rtc_ops = {
- 	.read_time	= ds1302_rtc_read_time,
- 	.set_time	= ds1302_rtc_set_time,
- 	.ioctl		= ds1302_rtc_ioctl,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-imxdi.c linux-2.6.39.3/drivers/rtc/rtc-imxdi.c
---- linux-2.6.39.3/drivers/rtc/rtc-imxdi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct rtc_class_ops dryice_rtc_ops = {
-+static const struct rtc_class_ops dryice_rtc_ops = {
- 	.read_time		= dryice_rtc_read_time,
- 	.set_mmss		= dryice_rtc_set_mmss,
- 	.alarm_irq_enable	= dryice_rtc_alarm_irq_enable,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-jz4740.c linux-2.6.39.3/drivers/rtc/rtc-jz4740.c
---- linux-2.6.39.3/drivers/rtc/rtc-jz4740.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-jz4740.c	2011-05-22 19:36:32.000000000 -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);
- }
- 
--static struct rtc_class_ops jz4740_rtc_ops = {
-+static const struct rtc_class_ops jz4740_rtc_ops = {
- 	.read_time	= jz4740_rtc_read_time,
- 	.set_mmss	= jz4740_rtc_set_mmss,
- 	.read_alarm	= jz4740_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-m41t80.c linux-2.6.39.3/drivers/rtc/rtc-m41t80.c
---- linux-2.6.39.3/drivers/rtc/rtc-m41t80.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-m41t80.c	2011-05-22 19:36:32.000000000 -0400
-@@ -354,7 +354,7 @@ static int m41t80_rtc_read_alarm(struct 
- 	return 0;
- }
- 
--static struct rtc_class_ops m41t80_rtc_ops = {
-+static const struct rtc_class_ops m41t80_rtc_ops = {
- 	.read_time = m41t80_rtc_read_time,
- 	.set_time = m41t80_rtc_set_time,
- 	.read_alarm = m41t80_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-mxc.c linux-2.6.39.3/drivers/rtc/rtc-mxc.c
---- linux-2.6.39.3/drivers/rtc/rtc-mxc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- /* RTC layer */
--static struct rtc_class_ops mxc_rtc_ops = {
-+static const struct rtc_class_ops mxc_rtc_ops = {
- 	.release		= mxc_rtc_release,
- 	.read_time		= mxc_rtc_read_time,
- 	.set_mmss		= mxc_rtc_set_mmss,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-nuc900.c linux-2.6.39.3/drivers/rtc/rtc-nuc900.c
---- linux-2.6.39.3/drivers/rtc/rtc-nuc900.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-nuc900.c	2011-05-22 19:36:32.000000000 -0400
-@@ -214,7 +214,7 @@ static int nuc900_rtc_set_alarm(struct d
- 	return 0;
- }
- 
--static struct rtc_class_ops nuc900_rtc_ops = {
-+static const struct rtc_class_ops nuc900_rtc_ops = {
- 	.read_time = nuc900_rtc_read_time,
- 	.set_time = nuc900_rtc_set_time,
- 	.read_alarm = nuc900_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-omap.c linux-2.6.39.3/drivers/rtc/rtc-omap.c
---- linux-2.6.39.3/drivers/rtc/rtc-omap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct rtc_class_ops omap_rtc_ops = {
-+static const struct rtc_class_ops omap_rtc_ops = {
- 	.read_time	= omap_rtc_read_time,
- 	.set_time	= omap_rtc_set_time,
- 	.read_alarm	= omap_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-pcf50633.c linux-2.6.39.3/drivers/rtc/rtc-pcf50633.c
---- linux-2.6.39.3/drivers/rtc/rtc-pcf50633.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-pcf50633.c	2011-05-22 19:36:32.000000000 -0400
-@@ -238,7 +238,7 @@ static int pcf50633_rtc_set_alarm(struct
- 	return ret;
- }
- 
--static struct rtc_class_ops pcf50633_rtc_ops = {
-+static const struct rtc_class_ops pcf50633_rtc_ops = {
- 	.read_time		= pcf50633_rtc_read_time,
- 	.set_time		= pcf50633_rtc_set_time,
- 	.read_alarm		= pcf50633_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-pl031.c linux-2.6.39.3/drivers/rtc/rtc-pl031.c
---- linux-2.6.39.3/drivers/rtc/rtc-pl031.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-pl031.c	2011-05-22 19:36:32.000000000 -0400
-@@ -374,7 +374,7 @@ err_req:
- }
- 
- /* Operations for the original ARM version */
--static struct rtc_class_ops arm_pl031_ops = {
-+static const struct rtc_class_ops arm_pl031_ops = {
- 	.read_time = pl031_read_time,
- 	.set_time = pl031_set_time,
- 	.read_alarm = pl031_read_alarm,
-@@ -383,7 +383,7 @@ static struct rtc_class_ops arm_pl031_op
- };
- 
- /* The First ST derivative */
--static struct rtc_class_ops stv1_pl031_ops = {
-+static const struct rtc_class_ops stv1_pl031_ops = {
- 	.read_time = pl031_read_time,
- 	.set_time = pl031_set_time,
- 	.read_alarm = pl031_read_alarm,
-@@ -392,7 +392,7 @@ static struct rtc_class_ops stv1_pl031_o
- };
- 
- /* And the second ST derivative */
--static struct rtc_class_ops stv2_pl031_ops = {
-+static const struct rtc_class_ops stv2_pl031_ops = {
- 	.read_time = pl031_stv2_read_time,
- 	.set_time = pl031_stv2_set_time,
- 	.read_alarm = pl031_stv2_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-rx8025.c linux-2.6.39.3/drivers/rtc/rtc-rx8025.c
---- linux-2.6.39.3/drivers/rtc/rtc-rx8025.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-rx8025.c	2011-05-22 19:36:32.000000000 -0400
-@@ -424,7 +424,7 @@ static int rx8025_alarm_irq_enable(struc
- 	return 0;
- }
- 
--static struct rtc_class_ops rx8025_rtc_ops = {
-+static const struct rtc_class_ops rx8025_rtc_ops = {
- 	.read_time = rx8025_get_time,
- 	.set_time = rx8025_set_time,
- 	.read_alarm = rx8025_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-sh.c linux-2.6.39.3/drivers/rtc/rtc-sh.c
---- linux-2.6.39.3/drivers/rtc/rtc-sh.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-sh.c	2011-05-22 19:36:32.000000000 -0400
-@@ -576,7 +576,7 @@ static int sh_rtc_set_alarm(struct devic
- 	return 0;
- }
- 
--static struct rtc_class_ops sh_rtc_ops = {
-+static const struct rtc_class_ops sh_rtc_ops = {
- 	.read_time	= sh_rtc_read_time,
- 	.set_time	= sh_rtc_set_time,
- 	.read_alarm	= sh_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-stmp3xxx.c linux-2.6.39.3/drivers/rtc/rtc-stmp3xxx.c
---- linux-2.6.39.3/drivers/rtc/rtc-stmp3xxx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-stmp3xxx.c	2011-05-22 19:36:32.000000000 -0400
-@@ -133,7 +133,7 @@ static int stmp3xxx_rtc_set_alarm(struct
- 	return 0;
- }
- 
--static struct rtc_class_ops stmp3xxx_rtc_ops = {
-+static const struct rtc_class_ops stmp3xxx_rtc_ops = {
- 	.alarm_irq_enable =
- 			  stmp3xxx_alarm_irq_enable,
- 	.read_time	= stmp3xxx_rtc_gettime,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-tegra.c linux-2.6.39.3/drivers/rtc/rtc-tegra.c
---- linux-2.6.39.3/drivers/rtc/rtc-tegra.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct rtc_class_ops tegra_rtc_ops = {
-+static const struct rtc_class_ops tegra_rtc_ops = {
- 	.read_time	= tegra_rtc_read_time,
- 	.set_time	= tegra_rtc_set_time,
- 	.read_alarm	= tegra_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-twl.c linux-2.6.39.3/drivers/rtc/rtc-twl.c
---- linux-2.6.39.3/drivers/rtc/rtc-twl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/rtc/rtc-twl.c	2011-05-22 19:36:32.000000000 -0400
-@@ -415,7 +415,7 @@ out:
- 	return ret;
- }
- 
--static struct rtc_class_ops twl_rtc_ops = {
-+static const struct rtc_class_ops twl_rtc_ops = {
- 	.read_time	= twl_rtc_read_time,
- 	.set_time	= twl_rtc_set_time,
- 	.read_alarm	= twl_rtc_read_alarm,
-diff -urNp linux-2.6.39.3/drivers/rtc/rtc-v3020.c linux-2.6.39.3/drivers/rtc/rtc-v3020.c
---- linux-2.6.39.3/drivers/rtc/rtc-v3020.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 
--	struct v3020_chip_ops *ops;
-+	const struct v3020_chip_ops *ops;
- 
- 	struct rtc_device *rtc;
- };
-@@ -100,7 +100,7 @@ static unsigned char v3020_mmio_read_bit
- 	return !!(readl(chip->ioaddress) & (1 << chip->leftshift));
- }
- 
--static struct v3020_chip_ops v3020_mmio_ops = {
-+static const struct v3020_chip_ops v3020_mmio_ops = {
- 	.map_io		= v3020_mmio_map,
- 	.unmap_io	= v3020_mmio_unmap,
- 	.read_bit	= v3020_mmio_read_bit,
-@@ -177,7 +177,7 @@ static unsigned char v3020_gpio_read_bit
- 	return bit;
- }
- 
--static struct v3020_chip_ops v3020_gpio_ops = {
-+static const struct v3020_chip_ops v3020_gpio_ops = {
- 	.map_io		= v3020_gpio_map,
- 	.unmap_io	= v3020_gpio_unmap,
- 	.read_bit	= v3020_gpio_read_bit,
-diff -urNp linux-2.6.39.3/drivers/s390/char/con3270.c linux-2.6.39.3/drivers/s390/char/con3270.c
---- linux-2.6.39.3/drivers/s390/char/con3270.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/char/con3270.c	2011-05-22 19:36:32.000000000 -0400
-@@ -28,7 +28,7 @@
- #define CON3270_OUTPUT_BUFFER_SIZE 1024
- #define CON3270_STRING_PAGES 4
- 
--static struct raw3270_fn con3270_fn;
-+static const struct raw3270_fn con3270_fn;
+diff -urNp linux-2.6.39.4/drivers/scsi/aacraid/aacraid.h linux-2.6.39.4/drivers/scsi/aacraid/aacraid.h
+--- linux-2.6.39.4/drivers/scsi/aacraid/aacraid.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/aacraid/aacraid.h	2011-08-05 20:34:06.000000000 -0400
+@@ -492,7 +492,7 @@ struct adapter_ops
+ 	int  (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
+ 	/* Administrative operations */
+ 	int  (*adapter_comm)(struct aac_dev * dev, int comm);
+-};
++} __no_const;
  
  /*
-  * Main 3270 console view data structure.
-@@ -413,7 +413,7 @@ con3270_irq(struct con3270 *cp, struct r
- }
- 
- /* Console view to a 3270 device. */
--static struct raw3270_fn con3270_fn = {
-+static const struct raw3270_fn con3270_fn = {
- 	.activate = con3270_activate,
- 	.deactivate = con3270_deactivate,
- 	.intv = (void *) con3270_irq
-diff -urNp linux-2.6.39.3/drivers/s390/char/fs3270.c linux-2.6.39.3/drivers/s390/char/fs3270.c
---- linux-2.6.39.3/drivers/s390/char/fs3270.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/char/fs3270.c	2011-05-22 19:36:32.000000000 -0400
-@@ -24,7 +24,7 @@
- #include "raw3270.h"
- #include "ctrlchar.h"
- 
--static struct raw3270_fn fs3270_fn;
-+static const struct raw3270_fn fs3270_fn;
- 
- struct fs3270 {
- 	struct raw3270_view view;
-@@ -413,7 +413,7 @@ fs3270_release(struct raw3270_view *view
- }
- 
- /* View to a 3270 device. Can be console, tty or fullscreen. */
--static struct raw3270_fn fs3270_fn = {
-+static const struct raw3270_fn fs3270_fn = {
- 	.activate = fs3270_activate,
- 	.deactivate = fs3270_deactivate,
- 	.intv = (void *) fs3270_irq,
-diff -urNp linux-2.6.39.3/drivers/s390/char/raw3270.c linux-2.6.39.3/drivers/s390/char/raw3270.c
---- linux-2.6.39.3/drivers/s390/char/raw3270.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/char/raw3270.c	2011-05-22 19:36:32.000000000 -0400
-@@ -488,7 +488,7 @@ raw3270_init_irq(struct raw3270_view *vi
- 	return RAW3270_IO_DONE;
- }
- 
--static struct raw3270_fn raw3270_init_fn = {
-+static const struct raw3270_fn raw3270_init_fn = {
- 	.intv = raw3270_init_irq
- };
- 
-diff -urNp linux-2.6.39.3/drivers/s390/char/tty3270.c linux-2.6.39.3/drivers/s390/char/tty3270.c
---- linux-2.6.39.3/drivers/s390/char/tty3270.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/char/tty3270.c	2011-05-22 19:36:32.000000000 -0400
-@@ -37,7 +37,7 @@
- struct tty_driver *tty3270_driver;
- static int tty3270_max_index;
- 
--static struct raw3270_fn tty3270_fn;
-+static const struct raw3270_fn tty3270_fn;
- 
- struct tty3270_cell {
- 	unsigned char character;
-@@ -834,7 +834,7 @@ tty3270_del_views(void)
- 	}
- }
- 
--static struct raw3270_fn tty3270_fn = {
-+static const struct raw3270_fn tty3270_fn = {
- 	.activate = tty3270_activate,
- 	.deactivate = tty3270_deactivate,
- 	.intv = (void *) tty3270_irq,
-diff -urNp linux-2.6.39.3/drivers/s390/cio/qdio_debug.c linux-2.6.39.3/drivers/s390/cio/qdio_debug.c
---- linux-2.6.39.3/drivers/s390/cio/qdio_debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/cio/qdio_debug.c	2011-05-22 19:36:32.000000000 -0400
-@@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode *
- 			   filp->f_path.dentry->d_inode->i_private);
- }
- 
--static struct file_operations debugfs_perf_fops = {
-+static const struct file_operations debugfs_perf_fops = {
- 	.owner	 = THIS_MODULE,
- 	.open	 = qperf_seq_open,
- 	.read	 = seq_read,
-diff -urNp linux-2.6.39.3/drivers/s390/crypto/zcrypt_cex2a.c linux-2.6.39.3/drivers/s390/crypto/zcrypt_cex2a.c
---- linux-2.6.39.3/drivers/s390/crypto/zcrypt_cex2a.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/crypto/zcrypt_cex2a.c	2011-05-22 19:36:32.000000000 -0400
-@@ -415,7 +415,7 @@ out_free:
- /**
-  * The crypto operations for a CEX2A card.
-  */
--static struct zcrypt_ops zcrypt_cex2a_ops = {
-+static const struct zcrypt_ops zcrypt_cex2a_ops = {
- 	.rsa_modexpo = zcrypt_cex2a_modexpo,
- 	.rsa_modexpo_crt = zcrypt_cex2a_modexpo_crt,
- };
-diff -urNp linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcica.c linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcica.c
---- linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcica.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcica.c	2011-05-22 19:36:32.000000000 -0400
-@@ -347,7 +347,7 @@ out_free:
- /**
-  * The crypto operations for a PCICA card.
-  */
--static struct zcrypt_ops zcrypt_pcica_ops = {
-+static const struct zcrypt_ops zcrypt_pcica_ops = {
- 	.rsa_modexpo = zcrypt_pcica_modexpo,
- 	.rsa_modexpo_crt = zcrypt_pcica_modexpo_crt,
- };
-diff -urNp linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcicc.c linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcicc.c
---- linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcicc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcicc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -553,7 +553,7 @@ out_free:
- /**
-  * The crypto operations for a PCICC card.
-  */
--static struct zcrypt_ops zcrypt_pcicc_ops = {
-+static const struct zcrypt_ops zcrypt_pcicc_ops = {
- 	.rsa_modexpo = zcrypt_pcicc_modexpo,
- 	.rsa_modexpo_crt = zcrypt_pcicc_modexpo_crt,
- };
-diff -urNp linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcixcc.c linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcixcc.c
---- linux-2.6.39.3/drivers/s390/crypto/zcrypt_pcixcc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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.
-  */
--static struct zcrypt_ops zcrypt_pcixcc_ops = {
-+static const struct zcrypt_ops zcrypt_pcixcc_ops = {
- 	.rsa_modexpo = zcrypt_pcixcc_modexpo,
- 	.rsa_modexpo_crt = zcrypt_pcixcc_modexpo_crt,
- 	.send_cprb = zcrypt_pcixcc_send_cprb,
- };
- 
--static struct zcrypt_ops zcrypt_pcixcc_with_rng_ops = {
-+static const struct zcrypt_ops zcrypt_pcixcc_with_rng_ops = {
- 	.rsa_modexpo = zcrypt_pcixcc_modexpo,
- 	.rsa_modexpo_crt = zcrypt_pcixcc_modexpo_crt,
- 	.send_cprb = zcrypt_pcixcc_send_cprb,
-diff -urNp linux-2.6.39.3/drivers/s390/kvm/kvm_virtio.c linux-2.6.39.3/drivers/s390/kvm/kvm_virtio.c
---- linux-2.6.39.3/drivers/s390/kvm/kvm_virtio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/kvm/kvm_virtio.c	2011-05-22 19:36:32.000000000 -0400
-@@ -266,7 +266,7 @@ error:
- /*
-  * The config ops structure as defined by virtio config
-  */
--static struct virtio_config_ops kvm_vq_configspace_ops = {
-+static const struct virtio_config_ops kvm_vq_configspace_ops = {
- 	.get_features = kvm_get_features,
- 	.finalize_features = kvm_finalize_features,
- 	.get = kvm_get,
-diff -urNp linux-2.6.39.3/drivers/s390/net/qeth_core.h linux-2.6.39.3/drivers/s390/net/qeth_core.h
---- linux-2.6.39.3/drivers/s390/net/qeth_core.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/s390/net/qeth_core.h	2011-05-22 19:36:32.000000000 -0400
-@@ -743,7 +743,7 @@ struct qeth_card {
- 	struct qeth_qdio_info qdio;
- 	struct qeth_perf_stats perf_stats;
- 	int read_or_write_problem;
--	struct qeth_osn_info osn_info;
-+	const struct qeth_osn_info osn_info;
- 	struct qeth_discipline discipline;
- 	atomic_t force_alloc_skb;
- 	struct service_level qeth_service_level;
-diff -urNp linux-2.6.39.3/drivers/scsi/53c700.c linux-2.6.39.3/drivers/scsi/53c700.c
---- linux-2.6.39.3/drivers/scsi/53c700.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
--static struct spi_function_template NCR_700_transport_functions =  {
-+static struct spi_function_template NCR_700_transport_functions = {
- 	.set_period	= NCR_700_set_period,
- 	.show_period	= 1,
- 	.set_offset	= NCR_700_set_offset,
-diff -urNp linux-2.6.39.3/drivers/scsi/aacraid/commctrl.c linux-2.6.39.3/drivers/scsi/aacraid/commctrl.c
---- linux-2.6.39.3/drivers/scsi/aacraid/commctrl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/aacraid/commctrl.c	2011-05-22 19:36:32.000000000 -0400
+  *	Define which interrupt handler needs to be installed
+diff -urNp linux-2.6.39.4/drivers/scsi/aacraid/commctrl.c linux-2.6.39.4/drivers/scsi/aacraid/commctrl.c
+--- linux-2.6.39.4/drivers/scsi/aacraid/commctrl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/aacraid/commctrl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
  	u32 actual_fibsize64, actual_fibsize = 0;
  	int i;
@@ -38274,9 +30882,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/aacraid/commctrl.c linux-2.6.39.3/drivers
  
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-2.6.39.3/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.39.3/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.39.3/drivers/scsi/aic94xx/aic94xx_init.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/aic94xx/aic94xx_init.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.39.4/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-2.6.39.4/drivers/scsi/aic94xx/aic94xx_init.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/aic94xx/aic94xx_init.c	2011-08-05 19:44:37.000000000 -0400
 @@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru
  			flash_error_table[i].reason);
  }
@@ -38286,21 +30894,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.39.3/dri
  	asd_show_update_bios, asd_store_update_bios);
  
  static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfa_core.c linux-2.6.39.3/drivers/scsi/bfa/bfa_core.c
---- linux-2.6.39.3/drivers/scsi/bfa/bfa_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/bfa/bfa_core.c	2011-05-22 19:36:32.000000000 -0400
-@@ -24,7 +24,7 @@ BFA_TRC_FILE(HAL, CORE);
- /*
-  * BFA module list terminated by NULL
-  */
--static struct bfa_module_s *hal_mods[] = {
-+static const struct bfa_module_s *hal_mods[] = {
- 	&hal_mod_sgpg,
- 	&hal_mod_fcport,
- 	&hal_mod_fcxp,
-diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfad.c linux-2.6.39.3/drivers/scsi/bfa/bfad.c
---- linux-2.6.39.3/drivers/scsi/bfa/bfad.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/bfa/bfad.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/bfa/bfad.c linux-2.6.39.4/drivers/scsi/bfa/bfad.c
+--- linux-2.6.39.4/drivers/scsi/bfa/bfad.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/bfa/bfad.c	2011-08-05 19:44:37.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;
@@ -38310,39 +30906,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfad.c linux-2.6.39.3/drivers/scsi/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.3/drivers/scsi/bfa/bfa_fcs.c linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs.c
---- linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs.c	2011-05-22 19:36:32.000000000 -0400
-@@ -70,7 +70,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, st
- 	       bfa_boolean_t min_cfg)
- {
- 	int		i;
--	struct bfa_fcs_mod_s  *mod;
-+	const struct bfa_fcs_mod_s *mod;
- 
- 	fcs->bfa = bfa;
- 	fcs->bfad = bfad;
-@@ -93,7 +93,7 @@ void
- bfa_fcs_init(struct bfa_fcs_s *fcs)
- {
- 	int		i, npbc_vports;
--	struct bfa_fcs_mod_s  *mod;
-+	const struct bfa_fcs_mod_s *mod;
- 	struct bfi_pbc_vport_s pbc_vports[BFI_PBC_MAX_VPORTS];
- 
- 	for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
-@@ -140,7 +140,7 @@ bfa_fcs_driver_info_init(struct bfa_fcs_
- void
- bfa_fcs_exit(struct bfa_fcs_s *fcs)
- {
--	struct bfa_fcs_mod_s  *mod;
-+	const struct bfa_fcs_mod_s *mod;
- 	int		nmods, i;
- 
- 	bfa_wc_init(&fcs->wc, bfa_fcs_exit_comp, fcs);
-diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_lport.c
---- linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_lport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_lport.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_lport.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_lport.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
  	u16        len, count;
  	u16	templen;
@@ -38361,9 +30927,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.39.3/driver
  	/*
  	 * get port attributes
  	 */
-diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_rport.c
---- linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_rport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_rport.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_rport.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/bfa/bfa_fcs_rport.c	2011-08-05 19:44:37.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;
@@ -38373,43 +30939,42 @@ diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.39.3/driver
  	bfa_trc(port->fcs, rx_fchs->s_id);
  	bfa_trc(port->fcs, rx_fchs->d_id);
  
-diff -urNp linux-2.6.39.3/drivers/scsi/bfa/bfa_modules.h linux-2.6.39.3/drivers/scsi/bfa/bfa_modules.h
---- linux-2.6.39.3/drivers/scsi/bfa/bfa_modules.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/bfa/bfa_modules.h	2011-05-22 19:36:32.000000000 -0400
-@@ -68,8 +68,8 @@ enum {
- 	static void bfa_ ## __mod ## _stop(struct bfa_s *bfa);      \
- 	static void bfa_ ## __mod ## _iocdisable(struct bfa_s *bfa);      \
- 									\
--	extern struct bfa_module_s hal_mod_ ## __mod;			\
--	struct bfa_module_s hal_mod_ ## __mod = {			\
-+	extern  const struct bfa_module_s hal_mod_ ## __mod;			\
-+	 const struct bfa_module_s hal_mod_ ## __mod = {			\
- 		bfa_ ## __mod ## _meminfo,				\
- 		bfa_ ## __mod ## _attach,				\
- 		bfa_ ## __mod ## _detach,				\
-@@ -116,12 +116,12 @@ struct bfa_s {
- };
+diff -urNp linux-2.6.39.4/drivers/scsi/bfa/bfa.h linux-2.6.39.4/drivers/scsi/bfa/bfa.h
+--- linux-2.6.39.4/drivers/scsi/bfa/bfa.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/bfa/bfa.h	2011-08-05 20:34:06.000000000 -0400
+@@ -238,7 +238,7 @@ struct bfa_hwif_s {
+ 				u32 *nvecs, u32 *maxvec);
+ 	void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start,
+ 				       u32 *end);
+-};
++} __no_const;
+ typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
+ 
+ struct bfa_iocfc_s {
+diff -urNp linux-2.6.39.4/drivers/scsi/bfa/bfa_ioc.h linux-2.6.39.4/drivers/scsi/bfa/bfa_ioc.h
+--- linux-2.6.39.4/drivers/scsi/bfa/bfa_ioc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/bfa/bfa_ioc.h	2011-08-05 20:34:06.000000000 -0400
+@@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s {
+ 	bfa_ioc_disable_cbfn_t	disable_cbfn;
+ 	bfa_ioc_hbfail_cbfn_t	hbfail_cbfn;
+ 	bfa_ioc_reset_cbfn_t	reset_cbfn;
+-};
++} __no_const;
  
- extern bfa_boolean_t bfa_auto_recover;
--extern struct bfa_module_s hal_mod_sgpg;
--extern struct bfa_module_s hal_mod_fcport;
--extern struct bfa_module_s hal_mod_fcxp;
--extern struct bfa_module_s hal_mod_lps;
--extern struct bfa_module_s hal_mod_uf;
--extern struct bfa_module_s hal_mod_rport;
--extern struct bfa_module_s hal_mod_fcpim;
-+extern const struct bfa_module_s hal_mod_sgpg;
-+extern const struct bfa_module_s hal_mod_fcport;
-+extern const struct bfa_module_s hal_mod_fcxp;
-+extern const struct bfa_module_s hal_mod_lps;
-+extern const struct bfa_module_s hal_mod_uf;
-+extern const struct bfa_module_s hal_mod_rport;
-+extern const struct bfa_module_s hal_mod_fcpim;
- 
- #endif /* __BFA_MODULES_H__ */
-diff -urNp linux-2.6.39.3/drivers/scsi/BusLogic.c linux-2.6.39.3/drivers/scsi/BusLogic.c
---- linux-2.6.39.3/drivers/scsi/BusLogic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/BusLogic.c	2011-05-22 19:36:32.000000000 -0400
+ /*
+  * Heartbeat failure notification queue element.
+@@ -267,7 +267,7 @@ struct bfa_ioc_hwif_s {
+ 	void		(*ioc_sync_leave)	(struct bfa_ioc_s *ioc);
+ 	void		(*ioc_sync_ack)		(struct bfa_ioc_s *ioc);
+ 	bfa_boolean_t	(*ioc_sync_complete)	(struct bfa_ioc_s *ioc);
+-};
++} __no_const;
+ 
+ #define bfa_ioc_pcifn(__ioc)		((__ioc)->pcidev.pci_func)
+ #define bfa_ioc_devid(__ioc)		((__ioc)->pcidev.device_id)
+diff -urNp linux-2.6.39.4/drivers/scsi/BusLogic.c linux-2.6.39.4/drivers/scsi/BusLogic.c
+--- linux-2.6.39.4/drivers/scsi/BusLogic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/BusLogic.c	2011-08-05 19:44:37.000000000 -0400
 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
  static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
  						    *PrototypeHostAdapter)
@@ -38419,9 +30984,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/BusLogic.c linux-2.6.39.3/drivers/scsi/Bu
  	/*
  	   If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
  	   Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
-diff -urNp linux-2.6.39.3/drivers/scsi/dpt_i2o.c linux-2.6.39.3/drivers/scsi/dpt_i2o.c
---- linux-2.6.39.3/drivers/scsi/dpt_i2o.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/dpt_i2o.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/dpt_i2o.c linux-2.6.39.4/drivers/scsi/dpt_i2o.c
+--- linux-2.6.39.4/drivers/scsi/dpt_i2o.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/dpt_i2o.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
  	dma_addr_t addr;
  	ulong flags = 0;
@@ -38440,9 +31005,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/dpt_i2o.c linux-2.6.39.3/drivers/scsi/dpt
  	memset(msg, 0 , sizeof(msg));
  	len = scsi_bufflen(cmd);
  	direction = 0x00000000;	
-diff -urNp linux-2.6.39.3/drivers/scsi/eata.c linux-2.6.39.3/drivers/scsi/eata.c
---- linux-2.6.39.3/drivers/scsi/eata.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/eata.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/eata.c linux-2.6.39.4/drivers/scsi/eata.c
+--- linux-2.6.39.4/drivers/scsi/eata.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/eata.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
  	struct hostdata *ha;
  	char name[16];
@@ -38452,42 +31017,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/eata.c linux-2.6.39.3/drivers/scsi/eata.c
  	sprintf(name, "%s%d", driver_name, j);
  
  	if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff -urNp linux-2.6.39.3/drivers/scsi/esp_scsi.c linux-2.6.39.3/drivers/scsi/esp_scsi.c
---- linux-2.6.39.3/drivers/scsi/esp_scsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 |= ESP_TGT_CHECK_NEGO;
- }
- 
--static struct spi_function_template esp_transport_ops = {
-+static const struct spi_function_template esp_transport_ops = {
- 	.set_offset		= esp_set_offset,
- 	.show_offset		= 1,
- 	.set_period		= esp_set_period,
-diff -urNp linux-2.6.39.3/drivers/scsi/fcoe/fcoe.c linux-2.6.39.3/drivers/scsi/fcoe/fcoe.c
---- linux-2.6.39.3/drivers/scsi/fcoe/fcoe.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/fcoe/fcoe.c	2011-05-22 19:36:32.000000000 -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 *);
- 
--static struct libfc_function_template fcoe_libfc_fcn_templ = {
-+static const struct libfc_function_template fcoe_libfc_fcn_templ = {
- 	.frame_send = fcoe_xmit,
- 	.ddp_setup = fcoe_ddp_setup,
- 	.ddp_done = fcoe_ddp_done,
-diff -urNp linux-2.6.39.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-2.6.39.3/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-2.6.39.3/drivers/scsi/fcoe/fcoe_ctlr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/fcoe/fcoe_ctlr.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1912,7 +1912,7 @@ static void fcoe_ctlr_vn_rport_callback(
- 	mutex_unlock(&fip->ctlr_mutex);
- }
- 
--static struct fc_rport_operations fcoe_ctlr_vn_rport_ops = {
-+static const struct fc_rport_operations fcoe_ctlr_vn_rport_ops = {
- 	.event_callback = fcoe_ctlr_vn_rport_callback,
- };
- 
+diff -urNp linux-2.6.39.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-2.6.39.4/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-2.6.39.4/drivers/scsi/fcoe/fcoe_ctlr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/fcoe/fcoe_ctlr.c	2011-08-05 20:34:06.000000000 -0400
 @@ -2458,6 +2458,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
  	} buf;
  	int rc;
@@ -38497,21 +31029,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-2.6.39.3/drivers/s
  	fiph = (struct fip_header *)skb->data;
  	sub = fiph->fip_subcode;
  
-diff -urNp linux-2.6.39.3/drivers/scsi/fnic/fnic_main.c linux-2.6.39.3/drivers/scsi/fnic/fnic_main.c
---- linux-2.6.39.3/drivers/scsi/fnic/fnic_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/fnic/fnic_main.c	2011-05-22 19:36:32.000000000 -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");
- 
- 
--static struct libfc_function_template fnic_transport_template = {
-+static const struct libfc_function_template fnic_transport_template = {
- 	.frame_send = fnic_send,
- 	.lport_set_port_id = fnic_set_port_id,
- 	.fcp_abort_io = fnic_empty_scsi_cleanup,
-diff -urNp linux-2.6.39.3/drivers/scsi/gdth.c linux-2.6.39.3/drivers/scsi/gdth.c
---- linux-2.6.39.3/drivers/scsi/gdth.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/gdth.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/gdth.c linux-2.6.39.4/drivers/scsi/gdth.c
+--- linux-2.6.39.4/drivers/scsi/gdth.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/gdth.c	2011-08-05 19:44:37.000000000 -0400
 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
      unsigned long flags;
      gdth_ha_str *ha;
@@ -38549,9 +31069,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/gdth.c linux-2.6.39.3/drivers/scsi/gdth.c
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-2.6.39.3/drivers/scsi/gdth_proc.c linux-2.6.39.3/drivers/scsi/gdth_proc.c
---- linux-2.6.39.3/drivers/scsi/gdth_proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/gdth_proc.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/gdth_proc.c linux-2.6.39.4/drivers/scsi/gdth_proc.c
+--- linux-2.6.39.4/drivers/scsi/gdth_proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/gdth_proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
      u64         paddr;
  
@@ -38571,9 +31091,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/gdth_proc.c linux-2.6.39.3/drivers/scsi/g
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff -urNp linux-2.6.39.3/drivers/scsi/hosts.c linux-2.6.39.3/drivers/scsi/hosts.c
---- linux-2.6.39.3/drivers/scsi/hosts.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/hosts.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/hosts.c linux-2.6.39.4/drivers/scsi/hosts.c
+--- linux-2.6.39.4/drivers/scsi/hosts.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/hosts.c	2011-08-05 19:44:37.000000000 -0400
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -38592,145 +31112,129 @@ diff -urNp linux-2.6.39.3/drivers/scsi/hosts.c linux-2.6.39.3/drivers/scsi/hosts
  	shost->dma_channel = 0xff;
  
  	/* These three are default values which can be overridden */
-diff -urNp linux-2.6.39.3/drivers/scsi/hpsa.h linux-2.6.39.3/drivers/scsi/hpsa.h
---- linux-2.6.39.3/drivers/scsi/hpsa.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/hpsa.h	2011-05-22 19:36:32.000000000 -0400
-@@ -347,7 +347,7 @@ static struct access_method SA5_access =
- 	SA5_completed,
- };
- 
--static struct access_method SA5_performant_access = {
-+static const struct access_method SA5_performant_access = {
- 	SA5_submit_command,
- 	SA5_performant_intr_mask,
- 	SA5_fifo_full,
-diff -urNp linux-2.6.39.3/drivers/scsi/hptiop.c linux-2.6.39.3/drivers/scsi/hptiop.c
---- linux-2.6.39.3/drivers/scsi/hptiop.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct hptiop_adapter_ops hptiop_itl_ops = {
-+static const struct hptiop_adapter_ops hptiop_itl_ops = {
- 	.iop_wait_ready    = iop_wait_ready_itl,
- 	.internal_memalloc = NULL,
- 	.internal_memfree  = NULL,
-@@ -1241,7 +1241,7 @@ static struct hptiop_adapter_ops hptiop_
- 	.post_req          = hptiop_post_req_itl,
- };
- 
--static struct hptiop_adapter_ops hptiop_mv_ops = {
-+static const struct hptiop_adapter_ops hptiop_mv_ops = {
- 	.iop_wait_ready    = iop_wait_ready_mv,
- 	.internal_memalloc = hptiop_internal_memalloc_mv,
- 	.internal_memfree  = hptiop_internal_memfree_mv,
-diff -urNp linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvfc.c linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvfc.c
---- linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvfc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvfc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -4881,7 +4881,7 @@ static struct vio_device_id ibmvfc_devic
- };
- MODULE_DEVICE_TABLE(vio, ibmvfc_device_table);
+diff -urNp linux-2.6.39.4/drivers/scsi/hpsa.c linux-2.6.39.4/drivers/scsi/hpsa.c
+--- linux-2.6.39.4/drivers/scsi/hpsa.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/hpsa.c	2011-08-05 20:34:06.000000000 -0400
+@@ -469,7 +469,7 @@ static inline u32 next_command(struct ct
+ 	u32 a;
+ 
+ 	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
+-		return h->access.command_completed(h);
++		return h->access->command_completed(h);
+ 
+ 	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
+ 		a = *(h->reply_pool_head); /* Next cmd in ring buffer */
+@@ -2889,7 +2889,7 @@ static void start_io(struct ctlr_info *h
+ 	while (!list_empty(&h->reqQ)) {
+ 		c = list_entry(h->reqQ.next, struct CommandList, list);
+ 		/* can't do anything if fifo is full */
+-		if ((h->access.fifo_full(h))) {
++		if ((h->access->fifo_full(h))) {
+ 			dev_warn(&h->pdev->dev, "fifo full\n");
+ 			break;
+ 		}
+@@ -2899,7 +2899,7 @@ static void start_io(struct ctlr_info *h
+ 		h->Qdepth--;
  
--static struct dev_pm_ops ibmvfc_pm_ops = {
-+static const struct dev_pm_ops ibmvfc_pm_ops = {
- 	.resume = ibmvfc_resume
- };
+ 		/* Tell the controller execute command */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
  
-diff -urNp linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvscsi.c linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvscsi.c
---- linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvscsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvscsi.c	2011-05-22 19:36:32.000000000 -0400
-@@ -104,7 +104,7 @@ static struct scsi_transport_template *i
+ 		/* Put job onto the completed Q */
+ 		addQ(&h->cmpQ, c);
+@@ -2908,17 +2908,17 @@ static void start_io(struct ctlr_info *h
  
- #define IBMVSCSI_VERSION "1.5.9"
+ static inline unsigned long get_next_completion(struct ctlr_info *h)
+ {
+-	return h->access.command_completed(h);
++	return h->access->command_completed(h);
+ }
  
--static struct ibmvscsi_ops *ibmvscsi_ops;
-+static const struct ibmvscsi_ops *ibmvscsi_ops;
+ static inline bool interrupt_pending(struct ctlr_info *h)
+ {
+-	return h->access.intr_pending(h);
++	return h->access->intr_pending(h);
+ }
  
- MODULE_DESCRIPTION("IBM Virtual SCSI");
- MODULE_AUTHOR("Dave Boutcher");
-@@ -2059,7 +2059,7 @@ static struct vio_device_id ibmvscsi_dev
- };
- MODULE_DEVICE_TABLE(vio, ibmvscsi_device_table);
+ static inline long interrupt_not_for_us(struct ctlr_info *h)
+ {
+-	return (h->access.intr_pending(h) == 0) ||
++	return (h->access->intr_pending(h) == 0) ||
+ 		(h->interrupts_enabled == 0);
+ }
  
--static struct dev_pm_ops ibmvscsi_pm_ops = {
-+static const struct dev_pm_ops ibmvscsi_pm_ops = {
- 	.resume = ibmvscsi_resume
- };
+@@ -3684,7 +3684,7 @@ static int __devinit hpsa_pci_init(struc
+ 	if (prod_index < 0)
+ 		return -ENODEV;
+ 	h->product_name = products[prod_index].product_name;
+-	h->access = *(products[prod_index].access);
++	h->access = products[prod_index].access;
  
-@@ -2075,7 +2075,7 @@ static struct vio_driver ibmvscsi_driver
+ 	if (hpsa_board_disabled(h->pdev)) {
+ 		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
+@@ -3845,7 +3845,7 @@ static int __devinit hpsa_init_one(struc
  	}
- };
  
--static struct srp_function_template ibmvscsi_transport_functions = {
-+static const struct srp_function_template ibmvscsi_transport_functions = {
- };
+ 	/* make sure the board interrupts are off */
+-	h->access.set_intr_mask(h, HPSA_INTR_OFF);
++	h->access->set_intr_mask(h, HPSA_INTR_OFF);
  
- int __init ibmvscsi_module_init(void)
-diff -urNp linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvscsi.h linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvscsi.h
---- linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvscsi.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- };
+ 	if (h->msix_vector || h->msi_vector)
+ 		rc = request_irq(h->intr[h->intr_mode], do_hpsa_intr_msi,
+@@ -3892,7 +3892,7 @@ static int __devinit hpsa_init_one(struc
+ 	hpsa_scsi_setup(h);
  
--extern struct ibmvscsi_ops iseriesvscsi_ops;
--extern struct ibmvscsi_ops rpavscsi_ops;
-+extern const struct ibmvscsi_ops iseriesvscsi_ops;
-+extern const struct ibmvscsi_ops rpavscsi_ops;
+ 	/* Turn the interrupts on so we can service requests */
+-	h->access.set_intr_mask(h, HPSA_INTR_ON);
++	h->access->set_intr_mask(h, HPSA_INTR_ON);
  
- #endif				/* IBMVSCSI_H */
-diff -urNp linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvstgt.c linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvstgt.c
---- linux-2.6.39.3/drivers/scsi/ibmvscsi/ibmvstgt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct srp_function_template ibmvstgt_transport_functions = {
-+static const struct srp_function_template ibmvstgt_transport_functions = {
- 	.tsk_mgmt_response = ibmvstgt_tsk_mgmt_response,
- 	.it_nexus_response = ibmvstgt_it_nexus_response,
- };
-diff -urNp linux-2.6.39.3/drivers/scsi/ibmvscsi/iseries_vscsi.c linux-2.6.39.3/drivers/scsi/ibmvscsi/iseries_vscsi.c
---- linux-2.6.39.3/drivers/scsi/ibmvscsi/iseries_vscsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/ibmvscsi/iseries_vscsi.c	2011-05-22 19:36:32.000000000 -0400
-@@ -163,7 +163,7 @@ static int iseriesvscsi_resume(struct ib
- 	return 0;
- }
- 
--struct ibmvscsi_ops iseriesvscsi_ops = {
-+const struct ibmvscsi_ops iseriesvscsi_ops = {
- 	.init_crq_queue = iseriesvscsi_init_crq_queue,
- 	.release_crq_queue = iseriesvscsi_release_crq_queue,
- 	.reset_crq_queue = iseriesvscsi_reset_crq_queue,
-diff -urNp linux-2.6.39.3/drivers/scsi/ibmvscsi/rpa_vscsi.c linux-2.6.39.3/drivers/scsi/ibmvscsi/rpa_vscsi.c
---- linux-2.6.39.3/drivers/scsi/ibmvscsi/rpa_vscsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct ibmvscsi_ops rpavscsi_ops = {
-+const struct ibmvscsi_ops rpavscsi_ops = {
- 	.init_crq_queue = rpavscsi_init_crq_queue,
- 	.release_crq_queue = rpavscsi_release_crq_queue,
- 	.reset_crq_queue = rpavscsi_reset_crq_queue,
-diff -urNp linux-2.6.39.3/drivers/scsi/ipr.c linux-2.6.39.3/drivers/scsi/ipr.c
---- linux-2.6.39.3/drivers/scsi/ipr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/ipr.c	2011-05-22 19:36:32.000000000 -0400
-@@ -6210,7 +6210,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
- 	return true;
- }
- 
--static struct ata_port_operations ipr_sata_ops = {
-+static const struct ata_port_operations ipr_sata_ops = {
- 	.phy_reset = ipr_ata_phy_reset,
- 	.hardreset = ipr_sata_reset,
- 	.post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.39.3/drivers/scsi/libfc/fc_exch.c linux-2.6.39.3/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.39.3/drivers/scsi/libfc/fc_exch.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/libfc/fc_exch.c	2011-05-22 19:36:32.000000000 -0400
+ 	hpsa_put_ctlr_into_performant_mode(h);
+ 	hpsa_hba_inquiry(h);
+@@ -3955,7 +3955,7 @@ static void hpsa_shutdown(struct pci_dev
+ 	 * To write all data in the battery backed cache to disks
+ 	 */
+ 	hpsa_flush_cache(h);
+-	h->access.set_intr_mask(h, HPSA_INTR_OFF);
++	h->access->set_intr_mask(h, HPSA_INTR_OFF);
+ 	free_irq(h->intr[h->intr_mode], h);
+ #ifdef CONFIG_PCI_MSI
+ 	if (h->msix_vector)
+@@ -4118,7 +4118,7 @@ static __devinit void hpsa_enter_perform
+ 		return;
+ 	}
+ 	/* Change the access methods to the performant access methods */
+-	h->access = SA5_performant_access;
++	h->access = &SA5_performant_access;
+ 	h->transMethod = CFGTBL_Trans_Performant;
+ }
+ 
+diff -urNp linux-2.6.39.4/drivers/scsi/hpsa.h linux-2.6.39.4/drivers/scsi/hpsa.h
+--- linux-2.6.39.4/drivers/scsi/hpsa.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/hpsa.h	2011-08-05 20:34:06.000000000 -0400
+@@ -73,7 +73,7 @@ struct ctlr_info {
+ 	unsigned int msix_vector;
+ 	unsigned int msi_vector;
+ 	int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	/* queue and queue Info */
+ 	struct list_head reqQ;
+diff -urNp linux-2.6.39.4/drivers/scsi/ips.h linux-2.6.39.4/drivers/scsi/ips.h
+--- linux-2.6.39.4/drivers/scsi/ips.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/ips.h	2011-08-05 20:34:06.000000000 -0400
+@@ -1027,7 +1027,7 @@ typedef struct {
+    int       (*intr)(struct ips_ha *);
+    void      (*enableint)(struct ips_ha *);
+    uint32_t (*statupd)(struct ips_ha *);
+-} ips_hw_func_t;
++} __no_const ips_hw_func_t;
+ 
+ typedef struct ips_ha {
+    uint8_t            ha_id[IPS_MAX_CHANNELS+1];
+diff -urNp linux-2.6.39.4/drivers/scsi/libfc/fc_exch.c linux-2.6.39.4/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.39.4/drivers/scsi/libfc/fc_exch.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/libfc/fc_exch.c	2011-08-05 19:44:37.000000000 -0400
 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -38852,42 +31356,10 @@ diff -urNp linux-2.6.39.3/drivers/scsi/libfc/fc_exch.c linux-2.6.39.3/drivers/sc
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-2.6.39.3/drivers/scsi/libfc/fc_lport.c linux-2.6.39.3/drivers/scsi/libfc/fc_lport.c
---- linux-2.6.39.3/drivers/scsi/libfc/fc_lport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/libfc/fc_lport.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1299,7 +1299,7 @@ static void fc_lport_enter_ns(struct fc_
- 		fc_lport_error(lport, fp);
- }
- 
--static struct fc_rport_operations fc_lport_rport_ops = {
-+static const struct fc_rport_operations fc_lport_rport_ops = {
- 	.event_callback = fc_lport_rport_callback,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/scsi/libfc/fc_rport.c linux-2.6.39.3/drivers/scsi/libfc/fc_rport.c
---- linux-2.6.39.3/drivers/scsi/libfc/fc_rport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/libfc/fc_rport.c	2011-05-22 19:36:32.000000000 -0400
-@@ -256,7 +256,7 @@ static void fc_rport_work(struct work_st
- 	struct fc_rport_libfc_priv *rpriv;
- 	enum fc_rport_event event;
- 	struct fc_lport *lport = rdata->local_port;
--	struct fc_rport_operations *rport_ops;
-+	const struct fc_rport_operations *rport_ops;
- 	struct fc_rport_identifiers ids;
- 	struct fc_rport *rport;
- 	struct fc4_prov *prov;
-diff -urNp linux-2.6.39.3/drivers/scsi/libsas/sas_ata.c linux-2.6.39.3/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.39.3/drivers/scsi/libsas/sas_ata.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/libsas/sas_ata.c	2011-05-22 19:36:32.000000000 -0400
-@@ -307,14 +307,14 @@ static void sas_ata_post_internal(struct
- 	}
- }
- 
--static struct ata_port_operations sas_sata_ops = {
-+static const struct ata_port_operations sas_sata_ops = {
- 	.prereset		= ata_std_prereset,
- 	.softreset		= NULL,
- 	.hardreset		= sas_ata_hard_reset,
+diff -urNp linux-2.6.39.4/drivers/scsi/libsas/sas_ata.c linux-2.6.39.4/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.39.4/drivers/scsi/libsas/sas_ata.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/libsas/sas_ata.c	2011-08-05 20:34:06.000000000 -0400
+@@ -314,7 +314,7 @@ static struct ata_port_operations sas_sa
  	.postreset		= ata_std_postreset,
  	.error_handler		= ata_std_error_handler,
  	.post_internal_cmd	= sas_ata_post_internal,
@@ -38896,9 +31368,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/libsas/sas_ata.c linux-2.6.39.3/drivers/s
  	.qc_prep		= ata_noop_qc_prep,
  	.qc_issue		= sas_ata_qc_issue,
  	.qc_fill_rtf		= sas_ata_qc_fill_rtf,
-diff -urNp linux-2.6.39.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.39.3/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-2.6.39.3/drivers/scsi/lpfc/lpfc_debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/lpfc/lpfc_debugfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.39.4/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-2.6.39.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
  
  #include <linux/debugfs.h>
@@ -38987,9 +31459,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.39.3/driver
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff -urNp linux-2.6.39.3/drivers/scsi/lpfc/lpfc.h linux-2.6.39.3/drivers/scsi/lpfc/lpfc.h
---- linux-2.6.39.3/drivers/scsi/lpfc/lpfc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/lpfc/lpfc.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/lpfc/lpfc.h linux-2.6.39.4/drivers/scsi/lpfc/lpfc.h
+--- linux-2.6.39.4/drivers/scsi/lpfc/lpfc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/lpfc/lpfc.h	2011-08-05 19:44:37.000000000 -0400
 @@ -419,7 +419,7 @@ struct lpfc_vport {
  	struct dentry *debug_nodelist;
  	struct dentry *vport_debugfs_root;
@@ -39019,9 +31491,25 @@ diff -urNp linux-2.6.39.3/drivers/scsi/lpfc/lpfc.h linux-2.6.39.3/drivers/scsi/l
  	/* iDiag debugfs sub-directory */
  	struct dentry *idiag_root;
  	struct dentry *idiag_pci_cfg;
-diff -urNp linux-2.6.39.3/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.39.3/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-2.6.39.3/drivers/scsi/lpfc/lpfc_scsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/lpfc/lpfc_scsi.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/lpfc/lpfc_init.c linux-2.6.39.4/drivers/scsi/lpfc/lpfc_init.c
+--- linux-2.6.39.4/drivers/scsi/lpfc/lpfc_init.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/lpfc/lpfc_init.c	2011-08-05 20:34:06.000000000 -0400
+@@ -9535,8 +9535,10 @@ lpfc_init(void)
+ 	printk(LPFC_COPYRIGHT "\n");
+ 
+ 	if (lpfc_enable_npiv) {
+-		lpfc_transport_functions.vport_create = lpfc_vport_create;
+-		lpfc_transport_functions.vport_delete = lpfc_vport_delete;
++		pax_open_kernel();
++		*(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
++		*(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
++		pax_close_kernel();
+ 	}
+ 	lpfc_transport_template =
+ 				fc_attach_transport(&lpfc_transport_functions);
+diff -urNp linux-2.6.39.4/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.39.4/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-2.6.39.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-08-05 19:44:37.000000000 -0400
 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
  	uint32_t evt_posted;
  
@@ -39073,21 +31561,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.39.3/drivers/s
  }
  
  /**
-diff -urNp linux-2.6.39.3/drivers/scsi/mac_esp.c linux-2.6.39.3/drivers/scsi/mac_esp.c
---- linux-2.6.39.3/drivers/scsi/mac_esp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct esp_driver_ops mac_esp_ops = {
-+static const struct esp_driver_ops mac_esp_ops = {
- 	.esp_write8       = mac_esp_write8,
- 	.esp_read8        = mac_esp_read8,
- 	.map_single       = mac_esp_map_single,
-diff -urNp linux-2.6.39.3/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.39.3/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-2.6.39.3/drivers/scsi/megaraid/megaraid_mbox.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/megaraid/megaraid_mbox.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.39.4/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-2.6.39.4/drivers/scsi/megaraid/megaraid_mbox.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/megaraid/megaraid_mbox.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3510,6 +3510,8 @@ megaraid_cmm_register(adapter_t *adapter
  	int		rval;
  	int		i;
@@ -39097,93 +31573,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.39.3/d
  	// Allocate memory for the base list of scb for management module.
  	adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
  
-diff -urNp linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas_base.c linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas_base.c
---- linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas_base.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct megasas_instance_template megasas_instance_template_xscale = {
-+static const struct megasas_instance_template megasas_instance_template_xscale = {
- 
- 	.fire_cmd = megasas_fire_cmd_xscale,
- 	.enable_intr = megasas_enable_intr_xscale,
-@@ -497,7 +497,7 @@ megasas_check_reset_ppc(struct megasas_i
- {
- 	return 0;
- }
--static struct megasas_instance_template megasas_instance_template_ppc = {
-+static const struct megasas_instance_template megasas_instance_template_ppc = {
- 
- 	.fire_cmd = megasas_fire_cmd_ppc,
- 	.enable_intr = megasas_enable_intr_ppc,
-@@ -623,7 +623,7 @@ megasas_check_reset_skinny(struct megasa
- 	return 0;
- }
- 
--static struct megasas_instance_template megasas_instance_template_skinny = {
-+static const struct megasas_instance_template megasas_instance_template_skinny = {
- 
- 	.fire_cmd = megasas_fire_cmd_skinny,
- 	.enable_intr = megasas_enable_intr_skinny,
-@@ -810,7 +810,7 @@ megasas_check_reset_gen2(struct megasas_
- 	return 0;
- }
- 
--static struct megasas_instance_template megasas_instance_template_gen2 = {
-+static const struct megasas_instance_template megasas_instance_template_gen2 = {
- 
- 	.fire_cmd = megasas_fire_cmd_gen2,
- 	.enable_intr = megasas_enable_intr_gen2,
-@@ -834,7 +834,7 @@ static struct megasas_instance_template 
- /*
-  * Template added for TB (Fusion)
-  */
--extern struct megasas_instance_template megasas_instance_template_fusion;
-+extern const struct megasas_instance_template megasas_instance_template_fusion;
- 
- /**
-  * megasas_issue_polled -	Issues a polling command
-diff -urNp linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas_fusion.c linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas_fusion.c
---- linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas_fusion.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas_fusion.c	2011-05-22 19:36:32.000000000 -0400
-@@ -2236,7 +2236,7 @@ void megasas_fusion_ocr_wq(struct work_s
- 	megasas_reset_fusion(instance->host);
- }
- 
--struct megasas_instance_template megasas_instance_template_fusion = {
-+const struct megasas_instance_template megasas_instance_template_fusion = {
- 	.fire_cmd = megasas_fire_cmd_fusion,
- 	.enable_intr = megasas_enable_intr_fusion,
- 	.disable_intr = megasas_disable_intr_fusion,
-diff -urNp linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas.h linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas.h
---- linux-2.6.39.3/drivers/scsi/megaraid/megaraid_sas.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 
--	struct megasas_instance_template *instancet;
-+	const struct megasas_instance_template *instancet;
- 	struct tasklet_struct isr_tasklet;
- 	struct work_struct work_init;
- 
-diff -urNp linux-2.6.39.3/drivers/scsi/ncr53c8xx.c linux-2.6.39.3/drivers/scsi/ncr53c8xx.c
---- linux-2.6.39.3/drivers/scsi/ncr53c8xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/ncr53c8xx.c	2011-05-22 19:36:32.000000000 -0400
-@@ -8606,7 +8606,7 @@ static void ncr53c8xx_get_signalling(str
- 	spi_signalling(shost) = type;
- }
- 
--static struct spi_function_template ncr53c8xx_transport_functions =  {
-+static struct spi_function_template ncr53c8xx_transport_functions = {
- 	.set_period	= ncr53c8xx_set_period,
- 	.show_period	= 1,
- 	.set_offset	= ncr53c8xx_set_offset,
-diff -urNp linux-2.6.39.3/drivers/scsi/osd/osd_initiator.c linux-2.6.39.3/drivers/scsi/osd/osd_initiator.c
---- linux-2.6.39.3/drivers/scsi/osd/osd_initiator.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/osd/osd_initiator.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/osd/osd_initiator.c linux-2.6.39.4/drivers/scsi/osd/osd_initiator.c
+--- linux-2.6.39.4/drivers/scsi/osd/osd_initiator.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/osd/osd_initiator.c	2011-08-05 19:44:37.000000000 -0400
 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
  	int nelem = ARRAY_SIZE(get_attrs), a = 0;
  	int ret;
@@ -39193,9 +31585,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/osd/osd_initiator.c linux-2.6.39.3/driver
  	or = osd_start_request(od, GFP_KERNEL);
  	if (!or)
  		return -ENOMEM;
-diff -urNp linux-2.6.39.3/drivers/scsi/pmcraid.c linux-2.6.39.3/drivers/scsi/pmcraid.c
---- linux-2.6.39.3/drivers/scsi/pmcraid.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/pmcraid.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/pmcraid.c linux-2.6.39.4/drivers/scsi/pmcraid.c
+--- linux-2.6.39.4/drivers/scsi/pmcraid.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/pmcraid.c	2011-08-05 19:44:37.000000000 -0400
 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
  		res->scsi_dev = scsi_dev;
  		scsi_dev->hostdata = res;
@@ -39266,9 +31658,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/pmcraid.c linux-2.6.39.3/drivers/scsi/pmc
  	schedule_work(&pinstance->worker_q);
  	return rc;
  
-diff -urNp linux-2.6.39.3/drivers/scsi/pmcraid.h linux-2.6.39.3/drivers/scsi/pmcraid.h
---- linux-2.6.39.3/drivers/scsi/pmcraid.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/pmcraid.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/pmcraid.h linux-2.6.39.4/drivers/scsi/pmcraid.h
+--- linux-2.6.39.4/drivers/scsi/pmcraid.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/pmcraid.h	2011-08-05 19:44:37.000000000 -0400
 @@ -750,7 +750,7 @@ struct pmcraid_instance {
  	struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
  
@@ -39298,21 +31690,21 @@ diff -urNp linux-2.6.39.3/drivers/scsi/pmcraid.h linux-2.6.39.3/drivers/scsi/pmc
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
-diff -urNp linux-2.6.39.3/drivers/scsi/qla2xxx/qla_os.c linux-2.6.39.3/drivers/scsi/qla2xxx/qla_os.c
---- linux-2.6.39.3/drivers/scsi/qla2xxx/qla_os.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/qla2xxx/qla_os.c	2011-06-03 00:32:06.000000000 -0400
-@@ -4103,7 +4103,7 @@ static struct pci_driver qla2xxx_pci_dri
- 	.err_handler	= &qla2xxx_err_handler,
- };
- 
--static struct file_operations apidev_fops = {
-+static const struct file_operations apidev_fops = {
- 	.owner = THIS_MODULE,
- 	.llseek = noop_llseek,
- };
-diff -urNp linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_def.h
---- linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_def.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_def.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/qla2xxx/qla_def.h linux-2.6.39.4/drivers/scsi/qla2xxx/qla_def.h
+--- linux-2.6.39.4/drivers/scsi/qla2xxx/qla_def.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/qla2xxx/qla_def.h	2011-08-05 20:34:06.000000000 -0400
+@@ -2236,7 +2236,7 @@ struct isp_operations {
+ 	int (*get_flash_version) (struct scsi_qla_host *, void *);
+ 	int (*start_scsi) (srb_t *);
+ 	int (*abort_isp) (struct scsi_qla_host *);
+-};
++} __no_const;
+ 
+ /* MSI-X Support *************************************************************/
+ 
+diff -urNp linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_def.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_def.h	2011-08-05 19:44:37.000000000 -0400
 @@ -256,7 +256,7 @@ struct ddb_entry {
  	atomic_t retry_relogin_timer; /* Min Time between relogins
  				       * (4000 only) */
@@ -39322,9 +31714,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.39.3/drivers/
  				       * retried */
  
  	uint16_t port;
-diff -urNp linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_init.c
---- linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_init.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_init.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_init.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_init.c	2011-08-05 19:44:37.000000000 -0400
 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
  	ddb_entry->fw_ddb_index = fw_ddb_index;
  	atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -39343,9 +31735,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.39.3/drivers
  		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.3/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_os.c
---- linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_os.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_os.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_os.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/qla4xxx/ql4_os.c	2011-08-05 19:44:37.000000000 -0400
 @@ -802,13 +802,13 @@ static void qla4xxx_timer(struct scsi_ql
  			    ddb_entry->fw_ddb_device_state ==
  			    DDB_DS_SESSION_FAILED) {
@@ -39362,9 +31754,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.39.3/drivers/s
  							  relogin_retry_count))
  					);
  				start_dpc++;
-diff -urNp linux-2.6.39.3/drivers/scsi/scsi.c linux-2.6.39.3/drivers/scsi/scsi.c
---- linux-2.6.39.3/drivers/scsi/scsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/scsi.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/scsi.c linux-2.6.39.4/drivers/scsi/scsi.c
+--- linux-2.6.39.4/drivers/scsi/scsi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/scsi.c	2011-08-05 19:44:37.000000000 -0400
 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
  	unsigned long timeout;
  	int rtn = 0;
@@ -39374,9 +31766,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/scsi.c linux-2.6.39.3/drivers/scsi/scsi.c
  
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-2.6.39.3/drivers/scsi/scsi_debug.c linux-2.6.39.3/drivers/scsi/scsi_debug.c
---- linux-2.6.39.3/drivers/scsi/scsi_debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/scsi_debug.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/scsi_debug.c linux-2.6.39.4/drivers/scsi/scsi_debug.c
+--- linux-2.6.39.4/drivers/scsi/scsi_debug.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/scsi_debug.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
  	unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
  	unsigned char *cmd = (unsigned char *)scp->cmnd;
@@ -39395,9 +31787,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/scsi_debug.c linux-2.6.39.3/drivers/scsi/
  	if ((errsts = check_readiness(scp, 1, devip)))
  		return errsts;
  	memset(arr, 0, sizeof(arr));
-diff -urNp linux-2.6.39.3/drivers/scsi/scsi_lib.c linux-2.6.39.3/drivers/scsi/scsi_lib.c
---- linux-2.6.39.3/drivers/scsi/scsi_lib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/scsi_lib.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/scsi_lib.c linux-2.6.39.4/drivers/scsi/scsi_lib.c
+--- linux-2.6.39.4/drivers/scsi/scsi_lib.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/scsi_lib.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1410,7 +1410,7 @@ static void scsi_kill_request(struct req
  	shost = sdev->host;
  	scsi_init_cmd_errh(cmd);
@@ -39419,9 +31811,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/scsi_lib.c linux-2.6.39.3/drivers/scsi/sc
  
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
-diff -urNp linux-2.6.39.3/drivers/scsi/scsi_sysfs.c linux-2.6.39.3/drivers/scsi/scsi_sysfs.c
---- linux-2.6.39.3/drivers/scsi/scsi_sysfs.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/scsi_sysfs.c	2011-06-25 13:00:26.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/scsi_sysfs.c linux-2.6.39.4/drivers/scsi/scsi_sysfs.c
+--- linux-2.6.39.4/drivers/scsi/scsi_sysfs.c	2011-06-25 12:55:22.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/scsi_sysfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, 
  		    char *buf)						\
  {									\
@@ -39431,9 +31823,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/scsi_sysfs.c linux-2.6.39.3/drivers/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.3/drivers/scsi/scsi_transport_fc.c linux-2.6.39.3/drivers/scsi/scsi_transport_fc.c
---- linux-2.6.39.3/drivers/scsi/scsi_transport_fc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/scsi_transport_fc.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/scsi_transport_fc.c linux-2.6.39.4/drivers/scsi/scsi_transport_fc.c
+--- linux-2.6.39.4/drivers/scsi/scsi_transport_fc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/scsi_transport_fc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
   * Netlink Infrastructure
   */
@@ -39470,9 +31862,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/scsi_transport_fc.c linux-2.6.39.3/driver
  		return -EINVAL;
  	/*
  	 * Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-2.6.39.3/drivers/scsi/scsi_transport_iscsi.c linux-2.6.39.3/drivers/scsi/scsi_transport_iscsi.c
---- linux-2.6.39.3/drivers/scsi/scsi_transport_iscsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/scsi_transport_iscsi.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/scsi_transport_iscsi.c linux-2.6.39.4/drivers/scsi/scsi_transport_iscsi.c
+--- linux-2.6.39.4/drivers/scsi/scsi_transport_iscsi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/scsi_transport_iscsi.c	2011-08-05 19:44:37.000000000 -0400
 @@ -83,7 +83,7 @@ struct iscsi_internal {
  	struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -39500,9 +31892,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/scsi_transport_iscsi.c linux-2.6.39.3/dri
  
  	err = class_register(&iscsi_transport_class);
  	if (err)
-diff -urNp linux-2.6.39.3/drivers/scsi/scsi_transport_srp.c linux-2.6.39.3/drivers/scsi/scsi_transport_srp.c
---- linux-2.6.39.3/drivers/scsi/scsi_transport_srp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/scsi_transport_srp.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/scsi_transport_srp.c linux-2.6.39.4/drivers/scsi/scsi_transport_srp.c
+--- linux-2.6.39.4/drivers/scsi/scsi_transport_srp.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/scsi_transport_srp.c	2011-08-05 19:44:37.000000000 -0400
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -39530,9 +31922,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/scsi_transport_srp.c linux-2.6.39.3/drive
  	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
  	transport_setup_device(&rport->dev);
-diff -urNp linux-2.6.39.3/drivers/scsi/sg.c linux-2.6.39.3/drivers/scsi/sg.c
---- linux-2.6.39.3/drivers/scsi/sg.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/sg.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/sg.c linux-2.6.39.4/drivers/scsi/sg.c
+--- linux-2.6.39.4/drivers/scsi/sg.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/sg.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
  	const struct file_operations * fops;
  };
@@ -39551,9 +31943,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/sg.c linux-2.6.39.3/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-2.6.39.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.39.3/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-2.6.39.3/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.39.4/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-2.6.39.4/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
  	int do_iounmap = 0;
  	int do_disable_device = 1;
@@ -39563,9 +31955,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.39.3/dri
  	memset(&sym_dev, 0, sizeof(sym_dev));
  	memset(&nvram, 0, sizeof(nvram));
  	sym_dev.pdev = pdev;
-diff -urNp linux-2.6.39.3/drivers/scsi/vmw_pvscsi.c linux-2.6.39.3/drivers/scsi/vmw_pvscsi.c
---- linux-2.6.39.3/drivers/scsi/vmw_pvscsi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/scsi/vmw_pvscsi.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/scsi/vmw_pvscsi.c linux-2.6.39.4/drivers/scsi/vmw_pvscsi.c
+--- linux-2.6.39.4/drivers/scsi/vmw_pvscsi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/scsi/vmw_pvscsi.c	2011-08-05 19:44:37.000000000 -0400
 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
  	dma_addr_t base;
  	unsigned i;
@@ -39575,88 +31967,9 @@ diff -urNp linux-2.6.39.3/drivers/scsi/vmw_pvscsi.c linux-2.6.39.3/drivers/scsi/
  	cmd.ringsStatePPN   = adapter->ringStatePA >> PAGE_SHIFT;
  	cmd.reqRingNumPages = adapter->req_pages;
  	cmd.cmpRingNumPages = adapter->cmp_pages;
-diff -urNp linux-2.6.39.3/drivers/sh/clk/cpg.c linux-2.6.39.3/drivers/sh/clk/cpg.c
---- linux-2.6.39.3/drivers/sh/clk/cpg.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/sh/clk/cpg.c	2011-06-03 00:32:06.000000000 -0400
-@@ -26,7 +26,7 @@ static void sh_clk_mstp32_disable(struct
- 		     clk->enable_reg);
- }
- 
--static struct clk_ops sh_clk_mstp32_clk_ops = {
-+static const struct clk_ops sh_clk_mstp32_clk_ops = {
- 	.enable		= sh_clk_mstp32_enable,
- 	.disable	= sh_clk_mstp32_disable,
- 	.recalc		= followparent_recalc,
-@@ -150,7 +150,7 @@ static void sh_clk_div6_disable(struct c
- 	__raw_writel(value, clk->enable_reg);
- }
- 
--static struct clk_ops sh_clk_div6_clk_ops = {
-+static const struct clk_ops sh_clk_div6_clk_ops = {
- 	.recalc		= sh_clk_div6_recalc,
- 	.round_rate	= sh_clk_div_round_rate,
- 	.set_rate	= sh_clk_div6_set_rate,
-@@ -158,7 +158,7 @@ static struct clk_ops sh_clk_div6_clk_op
- 	.disable	= sh_clk_div6_disable,
- };
- 
--static struct clk_ops sh_clk_div6_reparent_clk_ops = {
-+static const struct clk_ops sh_clk_div6_reparent_clk_ops = {
- 	.recalc		= sh_clk_div6_recalc,
- 	.round_rate	= sh_clk_div_round_rate,
- 	.set_rate	= sh_clk_div6_set_rate,
-@@ -282,13 +282,13 @@ static void sh_clk_div4_disable(struct c
- 	__raw_writel(__raw_readl(clk->enable_reg) | (1 << 8), clk->enable_reg);
- }
- 
--static struct clk_ops sh_clk_div4_clk_ops = {
-+static const struct clk_ops sh_clk_div4_clk_ops = {
- 	.recalc		= sh_clk_div4_recalc,
- 	.set_rate	= sh_clk_div4_set_rate,
- 	.round_rate	= sh_clk_div_round_rate,
- };
- 
--static struct clk_ops sh_clk_div4_enable_clk_ops = {
-+static const struct clk_ops sh_clk_div4_enable_clk_ops = {
- 	.recalc		= sh_clk_div4_recalc,
- 	.set_rate	= sh_clk_div4_set_rate,
- 	.round_rate	= sh_clk_div_round_rate,
-@@ -296,7 +296,7 @@ static struct clk_ops sh_clk_div4_enable
- 	.disable	= sh_clk_div4_disable,
- };
- 
--static struct clk_ops sh_clk_div4_reparent_clk_ops = {
-+static const struct clk_ops sh_clk_div4_reparent_clk_ops = {
- 	.recalc		= sh_clk_div4_recalc,
- 	.set_rate	= sh_clk_div4_set_rate,
- 	.round_rate	= sh_clk_div_round_rate,
-diff -urNp linux-2.6.39.3/drivers/spi/dw_spi.h linux-2.6.39.3/drivers/spi/dw_spi.h
---- linux-2.6.39.3/drivers/spi/dw_spi.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/spi/dw_spi.h	2011-05-22 19:36:32.000000000 -0400
-@@ -151,7 +151,7 @@ struct dw_spi {
- 	int			dma_chan_done;
- 	struct device		*dma_dev;
- 	dma_addr_t		dma_addr; /* phy address of the Data register */
--	struct dw_spi_dma_ops	*dma_ops;
-+	const struct dw_spi_dma_ops	*dma_ops;
- 	void			*dma_priv; /* platform relate info */
- 	struct pci_dev		*dmac;
- 
-diff -urNp linux-2.6.39.3/drivers/spi/dw_spi_mid.c linux-2.6.39.3/drivers/spi/dw_spi_mid.c
---- linux-2.6.39.3/drivers/spi/dw_spi_mid.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/spi/dw_spi_mid.c	2011-05-22 19:36:32.000000000 -0400
-@@ -180,7 +180,7 @@ static int mid_spi_dma_transfer(struct d
- 	return 0;
- }
- 
--static struct dw_spi_dma_ops mid_dma_ops = {
-+static const struct dw_spi_dma_ops mid_dma_ops = {
- 	.dma_init	= mid_spi_dma_init,
- 	.dma_exit	= mid_spi_dma_exit,
- 	.dma_transfer	= mid_spi_dma_transfer,
-diff -urNp linux-2.6.39.3/drivers/spi/spi.c linux-2.6.39.3/drivers/spi/spi.c
---- linux-2.6.39.3/drivers/spi/spi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/spi/spi.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/spi/spi.c linux-2.6.39.4/drivers/spi/spi.c
+--- linux-2.6.39.4/drivers/spi/spi.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/spi/spi.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
@@ -39666,34 +31979,9 @@ diff -urNp linux-2.6.39.3/drivers/spi/spi.c linux-2.6.39.3/drivers/spi/spi.c
  
  static u8	*buf;
  
-diff -urNp linux-2.6.39.3/drivers/ssb/driver_pcicore.c linux-2.6.39.3/drivers/ssb/driver_pcicore.c
---- linux-2.6.39.3/drivers/ssb/driver_pcicore.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/ssb/driver_pcicore.c	2011-05-22 19:36:32.000000000 -0400
-@@ -223,7 +223,7 @@ static int ssb_pcicore_write_config(stru
- 	return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
- }
- 
--static struct pci_ops ssb_pcicore_pciops = {
-+static const struct pci_ops ssb_pcicore_pciops = {
- 	.read	= ssb_pcicore_read_config,
- 	.write	= ssb_pcicore_write_config,
- };
-diff -urNp linux-2.6.39.3/drivers/staging/ath6kl/os/linux/cfg80211.c linux-2.6.39.3/drivers/staging/ath6kl/os/linux/cfg80211.c
---- linux-2.6.39.3/drivers/staging/ath6kl/os/linux/cfg80211.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/ath6kl/os/linux/cfg80211.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1391,8 +1391,7 @@ u32 cipher_suites[] = {
-     WLAN_CIPHER_SUITE_CCMP,
- };
- 
--static struct
--cfg80211_ops ar6k_cfg80211_ops = {
-+static const struct cfg80211_ops ar6k_cfg80211_ops = {
-     .change_virtual_intf = ar6k_cfg80211_change_iface,
-     .add_virtual_intf = ar6k_cfg80211_add_virtual_intf,
-     .del_virtual_intf = ar6k_cfg80211_del_virtual_intf,
-diff -urNp linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-08-05 20:34:06.000000000 -0400
 @@ -857,14 +857,14 @@ static void dhd_op_if(dhd_if_t *ifp)
  			free_netdev(ifp->net);
  		}
@@ -39711,15 +31999,6 @@ diff -urNp linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2
  			err = dhd_net_attach(&dhd->pub, ifp->idx);
  			if (err != 0) {
  				DHD_ERROR(("%s: dhd_net_attach failed, "
-@@ -1500,7 +1500,7 @@ static void dhd_ethtool_get_drvinfo(stru
- 	sprintf(info->bus_info, "%s", dev_name(&wl_cfg80211_get_sdio_func()->dev));
- }
- 
--struct ethtool_ops dhd_ethtool_ops = {
-+const struct ethtool_ops dhd_ethtool_ops = {
- 	.get_drvinfo = dhd_ethtool_get_drvinfo
- };
- 
 @@ -1923,7 +1923,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
  		strcpy(nv_path, nvram_path);
  
@@ -39747,30 +32026,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2
  
  #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
  	g_bus = bus;
-@@ -2206,7 +2206,7 @@ dhd_iovar(dhd_pub_t *pub, int ifidx, cha
- 	return ret;
- }
- 
--static struct net_device_ops dhd_ops_pri = {
-+static const struct net_device_ops dhd_ops_pri = {
- 	.ndo_open = dhd_open,
- 	.ndo_stop = dhd_stop,
- 	.ndo_get_stats = dhd_get_stats,
-diff -urNp linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
---- linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- }
- 
--static struct cfg80211_ops wl_cfg80211_ops = {
-+static const struct cfg80211_ops wl_cfg80211_ops = {
- 	.change_virtual_intf = wl_cfg80211_change_iface,
- 	.scan = wl_cfg80211_scan,
- 	.set_wiphy_params = wl_cfg80211_set_wiphy_params,
-diff -urNp linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c
---- linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+--- linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-08-05 19:44:37.000000000 -0400
 @@ -495,7 +495,7 @@ wl_iw_get_range(struct net_device *dev,
  	list = (wl_u32_list_t *) channels;
  
@@ -39780,45 +32038,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.3
  
  	range->min_nwid = range->max_nwid = 0;
  
-diff -urNp linux-2.6.39.3/drivers/staging/comedi/comedi_fops.c linux-2.6.39.3/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.39.3/drivers/staging/comedi/comedi_fops.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct vm_operations_struct comedi_vm_ops = {
-+static const struct vm_operations_struct comedi_vm_ops = {
- 	.close = comedi_unmap,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/staging/cx25821/cx25821-alsa.c linux-2.6.39.3/drivers/staging/cx25821/cx25821-alsa.c
---- linux-2.6.39.3/drivers/staging/cx25821/cx25821-alsa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
--static struct snd_pcm_ops snd_cx25821_pcm_ops = {
-+static const struct snd_pcm_ops snd_cx25821_pcm_ops = {
- 	.open = snd_cx25821_pcm_open,
- 	.close = snd_cx25821_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/staging/cx25821/cx25821-i2c.c linux-2.6.39.3/drivers/staging/cx25821/cx25821-i2c.c
---- linux-2.6.39.3/drivers/staging/cx25821/cx25821-i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/cx25821/cx25821-i2c.c	2011-05-22 19:36:32.000000000 -0400
-@@ -282,7 +282,7 @@ static u32 cx25821_functionality(struct 
- 	    I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA;
- }
- 
--static struct i2c_algorithm cx25821_i2c_algo_template = {
-+static const struct i2c_algorithm cx25821_i2c_algo_template = {
- 	.master_xfer = i2c_xfer,
- 	.functionality = cx25821_functionality,
- #ifdef NEED_ALGO_CONTROL
-diff -urNp linux-2.6.39.3/drivers/staging/et131x/et1310_tx.c linux-2.6.39.3/drivers/staging/et131x/et1310_tx.c
---- linux-2.6.39.3/drivers/staging/et131x/et1310_tx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/et131x/et1310_tx.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/et131x/et1310_tx.c linux-2.6.39.4/drivers/staging/et131x/et1310_tx.c
+--- linux-2.6.39.4/drivers/staging/et131x/et1310_tx.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/et131x/et1310_tx.c	2011-08-05 19:44:37.000000000 -0400
 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
  	struct net_device_stats *stats = &etdev->net_stats;
  
@@ -39834,9 +32056,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/et131x/et1310_tx.c linux-2.6.39.3/driv
  
  	if (tcb->skb) {
  		stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-2.6.39.3/drivers/staging/et131x/et131x_adapter.h linux-2.6.39.3/drivers/staging/et131x/et131x_adapter.h
---- linux-2.6.39.3/drivers/staging/et131x/et131x_adapter.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/et131x/et131x_adapter.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/et131x/et131x_adapter.h linux-2.6.39.4/drivers/staging/et131x/et131x_adapter.h
+--- linux-2.6.39.4/drivers/staging/et131x/et131x_adapter.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/et131x/et131x_adapter.h	2011-08-05 19:44:37.000000000 -0400
 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
  	 * operations
  	 */
@@ -39852,168 +32074,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/et131x/et131x_adapter.h linux-2.6.39.3
  	u32 norcvbuf;	/* # Rx packets discarded */
  	u32 noxmtbuf;	/* # Tx packets discarded */
  
-diff -urNp linux-2.6.39.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.39.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
---- linux-2.6.39.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c	2011-05-22 19:36:32.000000000 -0400
-@@ -55,7 +55,7 @@ int numofmsgbuf = 0;
- //
- // Table of entry-point routines for char device
- //
--static struct file_operations ft1000fops =
-+static const struct file_operations ft1000fops =
- {
- 	.unlocked_ioctl	= ft1000_ioctl,
- 	.poll		= ft1000_poll_dev,
-diff -urNp linux-2.6.39.3/drivers/staging/generic_serial/rio/rio_linux.c linux-2.6.39.3/drivers/staging/generic_serial/rio/rio_linux.c
---- linux-2.6.39.3/drivers/staging/generic_serial/rio/rio_linux.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/generic_serial/rio/rio_linux.c	2011-05-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);
- 
--static struct real_driver rio_real_driver = {
-+static const struct real_driver rio_real_driver = {
- 	rio_disable_tx_interrupts,
- 	rio_enable_tx_interrupts,
- 	rio_disable_rx_interrupts,
-diff -urNp linux-2.6.39.3/drivers/staging/generic_serial/ser_a2232.c linux-2.6.39.3/drivers/staging/generic_serial/ser_a2232.c
---- linux-2.6.39.3/drivers/staging/generic_serial/ser_a2232.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  *--------------------------------------------------------------------------*/
--static struct real_driver a2232_real_driver = {
-+static const struct real_driver a2232_real_driver = {
-         a2232_disable_tx_interrupts,
-         a2232_enable_tx_interrupts,
-         a2232_disable_rx_interrupts,
-diff -urNp linux-2.6.39.3/drivers/staging/generic_serial/sx.c linux-2.6.39.3/drivers/staging/generic_serial/sx.c
---- linux-2.6.39.3/drivers/staging/generic_serial/sx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/generic_serial/sx.c	2011-05-22 19:36:32.000000000 -0400
-@@ -355,7 +355,7 @@ module_param(sx_irqmask, int, 0);
- 
- MODULE_LICENSE("GPL");
- 
--static struct real_driver sx_real_driver = {
-+static const struct real_driver sx_real_driver = {
- 	sx_disable_tx_interrupts,
- 	sx_enable_tx_interrupts,
- 	sx_disable_rx_interrupts,
-diff -urNp linux-2.6.39.3/drivers/staging/generic_serial/vme_scc.c linux-2.6.39.3/drivers/staging/generic_serial/vme_scc.c
---- linux-2.6.39.3/drivers/staging/generic_serial/vme_scc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/generic_serial/vme_scc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -94,7 +94,7 @@ static struct scc_port scc_ports[2];
-  * Interface from generic_serial.c back here
-  *--------------------------------------------------------------------------*/
- 
--static struct real_driver scc_real_driver = {
-+static const struct real_driver scc_real_driver = {
-         scc_disable_tx_interrupts,
-         scc_enable_tx_interrupts,
-         scc_disable_rx_interrupts,
-diff -urNp linux-2.6.39.3/drivers/staging/gma500/psb_fb.c linux-2.6.39.3/drivers/staging/gma500/psb_fb.c
---- linux-2.6.39.3/drivers/staging/gma500/psb_fb.c	2011-06-25 12:55:22.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/gma500/psb_fb.c	2011-06-25 13:00:26.000000000 -0400
-@@ -230,7 +230,7 @@ static void psbfb_vm_close(struct vm_are
- 	DRM_DEBUG("vm_close\n");
- }
- 
--static struct vm_operations_struct psbfb_vm_ops = {
-+static const struct vm_operations_struct psbfb_vm_ops = {
- 	.fault	= psbfb_vm_fault,
- 	.open	= psbfb_vm_open,
- 	.close	= psbfb_vm_close
-diff -urNp linux-2.6.39.3/drivers/staging/go7007/go7007-i2c.c linux-2.6.39.3/drivers/staging/go7007/go7007-i2c.c
---- linux-2.6.39.3/drivers/staging/go7007/go7007-i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct i2c_algorithm go7007_algo = {
-+static const struct i2c_algorithm go7007_algo = {
- 	.smbus_xfer	= go7007_smbus_xfer,
- 	.master_xfer	= go7007_i2c_master_xfer,
- 	.functionality	= go7007_functionality,
-diff -urNp linux-2.6.39.3/drivers/staging/go7007/go7007-usb.c linux-2.6.39.3/drivers/staging/go7007/go7007-usb.c
---- linux-2.6.39.3/drivers/staging/go7007/go7007-usb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = {
-+static const struct go7007_hpi_ops go7007_usb_ezusb_hpi_ops = {
- 	.interface_reset	= go7007_usb_interface_reset,
- 	.write_interrupt	= go7007_usb_ezusb_write_interrupt,
- 	.read_interrupt		= go7007_usb_read_interrupt,
-@@ -858,7 +858,7 @@ static struct go7007_hpi_ops go7007_usb_
- 	.send_firmware		= go7007_usb_send_firmware,
- };
- 
--static struct go7007_hpi_ops go7007_usb_onboard_hpi_ops = {
-+static const struct go7007_hpi_ops go7007_usb_onboard_hpi_ops = {
- 	.interface_reset	= go7007_usb_interface_reset,
- 	.write_interrupt	= go7007_usb_onboard_write_interrupt,
- 	.read_interrupt		= go7007_usb_read_interrupt,
-@@ -950,7 +950,7 @@ static u32 go7007_usb_functionality(stru
- 	return (I2C_FUNC_SMBUS_EMUL) & ~I2C_FUNC_SMBUS_QUICK;
- }
- 
--static struct i2c_algorithm go7007_usb_algo = {
-+static const struct i2c_algorithm go7007_usb_algo = {
- 	.master_xfer	= go7007_usb_i2c_master_xfer,
- 	.functionality	= go7007_usb_functionality,
- };
-diff -urNp linux-2.6.39.3/drivers/staging/go7007/go7007-v4l2.c linux-2.6.39.3/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.39.3/drivers/staging/go7007/go7007-v4l2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct vm_operations_struct go7007_vm_ops = {
-+static const struct vm_operations_struct go7007_vm_ops = {
- 	.open	= go7007_vm_open,
- 	.close	= go7007_vm_close,
- 	.fault	= go7007_vm_fault,
-diff -urNp linux-2.6.39.3/drivers/staging/go7007/saa7134-go7007.c linux-2.6.39.3/drivers/staging/go7007/saa7134-go7007.c
---- linux-2.6.39.3/drivers/staging/go7007/saa7134-go7007.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- }
- 
--static struct go7007_hpi_ops saa7134_go7007_hpi_ops = {
-+static const struct go7007_hpi_ops saa7134_go7007_hpi_ops = {
- 	.interface_reset	= saa7134_go7007_interface_reset,
- 	.write_interrupt	= saa7134_go7007_write_interrupt,
- 	.read_interrupt		= saa7134_go7007_read_interrupt,
-diff -urNp linux-2.6.39.3/drivers/staging/go7007/snd-go7007.c linux-2.6.39.3/drivers/staging/go7007/snd-go7007.c
---- linux-2.6.39.3/drivers/staging/go7007/snd-go7007.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops go7007_snd_capture_ops = {
-+static const struct snd_pcm_ops go7007_snd_capture_ops = {
- 	.open		= go7007_snd_capture_open,
- 	.close		= go7007_snd_capture_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -227,7 +227,7 @@ static int go7007_snd_free(struct snd_de
- 	return 0;
- }
- 
--static struct snd_device_ops go7007_snd_device_ops = {
-+static const struct snd_device_ops go7007_snd_device_ops = {
- 	.dev_free	= go7007_snd_free,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/staging/hv/channel.c linux-2.6.39.3/drivers/staging/hv/channel.c
---- linux-2.6.39.3/drivers/staging/hv/channel.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/hv/channel.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/hv/channel.c linux-2.6.39.4/drivers/staging/hv/channel.c
+--- linux-2.6.39.4/drivers/staging/hv/channel.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/hv/channel.c	2011-08-05 19:44:37.000000000 -0400
 @@ -509,8 +509,8 @@ int vmbus_establish_gpadl(struct vmbus_c
  	unsigned long flags;
  	int ret = 0;
@@ -40025,9 +32088,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/hv/channel.c linux-2.6.39.3/drivers/st
  
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
-diff -urNp linux-2.6.39.3/drivers/staging/hv/hv.c linux-2.6.39.3/drivers/staging/hv/hv.c
---- linux-2.6.39.3/drivers/staging/hv/hv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/hv/hv.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/hv/hv.c linux-2.6.39.4/drivers/staging/hv/hv.c
+--- linux-2.6.39.4/drivers/staging/hv/hv.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/hv/hv.c	2011-08-05 19:44:37.000000000 -0400
 @@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi
  	u64 output_address = (output) ? virt_to_phys(output) : 0;
  	u32 output_address_hi = output_address >> 32;
@@ -40037,9 +32100,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/hv/hv.c linux-2.6.39.3/drivers/staging
  
  	DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
  		   control, input, output);
-diff -urNp linux-2.6.39.3/drivers/staging/hv/rndis_filter.c linux-2.6.39.3/drivers/staging/hv/rndis_filter.c
---- linux-2.6.39.3/drivers/staging/hv/rndis_filter.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/hv/rndis_filter.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/hv/rndis_filter.c linux-2.6.39.4/drivers/staging/hv/rndis_filter.c
+--- linux-2.6.39.4/drivers/staging/hv/rndis_filter.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/hv/rndis_filter.c	2011-08-05 19:44:37.000000000 -0400
 @@ -49,7 +49,7 @@ struct rndis_device {
  
  	enum rndis_device_state state;
@@ -40067,9 +32130,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/hv/rndis_filter.c linux-2.6.39.3/drive
  
  	/* Ignore return since this msg is optional. */
  	rndis_filter_send_request(dev, request);
-diff -urNp linux-2.6.39.3/drivers/staging/hv/vmbus_drv.c linux-2.6.39.3/drivers/staging/hv/vmbus_drv.c
---- linux-2.6.39.3/drivers/staging/hv/vmbus_drv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/hv/vmbus_drv.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/hv/vmbus_drv.c linux-2.6.39.4/drivers/staging/hv/vmbus_drv.c
+--- linux-2.6.39.4/drivers/staging/hv/vmbus_drv.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/hv/vmbus_drv.c	2011-08-05 19:44:37.000000000 -0400
 @@ -661,14 +661,14 @@ int vmbus_child_device_register(struct h
  {
  	int ret = 0;
@@ -40087,9 +32150,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/hv/vmbus_drv.c linux-2.6.39.3/drivers/
  
  	/* The new device belongs to this bus */
  	child_device_obj->device.bus = &vmbus_drv.bus; /* device->dev.bus; */
-diff -urNp linux-2.6.39.3/drivers/staging/hv/vmbus_private.h linux-2.6.39.3/drivers/staging/hv/vmbus_private.h
---- linux-2.6.39.3/drivers/staging/hv/vmbus_private.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/hv/vmbus_private.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/hv/vmbus_private.h linux-2.6.39.4/drivers/staging/hv/vmbus_private.h
+--- linux-2.6.39.4/drivers/staging/hv/vmbus_private.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/hv/vmbus_private.h	2011-08-05 19:44:37.000000000 -0400
 @@ -58,7 +58,7 @@ enum vmbus_connect_state {
  struct vmbus_connection {
  	enum vmbus_connect_state conn_state;
@@ -40099,9 +32162,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/hv/vmbus_private.h linux-2.6.39.3/driv
  
  	/*
  	 * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-2.6.39.3/drivers/staging/iio/ring_generic.h linux-2.6.39.3/drivers/staging/iio/ring_generic.h
---- linux-2.6.39.3/drivers/staging/iio/ring_generic.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/iio/ring_generic.h	2011-05-25 16:55:27.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/iio/ring_generic.h linux-2.6.39.4/drivers/staging/iio/ring_generic.h
+--- linux-2.6.39.4/drivers/staging/iio/ring_generic.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/iio/ring_generic.h	2011-08-05 19:44:37.000000000 -0400
 @@ -134,7 +134,7 @@ struct iio_ring_buffer {
  	struct iio_handler		access_handler;
  	struct iio_event_interface	ev_int;
@@ -40111,134 +32174,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/iio/ring_generic.h linux-2.6.39.3/driv
  	int				(*preenable)(struct iio_dev *);
  	int				(*postenable)(struct iio_dev *);
  	int				(*predisable)(struct iio_dev *);
-diff -urNp linux-2.6.39.3/drivers/staging/intel_sst/intelmid_ctrl.c linux-2.6.39.3/drivers/staging/intel_sst/intelmid_ctrl.c
---- linux-2.6.39.3/drivers/staging/intel_sst/intelmid_ctrl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	int ret_val = 0, vendor, status;
--	struct intel_sst_pcm_control *pcm_control;
-+	const struct intel_sst_pcm_control *pcm_control;
- 
- 	pr_debug("snd_intelmad_device_set called\n");
- 
-diff -urNp linux-2.6.39.3/drivers/staging/intel_sst/intel_sst_drv_interface.c linux-2.6.39.3/drivers/staging/intel_sst/intel_sst_drv_interface.c
---- linux-2.6.39.3/drivers/staging/intel_sst/intel_sst_drv_interface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/intel_sst/intel_sst_drv_interface.c	2011-05-22 19:36:32.000000000 -0400
-@@ -470,7 +470,7 @@ int sst_device_control(int cmd, void *ar
- }
- 
- 
--struct intel_sst_pcm_control pcm_ops = {
-+const struct intel_sst_pcm_control pcm_ops = {
- 	.open = sst_open_pcm_stream,
- 	.device_control = sst_device_control,
- 	.close = sst_close_pcm_stream,
-diff -urNp linux-2.6.39.3/drivers/staging/line6/capture.c linux-2.6.39.3/drivers/staging/line6/capture.c
---- linux-2.6.39.3/drivers/staging/line6/capture.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/line6/capture.c	2011-05-22 19:36:32.000000000 -0400
-@@ -378,7 +378,7 @@ snd_line6_capture_pointer(struct snd_pcm
- }
- 
- /* capture operators */
--struct snd_pcm_ops snd_line6_capture_ops = {
-+const struct snd_pcm_ops snd_line6_capture_ops = {
- 	.open = snd_line6_capture_open,
- 	.close = snd_line6_capture_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/staging/line6/capture.h linux-2.6.39.3/drivers/staging/line6/capture.h
---- linux-2.6.39.3/drivers/staging/line6/capture.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/line6/capture.h	2011-05-22 19:36:32.000000000 -0400
-@@ -17,7 +17,7 @@
- #include "driver.h"
- #include "pcm.h"
- 
--extern struct snd_pcm_ops snd_line6_capture_ops;
-+extern const struct snd_pcm_ops snd_line6_capture_ops;
- 
- extern void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf,
- 			       int fsize);
-diff -urNp linux-2.6.39.3/drivers/staging/line6/midi.c linux-2.6.39.3/drivers/staging/line6/midi.c
---- linux-2.6.39.3/drivers/staging/line6/midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/line6/midi.c	2011-05-22 19:36:32.000000000 -0400
-@@ -239,14 +239,14 @@ static void line6_midi_input_trigger(str
- 		line6->line6midi->substream_receive = 0;
- }
- 
--static struct snd_rawmidi_ops line6_midi_output_ops = {
-+static const struct snd_rawmidi_ops line6_midi_output_ops = {
- 	.open = line6_midi_output_open,
- 	.close = line6_midi_output_close,
- 	.trigger = line6_midi_output_trigger,
- 	.drain = line6_midi_output_drain,
- };
- 
--static struct snd_rawmidi_ops line6_midi_input_ops = {
-+static const struct snd_rawmidi_ops line6_midi_input_ops = {
- 	.open = line6_midi_input_open,
- 	.close = line6_midi_input_close,
- 	.trigger = line6_midi_input_trigger,
-@@ -373,7 +373,7 @@ static int snd_line6_midi_free(struct sn
- */
- int line6_init_midi(struct usb_line6 *line6)
- {
--	static struct snd_device_ops midi_ops = {
-+	static const struct snd_device_ops midi_ops = {
- 		.dev_free = snd_line6_midi_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/drivers/staging/line6/pcm.c linux-2.6.39.3/drivers/staging/line6/pcm.c
---- linux-2.6.39.3/drivers/staging/line6/pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/line6/pcm.c	2011-05-22 19:36:32.000000000 -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)
- {
--	static struct snd_device_ops pcm_ops = {
-+	static const struct snd_device_ops pcm_ops = {
- 		.dev_free = snd_line6_pcm_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/drivers/staging/line6/playback.c linux-2.6.39.3/drivers/staging/line6/playback.c
---- linux-2.6.39.3/drivers/staging/line6/playback.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/line6/playback.c	2011-05-22 19:36:32.000000000 -0400
-@@ -536,7 +536,7 @@ snd_line6_playback_pointer(struct snd_pc
- }
- 
- /* playback operators */
--struct snd_pcm_ops snd_line6_playback_ops = {
-+const struct snd_pcm_ops snd_line6_playback_ops = {
- 	.open = snd_line6_playback_open,
- 	.close = snd_line6_playback_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/staging/line6/playback.h linux-2.6.39.3/drivers/staging/line6/playback.h
---- linux-2.6.39.3/drivers/staging/line6/playback.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/line6/playback.h	2011-05-22 19:36:32.000000000 -0400
-@@ -27,7 +27,7 @@
-  */
- #define USE_CLEAR_BUFFER_WORKAROUND 1
- 
--extern struct snd_pcm_ops snd_line6_playback_ops;
-+extern const struct snd_pcm_ops snd_line6_playback_ops;
- 
- extern int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm);
- extern int line6_submit_audio_out_all_urbs(struct snd_line6_pcm *line6pcm);
-diff -urNp linux-2.6.39.3/drivers/staging/msm/staging-devices.c linux-2.6.39.3/drivers/staging/msm/staging-devices.c
---- linux-2.6.39.3/drivers/staging/msm/staging-devices.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/msm/staging-devices.c	2011-05-22 19:36:32.000000000 -0400
-@@ -211,7 +211,7 @@ static int msm_fb_lcdc_gpio_config(int o
- }
- 
- 
--static struct lcdc_platform_data lcdc_pdata = {
-+static const struct lcdc_platform_data lcdc_pdata = {
- 	.lcdc_gpio_config = msm_fb_lcdc_gpio_config,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/staging/octeon/ethernet.c linux-2.6.39.3/drivers/staging/octeon/ethernet.c
---- linux-2.6.39.3/drivers/staging/octeon/ethernet.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/octeon/ethernet.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/octeon/ethernet.c linux-2.6.39.4/drivers/staging/octeon/ethernet.c
+--- linux-2.6.39.4/drivers/staging/octeon/ethernet.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/octeon/ethernet.c	2011-08-05 19:44:37.000000000 -0400
 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
  		 * since the RX tasklet also increments it.
  		 */
@@ -40255,9 +32193,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/octeon/ethernet.c linux-2.6.39.3/drive
  #endif
  	}
  
-diff -urNp linux-2.6.39.3/drivers/staging/octeon/ethernet-rx.c linux-2.6.39.3/drivers/staging/octeon/ethernet-rx.c
---- linux-2.6.39.3/drivers/staging/octeon/ethernet-rx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/octeon/ethernet-rx.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/octeon/ethernet-rx.c linux-2.6.39.4/drivers/staging/octeon/ethernet-rx.c
+--- linux-2.6.39.4/drivers/staging/octeon/ethernet-rx.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/octeon/ethernet-rx.c	2011-08-05 19:44:37.000000000 -0400
 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
  				/* Increment RX stats for virtual ports */
  				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
@@ -40286,74 +32224,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/octeon/ethernet-rx.c linux-2.6.39.3/dr
  #endif
  				dev_kfree_skb_irq(skb);
  			}
-diff -urNp linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.c
---- linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.c	2011-05-22 19:36:32.000000000 -0400
-@@ -43,7 +43,7 @@ module_param(noinit, int, 0444);
- static int useaa = 1;
- module_param(useaa, int, 0444);
- 
--static struct dcon_platform_data *pdata;
-+static const struct dcon_platform_data *pdata;
- 
- /* I2C structures */
- 
-diff -urNp linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.h linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.h
---- linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon.h	2011-05-22 19:36:32.000000000 -0400
-@@ -92,11 +92,11 @@ struct dcon_platform_data {
- extern irqreturn_t dcon_interrupt(int irq, void *id);
- 
- #ifdef CONFIG_FB_OLPC_DCON_1
--extern struct dcon_platform_data dcon_pdata_xo_1;
-+extern const struct dcon_platform_data dcon_pdata_xo_1;
- #endif
- 
- #ifdef CONFIG_FB_OLPC_DCON_1_5
--extern struct dcon_platform_data dcon_pdata_xo_1_5;
-+extern const struct dcon_platform_data dcon_pdata_xo_1_5;
- #endif
- 
- #endif
-diff -urNp linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
---- linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct dcon_platform_data dcon_pdata_xo_1_5 = {
-+const struct dcon_platform_data dcon_pdata_xo_1_5 = {
- 	.init = dcon_init_xo_1_5,
- 	.bus_stabilize_wiggle = dcon_wiggle_xo_1_5,
- 	.set_dconload = dcon_set_dconload_xo_1_5,
-diff -urNp linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
---- linux-2.6.39.3/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct dcon_platform_data dcon_pdata_xo_1 = {
-+const struct dcon_platform_data dcon_pdata_xo_1 = {
- 	.init = dcon_init_xo_1,
- 	.bus_stabilize_wiggle = dcon_wiggle_xo_1,
- 	.set_dconload = dcon_set_dconload_1,
-diff -urNp linux-2.6.39.3/drivers/staging/phison/phison.c linux-2.6.39.3/drivers/staging/phison/phison.c
---- linux-2.6.39.3/drivers/staging/phison/phison.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/phison/phison.c	2011-05-22 19:36:32.000000000 -0400
-@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations phison_ops = {
-+static const struct ata_port_operations phison_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.prereset		= phison_pre_reset,
- };
-diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/inode.c linux-2.6.39.3/drivers/staging/pohmelfs/inode.c
---- linux-2.6.39.3/drivers/staging/pohmelfs/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/pohmelfs/inode.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/pohmelfs/inode.c linux-2.6.39.4/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.39.4/drivers/staging/pohmelfs/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/pohmelfs/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
@@ -40372,9 +32245,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/inode.c linux-2.6.39.3/driver
  	atomic_long_set(&psb->total_inodes, 0);
  
  	mutex_init(&psb->state_lock);
-diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/mcache.c linux-2.6.39.3/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.39.3/drivers/staging/pohmelfs/mcache.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/pohmelfs/mcache.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/pohmelfs/mcache.c linux-2.6.39.4/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.39.4/drivers/staging/pohmelfs/mcache.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/pohmelfs/mcache.c	2011-08-05 19:44:37.000000000 -0400
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
  	m->data = data;
  	m->start = start;
@@ -40384,9 +32257,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/mcache.c linux-2.6.39.3/drive
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/netfs.h linux-2.6.39.3/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.39.3/drivers/staging/pohmelfs/netfs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/pohmelfs/netfs.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/pohmelfs/netfs.h linux-2.6.39.4/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.39.4/drivers/staging/pohmelfs/netfs.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/pohmelfs/netfs.h	2011-08-05 19:44:37.000000000 -0400
 @@ -571,14 +571,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
@@ -40404,9 +32277,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/netfs.h linux-2.6.39.3/driver
  
  	unsigned int		crypto_attached_size;
  	unsigned int		crypto_align_size;
-diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/trans.c linux-2.6.39.3/drivers/staging/pohmelfs/trans.c
---- linux-2.6.39.3/drivers/staging/pohmelfs/trans.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/pohmelfs/trans.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/pohmelfs/trans.c linux-2.6.39.4/drivers/staging/pohmelfs/trans.c
+--- linux-2.6.39.4/drivers/staging/pohmelfs/trans.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/pohmelfs/trans.c	2011-08-05 19:44:37.000000000 -0400
 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
  	int err;
  	struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -40416,87 +32289,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/pohmelfs/trans.c linux-2.6.39.3/driver
  
  	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
  		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-2.6.39.3/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.39.3/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.39.3/drivers/staging/rtl8192u/ieee80211/proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct seq_operations crypto_seq_ops = {
-+static const struct seq_operations crypto_seq_ops = {
- 	.start		= c_start,
- 	.next		= c_next,
- 	.stop		= c_stop,
-@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
- 	return seq_open(file, &crypto_seq_ops);
- }
- 
--static struct file_operations proc_crypto_ops = {
-+static const struct file_operations proc_crypto_ops = {
- 	.open		= crypto_info_open,
- 	.read		= seq_read,
- 	.llseek		= seq_lseek,
-diff -urNp linux-2.6.39.3/drivers/staging/rtl8712/rtl871x_io.h linux-2.6.39.3/drivers/staging/rtl8712/rtl871x_io.h
---- linux-2.6.39.3/drivers/staging/rtl8712/rtl871x_io.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 	void (*intf_hdl_close)(u8 *priv);
--	struct	_io_ops	io_ops;
-+	const struct _io_ops io_ops;
- };
- 
- struct reg_protocol_rd {
-diff -urNp linux-2.6.39.3/drivers/staging/solo6x10/g723.c linux-2.6.39.3/drivers/staging/solo6x10/g723.c
---- linux-2.6.39.3/drivers/staging/solo6x10/g723.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/solo6x10/g723.c	2011-05-22 19:36:32.000000000 -0400
-@@ -237,7 +237,7 @@ static int snd_solo_pcm_copy(struct snd_
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_solo_pcm_ops = {
-+static const struct snd_pcm_ops snd_solo_pcm_ops = {
- 	.open = snd_solo_pcm_open,
- 	.close = snd_solo_pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -334,7 +334,7 @@ static int solo_snd_pcm_init(struct solo
- 
- int solo_g723_init(struct solo_dev *solo_dev)
- {
--	static struct snd_device_ops ops = { NULL };
-+	static const struct snd_device_ops ops = { NULL };
- 	struct snd_card *card;
- 	struct snd_kcontrol_new kctl;
- 	char name[32];
-diff -urNp linux-2.6.39.3/drivers/staging/spectra/ffsport.c linux-2.6.39.3/drivers/staging/spectra/ffsport.c
---- linux-2.6.39.3/drivers/staging/spectra/ffsport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct block_device_operations GLOB_SBD_ops = {
-+static const struct block_device_operations GLOB_SBD_ops = {
- 	.owner = THIS_MODULE,
- 	.open = GLOB_SBD_open,
- 	.release = GLOB_SBD_release,
-diff -urNp linux-2.6.39.3/drivers/staging/tm6000/tm6000-alsa.c linux-2.6.39.3/drivers/staging/tm6000/tm6000-alsa.c
---- linux-2.6.39.3/drivers/staging/tm6000/tm6000-alsa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
--static struct snd_pcm_ops snd_tm6000_pcm_ops = {
-+static const struct snd_pcm_ops snd_tm6000_pcm_ops = {
- 	.open = snd_tm6000_pcm_open,
- 	.close = snd_tm6000_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/drivers/staging/tty/istallion.c linux-2.6.39.3/drivers/staging/tty/istallion.c
---- linux-2.6.39.3/drivers/staging/tty/istallion.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/tty/istallion.c	2011-05-22 20:49:07.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/tty/istallion.c linux-2.6.39.4/drivers/staging/tty/istallion.c
+--- linux-2.6.39.4/drivers/staging/tty/istallion.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/tty/istallion.c	2011-08-05 19:44:37.000000000 -0400
 @@ -186,7 +186,6 @@ static struct ktermios		stli_deftermios 
   *	re-used for each stats call.
   */
@@ -40531,9 +32326,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/tty/istallion.c linux-2.6.39.3/drivers
  	if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
  		return -EFAULT;
  	if (stli_dummybrd.brdnr >= STL_MAXBRDS)
-diff -urNp linux-2.6.39.3/drivers/staging/tty/stallion.c linux-2.6.39.3/drivers/staging/tty/stallion.c
---- linux-2.6.39.3/drivers/staging/tty/stallion.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/tty/stallion.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/tty/stallion.c linux-2.6.39.4/drivers/staging/tty/stallion.c
+--- linux-2.6.39.4/drivers/staging/tty/stallion.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/tty/stallion.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
  	struct stlport	stl_dummyport;
  	struct stlport	*portp;
@@ -40543,9 +32338,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/tty/stallion.c linux-2.6.39.3/drivers/
  	if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
  		return -EFAULT;
  	portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-diff -urNp linux-2.6.39.3/drivers/staging/usbip/vhci.h linux-2.6.39.3/drivers/staging/usbip/vhci.h
---- linux-2.6.39.3/drivers/staging/usbip/vhci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/usbip/vhci.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/usbip/vhci.h linux-2.6.39.4/drivers/staging/usbip/vhci.h
+--- linux-2.6.39.4/drivers/staging/usbip/vhci.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/usbip/vhci.h	2011-08-05 19:44:37.000000000 -0400
 @@ -92,7 +92,7 @@ struct vhci_hcd {
  	unsigned	resuming:1;
  	unsigned long	re_timeout;
@@ -40555,9 +32350,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/usbip/vhci.h linux-2.6.39.3/drivers/st
  
  	/*
  	 * NOTE:
-diff -urNp linux-2.6.39.3/drivers/staging/usbip/vhci_hcd.c linux-2.6.39.3/drivers/staging/usbip/vhci_hcd.c
---- linux-2.6.39.3/drivers/staging/usbip/vhci_hcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/usbip/vhci_hcd.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/usbip/vhci_hcd.c linux-2.6.39.4/drivers/staging/usbip/vhci_hcd.c
+--- linux-2.6.39.4/drivers/staging/usbip/vhci_hcd.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/usbip/vhci_hcd.c	2011-08-05 19:44:37.000000000 -0400
 @@ -536,7 +536,7 @@ static void vhci_tx_urb(struct urb *urb)
  		return;
  	}
@@ -40585,9 +32380,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/usbip/vhci_hcd.c linux-2.6.39.3/driver
  	spin_lock_init(&vhci->lock);
  
  
-diff -urNp linux-2.6.39.3/drivers/staging/usbip/vhci_rx.c linux-2.6.39.3/drivers/staging/usbip/vhci_rx.c
---- linux-2.6.39.3/drivers/staging/usbip/vhci_rx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/usbip/vhci_rx.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/staging/usbip/vhci_rx.c linux-2.6.39.4/drivers/staging/usbip/vhci_rx.c
+--- linux-2.6.39.4/drivers/staging/usbip/vhci_rx.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/staging/usbip/vhci_rx.c	2011-08-05 19:44:37.000000000 -0400
 @@ -81,7 +81,7 @@ static void vhci_recv_ret_submit(struct 
  		usbip_uerr("cannot find a urb of seqnum %u\n",
  							pdu->base.seqnum);
@@ -40597,117 +32392,9 @@ diff -urNp linux-2.6.39.3/drivers/staging/usbip/vhci_rx.c linux-2.6.39.3/drivers
  		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
  		return;
  	}
-diff -urNp linux-2.6.39.3/drivers/staging/vme/devices/vme_user.c linux-2.6.39.3/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.39.3/drivers/staging/vme/devices/vme_user.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
--static struct file_operations vme_user_fops = {
-+static const struct file_operations vme_user_fops = {
- 	.open = vme_user_open,
- 	.release = vme_user_release,
- 	.read = vme_user_read,
-diff -urNp linux-2.6.39.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.39.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
---- linux-2.6.39.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c	2011-05-22 19:36:32.000000000 -0400
-@@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge
- 
- 
- /*standard block device driver interface */
--static struct block_device_operations cyasblkdev_bdops = {
-+static const struct block_device_operations cyasblkdev_bdops = {
- 	.open			= cyasblkdev_blk_open,
- 	.release		= cyasblkdev_blk_release,
- 	.ioctl			= cyasblkdev_blk_ioctl,
-diff -urNp linux-2.6.39.3/drivers/staging/wlags49_h2/wl_netdev.c linux-2.6.39.3/drivers/staging/wlags49_h2/wl_netdev.c
---- linux-2.6.39.3/drivers/staging/wlags49_h2/wl_netdev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
--static struct ethtool_ops wl_ethtool_ops = {
-+static const struct ethtool_ops wl_ethtool_ops = {
-     .get_drvinfo = wl_get_drvinfo,
-     .get_link = ethtool_op_get_link,
- };
-diff -urNp linux-2.6.39.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.39.3/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-2.6.39.3/drivers/staging/wlan-ng/hfa384x_usb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/wlan-ng/hfa384x_usb.c	2011-05-22 19:36:32.000000000 -0400
-@@ -671,7 +671,7 @@ struct usbctlx_cmd_completor {
- 	hfa384x_cmdresult_t *result;
- };
- 
--static inline int usbctlx_cmd_completor_fn(struct usbctlx_completor *head)
-+static inline int usbctlx_cmd_completor_fn(const struct usbctlx_completor *head)
- {
- 	struct usbctlx_cmd_completor *complete;
- 
-@@ -705,7 +705,7 @@ struct usbctlx_rrid_completor {
- 	unsigned int riddatalen;
- };
- 
--static int usbctlx_rrid_completor_fn(struct usbctlx_completor *head)
-+static int usbctlx_rrid_completor_fn(const struct usbctlx_completor *head)
- {
- 	struct usbctlx_rrid_completor *complete;
- 	hfa384x_rridresult_t rridresult;
-@@ -768,7 +768,7 @@ struct usbctlx_rmem_completor {
- };
- typedef struct usbctlx_rmem_completor usbctlx_rmem_completor_t;
- 
--static int usbctlx_rmem_completor_fn(struct usbctlx_completor *head)
-+static int usbctlx_rmem_completor_fn(const struct usbctlx_completor *head)
- {
- 	usbctlx_rmem_completor_t *complete = (usbctlx_rmem_completor_t *) head;
- 
-diff -urNp linux-2.6.39.3/drivers/staging/zcache/tmem.c linux-2.6.39.3/drivers/staging/zcache/tmem.c
---- linux-2.6.39.3/drivers/staging/zcache/tmem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/zcache/tmem.c	2011-05-22 19:36:32.000000000 -0400
-@@ -39,7 +39,7 @@
-  * A tmem host implementation must use this function to register callbacks
-  * for memory allocation.
-  */
--static struct tmem_hostops tmem_hostops;
-+static const struct tmem_hostops tmem_hostops;
- 
- static void tmem_objnode_tree_init(void);
- 
-@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_h
-  * A tmem host implementation must use this function to register
-  * callbacks for a page-accessible memory (PAM) implementation
-  */
--static struct tmem_pamops tmem_pamops;
-+static const struct tmem_pamops tmem_pamops;
- 
- void tmem_register_pamops(struct tmem_pamops *m)
- {
-diff -urNp linux-2.6.39.3/drivers/staging/zcache/zcache.c linux-2.6.39.3/drivers/staging/zcache/zcache.c
---- linux-2.6.39.3/drivers/staging/zcache/zcache.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/staging/zcache/zcache.c	2011-05-22 19:36:32.000000000 -0400
-@@ -882,7 +882,7 @@ static void zcache_obj_free(struct tmem_
- 	kmem_cache_free(zcache_obj_cache, obj);
- }
- 
--static struct tmem_hostops zcache_hostops = {
-+static const struct tmem_hostops zcache_hostops = {
- 	.obj_alloc = zcache_obj_alloc,
- 	.obj_free = zcache_obj_free,
- 	.objnode_alloc = zcache_objnode_alloc,
-@@ -987,7 +987,7 @@ static void zcache_pampd_free(void *pamp
- 	}
- }
- 
--static struct tmem_pamops zcache_pamops = {
-+static const struct tmem_pamops zcache_pamops = {
- 	.create = zcache_pampd_create,
- 	.get_data = zcache_pampd_get_data,
- 	.free = zcache_pampd_free,
-diff -urNp linux-2.6.39.3/drivers/target/target_core_alua.c linux-2.6.39.3/drivers/target/target_core_alua.c
---- linux-2.6.39.3/drivers/target/target_core_alua.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/target/target_core_alua.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/target/target_core_alua.c linux-2.6.39.4/drivers/target/target_core_alua.c
+--- linux-2.6.39.4/drivers/target/target_core_alua.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/target/target_core_alua.c	2011-08-05 19:44:37.000000000 -0400
 @@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_
  	char path[ALUA_METADATA_PATH_LEN];
  	int len;
@@ -40726,9 +32413,9 @@ diff -urNp linux-2.6.39.3/drivers/target/target_core_alua.c linux-2.6.39.3/drive
  	memset(path, 0, ALUA_METADATA_PATH_LEN);
  	memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
  
-diff -urNp linux-2.6.39.3/drivers/target/target_core_cdb.c linux-2.6.39.3/drivers/target/target_core_cdb.c
---- linux-2.6.39.3/drivers/target/target_core_cdb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/target/target_core_cdb.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/target/target_core_cdb.c linux-2.6.39.4/drivers/target/target_core_cdb.c
+--- linux-2.6.39.4/drivers/target/target_core_cdb.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/target/target_core_cdb.c	2011-08-05 19:44:37.000000000 -0400
 @@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
  	int length = 0;
  	unsigned char buf[SE_MODE_PAGE_BUF];
@@ -40738,9 +32425,9 @@ diff -urNp linux-2.6.39.3/drivers/target/target_core_cdb.c linux-2.6.39.3/driver
  	memset(buf, 0, SE_MODE_PAGE_BUF);
  
  	switch (cdb[2] & 0x3f) {
-diff -urNp linux-2.6.39.3/drivers/target/target_core_configfs.c linux-2.6.39.3/drivers/target/target_core_configfs.c
---- linux-2.6.39.3/drivers/target/target_core_configfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/target/target_core_configfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/target/target_core_configfs.c linux-2.6.39.4/drivers/target/target_core_configfs.c
+--- linux-2.6.39.4/drivers/target/target_core_configfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/target/target_core_configfs.c	2011-08-05 20:34:06.000000000 -0400
 @@ -1280,6 +1280,8 @@ static ssize_t target_core_dev_pr_show_a
  	ssize_t len = 0;
  	int reg_count = 0, prf_isid;
@@ -40750,57 +32437,9 @@ diff -urNp linux-2.6.39.3/drivers/target/target_core_configfs.c linux-2.6.39.3/d
  	if (!(su_dev->se_dev_ptr))
  		return -ENODEV;
  
-@@ -2682,7 +2684,7 @@ static void target_core_alua_drop_tg_pt_
- 	config_item_put(item);
- }
- 
--static struct configfs_group_operations target_core_alua_tg_pt_gps_group_ops = {
-+static const struct configfs_group_operations target_core_alua_tg_pt_gps_group_ops = {
- 	.make_group		= &target_core_alua_create_tg_pt_gp,
- 	.drop_item		= &target_core_alua_drop_tg_pt_gp,
- };
-@@ -2726,7 +2728,7 @@ static void target_core_stat_rmdir(
- 	return;
- }
- 
--static struct configfs_group_operations target_core_stat_group_ops = {
-+static const struct configfs_group_operations target_core_stat_group_ops = {
- 	.make_group		= &target_core_stat_mkdir,
- 	.drop_item		= &target_core_stat_rmdir,
- };
-@@ -2939,7 +2941,7 @@ static void target_core_drop_subdev(
- 	mutex_unlock(&hba->hba_access_mutex);
- }
- 
--static struct configfs_group_operations target_core_hba_group_ops = {
-+static const struct configfs_group_operations target_core_hba_group_ops = {
- 	.make_group		= target_core_make_subdev,
- 	.drop_item		= target_core_drop_subdev,
- };
-@@ -3117,7 +3119,7 @@ static void target_core_call_delhbafromt
- 	config_item_put(item);
- }
- 
--static struct configfs_group_operations target_core_group_ops = {
-+static const struct configfs_group_operations target_core_group_ops = {
- 	.make_group	= target_core_call_addhbatotarget,
- 	.drop_item	= target_core_call_delhbafromtarget,
- };
-diff -urNp linux-2.6.39.3/drivers/target/target_core_fabric_configfs.c linux-2.6.39.3/drivers/target/target_core_fabric_configfs.c
---- linux-2.6.39.3/drivers/target/target_core_fabric_configfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct configfs_group_operations target_fabric_wwn_group_ops = {
-+static const struct configfs_group_operations target_fabric_wwn_group_ops = {
- 	.make_group	= target_fabric_make_wwn,
- 	.drop_item	= target_fabric_drop_wwn,
- };
-diff -urNp linux-2.6.39.3/drivers/target/target_core_pr.c linux-2.6.39.3/drivers/target/target_core_pr.c
---- linux-2.6.39.3/drivers/target/target_core_pr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/target/target_core_pr.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/target/target_core_pr.c linux-2.6.39.4/drivers/target/target_core_pr.c
+--- linux-2.6.39.4/drivers/target/target_core_pr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/target/target_core_pr.c	2011-08-05 19:44:37.000000000 -0400
 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
  	unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
  	u16 tpgt;
@@ -40828,9 +32467,9 @@ diff -urNp linux-2.6.39.3/drivers/target/target_core_pr.c linux-2.6.39.3/drivers
  	memset(iov, 0, sizeof(struct iovec));
  	memset(path, 0, 512);
  
-diff -urNp linux-2.6.39.3/drivers/target/target_core_tmr.c linux-2.6.39.3/drivers/target/target_core_tmr.c
---- linux-2.6.39.3/drivers/target/target_core_tmr.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/target/target_core_tmr.c	2011-06-03 00:32:07.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/target/target_core_tmr.c linux-2.6.39.4/drivers/target/target_core_tmr.c
+--- linux-2.6.39.4/drivers/target/target_core_tmr.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/drivers/target/target_core_tmr.c	2011-08-05 19:44:37.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,
@@ -40858,9 +32497,9 @@ diff -urNp linux-2.6.39.3/drivers/target/target_core_tmr.c linux-2.6.39.3/driver
  		spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
  		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
  
-diff -urNp linux-2.6.39.3/drivers/target/target_core_transport.c linux-2.6.39.3/drivers/target/target_core_transport.c
---- linux-2.6.39.3/drivers/target/target_core_transport.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/target/target_core_transport.c	2011-06-03 00:32:07.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/target/target_core_transport.c linux-2.6.39.4/drivers/target/target_core_transport.c
+--- linux-2.6.39.4/drivers/target/target_core_transport.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/drivers/target/target_core_transport.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t
  
  	dev->queue_depth	= dev_limits->queue_depth;
@@ -40936,9 +32575,9 @@ diff -urNp linux-2.6.39.3/drivers/target/target_core_transport.c linux-2.6.39.3/
  			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.3/drivers/telephony/ixj.c linux-2.6.39.3/drivers/telephony/ixj.c
---- linux-2.6.39.3/drivers/telephony/ixj.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/telephony/ixj.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/telephony/ixj.c linux-2.6.39.4/drivers/telephony/ixj.c
+--- linux-2.6.39.4/drivers/telephony/ixj.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/telephony/ixj.c	2011-08-05 19:44:37.000000000 -0400
 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
  	bool mContinue;
  	char *pIn, *pOut;
@@ -40948,32 +32587,9 @@ diff -urNp linux-2.6.39.3/drivers/telephony/ixj.c linux-2.6.39.3/drivers/telepho
  	if (!SCI_Prepare(j))
  		return 0;
  
-diff -urNp linux-2.6.39.3/drivers/tty/hvc/hvc_console.h linux-2.6.39.3/drivers/tty/hvc/hvc_console.h
---- linux-2.6.39.3/drivers/tty/hvc/hvc_console.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/hvc/hvc_console.h	2011-05-22 19:36:32.000000000 -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,
- 				     const struct hv_ops *ops, int outbuf_size);
-+
- /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
- extern int hvc_remove(struct hvc_struct *hp);
- 
-diff -urNp linux-2.6.39.3/drivers/tty/hvc/hvc_iucv.c linux-2.6.39.3/drivers/tty/hvc/hvc_iucv.c
---- linux-2.6.39.3/drivers/tty/hvc/hvc_iucv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/hvc/hvc_iucv.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1203,7 +1203,7 @@ static int param_get_vmidfilter(char *bu
- 
- #define param_check_vmidfilter(name, p) __param_check(name, p, void)
- 
--static struct kernel_param_ops param_ops_vmidfilter = {
-+static const struct kernel_param_ops param_ops_vmidfilter = {
- 	.set = param_set_vmidfilter,
- 	.get = param_get_vmidfilter,
- };
-diff -urNp linux-2.6.39.3/drivers/tty/hvc/hvcs.c linux-2.6.39.3/drivers/tty/hvc/hvcs.c
---- linux-2.6.39.3/drivers/tty/hvc/hvcs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/hvc/hvcs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/hvc/hvcs.c linux-2.6.39.4/drivers/tty/hvc/hvcs.c
+--- linux-2.6.39.4/drivers/tty/hvc/hvcs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/hvc/hvcs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -83,6 +83,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -41076,48 +32692,9 @@ diff -urNp linux-2.6.39.3/drivers/tty/hvc/hvcs.c linux-2.6.39.3/drivers/tty/hvc/
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.39.3/drivers/tty/hvc/hvc_xen.c linux-2.6.39.3/drivers/tty/hvc/hvc_xen.c
---- linux-2.6.39.3/drivers/tty/hvc/hvc_xen.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/hvc/hvc_xen.c	2011-05-22 19:36:32.000000000 -0400
-@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt
- 	return recv;
- }
- 
--static struct hv_ops domU_hvc_ops = {
-+static const struct hv_ops domU_hvc_ops = {
- 	.get_chars = domU_read_console,
- 	.put_chars = domU_write_console,
- 	.notifier_add = notifier_add_irq,
-@@ -149,7 +149,7 @@ static int dom0_write_console(uint32_t v
- 	return len;
- }
- 
--static struct hv_ops dom0_hvc_ops = {
-+static const struct hv_ops dom0_hvc_ops = {
- 	.get_chars = dom0_read_console,
- 	.put_chars = dom0_write_console,
- 	.notifier_add = notifier_add_irq,
-@@ -160,7 +160,7 @@ static struct hv_ops dom0_hvc_ops = {
- static int __init xen_hvc_init(void)
- {
- 	struct hvc_struct *hp;
--	struct hv_ops *ops;
-+	const struct hv_ops *ops;
- 
- 	if (!xen_pv_domain())
- 		return -ENODEV;
-@@ -205,7 +205,7 @@ static void __exit xen_hvc_fini(void)
- 
- static int xen_cons_init(void)
- {
--	struct hv_ops *ops;
-+	const struct hv_ops *ops;
- 
- 	if (!xen_pv_domain())
- 		return 0;
-diff -urNp linux-2.6.39.3/drivers/tty/ipwireless/tty.c linux-2.6.39.3/drivers/tty/ipwireless/tty.c
---- linux-2.6.39.3/drivers/tty/ipwireless/tty.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/ipwireless/tty.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/ipwireless/tty.c linux-2.6.39.4/drivers/tty/ipwireless/tty.c
+--- linux-2.6.39.4/drivers/tty/ipwireless/tty.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/ipwireless/tty.c	2011-08-05 19:44:37.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -41240,21 +32817,9 @@ diff -urNp linux-2.6.39.3/drivers/tty/ipwireless/tty.c linux-2.6.39.3/drivers/tt
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-2.6.39.3/drivers/tty/mxser.c linux-2.6.39.3/drivers/tty/mxser.c
---- linux-2.6.39.3/drivers/tty/mxser.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/mxser.c	2011-05-22 19:36:32.000000000 -0400
-@@ -2340,7 +2340,7 @@ static const struct tty_operations mxser
- 	.get_icount = mxser_get_icount,
- };
- 
--struct tty_port_operations mxser_port_ops = {
-+const struct tty_port_operations mxser_port_ops = {
- 	.carrier_raised = mxser_carrier_raised,
- 	.dtr_rts = mxser_dtr_rts,
- 	.activate = mxser_activate,
-diff -urNp linux-2.6.39.3/drivers/tty/n_gsm.c linux-2.6.39.3/drivers/tty/n_gsm.c
---- linux-2.6.39.3/drivers/tty/n_gsm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/n_gsm.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/n_gsm.c linux-2.6.39.4/drivers/tty/n_gsm.c
+--- linux-2.6.39.4/drivers/tty/n_gsm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/n_gsm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1588,7 +1588,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
  		return NULL;
  	spin_lock_init(&dlci->lock);
@@ -41264,9 +32829,9 @@ diff -urNp linux-2.6.39.3/drivers/tty/n_gsm.c linux-2.6.39.3/drivers/tty/n_gsm.c
  		kfree(dlci);
  		return NULL;
  	}
-diff -urNp linux-2.6.39.3/drivers/tty/n_tty.c linux-2.6.39.3/drivers/tty/n_tty.c
---- linux-2.6.39.3/drivers/tty/n_tty.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/n_tty.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/n_tty.c linux-2.6.39.4/drivers/tty/n_tty.c
+--- linux-2.6.39.4/drivers/tty/n_tty.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/n_tty.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2122,6 +2122,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
  {
  	*ops = tty_ldisc_N_TTY;
@@ -41276,43 +32841,24 @@ diff -urNp linux-2.6.39.3/drivers/tty/n_tty.c linux-2.6.39.3/drivers/tty/n_tty.c
 +	ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-2.6.39.3/drivers/tty/pty.c linux-2.6.39.3/drivers/tty/pty.c
---- linux-2.6.39.3/drivers/tty/pty.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/pty.c	2011-05-22 19:36:32.000000000 -0400
-@@ -699,7 +699,18 @@ out:
- 	return retval;
- }
- 
--static struct file_operations ptmx_fops;
-+static const struct file_operations ptmx_fops = {
-+	.llseek		= no_llseek,
-+	.read		= tty_read,
-+	.write		= tty_write,
-+	.poll		= tty_poll,
-+	.unlocked_ioctl	= tty_ioctl,
-+	.compat_ioctl	= tty_compat_ioctl,
-+	.open		= ptmx_open,
-+	.release	= tty_release,
-+	.fasync		= tty_fasync,
-+};
-+
- 
- static void __init unix98_pty_init(void)
- {
-@@ -752,10 +763,6 @@ static void __init unix98_pty_init(void)
- 
+diff -urNp linux-2.6.39.4/drivers/tty/pty.c linux-2.6.39.4/drivers/tty/pty.c
+--- linux-2.6.39.4/drivers/tty/pty.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/pty.c	2011-08-05 20:34:06.000000000 -0400
+@@ -753,8 +753,10 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
--	/* Now create the /dev/ptmx special device */
--	tty_default_fops(&ptmx_fops);
+ 	/* Now create the /dev/ptmx special device */
++	pax_open_kernel();
+ 	tty_default_fops(&ptmx_fops);
 -	ptmx_fops.open = ptmx_open;
--
++	*(void **)&ptmx_fops.open = ptmx_open;
++	pax_close_kernel();
+ 
  	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.3/drivers/tty/rocket.c linux-2.6.39.3/drivers/tty/rocket.c
---- linux-2.6.39.3/drivers/tty/rocket.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/rocket.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/rocket.c linux-2.6.39.4/drivers/tty/rocket.c
+--- linux-2.6.39.4/drivers/tty/rocket.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/rocket.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
  	struct rocket_ports tmp;
  	int board;
@@ -41322,354 +32868,110 @@ diff -urNp linux-2.6.39.3/drivers/tty/rocket.c linux-2.6.39.3/drivers/tty/rocket
  	if (!retports)
  		return -EFAULT;
  	memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-2.6.39.3/drivers/tty/serial/21285.c linux-2.6.39.3/drivers/tty/serial/21285.c
---- linux-2.6.39.3/drivers/tty/serial/21285.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/21285.c	2011-05-22 19:36:32.000000000 -0400
-@@ -340,7 +340,7 @@ static int serial21285_verify_port(struc
- 	return ret;
- }
+diff -urNp linux-2.6.39.4/drivers/tty/serial/kgdboc.c linux-2.6.39.4/drivers/tty/serial/kgdboc.c
+--- linux-2.6.39.4/drivers/tty/serial/kgdboc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/serial/kgdboc.c	2011-08-05 20:34:06.000000000 -0400
+@@ -23,8 +23,9 @@
+ #define MAX_CONFIG_LEN		40
  
--static struct uart_ops serial21285_ops = {
-+static const struct uart_ops serial21285_ops = {
- 	.tx_empty	= serial21285_tx_empty,
- 	.get_mctrl	= serial21285_get_mctrl,
- 	.set_mctrl	= serial21285_set_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/8250.c linux-2.6.39.3/drivers/tty/serial/8250.c
---- linux-2.6.39.3/drivers/tty/serial/8250.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/8250.c	2011-05-22 19:36:32.000000000 -0400
-@@ -2708,7 +2708,7 @@ serial8250_type(struct uart_port *port)
- 	return uart_config[type].name;
- }
- 
--static struct uart_ops serial8250_pops = {
-+static const struct uart_ops serial8250_pops = {
- 	.tx_empty	= serial8250_tx_empty,
- 	.set_mctrl	= serial8250_set_mctrl,
- 	.get_mctrl	= serial8250_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/altera_jtaguart.c linux-2.6.39.3/drivers/tty/serial/altera_jtaguart.c
---- linux-2.6.39.3/drivers/tty/serial/altera_jtaguart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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.
-  */
--static struct uart_ops altera_jtaguart_ops = {
-+static const struct uart_ops altera_jtaguart_ops = {
- 	.tx_empty	= altera_jtaguart_tx_empty,
- 	.get_mctrl	= altera_jtaguart_get_mctrl,
- 	.set_mctrl	= altera_jtaguart_set_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/altera_uart.c linux-2.6.39.3/drivers/tty/serial/altera_uart.c
---- linux-2.6.39.3/drivers/tty/serial/altera_uart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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.
-  */
--static struct uart_ops altera_uart_ops = {
-+static const struct uart_ops altera_uart_ops = {
- 	.tx_empty	= altera_uart_tx_empty,
- 	.get_mctrl	= altera_uart_get_mctrl,
- 	.set_mctrl	= altera_uart_set_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/amba-pl010.c linux-2.6.39.3/drivers/tty/serial/amba-pl010.c
---- linux-2.6.39.3/drivers/tty/serial/amba-pl010.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/amba-pl010.c	2011-05-22 19:36:32.000000000 -0400
-@@ -529,7 +529,7 @@ static int pl010_verify_port(struct uart
- 	return ret;
- }
+ static struct kgdb_io		kgdboc_io_ops;
++static struct kgdb_io		kgdboc_io_ops_console;
  
--static struct uart_ops amba_pl010_pops = {
-+static const struct uart_ops amba_pl010_pops = {
- 	.tx_empty	= pl010_tx_empty,
- 	.set_mctrl	= pl010_set_mctrl,
- 	.get_mctrl	= pl010_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/amba-pl011.c linux-2.6.39.3/drivers/tty/serial/amba-pl011.c
---- linux-2.6.39.3/drivers/tty/serial/amba-pl011.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/amba-pl011.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1581,7 +1581,7 @@ static int pl010_verify_port(struct uart
- 	return ret;
- }
+-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
++/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
+ static int configured		= -1;
  
--static struct uart_ops amba_pl011_pops = {
-+static const struct uart_ops amba_pl011_pops = {
- 	.tx_empty	= pl01x_tx_empty,
- 	.set_mctrl	= pl011_set_mctrl,
- 	.get_mctrl	= pl01x_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/apbuart.c linux-2.6.39.3/drivers/tty/serial/apbuart.c
---- linux-2.6.39.3/drivers/tty/serial/apbuart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/apbuart.c	2011-05-22 19:36:32.000000000 -0400
-@@ -328,7 +328,7 @@ static int apbuart_verify_port(struct ua
- 	return ret;
+ static char config[MAX_CONFIG_LEN];
+@@ -147,6 +148,8 @@ static void cleanup_kgdboc(void)
+ 	kgdboc_unregister_kbd();
+ 	if (configured == 1)
+ 		kgdb_unregister_io_module(&kgdboc_io_ops);
++	else if (configured == 2)
++		kgdb_unregister_io_module(&kgdboc_io_ops_console);
  }
  
--static struct uart_ops grlib_apbuart_ops = {
-+static const struct uart_ops grlib_apbuart_ops = {
- 	.tx_empty = apbuart_tx_empty,
- 	.set_mctrl = apbuart_set_mctrl,
- 	.get_mctrl = apbuart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/atmel_serial.c linux-2.6.39.3/drivers/tty/serial/atmel_serial.c
---- linux-2.6.39.3/drivers/tty/serial/atmel_serial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- 
- 
--static struct uart_ops atmel_pops = {
-+static const struct uart_ops atmel_pops = {
- 	.tx_empty	= atmel_tx_empty,
- 	.set_mctrl	= atmel_set_mctrl,
- 	.get_mctrl	= atmel_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/bcm63xx_uart.c linux-2.6.39.3/drivers/tty/serial/bcm63xx_uart.c
---- linux-2.6.39.3/drivers/tty/serial/bcm63xx_uart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- /* serial core callbacks */
--static struct uart_ops bcm_uart_ops = {
-+static const struct uart_ops bcm_uart_ops = {
- 	.tx_empty	= bcm_uart_tx_empty,
- 	.get_mctrl	= bcm_uart_get_mctrl,
- 	.set_mctrl	= bcm_uart_set_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/bfin_5xx.c linux-2.6.39.3/drivers/tty/serial/bfin_5xx.c
---- linux-2.6.39.3/drivers/tty/serial/bfin_5xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/bfin_5xx.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1036,7 +1036,7 @@ static int bfin_kgdboc_port_startup(stru
- }
- #endif
+ static int configure_kgdboc(void)
+@@ -156,13 +159,13 @@ static int configure_kgdboc(void)
+ 	int err;
+ 	char *cptr = config;
+ 	struct console *cons;
++	int is_console = 0;
+ 
+ 	err = kgdboc_option_setup(config);
+ 	if (err || !strlen(config) || isspace(config[0]))
+ 		goto noconfig;
+ 
+ 	err = -ENODEV;
+-	kgdboc_io_ops.is_console = 0;
+ 	kgdb_tty_driver = NULL;
+ 
+ 	kgdboc_use_kms = 0;
+@@ -183,7 +186,7 @@ static int configure_kgdboc(void)
+ 		int idx;
+ 		if (cons->device && cons->device(cons, &idx) == p &&
+ 		    idx == tty_line) {
+-			kgdboc_io_ops.is_console = 1;
++			is_console = 1;
+ 			break;
+ 		}
+ 		cons = cons->next;
+@@ -193,12 +196,16 @@ static int configure_kgdboc(void)
+ 	kgdb_tty_line = tty_line;
+ 
+ do_register:
+-	err = kgdb_register_io_module(&kgdboc_io_ops);
++	if (is_console) {
++		err = kgdb_register_io_module(&kgdboc_io_ops_console);
++		configured = 2;
++	} else {
++		err = kgdb_register_io_module(&kgdboc_io_ops);
++		configured = 1;
++	}
+ 	if (err)
+ 		goto noconfig;
  
--static struct uart_ops bfin_serial_pops = {
-+static const struct uart_ops bfin_serial_pops = {
- 	.tx_empty	= bfin_serial_tx_empty,
- 	.set_mctrl	= bfin_serial_set_mctrl,
- 	.get_mctrl	= bfin_serial_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/bfin_sport_uart.c linux-2.6.39.3/drivers/tty/serial/bfin_sport_uart.c
---- linux-2.6.39.3/drivers/tty/serial/bfin_sport_uart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--struct uart_ops sport_uart_ops = {
-+const struct uart_ops sport_uart_ops = {
- 	.tx_empty	= sport_tx_empty,
- 	.set_mctrl	= sport_set_mctrl,
- 	.get_mctrl	= sport_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/clps711x.c linux-2.6.39.3/drivers/tty/serial/clps711x.c
---- linux-2.6.39.3/drivers/tty/serial/clps711x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/clps711x.c	2011-05-22 19:36:32.000000000 -0400
-@@ -380,7 +380,7 @@ static int clps711xuart_request_port(str
+-	configured = 1;
+-
  	return 0;
- }
- 
--static struct uart_ops clps711x_pops = {
-+static const struct uart_ops clps711x_pops = {
- 	.tx_empty	= clps711xuart_tx_empty,
- 	.set_mctrl	= clps711xuart_set_mctrl_null,
- 	.get_mctrl	= clps711xuart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/cpm_uart/cpm_uart_core.c linux-2.6.39.3/drivers/tty/serial/cpm_uart/cpm_uart_core.c
---- linux-2.6.39.3/drivers/tty/serial/cpm_uart/cpm_uart_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/cpm_uart/cpm_uart_core.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1099,7 +1099,7 @@ static void cpm_put_poll_char(struct uar
- }
- #endif /* CONFIG_CONSOLE_POLL */
- 
--static struct uart_ops cpm_uart_pops = {
-+static const struct uart_ops cpm_uart_pops = {
- 	.tx_empty	= cpm_uart_tx_empty,
- 	.set_mctrl	= cpm_uart_set_mctrl,
- 	.get_mctrl	= cpm_uart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/dz.c linux-2.6.39.3/drivers/tty/serial/dz.c
---- linux-2.6.39.3/drivers/tty/serial/dz.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct uart_ops dz_ops = {
-+static const struct uart_ops dz_ops = {
- 	.tx_empty	= dz_tx_empty,
- 	.get_mctrl	= dz_get_mctrl,
- 	.set_mctrl	= dz_set_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/imx.c linux-2.6.39.3/drivers/tty/serial/imx.c
---- linux-2.6.39.3/drivers/tty/serial/imx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/imx.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1018,7 +1018,7 @@ imx_verify_port(struct uart_port *port, 
- 	return ret;
- }
  
--static struct uart_ops imx_pops = {
-+static const struct uart_ops imx_pops = {
- 	.tx_empty	= imx_tx_empty,
- 	.set_mctrl	= imx_set_mctrl,
- 	.get_mctrl	= imx_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/ioc3_serial.c linux-2.6.39.3/drivers/tty/serial/ioc3_serial.c
---- linux-2.6.39.3/drivers/tty/serial/ioc3_serial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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_
- }
- 
- /* Associate the uart functions above - given to serial core */
--static struct uart_ops ioc3_ops = {
-+static const struct uart_ops ioc3_ops = {
- 	.tx_empty = ic3_tx_empty,
- 	.set_mctrl = ic3_set_mctrl,
- 	.get_mctrl = ic3_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/ioc4_serial.c linux-2.6.39.3/drivers/tty/serial/ioc4_serial.c
---- linux-2.6.39.3/drivers/tty/serial/ioc4_serial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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_
- 
- /* Associate the uart functions above - given to serial core */
- 
--static struct uart_ops ioc4_ops = {
-+static const struct uart_ops ioc4_ops = {
- 	.tx_empty	= ic4_tx_empty,
- 	.set_mctrl	= ic4_set_mctrl,
- 	.get_mctrl	= ic4_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/ip22zilog.c linux-2.6.39.3/drivers/tty/serial/ip22zilog.c
---- linux-2.6.39.3/drivers/tty/serial/ip22zilog.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/ip22zilog.c	2011-05-22 19:36:32.000000000 -0400
-@@ -928,7 +928,7 @@ static int ip22zilog_verify_port(struct 
- 	return -EINVAL;
- }
- 
--static struct uart_ops ip22zilog_pops = {
-+static const struct uart_ops ip22zilog_pops = {
- 	.tx_empty	=	ip22zilog_tx_empty,
- 	.set_mctrl	=	ip22zilog_set_mctrl,
- 	.get_mctrl	=	ip22zilog_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/kgdboc.c linux-2.6.39.3/drivers/tty/serial/kgdboc.c
---- linux-2.6.39.3/drivers/tty/serial/kgdboc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/kgdboc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -22,7 +22,7 @@
- 
- #define MAX_CONFIG_LEN		40
- 
--static struct kgdb_io		kgdboc_io_ops;
-+static struct kgdb_io	kgdboc_io_ops;	/* cannot be const, see configure_kgdboc() */
+ noconfig:
+@@ -212,7 +219,7 @@ noconfig:
+ static int __init init_kgdboc(void)
+ {
+ 	/* Already configured? */
+-	if (configured == 1)
++	if (configured >= 1)
+ 		return 0;
  
- /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
- static int configured		= -1;
-@@ -293,7 +293,7 @@ static void kgdboc_post_exp_handler(void
- 	kgdboc_restore_input();
- }
- 
--static struct kgdb_io kgdboc_io_ops = {
-+static struct kgdb_io kgdboc_io_ops = {	/* cannot be const, see configure_kgdboc() */
- 	.name			= "kgdboc",
- 	.read_char		= kgdboc_get_char,
- 	.write_char		= kgdboc_put_char,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/m32r_sio.c linux-2.6.39.3/drivers/tty/serial/m32r_sio.c
---- linux-2.6.39.3/drivers/tty/serial/m32r_sio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/m32r_sio.c	2011-05-22 19:36:32.000000000 -0400
-@@ -939,7 +939,7 @@ m32r_sio_type(struct uart_port *port)
- 	return uart_config[type].name;
- }
- 
--static struct uart_ops m32r_sio_pops = {
-+static const struct uart_ops m32r_sio_pops = {
- 	.tx_empty	= m32r_sio_tx_empty,
- 	.set_mctrl	= m32r_sio_set_mctrl,
- 	.get_mctrl	= m32r_sio_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/max3100.c linux-2.6.39.3/drivers/tty/serial/max3100.c
---- linux-2.6.39.3/drivers/tty/serial/max3100.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/max3100.c	2011-05-22 19:36:32.000000000 -0400
-@@ -710,7 +710,7 @@ static void max3100_break_ctl(struct uar
- 	dev_dbg(&s->spi->dev, "%s\n", __func__);
- }
- 
--static struct uart_ops max3100_ops = {
-+static const struct uart_ops max3100_ops = {
- 	.tx_empty	= max3100_tx_empty,
- 	.set_mctrl	= max3100_set_mctrl,
- 	.get_mctrl	= max3100_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/max3107.c linux-2.6.39.3/drivers/tty/serial/max3107.c
---- linux-2.6.39.3/drivers/tty/serial/max3107.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/max3107.c	2011-05-22 19:36:32.000000000 -0400
-@@ -910,7 +910,7 @@ static void max3107_break_ctl(struct uar
- 
- 
- /* Port functions */
--static struct uart_ops max3107_ops = {
-+static const struct uart_ops max3107_ops = {
- 	.tx_empty       = max3107_tx_empty,
- 	.set_mctrl      = max3107_set_mctrl,
- 	.get_mctrl      = max3107_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/mfd.c linux-2.6.39.3/drivers/tty/serial/mfd.c
---- linux-2.6.39.3/drivers/tty/serial/mfd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/mfd.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1178,7 +1178,7 @@ static struct console serial_hsu_console
- };
- #endif
+ 	return configure_kgdboc();
+@@ -261,7 +268,7 @@ static int param_set_kgdboc_var(const ch
+ 	if (config[len - 1] == '\n')
+ 		config[len - 1] = '\0';
  
--struct uart_ops serial_hsu_pops = {
-+const struct uart_ops serial_hsu_pops = {
- 	.tx_empty	= serial_hsu_tx_empty,
- 	.set_mctrl	= serial_hsu_set_mctrl,
- 	.get_mctrl	= serial_hsu_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/mpc52xx_uart.c linux-2.6.39.3/drivers/tty/serial/mpc52xx_uart.c
---- linux-2.6.39.3/drivers/tty/serial/mpc52xx_uart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct psc_ops mpc52xx_psc_ops = {
-+static const struct psc_ops mpc52xx_psc_ops = {
- 	.fifo_init = mpc52xx_psc_fifo_init,
- 	.raw_rx_rdy = mpc52xx_psc_raw_rx_rdy,
- 	.raw_tx_rdy = mpc52xx_psc_raw_tx_rdy,
-@@ -304,7 +304,7 @@ static struct psc_ops mpc52xx_psc_ops = 
- 	.handle_irq = mpc52xx_psc_handle_irq,
- };
+-	if (configured == 1)
++	if (configured >= 1)
+ 		cleanup_kgdboc();
  
--static struct psc_ops mpc5200b_psc_ops = {
-+static const struct psc_ops mpc5200b_psc_ops = {
- 	.fifo_init = mpc52xx_psc_fifo_init,
- 	.raw_rx_rdy = mpc52xx_psc_raw_rx_rdy,
- 	.raw_tx_rdy = mpc52xx_psc_raw_tx_rdy,
-@@ -571,7 +571,7 @@ static void mpc512x_psc_get_irq(struct u
- 	port->irq = psc_fifoc_irq;
- }
- 
--static struct psc_ops mpc512x_psc_ops = {
-+static const struct psc_ops mpc512x_psc_ops = {
- 	.fifo_init = mpc512x_psc_fifo_init,
- 	.raw_rx_rdy = mpc512x_psc_raw_rx_rdy,
- 	.raw_tx_rdy = mpc512x_psc_raw_tx_rdy,
-@@ -596,7 +596,7 @@ static struct psc_ops mpc512x_psc_ops = 
+ 	/* Go and configure with the new params. */
+@@ -301,6 +308,15 @@ static struct kgdb_io kgdboc_io_ops = {
+ 	.post_exception		= kgdboc_post_exp_handler,
  };
- #endif
- 
--static struct psc_ops *psc_ops;
-+static const struct psc_ops *psc_ops;
- 
- /* ======================================================================== */
- /* UART operations                                                          */
-@@ -905,7 +905,7 @@ mpc52xx_uart_verify_port(struct uart_por
- }
- 
  
--static struct uart_ops mpc52xx_uart_ops = {
-+static const struct uart_ops mpc52xx_uart_ops = {
- 	.tx_empty	= mpc52xx_uart_tx_empty,
- 	.set_mctrl	= mpc52xx_uart_set_mctrl,
- 	.get_mctrl	= mpc52xx_uart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/mpsc.c linux-2.6.39.3/drivers/tty/serial/mpsc.c
---- linux-2.6.39.3/drivers/tty/serial/mpsc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/mpsc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1663,7 +1663,7 @@ static void mpsc_put_poll_char(struct ua
- }
- #endif
- 
--static struct uart_ops mpsc_pops = {
-+static const struct uart_ops mpsc_pops = {
- 	.tx_empty	= mpsc_tx_empty,
- 	.set_mctrl	= mpsc_set_mctrl,
- 	.get_mctrl	= mpsc_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/mrst_max3110.c linux-2.6.39.3/drivers/tty/serial/mrst_max3110.c
---- linux-2.6.39.3/drivers/tty/serial/mrst_max3110.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/mrst_max3110.c	2011-05-22 19:36:32.000000000 -0400
++static struct kgdb_io kgdboc_io_ops_console = {
++	.name			= "kgdboc",
++	.read_char		= kgdboc_get_char,
++	.write_char		= kgdboc_put_char,
++	.pre_exception		= kgdboc_pre_exp_handler,
++	.post_exception		= kgdboc_post_exp_handler,
++	.is_console		= 1
++};
++
+ #ifdef CONFIG_KGDB_SERIAL_CONSOLE
+ /* This is only available if kgdboc is a built in for early debugging */
+ static int __init kgdboc_early_init(char *opt)
+diff -urNp linux-2.6.39.4/drivers/tty/serial/mrst_max3110.c linux-2.6.39.4/drivers/tty/serial/mrst_max3110.c
+--- linux-2.6.39.4/drivers/tty/serial/mrst_max3110.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/serial/mrst_max3110.c	2011-08-05 20:34:06.000000000 -0400
 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
  	int loop = 1, num, total = 0;
  	u8 recv_buf[512], *pbuf;
@@ -41679,506 +32981,21 @@ diff -urNp linux-2.6.39.3/drivers/tty/serial/mrst_max3110.c linux-2.6.39.3/drive
  	pbuf = recv_buf;
  	do {
  		num = max3110_read_multi(max, pbuf);
-@@ -726,7 +728,7 @@ static void serial_m3110_enable_ms(struc
- {
- }
- 
--struct uart_ops serial_m3110_ops = {
-+const struct uart_ops serial_m3110_ops = {
- 	.tx_empty	= serial_m3110_tx_empty,
- 	.set_mctrl	= serial_m3110_set_mctrl,
- 	.get_mctrl	= serial_m3110_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/msm_serial.c linux-2.6.39.3/drivers/tty/serial/msm_serial.c
---- linux-2.6.39.3/drivers/tty/serial/msm_serial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/msm_serial.c	2011-05-22 19:36:32.000000000 -0400
-@@ -702,7 +702,7 @@ static void msm_power(struct uart_port *
- 	}
- }
- 
--static struct uart_ops msm_uart_pops = {
-+static const struct uart_ops msm_uart_pops = {
- 	.tx_empty = msm_tx_empty,
- 	.set_mctrl = msm_set_mctrl,
- 	.get_mctrl = msm_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/msm_serial_hs.c linux-2.6.39.3/drivers/tty/serial/msm_serial_hs.c
---- linux-2.6.39.3/drivers/tty/serial/msm_serial_hs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/msm_serial_hs.c	2011-05-22 19:36:32.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;
- static struct uart_driver msm_hs_driver;
--static struct uart_ops msm_hs_ops;
-+static const struct uart_ops msm_hs_ops;
- static struct workqueue_struct *msm_hs_workqueue;
- 
- #define UARTDM_TO_MSM(uart_port) \
-@@ -1856,7 +1856,7 @@ static struct uart_driver msm_hs_driver 
- 	.cons = 0,
- };
- 
--static struct uart_ops msm_hs_ops = {
-+static const struct uart_ops msm_hs_ops = {
- 	.tx_empty = msm_hs_tx_empty,
- 	.set_mctrl = msm_hs_set_mctrl_locked,
- 	.get_mctrl = msm_hs_get_mctrl_locked,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/mux.c linux-2.6.39.3/drivers/tty/serial/mux.c
---- linux-2.6.39.3/drivers/tty/serial/mux.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/mux.c	2011-05-22 19:36:32.000000000 -0400
-@@ -442,7 +442,7 @@ static struct console mux_console = {
- #define MUX_CONSOLE	NULL
- #endif
- 
--static struct uart_ops mux_pops = {
-+static const struct uart_ops mux_pops = {
- 	.tx_empty =		mux_tx_empty,
- 	.set_mctrl =		mux_set_mctrl,
- 	.get_mctrl =		mux_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/mxs-auart.c linux-2.6.39.3/drivers/tty/serial/mxs-auart.c
---- linux-2.6.39.3/drivers/tty/serial/mxs-auart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/mxs-auart.c	2011-05-22 19:36:32.000000000 -0400
-@@ -499,7 +499,7 @@ static void mxs_auart_enable_ms(struct u
- 	/* just empty */
- }
- 
--static struct uart_ops mxs_auart_ops = {
-+static const struct uart_ops mxs_auart_ops = {
- 	.tx_empty       = mxs_auart_tx_empty,
- 	.start_tx       = mxs_auart_start_tx,
- 	.stop_tx	= mxs_auart_stop_tx,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/netx-serial.c linux-2.6.39.3/drivers/tty/serial/netx-serial.c
---- linux-2.6.39.3/drivers/tty/serial/netx-serial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct uart_ops netx_pops = {
-+static const struct uart_ops netx_pops = {
- 	.tx_empty	= netx_tx_empty,
- 	.set_mctrl	= netx_set_mctrl,
- 	.get_mctrl	= netx_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/nwpserial.c linux-2.6.39.3/drivers/tty/serial/nwpserial.c
---- linux-2.6.39.3/drivers/tty/serial/nwpserial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/nwpserial.c	2011-05-22 19:36:32.000000000 -0400
-@@ -303,7 +303,7 @@ static unsigned int nwpserial_tx_empty(s
- 	return ret & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
- }
- 
--static struct uart_ops nwpserial_pops = {
-+static const struct uart_ops nwpserial_pops = {
- 	.tx_empty     = nwpserial_tx_empty,
- 	.set_mctrl    = nwpserial_set_mctrl,
- 	.get_mctrl    = nwpserial_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/omap-serial.c linux-2.6.39.3/drivers/tty/serial/omap-serial.c
---- linux-2.6.39.3/drivers/tty/serial/omap-serial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- #endif
- 
--static struct uart_ops serial_omap_pops = {
-+static const struct uart_ops serial_omap_pops = {
- 	.tx_empty	= serial_omap_tx_empty,
- 	.set_mctrl	= serial_omap_set_mctrl,
- 	.get_mctrl	= serial_omap_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/pch_uart.c linux-2.6.39.3/drivers/tty/serial/pch_uart.c
---- linux-2.6.39.3/drivers/tty/serial/pch_uart.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/pch_uart.c	2011-07-09 09:19:18.000000000 -0400
-@@ -1351,7 +1351,7 @@ static int pch_uart_verify_port(struct u
- 	return 0;
- }
- 
--static struct uart_ops pch_uart_ops = {
-+static const struct uart_ops pch_uart_ops = {
- 	.tx_empty = pch_uart_tx_empty,
- 	.set_mctrl = pch_uart_set_mctrl,
- 	.get_mctrl = pch_uart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/pmac_zilog.c linux-2.6.39.3/drivers/tty/serial/pmac_zilog.c
---- linux-2.6.39.3/drivers/tty/serial/pmac_zilog.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/pmac_zilog.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1427,7 +1427,7 @@ static void pmz_poll_put_char(struct uar
- 
- #endif /* CONFIG_CONSOLE_POLL */
- 
--static struct uart_ops pmz_pops = {
-+static const struct uart_ops pmz_pops = {
- 	.tx_empty	=	pmz_tx_empty,
- 	.set_mctrl	=	pmz_set_mctrl,
- 	.get_mctrl	=	pmz_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/pnx8xxx_uart.c linux-2.6.39.3/drivers/tty/serial/pnx8xxx_uart.c
---- linux-2.6.39.3/drivers/tty/serial/pnx8xxx_uart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct uart_ops pnx8xxx_pops = {
-+static const struct uart_ops pnx8xxx_pops = {
- 	.tx_empty	= pnx8xxx_tx_empty,
- 	.set_mctrl	= pnx8xxx_set_mctrl,
- 	.get_mctrl	= pnx8xxx_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/pxa.c linux-2.6.39.3/drivers/tty/serial/pxa.c
---- linux-2.6.39.3/drivers/tty/serial/pxa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/pxa.c	2011-05-22 19:36:32.000000000 -0400
-@@ -706,7 +706,7 @@ static struct console serial_pxa_console
- #define PXA_CONSOLE	NULL
- #endif
- 
--struct uart_ops serial_pxa_pops = {
-+const struct uart_ops serial_pxa_pops = {
- 	.tx_empty	= serial_pxa_tx_empty,
- 	.set_mctrl	= serial_pxa_set_mctrl,
- 	.get_mctrl	= serial_pxa_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/sa1100.c linux-2.6.39.3/drivers/tty/serial/sa1100.c
---- linux-2.6.39.3/drivers/tty/serial/sa1100.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/sa1100.c	2011-05-22 19:36:32.000000000 -0400
-@@ -577,7 +577,7 @@ sa1100_verify_port(struct uart_port *por
- 	return ret;
- }
- 
--static struct uart_ops sa1100_pops = {
-+static const struct uart_ops sa1100_pops = {
- 	.tx_empty	= sa1100_tx_empty,
- 	.set_mctrl	= sa1100_set_mctrl,
- 	.get_mctrl	= sa1100_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/samsung.c linux-2.6.39.3/drivers/tty/serial/samsung.c
---- linux-2.6.39.3/drivers/tty/serial/samsung.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/samsung.c	2011-05-22 19:36:32.000000000 -0400
-@@ -860,7 +860,7 @@ static struct console s3c24xx_serial_con
- #define S3C24XX_SERIAL_CONSOLE NULL
- #endif
+diff -urNp linux-2.6.39.4/drivers/tty/tty_io.c linux-2.6.39.4/drivers/tty/tty_io.c
+--- linux-2.6.39.4/drivers/tty/tty_io.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/tty_io.c	2011-08-05 20:34:06.000000000 -0400
+@@ -3200,7 +3200,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
--static struct uart_ops s3c24xx_serial_ops = {
-+static const struct uart_ops s3c24xx_serial_ops = {
- 	.pm		= s3c24xx_serial_pm,
- 	.tx_empty	= s3c24xx_serial_tx_empty,
- 	.get_mctrl	= s3c24xx_serial_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/sc26xx.c linux-2.6.39.3/drivers/tty/serial/sc26xx.c
---- linux-2.6.39.3/drivers/tty/serial/sc26xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/sc26xx.c	2011-05-22 19:36:32.000000000 -0400
-@@ -515,7 +515,7 @@ static int sc26xx_verify_port(struct uar
- 	return -EINVAL;
- }
- 
--static struct uart_ops sc26xx_ops = {
-+static const struct uart_ops sc26xx_ops = {
- 	.tx_empty	= sc26xx_tx_empty,
- 	.set_mctrl	= sc26xx_set_mctrl,
- 	.get_mctrl	= sc26xx_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/serial_ks8695.c linux-2.6.39.3/drivers/tty/serial/serial_ks8695.c
---- linux-2.6.39.3/drivers/tty/serial/serial_ks8695.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/serial_ks8695.c	2011-05-22 19:36:32.000000000 -0400
-@@ -528,7 +528,7 @@ static int ks8695uart_verify_port(struct
- 	return ret;
- }
- 
--static struct uart_ops ks8695uart_pops = {
-+static const struct uart_ops ks8695uart_pops = {
- 	.tx_empty	= ks8695uart_tx_empty,
- 	.set_mctrl	= ks8695uart_set_mctrl,
- 	.get_mctrl	= ks8695uart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/serial_txx9.c linux-2.6.39.3/drivers/tty/serial/serial_txx9.c
---- linux-2.6.39.3/drivers/tty/serial/serial_txx9.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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";
- }
- 
--static struct uart_ops serial_txx9_pops = {
-+static const struct uart_ops serial_txx9_pops = {
- 	.tx_empty	= serial_txx9_tx_empty,
- 	.set_mctrl	= serial_txx9_set_mctrl,
- 	.get_mctrl	= serial_txx9_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/sn_console.c linux-2.6.39.3/drivers/tty/serial/sn_console.c
---- linux-2.6.39.3/drivers/tty/serial/sn_console.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/sn_console.c	2011-05-22 19:36:32.000000000 -0400
-@@ -388,7 +388,7 @@ static void snp_config_port(struct uart_
- 
- /* Associate the uart functions above - given to serial core */
- 
--static struct uart_ops sn_console_ops = {
-+static const struct uart_ops sn_console_ops = {
- 	.tx_empty = snp_tx_empty,
- 	.set_mctrl = snp_set_mctrl,
- 	.get_mctrl = snp_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/sunhv.c linux-2.6.39.3/drivers/tty/serial/sunhv.c
---- linux-2.6.39.3/drivers/tty/serial/sunhv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/sunhv.c	2011-05-22 19:36:32.000000000 -0400
-@@ -168,12 +168,12 @@ struct sunhv_ops {
- 	int (*receive_chars)(struct uart_port *port, struct tty_struct *tty);
- };
- 
--static struct sunhv_ops bychar_ops = {
-+static const struct sunhv_ops bychar_ops = {
- 	.transmit_chars = transmit_chars_putchar,
- 	.receive_chars = receive_chars_getchar,
- };
- 
--static struct sunhv_ops bywrite_ops = {
-+static const struct sunhv_ops bywrite_ops = {
- 	.transmit_chars = transmit_chars_write,
- 	.receive_chars = receive_chars_read,
- };
-@@ -370,7 +370,7 @@ static int sunhv_verify_port(struct uart
- 	return -EINVAL;
- }
- 
--static struct uart_ops sunhv_pops = {
-+static const struct uart_ops sunhv_pops = {
- 	.tx_empty	= sunhv_tx_empty,
- 	.set_mctrl	= sunhv_set_mctrl,
- 	.get_mctrl	= sunhv_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/sunsab.c linux-2.6.39.3/drivers/tty/serial/sunsab.c
---- linux-2.6.39.3/drivers/tty/serial/sunsab.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/sunsab.c	2011-05-22 19:36:32.000000000 -0400
-@@ -804,7 +804,7 @@ static int sunsab_verify_port(struct uar
- 	return -EINVAL;
- }
- 
--static struct uart_ops sunsab_pops = {
-+static const struct uart_ops sunsab_pops = {
- 	.tx_empty	= sunsab_tx_empty,
- 	.set_mctrl	= sunsab_set_mctrl,
- 	.get_mctrl	= sunsab_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/sunsu.c linux-2.6.39.3/drivers/tty/serial/sunsu.c
---- linux-2.6.39.3/drivers/tty/serial/sunsu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/sunsu.c	2011-05-22 19:36:32.000000000 -0400
-@@ -946,7 +946,7 @@ sunsu_type(struct uart_port *port)
- 	return uart_config[type].name;
- }
- 
--static struct uart_ops sunsu_pops = {
-+static const struct uart_ops sunsu_pops = {
- 	.tx_empty	= sunsu_tx_empty,
- 	.set_mctrl	= sunsu_set_mctrl,
- 	.get_mctrl	= sunsu_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/sunzilog.c linux-2.6.39.3/drivers/tty/serial/sunzilog.c
---- linux-2.6.39.3/drivers/tty/serial/sunzilog.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/sunzilog.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1042,7 +1042,7 @@ static void sunzilog_put_poll_char(struc
- }
- #endif /* CONFIG_CONSOLE_POLL */
- 
--static struct uart_ops sunzilog_pops = {
-+static const struct uart_ops sunzilog_pops = {
- 	.tx_empty	=	sunzilog_tx_empty,
- 	.set_mctrl	=	sunzilog_set_mctrl,
- 	.get_mctrl	=	sunzilog_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/timbuart.c linux-2.6.39.3/drivers/tty/serial/timbuart.c
---- linux-2.6.39.3/drivers/tty/serial/timbuart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/timbuart.c	2011-05-22 19:36:32.000000000 -0400
-@@ -394,7 +394,7 @@ static int timbuart_verify_port(struct u
- 	return -EINVAL;
- }
- 
--static struct uart_ops timbuart_ops = {
-+static const struct uart_ops timbuart_ops = {
- 	.tx_empty = timbuart_tx_empty,
- 	.set_mctrl = timbuart_set_mctrl,
- 	.get_mctrl = timbuart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/uartlite.c linux-2.6.39.3/drivers/tty/serial/uartlite.c
---- linux-2.6.39.3/drivers/tty/serial/uartlite.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/uartlite.c	2011-05-22 19:36:32.000000000 -0400
-@@ -331,7 +331,7 @@ static void ulite_put_poll_char(struct u
- }
- #endif
- 
--static struct uart_ops ulite_ops = {
-+static const struct uart_ops ulite_ops = {
- 	.tx_empty	= ulite_tx_empty,
- 	.set_mctrl	= ulite_set_mctrl,
- 	.get_mctrl	= ulite_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/ucc_uart.c linux-2.6.39.3/drivers/tty/serial/ucc_uart.c
---- linux-2.6.39.3/drivers/tty/serial/ucc_uart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/ucc_uart.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1088,7 +1088,7 @@ static int qe_uart_verify_port(struct ua
-  *
-  * Details on these functions can be found in Documentation/serial/driver
-  */
--static struct uart_ops qe_uart_pops = {
-+static const struct uart_ops qe_uart_pops = {
- 	.tx_empty       = qe_uart_tx_empty,
- 	.set_mctrl      = qe_uart_set_mctrl,
- 	.get_mctrl      = qe_uart_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/vr41xx_siu.c linux-2.6.39.3/drivers/tty/serial/vr41xx_siu.c
---- linux-2.6.39.3/drivers/tty/serial/vr41xx_siu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/vr41xx_siu.c	2011-05-22 19:36:32.000000000 -0400
-@@ -683,7 +683,7 @@ static int siu_verify_port(struct uart_p
- 	return 0;
- }
- 
--static struct uart_ops siu_uart_ops = {
-+static const struct uart_ops siu_uart_ops = {
- 	.tx_empty	= siu_tx_empty,
- 	.set_mctrl	= siu_set_mctrl,
- 	.get_mctrl	= siu_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/vt8500_serial.c linux-2.6.39.3/drivers/tty/serial/vt8500_serial.c
---- linux-2.6.39.3/drivers/tty/serial/vt8500_serial.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/serial/vt8500_serial.c	2011-05-22 19:36:32.000000000 -0400
-@@ -519,7 +519,7 @@ static struct console vt8500_console = {
- #define VT8500_CONSOLE	NULL
- #endif
- 
--static struct uart_ops vt8500_uart_pops = {
-+static const struct uart_ops vt8500_uart_pops = {
- 	.tx_empty	= vt8500_tx_empty,
- 	.set_mctrl	= vt8500_set_mctrl,
- 	.get_mctrl	= vt8500_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/serial/zs.c linux-2.6.39.3/drivers/tty/serial/zs.c
---- linux-2.6.39.3/drivers/tty/serial/zs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- 
--static struct uart_ops zs_ops = {
-+static const struct uart_ops zs_ops = {
- 	.tx_empty	= zs_tx_empty,
- 	.set_mctrl	= zs_set_mctrl,
- 	.get_mctrl	= zs_get_mctrl,
-diff -urNp linux-2.6.39.3/drivers/tty/tty_io.c linux-2.6.39.3/drivers/tty/tty_io.c
---- linux-2.6.39.3/drivers/tty/tty_io.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/tty_io.c	2011-05-22 19:36:32.000000000 -0400
-@@ -139,21 +139,11 @@ EXPORT_SYMBOL(tty_mutex);
- /* Spinlock to protect the tty->tty_files list */
- DEFINE_SPINLOCK(tty_files_lock);
- 
--static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
--static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
- ssize_t redirected_tty_write(struct file *, const char __user *,
- 							size_t, loff_t *);
--static unsigned int tty_poll(struct file *, poll_table *);
- static int tty_open(struct inode *, struct file *);
- long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
--#ifdef CONFIG_COMPAT
--static long tty_compat_ioctl(struct file *file, unsigned int cmd,
--				unsigned long arg);
--#else
--#define tty_compat_ioctl NULL
--#endif
- static int __tty_fasync(int fd, struct file *filp, int on);
--static int tty_fasync(int fd, struct file *filp, int on);
- static void release_tty(struct tty_struct *tty, int idx);
- static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
- static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-@@ -937,7 +927,7 @@ EXPORT_SYMBOL(start_tty);
-  *	read calls may be outstanding in parallel.
-  */
- 
--static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
-+ssize_t tty_read(struct file *file, char __user *buf, size_t count,
- 			loff_t *ppos)
+ void tty_default_fops(struct file_operations *fops)
  {
- 	int i;
-@@ -963,6 +953,8 @@ static ssize_t tty_read(struct file *fil
- 	return i;
- }
- 
-+EXPORT_SYMBOL(tty_read);
-+
- void tty_write_unlock(struct tty_struct *tty)
- {
- 	mutex_unlock(&tty->atomic_write_lock);
-@@ -1112,7 +1104,7 @@ void tty_write_message(struct tty_struct
-  *	write method will not be invoked in parallel for each device.
-  */
- 
--static ssize_t tty_write(struct file *file, const char __user *buf,
-+ssize_t tty_write(struct file *file, const char __user *buf,
- 						size_t count, loff_t *ppos)
- {
- 	struct inode *inode = file->f_path.dentry->d_inode;
-@@ -1138,6 +1130,8 @@ static ssize_t tty_write(struct file *fi
- 	return ret;
- }
- 
-+EXPORT_SYMBOL(tty_write);
-+
- ssize_t redirected_tty_write(struct file *file, const char __user *buf,
- 						size_t count, loff_t *ppos)
- {
-@@ -1777,6 +1771,8 @@ int tty_release(struct inode *inode, str
- 	return 0;
- }
- 
-+EXPORT_SYMBOL(tty_release);
-+
- /**
-  *	tty_open		-	open a tty device
-  *	@inode: inode of device file
-@@ -1968,7 +1964,7 @@ got_driver:
-  *	may be re-entered freely by other callers.
-  */
- 
--static unsigned int tty_poll(struct file *filp, poll_table *wait)
-+unsigned int tty_poll(struct file *filp, poll_table *wait)
- {
- 	struct tty_struct *tty = file_tty(filp);
- 	struct tty_ldisc *ld;
-@@ -1984,6 +1980,8 @@ static unsigned int tty_poll(struct file
- 	return ret;
- }
- 
-+EXPORT_SYMBOL(tty_poll);
-+
- static int __tty_fasync(int fd, struct file *filp, int on)
- {
- 	struct tty_struct *tty = file_tty(filp);
-@@ -2025,7 +2023,7 @@ out:
- 	return retval;
- }
- 
--static int tty_fasync(int fd, struct file *filp, int on)
-+int tty_fasync(int fd, struct file *filp, int on)
- {
- 	int retval;
- 	tty_lock();
-@@ -2034,6 +2032,8 @@ static int tty_fasync(int fd, struct fil
- 	return retval;
- }
- 
-+EXPORT_SYMBOL(tty_fasync);
-+
- /**
-  *	tiocsti			-	fake input character
-  *	@tty: tty to fake input into
-@@ -2695,8 +2695,10 @@ long tty_ioctl(struct file *file, unsign
- 	return retval;
- }
- 
-+EXPORT_SYMBOL(tty_ioctl);
-+
- #ifdef CONFIG_COMPAT
--static long tty_compat_ioctl(struct file *file, unsigned int cmd,
-+long tty_compat_ioctl(struct file *file, unsigned int cmd,
- 				unsigned long arg)
- {
- 	struct inode *inode = file->f_dentry->d_inode;
-@@ -2720,6 +2722,9 @@ static long tty_compat_ioctl(struct file
- 
- 	return retval;
+-	*fops = tty_fops;
++	memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
  }
-+
-+EXPORT_SYMBOL(tty_compat_ioctl);
-+
- #endif
  
  /*
-@@ -3198,11 +3203,6 @@ struct tty_struct *get_current_tty(void)
- }
- EXPORT_SYMBOL_GPL(get_current_tty);
- 
--void tty_default_fops(struct file_operations *fops)
--{
--	*fops = tty_fops;
--}
--
- /*
-  * 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.3/drivers/tty/tty_ldisc.c linux-2.6.39.3/drivers/tty/tty_ldisc.c
---- linux-2.6.39.3/drivers/tty/tty_ldisc.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/tty_ldisc.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/tty_ldisc.c linux-2.6.39.4/drivers/tty/tty_ldisc.c
+--- linux-2.6.39.4/drivers/tty/tty_ldisc.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/tty_ldisc.c	2011-08-05 19:44:37.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 = ld->ops;
@@ -42224,9 +33041,9 @@ diff -urNp linux-2.6.39.3/drivers/tty/tty_ldisc.c linux-2.6.39.3/drivers/tty/tty
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-2.6.39.3/drivers/tty/vt/keyboard.c linux-2.6.39.3/drivers/tty/vt/keyboard.c
---- linux-2.6.39.3/drivers/tty/vt/keyboard.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/vt/keyboard.c	2011-05-22 20:32:43.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/vt/keyboard.c linux-2.6.39.4/drivers/tty/vt/keyboard.c
+--- linux-2.6.39.4/drivers/tty/vt/keyboard.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/vt/keyboard.c	2011-08-05 19:44:37.000000000 -0400
 @@ -658,6 +658,16 @@ static void k_spec(struct vc_data *vc, u
  	     kbd->kbdmode == VC_OFF) &&
  	     value != KVAL(K_SAK))
@@ -42244,9 +33061,9 @@ diff -urNp linux-2.6.39.3/drivers/tty/vt/keyboard.c linux-2.6.39.3/drivers/tty/v
  	fn_handler[value](vc);
  }
  
-diff -urNp linux-2.6.39.3/drivers/tty/vt/vt.c linux-2.6.39.3/drivers/tty/vt/vt.c
---- linux-2.6.39.3/drivers/tty/vt/vt.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/vt/vt.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/vt/vt.c linux-2.6.39.4/drivers/tty/vt/vt.c
+--- linux-2.6.39.4/drivers/tty/vt/vt.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/vt/vt.c	2011-08-05 19:44:37.000000000 -0400
 @@ -261,7 +261,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -42256,9 +33073,9 @@ diff -urNp linux-2.6.39.3/drivers/tty/vt/vt.c linux-2.6.39.3/drivers/tty/vt/vt.c
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-2.6.39.3/drivers/tty/vt/vt_ioctl.c linux-2.6.39.3/drivers/tty/vt/vt_ioctl.c
---- linux-2.6.39.3/drivers/tty/vt/vt_ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/tty/vt/vt_ioctl.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/tty/vt/vt_ioctl.c linux-2.6.39.4/drivers/tty/vt/vt_ioctl.c
+--- linux-2.6.39.4/drivers/tty/vt/vt_ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/tty/vt/vt_ioctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -209,9 +209,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
@@ -42299,9 +33116,9 @@ diff -urNp linux-2.6.39.3/drivers/tty/vt/vt_ioctl.c linux-2.6.39.3/drivers/tty/v
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff -urNp linux-2.6.39.3/drivers/uio/uio.c linux-2.6.39.3/drivers/uio/uio.c
---- linux-2.6.39.3/drivers/uio/uio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/uio/uio.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/uio/uio.c linux-2.6.39.4/drivers/uio/uio.c
+--- linux-2.6.39.4/drivers/uio/uio.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/uio/uio.c	2011-08-05 19:44:37.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -42393,9 +33210,9 @@ diff -urNp linux-2.6.39.3/drivers/uio/uio.c linux-2.6.39.3/drivers/uio/uio.c
  
  	ret = uio_get_minor(idev);
  	if (ret)
-diff -urNp linux-2.6.39.3/drivers/usb/atm/cxacru.c linux-2.6.39.3/drivers/usb/atm/cxacru.c
---- linux-2.6.39.3/drivers/usb/atm/cxacru.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/atm/cxacru.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/usb/atm/cxacru.c linux-2.6.39.4/drivers/usb/atm/cxacru.c
+--- linux-2.6.39.4/drivers/usb/atm/cxacru.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/atm/cxacru.c	2011-08-05 19:44:37.000000000 -0400
 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
  		ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
  		if (ret < 2)
@@ -42405,9 +33222,9 @@ diff -urNp linux-2.6.39.3/drivers/usb/atm/cxacru.c linux-2.6.39.3/drivers/usb/at
  			return -EINVAL;
  		pos += tmp;
  
-diff -urNp linux-2.6.39.3/drivers/usb/atm/usbatm.c linux-2.6.39.3/drivers/usb/atm/usbatm.c
---- linux-2.6.39.3/drivers/usb/atm/usbatm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/atm/usbatm.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/usb/atm/usbatm.c linux-2.6.39.4/drivers/usb/atm/usbatm.c
+--- linux-2.6.39.4/drivers/usb/atm/usbatm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/atm/usbatm.c	2011-08-05 19:44:37.000000000 -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",
@@ -42487,9 +33304,9 @@ diff -urNp linux-2.6.39.3/drivers/usb/atm/usbatm.c linux-2.6.39.3/drivers/usb/at
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-2.6.39.3/drivers/usb/core/devices.c linux-2.6.39.3/drivers/usb/core/devices.c
---- linux-2.6.39.3/drivers/usb/core/devices.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/core/devices.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/usb/core/devices.c linux-2.6.39.4/drivers/usb/core/devices.c
+--- linux-2.6.39.4/drivers/usb/core/devices.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/core/devices.c	2011-08-05 19:44:37.000000000 -0400
 @@ -126,7 +126,7 @@ static const char *format_endpt =
   * time it gets called.
   */
@@ -42517,30 +33334,9 @@ diff -urNp linux-2.6.39.3/drivers/usb/core/devices.c linux-2.6.39.3/drivers/usb/
  	if (file->f_version != event_count) {
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
-diff -urNp linux-2.6.39.3/drivers/usb/core/hcd.c linux-2.6.39.3/drivers/usb/core/hcd.c
---- linux-2.6.39.3/drivers/usb/core/hcd.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/core/hcd.c	2011-06-03 00:32:07.000000000 -0400
-@@ -2574,7 +2574,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
- 
- #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
- 
--struct usb_mon_operations *mon_ops;
-+const struct usb_mon_operations *mon_ops;
- 
- /*
-  * The registration is unlocked.
-@@ -2584,7 +2584,7 @@ struct usb_mon_operations *mon_ops;
-  * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
-  */
-  
--int usb_mon_register (struct usb_mon_operations *ops)
-+int usb_mon_register (const struct usb_mon_operations *ops)
- {
- 
- 	if (mon_ops)
-diff -urNp linux-2.6.39.3/drivers/usb/core/message.c linux-2.6.39.3/drivers/usb/core/message.c
---- linux-2.6.39.3/drivers/usb/core/message.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/core/message.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/usb/core/message.c linux-2.6.39.4/drivers/usb/core/message.c
+--- linux-2.6.39.4/drivers/usb/core/message.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/core/message.c	2011-08-05 19:44:37.000000000 -0400
 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
@@ -42552,261 +33348,49 @@ diff -urNp linux-2.6.39.3/drivers/usb/core/message.c linux-2.6.39.3/drivers/usb/
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.39.3/drivers/usb/early/ehci-dbgp.c linux-2.6.39.3/drivers/usb/early/ehci-dbgp.c
---- linux-2.6.39.3/drivers/usb/early/ehci-dbgp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/early/ehci-dbgp.c	2011-05-22 19:36:32.000000000 -0400
-@@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x,
- }
+diff -urNp linux-2.6.39.4/drivers/usb/early/ehci-dbgp.c linux-2.6.39.4/drivers/usb/early/ehci-dbgp.c
+--- linux-2.6.39.4/drivers/usb/early/ehci-dbgp.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/early/ehci-dbgp.c	2011-08-05 20:34:06.000000000 -0400
+@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
  
  #ifdef CONFIG_KGDB
--static struct kgdb_io kgdbdbgp_io_ops;
-+static struct kgdb_io kgdbdbgp_io_ops;	/* cannot be const, see kgdbdbgp_parse_config */
- #define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
+ static struct kgdb_io kgdbdbgp_io_ops;
+-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
++static struct kgdb_io kgdbdbgp_io_ops_console;
++#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
  #else
  #define dbgp_kgdb_mode (0)
-@@ -1026,7 +1026,7 @@ static void kgdbdbgp_write_char(u8 chr)
- 	early_dbgp_write(NULL, &chr, 1);
- }
- 
--static struct kgdb_io kgdbdbgp_io_ops = {
-+static struct kgdb_io kgdbdbgp_io_ops = {	/* cannot be const, see kgdbdbgp_parse_config() */
- 	.name = "kgdbdbgp",
- 	.read_char = kgdbdbgp_read_char,
+ #endif
+@@ -1032,6 +1033,13 @@ static struct kgdb_io kgdbdbgp_io_ops = 
  	.write_char = kgdbdbgp_write_char,
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/fsl_qe_udc.c linux-2.6.39.3/drivers/usb/gadget/fsl_qe_udc.c
---- linux-2.6.39.3/drivers/usb/gadget/fsl_qe_udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/fsl_qe_udc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1859,7 +1859,7 @@ out:
- 	return status;
- }
- 
--static struct usb_ep_ops qe_ep_ops = {
-+static const struct usb_ep_ops qe_ep_ops = {
- 	.enable = qe_ep_enable,
- 	.disable = qe_ep_disable,
- 
-@@ -1928,7 +1928,7 @@ static int qe_pullup(struct usb_gadget *
- }
- 
- /* defined in usb_gadget.h */
--static struct usb_gadget_ops qe_gadget_ops = {
-+static const struct usb_gadget_ops qe_gadget_ops = {
- 	.get_frame = qe_get_frame,
- 	.wakeup = qe_wakeup,
- /*	.set_selfpowered = qe_set_selfpowered,*/ /* always selfpowered */
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/fsl_udc_core.c linux-2.6.39.3/drivers/usb/gadget/fsl_udc_core.c
---- linux-2.6.39.3/drivers/usb/gadget/fsl_udc_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct usb_ep_ops fsl_ep_ops = {
-+static const struct usb_ep_ops fsl_ep_ops = {
- 	.enable = fsl_ep_enable,
- 	.disable = fsl_ep_disable,
- 
-@@ -1114,7 +1114,7 @@ static int fsl_pullup(struct usb_gadget 
- }
- 
- /* defined in gadget.h */
--static struct usb_gadget_ops fsl_gadget_ops = {
-+static const struct usb_gadget_ops fsl_gadget_ops = {
- 	.get_frame = fsl_get_frame,
- 	.wakeup = fsl_wakeup,
- /*	.set_selfpowered = fsl_set_selfpowered,	*/ /* Always selfpowered */
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/fusb300_udc.c linux-2.6.39.3/drivers/usb/gadget/fusb300_udc.c
---- linux-2.6.39.3/drivers/usb/gadget/fusb300_udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- {
- }
- 
--static struct usb_ep_ops fusb300_ep_ops = {
-+static const struct usb_ep_ops fusb300_ep_ops = {
- 	.enable		= fusb300_enable,
- 	.disable	= fusb300_disable,
- 
-@@ -1570,7 +1570,7 @@ static int fusb300_udc_pullup(struct usb
- 	return 0;
- }
- 
--static struct usb_gadget_ops fusb300_gadget_ops = {
-+static const struct usb_gadget_ops fusb300_gadget_ops = {
- 	.pullup		= fusb300_udc_pullup,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/goku_udc.c linux-2.6.39.3/drivers/usb/gadget/goku_udc.c
---- linux-2.6.39.3/drivers/usb/gadget/goku_udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/goku_udc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -973,7 +973,7 @@ static void goku_fifo_flush(struct usb_e
- 		command(regs, COMMAND_FIFO_CLEAR, ep->num);
- }
- 
--static struct usb_ep_ops goku_ep_ops = {
-+static const struct usb_ep_ops goku_ep_ops = {
- 	.enable		= goku_ep_enable,
- 	.disable	= goku_ep_disable,
- 
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/imx_udc.c linux-2.6.39.3/drivers/usb/gadget/imx_udc.c
---- linux-2.6.39.3/drivers/usb/gadget/imx_udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/imx_udc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -937,7 +937,7 @@ static void imx_ep_fifo_flush(struct usb
- 	local_irq_restore(flags);
- }
- 
--static struct usb_ep_ops imx_ep_ops = {
-+static const struct usb_ep_ops imx_ep_ops = {
- 	.enable		= imx_ep_enable,
- 	.disable	= imx_ep_disable,
- 
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/m66592-udc.c linux-2.6.39.3/drivers/usb/gadget/m66592-udc.c
---- linux-2.6.39.3/drivers/usb/gadget/m66592-udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/m66592-udc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1437,7 +1437,7 @@ static void m66592_fifo_flush(struct usb
- 	spin_unlock_irqrestore(&ep->m66592->lock, flags);
- }
- 
--static struct usb_ep_ops m66592_ep_ops = {
-+static const struct usb_ep_ops m66592_ep_ops = {
- 	.enable		= m66592_enable,
- 	.disable	= m66592_disable,
- 
-@@ -1542,7 +1542,7 @@ static int m66592_get_frame(struct usb_g
- 	return m66592_read(m66592, M66592_FRMNUM) & 0x03FF;
- }
- 
--static struct usb_gadget_ops m66592_gadget_ops = {
-+static const struct usb_gadget_ops m66592_gadget_ops = {
- 	.get_frame		= m66592_get_frame,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/mv_udc_core.c linux-2.6.39.3/drivers/usb/gadget/mv_udc_core.c
---- linux-2.6.39.3/drivers/usb/gadget/mv_udc_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct usb_ep_ops mv_ep_ops = {
-+static const struct usb_ep_ops mv_ep_ops = {
- 	.enable		= mv_ep_enable,
- 	.disable	= mv_ep_disable,
- 
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/omap_udc.c linux-2.6.39.3/drivers/usb/gadget/omap_udc.c
---- linux-2.6.39.3/drivers/usb/gadget/omap_udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/omap_udc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1177,7 +1177,7 @@ done:
- 	return status;
- }
- 
--static struct usb_ep_ops omap_ep_ops = {
-+static const struct usb_ep_ops omap_ep_ops = {
- 	.enable		= omap_ep_enable,
- 	.disable	= omap_ep_disable,
- 
-@@ -1374,7 +1374,7 @@ static int omap_pullup(struct usb_gadget
- 	return 0;
- }
- 
--static struct usb_gadget_ops omap_gadget_ops = {
-+static const struct usb_gadget_ops omap_gadget_ops = {
- 	.get_frame		= omap_get_frame,
- 	.wakeup			= omap_wakeup,
- 	.set_selfpowered	= omap_set_selfpowered,
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/pxa25x_udc.c linux-2.6.39.3/drivers/usb/gadget/pxa25x_udc.c
---- linux-2.6.39.3/drivers/usb/gadget/pxa25x_udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/pxa25x_udc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -896,7 +896,7 @@ static void pxa25x_ep_fifo_flush(struct 
- }
- 
- 
--static struct usb_ep_ops pxa25x_ep_ops = {
-+static const struct usb_ep_ops pxa25x_ep_ops = {
- 	.enable		= pxa25x_ep_enable,
- 	.disable	= pxa25x_ep_disable,
- 
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/pxa27x_udc.c linux-2.6.39.3/drivers/usb/gadget/pxa27x_udc.c
---- linux-2.6.39.3/drivers/usb/gadget/pxa27x_udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/pxa27x_udc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1491,7 +1491,7 @@ static int pxa_ep_disable(struct usb_ep 
- 	return 0;
- }
- 
--static struct usb_ep_ops pxa_ep_ops = {
-+static const struct usb_ep_ops pxa_ep_ops = {
- 	.enable		= pxa_ep_enable,
- 	.disable	= pxa_ep_disable,
- 
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/r8a66597-udc.c linux-2.6.39.3/drivers/usb/gadget/r8a66597-udc.c
---- linux-2.6.39.3/drivers/usb/gadget/r8a66597-udc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct usb_ep_ops r8a66597_ep_ops = {
-+static const struct usb_ep_ops r8a66597_ep_ops = {
- 	.enable		= r8a66597_enable,
- 	.disable	= r8a66597_disable,
- 
-@@ -1497,7 +1497,7 @@ static int r8a66597_get_frame(struct usb
- 	return r8a66597_read(r8a66597, FRMNUM) & 0x03FF;
- }
- 
--static struct usb_gadget_ops r8a66597_gadget_ops = {
-+static const struct usb_gadget_ops r8a66597_gadget_ops = {
- 	.get_frame		= r8a66597_get_frame,
  };
  
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/s3c-hsotg.c linux-2.6.39.3/drivers/usb/gadget/s3c-hsotg.c
---- linux-2.6.39.3/drivers/usb/gadget/s3c-hsotg.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/s3c-hsotg.c	2011-05-22 19:36:32.000000000 -0400
-@@ -2461,7 +2461,7 @@ static int s3c_hsotg_ep_sethalt(struct u
- 	return 0;
- }
- 
--static struct usb_ep_ops s3c_hsotg_ep_ops = {
-+static const struct usb_ep_ops s3c_hsotg_ep_ops = {
- 	.enable		= s3c_hsotg_ep_enable,
- 	.disable	= s3c_hsotg_ep_disable,
- 	.alloc_request	= s3c_hsotg_ep_alloc_request,
-@@ -2725,7 +2725,7 @@ static int s3c_hsotg_gadget_getframe(str
- 	return s3c_hsotg_read_frameno(to_hsotg(gadget));
- }
- 
--static struct usb_gadget_ops s3c_hsotg_gadget_ops = {
-+static const struct usb_gadget_ops s3c_hsotg_gadget_ops = {
- 	.get_frame	= s3c_hsotg_gadget_getframe,
- };
++static struct kgdb_io kgdbdbgp_io_ops_console = {
++	.name = "kgdbdbgp",
++	.read_char = kgdbdbgp_read_char,
++	.write_char = kgdbdbgp_write_char,
++	.is_console = 1
++};
++
+ static int kgdbdbgp_wait_time;
  
-diff -urNp linux-2.6.39.3/drivers/usb/gadget/uvc_queue.c linux-2.6.39.3/drivers/usb/gadget/uvc_queue.c
---- linux-2.6.39.3/drivers/usb/gadget/uvc_queue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/gadget/uvc_queue.c	2011-05-22 19:36:32.000000000 -0400
-@@ -400,7 +400,7 @@ static void uvc_vm_close(struct vm_area_
- 	buffer->vma_use_count--;
- }
+ static int __init kgdbdbgp_parse_config(char *str)
+@@ -1047,8 +1055,10 @@ static int __init kgdbdbgp_parse_config(
+ 		ptr++;
+ 		kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
+ 	}
+-	kgdb_register_io_module(&kgdbdbgp_io_ops);
+-	kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
++	if (early_dbgp_console.index != -1)
++		kgdb_register_io_module(&kgdbdbgp_io_ops_console);
++	else
++		kgdb_register_io_module(&kgdbdbgp_io_ops);
  
--static struct vm_operations_struct uvc_vm_ops = {
-+static const struct vm_operations_struct uvc_vm_ops = {
- 	.open		= uvc_vm_open,
- 	.close		= uvc_vm_close,
- };
-diff -urNp linux-2.6.39.3/drivers/usb/host/ehci-fsl.c linux-2.6.39.3/drivers/usb/host/ehci-fsl.c
---- linux-2.6.39.3/drivers/usb/host/ehci-fsl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/host/ehci-fsl.c	2011-05-22 19:36:32.000000000 -0400
-@@ -380,7 +380,7 @@ static int ehci_fsl_drv_restore(struct d
  	return 0;
  }
- 
--static struct dev_pm_ops ehci_fsl_pm_ops = {
-+static const struct dev_pm_ops ehci_fsl_pm_ops = {
- 	.suspend = ehci_fsl_drv_suspend,
- 	.resume = ehci_fsl_drv_resume,
- 	.restore = ehci_fsl_drv_restore,
-diff -urNp linux-2.6.39.3/drivers/usb/host/xhci-mem.c linux-2.6.39.3/drivers/usb/host/xhci-mem.c
---- linux-2.6.39.3/drivers/usb/host/xhci-mem.c	2011-06-25 12:55:23.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/host/xhci-mem.c	2011-06-25 13:00:26.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/usb/host/xhci-mem.c linux-2.6.39.4/drivers/usb/host/xhci-mem.c
+--- linux-2.6.39.4/drivers/usb/host/xhci-mem.c	2011-06-25 12:55:23.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/host/xhci-mem.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1680,6 +1680,8 @@ static int xhci_check_trb_in_td_math(str
  	unsigned int num_tests;
  	int i, ret;
@@ -42816,94 +33400,9 @@ diff -urNp linux-2.6.39.3/drivers/usb/host/xhci-mem.c linux-2.6.39.3/drivers/usb
  	num_tests = ARRAY_SIZE(simple_test_vector);
  	for (i = 0; i < num_tests; i++) {
  		ret = xhci_test_trb_in_td(xhci,
-diff -urNp linux-2.6.39.3/drivers/usb/mon/mon_main.c linux-2.6.39.3/drivers/usb/mon/mon_main.c
---- linux-2.6.39.3/drivers/usb/mon/mon_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/mon/mon_main.c	2011-05-22 19:36:32.000000000 -0400
-@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
- /*
-  * Ops
-  */
--static struct usb_mon_operations mon_ops_0 = {
-+static const struct usb_mon_operations mon_ops_0 = {
- 	.urb_submit =	mon_submit,
- 	.urb_submit_error = mon_submit_error,
- 	.urb_complete =	mon_complete,
-diff -urNp linux-2.6.39.3/drivers/usb/musb/cppi_dma.h linux-2.6.39.3/drivers/usb/musb/cppi_dma.h
---- linux-2.6.39.3/drivers/usb/musb/cppi_dma.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/musb/cppi_dma.h	2011-05-22 19:36:32.000000000 -0400
-@@ -113,7 +113,7 @@ struct cppi_channel {
- 
- /* CPPI DMA controller object */
- struct cppi {
--	struct dma_controller		controller;
-+	const struct dma_controller controller;
- 	struct musb			*musb;
- 	void __iomem			*mregs;		/* Mentor regs */
- 	void __iomem			*tibase;	/* TI/CPPI regs */
-diff -urNp linux-2.6.39.3/drivers/usb/otg/msm_otg.c linux-2.6.39.3/drivers/usb/otg/msm_otg.c
---- linux-2.6.39.3/drivers/usb/otg/msm_otg.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/otg/msm_otg.c	2011-05-22 19:36:32.000000000 -0400
-@@ -95,7 +95,7 @@ static int ulpi_write(struct otg_transce
- 	return 0;
- }
- 
--static struct otg_io_access_ops msm_otg_io_ops = {
-+static const struct otg_io_access_ops msm_otg_io_ops = {
- 	.read = ulpi_read,
- 	.write = ulpi_write,
- };
-diff -urNp linux-2.6.39.3/drivers/usb/otg/ulpi_viewport.c linux-2.6.39.3/drivers/usb/otg/ulpi_viewport.c
---- linux-2.6.39.3/drivers/usb/otg/ulpi_viewport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/otg/ulpi_viewport.c	2011-05-22 19:36:32.000000000 -0400
-@@ -74,7 +74,7 @@ static int ulpi_viewport_write(struct ot
- 	return ulpi_viewport_wait(view, ULPI_VIEW_RUN);
- }
- 
--struct otg_io_access_ops ulpi_viewport_access_ops = {
-+const struct otg_io_access_ops ulpi_viewport_access_ops = {
- 	.read	= ulpi_viewport_read,
- 	.write	= ulpi_viewport_write,
- };
-diff -urNp linux-2.6.39.3/drivers/usb/serial/ftdi_sio.c linux-2.6.39.3/drivers/usb/serial/ftdi_sio.c
---- linux-2.6.39.3/drivers/usb/serial/ftdi_sio.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/serial/ftdi_sio.c	2011-07-09 09:19:18.000000000 -0400
-@@ -104,27 +104,27 @@ static int   ftdi_stmclite_probe(struct 
- static void  ftdi_USB_UIRT_setup(struct ftdi_private *priv);
- static void  ftdi_HE_TIRA1_setup(struct ftdi_private *priv);
- 
--static struct ftdi_sio_quirk ftdi_jtag_quirk = {
-+static const struct ftdi_sio_quirk ftdi_jtag_quirk = {
- 	.probe	= ftdi_jtag_probe,
- };
- 
--static struct ftdi_sio_quirk ftdi_mtxorb_hack_quirk = {
-+static const struct ftdi_sio_quirk ftdi_mtxorb_hack_quirk = {
- 	.probe  = ftdi_mtxorb_hack_setup,
- };
- 
--static struct ftdi_sio_quirk ftdi_NDI_device_quirk = {
-+static const struct ftdi_sio_quirk ftdi_NDI_device_quirk = {
- 	.probe	= ftdi_NDI_device_setup,
- };
- 
--static struct ftdi_sio_quirk ftdi_USB_UIRT_quirk = {
-+static const struct ftdi_sio_quirk ftdi_USB_UIRT_quirk = {
- 	.port_probe = ftdi_USB_UIRT_setup,
- };
- 
--static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = {
-+static const struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = {
- 	.port_probe = ftdi_HE_TIRA1_setup,
- };
- 
--static struct ftdi_sio_quirk ftdi_stmclite_quirk = {
-+static const struct ftdi_sio_quirk ftdi_stmclite_quirk = {
- 	.probe	= ftdi_stmclite_probe,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/usb/wusbcore/wa-hc.h linux-2.6.39.3/drivers/usb/wusbcore/wa-hc.h
---- linux-2.6.39.3/drivers/usb/wusbcore/wa-hc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/wusbcore/wa-hc.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/usb/wusbcore/wa-hc.h linux-2.6.39.4/drivers/usb/wusbcore/wa-hc.h
+--- linux-2.6.39.4/drivers/usb/wusbcore/wa-hc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/wusbcore/wa-hc.h	2011-08-05 19:44:37.000000000 -0400
 @@ -192,7 +192,7 @@ struct wahc {
  	struct list_head xfer_delayed_list;
  	spinlock_t xfer_list_lock;
@@ -42922,9 +33421,9 @@ diff -urNp linux-2.6.39.3/drivers/usb/wusbcore/wa-hc.h linux-2.6.39.3/drivers/us
  }
  
  /**
-diff -urNp linux-2.6.39.3/drivers/usb/wusbcore/wa-xfer.c linux-2.6.39.3/drivers/usb/wusbcore/wa-xfer.c
---- linux-2.6.39.3/drivers/usb/wusbcore/wa-xfer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/usb/wusbcore/wa-xfer.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/usb/wusbcore/wa-xfer.c linux-2.6.39.4/drivers/usb/wusbcore/wa-xfer.c
+--- linux-2.6.39.4/drivers/usb/wusbcore/wa-xfer.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/usb/wusbcore/wa-xfer.c	2011-08-05 19:44:37.000000000 -0400
 @@ -294,7 +294,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -42934,9 +33433,9 @@ diff -urNp linux-2.6.39.3/drivers/usb/wusbcore/wa-xfer.c linux-2.6.39.3/drivers/
  }
  
  /*
-diff -urNp linux-2.6.39.3/drivers/vhost/vhost.c linux-2.6.39.3/drivers/vhost/vhost.c
---- linux-2.6.39.3/drivers/vhost/vhost.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/vhost/vhost.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/vhost/vhost.c linux-2.6.39.4/drivers/vhost/vhost.c
+--- linux-2.6.39.4/drivers/vhost/vhost.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/vhost/vhost.c	2011-08-05 19:44:37.000000000 -0400
 @@ -580,7 +580,7 @@ static int init_used(struct vhost_virtqu
  	return get_user(vq->last_used_idx, &used->idx);
  }
@@ -42946,201 +33445,9 @@ diff -urNp linux-2.6.39.3/drivers/vhost/vhost.c linux-2.6.39.3/drivers/vhost/vho
  {
  	struct file *eventfp, *filep = NULL,
  		    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-2.6.39.3/drivers/video/backlight/corgi_lcd.c linux-2.6.39.3/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.39.3/drivers/video/backlight/corgi_lcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct lcd_ops corgi_lcd_ops = {
-+static const struct lcd_ops corgi_lcd_ops = {
- 	.get_power	= corgi_lcd_get_power,
- 	.set_power	= corgi_lcd_set_power,
- 	.set_mode	= corgi_lcd_set_mode,
-diff -urNp linux-2.6.39.3/drivers/video/backlight/cr_bllcd.c linux-2.6.39.3/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.39.3/drivers/video/backlight/cr_bllcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/backlight/cr_bllcd.c	2011-05-22 19:36:32.000000000 -0400
-@@ -165,7 +165,7 @@ static int cr_lcd_set_power(struct lcd_d
- 	return 0;
- }
- 
--static struct lcd_ops cr_lcd_ops = {
-+static const struct lcd_ops cr_lcd_ops = {
- 	.set_power = cr_lcd_set_power,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/video/backlight/ili9320.c linux-2.6.39.3/drivers/video/backlight/ili9320.c
---- linux-2.6.39.3/drivers/video/backlight/ili9320.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct lcd_ops ili9320_ops = {
-+static const struct lcd_ops ili9320_ops = {
- 	.get_power	= ili9320_get_power,
- 	.set_power	= ili9320_set_power,
- };
-diff -urNp linux-2.6.39.3/drivers/video/backlight/jornada720_lcd.c linux-2.6.39.3/drivers/video/backlight/jornada720_lcd.c
---- linux-2.6.39.3/drivers/video/backlight/jornada720_lcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/backlight/jornada720_lcd.c	2011-05-22 19:36:32.000000000 -0400
-@@ -87,7 +87,7 @@ static int jornada_lcd_set_power(struct 
- 	return 0;
- }
- 
--static struct lcd_ops jornada_lcd_props = {
-+static const struct lcd_ops jornada_lcd_props = {
- 	.get_contrast = jornada_lcd_get_contrast,
- 	.set_contrast = jornada_lcd_set_contrast,
- 	.get_power = jornada_lcd_get_power,
-diff -urNp linux-2.6.39.3/drivers/video/backlight/l4f00242t03.c linux-2.6.39.3/drivers/video/backlight/l4f00242t03.c
---- linux-2.6.39.3/drivers/video/backlight/l4f00242t03.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/backlight/l4f00242t03.c	2011-05-22 19:36:32.000000000 -0400
-@@ -149,7 +149,7 @@ static int l4f00242t03_lcd_power_set(str
- 	return 0;
- }
- 
--static struct lcd_ops l4f_ops = {
-+static const struct lcd_ops l4f_ops = {
- 	.set_power	= l4f00242t03_lcd_power_set,
- 	.get_power	= l4f00242t03_lcd_power_get,
- };
-diff -urNp linux-2.6.39.3/drivers/video/backlight/lcd.c linux-2.6.39.3/drivers/video/backlight/lcd.c
---- linux-2.6.39.3/drivers/video/backlight/lcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/backlight/lcd.c	2011-05-22 19:36:32.000000000 -0400
-@@ -192,7 +192,7 @@ static struct device_attribute lcd_devic
-  * or a pointer to the newly allocated device.
-  */
- struct lcd_device *lcd_device_register(const char *name, struct device *parent,
--		void *devdata, struct lcd_ops *ops)
-+		void *devdata, const struct lcd_ops *ops)
- {
- 	struct lcd_device *new_ld;
- 	int rc;
-diff -urNp linux-2.6.39.3/drivers/video/backlight/ld9040.c linux-2.6.39.3/drivers/video/backlight/ld9040.c
---- linux-2.6.39.3/drivers/video/backlight/ld9040.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/backlight/ld9040.c	2011-05-22 19:36:32.000000000 -0400
-@@ -651,7 +651,7 @@ static int ld9040_set_brightness(struct 
- 	return ret;
- }
- 
--static struct lcd_ops ld9040_lcd_ops = {
-+static const struct lcd_ops ld9040_lcd_ops = {
- 	.set_power = ld9040_set_power,
- 	.get_power = ld9040_get_power,
- };
-diff -urNp linux-2.6.39.3/drivers/video/backlight/lms283gf05.c linux-2.6.39.3/drivers/video/backlight/lms283gf05.c
---- linux-2.6.39.3/drivers/video/backlight/lms283gf05.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct lcd_ops lms_ops = {
-+static const struct lcd_ops lms_ops = {
- 	.set_power	= lms283gf05_power_set,
- 	.get_power	= NULL,
- };
-diff -urNp linux-2.6.39.3/drivers/video/backlight/ltv350qv.c linux-2.6.39.3/drivers/video/backlight/ltv350qv.c
---- linux-2.6.39.3/drivers/video/backlight/ltv350qv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/backlight/ltv350qv.c	2011-05-22 19:36:32.000000000 -0400
-@@ -221,7 +221,7 @@ static int ltv350qv_get_power(struct lcd
- 	return lcd->power;
- }
- 
--static struct lcd_ops ltv_ops = {
-+static const struct lcd_ops ltv_ops = {
- 	.get_power	= ltv350qv_get_power,
- 	.set_power	= ltv350qv_set_power,
- };
-diff -urNp linux-2.6.39.3/drivers/video/backlight/platform_lcd.c linux-2.6.39.3/drivers/video/backlight/platform_lcd.c
---- linux-2.6.39.3/drivers/video/backlight/platform_lcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 == info->device;
- }
- 
--static struct lcd_ops platform_lcd_ops = {
-+static const struct lcd_ops platform_lcd_ops = {
- 	.get_power	= platform_lcd_get_power,
- 	.set_power	= platform_lcd_set_power,
- 	.check_fb	= platform_lcd_match,
-diff -urNp linux-2.6.39.3/drivers/video/backlight/s6e63m0.c linux-2.6.39.3/drivers/video/backlight/s6e63m0.c
---- linux-2.6.39.3/drivers/video/backlight/s6e63m0.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct lcd_ops s6e63m0_lcd_ops = {
-+static const struct lcd_ops s6e63m0_lcd_ops = {
- 	.set_power = s6e63m0_set_power,
- 	.get_power = s6e63m0_get_power,
- };
-diff -urNp linux-2.6.39.3/drivers/video/backlight/tdo24m.c linux-2.6.39.3/drivers/video/backlight/tdo24m.c
---- linux-2.6.39.3/drivers/video/backlight/tdo24m.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct lcd_ops tdo24m_ops = {
-+static const struct lcd_ops tdo24m_ops = {
- 	.get_power	= tdo24m_get_power,
- 	.set_power	= tdo24m_set_power,
- 	.set_mode	= tdo24m_set_mode,
-diff -urNp linux-2.6.39.3/drivers/video/backlight/tosa_lcd.c linux-2.6.39.3/drivers/video/backlight/tosa_lcd.c
---- linux-2.6.39.3/drivers/video/backlight/tosa_lcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/backlight/tosa_lcd.c	2011-05-22 19:36:32.000000000 -0400
-@@ -163,7 +163,7 @@ static int tosa_lcd_set_mode(struct lcd_
- 	return 0;
- }
- 
--static struct lcd_ops tosa_lcd_ops = {
-+static const struct lcd_ops tosa_lcd_ops = {
- 	.set_power = tosa_lcd_set_power,
- 	.get_power = tosa_lcd_get_power,
- 	.set_mode = tosa_lcd_set_mode,
-diff -urNp linux-2.6.39.3/drivers/video/bf537-lq035.c linux-2.6.39.3/drivers/video/bf537-lq035.c
---- linux-2.6.39.3/drivers/video/bf537-lq035.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/bf537-lq035.c	2011-05-22 19:36:32.000000000 -0400
-@@ -682,7 +682,7 @@ static int bfin_lcd_check_fb(struct lcd_
- 	return 0;
- }
- 
--static struct lcd_ops bfin_lcd_ops = {
-+static const struct lcd_ops bfin_lcd_ops = {
- 	.get_power	= bfin_lcd_get_power,
- 	.set_power	= bfin_lcd_set_power,
- 	.get_contrast	= bfin_lcd_get_contrast,
-diff -urNp linux-2.6.39.3/drivers/video/bf54x-lq043fb.c linux-2.6.39.3/drivers/video/bf54x-lq043fb.c
---- linux-2.6.39.3/drivers/video/bf54x-lq043fb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/bf54x-lq043fb.c	2011-05-22 19:36:32.000000000 -0400
-@@ -467,7 +467,7 @@ static int bfin_lcd_check_fb(struct lcd_
- 	return 0;
- }
- 
--static struct lcd_ops bfin_lcd_ops = {
-+static const struct lcd_ops bfin_lcd_ops = {
- 	.get_power = bfin_lcd_get_power,
- 	.set_power = bfin_lcd_set_power,
- 	.get_contrast = bfin_lcd_get_contrast,
-diff -urNp linux-2.6.39.3/drivers/video/bfin-t350mcqb-fb.c linux-2.6.39.3/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.39.3/drivers/video/bfin-t350mcqb-fb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct lcd_ops bfin_lcd_ops = {
-+static const struct lcd_ops bfin_lcd_ops = {
- 	.get_power = bfin_lcd_get_power,
- 	.set_power = bfin_lcd_set_power,
- 	.get_contrast = bfin_lcd_get_contrast,
-diff -urNp linux-2.6.39.3/drivers/video/fbcmap.c linux-2.6.39.3/drivers/video/fbcmap.c
---- linux-2.6.39.3/drivers/video/fbcmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/fbcmap.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/video/fbcmap.c linux-2.6.39.4/drivers/video/fbcmap.c
+--- linux-2.6.39.4/drivers/video/fbcmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/video/fbcmap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
  		rc = -ENODEV;
  		goto out;
@@ -43151,9 +33458,9 @@ diff -urNp linux-2.6.39.3/drivers/video/fbcmap.c linux-2.6.39.3/drivers/video/fb
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-2.6.39.3/drivers/video/fbmem.c linux-2.6.39.3/drivers/video/fbmem.c
---- linux-2.6.39.3/drivers/video/fbmem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/fbmem.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/video/fbmem.c linux-2.6.39.4/drivers/video/fbmem.c
+--- linux-2.6.39.4/drivers/video/fbmem.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/video/fbmem.c	2011-08-05 19:44:37.000000000 -0400
 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dx += image->width + 8;
  		}
@@ -43199,71 +33506,9 @@ diff -urNp linux-2.6.39.3/drivers/video/fbmem.c linux-2.6.39.3/drivers/video/fbm
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.39.3/drivers/video/geode/display_gx1.c linux-2.6.39.3/drivers/video/geode/display_gx1.c
---- linux-2.6.39.3/drivers/video/geode/display_gx1.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--struct geode_dc_ops gx1_dc_ops = {
-+const struct geode_dc_ops gx1_dc_ops = {
- 	.set_mode	 = gx1_set_mode,
- 	.set_palette_reg = gx1_set_hw_palette_reg,
- };
-diff -urNp linux-2.6.39.3/drivers/video/geode/display_gx1.h linux-2.6.39.3/drivers/video/geode/display_gx1.h
---- linux-2.6.39.3/drivers/video/geode/display_gx1.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
--extern struct geode_dc_ops gx1_dc_ops;
-+extern const struct geode_dc_ops gx1_dc_ops;
- 
- /* GX1 configuration I/O registers */
- 
-diff -urNp linux-2.6.39.3/drivers/video/geode/geodefb.h linux-2.6.39.3/drivers/video/geode/geodefb.h
---- linux-2.6.39.3/drivers/video/geode/geodefb.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/geode/geodefb.h	2011-05-22 19:36:32.000000000 -0400
-@@ -31,8 +31,8 @@ struct geodefb_par {
- 	int panel_y;
- 	void __iomem *dc_regs;
- 	void __iomem *vid_regs;
--	struct geode_dc_ops  *dc_ops;
--	struct geode_vid_ops *vid_ops;
-+	const struct geode_dc_ops  *dc_ops;
-+	const struct geode_vid_ops *vid_ops;
- };
- 
- #endif /* !__GEODEFB_H__ */
-diff -urNp linux-2.6.39.3/drivers/video/geode/video_cs5530.c linux-2.6.39.3/drivers/video/geode/video_cs5530.c
---- linux-2.6.39.3/drivers/video/geode/video_cs5530.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/geode/video_cs5530.c	2011-05-22 19:36:32.000000000 -0400
-@@ -186,7 +186,7 @@ static int cs5530_blank_display(struct f
- 	return 0;
- }
- 
--struct geode_vid_ops cs5530_vid_ops = {
-+const struct geode_vid_ops cs5530_vid_ops = {
- 	.set_dclk          = cs5530_set_dclk_frequency,
- 	.configure_display = cs5530_configure_display,
- 	.blank_display     = cs5530_blank_display,
-diff -urNp linux-2.6.39.3/drivers/video/geode/video_cs5530.h linux-2.6.39.3/drivers/video/geode/video_cs5530.h
---- linux-2.6.39.3/drivers/video/geode/video_cs5530.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/geode/video_cs5530.h	2011-05-22 19:36:32.000000000 -0400
-@@ -15,7 +15,7 @@
- #ifndef __VIDEO_CS5530_H__
- #define __VIDEO_CS5530_H__
- 
--extern struct geode_vid_ops cs5530_vid_ops;
-+extern const struct geode_vid_ops cs5530_vid_ops;
- 
- /* CS5530 Video device registers */
- 
-diff -urNp linux-2.6.39.3/drivers/video/i810/i810_accel.c linux-2.6.39.3/drivers/video/i810/i810_accel.c
---- linux-2.6.39.3/drivers/video/i810/i810_accel.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/i810/i810_accel.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/video/i810/i810_accel.c linux-2.6.39.4/drivers/video/i810/i810_accel.c
+--- linux-2.6.39.4/drivers/video/i810/i810_accel.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/video/i810/i810_accel.c	2011-08-05 19:44:37.000000000 -0400
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
  		}
  	}
@@ -43272,57 +33517,9 @@ diff -urNp linux-2.6.39.3/drivers/video/i810/i810_accel.c linux-2.6.39.3/drivers
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.39.3/drivers/video/matrox/matroxfb_base.c linux-2.6.39.3/drivers/video/matrox/matroxfb_base.c
---- linux-2.6.39.3/drivers/video/matrox/matroxfb_base.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/matrox/matroxfb_base.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1232,7 +1232,7 @@ static struct fb_ops matroxfb_ops = {
- #define RSText		0x7
- #define RSText8		0x8
- /* 9-F */
--static struct { struct fb_bitfield red, green, blue, transp; int bits_per_pixel; } colors[] = {
-+static const struct { struct fb_bitfield red, green, blue, transp; int bits_per_pixel; } colors[] = {
- 	{ {  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.3/drivers/video/omap/lcd_ams_delta.c linux-2.6.39.3/drivers/video/omap/lcd_ams_delta.c
---- linux-2.6.39.3/drivers/video/omap/lcd_ams_delta.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/omap/lcd_ams_delta.c	2011-05-22 19:36:32.000000000 -0400
-@@ -87,7 +87,7 @@ static int ams_delta_lcd_get_contrast(st
- 	return ams_delta_lcd & AMS_DELTA_MAX_CONTRAST;
- }
- 
--static struct lcd_ops ams_delta_lcd_ops = {
-+static const struct lcd_ops ams_delta_lcd_ops = {
- 	.get_power = ams_delta_lcd_get_power,
- 	.set_power = ams_delta_lcd_set_power,
- 	.get_contrast = ams_delta_lcd_get_contrast,
-diff -urNp linux-2.6.39.3/drivers/video/pxa3xx-gcu.c linux-2.6.39.3/drivers/video/pxa3xx-gcu.c
---- linux-2.6.39.3/drivers/video/pxa3xx-gcu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/pxa3xx-gcu.c	2011-05-22 19:36:32.000000000 -0400
-@@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv {
- 	dma_addr_t		  shared_phys;
- 	struct resource		 *resource_mem;
- 	struct miscdevice	  misc_dev;
--	struct file_operations	  misc_fops;
-+	const struct file_operations	  misc_fops;
- 	wait_queue_head_t	  wait_idle;
- 	wait_queue_head_t	  wait_free;
- 	spinlock_t		  spinlock;
-diff -urNp linux-2.6.39.3/drivers/video/sh_mobile_lcdcfb.c linux-2.6.39.3/drivers/video/sh_mobile_lcdcfb.c
---- linux-2.6.39.3/drivers/video/sh_mobile_lcdcfb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
-+const struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
- 	lcdc_sys_write_index,
- 	lcdc_sys_write_data,
- 	lcdc_sys_read_data,
-diff -urNp linux-2.6.39.3/drivers/video/udlfb.c linux-2.6.39.3/drivers/video/udlfb.c
---- linux-2.6.39.3/drivers/video/udlfb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/udlfb.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/video/udlfb.c linux-2.6.39.4/drivers/video/udlfb.c
+--- linux-2.6.39.4/drivers/video/udlfb.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/video/udlfb.c	2011-08-05 19:44:37.000000000 -0400
 @@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data 
  		dlfb_urb_completion(urb);
  
@@ -43406,9 +33603,9 @@ diff -urNp linux-2.6.39.3/drivers/video/udlfb.c linux-2.6.39.3/drivers/video/udl
  
  	return count;
  }
-diff -urNp linux-2.6.39.3/drivers/video/uvesafb.c linux-2.6.39.3/drivers/video/uvesafb.c
---- linux-2.6.39.3/drivers/video/uvesafb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/uvesafb.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/video/uvesafb.c linux-2.6.39.4/drivers/video/uvesafb.c
+--- linux-2.6.39.4/drivers/video/uvesafb.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/video/uvesafb.c	2011-08-05 20:34:06.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -43484,18 +33681,9 @@ diff -urNp linux-2.6.39.3/drivers/video/uvesafb.c linux-2.6.39.3/drivers/video/u
  		}
  
  		framebuffer_release(info);
-@@ -2013,7 +2047,7 @@ static int param_set_scroll(const char *
- 
- 	return 0;
- }
--static struct kernel_param_ops param_ops_scroll = {
-+static const struct kernel_param_ops param_ops_scroll = {
- 	.set = param_set_scroll,
- };
- #define param_check_scroll(name, p) __param_check(name, p, void)
-diff -urNp linux-2.6.39.3/drivers/video/vesafb.c linux-2.6.39.3/drivers/video/vesafb.c
---- linux-2.6.39.3/drivers/video/vesafb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/video/vesafb.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/video/vesafb.c linux-2.6.39.4/drivers/video/vesafb.c
+--- linux-2.6.39.4/drivers/video/vesafb.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/video/vesafb.c	2011-08-05 20:34:06.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -43562,17 +33750,16 @@ diff -urNp linux-2.6.39.3/drivers/video/vesafb.c linux-2.6.39.3/drivers/video/ve
  
  	if (ypan || pmi_setpal) {
  		unsigned short *pmi_base;
--		pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
++
+ 		pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
 -		pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
 -		pmi_pal   = (void*)((char*)pmi_base + pmi_base[2]);
 +
-+		pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
-+
 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
 +		pax_open_kernel();
 +		memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
 +#else
-+		pmi_code = pmi_base;
++		pmi_code  = pmi_base;
 +#endif
 +
 +		pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
@@ -43599,9 +33786,9 @@ diff -urNp linux-2.6.39.3/drivers/video/vesafb.c linux-2.6.39.3/drivers/video/ve
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-2.6.39.3/drivers/virtio/virtio_balloon.c linux-2.6.39.3/drivers/virtio/virtio_balloon.c
---- linux-2.6.39.3/drivers/virtio/virtio_balloon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/virtio/virtio_balloon.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/drivers/virtio/virtio_balloon.c linux-2.6.39.4/drivers/virtio/virtio_balloon.c
+--- linux-2.6.39.4/drivers/virtio/virtio_balloon.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/drivers/virtio/virtio_balloon.c	2011-08-05 19:44:37.000000000 -0400
 @@ -176,6 +176,8 @@ static void update_balloon_stats(struct 
  	struct sysinfo i;
  	int idx = 0;
@@ -43611,63 +33798,9 @@ diff -urNp linux-2.6.39.3/drivers/virtio/virtio_balloon.c linux-2.6.39.3/drivers
  	all_vm_events(events);
  	si_meminfo(&i);
  
-diff -urNp linux-2.6.39.3/drivers/xen/gntalloc.c linux-2.6.39.3/drivers/xen/gntalloc.c
---- linux-2.6.39.3/drivers/xen/gntalloc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct vm_operations_struct gntalloc_vmops = {
-+static const struct vm_operations_struct gntalloc_vmops = {
- 	.close = gntalloc_vma_close,
- };
- 
-diff -urNp linux-2.6.39.3/drivers/xen/gntdev.c linux-2.6.39.3/drivers/xen/gntdev.c
---- linux-2.6.39.3/drivers/xen/gntdev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/xen/gntdev.c	2011-05-22 19:36:32.000000000 -0400
-@@ -340,7 +340,7 @@ static void gntdev_vma_close(struct vm_a
- 	gntdev_put_map(map);
- }
- 
--static struct vm_operations_struct gntdev_vmops = {
-+static const struct vm_operations_struct gntdev_vmops = {
- 	.close = gntdev_vma_close,
- };
- 
-@@ -404,7 +404,7 @@ static void mn_release(struct mmu_notifi
- 	spin_unlock(&priv->lock);
- }
- 
--struct mmu_notifier_ops gntdev_mmu_ops = {
-+const struct mmu_notifier_ops gntdev_mmu_ops = {
- 	.release                = mn_release,
- 	.invalidate_page        = mn_invl_page,
- 	.invalidate_range_start = mn_invl_range_start,
-diff -urNp linux-2.6.39.3/drivers/xen/xenfs/privcmd.c linux-2.6.39.3/drivers/xen/xenfs/privcmd.c
---- linux-2.6.39.3/drivers/xen/xenfs/privcmd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/drivers/xen/xenfs/privcmd.c	2011-05-22 19:36:32.000000000 -0400
-@@ -268,7 +268,7 @@ static int mmap_return_errors(void *data
- 	return put_user(*mfnp, st->user++);
- }
- 
--static struct vm_operations_struct privcmd_vm_ops;
-+static const struct vm_operations_struct privcmd_vm_ops;
- 
- static long privcmd_ioctl_mmap_batch(void __user *udata)
- {
-@@ -369,7 +369,7 @@ static int privcmd_fault(struct vm_area_
- 	return VM_FAULT_SIGBUS;
- }
- 
--static struct vm_operations_struct privcmd_vm_ops = {
-+static const struct vm_operations_struct privcmd_vm_ops = {
- 	.fault = privcmd_fault
- };
- 
-diff -urNp linux-2.6.39.3/fs/9p/vfs_inode.c linux-2.6.39.3/fs/9p/vfs_inode.c
---- linux-2.6.39.3/fs/9p/vfs_inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/9p/vfs_inode.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/9p/vfs_inode.c linux-2.6.39.4/fs/9p/vfs_inode.c
+--- linux-2.6.39.4/fs/9p/vfs_inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/9p/vfs_inode.c	2011-08-05 19:44:37.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)
@@ -43677,9 +33810,9 @@ diff -urNp linux-2.6.39.3/fs/9p/vfs_inode.c linux-2.6.39.3/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.39.3/fs/aio.c linux-2.6.39.3/fs/aio.c
---- linux-2.6.39.3/fs/aio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/aio.c	2011-06-03 01:00:34.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/aio.c linux-2.6.39.4/fs/aio.c
+--- linux-2.6.39.4/fs/aio.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/aio.c	2011-08-05 19:44:37.000000000 -0400
 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx 
  	size += sizeof(struct io_event) * nr_events;
  	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -43728,9 +33861,9 @@ diff -urNp linux-2.6.39.3/fs/aio.c linux-2.6.39.3/fs/aio.c
  	kiocb->ki_nr_segs = kiocb->ki_nbytes;
  	kiocb->ki_cur_seg = 0;
  	/* ki_nbytes/left now reflect bytes instead of segs */
-diff -urNp linux-2.6.39.3/fs/attr.c linux-2.6.39.3/fs/attr.c
---- linux-2.6.39.3/fs/attr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/attr.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/attr.c linux-2.6.39.4/fs/attr.c
+--- linux-2.6.39.4/fs/attr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/attr.c	2011-08-05 19:44:37.000000000 -0400
 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
  		unsigned long limit;
  
@@ -43739,9 +33872,9 @@ diff -urNp linux-2.6.39.3/fs/attr.c linux-2.6.39.3/fs/attr.c
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.39.3/fs/befs/linuxvfs.c linux-2.6.39.3/fs/befs/linuxvfs.c
---- linux-2.6.39.3/fs/befs/linuxvfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/befs/linuxvfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/befs/linuxvfs.c linux-2.6.39.4/fs/befs/linuxvfs.c
+--- linux-2.6.39.4/fs/befs/linuxvfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/befs/linuxvfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -498,7 +498,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -43751,9 +33884,9 @@ diff -urNp linux-2.6.39.3/fs/befs/linuxvfs.c linux-2.6.39.3/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-2.6.39.3/fs/binfmt_aout.c linux-2.6.39.3/fs/binfmt_aout.c
---- linux-2.6.39.3/fs/binfmt_aout.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/binfmt_aout.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/binfmt_aout.c linux-2.6.39.4/fs/binfmt_aout.c
+--- linux-2.6.39.4/fs/binfmt_aout.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/binfmt_aout.c	2011-08-05 19:44:37.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -43830,9 +33963,9 @@ diff -urNp linux-2.6.39.3/fs/binfmt_aout.c linux-2.6.39.3/fs/binfmt_aout.c
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.39.3/fs/binfmt_elf.c linux-2.6.39.3/fs/binfmt_elf.c
---- linux-2.6.39.3/fs/binfmt_elf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/binfmt_elf.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/binfmt_elf.c linux-2.6.39.4/fs/binfmt_elf.c
+--- linux-2.6.39.4/fs/binfmt_elf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/binfmt_elf.c	2011-08-05 19:44:37.000000000 -0400
 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump	NULL
  #endif
@@ -44536,9 +34669,9 @@ diff -urNp linux-2.6.39.3/fs/binfmt_elf.c linux-2.6.39.3/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-2.6.39.3/fs/binfmt_flat.c linux-2.6.39.3/fs/binfmt_flat.c
---- linux-2.6.39.3/fs/binfmt_flat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/binfmt_flat.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/binfmt_flat.c linux-2.6.39.4/fs/binfmt_flat.c
+--- linux-2.6.39.4/fs/binfmt_flat.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/binfmt_flat.c	2011-08-05 19:44:37.000000000 -0400
 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
@@ -44571,9 +34704,9 @@ diff -urNp linux-2.6.39.3/fs/binfmt_flat.c linux-2.6.39.3/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-2.6.39.3/fs/bio.c linux-2.6.39.3/fs/bio.c
---- linux-2.6.39.3/fs/bio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/bio.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/bio.c linux-2.6.39.4/fs/bio.c
+--- linux-2.6.39.4/fs/bio.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/bio.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
  	const int read = bio_data_dir(bio) == READ;
  	struct bio_map_data *bmd = bio->bi_private;
@@ -44583,9 +34716,9 @@ diff -urNp linux-2.6.39.3/fs/bio.c linux-2.6.39.3/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.39.3/fs/block_dev.c linux-2.6.39.3/fs/block_dev.c
---- linux-2.6.39.3/fs/block_dev.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/block_dev.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/block_dev.c linux-2.6.39.4/fs/block_dev.c
+--- linux-2.6.39.4/fs/block_dev.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/fs/block_dev.c	2011-08-05 19:44:37.000000000 -0400
 @@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de
  	else if (bdev->bd_contains == bdev)
  		return true;  	 /* is a whole device which isn't held */
@@ -44595,34 +34728,9 @@ diff -urNp linux-2.6.39.3/fs/block_dev.c linux-2.6.39.3/fs/block_dev.c
  		return true; 	 /* is a partition of a device that is being partitioned */
  	else if (whole->bd_holder != NULL)
  		return false;	 /* is a partition of a held device */
-diff -urNp linux-2.6.39.3/fs/btrfs/compression.c linux-2.6.39.3/fs/btrfs/compression.c
---- linux-2.6.39.3/fs/btrfs/compression.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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];
- 
--struct btrfs_compress_op *btrfs_compress_op[] = {
-+const struct btrfs_compress_op *btrfs_compress_op[] = {
- 	&btrfs_zlib_compress,
- 	&btrfs_lzo_compress,
- };
-diff -urNp linux-2.6.39.3/fs/btrfs/compression.h linux-2.6.39.3/fs/btrfs/compression.h
---- linux-2.6.39.3/fs/btrfs/compression.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- };
- 
--extern struct btrfs_compress_op btrfs_zlib_compress;
--extern struct btrfs_compress_op btrfs_lzo_compress;
-+extern const struct btrfs_compress_op btrfs_zlib_compress;
-+extern const struct btrfs_compress_op btrfs_lzo_compress;
- 
- #endif
-diff -urNp linux-2.6.39.3/fs/btrfs/ctree.c linux-2.6.39.3/fs/btrfs/ctree.c
---- linux-2.6.39.3/fs/btrfs/ctree.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/ctree.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/btrfs/ctree.c linux-2.6.39.4/fs/btrfs/ctree.c
+--- linux-2.6.39.4/fs/btrfs/ctree.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/btrfs/ctree.c	2011-08-05 19:44:37.000000000 -0400
 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
@@ -44647,93 +34755,9 @@ diff -urNp linux-2.6.39.3/fs/btrfs/ctree.c linux-2.6.39.3/fs/btrfs/ctree.c
  		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
  		ret = fixup_low_keys(trans, root, path, &disk_key, 1);
  	}
-diff -urNp linux-2.6.39.3/fs/btrfs/disk-io.c linux-2.6.39.3/fs/btrfs/disk-io.c
---- linux-2.6.39.3/fs/btrfs/disk-io.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/disk-io.c	2011-05-22 19:36:32.000000000 -0400
-@@ -42,7 +42,7 @@
- #include "tree-log.h"
- #include "free-space-cache.h"
- 
--static struct extent_io_ops btree_extent_io_ops;
-+static const struct extent_io_ops btree_extent_io_ops;
- static void end_workqueue_fn(struct btrfs_work *work);
- static void free_fs_root(struct btrfs_root *root);
- static void btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
-@@ -3070,7 +3070,7 @@ static int btrfs_cleanup_transaction(str
- 	return 0;
- }
- 
--static struct extent_io_ops btree_extent_io_ops = {
-+static const struct extent_io_ops btree_extent_io_ops = {
- 	.write_cache_pages_lock_hook = btree_lock_page_hook,
- 	.readpage_end_io_hook = btree_readpage_end_io_hook,
- 	.submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.39.3/fs/btrfs/extent_io.h linux-2.6.39.3/fs/btrfs/extent_io.h
---- linux-2.6.39.3/fs/btrfs/extent_io.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/extent_io.h	2011-05-22 19:36:32.000000000 -0400
-@@ -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);
- struct extent_io_ops {
--	int (*fill_delalloc)(struct inode *inode, struct page *locked_page,
-+	int (* const fill_delalloc)(struct inode *inode, struct page *locked_page,
- 			     u64 start, u64 end, int *page_started,
- 			     unsigned long *nr_written);
--	int (*writepage_start_hook)(struct page *page, u64 start, u64 end);
--	int (*writepage_io_hook)(struct page *page, u64 start, u64 end);
-+	int (* const writepage_start_hook)(struct page *page, u64 start, u64 end);
-+	int (* const writepage_io_hook)(struct page *page, u64 start, u64 end);
- 	extent_submit_bio_hook_t *submit_bio_hook;
--	int (*merge_bio_hook)(struct page *page, unsigned long offset,
-+	int (* const merge_bio_hook)(struct page *page, unsigned long offset,
- 			      size_t size, struct bio *bio,
- 			      unsigned long bio_flags);
--	int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
--	int (*readpage_io_failed_hook)(struct bio *bio, struct page *page,
-+	int (* const readpage_io_hook)(struct page *page, u64 start, u64 end);
-+	int (* const readpage_io_failed_hook)(struct bio *bio, struct page *page,
- 				       u64 start, u64 end,
- 				       struct extent_state *state);
--	int (*writepage_io_failed_hook)(struct bio *bio, struct page *page,
-+	int (* const writepage_io_failed_hook)(struct bio *bio, struct page *page,
- 					u64 start, u64 end,
- 				       struct extent_state *state);
--	int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end,
-+	int (* const readpage_end_io_hook)(struct page *page, u64 start, u64 end,
- 				    struct extent_state *state);
--	int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
-+	int (* const writepage_end_io_hook)(struct page *page, u64 start, u64 end,
- 				      struct extent_state *state, int uptodate);
--	int (*set_bit_hook)(struct inode *inode, struct extent_state *state,
-+	int (* const set_bit_hook)(struct inode *inode, struct extent_state *state,
- 			    int *bits);
--	int (*clear_bit_hook)(struct inode *inode, struct extent_state *state,
-+	int (* const clear_bit_hook)(struct inode *inode, struct extent_state *state,
- 			      int *bits);
--	int (*merge_extent_hook)(struct inode *inode,
-+	int (* const merge_extent_hook)(struct inode *inode,
- 				 struct extent_state *new,
- 				 struct extent_state *other);
--	int (*split_extent_hook)(struct inode *inode,
-+	int (* const split_extent_hook)(struct inode *inode,
- 				 struct extent_state *orig, u64 split);
--	int (*write_cache_pages_lock_hook)(struct page *page);
-+	int (* const write_cache_pages_lock_hook)(struct page *page);
- };
- 
- struct extent_io_tree {
-@@ -95,7 +95,7 @@ struct extent_io_tree {
- 	u64 dirty_bytes;
- 	spinlock_t lock;
- 	spinlock_t buffer_lock;
--	struct extent_io_ops *ops;
-+	const struct extent_io_ops *ops;
- };
- 
- struct extent_state {
-diff -urNp linux-2.6.39.3/fs/btrfs/free-space-cache.c linux-2.6.39.3/fs/btrfs/free-space-cache.c
---- linux-2.6.39.3/fs/btrfs/free-space-cache.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/free-space-cache.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/btrfs/free-space-cache.c linux-2.6.39.4/fs/btrfs/free-space-cache.c
+--- linux-2.6.39.4/fs/btrfs/free-space-cache.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/btrfs/free-space-cache.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1910,8 +1910,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
  	while(1) {
  		if (entry->bytes < bytes ||
@@ -44751,18 +34775,9 @@ diff -urNp linux-2.6.39.3/fs/btrfs/free-space-cache.c linux-2.6.39.3/fs/btrfs/fr
  				node = rb_next(&entry->offset_index);
  				if (!node)
  					break;
-diff -urNp linux-2.6.39.3/fs/btrfs/inode.c linux-2.6.39.3/fs/btrfs/inode.c
---- linux-2.6.39.3/fs/btrfs/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- static const struct file_operations btrfs_dir_file_operations;
--static struct extent_io_ops btrfs_extent_io_ops;
-+static const struct extent_io_ops btrfs_extent_io_ops;
- 
- static struct kmem_cache *btrfs_inode_cachep;
- struct kmem_cache *btrfs_trans_handle_cachep;
+diff -urNp linux-2.6.39.4/fs/btrfs/inode.c linux-2.6.39.4/fs/btrfs/inode.c
+--- linux-2.6.39.4/fs/btrfs/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/btrfs/inode.c	2011-08-05 20:34:06.000000000 -0400
 @@ -6947,7 +6947,7 @@ fail:
  	return -ENOMEM;
  }
@@ -44787,18 +34802,9 @@ diff -urNp linux-2.6.39.3/fs/btrfs/inode.c linux-2.6.39.3/fs/btrfs/inode.c
  /*
   * If a file is moved, it will inherit the cow and compression flags of the new
   * directory.
-@@ -7488,7 +7496,7 @@ static const struct file_operations btrf
- 	.fsync		= btrfs_sync_file,
- };
- 
--static struct extent_io_ops btrfs_extent_io_ops = {
-+static const struct extent_io_ops btrfs_extent_io_ops = {
- 	.fill_delalloc = run_delalloc_range,
- 	.submit_bio_hook = btrfs_submit_bio_hook,
- 	.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.39.3/fs/btrfs/ioctl.c linux-2.6.39.3/fs/btrfs/ioctl.c
---- linux-2.6.39.3/fs/btrfs/ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/ioctl.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/btrfs/ioctl.c linux-2.6.39.4/fs/btrfs/ioctl.c
+--- linux-2.6.39.4/fs/btrfs/ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/btrfs/ioctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2361,9 +2361,12 @@ long btrfs_ioctl_space_info(struct btrfs
  	for (i = 0; i < num_types; i++) {
  		struct btrfs_space_info *tmp;
@@ -44823,21 +34829,9 @@ diff -urNp linux-2.6.39.3/fs/btrfs/ioctl.c linux-2.6.39.3/fs/btrfs/ioctl.c
  		}
  		up_read(&info->groups_sem);
  	}
-diff -urNp linux-2.6.39.3/fs/btrfs/lzo.c linux-2.6.39.3/fs/btrfs/lzo.c
---- linux-2.6.39.3/fs/btrfs/lzo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/lzo.c	2011-05-22 19:36:32.000000000 -0400
-@@ -418,7 +418,7 @@ out:
- 	return ret;
- }
- 
--struct btrfs_compress_op btrfs_lzo_compress = {
-+const struct btrfs_compress_op btrfs_lzo_compress = {
- 	.alloc_workspace	= lzo_alloc_workspace,
- 	.free_workspace		= lzo_free_workspace,
- 	.compress_pages		= lzo_compress_pages,
-diff -urNp linux-2.6.39.3/fs/btrfs/relocation.c linux-2.6.39.3/fs/btrfs/relocation.c
---- linux-2.6.39.3/fs/btrfs/relocation.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/relocation.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/btrfs/relocation.c linux-2.6.39.4/fs/btrfs/relocation.c
+--- linux-2.6.39.4/fs/btrfs/relocation.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/btrfs/relocation.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt
  	}
  	spin_unlock(&rc->reloc_root_tree.lock);
@@ -44847,21 +34841,9 @@ diff -urNp linux-2.6.39.3/fs/btrfs/relocation.c linux-2.6.39.3/fs/btrfs/relocati
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.39.3/fs/btrfs/zlib.c linux-2.6.39.3/fs/btrfs/zlib.c
---- linux-2.6.39.3/fs/btrfs/zlib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/btrfs/zlib.c	2011-05-22 19:36:32.000000000 -0400
-@@ -390,7 +390,7 @@ next:
- 	return ret;
- }
- 
--struct btrfs_compress_op btrfs_zlib_compress = {
-+const struct btrfs_compress_op btrfs_zlib_compress = {
- 	.alloc_workspace	= zlib_alloc_workspace,
- 	.free_workspace		= zlib_free_workspace,
- 	.compress_pages		= zlib_compress_pages,
-diff -urNp linux-2.6.39.3/fs/cachefiles/bind.c linux-2.6.39.3/fs/cachefiles/bind.c
---- linux-2.6.39.3/fs/cachefiles/bind.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cachefiles/bind.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cachefiles/bind.c linux-2.6.39.4/fs/cachefiles/bind.c
+--- linux-2.6.39.4/fs/cachefiles/bind.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cachefiles/bind.c	2011-08-05 19:44:37.000000000 -0400
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
@@ -44878,9 +34860,9 @@ diff -urNp linux-2.6.39.3/fs/cachefiles/bind.c linux-2.6.39.3/fs/cachefiles/bind
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-2.6.39.3/fs/cachefiles/daemon.c linux-2.6.39.3/fs/cachefiles/daemon.c
---- linux-2.6.39.3/fs/cachefiles/daemon.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cachefiles/daemon.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cachefiles/daemon.c linux-2.6.39.4/fs/cachefiles/daemon.c
+--- linux-2.6.39.4/fs/cachefiles/daemon.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cachefiles/daemon.c	2011-08-05 19:44:37.000000000 -0400
 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
  	if (n > buflen)
  		return -EMSGSIZE;
@@ -44917,9 +34899,9 @@ diff -urNp linux-2.6.39.3/fs/cachefiles/daemon.c linux-2.6.39.3/fs/cachefiles/da
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-2.6.39.3/fs/cachefiles/internal.h linux-2.6.39.3/fs/cachefiles/internal.h
---- linux-2.6.39.3/fs/cachefiles/internal.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cachefiles/internal.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cachefiles/internal.h linux-2.6.39.4/fs/cachefiles/internal.h
+--- linux-2.6.39.4/fs/cachefiles/internal.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cachefiles/internal.h	2011-08-05 19:44:37.000000000 -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) */
@@ -44954,9 +34936,9 @@ diff -urNp linux-2.6.39.3/fs/cachefiles/internal.h linux-2.6.39.3/fs/cachefiles/
  }
  
  #else
-diff -urNp linux-2.6.39.3/fs/cachefiles/namei.c linux-2.6.39.3/fs/cachefiles/namei.c
---- linux-2.6.39.3/fs/cachefiles/namei.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cachefiles/namei.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cachefiles/namei.c linux-2.6.39.4/fs/cachefiles/namei.c
+--- linux-2.6.39.4/fs/cachefiles/namei.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cachefiles/namei.c	2011-08-05 19:44:37.000000000 -0400
 @@ -318,7 +318,7 @@ try_again:
  	/* first step is to make up a grave dentry in the graveyard */
  	sprintf(nbuffer, "%08x%08x",
@@ -44966,9 +34948,9 @@ diff -urNp linux-2.6.39.3/fs/cachefiles/namei.c linux-2.6.39.3/fs/cachefiles/nam
  
  	/* do the multiway lock magic */
  	trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-2.6.39.3/fs/cachefiles/proc.c linux-2.6.39.3/fs/cachefiles/proc.c
---- linux-2.6.39.3/fs/cachefiles/proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cachefiles/proc.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cachefiles/proc.c linux-2.6.39.4/fs/cachefiles/proc.c
+--- linux-2.6.39.4/fs/cachefiles/proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cachefiles/proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -44995,9 +34977,9 @@ diff -urNp linux-2.6.39.3/fs/cachefiles/proc.c linux-2.6.39.3/fs/cachefiles/proc
  		if (x == 0 && y == 0 && z == 0)
  			return 0;
  
-diff -urNp linux-2.6.39.3/fs/cachefiles/rdwr.c linux-2.6.39.3/fs/cachefiles/rdwr.c
---- linux-2.6.39.3/fs/cachefiles/rdwr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cachefiles/rdwr.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cachefiles/rdwr.c linux-2.6.39.4/fs/cachefiles/rdwr.c
+--- linux-2.6.39.4/fs/cachefiles/rdwr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cachefiles/rdwr.c	2011-08-05 19:44:37.000000000 -0400
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
@@ -45007,21 +34989,9 @@ diff -urNp linux-2.6.39.3/fs/cachefiles/rdwr.c linux-2.6.39.3/fs/cachefiles/rdwr
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-2.6.39.3/fs/ceph/addr.c linux-2.6.39.3/fs/ceph/addr.c
---- linux-2.6.39.3/fs/ceph/addr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ceph/addr.c	2011-05-22 19:36:32.000000000 -0400
-@@ -1164,7 +1164,7 @@ out:
- 	return ret;
- }
- 
--static struct vm_operations_struct ceph_vmops = {
-+static const struct vm_operations_struct ceph_vmops = {
- 	.fault		= filemap_fault,
- 	.page_mkwrite	= ceph_page_mkwrite,
- };
-diff -urNp linux-2.6.39.3/fs/ceph/dir.c linux-2.6.39.3/fs/ceph/dir.c
---- linux-2.6.39.3/fs/ceph/dir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ceph/dir.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ceph/dir.c linux-2.6.39.4/fs/ceph/dir.c
+--- linux-2.6.39.4/fs/ceph/dir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ceph/dir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
  	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
  	struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -45040,9 +35010,9 @@ diff -urNp linux-2.6.39.3/fs/ceph/dir.c linux-2.6.39.3/fs/ceph/dir.c
  		u64 pos = ceph_make_fpos(frag, off);
  		struct ceph_mds_reply_inode *in =
  			rinfo->dir_in[off - fi->offset].in;
-diff -urNp linux-2.6.39.3/fs/cifs/cifs_debug.c linux-2.6.39.3/fs/cifs/cifs_debug.c
---- linux-2.6.39.3/fs/cifs/cifs_debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cifs/cifs_debug.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cifs/cifs_debug.c linux-2.6.39.4/fs/cifs/cifs_debug.c
+--- linux-2.6.39.4/fs/cifs/cifs_debug.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cifs/cifs_debug.c	2011-08-05 19:44:37.000000000 -0400
 @@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(str
  					tcon = list_entry(tmp3,
  							  struct cifsTconInfo,
@@ -45150,9 +35120,9 @@ diff -urNp linux-2.6.39.3/fs/cifs/cifs_debug.c linux-2.6.39.3/fs/cifs/cifs_debug
  			}
  		}
  	}
-diff -urNp linux-2.6.39.3/fs/cifs/cifsglob.h linux-2.6.39.3/fs/cifs/cifsglob.h
---- linux-2.6.39.3/fs/cifs/cifsglob.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cifs/cifsglob.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cifs/cifsglob.h linux-2.6.39.4/fs/cifs/cifsglob.h
+--- linux-2.6.39.4/fs/cifs/cifsglob.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cifs/cifsglob.h	2011-08-05 19:44:37.000000000 -0400
 @@ -305,28 +305,28 @@ struct cifsTconInfo {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
@@ -45213,9 +35183,9 @@ diff -urNp linux-2.6.39.3/fs/cifs/cifsglob.h linux-2.6.39.3/fs/cifs/cifsglob.h
  
  static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
  					    unsigned int bytes)
-diff -urNp linux-2.6.39.3/fs/cifs/link.c linux-2.6.39.3/fs/cifs/link.c
---- linux-2.6.39.3/fs/cifs/link.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/cifs/link.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/cifs/link.c linux-2.6.39.4/fs/cifs/link.c
+--- linux-2.6.39.4/fs/cifs/link.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/cifs/link.c	2011-08-05 19:44:37.000000000 -0400
 @@ -577,7 +577,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -45225,9 +35195,9 @@ diff -urNp linux-2.6.39.3/fs/cifs/link.c linux-2.6.39.3/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-2.6.39.3/fs/coda/cache.c linux-2.6.39.3/fs/coda/cache.c
---- linux-2.6.39.3/fs/coda/cache.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/coda/cache.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/coda/cache.c linux-2.6.39.4/fs/coda/cache.c
+--- linux-2.6.39.4/fs/coda/cache.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/coda/cache.c	2011-08-05 19:44:37.000000000 -0400
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -45272,9 +35242,9 @@ diff -urNp linux-2.6.39.3/fs/coda/cache.c linux-2.6.39.3/fs/coda/cache.c
  	spin_unlock(&cii->c_lock);
  
  	return hit;
-diff -urNp linux-2.6.39.3/fs/compat_binfmt_elf.c linux-2.6.39.3/fs/compat_binfmt_elf.c
---- linux-2.6.39.3/fs/compat_binfmt_elf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/compat_binfmt_elf.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/compat_binfmt_elf.c linux-2.6.39.4/fs/compat_binfmt_elf.c
+--- linux-2.6.39.4/fs/compat_binfmt_elf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/compat_binfmt_elf.c	2011-08-05 19:44:37.000000000 -0400
 @@ -30,11 +30,13 @@
  #undef	elf_phdr
  #undef	elf_shdr
@@ -45289,9 +35259,9 @@ diff -urNp linux-2.6.39.3/fs/compat_binfmt_elf.c linux-2.6.39.3/fs/compat_binfmt
  #define elf_addr_t	Elf32_Addr
  
  /*
-diff -urNp linux-2.6.39.3/fs/compat.c linux-2.6.39.3/fs/compat.c
---- linux-2.6.39.3/fs/compat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/compat.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/compat.c linux-2.6.39.4/fs/compat.c
+--- linux-2.6.39.4/fs/compat.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/compat.c	2011-08-05 19:44:37.000000000 -0400
 @@ -566,7 +566,7 @@ ssize_t compat_rw_copy_check_uvector(int
  		goto out;
  
@@ -45480,9 +35450,9 @@ diff -urNp linux-2.6.39.3/fs/compat.c linux-2.6.39.3/fs/compat.c
  	if (n < 0)
  		goto out_nofds;
  
-diff -urNp linux-2.6.39.3/fs/compat_ioctl.c linux-2.6.39.3/fs/compat_ioctl.c
---- linux-2.6.39.3/fs/compat_ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/compat_ioctl.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/compat_ioctl.c linux-2.6.39.4/fs/compat_ioctl.c
+--- linux-2.6.39.4/fs/compat_ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/compat_ioctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
  
  	err  = get_user(palp, &up->palette);
@@ -45503,9 +35473,9 @@ diff -urNp linux-2.6.39.3/fs/compat_ioctl.c linux-2.6.39.3/fs/compat_ioctl.c
  	if (a > b)
  		return 1;
  	if (a < b)
-diff -urNp linux-2.6.39.3/fs/configfs/dir.c linux-2.6.39.3/fs/configfs/dir.c
---- linux-2.6.39.3/fs/configfs/dir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/configfs/dir.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/configfs/dir.c linux-2.6.39.4/fs/configfs/dir.c
+--- linux-2.6.39.4/fs/configfs/dir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/configfs/dir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file 
  			}
  			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -45530,33 +35500,9 @@ diff -urNp linux-2.6.39.3/fs/configfs/dir.c linux-2.6.39.3/fs/configfs/dir.c
  
  				/*
  				 * We'll have a dentry and an inode for
-diff -urNp linux-2.6.39.3/fs/configfs/file.c linux-2.6.39.3/fs/configfs/file.c
---- linux-2.6.39.3/fs/configfs/file.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/configfs/file.c	2011-05-22 19:36:32.000000000 -0400
-@@ -215,7 +215,7 @@ static int check_perm(struct inode * ino
- 	struct config_item *item = configfs_get_config_item(file->f_path.dentry->d_parent);
- 	struct configfs_attribute * attr = to_attr(file->f_path.dentry);
- 	struct configfs_buffer * buffer;
--	struct configfs_item_operations * ops = NULL;
-+	struct configfs_item_operations *ops = NULL;
- 	int error = 0;
- 
- 	if (!item || !attr)
-diff -urNp linux-2.6.39.3/fs/configfs/item.c linux-2.6.39.3/fs/configfs/item.c
---- linux-2.6.39.3/fs/configfs/item.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/configfs/item.c	2011-05-22 19:36:32.000000000 -0400
-@@ -123,7 +123,7 @@ void config_item_init_type_name(struct c
- EXPORT_SYMBOL(config_item_init_type_name);
- 
- void config_group_init_type_name(struct config_group *group, const char *name,
--			 struct config_item_type *type)
-+			struct config_item_type *type)
- {
- 	config_item_set_name(&group->cg_item, name);
- 	group->cg_item.ci_type = type;
-diff -urNp linux-2.6.39.3/fs/dcache.c linux-2.6.39.3/fs/dcache.c
---- linux-2.6.39.3/fs/dcache.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/dcache.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/dcache.c linux-2.6.39.4/fs/dcache.c
+--- linux-2.6.39.4/fs/dcache.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/dcache.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3069,7 +3069,7 @@ void __init vfs_caches_init(unsigned lon
  	mempages -= reserve;
  
@@ -45566,21 +35512,9 @@ diff -urNp linux-2.6.39.3/fs/dcache.c linux-2.6.39.3/fs/dcache.c
  
  	dcache_init();
  	inode_init();
-diff -urNp linux-2.6.39.3/fs/dlm/lockspace.c linux-2.6.39.3/fs/dlm/lockspace.c
---- linux-2.6.39.3/fs/dlm/lockspace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/dlm/lockspace.c	2011-05-22 19:36:32.000000000 -0400
-@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
- 	return 0;
- }
- 
--static struct kset_uevent_ops dlm_uevent_ops = {
-+static const struct kset_uevent_ops dlm_uevent_ops = {
- 	.uevent = dlm_uevent,
- };
- 
-diff -urNp linux-2.6.39.3/fs/ecryptfs/inode.c linux-2.6.39.3/fs/ecryptfs/inode.c
---- linux-2.6.39.3/fs/ecryptfs/inode.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/fs/ecryptfs/inode.c	2011-06-03 00:32:07.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ecryptfs/inode.c linux-2.6.39.4/fs/ecryptfs/inode.c
+--- linux-2.6.39.4/fs/ecryptfs/inode.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/fs/ecryptfs/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -623,7 +623,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -45608,9 +35542,9 @@ diff -urNp linux-2.6.39.3/fs/ecryptfs/inode.c linux-2.6.39.3/fs/ecryptfs/inode.c
  	if (!IS_ERR(buf)) {
  		/* Free the char* */
  		kfree(buf);
-diff -urNp linux-2.6.39.3/fs/ecryptfs/miscdev.c linux-2.6.39.3/fs/ecryptfs/miscdev.c
---- linux-2.6.39.3/fs/ecryptfs/miscdev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ecryptfs/miscdev.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ecryptfs/miscdev.c linux-2.6.39.4/fs/ecryptfs/miscdev.c
+--- linux-2.6.39.4/fs/ecryptfs/miscdev.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ecryptfs/miscdev.c	2011-08-05 19:44:37.000000000 -0400
 @@ -328,7 +328,7 @@ check_list:
  		goto out_unlock_msg_ctx;
  	i = 5;
@@ -45620,9 +35554,9 @@ diff -urNp linux-2.6.39.3/fs/ecryptfs/miscdev.c linux-2.6.39.3/fs/ecryptfs/miscd
  			goto out_unlock_msg_ctx;
  		i += packet_length_size;
  		if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-2.6.39.3/fs/exec.c linux-2.6.39.3/fs/exec.c
---- linux-2.6.39.3/fs/exec.c	2011-06-25 12:55:23.000000000 -0400
-+++ linux-2.6.39.3/fs/exec.c	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/exec.c linux-2.6.39.4/fs/exec.c
+--- linux-2.6.39.4/fs/exec.c	2011-06-25 12:55:23.000000000 -0400
++++ linux-2.6.39.4/fs/exec.c	2011-08-05 19:44:37.000000000 -0400
 @@ -55,12 +55,24 @@
  #include <linux/fs_struct.h>
  #include <linux/pipe_fs_i.h>
@@ -46224,9 +36158,9 @@ diff -urNp linux-2.6.39.3/fs/exec.c linux-2.6.39.3/fs/exec.c
  fail_unlock:
  	kfree(cn.corename);
  fail_corename:
-diff -urNp linux-2.6.39.3/fs/ext2/balloc.c linux-2.6.39.3/fs/ext2/balloc.c
---- linux-2.6.39.3/fs/ext2/balloc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ext2/balloc.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ext2/balloc.c linux-2.6.39.4/fs/ext2/balloc.c
+--- linux-2.6.39.4/fs/ext2/balloc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ext2/balloc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -46236,9 +36170,9 @@ diff -urNp linux-2.6.39.3/fs/ext2/balloc.c linux-2.6.39.3/fs/ext2/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.39.3/fs/ext3/balloc.c linux-2.6.39.3/fs/ext3/balloc.c
---- linux-2.6.39.3/fs/ext3/balloc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ext3/balloc.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ext3/balloc.c linux-2.6.39.4/fs/ext3/balloc.c
+--- linux-2.6.39.4/fs/ext3/balloc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ext3/balloc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -46248,9 +36182,9 @@ diff -urNp linux-2.6.39.3/fs/ext3/balloc.c linux-2.6.39.3/fs/ext3/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.39.3/fs/ext4/balloc.c linux-2.6.39.3/fs/ext4/balloc.c
---- linux-2.6.39.3/fs/ext4/balloc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ext4/balloc.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ext4/balloc.c linux-2.6.39.4/fs/ext4/balloc.c
+--- linux-2.6.39.4/fs/ext4/balloc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ext4/balloc.c	2011-08-05 19:44: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 == current_fsuid() ||
@@ -46260,9 +36194,9 @@ diff -urNp linux-2.6.39.3/fs/ext4/balloc.c linux-2.6.39.3/fs/ext4/balloc.c
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
  	}
-diff -urNp linux-2.6.39.3/fs/ext4/ext4.h linux-2.6.39.3/fs/ext4/ext4.h
---- linux-2.6.39.3/fs/ext4/ext4.h	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/fs/ext4/ext4.h	2011-06-03 00:32:07.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ext4/ext4.h linux-2.6.39.4/fs/ext4/ext4.h
+--- linux-2.6.39.4/fs/ext4/ext4.h	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/fs/ext4/ext4.h	2011-08-05 19:44:37.000000000 -0400
 @@ -1166,19 +1166,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
@@ -46293,9 +36227,9 @@ diff -urNp linux-2.6.39.3/fs/ext4/ext4.h linux-2.6.39.3/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff -urNp linux-2.6.39.3/fs/ext4/mballoc.c linux-2.6.39.3/fs/ext4/mballoc.c
---- linux-2.6.39.3/fs/ext4/mballoc.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/fs/ext4/mballoc.c	2011-06-03 00:32:07.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ext4/mballoc.c linux-2.6.39.4/fs/ext4/mballoc.c
+--- linux-2.6.39.4/fs/ext4/mballoc.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/fs/ext4/mballoc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1853,7 +1853,7 @@ void ext4_mb_simple_scan_group(struct ex
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
@@ -46418,9 +36352,9 @@ diff -urNp linux-2.6.39.3/fs/ext4/mballoc.c linux-2.6.39.3/fs/ext4/mballoc.c
  	trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
  	return 0;
-diff -urNp linux-2.6.39.3/fs/fcntl.c linux-2.6.39.3/fs/fcntl.c
---- linux-2.6.39.3/fs/fcntl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fcntl.c	2011-05-22 20:45:50.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fcntl.c linux-2.6.39.4/fs/fcntl.c
+--- linux-2.6.39.4/fs/fcntl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fcntl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
@@ -46458,9 +36392,9 @@ diff -urNp linux-2.6.39.3/fs/fcntl.c linux-2.6.39.3/fs/fcntl.c
  		));
  
  	fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-2.6.39.3/fs/fifo.c linux-2.6.39.3/fs/fifo.c
---- linux-2.6.39.3/fs/fifo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fifo.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fifo.c linux-2.6.39.4/fs/fifo.c
+--- linux-2.6.39.4/fs/fifo.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fifo.c	2011-08-05 19:44:37.000000000 -0400
 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &read_pipefifo_fops;
@@ -46531,9 +36465,9 @@ diff -urNp linux-2.6.39.3/fs/fifo.c linux-2.6.39.3/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-2.6.39.3/fs/file.c linux-2.6.39.3/fs/file.c
---- linux-2.6.39.3/fs/file.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/file.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/file.c linux-2.6.39.4/fs/file.c
+--- linux-2.6.39.4/fs/file.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/file.c	2011-08-05 19:44:37.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -46550,9 +36484,9 @@ diff -urNp linux-2.6.39.3/fs/file.c linux-2.6.39.3/fs/file.c
  	if (nr >= rlimit(RLIMIT_NOFILE))
  		return -EMFILE;
  
-diff -urNp linux-2.6.39.3/fs/filesystems.c linux-2.6.39.3/fs/filesystems.c
---- linux-2.6.39.3/fs/filesystems.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/filesystems.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/filesystems.c linux-2.6.39.4/fs/filesystems.c
+--- linux-2.6.39.4/fs/filesystems.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/filesystems.c	2011-08-05 19:44:37.000000000 -0400
 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
  	int len = dot ? dot - name : strlen(name);
  
@@ -46566,9 +36500,9 @@ diff -urNp linux-2.6.39.3/fs/filesystems.c linux-2.6.39.3/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-2.6.39.3/fs/fscache/cookie.c linux-2.6.39.3/fs/fscache/cookie.c
---- linux-2.6.39.3/fs/fscache/cookie.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fscache/cookie.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fscache/cookie.c linux-2.6.39.4/fs/fscache/cookie.c
+--- linux-2.6.39.4/fs/fscache/cookie.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fscache/cookie.c	2011-08-05 19:44:37.000000000 -0400
 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
  	       parent ? (char *) parent->def->name : "<no-parent>",
  	       def->name, netfs_data);
@@ -46687,9 +36621,9 @@ diff -urNp linux-2.6.39.3/fs/fscache/cookie.c linux-2.6.39.3/fs/fscache/cookie.c
  		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
  			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
  	}
-diff -urNp linux-2.6.39.3/fs/fscache/internal.h linux-2.6.39.3/fs/fscache/internal.h
---- linux-2.6.39.3/fs/fscache/internal.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fscache/internal.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fscache/internal.h linux-2.6.39.4/fs/fscache/internal.h
+--- linux-2.6.39.4/fs/fscache/internal.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fscache/internal.h	2011-08-05 19:44:37.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];
@@ -46893,9 +36827,9 @@ diff -urNp linux-2.6.39.3/fs/fscache/internal.h linux-2.6.39.3/fs/fscache/intern
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-2.6.39.3/fs/fscache/object.c linux-2.6.39.3/fs/fscache/object.c
---- linux-2.6.39.3/fs/fscache/object.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fscache/object.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fscache/object.c linux-2.6.39.4/fs/fscache/object.c
+--- linux-2.6.39.4/fs/fscache/object.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fscache/object.c	2011-08-05 19:44:37.000000000 -0400
 @@ -128,7 +128,7 @@ static void fscache_object_state_machine
  		/* update the object metadata on disk */
  	case FSCACHE_OBJECT_UPDATING:
@@ -47007,9 +36941,9 @@ diff -urNp linux-2.6.39.3/fs/fscache/object.c linux-2.6.39.3/fs/fscache/object.c
  		break;
  
  	default:
-diff -urNp linux-2.6.39.3/fs/fscache/operation.c linux-2.6.39.3/fs/fscache/operation.c
---- linux-2.6.39.3/fs/fscache/operation.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fscache/operation.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fscache/operation.c linux-2.6.39.4/fs/fscache/operation.c
+--- linux-2.6.39.4/fs/fscache/operation.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fscache/operation.c	2011-08-05 19:44:37.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -47125,9 +37059,9 @@ diff -urNp linux-2.6.39.3/fs/fscache/operation.c linux-2.6.39.3/fs/fscache/opera
  
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-2.6.39.3/fs/fscache/page.c linux-2.6.39.3/fs/fscache/page.c
---- linux-2.6.39.3/fs/fscache/page.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/fscache/page.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fscache/page.c linux-2.6.39.4/fs/fscache/page.c
+--- linux-2.6.39.4/fs/fscache/page.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/fs/fscache/page.c	2011-08-05 21:12:20.000000000 -0400
 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
  	val = radix_tree_lookup(&cookie->stores, page->index);
  	if (!val) {
@@ -47511,9 +37445,9 @@ diff -urNp linux-2.6.39.3/fs/fscache/page.c linux-2.6.39.3/fs/fscache/page.c
  #endif
  
  	for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-2.6.39.3/fs/fscache/stats.c linux-2.6.39.3/fs/fscache/stats.c
---- linux-2.6.39.3/fs/fscache/stats.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fscache/stats.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fscache/stats.c linux-2.6.39.4/fs/fscache/stats.c
+--- linux-2.6.39.4/fs/fscache/stats.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fscache/stats.c	2011-08-05 19:44:37.000000000 -0400
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -47889,9 +37823,9 @@ diff -urNp linux-2.6.39.3/fs/fscache/stats.c linux-2.6.39.3/fs/fscache/stats.c
  
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-2.6.39.3/fs/fs_struct.c linux-2.6.39.3/fs/fs_struct.c
---- linux-2.6.39.3/fs/fs_struct.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fs_struct.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fs_struct.c linux-2.6.39.4/fs/fs_struct.c
+--- linux-2.6.39.4/fs/fs_struct.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fs_struct.c	2011-08-05 19:44:37.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -47981,65 +37915,30 @@ diff -urNp linux-2.6.39.3/fs/fs_struct.c linux-2.6.39.3/fs/fs_struct.c
  		spin_unlock(&fs->lock);
  
  		task_unlock(current);
-diff -urNp linux-2.6.39.3/fs/fuse/cuse.c linux-2.6.39.3/fs/fuse/cuse.c
---- linux-2.6.39.3/fs/fuse/cuse.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct file_operations cuse_channel_fops; /* initialized during init */
--
-+static const struct file_operations cuse_channel_fops = { /* initialized during init */
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.read		= do_sync_read,
-+	.aio_read	= fuse_dev_read,
-+	.write		= do_sync_write,
-+	.aio_write	= fuse_dev_write,
-+	.poll		= fuse_dev_poll,
-+	.open		= cuse_channel_open,
-+	.release	= cuse_channel_release,
-+	.fasync		= fuse_dev_fasync,
-+};
- 
- /**************************************************************************
-  * Misc stuff and module initializatiion
-@@ -585,12 +595,6 @@ static int __init cuse_init(void)
- 	for (i = 0; i < CUSE_CONNTBL_LEN; i++)
+diff -urNp linux-2.6.39.4/fs/fuse/cuse.c linux-2.6.39.4/fs/fuse/cuse.c
+--- linux-2.6.39.4/fs/fuse/cuse.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fuse/cuse.c	2011-08-05 20:34:06.000000000 -0400
+@@ -586,10 +586,12 @@ static int __init cuse_init(void)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
--	/* inherit and extend fuse_dev_operations */
+ 	/* inherit and extend fuse_dev_operations */
 -	cuse_channel_fops		= fuse_dev_operations;
 -	cuse_channel_fops.owner		= THIS_MODULE;
 -	cuse_channel_fops.open		= cuse_channel_open;
 -	cuse_channel_fops.release	= cuse_channel_release;
--
++	pax_open_kernel();
++	memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
++	*(void **)&cuse_channel_fops.owner	= THIS_MODULE;
++	*(void **)&cuse_channel_fops.open	= cuse_channel_open;
++	*(void **)&cuse_channel_fops.release	= cuse_channel_release;
++	pax_close_kernel();
+ 
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
- 		return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.39.3/fs/fuse/dev.c linux-2.6.39.3/fs/fuse/dev.c
---- linux-2.6.39.3/fs/fuse/dev.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
-+ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
- 			      unsigned long nr_segs, loff_t pos)
- {
- 	struct fuse_copy_state cs;
-@@ -1195,6 +1195,8 @@ static ssize_t fuse_dev_read(struct kioc
- 	return fuse_dev_do_read(fc, file, &cs, iov_length(iov, nr_segs));
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_read);
-+
- static int fuse_dev_pipe_buf_steal(struct pipe_inode_info *pipe,
- 				   struct pipe_buffer *buf)
- {
-@@ -1238,7 +1240,7 @@ static ssize_t fuse_dev_splice_read(stru
+diff -urNp linux-2.6.39.4/fs/fuse/dev.c linux-2.6.39.4/fs/fuse/dev.c
+--- linux-2.6.39.4/fs/fuse/dev.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fuse/dev.c	2011-08-05 20:34:06.000000000 -0400
+@@ -1238,7 +1238,7 @@ static ssize_t fuse_dev_splice_read(stru
  	ret = 0;
  	pipe_lock(pipe);
  
@@ -48048,63 +37947,9 @@ diff -urNp linux-2.6.39.3/fs/fuse/dev.c linux-2.6.39.3/fs/fuse/dev.c
  		send_sig(SIGPIPE, current, 0);
  		if (!ret)
  			ret = -EPIPE;
-@@ -1731,7 +1733,7 @@ static ssize_t fuse_dev_do_write(struct 
- 	return err;
- }
- 
--static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
-+ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
- 			      unsigned long nr_segs, loff_t pos)
- {
- 	struct fuse_copy_state cs;
-@@ -1744,6 +1746,8 @@ static ssize_t fuse_dev_write(struct kio
- 	return fuse_dev_do_write(fc, &cs, iov_length(iov, nr_segs));
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_write);
-+
- static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
- 				     struct file *out, loff_t *ppos,
- 				     size_t len, unsigned int flags)
-@@ -1822,7 +1826,7 @@ out:
- 	return ret;
- }
- 
--static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
-+unsigned fuse_dev_poll(struct file *file, poll_table *wait)
- {
- 	unsigned mask = POLLOUT | POLLWRNORM;
- 	struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1841,6 +1845,8 @@ static unsigned fuse_dev_poll(struct fil
- 	return mask;
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_poll);
-+
- /*
-  * Abort all requests on the given list (pending or processing)
-  *
-@@ -1977,7 +1983,7 @@ int fuse_dev_release(struct inode *inode
- }
- EXPORT_SYMBOL_GPL(fuse_dev_release);
- 
--static int fuse_dev_fasync(int fd, struct file *file, int on)
-+int fuse_dev_fasync(int fd, struct file *file, int on)
- {
- 	struct fuse_conn *fc = fuse_get_conn(file);
- 	if (!fc)
-@@ -1987,6 +1993,8 @@ static int fuse_dev_fasync(int fd, struc
- 	return fasync_helper(fd, file, on, &fc->fasync);
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_fasync);
-+
- const struct file_operations fuse_dev_operations = {
- 	.owner		= THIS_MODULE,
- 	.llseek		= no_llseek,
-diff -urNp linux-2.6.39.3/fs/fuse/dir.c linux-2.6.39.3/fs/fuse/dir.c
---- linux-2.6.39.3/fs/fuse/dir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fuse/dir.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/fuse/dir.c linux-2.6.39.4/fs/fuse/dir.c
+--- linux-2.6.39.4/fs/fuse/dir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/fuse/dir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *de
  	return link;
  }
@@ -48114,29 +37959,9 @@ diff -urNp linux-2.6.39.3/fs/fuse/dir.c linux-2.6.39.3/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-2.6.39.3/fs/fuse/fuse_i.h linux-2.6.39.3/fs/fuse/fuse_i.h
---- linux-2.6.39.3/fs/fuse/fuse_i.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/fuse/fuse_i.h	2011-05-22 19:36:32.000000000 -0400
-@@ -540,6 +540,16 @@ extern const struct file_operations fuse
- 
- extern const struct dentry_operations fuse_dentry_operations;
- 
-+extern ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
-+			      unsigned long nr_segs, loff_t pos);
-+
-+extern ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
-+			       unsigned long nr_segs, loff_t pos);
-+
-+extern unsigned fuse_dev_poll(struct file *file, poll_table *wait);
-+
-+extern int fuse_dev_fasync(int fd, struct file *file, int on);
-+
- /**
-  * Inode to nodeid comparison.
-  */
-diff -urNp linux-2.6.39.3/fs/gfs2/ops_inode.c linux-2.6.39.3/fs/gfs2/ops_inode.c
---- linux-2.6.39.3/fs/gfs2/ops_inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/gfs2/ops_inode.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/gfs2/ops_inode.c linux-2.6.39.4/fs/gfs2/ops_inode.c
+--- linux-2.6.39.4/fs/gfs2/ops_inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/gfs2/ops_inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -740,6 +740,8 @@ static int gfs2_rename(struct inode *odi
  	unsigned int x;
  	int error;
@@ -48155,9 +37980,9 @@ diff -urNp linux-2.6.39.3/fs/gfs2/ops_inode.c linux-2.6.39.3/fs/gfs2/ops_inode.c
  	if (!IS_ERR(s))
  		kfree(s);
  }
-diff -urNp linux-2.6.39.3/fs/hfsplus/catalog.c linux-2.6.39.3/fs/hfsplus/catalog.c
---- linux-2.6.39.3/fs/hfsplus/catalog.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/hfsplus/catalog.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/hfsplus/catalog.c linux-2.6.39.4/fs/hfsplus/catalog.c
+--- linux-2.6.39.4/fs/hfsplus/catalog.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/hfsplus/catalog.c	2011-08-05 19:44:37.000000000 -0400
 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block 
  	int err;
  	u16 type;
@@ -48185,9 +38010,9 @@ diff -urNp linux-2.6.39.3/fs/hfsplus/catalog.c linux-2.6.39.3/fs/hfsplus/catalog
  	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.3/fs/hfsplus/dir.c linux-2.6.39.3/fs/hfsplus/dir.c
---- linux-2.6.39.3/fs/hfsplus/dir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/hfsplus/dir.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/hfsplus/dir.c linux-2.6.39.4/fs/hfsplus/dir.c
+--- linux-2.6.39.4/fs/hfsplus/dir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/hfsplus/dir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
  	struct hfsplus_readdir_data *rd;
  	u16 type;
@@ -48197,9 +38022,9 @@ diff -urNp linux-2.6.39.3/fs/hfsplus/dir.c linux-2.6.39.3/fs/hfsplus/dir.c
  	if (filp->f_pos >= inode->i_size)
  		return 0;
  
-diff -urNp linux-2.6.39.3/fs/hfsplus/inode.c linux-2.6.39.3/fs/hfsplus/inode.c
---- linux-2.6.39.3/fs/hfsplus/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/hfsplus/inode.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/hfsplus/inode.c linux-2.6.39.4/fs/hfsplus/inode.c
+--- linux-2.6.39.4/fs/hfsplus/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/hfsplus/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode 
  	int res = 0;
  	u16 type;
@@ -48218,9 +38043,9 @@ diff -urNp linux-2.6.39.3/fs/hfsplus/inode.c linux-2.6.39.3/fs/hfsplus/inode.c
  	if (HFSPLUS_IS_RSRC(inode))
  		main_inode = HFSPLUS_I(inode)->rsrc_inode;
  
-diff -urNp linux-2.6.39.3/fs/hfsplus/ioctl.c linux-2.6.39.3/fs/hfsplus/ioctl.c
---- linux-2.6.39.3/fs/hfsplus/ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/hfsplus/ioctl.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/hfsplus/ioctl.c linux-2.6.39.4/fs/hfsplus/ioctl.c
+--- linux-2.6.39.4/fs/hfsplus/ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/hfsplus/ioctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
  	struct hfsplus_cat_file *file;
  	int res;
@@ -48239,9 +38064,9 @@ diff -urNp linux-2.6.39.3/fs/hfsplus/ioctl.c linux-2.6.39.3/fs/hfsplus/ioctl.c
  	if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
  		return -EOPNOTSUPP;
  
-diff -urNp linux-2.6.39.3/fs/hfsplus/super.c linux-2.6.39.3/fs/hfsplus/super.c
---- linux-2.6.39.3/fs/hfsplus/super.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/hfsplus/super.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/hfsplus/super.c linux-2.6.39.4/fs/hfsplus/super.c
+--- linux-2.6.39.4/fs/hfsplus/super.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/hfsplus/super.c	2011-08-05 19:44:37.000000000 -0400
 @@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
  	struct nls_table *nls = NULL;
  	int err;
@@ -48251,9 +38076,9 @@ diff -urNp linux-2.6.39.3/fs/hfsplus/super.c linux-2.6.39.3/fs/hfsplus/super.c
  	err = -EINVAL;
  	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
  	if (!sbi)
-diff -urNp linux-2.6.39.3/fs/hugetlbfs/inode.c linux-2.6.39.3/fs/hugetlbfs/inode.c
---- linux-2.6.39.3/fs/hugetlbfs/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/hugetlbfs/inode.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/hugetlbfs/inode.c linux-2.6.39.4/fs/hugetlbfs/inode.c
+--- linux-2.6.39.4/fs/hugetlbfs/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/hugetlbfs/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
  	.kill_sb	= kill_litter_super,
  };
@@ -48263,9 +38088,9 @@ diff -urNp linux-2.6.39.3/fs/hugetlbfs/inode.c linux-2.6.39.3/fs/hugetlbfs/inode
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-2.6.39.3/fs/inode.c linux-2.6.39.3/fs/inode.c
---- linux-2.6.39.3/fs/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/inode.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/inode.c linux-2.6.39.4/fs/inode.c
+--- linux-2.6.39.4/fs/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -862,8 +862,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
@@ -48277,9 +38102,9 @@ diff -urNp linux-2.6.39.3/fs/inode.c linux-2.6.39.3/fs/inode.c
  
  		res = next - LAST_INO_BATCH;
  	}
-diff -urNp linux-2.6.39.3/fs/jbd/checkpoint.c linux-2.6.39.3/fs/jbd/checkpoint.c
---- linux-2.6.39.3/fs/jbd/checkpoint.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/jbd/checkpoint.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/jbd/checkpoint.c linux-2.6.39.4/fs/jbd/checkpoint.c
+--- linux-2.6.39.4/fs/jbd/checkpoint.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/jbd/checkpoint.c	2011-08-05 19:44:37.000000000 -0400
 @@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
  	tid_t this_tid;
  	int result;
@@ -48289,9 +38114,9 @@ diff -urNp linux-2.6.39.3/fs/jbd/checkpoint.c linux-2.6.39.3/fs/jbd/checkpoint.c
  	jbd_debug(1, "Start checkpoint\n");
  
  	/*
-diff -urNp linux-2.6.39.3/fs/jffs2/compr_rtime.c linux-2.6.39.3/fs/jffs2/compr_rtime.c
---- linux-2.6.39.3/fs/jffs2/compr_rtime.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/jffs2/compr_rtime.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/jffs2/compr_rtime.c linux-2.6.39.4/fs/jffs2/compr_rtime.c
+--- linux-2.6.39.4/fs/jffs2/compr_rtime.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/jffs2/compr_rtime.c	2011-08-05 19:44:37.000000000 -0400
 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
  	int outpos = 0;
  	int pos=0;
@@ -48310,9 +38135,9 @@ diff -urNp linux-2.6.39.3/fs/jffs2/compr_rtime.c linux-2.6.39.3/fs/jffs2/compr_r
  	memset(positions,0,sizeof(positions));
  
  	while (outpos<destlen) {
-diff -urNp linux-2.6.39.3/fs/jffs2/compr_rubin.c linux-2.6.39.3/fs/jffs2/compr_rubin.c
---- linux-2.6.39.3/fs/jffs2/compr_rubin.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/jffs2/compr_rubin.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/jffs2/compr_rubin.c linux-2.6.39.4/fs/jffs2/compr_rubin.c
+--- linux-2.6.39.4/fs/jffs2/compr_rubin.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/jffs2/compr_rubin.c	2011-08-05 19:44:37.000000000 -0400
 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
  	int ret;
  	uint32_t mysrclen, mydstlen;
@@ -48322,9 +38147,9 @@ diff -urNp linux-2.6.39.3/fs/jffs2/compr_rubin.c linux-2.6.39.3/fs/jffs2/compr_r
  	mysrclen = *sourcelen;
  	mydstlen = *dstlen - 8;
  
-diff -urNp linux-2.6.39.3/fs/jffs2/erase.c linux-2.6.39.3/fs/jffs2/erase.c
---- linux-2.6.39.3/fs/jffs2/erase.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/jffs2/erase.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/jffs2/erase.c linux-2.6.39.4/fs/jffs2/erase.c
+--- linux-2.6.39.4/fs/jffs2/erase.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/jffs2/erase.c	2011-08-05 19:44:37.000000000 -0400
 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -48335,9 +38160,9 @@ diff -urNp linux-2.6.39.3/fs/jffs2/erase.c linux-2.6.39.3/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.39.3/fs/jffs2/wbuf.c linux-2.6.39.3/fs/jffs2/wbuf.c
---- linux-2.6.39.3/fs/jffs2/wbuf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/jffs2/wbuf.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/jffs2/wbuf.c linux-2.6.39.4/fs/jffs2/wbuf.c
+--- linux-2.6.39.4/fs/jffs2/wbuf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/jffs2/wbuf.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -48348,9 +38173,9 @@ diff -urNp linux-2.6.39.3/fs/jffs2/wbuf.c linux-2.6.39.3/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-2.6.39.3/fs/jffs2/xattr.c linux-2.6.39.3/fs/jffs2/xattr.c
---- linux-2.6.39.3/fs/jffs2/xattr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/jffs2/xattr.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/jffs2/xattr.c linux-2.6.39.4/fs/jffs2/xattr.c
+--- linux-2.6.39.4/fs/jffs2/xattr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/jffs2/xattr.c	2011-08-05 19:44:37.000000000 -0400
 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct 
  
  	BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -48360,9 +38185,9 @@ diff -urNp linux-2.6.39.3/fs/jffs2/xattr.c linux-2.6.39.3/fs/jffs2/xattr.c
  	/* Phase.1 : Merge same xref */
  	for (i=0; i < XREF_TMPHASH_SIZE; i++)
  		xref_tmphash[i] = NULL;
-diff -urNp linux-2.6.39.3/fs/jfs/super.c linux-2.6.39.3/fs/jfs/super.c
---- linux-2.6.39.3/fs/jfs/super.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/jfs/super.c	2011-06-07 18:07:24.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/jfs/super.c linux-2.6.39.4/fs/jfs/super.c
+--- linux-2.6.39.4/fs/jfs/super.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/jfs/super.c	2011-08-05 19:44:37.000000000 -0400
 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
  
  	jfs_inode_cachep =
@@ -48372,9 +38197,9 @@ diff -urNp linux-2.6.39.3/fs/jfs/super.c linux-2.6.39.3/fs/jfs/super.c
  			    init_once);
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
-diff -urNp linux-2.6.39.3/fs/Kconfig.binfmt linux-2.6.39.3/fs/Kconfig.binfmt
---- linux-2.6.39.3/fs/Kconfig.binfmt	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/Kconfig.binfmt	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/Kconfig.binfmt linux-2.6.39.4/fs/Kconfig.binfmt
+--- linux-2.6.39.4/fs/Kconfig.binfmt	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/Kconfig.binfmt	2011-08-05 19:44:37.000000000 -0400
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -48384,9 +38209,9 @@ diff -urNp linux-2.6.39.3/fs/Kconfig.binfmt linux-2.6.39.3/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.3/fs/libfs.c linux-2.6.39.3/fs/libfs.c
---- linux-2.6.39.3/fs/libfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/libfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/libfs.c linux-2.6.39.4/fs/libfs.c
+--- linux-2.6.39.4/fs/libfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/libfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
  
  			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
@@ -48411,9 +38236,9 @@ diff -urNp linux-2.6.39.3/fs/libfs.c linux-2.6.39.3/fs/libfs.c
  					    next->d_name.len, filp->f_pos, 
  					    next->d_inode->i_ino, 
  					    dt_type(next->d_inode)) < 0)
-diff -urNp linux-2.6.39.3/fs/lockd/clntproc.c linux-2.6.39.3/fs/lockd/clntproc.c
---- linux-2.6.39.3/fs/lockd/clntproc.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/lockd/clntproc.c	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/lockd/clntproc.c linux-2.6.39.4/fs/lockd/clntproc.c
+--- linux-2.6.39.4/fs/lockd/clntproc.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/fs/lockd/clntproc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
@@ -48437,21 +38262,9 @@ diff -urNp linux-2.6.39.3/fs/lockd/clntproc.c linux-2.6.39.3/fs/lockd/clntproc.c
  	req = &reqst;
  	memset(req, 0, sizeof(*req));
  	locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-2.6.39.3/fs/lockd/svc.c linux-2.6.39.3/fs/lockd/svc.c
---- linux-2.6.39.3/fs/lockd/svc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/lockd/svc.c	2011-05-22 19:36:32.000000000 -0400
-@@ -41,7 +41,7 @@
- 
- static struct svc_program	nlmsvc_program;
- 
--struct nlmsvc_binding *		nlmsvc_ops;
-+const struct nlmsvc_binding *	nlmsvc_ops;
- EXPORT_SYMBOL_GPL(nlmsvc_ops);
- 
- static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.39.3/fs/locks.c linux-2.6.39.3/fs/locks.c
---- linux-2.6.39.3/fs/locks.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/locks.c	2011-07-06 19:44:53.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/locks.c linux-2.6.39.4/fs/locks.c
+--- linux-2.6.39.4/fs/locks.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/fs/locks.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
  		return;
  
@@ -48473,9 +38286,9 @@ diff -urNp linux-2.6.39.3/fs/locks.c linux-2.6.39.3/fs/locks.c
  	}
  
  	lock_flocks();
-diff -urNp linux-2.6.39.3/fs/logfs/super.c linux-2.6.39.3/fs/logfs/super.c
---- linux-2.6.39.3/fs/logfs/super.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/logfs/super.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/logfs/super.c linux-2.6.39.4/fs/logfs/super.c
+--- linux-2.6.39.4/fs/logfs/super.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/logfs/super.c	2011-08-05 19:44:37.000000000 -0400
 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
  	struct logfs_disk_super _ds1, *ds1 = &_ds1;
  	int err, valid0, valid1;
@@ -48485,9 +38298,9 @@ diff -urNp linux-2.6.39.3/fs/logfs/super.c linux-2.6.39.3/fs/logfs/super.c
  	/* read first superblock */
  	err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
  	if (err)
-diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
---- linux-2.6.39.3/fs/namei.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/fs/namei.c	2011-06-03 00:32:07.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/namei.c linux-2.6.39.4/fs/namei.c
+--- linux-2.6.39.4/fs/namei.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/fs/namei.c	2011-08-05 21:12:20.000000000 -0400
 @@ -237,20 +237,30 @@ int generic_permission(struct inode *ino
  		return ret;
  
@@ -48577,7 +38390,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  		error = 0;
  		if (s)
  			error = __vfs_follow_link(nd, s);
-@@ -1697,6 +1725,9 @@ static int do_path_lookup(int dfd, const
+@@ -1702,6 +1730,9 @@ static int do_path_lookup(int dfd, const
  		retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
  
  	if (likely(!retval)) {
@@ -48587,7 +38400,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  		if (unlikely(!audit_dummy_context())) {
  			if (nd->path.dentry && nd->inode)
  				audit_inode(name, nd->path.dentry);
-@@ -2007,6 +2038,30 @@ int vfs_create(struct inode *dir, struct
+@@ -2012,6 +2043,30 @@ int vfs_create(struct inode *dir, struct
  	return error;
  }
  
@@ -48618,7 +38431,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  static int may_open(struct path *path, int acc_mode, int flag)
  {
  	struct dentry *dentry = path->dentry;
-@@ -2059,7 +2114,27 @@ static int may_open(struct path *path, i
+@@ -2064,7 +2119,27 @@ static int may_open(struct path *path, i
  	/*
  	 * Ensure there are no outstanding leases on the file.
  	 */
@@ -48647,7 +38460,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  }
  
  static int handle_truncate(struct file *filp)
-@@ -2085,30 +2160,6 @@ static int handle_truncate(struct file *
+@@ -2090,30 +2165,6 @@ static int handle_truncate(struct file *
  }
  
  /*
@@ -48678,7 +38491,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
   * Handle the last step of open()
   */
  static struct file *do_last(struct nameidata *nd, struct path *path,
-@@ -2117,6 +2168,7 @@ static struct file *do_last(struct namei
+@@ -2122,6 +2173,7 @@ static struct file *do_last(struct namei
  	struct dentry *dir = nd->path.dentry;
  	struct dentry *dentry;
  	int open_flag = op->open_flag;
@@ -48686,7 +38499,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	int will_truncate = open_flag & O_TRUNC;
  	int want_write = 0;
  	int acc_mode = op->acc_mode;
-@@ -2212,6 +2264,12 @@ static struct file *do_last(struct namei
+@@ -2217,6 +2269,12 @@ static struct file *do_last(struct namei
  	/* Negative dentry, just create the file */
  	if (!dentry->d_inode) {
  		int mode = op->mode;
@@ -48699,7 +38512,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  		if (!IS_POSIXACL(dir->d_inode))
  			mode &= ~current_umask();
  		/*
-@@ -2235,6 +2293,8 @@ static struct file *do_last(struct namei
+@@ -2240,6 +2298,8 @@ static struct file *do_last(struct namei
  		error = vfs_create(dir->d_inode, dentry, mode, nd);
  		if (error)
  			goto exit_mutex_unlock;
@@ -48708,7 +38521,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  		mutex_unlock(&dir->d_inode->i_mutex);
  		dput(nd->path.dentry);
  		nd->path.dentry = dentry;
-@@ -2244,6 +2304,14 @@ static struct file *do_last(struct namei
+@@ -2249,6 +2309,14 @@ static struct file *do_last(struct namei
  	/*
  	 * It already exists.
  	 */
@@ -48723,7 +38536,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	mutex_unlock(&dir->d_inode->i_mutex);
  	audit_inode(pathname, path->dentry);
  
-@@ -2530,6 +2598,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2535,6 +2603,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	error = may_mknod(mode);
  	if (error)
  		goto out_dput;
@@ -48741,7 +38554,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2550,6 +2629,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2555,6 +2634,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	}
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -48751,7 +38564,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2602,6 +2684,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2607,6 +2689,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -48763,7 +38576,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	if (!IS_POSIXACL(nd.path.dentry->d_inode))
  		mode &= ~current_umask();
  	error = mnt_want_write(nd.path.mnt);
-@@ -2613,6 +2700,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2618,6 +2705,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
  	error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -48774,7 +38587,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2692,6 +2783,8 @@ static long do_rmdir(int dfd, const char
+@@ -2697,6 +2788,8 @@ static long do_rmdir(int dfd, const char
  	char * name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -48783,7 +38596,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2716,6 +2809,19 @@ static long do_rmdir(int dfd, const char
+@@ -2721,6 +2814,19 @@ static long do_rmdir(int dfd, const char
  	error = PTR_ERR(dentry);
  	if (IS_ERR(dentry))
  		goto exit2;
@@ -48803,7 +38616,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto exit3;
-@@ -2723,6 +2829,8 @@ static long do_rmdir(int dfd, const char
+@@ -2728,6 +2834,8 @@ static long do_rmdir(int dfd, const char
  	if (error)
  		goto exit4;
  	error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -48812,7 +38625,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  exit4:
  	mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2785,6 +2893,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2790,6 +2898,8 @@ static long do_unlinkat(int dfd, const c
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -48821,7 +38634,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2804,8 +2914,17 @@ static long do_unlinkat(int dfd, const c
+@@ -2809,8 +2919,17 @@ static long do_unlinkat(int dfd, const c
  		if (nd.last.name[nd.last.len])
  			goto slashes;
  		inode = dentry->d_inode;
@@ -48840,7 +38653,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  		error = mnt_want_write(nd.path.mnt);
  		if (error)
  			goto exit2;
-@@ -2813,6 +2932,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2818,6 +2937,8 @@ static long do_unlinkat(int dfd, const c
  		if (error)
  			goto exit3;
  		error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -48849,7 +38662,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  exit3:
  		mnt_drop_write(nd.path.mnt);
  	exit2:
-@@ -2890,6 +3011,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2895,6 +3016,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -48861,7 +38674,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2897,6 +3023,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2902,6 +3028,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (error)
  		goto out_drop_write;
  	error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -48870,7 +38683,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -3005,6 +3133,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -3010,6 +3138,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
  		goto out_unlock;
@@ -48891,7 +38704,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -3012,6 +3154,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -3017,6 +3159,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
  	if (error)
  		goto out_drop_write;
  	error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -48900,7 +38713,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -3189,6 +3333,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3194,6 +3338,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	char *to;
  	int error;
  
@@ -48909,7 +38722,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	error = user_path_parent(olddfd, oldname, &oldnd, &from);
  	if (error)
  		goto exit;
-@@ -3245,6 +3391,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3250,6 +3396,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -48922,7 +38735,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	error = mnt_want_write(oldnd.path.mnt);
  	if (error)
  		goto exit5;
-@@ -3254,6 +3406,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3259,6 +3411,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  		goto exit6;
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  				   new_dir->d_inode, new_dentry);
@@ -48932,7 +38745,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  exit6:
  	mnt_drop_write(oldnd.path.mnt);
  exit5:
-@@ -3279,6 +3434,8 @@ SYSCALL_DEFINE2(rename, const char __use
+@@ -3284,6 +3439,8 @@ SYSCALL_DEFINE2(rename, const char __use
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -48941,7 +38754,7 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  	int len;
  
  	len = PTR_ERR(link);
-@@ -3288,7 +3445,14 @@ int vfs_readlink(struct dentry *dentry, 
+@@ -3293,7 +3450,14 @@ int vfs_readlink(struct dentry *dentry, 
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -48957,9 +38770,9 @@ diff -urNp linux-2.6.39.3/fs/namei.c linux-2.6.39.3/fs/namei.c
  		len = -EFAULT;
  out:
  	return len;
-diff -urNp linux-2.6.39.3/fs/namespace.c linux-2.6.39.3/fs/namespace.c
---- linux-2.6.39.3/fs/namespace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/namespace.c	2011-05-22 20:43:58.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/namespace.c linux-2.6.39.4/fs/namespace.c
+--- linux-2.6.39.4/fs/namespace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/namespace.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -49019,9 +38832,9 @@ diff -urNp linux-2.6.39.3/fs/namespace.c linux-2.6.39.3/fs/namespace.c
  	get_fs_root(current->fs, &root);
  	error = lock_mount(&old);
  	if (error)
-diff -urNp linux-2.6.39.3/fs/ncpfs/dir.c linux-2.6.39.3/fs/ncpfs/dir.c
---- linux-2.6.39.3/fs/ncpfs/dir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ncpfs/dir.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ncpfs/dir.c linux-2.6.39.4/fs/ncpfs/dir.c
+--- linux-2.6.39.4/fs/ncpfs/dir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ncpfs/dir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
  	int res, val = 0, len;
  	__u8 __name[NCP_MAXPATHLEN + 1];
@@ -49067,9 +38880,9 @@ diff -urNp linux-2.6.39.3/fs/ncpfs/dir.c linux-2.6.39.3/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.3/fs/ncpfs/inode.c linux-2.6.39.3/fs/ncpfs/inode.c
---- linux-2.6.39.3/fs/ncpfs/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ncpfs/inode.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ncpfs/inode.c linux-2.6.39.4/fs/ncpfs/inode.c
+--- linux-2.6.39.4/fs/ncpfs/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ncpfs/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
  #endif
  	struct ncp_entry_info finfo;
@@ -49079,9 +38892,9 @@ diff -urNp linux-2.6.39.3/fs/ncpfs/inode.c linux-2.6.39.3/fs/ncpfs/inode.c
  	data.wdog_pid = NULL;
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
-diff -urNp linux-2.6.39.3/fs/nfs/inode.c linux-2.6.39.3/fs/nfs/inode.c
---- linux-2.6.39.3/fs/nfs/inode.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/nfs/inode.c	2011-07-09 09:19:24.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/nfs/inode.c linux-2.6.39.4/fs/nfs/inode.c
+--- linux-2.6.39.4/fs/nfs/inode.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/fs/nfs/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
  	nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
  	nfsi->attrtimeo_timestamp = jiffies;
@@ -49111,41 +38924,9 @@ diff -urNp linux-2.6.39.3/fs/nfs/inode.c linux-2.6.39.3/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.39.3/fs/nfs/nfs4proc.c linux-2.6.39.3/fs/nfs/nfs4proc.c
---- linux-2.6.39.3/fs/nfs/nfs4proc.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/nfs/nfs4proc.c	2011-07-09 09:19:24.000000000 -0400
-@@ -5858,14 +5858,14 @@ struct nfs4_state_recovery_ops nfs41_nog
- };
- #endif /* CONFIG_NFS_V4_1 */
- 
--struct nfs4_state_maintenance_ops nfs40_state_renewal_ops = {
-+const struct nfs4_state_maintenance_ops nfs40_state_renewal_ops = {
- 	.sched_state_renewal = nfs4_proc_async_renew,
- 	.get_state_renewal_cred_locked = nfs4_get_renew_cred_locked,
- 	.renew_lease = nfs4_proc_renew,
- };
- 
- #if defined(CONFIG_NFS_V4_1)
--struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = {
-+const struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = {
- 	.sched_state_renewal = nfs41_proc_async_sequence,
- 	.get_state_renewal_cred_locked = nfs4_get_machine_cred_locked,
- 	.renew_lease = nfs4_proc_sequence,
-diff -urNp linux-2.6.39.3/fs/nfsd/lockd.c linux-2.6.39.3/fs/nfsd/lockd.c
---- linux-2.6.39.3/fs/nfsd/lockd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/nfsd/lockd.c	2011-05-22 19:36:32.000000000 -0400
-@@ -60,7 +60,7 @@ nlm_fclose(struct file *filp)
- 	fput(filp);
- }
- 
--static struct nlmsvc_binding	nfsd_nlm_ops = {
-+static const struct nlmsvc_binding	nfsd_nlm_ops = {
- 	.fopen		= nlm_fopen,		/* open file for locking */
- 	.fclose		= nlm_fclose,		/* close file */
- };
-diff -urNp linux-2.6.39.3/fs/nfsd/nfs4state.c linux-2.6.39.3/fs/nfsd/nfs4state.c
---- linux-2.6.39.3/fs/nfsd/nfs4state.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/nfsd/nfs4state.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/nfsd/nfs4state.c linux-2.6.39.4/fs/nfsd/nfs4state.c
+--- linux-2.6.39.4/fs/nfsd/nfs4state.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/nfsd/nfs4state.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3784,6 +3784,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
  	unsigned int strhashval;
  	int err;
@@ -49155,9 +38936,9 @@ diff -urNp linux-2.6.39.3/fs/nfsd/nfs4state.c linux-2.6.39.3/fs/nfsd/nfs4state.c
  	dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
  		(long long) lock->lk_offset,
  		(long long) lock->lk_length);
-diff -urNp linux-2.6.39.3/fs/nfsd/nfs4xdr.c linux-2.6.39.3/fs/nfsd/nfs4xdr.c
---- linux-2.6.39.3/fs/nfsd/nfs4xdr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/nfsd/nfs4xdr.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/nfsd/nfs4xdr.c linux-2.6.39.4/fs/nfsd/nfs4xdr.c
+--- linux-2.6.39.4/fs/nfsd/nfs4xdr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/nfsd/nfs4xdr.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1793,6 +1793,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
  		.dentry	= dentry,
  	};
@@ -49167,21 +38948,9 @@ diff -urNp linux-2.6.39.3/fs/nfsd/nfs4xdr.c linux-2.6.39.3/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.3/fs/nfsd/nfsctl.c linux-2.6.39.3/fs/nfsd/nfsctl.c
---- linux-2.6.39.3/fs/nfsd/nfsctl.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/nfsd/nfsctl.c	2011-07-09 09:19:24.000000000 -0400
-@@ -183,7 +183,7 @@ static int export_features_open(struct i
- 	return single_open(file, export_features_show, NULL);
- }
- 
--static struct file_operations export_features_operations = {
-+static const struct file_operations export_features_operations = {
- 	.open		= export_features_open,
- 	.read		= seq_read,
- 	.llseek		= seq_lseek,
-diff -urNp linux-2.6.39.3/fs/nfsd/vfs.c linux-2.6.39.3/fs/nfsd/vfs.c
---- linux-2.6.39.3/fs/nfsd/vfs.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/fs/nfsd/vfs.c	2011-07-09 09:19:24.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/nfsd/vfs.c linux-2.6.39.4/fs/nfsd/vfs.c
+--- linux-2.6.39.4/fs/nfsd/vfs.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/fs/nfsd/vfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -901,7 +901,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
@@ -49209,69 +38978,9 @@ diff -urNp linux-2.6.39.3/fs/nfsd/vfs.c linux-2.6.39.3/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-2.6.39.3/fs/nilfs2/segment.c linux-2.6.39.3/fs/nilfs2/segment.c
---- linux-2.6.39.3/fs/nilfs2/segment.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/nilfs2/segment.c	2011-05-22 19:36:32.000000000 -0400
-@@ -555,7 +555,7 @@ static void nilfs_write_file_node_binfo(
- 	*vblocknr = binfo->bi_v.bi_vblocknr;
- }
- 
--static struct nilfs_sc_operations nilfs_sc_file_ops = {
-+static const struct nilfs_sc_operations nilfs_sc_file_ops = {
- 	.collect_data = nilfs_collect_file_data,
- 	.collect_node = nilfs_collect_file_node,
- 	.collect_bmap = nilfs_collect_file_bmap,
-@@ -604,7 +604,7 @@ static void nilfs_write_dat_node_binfo(s
- 	*binfo_dat = binfo->bi_dat;
- }
- 
--static struct nilfs_sc_operations nilfs_sc_dat_ops = {
-+static const struct nilfs_sc_operations nilfs_sc_dat_ops = {
- 	.collect_data = nilfs_collect_dat_data,
- 	.collect_node = nilfs_collect_file_node,
- 	.collect_bmap = nilfs_collect_dat_bmap,
-@@ -612,7 +612,7 @@ static struct nilfs_sc_operations nilfs_
- 	.write_node_binfo = nilfs_write_dat_node_binfo,
- };
- 
--static struct nilfs_sc_operations nilfs_sc_dsync_ops = {
-+static const struct nilfs_sc_operations nilfs_sc_dsync_ops = {
- 	.collect_data = nilfs_collect_file_data,
- 	.collect_node = NULL,
- 	.collect_bmap = NULL,
-@@ -971,7 +971,7 @@ static size_t nilfs_segctor_buffer_rest(
- 
- static int nilfs_segctor_scan_file(struct nilfs_sc_info *sci,
- 				   struct inode *inode,
--				   struct nilfs_sc_operations *sc_ops)
-+				   const struct nilfs_sc_operations *sc_ops)
- {
- 	LIST_HEAD(data_buffers);
- 	LIST_HEAD(node_buffers);
-@@ -1475,7 +1475,7 @@ nilfs_segctor_update_payload_blocknr(str
- 	sector_t blocknr;
- 	unsigned long nfinfo = segbuf->sb_sum.nfinfo;
- 	unsigned long nblocks = 0, ndatablk = 0;
--	struct nilfs_sc_operations *sc_op = NULL;
-+	const struct nilfs_sc_operations *sc_op = NULL;
- 	struct nilfs_segsum_pointer ssp;
- 	struct nilfs_finfo *finfo = NULL;
- 	union nilfs_binfo binfo;
-diff -urNp linux-2.6.39.3/fs/notify/dnotify/dnotify.c linux-2.6.39.3/fs/notify/dnotify/dnotify.c
---- linux-2.6.39.3/fs/notify/dnotify/dnotify.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/notify/dnotify/dnotify.c	2011-05-22 19:36:32.000000000 -0400
-@@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsn
- 	kmem_cache_free(dnotify_mark_cache, dn_mark);
- }
- 
--static struct fsnotify_ops dnotify_fsnotify_ops = {
-+static const struct fsnotify_ops dnotify_fsnotify_ops = {
- 	.handle_event = dnotify_handle_event,
- 	.should_send_event = dnotify_should_send_event,
- 	.free_group_priv = NULL,
-diff -urNp linux-2.6.39.3/fs/notify/notification.c linux-2.6.39.3/fs/notify/notification.c
---- linux-2.6.39.3/fs/notify/notification.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/notify/notification.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/notify/notification.c linux-2.6.39.4/fs/notify/notification.c
+--- linux-2.6.39.4/fs/notify/notification.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/notify/notification.c	2011-08-05 19:44:37.000000000 -0400
 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
@@ -49290,9 +38999,9 @@ diff -urNp linux-2.6.39.3/fs/notify/notification.c linux-2.6.39.3/fs/notify/noti
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-2.6.39.3/fs/ntfs/dir.c linux-2.6.39.3/fs/ntfs/dir.c
---- linux-2.6.39.3/fs/ntfs/dir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ntfs/dir.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ntfs/dir.c linux-2.6.39.4/fs/ntfs/dir.c
+--- linux-2.6.39.4/fs/ntfs/dir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ntfs/dir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
@@ -49302,9 +39011,9 @@ diff -urNp linux-2.6.39.3/fs/ntfs/dir.c linux-2.6.39.3/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.3/fs/ntfs/file.c linux-2.6.39.3/fs/ntfs/file.c
---- linux-2.6.39.3/fs/ntfs/file.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ntfs/file.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ntfs/file.c linux-2.6.39.4/fs/ntfs/file.c
+--- linux-2.6.39.4/fs/ntfs/file.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ntfs/file.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
@@ -49314,42 +39023,9 @@ diff -urNp linux-2.6.39.3/fs/ntfs/file.c linux-2.6.39.3/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.39.3/fs/ocfs2/cluster/heartbeat.c linux-2.6.39.3/fs/ocfs2/cluster/heartbeat.c
---- linux-2.6.39.3/fs/ocfs2/cluster/heartbeat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/cluster/heartbeat.c	2011-05-22 19:36:32.000000000 -0400
-@@ -2261,7 +2261,7 @@ static struct configfs_item_operations o
- 	.store_attribute	= o2hb_heartbeat_group_store,
- };
- 
--static struct configfs_group_operations o2hb_heartbeat_group_group_ops = {
-+static const struct configfs_group_operations o2hb_heartbeat_group_group_ops = {
- 	.make_item	= o2hb_heartbeat_group_make_item,
- 	.drop_item	= o2hb_heartbeat_group_drop_item,
- };
-diff -urNp linux-2.6.39.3/fs/ocfs2/cluster/nodemanager.c linux-2.6.39.3/fs/ocfs2/cluster/nodemanager.c
---- linux-2.6.39.3/fs/ocfs2/cluster/nodemanager.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/cluster/nodemanager.c	2011-05-22 19:36:32.000000000 -0400
-@@ -752,7 +752,7 @@ static void o2nm_node_group_drop_item(st
- 	config_item_put(item);
- }
- 
--static struct configfs_group_operations o2nm_node_group_group_ops = {
-+static const struct configfs_group_operations o2nm_node_group_group_ops = {
- 	.make_item	= o2nm_node_group_make_item,
- 	.drop_item	= o2nm_node_group_drop_item,
- };
-@@ -869,7 +869,7 @@ static void o2nm_cluster_group_drop_item
- 	config_item_put(item);
- }
- 
--static struct configfs_group_operations o2nm_cluster_group_group_ops = {
-+static const struct configfs_group_operations o2nm_cluster_group_group_ops = {
- 	.make_group	= o2nm_cluster_group_make_group,
- 	.drop_item	= o2nm_cluster_group_drop_item,
- };
-diff -urNp linux-2.6.39.3/fs/ocfs2/localalloc.c linux-2.6.39.3/fs/ocfs2/localalloc.c
---- linux-2.6.39.3/fs/ocfs2/localalloc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/localalloc.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ocfs2/localalloc.c linux-2.6.39.4/fs/ocfs2/localalloc.c
+--- linux-2.6.39.4/fs/ocfs2/localalloc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ocfs2/localalloc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
  		goto bail;
  	}
@@ -49359,9 +39035,9 @@ diff -urNp linux-2.6.39.3/fs/ocfs2/localalloc.c linux-2.6.39.3/fs/ocfs2/localall
  
  bail:
  	if (handle)
-diff -urNp linux-2.6.39.3/fs/ocfs2/namei.c linux-2.6.39.3/fs/ocfs2/namei.c
---- linux-2.6.39.3/fs/ocfs2/namei.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/namei.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ocfs2/namei.c linux-2.6.39.4/fs/ocfs2/namei.c
+--- linux-2.6.39.4/fs/ocfs2/namei.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ocfs2/namei.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
  	struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
  	struct ocfs2_dir_lookup_result target_insert = { NULL, };
@@ -49371,9 +39047,9 @@ diff -urNp linux-2.6.39.3/fs/ocfs2/namei.c linux-2.6.39.3/fs/ocfs2/namei.c
  	/* At some point it might be nice to break this function up a
  	 * bit. */
  
-diff -urNp linux-2.6.39.3/fs/ocfs2/ocfs2.h linux-2.6.39.3/fs/ocfs2/ocfs2.h
---- linux-2.6.39.3/fs/ocfs2/ocfs2.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/ocfs2.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ocfs2/ocfs2.h linux-2.6.39.4/fs/ocfs2/ocfs2.h
+--- linux-2.6.39.4/fs/ocfs2/ocfs2.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ocfs2/ocfs2.h	2011-08-05 19:44:37.000000000 -0400
 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -49391,61 +39067,9 @@ diff -urNp linux-2.6.39.3/fs/ocfs2/ocfs2.h linux-2.6.39.3/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.39.3/fs/ocfs2/stackglue.h linux-2.6.39.3/fs/ocfs2/stackglue.h
---- linux-2.6.39.3/fs/ocfs2/stackglue.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/stackglue.h	2011-05-22 19:36:32.000000000 -0400
-@@ -221,13 +221,13 @@ struct ocfs2_stack_operations {
- };
- 
- /*
-- * Each stack plugin must describe itself by registering a
-+ * Each stack plugin must describe itself by registerin const g a
-  * ocfs2_stack_plugin structure.  This is only seen by stackglue and the
-  * stack driver.
-  */
- struct ocfs2_stack_plugin {
- 	char *sp_name;
--	struct ocfs2_stack_operations *sp_ops;
-+	const struct ocfs2_stack_operations *sp_ops;
- 	struct module *sp_owner;
- 
- 	/* These are managed by the stackglue code. */
-diff -urNp linux-2.6.39.3/fs/ocfs2/stack_o2cb.c linux-2.6.39.3/fs/ocfs2/stack_o2cb.c
---- linux-2.6.39.3/fs/ocfs2/stack_o2cb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/stack_o2cb.c	2011-06-07 18:07:24.000000000 -0400
-@@ -358,7 +358,7 @@ static int o2cb_cluster_this_node(unsign
- 	return 0;
- }
- 
--static struct ocfs2_stack_operations o2cb_stack_ops = {
-+static const struct ocfs2_stack_operations o2cb_stack_ops = {
- 	.connect	= o2cb_cluster_connect,
- 	.disconnect	= o2cb_cluster_disconnect,
- 	.this_node	= o2cb_cluster_this_node,
-diff -urNp linux-2.6.39.3/fs/ocfs2/stack_user.c linux-2.6.39.3/fs/ocfs2/stack_user.c
---- linux-2.6.39.3/fs/ocfs2/stack_user.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 = NULL;
- 	struct ocfs2_control_private *p = file->private_data;
--	struct ocfs2_protocol_version *max =
-+	const struct ocfs2_protocol_version *max =
- 		&ocfs2_user_plugin.sp_max_proto;
- 
- 	if (ocfs2_control_get_handshake_state(file) !=
-@@ -861,7 +861,7 @@ static int user_cluster_this_node(unsign
- 	return 0;
- }
- 
--static struct ocfs2_stack_operations ocfs2_user_plugin_ops = {
-+static const struct ocfs2_stack_operations ocfs2_user_plugin_ops = {
- 	.connect	= user_cluster_connect,
- 	.disconnect	= user_cluster_disconnect,
- 	.this_node	= user_cluster_this_node,
-diff -urNp linux-2.6.39.3/fs/ocfs2/suballoc.c linux-2.6.39.3/fs/ocfs2/suballoc.c
---- linux-2.6.39.3/fs/ocfs2/suballoc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/suballoc.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ocfs2/suballoc.c linux-2.6.39.4/fs/ocfs2/suballoc.c
+--- linux-2.6.39.4/fs/ocfs2/suballoc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ocfs2/suballoc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
  				mlog_errno(status);
  			goto bail;
@@ -49500,9 +39124,9 @@ diff -urNp linux-2.6.39.3/fs/ocfs2/suballoc.c linux-2.6.39.3/fs/ocfs2/suballoc.c
  			*num_clusters = res.sr_bits;
  		}
  	}
-diff -urNp linux-2.6.39.3/fs/ocfs2/super.c linux-2.6.39.3/fs/ocfs2/super.c
---- linux-2.6.39.3/fs/ocfs2/super.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/super.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ocfs2/super.c linux-2.6.39.4/fs/ocfs2/super.c
+--- linux-2.6.39.4/fs/ocfs2/super.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ocfs2/super.c	2011-08-05 19:44:37.000000000 -0400
 @@ -299,11 +299,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -49537,9 +39161,9 @@ diff -urNp linux-2.6.39.3/fs/ocfs2/super.c linux-2.6.39.3/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.39.3/fs/ocfs2/symlink.c linux-2.6.39.3/fs/ocfs2/symlink.c
---- linux-2.6.39.3/fs/ocfs2/symlink.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/ocfs2/symlink.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/ocfs2/symlink.c linux-2.6.39.4/fs/ocfs2/symlink.c
+--- linux-2.6.39.4/fs/ocfs2/symlink.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/ocfs2/symlink.c	2011-08-05 19:44:37.000000000 -0400
 @@ -142,7 +142,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -49549,9 +39173,9 @@ diff -urNp linux-2.6.39.3/fs/ocfs2/symlink.c linux-2.6.39.3/fs/ocfs2/symlink.c
  	if (!IS_ERR(link))
  		kfree(link);
  }
-diff -urNp linux-2.6.39.3/fs/open.c linux-2.6.39.3/fs/open.c
---- linux-2.6.39.3/fs/open.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/open.c	2011-05-22 20:46:51.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/open.c linux-2.6.39.4/fs/open.c
+--- linux-2.6.39.4/fs/open.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/open.c	2011-08-05 19:44:37.000000000 -0400
 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
@@ -49689,9 +39313,9 @@ diff -urNp linux-2.6.39.3/fs/open.c linux-2.6.39.3/fs/open.c
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff -urNp linux-2.6.39.3/fs/partitions/ldm.c linux-2.6.39.3/fs/partitions/ldm.c
---- linux-2.6.39.3/fs/partitions/ldm.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/fs/partitions/ldm.c	2011-06-03 00:32:07.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/partitions/ldm.c linux-2.6.39.4/fs/partitions/ldm.c
+--- linux-2.6.39.4/fs/partitions/ldm.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/fs/partitions/ldm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
  		ldm_error ("A VBLK claims to have %d parts.", num);
  		return false;
@@ -49709,9 +39333,9 @@ diff -urNp linux-2.6.39.3/fs/partitions/ldm.c linux-2.6.39.3/fs/partitions/ldm.c
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-diff -urNp linux-2.6.39.3/fs/pipe.c linux-2.6.39.3/fs/pipe.c
---- linux-2.6.39.3/fs/pipe.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/pipe.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/pipe.c linux-2.6.39.4/fs/pipe.c
+--- linux-2.6.39.4/fs/pipe.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/pipe.c	2011-08-05 19:44:37.000000000 -0400
 @@ -420,9 +420,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -49835,9 +39459,9 @@ diff -urNp linux-2.6.39.3/fs/pipe.c linux-2.6.39.3/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-2.6.39.3/fs/proc/array.c linux-2.6.39.3/fs/proc/array.c
---- linux-2.6.39.3/fs/proc/array.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/array.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/array.c linux-2.6.39.4/fs/proc/array.c
+--- linux-2.6.39.4/fs/proc/array.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/array.c	2011-08-05 19:44:37.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -49961,9 +39585,9 @@ diff -urNp linux-2.6.39.3/fs/proc/array.c linux-2.6.39.3/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
---- linux-2.6.39.3/fs/proc/base.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/base.c	2011-06-04 21:20:04.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/base.c linux-2.6.39.4/fs/proc/base.c
+--- linux-2.6.39.4/fs/proc/base.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/fs/proc/base.c	2011-08-05 21:13:18.000000000 -0400
 @@ -104,6 +104,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -50277,7 +39901,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	if (!IS_ERR(s))
  		__putname(s);
  }
-@@ -2835,7 +2950,7 @@ static const struct pid_entry tgid_base_
+@@ -2838,7 +2953,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),
@@ -50286,7 +39910,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	INF("syscall",    S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2860,10 +2975,10 @@ static const struct pid_entry tgid_base_
+@@ -2863,10 +2978,10 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_SECURITY
  	DIR("attr",       S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
  #endif
@@ -50299,9 +39923,9 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2894,6 +3009,9 @@ static const struct pid_entry tgid_base_
+@@ -2897,6 +3012,9 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_TASK_IO_ACCOUNTING
- 	INF("io",	S_IRUGO, proc_tgid_io_accounting),
+ 	INF("io",	S_IRUSR, proc_tgid_io_accounting),
  #endif
 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
 +	INF("ipaddr",	  S_IRUSR, proc_pid_ipaddr),
@@ -50309,7 +39933,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -3019,7 +3137,14 @@ static struct dentry *proc_pid_instantia
+@@ -3022,7 +3140,14 @@ static struct dentry *proc_pid_instantia
  	if (!inode)
  		goto out;
  
@@ -50324,7 +39948,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -3061,7 +3186,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -3064,7 +3189,11 @@ struct dentry *proc_pid_lookup(struct in
  	if (!task)
  		goto out;
  
@@ -50336,7 +39960,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	put_task_struct(task);
  out:
  	return result;
-@@ -3126,6 +3255,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -3129,6 +3258,11 @@ int proc_pid_readdir(struct file * filp,
  {
  	unsigned int nr;
  	struct task_struct *reaper;
@@ -50348,7 +39972,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	struct tgid_iter iter;
  	struct pid_namespace *ns;
  
-@@ -3149,8 +3283,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3152,8 +3286,27 @@ int proc_pid_readdir(struct file * filp,
  	for (iter = next_tgid(ns, iter);
  	     iter.task;
  	     iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -50377,7 +40001,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  			put_task_struct(iter.task);
  			goto out;
  		}
-@@ -3177,7 +3330,7 @@ static const struct pid_entry tid_base_s
+@@ -3180,7 +3333,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),
@@ -50386,7 +40010,7 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	INF("syscall",   S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3201,10 +3354,10 @@ static const struct pid_entry tid_base_s
+@@ -3204,10 +3357,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
@@ -50399,9 +40023,9 @@ diff -urNp linux-2.6.39.3/fs/proc/base.c linux-2.6.39.3/fs/proc/base.c
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.39.3/fs/proc/cmdline.c linux-2.6.39.3/fs/proc/cmdline.c
---- linux-2.6.39.3/fs/proc/cmdline.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/cmdline.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/cmdline.c linux-2.6.39.4/fs/proc/cmdline.c
+--- linux-2.6.39.4/fs/proc/cmdline.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/cmdline.c	2011-08-05 19:44:37.000000000 -0400
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -50414,9 +40038,9 @@ diff -urNp linux-2.6.39.3/fs/proc/cmdline.c linux-2.6.39.3/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-2.6.39.3/fs/proc/devices.c linux-2.6.39.3/fs/proc/devices.c
---- linux-2.6.39.3/fs/proc/devices.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/devices.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/devices.c linux-2.6.39.4/fs/proc/devices.c
+--- linux-2.6.39.4/fs/proc/devices.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/devices.c	2011-08-05 19:44:37.000000000 -0400
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -50429,9 +40053,9 @@ diff -urNp linux-2.6.39.3/fs/proc/devices.c linux-2.6.39.3/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-2.6.39.3/fs/proc/inode.c linux-2.6.39.3/fs/proc/inode.c
---- linux-2.6.39.3/fs/proc/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/inode.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/inode.c linux-2.6.39.4/fs/proc/inode.c
+--- linux-2.6.39.4/fs/proc/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -433,7 +433,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
@@ -50444,9 +40068,9 @@ diff -urNp linux-2.6.39.3/fs/proc/inode.c linux-2.6.39.3/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-2.6.39.3/fs/proc/internal.h linux-2.6.39.3/fs/proc/internal.h
---- linux-2.6.39.3/fs/proc/internal.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/internal.h	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/internal.h linux-2.6.39.4/fs/proc/internal.h
+--- linux-2.6.39.4/fs/proc/internal.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/internal.h	2011-08-05 19:44:37.000000000 -0400
 @@ -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,
@@ -50457,9 +40081,9 @@ diff -urNp linux-2.6.39.3/fs/proc/internal.h linux-2.6.39.3/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.39.3/fs/proc/Kconfig linux-2.6.39.3/fs/proc/Kconfig
---- linux-2.6.39.3/fs/proc/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/Kconfig	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/Kconfig linux-2.6.39.4/fs/proc/Kconfig
+--- linux-2.6.39.4/fs/proc/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/Kconfig	2011-08-05 19:44:37.000000000 -0400
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -50487,9 +40111,9 @@ diff -urNp linux-2.6.39.3/fs/proc/Kconfig linux-2.6.39.3/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.3/fs/proc/kcore.c linux-2.6.39.3/fs/proc/kcore.c
---- linux-2.6.39.3/fs/proc/kcore.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/kcore.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/kcore.c linux-2.6.39.4/fs/proc/kcore.c
+--- linux-2.6.39.4/fs/proc/kcore.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/kcore.c	2011-08-05 19:44:37.000000000 -0400
 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
  	off_t offset = 0;
  	struct kcore_list *m;
@@ -50557,9 +40181,9 @@ diff -urNp linux-2.6.39.3/fs/proc/kcore.c linux-2.6.39.3/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-2.6.39.3/fs/proc/meminfo.c linux-2.6.39.3/fs/proc/meminfo.c
---- linux-2.6.39.3/fs/proc/meminfo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/meminfo.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/meminfo.c linux-2.6.39.4/fs/proc/meminfo.c
+--- linux-2.6.39.4/fs/proc/meminfo.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/meminfo.c	2011-08-05 19:44:37.000000000 -0400
 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
  	unsigned long pages[NR_LRU_LISTS];
  	int lru;
@@ -50578,9 +40202,9 @@ diff -urNp linux-2.6.39.3/fs/proc/meminfo.c linux-2.6.39.3/fs/proc/meminfo.c
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  		,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-2.6.39.3/fs/proc/nommu.c linux-2.6.39.3/fs/proc/nommu.c
---- linux-2.6.39.3/fs/proc/nommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/nommu.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/nommu.c linux-2.6.39.4/fs/proc/nommu.c
+--- linux-2.6.39.4/fs/proc/nommu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/nommu.c	2011-08-05 19:44:37.000000000 -0400
 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
  		if (len < 1)
  			len = 1;
@@ -50590,9 +40214,9 @@ diff -urNp linux-2.6.39.3/fs/proc/nommu.c linux-2.6.39.3/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-2.6.39.3/fs/proc/proc_net.c linux-2.6.39.3/fs/proc/proc_net.c
---- linux-2.6.39.3/fs/proc/proc_net.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/proc_net.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/proc_net.c linux-2.6.39.4/fs/proc/proc_net.c
+--- linux-2.6.39.4/fs/proc/proc_net.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/proc_net.c	2011-08-05 19:44:37.000000000 -0400
 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
  	struct task_struct *task;
  	struct nsproxy *ns;
@@ -50611,9 +40235,9 @@ diff -urNp linux-2.6.39.3/fs/proc/proc_net.c linux-2.6.39.3/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.39.3/fs/proc/proc_sysctl.c linux-2.6.39.3/fs/proc/proc_sysctl.c
---- linux-2.6.39.3/fs/proc/proc_sysctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/proc_sysctl.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/proc_sysctl.c linux-2.6.39.4/fs/proc/proc_sysctl.c
+--- linux-2.6.39.4/fs/proc/proc_sysctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/proc_sysctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -8,6 +8,8 @@
  #include <linux/namei.h>
  #include "internal.h"
@@ -50653,9 +40277,9 @@ diff -urNp linux-2.6.39.3/fs/proc/proc_sysctl.c linux-2.6.39.3/fs/proc/proc_sysc
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.39.3/fs/proc/root.c linux-2.6.39.3/fs/proc/root.c
---- linux-2.6.39.3/fs/proc/root.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/root.c	2011-05-22 19:41:37.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/root.c linux-2.6.39.4/fs/proc/root.c
+--- linux-2.6.39.4/fs/proc/root.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/root.c	2011-08-05 19:44:37.000000000 -0400
 @@ -122,7 +122,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
@@ -50672,9 +40296,9 @@ diff -urNp linux-2.6.39.3/fs/proc/root.c linux-2.6.39.3/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-2.6.39.3/fs/proc/task_mmu.c linux-2.6.39.3/fs/proc/task_mmu.c
---- linux-2.6.39.3/fs/proc/task_mmu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/task_mmu.c	2011-05-22 22:43:29.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/task_mmu.c linux-2.6.39.4/fs/proc/task_mmu.c
+--- linux-2.6.39.4/fs/proc/task_mmu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/task_mmu.c	2011-08-05 19:44:37.000000000 -0400
 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
  		"VmExe:\t%8lu kB\n"
  		"VmLib:\t%8lu kB\n"
@@ -50805,9 +40429,9 @@ diff -urNp linux-2.6.39.3/fs/proc/task_mmu.c linux-2.6.39.3/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.3/fs/proc/task_nommu.c linux-2.6.39.3/fs/proc/task_nommu.c
---- linux-2.6.39.3/fs/proc/task_nommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/proc/task_nommu.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/proc/task_nommu.c linux-2.6.39.4/fs/proc/task_nommu.c
+--- linux-2.6.39.4/fs/proc/task_nommu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/proc/task_nommu.c	2011-08-05 19:44:37.000000000 -0400
 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
  	else
  		bytes += kobjsize(mm);
@@ -50826,9 +40450,9 @@ diff -urNp linux-2.6.39.3/fs/proc/task_nommu.c linux-2.6.39.3/fs/proc/task_nommu
  	} else if (mm) {
  		if (vma->vm_start <= mm->start_stack &&
  			vma->vm_end >= mm->start_stack) {
-diff -urNp linux-2.6.39.3/fs/quota/netlink.c linux-2.6.39.3/fs/quota/netlink.c
---- linux-2.6.39.3/fs/quota/netlink.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/quota/netlink.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/quota/netlink.c linux-2.6.39.4/fs/quota/netlink.c
+--- linux-2.6.39.4/fs/quota/netlink.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/quota/netlink.c	2011-08-05 19:44:37.000000000 -0400
 @@ -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)
@@ -50847,9 +40471,9 @@ diff -urNp linux-2.6.39.3/fs/quota/netlink.c linux-2.6.39.3/fs/quota/netlink.c
  			&quota_genl_family, 0, QUOTA_NL_C_WARNING);
  	if (!msg_head) {
  		printk(KERN_ERR
-diff -urNp linux-2.6.39.3/fs/readdir.c linux-2.6.39.3/fs/readdir.c
---- linux-2.6.39.3/fs/readdir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/readdir.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/readdir.c linux-2.6.39.4/fs/readdir.c
+--- linux-2.6.39.4/fs/readdir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/readdir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -50939,9 +40563,9 @@ diff -urNp linux-2.6.39.3/fs/readdir.c linux-2.6.39.3/fs/readdir.c
  	buf.count = count;
  	buf.error = 0;
  
-diff -urNp linux-2.6.39.3/fs/reiserfs/dir.c linux-2.6.39.3/fs/reiserfs/dir.c
---- linux-2.6.39.3/fs/reiserfs/dir.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/reiserfs/dir.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/reiserfs/dir.c linux-2.6.39.4/fs/reiserfs/dir.c
+--- linux-2.6.39.4/fs/reiserfs/dir.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/reiserfs/dir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
  	struct reiserfs_dir_entry de;
  	int ret = 0;
@@ -50951,9 +40575,9 @@ diff -urNp linux-2.6.39.3/fs/reiserfs/dir.c linux-2.6.39.3/fs/reiserfs/dir.c
  	reiserfs_write_lock(inode->i_sb);
  
  	reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-2.6.39.3/fs/reiserfs/do_balan.c linux-2.6.39.3/fs/reiserfs/do_balan.c
---- linux-2.6.39.3/fs/reiserfs/do_balan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/reiserfs/do_balan.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/reiserfs/do_balan.c linux-2.6.39.4/fs/reiserfs/do_balan.c
+--- linux-2.6.39.4/fs/reiserfs/do_balan.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/reiserfs/do_balan.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
  		return;
  	}
@@ -50963,66 +40587,9 @@ diff -urNp linux-2.6.39.3/fs/reiserfs/do_balan.c linux-2.6.39.3/fs/reiserfs/do_b
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.39.3/fs/reiserfs/item_ops.c linux-2.6.39.3/fs/reiserfs/item_ops.c
---- linux-2.6.39.3/fs/reiserfs/item_ops.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct item_operations stat_data_ops = {
-+static const struct item_operations stat_data_ops = {
- 	.bytes_number = sd_bytes_number,
- 	.decrement_key = sd_decrement_key,
- 	.is_left_mergeable = sd_is_left_mergeable,
-@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtu
- 			 vi->vi_index, vi->vi_type, vi->vi_ih);
- }
- 
--static struct item_operations direct_ops = {
-+static const struct item_operations direct_ops = {
- 	.bytes_number = direct_bytes_number,
- 	.decrement_key = direct_decrement_key,
- 	.is_left_mergeable = direct_is_left_mergeable,
-@@ -341,7 +341,7 @@ static void indirect_print_vi(struct vir
- 			 vi->vi_index, vi->vi_type, vi->vi_ih);
- }
- 
--static struct item_operations indirect_ops = {
-+static const struct item_operations indirect_ops = {
- 	.bytes_number = indirect_bytes_number,
- 	.decrement_key = indirect_decrement_key,
- 	.is_left_mergeable = indirect_is_left_mergeable,
-@@ -628,7 +628,7 @@ static void direntry_print_vi(struct vir
- 	printk("\n");
- }
- 
--static struct item_operations direntry_ops = {
-+static const struct item_operations direntry_ops = {
- 	.bytes_number = direntry_bytes_number,
- 	.decrement_key = direntry_decrement_key,
- 	.is_left_mergeable = direntry_is_left_mergeable,
-@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct vir
- 			 "Invalid item type observed, run fsck ASAP");
- }
- 
--static struct item_operations errcatch_ops = {
-+static const struct item_operations errcatch_ops = {
- 	errcatch_bytes_number,
- 	errcatch_decrement_key,
- 	errcatch_is_left_mergeable,
-@@ -746,7 +746,7 @@ static struct item_operations errcatch_o
- #error Item types must use disk-format assigned values.
- #endif
- 
--struct item_operations *item_ops[TYPE_ANY + 1] = {
-+const struct item_operations * const item_ops[TYPE_ANY + 1] = {
- 	&stat_data_ops,
- 	&indirect_ops,
- 	&direct_ops,
-diff -urNp linux-2.6.39.3/fs/reiserfs/journal.c linux-2.6.39.3/fs/reiserfs/journal.c
---- linux-2.6.39.3/fs/reiserfs/journal.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/reiserfs/journal.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/reiserfs/journal.c linux-2.6.39.4/fs/reiserfs/journal.c
+--- linux-2.6.39.4/fs/reiserfs/journal.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/reiserfs/journal.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
  	struct buffer_head *bh;
  	int i, j;
@@ -51032,9 +40599,9 @@ diff -urNp linux-2.6.39.3/fs/reiserfs/journal.c linux-2.6.39.3/fs/reiserfs/journ
  	bh = __getblk(dev, block, bufsize);
  	if (buffer_uptodate(bh))
  		return (bh);
-diff -urNp linux-2.6.39.3/fs/reiserfs/namei.c linux-2.6.39.3/fs/reiserfs/namei.c
---- linux-2.6.39.3/fs/reiserfs/namei.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/reiserfs/namei.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/reiserfs/namei.c linux-2.6.39.4/fs/reiserfs/namei.c
+--- linux-2.6.39.4/fs/reiserfs/namei.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/reiserfs/namei.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode 
  	unsigned long savelink = 1;
  	struct timespec ctime;
@@ -51044,9 +40611,9 @@ diff -urNp linux-2.6.39.3/fs/reiserfs/namei.c linux-2.6.39.3/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.3/fs/reiserfs/procfs.c linux-2.6.39.3/fs/reiserfs/procfs.c
---- linux-2.6.39.3/fs/reiserfs/procfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/reiserfs/procfs.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/reiserfs/procfs.c linux-2.6.39.4/fs/reiserfs/procfs.c
+--- linux-2.6.39.4/fs/reiserfs/procfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/reiserfs/procfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -51065,9 +40632,9 @@ diff -urNp linux-2.6.39.3/fs/reiserfs/procfs.c linux-2.6.39.3/fs/reiserfs/procfs
  	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.3/fs/reiserfs/stree.c linux-2.6.39.3/fs/reiserfs/stree.c
---- linux-2.6.39.3/fs/reiserfs/stree.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/reiserfs/stree.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/reiserfs/stree.c linux-2.6.39.4/fs/reiserfs/stree.c
+--- linux-2.6.39.4/fs/reiserfs/stree.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/reiserfs/stree.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
  	int iter = 0;
  #endif
@@ -51113,9 +40680,9 @@ diff -urNp linux-2.6.39.3/fs/reiserfs/stree.c linux-2.6.39.3/fs/reiserfs/stree.c
  	BUG_ON(!th->t_trans_id);
  
  	if (inode) {		/* Do we count quotas for item? */
-diff -urNp linux-2.6.39.3/fs/reiserfs/super.c linux-2.6.39.3/fs/reiserfs/super.c
---- linux-2.6.39.3/fs/reiserfs/super.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/reiserfs/super.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/reiserfs/super.c linux-2.6.39.4/fs/reiserfs/super.c
+--- linux-2.6.39.4/fs/reiserfs/super.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/reiserfs/super.c	2011-08-05 19:44:37.000000000 -0400
 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
  		{.option_name = NULL}
  	};
@@ -51125,9 +40692,9 @@ diff -urNp linux-2.6.39.3/fs/reiserfs/super.c linux-2.6.39.3/fs/reiserfs/super.c
  	*blocks = 0;
  	if (!options || !*options)
  		/* use default configuration: create tails, journaling on, no
-diff -urNp linux-2.6.39.3/fs/select.c linux-2.6.39.3/fs/select.c
---- linux-2.6.39.3/fs/select.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/select.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/select.c linux-2.6.39.4/fs/select.c
+--- linux-2.6.39.4/fs/select.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/select.c	2011-08-05 19:44:37.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -51164,9 +40731,9 @@ diff -urNp linux-2.6.39.3/fs/select.c linux-2.6.39.3/fs/select.c
  	if (nfds > rlimit(RLIMIT_NOFILE))
  		return -EINVAL;
  
-diff -urNp linux-2.6.39.3/fs/seq_file.c linux-2.6.39.3/fs/seq_file.c
---- linux-2.6.39.3/fs/seq_file.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/seq_file.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/seq_file.c linux-2.6.39.4/fs/seq_file.c
+--- linux-2.6.39.4/fs/seq_file.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/seq_file.c	2011-08-05 20:34:06.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
@@ -51207,9 +40774,18 @@ diff -urNp linux-2.6.39.3/fs/seq_file.c linux-2.6.39.3/fs/seq_file.c
  		if (!m->buf)
  			goto Enomem;
  		m->count = 0;
-diff -urNp linux-2.6.39.3/fs/splice.c linux-2.6.39.3/fs/splice.c
---- linux-2.6.39.3/fs/splice.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/splice.c	2011-05-22 19:36:32.000000000 -0400
+@@ -549,7 +553,7 @@ static void single_stop(struct seq_file 
+ int single_open(struct file *file, int (*show)(struct seq_file *, void *),
+ 		void *data)
+ {
+-	struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
++	seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
+ 	int res = -ENOMEM;
+ 
+ 	if (op) {
+diff -urNp linux-2.6.39.4/fs/splice.c linux-2.6.39.4/fs/splice.c
+--- linux-2.6.39.4/fs/splice.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/splice.c	2011-08-05 19:44:37.000000000 -0400
 @@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
@@ -51375,9 +40951,9 @@ diff -urNp linux-2.6.39.3/fs/splice.c linux-2.6.39.3/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-2.6.39.3/fs/sysfs/file.c linux-2.6.39.3/fs/sysfs/file.c
---- linux-2.6.39.3/fs/sysfs/file.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/sysfs/file.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/sysfs/file.c linux-2.6.39.4/fs/sysfs/file.c
+--- linux-2.6.39.4/fs/sysfs/file.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/sysfs/file.c	2011-08-05 19:44:37.000000000 -0400
 @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
@@ -51423,9 +40999,9 @@ diff -urNp linux-2.6.39.3/fs/sysfs/file.c linux-2.6.39.3/fs/sysfs/file.c
  		wake_up_interruptible(&od->poll);
  	}
  
-diff -urNp linux-2.6.39.3/fs/sysfs/mount.c linux-2.6.39.3/fs/sysfs/mount.c
---- linux-2.6.39.3/fs/sysfs/mount.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/sysfs/mount.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/sysfs/mount.c linux-2.6.39.4/fs/sysfs/mount.c
+--- linux-2.6.39.4/fs/sysfs/mount.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/sysfs/mount.c	2011-08-05 19:44:37.000000000 -0400
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
  	.s_name		= "",
  	.s_count	= ATOMIC_INIT(1),
@@ -51438,9 +41014,9 @@ diff -urNp linux-2.6.39.3/fs/sysfs/mount.c linux-2.6.39.3/fs/sysfs/mount.c
  	.s_ino		= 1,
  };
  
-diff -urNp linux-2.6.39.3/fs/sysfs/symlink.c linux-2.6.39.3/fs/sysfs/symlink.c
---- linux-2.6.39.3/fs/sysfs/symlink.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/sysfs/symlink.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/sysfs/symlink.c linux-2.6.39.4/fs/sysfs/symlink.c
+--- linux-2.6.39.4/fs/sysfs/symlink.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/sysfs/symlink.c	2011-08-05 19:44:37.000000000 -0400
 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -51450,9 +41026,9 @@ diff -urNp linux-2.6.39.3/fs/sysfs/symlink.c linux-2.6.39.3/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.39.3/fs/udf/inode.c linux-2.6.39.3/fs/udf/inode.c
---- linux-2.6.39.3/fs/udf/inode.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/udf/inode.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/udf/inode.c linux-2.6.39.4/fs/udf/inode.c
+--- linux-2.6.39.4/fs/udf/inode.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/udf/inode.c	2011-08-05 19:44:37.000000000 -0400
 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
  	int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
  	int lastblock = 0;
@@ -51462,9 +41038,9 @@ diff -urNp linux-2.6.39.3/fs/udf/inode.c linux-2.6.39.3/fs/udf/inode.c
  	prev_epos.offset = udf_file_entry_alloc_offset(inode);
  	prev_epos.block = iinfo->i_location;
  	prev_epos.bh = NULL;
-diff -urNp linux-2.6.39.3/fs/udf/misc.c linux-2.6.39.3/fs/udf/misc.c
---- linux-2.6.39.3/fs/udf/misc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/udf/misc.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/udf/misc.c linux-2.6.39.4/fs/udf/misc.c
+--- linux-2.6.39.4/fs/udf/misc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/udf/misc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -51474,9 +41050,9 @@ diff -urNp linux-2.6.39.3/fs/udf/misc.c linux-2.6.39.3/fs/udf/misc.c
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-2.6.39.3/fs/utimes.c linux-2.6.39.3/fs/utimes.c
---- linux-2.6.39.3/fs/utimes.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/utimes.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/utimes.c linux-2.6.39.4/fs/utimes.c
+--- linux-2.6.39.4/fs/utimes.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/utimes.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -51498,9 +41074,9 @@ diff -urNp linux-2.6.39.3/fs/utimes.c linux-2.6.39.3/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.39.3/fs/xattr_acl.c linux-2.6.39.3/fs/xattr_acl.c
---- linux-2.6.39.3/fs/xattr_acl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xattr_acl.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/xattr_acl.c linux-2.6.39.4/fs/xattr_acl.c
+--- linux-2.6.39.4/fs/xattr_acl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/xattr_acl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -51512,9 +41088,9 @@ diff -urNp linux-2.6.39.3/fs/xattr_acl.c linux-2.6.39.3/fs/xattr_acl.c
  	int count;
  	struct posix_acl *acl;
  	struct posix_acl_entry *acl_e;
-diff -urNp linux-2.6.39.3/fs/xattr.c linux-2.6.39.3/fs/xattr.c
---- linux-2.6.39.3/fs/xattr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xattr.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/xattr.c linux-2.6.39.4/fs/xattr.c
+--- linux-2.6.39.4/fs/xattr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/xattr.c	2011-08-05 19:44:37.000000000 -0400
 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -51577,9 +41153,9 @@ diff -urNp linux-2.6.39.3/fs/xattr.c linux-2.6.39.3/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-08-05 19:44:37.000000000 -0400
 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
  	xfs_fsop_geom_t		  fsgeo;
  	int			  error;
@@ -51588,9 +41164,9 @@ diff -urNp linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.39.3/fs/xfs/l
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
  	if (error)
  		return -error;
-diff -urNp linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -128,7 +128,7 @@ xfs_find_handle(
  	}
  
@@ -51600,9 +41176,9 @@ diff -urNp linux-2.6.39.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.39.3/fs/xfs/lin
  	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
  		goto out_put;
  
-diff -urNp linux-2.6.39.3/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.39.3/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.39.3/fs/xfs/linux-2.6/xfs_iops.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xfs/linux-2.6/xfs_iops.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.39.4/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.39.4/fs/xfs/linux-2.6/xfs_iops.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/xfs/linux-2.6/xfs_iops.c	2011-08-05 19:44:37.000000000 -0400
 @@ -437,7 +437,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
@@ -51612,9 +41188,9 @@ diff -urNp linux-2.6.39.3/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.39.3/fs/xfs/linu
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff -urNp linux-2.6.39.3/fs/xfs/xfs_bmap.c linux-2.6.39.3/fs/xfs/xfs_bmap.c
---- linux-2.6.39.3/fs/xfs/xfs_bmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xfs/xfs_bmap.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/xfs/xfs_bmap.c linux-2.6.39.4/fs/xfs/xfs_bmap.c
+--- linux-2.6.39.4/fs/xfs/xfs_bmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/xfs/xfs_bmap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
@@ -51624,21 +41200,9 @@ diff -urNp linux-2.6.39.3/fs/xfs/xfs_bmap.c linux-2.6.39.3/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-2.6.39.3/fs/xfs/xfs_dir2.c linux-2.6.39.3/fs/xfs/xfs_dir2.c
---- linux-2.6.39.3/fs/xfs/xfs_dir2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xfs/xfs_dir2.c	2011-05-22 19:36:32.000000000 -0400
-@@ -85,7 +85,7 @@ xfs_ascii_ci_compname(
- 	return result;
- }
- 
--static struct xfs_nameops xfs_ascii_ci_nameops = {
-+static const struct xfs_nameops xfs_ascii_ci_nameops = {
- 	.hashname	= xfs_ascii_ci_hashname,
- 	.compname	= xfs_ascii_ci_compname,
- };
-diff -urNp linux-2.6.39.3/fs/xfs/xfs_dir2_sf.c linux-2.6.39.3/fs/xfs/xfs_dir2_sf.c
---- linux-2.6.39.3/fs/xfs/xfs_dir2_sf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/fs/xfs/xfs_dir2_sf.c	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/fs/xfs/xfs_dir2_sf.c linux-2.6.39.4/fs/xfs/xfs_dir2_sf.c
+--- linux-2.6.39.4/fs/xfs/xfs_dir2_sf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/fs/xfs/xfs_dir2_sf.c	2011-08-05 19:44:37.000000000 -0400
 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
  		}
  
@@ -51656,9 +41220,9 @@ diff -urNp linux-2.6.39.3/fs/xfs/xfs_dir2_sf.c linux-2.6.39.3/fs/xfs/xfs_dir2_sf
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-2.6.39.3/grsecurity/gracl_alloc.c linux-2.6.39.3/grsecurity/gracl_alloc.c
---- linux-2.6.39.3/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_alloc.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_alloc.c linux-2.6.39.4/grsecurity/gracl_alloc.c
+--- linux-2.6.39.4/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_alloc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -51765,9 +41329,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_alloc.c linux-2.6.39.3/grsecurity/gra
 +	else
 +		return 1;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/gracl.c linux-2.6.39.3/grsecurity/gracl.c
---- linux-2.6.39.3/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl.c	2011-07-14 21:03:00.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl.c linux-2.6.39.4/grsecurity/gracl.c
+--- linux-2.6.39.4/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,4106 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -55875,9 +45439,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl.c linux-2.6.39.3/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-2.6.39.3/grsecurity/gracl_cap.c linux-2.6.39.3/grsecurity/gracl_cap.c
---- linux-2.6.39.3/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_cap.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_cap.c linux-2.6.39.4/grsecurity/gracl_cap.c
+--- linux-2.6.39.4/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_cap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,139 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -56018,9 +45582,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_cap.c linux-2.6.39.3/grsecurity/gracl
 +	return 0;
 +}
 +
-diff -urNp linux-2.6.39.3/grsecurity/gracl_fs.c linux-2.6.39.3/grsecurity/gracl_fs.c
---- linux-2.6.39.3/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_fs.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_fs.c linux-2.6.39.4/grsecurity/gracl_fs.c
+--- linux-2.6.39.4/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_fs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -56453,9 +46017,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_fs.c linux-2.6.39.3/grsecurity/gracl_
 +
 +	return 0;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/gracl_ip.c linux-2.6.39.3/grsecurity/gracl_ip.c
---- linux-2.6.39.3/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_ip.c	2011-05-22 22:47:31.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_ip.c linux-2.6.39.4/grsecurity/gracl_ip.c
+--- linux-2.6.39.4/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_ip.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,381 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -56838,9 +46402,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_ip.c linux-2.6.39.3/grsecurity/gracl_
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-2.6.39.3/grsecurity/gracl_learn.c linux-2.6.39.3/grsecurity/gracl_learn.c
---- linux-2.6.39.3/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_learn.c	2011-07-14 21:03:00.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_learn.c linux-2.6.39.4/grsecurity/gracl_learn.c
+--- linux-2.6.39.4/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_learn.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,207 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -57049,9 +46613,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_learn.c linux-2.6.39.3/grsecurity/gra
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-2.6.39.3/grsecurity/gracl_res.c linux-2.6.39.3/grsecurity/gracl_res.c
---- linux-2.6.39.3/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_res.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_res.c linux-2.6.39.4/grsecurity/gracl_res.c
+--- linux-2.6.39.4/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_res.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -57121,9 +46685,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_res.c linux-2.6.39.3/grsecurity/gracl
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/gracl_segv.c linux-2.6.39.3/grsecurity/gracl_segv.c
---- linux-2.6.39.3/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_segv.c	2011-05-22 22:47:39.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_segv.c linux-2.6.39.4/grsecurity/gracl_segv.c
+--- linux-2.6.39.4/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_segv.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,299 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -57424,9 +46988,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_segv.c linux-2.6.39.3/grsecurity/grac
 +
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/gracl_shm.c linux-2.6.39.3/grsecurity/gracl_shm.c
---- linux-2.6.39.3/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/gracl_shm.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/gracl_shm.c linux-2.6.39.4/grsecurity/gracl_shm.c
+--- linux-2.6.39.4/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/gracl_shm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -57468,9 +47032,9 @@ diff -urNp linux-2.6.39.3/grsecurity/gracl_shm.c linux-2.6.39.3/grsecurity/gracl
 +
 +	return 1;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_chdir.c linux-2.6.39.3/grsecurity/grsec_chdir.c
---- linux-2.6.39.3/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_chdir.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_chdir.c linux-2.6.39.4/grsecurity/grsec_chdir.c
+--- linux-2.6.39.4/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_chdir.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -57491,9 +47055,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_chdir.c linux-2.6.39.3/grsecurity/grs
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_chroot.c linux-2.6.39.3/grsecurity/grsec_chroot.c
---- linux-2.6.39.3/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_chroot.c	2011-07-18 17:20:05.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_chroot.c linux-2.6.39.4/grsecurity/grsec_chroot.c
+--- linux-2.6.39.4/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_chroot.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,349 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -57844,9 +47408,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_chroot.c linux-2.6.39.3/grsecurity/gr
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-2.6.39.3/grsecurity/grsec_disabled.c linux-2.6.39.3/grsecurity/grsec_disabled.c
---- linux-2.6.39.3/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_disabled.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_disabled.c linux-2.6.39.4/grsecurity/grsec_disabled.c
+--- linux-2.6.39.4/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_disabled.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,447 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -58295,9 +47859,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_disabled.c linux-2.6.39.3/grsecurity/
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-2.6.39.3/grsecurity/grsec_exec.c linux-2.6.39.3/grsecurity/grsec_exec.c
---- linux-2.6.39.3/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_exec.c	2011-05-22 22:41:29.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_exec.c linux-2.6.39.4/grsecurity/grsec_exec.c
+--- linux-2.6.39.4/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_exec.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,146 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -58445,9 +48009,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_exec.c linux-2.6.39.3/grsecurity/grse
 +	return;
 +}
 +#endif
-diff -urNp linux-2.6.39.3/grsecurity/grsec_fifo.c linux-2.6.39.3/grsecurity/grsec_fifo.c
---- linux-2.6.39.3/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_fifo.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_fifo.c linux-2.6.39.4/grsecurity/grsec_fifo.c
+--- linux-2.6.39.4/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_fifo.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -58473,9 +48037,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_fifo.c linux-2.6.39.3/grsecurity/grse
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_fork.c linux-2.6.39.3/grsecurity/grsec_fork.c
---- linux-2.6.39.3/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_fork.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_fork.c linux-2.6.39.4/grsecurity/grsec_fork.c
+--- linux-2.6.39.4/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_fork.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -58500,9 +48064,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_fork.c linux-2.6.39.3/grsecurity/grse
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_init.c linux-2.6.39.3/grsecurity/grsec_init.c
---- linux-2.6.39.3/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_init.c	2011-06-29 19:35:59.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_init.c linux-2.6.39.4/grsecurity/grsec_init.c
+--- linux-2.6.39.4/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_init.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,273 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -58777,9 +48341,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_init.c linux-2.6.39.3/grsecurity/grse
 +
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_link.c linux-2.6.39.3/grsecurity/grsec_link.c
---- linux-2.6.39.3/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_link.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_link.c linux-2.6.39.4/grsecurity/grsec_link.c
+--- linux-2.6.39.4/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_link.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -58824,9 +48388,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_link.c linux-2.6.39.3/grsecurity/grse
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_log.c linux-2.6.39.3/grsecurity/grsec_log.c
---- linux-2.6.39.3/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_log.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_log.c linux-2.6.39.4/grsecurity/grsec_log.c
+--- linux-2.6.39.4/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_log.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -59138,9 +48702,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_log.c linux-2.6.39.3/grsecurity/grsec
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_mem.c linux-2.6.39.3/grsecurity/grsec_mem.c
---- linux-2.6.39.3/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_mem.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_mem.c linux-2.6.39.4/grsecurity/grsec_mem.c
+--- linux-2.6.39.4/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_mem.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -59175,9 +48739,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_mem.c linux-2.6.39.3/grsecurity/grsec
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_mount.c linux-2.6.39.3/grsecurity/grsec_mount.c
---- linux-2.6.39.3/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_mount.c	2011-06-20 19:46:18.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_mount.c linux-2.6.39.4/grsecurity/grsec_mount.c
+--- linux-2.6.39.4/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_mount.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -59241,9 +48805,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_mount.c linux-2.6.39.3/grsecurity/grs
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_pax.c linux-2.6.39.3/grsecurity/grsec_pax.c
---- linux-2.6.39.3/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_pax.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_pax.c linux-2.6.39.4/grsecurity/grsec_pax.c
+--- linux-2.6.39.4/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_pax.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -59281,9 +48845,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_pax.c linux-2.6.39.3/grsecurity/grsec
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_ptrace.c linux-2.6.39.3/grsecurity/grsec_ptrace.c
---- linux-2.6.39.3/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_ptrace.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_ptrace.c linux-2.6.39.4/grsecurity/grsec_ptrace.c
+--- linux-2.6.39.4/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_ptrace.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -59299,9 +48863,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_ptrace.c linux-2.6.39.3/grsecurity/gr
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_sig.c linux-2.6.39.3/grsecurity/grsec_sig.c
---- linux-2.6.39.3/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_sig.c	2011-06-29 19:40:46.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_sig.c linux-2.6.39.4/grsecurity/grsec_sig.c
+--- linux-2.6.39.4/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_sig.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,206 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -59509,9 +49073,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_sig.c linux-2.6.39.3/grsecurity/grsec
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_sock.c linux-2.6.39.3/grsecurity/grsec_sock.c
---- linux-2.6.39.3/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_sock.c	2011-05-22 20:29:21.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_sock.c linux-2.6.39.4/grsecurity/grsec_sock.c
+--- linux-2.6.39.4/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_sock.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,244 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -59757,9 +49321,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_sock.c linux-2.6.39.3/grsecurity/grse
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsec_sysctl.c linux-2.6.39.3/grsecurity/grsec_sysctl.c
---- linux-2.6.39.3/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_sysctl.c	2011-06-29 19:38:04.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_sysctl.c linux-2.6.39.4/grsecurity/grsec_sysctl.c
+--- linux-2.6.39.4/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_sysctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,442 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -60203,9 +49767,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_sysctl.c linux-2.6.39.3/grsecurity/gr
 +	{ }
 +};
 +#endif
-diff -urNp linux-2.6.39.3/grsecurity/grsec_time.c linux-2.6.39.3/grsecurity/grsec_time.c
---- linux-2.6.39.3/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_time.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_time.c linux-2.6.39.4/grsecurity/grsec_time.c
+--- linux-2.6.39.4/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_time.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -60223,9 +49787,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_time.c linux-2.6.39.3/grsecurity/grse
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-2.6.39.3/grsecurity/grsec_tpe.c linux-2.6.39.3/grsecurity/grsec_tpe.c
---- linux-2.6.39.3/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsec_tpe.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsec_tpe.c linux-2.6.39.4/grsecurity/grsec_tpe.c
+--- linux-2.6.39.4/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsec_tpe.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -60266,9 +49830,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsec_tpe.c linux-2.6.39.3/grsecurity/grsec
 +#endif
 +	return 1;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/grsum.c linux-2.6.39.3/grsecurity/grsum.c
---- linux-2.6.39.3/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/grsum.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/grsum.c linux-2.6.39.4/grsecurity/grsum.c
+--- linux-2.6.39.4/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/grsum.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -60331,9 +49895,9 @@ diff -urNp linux-2.6.39.3/grsecurity/grsum.c linux-2.6.39.3/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-2.6.39.3/grsecurity/Kconfig linux-2.6.39.3/grsecurity/Kconfig
---- linux-2.6.39.3/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/Kconfig	2011-07-06 19:58:30.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/Kconfig linux-2.6.39.4/grsecurity/Kconfig
+--- linux-2.6.39.4/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/Kconfig	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,1048 @@
 +#
 +# grecurity configuration
@@ -61383,9 +50947,9 @@ diff -urNp linux-2.6.39.3/grsecurity/Kconfig linux-2.6.39.3/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-2.6.39.3/grsecurity/Makefile linux-2.6.39.3/grsecurity/Makefile
---- linux-2.6.39.3/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/grsecurity/Makefile	2011-05-24 20:26:54.000000000 -0400
+diff -urNp linux-2.6.39.4/grsecurity/Makefile linux-2.6.39.4/grsecurity/Makefile
+--- linux-2.6.39.4/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/grsecurity/Makefile	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,33 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -61420,53 +50984,21 @@ diff -urNp linux-2.6.39.3/grsecurity/Makefile linux-2.6.39.3/grsecurity/Makefile
 +	@-chmod -f 700 .
 +	@echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-2.6.39.3/include/acpi/acpi_drivers.h linux-2.6.39.3/include/acpi/acpi_drivers.h
---- linux-2.6.39.3/include/acpi/acpi_drivers.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/acpi/acpi_drivers.h	2011-05-22 19:36:32.000000000 -0400
-@@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void);
-                                   Dock Station
-   -------------------------------------------------------------------------- */
- struct acpi_dock_ops {
--	acpi_notify_handler handler;
--	acpi_notify_handler uevent;
-+	const acpi_notify_handler handler;
-+	const acpi_notify_handler uevent;
- };
- 
- #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
-@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle ha
- extern int register_dock_notifier(struct notifier_block *nb);
- extern void unregister_dock_notifier(struct notifier_block *nb);
- extern int register_hotplug_dock_device(acpi_handle handle,
--					struct acpi_dock_ops *ops,
-+					const struct acpi_dock_ops *ops,
- 					void *context);
- extern void unregister_hotplug_dock_device(acpi_handle handle);
- #else
-@@ -144,7 +144,7 @@ static inline void unregister_dock_notif
- {
- }
- static inline int register_hotplug_dock_device(acpi_handle handle,
--					       struct acpi_dock_ops *ops,
-+					       const struct acpi_dock_ops *ops,
- 					       void *context)
- {
- 	return -ENODEV;
-diff -urNp linux-2.6.39.3/include/acpi/processor.h linux-2.6.39.3/include/acpi/processor.h
---- linux-2.6.39.3/include/acpi/processor.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/acpi/processor.h	2011-05-22 19:36:32.000000000 -0400
-@@ -344,7 +344,7 @@ extern struct cpuidle_driver acpi_idle_d
- 
- /* in processor_thermal.c */
- int acpi_processor_get_limit_info(struct acpi_processor *pr);
--extern struct thermal_cooling_device_ops processor_cooling_ops;
-+extern const struct thermal_cooling_device_ops processor_cooling_ops;
- #ifdef CONFIG_CPU_FREQ
- void acpi_thermal_cpufreq_init(void);
- void acpi_thermal_cpufreq_exit(void);
-diff -urNp linux-2.6.39.3/include/asm-generic/atomic-long.h linux-2.6.39.3/include/asm-generic/atomic-long.h
---- linux-2.6.39.3/include/asm-generic/atomic-long.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/atomic-long.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/acpi/acpi_bus.h linux-2.6.39.4/include/acpi/acpi_bus.h
+--- linux-2.6.39.4/include/acpi/acpi_bus.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/acpi/acpi_bus.h	2011-08-05 20:34:06.000000000 -0400
+@@ -107,7 +107,7 @@ struct acpi_device_ops {
+ 	acpi_op_bind bind;
+ 	acpi_op_unbind unbind;
+ 	acpi_op_notify notify;
+-};
++} __no_const;
+ 
+ #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
+ 
+diff -urNp linux-2.6.39.4/include/asm-generic/atomic-long.h linux-2.6.39.4/include/asm-generic/atomic-long.h
+--- linux-2.6.39.4/include/asm-generic/atomic-long.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/atomic-long.h	2011-08-05 20:34:06.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -61729,12 +51261,12 @@ diff -urNp linux-2.6.39.3/include/asm-generic/atomic-long.h linux-2.6.39.3/inclu
 +	atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_inc_unchecked((atomic_unchecked_t *)NULL);
-+	atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
++	(void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
 +	atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
 +	atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_dec_unchecked((atomic_unchecked_t *)NULL);
 +	atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
-+	atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
++	(void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
 +
 +	atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
 +	atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
@@ -61767,9 +51299,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/atomic-long.h linux-2.6.39.3/inclu
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-2.6.39.3/include/asm-generic/cache.h linux-2.6.39.3/include/asm-generic/cache.h
---- linux-2.6.39.3/include/asm-generic/cache.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/cache.h	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/cache.h linux-2.6.39.4/include/asm-generic/cache.h
+--- linux-2.6.39.4/include/asm-generic/cache.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/cache.h	2011-08-05 19:44:37.000000000 -0400
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
@@ -61780,102 +51312,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/cache.h linux-2.6.39.3/include/asm
 +#define L1_CACHE_BYTES		(1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-2.6.39.3/include/asm-generic/dma-mapping-common.h linux-2.6.39.3/include/asm-generic/dma-mapping-common.h
---- linux-2.6.39.3/include/asm-generic/dma-mapping-common.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/dma-mapping-common.h	2011-05-22 19: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)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	dma_addr_t addr;
- 
- 	kmemcheck_mark_initialized(ptr, size);
-@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attr
- 					  enum dma_data_direction dir,
- 					  struct dma_attrs *attrs)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->unmap_page)
-@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struc
- 				   int nents, enum dma_data_direction dir,
- 				   struct dma_attrs *attrs)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	int i, ents;
- 	struct scatterlist *s;
- 
-@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(st
- 				      int nents, enum dma_data_direction dir,
- 				      struct dma_attrs *attrs)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	debug_dma_unmap_sg(dev, sg, nents, dir);
-@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(st
- 				      size_t offset, size_t size,
- 				      enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	dma_addr_t addr;
- 
- 	kmemcheck_mark_initialized(page_address(page) + offset, size);
-@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(st
- static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
- 				  size_t size, enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->unmap_page)
-@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_c
- 					   size_t size,
- 					   enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_single_for_cpu)
-@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_d
- 					      dma_addr_t addr, size_t size,
- 					      enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_single_for_device)
-@@ -139,7 +139,7 @@ static inline void
- dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
- 		    int nelems, enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_sg_for_cpu)
-@@ -151,7 +151,7 @@ static inline void
- dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
- 		       int nelems, enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.39.3/include/asm-generic/int-l64.h linux-2.6.39.3/include/asm-generic/int-l64.h
---- linux-2.6.39.3/include/asm-generic/int-l64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/int-l64.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/int-l64.h linux-2.6.39.4/include/asm-generic/int-l64.h
+--- linux-2.6.39.4/include/asm-generic/int-l64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/int-l64.h	2011-08-05 19:44:37.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -61885,9 +51324,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/int-l64.h linux-2.6.39.3/include/a
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.39.3/include/asm-generic/int-ll64.h linux-2.6.39.3/include/asm-generic/int-ll64.h
---- linux-2.6.39.3/include/asm-generic/int-ll64.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/int-ll64.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/int-ll64.h linux-2.6.39.4/include/asm-generic/int-ll64.h
+--- linux-2.6.39.4/include/asm-generic/int-ll64.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/int-ll64.h	2011-08-05 19:44:37.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -61897,9 +51336,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/int-ll64.h linux-2.6.39.3/include/
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.39.3/include/asm-generic/kmap_types.h linux-2.6.39.3/include/asm-generic/kmap_types.h
---- linux-2.6.39.3/include/asm-generic/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/kmap_types.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/kmap_types.h linux-2.6.39.4/include/asm-generic/kmap_types.h
+--- linux-2.6.39.4/include/asm-generic/kmap_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/kmap_types.h	2011-08-05 19:44:37.000000000 -0400
 @@ -29,10 +29,11 @@ KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
  KMAP_D(18)	KM_NMI_PTE,
@@ -61913,9 +51352,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/kmap_types.h linux-2.6.39.3/includ
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.39.3/include/asm-generic/pgtable.h linux-2.6.39.3/include/asm-generic/pgtable.h
---- linux-2.6.39.3/include/asm-generic/pgtable.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/pgtable.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/pgtable.h linux-2.6.39.4/include/asm-generic/pgtable.h
+--- linux-2.6.39.4/include/asm-generic/pgtable.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/pgtable.h	2011-08-05 19:44:37.000000000 -0400
 @@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd)
  #endif /* __HAVE_ARCH_PMD_WRITE */
  #endif
@@ -61931,9 +51370,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/pgtable.h linux-2.6.39.3/include/a
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.39.3/include/asm-generic/pgtable-nopmd.h linux-2.6.39.3/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.39.3/include/asm-generic/pgtable-nopmd.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/pgtable-nopmd.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/pgtable-nopmd.h linux-2.6.39.4/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.39.4/include/asm-generic/pgtable-nopmd.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/pgtable-nopmd.h	2011-08-05 19:44:37.000000000 -0400
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -61970,9 +51409,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/pgtable-nopmd.h linux-2.6.39.3/inc
  /*
   * 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.3/include/asm-generic/pgtable-nopud.h linux-2.6.39.3/include/asm-generic/pgtable-nopud.h
---- linux-2.6.39.3/include/asm-generic/pgtable-nopud.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/pgtable-nopud.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/pgtable-nopud.h linux-2.6.39.4/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.39.4/include/asm-generic/pgtable-nopud.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/pgtable-nopud.h	2011-08-05 19:44:37.000000000 -0400
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -62003,9 +51442,9 @@ diff -urNp linux-2.6.39.3/include/asm-generic/pgtable-nopud.h linux-2.6.39.3/inc
  /*
   * 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.3/include/asm-generic/vmlinux.lds.h linux-2.6.39.3/include/asm-generic/vmlinux.lds.h
---- linux-2.6.39.3/include/asm-generic/vmlinux.lds.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/asm-generic/vmlinux.lds.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/asm-generic/vmlinux.lds.h linux-2.6.39.4/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.39.4/include/asm-generic/vmlinux.lds.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/asm-generic/vmlinux.lds.h	2011-08-05 19:44:37.000000000 -0400
 @@ -213,6 +213,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
@@ -62042,9 +51481,30 @@ diff -urNp linux-2.6.39.3/include/asm-generic/vmlinux.lds.h linux-2.6.39.3/inclu
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.39.3/include/drm/drmP.h linux-2.6.39.3/include/drm/drmP.h
---- linux-2.6.39.3/include/drm/drmP.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/drm/drmP.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/drm/drm_crtc_helper.h linux-2.6.39.4/include/drm/drm_crtc_helper.h
+--- linux-2.6.39.4/include/drm/drm_crtc_helper.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/drm/drm_crtc_helper.h	2011-08-05 20:34:06.000000000 -0400
+@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
+ 
+ 	/* disable crtc when not in use - more explicit than dpms off */
+ 	void (*disable)(struct drm_crtc *crtc);
+-};
++} __no_const;
+ 
+ struct drm_encoder_helper_funcs {
+ 	void (*dpms)(struct drm_encoder *encoder, int mode);
+@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
+ 					    struct drm_connector *connector);
+ 	/* disable encoder when not in use - more explicit than dpms off */
+ 	void (*disable)(struct drm_encoder *encoder);
+-};
++} __no_const;
+ 
+ struct drm_connector_helper_funcs {
+ 	int (*get_modes)(struct drm_connector *connector);
+diff -urNp linux-2.6.39.4/include/drm/drmP.h linux-2.6.39.4/include/drm/drmP.h
+--- linux-2.6.39.4/include/drm/drmP.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/drm/drmP.h	2011-08-05 20:34:06.000000000 -0400
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -62053,15 +51513,6 @@ diff -urNp linux-2.6.39.3/include/drm/drmP.h linux-2.6.39.3/include/drm/drmP.h
  #include "drm.h"
  
  #include <linux/idr.h>
-@@ -908,7 +909,7 @@ struct drm_driver {
- 			    uint32_t handle);
- 
- 	/* Driver private ops for this object */
--	struct vm_operations_struct *gem_vm_ops;
-+	const struct vm_operations_struct *gem_vm_ops;
- 
- 	int major;
- 	int minor;
 @@ -1023,7 +1024,7 @@ struct drm_device {
  
  	/** \name Usage Counters */
@@ -62080,9 +51531,21 @@ diff -urNp linux-2.6.39.3/include/drm/drmP.h linux-2.6.39.3/include/drm/drmP.h
  	/*@} */
  
  	struct list_head filelist;
-diff -urNp linux-2.6.39.3/include/linux/a.out.h linux-2.6.39.3/include/linux/a.out.h
---- linux-2.6.39.3/include/linux/a.out.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/a.out.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/drm/ttm/ttm_memory.h linux-2.6.39.4/include/drm/ttm/ttm_memory.h
+--- linux-2.6.39.4/include/drm/ttm/ttm_memory.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/drm/ttm/ttm_memory.h	2011-08-05 20:34:06.000000000 -0400
+@@ -47,7 +47,7 @@
+ 
+ struct ttm_mem_shrink {
+ 	int (*do_shrink) (struct ttm_mem_shrink *);
+-};
++} __no_const;
+ 
+ /**
+  * struct ttm_mem_global - Global memory accounting structure.
+diff -urNp linux-2.6.39.4/include/linux/a.out.h linux-2.6.39.4/include/linux/a.out.h
+--- linux-2.6.39.4/include/linux/a.out.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/a.out.h	2011-08-05 19:44:37.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -62098,9 +51561,9 @@ diff -urNp linux-2.6.39.3/include/linux/a.out.h linux-2.6.39.3/include/linux/a.o
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-2.6.39.3/include/linux/atmdev.h linux-2.6.39.3/include/linux/atmdev.h
---- linux-2.6.39.3/include/linux/atmdev.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/atmdev.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/atmdev.h linux-2.6.39.4/include/linux/atmdev.h
+--- linux-2.6.39.4/include/linux/atmdev.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/atmdev.h	2011-08-05 19:44:37.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -62110,9 +51573,9 @@ diff -urNp linux-2.6.39.3/include/linux/atmdev.h linux-2.6.39.3/include/linux/at
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.39.3/include/linux/binfmts.h linux-2.6.39.3/include/linux/binfmts.h
---- linux-2.6.39.3/include/linux/binfmts.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/binfmts.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/binfmts.h linux-2.6.39.4/include/linux/binfmts.h
+--- linux-2.6.39.4/include/linux/binfmts.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/binfmts.h	2011-08-05 19:44:37.000000000 -0400
 @@ -92,6 +92,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
@@ -62121,47 +51584,21 @@ diff -urNp linux-2.6.39.3/include/linux/binfmts.h linux-2.6.39.3/include/linux/b
  	unsigned long min_coredump;	/* minimal dump size */
  };
  
-diff -urNp linux-2.6.39.3/include/linux/blkdev.h linux-2.6.39.3/include/linux/blkdev.h
---- linux-2.6.39.3/include/linux/blkdev.h	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/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 */
- 
- struct block_device_operations {
--	int (*open) (struct block_device *, fmode_t);
--	int (*release) (struct gendisk *, fmode_t);
--	int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
--	int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
--	int (*direct_access) (struct block_device *, sector_t,
-+	int (* const open) (struct block_device *, fmode_t);
-+	int (* const release) (struct gendisk *, fmode_t);
-+	int (* const ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
-+	int (* const compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
-+	int (* const direct_access) (struct block_device *, sector_t,
- 						void **, unsigned long *);
--	unsigned int (*check_events) (struct gendisk *disk,
-+	unsigned int (* const check_events) (struct gendisk *disk,
- 				      unsigned int clearing);
- 	/* ->media_changed() is DEPRECATED, use ->check_events() instead */
--	int (*media_changed) (struct gendisk *);
--	void (*unlock_native_capacity) (struct gendisk *);
--	int (*revalidate_disk) (struct gendisk *);
--	int (*getgeo)(struct block_device *, struct hd_geometry *);
-+	int (* const media_changed) (struct gendisk *);
-+	void (* const unlock_native_capacity) (struct gendisk *);
-+	int (* const revalidate_disk) (struct gendisk *);
-+	int (* const getgeo)(struct block_device *, struct hd_geometry *);
+diff -urNp linux-2.6.39.4/include/linux/blkdev.h linux-2.6.39.4/include/linux/blkdev.h
+--- linux-2.6.39.4/include/linux/blkdev.h	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/include/linux/blkdev.h	2011-08-05 20:34:06.000000000 -0400
+@@ -1307,7 +1307,7 @@ struct block_device_operations {
+ 	int (*getgeo)(struct block_device *, struct hd_geometry *);
  	/* this callback is with swap_lock and sometimes page table lock held */
--	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
+ 	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
 -	struct module *owner;
-+	void (* const swap_slot_free_notify) (struct block_device *, unsigned long);
 +	struct module * const owner;
  };
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.39.3/include/linux/blktrace_api.h linux-2.6.39.3/include/linux/blktrace_api.h
---- linux-2.6.39.3/include/linux/blktrace_api.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/blktrace_api.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/blktrace_api.h linux-2.6.39.4/include/linux/blktrace_api.h
+--- linux-2.6.39.4/include/linux/blktrace_api.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/blktrace_api.h	2011-08-05 19:44:37.000000000 -0400
 @@ -161,7 +161,7 @@ struct blk_trace {
  	struct dentry *dir;
  	struct dentry *dropped_file;
@@ -62171,9 +51608,9 @@ diff -urNp linux-2.6.39.3/include/linux/blktrace_api.h linux-2.6.39.3/include/li
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-2.6.39.3/include/linux/byteorder/little_endian.h linux-2.6.39.3/include/linux/byteorder/little_endian.h
---- linux-2.6.39.3/include/linux/byteorder/little_endian.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/byteorder/little_endian.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/byteorder/little_endian.h linux-2.6.39.4/include/linux/byteorder/little_endian.h
+--- linux-2.6.39.4/include/linux/byteorder/little_endian.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/byteorder/little_endian.h	2011-08-05 19:44:37.000000000 -0400
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -62238,9 +51675,9 @@ diff -urNp linux-2.6.39.3/include/linux/byteorder/little_endian.h linux-2.6.39.3
  }
  #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.3/include/linux/cache.h linux-2.6.39.3/include/linux/cache.h
---- linux-2.6.39.3/include/linux/cache.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/cache.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/cache.h linux-2.6.39.4/include/linux/cache.h
+--- linux-2.6.39.4/include/linux/cache.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/cache.h	2011-08-05 19:44:37.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -62252,9 +51689,9 @@ diff -urNp linux-2.6.39.3/include/linux/cache.h linux-2.6.39.3/include/linux/cac
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-2.6.39.3/include/linux/capability.h linux-2.6.39.3/include/linux/capability.h
---- linux-2.6.39.3/include/linux/capability.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/capability.h	2011-05-22 21:02:47.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/capability.h linux-2.6.39.4/include/linux/capability.h
+--- linux-2.6.39.4/include/linux/capability.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/capability.h	2011-08-05 19:44:37.000000000 -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);
@@ -62265,10 +51702,20 @@ diff -urNp linux-2.6.39.3/include/linux/capability.h linux-2.6.39.3/include/linu
  
  /* audit system wants to get cap info from files as well */
  extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
-diff -urNp linux-2.6.39.3/include/linux/compiler-gcc4.h linux-2.6.39.3/include/linux/compiler-gcc4.h
---- linux-2.6.39.3/include/linux/compiler-gcc4.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/compiler-gcc4.h	2011-05-22 19:36:32.000000000 -0400
-@@ -46,6 +46,11 @@
+diff -urNp linux-2.6.39.4/include/linux/compiler-gcc4.h linux-2.6.39.4/include/linux/compiler-gcc4.h
+--- linux-2.6.39.4/include/linux/compiler-gcc4.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/compiler-gcc4.h	2011-08-05 20:34:06.000000000 -0400
+@@ -31,6 +31,9 @@
+ 
+ 
+ #if __GNUC_MINOR__ >= 5
++
++#define __no_const __attribute__((no_const))
++
+ /*
+  * Mark a position in code as unreachable.  This can be used to
+  * suppress control flow warnings after asm blocks that transfer
+@@ -46,6 +49,11 @@
  #define __noclone	__attribute__((__noclone__))
  
  #endif
@@ -62280,33 +51727,44 @@ diff -urNp linux-2.6.39.3/include/linux/compiler-gcc4.h linux-2.6.39.3/include/l
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.39.3/include/linux/compiler.h linux-2.6.39.3/include/linux/compiler.h
---- linux-2.6.39.3/include/linux/compiler.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/compiler.h	2011-05-22 19:36:32.000000000 -0400
-@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_
+diff -urNp linux-2.6.39.4/include/linux/compiler.h linux-2.6.39.4/include/linux/compiler.h
+--- linux-2.6.39.4/include/linux/compiler.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/compiler.h	2011-08-05 20:34:06.000000000 -0400
+@@ -264,6 +264,10 @@ void ftrace_likely_update(struct ftrace_
+ # define __attribute_const__	/* unimplemented */
+ #endif
+ 
++#ifndef __no_const
++# define __no_const
++#endif
++
+ /*
+  * Tell gcc if a function is cold. The compiler will assume any path
+  * directly leading to the call is unlikely.
+@@ -273,6 +277,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
  
 +#ifndef __alloc_size
-+#define __alloc_size
++#define __alloc_size(...)
 +#endif
 +
 +#ifndef __bos
-+#define __bos
++#define __bos(ptr, arg)
 +#endif
 +
 +#ifndef __bos0
-+#define __bos0
++#define __bos0(ptr)
 +#endif
 +
 +#ifndef __bos1
-+#define __bos1
++#define __bos1(ptr)
 +#endif
 +
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-@@ -306,6 +322,7 @@ void ftrace_likely_update(struct ftrace_
+@@ -306,6 +326,7 @@ void ftrace_likely_update(struct ftrace_
   * use is to mediate communication between process-level code and irq/NMI
   * handlers, all running on the same CPU.
   */
@@ -62315,33 +51773,9 @@ diff -urNp linux-2.6.39.3/include/linux/compiler.h linux-2.6.39.3/include/linux/
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-2.6.39.3/include/linux/concap.h linux-2.6.39.3/include/linux/concap.h
---- linux-2.6.39.3/include/linux/concap.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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  */
- 	struct concap_device_ops *dops;	/* callbacks provided by device */
-- 	struct concap_proto_ops  *pops;	/* callbacks provided by us */
-+ 	const struct concap_proto_ops  *pops;	/* callbacks provided by us */
-  	spinlock_t lock;
- 	int flags;
- 	void *proto_data;		/* protocol specific private data, to
-diff -urNp linux-2.6.39.3/include/linux/configfs.h linux-2.6.39.3/include/linux/configfs.h
---- linux-2.6.39.3/include/linux/configfs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/configfs.h	2011-05-22 19:36:32.000000000 -0400
-@@ -82,7 +82,7 @@ extern void config_item_put(struct confi
- struct config_item_type {
- 	struct module				*ct_owner;
- 	struct configfs_item_operations		*ct_item_ops;
--	struct configfs_group_operations	*ct_group_ops;
-+	const struct configfs_group_operations	*ct_group_ops;
- 	struct configfs_attribute		**ct_attrs;
- };
- 
-diff -urNp linux-2.6.39.3/include/linux/cpuset.h linux-2.6.39.3/include/linux/cpuset.h
---- linux-2.6.39.3/include/linux/cpuset.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/cpuset.h	2011-05-22 19:36:32.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/cpuset.h linux-2.6.39.4/include/linux/cpuset.h
+--- linux-2.6.39.4/include/linux/cpuset.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/cpuset.h	2011-08-05 19:44:37.000000000 -0400
 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
  	 * nodemask.
  	 */
@@ -62351,30 +51785,37 @@ diff -urNp linux-2.6.39.3/include/linux/cpuset.h linux-2.6.39.3/include/linux/cp
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-2.6.39.3/include/linux/dca.h linux-2.6.39.3/include/linux/dca.h
---- linux-2.6.39.3/include/linux/dca.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/dca.h	2011-05-22 19:36:32.000000000 -0400
-@@ -34,7 +34,7 @@ void dca_unregister_notify(struct notifi
- 
- struct dca_provider {
- 	struct list_head	node;
--	struct dca_ops		*ops;
-+	const struct dca_ops		*ops;
- 	struct device 		*cd;
- 	int			 id;
- };
-@@ -53,7 +53,7 @@ struct dca_ops {
- 	int	(*dev_managed)      (struct dca_provider *, struct device *);
- };
- 
--struct dca_provider *alloc_dca_provider(struct dca_ops *ops, int priv_size);
-+struct dca_provider *alloc_dca_provider(const struct dca_ops *ops, int priv_size);
- 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 *dev);
-diff -urNp linux-2.6.39.3/include/linux/decompress/mm.h linux-2.6.39.3/include/linux/decompress/mm.h
---- linux-2.6.39.3/include/linux/decompress/mm.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/decompress/mm.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/crypto.h linux-2.6.39.4/include/linux/crypto.h
+--- linux-2.6.39.4/include/linux/crypto.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/crypto.h	2011-08-05 20:34:06.000000000 -0400
+@@ -361,7 +361,7 @@ struct cipher_tfm {
+ 	                  const u8 *key, unsigned int keylen);
+ 	void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+ 	void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+-};
++} __no_const;
+ 
+ struct hash_tfm {
+ 	int (*init)(struct hash_desc *desc);
+@@ -382,13 +382,13 @@ struct compress_tfm {
+ 	int (*cot_decompress)(struct crypto_tfm *tfm,
+ 	                      const u8 *src, unsigned int slen,
+ 	                      u8 *dst, unsigned int *dlen);
+-};
++} __no_const;
+ 
+ struct rng_tfm {
+ 	int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
+ 			      unsigned int dlen);
+ 	int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
+-};
++} __no_const;
+ 
+ #define crt_ablkcipher	crt_u.ablkcipher
+ #define crt_aead	crt_u.aead
+diff -urNp linux-2.6.39.4/include/linux/decompress/mm.h linux-2.6.39.4/include/linux/decompress/mm.h
+--- linux-2.6.39.4/include/linux/decompress/mm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/decompress/mm.h	2011-08-05 19:44:37.000000000 -0400
 @@ -77,7 +77,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -62384,67 +51825,33 @@ diff -urNp linux-2.6.39.3/include/linux/decompress/mm.h linux-2.6.39.3/include/l
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.39.3/include/linux/dma-mapping.h linux-2.6.39.3/include/linux/dma-mapping.h
---- linux-2.6.39.3/include/linux/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/dma-mapping.h	2011-05-22 19:36:33.000000000 -0400
-@@ -16,40 +16,40 @@ enum dma_data_direction {
- };
- 
- struct dma_map_ops {
--	void* (*alloc_coherent)(struct device *dev, size_t size,
-+	void* (* const alloc_coherent)(struct device *dev, size_t size,
- 				dma_addr_t *dma_handle, gfp_t gfp);
--	void (*free_coherent)(struct device *dev, size_t size,
-+	void (* const free_coherent)(struct device *dev, size_t size,
- 			      void *vaddr, dma_addr_t dma_handle);
--	dma_addr_t (*map_page)(struct device *dev, struct page *page,
-+	dma_addr_t (* const map_page)(struct device *dev, struct page *page,
- 			       unsigned long offset, size_t size,
- 			       enum dma_data_direction dir,
- 			       struct dma_attrs *attrs);
--	void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
-+	void (* const unmap_page)(struct device *dev, dma_addr_t dma_handle,
- 			   size_t size, enum dma_data_direction dir,
- 			   struct dma_attrs *attrs);
--	int (*map_sg)(struct device *dev, struct scatterlist *sg,
-+	int (* const map_sg)(struct device *dev, struct scatterlist *sg,
- 		      int nents, enum dma_data_direction dir,
- 		      struct dma_attrs *attrs);
--	void (*unmap_sg)(struct device *dev,
-+	void (* const unmap_sg)(struct device *dev,
- 			 struct scatterlist *sg, int nents,
- 			 enum dma_data_direction dir,
- 			 struct dma_attrs *attrs);
--	void (*sync_single_for_cpu)(struct device *dev,
-+	void (* const sync_single_for_cpu)(struct device *dev,
- 				    dma_addr_t dma_handle, size_t size,
- 				    enum dma_data_direction dir);
--	void (*sync_single_for_device)(struct device *dev,
-+	void (* const sync_single_for_device)(struct device *dev,
- 				       dma_addr_t dma_handle, size_t size,
- 				       enum dma_data_direction dir);
--	void (*sync_sg_for_cpu)(struct device *dev,
-+	void (* const sync_sg_for_cpu)(struct device *dev,
- 				struct scatterlist *sg, int nents,
- 				enum dma_data_direction dir);
--	void (*sync_sg_for_device)(struct device *dev,
-+	void (* const sync_sg_for_device)(struct device *dev,
- 				   struct scatterlist *sg, int nents,
- 				   enum dma_data_direction dir);
--	int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
--	int (*dma_supported)(struct device *dev, u64 mask);
--	int (*set_dma_mask)(struct device *dev, u64 mask);
+diff -urNp linux-2.6.39.4/include/linux/dma-mapping.h linux-2.6.39.4/include/linux/dma-mapping.h
+--- linux-2.6.39.4/include/linux/dma-mapping.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/dma-mapping.h	2011-08-05 20:34:06.000000000 -0400
+@@ -49,7 +49,7 @@ struct dma_map_ops {
+ 	int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
+ 	int (*dma_supported)(struct device *dev, u64 mask);
+ 	int (*set_dma_mask)(struct device *dev, u64 mask);
 -	int is_phys;
-+	int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr);
-+	int (* const dma_supported)(struct device *dev, u64 mask);
-+	int (* set_dma_mask)(struct device *dev, u64 mask);
 +	const int is_phys;
  };
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.39.3/include/linux/elf.h linux-2.6.39.3/include/linux/elf.h
---- linux-2.6.39.3/include/linux/elf.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/elf.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/efi.h linux-2.6.39.4/include/linux/efi.h
+--- linux-2.6.39.4/include/linux/efi.h	2011-06-25 12:55:23.000000000 -0400
++++ linux-2.6.39.4/include/linux/efi.h	2011-08-05 20:34:06.000000000 -0400
+@@ -409,7 +409,7 @@ struct efivar_operations {
+ 	efi_get_variable_t *get_variable;
+ 	efi_get_next_variable_t *get_next_variable;
+ 	efi_set_variable_t *set_variable;
+-};
++} __no_const;
+ 
+ struct efivars {
+ 	/*
+diff -urNp linux-2.6.39.4/include/linux/elf.h linux-2.6.39.4/include/linux/elf.h
+--- linux-2.6.39.4/include/linux/elf.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/elf.h	2011-08-05 19:44:37.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -62517,21 +51924,21 @@ diff -urNp linux-2.6.39.3/include/linux/elf.h linux-2.6.39.3/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-2.6.39.3/include/linux/enclosure.h linux-2.6.39.3/include/linux/enclosure.h
---- linux-2.6.39.3/include/linux/enclosure.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/enclosure.h	2011-05-22 19:36:33.000000000 -0400
-@@ -98,7 +98,7 @@ struct enclosure_device {
- 	void *scratch;
- 	struct list_head node;
- 	struct device edev;
--	struct enclosure_component_callbacks *cb;
-+	const struct enclosure_component_callbacks *cb;
- 	int components;
- 	struct enclosure_component component[0];
+diff -urNp linux-2.6.39.4/include/linux/firewire.h linux-2.6.39.4/include/linux/firewire.h
+--- linux-2.6.39.4/include/linux/firewire.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/firewire.h	2011-08-05 20:34:06.000000000 -0400
+@@ -429,7 +429,7 @@ struct fw_iso_context {
+ 	union {
+ 		fw_iso_callback_t sc;
+ 		fw_iso_mc_callback_t mc;
+-	} callback;
++	} __no_const callback;
+ 	void *callback_data;
  };
-diff -urNp linux-2.6.39.3/include/linux/fscache-cache.h linux-2.6.39.3/include/linux/fscache-cache.h
---- linux-2.6.39.3/include/linux/fscache-cache.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/fscache-cache.h	2011-05-22 19:36:33.000000000 -0400
+ 
+diff -urNp linux-2.6.39.4/include/linux/fscache-cache.h linux-2.6.39.4/include/linux/fscache-cache.h
+--- linux-2.6.39.4/include/linux/fscache-cache.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/fscache-cache.h	2011-08-05 19:44:37.000000000 -0400
 @@ -113,7 +113,7 @@ struct fscache_operation {
  #endif
  };
@@ -62550,9 +51957,9 @@ diff -urNp linux-2.6.39.3/include/linux/fscache-cache.h linux-2.6.39.3/include/l
  	op->processor = processor;
  	op->release = release;
  	INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-2.6.39.3/include/linux/fs.h linux-2.6.39.3/include/linux/fs.h
---- linux-2.6.39.3/include/linux/fs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/fs.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/fs.h linux-2.6.39.4/include/linux/fs.h
+--- linux-2.6.39.4/include/linux/fs.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/fs.h	2011-08-05 20:34:06.000000000 -0400
 @@ -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)
@@ -62565,148 +51972,26 @@ diff -urNp linux-2.6.39.3/include/linux/fs.h linux-2.6.39.3/include/linux/fs.h
  /*
   * The below are the various read and write types that we support. Some of
   * them include behavioral modifiers that send information down to the
-@@ -575,41 +580,41 @@ typedef int (*read_actor_t)(read_descrip
- 		unsigned long, unsigned long);
- 
- struct address_space_operations {
--	int (*writepage)(struct page *page, struct writeback_control *wbc);
--	int (*readpage)(struct file *, struct page *);
-+	int (* const writepage)(struct page *page, struct writeback_control *wbc);
-+	int (* const readpage)(struct file *, struct page *);
- 
- 	/* Write back some dirty pages from this mapping. */
--	int (*writepages)(struct address_space *, struct writeback_control *);
-+	int (* const writepages)(struct address_space *, struct writeback_control *);
- 
- 	/* Set a page dirty.  Return true if this dirtied it */
--	int (*set_page_dirty)(struct page *page);
-+	int (* const set_page_dirty)(struct page *page);
- 
--	int (*readpages)(struct file *filp, struct address_space *mapping,
-+	int (* const readpages)(struct file *filp, struct address_space *mapping,
- 			struct list_head *pages, unsigned nr_pages);
- 
--	int (*write_begin)(struct file *, struct address_space *mapping,
-+	int (* const write_begin)(struct file *, struct address_space *mapping,
- 				loff_t pos, unsigned len, unsigned flags,
- 				struct page **pagep, void **fsdata);
--	int (*write_end)(struct file *, struct address_space *mapping,
-+	int (* const write_end)(struct file *, struct address_space *mapping,
- 				loff_t pos, unsigned len, unsigned copied,
- 				struct page *page, void *fsdata);
- 
- 	/* Unfortunately this kludge is needed for FIBMAP. Don't use it */
--	sector_t (*bmap)(struct address_space *, sector_t);
--	void (*invalidatepage) (struct page *, unsigned long);
--	int (*releasepage) (struct page *, gfp_t);
--	void (*freepage)(struct page *);
--	ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
-+	sector_t (* const bmap)(struct address_space *, sector_t);
-+	void (* const invalidatepage) (struct page *, unsigned long);
-+	int (* const releasepage) (struct page *, gfp_t);
-+	void (* const freepage)(struct page *);
-+	ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
- 			loff_t offset, unsigned long nr_segs);
--	int (*get_xip_mem)(struct address_space *, pgoff_t, int,
-+	int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
- 						void **, unsigned long *);
- 	/* migrate the contents of a page to the specified target */
--	int (*migratepage) (struct address_space *,
-+	int (* const migratepage) (struct address_space *,
- 			struct page *, struct page *);
--	int (*launder_page) (struct page *);
--	int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
-+	int (* const launder_page) (struct page *);
-+	int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
- 					unsigned long);
--	int (*error_remove_page)(struct address_space *, struct page *);
-+	int (* const error_remove_page)(struct address_space *, struct page *);
- };
- 
- extern const struct address_space_operations empty_aops;
-@@ -1060,17 +1065,17 @@ static inline int file_check_writeable(s
- typedef struct files_struct *fl_owner_t;
- 
- struct file_lock_operations {
--	void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
--	void (*fl_release_private)(struct file_lock *);
-+	void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
-+	void (* const fl_release_private)(struct file_lock *);
+@@ -1535,7 +1540,7 @@ struct block_device_operations;
+  * the big kernel lock held in all filesystems.
+  */
+ struct file_operations {
+-	struct module *owner;
++	struct module * const owner;
+ 	loff_t (*llseek) (struct file *, loff_t, int);
+ 	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+ 	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+@@ -1563,6 +1568,7 @@ struct file_operations {
+ 	long (*fallocate)(struct file *file, int mode, loff_t offset,
+ 			  loff_t len);
  };
++typedef struct file_operations __no_const file_operations_no_const;
  
- struct lock_manager_operations {
--	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
--	void (*fl_notify)(struct file_lock *);	/* unblock callback */
--	int (*fl_grant)(struct file_lock *, struct file_lock *, int);
--	void (*fl_release_private)(struct file_lock *);
--	void (*fl_break)(struct file_lock *);
--	int (*fl_change)(struct file_lock **, int);
-+	int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
-+	void (* const fl_notify)(struct file_lock *);	/* unblock callback */
-+	int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
-+	void (* const fl_release_private)(struct file_lock *);
-+	void (* const fl_break)(struct file_lock *);
-+	int (* const fl_change)(struct file_lock **, int);
- };
+ #define IPERM_FLAG_RCU	0x0001
  
- struct lock_manager {
-@@ -1611,31 +1616,31 @@ extern ssize_t vfs_writev(struct file *,
- 		unsigned long, loff_t *);
- 
- struct super_operations {
--   	struct inode *(*alloc_inode)(struct super_block *sb);
--	void (*destroy_inode)(struct inode *);
-+   	struct inode *(* const alloc_inode)(struct super_block *sb);
-+	void (* const destroy_inode)(struct inode *);
- 
--   	void (*dirty_inode) (struct inode *);
--	int (*write_inode) (struct inode *, struct writeback_control *wbc);
--	int (*drop_inode) (struct inode *);
--	void (*evict_inode) (struct inode *);
--	void (*put_super) (struct super_block *);
--	void (*write_super) (struct super_block *);
--	int (*sync_fs)(struct super_block *sb, int wait);
--	int (*freeze_fs) (struct super_block *);
--	int (*unfreeze_fs) (struct super_block *);
--	int (*statfs) (struct dentry *, struct kstatfs *);
--	int (*remount_fs) (struct super_block *, int *, char *);
--	void (*umount_begin) (struct super_block *);
--
--	int (*show_options)(struct seq_file *, struct vfsmount *);
--	int (*show_devname)(struct seq_file *, struct vfsmount *);
--	int (*show_path)(struct seq_file *, struct vfsmount *);
--	int (*show_stats)(struct seq_file *, struct vfsmount *);
-+   	void (* const dirty_inode) (struct inode *);
-+	int (* const write_inode) (struct inode *, struct writeback_control *wbc);
-+	int (* const drop_inode) (struct inode *);
-+	void (* const evict_inode) (struct inode *);
-+	void (* const put_super) (struct super_block *);
-+	void (* const write_super) (struct super_block *);
-+	int (* const sync_fs)(struct super_block *sb, int wait);
-+	int (* const freeze_fs) (struct super_block *);
-+	int (* const unfreeze_fs) (struct super_block *);
-+	int (* const statfs) (struct dentry *, struct kstatfs *);
-+	int (* const remount_fs) (struct super_block *, int *, char *);
-+	void (* const umount_begin) (struct super_block *);
-+
-+	int (* const show_options)(struct seq_file *, struct vfsmount *);
-+	int (* const show_devname)(struct seq_file *, struct vfsmount *);
-+	int (* const show_path)(struct seq_file *, struct vfsmount *);
-+	int (* const show_stats)(struct seq_file *, struct vfsmount *);
- #ifdef CONFIG_QUOTA
--	ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
--	ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
-+	ssize_t (* const quota_read)(struct super_block *, int, char *, size_t, loff_t);
-+	ssize_t (* const quota_write)(struct super_block *, int, const char *, size_t, loff_t);
- #endif
--	int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
-+	int (* const bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
- };
- 
- /*
-diff -urNp linux-2.6.39.3/include/linux/fs_struct.h linux-2.6.39.3/include/linux/fs_struct.h
---- linux-2.6.39.3/include/linux/fs_struct.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/fs_struct.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/fs_struct.h linux-2.6.39.4/include/linux/fs_struct.h
+--- linux-2.6.39.4/include/linux/fs_struct.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/fs_struct.h	2011-08-05 19:44:37.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -62716,9 +52001,18 @@ diff -urNp linux-2.6.39.3/include/linux/fs_struct.h linux-2.6.39.3/include/linux
  	spinlock_t lock;
  	seqcount_t seq;
  	int umask;
-diff -urNp linux-2.6.39.3/include/linux/ftrace_event.h linux-2.6.39.3/include/linux/ftrace_event.h
---- linux-2.6.39.3/include/linux/ftrace_event.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/ftrace_event.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/ftrace_event.h linux-2.6.39.4/include/linux/ftrace_event.h
+--- linux-2.6.39.4/include/linux/ftrace_event.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/ftrace_event.h	2011-08-05 20:34:06.000000000 -0400
+@@ -84,7 +84,7 @@ struct trace_event_functions {
+ 	trace_print_func	raw;
+ 	trace_print_func	hex;
+ 	trace_print_func	binary;
+-};
++} __no_const;
+ 
+ struct trace_event {
+ 	struct hlist_node		node;
 @@ -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);
@@ -62728,21 +52022,9 @@ diff -urNp linux-2.6.39.3/include/linux/ftrace_event.h linux-2.6.39.3/include/li
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-2.6.39.3/include/linux/ftrace.h linux-2.6.39.3/include/linux/ftrace.h
---- linux-2.6.39.3/include/linux/ftrace.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 *ops,
- 				void *data);
- extern void
--unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops);
-+unregister_ftrace_function_probe_func(char *glob, const struct ftrace_probe_ops *ops);
- extern void unregister_ftrace_function_probe_all(char *glob);
- 
- extern int ftrace_text_reserved(void *start, void *end);
-diff -urNp linux-2.6.39.3/include/linux/genhd.h linux-2.6.39.3/include/linux/genhd.h
---- linux-2.6.39.3/include/linux/genhd.h	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/include/linux/genhd.h	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/genhd.h linux-2.6.39.4/include/linux/genhd.h
+--- linux-2.6.39.4/include/linux/genhd.h	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/include/linux/genhd.h	2011-08-05 19:44:37.000000000 -0400
 @@ -184,7 +184,7 @@ struct gendisk {
  	struct kobject *slave_dir;
  
@@ -62752,9 +52034,9 @@ diff -urNp linux-2.6.39.3/include/linux/genhd.h linux-2.6.39.3/include/linux/gen
  	struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-2.6.39.3/include/linux/gracl.h linux-2.6.39.3/include/linux/gracl.h
---- linux-2.6.39.3/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/gracl.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/gracl.h linux-2.6.39.4/include/linux/gracl.h
+--- linux-2.6.39.4/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/gracl.h	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -63073,9 +52355,9 @@ diff -urNp linux-2.6.39.3/include/linux/gracl.h linux-2.6.39.3/include/linux/gra
 +
 +#endif
 +
-diff -urNp linux-2.6.39.3/include/linux/gralloc.h linux-2.6.39.3/include/linux/gralloc.h
---- linux-2.6.39.3/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/gralloc.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/gralloc.h linux-2.6.39.4/include/linux/gralloc.h
+--- linux-2.6.39.4/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/gralloc.h	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -63086,9 +52368,9 @@ diff -urNp linux-2.6.39.3/include/linux/gralloc.h linux-2.6.39.3/include/linux/g
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-2.6.39.3/include/linux/grdefs.h linux-2.6.39.3/include/linux/grdefs.h
---- linux-2.6.39.3/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/grdefs.h	2011-06-11 16:24:51.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/grdefs.h linux-2.6.39.4/include/linux/grdefs.h
+--- linux-2.6.39.4/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/grdefs.h	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -63230,9 +52512,9 @@ diff -urNp linux-2.6.39.3/include/linux/grdefs.h linux-2.6.39.3/include/linux/gr
 +};
 +
 +#endif
-diff -urNp linux-2.6.39.3/include/linux/grinternal.h linux-2.6.39.3/include/linux/grinternal.h
---- linux-2.6.39.3/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/grinternal.h	2011-07-14 21:03:15.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/grinternal.h linux-2.6.39.4/include/linux/grinternal.h
+--- linux-2.6.39.4/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/grinternal.h	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,219 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -63453,9 +52735,9 @@ diff -urNp linux-2.6.39.3/include/linux/grinternal.h linux-2.6.39.3/include/linu
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.39.3/include/linux/grmsg.h linux-2.6.39.3/include/linux/grmsg.h
---- linux-2.6.39.3/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/grmsg.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/grmsg.h linux-2.6.39.4/include/linux/grmsg.h
+--- linux-2.6.39.4/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/grmsg.h	2011-08-05 19:44:37.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/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -63565,10 +52847,10 @@ diff -urNp linux-2.6.39.3/include/linux/grmsg.h linux-2.6.39.3/include/linux/grm
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-2.6.39.3/include/linux/grsecurity.h linux-2.6.39.3/include/linux/grsecurity.h
---- linux-2.6.39.3/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/grsecurity.h	2011-07-16 15:28:00.000000000 -0400
-@@ -0,0 +1,215 @@
+diff -urNp linux-2.6.39.4/include/linux/grsecurity.h linux-2.6.39.4/include/linux/grsecurity.h
+--- linux-2.6.39.4/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/grsecurity.h	2011-08-05 19:54:17.000000000 -0400
+@@ -0,0 +1,218 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -63578,6 +52860,9 @@ diff -urNp linux-2.6.39.3/include/linux/grsecurity.h linux-2.6.39.3/include/linu
 +#include <linux/compat.h>
 +
 +/* notify of brain-dead configs */
++#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
++#endif
 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
 +#endif
@@ -63784,9 +53069,9 @@ diff -urNp linux-2.6.39.3/include/linux/grsecurity.h linux-2.6.39.3/include/linu
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.39.3/include/linux/grsock.h linux-2.6.39.3/include/linux/grsock.h
---- linux-2.6.39.3/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/grsock.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/grsock.h linux-2.6.39.4/include/linux/grsock.h
+--- linux-2.6.39.4/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/grsock.h	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -63807,9 +53092,9 @@ diff -urNp linux-2.6.39.3/include/linux/grsock.h linux-2.6.39.3/include/linux/gr
 +			    const int protocol);
 +
 +#endif
-diff -urNp linux-2.6.39.3/include/linux/highmem.h linux-2.6.39.3/include/linux/highmem.h
---- linux-2.6.39.3/include/linux/highmem.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/highmem.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/highmem.h linux-2.6.39.4/include/linux/highmem.h
+--- linux-2.6.39.4/include/linux/highmem.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/highmem.h	2011-08-05 19:44:37.000000000 -0400
 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct
  	kunmap_atomic(kaddr, KM_USER0);
  }
@@ -63829,9 +53114,20 @@ diff -urNp linux-2.6.39.3/include/linux/highmem.h linux-2.6.39.3/include/linux/h
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff -urNp linux-2.6.39.3/include/linux/i2o.h linux-2.6.39.3/include/linux/i2o.h
---- linux-2.6.39.3/include/linux/i2o.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/i2o.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/i2c.h linux-2.6.39.4/include/linux/i2c.h
+--- linux-2.6.39.4/include/linux/i2c.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/i2c.h	2011-08-05 20:34:06.000000000 -0400
+@@ -346,6 +346,7 @@ struct i2c_algorithm {
+ 	/* To determine what the adapter supports */
+ 	u32 (*functionality) (struct i2c_adapter *);
+ };
++typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
+ 
+ /*
+  * i2c_adapter is the structure used to identify a physical i2c bus along
+diff -urNp linux-2.6.39.4/include/linux/i2o.h linux-2.6.39.4/include/linux/i2o.h
+--- linux-2.6.39.4/include/linux/i2o.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/i2o.h	2011-08-05 19:44:37.000000000 -0400
 @@ -564,7 +564,7 @@ struct i2o_controller {
  	struct i2o_device *exec;	/* Executive */
  #if BITS_PER_LONG == 64
@@ -63841,21 +53137,9 @@ diff -urNp linux-2.6.39.3/include/linux/i2o.h linux-2.6.39.3/include/linux/i2o.h
  	struct list_head context_list;	/* list of context id's
  					   and pointers */
  #endif
-diff -urNp linux-2.6.39.3/include/linux/if_phonet.h linux-2.6.39.3/include/linux/if_phonet.h
---- linux-2.6.39.3/include/linux/if_phonet.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/if_phonet.h	2011-05-22 19:36:33.000000000 -0400
-@@ -13,7 +13,7 @@
- #define PHONET_DEV_MTU		PHONET_MAX_MTU
- 
- #ifdef __KERNEL__
--extern struct header_ops phonet_header_ops;
-+extern const struct header_ops phonet_header_ops;
- #endif
- 
- #endif
-diff -urNp linux-2.6.39.3/include/linux/init.h linux-2.6.39.3/include/linux/init.h
---- linux-2.6.39.3/include/linux/init.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/init.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/init.h linux-2.6.39.4/include/linux/init.h
+--- linux-2.6.39.4/include/linux/init.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/init.h	2011-08-05 19:44:37.000000000 -0400
 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
@@ -63872,9 +53156,9 @@ diff -urNp linux-2.6.39.3/include/linux/init.h linux-2.6.39.3/include/linux/init
  	{ return exitfn; }					\
  	void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-2.6.39.3/include/linux/init_task.h linux-2.6.39.3/include/linux/init_task.h
---- linux-2.6.39.3/include/linux/init_task.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/init_task.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/init_task.h linux-2.6.39.4/include/linux/init_task.h
+--- linux-2.6.39.4/include/linux/init_task.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/init_task.h	2011-08-05 19:44:37.000000000 -0400
 @@ -83,6 +83,12 @@ extern struct group_info init_groups;
  #define INIT_IDS
  #endif
@@ -63896,9 +53180,21 @@ diff -urNp linux-2.6.39.3/include/linux/init_task.h linux-2.6.39.3/include/linux
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff -urNp linux-2.6.39.3/include/linux/interrupt.h linux-2.6.39.3/include/linux/interrupt.h
---- linux-2.6.39.3/include/linux/interrupt.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/interrupt.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/intel-iommu.h linux-2.6.39.4/include/linux/intel-iommu.h
+--- linux-2.6.39.4/include/linux/intel-iommu.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/intel-iommu.h	2011-08-05 20:34:06.000000000 -0400
+@@ -296,7 +296,7 @@ struct iommu_flush {
+ 			      u8 fm, u64 type);
+ 	void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
+ 			    unsigned int size_order, u64 type);
+-};
++} __no_const;
+ 
+ enum {
+ 	SR_DMAR_FECTL_REG,
+diff -urNp linux-2.6.39.4/include/linux/interrupt.h linux-2.6.39.4/include/linux/interrupt.h
+--- linux-2.6.39.4/include/linux/interrupt.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/interrupt.h	2011-08-05 19:44:37.000000000 -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.
@@ -63923,33 +53219,9 @@ diff -urNp linux-2.6.39.3/include/linux/interrupt.h linux-2.6.39.3/include/linux
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff -urNp linux-2.6.39.3/include/linux/iommu.h linux-2.6.39.3/include/linux/iommu.h
---- linux-2.6.39.3/include/linux/iommu.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/iommu.h	2011-05-22 19:36:33.000000000 -0400
-@@ -49,7 +49,7 @@ struct iommu_ops {
- 
- #ifdef CONFIG_IOMMU_API
- 
--extern void register_iommu(struct iommu_ops *ops);
-+extern void register_iommu(const struct iommu_ops *ops);
- 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.3/include/linux/ipmi.h linux-2.6.39.3/include/linux/ipmi.h
---- linux-2.6.39.3/include/linux/ipmi.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/ipmi.h	2011-05-22 19:36:33.000000000 -0400
-@@ -282,7 +282,7 @@ struct ipmi_user_hndl {
- 
- /* Create a new user of the IPMI layer on the given interface number. */
- int ipmi_create_user(unsigned int          if_num,
--		     struct ipmi_user_hndl *handler,
-+		     const struct ipmi_user_hndl *handler,
- 		     void                  *handler_data,
- 		     ipmi_user_t           *user);
- 
-diff -urNp linux-2.6.39.3/include/linux/kallsyms.h linux-2.6.39.3/include/linux/kallsyms.h
---- linux-2.6.39.3/include/linux/kallsyms.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/kallsyms.h	2011-05-22 22:52:54.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/kallsyms.h linux-2.6.39.4/include/linux/kallsyms.h
+--- linux-2.6.39.4/include/linux/kallsyms.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/kallsyms.h	2011-08-05 19:44:37.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -63977,9 +53249,9 @@ diff -urNp linux-2.6.39.3/include/linux/kallsyms.h linux-2.6.39.3/include/linux/
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.39.3/include/linux/kgdb.h linux-2.6.39.3/include/linux/kgdb.h
---- linux-2.6.39.3/include/linux/kgdb.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/kgdb.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/kgdb.h linux-2.6.39.4/include/linux/kgdb.h
+--- linux-2.6.39.4/include/linux/kgdb.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/kgdb.h	2011-08-05 20:34:06.000000000 -0400
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -63989,42 +53261,37 @@ diff -urNp linux-2.6.39.3/include/linux/kgdb.h linux-2.6.39.3/include/linux/kgdb
  
  extern struct task_struct	*kgdb_usethread;
  extern struct task_struct	*kgdb_contthread;
-@@ -269,22 +269,22 @@ struct kgdb_arch {
+@@ -241,8 +241,8 @@ extern void kgdb_arch_late(void);
+  * hardware debug registers.
+  */
+ struct kgdb_arch {
+-	unsigned char		gdb_bpt_instr[BREAK_INSTR_SIZE];
+-	unsigned long		flags;
++	const unsigned char	gdb_bpt_instr[BREAK_INSTR_SIZE];
++	const unsigned long	flags;
+ 
+ 	int	(*set_breakpoint)(unsigned long, char *);
+ 	int	(*remove_breakpoint)(unsigned long, char *);
+@@ -268,14 +268,14 @@ struct kgdb_arch {
+  * not a console
   */
  struct kgdb_io {
- 	const char		*name;
--	int			(*read_char) (void);
--	void			(*write_char) (u8);
--	void			(*flush) (void);
--	int			(*init) (void);
--	void			(*pre_exception) (void);
--	void			(*post_exception) (void);
-+	int			(* const read_char) (void);
-+	void			(* const write_char) (u8);
-+	void			(* const flush) (void);
-+	int			(* const init) (void);
-+	void			(* const pre_exception) (void);
-+	void			(* const post_exception) (void);
- 	int			is_console;
- };
- 
--extern struct kgdb_arch		arch_kgdb_ops;
-+extern const struct kgdb_arch arch_kgdb_ops;
- 
- extern unsigned long __weak kgdb_arch_pc(int exception, struct pt_regs *regs);
- 
--extern int kgdb_register_io_module(struct kgdb_io *local_kgdb_io_ops);
--extern void kgdb_unregister_io_module(struct kgdb_io *local_kgdb_io_ops);
--extern struct kgdb_io *dbg_io_ops;
-+extern int kgdb_register_io_module(const struct kgdb_io *local_kgdb_io_ops);
-+extern void kgdb_unregister_io_module(const struct kgdb_io *local_kgdb_io_ops);
-+extern const struct kgdb_io *dbg_io_ops;
- 
- 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.3/include/linux/kmod.h linux-2.6.39.3/include/linux/kmod.h
---- linux-2.6.39.3/include/linux/kmod.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/kmod.h	2011-05-22 19:41:42.000000000 -0400
+-	const char		*name;
++	const char * const	name;
+ 	int			(*read_char) (void);
+ 	void			(*write_char) (u8);
+ 	void			(*flush) (void);
+ 	int			(*init) (void);
+ 	void			(*pre_exception) (void);
+ 	void			(*post_exception) (void);
+-	int			is_console;
++	const int		is_console;
+ };
+ 
+ extern struct kgdb_arch		arch_kgdb_ops;
+diff -urNp linux-2.6.39.4/include/linux/kmod.h linux-2.6.39.4/include/linux/kmod.h
+--- linux-2.6.39.4/include/linux/kmod.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/kmod.h	2011-08-05 19:44:37.000000000 -0400
 @@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysc
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -64034,9 +53301,9 @@ diff -urNp linux-2.6.39.3/include/linux/kmod.h linux-2.6.39.3/include/linux/kmod
  #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.3/include/linux/kvm_host.h linux-2.6.39.3/include/linux/kvm_host.h
---- linux-2.6.39.3/include/linux/kvm_host.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/kvm_host.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/kvm_host.h linux-2.6.39.4/include/linux/kvm_host.h
+--- linux-2.6.39.4/include/linux/kvm_host.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/kvm_host.h	2011-08-05 19:44:37.000000000 -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);
@@ -64055,126 +53322,56 @@ diff -urNp linux-2.6.39.3/include/linux/kvm_host.h linux-2.6.39.3/include/linux/
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.39.3/include/linux/lapb.h linux-2.6.39.3/include/linux/lapb.h
---- linux-2.6.39.3/include/linux/lapb.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/lapb.h	2011-05-22 19:36:33.000000000 -0400
-@@ -44,7 +44,7 @@ struct lapb_parms_struct {
- 	unsigned int mode;
- };
- 
--extern int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks);
-+extern int lapb_register(struct net_device *dev, const struct lapb_register_struct *callbacks);
- extern int lapb_unregister(struct net_device *dev);
- extern int lapb_getparms(struct net_device *dev, struct lapb_parms_struct *parms);
- extern int lapb_setparms(struct net_device *dev, struct lapb_parms_struct *parms);
-diff -urNp linux-2.6.39.3/include/linux/lcd.h linux-2.6.39.3/include/linux/lcd.h
---- linux-2.6.39.3/include/linux/lcd.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/lcd.h	2011-05-22 19:36:33.000000000 -0400
-@@ -60,7 +60,7 @@ struct lcd_device {
- 	   points to something in the body of that driver, it is also invalid. */
- 	struct mutex ops_lock;
- 	/* If this is NULL, the backing module is unloaded */
--	struct lcd_ops *ops;
-+	const struct lcd_ops *ops;
- 	/* Serialise access to set_power method */
- 	struct mutex update_lock;
- 	/* The framebuffer notifier block */
-@@ -101,7 +101,7 @@ static inline void lcd_set_power(struct 
- }
- 
- extern struct lcd_device *lcd_device_register(const char *name,
--	struct device *parent, void *devdata, struct lcd_ops *ops);
-+	struct device *parent, void *devdata, const struct lcd_ops *ops);
- extern void lcd_device_unregister(struct lcd_device *ld);
- 
- #define to_lcd_device(obj) container_of(obj, struct lcd_device, dev)
-diff -urNp linux-2.6.39.3/include/linux/libata.h linux-2.6.39.3/include/linux/libata.h
---- linux-2.6.39.3/include/linux/libata.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/libata.h	2011-05-22 19:36:33.000000000 -0400
-@@ -524,11 +524,11 @@ struct ata_ioports {
- 
- struct ata_host {
- 	spinlock_t		lock;
--	struct device 		*dev;
-+	struct device		*dev;
- 	void __iomem * const	*iomap;
- 	unsigned int		n_ports;
- 	void			*private_data;
--	struct ata_port_operations *ops;
-+	const struct ata_port_operations *ops;
- 	unsigned long		flags;
- 
- 	struct mutex		eh_mutex;
-@@ -719,7 +719,7 @@ struct ata_link {
- 
- struct ata_port {
- 	struct Scsi_Host	*scsi_host; /* our co-allocated scsi host */
--	struct ata_port_operations *ops;
-+	const struct ata_port_operations *ops;
- 	spinlock_t		*lock;
- 	/* Flags owned by the EH context. Only EH should touch these once the
- 	   port is active */
-@@ -907,7 +907,7 @@ struct ata_port_info {
- 	unsigned long		pio_mask;
- 	unsigned long		mwdma_mask;
- 	unsigned long		udma_mask;
--	struct ata_port_operations *port_ops;
-+	const struct ata_port_operations *port_ops;
- 	void 			*private_data;
- };
- 
-@@ -931,7 +931,7 @@ extern const unsigned long sata_deb_timi
- extern const unsigned long sata_deb_timing_hotplug[];
- extern const unsigned long sata_deb_timing_long[];
- 
--extern struct ata_port_operations ata_dummy_port_ops;
-+extern const struct ata_port_operations ata_dummy_port_ops;
- extern const struct ata_port_info ata_dummy_port_info;
- 
- static inline const unsigned long *
-@@ -977,7 +977,7 @@ extern int ata_host_activate(struct ata_
- 			     struct scsi_host_template *sht);
- extern void ata_host_detach(struct ata_host *host);
- extern void ata_host_init(struct ata_host *, struct device *,
--			  unsigned long, struct ata_port_operations *);
-+			  unsigned long, const struct ata_port_operations *);
- 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.3/include/linux/lockd/bind.h linux-2.6.39.3/include/linux/lockd/bind.h
---- linux-2.6.39.3/include/linux/lockd/bind.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/lockd/bind.h	2011-05-22 19:36:33.000000000 -0400
-@@ -23,13 +23,13 @@ struct svc_rqst;
-  * This is the set of functions for lockd->nfsd communication
-  */
- struct nlmsvc_binding {
--	__be32			(*fopen)(struct svc_rqst *,
-+	__be32			(* const fopen)(struct svc_rqst *,
- 						struct nfs_fh *,
- 						struct file **);
--	void			(*fclose)(struct file *);
-+	void			(* const fclose)(struct file *);
- };
- 
--extern struct nlmsvc_binding *	nlmsvc_ops;
-+extern const struct nlmsvc_binding *	nlmsvc_ops;
+diff -urNp linux-2.6.39.4/include/linux/libata.h linux-2.6.39.4/include/linux/libata.h
+--- linux-2.6.39.4/include/linux/libata.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/libata.h	2011-08-05 20:34:06.000000000 -0400
+@@ -898,7 +898,7 @@ struct ata_port_operations {
+ 	 * ->inherits must be the last field and all the preceding
+ 	 * fields must be pointers.
+ 	 */
+-	const struct ata_port_operations	*inherits;
++	const struct ata_port_operations * const inherits;
+ };
+ 
+ struct ata_port_info {
+diff -urNp linux-2.6.39.4/include/linux/mca.h linux-2.6.39.4/include/linux/mca.h
+--- linux-2.6.39.4/include/linux/mca.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mca.h	2011-08-05 20:34:06.000000000 -0400
+@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
+ 						  int region);
+ 	void *		(*mca_transform_memory)(struct mca_device *,
+ 						void *memory);
+-};
++} __no_const;
+ 
+ struct mca_bus {
+ 	u64			default_dma_mask;
+diff -urNp linux-2.6.39.4/include/linux/memory.h linux-2.6.39.4/include/linux/memory.h
+--- linux-2.6.39.4/include/linux/memory.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/memory.h	2011-08-05 20:34:06.000000000 -0400
+@@ -142,7 +142,7 @@ struct memory_accessor {
+ 			size_t count);
+ 	ssize_t (*write)(struct memory_accessor *, const char *buf,
+ 			 off_t offset, size_t count);
+-};
++} __no_const;
  
  /*
-  * Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.39.3/include/linux/mfd/abx500.h linux-2.6.39.3/include/linux/mfd/abx500.h
---- linux-2.6.39.3/include/linux/mfd/abx500.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/mfd/abx500.h	2011-05-22 19:36:33.000000000 -0400
-@@ -227,6 +227,6 @@ struct abx500_ops {
+  * Kernel text modification mutex, used for code patching. Users of this lock
+diff -urNp linux-2.6.39.4/include/linux/mfd/abx500.h linux-2.6.39.4/include/linux/mfd/abx500.h
+--- linux-2.6.39.4/include/linux/mfd/abx500.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mfd/abx500.h	2011-08-05 20:34:06.000000000 -0400
+@@ -226,6 +226,7 @@ struct abx500_ops {
+ 	int (*event_registers_startup_state_get) (struct device *, u8 *);
  	int (*startup_irq_enabled) (struct device *, unsigned int);
  };
++typedef struct abx500_ops __no_const abx500_ops_no_const;
  
--int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
-+int abx500_register_ops(struct device *core_dev, const struct abx500_ops *ops);
+ int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
  void abx500_remove_ops(struct device *dev);
- #endif
-diff -urNp linux-2.6.39.3/include/linux/mm.h linux-2.6.39.3/include/linux/mm.h
---- linux-2.6.39.3/include/linux/mm.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/mm.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/mm.h linux-2.6.39.4/include/linux/mm.h
+--- linux-2.6.39.4/include/linux/mm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mm.h	2011-08-05 19:44:37.000000000 -0400
 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
@@ -64297,9 +53494,9 @@ diff -urNp linux-2.6.39.3/include/linux/mm.h linux-2.6.39.3/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.39.3/include/linux/mm_types.h linux-2.6.39.3/include/linux/mm_types.h
---- linux-2.6.39.3/include/linux/mm_types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/mm_types.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/mm_types.h linux-2.6.39.4/include/linux/mm_types.h
+--- linux-2.6.39.4/include/linux/mm_types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mm_types.h	2011-08-05 19:44:37.000000000 -0400
 @@ -183,6 +183,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
@@ -64334,9 +53531,9 @@ diff -urNp linux-2.6.39.3/include/linux/mm_types.h linux-2.6.39.3/include/linux/
  };
  
  /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.39.3/include/linux/mmu_notifier.h linux-2.6.39.3/include/linux/mmu_notifier.h
---- linux-2.6.39.3/include/linux/mmu_notifier.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/mmu_notifier.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/mmu_notifier.h linux-2.6.39.4/include/linux/mmu_notifier.h
+--- linux-2.6.39.4/include/linux/mmu_notifier.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mmu_notifier.h	2011-08-05 19:44:37.000000000 -0400
 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
@@ -64353,9 +53550,9 @@ diff -urNp linux-2.6.39.3/include/linux/mmu_notifier.h linux-2.6.39.3/include/li
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)		\
-diff -urNp linux-2.6.39.3/include/linux/mmzone.h linux-2.6.39.3/include/linux/mmzone.h
---- linux-2.6.39.3/include/linux/mmzone.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/mmzone.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/mmzone.h linux-2.6.39.4/include/linux/mmzone.h
+--- linux-2.6.39.4/include/linux/mmzone.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mmzone.h	2011-08-05 19:44:37.000000000 -0400
 @@ -355,7 +355,7 @@ struct zone {
  	unsigned long		flags;		   /* zone flags, see below */
  
@@ -64365,9 +53562,9 @@ diff -urNp linux-2.6.39.3/include/linux/mmzone.h linux-2.6.39.3/include/linux/mm
  
  	/*
  	 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-2.6.39.3/include/linux/mod_devicetable.h linux-2.6.39.3/include/linux/mod_devicetable.h
---- linux-2.6.39.3/include/linux/mod_devicetable.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/mod_devicetable.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/mod_devicetable.h linux-2.6.39.4/include/linux/mod_devicetable.h
+--- linux-2.6.39.4/include/linux/mod_devicetable.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mod_devicetable.h	2011-08-05 19:44:37.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -64386,10 +53583,18 @@ diff -urNp linux-2.6.39.3/include/linux/mod_devicetable.h linux-2.6.39.3/include
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-2.6.39.3/include/linux/module.h linux-2.6.39.3/include/linux/module.h
---- linux-2.6.39.3/include/linux/module.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/module.h	2011-05-22 19:36:33.000000000 -0400
-@@ -324,19 +324,16 @@ struct module
+diff -urNp linux-2.6.39.4/include/linux/module.h linux-2.6.39.4/include/linux/module.h
+--- linux-2.6.39.4/include/linux/module.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/module.h	2011-08-05 20:34:06.000000000 -0400
+@@ -16,6 +16,7 @@
+ #include <linux/kobject.h>
+ #include <linux/moduleparam.h>
+ #include <linux/tracepoint.h>
++#include <linux/fs.h>
+ 
+ #include <linux/percpu.h>
+ #include <asm/module.h>
+@@ -324,19 +325,16 @@ struct module
  	int (*init)(void);
  
  	/* If this is non-NULL, vfree after init() returns */
@@ -64413,7 +53618,18 @@ diff -urNp linux-2.6.39.3/include/linux/module.h linux-2.6.39.3/include/linux/mo
  
  	/* Arch-specific module values */
  	struct mod_arch_specific arch;
-@@ -441,16 +438,46 @@ bool is_module_address(unsigned long add
+@@ -391,6 +389,10 @@ struct module
+ #ifdef CONFIG_EVENT_TRACING
+ 	struct ftrace_event_call **trace_events;
+ 	unsigned int num_trace_events;
++	struct file_operations trace_id;
++	struct file_operations trace_enable;
++	struct file_operations trace_format;
++	struct file_operations trace_filter;
+ #endif
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ 	unsigned long *ftrace_callsites;
+@@ -441,16 +443,46 @@ bool is_module_address(unsigned long add
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -64464,9 +53680,9 @@ diff -urNp linux-2.6.39.3/include/linux/module.h linux-2.6.39.3/include/linux/mo
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.39.3/include/linux/moduleloader.h linux-2.6.39.3/include/linux/moduleloader.h
---- linux-2.6.39.3/include/linux/moduleloader.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/moduleloader.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/moduleloader.h linux-2.6.39.4/include/linux/moduleloader.h
+--- linux-2.6.39.4/include/linux/moduleloader.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/moduleloader.h	2011-08-05 19:44:37.000000000 -0400
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -64489,9 +53705,9 @@ diff -urNp linux-2.6.39.3/include/linux/moduleloader.h linux-2.6.39.3/include/li
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.39.3/include/linux/moduleparam.h linux-2.6.39.3/include/linux/moduleparam.h
---- linux-2.6.39.3/include/linux/moduleparam.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/moduleparam.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/moduleparam.h linux-2.6.39.4/include/linux/moduleparam.h
+--- linux-2.6.39.4/include/linux/moduleparam.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/moduleparam.h	2011-08-05 20:34:06.000000000 -0400
 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
@@ -64501,73 +53717,6 @@ diff -urNp linux-2.6.39.3/include/linux/moduleparam.h linux-2.6.39.3/include/lin
  		= { len, string };					\
  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
  			    &param_ops_string,				\
-@@ -285,48 +285,48 @@ static inline void destroy_params(const 
- #define __param_check(name, p, type) \
- 	static inline type *__check_##name(void) { return(p); }
- 
--extern struct kernel_param_ops param_ops_byte;
-+extern const struct kernel_param_ops param_ops_byte;
- extern int param_set_byte(const char *val, const struct kernel_param *kp);
- extern int param_get_byte(char *buffer, const struct kernel_param *kp);
- #define param_check_byte(name, p) __param_check(name, p, unsigned char)
- 
--extern struct kernel_param_ops param_ops_short;
-+extern const struct kernel_param_ops param_ops_short;
- extern int param_set_short(const char *val, const struct kernel_param *kp);
- extern int param_get_short(char *buffer, const struct kernel_param *kp);
- #define param_check_short(name, p) __param_check(name, p, short)
- 
--extern struct kernel_param_ops param_ops_ushort;
-+extern const struct kernel_param_ops param_ops_ushort;
- extern int param_set_ushort(const char *val, const struct kernel_param *kp);
- extern int param_get_ushort(char *buffer, const struct kernel_param *kp);
- #define param_check_ushort(name, p) __param_check(name, p, unsigned short)
- 
--extern struct kernel_param_ops param_ops_int;
-+extern const struct kernel_param_ops param_ops_int;
- extern int param_set_int(const char *val, const struct kernel_param *kp);
- extern int param_get_int(char *buffer, const struct kernel_param *kp);
- #define param_check_int(name, p) __param_check(name, p, int)
- 
--extern struct kernel_param_ops param_ops_uint;
-+extern const struct kernel_param_ops param_ops_uint;
- extern int param_set_uint(const char *val, const struct kernel_param *kp);
- extern int param_get_uint(char *buffer, const struct kernel_param *kp);
- #define param_check_uint(name, p) __param_check(name, p, unsigned int)
- 
--extern struct kernel_param_ops param_ops_long;
-+extern const struct kernel_param_ops param_ops_long;
- extern int param_set_long(const char *val, const struct kernel_param *kp);
- extern int param_get_long(char *buffer, const struct kernel_param *kp);
- #define param_check_long(name, p) __param_check(name, p, long)
- 
--extern struct kernel_param_ops param_ops_ulong;
-+extern const struct kernel_param_ops param_ops_ulong;
- extern int param_set_ulong(const char *val, const struct kernel_param *kp);
- extern int param_get_ulong(char *buffer, const struct kernel_param *kp);
- #define param_check_ulong(name, p) __param_check(name, p, unsigned long)
- 
--extern struct kernel_param_ops param_ops_charp;
-+extern const struct kernel_param_ops param_ops_charp;
- extern int param_set_charp(const char *val, const struct kernel_param *kp);
- extern int param_get_charp(char *buffer, const struct kernel_param *kp);
- #define param_check_charp(name, p) __param_check(name, p, char *)
- 
- /* For historical reasons "bool" parameters can be (unsigned) "int". */
--extern struct kernel_param_ops param_ops_bool;
-+extern const struct kernel_param_ops param_ops_bool;
- extern int param_set_bool(const char *val, const struct kernel_param *kp);
- extern int param_get_bool(char *buffer, const struct kernel_param *kp);
- #define param_check_bool(name, p)					\
-@@ -337,7 +337,7 @@ extern int param_get_bool(char *buffer, 
- 			     !__same_type((p), int *));			\
- 	}
- 
--extern struct kernel_param_ops param_ops_invbool;
-+extern const struct kernel_param_ops param_ops_invbool;
- extern int param_set_invbool(const char *val, const struct kernel_param *kp);
- extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
- #define param_check_invbool(name, p) __param_check(name, p, bool)
 @@ -370,7 +370,7 @@ extern int param_get_invbool(char *buffe
   * module_param_named() for why this might be necessary.
   */
@@ -64577,21 +53726,9 @@ diff -urNp linux-2.6.39.3/include/linux/moduleparam.h linux-2.6.39.3/include/lin
  	= { ARRAY_SIZE(array), nump, &param_ops_##type,			\
  	    sizeof(array[0]), array };					\
  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
-@@ -379,9 +379,9 @@ extern int param_get_invbool(char *buffe
- 			    __same_type(array[0], bool), perm);		\
- 	__MODULE_PARM_TYPE(name, "array of " #type)
- 
--extern struct kernel_param_ops param_array_ops;
-+extern const struct kernel_param_ops param_array_ops;
- 
--extern struct kernel_param_ops param_ops_string;
-+extern const struct kernel_param_ops param_ops_string;
- extern int param_set_copystring(const char *val, const struct kernel_param *);
- extern int param_get_string(char *buffer, const struct kernel_param *kp);
- 
-diff -urNp linux-2.6.39.3/include/linux/mutex.h linux-2.6.39.3/include/linux/mutex.h
---- linux-2.6.39.3/include/linux/mutex.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/mutex.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/mutex.h linux-2.6.39.4/include/linux/mutex.h
+--- linux-2.6.39.4/include/linux/mutex.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/mutex.h	2011-08-05 19:44:37.000000000 -0400
 @@ -51,7 +51,7 @@ struct mutex {
  	spinlock_t		wait_lock;
  	struct list_head	wait_list;
@@ -64601,9 +53738,9 @@ diff -urNp linux-2.6.39.3/include/linux/mutex.h linux-2.6.39.3/include/linux/mut
  #endif
  #ifdef CONFIG_DEBUG_MUTEXES
  	const char 		*name;
-diff -urNp linux-2.6.39.3/include/linux/namei.h linux-2.6.39.3/include/linux/namei.h
---- linux-2.6.39.3/include/linux/namei.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/namei.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/namei.h linux-2.6.39.4/include/linux/namei.h
+--- linux-2.6.39.4/include/linux/namei.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/namei.h	2011-08-05 19:44:37.000000000 -0400
 @@ -24,7 +24,7 @@ struct nameidata {
  	unsigned	seq;
  	int		last_type;
@@ -64628,9 +53765,20 @@ diff -urNp linux-2.6.39.3/include/linux/namei.h linux-2.6.39.3/include/linux/nam
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-2.6.39.3/include/linux/netfilter/xt_gradm.h linux-2.6.39.3/include/linux/netfilter/xt_gradm.h
---- linux-2.6.39.3/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/include/linux/netfilter/xt_gradm.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/netdevice.h linux-2.6.39.4/include/linux/netdevice.h
+--- linux-2.6.39.4/include/linux/netdevice.h	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/include/linux/netdevice.h	2011-08-05 21:12:20.000000000 -0400
+@@ -979,6 +979,7 @@ struct net_device_ops {
+ 	int			(*ndo_set_features)(struct net_device *dev,
+ 						    u32 features);
+ };
++typedef struct net_device_ops __no_const net_device_ops_no_const;
+ 
+ /*
+  *	The DEVICE structure.
+diff -urNp linux-2.6.39.4/include/linux/netfilter/xt_gradm.h linux-2.6.39.4/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.39.4/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/include/linux/netfilter/xt_gradm.h	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -64641,9 +53789,9 @@ diff -urNp linux-2.6.39.3/include/linux/netfilter/xt_gradm.h linux-2.6.39.3/incl
 +};
 +
 +#endif
-diff -urNp linux-2.6.39.3/include/linux/oprofile.h linux-2.6.39.3/include/linux/oprofile.h
---- linux-2.6.39.3/include/linux/oprofile.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/oprofile.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/oprofile.h linux-2.6.39.4/include/linux/oprofile.h
+--- linux-2.6.39.4/include/linux/oprofile.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/oprofile.h	2011-08-05 19:44:37.000000000 -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);
@@ -64656,9 +53804,9 @@ diff -urNp linux-2.6.39.3/include/linux/oprofile.h linux-2.6.39.3/include/linux/
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.39.3/include/linux/padata.h linux-2.6.39.3/include/linux/padata.h
---- linux-2.6.39.3/include/linux/padata.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/padata.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/padata.h linux-2.6.39.4/include/linux/padata.h
+--- linux-2.6.39.4/include/linux/padata.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/padata.h	2011-08-05 19:44:37.000000000 -0400
 @@ -129,7 +129,7 @@ struct parallel_data {
  	struct padata_instance		*pinst;
  	struct padata_parallel_queue	__percpu *pqueue;
@@ -64668,57 +53816,9 @@ diff -urNp linux-2.6.39.3/include/linux/padata.h linux-2.6.39.3/include/linux/pa
  	atomic_t			reorder_objects;
  	atomic_t			refcnt;
  	unsigned int			max_seq_nr;
-diff -urNp linux-2.6.39.3/include/linux/pci.h linux-2.6.39.3/include/linux/pci.h
---- linux-2.6.39.3/include/linux/pci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/pci.h	2011-05-22 19:36:33.000000000 -0400
-@@ -411,7 +411,7 @@ struct pci_bus {
- 	struct resource *resource[PCI_BRIDGE_RESOURCE_NUM];
- 	struct list_head resources;	/* address space routed to this bus */
- 
--	struct pci_ops	*ops;		/* configuration access functions */
-+	const struct pci_ops	*ops;	/* configuration access functions */
- 	void		*sysdata;	/* hook for sys-specific extension */
- 	struct proc_dir_entry *procdir;	/* directory entry in /proc/bus/pci */
- 
-@@ -550,7 +550,7 @@ struct pci_driver {
- 	int  (*resume_early) (struct pci_dev *dev);
- 	int  (*resume) (struct pci_dev *dev);	                /* Device woken up */
- 	void (*shutdown) (struct pci_dev *dev);
--	struct pci_error_handlers *err_handler;
-+	const struct pci_error_handlers *err_handler;
- 	struct device_driver	driver;
- 	struct pci_dynids dynids;
- };
-@@ -639,7 +639,7 @@ void pcibios_scan_specific_bus(int busn)
- extern struct pci_bus *pci_find_bus(int domain, int busnr);
- void pci_bus_add_devices(const struct pci_bus *bus);
- struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
--				      struct pci_ops *ops, void *sysdata);
-+				      const struct pci_ops *ops, void *sysdata);
- static inline struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,
- 					   void *sysdata)
- {
-@@ -650,7 +650,7 @@ static inline struct pci_bus * __devinit
- 	return root_bus;
- }
- struct pci_bus *pci_create_bus(struct device *parent, int bus,
--			       struct pci_ops *ops, void *sysdata);
-+			       const struct pci_ops *ops, void *sysdata);
- struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
- 				int busnr);
- void pcie_update_link_speed(struct pci_bus *bus, u16 link_status);
-@@ -727,7 +727,7 @@ int pci_bus_write_config_word(struct pci
- 			      int where, u16 val);
- int pci_bus_write_config_dword(struct pci_bus *bus, unsigned int devfn,
- 			       int where, u32 val);
--struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops);
-+const struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, const struct pci_ops *ops);
- 
- static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val)
- {
-diff -urNp linux-2.6.39.3/include/linux/perf_event.h linux-2.6.39.3/include/linux/perf_event.h
---- linux-2.6.39.3/include/linux/perf_event.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/perf_event.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/perf_event.h linux-2.6.39.4/include/linux/perf_event.h
+--- linux-2.6.39.4/include/linux/perf_event.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/perf_event.h	2011-08-05 20:34:06.000000000 -0400
 @@ -759,8 +759,8 @@ struct perf_event {
  
  	enum perf_event_active_state	state;
@@ -64741,22 +53841,9 @@ diff -urNp linux-2.6.39.3/include/linux/perf_event.h linux-2.6.39.3/include/linu
  
  	/*
  	 * Protect attach/detach and child_list:
-@@ -1090,9 +1090,9 @@ void perf_event_task_sched_out(struct ta
- }
- 
- extern void perf_event_mmap(struct vm_area_struct *vma);
--extern struct perf_guest_info_callbacks *perf_guest_cbs;
--extern int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);
--extern int perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);
-+extern const struct perf_guest_info_callbacks *perf_guest_cbs;
-+extern int perf_register_guest_info_callbacks(const struct perf_guest_info_callbacks *callbacks);
-+extern int perf_unregister_guest_info_callbacks(const struct perf_guest_info_callbacks *callbacks);
- 
- extern void perf_event_comm(struct task_struct *tsk);
- extern void perf_event_fork(struct task_struct *tsk);
-diff -urNp linux-2.6.39.3/include/linux/pipe_fs_i.h linux-2.6.39.3/include/linux/pipe_fs_i.h
---- linux-2.6.39.3/include/linux/pipe_fs_i.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/pipe_fs_i.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/pipe_fs_i.h linux-2.6.39.4/include/linux/pipe_fs_i.h
+--- linux-2.6.39.4/include/linux/pipe_fs_i.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/pipe_fs_i.h	2011-08-05 19:44:37.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
  	wait_queue_head_t wait;
@@ -64770,30 +53857,9 @@ diff -urNp linux-2.6.39.3/include/linux/pipe_fs_i.h linux-2.6.39.3/include/linux
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct page *tmp_page;
-diff -urNp linux-2.6.39.3/include/linux/pm.h linux-2.6.39.3/include/linux/pm.h
---- linux-2.6.39.3/include/linux/pm.h	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/include/linux/pm.h	2011-07-09 09:19:24.000000000 -0400
-@@ -268,7 +268,7 @@ const struct dev_pm_ops name = { \
-  * runtime PM, make the pm member point to generic_subsys_pm_ops.
-  */
- #ifdef CONFIG_PM
--extern struct dev_pm_ops generic_subsys_pm_ops;
-+extern const struct dev_pm_ops generic_subsys_pm_ops;
- #define GENERIC_SUBSYS_PM_OPS	(&generic_subsys_pm_ops)
- #else
- #define GENERIC_SUBSYS_PM_OPS	NULL
-@@ -472,7 +472,7 @@ extern void update_pm_runtime_accounting
-  * subsystem-level and driver-level callbacks.
-  */
- struct dev_power_domain {
--	struct dev_pm_ops	ops;
-+	const struct dev_pm_ops ops;
- };
- 
- /*
-diff -urNp linux-2.6.39.3/include/linux/pm_runtime.h linux-2.6.39.3/include/linux/pm_runtime.h
---- linux-2.6.39.3/include/linux/pm_runtime.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/pm_runtime.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/pm_runtime.h linux-2.6.39.4/include/linux/pm_runtime.h
+--- linux-2.6.39.4/include/linux/pm_runtime.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/pm_runtime.h	2011-08-05 19:44:37.000000000 -0400
 @@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
@@ -64803,9 +53869,9 @@ diff -urNp linux-2.6.39.3/include/linux/pm_runtime.h linux-2.6.39.3/include/linu
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-2.6.39.3/include/linux/poison.h linux-2.6.39.3/include/linux/poison.h
---- linux-2.6.39.3/include/linux/poison.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/poison.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/poison.h linux-2.6.39.4/include/linux/poison.h
+--- linux-2.6.39.4/include/linux/poison.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/poison.h	2011-08-05 19:44:37.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -64817,26 +53883,21 @@ diff -urNp linux-2.6.39.3/include/linux/poison.h linux-2.6.39.3/include/linux/po
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-2.6.39.3/include/linux/posix-timers.h linux-2.6.39.3/include/linux/posix-timers.h
---- linux-2.6.39.3/include/linux/posix-timers.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/posix-timers.h	2011-05-22 19:36:33.000000000 -0400
-@@ -102,10 +102,10 @@ struct k_clock {
- 			   struct itimerspec * cur_setting);
- };
- 
--extern struct k_clock clock_posix_cpu;
--extern struct k_clock clock_posix_dynamic;
-+extern const struct k_clock clock_posix_cpu;
-+extern const struct k_clock clock_posix_dynamic;
+diff -urNp linux-2.6.39.4/include/linux/preempt.h linux-2.6.39.4/include/linux/preempt.h
+--- linux-2.6.39.4/include/linux/preempt.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/preempt.h	2011-08-05 20:34:06.000000000 -0400
+@@ -115,7 +115,7 @@ struct preempt_ops {
+ 	void (*sched_in)(struct preempt_notifier *notifier, int cpu);
+ 	void (*sched_out)(struct preempt_notifier *notifier,
+ 			  struct task_struct *next);
+-};
++} __no_const;
  
--void posix_timers_register_clock(const clockid_t clock_id, struct k_clock *new_clock);
-+void posix_timers_register_clock(const clockid_t clock_id, const struct k_clock *new_clock);
- 
- /* function to call to trigger timer event */
- int posix_timer_event(struct k_itimer *timr, int si_private);
-diff -urNp linux-2.6.39.3/include/linux/proc_fs.h linux-2.6.39.3/include/linux/proc_fs.h
---- linux-2.6.39.3/include/linux/proc_fs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/proc_fs.h	2011-05-22 19:41:42.000000000 -0400
+ /**
+  * preempt_notifier - key for installing preemption notifiers
+diff -urNp linux-2.6.39.4/include/linux/proc_fs.h linux-2.6.39.4/include/linux/proc_fs.h
+--- linux-2.6.39.4/include/linux/proc_fs.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/proc_fs.h	2011-08-05 20:34:06.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -64857,9 +53918,18 @@ diff -urNp linux-2.6.39.3/include/linux/proc_fs.h linux-2.6.39.3/include/linux/p
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
  	mode_t mode, struct proc_dir_entry *base, 
  	read_proc_t *read_proc, void * data)
-diff -urNp linux-2.6.39.3/include/linux/ptrace.h linux-2.6.39.3/include/linux/ptrace.h
---- linux-2.6.39.3/include/linux/ptrace.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/ptrace.h	2011-05-22 19:41:42.000000000 -0400
+@@ -258,7 +271,7 @@ union proc_op {
+ 	int (*proc_show)(struct seq_file *m,
+ 		struct pid_namespace *ns, struct pid *pid,
+ 		struct task_struct *task);
+-};
++} __no_const;
+ 
+ struct ctl_table_header;
+ struct ctl_table;
+diff -urNp linux-2.6.39.4/include/linux/ptrace.h linux-2.6.39.4/include/linux/ptrace.h
+--- linux-2.6.39.4/include/linux/ptrace.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/ptrace.h	2011-08-05 19:44:37.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
@@ -64873,9 +53943,9 @@ diff -urNp linux-2.6.39.3/include/linux/ptrace.h linux-2.6.39.3/include/linux/pt
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-2.6.39.3/include/linux/random.h linux-2.6.39.3/include/linux/random.h
---- linux-2.6.39.3/include/linux/random.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/random.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/random.h linux-2.6.39.4/include/linux/random.h
+--- linux-2.6.39.4/include/linux/random.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/random.h	2011-08-05 19:44:37.000000000 -0400
 @@ -80,12 +80,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
@@ -64895,9 +53965,9 @@ diff -urNp linux-2.6.39.3/include/linux/random.h linux-2.6.39.3/include/linux/ra
  }
  
  /**
-diff -urNp linux-2.6.39.3/include/linux/reboot.h linux-2.6.39.3/include/linux/reboot.h
---- linux-2.6.39.3/include/linux/reboot.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/reboot.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/reboot.h linux-2.6.39.4/include/linux/reboot.h
+--- linux-2.6.39.4/include/linux/reboot.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/reboot.h	2011-08-05 19:44:37.000000000 -0400
 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
   * Architecture-specific implementations of sys_reboot commands.
   */
@@ -64933,9 +54003,9 @@ diff -urNp linux-2.6.39.3/include/linux/reboot.h linux-2.6.39.3/include/linux/re
  #include <asm/emergency-restart.h>
  
  #endif
-diff -urNp linux-2.6.39.3/include/linux/reiserfs_fs.h linux-2.6.39.3/include/linux/reiserfs_fs.h
---- linux-2.6.39.3/include/linux/reiserfs_fs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/reiserfs_fs.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/reiserfs_fs.h linux-2.6.39.4/include/linux/reiserfs_fs.h
+--- linux-2.6.39.4/include/linux/reiserfs_fs.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/reiserfs_fs.h	2011-08-05 20:34:06.000000000 -0400
 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
@@ -64945,46 +54015,9 @@ diff -urNp linux-2.6.39.3/include/linux/reiserfs_fs.h linux-2.6.39.3/include/lin
  #define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)->tb_sb) != (tb)->fs_gen)
  #define __fs_changed(gen,s) (gen != get_generation (s))
  #define fs_changed(gen,s)		\
-@@ -1618,24 +1618,24 @@ static inline struct super_block *sb_fro
- */
- 
- struct item_operations {
--	int (*bytes_number) (struct item_head * ih, int block_size);
--	void (*decrement_key) (struct cpu_key *);
--	int (*is_left_mergeable) (struct reiserfs_key * ih,
-+	int (* const bytes_number) (struct item_head * ih, int block_size);
-+	void (* const decrement_key) (struct cpu_key *);
-+	int (* const is_left_mergeable) (struct reiserfs_key * ih,
- 				  unsigned long bsize);
--	void (*print_item) (struct item_head *, char *item);
--	void (*check_item) (struct item_head *, char *item);
-+	void (* const print_item) (struct item_head *, char *item);
-+	void (* const check_item) (struct item_head *, char *item);
- 
--	int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi,
-+	int (* const create_vi) (struct virtual_node * vn, struct virtual_item * vi,
- 			  int is_affected, int insert_size);
--	int (*check_left) (struct virtual_item * vi, int free,
-+	int (* const check_left) (struct virtual_item * vi, int free,
- 			   int start_skip, int end_skip);
--	int (*check_right) (struct virtual_item * vi, int free);
--	int (*part_size) (struct virtual_item * vi, int from, int to);
--	int (*unit_num) (struct virtual_item * vi);
--	void (*print_vi) (struct virtual_item * vi);
-+	int (* const check_right) (struct virtual_item * vi, int free);
-+	int (* const part_size) (struct virtual_item * vi, int from, int to);
-+	int (* const unit_num) (struct virtual_item * vi);
-+	void (* const print_vi) (struct virtual_item * vi);
- };
- 
--extern struct item_operations *item_ops[TYPE_ANY + 1];
-+extern const struct item_operations * const item_ops[TYPE_ANY + 1];
- 
- #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (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.3/include/linux/reiserfs_fs_sb.h linux-2.6.39.3/include/linux/reiserfs_fs_sb.h
---- linux-2.6.39.3/include/linux/reiserfs_fs_sb.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/reiserfs_fs_sb.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/reiserfs_fs_sb.h linux-2.6.39.4/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.39.4/include/linux/reiserfs_fs_sb.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/reiserfs_fs_sb.h	2011-08-05 19:44:37.000000000 -0400
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
@@ -64994,9 +54027,32 @@ diff -urNp linux-2.6.39.3/include/linux/reiserfs_fs_sb.h linux-2.6.39.3/include/
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-2.6.39.3/include/linux/rmap.h linux-2.6.39.3/include/linux/rmap.h
---- linux-2.6.39.3/include/linux/rmap.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/rmap.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/relay.h linux-2.6.39.4/include/linux/relay.h
+--- linux-2.6.39.4/include/linux/relay.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/relay.h	2011-08-05 20:34:06.000000000 -0400
+@@ -159,7 +159,7 @@ struct rchan_callbacks
+ 	 * The callback should return 0 if successful, negative if not.
+ 	 */
+ 	int (*remove_buf_file)(struct dentry *dentry);
+-};
++} __no_const;
+ 
+ /*
+  * CONFIG_RELAY kernel API, kernel/relay.c
+diff -urNp linux-2.6.39.4/include/linux/rfkill.h linux-2.6.39.4/include/linux/rfkill.h
+--- linux-2.6.39.4/include/linux/rfkill.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/rfkill.h	2011-08-05 20:34:06.000000000 -0400
+@@ -147,6 +147,7 @@ struct rfkill_ops {
+ 	void	(*query)(struct rfkill *rfkill, void *data);
+ 	int	(*set_block)(void *data, bool blocked);
+ };
++typedef struct rfkill_ops __no_const rfkill_ops_no_const;
+ 
+ #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
+ /**
+diff -urNp linux-2.6.39.4/include/linux/rmap.h linux-2.6.39.4/include/linux/rmap.h
+--- linux-2.6.39.4/include/linux/rmap.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/rmap.h	2011-08-05 19:44:37.000000000 -0400
 @@ -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 *);
@@ -65008,9 +54064,9 @@ diff -urNp linux-2.6.39.3/include/linux/rmap.h linux-2.6.39.3/include/linux/rmap
  void __anon_vma_link(struct vm_area_struct *);
  
  static inline void anon_vma_merge(struct vm_area_struct *vma,
-diff -urNp linux-2.6.39.3/include/linux/sched.h linux-2.6.39.3/include/linux/sched.h
---- linux-2.6.39.3/include/linux/sched.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/sched.h	2011-07-14 21:03:15.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/sched.h linux-2.6.39.4/include/linux/sched.h
+--- linux-2.6.39.4/include/linux/sched.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/sched.h	2011-08-05 20:34:06.000000000 -0400
 @@ -100,6 +100,7 @@ struct bio_list;
  struct fs_struct;
  struct perf_event_context;
@@ -65160,7 +54216,7 @@ diff -urNp linux-2.6.39.3/include/linux/sched.h linux-2.6.39.3/include/linux/sch
 +#define MF_PAX_SEGMEXEC		0x20000000	/* Segmentation based non-executable pages */
 +
 +#ifdef CONFIG_PAX_SOFTMODE
-+extern unsigned int pax_softmode;
++extern int pax_softmode;
 +#endif
 +
 +extern int pax_check_flags(unsigned long *);
@@ -65253,9 +54309,9 @@ diff -urNp linux-2.6.39.3/include/linux/sched.h linux-2.6.39.3/include/linux/sch
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.39.3/include/linux/screen_info.h linux-2.6.39.3/include/linux/screen_info.h
---- linux-2.6.39.3/include/linux/screen_info.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/screen_info.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/screen_info.h linux-2.6.39.4/include/linux/screen_info.h
+--- linux-2.6.39.4/include/linux/screen_info.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/screen_info.h	2011-08-05 19:44:37.000000000 -0400
 @@ -43,7 +43,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
@@ -65266,9 +54322,9 @@ diff -urNp linux-2.6.39.3/include/linux/screen_info.h linux-2.6.39.3/include/lin
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-2.6.39.3/include/linux/security.h linux-2.6.39.3/include/linux/security.h
---- linux-2.6.39.3/include/linux/security.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/security.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/security.h linux-2.6.39.4/include/linux/security.h
+--- linux-2.6.39.4/include/linux/security.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/security.h	2011-08-05 19:44:37.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -65277,9 +54333,20 @@ diff -urNp linux-2.6.39.3/include/linux/security.h linux-2.6.39.3/include/linux/
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.39.3/include/linux/shm.h linux-2.6.39.3/include/linux/shm.h
---- linux-2.6.39.3/include/linux/shm.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/shm.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/seq_file.h linux-2.6.39.4/include/linux/seq_file.h
+--- linux-2.6.39.4/include/linux/seq_file.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/seq_file.h	2011-08-05 20:34:06.000000000 -0400
+@@ -32,6 +32,7 @@ struct seq_operations {
+ 	void * (*next) (struct seq_file *m, void *v, loff_t *pos);
+ 	int (*show) (struct seq_file *m, void *v);
+ };
++typedef struct seq_operations __no_const seq_operations_no_const;
+ 
+ #define SEQ_SKIP 1
+ 
+diff -urNp linux-2.6.39.4/include/linux/shm.h linux-2.6.39.4/include/linux/shm.h
+--- linux-2.6.39.4/include/linux/shm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/shm.h	2011-08-05 19:44:37.000000000 -0400
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
  	pid_t			shm_cprid;
  	pid_t			shm_lprid;
@@ -65291,9 +54358,9 @@ diff -urNp linux-2.6.39.3/include/linux/shm.h linux-2.6.39.3/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-2.6.39.3/include/linux/skbuff.h linux-2.6.39.3/include/linux/skbuff.h
---- linux-2.6.39.3/include/linux/skbuff.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/skbuff.h	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/skbuff.h linux-2.6.39.4/include/linux/skbuff.h
+--- linux-2.6.39.4/include/linux/skbuff.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/skbuff.h	2011-08-05 19:44:37.000000000 -0400
 @@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -65330,9 +54397,9 @@ diff -urNp linux-2.6.39.3/include/linux/skbuff.h linux-2.6.39.3/include/linux/sk
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-2.6.39.3/include/linux/slab_def.h linux-2.6.39.3/include/linux/slab_def.h
---- linux-2.6.39.3/include/linux/slab_def.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/slab_def.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/slab_def.h linux-2.6.39.4/include/linux/slab_def.h
+--- linux-2.6.39.4/include/linux/slab_def.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/slab_def.h	2011-08-05 19:44:37.000000000 -0400
 @@ -96,10 +96,10 @@ struct kmem_cache {
  	unsigned long node_allocs;
  	unsigned long node_frees;
@@ -65348,9 +54415,9 @@ diff -urNp linux-2.6.39.3/include/linux/slab_def.h linux-2.6.39.3/include/linux/
  
  	/*
  	 * If debugging is enabled, then the allocator can add additional
-diff -urNp linux-2.6.39.3/include/linux/slab.h linux-2.6.39.3/include/linux/slab.h
---- linux-2.6.39.3/include/linux/slab.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/slab.h	2011-05-23 17:07:00.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/slab.h linux-2.6.39.4/include/linux/slab.h
+--- linux-2.6.39.4/include/linux/slab.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/slab.h	2011-08-05 19:44:37.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -65457,9 +54524,9 @@ diff -urNp linux-2.6.39.3/include/linux/slab.h linux-2.6.39.3/include/linux/slab
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-2.6.39.3/include/linux/slub_def.h linux-2.6.39.3/include/linux/slub_def.h
---- linux-2.6.39.3/include/linux/slub_def.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/slub_def.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/slub_def.h linux-2.6.39.4/include/linux/slub_def.h
+--- linux-2.6.39.4/include/linux/slub_def.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/slub_def.h	2011-08-05 20:34:06.000000000 -0400
 @@ -84,7 +84,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
@@ -65469,9 +54536,18 @@ diff -urNp linux-2.6.39.3/include/linux/slub_def.h linux-2.6.39.3/include/linux/
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
-diff -urNp linux-2.6.39.3/include/linux/sonet.h linux-2.6.39.3/include/linux/sonet.h
---- linux-2.6.39.3/include/linux/sonet.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/sonet.h	2011-05-22 19:36:33.000000000 -0400
+@@ -218,7 +218,7 @@ static __always_inline struct kmem_cache
+ }
+ 
+ void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
+-void *__kmalloc(size_t size, gfp_t flags);
++void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
+ 
+ static __always_inline void *
+ kmalloc_order(size_t size, gfp_t flags, unsigned int order)
+diff -urNp linux-2.6.39.4/include/linux/sonet.h linux-2.6.39.4/include/linux/sonet.h
+--- linux-2.6.39.4/include/linux/sonet.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/sonet.h	2011-08-05 19:44:37.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -65481,21 +54557,9 @@ diff -urNp linux-2.6.39.3/include/linux/sonet.h linux-2.6.39.3/include/linux/son
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.39.3/include/linux/ssb/ssb_driver_gige.h linux-2.6.39.3/include/linux/ssb/ssb_driver_gige.h
---- linux-2.6.39.3/include/linux/ssb/ssb_driver_gige.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/ssb/ssb_driver_gige.h	2011-05-22 19:36:33.000000000 -0400
-@@ -44,7 +44,7 @@ struct ssb_gige {
- 
- 	/* The PCI controller device. */
- 	struct pci_controller pci_controller;
--	struct pci_ops pci_ops;
-+	const struct pci_ops pci_ops;
- 	struct resource mem_resource;
- 	struct resource io_resource;
- };
-diff -urNp linux-2.6.39.3/include/linux/sunrpc/clnt.h linux-2.6.39.3/include/linux/sunrpc/clnt.h
---- linux-2.6.39.3/include/linux/sunrpc/clnt.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/sunrpc/clnt.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/sunrpc/clnt.h linux-2.6.39.4/include/linux/sunrpc/clnt.h
+--- linux-2.6.39.4/include/linux/sunrpc/clnt.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/sunrpc/clnt.h	2011-08-05 19:44:37.000000000 -0400
 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
  {
  	switch (sap->sa_family) {
@@ -65526,9 +54590,9 @@ diff -urNp linux-2.6.39.3/include/linux/sunrpc/clnt.h linux-2.6.39.3/include/lin
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-2.6.39.3/include/linux/sunrpc/svc_rdma.h linux-2.6.39.3/include/linux/sunrpc/svc_rdma.h
---- linux-2.6.39.3/include/linux/sunrpc/svc_rdma.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/sunrpc/svc_rdma.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/sunrpc/svc_rdma.h linux-2.6.39.4/include/linux/sunrpc/svc_rdma.h
+--- linux-2.6.39.4/include/linux/sunrpc/svc_rdma.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/sunrpc/svc_rdma.h	2011-08-05 19:44:37.000000000 -0400
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -65554,64 +54618,9 @@ diff -urNp linux-2.6.39.3/include/linux/sunrpc/svc_rdma.h linux-2.6.39.3/include
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-2.6.39.3/include/linux/suspend.h linux-2.6.39.3/include/linux/suspend.h
---- linux-2.6.39.3/include/linux/suspend.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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.
-  */
- struct platform_suspend_ops {
--	int (*valid)(suspend_state_t state);
--	int (*begin)(suspend_state_t state);
--	int (*prepare)(void);
--	int (*prepare_late)(void);
--	int (*enter)(suspend_state_t state);
--	void (*wake)(void);
--	void (*finish)(void);
--	void (*end)(void);
--	void (*recover)(void);
-+	int (* const valid)(suspend_state_t state);
-+	int (* const begin)(suspend_state_t state);
-+	int (* const prepare)(void);
-+	int (* const prepare_late)(void);
-+	int (* const enter)(suspend_state_t state);
-+	void (* const wake)(void);
-+	void (* const finish)(void);
-+	void (* const end)(void);
-+	void (* const recover)(void);
- };
- 
- #ifdef CONFIG_SUSPEND
-@@ -217,16 +217,16 @@ extern void mark_free_pages(struct zone 
-  *	platforms which require special recovery actions in that situation.
-  */
- struct platform_hibernation_ops {
--	int (*begin)(void);
--	void (*end)(void);
--	int (*pre_snapshot)(void);
--	void (*finish)(void);
--	int (*prepare)(void);
--	int (*enter)(void);
--	void (*leave)(void);
--	int (*pre_restore)(void);
--	void (*restore_cleanup)(void);
--	void (*recover)(void);
-+	int (* const begin)(void);
-+	void (* const end)(void);
-+	int (* const pre_snapshot)(void);
-+	void (* const finish)(void);
-+	int (* const prepare)(void);
-+	int (* const enter)(void);
-+	void (* const leave)(void);
-+	int (* const pre_restore)(void);
-+	void (* const restore_cleanup)(void);
-+	void (* const recover)(void);
- };
- 
- #ifdef CONFIG_HIBERNATION
-diff -urNp linux-2.6.39.3/include/linux/sysctl.h linux-2.6.39.3/include/linux/sysctl.h
---- linux-2.6.39.3/include/linux/sysctl.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/sysctl.h	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/sysctl.h linux-2.6.39.4/include/linux/sysctl.h
+--- linux-2.6.39.4/include/linux/sysctl.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/sysctl.h	2011-08-05 19:44:37.000000000 -0400
 @@ -155,7 +155,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -65634,61 +54643,9 @@ diff -urNp linux-2.6.39.3/include/linux/sysctl.h linux-2.6.39.3/include/linux/sy
  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.3/include/linux/sysfs.h linux-2.6.39.3/include/linux/sysfs.h
---- linux-2.6.39.3/include/linux/sysfs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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)
- 
- struct sysfs_ops {
--	ssize_t	(*show)(struct kobject *, struct attribute *,char *);
--	ssize_t	(*store)(struct kobject *,struct attribute *,const char *, size_t);
-+	ssize_t	(* const show)(struct kobject *, struct attribute *,char *);
-+	ssize_t	(* const store)(struct kobject *,struct attribute *,const char *, size_t);
- };
- 
- struct sysfs_dirent;
-diff -urNp linux-2.6.39.3/include/linux/tty.h linux-2.6.39.3/include/linux/tty.h
---- linux-2.6.39.3/include/linux/tty.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/tty.h	2011-05-22 19:36:33.000000000 -0400
-@@ -13,6 +13,7 @@
- #include <linux/tty_driver.h>
- #include <linux/tty_ldisc.h>
- #include <linux/mutex.h>
-+#include <linux/poll.h>
- 
- #include <asm/system.h>
- 
-@@ -466,7 +467,6 @@ extern int tty_perform_flush(struct tty_
- extern dev_t tty_devnum(struct tty_struct *tty);
- extern void proc_clear_tty(struct task_struct *p);
- extern struct tty_struct *get_current_tty(void);
--extern void tty_default_fops(struct file_operations *fops);
- extern struct tty_struct *alloc_tty_struct(void);
- extern int tty_add_file(struct tty_struct *tty, struct file *file);
- extern void free_tty_struct(struct tty_struct *tty);
-@@ -529,6 +529,18 @@ extern void tty_ldisc_begin(void);
- /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
- extern void tty_ldisc_enable(struct tty_struct *tty);
- 
-+/* tty_io.c */
-+extern ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
-+extern ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
-+extern unsigned int tty_poll(struct file *, poll_table *);
-+#ifdef CONFIG_COMPAT
-+extern long tty_compat_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg);
-+#else
-+#define tty_compat_ioctl NULL
-+#endif
-+extern int tty_release(struct inode *, struct file *);
-+extern int tty_fasync(int fd, struct file *filp, int on);
- 
- /* n_tty.c */
- extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.39.3/include/linux/tty_ldisc.h linux-2.6.39.3/include/linux/tty_ldisc.h
---- linux-2.6.39.3/include/linux/tty_ldisc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/tty_ldisc.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/tty_ldisc.h linux-2.6.39.4/include/linux/tty_ldisc.h
+--- linux-2.6.39.4/include/linux/tty_ldisc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/tty_ldisc.h	2011-08-05 19:44:37.000000000 -0400
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -65698,9 +54655,9 @@ diff -urNp linux-2.6.39.3/include/linux/tty_ldisc.h linux-2.6.39.3/include/linux
  };
  
  struct tty_ldisc {
-diff -urNp linux-2.6.39.3/include/linux/types.h linux-2.6.39.3/include/linux/types.h
---- linux-2.6.39.3/include/linux/types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/types.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/types.h linux-2.6.39.4/include/linux/types.h
+--- linux-2.6.39.4/include/linux/types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/types.h	2011-08-05 19:44:37.000000000 -0400
 @@ -213,10 +213,26 @@ typedef struct {
  	int counter;
  } atomic_t;
@@ -65728,9 +54685,9 @@ diff -urNp linux-2.6.39.3/include/linux/types.h linux-2.6.39.3/include/linux/typ
  #endif
  
  struct list_head {
-diff -urNp linux-2.6.39.3/include/linux/uaccess.h linux-2.6.39.3/include/linux/uaccess.h
---- linux-2.6.39.3/include/linux/uaccess.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/uaccess.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/uaccess.h linux-2.6.39.4/include/linux/uaccess.h
+--- linux-2.6.39.4/include/linux/uaccess.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/uaccess.h	2011-08-05 19:44:37.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
@@ -65766,9 +54723,9 @@ diff -urNp linux-2.6.39.3/include/linux/uaccess.h linux-2.6.39.3/include/linux/u
 +extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
  
  #endif		/* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.39.3/include/linux/unaligned/access_ok.h linux-2.6.39.3/include/linux/unaligned/access_ok.h
---- linux-2.6.39.3/include/linux/unaligned/access_ok.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/unaligned/access_ok.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/unaligned/access_ok.h linux-2.6.39.4/include/linux/unaligned/access_ok.h
+--- linux-2.6.39.4/include/linux/unaligned/access_ok.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/unaligned/access_ok.h	2011-08-05 19:44:37.000000000 -0400
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -65808,87 +54765,9 @@ diff -urNp linux-2.6.39.3/include/linux/unaligned/access_ok.h linux-2.6.39.3/inc
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-2.6.39.3/include/linux/usb/hcd.h linux-2.6.39.3/include/linux/usb/hcd.h
---- linux-2.6.39.3/include/linux/usb/hcd.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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); */
- };
- 
--extern struct usb_mon_operations *mon_ops;
-+extern const struct usb_mon_operations *mon_ops;
- 
- static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
- {
-@@ -637,7 +637,7 @@ static inline void usbmon_urb_complete(s
- 		(*mon_ops->urb_complete)(bus, urb, status);
- }
- 
--int usb_mon_register(struct usb_mon_operations *ops);
-+int usb_mon_register(const struct usb_mon_operations *ops);
- void usb_mon_deregister(void);
- 
- #else
-diff -urNp linux-2.6.39.3/include/linux/usb/intel_mid_otg.h linux-2.6.39.3/include/linux/usb/intel_mid_otg.h
---- linux-2.6.39.3/include/linux/usb/intel_mid_otg.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 
- 	/* ops to access ulpi */
--	struct iotg_ulpi_access_ops	ulpi_ops;
-+	const struct iotg_ulpi_access_ops ulpi_ops;
- 
- 	/* atomic notifier for interrupt context */
- 	struct atomic_notifier_head	iotg_notifier;
-diff -urNp linux-2.6.39.3/include/linux/usb/ulpi.h linux-2.6.39.3/include/linux/usb/ulpi.h
---- linux-2.6.39.3/include/linux/usb/ulpi.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/usb/ulpi.h	2011-05-22 19:36:33.000000000 -0400
-@@ -186,7 +186,7 @@ struct otg_transceiver *otg_ulpi_create(
- 
- #ifdef CONFIG_USB_ULPI_VIEWPORT
- /* access ops for controllers with a viewport register */
--extern struct otg_io_access_ops ulpi_viewport_access_ops;
-+extern const struct otg_io_access_ops ulpi_viewport_access_ops;
- #endif
- 
- #endif /* __LINUX_USB_ULPI_H */
-diff -urNp linux-2.6.39.3/include/linux/vga_switcheroo.h linux-2.6.39.3/include/linux/vga_switcheroo.h
---- linux-2.6.39.3/include/linux/vga_switcheroo.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/vga_switcheroo.h	2011-05-22 19:36:33.000000000 -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);
- 
--int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler);
-+int vga_switcheroo_register_handler(const struct vga_switcheroo_handler *handler);
- void vga_switcheroo_unregister_handler(void);
- 
- int vga_switcheroo_process_delayed_switch(void);
-@@ -52,7 +52,7 @@ static inline int vga_switcheroo_registe
- 					  void (*reprobe)(struct pci_dev *dev),
- 					  bool (*can_switch)(struct pci_dev *dev)) { return 0; }
- static inline void vga_switcheroo_client_fb_set(struct pci_dev *dev, struct fb_info *info) {}
--static inline int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler) { return 0; }
-+static inline int vga_switcheroo_register_handler(const struct vga_switcheroo_handler *handler) { return 0; }
- static inline void vga_switcheroo_unregister_handler(void) {}
- static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
- 
-diff -urNp linux-2.6.39.3/include/linux/virtio.h linux-2.6.39.3/include/linux/virtio.h
---- linux-2.6.39.3/include/linux/virtio.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/virtio.h	2011-05-22 19:36:33.000000000 -0400
-@@ -102,7 +102,7 @@ struct virtio_device {
- 	int index;
- 	struct device dev;
- 	struct virtio_device_id id;
--	struct virtio_config_ops *config;
-+	const struct virtio_config_ops *config;
- 	struct list_head vqs;
- 	/* Note that this is a Linux set_bit-style bitmap. */
- 	unsigned long features[1];
-diff -urNp linux-2.6.39.3/include/linux/vmalloc.h linux-2.6.39.3/include/linux/vmalloc.h
---- linux-2.6.39.3/include/linux/vmalloc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/vmalloc.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/vmalloc.h linux-2.6.39.4/include/linux/vmalloc.h
+--- linux-2.6.39.4/include/linux/vmalloc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/vmalloc.h	2011-08-05 19:44:37.000000000 -0400
 @@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining 
  #define VM_MAP		0x00000004	/* vmap()ed pages */
  #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
@@ -66005,9 +54884,9 @@ diff -urNp linux-2.6.39.3/include/linux/vmalloc.h linux-2.6.39.3/include/linux/v
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.39.3/include/linux/vmstat.h linux-2.6.39.3/include/linux/vmstat.h
---- linux-2.6.39.3/include/linux/vmstat.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/linux/vmstat.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/linux/vmstat.h linux-2.6.39.4/include/linux/vmstat.h
+--- linux-2.6.39.4/include/linux/vmstat.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/linux/vmstat.h	2011-08-05 19:44:37.000000000 -0400
 @@ -147,18 +147,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -66071,28 +54950,33 @@ diff -urNp linux-2.6.39.3/include/linux/vmstat.h linux-2.6.39.3/include/linux/vm
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.39.3/include/media/saa7146_vv.h linux-2.6.39.3/include/media/saa7146_vv.h
---- linux-2.6.39.3/include/media/saa7146_vv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/media/saa7146_vv.h	2011-05-22 19:36:33.000000000 -0400
-@@ -202,13 +202,13 @@ void saa7146_set_gpio(struct saa7146_dev
- 
- /* from saa7146_video.c */
- extern const struct v4l2_ioctl_ops saa7146_video_ioctl_ops;
--extern struct saa7146_use_ops saa7146_video_uops;
-+extern const struct saa7146_use_ops saa7146_video_uops;
- int saa7146_start_preview(struct saa7146_fh *fh);
- int saa7146_stop_preview(struct saa7146_fh *fh);
- long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);
- 
- /* from saa7146_vbi.c */
--extern struct saa7146_use_ops saa7146_vbi_uops;
-+extern const struct saa7146_use_ops saa7146_vbi_uops;
- 
- /* resource management functions */
- int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit);
-diff -urNp linux-2.6.39.3/include/media/v4l2-device.h linux-2.6.39.3/include/media/v4l2-device.h
---- linux-2.6.39.3/include/media/v4l2-device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/media/v4l2-device.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/media/saa7146_vv.h linux-2.6.39.4/include/media/saa7146_vv.h
+--- linux-2.6.39.4/include/media/saa7146_vv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/media/saa7146_vv.h	2011-08-05 20:34:06.000000000 -0400
+@@ -163,7 +163,7 @@ struct saa7146_ext_vv
+ 	int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
+ 
+ 	/* the extension can override this */
+-	struct v4l2_ioctl_ops ops;
++	v4l2_ioctl_ops_no_const ops;
+ 	/* pointer to the saa7146 core ops */
+ 	const struct v4l2_ioctl_ops *core_ops;
+ 
+diff -urNp linux-2.6.39.4/include/media/v4l2-dev.h linux-2.6.39.4/include/media/v4l2-dev.h
+--- linux-2.6.39.4/include/media/v4l2-dev.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/media/v4l2-dev.h	2011-08-05 20:34:06.000000000 -0400
+@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta
+ 
+ 
+ struct v4l2_file_operations {
+-	struct module *owner;
++	struct module * const owner;
+ 	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+ 	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+ 	unsigned int (*poll) (struct file *, struct poll_table_struct *);
+diff -urNp linux-2.6.39.4/include/media/v4l2-device.h linux-2.6.39.4/include/media/v4l2-device.h
+--- linux-2.6.39.4/include/media/v4l2-device.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/media/v4l2-device.h	2011-08-05 19:44:37.000000000 -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. */
@@ -66102,9 +54986,29 @@ diff -urNp linux-2.6.39.3/include/media/v4l2-device.h linux-2.6.39.3/include/med
  
  /* 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.3/include/net/caif/cfctrl.h linux-2.6.39.3/include/net/caif/cfctrl.h
---- linux-2.6.39.3/include/net/caif/cfctrl.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/caif/cfctrl.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/media/v4l2-ioctl.h linux-2.6.39.4/include/media/v4l2-ioctl.h
+--- linux-2.6.39.4/include/media/v4l2-ioctl.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/media/v4l2-ioctl.h	2011-08-05 20:34:06.000000000 -0400
+@@ -272,6 +272,7 @@ struct v4l2_ioctl_ops {
+ 	long (*vidioc_default)	       (struct file *file, void *fh,
+ 					bool valid_prio, int cmd, void *arg);
+ };
++typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
+ 
+ 
+ /* v4l debugging and diagnostics */
+diff -urNp linux-2.6.39.4/include/net/caif/cfctrl.h linux-2.6.39.4/include/net/caif/cfctrl.h
+--- linux-2.6.39.4/include/net/caif/cfctrl.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/caif/cfctrl.h	2011-08-05 20:34:06.000000000 -0400
+@@ -52,7 +52,7 @@ struct cfctrl_rsp {
+ 	void (*radioset_rsp)(void);
+ 	void (*reject_rsp)(struct cflayer *layer, u8 linkid,
+ 				struct cflayer *client_layer);
+-};
++} __no_const;
+ 
+ /* Link Setup Parameters for CAIF-Links. */
+ struct cfctrl_link_param {
 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
  struct cfctrl {
  	struct cfsrvl serv;
@@ -66116,9 +55020,9 @@ diff -urNp linux-2.6.39.3/include/net/caif/cfctrl.h linux-2.6.39.3/include/net/c
  	struct list_head list;
  	/* Protects from simultaneous access to first_req list */
  	spinlock_t info_list_lock;
-diff -urNp linux-2.6.39.3/include/net/flow.h linux-2.6.39.3/include/net/flow.h
---- linux-2.6.39.3/include/net/flow.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/flow.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/flow.h linux-2.6.39.4/include/net/flow.h
+--- linux-2.6.39.4/include/net/flow.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/flow.h	2011-08-05 19:44:37.000000000 -0400
 @@ -167,6 +167,6 @@ extern struct flow_cache_object *flow_ca
  		u8 dir, flow_resolve_t resolver, void *ctx);
  
@@ -66127,9 +55031,9 @@ diff -urNp linux-2.6.39.3/include/net/flow.h linux-2.6.39.3/include/net/flow.h
 +extern atomic_unchecked_t flow_cache_genid;
  
  #endif
-diff -urNp linux-2.6.39.3/include/net/inetpeer.h linux-2.6.39.3/include/net/inetpeer.h
---- linux-2.6.39.3/include/net/inetpeer.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/inetpeer.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/inetpeer.h linux-2.6.39.4/include/net/inetpeer.h
+--- linux-2.6.39.4/include/net/inetpeer.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/inetpeer.h	2011-08-05 19:44:37.000000000 -0400
 @@ -43,8 +43,8 @@ struct inet_peer {
  	 */
  	union {
@@ -66150,9 +55054,9 @@ diff -urNp linux-2.6.39.3/include/net/inetpeer.h linux-2.6.39.3/include/net/inet
  }
  
  #endif /* _NET_INETPEER_H */
-diff -urNp linux-2.6.39.3/include/net/ip_fib.h linux-2.6.39.3/include/net/ip_fib.h
---- linux-2.6.39.3/include/net/ip_fib.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/ip_fib.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/ip_fib.h linux-2.6.39.4/include/net/ip_fib.h
+--- linux-2.6.39.4/include/net/ip_fib.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/ip_fib.h	2011-08-05 19:44:37.000000000 -0400
 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
  
  #define FIB_RES_SADDR(net, res)				\
@@ -66162,9 +55066,9 @@ diff -urNp linux-2.6.39.3/include/net/ip_fib.h linux-2.6.39.3/include/net/ip_fib
  	 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.3/include/net/ip_vs.h linux-2.6.39.3/include/net/ip_vs.h
---- linux-2.6.39.3/include/net/ip_vs.h	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/include/net/ip_vs.h	2011-07-09 09:19:24.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/ip_vs.h linux-2.6.39.4/include/net/ip_vs.h
+--- linux-2.6.39.4/include/net/ip_vs.h	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/include/net/ip_vs.h	2011-08-05 19:44:37.000000000 -0400
 @@ -512,7 +512,7 @@ struct ip_vs_conn {
  	struct ip_vs_conn       *control;       /* Master control connection */
  	atomic_t                n_control;      /* Number of controlled ones */
@@ -66183,9 +55087,21 @@ diff -urNp linux-2.6.39.3/include/net/ip_vs.h linux-2.6.39.3/include/net/ip_vs.h
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-diff -urNp linux-2.6.39.3/include/net/irda/ircomm_tty.h linux-2.6.39.3/include/net/irda/ircomm_tty.h
---- linux-2.6.39.3/include/net/irda/ircomm_tty.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/irda/ircomm_tty.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/irda/ircomm_core.h linux-2.6.39.4/include/net/irda/ircomm_core.h
+--- linux-2.6.39.4/include/net/irda/ircomm_core.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/irda/ircomm_core.h	2011-08-05 20:34:06.000000000 -0400
+@@ -51,7 +51,7 @@ typedef struct {
+ 	int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
+ 	int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
+ 				  struct ircomm_info *);	
+-} call_t;
++} __no_const call_t;
+ 
+ struct ircomm_cb {
+ 	irda_queue_t queue;
+diff -urNp linux-2.6.39.4/include/net/irda/ircomm_tty.h linux-2.6.39.4/include/net/irda/ircomm_tty.h
+--- linux-2.6.39.4/include/net/irda/ircomm_tty.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/irda/ircomm_tty.h	2011-08-05 19:44:37.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -66205,9 +55121,9 @@ diff -urNp linux-2.6.39.3/include/net/irda/ircomm_tty.h linux-2.6.39.3/include/n
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-2.6.39.3/include/net/iucv/af_iucv.h linux-2.6.39.3/include/net/iucv/af_iucv.h
---- linux-2.6.39.3/include/net/iucv/af_iucv.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/iucv/af_iucv.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/iucv/af_iucv.h linux-2.6.39.4/include/net/iucv/af_iucv.h
+--- linux-2.6.39.4/include/net/iucv/af_iucv.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/iucv/af_iucv.h	2011-08-05 19:44:37.000000000 -0400
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
  	struct hlist_head head;
@@ -66217,52 +55133,33 @@ diff -urNp linux-2.6.39.3/include/net/iucv/af_iucv.h linux-2.6.39.3/include/net/
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-2.6.39.3/include/net/neighbour.h linux-2.6.39.3/include/net/neighbour.h
---- linux-2.6.39.3/include/net/neighbour.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/neighbour.h	2011-05-22 19:36:33.000000000 -0400
-@@ -118,12 +118,12 @@ struct neighbour {
- 
- struct neigh_ops {
- 	int			family;
--	void			(*solicit)(struct neighbour *, struct sk_buff*);
--	void			(*error_report)(struct neighbour *, struct sk_buff*);
--	int			(*output)(struct sk_buff*);
--	int			(*connected_output)(struct sk_buff*);
--	int			(*hh_output)(struct sk_buff*);
--	int			(*queue_xmit)(struct sk_buff*);
-+	void			(* const solicit)(struct neighbour *, struct sk_buff*);
-+	void			(* const error_report)(struct neighbour *, struct sk_buff*);
-+	int			(* const output)(struct sk_buff*);
-+	int			(* const connected_output)(struct sk_buff*);
-+	int			(* const hh_output)(struct sk_buff*);
-+	int			(* const queue_xmit)(struct sk_buff*);
+diff -urNp linux-2.6.39.4/include/net/lapb.h linux-2.6.39.4/include/net/lapb.h
+--- linux-2.6.39.4/include/net/lapb.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/lapb.h	2011-08-05 20:34:06.000000000 -0400
+@@ -95,7 +95,7 @@ struct lapb_cb {
+ 	struct sk_buff_head	write_queue;
+ 	struct sk_buff_head	ack_queue;
+ 	unsigned char		window;
+-	struct lapb_register_struct callbacks;
++	struct lapb_register_struct *callbacks;
+ 
+ 	/* FRMR control information */
+ 	struct lapb_frame	frmr_data;
+diff -urNp linux-2.6.39.4/include/net/neighbour.h linux-2.6.39.4/include/net/neighbour.h
+--- linux-2.6.39.4/include/net/neighbour.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/neighbour.h	2011-08-05 20:34:06.000000000 -0400
+@@ -117,7 +117,7 @@ struct neighbour {
  };
  
- struct pneigh_entry {
-diff -urNp linux-2.6.39.3/include/net/netfilter/nf_conntrack_ecache.h linux-2.6.39.3/include/net/netfilter/nf_conntrack_ecache.h
---- linux-2.6.39.3/include/net/netfilter/nf_conntrack_ecache.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/netfilter/nf_conntrack_ecache.h	2011-05-22 19:36:33.000000000 -0400
-@@ -95,7 +95,7 @@ nf_conntrack_eventmask_report(unsigned i
- 			      int report)
- {
- 	int ret = 0;
--	struct nf_ct_event_notifier *notify;
-+	const struct nf_ct_event_notifier *notify;
- 	struct nf_conntrack_ecache *e;
- 
- 	rcu_read_lock();
-@@ -174,7 +174,7 @@ nf_ct_expect_event_report(enum ip_conntr
- 			  u32 pid,
- 			  int report)
- {
--	struct nf_exp_event_notifier *notify;
-+	const struct nf_exp_event_notifier *notify;
- 	struct nf_conntrack_ecache *e;
- 
- 	rcu_read_lock();
-diff -urNp linux-2.6.39.3/include/net/netlink.h linux-2.6.39.3/include/net/netlink.h
---- linux-2.6.39.3/include/net/netlink.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/netlink.h	2011-05-22 19:36:33.000000000 -0400
+ struct neigh_ops {
+-	int			family;
++	const int		family;
+ 	void			(*solicit)(struct neighbour *, struct sk_buff*);
+ 	void			(*error_report)(struct neighbour *, struct sk_buff*);
+ 	int			(*output)(struct sk_buff*);
+diff -urNp linux-2.6.39.4/include/net/netlink.h linux-2.6.39.4/include/net/netlink.h
+--- linux-2.6.39.4/include/net/netlink.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/netlink.h	2011-08-05 19:44:37.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)
  {
@@ -66272,9 +55169,9 @@ diff -urNp linux-2.6.39.3/include/net/netlink.h linux-2.6.39.3/include/net/netli
  }
  
  /**
-diff -urNp linux-2.6.39.3/include/net/netns/ipv4.h linux-2.6.39.3/include/net/netns/ipv4.h
---- linux-2.6.39.3/include/net/netns/ipv4.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/netns/ipv4.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/netns/ipv4.h linux-2.6.39.4/include/net/netns/ipv4.h
+--- linux-2.6.39.4/include/net/netns/ipv4.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/netns/ipv4.h	2011-08-05 19:44:37.000000000 -0400
 @@ -54,8 +54,8 @@ struct netns_ipv4 {
  	int sysctl_rt_cache_rebuild_count;
  	int current_rt_cache_rebuild_count;
@@ -66286,9 +55183,9 @@ diff -urNp linux-2.6.39.3/include/net/netns/ipv4.h linux-2.6.39.3/include/net/ne
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-2.6.39.3/include/net/sctp/sctp.h linux-2.6.39.3/include/net/sctp/sctp.h
---- linux-2.6.39.3/include/net/sctp/sctp.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/sctp/sctp.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/sctp/sctp.h linux-2.6.39.4/include/net/sctp/sctp.h
+--- linux-2.6.39.4/include/net/sctp/sctp.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/sctp/sctp.h	2011-08-05 19:44:37.000000000 -0400
 @@ -316,9 +316,9 @@ do {									\
  
  #else	/* SCTP_DEBUG */
@@ -66302,9 +55199,9 @@ diff -urNp linux-2.6.39.3/include/net/sctp/sctp.h linux-2.6.39.3/include/net/sct
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.39.3/include/net/sock.h linux-2.6.39.3/include/net/sock.h
---- linux-2.6.39.3/include/net/sock.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/sock.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/net/sock.h linux-2.6.39.4/include/net/sock.h
+--- linux-2.6.39.4/include/net/sock.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/sock.h	2011-08-05 19:44:37.000000000 -0400
 @@ -277,7 +277,7 @@ struct sock {
  #ifdef CONFIG_RPS
  	__u32			sk_rxhash;
@@ -66314,33 +55211,37 @@ diff -urNp linux-2.6.39.3/include/net/sock.h linux-2.6.39.3/include/net/sock.h
  	int			sk_rcvbuf;
  
  	struct sk_filter __rcu	*sk_filter;
-diff -urNp linux-2.6.39.3/include/net/tcp.h linux-2.6.39.3/include/net/tcp.h
---- linux-2.6.39.3/include/net/tcp.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/tcp.h	2011-05-22 19:36:33.000000000 -0400
-@@ -1374,7 +1374,7 @@ enum tcp_seq_states {
+diff -urNp linux-2.6.39.4/include/net/tcp.h linux-2.6.39.4/include/net/tcp.h
+--- linux-2.6.39.4/include/net/tcp.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/tcp.h	2011-08-05 20:34:06.000000000 -0400
+@@ -1374,8 +1374,8 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
 -	struct file_operations	seq_fops;
-+	struct file_operations	seq_fops;	/* cannot be const */
- 	struct seq_operations	seq_ops;
+-	struct seq_operations	seq_ops;
++	file_operations_no_const	seq_fops;
++	seq_operations_no_const	seq_ops;
  };
  
-diff -urNp linux-2.6.39.3/include/net/udp.h linux-2.6.39.3/include/net/udp.h
---- linux-2.6.39.3/include/net/udp.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/udp.h	2011-05-22 19:36:33.000000000 -0400
-@@ -234,7 +234,7 @@ struct udp_seq_afinfo {
+ struct tcp_iter_state {
+diff -urNp linux-2.6.39.4/include/net/udp.h linux-2.6.39.4/include/net/udp.h
+--- linux-2.6.39.4/include/net/udp.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/udp.h	2011-08-05 20:34:06.000000000 -0400
+@@ -234,8 +234,8 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
  	struct udp_table	*udp_table;
 -	struct file_operations	seq_fops;
-+	struct file_operations	seq_fops;	/* cannot be const */
- 	struct seq_operations	seq_ops;
+-	struct seq_operations	seq_ops;
++	file_operations_no_const	seq_fops;
++	seq_operations_no_const	seq_ops;
  };
  
-diff -urNp linux-2.6.39.3/include/net/xfrm.h linux-2.6.39.3/include/net/xfrm.h
---- linux-2.6.39.3/include/net/xfrm.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/net/xfrm.h	2011-05-22 19:36:33.000000000 -0400
+ struct udp_iter_state {
+diff -urNp linux-2.6.39.4/include/net/xfrm.h linux-2.6.39.4/include/net/xfrm.h
+--- linux-2.6.39.4/include/net/xfrm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/net/xfrm.h	2011-08-05 19:44:37.000000000 -0400
 @@ -505,7 +505,7 @@ struct xfrm_policy {
  	struct timer_list	timer;
  
@@ -66350,48 +55251,41 @@ diff -urNp linux-2.6.39.3/include/net/xfrm.h linux-2.6.39.3/include/net/xfrm.h
  	u32			priority;
  	u32			index;
  	struct xfrm_mark	mark;
-diff -urNp linux-2.6.39.3/include/pcmcia/ss.h linux-2.6.39.3/include/pcmcia/ss.h
---- linux-2.6.39.3/include/pcmcia/ss.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/pcmcia/ss.h	2011-05-22 19:36:33.000000000 -0400
-@@ -241,9 +241,9 @@ struct pcmcia_socket {
-  *				"select PCCARD_NONSTATIC" in Kconfig.
-  *
-  */
--extern struct pccard_resource_ops pccard_static_ops;
-+extern const struct pccard_resource_ops pccard_static_ops;
- #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
--extern struct pccard_resource_ops pccard_iodyn_ops;
-+extern const struct pccard_resource_ops pccard_iodyn_ops;
- extern struct pccard_resource_ops pccard_nonstatic_ops;
- #else
- /* If PCMCIA is not used, but only CARDBUS, these functions are not used
-diff -urNp linux-2.6.39.3/include/rdma/ib_verbs.h linux-2.6.39.3/include/rdma/ib_verbs.h
---- linux-2.6.39.3/include/rdma/ib_verbs.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
--	struct ib_dma_mapping_ops   *dma_ops;
-+	const struct ib_dma_mapping_ops   *dma_ops;
- 
- 	struct module               *owner;
- 	struct device                dev;
-diff -urNp linux-2.6.39.3/include/scsi/libfc.h linux-2.6.39.3/include/scsi/libfc.h
---- linux-2.6.39.3/include/scsi/libfc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/scsi/libfc.h	2011-05-22 19:36:33.000000000 -0400
-@@ -202,7 +202,7 @@ struct fc_rport_priv {
- 	struct mutex                rp_mutex;
- 	struct delayed_work	    retry_work;
- 	enum fc_rport_event         event;
--	struct fc_rport_operations  *ops;
-+	const struct fc_rport_operations  *ops;
- 	struct list_head            peers;
- 	struct work_struct          event_work;
- 	u32			    supported_classes;
-diff -urNp linux-2.6.39.3/include/scsi/scsi_device.h linux-2.6.39.3/include/scsi/scsi_device.h
---- linux-2.6.39.3/include/scsi/scsi_device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/scsi/scsi_device.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/rdma/iw_cm.h linux-2.6.39.4/include/rdma/iw_cm.h
+--- linux-2.6.39.4/include/rdma/iw_cm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/rdma/iw_cm.h	2011-08-05 20:34:06.000000000 -0400
+@@ -129,7 +129,7 @@ struct iw_cm_verbs {
+ 					 int backlog);
+ 
+ 	int		(*destroy_listen)(struct iw_cm_id *cm_id);
+-};
++} __no_const;
+ 
+ /**
+  * iw_create_cm_id - Create an IW CM identifier.
+diff -urNp linux-2.6.39.4/include/scsi/libfc.h linux-2.6.39.4/include/scsi/libfc.h
+--- linux-2.6.39.4/include/scsi/libfc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/scsi/libfc.h	2011-08-05 20:34:06.000000000 -0400
+@@ -750,6 +750,7 @@ struct libfc_function_template {
+ 	 */
+ 	void (*disc_stop_final) (struct fc_lport *);
+ };
++typedef struct libfc_function_template __no_const libfc_function_template_no_const;
+ 
+ /**
+  * struct fc_disc - Discovery context
+@@ -853,7 +854,7 @@ struct fc_lport {
+ 	struct fc_vport		       *vport;
+ 
+ 	/* Operational Information */
+-	struct libfc_function_template tt;
++	libfc_function_template_no_const tt;
+ 	u8			       link_up;
+ 	u8			       qfull;
+ 	enum fc_lport_state	       state;
+diff -urNp linux-2.6.39.4/include/scsi/scsi_device.h linux-2.6.39.4/include/scsi/scsi_device.h
+--- linux-2.6.39.4/include/scsi/scsi_device.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/scsi/scsi_device.h	2011-08-05 19:44:37.000000000 -0400
 @@ -161,9 +161,9 @@ struct scsi_device {
  	unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED	3
@@ -66405,163 +55299,159 @@ diff -urNp linux-2.6.39.3/include/scsi/scsi_device.h linux-2.6.39.3/include/scsi
  
  	struct device		sdev_gendev,
  				sdev_dev;
-diff -urNp linux-2.6.39.3/include/sound/ac97_codec.h linux-2.6.39.3/include/sound/ac97_codec.h
---- linux-2.6.39.3/include/sound/ac97_codec.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/sound/ac97_codec.h	2011-05-22 19:36:33.000000000 -0400
-@@ -424,15 +424,15 @@
- struct snd_ac97;
- 
- struct snd_ac97_build_ops {
--	int (*build_3d) (struct snd_ac97 *ac97);
--	int (*build_specific) (struct snd_ac97 *ac97);
--	int (*build_spdif) (struct snd_ac97 *ac97);
--	int (*build_post_spdif) (struct snd_ac97 *ac97);
-+	int (* const build_3d) (struct snd_ac97 *ac97);
-+	int (* const build_specific) (struct snd_ac97 *ac97);
-+	int (* const build_spdif) (struct snd_ac97 *ac97);
-+	int (* const build_post_spdif) (struct snd_ac97 *ac97);
- #ifdef CONFIG_PM
--	void (*suspend) (struct snd_ac97 *ac97);
--	void (*resume) (struct snd_ac97 *ac97);
-+	void (* const suspend) (struct snd_ac97 *ac97);
-+	void (* const resume) (struct snd_ac97 *ac97);
- #endif
--	void (*update_jacks) (struct snd_ac97 *ac97);	/* for jack-sharing */
-+	void (* const update_jacks) (struct snd_ac97 *ac97);	/* for jack-sharing */
- };
+diff -urNp linux-2.6.39.4/include/scsi/scsi_transport_fc.h linux-2.6.39.4/include/scsi/scsi_transport_fc.h
+--- linux-2.6.39.4/include/scsi/scsi_transport_fc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/scsi/scsi_transport_fc.h	2011-08-05 20:34:06.000000000 -0400
+@@ -666,9 +666,9 @@ struct fc_function_template {
+ 	int	(*bsg_timeout)(struct fc_bsg_job *);
+ 
+ 	/* allocation lengths for host-specific data */
+-	u32	 			dd_fcrport_size;
+-	u32	 			dd_fcvport_size;
+-	u32				dd_bsg_size;
++	const u32			dd_fcrport_size;
++	const u32			dd_fcvport_size;
++	const u32			dd_bsg_size;
  
- struct snd_ac97_bus_ops {
-@@ -446,7 +446,7 @@ struct snd_ac97_bus_ops {
- 
- struct snd_ac97_bus {
- 	/* -- lowlevel (hardware) driver specific -- */
--	struct snd_ac97_bus_ops *ops;
-+	const struct snd_ac97_bus_ops *ops;
- 	void *private_data;
- 	void (*private_free) (struct snd_ac97_bus *bus);
- 	/* --- */
-@@ -556,7 +556,7 @@ static inline int ac97_can_spdif(struct 
- 
- /* functions */
- /* create new AC97 bus */
--int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,
-+int snd_ac97_bus(struct snd_card *card, int num, const struct snd_ac97_bus_ops *ops,
- 		 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.3/include/sound/core.h linux-2.6.39.3/include/sound/core.h
---- linux-2.6.39.3/include/sound/core.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/sound/core.h	2011-05-22 19:36:33.000000000 -0400
-@@ -88,7 +88,7 @@ struct snd_device {
- 	snd_device_state_t state;	/* state of the device */
- 	snd_device_type_t type;		/* device type */
- 	void *device_data;		/* device structure */
--	struct snd_device_ops *ops;	/* operations */
-+	const struct snd_device_ops *ops;	/* operations */
- };
- 
- #define snd_device(n) list_entry(n, struct snd_device, list)
-@@ -301,7 +301,7 @@ int snd_card_file_remove(struct snd_card
- /* device.c */
- 
- int snd_device_new(struct snd_card *card, snd_device_type_t type,
--		   void *device_data, struct snd_device_ops *ops);
-+		   void *device_data, const struct snd_device_ops *ops);
- 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.3/include/sound/pcm.h linux-2.6.39.3/include/sound/pcm.h
---- linux-2.6.39.3/include/sound/pcm.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/sound/pcm.h	2011-05-22 19:36:33.000000000 -0400
-@@ -379,7 +379,7 @@ struct snd_pcm_substream {
- 	unsigned int dma_buf_id;
- 	size_t dma_max;
- 	/* -- hardware operations -- */
--	struct snd_pcm_ops *ops;
-+	const struct snd_pcm_ops *ops;
- 	/* -- runtime information -- */
- 	struct snd_pcm_runtime *runtime;
-         /* -- timer section -- */
-@@ -845,7 +845,7 @@ const unsigned char *snd_pcm_format_sile
- int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames);
- snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian);
- 
--void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, struct snd_pcm_ops *ops);
-+void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, const struct snd_pcm_ops *ops);
- 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.3/include/sound/rawmidi.h linux-2.6.39.3/include/sound/rawmidi.h
---- linux-2.6.39.3/include/sound/rawmidi.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	/* hardware layer */
--	struct snd_rawmidi_ops *ops;
-+	const struct snd_rawmidi_ops *ops;
- };
- 
- struct snd_rawmidi_file {
-@@ -127,7 +127,7 @@ struct snd_rawmidi {
- 	int ossreg;
- #endif
+ 	/*
+ 	 * The driver sets these to tell the transport class it
+@@ -678,39 +678,39 @@ struct fc_function_template {
+ 	 */
  
--	struct snd_rawmidi_global_ops *ops;
-+	const struct snd_rawmidi_global_ops *ops;
+ 	/* remote port fixed attributes */
+-	unsigned long	show_rport_maxframe_size:1;
+-	unsigned long	show_rport_supported_classes:1;
+-	unsigned long   show_rport_dev_loss_tmo:1;
++	const unsigned long	show_rport_maxframe_size:1;
++	const unsigned long	show_rport_supported_classes:1;
++	const unsigned long   show_rport_dev_loss_tmo:1;
  
- 	struct snd_rawmidi_str streams[2];
+ 	/*
+ 	 * target dynamic attributes
+ 	 * These should all be "1" if the driver uses the remote port
+ 	 * add/delete functions (so attributes reflect rport values).
+ 	 */
+-	unsigned long	show_starget_node_name:1;
+-	unsigned long	show_starget_port_name:1;
+-	unsigned long	show_starget_port_id:1;
++	const unsigned long	show_starget_node_name:1;
++	const unsigned long	show_starget_port_name:1;
++	const unsigned long	show_starget_port_id:1;
+ 
+ 	/* host fixed attributes */
+-	unsigned long	show_host_node_name:1;
+-	unsigned long	show_host_port_name:1;
+-	unsigned long	show_host_permanent_port_name:1;
+-	unsigned long	show_host_supported_classes:1;
+-	unsigned long	show_host_supported_fc4s:1;
+-	unsigned long	show_host_supported_speeds:1;
+-	unsigned long	show_host_maxframe_size:1;
+-	unsigned long	show_host_serial_number:1;
++	const unsigned long	show_host_node_name:1;
++	const unsigned long	show_host_port_name:1;
++	const unsigned long	show_host_permanent_port_name:1;
++	const unsigned long	show_host_supported_classes:1;
++	const unsigned long	show_host_supported_fc4s:1;
++	const unsigned long	show_host_supported_speeds:1;
++	const unsigned long	show_host_maxframe_size:1;
++	const unsigned long	show_host_serial_number:1;
+ 	/* host dynamic attributes */
+-	unsigned long	show_host_port_id:1;
+-	unsigned long	show_host_port_type:1;
+-	unsigned long	show_host_port_state:1;
+-	unsigned long	show_host_active_fc4s:1;
+-	unsigned long	show_host_speed:1;
+-	unsigned long	show_host_fabric_name:1;
+-	unsigned long	show_host_symbolic_name:1;
+-	unsigned long	show_host_system_hostname:1;
++	const unsigned long	show_host_port_id:1;
++	const unsigned long	show_host_port_type:1;
++	const unsigned long	show_host_port_state:1;
++	const unsigned long	show_host_active_fc4s:1;
++	const unsigned long	show_host_speed:1;
++	const unsigned long	show_host_fabric_name:1;
++	const unsigned long	show_host_symbolic_name:1;
++	const unsigned long	show_host_system_hostname:1;
+ 
+-	unsigned long	disable_target_scan:1;
++	const unsigned long	disable_target_scan:1;
+ };
+ 
+ 
+diff -urNp linux-2.6.39.4/include/sound/ak4xxx-adda.h linux-2.6.39.4/include/sound/ak4xxx-adda.h
+--- linux-2.6.39.4/include/sound/ak4xxx-adda.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/sound/ak4xxx-adda.h	2011-08-05 20:34:06.000000000 -0400
+@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
+ 	void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
+ 		      unsigned char val);
+ 	void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
+-};
++} __no_const;
+ 
+ #define AK4XXX_IMAGE_SIZE	(AK4XXX_MAX_CHIPS * 16)	/* 64 bytes */
+ 
+diff -urNp linux-2.6.39.4/include/sound/hwdep.h linux-2.6.39.4/include/sound/hwdep.h
+--- linux-2.6.39.4/include/sound/hwdep.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/sound/hwdep.h	2011-08-05 20:34:06.000000000 -0400
+@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
+ 			  struct snd_hwdep_dsp_status *status);
+ 	int (*dsp_load)(struct snd_hwdep *hw,
+ 			struct snd_hwdep_dsp_image *image);
+-};
++} __no_const;
+ 
+ struct snd_hwdep {
+ 	struct snd_card *card;
+diff -urNp linux-2.6.39.4/include/sound/info.h linux-2.6.39.4/include/sound/info.h
+--- linux-2.6.39.4/include/sound/info.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/sound/info.h	2011-08-05 20:34:06.000000000 -0400
+@@ -44,7 +44,7 @@ struct snd_info_entry_text {
+ 		     struct snd_info_buffer *buffer);
+ 	void (*write)(struct snd_info_entry *entry,
+ 		      struct snd_info_buffer *buffer);
+-};
++} __no_const;
+ 
+ struct snd_info_entry_ops {
+ 	int (*open)(struct snd_info_entry *entry,
+diff -urNp linux-2.6.39.4/include/sound/pcm.h linux-2.6.39.4/include/sound/pcm.h
+--- linux-2.6.39.4/include/sound/pcm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/sound/pcm.h	2011-08-05 20:34:06.000000000 -0400
+@@ -81,6 +81,7 @@ struct snd_pcm_ops {
+ 	int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
+ 	int (*ack)(struct snd_pcm_substream *substream);
+ };
++typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
  
-@@ -151,7 +151,7 @@ int snd_rawmidi_new(struct snd_card *car
- 		    int output_count, int input_count,
- 		    struct snd_rawmidi **rmidi);
- void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream,
--			 struct snd_rawmidi_ops *ops);
-+			 const struct snd_rawmidi_ops *ops);
+ /*
+  *
+diff -urNp linux-2.6.39.4/include/sound/sb16_csp.h linux-2.6.39.4/include/sound/sb16_csp.h
+--- linux-2.6.39.4/include/sound/sb16_csp.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/sound/sb16_csp.h	2011-08-05 20:34:06.000000000 -0400
+@@ -139,7 +139,7 @@ struct snd_sb_csp_ops {
+ 	int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
+ 	int (*csp_stop) (struct snd_sb_csp * p);
+ 	int (*csp_qsound_transfer) (struct snd_sb_csp * p);
+-};
++} __no_const;
  
- /* callbacks */
+ /*
+  * CSP private data
+diff -urNp linux-2.6.39.4/include/sound/soc.h linux-2.6.39.4/include/sound/soc.h
+--- linux-2.6.39.4/include/sound/soc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/sound/soc.h	2011-08-05 20:34:06.000000000 -0400
+@@ -624,7 +624,7 @@ struct snd_soc_platform_driver {
+ 		struct snd_soc_dai *);
+ 
+ 	/* platform stream ops */
+-	struct snd_pcm_ops *ops;
++	struct snd_pcm_ops * const ops;
+ };
  
-diff -urNp linux-2.6.39.3/include/sound/seq_device.h linux-2.6.39.3/include/sound/seq_device.h
---- linux-2.6.39.3/include/sound/seq_device.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/sound/seq_device.h	2011-05-22 19:36:33.000000000 -0400
-@@ -69,7 +69,7 @@ struct snd_seq_dev_ops {
-  */
- void snd_seq_device_load_drivers(void);
- int snd_seq_device_new(struct snd_card *card, int device, char *id, int argsize, struct snd_seq_device **result);
--int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry, int argsize);
-+int snd_seq_device_register_driver(char *id, const struct snd_seq_dev_ops *entry, int argsize);
- int snd_seq_device_unregister_driver(char *id);
- 
- #define SNDRV_SEQ_DEVICE_ARGPTR(dev) (void *)((char *)(dev) + sizeof(struct snd_seq_device))
-diff -urNp linux-2.6.39.3/include/sound/snd_wavefront.h linux-2.6.39.3/include/sound/snd_wavefront.h
---- linux-2.6.39.3/include/sound/snd_wavefront.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/sound/snd_wavefront.h	2011-05-22 19:36:33.000000000 -0400
-@@ -37,8 +37,8 @@ struct _snd_wavefront_midi {
- #define	MPU_ACK		0xFE
- #define	UART_MODE_ON	0x3F
- 
--extern struct snd_rawmidi_ops snd_wavefront_midi_output;
--extern struct snd_rawmidi_ops snd_wavefront_midi_input;
-+extern const struct snd_rawmidi_ops snd_wavefront_midi_output;
-+extern const struct snd_rawmidi_ops snd_wavefront_midi_input;
- 
- 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.3/include/sound/soc.h linux-2.6.39.3/include/sound/soc.h
---- linux-2.6.39.3/include/sound/soc.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/sound/soc.h	2011-05-22 19:36:33.000000000 -0400
-@@ -245,7 +245,7 @@ struct snd_soc_jack_gpio;
- 
- typedef int (*hw_write_t)(void *,const char* ,int);
- 
--extern struct snd_ac97_bus_ops soc_ac97_ops;
-+extern const struct snd_ac97_bus_ops soc_ac97_ops;
- 
- enum snd_soc_control_type {
- 	SND_SOC_CUSTOM,
-diff -urNp linux-2.6.39.3/include/sound/ymfpci.h linux-2.6.39.3/include/sound/ymfpci.h
---- linux-2.6.39.3/include/sound/ymfpci.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/sound/ymfpci.h	2011-05-22 19:36:33.000000000 -0400
+ struct snd_soc_platform {
+diff -urNp linux-2.6.39.4/include/sound/ymfpci.h linux-2.6.39.4/include/sound/ymfpci.h
+--- linux-2.6.39.4/include/sound/ymfpci.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/sound/ymfpci.h	2011-08-05 19:44:37.000000000 -0400
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
  	spinlock_t reg_lock;
  	spinlock_t voice_lock;
@@ -66571,9 +55461,18 @@ diff -urNp linux-2.6.39.3/include/sound/ymfpci.h linux-2.6.39.3/include/sound/ym
  	struct snd_info_entry *proc_entry;
  	const struct firmware *dsp_microcode;
  	const struct firmware *controller_microcode;
-diff -urNp linux-2.6.39.3/include/target/target_core_base.h linux-2.6.39.3/include/target/target_core_base.h
---- linux-2.6.39.3/include/target/target_core_base.h	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/include/target/target_core_base.h	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/include/target/target_core_base.h linux-2.6.39.4/include/target/target_core_base.h
+--- linux-2.6.39.4/include/target/target_core_base.h	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/include/target/target_core_base.h	2011-08-05 20:34:06.000000000 -0400
+@@ -364,7 +364,7 @@ struct t10_reservation_ops {
+ 	int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
+ 	int (*t10_pr_register)(struct se_cmd *);
+ 	int (*t10_pr_clear)(struct se_cmd *);
+-};
++} __no_const;
+ 
+ struct t10_reservation_template {
+ 	/* Reservation effects all target ports */
 @@ -432,8 +432,8 @@ struct se_transport_task {
  	atomic_t		t_task_cdbs_left;
  	atomic_t		t_task_cdbs_ex_left;
@@ -66594,9 +55493,9 @@ diff -urNp linux-2.6.39.3/include/target/target_core_base.h linux-2.6.39.3/inclu
  	atomic_t		dev_tur_active;
  	atomic_t		execute_tasks;
  	atomic_t		dev_status_thr_count;
-diff -urNp linux-2.6.39.3/include/trace/events/irq.h linux-2.6.39.3/include/trace/events/irq.h
---- linux-2.6.39.3/include/trace/events/irq.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/trace/events/irq.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/trace/events/irq.h linux-2.6.39.4/include/trace/events/irq.h
+--- linux-2.6.39.4/include/trace/events/irq.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/trace/events/irq.h	2011-08-05 19:44:37.000000000 -0400
 @@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
@@ -66615,9 +55514,9 @@ diff -urNp linux-2.6.39.3/include/trace/events/irq.h linux-2.6.39.3/include/trac
  
  	TP_ARGS(irq, action, ret),
  
-diff -urNp linux-2.6.39.3/include/video/udlfb.h linux-2.6.39.3/include/video/udlfb.h
---- linux-2.6.39.3/include/video/udlfb.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/video/udlfb.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/video/udlfb.h linux-2.6.39.4/include/video/udlfb.h
+--- linux-2.6.39.4/include/video/udlfb.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/video/udlfb.h	2011-08-05 19:44:37.000000000 -0400
 @@ -51,10 +51,10 @@ struct dlfb_data {
  	int base8;
  	u32 pseudo_palette[256];
@@ -66633,9 +55532,9 @@ diff -urNp linux-2.6.39.3/include/video/udlfb.h linux-2.6.39.3/include/video/udl
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-2.6.39.3/include/video/uvesafb.h linux-2.6.39.3/include/video/uvesafb.h
---- linux-2.6.39.3/include/video/uvesafb.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/include/video/uvesafb.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/include/video/uvesafb.h linux-2.6.39.4/include/video/uvesafb.h
+--- linux-2.6.39.4/include/video/uvesafb.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/include/video/uvesafb.h	2011-08-05 19:44:37.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -66644,9 +55543,9 @@ diff -urNp linux-2.6.39.3/include/video/uvesafb.h linux-2.6.39.3/include/video/u
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-2.6.39.3/init/do_mounts.c linux-2.6.39.3/init/do_mounts.c
---- linux-2.6.39.3/init/do_mounts.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/init/do_mounts.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/init/do_mounts.c linux-2.6.39.4/init/do_mounts.c
+--- linux-2.6.39.4/init/do_mounts.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/init/do_mounts.c	2011-08-05 19:44:37.000000000 -0400
 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -66686,9 +55585,9 @@ diff -urNp linux-2.6.39.3/init/do_mounts.c linux-2.6.39.3/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.3/init/do_mounts.h linux-2.6.39.3/init/do_mounts.h
---- linux-2.6.39.3/init/do_mounts.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/init/do_mounts.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/init/do_mounts.h linux-2.6.39.4/init/do_mounts.h
+--- linux-2.6.39.4/init/do_mounts.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/init/do_mounts.h	2011-08-05 19:44:37.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -66708,9 +55607,9 @@ diff -urNp linux-2.6.39.3/init/do_mounts.h linux-2.6.39.3/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-2.6.39.3/init/do_mounts_initrd.c linux-2.6.39.3/init/do_mounts_initrd.c
---- linux-2.6.39.3/init/do_mounts_initrd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/init/do_mounts_initrd.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/init/do_mounts_initrd.c linux-2.6.39.4/init/do_mounts_initrd.c
+--- linux-2.6.39.4/init/do_mounts_initrd.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/init/do_mounts_initrd.c	2011-08-05 19:44:37.000000000 -0400
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
  	create_dev("/dev/root.old", Root_RAM0);
  	/* mount initrd on rootfs' /root */
@@ -66785,9 +55684,9 @@ diff -urNp linux-2.6.39.3/init/do_mounts_initrd.c linux-2.6.39.3/init/do_mounts_
 +	sys_unlink((__force const char __user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-2.6.39.3/init/do_mounts_md.c linux-2.6.39.3/init/do_mounts_md.c
---- linux-2.6.39.3/init/do_mounts_md.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/init/do_mounts_md.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/init/do_mounts_md.c linux-2.6.39.4/init/do_mounts_md.c
+--- linux-2.6.39.4/init/do_mounts_md.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/init/do_mounts_md.c	2011-08-05 19:44:37.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -66806,9 +55705,9 @@ diff -urNp linux-2.6.39.3/init/do_mounts_md.c linux-2.6.39.3/init/do_mounts_md.c
  			sys_ioctl(fd, BLKRRPART, 0);
  		}
  		sys_close(fd);
-diff -urNp linux-2.6.39.3/init/initramfs.c linux-2.6.39.3/init/initramfs.c
---- linux-2.6.39.3/init/initramfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/init/initramfs.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/init/initramfs.c linux-2.6.39.4/init/initramfs.c
+--- linux-2.6.39.4/init/initramfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/init/initramfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -66917,9 +55816,9 @@ diff -urNp linux-2.6.39.3/init/initramfs.c linux-2.6.39.3/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-2.6.39.3/init/Kconfig linux-2.6.39.3/init/Kconfig
---- linux-2.6.39.3/init/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/init/Kconfig	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/init/Kconfig linux-2.6.39.4/init/Kconfig
+--- linux-2.6.39.4/init/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/init/Kconfig	2011-08-05 19:44:37.000000000 -0400
 @@ -1202,7 +1202,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
@@ -66929,9 +55828,9 @@ diff -urNp linux-2.6.39.3/init/Kconfig linux-2.6.39.3/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.3/init/main.c linux-2.6.39.3/init/main.c
---- linux-2.6.39.3/init/main.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/init/main.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/init/main.c linux-2.6.39.4/init/main.c
+--- linux-2.6.39.4/init/main.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/init/main.c	2011-08-05 20:34:06.000000000 -0400
 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
@@ -66978,7 +55877,7 @@ diff -urNp linux-2.6.39.3/init/main.c linux-2.6.39.3/init/main.c
 +#endif
 +
 +#ifdef CONFIG_PAX_SOFTMODE
-+unsigned int pax_softmode;
++int pax_softmode;
 +
 +static int __init setup_pax_softmode(char *str)
 +{
@@ -67043,9 +55942,9 @@ diff -urNp linux-2.6.39.3/init/main.c linux-2.6.39.3/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.3/ipc/mqueue.c linux-2.6.39.3/ipc/mqueue.c
---- linux-2.6.39.3/ipc/mqueue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/ipc/mqueue.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/ipc/mqueue.c linux-2.6.39.4/ipc/mqueue.c
+--- linux-2.6.39.4/ipc/mqueue.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/ipc/mqueue.c	2011-08-05 19:44:37.000000000 -0400
 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
  			mq_bytes = (mq_msg_tblsz +
  				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -67054,10 +55953,66 @@ diff -urNp linux-2.6.39.3/ipc/mqueue.c linux-2.6.39.3/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.3/ipc/sem.c linux-2.6.39.3/ipc/sem.c
---- linux-2.6.39.3/ipc/sem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/ipc/sem.c	2011-05-22 19:36:33.000000000 -0400
-@@ -854,6 +854,8 @@ static int semctl_main(struct ipc_namesp
+diff -urNp linux-2.6.39.4/ipc/msg.c linux-2.6.39.4/ipc/msg.c
+--- linux-2.6.39.4/ipc/msg.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/ipc/msg.c	2011-08-05 20:34:06.000000000 -0400
+@@ -309,18 +309,19 @@ static inline int msg_security(struct ke
+ 	return security_msg_queue_associate(msq, msgflg);
+ }
+ 
++static struct ipc_ops msg_ops = {
++	.getnew		= newque,
++	.associate	= msg_security,
++	.more_checks	= NULL
++};
++
+ SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops msg_ops;
+ 	struct ipc_params msg_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+ 
+-	msg_ops.getnew = newque;
+-	msg_ops.associate = msg_security;
+-	msg_ops.more_checks = NULL;
+-
+ 	msg_params.key = key;
+ 	msg_params.flg = msgflg;
+ 
+diff -urNp linux-2.6.39.4/ipc/sem.c linux-2.6.39.4/ipc/sem.c
+--- linux-2.6.39.4/ipc/sem.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/ipc/sem.c	2011-08-05 20:34:06.000000000 -0400
+@@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
+ 	return 0;
+ }
+ 
++static struct ipc_ops sem_ops = {
++	.getnew		= newary,
++	.associate	= sem_security,
++	.more_checks	= sem_more_checks
++};
++
+ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops sem_ops;
+ 	struct ipc_params sem_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+@@ -329,10 +334,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int,
+ 	if (nsems < 0 || nsems > ns->sc_semmsl)
+ 		return -EINVAL;
+ 
+-	sem_ops.getnew = newary;
+-	sem_ops.associate = sem_security;
+-	sem_ops.more_checks = sem_more_checks;
+-
+ 	sem_params.key = key;
+ 	sem_params.flg = semflg;
+ 	sem_params.u.nsems = nsems;
+@@ -854,6 +855,8 @@ static int semctl_main(struct ipc_namesp
  	int nsems;
  	struct list_head tasks;
  
@@ -67066,7 +56021,7 @@ diff -urNp linux-2.6.39.3/ipc/sem.c linux-2.6.39.3/ipc/sem.c
  	sma = sem_lock_check(ns, semid);
  	if (IS_ERR(sma))
  		return PTR_ERR(sma);
-@@ -1301,6 +1303,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
+@@ -1301,6 +1304,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
  	struct ipc_namespace *ns;
  	struct list_head tasks;
  
@@ -67075,9 +56030,9 @@ diff -urNp linux-2.6.39.3/ipc/sem.c linux-2.6.39.3/ipc/sem.c
  	ns = current->nsproxy->ipc_ns;
  
  	if (nsops < 1 || semid < 0)
-diff -urNp linux-2.6.39.3/ipc/shm.c linux-2.6.39.3/ipc/shm.c
---- linux-2.6.39.3/ipc/shm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/ipc/shm.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/ipc/shm.c linux-2.6.39.4/ipc/shm.c
+--- linux-2.6.39.4/ipc/shm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/ipc/shm.c	2011-08-05 20:34:06.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
@@ -67108,7 +56063,32 @@ diff -urNp linux-2.6.39.3/ipc/shm.c linux-2.6.39.3/ipc/shm.c
  	shp->shm_segsz = size;
  	shp->shm_nattch = 0;
  	shp->shm_file = file;
-@@ -762,8 +778,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
+@@ -451,18 +467,19 @@ static inline int shm_more_checks(struct
+ 	return 0;
+ }
+ 
++static struct ipc_ops shm_ops = {
++	.getnew		= newseg,
++	.associate	= shm_security,
++	.more_checks	= shm_more_checks
++};
++
+ SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops shm_ops;
+ 	struct ipc_params shm_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+ 
+-	shm_ops.getnew = newseg;
+-	shm_ops.associate = shm_security;
+-	shm_ops.more_checks = shm_more_checks;
+-
+ 	shm_params.key = key;
+ 	shm_params.flg = shmflg;
+ 	shm_params.u.size = size;
+@@ -762,8 +779,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
  	case SHM_LOCK:
  	case SHM_UNLOCK:
  	{
@@ -67117,7 +56097,7 @@ diff -urNp linux-2.6.39.3/ipc/shm.c linux-2.6.39.3/ipc/shm.c
  		lru_add_drain_all();  /* drain pagevecs to lru lists */
  
  		shp = shm_lock_check(ns, shmid);
-@@ -896,9 +910,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -896,9 +911,21 @@ long do_shmat(int shmid, char __user *sh
  	if (err)
  		goto out_unlock;
  
@@ -67139,9 +56119,9 @@ diff -urNp linux-2.6.39.3/ipc/shm.c linux-2.6.39.3/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-2.6.39.3/kernel/acct.c linux-2.6.39.3/kernel/acct.c
---- linux-2.6.39.3/kernel/acct.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/acct.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/acct.c linux-2.6.39.4/kernel/acct.c
+--- linux-2.6.39.4/kernel/acct.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/acct.c	2011-08-05 19:44:37.000000000 -0400
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -67151,9 +56131,9 @@ diff -urNp linux-2.6.39.3/kernel/acct.c linux-2.6.39.3/kernel/acct.c
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff -urNp linux-2.6.39.3/kernel/audit.c linux-2.6.39.3/kernel/audit.c
---- linux-2.6.39.3/kernel/audit.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/audit.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/audit.c linux-2.6.39.4/kernel/audit.c
+--- linux-2.6.39.4/kernel/audit.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/audit.c	2011-08-05 19:44:37.000000000 -0400
 @@ -112,7 +112,7 @@ u32		audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
@@ -67190,9 +56170,9 @@ diff -urNp linux-2.6.39.3/kernel/audit.c linux-2.6.39.3/kernel/audit.c
  		status_set.backlog	 = 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.3/kernel/auditsc.c linux-2.6.39.3/kernel/auditsc.c
---- linux-2.6.39.3/kernel/auditsc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/auditsc.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/auditsc.c linux-2.6.39.4/kernel/auditsc.c
+--- linux-2.6.39.4/kernel/auditsc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/auditsc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2111,7 +2111,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -67211,9 +56191,9 @@ diff -urNp linux-2.6.39.3/kernel/auditsc.c linux-2.6.39.3/kernel/auditsc.c
  	struct audit_context *context = task->audit_context;
  
  	if (context && context->in_syscall) {
-diff -urNp linux-2.6.39.3/kernel/capability.c linux-2.6.39.3/kernel/capability.c
---- linux-2.6.39.3/kernel/capability.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/capability.c	2011-05-22 21:02:23.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/capability.c linux-2.6.39.4/kernel/capability.c
+--- linux-2.6.39.4/kernel/capability.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/capability.c	2011-08-05 19:44:37.000000000 -0400
 @@ -206,6 +206,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
  		 * before modification is attempted and the application
  		 * fails.
@@ -67274,9 +56254,9 @@ diff -urNp linux-2.6.39.3/kernel/capability.c linux-2.6.39.3/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.3/kernel/cgroup.c linux-2.6.39.3/kernel/cgroup.c
---- linux-2.6.39.3/kernel/cgroup.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/cgroup.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/cgroup.c linux-2.6.39.4/kernel/cgroup.c
+--- linux-2.6.39.4/kernel/cgroup.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/cgroup.c	2011-08-05 19:44:37.000000000 -0400
 @@ -598,6 +598,8 @@ static struct css_set *find_css_set(
  	struct hlist_head *hhead;
  	struct cg_cgroup_link *link;
@@ -67286,9 +56266,9 @@ diff -urNp linux-2.6.39.3/kernel/cgroup.c linux-2.6.39.3/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.3/kernel/compat.c linux-2.6.39.3/kernel/compat.c
---- linux-2.6.39.3/kernel/compat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/compat.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/compat.c linux-2.6.39.4/kernel/compat.c
+--- linux-2.6.39.4/kernel/compat.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/compat.c	2011-08-05 19:44:37.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -67297,9 +56277,9 @@ diff -urNp linux-2.6.39.3/kernel/compat.c linux-2.6.39.3/kernel/compat.c
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-diff -urNp linux-2.6.39.3/kernel/configs.c linux-2.6.39.3/kernel/configs.c
---- linux-2.6.39.3/kernel/configs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/configs.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/configs.c linux-2.6.39.4/kernel/configs.c
+--- linux-2.6.39.4/kernel/configs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/configs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -67320,9 +56300,9 @@ diff -urNp linux-2.6.39.3/kernel/configs.c linux-2.6.39.3/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-2.6.39.3/kernel/cred.c linux-2.6.39.3/kernel/cred.c
---- linux-2.6.39.3/kernel/cred.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/cred.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/cred.c linux-2.6.39.4/kernel/cred.c
+--- linux-2.6.39.4/kernel/cred.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/cred.c	2011-08-05 19:44:37.000000000 -0400
 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
@@ -67458,18 +56438,9 @@ diff -urNp linux-2.6.39.3/kernel/cred.c linux-2.6.39.3/kernel/cred.c
  	ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-2.6.39.3/kernel/debug/debug_core.c linux-2.6.39.3/kernel/debug/debug_core.c
---- linux-2.6.39.3/kernel/debug/debug_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/debug/debug_core.c	2011-05-22 19:36:33.000000000 -0400
-@@ -72,7 +72,7 @@ int			kgdb_io_module_registered;
- /* Guard for recursive entry */
- static int			exception_level;
- 
--struct kgdb_io		*dbg_io_ops;
-+const struct kgdb_io		*dbg_io_ops;
- static DEFINE_SPINLOCK(kgdb_registration_lock);
- 
- /* kgdb console driver is loaded */
+diff -urNp linux-2.6.39.4/kernel/debug/debug_core.c linux-2.6.39.4/kernel/debug/debug_core.c
+--- linux-2.6.39.4/kernel/debug/debug_core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/debug/debug_core.c	2011-08-05 20:34:06.000000000 -0400
 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
   */
  static atomic_t			masters_in_kgdb;
@@ -67530,27 +56501,9 @@ diff -urNp linux-2.6.39.3/kernel/debug/debug_core.c linux-2.6.39.3/kernel/debug/
  	tasklet_schedule(&kgdb_tasklet_breakpoint);
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-@@ -864,7 +864,7 @@ static void kgdb_initial_breakpoint(void
-  *
-  *	Register it with the KGDB core.
-  */
--int kgdb_register_io_module(struct kgdb_io *new_dbg_io_ops)
-+int kgdb_register_io_module(const struct kgdb_io *new_dbg_io_ops)
- {
- 	int err;
- 
-@@ -909,7 +909,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
-  *
-  *	Unregister it with the KGDB core.
-  */
--void kgdb_unregister_io_module(struct kgdb_io *old_dbg_io_ops)
-+void kgdb_unregister_io_module(const struct kgdb_io *old_dbg_io_ops)
- {
- 	BUG_ON(kgdb_connected);
- 
-diff -urNp linux-2.6.39.3/kernel/debug/kdb/kdb_main.c linux-2.6.39.3/kernel/debug/kdb/kdb_main.c
---- linux-2.6.39.3/kernel/debug/kdb/kdb_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/debug/kdb/kdb_main.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/debug/kdb/kdb_main.c linux-2.6.39.4/kernel/debug/kdb/kdb_main.c
+--- linux-2.6.39.4/kernel/debug/kdb/kdb_main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/debug/kdb/kdb_main.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
  	list_for_each_entry(mod, kdb_modules, list) {
  
@@ -67569,9 +56522,9 @@ diff -urNp linux-2.6.39.3/kernel/debug/kdb/kdb_main.c linux-2.6.39.3/kernel/debu
  
  #ifdef CONFIG_MODULE_UNLOAD
  		{
-diff -urNp linux-2.6.39.3/kernel/exit.c linux-2.6.39.3/kernel/exit.c
---- linux-2.6.39.3/kernel/exit.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/exit.c	2011-05-22 20:02:30.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/exit.c linux-2.6.39.4/kernel/exit.c
+--- linux-2.6.39.4/kernel/exit.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/exit.c	2011-08-05 19:44:37.000000000 -0400
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -67683,9 +56636,9 @@ diff -urNp linux-2.6.39.3/kernel/exit.c linux-2.6.39.3/kernel/exit.c
  	exit_mm(tsk);
  
  	if (group_dead)
-diff -urNp linux-2.6.39.3/kernel/fork.c linux-2.6.39.3/kernel/fork.c
---- linux-2.6.39.3/kernel/fork.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/fork.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/fork.c linux-2.6.39.4/kernel/fork.c
+--- linux-2.6.39.4/kernel/fork.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/fork.c	2011-08-05 19:44:37.000000000 -0400
 @@ -287,7 +287,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
@@ -67982,9 +56935,9 @@ diff -urNp linux-2.6.39.3/kernel/fork.c linux-2.6.39.3/kernel/fork.c
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff -urNp linux-2.6.39.3/kernel/futex.c linux-2.6.39.3/kernel/futex.c
---- linux-2.6.39.3/kernel/futex.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/futex.c	2011-05-22 22:41:57.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/futex.c linux-2.6.39.4/kernel/futex.c
+--- linux-2.6.39.4/kernel/futex.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/futex.c	2011-08-05 19:44:37.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -68072,9 +57025,9 @@ diff -urNp linux-2.6.39.3/kernel/futex.c linux-2.6.39.3/kernel/futex.c
  
  	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
  		plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
-diff -urNp linux-2.6.39.3/kernel/futex_compat.c linux-2.6.39.3/kernel/futex_compat.c
---- linux-2.6.39.3/kernel/futex_compat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/futex_compat.c	2011-05-22 22:42:09.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/futex_compat.c linux-2.6.39.4/kernel/futex_compat.c
+--- linux-2.6.39.4/kernel/futex_compat.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/futex_compat.c	2011-08-05 19:44:37.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -68114,9 +57067,9 @@ diff -urNp linux-2.6.39.3/kernel/futex_compat.c linux-2.6.39.3/kernel/futex_comp
  		head = p->compat_robust_list;
  		rcu_read_unlock();
  	}
-diff -urNp linux-2.6.39.3/kernel/gcov/base.c linux-2.6.39.3/kernel/gcov/base.c
---- linux-2.6.39.3/kernel/gcov/base.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/gcov/base.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/gcov/base.c linux-2.6.39.4/kernel/gcov/base.c
+--- linux-2.6.39.4/kernel/gcov/base.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/gcov/base.c	2011-08-05 19:44:37.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -68138,9 +57091,9 @@ diff -urNp linux-2.6.39.3/kernel/gcov/base.c linux-2.6.39.3/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-2.6.39.3/kernel/hrtimer.c linux-2.6.39.3/kernel/hrtimer.c
---- linux-2.6.39.3/kernel/hrtimer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/hrtimer.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/hrtimer.c linux-2.6.39.4/kernel/hrtimer.c
+--- linux-2.6.39.4/kernel/hrtimer.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/hrtimer.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1383,7 +1383,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
@@ -68150,9 +57103,9 @@ diff -urNp linux-2.6.39.3/kernel/hrtimer.c linux-2.6.39.3/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-2.6.39.3/kernel/irq/manage.c linux-2.6.39.3/kernel/irq/manage.c
---- linux-2.6.39.3/kernel/irq/manage.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/irq/manage.c	2011-06-13 17:09:06.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/irq/manage.c linux-2.6.39.4/kernel/irq/manage.c
+--- linux-2.6.39.4/kernel/irq/manage.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/irq/manage.c	2011-08-05 19:44:37.000000000 -0400
 @@ -491,6 +491,9 @@ int irq_set_irq_wake(unsigned int irq, u
  	struct irq_desc *desc = irq_get_desc_buslock(irq, &flags);
  	int ret = 0;
@@ -68163,9 +57116,9 @@ diff -urNp linux-2.6.39.3/kernel/irq/manage.c linux-2.6.39.3/kernel/irq/manage.c
  	/* wakeup-capable irqs can be shared between drivers that
  	 * don't need to have the same sleep mode behaviors.
  	 */
-diff -urNp linux-2.6.39.3/kernel/jump_label.c linux-2.6.39.3/kernel/jump_label.c
---- linux-2.6.39.3/kernel/jump_label.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/jump_label.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/jump_label.c linux-2.6.39.4/kernel/jump_label.c
+--- linux-2.6.39.4/kernel/jump_label.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/jump_label.c	2011-08-05 19:44:37.000000000 -0400
 @@ -49,6 +49,17 @@ void jump_label_unlock(void)
  	mutex_unlock(&jump_label_mutex);
  }
@@ -68206,9 +57159,9 @@ diff -urNp linux-2.6.39.3/kernel/jump_label.c linux-2.6.39.3/kernel/jump_label.c
  					iter++;
  				}
  			}
-diff -urNp linux-2.6.39.3/kernel/kallsyms.c linux-2.6.39.3/kernel/kallsyms.c
---- linux-2.6.39.3/kernel/kallsyms.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/kallsyms.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/kallsyms.c linux-2.6.39.4/kernel/kallsyms.c
+--- linux-2.6.39.4/kernel/kallsyms.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/kallsyms.c	2011-08-05 19:44:37.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 description)
@@ -68311,9 +57264,9 @@ diff -urNp linux-2.6.39.3/kernel/kallsyms.c linux-2.6.39.3/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-2.6.39.3/kernel/kmod.c linux-2.6.39.3/kernel/kmod.c
---- linux-2.6.39.3/kernel/kmod.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/kmod.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/kmod.c linux-2.6.39.4/kernel/kmod.c
+--- linux-2.6.39.4/kernel/kmod.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/kmod.c	2011-08-05 19:44:37.000000000 -0400
 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
@@ -68410,9 +57363,9 @@ diff -urNp linux-2.6.39.3/kernel/kmod.c linux-2.6.39.3/kernel/kmod.c
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff -urNp linux-2.6.39.3/kernel/kprobes.c linux-2.6.39.3/kernel/kprobes.c
---- linux-2.6.39.3/kernel/kprobes.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/kprobes.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/kprobes.c linux-2.6.39.4/kernel/kprobes.c
+--- linux-2.6.39.4/kernel/kprobes.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/kprobes.c	2011-08-05 19:44:37.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.
@@ -68449,9 +57402,9 @@ diff -urNp linux-2.6.39.3/kernel/kprobes.c linux-2.6.39.3/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-2.6.39.3/kernel/lockdep.c linux-2.6.39.3/kernel/lockdep.c
---- linux-2.6.39.3/kernel/lockdep.c	2011-06-25 12:55:23.000000000 -0400
-+++ linux-2.6.39.3/kernel/lockdep.c	2011-06-25 13:00:28.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/lockdep.c linux-2.6.39.4/kernel/lockdep.c
+--- linux-2.6.39.4/kernel/lockdep.c	2011-06-25 12:55:23.000000000 -0400
++++ linux-2.6.39.4/kernel/lockdep.c	2011-08-05 19:44:37.000000000 -0400
 @@ -571,6 +571,10 @@ static int static_obj(void *obj)
  		      end   = (unsigned long) &_end,
  		      addr  = (unsigned long) obj;
@@ -68480,9 +57433,9 @@ diff -urNp linux-2.6.39.3/kernel/lockdep.c linux-2.6.39.3/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.3/kernel/lockdep_proc.c linux-2.6.39.3/kernel/lockdep_proc.c
---- linux-2.6.39.3/kernel/lockdep_proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/lockdep_proc.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/lockdep_proc.c linux-2.6.39.4/kernel/lockdep_proc.c
+--- linux-2.6.39.4/kernel/lockdep_proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/lockdep_proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
@@ -68492,9 +57445,9 @@ diff -urNp linux-2.6.39.3/kernel/lockdep_proc.c linux-2.6.39.3/kernel/lockdep_pr
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-2.6.39.3/kernel/module.c linux-2.6.39.3/kernel/module.c
---- linux-2.6.39.3/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/module.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/module.c linux-2.6.39.4/kernel/module.c
+--- linux-2.6.39.4/kernel/module.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/module.c	2011-08-05 19:44:37.000000000 -0400
 @@ -57,6 +57,7 @@
  #include <linux/kmemleak.h>
  #include <linux/jump_label.h>
@@ -69223,9 +58176,9 @@ diff -urNp linux-2.6.39.3/kernel/module.c linux-2.6.39.3/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-2.6.39.3/kernel/mutex.c linux-2.6.39.3/kernel/mutex.c
---- linux-2.6.39.3/kernel/mutex.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/mutex.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/mutex.c linux-2.6.39.4/kernel/mutex.c
+--- linux-2.6.39.4/kernel/mutex.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/mutex.c	2011-08-05 19:44:37.000000000 -0400
 @@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock, 
  	 */
  
@@ -69263,9 +58216,9 @@ diff -urNp linux-2.6.39.3/kernel/mutex.c linux-2.6.39.3/kernel/mutex.c
  	mutex_set_owner(lock);
  
  	/* set it to 0 if there are no waiters left: */
-diff -urNp linux-2.6.39.3/kernel/mutex-debug.c linux-2.6.39.3/kernel/mutex-debug.c
---- linux-2.6.39.3/kernel/mutex-debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/mutex-debug.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/mutex-debug.c linux-2.6.39.4/kernel/mutex-debug.c
+--- linux-2.6.39.4/kernel/mutex-debug.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/mutex-debug.c	2011-08-05 19:44:37.000000000 -0400
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -69303,9 +58256,9 @@ diff -urNp linux-2.6.39.3/kernel/mutex-debug.c linux-2.6.39.3/kernel/mutex-debug
  	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
  	mutex_clear_owner(lock);
  }
-diff -urNp linux-2.6.39.3/kernel/mutex-debug.h linux-2.6.39.3/kernel/mutex-debug.h
---- linux-2.6.39.3/kernel/mutex-debug.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/mutex-debug.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/mutex-debug.h linux-2.6.39.4/kernel/mutex-debug.h
+--- linux-2.6.39.4/kernel/mutex-debug.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/mutex-debug.h	2011-08-05 19:44:37.000000000 -0400
 @@ -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,
@@ -69326,9 +58279,9 @@ diff -urNp linux-2.6.39.3/kernel/mutex-debug.h linux-2.6.39.3/kernel/mutex-debug
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.39.3/kernel/mutex.h linux-2.6.39.3/kernel/mutex.h
---- linux-2.6.39.3/kernel/mutex.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/mutex.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/mutex.h linux-2.6.39.4/kernel/mutex.h
+--- linux-2.6.39.4/kernel/mutex.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/mutex.h	2011-08-05 19:44:37.000000000 -0400
 @@ -19,7 +19,7 @@
  #ifdef CONFIG_SMP
  static inline void mutex_set_owner(struct mutex *lock)
@@ -69338,9 +58291,9 @@ diff -urNp linux-2.6.39.3/kernel/mutex.h linux-2.6.39.3/kernel/mutex.h
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.39.3/kernel/padata.c linux-2.6.39.3/kernel/padata.c
---- linux-2.6.39.3/kernel/padata.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/padata.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/padata.c linux-2.6.39.4/kernel/padata.c
+--- linux-2.6.39.4/kernel/padata.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/padata.c	2011-08-05 19:44:37.000000000 -0400
 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
  	padata->pd = pd;
  	padata->cb_cpu = cb_cpu;
@@ -69364,9 +58317,9 @@ diff -urNp linux-2.6.39.3/kernel/padata.c linux-2.6.39.3/kernel/padata.c
  	atomic_set(&pd->reorder_objects, 0);
  	atomic_set(&pd->refcnt, 0);
  	pd->pinst = pinst;
-diff -urNp linux-2.6.39.3/kernel/panic.c linux-2.6.39.3/kernel/panic.c
---- linux-2.6.39.3/kernel/panic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/panic.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/panic.c linux-2.6.39.4/kernel/panic.c
+--- linux-2.6.39.4/kernel/panic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/panic.c	2011-08-05 19:44:37.000000000 -0400
 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
  	const char *board;
  
@@ -69386,66 +58339,9 @@ diff -urNp linux-2.6.39.3/kernel/panic.c linux-2.6.39.3/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.39.3/kernel/params.c linux-2.6.39.3/kernel/params.c
---- linux-2.6.39.3/kernel/params.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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));	\
- 	}								\
--	struct kernel_param_ops param_ops_##name = {			\
-+	 const struct kernel_param_ops param_ops_##name = {			\
- 		.set = param_set_##name,				\
- 		.get = param_get_##name,				\
- 	};								\
-@@ -286,7 +286,7 @@ static void param_free_charp(void *arg)
- 	maybe_kfree_parameter(*((char **)arg));
- }
- 
--struct kernel_param_ops param_ops_charp = {
-+const struct kernel_param_ops param_ops_charp = {
- 	.set = param_set_charp,
- 	.get = param_get_charp,
- 	.free = param_free_charp,
-@@ -334,7 +334,7 @@ int param_get_bool(char *buffer, const s
- }
- EXPORT_SYMBOL(param_get_bool);
- 
--struct kernel_param_ops param_ops_bool = {
-+const struct kernel_param_ops param_ops_bool = {
- 	.set = param_set_bool,
- 	.get = param_get_bool,
- };
-@@ -362,7 +362,7 @@ int param_get_invbool(char *buffer, cons
- }
- EXPORT_SYMBOL(param_get_invbool);
- 
--struct kernel_param_ops param_ops_invbool = {
-+const struct kernel_param_ops param_ops_invbool = {
- 	.set = param_set_invbool,
- 	.get = param_get_invbool,
- };
-@@ -460,7 +460,7 @@ static void param_array_free(void *arg)
- 			arr->ops->free(arr->elem + arr->elemsize * i);
- }
- 
--struct kernel_param_ops param_array_ops = {
-+const struct kernel_param_ops param_array_ops = {
- 	.set = param_array_set,
- 	.get = param_array_get,
- 	.free = param_array_free,
-@@ -488,7 +488,7 @@ int param_get_string(char *buffer, const
- }
- EXPORT_SYMBOL(param_get_string);
- 
--struct kernel_param_ops param_ops_string = {
-+const struct kernel_param_ops param_ops_string = {
- 	.set = param_set_copystring,
- 	.get = param_get_string,
- };
-diff -urNp linux-2.6.39.3/kernel/perf_event.c linux-2.6.39.3/kernel/perf_event.c
---- linux-2.6.39.3/kernel/perf_event.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/perf_event.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/perf_event.c linux-2.6.39.4/kernel/perf_event.c
+--- linux-2.6.39.4/kernel/perf_event.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/perf_event.c	2011-08-05 20:34:06.000000000 -0400
 @@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
  	return 0;
  }
@@ -69489,26 +58385,6 @@ diff -urNp linux-2.6.39.3/kernel/perf_event.c linux-2.6.39.3/kernel/perf_event.c
  
  	barrier();
  	++userpg->lock;
-@@ -3884,16 +3884,16 @@ static void perf_pending_event(struct ir
-  * Later on, we might change it to a list if there is
-  * another virtualization implementation supporting the callbacks.
-  */
--struct perf_guest_info_callbacks *perf_guest_cbs;
-+const struct perf_guest_info_callbacks *perf_guest_cbs;
- 
--int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *cbs)
-+int perf_register_guest_info_callbacks(const struct perf_guest_info_callbacks *cbs)
- {
- 	perf_guest_cbs = cbs;
- 	return 0;
- }
- EXPORT_SYMBOL_GPL(perf_register_guest_info_callbacks);
- 
--int perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *cbs)
-+int perf_unregister_guest_info_callbacks(const struct perf_guest_info_callbacks *cbs)
- {
- 	perf_guest_cbs = NULL;
- 	return 0;
 @@ -4196,11 +4196,11 @@ static void perf_output_read_one(struct 
  	values[n++] = perf_event_count(event);
  	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
@@ -69546,9 +58422,9 @@ diff -urNp linux-2.6.39.3/kernel/perf_event.c linux-2.6.39.3/kernel/perf_event.c
  		     &parent_event->child_total_time_running);
  
  	/*
-diff -urNp linux-2.6.39.3/kernel/pid.c linux-2.6.39.3/kernel/pid.c
---- linux-2.6.39.3/kernel/pid.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/pid.c	2011-07-16 15:42:36.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/pid.c linux-2.6.39.4/kernel/pid.c
+--- linux-2.6.39.4/kernel/pid.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/pid.c	2011-08-05 19:44:37.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -69596,9 +58472,9 @@ diff -urNp linux-2.6.39.3/kernel/pid.c linux-2.6.39.3/kernel/pid.c
  struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
  {
  	struct pid *pid;
-diff -urNp linux-2.6.39.3/kernel/posix-cpu-timers.c linux-2.6.39.3/kernel/posix-cpu-timers.c
---- linux-2.6.39.3/kernel/posix-cpu-timers.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/posix-cpu-timers.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/posix-cpu-timers.c linux-2.6.39.4/kernel/posix-cpu-timers.c
+--- linux-2.6.39.4/kernel/posix-cpu-timers.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/posix-cpu-timers.c	2011-08-05 20:34:06.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -69607,35 +58483,9 @@ diff -urNp linux-2.6.39.3/kernel/posix-cpu-timers.c linux-2.6.39.3/kernel/posix-
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-@@ -1590,7 +1591,7 @@ static int thread_cpu_timer_create(struc
- 	return posix_cpu_timer_create(timer);
- }
- 
--struct k_clock clock_posix_cpu = {
-+const struct k_clock clock_posix_cpu = {
- 	.clock_getres	= posix_cpu_clock_getres,
- 	.clock_set	= posix_cpu_clock_set,
- 	.clock_get	= posix_cpu_clock_get,
-@@ -1604,14 +1605,14 @@ struct k_clock clock_posix_cpu = {
- 
- static __init int init_posix_cpu_timers(void)
- {
--	struct k_clock process = {
-+	const struct k_clock process = {
- 		.clock_getres	= process_cpu_clock_getres,
- 		.clock_get	= process_cpu_clock_get,
- 		.timer_create	= process_cpu_timer_create,
- 		.nsleep		= process_cpu_nsleep,
- 		.nsleep_restart	= process_cpu_nsleep_restart,
- 	};
--	struct k_clock thread = {
-+	const struct k_clock thread = {
- 		.clock_getres	= thread_cpu_clock_getres,
- 		.clock_get	= thread_cpu_clock_get,
- 		.timer_create	= thread_cpu_timer_create,
-diff -urNp linux-2.6.39.3/kernel/posix-timers.c linux-2.6.39.3/kernel/posix-timers.c
---- linux-2.6.39.3/kernel/posix-timers.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/posix-timers.c	2011-05-22 20:13:41.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/posix-timers.c linux-2.6.39.4/kernel/posix-timers.c
+--- linux-2.6.39.4/kernel/posix-timers.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/posix-timers.c	2011-08-05 20:34:06.000000000 -0400
 @@ -43,6 +43,7 @@
  #include <linux/idr.h>
  #include <linux/posix-clock.h>
@@ -69644,48 +58494,15 @@ diff -urNp linux-2.6.39.3/kernel/posix-timers.c linux-2.6.39.3/kernel/posix-time
  #include <linux/syscalls.h>
  #include <linux/wait.h>
  #include <linux/workqueue.h>
-@@ -227,7 +228,7 @@ static int posix_get_boottime(const cloc
+@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
+  *	    which we beg off on and pass to do_sys_settimeofday().
   */
- static __init int init_posix_timers(void)
- {
--	struct k_clock clock_realtime = {
-+	const struct k_clock clock_realtime = {
- 		.clock_getres	= hrtimer_get_res,
- 		.clock_get	= posix_clock_realtime_get,
- 		.clock_set	= posix_clock_realtime_set,
-@@ -239,7 +240,7 @@ static __init int init_posix_timers(void
- 		.timer_get	= common_timer_get,
- 		.timer_del	= common_timer_del,
- 	};
--	struct k_clock clock_monotonic = {
-+	const struct k_clock clock_monotonic = {
- 		.clock_getres	= hrtimer_get_res,
- 		.clock_get	= posix_ktime_get_ts,
- 		.nsleep		= common_nsleep,
-@@ -249,19 +250,19 @@ static __init int init_posix_timers(void
- 		.timer_get	= common_timer_get,
- 		.timer_del	= common_timer_del,
- 	};
--	struct k_clock clock_monotonic_raw = {
-+	const struct k_clock clock_monotonic_raw = {
- 		.clock_getres	= hrtimer_get_res,
- 		.clock_get	= posix_get_monotonic_raw,
- 	};
--	struct k_clock clock_realtime_coarse = {
-+	const struct k_clock clock_realtime_coarse = {
- 		.clock_getres	= posix_get_coarse_res,
- 		.clock_get	= posix_get_realtime_coarse,
- 	};
--	struct k_clock clock_monotonic_coarse = {
-+	const struct k_clock clock_monotonic_coarse = {
- 		.clock_getres	= posix_get_coarse_res,
- 		.clock_get	= posix_get_monotonic_coarse,
- 	};
--	struct k_clock clock_boottime = {
-+	const struct k_clock clock_boottime = {
- 		.clock_getres	= hrtimer_get_res,
- 		.clock_get	= posix_get_boottime,
- 		.nsleep		= common_nsleep,
+ 
+-static struct k_clock posix_clocks[MAX_CLOCKS];
++static struct k_clock *posix_clocks[MAX_CLOCKS];
+ 
+ /*
+  * These ones are defined below.
 @@ -272,6 +273,8 @@ static __init int init_posix_timers(void
  		.timer_del	= common_timer_del,
  	};
@@ -69695,70 +58512,28 @@ diff -urNp linux-2.6.39.3/kernel/posix-timers.c linux-2.6.39.3/kernel/posix-time
  	posix_timers_register_clock(CLOCK_REALTIME, &clock_realtime);
  	posix_timers_register_clock(CLOCK_MONOTONIC, &clock_monotonic);
  	posix_timers_register_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
-@@ -454,7 +457,7 @@ static struct pid *good_sigevent(sigeven
- }
+@@ -473,7 +476,7 @@ void posix_timers_register_clock(const c
+ 		return;
+ 	}
  
- void posix_timers_register_clock(const clockid_t clock_id,
--				 struct k_clock *new_clock)
-+				 const struct k_clock *new_clock)
- {
- 	if ((unsigned) clock_id >= MAX_CLOCKS) {
- 		printk(KERN_WARNING "POSIX clock register failed for clock_id %d\n",
-@@ -506,7 +509,7 @@ static void release_posix_timer(struct k
- 	kmem_cache_free(posix_timers_cache, tmr);
+-	posix_clocks[clock_id] = *new_clock;
++	posix_clocks[clock_id] = new_clock;
  }
+ EXPORT_SYMBOL_GPL(posix_timers_register_clock);
  
--static struct k_clock *clockid_to_kclock(const clockid_t id)
-+static const struct k_clock *clockid_to_kclock(const clockid_t id)
- {
- 	if (id < 0)
+@@ -512,9 +515,9 @@ static struct k_clock *clockid_to_kclock
  		return (id & CLOCKFD_MASK) == CLOCKFD ?
-@@ -529,7 +532,7 @@ SYSCALL_DEFINE3(timer_create, const cloc
- 		struct sigevent __user *, timer_event_spec,
- 		timer_t __user *, created_timer_id)
- {
--	struct k_clock *kc = clockid_to_kclock(which_clock);
-+	const struct k_clock *kc = clockid_to_kclock(which_clock);
- 	struct k_itimer *new_timer;
- 	int error, new_timer_id;
- 	sigevent_t event;
-@@ -714,7 +717,7 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, 
- {
- 	struct itimerspec cur_setting;
- 	struct k_itimer *timr;
--	struct k_clock *kc;
-+	const struct k_clock *kc;
- 	unsigned long flags;
- 	int ret = 0;
- 
-@@ -822,7 +825,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, 
- 	int error = 0;
- 	unsigned long flag;
- 	struct itimerspec *rtn = old_setting ? &old_spec : NULL;
--	struct k_clock *kc;
-+	const struct k_clock *kc;
- 
- 	if (!new_setting)
- 		return -EINVAL;
-@@ -868,7 +871,7 @@ static int common_timer_del(struct k_iti
- 
- static inline int timer_delete_hook(struct k_itimer *timer)
- {
--	struct k_clock *kc = clockid_to_kclock(timer->it_clock);
-+	const struct k_clock *kc = clockid_to_kclock(timer->it_clock);
+ 			&clock_posix_dynamic : &clock_posix_cpu;
  
- 	if (WARN_ON_ONCE(!kc || !kc->timer_del))
- 		return -EINVAL;
-@@ -947,7 +950,7 @@ void exit_itimers(struct signal_struct *
- SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
- 		const struct timespec __user *, tp)
- {
--	struct k_clock *kc = clockid_to_kclock(which_clock);
-+	const struct k_clock *kc = clockid_to_kclock(which_clock);
- 	struct timespec new_tp;
+-	if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
++	if (id >= MAX_CLOCKS || !posix_clocks[id]->clock_getres)
+ 		return NULL;
+-	return &posix_clocks[id];
++	return posix_clocks[id];
+ }
  
- 	if (!kc || !kc->clock_set)
-@@ -956,13 +959,20 @@ SYSCALL_DEFINE2(clock_settime, const clo
+ static int common_timer_create(struct k_itimer *new_timer)
+@@ -956,6 +959,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
  	if (copy_from_user(&new_tp, tp, sizeof (*tp)))
  		return -EFAULT;
  
@@ -69772,53 +58547,9 @@ diff -urNp linux-2.6.39.3/kernel/posix-timers.c linux-2.6.39.3/kernel/posix-time
  	return kc->clock_set(which_clock, &new_tp);
  }
  
- SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
- 		struct timespec __user *,tp)
- {
--	struct k_clock *kc = clockid_to_kclock(which_clock);
-+	const struct k_clock *kc = clockid_to_kclock(which_clock);
- 	struct timespec kernel_tp;
- 	int error;
- 
-@@ -980,7 +990,7 @@ SYSCALL_DEFINE2(clock_gettime, const clo
- SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
- 		struct timex __user *, utx)
- {
--	struct k_clock *kc = clockid_to_kclock(which_clock);
-+	const struct k_clock *kc = clockid_to_kclock(which_clock);
- 	struct timex ktx;
- 	int err;
- 
-@@ -1003,7 +1013,7 @@ SYSCALL_DEFINE2(clock_adjtime, const clo
- SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
- 		struct timespec __user *, tp)
- {
--	struct k_clock *kc = clockid_to_kclock(which_clock);
-+	const struct k_clock *kc = clockid_to_kclock(which_clock);
- 	struct timespec rtn_tp;
- 	int error;
- 
-@@ -1033,7 +1043,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const c
- 		const struct timespec __user *, rqtp,
- 		struct timespec __user *, rmtp)
- {
--	struct k_clock *kc = clockid_to_kclock(which_clock);
-+	const struct k_clock *kc = clockid_to_kclock(which_clock);
- 	struct timespec t;
- 
- 	if (!kc)
-@@ -1057,7 +1067,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const c
- long clock_nanosleep_restart(struct restart_block *restart_block)
- {
- 	clockid_t which_clock = restart_block->nanosleep.index;
--	struct k_clock *kc = clockid_to_kclock(which_clock);
-+	const struct k_clock *kc = clockid_to_kclock(which_clock);
- 
- 	if (WARN_ON_ONCE(!kc || !kc->nsleep_restart))
- 		return -EINVAL;
-diff -urNp linux-2.6.39.3/kernel/power/poweroff.c linux-2.6.39.3/kernel/power/poweroff.c
---- linux-2.6.39.3/kernel/power/poweroff.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/power/poweroff.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/power/poweroff.c linux-2.6.39.4/kernel/power/poweroff.c
+--- linux-2.6.39.4/kernel/power/poweroff.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/power/poweroff.c	2011-08-05 19:44:37.000000000 -0400
 @@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
@@ -69828,9 +58559,9 @@ diff -urNp linux-2.6.39.3/kernel/power/poweroff.c linux-2.6.39.3/kernel/power/po
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-2.6.39.3/kernel/power/process.c linux-2.6.39.3/kernel/power/process.c
---- linux-2.6.39.3/kernel/power/process.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/power/process.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/power/process.c linux-2.6.39.4/kernel/power/process.c
+--- linux-2.6.39.4/kernel/power/process.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/power/process.c	2011-08-05 19:44:37.000000000 -0400
 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
  	u64 elapsed_csecs64;
  	unsigned int elapsed_csecs;
@@ -69873,9 +58604,9 @@ diff -urNp linux-2.6.39.3/kernel/power/process.c linux-2.6.39.3/kernel/power/pro
  			break;
  
  		if (pm_wakeup_pending()) {
-diff -urNp linux-2.6.39.3/kernel/printk.c linux-2.6.39.3/kernel/printk.c
---- linux-2.6.39.3/kernel/printk.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/printk.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/printk.c linux-2.6.39.4/kernel/printk.c
+--- linux-2.6.39.4/kernel/printk.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/printk.c	2011-08-05 19:44:37.000000000 -0400
 @@ -284,12 +284,17 @@ static int check_syslog_permissions(int 
  	if (from_file && type != SYSLOG_ACTION_OPEN)
  		return 0;
@@ -69895,9 +58626,9 @@ diff -urNp linux-2.6.39.3/kernel/printk.c linux-2.6.39.3/kernel/printk.c
  				 "but no CAP_SYSLOG (deprecated).\n");
  			return 0;
  		}
-diff -urNp linux-2.6.39.3/kernel/profile.c linux-2.6.39.3/kernel/profile.c
---- linux-2.6.39.3/kernel/profile.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/profile.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/profile.c linux-2.6.39.4/kernel/profile.c
+--- linux-2.6.39.4/kernel/profile.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/profile.c	2011-08-05 19:44:37.000000000 -0400
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -69955,9 +58686,9 @@ diff -urNp linux-2.6.39.3/kernel/profile.c linux-2.6.39.3/kernel/profile.c
  	return count;
  }
  
-diff -urNp linux-2.6.39.3/kernel/ptrace.c linux-2.6.39.3/kernel/ptrace.c
---- linux-2.6.39.3/kernel/ptrace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/ptrace.c	2011-05-23 17:07:00.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/ptrace.c linux-2.6.39.4/kernel/ptrace.c
+--- linux-2.6.39.4/kernel/ptrace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/ptrace.c	2011-08-05 19:44:37.000000000 -0400
 @@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
@@ -70129,9 +58860,9 @@ diff -urNp linux-2.6.39.3/kernel/ptrace.c linux-2.6.39.3/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-diff -urNp linux-2.6.39.3/kernel/rcutorture.c linux-2.6.39.3/kernel/rcutorture.c
---- linux-2.6.39.3/kernel/rcutorture.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/rcutorture.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/rcutorture.c linux-2.6.39.4/kernel/rcutorture.c
+--- linux-2.6.39.4/kernel/rcutorture.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/rcutorture.c	2011-08-05 19:44:37.000000000 -0400
 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
  	{ 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -70296,9 +59027,9 @@ diff -urNp linux-2.6.39.3/kernel/rcutorture.c linux-2.6.39.3/kernel/rcutorture.c
  	for_each_possible_cpu(cpu) {
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff -urNp linux-2.6.39.3/kernel/rcutree.c linux-2.6.39.3/kernel/rcutree.c
---- linux-2.6.39.3/kernel/rcutree.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/rcutree.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/rcutree.c linux-2.6.39.4/kernel/rcutree.c
+--- linux-2.6.39.4/kernel/rcutree.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/rcutree.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
@@ -70308,9 +59039,9 @@ diff -urNp linux-2.6.39.3/kernel/rcutree.c linux-2.6.39.3/kernel/rcutree.c
  {
  	/*
  	 * Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.39.3/kernel/rcutree_plugin.h linux-2.6.39.3/kernel/rcutree_plugin.h
---- linux-2.6.39.3/kernel/rcutree_plugin.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/rcutree_plugin.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/rcutree_plugin.h linux-2.6.39.4/kernel/rcutree_plugin.h
+--- linux-2.6.39.4/kernel/rcutree_plugin.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/rcutree_plugin.h	2011-08-05 19:44:37.000000000 -0400
 @@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void)
  
  	/* Clean up and exit. */
@@ -70373,9 +59104,9 @@ diff -urNp linux-2.6.39.3/kernel/rcutree_plugin.h linux-2.6.39.3/kernel/rcutree_
  
  	put_online_cpus();
  }
-diff -urNp linux-2.6.39.3/kernel/relay.c linux-2.6.39.3/kernel/relay.c
---- linux-2.6.39.3/kernel/relay.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/relay.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/relay.c linux-2.6.39.4/kernel/relay.c
+--- linux-2.6.39.4/kernel/relay.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/relay.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
  	};
  	ssize_t ret;
@@ -70385,9 +59116,9 @@ diff -urNp linux-2.6.39.3/kernel/relay.c linux-2.6.39.3/kernel/relay.c
  	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
  		return 0;
  	if (splice_grow_spd(pipe, &spd))
-diff -urNp linux-2.6.39.3/kernel/resource.c linux-2.6.39.3/kernel/resource.c
---- linux-2.6.39.3/kernel/resource.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/resource.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/resource.c linux-2.6.39.4/kernel/resource.c
+--- linux-2.6.39.4/kernel/resource.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/resource.c	2011-08-05 19:44:37.000000000 -0400
 @@ -133,8 +133,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -70407,9 +59138,9 @@ diff -urNp linux-2.6.39.3/kernel/resource.c linux-2.6.39.3/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.39.3/kernel/rtmutex-tester.c linux-2.6.39.3/kernel/rtmutex-tester.c
---- linux-2.6.39.3/kernel/rtmutex-tester.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/rtmutex-tester.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/rtmutex-tester.c linux-2.6.39.4/kernel/rtmutex-tester.c
+--- linux-2.6.39.4/kernel/rtmutex-tester.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/rtmutex-tester.c	2011-08-05 19:44:37.000000000 -0400
 @@ -20,7 +20,7 @@
  #define MAX_RT_TEST_MUTEXES	8
  
@@ -70500,9 +59231,9 @@ diff -urNp linux-2.6.39.3/kernel/rtmutex-tester.c linux-2.6.39.3/kernel/rtmutex-
  		return;
  
  	default:
-diff -urNp linux-2.6.39.3/kernel/sched_autogroup.c linux-2.6.39.3/kernel/sched_autogroup.c
---- linux-2.6.39.3/kernel/sched_autogroup.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/sched_autogroup.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/sched_autogroup.c linux-2.6.39.4/kernel/sched_autogroup.c
+--- linux-2.6.39.4/kernel/sched_autogroup.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/sched_autogroup.c	2011-08-05 19:44:37.000000000 -0400
 @@ -7,7 +7,7 @@
  
  unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
@@ -70521,9 +59252,9 @@ diff -urNp linux-2.6.39.3/kernel/sched_autogroup.c linux-2.6.39.3/kernel/sched_a
  	ag->tg = tg;
  #ifdef CONFIG_RT_GROUP_SCHED
  	/*
-diff -urNp linux-2.6.39.3/kernel/sched.c linux-2.6.39.3/kernel/sched.c
---- linux-2.6.39.3/kernel/sched.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/sched.c	2011-05-23 17:07:00.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/sched.c linux-2.6.39.4/kernel/sched.c
+--- linux-2.6.39.4/kernel/sched.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/sched.c	2011-08-05 19:44:37.000000000 -0400
 @@ -4078,6 +4078,8 @@ asmlinkage void __sched schedule(void)
  	struct rq *rq;
  	int cpu;
@@ -70600,9 +59331,9 @@ diff -urNp linux-2.6.39.3/kernel/sched.c linux-2.6.39.3/kernel/sched.c
  
  	if (cpu != group_first_cpu(sd->groups))
  		return;
-diff -urNp linux-2.6.39.3/kernel/sched_fair.c linux-2.6.39.3/kernel/sched_fair.c
---- linux-2.6.39.3/kernel/sched_fair.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/sched_fair.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/sched_fair.c linux-2.6.39.4/kernel/sched_fair.c
+--- linux-2.6.39.4/kernel/sched_fair.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/sched_fair.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3999,7 +3999,7 @@ static void nohz_idle_balance(int this_c
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
@@ -70612,9 +59343,9 @@ diff -urNp linux-2.6.39.3/kernel/sched_fair.c linux-2.6.39.3/kernel/sched_fair.c
  {
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-2.6.39.3/kernel/signal.c linux-2.6.39.3/kernel/signal.c
---- linux-2.6.39.3/kernel/signal.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/signal.c	2011-07-14 21:03:15.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/signal.c linux-2.6.39.4/kernel/signal.c
+--- linux-2.6.39.4/kernel/signal.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/signal.c	2011-08-05 19:44:37.000000000 -0400
 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
@@ -70746,9 +59477,9 @@ diff -urNp linux-2.6.39.3/kernel/signal.c linux-2.6.39.3/kernel/signal.c
  	if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
  		error = check_kill_permission(sig, info, p);
  		/*
-diff -urNp linux-2.6.39.3/kernel/smp.c linux-2.6.39.3/kernel/smp.c
---- linux-2.6.39.3/kernel/smp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/smp.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/smp.c linux-2.6.39.4/kernel/smp.c
+--- linux-2.6.39.4/kernel/smp.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/smp.c	2011-08-05 19:44:37.000000000 -0400
 @@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -70776,9 +59507,9 @@ diff -urNp linux-2.6.39.3/kernel/smp.c linux-2.6.39.3/kernel/smp.c
  {
  	raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-2.6.39.3/kernel/softirq.c linux-2.6.39.3/kernel/softirq.c
---- linux-2.6.39.3/kernel/softirq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/softirq.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/softirq.c linux-2.6.39.4/kernel/softirq.c
+--- linux-2.6.39.4/kernel/softirq.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/softirq.c	2011-08-05 20:34:06.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -70788,15 +59519,6 @@ diff -urNp linux-2.6.39.3/kernel/softirq.c linux-2.6.39.3/kernel/softirq.c
  	"HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
  	"TASKLET", "SCHED", "HRTIMER",	"RCU"
  };
-@@ -206,7 +206,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
- 
- asmlinkage void __do_softirq(void)
- {
--	struct softirq_action *h;
-+	const struct softirq_action *h;
- 	__u32 pending;
- 	int max_restart = MAX_SOFTIRQ_RESTART;
- 	int cpu;
 @@ -235,7 +235,7 @@ restart:
  			kstat_incr_softirqs_this_cpu(vec_nr);
  
@@ -70806,16 +59528,21 @@ diff -urNp linux-2.6.39.3/kernel/softirq.c linux-2.6.39.3/kernel/softirq.c
  			trace_softirq_exit(vec_nr);
  			if (unlikely(prev_count != preempt_count())) {
  				printk(KERN_ERR "huh, entered softirq %u %s %p"
-@@ -377,7 +377,7 @@ void raise_softirq(unsigned int nr)
+@@ -377,9 +377,11 @@ void raise_softirq(unsigned int nr)
  	local_irq_restore(flags);
  }
  
 -void open_softirq(int nr, void (*action)(struct softirq_action *))
 +void open_softirq(int nr, void (*action)(void))
  {
- 	softirq_vec[nr].action = action;
+-	softirq_vec[nr].action = action;
++	pax_open_kernel();
++	*(void **)&softirq_vec[nr].action = action;
++	pax_close_kernel();
  }
-@@ -433,7 +433,7 @@ void __tasklet_hi_schedule_first(struct 
+ 
+ /*
+@@ -433,7 +435,7 @@ void __tasklet_hi_schedule_first(struct 
  
  EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  
@@ -70824,7 +59551,7 @@ diff -urNp linux-2.6.39.3/kernel/softirq.c linux-2.6.39.3/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-@@ -468,7 +468,7 @@ static void tasklet_action(struct softir
+@@ -468,7 +470,7 @@ static void tasklet_action(struct softir
  	}
  }
  
@@ -70833,9 +59560,9 @@ diff -urNp linux-2.6.39.3/kernel/softirq.c linux-2.6.39.3/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-2.6.39.3/kernel/sys.c linux-2.6.39.3/kernel/sys.c
---- linux-2.6.39.3/kernel/sys.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/sys.c	2011-05-22 21:08:10.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/sys.c linux-2.6.39.4/kernel/sys.c
+--- linux-2.6.39.4/kernel/sys.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/sys.c	2011-08-05 19:44:37.000000000 -0400
 @@ -154,6 +154,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
@@ -70957,9 +59684,9 @@ diff -urNp linux-2.6.39.3/kernel/sys.c linux-2.6.39.3/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-2.6.39.3/kernel/sysctl.c linux-2.6.39.3/kernel/sysctl.c
---- linux-2.6.39.3/kernel/sysctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/sysctl.c	2011-05-22 20:23:10.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/sysctl.c linux-2.6.39.4/kernel/sysctl.c
+--- linux-2.6.39.4/kernel/sysctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/sysctl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -84,6 +84,13 @@
  
  
@@ -71149,9 +59876,9 @@ diff -urNp linux-2.6.39.3/kernel/sysctl.c linux-2.6.39.3/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.3/kernel/sysctl_check.c linux-2.6.39.3/kernel/sysctl_check.c
---- linux-2.6.39.3/kernel/sysctl_check.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/sysctl_check.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/sysctl_check.c linux-2.6.39.4/kernel/sysctl_check.c
+--- linux-2.6.39.4/kernel/sysctl_check.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/sysctl_check.c	2011-08-05 19:44:37.000000000 -0400
 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
  				set_fail(&fail, table, "Directory with extra2");
  		} else {
@@ -71160,9 +59887,9 @@ diff -urNp linux-2.6.39.3/kernel/sysctl_check.c linux-2.6.39.3/kernel/sysctl_che
  			    (table->proc_handler == proc_dointvec) ||
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-2.6.39.3/kernel/taskstats.c linux-2.6.39.3/kernel/taskstats.c
---- linux-2.6.39.3/kernel/taskstats.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/kernel/taskstats.c	2011-07-09 09:19:24.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/taskstats.c linux-2.6.39.4/kernel/taskstats.c
+--- linux-2.6.39.4/kernel/taskstats.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/kernel/taskstats.c	2011-08-05 19:44:37.000000000 -0400
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -71186,21 +59913,9 @@ diff -urNp linux-2.6.39.3/kernel/taskstats.c linux-2.6.39.3/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.3/kernel/time/posix-clock.c linux-2.6.39.3/kernel/time/posix-clock.c
---- linux-2.6.39.3/kernel/time/posix-clock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/time/posix-clock.c	2011-05-22 19:36:33.000000000 -0400
-@@ -433,7 +433,7 @@ static int pc_timer_settime(struct k_iti
- 	return err;
- }
- 
--struct k_clock clock_posix_dynamic = {
-+const struct k_clock clock_posix_dynamic = {
- 	.clock_getres	= pc_clock_getres,
- 	.clock_set	= pc_clock_settime,
- 	.clock_get	= pc_clock_gettime,
-diff -urNp linux-2.6.39.3/kernel/time/tick-broadcast.c linux-2.6.39.3/kernel/time/tick-broadcast.c
---- linux-2.6.39.3/kernel/time/tick-broadcast.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/time/tick-broadcast.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/time/tick-broadcast.c linux-2.6.39.4/kernel/time/tick-broadcast.c
+--- linux-2.6.39.4/kernel/time/tick-broadcast.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/time/tick-broadcast.c	2011-08-05 19:44:37.000000000 -0400
 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
  		 * then clear the broadcast bit.
  		 */
@@ -71210,9 +59925,9 @@ diff -urNp linux-2.6.39.3/kernel/time/tick-broadcast.c linux-2.6.39.3/kernel/tim
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.39.3/kernel/time/timekeeping.c linux-2.6.39.3/kernel/time/timekeeping.c
---- linux-2.6.39.3/kernel/time/timekeeping.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/time/timekeeping.c	2011-05-22 20:40:50.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/time/timekeeping.c linux-2.6.39.4/kernel/time/timekeeping.c
+--- linux-2.6.39.4/kernel/time/timekeeping.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/time/timekeeping.c	2011-08-05 19:44:37.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -71230,9 +59945,9 @@ diff -urNp linux-2.6.39.3/kernel/time/timekeeping.c linux-2.6.39.3/kernel/time/t
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff -urNp linux-2.6.39.3/kernel/time/timer_list.c linux-2.6.39.3/kernel/time/timer_list.c
---- linux-2.6.39.3/kernel/time/timer_list.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/time/timer_list.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/time/timer_list.c linux-2.6.39.4/kernel/time/timer_list.c
+--- linux-2.6.39.4/kernel/time/timer_list.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/time/timer_list.c	2011-08-05 19:44:37.000000000 -0400
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -71274,9 +59989,9 @@ diff -urNp linux-2.6.39.3/kernel/time/timer_list.c linux-2.6.39.3/kernel/time/ti
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.39.3/kernel/time/timer_stats.c linux-2.6.39.3/kernel/time/timer_stats.c
---- linux-2.6.39.3/kernel/time/timer_stats.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/time/timer_stats.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/time/timer_stats.c linux-2.6.39.4/kernel/time/timer_stats.c
+--- linux-2.6.39.4/kernel/time/timer_stats.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/time/timer_stats.c	2011-08-05 19:44:37.000000000 -0400
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -71345,9 +60060,9 @@ diff -urNp linux-2.6.39.3/kernel/time/timer_stats.c linux-2.6.39.3/kernel/time/t
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.39.3/kernel/time.c linux-2.6.39.3/kernel/time.c
---- linux-2.6.39.3/kernel/time.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/time.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/time.c linux-2.6.39.4/kernel/time.c
+--- linux-2.6.39.4/kernel/time.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/time.c	2011-08-05 19:44:37.000000000 -0400
 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
  		return error;
  
@@ -71360,9 +60075,9 @@ diff -urNp linux-2.6.39.3/kernel/time.c linux-2.6.39.3/kernel/time.c
  		/* SMP safe, global irq locking makes it work. */
  		sys_tz = *tz;
  		update_vsyscall_tz();
-diff -urNp linux-2.6.39.3/kernel/timer.c linux-2.6.39.3/kernel/timer.c
---- linux-2.6.39.3/kernel/timer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/timer.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/timer.c linux-2.6.39.4/kernel/timer.c
+--- linux-2.6.39.4/kernel/timer.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/timer.c	2011-08-05 19:44:37.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.
@@ -71372,9 +60087,9 @@ diff -urNp linux-2.6.39.3/kernel/timer.c linux-2.6.39.3/kernel/timer.c
  {
  	struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff -urNp linux-2.6.39.3/kernel/trace/blktrace.c linux-2.6.39.3/kernel/trace/blktrace.c
---- linux-2.6.39.3/kernel/trace/blktrace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/blktrace.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/trace/blktrace.c linux-2.6.39.4/kernel/trace/blktrace.c
+--- linux-2.6.39.4/kernel/trace/blktrace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/blktrace.c	2011-08-05 19:44:37.000000000 -0400
 @@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
  	struct blk_trace *bt = filp->private_data;
  	char buf[16];
@@ -71402,9 +60117,9 @@ diff -urNp linux-2.6.39.3/kernel/trace/blktrace.c linux-2.6.39.3/kernel/trace/bl
  
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-2.6.39.3/kernel/trace/ftrace.c linux-2.6.39.3/kernel/trace/ftrace.c
---- linux-2.6.39.3/kernel/trace/ftrace.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/ftrace.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/trace/ftrace.c linux-2.6.39.4/kernel/trace/ftrace.c
+--- linux-2.6.39.4/kernel/trace/ftrace.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/ftrace.c	2011-08-05 20:34:06.000000000 -0400
 @@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod, 
  
  	ip = rec->ip;
@@ -71435,27 +60150,9 @@ diff -urNp linux-2.6.39.3/kernel/trace/ftrace.c linux-2.6.39.3/kernel/trace/ftra
  {
  	struct ftrace_func_probe *entry;
  	struct ftrace_page *pg;
-@@ -2083,7 +2088,7 @@ enum {
- };
- 
- static void
--__unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
-+__unregister_ftrace_function_probe(char *glob, const struct ftrace_probe_ops *ops,
- 				  void *data, int flags)
- {
- 	struct ftrace_func_probe *entry;
-@@ -2144,7 +2149,7 @@ unregister_ftrace_function_probe(char *g
- }
- 
- void
--unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops)
-+unregister_ftrace_function_probe_func(char *glob, const struct ftrace_probe_ops *ops)
- {
- 	__unregister_ftrace_function_probe(glob, ops, NULL, PROBE_TEST_FUNC);
- }
-diff -urNp linux-2.6.39.3/kernel/trace/trace.c linux-2.6.39.3/kernel/trace/trace.c
---- linux-2.6.39.3/kernel/trace/trace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/trace.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/trace/trace.c linux-2.6.39.4/kernel/trace/trace.c
+--- linux-2.6.39.4/kernel/trace/trace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/trace.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3330,6 +3330,8 @@ static ssize_t tracing_splice_read_pipe(
  	size_t rem;
  	unsigned int i;
@@ -71498,10 +60195,10 @@ diff -urNp linux-2.6.39.3/kernel/trace/trace.c linux-2.6.39.3/kernel/trace/trace
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-2.6.39.3/kernel/trace/trace_events.c linux-2.6.39.3/kernel/trace/trace_events.c
---- linux-2.6.39.3/kernel/trace/trace_events.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/trace_events.c	2011-05-22 19:36:33.000000000 -0400
-@@ -1241,10 +1241,10 @@ static LIST_HEAD(ftrace_module_file_list
+diff -urNp linux-2.6.39.4/kernel/trace/trace_events.c linux-2.6.39.4/kernel/trace/trace_events.c
+--- linux-2.6.39.4/kernel/trace/trace_events.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/trace_events.c	2011-08-05 20:34:06.000000000 -0400
+@@ -1241,10 +1241,6 @@ static LIST_HEAD(ftrace_module_file_list
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
@@ -71509,28 +60206,47 @@ diff -urNp linux-2.6.39.3/kernel/trace/trace_events.c linux-2.6.39.3/kernel/trac
 -	struct file_operations		enable;
 -	struct file_operations		format;
 -	struct file_operations		filter;
-+	struct file_operations		id;	/* cannot be const, see trace_create_file_ops() */
-+	struct file_operations		enable;	/* cannot be const, see trace_create_file_ops() */
-+	struct file_operations		format;	/* cannot be const, see trace_create_file_ops() */
-+	struct file_operations		filter;	/* cannot be const, see trace_create_file_ops() */
  };
  
  static struct ftrace_module_file_ops *
-diff -urNp linux-2.6.39.3/kernel/trace/trace_functions.c linux-2.6.39.3/kernel/trace/trace_functions.c
---- linux-2.6.39.3/kernel/trace/trace_functions.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/trace_functions.c	2011-05-22 19:36:33.000000000 -0400
-@@ -308,7 +308,7 @@ ftrace_trace_onoff_print(struct seq_file
- static int
- ftrace_trace_onoff_unreg(char *glob, char *cmd, char *param)
- {
--	struct ftrace_probe_ops *ops;
-+	const struct ftrace_probe_ops *ops;
+@@ -1265,17 +1261,12 @@ trace_create_file_ops(struct module *mod
+ 
+ 	file_ops->mod = mod;
  
- 	/* we register both traceon and traceoff to this callback */
- 	if (strcmp(cmd, "traceon") == 0)
-diff -urNp linux-2.6.39.3/kernel/trace/trace_mmiotrace.c linux-2.6.39.3/kernel/trace/trace_mmiotrace.c
---- linux-2.6.39.3/kernel/trace/trace_mmiotrace.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/trace_mmiotrace.c	2011-05-22 19:36:33.000000000 -0400
+-	file_ops->id = ftrace_event_id_fops;
+-	file_ops->id.owner = mod;
+-
+-	file_ops->enable = ftrace_enable_fops;
+-	file_ops->enable.owner = mod;
+-
+-	file_ops->filter = ftrace_event_filter_fops;
+-	file_ops->filter.owner = mod;
+-
+-	file_ops->format = ftrace_event_format_fops;
+-	file_ops->format.owner = mod;
++	pax_open_kernel();
++	*(void **)&mod->trace_id.owner = mod;
++	*(void **)&mod->trace_enable.owner = mod;
++	*(void **)&mod->trace_filter.owner = mod;
++	*(void **)&mod->trace_format.owner = mod;
++	pax_close_kernel();
+ 
+ 	list_add(&file_ops->list, &ftrace_module_file_list);
+ 
+@@ -1299,8 +1290,8 @@ static void trace_module_add_events(stru
+ 
+ 	for_each_event(call, start, end) {
+ 		__trace_add_event_call(*call, mod,
+-				       &file_ops->id, &file_ops->enable,
+-				       &file_ops->filter, &file_ops->format);
++				       &mod->trace_id, &mod->trace_enable,
++				       &mod->trace_filter, &mod->trace_format);
+ 	}
+ }
+ 
+diff -urNp linux-2.6.39.4/kernel/trace/trace_mmiotrace.c linux-2.6.39.4/kernel/trace/trace_mmiotrace.c
+--- linux-2.6.39.4/kernel/trace/trace_mmiotrace.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/trace_mmiotrace.c	2011-08-05 19:44:37.000000000 -0400
 @@ -24,7 +24,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -71567,9 +60283,9 @@ diff -urNp linux-2.6.39.3/kernel/trace/trace_mmiotrace.c linux-2.6.39.3/kernel/t
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-diff -urNp linux-2.6.39.3/kernel/trace/trace_output.c linux-2.6.39.3/kernel/trace/trace_output.c
---- linux-2.6.39.3/kernel/trace/trace_output.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/trace_output.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/trace/trace_output.c linux-2.6.39.4/kernel/trace/trace_output.c
+--- linux-2.6.39.4/kernel/trace/trace_output.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/trace_output.c	2011-08-05 19:44:37.000000000 -0400
 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, 
  
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -71579,9 +60295,9 @@ diff -urNp linux-2.6.39.3/kernel/trace/trace_output.c linux-2.6.39.3/kernel/trac
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-2.6.39.3/kernel/trace/trace_stack.c linux-2.6.39.3/kernel/trace/trace_stack.c
---- linux-2.6.39.3/kernel/trace/trace_stack.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/trace_stack.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/trace/trace_stack.c linux-2.6.39.4/kernel/trace/trace_stack.c
+--- linux-2.6.39.4/kernel/trace/trace_stack.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/trace_stack.c	2011-08-05 19:44:37.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -71591,9 +60307,9 @@ diff -urNp linux-2.6.39.3/kernel/trace/trace_stack.c linux-2.6.39.3/kernel/trace
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.39.3/kernel/trace/trace_workqueue.c linux-2.6.39.3/kernel/trace/trace_workqueue.c
---- linux-2.6.39.3/kernel/trace/trace_workqueue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/kernel/trace/trace_workqueue.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/kernel/trace/trace_workqueue.c linux-2.6.39.4/kernel/trace/trace_workqueue.c
+--- linux-2.6.39.4/kernel/trace/trace_workqueue.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/kernel/trace/trace_workqueue.c	2011-08-05 19:44:37.000000000 -0400
 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
  	int		            cpu;
  	pid_t			    pid;
@@ -71621,9 +60337,9 @@ diff -urNp linux-2.6.39.3/kernel/trace/trace_workqueue.c linux-2.6.39.3/kernel/t
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff -urNp linux-2.6.39.3/lib/bug.c linux-2.6.39.3/lib/bug.c
---- linux-2.6.39.3/lib/bug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/lib/bug.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/bug.c linux-2.6.39.4/lib/bug.c
+--- linux-2.6.39.4/lib/bug.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/lib/bug.c	2011-08-05 19:44:37.000000000 -0400
 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
  		return BUG_TRAP_TYPE_NONE;
  
@@ -71633,9 +60349,9 @@ diff -urNp linux-2.6.39.3/lib/bug.c linux-2.6.39.3/lib/bug.c
  
  	file = NULL;
  	line = 0;
-diff -urNp linux-2.6.39.3/lib/debugobjects.c linux-2.6.39.3/lib/debugobjects.c
---- linux-2.6.39.3/lib/debugobjects.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/lib/debugobjects.c	2011-07-09 09:19:24.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/debugobjects.c linux-2.6.39.4/lib/debugobjects.c
+--- linux-2.6.39.4/lib/debugobjects.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/lib/debugobjects.c	2011-08-05 19:44:37.000000000 -0400
 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
  	if (limit > 4)
  		return;
@@ -71645,9 +60361,9 @@ diff -urNp linux-2.6.39.3/lib/debugobjects.c linux-2.6.39.3/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-2.6.39.3/lib/dma-debug.c linux-2.6.39.3/lib/dma-debug.c
---- linux-2.6.39.3/lib/dma-debug.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/lib/dma-debug.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/dma-debug.c linux-2.6.39.4/lib/dma-debug.c
+--- linux-2.6.39.4/lib/dma-debug.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/lib/dma-debug.c	2011-08-05 19:44:37.000000000 -0400
 @@ -862,7 +862,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -71657,9 +60373,9 @@ diff -urNp linux-2.6.39.3/lib/dma-debug.c linux-2.6.39.3/lib/dma-debug.c
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff -urNp linux-2.6.39.3/lib/inflate.c linux-2.6.39.3/lib/inflate.c
---- linux-2.6.39.3/lib/inflate.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/lib/inflate.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/inflate.c linux-2.6.39.4/lib/inflate.c
+--- linux-2.6.39.4/lib/inflate.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/lib/inflate.c	2011-08-05 19:44:37.000000000 -0400
 @@ -269,7 +269,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
@@ -71669,9 +60385,9 @@ diff -urNp linux-2.6.39.3/lib/inflate.c linux-2.6.39.3/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.39.3/lib/Kconfig.debug linux-2.6.39.3/lib/Kconfig.debug
---- linux-2.6.39.3/lib/Kconfig.debug	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/lib/Kconfig.debug	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/Kconfig.debug linux-2.6.39.4/lib/Kconfig.debug
+--- linux-2.6.39.4/lib/Kconfig.debug	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/lib/Kconfig.debug	2011-08-05 19:44:37.000000000 -0400
 @@ -1078,6 +1078,7 @@ config LATENCYTOP
  	depends on DEBUG_KERNEL
  	depends on STACKTRACE_SUPPORT
@@ -71680,9 +60396,9 @@ diff -urNp linux-2.6.39.3/lib/Kconfig.debug linux-2.6.39.3/lib/Kconfig.debug
  	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
  	select KALLSYMS
  	select KALLSYMS_ALL
-diff -urNp linux-2.6.39.3/lib/kref.c linux-2.6.39.3/lib/kref.c
---- linux-2.6.39.3/lib/kref.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/lib/kref.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/kref.c linux-2.6.39.4/lib/kref.c
+--- linux-2.6.39.4/lib/kref.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/lib/kref.c	2011-08-05 19:44:37.000000000 -0400
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -71692,9 +60408,9 @@ diff -urNp linux-2.6.39.3/lib/kref.c linux-2.6.39.3/lib/kref.c
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.39.3/lib/radix-tree.c linux-2.6.39.3/lib/radix-tree.c
---- linux-2.6.39.3/lib/radix-tree.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/lib/radix-tree.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/radix-tree.c linux-2.6.39.4/lib/radix-tree.c
+--- linux-2.6.39.4/lib/radix-tree.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/lib/radix-tree.c	2011-08-05 19:44:37.000000000 -0400
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -71704,9 +60420,9 @@ diff -urNp linux-2.6.39.3/lib/radix-tree.c linux-2.6.39.3/lib/radix-tree.c
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-2.6.39.3/lib/vsprintf.c linux-2.6.39.3/lib/vsprintf.c
---- linux-2.6.39.3/lib/vsprintf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/lib/vsprintf.c	2011-05-22 20:54:59.000000000 -0400
+diff -urNp linux-2.6.39.4/lib/vsprintf.c linux-2.6.39.4/lib/vsprintf.c
+--- linux-2.6.39.4/lib/vsprintf.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/lib/vsprintf.c	2011-08-05 19:44:37.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -71800,14 +60516,14 @@ diff -urNp linux-2.6.39.3/lib/vsprintf.c linux-2.6.39.3/lib/vsprintf.c
  			break;
  		}
  
-diff -urNp linux-2.6.39.3/localversion-grsec linux-2.6.39.3/localversion-grsec
---- linux-2.6.39.3/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/localversion-grsec	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/localversion-grsec linux-2.6.39.4/localversion-grsec
+--- linux-2.6.39.4/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/localversion-grsec	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.39.3/Makefile linux-2.6.39.3/Makefile
---- linux-2.6.39.3/Makefile	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/Makefile	2011-07-09 09:19:18.000000000 -0400
+diff -urNp linux-2.6.39.4/Makefile linux-2.6.39.4/Makefile
+--- linux-2.6.39.4/Makefile	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/Makefile	2011-08-05 21:12:17.000000000 -0400
 @@ -237,8 +237,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -71839,31 +60555,38 @@ diff -urNp linux-2.6.39.3/Makefile linux-2.6.39.3/Makefile
  # Basic helpers built in scripts/
 -PHONY += scripts_basic
 -scripts_basic:
-+PHONY += scripts_basic pax-plugin
-+scripts_basic: pax-plugin
++PHONY += scripts_basic gcc-plugins
++scripts_basic: gcc-plugins
  	$(Q)$(MAKE) $(build)=scripts/basic
  	$(Q)rm -f .tmp_quiet_recordmcount
  
-@@ -550,6 +553,18 @@ endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
+@@ -548,6 +551,25 @@ else
+ KBUILD_CFLAGS	+= -O2
+ endif
  
-+ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y)
-+KBUILD_CFLAGS += $(call cc-ifversion, -ge, 0405, -fplugin=$(objtree)/tools/gcc/pax_plugin.so -fplugin-arg-pax_plugin-track-lowest-sp=100)
++ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh $(HOSTCC)), y)
++CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so
++ifdef CONFIG_PAX_MEMORY_STACKLEAK
++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
-+pax-plugin:
-+ifneq (,$(findstring pax_plugin, $(KBUILD_CFLAGS)))
++KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
++gcc-plugins:
 +	$(Q)$(MAKE) $(build)=tools/gcc
 +else
-+ifeq ($(CONFIG_PAX_MEMORY_STACKLEAK),y)
-+	$(Q)echo "warning, your gcc does not support plugins, PAX_MEMORY_STACKLEAK will be less secure"
++gcc-plugins:
++ifeq ($(call cc-ifversion, -ge, 0405, y), y)
++	$(Q)echo "warning, your gcc installation does not support plugins, perhaps the necessary headers are missing?"
++else
++	$(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
 +endif
++	$(Q)echo "PAX_MEMORY_STACKLEAK and other  will be less secure"
 +endif
 +
+ include $(srctree)/arch/$(SRCARCH)/Makefile
+ 
  ifneq ($(CONFIG_FRAME_WARN),0)
- KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
- endif
-@@ -685,7 +700,7 @@ export mod_strip_cmd
+@@ -685,7 +707,7 @@ export mod_strip_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -71872,16 +60595,16 @@ diff -urNp linux-2.6.39.3/Makefile linux-2.6.39.3/Makefile
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -947,7 +962,7 @@ ifneq ($(KBUILD_SRC),)
+@@ -947,7 +969,7 @@ ifneq ($(KBUILD_SRC),)
  endif
  
  # prepare2 creates a makefile if using a separate output directory
 -prepare2: prepare3 outputmakefile
-+prepare2: prepare3 outputmakefile pax-plugin
++prepare2: prepare3 outputmakefile gcc-plugins
  
  prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
                     include/config/auto.conf
-@@ -1375,7 +1390,7 @@ clean: $(clean-dirs)
+@@ -1375,7 +1397,7 @@ clean: $(clean-dirs)
  	$(call cmd,rmdirs)
  	$(call cmd,rmfiles)
  	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
@@ -71890,9 +60613,9 @@ diff -urNp linux-2.6.39.3/Makefile linux-2.6.39.3/Makefile
  		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
  		-o -name '*.symtypes' -o -name 'modules.order' \
  		-o -name modules.builtin -o -name '.tmp_*.o.*' \
-diff -urNp linux-2.6.39.3/mm/filemap.c linux-2.6.39.3/mm/filemap.c
---- linux-2.6.39.3/mm/filemap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/filemap.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/filemap.c linux-2.6.39.4/mm/filemap.c
+--- linux-2.6.39.4/mm/filemap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/filemap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1724,7 +1724,7 @@ int generic_file_mmap(struct file * file
  	struct address_space *mapping = file->f_mapping;
  
@@ -71910,9 +60633,9 @@ diff -urNp linux-2.6.39.3/mm/filemap.c linux-2.6.39.3/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-2.6.39.3/mm/fremap.c linux-2.6.39.3/mm/fremap.c
---- linux-2.6.39.3/mm/fremap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/fremap.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/fremap.c linux-2.6.39.4/mm/fremap.c
+--- linux-2.6.39.4/mm/fremap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/fremap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
  	vma = find_vma(mm, start);
@@ -71934,9 +60657,9 @@ diff -urNp linux-2.6.39.3/mm/fremap.c linux-2.6.39.3/mm/fremap.c
  		munlock_vma_pages_range(vma, start, start + size);
  		vma->vm_flags = saved_flags;
  	}
-diff -urNp linux-2.6.39.3/mm/highmem.c linux-2.6.39.3/mm/highmem.c
---- linux-2.6.39.3/mm/highmem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/highmem.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/highmem.c linux-2.6.39.4/mm/highmem.c
+--- linux-2.6.39.4/mm/highmem.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/highmem.c	2011-08-05 19:44:37.000000000 -0400
 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -71962,9 +60685,9 @@ diff -urNp linux-2.6.39.3/mm/highmem.c linux-2.6.39.3/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-2.6.39.3/mm/huge_memory.c linux-2.6.39.3/mm/huge_memory.c
---- linux-2.6.39.3/mm/huge_memory.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/huge_memory.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/huge_memory.c linux-2.6.39.4/mm/huge_memory.c
+--- linux-2.6.39.4/mm/huge_memory.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/huge_memory.c	2011-08-05 19:44:37.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.
@@ -71974,9 +60697,9 @@ diff -urNp linux-2.6.39.3/mm/huge_memory.c linux-2.6.39.3/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.3/mm/hugetlb.c linux-2.6.39.3/mm/hugetlb.c
---- linux-2.6.39.3/mm/hugetlb.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/mm/hugetlb.c	2011-07-09 09:19:24.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/hugetlb.c linux-2.6.39.4/mm/hugetlb.c
+--- linux-2.6.39.4/mm/hugetlb.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/mm/hugetlb.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s
  	return 1;
  }
@@ -72066,9 +60789,9 @@ diff -urNp linux-2.6.39.3/mm/hugetlb.c linux-2.6.39.3/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-2.6.39.3/mm/internal.h linux-2.6.39.3/mm/internal.h
---- linux-2.6.39.3/mm/internal.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/internal.h	2011-07-09 09:12:54.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/internal.h linux-2.6.39.4/mm/internal.h
+--- linux-2.6.39.4/mm/internal.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/internal.h	2011-08-05 19:44:37.000000000 -0400
 @@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
   * in mm/page_alloc.c
   */
@@ -72077,9 +60800,9 @@ diff -urNp linux-2.6.39.3/mm/internal.h linux-2.6.39.3/mm/internal.h
  extern void prep_compound_page(struct page *page, unsigned long order);
  #ifdef CONFIG_MEMORY_FAILURE
  extern bool is_free_buddy_page(struct page *page);
-diff -urNp linux-2.6.39.3/mm/Kconfig linux-2.6.39.3/mm/Kconfig
---- linux-2.6.39.3/mm/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/Kconfig	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/Kconfig linux-2.6.39.4/mm/Kconfig
+--- linux-2.6.39.4/mm/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/Kconfig	2011-08-05 19:44:37.000000000 -0400
 @@ -240,7 +240,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -72089,9 +60812,9 @@ diff -urNp linux-2.6.39.3/mm/Kconfig linux-2.6.39.3/mm/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.3/mm/kmemleak.c linux-2.6.39.3/mm/kmemleak.c
---- linux-2.6.39.3/mm/kmemleak.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/mm/kmemleak.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/kmemleak.c linux-2.6.39.4/mm/kmemleak.c
+--- linux-2.6.39.4/mm/kmemleak.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/mm/kmemleak.c	2011-08-05 19:44:37.000000000 -0400
 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se
  
  	for (i = 0; i < object->trace_len; i++) {
@@ -72101,9 +60824,9 @@ diff -urNp linux-2.6.39.3/mm/kmemleak.c linux-2.6.39.3/mm/kmemleak.c
  	}
  }
  
-diff -urNp linux-2.6.39.3/mm/maccess.c linux-2.6.39.3/mm/maccess.c
---- linux-2.6.39.3/mm/maccess.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/maccess.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/maccess.c linux-2.6.39.4/mm/maccess.c
+--- linux-2.6.39.4/mm/maccess.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/maccess.c	2011-08-05 19:44:37.000000000 -0400
 @@ -15,10 +15,10 @@
   * happens, handle that and return -EFAULT.
   */
@@ -72130,9 +60853,9 @@ diff -urNp linux-2.6.39.3/mm/maccess.c linux-2.6.39.3/mm/maccess.c
  {
  	long ret;
  	mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.39.3/mm/madvise.c linux-2.6.39.3/mm/madvise.c
---- linux-2.6.39.3/mm/madvise.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/madvise.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/madvise.c linux-2.6.39.4/mm/madvise.c
+--- linux-2.6.39.4/mm/madvise.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/madvise.c	2011-08-05 19:44:37.000000000 -0400
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
@@ -72209,9 +60932,9 @@ diff -urNp linux-2.6.39.3/mm/madvise.c linux-2.6.39.3/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-2.6.39.3/mm/memory.c linux-2.6.39.3/mm/memory.c
---- linux-2.6.39.3/mm/memory.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/memory.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/memory.c linux-2.6.39.4/mm/memory.c
+--- linux-2.6.39.4/mm/memory.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/memory.c	2011-08-05 19:44:37.000000000 -0400
 @@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
  		return;
  
@@ -72775,9 +61498,9 @@ diff -urNp linux-2.6.39.3/mm/memory.c linux-2.6.39.3/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.3/mm/memory-failure.c linux-2.6.39.3/mm/memory-failure.c
---- linux-2.6.39.3/mm/memory-failure.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/mm/memory-failure.c	2011-07-09 09:19:26.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/memory-failure.c linux-2.6.39.4/mm/memory-failure.c
+--- linux-2.6.39.4/mm/memory-failure.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/mm/memory-failure.c	2011-08-05 19:44:37.000000000 -0400
 @@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -72850,9 +61573,9 @@ diff -urNp linux-2.6.39.3/mm/memory-failure.c linux-2.6.39.3/mm/memory-failure.c
  	SetPageHWPoison(page);
  	/* keep elevated page count for bad page */
  	return ret;
-diff -urNp linux-2.6.39.3/mm/mempolicy.c linux-2.6.39.3/mm/mempolicy.c
---- linux-2.6.39.3/mm/mempolicy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/mempolicy.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/mempolicy.c linux-2.6.39.4/mm/mempolicy.c
+--- linux-2.6.39.4/mm/mempolicy.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/mempolicy.c	2011-08-05 19:44:37.000000000 -0400
 @@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct 
  	unsigned long vmstart;
  	unsigned long vmend;
@@ -72933,9 +61656,9 @@ diff -urNp linux-2.6.39.3/mm/mempolicy.c linux-2.6.39.3/mm/mempolicy.c
  	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  		seq_printf(m, " heap");
  	} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.39.3/mm/migrate.c linux-2.6.39.3/mm/migrate.c
---- linux-2.6.39.3/mm/migrate.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/mm/migrate.c	2011-07-09 09:19:26.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/migrate.c linux-2.6.39.4/mm/migrate.c
+--- linux-2.6.39.4/mm/migrate.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/mm/migrate.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1133,6 +1133,8 @@ static int do_pages_move(struct mm_struc
  	unsigned long chunk_start;
  	int err;
@@ -72970,9 +61693,9 @@ diff -urNp linux-2.6.39.3/mm/migrate.c linux-2.6.39.3/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-2.6.39.3/mm/mlock.c linux-2.6.39.3/mm/mlock.c
---- linux-2.6.39.3/mm/mlock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/mlock.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/mlock.c linux-2.6.39.4/mm/mlock.c
+--- linux-2.6.39.4/mm/mlock.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/mlock.c	2011-08-05 19:44:37.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -73047,9 +61770,9 @@ diff -urNp linux-2.6.39.3/mm/mlock.c linux-2.6.39.3/mm/mlock.c
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff -urNp linux-2.6.39.3/mm/mmap.c linux-2.6.39.3/mm/mmap.c
---- linux-2.6.39.3/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/mmap.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/mmap.c linux-2.6.39.4/mm/mmap.c
+--- linux-2.6.39.4/mm/mmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/mmap.c	2011-08-05 20:34:06.000000000 -0400
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -74026,8 +62749,8 @@ diff -urNp linux-2.6.39.3/mm/mmap.c linux-2.6.39.3/mm/mmap.c
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
 +#ifdef CONFIG_PAX_SEGMEXEC
-+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
-+{
+ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+ {
 +	int ret = __do_munmap(mm, start, len);
 +	if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
 +		return ret;
@@ -74037,9 +62760,9 @@ diff -urNp linux-2.6.39.3/mm/mmap.c linux-2.6.39.3/mm/mmap.c
 +
 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
 +#else
- int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
 +#endif
- {
++{
  	unsigned long end;
  	struct vm_area_struct *vma, *prev, *last;
  
@@ -74239,11 +62962,10 @@ diff -urNp linux-2.6.39.3/mm/mmap.c linux-2.6.39.3/mm/mmap.c
  	/*
  	 * If anonymous vma has not yet been faulted, update new pgoff
  	 * to match new location, to increase its chance of merging.
-@@ -2413,6 +2870,39 @@ struct vm_area_struct *copy_vma(struct v
- 	kmem_cache_free(vm_area_cachep, new_vma);
+@@ -2414,6 +2871,39 @@ struct vm_area_struct *copy_vma(struct v
  	return NULL;
  }
-+ 
+ 
 +#ifdef CONFIG_PAX_SEGMEXEC
 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
 +{
@@ -74276,9 +62998,10 @@ diff -urNp linux-2.6.39.3/mm/mmap.c linux-2.6.39.3/mm/mmap.c
 +	return 0;
 +}
 +#endif
- 
++
  /*
   * Return true if the calling process may expand its vm space by the passed
+  * number of pages
 @@ -2424,7 +2914,7 @@ int may_expand_vm(struct mm_struct *mm, 
  	unsigned long lim;
  
@@ -74311,9 +63034,9 @@ diff -urNp linux-2.6.39.3/mm/mmap.c linux-2.6.39.3/mm/mmap.c
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-2.6.39.3/mm/mprotect.c linux-2.6.39.3/mm/mprotect.c
---- linux-2.6.39.3/mm/mprotect.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/mprotect.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/mprotect.c linux-2.6.39.4/mm/mprotect.c
+--- linux-2.6.39.4/mm/mprotect.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/mprotect.c	2011-08-05 19:44:37.000000000 -0400
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -74540,9 +63263,9 @@ diff -urNp linux-2.6.39.3/mm/mprotect.c linux-2.6.39.3/mm/mprotect.c
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-2.6.39.3/mm/mremap.c linux-2.6.39.3/mm/mremap.c
---- linux-2.6.39.3/mm/mremap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/mremap.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/mremap.c linux-2.6.39.4/mm/mremap.c
+--- linux-2.6.39.4/mm/mremap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/mremap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -74647,9 +63370,9 @@ diff -urNp linux-2.6.39.3/mm/mremap.c linux-2.6.39.3/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.39.3/mm/nobootmem.c linux-2.6.39.3/mm/nobootmem.c
---- linux-2.6.39.3/mm/nobootmem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/nobootmem.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/nobootmem.c linux-2.6.39.4/mm/nobootmem.c
+--- linux-2.6.39.4/mm/nobootmem.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/nobootmem.c	2011-08-05 19:44:37.000000000 -0400
 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
  unsigned long __init free_all_memory_core_early(int nodeid)
  {
@@ -74683,9 +63406,9 @@ diff -urNp linux-2.6.39.3/mm/nobootmem.c linux-2.6.39.3/mm/nobootmem.c
  
  	return count;
  }
-diff -urNp linux-2.6.39.3/mm/nommu.c linux-2.6.39.3/mm/nommu.c
---- linux-2.6.39.3/mm/nommu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/nommu.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/nommu.c linux-2.6.39.4/mm/nommu.c
+--- linux-2.6.39.4/mm/nommu.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/mm/nommu.c	2011-08-05 21:12:20.000000000 -0400
 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -74718,9 +63441,9 @@ diff -urNp linux-2.6.39.3/mm/nommu.c linux-2.6.39.3/mm/nommu.c
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-diff -urNp linux-2.6.39.3/mm/page_alloc.c linux-2.6.39.3/mm/page_alloc.c
---- linux-2.6.39.3/mm/page_alloc.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/mm/page_alloc.c	2011-07-09 09:12:54.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/page_alloc.c linux-2.6.39.4/mm/page_alloc.c
+--- linux-2.6.39.4/mm/page_alloc.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/mm/page_alloc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -337,7 +337,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
@@ -74774,9 +63497,9 @@ diff -urNp linux-2.6.39.3/mm/page_alloc.c linux-2.6.39.3/mm/page_alloc.c
  	for_each_populated_zone(zone) {
  		if (skip_free_areas_zone(filter, zone))
  			continue;
-diff -urNp linux-2.6.39.3/mm/percpu.c linux-2.6.39.3/mm/percpu.c
---- linux-2.6.39.3/mm/percpu.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/percpu.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/percpu.c linux-2.6.39.4/mm/percpu.c
+--- linux-2.6.39.4/mm/percpu.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/percpu.c	2011-08-05 19:44:37.000000000 -0400
 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -74786,9 +63509,9 @@ diff -urNp linux-2.6.39.3/mm/percpu.c linux-2.6.39.3/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-2.6.39.3/mm/rmap.c linux-2.6.39.3/mm/rmap.c
---- linux-2.6.39.3/mm/rmap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/rmap.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/rmap.c linux-2.6.39.4/mm/rmap.c
+--- linux-2.6.39.4/mm/rmap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/rmap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -131,6 +131,10 @@ int anon_vma_prepare(struct vm_area_stru
  	struct anon_vma *anon_vma = vma->anon_vma;
  	struct anon_vma_chain *avc;
@@ -74878,9 +63601,9 @@ diff -urNp linux-2.6.39.3/mm/rmap.c linux-2.6.39.3/mm/rmap.c
  {
  	struct anon_vma_chain *avc;
  	struct anon_vma *anon_vma;
-diff -urNp linux-2.6.39.3/mm/shmem.c linux-2.6.39.3/mm/shmem.c
---- linux-2.6.39.3/mm/shmem.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/mm/shmem.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/shmem.c linux-2.6.39.4/mm/shmem.c
+--- linux-2.6.39.4/mm/shmem.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/mm/shmem.c	2011-08-05 19:44:37.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/percpu_counter.h>
  #include <linux/swap.h>
@@ -74927,9 +63650,9 @@ diff -urNp linux-2.6.39.3/mm/shmem.c linux-2.6.39.3/mm/shmem.c
  	if (!sbinfo)
  		return -ENOMEM;
  
-diff -urNp linux-2.6.39.3/mm/slab.c linux-2.6.39.3/mm/slab.c
---- linux-2.6.39.3/mm/slab.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/slab.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/slab.c linux-2.6.39.4/mm/slab.c
+--- linux-2.6.39.4/mm/slab.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/slab.c	2011-08-05 19:44:37.000000000 -0400
 @@ -150,7 +150,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -75101,9 +63824,9 @@ diff -urNp linux-2.6.39.3/mm/slab.c linux-2.6.39.3/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.3/mm/slob.c linux-2.6.39.3/mm/slob.c
---- linux-2.6.39.3/mm/slob.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/slob.c	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/slob.c linux-2.6.39.4/mm/slob.c
+--- linux-2.6.39.4/mm/slob.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/slob.c	2011-08-05 19:44:37.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
@@ -75452,9 +64175,9 @@ diff -urNp linux-2.6.39.3/mm/slob.c linux-2.6.39.3/mm/slob.c
  }
  EXPORT_SYMBOL(kmem_cache_free);
  
-diff -urNp linux-2.6.39.3/mm/slub.c linux-2.6.39.3/mm/slub.c
---- linux-2.6.39.3/mm/slub.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/mm/slub.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/slub.c linux-2.6.39.4/mm/slub.c
+--- linux-2.6.39.4/mm/slub.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/mm/slub.c	2011-08-05 19:44:37.000000000 -0400
 @@ -431,7 +431,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
@@ -75629,9 +64352,9 @@ diff -urNp linux-2.6.39.3/mm/slub.c linux-2.6.39.3/mm/slub.c
  	return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-2.6.39.3/mm/swap.c linux-2.6.39.3/mm/swap.c
---- linux-2.6.39.3/mm/swap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/swap.c	2011-07-09 09:12:54.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/swap.c linux-2.6.39.4/mm/swap.c
+--- linux-2.6.39.4/mm/swap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/swap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -31,6 +31,7 @@
  #include <linux/backing-dev.h>
  #include <linux/memcontrol.h>
@@ -75649,9 +64372,9 @@ diff -urNp linux-2.6.39.3/mm/swap.c linux-2.6.39.3/mm/swap.c
  	(*dtor)(page);
  }
  
-diff -urNp linux-2.6.39.3/mm/swapfile.c linux-2.6.39.3/mm/swapfile.c
---- linux-2.6.39.3/mm/swapfile.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/swapfile.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/swapfile.c linux-2.6.39.4/mm/swapfile.c
+--- linux-2.6.39.4/mm/swapfile.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/swapfile.c	2011-08-05 19:44:37.000000000 -0400
 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
  
  static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
@@ -75699,9 +64422,9 @@ diff -urNp linux-2.6.39.3/mm/swapfile.c linux-2.6.39.3/mm/swapfile.c
  	wake_up_interruptible(&proc_poll_wait);
  
  	if (S_ISREG(inode->i_mode))
-diff -urNp linux-2.6.39.3/mm/util.c linux-2.6.39.3/mm/util.c
---- linux-2.6.39.3/mm/util.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/util.c	2011-05-23 17:07:00.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/util.c linux-2.6.39.4/mm/util.c
+--- linux-2.6.39.4/mm/util.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/util.c	2011-08-05 19:44:37.000000000 -0400
 @@ -112,6 +112,7 @@ EXPORT_SYMBOL(memdup_user);
   * allocated buffer. Use this if you don't want to free the buffer immediately
   * like, for example, with RCU.
@@ -75731,9 +64454,9 @@ diff -urNp linux-2.6.39.3/mm/util.c linux-2.6.39.3/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-2.6.39.3/mm/vmalloc.c linux-2.6.39.3/mm/vmalloc.c
---- linux-2.6.39.3/mm/vmalloc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/vmalloc.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/vmalloc.c linux-2.6.39.4/mm/vmalloc.c
+--- linux-2.6.39.4/mm/vmalloc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/vmalloc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
@@ -75966,9 +64689,9 @@ diff -urNp linux-2.6.39.3/mm/vmalloc.c linux-2.6.39.3/mm/vmalloc.c
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff -urNp linux-2.6.39.3/mm/vmstat.c linux-2.6.39.3/mm/vmstat.c
---- linux-2.6.39.3/mm/vmstat.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/mm/vmstat.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/mm/vmstat.c linux-2.6.39.4/mm/vmstat.c
+--- linux-2.6.39.4/mm/vmstat.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/mm/vmstat.c	2011-08-05 19:44:37.000000000 -0400
 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -76021,9 +64744,9 @@ diff -urNp linux-2.6.39.3/mm/vmstat.c linux-2.6.39.3/mm/vmstat.c
  #endif
  	return 0;
  }
-diff -urNp linux-2.6.39.3/net/8021q/vlan.c linux-2.6.39.3/net/8021q/vlan.c
---- linux-2.6.39.3/net/8021q/vlan.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/8021q/vlan.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/8021q/vlan.c linux-2.6.39.4/net/8021q/vlan.c
+--- linux-2.6.39.4/net/8021q/vlan.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/8021q/vlan.c	2011-08-05 19:44:37.000000000 -0400
 @@ -592,8 +592,7 @@ static int vlan_ioctl_handler(struct net
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
@@ -76034,9 +64757,9 @@ diff -urNp linux-2.6.39.3/net/8021q/vlan.c linux-2.6.39.3/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.39.3/net/atm/atm_misc.c linux-2.6.39.3/net/atm/atm_misc.c
---- linux-2.6.39.3/net/atm/atm_misc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/atm/atm_misc.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/atm/atm_misc.c linux-2.6.39.4/net/atm/atm_misc.c
+--- linux-2.6.39.4/net/atm/atm_misc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/atm/atm_misc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int 
  	if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
  		return 1;
@@ -76073,9 +64796,33 @@ diff -urNp linux-2.6.39.3/net/atm/atm_misc.c linux-2.6.39.3/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.39.3/net/atm/mpoa_caches.c linux-2.6.39.3/net/atm/mpoa_caches.c
---- linux-2.6.39.3/net/atm/mpoa_caches.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/atm/mpoa_caches.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/atm/lec.h linux-2.6.39.4/net/atm/lec.h
+--- linux-2.6.39.4/net/atm/lec.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/atm/lec.h	2011-08-05 20:34:06.000000000 -0400
+@@ -48,7 +48,7 @@ struct lane2_ops {
+ 			      const u8 *tlvs, u32 sizeoftlvs);
+ 	void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
+ 				     const u8 *tlvs, u32 sizeoftlvs);
+-};
++} __no_const;
+ 
+ /*
+  * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
+diff -urNp linux-2.6.39.4/net/atm/mpc.h linux-2.6.39.4/net/atm/mpc.h
+--- linux-2.6.39.4/net/atm/mpc.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/atm/mpc.h	2011-08-05 20:34:06.000000000 -0400
+@@ -33,7 +33,7 @@ struct mpoa_client {
+ 	struct mpc_parameters parameters;  /* parameters for this client    */
+ 
+ 	const struct net_device_ops *old_ops;
+-	struct net_device_ops new_ops;
++	net_device_ops_no_const new_ops;
+ };
+ 
+ 
+diff -urNp linux-2.6.39.4/net/atm/mpoa_caches.c linux-2.6.39.4/net/atm/mpoa_caches.c
+--- linux-2.6.39.4/net/atm/mpoa_caches.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/atm/mpoa_caches.c	2011-08-05 19:44:37.000000000 -0400
 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru
  	struct timeval now;
  	struct k_message msg;
@@ -76085,9 +64832,9 @@ diff -urNp linux-2.6.39.3/net/atm/mpoa_caches.c linux-2.6.39.3/net/atm/mpoa_cach
  	do_gettimeofday(&now);
  
  	read_lock_bh(&client->ingress_lock);
-diff -urNp linux-2.6.39.3/net/atm/proc.c linux-2.6.39.3/net/atm/proc.c
---- linux-2.6.39.3/net/atm/proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/atm/proc.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/atm/proc.c linux-2.6.39.4/net/atm/proc.c
+--- linux-2.6.39.4/net/atm/proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/atm/proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -76126,9 +64873,9 @@ diff -urNp linux-2.6.39.3/net/atm/proc.c linux-2.6.39.3/net/atm/proc.c
  	else
  		seq_printf(seq, "%3d %3d %5d         ",
  			   vcc->dev->number, vcc->vpi, vcc->vci);
-diff -urNp linux-2.6.39.3/net/atm/resources.c linux-2.6.39.3/net/atm/resources.c
---- linux-2.6.39.3/net/atm/resources.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/atm/resources.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/atm/resources.c linux-2.6.39.4/net/atm/resources.c
+--- linux-2.6.39.4/net/atm/resources.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/atm/resources.c	2011-08-05 19:44:37.000000000 -0400
 @@ -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)
@@ -76147,9 +64894,9 @@ diff -urNp linux-2.6.39.3/net/atm/resources.c linux-2.6.39.3/net/atm/resources.c
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.39.3/net/batman-adv/hard-interface.c linux-2.6.39.3/net/batman-adv/hard-interface.c
---- linux-2.6.39.3/net/batman-adv/hard-interface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/batman-adv/hard-interface.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/batman-adv/hard-interface.c linux-2.6.39.4/net/batman-adv/hard-interface.c
+--- linux-2.6.39.4/net/batman-adv/hard-interface.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/batman-adv/hard-interface.c	2011-08-05 19:44:37.000000000 -0400
 @@ -339,8 +339,8 @@ int hardif_enable_interface(struct hard_
  	hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
  	dev_add_pack(&hard_iface->batman_adv_ptype);
@@ -76161,9 +64908,9 @@ diff -urNp linux-2.6.39.3/net/batman-adv/hard-interface.c linux-2.6.39.3/net/bat
  	bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
  		 hard_iface->net_dev->name);
  
-diff -urNp linux-2.6.39.3/net/batman-adv/routing.c linux-2.6.39.3/net/batman-adv/routing.c
---- linux-2.6.39.3/net/batman-adv/routing.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/batman-adv/routing.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/batman-adv/routing.c linux-2.6.39.4/net/batman-adv/routing.c
+--- linux-2.6.39.4/net/batman-adv/routing.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/batman-adv/routing.c	2011-08-05 19:44:37.000000000 -0400
 @@ -625,7 +625,7 @@ void receive_bat_packet(struct ethhdr *e
  		return;
  
@@ -76173,9 +64920,9 @@ diff -urNp linux-2.6.39.3/net/batman-adv/routing.c linux-2.6.39.3/net/batman-adv
  
  	has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff -urNp linux-2.6.39.3/net/batman-adv/send.c linux-2.6.39.3/net/batman-adv/send.c
---- linux-2.6.39.3/net/batman-adv/send.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/batman-adv/send.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/batman-adv/send.c linux-2.6.39.4/net/batman-adv/send.c
+--- linux-2.6.39.4/net/batman-adv/send.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/batman-adv/send.c	2011-08-05 19:44:37.000000000 -0400
 @@ -277,7 +277,7 @@ void schedule_own_packet(struct hard_ifa
  
  	/* change sequence number to network order */
@@ -76194,9 +64941,9 @@ diff -urNp linux-2.6.39.3/net/batman-adv/send.c linux-2.6.39.3/net/batman-adv/se
  
  	slide_own_bcast_window(hard_iface);
  	send_time = own_send_time(bat_priv);
-diff -urNp linux-2.6.39.3/net/batman-adv/soft-interface.c linux-2.6.39.3/net/batman-adv/soft-interface.c
---- linux-2.6.39.3/net/batman-adv/soft-interface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/batman-adv/soft-interface.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/batman-adv/soft-interface.c linux-2.6.39.4/net/batman-adv/soft-interface.c
+--- linux-2.6.39.4/net/batman-adv/soft-interface.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/batman-adv/soft-interface.c	2011-08-05 19:44:37.000000000 -0400
 @@ -386,7 +386,7 @@ int interface_tx(struct sk_buff *skb, st
  
  		/* set broadcast sequence number */
@@ -76215,9 +64962,9 @@ diff -urNp linux-2.6.39.3/net/batman-adv/soft-interface.c linux-2.6.39.3/net/bat
  	atomic_set(&bat_priv->hna_local_changed, 0);
  
  	bat_priv->primary_if = NULL;
-diff -urNp linux-2.6.39.3/net/batman-adv/types.h linux-2.6.39.3/net/batman-adv/types.h
---- linux-2.6.39.3/net/batman-adv/types.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/batman-adv/types.h	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/batman-adv/types.h linux-2.6.39.4/net/batman-adv/types.h
+--- linux-2.6.39.4/net/batman-adv/types.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/batman-adv/types.h	2011-08-05 19:44:37.000000000 -0400
 @@ -38,8 +38,8 @@ struct hard_iface {
  	int16_t if_num;
  	char if_status;
@@ -76238,9 +64985,9 @@ diff -urNp linux-2.6.39.3/net/batman-adv/types.h linux-2.6.39.3/net/batman-adv/t
  	atomic_t bcast_queue_left;
  	atomic_t batman_queue_left;
  	char num_ifaces;
-diff -urNp linux-2.6.39.3/net/batman-adv/unicast.c linux-2.6.39.3/net/batman-adv/unicast.c
---- linux-2.6.39.3/net/batman-adv/unicast.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/batman-adv/unicast.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/batman-adv/unicast.c linux-2.6.39.4/net/batman-adv/unicast.c
+--- linux-2.6.39.4/net/batman-adv/unicast.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/batman-adv/unicast.c	2011-08-05 19:44:37.000000000 -0400
 @@ -263,7 +263,7 @@ int frag_send_skb(struct sk_buff *skb, s
  	frag1->flags = UNI_FRAG_HEAD | large_tail;
  	frag2->flags = large_tail;
@@ -76250,9 +64997,9 @@ diff -urNp linux-2.6.39.3/net/batman-adv/unicast.c linux-2.6.39.3/net/batman-adv
  	frag1->seqno = htons(seqno - 1);
  	frag2->seqno = htons(seqno);
  
-diff -urNp linux-2.6.39.3/net/bluetooth/l2cap_core.c linux-2.6.39.3/net/bluetooth/l2cap_core.c
---- linux-2.6.39.3/net/bluetooth/l2cap_core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/bluetooth/l2cap_core.c	2011-06-25 14:32:21.000000000 -0400
+diff -urNp linux-2.6.39.4/net/bluetooth/l2cap_core.c linux-2.6.39.4/net/bluetooth/l2cap_core.c
+--- linux-2.6.39.4/net/bluetooth/l2cap_core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/bluetooth/l2cap_core.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2202,7 +2202,7 @@ static inline int l2cap_config_req(struc
  
  	/* Reject if config buffer is too small. */
@@ -76262,9 +65009,9 @@ diff -urNp linux-2.6.39.3/net/bluetooth/l2cap_core.c linux-2.6.39.3/net/bluetoot
  		l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
  				l2cap_build_conf_rsp(sk, rsp,
  					L2CAP_CONF_REJECT, flags), rsp);
-diff -urNp linux-2.6.39.3/net/bluetooth/l2cap_sock.c linux-2.6.39.3/net/bluetooth/l2cap_sock.c
---- linux-2.6.39.3/net/bluetooth/l2cap_sock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/bluetooth/l2cap_sock.c	2011-06-12 06:36:08.000000000 -0400
+diff -urNp linux-2.6.39.4/net/bluetooth/l2cap_sock.c linux-2.6.39.4/net/bluetooth/l2cap_sock.c
+--- linux-2.6.39.4/net/bluetooth/l2cap_sock.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/bluetooth/l2cap_sock.c	2011-08-05 19:44:37.000000000 -0400
 @@ -446,6 +446,7 @@ static int l2cap_sock_getsockopt_old(str
  			break;
  		}
@@ -76273,9 +65020,9 @@ diff -urNp linux-2.6.39.3/net/bluetooth/l2cap_sock.c linux-2.6.39.3/net/bluetoot
  		cinfo.hci_handle = l2cap_pi(sk)->conn->hcon->handle;
  		memcpy(cinfo.dev_class, l2cap_pi(sk)->conn->hcon->dev_class, 3);
  
-diff -urNp linux-2.6.39.3/net/bluetooth/rfcomm/sock.c linux-2.6.39.3/net/bluetooth/rfcomm/sock.c
---- linux-2.6.39.3/net/bluetooth/rfcomm/sock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/bluetooth/rfcomm/sock.c	2011-06-12 06:36:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/bluetooth/rfcomm/sock.c linux-2.6.39.4/net/bluetooth/rfcomm/sock.c
+--- linux-2.6.39.4/net/bluetooth/rfcomm/sock.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/bluetooth/rfcomm/sock.c	2011-08-05 19:44:37.000000000 -0400
 @@ -787,6 +787,7 @@ static int rfcomm_sock_getsockopt_old(st
  
  		l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk;
@@ -76284,9 +65031,9 @@ diff -urNp linux-2.6.39.3/net/bluetooth/rfcomm/sock.c linux-2.6.39.3/net/bluetoo
  		cinfo.hci_handle = l2cap_pi(l2cap_sk)->conn->hcon->handle;
  		memcpy(cinfo.dev_class, l2cap_pi(l2cap_sk)->conn->hcon->dev_class, 3);
  
-diff -urNp linux-2.6.39.3/net/bridge/br_multicast.c linux-2.6.39.3/net/bridge/br_multicast.c
---- linux-2.6.39.3/net/bridge/br_multicast.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/bridge/br_multicast.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/bridge/br_multicast.c linux-2.6.39.4/net/bridge/br_multicast.c
+--- linux-2.6.39.4/net/bridge/br_multicast.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/bridge/br_multicast.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct 
  	nexthdr = ip6h->nexthdr;
  	offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -76296,9 +65043,9 @@ diff -urNp linux-2.6.39.3/net/bridge/br_multicast.c linux-2.6.39.3/net/bridge/br
  		return 0;
  
  	/* Okay, we found ICMPv6 header */
-diff -urNp linux-2.6.39.3/net/bridge/netfilter/ebtables.c linux-2.6.39.3/net/bridge/netfilter/ebtables.c
---- linux-2.6.39.3/net/bridge/netfilter/ebtables.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/bridge/netfilter/ebtables.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/bridge/netfilter/ebtables.c linux-2.6.39.4/net/bridge/netfilter/ebtables.c
+--- linux-2.6.39.4/net/bridge/netfilter/ebtables.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/bridge/netfilter/ebtables.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
  			tmp.valid_hooks = t->table->valid_hooks;
  		}
@@ -76317,9 +65064,9 @@ diff -urNp linux-2.6.39.3/net/bridge/netfilter/ebtables.c linux-2.6.39.3/net/bri
  	memset(&tinfo, 0, sizeof(tinfo));
  
  	if (cmd == EBT_SO_GET_ENTRIES) {
-diff -urNp linux-2.6.39.3/net/caif/caif_socket.c linux-2.6.39.3/net/caif/caif_socket.c
---- linux-2.6.39.3/net/caif/caif_socket.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/caif/caif_socket.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/caif/caif_socket.c linux-2.6.39.4/net/caif/caif_socket.c
+--- linux-2.6.39.4/net/caif/caif_socket.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/caif/caif_socket.c	2011-08-05 19:44:37.000000000 -0400
 @@ -48,18 +48,19 @@ static struct dentry *debugfsdir;
  #ifdef CONFIG_DEBUG_FS
  struct debug_fs_counter {
@@ -76437,9 +65184,9 @@ diff -urNp linux-2.6.39.3/net/caif/caif_socket.c linux-2.6.39.3/net/caif/caif_so
  
  	if (cf_sk->debugfs_socket_dir != NULL)
  		debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
-diff -urNp linux-2.6.39.3/net/caif/cfctrl.c linux-2.6.39.3/net/caif/cfctrl.c
---- linux-2.6.39.3/net/caif/cfctrl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/caif/cfctrl.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/caif/cfctrl.c linux-2.6.39.4/net/caif/cfctrl.c
+--- linux-2.6.39.4/net/caif/cfctrl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/caif/cfctrl.c	2011-08-05 19:44:37.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/stddef.h>
  #include <linux/spinlock.h>
@@ -76487,9 +65234,9 @@ diff -urNp linux-2.6.39.3/net/caif/cfctrl.c linux-2.6.39.3/net/caif/cfctrl.c
  
  	cfpkt_extr_head(pkt, &cmdrsp, 1);
  	cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff -urNp linux-2.6.39.3/net/can/bcm.c linux-2.6.39.3/net/can/bcm.c
---- linux-2.6.39.3/net/can/bcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/can/bcm.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/can/bcm.c linux-2.6.39.4/net/can/bcm.c
+--- linux-2.6.39.4/net/can/bcm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/can/bcm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file
  	struct bcm_sock *bo = bcm_sk(sk);
  	struct bcm_op *op;
@@ -76506,9 +65253,9 @@ diff -urNp linux-2.6.39.3/net/can/bcm.c linux-2.6.39.3/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.3/net/core/datagram.c linux-2.6.39.3/net/core/datagram.c
---- linux-2.6.39.3/net/core/datagram.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/core/datagram.c	2011-05-22 19:36:33.000000000 -0400
+diff -urNp linux-2.6.39.4/net/core/datagram.c linux-2.6.39.4/net/core/datagram.c
+--- linux-2.6.39.4/net/core/datagram.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/core/datagram.c	2011-08-05 19:44:37.000000000 -0400
 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
  	}
  
@@ -76518,9 +65265,9 @@ diff -urNp linux-2.6.39.3/net/core/datagram.c linux-2.6.39.3/net/core/datagram.c
  	sk_mem_reclaim_partial(sk);
  
  	return err;
-diff -urNp linux-2.6.39.3/net/core/dev.c linux-2.6.39.3/net/core/dev.c
---- linux-2.6.39.3/net/core/dev.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/net/core/dev.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/net/core/dev.c linux-2.6.39.4/net/core/dev.c
+--- linux-2.6.39.4/net/core/dev.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/net/core/dev.c	2011-08-05 20:34:06.000000000 -0400
 @@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
@@ -76536,15 +65283,15 @@ diff -urNp linux-2.6.39.3/net/core/dev.c linux-2.6.39.3/net/core/dev.c
  	}
  }
  EXPORT_SYMBOL(dev_load);
-@@ -1957,7 +1961,7 @@ struct dev_gso_cb {
+@@ -1951,7 +1955,7 @@ static int illegal_highdma(struct net_de
  
- static void dev_gso_skb_destructor(struct sk_buff *skb)
- {
--	struct dev_gso_cb *cb;
-+	const struct dev_gso_cb *cb;
+ struct dev_gso_cb {
+ 	void (*destructor)(struct sk_buff *skb);
+-};
++} __no_const;
+ 
+ #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
  
- 	do {
- 		struct sk_buff *nskb = skb->next;
 @@ -2901,7 +2905,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
@@ -76563,9 +65310,9 @@ diff -urNp linux-2.6.39.3/net/core/dev.c linux-2.6.39.3/net/core/dev.c
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.39.3/net/core/flow.c linux-2.6.39.3/net/core/flow.c
---- linux-2.6.39.3/net/core/flow.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/core/flow.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/core/flow.c linux-2.6.39.4/net/core/flow.c
+--- linux-2.6.39.4/net/core/flow.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/core/flow.c	2011-08-05 19:44:37.000000000 -0400
 @@ -60,7 +60,7 @@ struct flow_cache {
  	struct timer_list		rnd_timer;
  };
@@ -76602,9 +65349,21 @@ diff -urNp linux-2.6.39.3/net/core/flow.c linux-2.6.39.3/net/core/flow.c
  		if (!IS_ERR(flo))
  			fle->object = flo;
  		else
-diff -urNp linux-2.6.39.3/net/core/skbuff.c linux-2.6.39.3/net/core/skbuff.c
---- linux-2.6.39.3/net/core/skbuff.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/net/core/skbuff.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/net/core/rtnetlink.c linux-2.6.39.4/net/core/rtnetlink.c
+--- linux-2.6.39.4/net/core/rtnetlink.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/core/rtnetlink.c	2011-08-05 20:34:06.000000000 -0400
+@@ -56,7 +56,7 @@
+ struct rtnl_link {
+ 	rtnl_doit_func		doit;
+ 	rtnl_dumpit_func	dumpit;
+-};
++} __no_const;
+ 
+ static DEFINE_MUTEX(rtnl_mutex);
+ 
+diff -urNp linux-2.6.39.4/net/core/skbuff.c linux-2.6.39.4/net/core/skbuff.c
+--- linux-2.6.39.4/net/core/skbuff.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/net/core/skbuff.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1542,6 +1542,8 @@ int skb_splice_bits(struct sk_buff *skb,
  	struct sock *sk = skb->sk;
  	int ret = 0;
@@ -76614,9 +65373,9 @@ diff -urNp linux-2.6.39.3/net/core/skbuff.c linux-2.6.39.3/net/core/skbuff.c
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-diff -urNp linux-2.6.39.3/net/core/sock.c linux-2.6.39.3/net/core/sock.c
---- linux-2.6.39.3/net/core/sock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/core/sock.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/core/sock.c linux-2.6.39.4/net/core/sock.c
+--- linux-2.6.39.4/net/core/sock.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/core/sock.c	2011-08-05 19:44:37.000000000 -0400
 @@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  	 */
  	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
@@ -76689,9 +65448,9 @@ diff -urNp linux-2.6.39.3/net/core/sock.c linux-2.6.39.3/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-2.6.39.3/net/decnet/sysctl_net_decnet.c linux-2.6.39.3/net/decnet/sysctl_net_decnet.c
---- linux-2.6.39.3/net/decnet/sysctl_net_decnet.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/decnet/sysctl_net_decnet.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/decnet/sysctl_net_decnet.c linux-2.6.39.4/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.39.4/net/decnet/sysctl_net_decnet.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/decnet/sysctl_net_decnet.c	2011-08-05 19:44:37.000000000 -0400
 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
  
  	if (len > *lenp) len = *lenp;
@@ -76710,9 +65469,9 @@ diff -urNp linux-2.6.39.3/net/decnet/sysctl_net_decnet.c linux-2.6.39.3/net/decn
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-2.6.39.3/net/econet/Kconfig linux-2.6.39.3/net/econet/Kconfig
---- linux-2.6.39.3/net/econet/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/econet/Kconfig	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/econet/Kconfig linux-2.6.39.4/net/econet/Kconfig
+--- linux-2.6.39.4/net/econet/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/econet/Kconfig	2011-08-05 19:44:37.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -76722,9 +65481,9 @@ diff -urNp linux-2.6.39.3/net/econet/Kconfig linux-2.6.39.3/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.3/net/ipv4/fib_frontend.c linux-2.6.39.3/net/ipv4/fib_frontend.c
---- linux-2.6.39.3/net/ipv4/fib_frontend.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/fib_frontend.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/fib_frontend.c linux-2.6.39.4/net/ipv4/fib_frontend.c
+--- linux-2.6.39.4/net/ipv4/fib_frontend.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/fib_frontend.c	2011-08-05 19:44:37.000000000 -0400
 @@ -968,12 +968,12 @@ static int fib_inetaddr_event(struct not
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
  		fib_sync_up(dev);
@@ -76749,9 +65508,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/fib_frontend.c linux-2.6.39.3/net/ipv4/fib_fr
  		rt_cache_flush(dev_net(dev), -1);
  		break;
  	case NETDEV_DOWN:
-diff -urNp linux-2.6.39.3/net/ipv4/fib_semantics.c linux-2.6.39.3/net/ipv4/fib_semantics.c
---- linux-2.6.39.3/net/ipv4/fib_semantics.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/fib_semantics.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/fib_semantics.c linux-2.6.39.4/net/ipv4/fib_semantics.c
+--- linux-2.6.39.4/net/ipv4/fib_semantics.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/fib_semantics.c	2011-08-05 19:44:37.000000000 -0400
 @@ -701,7 +701,7 @@ __be32 fib_info_update_nh_saddr(struct n
  	nh->nh_saddr = inet_select_addr(nh->nh_dev,
  					nh->nh_gw,
@@ -76761,9 +65520,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/fib_semantics.c linux-2.6.39.3/net/ipv4/fib_s
  
  	return nh->nh_saddr;
  }
-diff -urNp linux-2.6.39.3/net/ipv4/inet_diag.c linux-2.6.39.3/net/ipv4/inet_diag.c
---- linux-2.6.39.3/net/ipv4/inet_diag.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/inet_diag.c	2011-06-20 19:27:58.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/inet_diag.c linux-2.6.39.4/net/ipv4/inet_diag.c
+--- linux-2.6.39.4/net/ipv4/inet_diag.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/inet_diag.c	2011-08-05 19:44:37.000000000 -0400
 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
  	r->idiag_retrans = 0;
  
@@ -76825,9 +65584,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/inet_diag.c linux-2.6.39.3/net/ipv4/inet_diag
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff -urNp linux-2.6.39.3/net/ipv4/inet_hashtables.c linux-2.6.39.3/net/ipv4/inet_hashtables.c
---- linux-2.6.39.3/net/ipv4/inet_hashtables.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/inet_hashtables.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/inet_hashtables.c linux-2.6.39.4/net/ipv4/inet_hashtables.c
+--- linux-2.6.39.4/net/ipv4/inet_hashtables.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/inet_hashtables.c	2011-08-05 19:44:37.000000000 -0400
 @@ -18,11 +18,14 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -76852,9 +65611,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/inet_hashtables.c linux-2.6.39.3/net/ipv4/ine
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			while (twrefcnt) {
-diff -urNp linux-2.6.39.3/net/ipv4/inetpeer.c linux-2.6.39.3/net/ipv4/inetpeer.c
---- linux-2.6.39.3/net/ipv4/inetpeer.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/inetpeer.c	2011-07-09 09:21:38.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/inetpeer.c linux-2.6.39.4/net/ipv4/inetpeer.c
+--- linux-2.6.39.4/net/ipv4/inetpeer.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/inetpeer.c	2011-08-05 19:44:37.000000000 -0400
 @@ -480,6 +480,8 @@ struct inet_peer *inet_getpeer(struct in
  	unsigned int sequence;
  	int invalidated, newrefcnt = 0;
@@ -76875,9 +65634,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/inetpeer.c linux-2.6.39.3/net/ipv4/inetpeer.c
  		p->tcp_ts_stamp = 0;
  		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
  		p->rate_tokens = 0;
-diff -urNp linux-2.6.39.3/net/ipv4/ip_fragment.c linux-2.6.39.3/net/ipv4/ip_fragment.c
---- linux-2.6.39.3/net/ipv4/ip_fragment.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/ip_fragment.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/ip_fragment.c linux-2.6.39.4/net/ipv4/ip_fragment.c
+--- linux-2.6.39.4/net/ipv4/ip_fragment.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/ip_fragment.c	2011-08-05 19:44:37.000000000 -0400
 @@ -297,7 +297,7 @@ static inline int ip_frag_too_far(struct
  		return 0;
  
@@ -76887,9 +65646,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/ip_fragment.c linux-2.6.39.3/net/ipv4/ip_frag
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.39.3/net/ipv4/ip_sockglue.c linux-2.6.39.3/net/ipv4/ip_sockglue.c
---- linux-2.6.39.3/net/ipv4/ip_sockglue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/ip_sockglue.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/ip_sockglue.c linux-2.6.39.4/net/ipv4/ip_sockglue.c
+--- linux-2.6.39.4/net/ipv4/ip_sockglue.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/ip_sockglue.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1064,6 +1064,8 @@ static int do_ip_getsockopt(struct sock 
  	int val;
  	int len;
@@ -76899,9 +65658,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/ip_sockglue.c linux-2.6.39.3/net/ipv4/ip_sock
  	if (level != SOL_IP)
  		return -EOPNOTSUPP;
  
-diff -urNp linux-2.6.39.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.39.3/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.39.3/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.39.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.39.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-08-05 19:44:37.000000000 -0400
 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
  
  	*len = 0;
@@ -76911,9 +65670,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.39.3/
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.39.3/net/ipv4/raw.c linux-2.6.39.3/net/ipv4/raw.c
---- linux-2.6.39.3/net/ipv4/raw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/raw.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/raw.c linux-2.6.39.4/net/ipv4/raw.c
+--- linux-2.6.39.4/net/ipv4/raw.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/raw.c	2011-08-05 19:44:37.000000000 -0400
 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
@@ -76970,9 +65729,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/raw.c linux-2.6.39.3/net/ipv4/raw.c
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.39.3/net/ipv4/route.c linux-2.6.39.3/net/ipv4/route.c
---- linux-2.6.39.3/net/ipv4/route.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/route.c	2011-07-09 09:19:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/route.c linux-2.6.39.4/net/ipv4/route.c
+--- linux-2.6.39.4/net/ipv4/route.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/route.c	2011-08-05 19:44:37.000000000 -0400
 @@ -303,7 +303,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
@@ -77000,9 +65759,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/route.c linux-2.6.39.3/net/ipv4/route.c
  		if (rt->peer->tcp_ts_stamp) {
  			ts = rt->peer->tcp_ts;
  			tsage = get_seconds() - rt->peer->tcp_ts_stamp;
-diff -urNp linux-2.6.39.3/net/ipv4/tcp.c linux-2.6.39.3/net/ipv4/tcp.c
---- linux-2.6.39.3/net/ipv4/tcp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/tcp.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/tcp.c linux-2.6.39.4/net/ipv4/tcp.c
+--- linux-2.6.39.4/net/ipv4/tcp.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/tcp.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2121,6 +2121,8 @@ static int do_tcp_setsockopt(struct sock
  	int val;
  	int err = 0;
@@ -77021,9 +65780,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/tcp.c linux-2.6.39.3/net/ipv4/tcp.c
  	if (get_user(len, optlen))
  		return -EFAULT;
  
-diff -urNp linux-2.6.39.3/net/ipv4/tcp_ipv4.c linux-2.6.39.3/net/ipv4/tcp_ipv4.c
---- linux-2.6.39.3/net/ipv4/tcp_ipv4.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/tcp_ipv4.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/tcp_ipv4.c linux-2.6.39.4/net/ipv4/tcp_ipv4.c
+--- linux-2.6.39.4/net/ipv4/tcp_ipv4.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/tcp_ipv4.c	2011-08-05 19:44:37.000000000 -0400
 @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -77119,9 +65878,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/tcp_ipv4.c linux-2.6.39.3/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-2.6.39.3/net/ipv4/tcp_minisocks.c linux-2.6.39.3/net/ipv4/tcp_minisocks.c
---- linux-2.6.39.3/net/ipv4/tcp_minisocks.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/tcp_minisocks.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/tcp_minisocks.c linux-2.6.39.4/net/ipv4/tcp_minisocks.c
+--- linux-2.6.39.4/net/ipv4/tcp_minisocks.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/tcp_minisocks.c	2011-08-05 19:44:37.000000000 -0400
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -77144,9 +65903,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/tcp_minisocks.c linux-2.6.39.3/net/ipv4/tcp_m
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-2.6.39.3/net/ipv4/tcp_output.c linux-2.6.39.3/net/ipv4/tcp_output.c
---- linux-2.6.39.3/net/ipv4/tcp_output.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/tcp_output.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/tcp_output.c linux-2.6.39.4/net/ipv4/tcp_output.c
+--- linux-2.6.39.4/net/ipv4/tcp_output.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/tcp_output.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
  	int mss;
  	int s_data_desired = 0;
@@ -77156,9 +65915,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/tcp_output.c linux-2.6.39.3/net/ipv4/tcp_outp
  	if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)
  		s_data_desired = cvp->s_data_desired;
  	skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
-diff -urNp linux-2.6.39.3/net/ipv4/tcp_probe.c linux-2.6.39.3/net/ipv4/tcp_probe.c
---- linux-2.6.39.3/net/ipv4/tcp_probe.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/tcp_probe.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/tcp_probe.c linux-2.6.39.4/net/ipv4/tcp_probe.c
+--- linux-2.6.39.4/net/ipv4/tcp_probe.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/tcp_probe.c	2011-08-05 19:44:37.000000000 -0400
 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
  		if (cnt + width >= len)
  			break;
@@ -77168,9 +65927,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/tcp_probe.c linux-2.6.39.3/net/ipv4/tcp_probe
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-2.6.39.3/net/ipv4/tcp_timer.c linux-2.6.39.3/net/ipv4/tcp_timer.c
---- linux-2.6.39.3/net/ipv4/tcp_timer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/tcp_timer.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/tcp_timer.c linux-2.6.39.4/net/ipv4/tcp_timer.c
+--- linux-2.6.39.4/net/ipv4/tcp_timer.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/tcp_timer.c	2011-08-05 19:44:37.000000000 -0400
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -77196,9 +65955,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/tcp_timer.c linux-2.6.39.3/net/ipv4/tcp_timer
  	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.3/net/ipv4/udp.c linux-2.6.39.3/net/ipv4/udp.c
---- linux-2.6.39.3/net/ipv4/udp.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/ipv4/udp.c	2011-07-09 09:19:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv4/udp.c linux-2.6.39.4/net/ipv4/udp.c
+--- linux-2.6.39.4/net/ipv4/udp.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/ipv4/udp.c	2011-08-05 19:44:37.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -77311,9 +66070,9 @@ diff -urNp linux-2.6.39.3/net/ipv4/udp.c linux-2.6.39.3/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.39.3/net/ipv6/inet6_connection_sock.c linux-2.6.39.3/net/ipv6/inet6_connection_sock.c
---- linux-2.6.39.3/net/ipv6/inet6_connection_sock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv6/inet6_connection_sock.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv6/inet6_connection_sock.c linux-2.6.39.4/net/ipv6/inet6_connection_sock.c
+--- linux-2.6.39.4/net/ipv6/inet6_connection_sock.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv6/inet6_connection_sock.c	2011-08-05 19:44:37.000000000 -0400
 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
  	{
@@ -77332,9 +66091,9 @@ diff -urNp linux-2.6.39.3/net/ipv6/inet6_connection_sock.c linux-2.6.39.3/net/ip
  			__sk_dst_reset(sk);
  			dst = NULL;
  		}
-diff -urNp linux-2.6.39.3/net/ipv6/ipv6_sockglue.c linux-2.6.39.3/net/ipv6/ipv6_sockglue.c
---- linux-2.6.39.3/net/ipv6/ipv6_sockglue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv6/ipv6_sockglue.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv6/ipv6_sockglue.c linux-2.6.39.4/net/ipv6/ipv6_sockglue.c
+--- linux-2.6.39.4/net/ipv6/ipv6_sockglue.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv6/ipv6_sockglue.c	2011-08-05 19:44:37.000000000 -0400
 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
  	int val, valbool;
  	int retv = -ENOPROTOOPT;
@@ -77353,9 +66112,9 @@ diff -urNp linux-2.6.39.3/net/ipv6/ipv6_sockglue.c linux-2.6.39.3/net/ipv6/ipv6_
  	if (ip6_mroute_opt(optname))
  		return ip6_mroute_getsockopt(sk, optname, optval, optlen);
  
-diff -urNp linux-2.6.39.3/net/ipv6/raw.c linux-2.6.39.3/net/ipv6/raw.c
---- linux-2.6.39.3/net/ipv6/raw.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv6/raw.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv6/raw.c linux-2.6.39.4/net/ipv6/raw.c
+--- linux-2.6.39.4/net/ipv6/raw.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv6/raw.c	2011-08-05 19:44:37.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)) &&
@@ -77451,9 +66210,9 @@ diff -urNp linux-2.6.39.3/net/ipv6/raw.c linux-2.6.39.3/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.39.3/net/ipv6/tcp_ipv6.c linux-2.6.39.3/net/ipv6/tcp_ipv6.c
---- linux-2.6.39.3/net/ipv6/tcp_ipv6.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/ipv6/tcp_ipv6.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv6/tcp_ipv6.c linux-2.6.39.4/net/ipv6/tcp_ipv6.c
+--- linux-2.6.39.4/net/ipv6/tcp_ipv6.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/ipv6/tcp_ipv6.c	2011-08-05 19:44:37.000000000 -0400
 @@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -77553,9 +66312,9 @@ diff -urNp linux-2.6.39.3/net/ipv6/tcp_ipv6.c linux-2.6.39.3/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.39.3/net/ipv6/udp.c linux-2.6.39.3/net/ipv6/udp.c
---- linux-2.6.39.3/net/ipv6/udp.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/ipv6/udp.c	2011-07-09 09:19:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/ipv6/udp.c linux-2.6.39.4/net/ipv6/udp.c
+--- linux-2.6.39.4/net/ipv6/udp.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/ipv6/udp.c	2011-08-05 19:44:37.000000000 -0400
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -77620,9 +66379,9 @@ diff -urNp linux-2.6.39.3/net/ipv6/udp.c linux-2.6.39.3/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.39.3/net/irda/ircomm/ircomm_tty.c linux-2.6.39.3/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.39.3/net/irda/ircomm/ircomm_tty.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/irda/ircomm/ircomm_tty.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/irda/ircomm/ircomm_tty.c linux-2.6.39.4/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.39.4/net/irda/ircomm/ircomm_tty.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/irda/ircomm/ircomm_tty.c	2011-08-05 19:44:37.000000000 -0400
 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
  	add_wait_queue(&self->open_wait, &wait);
  
@@ -77745,9 +66504,9 @@ diff -urNp linux-2.6.39.3/net/irda/ircomm/ircomm_tty.c linux-2.6.39.3/net/irda/i
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-2.6.39.3/net/iucv/af_iucv.c linux-2.6.39.3/net/iucv/af_iucv.c
---- linux-2.6.39.3/net/iucv/af_iucv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/iucv/af_iucv.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/iucv/af_iucv.c linux-2.6.39.4/net/iucv/af_iucv.c
+--- linux-2.6.39.4/net/iucv/af_iucv.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/iucv/af_iucv.c	2011-08-05 19:44:37.000000000 -0400
 @@ -653,10 +653,10 @@ static int iucv_sock_autobind(struct soc
  
  	write_lock_bh(&iucv_sk_list.lock);
@@ -77761,9 +66520,9 @@ diff -urNp linux-2.6.39.3/net/iucv/af_iucv.c linux-2.6.39.3/net/iucv/af_iucv.c
  	}
  
  	write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-2.6.39.3/net/key/af_key.c linux-2.6.39.3/net/key/af_key.c
---- linux-2.6.39.3/net/key/af_key.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/key/af_key.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/key/af_key.c linux-2.6.39.4/net/key/af_key.c
+--- linux-2.6.39.4/net/key/af_key.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/key/af_key.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
  	struct xfrm_migrate m[XFRM_MAX_DEPTH];
  	struct xfrm_kmaddress k;
@@ -77798,57 +66557,75 @@ diff -urNp linux-2.6.39.3/net/key/af_key.c linux-2.6.39.3/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.3/net/l2tp/l2tp_ip.c linux-2.6.39.3/net/l2tp/l2tp_ip.c
---- linux-2.6.39.3/net/l2tp/l2tp_ip.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/l2tp/l2tp_ip.c	2011-05-22 19:36:34.000000000 -0400
-@@ -625,7 +625,7 @@ static struct inet_protosw l2tp_ip_proto
- 	.no_check	= 0,
- };
+diff -urNp linux-2.6.39.4/net/lapb/lapb_iface.c linux-2.6.39.4/net/lapb/lapb_iface.c
+--- linux-2.6.39.4/net/lapb/lapb_iface.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/lapb/lapb_iface.c	2011-08-05 20:34:06.000000000 -0400
+@@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
+ 		goto out;
  
--static struct net_protocol l2tp_ip_protocol __read_mostly = {
-+static const struct net_protocol l2tp_ip_protocol = {
- 	.handler	= l2tp_ip_recv,
- };
+ 	lapb->dev       = dev;
+-	lapb->callbacks = *callbacks;
++	lapb->callbacks = callbacks;
  
-diff -urNp linux-2.6.39.3/net/lapb/lapb_iface.c linux-2.6.39.3/net/lapb/lapb_iface.c
---- linux-2.6.39.3/net/lapb/lapb_iface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
+ 	__lapb_insert_cb(lapb);
+ 
+@@ -380,32 +380,32 @@ int lapb_data_received(struct net_device
+ 
+ void lapb_connect_confirmation(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.connect_confirmation)
+-		lapb->callbacks.connect_confirmation(lapb->dev, reason);
++	if (lapb->callbacks->connect_confirmation)
++		lapb->callbacks->connect_confirmation(lapb->dev, reason);
  }
--
--int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks)
-+int lapb_register(struct net_device *dev, const struct lapb_register_struct *callbacks)
- {
- 	struct lapb_cb *lapb;
- 	int rc = LAPB_BADTOKEN;
-diff -urNp linux-2.6.39.3/net/mac80211/cfg.c linux-2.6.39.3/net/mac80211/cfg.c
---- linux-2.6.39.3/net/mac80211/cfg.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/cfg.c	2011-06-03 00:32:08.000000000 -0400
-@@ -2031,7 +2031,7 @@ static void ieee80211_get_ringparam(stru
- 	drv_get_ringparam(local, tx, tx_max, rx, rx_max);
- }
- 
--struct cfg80211_ops mac80211_config_ops = {
-+const struct cfg80211_ops mac80211_config_ops = {
- 	.add_virtual_intf = ieee80211_add_iface,
- 	.del_virtual_intf = ieee80211_del_iface,
- 	.change_virtual_intf = ieee80211_change_iface,
-diff -urNp linux-2.6.39.3/net/mac80211/cfg.h linux-2.6.39.3/net/mac80211/cfg.h
---- linux-2.6.39.3/net/mac80211/cfg.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/cfg.h	2011-05-22 19:36:34.000000000 -0400
-@@ -4,6 +4,6 @@
- #ifndef __CFG_H
- #define __CFG_H
- 
--extern struct cfg80211_ops mac80211_config_ops;
-+extern const struct cfg80211_ops mac80211_config_ops;
- 
- #endif /* __CFG_H */
-diff -urNp linux-2.6.39.3/net/mac80211/debugfs_sta.c linux-2.6.39.3/net/mac80211/debugfs_sta.c
---- linux-2.6.39.3/net/mac80211/debugfs_sta.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/debugfs_sta.c	2011-05-22 19:36:34.000000000 -0400
+ 
+ void lapb_connect_indication(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.connect_indication)
+-		lapb->callbacks.connect_indication(lapb->dev, reason);
++	if (lapb->callbacks->connect_indication)
++		lapb->callbacks->connect_indication(lapb->dev, reason);
+ }
+ 
+ void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.disconnect_confirmation)
+-		lapb->callbacks.disconnect_confirmation(lapb->dev, reason);
++	if (lapb->callbacks->disconnect_confirmation)
++		lapb->callbacks->disconnect_confirmation(lapb->dev, reason);
+ }
+ 
+ void lapb_disconnect_indication(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.disconnect_indication)
+-		lapb->callbacks.disconnect_indication(lapb->dev, reason);
++	if (lapb->callbacks->disconnect_indication)
++		lapb->callbacks->disconnect_indication(lapb->dev, reason);
+ }
+ 
+ int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
+ {
+-	if (lapb->callbacks.data_indication)
+-		return lapb->callbacks.data_indication(lapb->dev, skb);
++	if (lapb->callbacks->data_indication)
++		return lapb->callbacks->data_indication(lapb->dev, skb);
+ 
+ 	kfree_skb(skb);
+ 	return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
+@@ -415,8 +415,8 @@ int lapb_data_transmit(struct lapb_cb *l
+ {
+ 	int used = 0;
+ 
+-	if (lapb->callbacks.data_transmit) {
+-		lapb->callbacks.data_transmit(lapb->dev, skb);
++	if (lapb->callbacks->data_transmit) {
++		lapb->callbacks->data_transmit(lapb->dev, skb);
+ 		used = 1;
+ 	}
+ 
+diff -urNp linux-2.6.39.4/net/mac80211/debugfs_sta.c linux-2.6.39.4/net/mac80211/debugfs_sta.c
+--- linux-2.6.39.4/net/mac80211/debugfs_sta.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/debugfs_sta.c	2011-08-05 19:44:37.000000000 -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;
@@ -77867,9 +66644,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/debugfs_sta.c linux-2.6.39.3/net/mac80211
  	p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
  			htc->ht_supported ? "" : "not ");
  	if (htc->ht_supported) {
-diff -urNp linux-2.6.39.3/net/mac80211/ieee80211_i.h linux-2.6.39.3/net/mac80211/ieee80211_i.h
---- linux-2.6.39.3/net/mac80211/ieee80211_i.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/ieee80211_i.h	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/ieee80211_i.h linux-2.6.39.4/net/mac80211/ieee80211_i.h
+--- linux-2.6.39.4/net/mac80211/ieee80211_i.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/ieee80211_i.h	2011-08-05 19:44:37.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
@@ -77887,9 +66664,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/ieee80211_i.h linux-2.6.39.3/net/mac80211
  	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.3/net/mac80211/iface.c linux-2.6.39.3/net/mac80211/iface.c
---- linux-2.6.39.3/net/mac80211/iface.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/iface.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/iface.c linux-2.6.39.4/net/mac80211/iface.c
+--- linux-2.6.39.4/net/mac80211/iface.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/iface.c	2011-08-05 19:44:37.000000000 -0400
 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
  		break;
  	}
@@ -77944,9 +66721,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/iface.c linux-2.6.39.3/net/mac80211/iface
  		if (local->ops->napi_poll)
  			napi_disable(&local->napi);
  		ieee80211_clear_tx_pending(local);
-diff -urNp linux-2.6.39.3/net/mac80211/main.c linux-2.6.39.3/net/mac80211/main.c
---- linux-2.6.39.3/net/mac80211/main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/main.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/main.c linux-2.6.39.4/net/mac80211/main.c
+--- linux-2.6.39.4/net/mac80211/main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/main.c	2011-08-05 19:44:37.000000000 -0400
 @@ -215,7 +215,7 @@ int ieee80211_hw_config(struct ieee80211
  		local->hw.conf.power_level = power;
  	}
@@ -77956,9 +66733,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/main.c linux-2.6.39.3/net/mac80211/main.c
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-2.6.39.3/net/mac80211/mlme.c linux-2.6.39.3/net/mac80211/mlme.c
---- linux-2.6.39.3/net/mac80211/mlme.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/mlme.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/mlme.c linux-2.6.39.4/net/mac80211/mlme.c
+--- linux-2.6.39.4/net/mac80211/mlme.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/mlme.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1431,6 +1431,8 @@ static bool ieee80211_assoc_success(stru
  	bool have_higher_than_11mbit = false;
  	u16 ap_ht_cap_flags;
@@ -77968,9 +66745,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/mlme.c linux-2.6.39.3/net/mac80211/mlme.c
  	/* AssocResp and ReassocResp have identical structure */
  
  	aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff -urNp linux-2.6.39.3/net/mac80211/pm.c linux-2.6.39.3/net/mac80211/pm.c
---- linux-2.6.39.3/net/mac80211/pm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/pm.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/pm.c linux-2.6.39.4/net/mac80211/pm.c
+--- linux-2.6.39.4/net/mac80211/pm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/pm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
  	}
  
@@ -77980,9 +66757,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/pm.c linux-2.6.39.3/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
  	local->suspended = true;
-diff -urNp linux-2.6.39.3/net/mac80211/rate.c linux-2.6.39.3/net/mac80211/rate.c
---- linux-2.6.39.3/net/mac80211/rate.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/rate.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/rate.c linux-2.6.39.4/net/mac80211/rate.c
+--- linux-2.6.39.4/net/mac80211/rate.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/rate.c	2011-08-05 19:44:37.000000000 -0400
 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
  	ASSERT_RTNL();
@@ -77992,9 +66769,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/rate.c linux-2.6.39.3/net/mac80211/rate.c
  		return -EBUSY;
  
  	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-2.6.39.3/net/mac80211/rc80211_pid_debugfs.c linux-2.6.39.3/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.39.3/net/mac80211/rc80211_pid_debugfs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/rc80211_pid_debugfs.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.39.4/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.39.4/net/mac80211/rc80211_pid_debugfs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/rc80211_pid_debugfs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
  	spin_unlock_irqrestore(&events->lock, status);
@@ -78004,9 +66781,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/rc80211_pid_debugfs.c linux-2.6.39.3/net/
  		return -EFAULT;
  
  	return p;
-diff -urNp linux-2.6.39.3/net/mac80211/util.c linux-2.6.39.3/net/mac80211/util.c
---- linux-2.6.39.3/net/mac80211/util.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/mac80211/util.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/mac80211/util.c linux-2.6.39.4/net/mac80211/util.c
+--- linux-2.6.39.4/net/mac80211/util.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/mac80211/util.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1129,7 +1129,7 @@ int ieee80211_reconfig(struct ieee80211_
  		local->resuming = true;
  
@@ -78016,9 +66793,9 @@ diff -urNp linux-2.6.39.3/net/mac80211/util.c linux-2.6.39.3/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.3/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.39.3/net/netfilter/ipvs/ip_vs_conn.c
---- linux-2.6.39.3/net/netfilter/ipvs/ip_vs_conn.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/ipvs/ip_vs_conn.c	2011-07-09 09:19:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.39.4/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-2.6.39.4/net/netfilter/ipvs/ip_vs_conn.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/ipvs/ip_vs_conn.c	2011-08-05 19:44:37.000000000 -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);
@@ -78046,9 +66823,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.39.3/net/net
  	if (i > 8 || i < 0) return 0;
  
  	if (!todrop_rate[i]) return 0;
-diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_core.c linux-2.6.39.3/net/netfilter/ipvs/ip_vs_core.c
---- linux-2.6.39.3/net/netfilter/ipvs/ip_vs_core.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/ipvs/ip_vs_core.c	2011-07-09 09:19:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/ipvs/ip_vs_core.c linux-2.6.39.4/net/netfilter/ipvs/ip_vs_core.c
+--- linux-2.6.39.4/net/netfilter/ipvs/ip_vs_core.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/ipvs/ip_vs_core.c	2011-08-05 19:44:37.000000000 -0400
 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
  		ret = cp->packet_xmit(skb, cp, pd->pp);
  		/* do not touch skb anymore */
@@ -78067,9 +66844,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_core.c linux-2.6.39.3/net/net
  
  	if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
  	    cp->protocol == IPPROTO_SCTP) {
-diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.39.3/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-2.6.39.3/net/netfilter/ipvs/ip_vs_ctl.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/ipvs/ip_vs_ctl.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.39.4/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-2.6.39.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-05 19:44:37.000000000 -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);
@@ -78124,9 +66901,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.39.3/net/netf
  	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.3/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.39.3/net/netfilter/ipvs/ip_vs_sync.c
---- linux-2.6.39.3/net/netfilter/ipvs/ip_vs_sync.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/ipvs/ip_vs_sync.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.39.4/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-2.6.39.4/net/netfilter/ipvs/ip_vs_sync.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/ipvs/ip_vs_sync.c	2011-08-05 19:44:37.000000000 -0400
 @@ -648,7 +648,7 @@ control:
  	 * i.e only increment in_pkts for Templates.
  	 */
@@ -78145,9 +66922,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.39.3/net/net
  	cp->state = state;
  	cp->old_state = cp->state;
  	/*
-diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.39.3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-2.6.39.3/net/netfilter/ipvs/ip_vs_xmit.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/ipvs/ip_vs_xmit.c	2011-05-22 19:36:34.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.39.4/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-2.6.39.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1127,7 +1127,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
  		else
  			rc = NF_ACCEPT;
@@ -78166,9 +66943,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.39.3/net/net
  		goto out;
  	}
  
-diff -urNp linux-2.6.39.3/net/netfilter/Kconfig linux-2.6.39.3/net/netfilter/Kconfig
---- linux-2.6.39.3/net/netfilter/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/Kconfig	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/Kconfig linux-2.6.39.4/net/netfilter/Kconfig
+--- linux-2.6.39.4/net/netfilter/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/Kconfig	2011-08-05 19:44:37.000000000 -0400
 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -78186,9 +66963,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/Kconfig linux-2.6.39.3/net/netfilter/Kco
  config NETFILTER_XT_MATCH_HASHLIMIT
  	tristate '"hashlimit" match support'
  	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.39.3/net/netfilter/Makefile linux-2.6.39.3/net/netfilter/Makefile
---- linux-2.6.39.3/net/netfilter/Makefile	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/Makefile	2011-05-22 20:40:16.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/Makefile linux-2.6.39.4/net/netfilter/Makefile
+--- linux-2.6.39.4/net/netfilter/Makefile	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/Makefile	2011-08-05 19:44:37.000000000 -0400
 @@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
  obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -78197,9 +66974,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/Makefile linux-2.6.39.3/net/netfilter/Ma
  obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-2.6.39.3/net/netfilter/nfnetlink_log.c linux-2.6.39.3/net/netfilter/nfnetlink_log.c
---- linux-2.6.39.3/net/netfilter/nfnetlink_log.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/nfnetlink_log.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/nfnetlink_log.c linux-2.6.39.4/net/netfilter/nfnetlink_log.c
+--- linux-2.6.39.4/net/netfilter/nfnetlink_log.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/nfnetlink_log.c	2011-08-05 19:44:37.000000000 -0400
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -78218,9 +66995,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/nfnetlink_log.c linux-2.6.39.3/net/netfi
  
  	if (data_len) {
  		struct nlattr *nla;
-diff -urNp linux-2.6.39.3/net/netfilter/nfnetlink_queue.c linux-2.6.39.3/net/netfilter/nfnetlink_queue.c
---- linux-2.6.39.3/net/netfilter/nfnetlink_queue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/nfnetlink_queue.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/nfnetlink_queue.c linux-2.6.39.4/net/netfilter/nfnetlink_queue.c
+--- linux-2.6.39.4/net/netfilter/nfnetlink_queue.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/nfnetlink_queue.c	2011-08-05 19:44:37.000000000 -0400
 @@ -58,7 +58,7 @@ struct nfqnl_instance {
   */
  	spinlock_t	lock;
@@ -78248,9 +67025,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/nfnetlink_queue.c linux-2.6.39.3/net/net
  }
  
  static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-2.6.39.3/net/netfilter/xt_gradm.c linux-2.6.39.3/net/netfilter/xt_gradm.c
---- linux-2.6.39.3/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/net/netfilter/xt_gradm.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/xt_gradm.c linux-2.6.39.4/net/netfilter/xt_gradm.c
+--- linux-2.6.39.4/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/net/netfilter/xt_gradm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -78303,9 +67080,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/xt_gradm.c linux-2.6.39.3/net/netfilter/
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.39.3/net/netfilter/xt_statistic.c linux-2.6.39.3/net/netfilter/xt_statistic.c
---- linux-2.6.39.3/net/netfilter/xt_statistic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netfilter/xt_statistic.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netfilter/xt_statistic.c linux-2.6.39.4/net/netfilter/xt_statistic.c
+--- linux-2.6.39.4/net/netfilter/xt_statistic.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netfilter/xt_statistic.c	2011-08-05 19:44:37.000000000 -0400
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -78336,9 +67113,9 @@ diff -urNp linux-2.6.39.3/net/netfilter/xt_statistic.c linux-2.6.39.3/net/netfil
  
  	return 0;
  }
-diff -urNp linux-2.6.39.3/net/netlink/af_netlink.c linux-2.6.39.3/net/netlink/af_netlink.c
---- linux-2.6.39.3/net/netlink/af_netlink.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netlink/af_netlink.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netlink/af_netlink.c linux-2.6.39.4/net/netlink/af_netlink.c
+--- linux-2.6.39.4/net/netlink/af_netlink.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netlink/af_netlink.c	2011-08-05 19:44:37.000000000 -0400
 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock 
  			sk->sk_error_report(sk);
  		}
@@ -78373,9 +67150,9 @@ diff -urNp linux-2.6.39.3/net/netlink/af_netlink.c linux-2.6.39.3/net/netlink/af
  			   sock_i_ino(s)
  			);
  
-diff -urNp linux-2.6.39.3/net/netrom/af_netrom.c linux-2.6.39.3/net/netrom/af_netrom.c
---- linux-2.6.39.3/net/netrom/af_netrom.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/netrom/af_netrom.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/netrom/af_netrom.c linux-2.6.39.4/net/netrom/af_netrom.c
+--- linux-2.6.39.4/net/netrom/af_netrom.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/netrom/af_netrom.c	2011-08-05 19:44:37.000000000 -0400
 @@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc
  	struct sock *sk = sock->sk;
  	struct nr_sock *nr = nr_sk(sk);
@@ -78392,9 +67169,9 @@ diff -urNp linux-2.6.39.3/net/netrom/af_netrom.c linux-2.6.39.3/net/netrom/af_ne
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff -urNp linux-2.6.39.3/net/packet/af_packet.c linux-2.6.39.3/net/packet/af_packet.c
---- linux-2.6.39.3/net/packet/af_packet.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/packet/af_packet.c	2011-07-09 09:19:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/packet/af_packet.c linux-2.6.39.4/net/packet/af_packet.c
+--- linux-2.6.39.4/net/packet/af_packet.c	2011-07-09 09:18:51.000000000 -0400
++++ linux-2.6.39.4/net/packet/af_packet.c	2011-08-05 19:44:37.000000000 -0400
 @@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk
  
  	spin_lock(&sk->sk_receive_queue.lock);
@@ -78442,9 +67219,9 @@ diff -urNp linux-2.6.39.3/net/packet/af_packet.c linux-2.6.39.3/net/packet/af_pa
  			   atomic_read(&s->sk_refcnt),
  			   s->sk_type,
  			   ntohs(po->num),
-diff -urNp linux-2.6.39.3/net/phonet/af_phonet.c linux-2.6.39.3/net/phonet/af_phonet.c
---- linux-2.6.39.3/net/phonet/af_phonet.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/phonet/af_phonet.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/phonet/af_phonet.c linux-2.6.39.4/net/phonet/af_phonet.c
+--- linux-2.6.39.4/net/phonet/af_phonet.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/phonet/af_phonet.c	2011-08-05 20:34:06.000000000 -0400
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
  	struct phonet_protocol *pp;
@@ -78454,15 +67231,6 @@ diff -urNp linux-2.6.39.3/net/phonet/af_phonet.c linux-2.6.39.3/net/phonet/af_ph
  		return NULL;
  
  	rcu_read_lock();
-@@ -149,7 +149,7 @@ static int pn_header_parse(const struct 
- 	return 1;
- }
- 
--struct header_ops phonet_header_ops = {
-+const struct header_ops phonet_header_ops = {
- 	.create = pn_header_create,
- 	.parse = pn_header_parse,
- };
 @@ -469,7 +469,7 @@ int __init_or_module phonet_proto_regist
  {
  	int err = 0;
@@ -78472,9 +67240,9 @@ diff -urNp linux-2.6.39.3/net/phonet/af_phonet.c linux-2.6.39.3/net/phonet/af_ph
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.39.3/net/phonet/pep.c linux-2.6.39.3/net/phonet/pep.c
---- linux-2.6.39.3/net/phonet/pep.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/phonet/pep.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/phonet/pep.c linux-2.6.39.4/net/phonet/pep.c
+--- linux-2.6.39.4/net/phonet/pep.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/phonet/pep.c	2011-08-05 19:44:37.000000000 -0400
 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
  	case PNS_PEP_CTRL_REQ:
@@ -78502,9 +67270,9 @@ diff -urNp linux-2.6.39.3/net/phonet/pep.c linux-2.6.39.3/net/phonet/pep.c
  			err = NET_RX_DROP;
  			break;
  		}
-diff -urNp linux-2.6.39.3/net/phonet/socket.c linux-2.6.39.3/net/phonet/socket.c
---- linux-2.6.39.3/net/phonet/socket.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/phonet/socket.c	2011-05-22 20:39:26.000000000 -0400
+diff -urNp linux-2.6.39.4/net/phonet/socket.c linux-2.6.39.4/net/phonet/socket.c
+--- linux-2.6.39.4/net/phonet/socket.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/phonet/socket.c	2011-08-05 19:44:37.000000000 -0400
 @@ -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),
@@ -78521,9 +67289,9 @@ diff -urNp linux-2.6.39.3/net/phonet/socket.c linux-2.6.39.3/net/phonet/socket.c
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
-diff -urNp linux-2.6.39.3/net/rds/cong.c linux-2.6.39.3/net/rds/cong.c
---- linux-2.6.39.3/net/rds/cong.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/cong.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/cong.c linux-2.6.39.4/net/rds/cong.c
+--- linux-2.6.39.4/net/rds/cong.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/cong.c	2011-08-05 19:44:37.000000000 -0400
 @@ -77,7 +77,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
@@ -78551,9 +67319,9 @@ diff -urNp linux-2.6.39.3/net/rds/cong.c linux-2.6.39.3/net/rds/cong.c
  
  	if (likely(*recent == gen))
  		return 0;
-diff -urNp linux-2.6.39.3/net/rds/ib_cm.c linux-2.6.39.3/net/rds/ib_cm.c
---- linux-2.6.39.3/net/rds/ib_cm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/ib_cm.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/ib_cm.c linux-2.6.39.4/net/rds/ib_cm.c
+--- linux-2.6.39.4/net/rds/ib_cm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/ib_cm.c	2011-08-05 19:44:37.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);
@@ -78563,9 +67331,9 @@ diff -urNp linux-2.6.39.3/net/rds/ib_cm.c linux-2.6.39.3/net/rds/ib_cm.c
  #else
  	ic->i_ack_next = 0;
  #endif
-diff -urNp linux-2.6.39.3/net/rds/ib.h linux-2.6.39.3/net/rds/ib.h
---- linux-2.6.39.3/net/rds/ib.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/ib.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/ib.h linux-2.6.39.4/net/rds/ib.h
+--- linux-2.6.39.4/net/rds/ib.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/ib.h	2011-08-05 19:44:37.000000000 -0400
 @@ -127,7 +127,7 @@ struct rds_ib_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
@@ -78575,9 +67343,9 @@ diff -urNp linux-2.6.39.3/net/rds/ib.h linux-2.6.39.3/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.3/net/rds/ib_recv.c linux-2.6.39.3/net/rds/ib_recv.c
---- linux-2.6.39.3/net/rds/ib_recv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/ib_recv.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/ib_recv.c linux-2.6.39.4/net/rds/ib_recv.c
+--- linux-2.6.39.4/net/rds/ib_recv.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/ib_recv.c	2011-08-05 19:44:37.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)
@@ -78596,9 +67364,9 @@ diff -urNp linux-2.6.39.3/net/rds/ib_recv.c linux-2.6.39.3/net/rds/ib_recv.c
  }
  #endif
  
-diff -urNp linux-2.6.39.3/net/rds/iw_cm.c linux-2.6.39.3/net/rds/iw_cm.c
---- linux-2.6.39.3/net/rds/iw_cm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/iw_cm.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/iw_cm.c linux-2.6.39.4/net/rds/iw_cm.c
+--- linux-2.6.39.4/net/rds/iw_cm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/iw_cm.c	2011-08-05 19:44:37.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);
@@ -78608,9 +67376,9 @@ diff -urNp linux-2.6.39.3/net/rds/iw_cm.c linux-2.6.39.3/net/rds/iw_cm.c
  #else
  	ic->i_ack_next = 0;
  #endif
-diff -urNp linux-2.6.39.3/net/rds/iw.h linux-2.6.39.3/net/rds/iw.h
---- linux-2.6.39.3/net/rds/iw.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/iw.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/iw.h linux-2.6.39.4/net/rds/iw.h
+--- linux-2.6.39.4/net/rds/iw.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/iw.h	2011-08-05 19:44:37.000000000 -0400
 @@ -133,7 +133,7 @@ struct rds_iw_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
@@ -78620,9 +67388,9 @@ diff -urNp linux-2.6.39.3/net/rds/iw.h linux-2.6.39.3/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.3/net/rds/iw_rdma.c linux-2.6.39.3/net/rds/iw_rdma.c
---- linux-2.6.39.3/net/rds/iw_rdma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/iw_rdma.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/iw_rdma.c linux-2.6.39.4/net/rds/iw_rdma.c
+--- linux-2.6.39.4/net/rds/iw_rdma.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/iw_rdma.c	2011-08-05 19:44:37.000000000 -0400
 @@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
  	struct rdma_cm_id *pcm_id;
  	int rc;
@@ -78632,9 +67400,9 @@ diff -urNp linux-2.6.39.3/net/rds/iw_rdma.c linux-2.6.39.3/net/rds/iw_rdma.c
  	src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
  	dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff -urNp linux-2.6.39.3/net/rds/iw_recv.c linux-2.6.39.3/net/rds/iw_recv.c
---- linux-2.6.39.3/net/rds/iw_recv.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rds/iw_recv.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rds/iw_recv.c linux-2.6.39.4/net/rds/iw_recv.c
+--- linux-2.6.39.4/net/rds/iw_recv.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rds/iw_recv.c	2011-08-05 19:44:37.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)
@@ -78653,9 +67421,9 @@ diff -urNp linux-2.6.39.3/net/rds/iw_recv.c linux-2.6.39.3/net/rds/iw_recv.c
  }
  #endif
  
-diff -urNp linux-2.6.39.3/net/rxrpc/af_rxrpc.c linux-2.6.39.3/net/rxrpc/af_rxrpc.c
---- linux-2.6.39.3/net/rxrpc/af_rxrpc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/af_rxrpc.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/af_rxrpc.c linux-2.6.39.4/net/rxrpc/af_rxrpc.c
+--- linux-2.6.39.4/net/rxrpc/af_rxrpc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/af_rxrpc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
@@ -78665,9 +67433,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/af_rxrpc.c linux-2.6.39.3/net/rxrpc/af_rxrpc
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-ack.c linux-2.6.39.3/net/rxrpc/ar-ack.c
---- linux-2.6.39.3/net/rxrpc/ar-ack.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-ack.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-ack.c linux-2.6.39.4/net/rxrpc/ar-ack.c
+--- linux-2.6.39.4/net/rxrpc/ar-ack.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-ack.c	2011-08-05 19:44:37.000000000 -0400
 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
  	_enter("{%d,%d,%d,%d},",
@@ -78740,9 +67508,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-ack.c linux-2.6.39.3/net/rxrpc/ar-ack.c
  	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-call.c linux-2.6.39.3/net/rxrpc/ar-call.c
---- linux-2.6.39.3/net/rxrpc/ar-call.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-call.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-call.c linux-2.6.39.4/net/rxrpc/ar-call.c
+--- linux-2.6.39.4/net/rxrpc/ar-call.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-call.c	2011-08-05 19:44:37.000000000 -0400
 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
  	spin_lock_init(&call->lock);
  	rwlock_init(&call->state_lock);
@@ -78752,9 +67520,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-call.c linux-2.6.39.3/net/rxrpc/ar-call.c
  	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
  	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-connection.c linux-2.6.39.3/net/rxrpc/ar-connection.c
---- linux-2.6.39.3/net/rxrpc/ar-connection.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-connection.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-connection.c linux-2.6.39.4/net/rxrpc/ar-connection.c
+--- linux-2.6.39.4/net/rxrpc/ar-connection.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-connection.c	2011-08-05 19:44:37.000000000 -0400
 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
  		rwlock_init(&conn->lock);
  		spin_lock_init(&conn->state_lock);
@@ -78764,9 +67532,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-connection.c linux-2.6.39.3/net/rxrpc/ar-
  		conn->avail_calls = RXRPC_MAXCALLS;
  		conn->size_align = 4;
  		conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-connevent.c linux-2.6.39.3/net/rxrpc/ar-connevent.c
---- linux-2.6.39.3/net/rxrpc/ar-connevent.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-connevent.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-connevent.c linux-2.6.39.4/net/rxrpc/ar-connevent.c
+--- linux-2.6.39.4/net/rxrpc/ar-connevent.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-connevent.c	2011-08-05 19:44:37.000000000 -0400
 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
  	len = iov[0].iov_len + iov[1].iov_len;
@@ -78776,9 +67544,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-connevent.c linux-2.6.39.3/net/rxrpc/ar-c
  	_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-input.c linux-2.6.39.3/net/rxrpc/ar-input.c
---- linux-2.6.39.3/net/rxrpc/ar-input.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-input.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-input.c linux-2.6.39.4/net/rxrpc/ar-input.c
+--- linux-2.6.39.4/net/rxrpc/ar-input.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-input.c	2011-08-05 19:44:37.000000000 -0400
 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
  	/* track the latest serial number on this connection for ACK packet
  	 * information */
@@ -78791,9 +67559,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-input.c linux-2.6.39.3/net/rxrpc/ar-input
  					   serial);
  
  	/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-internal.h linux-2.6.39.3/net/rxrpc/ar-internal.h
---- linux-2.6.39.3/net/rxrpc/ar-internal.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-internal.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-internal.h linux-2.6.39.4/net/rxrpc/ar-internal.h
+--- linux-2.6.39.4/net/rxrpc/ar-internal.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-internal.h	2011-08-05 19:44:37.000000000 -0400
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
  	int			error;		/* error code for local abort */
  	int			debug_id;	/* debug ID for printks */
@@ -78823,9 +67591,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-internal.h linux-2.6.39.3/net/rxrpc/ar-in
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-local.c linux-2.6.39.3/net/rxrpc/ar-local.c
---- linux-2.6.39.3/net/rxrpc/ar-local.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-local.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-local.c linux-2.6.39.4/net/rxrpc/ar-local.c
+--- linux-2.6.39.4/net/rxrpc/ar-local.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-local.c	2011-08-05 19:44:37.000000000 -0400
 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
  		spin_lock_init(&local->lock);
  		rwlock_init(&local->services_lock);
@@ -78835,9 +67603,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-local.c linux-2.6.39.3/net/rxrpc/ar-local
  		memcpy(&local->srx, srx, sizeof(*srx));
  	}
  
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-output.c linux-2.6.39.3/net/rxrpc/ar-output.c
---- linux-2.6.39.3/net/rxrpc/ar-output.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-output.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-output.c linux-2.6.39.4/net/rxrpc/ar-output.c
+--- linux-2.6.39.4/net/rxrpc/ar-output.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-output.c	2011-08-05 19:44:37.000000000 -0400
 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb 
  			sp->hdr.cid = call->cid;
  			sp->hdr.callNumber = call->call_id;
@@ -78850,9 +67618,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-output.c linux-2.6.39.3/net/rxrpc/ar-outp
  			sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
  			sp->hdr.userStatus = 0;
  			sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-peer.c linux-2.6.39.3/net/rxrpc/ar-peer.c
---- linux-2.6.39.3/net/rxrpc/ar-peer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-peer.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-peer.c linux-2.6.39.4/net/rxrpc/ar-peer.c
+--- linux-2.6.39.4/net/rxrpc/ar-peer.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-peer.c	2011-08-05 19:44:37.000000000 -0400
 @@ -71,7 +71,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
  		INIT_LIST_HEAD(&peer->error_targets);
  		spin_lock_init(&peer->lock);
@@ -78862,9 +67630,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-peer.c linux-2.6.39.3/net/rxrpc/ar-peer.c
  		memcpy(&peer->srx, srx, sizeof(*srx));
  
  		rxrpc_assess_MTU_size(peer);
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-proc.c linux-2.6.39.3/net/rxrpc/ar-proc.c
---- linux-2.6.39.3/net/rxrpc/ar-proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-proc.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-proc.c linux-2.6.39.4/net/rxrpc/ar-proc.c
+--- linux-2.6.39.4/net/rxrpc/ar-proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
  		   atomic_read(&conn->usage),
  		   rxrpc_conn_states[conn->state],
@@ -78876,9 +67644,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-proc.c linux-2.6.39.3/net/rxrpc/ar-proc.c
  
  	return 0;
  }
-diff -urNp linux-2.6.39.3/net/rxrpc/ar-transport.c linux-2.6.39.3/net/rxrpc/ar-transport.c
---- linux-2.6.39.3/net/rxrpc/ar-transport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/ar-transport.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/ar-transport.c linux-2.6.39.4/net/rxrpc/ar-transport.c
+--- linux-2.6.39.4/net/rxrpc/ar-transport.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/ar-transport.c	2011-08-05 19:44:37.000000000 -0400
 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
  		spin_lock_init(&trans->client_lock);
  		rwlock_init(&trans->conn_lock);
@@ -78888,9 +67656,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/ar-transport.c linux-2.6.39.3/net/rxrpc/ar-t
  
  		if (peer->srx.transport.family == AF_INET) {
  			switch (peer->srx.transport_type) {
-diff -urNp linux-2.6.39.3/net/rxrpc/rxkad.c linux-2.6.39.3/net/rxrpc/rxkad.c
---- linux-2.6.39.3/net/rxrpc/rxkad.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/rxrpc/rxkad.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/rxrpc/rxkad.c linux-2.6.39.4/net/rxrpc/rxkad.c
+--- linux-2.6.39.4/net/rxrpc/rxkad.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/rxrpc/rxkad.c	2011-08-05 19:44:37.000000000 -0400
 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
  	u16 check;
  	int nsg;
@@ -78927,21 +67695,9 @@ diff -urNp linux-2.6.39.3/net/rxrpc/rxkad.c linux-2.6.39.3/net/rxrpc/rxkad.c
  	_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-2.6.39.3/net/sched/em_meta.c linux-2.6.39.3/net/sched/em_meta.c
---- linux-2.6.39.3/net/sched/em_meta.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sched/em_meta.c	2011-05-22 19:36:35.000000000 -0400
-@@ -832,7 +832,7 @@ static int em_meta_dump(struct sk_buff *
- {
- 	struct meta_match *meta = (struct meta_match *) em->data;
- 	struct tcf_meta_hdr hdr;
--	struct meta_type_ops *ops;
-+	const struct meta_type_ops *ops;
- 
- 	memset(&hdr, 0, sizeof(hdr));
- 	memcpy(&hdr.left, &meta->lvalue.hdr, sizeof(hdr.left));
-diff -urNp linux-2.6.39.3/net/sctp/proc.c linux-2.6.39.3/net/sctp/proc.c
---- linux-2.6.39.3/net/sctp/proc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sctp/proc.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sctp/proc.c linux-2.6.39.4/net/sctp/proc.c
+--- linux-2.6.39.4/net/sctp/proc.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/sctp/proc.c	2011-08-05 19:44:37.000000000 -0400
 @@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_
  	sctp_for_each_hentry(epb, node, &head->chain) {
  		ep = sctp_ep(epb);
@@ -78970,9 +67726,9 @@ diff -urNp linux-2.6.39.3/net/sctp/proc.c linux-2.6.39.3/net/sctp/proc.c
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff -urNp linux-2.6.39.3/net/sctp/socket.c linux-2.6.39.3/net/sctp/socket.c
---- linux-2.6.39.3/net/sctp/socket.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sctp/socket.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sctp/socket.c linux-2.6.39.4/net/sctp/socket.c
+--- linux-2.6.39.4/net/sctp/socket.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/sctp/socket.c	2011-08-05 19:44:37.000000000 -0400
 @@ -4433,7 +4433,7 @@ static int sctp_getsockopt_peer_addrs(st
  		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
  		if (space_left < addrlen)
@@ -78982,9 +67738,9 @@ diff -urNp linux-2.6.39.3/net/sctp/socket.c linux-2.6.39.3/net/sctp/socket.c
  			return -EFAULT;
  		to += addrlen;
  		cnt++;
-diff -urNp linux-2.6.39.3/net/socket.c linux-2.6.39.3/net/socket.c
---- linux-2.6.39.3/net/socket.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/net/socket.c	2011-06-03 00:32:08.000000000 -0400
+diff -urNp linux-2.6.39.4/net/socket.c linux-2.6.39.4/net/socket.c
+--- linux-2.6.39.4/net/socket.c	2011-06-03 00:04:14.000000000 -0400
++++ linux-2.6.39.4/net/socket.c	2011-08-05 19:44:37.000000000 -0400
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -79144,9 +67900,9 @@ diff -urNp linux-2.6.39.3/net/socket.c linux-2.6.39.3/net/socket.c
  	err = -EFAULT;
  	if (MSG_CMSG_COMPAT & flags) {
  		if (get_compat_msghdr(&msg_sys, msg_compat))
-diff -urNp linux-2.6.39.3/net/sunrpc/sched.c linux-2.6.39.3/net/sunrpc/sched.c
---- linux-2.6.39.3/net/sunrpc/sched.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/net/sunrpc/sched.c	2011-07-09 09:19:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sunrpc/sched.c linux-2.6.39.4/net/sunrpc/sched.c
+--- linux-2.6.39.4/net/sunrpc/sched.c	2011-08-05 21:11:51.000000000 -0400
++++ linux-2.6.39.4/net/sunrpc/sched.c	2011-08-05 21:12:20.000000000 -0400
 @@ -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)
@@ -79159,9 +67915,9 @@ diff -urNp linux-2.6.39.3/net/sunrpc/sched.c linux-2.6.39.3/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-08-05 19:44:37.000000000 -0400
 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
  static unsigned int min_max_inline = 4096;
  static unsigned int max_max_inline = 65536;
@@ -79269,9 +68025,9 @@ diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.39.3/net/sunr
  		.mode		= 0644,
  		.proc_handler	= read_reset_stat,
  	},
-diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-08-05 19:44:37.000000000 -0400
 @@ -499,7 +499,7 @@ next_sge:
  			svc_rdma_put_context(ctxt, 0);
  			goto out;
@@ -79299,9 +68055,9 @@ diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.39.3
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-08-05 19:44:37.000000000 -0400
 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
  	write_wr.wr.rdma.remote_addr = to;
  
@@ -79311,9 +68067,9 @@ diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.39.3/n
  	if (svc_rdma_send(xprt, &write_wr))
  		goto err;
  	return 0;
-diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-08-05 19:44:37.000000000 -0400
 @@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
  		return;
  
@@ -79359,9 +68115,9 @@ diff -urNp linux-2.6.39.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.39.
  
  			/* See if we can opportunistically reap SQ WR to make room */
  			sq_cq_reap(xprt);
-diff -urNp linux-2.6.39.3/net/sysctl_net.c linux-2.6.39.3/net/sysctl_net.c
---- linux-2.6.39.3/net/sysctl_net.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/sysctl_net.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/net/sysctl_net.c linux-2.6.39.4/net/sysctl_net.c
+--- linux-2.6.39.4/net/sysctl_net.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/sysctl_net.c	2011-08-05 19:44:37.000000000 -0400
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
  			       struct ctl_table *table)
  {
@@ -79371,9 +68127,9 @@ diff -urNp linux-2.6.39.3/net/sysctl_net.c linux-2.6.39.3/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-2.6.39.3/net/unix/af_unix.c linux-2.6.39.3/net/unix/af_unix.c
---- linux-2.6.39.3/net/unix/af_unix.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/unix/af_unix.c	2011-07-18 18:16:27.000000000 -0400
+diff -urNp linux-2.6.39.4/net/unix/af_unix.c linux-2.6.39.4/net/unix/af_unix.c
+--- linux-2.6.39.4/net/unix/af_unix.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/unix/af_unix.c	2011-08-05 19:44:37.000000000 -0400
 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
@@ -79432,9 +68188,21 @@ diff -urNp linux-2.6.39.3/net/unix/af_unix.c linux-2.6.39.3/net/unix/af_unix.c
  			atomic_read(&s->sk_refcnt),
  			0,
  			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.39.3/net/wireless/wext-core.c linux-2.6.39.3/net/wireless/wext-core.c
---- linux-2.6.39.3/net/wireless/wext-core.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/wireless/wext-core.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/wireless/core.h linux-2.6.39.4/net/wireless/core.h
+--- linux-2.6.39.4/net/wireless/core.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/wireless/core.h	2011-08-05 20:34:06.000000000 -0400
+@@ -27,7 +27,7 @@ struct cfg80211_registered_device {
+ 	struct mutex mtx;
+ 
+ 	/* rfkill support */
+-	struct rfkill_ops rfkill_ops;
++	rfkill_ops_no_const rfkill_ops;
+ 	struct rfkill *rfkill;
+ 	struct work_struct rfkill_sync;
+ 
+diff -urNp linux-2.6.39.4/net/wireless/wext-core.c linux-2.6.39.4/net/wireless/wext-core.c
+--- linux-2.6.39.4/net/wireless/wext-core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/wireless/wext-core.c	2011-08-05 19:44:37.000000000 -0400
 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
@@ -79468,9 +68236,9 @@ diff -urNp linux-2.6.39.3/net/wireless/wext-core.c linux-2.6.39.3/net/wireless/w
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff -urNp linux-2.6.39.3/net/xfrm/xfrm_policy.c linux-2.6.39.3/net/xfrm/xfrm_policy.c
---- linux-2.6.39.3/net/xfrm/xfrm_policy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/xfrm/xfrm_policy.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/xfrm/xfrm_policy.c linux-2.6.39.4/net/xfrm/xfrm_policy.c
+--- linux-2.6.39.4/net/xfrm/xfrm_policy.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/xfrm/xfrm_policy.c	2011-08-05 19:44:37.000000000 -0400
 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
  {
  	policy->walk.dead = 1;
@@ -79543,9 +68311,9 @@ diff -urNp linux-2.6.39.3/net/xfrm/xfrm_policy.c linux-2.6.39.3/net/xfrm/xfrm_po
  		}
  	}
  
-diff -urNp linux-2.6.39.3/net/xfrm/xfrm_user.c linux-2.6.39.3/net/xfrm/xfrm_user.c
---- linux-2.6.39.3/net/xfrm/xfrm_user.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/net/xfrm/xfrm_user.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/net/xfrm/xfrm_user.c linux-2.6.39.4/net/xfrm/xfrm_user.c
+--- linux-2.6.39.4/net/xfrm/xfrm_user.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/net/xfrm/xfrm_user.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
  	struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
  	int i;
@@ -79564,9 +68332,9 @@ diff -urNp linux-2.6.39.3/net/xfrm/xfrm_user.c linux-2.6.39.3/net/xfrm/xfrm_user
  	if (attrs[XFRMA_MIGRATE] == NULL)
  		return -EINVAL;
  
-diff -urNp linux-2.6.39.3/scripts/basic/fixdep.c linux-2.6.39.3/scripts/basic/fixdep.c
---- linux-2.6.39.3/scripts/basic/fixdep.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/basic/fixdep.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/basic/fixdep.c linux-2.6.39.4/scripts/basic/fixdep.c
+--- linux-2.6.39.4/scripts/basic/fixdep.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/basic/fixdep.c	2011-08-05 19:44:37.000000000 -0400
 @@ -235,9 +235,9 @@ static void use_config(const char *m, in
  
  static void parse_config_file(const char *map, size_t len)
@@ -79588,30 +68356,16 @@ diff -urNp linux-2.6.39.3/scripts/basic/fixdep.c linux-2.6.39.3/scripts/basic/fi
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.39.3/scripts/dtc/flattree.c linux-2.6.39.3/scripts/dtc/flattree.c
---- linux-2.6.39.3/scripts/dtc/flattree.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct emitter bin_emitter = {
-+static const struct emitter bin_emitter = {
- 	.cell = bin_emit_cell,
- 	.string = bin_emit_string,
- 	.align = bin_emit_align,
-@@ -230,7 +230,7 @@ static void asm_emit_property(void *e, s
- 	asm_emit_cell(e, FDT_PROP);
- }
- 
--static struct emitter asm_emitter = {
-+static const struct emitter asm_emitter = {
- 	.cell = asm_emit_cell,
- 	.string = asm_emit_string,
- 	.align = asm_emit_align,
-diff -urNp linux-2.6.39.3/scripts/Makefile.build linux-2.6.39.3/scripts/Makefile.build
---- linux-2.6.39.3/scripts/Makefile.build	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/Makefile.build	2011-06-03 01:15:00.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/gcc-plugin.sh linux-2.6.39.4/scripts/gcc-plugin.sh
+--- linux-2.6.39.4/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/scripts/gcc-plugin.sh	2011-08-05 20:34:06.000000000 -0400
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++echo "#include \"gcc-plugin.h\"" | $* -x c - -c -o /dev/null -I`$* -print-file-name=plugin`/include>/dev/null 2>&1 && echo "y"
+diff -urNp linux-2.6.39.4/scripts/Makefile.build linux-2.6.39.4/scripts/Makefile.build
+--- linux-2.6.39.4/scripts/Makefile.build	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/Makefile.build	2011-08-05 19:44:37.000000000 -0400
 @@ -93,7 +93,7 @@ endif
  endif
  
@@ -79621,9 +68375,9 @@ diff -urNp linux-2.6.39.3/scripts/Makefile.build linux-2.6.39.3/scripts/Makefile
  include scripts/Makefile.host
  endif
  
-diff -urNp linux-2.6.39.3/scripts/Makefile.clean linux-2.6.39.3/scripts/Makefile.clean
---- linux-2.6.39.3/scripts/Makefile.clean	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/Makefile.clean	2011-06-03 01:16:02.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/Makefile.clean linux-2.6.39.4/scripts/Makefile.clean
+--- linux-2.6.39.4/scripts/Makefile.clean	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/Makefile.clean	2011-08-05 19:44:37.000000000 -0400
 @@ -43,7 +43,8 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subd
  __clean-files	:= $(extra-y) $(always)                  \
  		   $(targets) $(clean-files)             \
@@ -79634,9 +68388,9 @@ diff -urNp linux-2.6.39.3/scripts/Makefile.clean linux-2.6.39.3/scripts/Makefile
  
  __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
  
-diff -urNp linux-2.6.39.3/scripts/Makefile.host linux-2.6.39.3/scripts/Makefile.host
---- linux-2.6.39.3/scripts/Makefile.host	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/Makefile.host	2011-06-03 01:17:12.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/Makefile.host linux-2.6.39.4/scripts/Makefile.host
+--- linux-2.6.39.4/scripts/Makefile.host	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/Makefile.host	2011-08-05 19:44:37.000000000 -0400
 @@ -31,6 +31,7 @@
  # Note: Shared libraries consisting of C++ files are not supported
  
@@ -79653,9 +68407,9 @@ diff -urNp linux-2.6.39.3/scripts/Makefile.host linux-2.6.39.3/scripts/Makefile.
  # Remove .so files from "xxx-objs"
  host-cobjs	:= $(filter-out %.so,$(host-cobjs))
  
-diff -urNp linux-2.6.39.3/scripts/mod/file2alias.c linux-2.6.39.3/scripts/mod/file2alias.c
---- linux-2.6.39.3/scripts/mod/file2alias.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/mod/file2alias.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/mod/file2alias.c linux-2.6.39.4/scripts/mod/file2alias.c
+--- linux-2.6.39.4/scripts/mod/file2alias.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/mod/file2alias.c	2011-08-05 19:44:37.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
@@ -79710,9 +68464,9 @@ diff -urNp linux-2.6.39.3/scripts/mod/file2alias.c linux-2.6.39.3/scripts/mod/fi
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-2.6.39.3/scripts/mod/modpost.c linux-2.6.39.3/scripts/mod/modpost.c
---- linux-2.6.39.3/scripts/mod/modpost.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/mod/modpost.c	2011-07-06 20:00:13.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/mod/modpost.c linux-2.6.39.4/scripts/mod/modpost.c
+--- linux-2.6.39.4/scripts/mod/modpost.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/mod/modpost.c	2011-08-05 19:44:37.000000000 -0400
 @@ -896,6 +896,7 @@ enum mismatch {
  	ANY_INIT_TO_ANY_EXIT,
  	ANY_EXIT_TO_ANY_INIT,
@@ -79789,9 +68543,9 @@ diff -urNp linux-2.6.39.3/scripts/mod/modpost.c linux-2.6.39.3/scripts/mod/modpo
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.39.3/scripts/mod/modpost.h linux-2.6.39.3/scripts/mod/modpost.h
---- linux-2.6.39.3/scripts/mod/modpost.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/mod/modpost.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/mod/modpost.h linux-2.6.39.4/scripts/mod/modpost.h
+--- linux-2.6.39.4/scripts/mod/modpost.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/mod/modpost.h	2011-08-05 19:44:37.000000000 -0400
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -79811,9 +68565,9 @@ diff -urNp linux-2.6.39.3/scripts/mod/modpost.h linux-2.6.39.3/scripts/mod/modpo
  
  struct module {
  	struct module *next;
-diff -urNp linux-2.6.39.3/scripts/mod/sumversion.c linux-2.6.39.3/scripts/mod/sumversion.c
---- linux-2.6.39.3/scripts/mod/sumversion.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/mod/sumversion.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/mod/sumversion.c linux-2.6.39.4/scripts/mod/sumversion.c
+--- linux-2.6.39.4/scripts/mod/sumversion.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/mod/sumversion.c	2011-08-05 19:44:37.000000000 -0400
 @@ -470,7 +470,7 @@ static void write_version(const char *fi
  		goto out;
  	}
@@ -79823,9 +68577,9 @@ diff -urNp linux-2.6.39.3/scripts/mod/sumversion.c linux-2.6.39.3/scripts/mod/su
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-2.6.39.3/scripts/pnmtologo.c linux-2.6.39.3/scripts/pnmtologo.c
---- linux-2.6.39.3/scripts/pnmtologo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/scripts/pnmtologo.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/scripts/pnmtologo.c linux-2.6.39.4/scripts/pnmtologo.c
+--- linux-2.6.39.4/scripts/pnmtologo.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/scripts/pnmtologo.c	2011-08-05 19:44:37.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -79852,9 +68606,9 @@ diff -urNp linux-2.6.39.3/scripts/pnmtologo.c linux-2.6.39.3/scripts/pnmtologo.c
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.39.3/security/apparmor/lsm.c linux-2.6.39.3/security/apparmor/lsm.c
---- linux-2.6.39.3/security/apparmor/lsm.c	2011-06-25 12:55:23.000000000 -0400
-+++ linux-2.6.39.3/security/apparmor/lsm.c	2011-06-25 13:00:28.000000000 -0400
+diff -urNp linux-2.6.39.4/security/apparmor/lsm.c linux-2.6.39.4/security/apparmor/lsm.c
+--- linux-2.6.39.4/security/apparmor/lsm.c	2011-06-25 12:55:23.000000000 -0400
++++ linux-2.6.39.4/security/apparmor/lsm.c	2011-08-05 20:34:06.000000000 -0400
 @@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
  	return error;
  }
@@ -79864,36 +68618,9 @@ diff -urNp linux-2.6.39.3/security/apparmor/lsm.c linux-2.6.39.3/security/apparm
  	.name =				"apparmor",
  
  	.ptrace_access_check =		apparmor_ptrace_access_check,
-@@ -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)
--static struct kernel_param_ops param_ops_aabool = {
-+static const struct kernel_param_ops param_ops_aabool = {
- 	.set = param_set_aabool,
- 	.get = param_get_aabool
- };
-@@ -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)
--static struct kernel_param_ops param_ops_aauint = {
-+static const struct kernel_param_ops param_ops_aauint = {
- 	.set = param_set_aauint,
- 	.get = param_get_aauint
- };
-@@ -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_param *kp);
- #define param_check_aalockpolicy(name, p) __param_check(name, p, int)
--static struct kernel_param_ops param_ops_aalockpolicy = {
-+static const struct kernel_param_ops param_ops_aalockpolicy = {
- 	.set = param_set_aalockpolicy,
- 	.get = param_get_aalockpolicy
- };
-diff -urNp linux-2.6.39.3/security/commoncap.c linux-2.6.39.3/security/commoncap.c
---- linux-2.6.39.3/security/commoncap.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/commoncap.c	2011-05-22 20:28:59.000000000 -0400
+diff -urNp linux-2.6.39.4/security/commoncap.c linux-2.6.39.4/security/commoncap.c
+--- linux-2.6.39.4/security/commoncap.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/commoncap.c	2011-08-05 19:44:37.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
@@ -79921,9 +68648,9 @@ diff -urNp linux-2.6.39.3/security/commoncap.c linux-2.6.39.3/security/commoncap
  	if (cred->uid != 0) {
  		if (bprm->cap_effective)
  			return 1;
-diff -urNp linux-2.6.39.3/security/integrity/ima/ima_api.c linux-2.6.39.3/security/integrity/ima/ima_api.c
---- linux-2.6.39.3/security/integrity/ima/ima_api.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/integrity/ima/ima_api.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/integrity/ima/ima_api.c linux-2.6.39.4/security/integrity/ima/ima_api.c
+--- linux-2.6.39.4/security/integrity/ima/ima_api.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/integrity/ima/ima_api.c	2011-08-05 19:44:37.000000000 -0400
 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
  	int result;
  
@@ -79933,9 +68660,9 @@ diff -urNp linux-2.6.39.3/security/integrity/ima/ima_api.c linux-2.6.39.3/securi
  
  	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
  	if (!entry) {
-diff -urNp linux-2.6.39.3/security/integrity/ima/ima_fs.c linux-2.6.39.3/security/integrity/ima/ima_fs.c
---- linux-2.6.39.3/security/integrity/ima/ima_fs.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/integrity/ima/ima_fs.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/integrity/ima/ima_fs.c linux-2.6.39.4/security/integrity/ima/ima_fs.c
+--- linux-2.6.39.4/security/integrity/ima/ima_fs.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/integrity/ima/ima_fs.c	2011-08-05 19:44:37.000000000 -0400
 @@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -79951,9 +68678,9 @@ diff -urNp linux-2.6.39.3/security/integrity/ima/ima_fs.c linux-2.6.39.3/securit
  	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-2.6.39.3/security/integrity/ima/ima.h linux-2.6.39.3/security/integrity/ima/ima.h
---- linux-2.6.39.3/security/integrity/ima/ima.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/integrity/ima/ima.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/integrity/ima/ima.h linux-2.6.39.4/security/integrity/ima/ima.h
+--- linux-2.6.39.4/security/integrity/ima/ima.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/integrity/ima/ima.h	2011-08-05 19:44:37.000000000 -0400
 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -79965,9 +68692,9 @@ diff -urNp linux-2.6.39.3/security/integrity/ima/ima.h linux-2.6.39.3/security/i
  	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.39.3/security/integrity/ima/ima_queue.c linux-2.6.39.3/security/integrity/ima/ima_queue.c
---- linux-2.6.39.3/security/integrity/ima/ima_queue.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/integrity/ima/ima_queue.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/integrity/ima/ima_queue.c linux-2.6.39.4/security/integrity/ima/ima_queue.c
+--- linux-2.6.39.4/security/integrity/ima/ima_queue.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/integrity/ima/ima_queue.c	2011-08-05 19:44:37.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);
@@ -79977,9 +68704,9 @@ diff -urNp linux-2.6.39.3/security/integrity/ima/ima_queue.c linux-2.6.39.3/secu
  	key = ima_hash_key(entry->digest);
  	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
  	return 0;
-diff -urNp linux-2.6.39.3/security/Kconfig linux-2.6.39.3/security/Kconfig
---- linux-2.6.39.3/security/Kconfig	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/Kconfig	2011-07-06 19:58:46.000000000 -0400
+diff -urNp linux-2.6.39.4/security/Kconfig linux-2.6.39.4/security/Kconfig
+--- linux-2.6.39.4/security/Kconfig	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/Kconfig	2011-08-05 19:44:37.000000000 -0400
 @@ -4,6 +4,554 @@
  
  menu "Security options"
@@ -80544,9 +69271,9 @@ diff -urNp linux-2.6.39.3/security/Kconfig linux-2.6.39.3/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.3/security/keys/keyring.c linux-2.6.39.3/security/keys/keyring.c
---- linux-2.6.39.3/security/keys/keyring.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/keys/keyring.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/keys/keyring.c linux-2.6.39.4/security/keys/keyring.c
+--- linux-2.6.39.4/security/keys/keyring.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/keys/keyring.c	2011-08-05 19:44:37.000000000 -0400
 @@ -213,15 +213,15 @@ static long keyring_read(const struct ke
  			ret = -EFAULT;
  
@@ -80566,9 +69293,9 @@ diff -urNp linux-2.6.39.3/security/keys/keyring.c linux-2.6.39.3/security/keys/k
  					goto error;
  
  				buflen -= tmp;
-diff -urNp linux-2.6.39.3/security/min_addr.c linux-2.6.39.3/security/min_addr.c
---- linux-2.6.39.3/security/min_addr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/min_addr.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/security/min_addr.c linux-2.6.39.4/security/min_addr.c
+--- linux-2.6.39.4/security/min_addr.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/min_addr.c	2011-08-05 19:44:37.000000000 -0400
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -80585,9 +69312,9 @@ diff -urNp linux-2.6.39.3/security/min_addr.c linux-2.6.39.3/security/min_addr.c
  }
  
  /*
-diff -urNp linux-2.6.39.3/security/security.c linux-2.6.39.3/security/security.c
---- linux-2.6.39.3/security/security.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/security.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/security/security.c linux-2.6.39.4/security/security.c
+--- linux-2.6.39.4/security/security.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/security.c	2011-08-05 19:44:37.000000000 -0400
 @@ -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);
@@ -80609,9 +69336,9 @@ diff -urNp linux-2.6.39.3/security/security.c linux-2.6.39.3/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-2.6.39.3/security/selinux/hooks.c linux-2.6.39.3/security/selinux/hooks.c
---- linux-2.6.39.3/security/selinux/hooks.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/selinux/hooks.c	2011-05-22 19:41:42.000000000 -0400
+diff -urNp linux-2.6.39.4/security/selinux/hooks.c linux-2.6.39.4/security/selinux/hooks.c
+--- linux-2.6.39.4/security/selinux/hooks.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/selinux/hooks.c	2011-08-05 19:44:37.000000000 -0400
 @@ -93,7 +93,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -80629,9 +69356,9 @@ diff -urNp linux-2.6.39.3/security/selinux/hooks.c linux-2.6.39.3/security/selin
  	.name =				"selinux",
  
  	.ptrace_access_check =		selinux_ptrace_access_check,
-diff -urNp linux-2.6.39.3/security/selinux/include/xfrm.h linux-2.6.39.3/security/selinux/include/xfrm.h
---- linux-2.6.39.3/security/selinux/include/xfrm.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/selinux/include/xfrm.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/selinux/include/xfrm.h linux-2.6.39.4/security/selinux/include/xfrm.h
+--- linux-2.6.39.4/security/selinux/include/xfrm.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/selinux/include/xfrm.h	2011-08-05 19:44:37.000000000 -0400
 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
  
  static inline void selinux_xfrm_notify_policyload(void)
@@ -80641,9 +69368,9 @@ diff -urNp linux-2.6.39.3/security/selinux/include/xfrm.h linux-2.6.39.3/securit
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-2.6.39.3/security/selinux/ss/services.c linux-2.6.39.3/security/selinux/ss/services.c
---- linux-2.6.39.3/security/selinux/ss/services.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/selinux/ss/services.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/selinux/ss/services.c linux-2.6.39.4/security/selinux/ss/services.c
+--- linux-2.6.39.4/security/selinux/ss/services.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/selinux/ss/services.c	2011-08-05 19:44:37.000000000 -0400
 @@ -1806,6 +1806,8 @@ int security_load_policy(void *data, siz
  	int rc = 0;
  	struct policy_file file = { data, len }, *fp = &file;
@@ -80653,9 +69380,9 @@ diff -urNp linux-2.6.39.3/security/selinux/ss/services.c linux-2.6.39.3/security
  	if (!ss_initialized) {
  		avtab_cache_init();
  		rc = policydb_read(&policydb, fp);
-diff -urNp linux-2.6.39.3/security/smack/smack_lsm.c linux-2.6.39.3/security/smack/smack_lsm.c
---- linux-2.6.39.3/security/smack/smack_lsm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/smack/smack_lsm.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/smack/smack_lsm.c linux-2.6.39.4/security/smack/smack_lsm.c
+--- linux-2.6.39.4/security/smack/smack_lsm.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/smack/smack_lsm.c	2011-08-05 19:44:37.000000000 -0400
 @@ -3386,7 +3386,7 @@ static int smack_inode_getsecctx(struct 
  	return 0;
  }
@@ -80665,9 +69392,9 @@ diff -urNp linux-2.6.39.3/security/smack/smack_lsm.c linux-2.6.39.3/security/sma
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff -urNp linux-2.6.39.3/security/tomoyo/tomoyo.c linux-2.6.39.3/security/tomoyo/tomoyo.c
---- linux-2.6.39.3/security/tomoyo/tomoyo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/security/tomoyo/tomoyo.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/security/tomoyo/tomoyo.c linux-2.6.39.4/security/tomoyo/tomoyo.c
+--- linux-2.6.39.4/security/tomoyo/tomoyo.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/security/tomoyo/tomoyo.c	2011-08-05 19:44:37.000000000 -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.
@@ -80677,23 +69404,9 @@ diff -urNp linux-2.6.39.3/security/tomoyo/tomoyo.c linux-2.6.39.3/security/tomoy
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-2.6.39.3/sound/aoa/aoa.h linux-2.6.39.3/sound/aoa/aoa.h
---- linux-2.6.39.3/sound/aoa/aoa.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- 
- /* GPIO stuff */
--extern struct gpio_methods *pmf_gpio_methods;
--extern struct gpio_methods *ftr_gpio_methods;
-+extern const struct gpio_methods *pmf_gpio_methods;
-+extern const struct gpio_methods *ftr_gpio_methods;
- /* extern struct gpio_methods *map_gpio_methods; */
- 
- #endif /* __AOA_H */
-diff -urNp linux-2.6.39.3/sound/aoa/codecs/onyx.c linux-2.6.39.3/sound/aoa/codecs/onyx.c
---- linux-2.6.39.3/sound/aoa/codecs/onyx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/aoa/codecs/onyx.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/sound/aoa/codecs/onyx.c linux-2.6.39.4/sound/aoa/codecs/onyx.c
+--- linux-2.6.39.4/sound/aoa/codecs/onyx.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/aoa/codecs/onyx.c	2011-08-05 19:44:37.000000000 -0400
 @@ -54,7 +54,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
@@ -80722,9 +69435,9 @@ diff -urNp linux-2.6.39.3/sound/aoa/codecs/onyx.c linux-2.6.39.3/sound/aoa/codec
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-2.6.39.3/sound/aoa/codecs/onyx.h linux-2.6.39.3/sound/aoa/codecs/onyx.h
---- linux-2.6.39.3/sound/aoa/codecs/onyx.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/aoa/codecs/onyx.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/sound/aoa/codecs/onyx.h linux-2.6.39.4/sound/aoa/codecs/onyx.h
+--- linux-2.6.39.4/sound/aoa/codecs/onyx.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/aoa/codecs/onyx.h	2011-08-05 19:44:37.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -80733,518 +69446,48 @@ diff -urNp linux-2.6.39.3/sound/aoa/codecs/onyx.h linux-2.6.39.3/sound/aoa/codec
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-2.6.39.3/sound/arm/aaci.c linux-2.6.39.3/sound/arm/aaci.c
---- linux-2.6.39.3/sound/arm/aaci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_pcm_ops aaci_playback_ops = {
-+static const struct snd_pcm_ops aaci_playback_ops = {
- 	.open		= aaci_pcm_open,
- 	.close		= aaci_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -738,7 +738,7 @@ static int aaci_pcm_capture_prepare(stru
- 	return 0;
- }
- 
--static struct snd_pcm_ops aaci_capture_ops = {
-+static const struct snd_pcm_ops aaci_capture_ops = {
- 	.open		= aaci_pcm_open,
- 	.close		= aaci_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -827,7 +827,7 @@ static struct ac97_pcm ac97_defs[] __dev
+diff -urNp linux-2.6.39.4/sound/core/seq/seq_device.c linux-2.6.39.4/sound/core/seq/seq_device.c
+--- linux-2.6.39.4/sound/core/seq/seq_device.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/core/seq/seq_device.c	2011-08-05 20:34:06.000000000 -0400
+@@ -63,7 +63,7 @@ struct ops_list {
+ 	int argsize;		/* argument size */
+ 
+ 	/* operators */
+-	struct snd_seq_dev_ops ops;
++	struct snd_seq_dev_ops *ops;
+ 
+ 	/* registred devices */
+ 	struct list_head dev_list;	/* list of devices */
+@@ -332,7 +332,7 @@ int snd_seq_device_register_driver(char 
+ 
+ 	mutex_lock(&ops->reg_mutex);
+ 	/* copy driver operators */
+-	ops->ops = *entry;
++	ops->ops = entry;
+ 	ops->driver |= DRIVER_LOADED;
+ 	ops->argsize = argsize;
+ 
+@@ -462,7 +462,7 @@ static int init_device(struct snd_seq_de
+ 			   dev->name, ops->id, ops->argsize, dev->argsize);
+ 		return -EINVAL;
  	}
- };
- 
--static struct snd_ac97_bus_ops aaci_bus_ops = {
-+static const struct snd_ac97_bus_ops aaci_bus_ops = {
- 	.write	= aaci_ac97_write,
- 	.read	= aaci_ac97_read,
- };
-diff -urNp linux-2.6.39.3/sound/arm/pxa2xx-ac97.c linux-2.6.39.3/sound/arm/pxa2xx-ac97.c
---- linux-2.6.39.3/sound/arm/pxa2xx-ac97.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
-+static const struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
- 	.read	= pxa2xx_ac97_read,
- 	.write	= pxa2xx_ac97_write,
- 	.reset	= pxa2xx_ac97_reset,
-diff -urNp linux-2.6.39.3/sound/atmel/abdac.c linux-2.6.39.3/sound/atmel/abdac.c
---- linux-2.6.39.3/sound/atmel/abdac.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/atmel/abdac.c	2011-05-22 19:36:35.000000000 -0400
-@@ -297,7 +297,7 @@ static irqreturn_t abdac_interrupt(int i
- 	return IRQ_HANDLED;
- }
- 
--static struct snd_pcm_ops atmel_abdac_ops = {
-+static const struct snd_pcm_ops atmel_abdac_ops = {
- 	.open		= atmel_abdac_open,
- 	.close		= atmel_abdac_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/atmel/ac97c.c linux-2.6.39.3/sound/atmel/ac97c.c
---- linux-2.6.39.3/sound/atmel/ac97c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/atmel/ac97c.c	2011-05-22 19:36:35.000000000 -0400
-@@ -626,7 +626,7 @@ atmel_ac97c_capture_pointer(struct snd_p
- 	return frames;
- }
- 
--static struct snd_pcm_ops atmel_ac97_playback_ops = {
-+static const struct snd_pcm_ops atmel_ac97_playback_ops = {
- 	.open		= atmel_ac97c_playback_open,
- 	.close		= atmel_ac97c_playback_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -637,7 +637,7 @@ static struct snd_pcm_ops atmel_ac97_pla
- 	.pointer	= atmel_ac97c_playback_pointer,
- };
- 
--static struct snd_pcm_ops atmel_ac97_capture_ops = {
-+static const struct snd_pcm_ops atmel_ac97_capture_ops = {
- 	.open		= atmel_ac97c_capture_open,
- 	.close		= atmel_ac97c_capture_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -909,7 +909,7 @@ static int __devinit atmel_ac97c_probe(s
- 	struct resource			*regs;
- 	struct ac97c_platform_data	*pdata;
- 	struct clk			*pclk;
--	static struct snd_ac97_bus_ops	ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write	= atmel_ac97c_write,
- 		.read	= atmel_ac97c_read,
- 	};
-diff -urNp linux-2.6.39.3/sound/core/control.c linux-2.6.39.3/sound/core/control.c
---- linux-2.6.39.3/sound/core/control.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/control.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1520,7 +1520,7 @@ static int snd_ctl_dev_free(struct snd_d
-  */
- int snd_ctl_create(struct snd_card *card)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_ctl_dev_free,
- 		.dev_register =	snd_ctl_dev_register,
- 		.dev_disconnect = snd_ctl_dev_disconnect,
-diff -urNp linux-2.6.39.3/sound/core/device.c linux-2.6.39.3/sound/core/device.c
---- linux-2.6.39.3/sound/core/device.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/device.c	2011-05-22 19:36:35.000000000 -0400
-@@ -41,7 +41,7 @@
-  * Returns zero if successful, or a negative error code on failure.
-  */
- int snd_device_new(struct snd_card *card, snd_device_type_t type,
--		   void *device_data, struct snd_device_ops *ops)
-+		   void *device_data, const struct snd_device_ops *ops)
- {
- 	struct snd_device *dev;
- 
-diff -urNp linux-2.6.39.3/sound/core/hwdep.c linux-2.6.39.3/sound/core/hwdep.c
---- linux-2.6.39.3/sound/core/hwdep.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/hwdep.c	2011-05-22 19:36:35.000000000 -0400
-@@ -348,7 +348,7 @@ int snd_hwdep_new(struct snd_card *card,
- {
- 	struct snd_hwdep *hwdep;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_hwdep_dev_free,
- 		.dev_register = snd_hwdep_dev_register,
- 		.dev_disconnect = snd_hwdep_dev_disconnect,
-diff -urNp linux-2.6.39.3/sound/core/info.c linux-2.6.39.3/sound/core/info.c
---- linux-2.6.39.3/sound/core/info.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_info_dev_free_entry,
- 		.dev_register =	snd_info_dev_register_entry,
- 		/* disconnect is done via snd_info_card_disconnect() */
-diff -urNp linux-2.6.39.3/sound/core/jack.c linux-2.6.39.3/sound/core/jack.c
---- linux-2.6.39.3/sound/core/jack.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/jack.c	2011-05-22 19:36:35.000000000 -0400
-@@ -105,7 +105,7 @@ int snd_jack_new(struct snd_card *card, 
- 	struct snd_jack *jack;
- 	int err;
- 	int i;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_jack_dev_free,
- 		.dev_register = snd_jack_dev_register,
- 	};
-diff -urNp linux-2.6.39.3/sound/core/pcm.c linux-2.6.39.3/sound/core/pcm.c
---- linux-2.6.39.3/sound/core/pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_pcm_dev_free,
- 		.dev_register =	snd_pcm_dev_register,
- 		.dev_disconnect = snd_pcm_dev_disconnect,
-diff -urNp linux-2.6.39.3/sound/core/pcm_lib.c linux-2.6.39.3/sound/core/pcm_lib.c
---- linux-2.6.39.3/sound/core/pcm_lib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/pcm_lib.c	2011-05-22 19:36:35.000000000 -0400
-@@ -505,7 +505,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm
-  *
-  * Sets the given PCM operators to the pcm instance.
-  */
--void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, struct snd_pcm_ops *ops)
-+void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, const struct snd_pcm_ops *ops)
- {
- 	struct snd_pcm_str *stream = &pcm->streams[direction];
- 	struct snd_pcm_substream *substream;
-diff -urNp linux-2.6.39.3/sound/core/pcm_native.c linux-2.6.39.3/sound/core/pcm_native.c
---- linux-2.6.39.3/sound/core/pcm_native.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
--static int snd_pcm_action_group(struct action_ops *ops,
-+static int snd_pcm_action_group(const struct action_ops *ops,
- 				struct snd_pcm_substream *substream,
- 				int state, int do_lock)
- {
-@@ -751,7 +751,7 @@ static int snd_pcm_action_group(struct a
- /*
-  *  Note: call with stream lock
-  */
--static int snd_pcm_action_single(struct action_ops *ops,
-+static int snd_pcm_action_single(const struct action_ops *ops,
- 				 struct snd_pcm_substream *substream,
- 				 int state)
- {
-@@ -771,7 +771,7 @@ static int snd_pcm_action_single(struct 
- /*
-  *  Note: call with stream lock
-  */
--static int snd_pcm_action(struct action_ops *ops,
-+static int snd_pcm_action(const struct action_ops *ops,
- 			  struct snd_pcm_substream *substream,
- 			  int state)
- {
-@@ -794,7 +794,7 @@ static int snd_pcm_action(struct action_
- /*
-  *  Note: don't use any locks before
-  */
--static int snd_pcm_action_lock_irq(struct action_ops *ops,
-+static int snd_pcm_action_lock_irq(const struct action_ops *ops,
- 				   struct snd_pcm_substream *substream,
- 				   int state)
- {
-@@ -818,7 +818,7 @@ static int snd_pcm_action_lock_irq(struc
- 
- /*
-  */
--static int snd_pcm_action_nonatomic(struct action_ops *ops,
-+static int snd_pcm_action_nonatomic(const struct action_ops *ops,
- 				    struct snd_pcm_substream *substream,
- 				    int state)
- {
-@@ -877,7 +877,7 @@ static void snd_pcm_post_start(struct sn
- 				 &runtime->trigger_tstamp);
- }
- 
--static struct action_ops snd_pcm_action_start = {
-+static const struct action_ops snd_pcm_action_start = {
- 	.pre_action = snd_pcm_pre_start,
- 	.do_action = snd_pcm_do_start,
- 	.undo_action = snd_pcm_undo_start,
-@@ -928,7 +928,7 @@ static void snd_pcm_post_stop(struct snd
- 	wake_up(&runtime->tsleep);
- }
- 
--static struct action_ops snd_pcm_action_stop = {
-+static const struct action_ops snd_pcm_action_stop = {
- 	.pre_action = snd_pcm_pre_stop,
- 	.do_action = snd_pcm_do_stop,
- 	.post_action = snd_pcm_post_stop
-@@ -1025,7 +1025,7 @@ static void snd_pcm_post_pause(struct sn
+-	if (ops->ops.init_device(dev) >= 0) {
++	if (ops->ops->init_device(dev) >= 0) {
+ 		dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
+ 		ops->num_init_devices++;
+ 	} else {
+@@ -489,7 +489,7 @@ static int free_device(struct snd_seq_de
+ 			   dev->name, ops->id, ops->argsize, dev->argsize);
+ 		return -EINVAL;
  	}
- }
- 
--static struct action_ops snd_pcm_action_pause = {
-+static const struct action_ops snd_pcm_action_pause = {
- 	.pre_action = snd_pcm_pre_pause,
- 	.do_action = snd_pcm_do_pause,
- 	.undo_action = snd_pcm_undo_pause,
-@@ -1076,7 +1076,7 @@ static void snd_pcm_post_suspend(struct 
- 	wake_up(&runtime->tsleep);
- }
- 
--static struct action_ops snd_pcm_action_suspend = {
-+static const struct action_ops snd_pcm_action_suspend = {
- 	.pre_action = snd_pcm_pre_suspend,
- 	.do_action = snd_pcm_do_suspend,
- 	.post_action = snd_pcm_post_suspend
-@@ -1175,7 +1175,7 @@ static void snd_pcm_post_resume(struct s
- 	runtime->status->state = runtime->status->suspended_state;
- }
- 
--static struct action_ops snd_pcm_action_resume = {
-+static const struct action_ops snd_pcm_action_resume = {
- 	.pre_action = snd_pcm_pre_resume,
- 	.do_action = snd_pcm_do_resume,
- 	.undo_action = snd_pcm_undo_resume,
-@@ -1278,7 +1278,7 @@ static void snd_pcm_post_reset(struct sn
- 		snd_pcm_playback_silence(substream, ULONG_MAX);
- }
- 
--static struct action_ops snd_pcm_action_reset = {
-+static const struct action_ops snd_pcm_action_reset = {
- 	.pre_action = snd_pcm_pre_reset,
- 	.do_action = snd_pcm_do_reset,
- 	.post_action = snd_pcm_post_reset
-@@ -1322,7 +1322,7 @@ static void snd_pcm_post_prepare(struct 
- 	runtime->status->state = SNDRV_PCM_STATE_PREPARED;
- }
- 
--static struct action_ops snd_pcm_action_prepare = {
-+static const struct action_ops snd_pcm_action_prepare = {
- 	.pre_action = snd_pcm_pre_prepare,
- 	.do_action = snd_pcm_do_prepare,
- 	.post_action = snd_pcm_post_prepare
-@@ -1397,7 +1397,7 @@ static void snd_pcm_post_drain_init(stru
- {
- }
- 
--static struct action_ops snd_pcm_action_drain_init = {
-+static const struct action_ops snd_pcm_action_drain_init = {
- 	.pre_action = snd_pcm_pre_drain_init,
- 	.do_action = snd_pcm_do_drain_init,
- 	.post_action = snd_pcm_post_drain_init
-diff -urNp linux-2.6.39.3/sound/core/rawmidi.c linux-2.6.39.3/sound/core/rawmidi.c
---- linux-2.6.39.3/sound/core/rawmidi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/rawmidi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1449,7 +1449,7 @@ int snd_rawmidi_new(struct snd_card *car
- {
- 	struct snd_rawmidi *rmidi;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_rawmidi_dev_free,
- 		.dev_register = snd_rawmidi_dev_register,
- 		.dev_disconnect = snd_rawmidi_dev_disconnect,
-@@ -1654,7 +1654,7 @@ static int snd_rawmidi_dev_disconnect(st
-  * Sets the rawmidi operators for the given stream direction.
-  */
- void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream,
--			 struct snd_rawmidi_ops *ops)
-+			 const struct snd_rawmidi_ops *ops)
- {
- 	struct snd_rawmidi_substream *substream;
- 	
-diff -urNp linux-2.6.39.3/sound/core/seq/seq_device.c linux-2.6.39.3/sound/core/seq/seq_device.c
---- linux-2.6.39.3/sound/core/seq/seq_device.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/seq/seq_device.c	2011-05-22 19:36:35.000000000 -0400
-@@ -178,7 +178,7 @@ int snd_seq_device_new(struct snd_card *
- 	struct snd_seq_device *dev;
- 	struct ops_list *ops;
- 	int err;
--	static struct snd_device_ops dops = {
-+	static const struct snd_device_ops dops = {
- 		.dev_free = snd_seq_device_dev_free,
- 		.dev_register = snd_seq_device_dev_register,
- 		.dev_disconnect = snd_seq_device_dev_disconnect,
-@@ -307,7 +307,7 @@ static int snd_seq_device_dev_disconnect
-  * id = driver id
-  * entry = driver operators - duplicated to each instance
-  */
--int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
-+int snd_seq_device_register_driver(char *id, const struct snd_seq_dev_ops *entry,
- 				   int argsize)
- {
- 	struct ops_list *ops;
-diff -urNp linux-2.6.39.3/sound/core/seq/seq_midi.c linux-2.6.39.3/sound/core/seq/seq_midi.c
---- linux-2.6.39.3/sound/core/seq/seq_midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/seq/seq_midi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -461,7 +461,7 @@ snd_seq_midisynth_unregister_port(struct
- 
- static int __init alsa_seq_midi_init(void)
- {
--	static struct snd_seq_dev_ops ops = {
-+	static const struct snd_seq_dev_ops ops = {
- 		snd_seq_midisynth_register_port,
- 		snd_seq_midisynth_unregister_port,
- 	};
-diff -urNp linux-2.6.39.3/sound/core/seq/seq_virmidi.c linux-2.6.39.3/sound/core/seq/seq_virmidi.c
---- linux-2.6.39.3/sound/core/seq/seq_virmidi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/seq/seq_virmidi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -337,13 +337,13 @@ static int snd_virmidi_unuse(void *priva
-  *  Register functions
-  */
- 
--static struct snd_rawmidi_ops snd_virmidi_input_ops = {
-+static const struct snd_rawmidi_ops snd_virmidi_input_ops = {
- 	.open = snd_virmidi_input_open,
- 	.close = snd_virmidi_input_close,
- 	.trigger = snd_virmidi_input_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_virmidi_output_ops = {
-+static const struct snd_rawmidi_ops snd_virmidi_output_ops = {
- 	.open = snd_virmidi_output_open,
- 	.close = snd_virmidi_output_close,
- 	.trigger = snd_virmidi_output_trigger,
-@@ -467,7 +467,7 @@ static int snd_virmidi_dev_unregister(st
- /*
-  *
-  */
--static struct snd_rawmidi_global_ops snd_virmidi_global_ops = {
-+static const struct snd_rawmidi_global_ops snd_virmidi_global_ops = {
- 	.dev_register = snd_virmidi_dev_register,
- 	.dev_unregister = snd_virmidi_dev_unregister,
- };
-diff -urNp linux-2.6.39.3/sound/core/timer.c linux-2.6.39.3/sound/core/timer.c
---- linux-2.6.39.3/sound/core/timer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/core/timer.c	2011-05-22 19:36:35.000000000 -0400
-@@ -756,7 +756,7 @@ int snd_timer_new(struct snd_card *card,
- {
- 	struct snd_timer *timer;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_timer_dev_free,
- 		.dev_register = snd_timer_dev_register,
- 		.dev_disconnect = snd_timer_dev_disconnect,
-diff -urNp linux-2.6.39.3/sound/drivers/aloop.c linux-2.6.39.3/sound/drivers/aloop.c
---- linux-2.6.39.3/sound/drivers/aloop.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_pcm_ops loopback_playback_ops = {
-+static const struct snd_pcm_ops loopback_playback_ops = {
- 	.open =		loopback_open,
- 	.close =	loopback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -742,7 +742,7 @@ static struct snd_pcm_ops loopback_playb
- 	.pointer =	loopback_pointer,
- };
- 
--static struct snd_pcm_ops loopback_capture_ops = {
-+static const struct snd_pcm_ops loopback_capture_ops = {
- 	.open =		loopback_open,
- 	.close =	loopback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/drivers/dummy.c linux-2.6.39.3/sound/drivers/dummy.c
---- linux-2.6.39.3/sound/drivers/dummy.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct dummy_timer_ops dummy_systimer_ops = {
-+static const struct dummy_timer_ops dummy_systimer_ops = {
- 	.create =	dummy_systimer_create,
- 	.free =		dummy_systimer_free,
- 	.prepare =	dummy_systimer_prepare,
-@@ -474,7 +474,7 @@ static void dummy_hrtimer_free(struct sn
- 	kfree(dpcm);
- }
- 
--static struct dummy_timer_ops dummy_hrtimer_ops = {
-+static const struct dummy_timer_ops dummy_hrtimer_ops = {
- 	.create =	dummy_hrtimer_create,
- 	.free =		dummy_hrtimer_free,
- 	.prepare =	dummy_hrtimer_prepare,
-@@ -660,7 +660,7 @@ static struct page *dummy_pcm_page(struc
- 	return virt_to_page(dummy_page[substream->stream]); /* the same page */
- }
- 
--static struct snd_pcm_ops dummy_pcm_ops = {
-+static const struct snd_pcm_ops dummy_pcm_ops = {
- 	.open =		dummy_pcm_open,
- 	.close =	dummy_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -671,7 +671,7 @@ static struct snd_pcm_ops dummy_pcm_ops 
- 	.pointer =	dummy_pcm_pointer,
- };
- 
--static struct snd_pcm_ops dummy_pcm_ops_no_buf = {
-+static const struct snd_pcm_ops dummy_pcm_ops_no_buf = {
- 	.open =		dummy_pcm_open,
- 	.close =	dummy_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -689,7 +689,7 @@ static int __devinit snd_card_dummy_pcm(
- 					int substreams)
- {
- 	struct snd_pcm *pcm;
--	struct snd_pcm_ops *ops;
-+	const struct snd_pcm_ops *ops;
- 	int err;
- 
- 	err = snd_pcm_new(dummy->card, "Dummy PCM", device,
-diff -urNp linux-2.6.39.3/sound/drivers/ml403-ac97cr.c linux-2.6.39.3/sound/drivers/ml403-ac97cr.c
---- linux-2.6.39.3/sound/drivers/ml403-ac97cr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/ml403-ac97cr.c	2011-05-22 19:36:35.000000000 -0400
-@@ -759,7 +759,7 @@ static int snd_ml403_ac97cr_capture_clos
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_ml403_ac97cr_playback_ops = {
-+static const struct snd_pcm_ops snd_ml403_ac97cr_playback_ops = {
- 	.open = snd_ml403_ac97cr_playback_open,
- 	.close = snd_ml403_ac97cr_playback_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -770,7 +770,7 @@ static struct snd_pcm_ops snd_ml403_ac97
- 	.pointer = snd_ml403_ac97cr_pcm_pointer,
- };
- 
--static struct snd_pcm_ops snd_ml403_ac97cr_capture_ops = {
-+static const struct snd_pcm_ops snd_ml403_ac97cr_capture_ops = {
- 	.open = snd_ml403_ac97cr_capture_open,
- 	.close = snd_ml403_ac97cr_capture_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -1114,7 +1114,7 @@ snd_ml403_ac97cr_create(struct snd_card 
- {
- 	struct snd_ml403_ac97cr *ml403_ac97cr;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_ml403_ac97cr_dev_free,
- 	};
- 	struct resource *resource;
-@@ -1210,7 +1210,7 @@ snd_ml403_ac97cr_mixer(struct snd_ml403_
- 	struct snd_ac97_bus *bus;
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_ml403_ac97cr_codec_write,
- 		.read = snd_ml403_ac97cr_codec_read,
- 	};
-diff -urNp linux-2.6.39.3/sound/drivers/mtpav.c linux-2.6.39.3/sound/drivers/mtpav.c
---- linux-2.6.39.3/sound/drivers/mtpav.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/mtpav.c	2011-05-22 19:36:35.000000000 -0400
-@@ -601,13 +601,13 @@ static int __devinit snd_mtpav_get_ISA(s
- /*
-  */
- 
--static struct snd_rawmidi_ops snd_mtpav_output = {
-+static const struct snd_rawmidi_ops snd_mtpav_output = {
- 	.open =		snd_mtpav_output_open,
- 	.close =	snd_mtpav_output_close,
- 	.trigger =	snd_mtpav_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_mtpav_input = {
-+static const struct snd_rawmidi_ops snd_mtpav_input = {
- 	.open =		snd_mtpav_input_open,
- 	.close =	snd_mtpav_input_close,
- 	.trigger =	snd_mtpav_input_trigger,
-diff -urNp linux-2.6.39.3/sound/drivers/mts64.c linux-2.6.39.3/sound/drivers/mts64.c
---- linux-2.6.39.3/sound/drivers/mts64.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/mts64.c	2011-05-22 19:36:35.000000000 -0400
+-	if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
++	if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
+ 		dev->status = SNDRV_SEQ_DEVICE_FREE;
+ 		dev->driver_data = NULL;
+ 		ops->num_init_devices--;
+diff -urNp linux-2.6.39.4/sound/drivers/mts64.c linux-2.6.39.4/sound/drivers/mts64.c
+--- linux-2.6.39.4/sound/drivers/mts64.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/drivers/mts64.c	2011-08-05 20:34:06.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -81301,49 +69544,21 @@ diff -urNp linux-2.6.39.3/sound/drivers/mts64.c linux-2.6.39.3/sound/drivers/mts
  
  	return 0;
  }
-@@ -760,13 +760,13 @@ static void snd_mts64_rawmidi_input_trig
- 	spin_unlock_irqrestore(&mts->lock, flags);
- }
- 
--static struct snd_rawmidi_ops snd_mts64_rawmidi_output_ops = {
-+static const struct snd_rawmidi_ops snd_mts64_rawmidi_output_ops = {
- 	.open    = snd_mts64_rawmidi_open,
- 	.close   = snd_mts64_rawmidi_close,
- 	.trigger = snd_mts64_rawmidi_output_trigger
- };
- 
--static struct snd_rawmidi_ops snd_mts64_rawmidi_input_ops = {
-+static const struct snd_rawmidi_ops snd_mts64_rawmidi_input_ops = {
- 	.open    = snd_mts64_rawmidi_open,
- 	.close   = snd_mts64_rawmidi_close,
- 	.trigger = snd_mts64_rawmidi_input_trigger
-diff -urNp linux-2.6.39.3/sound/drivers/pcsp/pcsp.c linux-2.6.39.3/sound/drivers/pcsp/pcsp.c
---- linux-2.6.39.3/sound/drivers/pcsp/pcsp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/pcsp/pcsp.c	2011-05-22 19:36:35.000000000 -0400
-@@ -41,7 +41,7 @@ struct snd_pcsp pcsp_chip;
- 
- static int __devinit snd_pcsp_create(struct snd_card *card)
- {
--	static struct snd_device_ops ops = { };
-+	static const struct snd_device_ops ops = { };
- 	struct timespec tp;
- 	int err;
- 	int div, min_div, order;
-diff -urNp linux-2.6.39.3/sound/drivers/pcsp/pcsp_lib.c linux-2.6.39.3/sound/drivers/pcsp/pcsp_lib.c
---- linux-2.6.39.3/sound/drivers/pcsp/pcsp_lib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/pcsp/pcsp_lib.c	2011-05-22 19:36:35.000000000 -0400
-@@ -323,7 +323,7 @@ static int snd_pcsp_playback_open(struct
- 	return 0;
- }
+diff -urNp linux-2.6.39.4/sound/drivers/opl4/opl4_lib.c linux-2.6.39.4/sound/drivers/opl4/opl4_lib.c
+--- linux-2.6.39.4/sound/drivers/opl4/opl4_lib.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/drivers/opl4/opl4_lib.c	2011-08-05 20:34:06.000000000 -0400
+@@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
+ MODULE_DESCRIPTION("OPL4 driver");
+ MODULE_LICENSE("GPL");
  
--static struct snd_pcm_ops snd_pcsp_playback_ops = {
-+static const struct snd_pcm_ops snd_pcsp_playback_ops = {
- 	.open = snd_pcsp_playback_open,
- 	.close = snd_pcsp_playback_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/drivers/portman2x4.c linux-2.6.39.3/sound/drivers/portman2x4.c
---- linux-2.6.39.3/sound/drivers/portman2x4.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/portman2x4.c	2011-05-22 19:36:35.000000000 -0400
+-static void inline snd_opl4_wait(struct snd_opl4 *opl4)
++static inline void snd_opl4_wait(struct snd_opl4 *opl4)
+ {
+ 	int timeout = 10;
+ 	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
+diff -urNp linux-2.6.39.4/sound/drivers/portman2x4.c linux-2.6.39.4/sound/drivers/portman2x4.c
+--- linux-2.6.39.4/sound/drivers/portman2x4.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/drivers/portman2x4.c	2011-08-05 20:34:06.000000000 -0400
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -81361,76 +69576,9 @@ diff -urNp linux-2.6.39.3/sound/drivers/portman2x4.c linux-2.6.39.3/sound/driver
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-@@ -547,13 +548,13 @@ static void snd_portman_midi_output_trig
- 	spin_unlock_irqrestore(&pm->reg_lock, flags);
- }
- 
--static struct snd_rawmidi_ops snd_portman_midi_output = {
-+static const struct snd_rawmidi_ops snd_portman_midi_output = {
- 	.open =		snd_portman_midi_open,
- 	.close =	snd_portman_midi_close,
- 	.trigger =	snd_portman_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_portman_midi_input = {
-+static const struct snd_rawmidi_ops snd_portman_midi_input = {
- 	.open =		snd_portman_midi_open,
- 	.close =	snd_portman_midi_close,
- 	.trigger =	snd_portman_midi_input_trigger,
-diff -urNp linux-2.6.39.3/sound/drivers/serial-u16550.c linux-2.6.39.3/sound/drivers/serial-u16550.c
---- linux-2.6.39.3/sound/drivers/serial-u16550.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/serial-u16550.c	2011-05-22 19:36:35.000000000 -0400
-@@ -754,15 +754,13 @@ static void snd_uart16550_output_trigger
- 		snd_uart16550_output_write(substream);
- }
- 
--static struct snd_rawmidi_ops snd_uart16550_output =
--{
-+static const struct snd_rawmidi_ops snd_uart16550_output = {
- 	.open =		snd_uart16550_output_open,
- 	.close =	snd_uart16550_output_close,
- 	.trigger =	snd_uart16550_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_uart16550_input =
--{
-+static const struct snd_rawmidi_ops snd_uart16550_input = {
- 	.open =		snd_uart16550_input_open,
- 	.close =	snd_uart16550_input_close,
- 	.trigger =	snd_uart16550_input_trigger,
-@@ -792,7 +790,7 @@ static int __devinit snd_uart16550_creat
- 				       int droponfull,
- 				       struct snd_uart16550 **ruart)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_uart16550_dev_free,
- 	};
- 	struct snd_uart16550 *uart;
-diff -urNp linux-2.6.39.3/sound/drivers/vx/vx_pcm.c linux-2.6.39.3/sound/drivers/vx/vx_pcm.c
---- linux-2.6.39.3/sound/drivers/vx/vx_pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/drivers/vx/vx_pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -895,7 +895,7 @@ static int vx_pcm_prepare(struct snd_pcm
- /*
-  * operators for PCM playback
-  */
--static struct snd_pcm_ops vx_pcm_playback_ops = {
-+static const struct snd_pcm_ops vx_pcm_playback_ops = {
- 	.open =		vx_pcm_playback_open,
- 	.close =	vx_pcm_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1116,7 +1116,7 @@ static snd_pcm_uframes_t vx_pcm_capture_
- /*
-  * operators for PCM capture
-  */
--static struct snd_pcm_ops vx_pcm_capture_ops = {
-+static const struct snd_pcm_ops vx_pcm_capture_ops = {
- 	.open =		vx_pcm_capture_open,
- 	.close =	vx_pcm_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/firewire/amdtp.c linux-2.6.39.3/sound/firewire/amdtp.c
---- linux-2.6.39.3/sound/firewire/amdtp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/firewire/amdtp.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/sound/firewire/amdtp.c linux-2.6.39.4/sound/firewire/amdtp.c
+--- linux-2.6.39.4/sound/firewire/amdtp.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/firewire/amdtp.c	2011-08-05 19:44:37.000000000 -0400
 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
  		ptr = s->pcm_buffer_pointer + data_blocks;
  		if (ptr >= pcm->runtime->buffer_size)
@@ -81449,9 +69597,9 @@ diff -urNp linux-2.6.39.3/sound/firewire/amdtp.c linux-2.6.39.3/sound/firewire/a
  		(fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
  }
  EXPORT_SYMBOL(amdtp_out_stream_update);
-diff -urNp linux-2.6.39.3/sound/firewire/amdtp.h linux-2.6.39.3/sound/firewire/amdtp.h
---- linux-2.6.39.3/sound/firewire/amdtp.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/firewire/amdtp.h	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/sound/firewire/amdtp.h linux-2.6.39.4/sound/firewire/amdtp.h
+--- linux-2.6.39.4/sound/firewire/amdtp.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/firewire/amdtp.h	2011-08-05 19:44:37.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)
@@ -81461,379 +69609,21 @@ diff -urNp linux-2.6.39.3/sound/firewire/amdtp.h linux-2.6.39.3/sound/firewire/a
  }
  
  /**
-diff -urNp linux-2.6.39.3/sound/i2c/i2c.c linux-2.6.39.3/sound/i2c/i2c.c
---- linux-2.6.39.3/sound/i2c/i2c.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_i2c_bus_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/i2c/other/ak4113.c linux-2.6.39.3/sound/i2c/other/ak4113.c
---- linux-2.6.39.3/sound/i2c/other/ak4113.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/i2c/other/ak4113.c	2011-05-22 19:36:35.000000000 -0400
-@@ -75,7 +75,7 @@ int snd_ak4113_create(struct snd_card *c
- 	struct ak4113 *chip;
- 	int err = 0;
- 	unsigned char reg;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =     snd_ak4113_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/i2c/other/ak4114.c linux-2.6.39.3/sound/i2c/other/ak4114.c
---- linux-2.6.39.3/sound/i2c/other/ak4114.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/i2c/other/ak4114.c	2011-05-22 19:36:35.000000000 -0400
-@@ -86,7 +86,7 @@ int snd_ak4114_create(struct snd_card *c
- 	struct ak4114 *chip;
- 	int err = 0;
- 	unsigned char reg;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =     snd_ak4114_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/i2c/other/ak4117.c linux-2.6.39.3/sound/i2c/other/ak4117.c
---- linux-2.6.39.3/sound/i2c/other/ak4117.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/i2c/other/ak4117.c	2011-05-22 19:36:35.000000000 -0400
-@@ -78,7 +78,7 @@ int snd_ak4117_create(struct snd_card *c
- 	struct ak4117 *chip;
- 	int err = 0;
- 	unsigned char reg;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =     snd_ak4117_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/isa/ad1816a/ad1816a_lib.c linux-2.6.39.3/sound/isa/ad1816a/ad1816a_lib.c
---- linux-2.6.39.3/sound/isa/ad1816a/ad1816a_lib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/ad1816a/ad1816a_lib.c	2011-05-22 19:36:35.000000000 -0400
-@@ -575,7 +575,7 @@ int __devinit snd_ad1816a_create(struct 
- 				 unsigned long port, int irq, int dma1, int dma2,
- 				 struct snd_ad1816a **rchip)
- {
--        static struct snd_device_ops ops = {
-+        static const struct snd_device_ops ops = {
- 		.dev_free =	snd_ad1816a_dev_free,
- 	};
- 	int error;
-diff -urNp linux-2.6.39.3/sound/isa/es1688/es1688_lib.c linux-2.6.39.3/sound/isa/es1688/es1688_lib.c
---- linux-2.6.39.3/sound/isa/es1688/es1688_lib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/es1688/es1688_lib.c	2011-05-22 19:36:35.000000000 -0400
-@@ -646,7 +646,7 @@ int snd_es1688_create(struct snd_card *c
- 		      int dma8,
- 		      unsigned short hardware)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_es1688_dev_free,
- 	};
-                                 
-diff -urNp linux-2.6.39.3/sound/isa/es18xx.c linux-2.6.39.3/sound/isa/es18xx.c
---- linux-2.6.39.3/sound/isa/es18xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/es18xx.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1658,7 +1658,7 @@ static int __devinit snd_es18xx_probe(st
- 	return snd_es18xx_initialize(chip, mpu_port, fm_port);
- }
- 
--static struct snd_pcm_ops snd_es18xx_playback_ops = {
-+static const struct snd_pcm_ops snd_es18xx_playback_ops = {
- 	.open =		snd_es18xx_playback_open,
- 	.close =	snd_es18xx_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1669,7 +1669,7 @@ static struct snd_pcm_ops snd_es18xx_pla
- 	.pointer =	snd_es18xx_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_es18xx_capture_ops = {
-+static const struct snd_pcm_ops snd_es18xx_capture_ops = {
- 	.open =		snd_es18xx_capture_open,
- 	.close =	snd_es18xx_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1784,7 +1784,7 @@ static int __devinit snd_es18xx_new_devi
- 					   int irq, int dma1, int dma2)
- {
- 	struct snd_es18xx *chip = card->private_data;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_es18xx_dev_free,
-         };
- 	int err;
-diff -urNp linux-2.6.39.3/sound/isa/gus/gus_main.c linux-2.6.39.3/sound/isa/gus/gus_main.c
---- linux-2.6.39.3/sound/isa/gus/gus_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/gus/gus_main.c	2011-05-22 19:36:35.000000000 -0400
-@@ -139,7 +139,7 @@ int snd_gus_create(struct snd_card *card
- {
- 	struct snd_gus_card *gus;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_gus_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/isa/msnd/msnd.c linux-2.6.39.3/sound/isa/msnd/msnd.c
---- linux-2.6.39.3/sound/isa/msnd/msnd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/msnd/msnd.c	2011-05-22 19:36:35.000000000 -0400
-@@ -570,7 +570,7 @@ snd_msnd_playback_pointer(struct snd_pcm
- }
- 
- 
--static struct snd_pcm_ops snd_msnd_playback_ops = {
-+static const struct snd_pcm_ops snd_msnd_playback_ops = {
- 	.open =		snd_msnd_playback_open,
- 	.close =	snd_msnd_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -667,7 +667,7 @@ static int snd_msnd_capture_hw_params(st
- }
- 
+diff -urNp linux-2.6.39.4/sound/isa/cmi8330.c linux-2.6.39.4/sound/isa/cmi8330.c
+--- linux-2.6.39.4/sound/isa/cmi8330.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/isa/cmi8330.c	2011-08-05 20:34:06.000000000 -0400
+@@ -172,7 +172,7 @@ struct snd_cmi8330 {
  
--static struct snd_pcm_ops snd_msnd_capture_ops = {
-+static const struct snd_pcm_ops snd_msnd_capture_ops = {
- 	.open =		snd_msnd_capture_open,
- 	.close =	snd_msnd_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/isa/msnd/msnd_midi.c linux-2.6.39.3/sound/isa/msnd/msnd_midi.c
---- linux-2.6.39.3/sound/isa/msnd/msnd_midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/msnd/msnd_midi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -141,7 +141,7 @@ void snd_msndmidi_input_read(void *mpuv)
- }
- EXPORT_SYMBOL(snd_msndmidi_input_read);
- 
--static struct snd_rawmidi_ops snd_msndmidi_input = {
-+static const struct snd_rawmidi_ops snd_msndmidi_input = {
- 	.open =		snd_msndmidi_input_open,
- 	.close =	snd_msndmidi_input_close,
- 	.trigger =	snd_msndmidi_input_trigger,
-diff -urNp linux-2.6.39.3/sound/isa/msnd/msnd_pinnacle.c linux-2.6.39.3/sound/isa/msnd/msnd_pinnacle.c
---- linux-2.6.39.3/sound/isa/msnd/msnd_pinnacle.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/msnd/msnd_pinnacle.c	2011-05-22 19:36:35.000000000 -0400
-@@ -539,7 +539,7 @@ static int __devinit snd_msnd_attach(str
- {
- 	struct snd_msnd *chip = card->private_data;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =      snd_msnd_dev_free,
- 		};
- 
-diff -urNp linux-2.6.39.3/sound/isa/sb/emu8000.c linux-2.6.39.3/sound/isa/sb/emu8000.c
---- linux-2.6.39.3/sound/isa/sb/emu8000.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_emu8000_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/isa/sb/emu8000_pcm.c linux-2.6.39.3/sound/isa/sb/emu8000_pcm.c
---- linux-2.6.39.3/sound/isa/sb/emu8000_pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/sb/emu8000_pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -667,7 +667,7 @@ static snd_pcm_uframes_t emu8k_pcm_point
- }
- 
- 
--static struct snd_pcm_ops emu8k_pcm_ops = {
-+static const struct snd_pcm_ops emu8k_pcm_ops = {
- 	.open =		emu8k_pcm_open,
- 	.close =	emu8k_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/isa/sb/sb_common.c linux-2.6.39.3/sound/isa/sb/sb_common.c
---- linux-2.6.39.3/sound/isa/sb/sb_common.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/isa/sb/sb_common.c	2011-05-22 19:36:35.000000000 -0400
-@@ -218,7 +218,7 @@ int snd_sbdsp_create(struct snd_card *ca
- {
- 	struct snd_sb *chip;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_sbdsp_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/isa/wavefront/wavefront_midi.c linux-2.6.39.3/sound/isa/wavefront/wavefront_midi.c
---- linux-2.6.39.3/sound/isa/wavefront/wavefront_midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--struct snd_rawmidi_ops snd_wavefront_midi_output =
-+const struct snd_rawmidi_ops snd_wavefront_midi_output =
- {
- 	.open =		snd_wavefront_midi_output_open,
- 	.close =	snd_wavefront_midi_output_close,
- 	.trigger =	snd_wavefront_midi_output_trigger,
- };
- 
--struct snd_rawmidi_ops snd_wavefront_midi_input =
-+const struct snd_rawmidi_ops snd_wavefront_midi_input =
- {
- 	.open =		snd_wavefront_midi_input_open,
- 	.close =	snd_wavefront_midi_input_close,
-diff -urNp linux-2.6.39.3/sound/isa/wss/wss_lib.c linux-2.6.39.3/sound/isa/wss/wss_lib.c
---- linux-2.6.39.3/sound/isa/wss/wss_lib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_wss_dev_free,
- 	};
- 	struct snd_wss *chip;
-diff -urNp linux-2.6.39.3/sound/mips/au1x00.c linux-2.6.39.3/sound/mips/au1x00.c
---- linux-2.6.39.3/sound/mips/au1x00.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/mips/au1x00.c	2011-05-22 19:36:35.000000000 -0400
-@@ -416,7 +416,7 @@ snd_au1000_pointer(struct snd_pcm_substr
- 	return bytes_to_frames(runtime,location);
- }
- 
--static struct snd_pcm_ops snd_card_au1000_playback_ops = {
-+static const struct snd_pcm_ops snd_card_au1000_playback_ops = {
- 	.open			= snd_au1000_playback_open,
- 	.close			= snd_au1000_playback_close,
- 	.ioctl			= snd_pcm_lib_ioctl,
-@@ -427,7 +427,7 @@ static struct snd_pcm_ops snd_card_au100
- 	.pointer		= snd_au1000_pointer,
- };
- 
--static struct snd_pcm_ops snd_card_au1000_capture_ops = {
-+static const struct snd_pcm_ops snd_card_au1000_capture_ops = {
- 	.open			= snd_au1000_capture_open,
- 	.close			= snd_au1000_capture_close,
- 	.ioctl			= snd_pcm_lib_ioctl,
-@@ -557,7 +557,7 @@ snd_au1000_ac97_new(struct snd_au1000 *a
- 	int err;
- 	struct snd_ac97_bus *pbus;
- 	struct snd_ac97_template ac97;
-- 	static struct snd_ac97_bus_ops ops = {
-+ 	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_au1000_ac97_write,
- 		.read = snd_au1000_ac97_read,
- 	};
-diff -urNp linux-2.6.39.3/sound/mips/hal2.c linux-2.6.39.3/sound/mips/hal2.c
---- linux-2.6.39.3/sound/mips/hal2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_pcm_ops hal2_playback_ops = {
-+static const struct snd_pcm_ops hal2_playback_ops = {
- 	.open =        hal2_playback_open,
- 	.close =       hal2_playback_close,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -720,7 +720,7 @@ static struct snd_pcm_ops hal2_playback_
- 	.ack =         hal2_playback_ack,
- };
- 
--static struct snd_pcm_ops hal2_capture_ops = {
-+static const struct snd_pcm_ops hal2_capture_ops = {
- 	.open =        hal2_capture_open,
- 	.close =       hal2_capture_close,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -766,7 +766,7 @@ static int hal2_dev_free(struct snd_devi
- 	return 0;
- }
- 
--static struct snd_device_ops hal2_ops = {
-+static const struct snd_device_ops hal2_ops = {
- 	.dev_free = hal2_dev_free,
- };
- 
-diff -urNp linux-2.6.39.3/sound/mips/sgio2audio.c linux-2.6.39.3/sound/mips/sgio2audio.c
---- linux-2.6.39.3/sound/mips/sgio2audio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/mips/sgio2audio.c	2011-05-22 19:36:35.000000000 -0400
-@@ -681,7 +681,7 @@ snd_sgio2audio_pcm_pointer(struct snd_pc
- }
- 
- /* operators */
--static struct snd_pcm_ops snd_sgio2audio_playback1_ops = {
-+static const struct snd_pcm_ops snd_sgio2audio_playback1_ops = {
- 	.open =        snd_sgio2audio_playback1_open,
- 	.close =       snd_sgio2audio_pcm_close,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -694,7 +694,7 @@ static struct snd_pcm_ops snd_sgio2audio
- 	.mmap =        snd_pcm_lib_mmap_vmalloc,
- };
- 
--static struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
-+static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
- 	.open =        snd_sgio2audio_playback2_open,
- 	.close =       snd_sgio2audio_pcm_close,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -707,7 +707,7 @@ static struct snd_pcm_ops snd_sgio2audio
- 	.mmap =        snd_pcm_lib_mmap_vmalloc,
- };
- 
--static struct snd_pcm_ops snd_sgio2audio_capture_ops = {
-+static const struct snd_pcm_ops snd_sgio2audio_capture_ops = {
- 	.open =        snd_sgio2audio_capture_open,
- 	.close =       snd_sgio2audio_pcm_close,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -829,7 +829,7 @@ static int snd_sgio2audio_dev_free(struc
- 	return snd_sgio2audio_free(chip);
- }
- 
--static struct snd_device_ops ops = {
-+static const struct snd_device_ops ops = {
- 	.dev_free = snd_sgio2audio_dev_free,
- };
- 
-diff -urNp linux-2.6.39.3/sound/oss/ac97_codec.c linux-2.6.39.3/sound/oss/ac97_codec.c
---- linux-2.6.39.3/sound/oss/ac97_codec.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
-  
--static struct ac97_ops null_ops = { NULL, NULL, NULL };
--static struct ac97_ops default_ops = { NULL, eapd_control, NULL };
--static struct ac97_ops default_digital_ops = { NULL, eapd_control, generic_digital_control};
--static struct ac97_ops wolfson_ops03 = { wolfson_init03, NULL, NULL };
--static struct ac97_ops wolfson_ops04 = { wolfson_init04, NULL, NULL };
--static struct ac97_ops wolfson_ops05 = { wolfson_init05, NULL, NULL };
--static struct ac97_ops wolfson_ops11 = { wolfson_init11, NULL, NULL };
--static struct ac97_ops wolfson_ops13 = { wolfson_init13, NULL, NULL };
--static struct ac97_ops tritech_ops = { tritech_init, NULL, NULL };
--static struct ac97_ops tritech_m_ops = { tritech_maestro_init, NULL, NULL };
--static struct ac97_ops sigmatel_9708_ops = { sigmatel_9708_init, NULL, NULL };
--static struct ac97_ops sigmatel_9721_ops = { sigmatel_9721_init, NULL, NULL };
--static struct ac97_ops sigmatel_9744_ops = { sigmatel_9744_init, NULL, NULL };
--static struct ac97_ops crystal_digital_ops = { NULL, eapd_control, crystal_digital_control };
--static struct ac97_ops ad1886_ops = { ad1886_init, eapd_control, NULL };
--static struct ac97_ops cmedia_ops = { NULL, eapd_control, NULL};
--static struct ac97_ops cmedia_digital_ops = { cmedia_init, eapd_control, cmedia_digital_control};
-+static const struct ac97_ops null_ops = { NULL, NULL, NULL };
-+static const struct ac97_ops default_ops = { NULL, eapd_control, NULL };
-+static const struct ac97_ops default_digital_ops = { NULL, eapd_control, generic_digital_control};
-+static const struct ac97_ops wolfson_ops03 = { wolfson_init03, NULL, NULL };
-+static const struct ac97_ops wolfson_ops04 = { wolfson_init04, NULL, NULL };
-+static const struct ac97_ops wolfson_ops05 = { wolfson_init05, NULL, NULL };
-+static const struct ac97_ops wolfson_ops11 = { wolfson_init11, NULL, NULL };
-+static const struct ac97_ops wolfson_ops13 = { wolfson_init13, NULL, NULL };
-+static const struct ac97_ops tritech_ops = { tritech_init, NULL, NULL };
-+static const struct ac97_ops tritech_m_ops = { tritech_maestro_init, NULL, NULL };
-+static const struct ac97_ops sigmatel_9708_ops = { sigmatel_9708_init, NULL, NULL };
-+static const struct ac97_ops sigmatel_9721_ops = { sigmatel_9721_init, NULL, NULL };
-+static const struct ac97_ops sigmatel_9744_ops = { sigmatel_9744_init, NULL, NULL };
-+static const struct ac97_ops crystal_digital_ops = { NULL, eapd_control, crystal_digital_control };
-+static const struct ac97_ops ad1886_ops = { ad1886_init, eapd_control, NULL };
-+static const struct ac97_ops cmedia_ops = { NULL, eapd_control, NULL};
-+static const struct ac97_ops cmedia_digital_ops = { cmedia_init, eapd_control, cmedia_digital_control};
- 
- /* sorted by vendor/device id */
- static const struct {
-diff -urNp linux-2.6.39.3/sound/oss/sb_audio.c linux-2.6.39.3/sound/oss/sb_audio.c
---- linux-2.6.39.3/sound/oss/sb_audio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/oss/sb_audio.c	2011-05-22 19:36:35.000000000 -0400
+ 	struct snd_pcm *pcm;
+ 	struct snd_cmi8330_stream {
+-		struct snd_pcm_ops ops;
++		snd_pcm_ops_no_const ops;
+ 		snd_pcm_open_callback_t open;
+ 		void *private_data; /* sb or wss */
+ 	} streams[2];
+diff -urNp linux-2.6.39.4/sound/oss/sb_audio.c linux-2.6.39.4/sound/oss/sb_audio.c
+--- linux-2.6.39.4/sound/oss/sb_audio.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/oss/sb_audio.c	2011-08-05 19:44:37.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -81843,9 +69633,9 @@ diff -urNp linux-2.6.39.3/sound/oss/sb_audio.c linux-2.6.39.3/sound/oss/sb_audio
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-2.6.39.3/sound/oss/swarm_cs4297a.c linux-2.6.39.3/sound/oss/swarm_cs4297a.c
---- linux-2.6.39.3/sound/oss/swarm_cs4297a.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/oss/swarm_cs4297a.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/sound/oss/swarm_cs4297a.c linux-2.6.39.4/sound/oss/swarm_cs4297a.c
+--- linux-2.6.39.4/sound/oss/swarm_cs4297a.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/oss/swarm_cs4297a.c	2011-08-05 19:44:37.000000000 -0400
 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
  {
  	struct cs4297a_state *s;
@@ -81880,1336 +69670,68 @@ diff -urNp linux-2.6.39.3/sound/oss/swarm_cs4297a.c linux-2.6.39.3/sound/oss/swa
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-2.6.39.3/sound/parisc/harmony.c linux-2.6.39.3/sound/parisc/harmony.c
---- linux-2.6.39.3/sound/parisc/harmony.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops snd_harmony_playback_ops = {
-+static const struct snd_pcm_ops snd_harmony_playback_ops = {
- 	.open =	snd_harmony_playback_open,
- 	.close = snd_harmony_playback_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -607,7 +607,7 @@ static struct snd_pcm_ops snd_harmony_pl
-  	.pointer = snd_harmony_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_harmony_capture_ops = {
-+static const struct snd_pcm_ops snd_harmony_capture_ops = {
-         .open = snd_harmony_capture_open,
-         .close = snd_harmony_capture_close,
-         .ioctl = snd_pcm_lib_ioctl,
-@@ -922,7 +922,7 @@ snd_harmony_create(struct snd_card *card
- {
- 	int err;
- 	struct snd_harmony *h;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_harmony_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/ac97/ac97_codec.c linux-2.6.39.3/sound/pci/ac97/ac97_codec.c
---- linux-2.6.39.3/sound/pci/ac97/ac97_codec.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ac97/ac97_codec.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1910,12 +1910,12 @@ static int ac97_reset_wait(struct snd_ac
-  *
-  * Returns zero if successful, or a negative error code on failure.
-  */
--int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,
-+int snd_ac97_bus(struct snd_card *card, int num, const struct snd_ac97_bus_ops *ops,
- 		 void *private_data, struct snd_ac97_bus **rbus)
- {
- 	int err;
- 	struct snd_ac97_bus *bus;
--	static struct snd_device_ops dev_ops = {
-+	static const struct snd_device_ops dev_ops = {
- 		.dev_free =	snd_ac97_bus_dev_free,
- 	};
- 
-@@ -2015,7 +2015,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *
- 	unsigned long end_time;
- 	unsigned int reg;
- 	const struct ac97_codec_id *pid;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_ac97_dev_free,
- 		.dev_register =	snd_ac97_dev_register,
- 		.dev_disconnect =	snd_ac97_dev_disconnect,
-diff -urNp linux-2.6.39.3/sound/pci/ad1889.c linux-2.6.39.3/sound/pci/ad1889.c
---- linux-2.6.39.3/sound/pci/ad1889.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ad1889.c	2011-05-22 19:36:35.000000000 -0400
-@@ -574,7 +574,7 @@ snd_ad1889_capture_pointer(struct snd_pc
- 	return bytes_to_frames(ss->runtime, ptr);
- }
- 
--static struct snd_pcm_ops snd_ad1889_playback_ops = {
-+static const struct snd_pcm_ops snd_ad1889_playback_ops = {
- 	.open = snd_ad1889_playback_open,
- 	.close = snd_ad1889_playback_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -585,7 +585,7 @@ static struct snd_pcm_ops snd_ad1889_pla
- 	.pointer = snd_ad1889_playback_pointer, 
- };
- 
--static struct snd_pcm_ops snd_ad1889_capture_ops = {
-+static const struct snd_pcm_ops snd_ad1889_capture_ops = {
- 	.open = snd_ad1889_capture_open,
- 	.close = snd_ad1889_capture_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -809,7 +809,7 @@ snd_ad1889_ac97_init(struct snd_ad1889 *
- {
- 	int err;
- 	struct snd_ac97_template ac97;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_ad1889_ac97_write,
- 		.read = snd_ad1889_ac97_read,
- 	};
-@@ -899,7 +899,7 @@ snd_ad1889_create(struct snd_card *card,
- 	int err;
- 
- 	struct snd_ad1889 *chip;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_ad1889_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/ak4531_codec.c linux-2.6.39.3/sound/pci/ak4531_codec.c
---- linux-2.6.39.3/sound/pci/ak4531_codec.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ak4531_codec.c	2011-05-22 19:36:35.000000000 -0400
-@@ -389,7 +389,7 @@ int __devinit snd_ak4531_mixer(struct sn
- 	unsigned int idx;
- 	int err;
- 	struct snd_ak4531 *ak4531;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_ak4531_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/ali5451/ali5451.c linux-2.6.39.3/sound/pci/ali5451/ali5451.c
---- linux-2.6.39.3/sound/pci/ali5451/ali5451.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ali5451/ali5451.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1847,7 +1847,7 @@ static int __devinit snd_ali_mixer(struc
- 	struct snd_ac97_template ac97;
- 	unsigned int idx;
- 	int i, err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_ali_codec_write,
- 		.read = snd_ali_codec_read,
- 	};
-@@ -2114,7 +2114,7 @@ static int __devinit snd_ali_create(stru
- 	struct snd_ali *codec;
- 	int i, err;
- 	unsigned short cmdw;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_ali_dev_free,
-         };
- 
-diff -urNp linux-2.6.39.3/sound/pci/als300.c linux-2.6.39.3/sound/pci/als300.c
---- linux-2.6.39.3/sound/pci/als300.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/als300.c	2011-05-22 19:36:35.000000000 -0400
-@@ -319,7 +319,7 @@ static int snd_als300_ac97(struct snd_al
- 	struct snd_ac97_bus *bus;
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_als300_ac97_write,
- 		.read = snd_als300_ac97_read,
- 	};
-@@ -589,7 +589,7 @@ static snd_pcm_uframes_t snd_als300_poin
- 	return bytes_to_frames(substream->runtime, current_ptr);
- }
- 
--static struct snd_pcm_ops snd_als300_playback_ops = {
-+static const struct snd_pcm_ops snd_als300_playback_ops = {
- 	.open =		snd_als300_playback_open,
- 	.close =	snd_als300_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -600,7 +600,7 @@ static struct snd_pcm_ops snd_als300_pla
- 	.pointer =	snd_als300_pointer,
- };
- 
--static struct snd_pcm_ops snd_als300_capture_ops = {
-+static const struct snd_pcm_ops snd_als300_capture_ops = {
- 	.open =		snd_als300_capture_open,
- 	.close =	snd_als300_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -680,7 +680,7 @@ static int __devinit snd_als300_create(s
- 	void *irq_handler;
- 	int err;
- 
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_als300_dev_free,
- 	};
- 	*rchip = NULL;
-diff -urNp linux-2.6.39.3/sound/pci/als4000.c linux-2.6.39.3/sound/pci/als4000.c
---- linux-2.6.39.3/sound/pci/als4000.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/als4000.c	2011-05-22 19:36:35.000000000 -0400
-@@ -672,7 +672,7 @@ static int snd_als4000_capture_close(str
- 
- /******************************************************************/
- 
--static struct snd_pcm_ops snd_als4000_playback_ops = {
-+static const struct snd_pcm_ops snd_als4000_playback_ops = {
- 	.open =		snd_als4000_playback_open,
- 	.close =	snd_als4000_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -683,7 +683,7 @@ static struct snd_pcm_ops snd_als4000_pl
- 	.pointer =	snd_als4000_playback_pointer
- };
- 
--static struct snd_pcm_ops snd_als4000_capture_ops = {
-+static const struct snd_pcm_ops snd_als4000_capture_ops = {
- 	.open =		snd_als4000_capture_open,
- 	.close =	snd_als4000_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/asihpi/asihpi.c linux-2.6.39.3/sound/pci/asihpi/asihpi.c
---- linux-2.6.39.3/sound/pci/asihpi/asihpi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/asihpi/asihpi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1067,7 +1067,7 @@ static int snd_card_asihpi_playback_sile
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_card_asihpi_playback_ops = {
-+static const struct snd_pcm_ops snd_card_asihpi_playback_ops = {
- 	.open = snd_card_asihpi_playback_open,
- 	.close = snd_card_asihpi_playback_close,
- 	.ioctl = snd_card_asihpi_playback_ioctl,
-@@ -1080,7 +1080,7 @@ static struct snd_pcm_ops snd_card_asihp
- 	.silence = snd_card_asihpi_playback_silence,
- };
- 
--static struct snd_pcm_ops snd_card_asihpi_playback_mmap_ops = {
-+static const struct snd_pcm_ops snd_card_asihpi_playback_mmap_ops = {
- 	.open = snd_card_asihpi_playback_open,
- 	.close = snd_card_asihpi_playback_close,
- 	.ioctl = snd_card_asihpi_playback_ioctl,
-@@ -1268,7 +1268,7 @@ static int snd_card_asihpi_capture_copy(
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {
-+static const struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {
- 	.open = snd_card_asihpi_capture_open,
- 	.close = snd_card_asihpi_capture_close,
- 	.ioctl = snd_card_asihpi_capture_ioctl,
-@@ -1279,7 +1279,7 @@ static struct snd_pcm_ops snd_card_asihp
- 	.pointer = snd_card_asihpi_capture_pointer,
- };
- 
--static struct snd_pcm_ops snd_card_asihpi_capture_ops = {
-+static const struct snd_pcm_ops snd_card_asihpi_capture_ops = {
- 	.open = snd_card_asihpi_capture_open,
- 	.close = snd_card_asihpi_capture_close,
- 	.ioctl = snd_card_asihpi_capture_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/atiixp.c linux-2.6.39.3/sound/pci/atiixp.c
---- linux-2.6.39.3/sound/pci/atiixp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/atiixp.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1148,7 +1148,7 @@ static int snd_atiixp_spdif_close(struct
- }
- 
- /* AC97 playback */
--static struct snd_pcm_ops snd_atiixp_playback_ops = {
-+static const struct snd_pcm_ops snd_atiixp_playback_ops = {
- 	.open =		snd_atiixp_playback_open,
- 	.close =	snd_atiixp_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1160,7 +1160,7 @@ static struct snd_pcm_ops snd_atiixp_pla
- };
- 
- /* AC97 capture */
--static struct snd_pcm_ops snd_atiixp_capture_ops = {
-+static const struct snd_pcm_ops snd_atiixp_capture_ops = {
- 	.open =		snd_atiixp_capture_open,
- 	.close =	snd_atiixp_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1172,7 +1172,7 @@ static struct snd_pcm_ops snd_atiixp_cap
- };
- 
- /* SPDIF playback */
--static struct snd_pcm_ops snd_atiixp_spdif_ops = {
-+static const struct snd_pcm_ops snd_atiixp_spdif_ops = {
- 	.open =		snd_atiixp_spdif_open,
- 	.close =	snd_atiixp_spdif_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1410,7 +1410,7 @@ static int __devinit snd_atiixp_mixer_ne
- 	struct snd_ac97_template ac97;
- 	int i, err;
- 	int codec_count;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_atiixp_ac97_write,
- 		.read = snd_atiixp_ac97_read,
- 	};
-@@ -1590,7 +1590,7 @@ static int __devinit snd_atiixp_create(s
- 				      struct pci_dev *pci,
- 				      struct atiixp **r_chip)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_atiixp_dev_free,
- 	};
- 	struct atiixp *chip;
-diff -urNp linux-2.6.39.3/sound/pci/atiixp_modem.c linux-2.6.39.3/sound/pci/atiixp_modem.c
---- linux-2.6.39.3/sound/pci/atiixp_modem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/atiixp_modem.c	2011-05-22 19:36:35.000000000 -0400
-@@ -947,7 +947,7 @@ static int snd_atiixp_capture_close(stru
- 
- 
- /* AC97 playback */
--static struct snd_pcm_ops snd_atiixp_playback_ops = {
-+static const struct snd_pcm_ops snd_atiixp_playback_ops = {
- 	.open =		snd_atiixp_playback_open,
- 	.close =	snd_atiixp_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -959,7 +959,7 @@ static struct snd_pcm_ops snd_atiixp_pla
- };
- 
- /* AC97 capture */
--static struct snd_pcm_ops snd_atiixp_capture_ops = {
-+static const struct snd_pcm_ops snd_atiixp_capture_ops = {
- 	.open =		snd_atiixp_capture_open,
- 	.close =	snd_atiixp_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1067,7 +1067,7 @@ static int __devinit snd_atiixp_mixer_ne
- 	struct snd_ac97_template ac97;
- 	int i, err;
- 	int codec_count;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_atiixp_ac97_write,
- 		.read = snd_atiixp_ac97_read,
- 	};
-@@ -1226,7 +1226,7 @@ static int __devinit snd_atiixp_create(s
- 				       struct pci_dev *pci,
- 				       struct atiixp_modem **r_chip)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_atiixp_dev_free,
- 	};
- 	struct atiixp_modem *chip;
-diff -urNp linux-2.6.39.3/sound/pci/au88x0/au88x0_pcm.c linux-2.6.39.3/sound/pci/au88x0/au88x0_pcm.c
---- linux-2.6.39.3/sound/pci/au88x0/au88x0_pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/au88x0/au88x0_pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -409,7 +409,7 @@ static snd_pcm_uframes_t snd_vortex_pcm_
- }
- 
- /* operators */
--static struct snd_pcm_ops snd_vortex_playback_ops = {
-+static const struct snd_pcm_ops snd_vortex_playback_ops = {
- 	.open = snd_vortex_pcm_open,
- 	.close = snd_vortex_pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/aw2/aw2-alsa.c linux-2.6.39.3/sound/pci/aw2/aw2-alsa.c
---- linux-2.6.39.3/sound/pci/aw2/aw2-alsa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/aw2/aw2-alsa.c	2011-05-22 19:36:35.000000000 -0400
-@@ -178,7 +178,7 @@ static struct pci_driver driver = {
- };
- 
- /* operators for playback PCM alsa interface */
--static struct snd_pcm_ops snd_aw2_playback_ops = {
-+static const struct snd_pcm_ops snd_aw2_playback_ops = {
- 	.open = snd_aw2_pcm_playback_open,
- 	.close = snd_aw2_pcm_playback_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -190,7 +190,7 @@ static struct snd_pcm_ops snd_aw2_playba
- };
- 
- /* operators for capture PCM alsa interface */
--static struct snd_pcm_ops snd_aw2_capture_ops = {
-+static const struct snd_pcm_ops snd_aw2_capture_ops = {
- 	.open = snd_aw2_pcm_capture_open,
- 	.close = snd_aw2_pcm_capture_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -263,7 +263,7 @@ static int __devinit snd_aw2_create(stru
- {
- 	struct aw2 *chip;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_aw2_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/azt3328.c linux-2.6.39.3/sound/pci/azt3328.c
---- linux-2.6.39.3/sound/pci/azt3328.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/azt3328.c	2011-05-22 19:36:35.000000000 -0400
-@@ -822,7 +822,7 @@ snd_azf3328_mixer_new(struct snd_azf3328
- {
- 	struct snd_ac97_bus *bus;
- 	struct snd_ac97_template ac97;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_azf3328_mixer_ac97_write,
- 		.read = snd_azf3328_mixer_ac97_read,
- 	};
-@@ -2179,7 +2179,7 @@ snd_azf3328_pcm_close(struct snd_pcm_sub
- 
- /******************************************************************/
- 
--static struct snd_pcm_ops snd_azf3328_playback_ops = {
-+static const struct snd_pcm_ops snd_azf3328_playback_ops = {
- 	.open =		snd_azf3328_pcm_playback_open,
- 	.close =	snd_azf3328_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -2190,7 +2190,7 @@ static struct snd_pcm_ops snd_azf3328_pl
- 	.pointer =	snd_azf3328_pcm_pointer
- };
- 
--static struct snd_pcm_ops snd_azf3328_capture_ops = {
-+static const struct snd_pcm_ops snd_azf3328_capture_ops = {
- 	.open =		snd_azf3328_pcm_capture_open,
- 	.close =	snd_azf3328_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -2201,7 +2201,7 @@ static struct snd_pcm_ops snd_azf3328_ca
- 	.pointer =	snd_azf3328_pcm_pointer
- };
- 
--static struct snd_pcm_ops snd_azf3328_i2s_out_ops = {
-+static const struct snd_pcm_ops snd_azf3328_i2s_out_ops = {
- 	.open =		snd_azf3328_pcm_i2s_out_open,
- 	.close =	snd_azf3328_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -2497,7 +2497,7 @@ snd_azf3328_create(struct snd_card *card
- {
- 	struct snd_azf3328 *chip;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =     snd_azf3328_dev_free,
- 	};
- 	u8 dma_init;
-diff -urNp linux-2.6.39.3/sound/pci/bt87x.c linux-2.6.39.3/sound/pci/bt87x.c
---- linux-2.6.39.3/sound/pci/bt87x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops snd_bt87x_pcm_ops = {
-+static const struct snd_pcm_ops snd_bt87x_pcm_ops = {
- 	.open = snd_bt87x_pcm_open,
- 	.close = snd_bt87x_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -720,7 +720,7 @@ static int __devinit snd_bt87x_create(st
- {
- 	struct snd_bt87x *chip;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_bt87x_dev_free
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/ca0106/ca0106_main.c linux-2.6.39.3/sound/pci/ca0106/ca0106_main.c
---- linux-2.6.39.3/sound/pci/ca0106/ca0106_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ca0106/ca0106_main.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1103,7 +1103,7 @@ snd_ca0106_pcm_pointer_capture(struct sn
- }
- 
- /* operators */
--static struct snd_pcm_ops snd_ca0106_playback_front_ops = {
-+static const struct snd_pcm_ops snd_ca0106_playback_front_ops = {
- 	.open =        snd_ca0106_pcm_open_playback_front,
- 	.close =       snd_ca0106_pcm_close_playback,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -1114,7 +1114,7 @@ static struct snd_pcm_ops snd_ca0106_pla
- 	.pointer =     snd_ca0106_pcm_pointer_playback,
- };
- 
--static struct snd_pcm_ops snd_ca0106_capture_0_ops = {
-+static const struct snd_pcm_ops snd_ca0106_capture_0_ops = {
- 	.open =        snd_ca0106_pcm_open_0_capture,
- 	.close =       snd_ca0106_pcm_close_capture,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -1125,7 +1125,7 @@ static struct snd_pcm_ops snd_ca0106_cap
- 	.pointer =     snd_ca0106_pcm_pointer_capture,
- };
- 
--static struct snd_pcm_ops snd_ca0106_capture_1_ops = {
-+static const struct snd_pcm_ops snd_ca0106_capture_1_ops = {
- 	.open =        snd_ca0106_pcm_open_1_capture,
- 	.close =       snd_ca0106_pcm_close_capture,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -1136,7 +1136,7 @@ static struct snd_pcm_ops snd_ca0106_cap
- 	.pointer =     snd_ca0106_pcm_pointer_capture,
- };
- 
--static struct snd_pcm_ops snd_ca0106_capture_2_ops = {
-+static const struct snd_pcm_ops snd_ca0106_capture_2_ops = {
- 	.open =        snd_ca0106_pcm_open_2_capture,
- 	.close =       snd_ca0106_pcm_close_capture,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -1147,7 +1147,7 @@ static struct snd_pcm_ops snd_ca0106_cap
- 	.pointer =     snd_ca0106_pcm_pointer_capture,
- };
- 
--static struct snd_pcm_ops snd_ca0106_capture_3_ops = {
-+static const struct snd_pcm_ops snd_ca0106_capture_3_ops = {
- 	.open =        snd_ca0106_pcm_open_3_capture,
- 	.close =       snd_ca0106_pcm_close_capture,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -1158,7 +1158,7 @@ static struct snd_pcm_ops snd_ca0106_cap
- 	.pointer =     snd_ca0106_pcm_pointer_capture,
- };
- 
--static struct snd_pcm_ops snd_ca0106_playback_center_lfe_ops = {
-+static const struct snd_pcm_ops snd_ca0106_playback_center_lfe_ops = {
-         .open =         snd_ca0106_pcm_open_playback_center_lfe,
-         .close =        snd_ca0106_pcm_close_playback,
-         .ioctl =        snd_pcm_lib_ioctl,
-@@ -1169,7 +1169,7 @@ static struct snd_pcm_ops snd_ca0106_pla
-         .pointer =      snd_ca0106_pcm_pointer_playback, 
- };
- 
--static struct snd_pcm_ops snd_ca0106_playback_unknown_ops = {
-+static const struct snd_pcm_ops snd_ca0106_playback_unknown_ops = {
-         .open =         snd_ca0106_pcm_open_playback_unknown,
-         .close =        snd_ca0106_pcm_close_playback,
-         .ioctl =        snd_pcm_lib_ioctl,
-@@ -1180,7 +1180,7 @@ static struct snd_pcm_ops snd_ca0106_pla
-         .pointer =      snd_ca0106_pcm_pointer_playback, 
- };
- 
--static struct snd_pcm_ops snd_ca0106_playback_rear_ops = {
-+static const struct snd_pcm_ops snd_ca0106_playback_rear_ops = {
-         .open =         snd_ca0106_pcm_open_playback_rear,
-         .close =        snd_ca0106_pcm_close_playback,
-         .ioctl =        snd_pcm_lib_ioctl,
-@@ -1223,7 +1223,7 @@ static int snd_ca0106_ac97(struct snd_ca
- 	struct snd_ac97_bus *pbus;
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_ca0106_ac97_write,
- 		.read = snd_ca0106_ac97_read,
- 	};
-@@ -1629,7 +1629,7 @@ static int __devinit snd_ca0106_create(i
- 	struct snd_ca0106 *chip;
- 	struct snd_ca0106_details *c;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_ca0106_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/ca0106/ca_midi.c linux-2.6.39.3/sound/pci/ca0106/ca_midi.c
---- linux-2.6.39.3/sound/pci/ca0106/ca_midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ca0106/ca_midi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -255,15 +255,13 @@ static void ca_midi_output_trigger(struc
- 	}
- }
- 
--static struct snd_rawmidi_ops ca_midi_output =
--{
-+static const struct snd_rawmidi_ops ca_midi_output = {
- 	.open =		ca_midi_output_open,
- 	.close =	ca_midi_output_close,
- 	.trigger =	ca_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops ca_midi_input =
--{
-+static const struct snd_rawmidi_ops ca_midi_input = {
- 	.open =		ca_midi_input_open,
- 	.close =	ca_midi_input_close,
- 	.trigger =	ca_midi_input_trigger,
-diff -urNp linux-2.6.39.3/sound/pci/cmipci.c linux-2.6.39.3/sound/pci/cmipci.c
---- linux-2.6.39.3/sound/pci/cmipci.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/cmipci.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1838,7 +1838,7 @@ static int snd_cmipci_capture_spdif_clos
- /*
-  */
- 
--static struct snd_pcm_ops snd_cmipci_playback_ops = {
-+static const struct snd_pcm_ops snd_cmipci_playback_ops = {
- 	.open =		snd_cmipci_playback_open,
- 	.close =	snd_cmipci_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1849,7 +1849,7 @@ static struct snd_pcm_ops snd_cmipci_pla
- 	.pointer =	snd_cmipci_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_cmipci_capture_ops = {
-+static const struct snd_pcm_ops snd_cmipci_capture_ops = {
- 	.open =		snd_cmipci_capture_open,
- 	.close =	snd_cmipci_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1860,7 +1860,7 @@ static struct snd_pcm_ops snd_cmipci_cap
- 	.pointer =	snd_cmipci_capture_pointer,
- };
- 
--static struct snd_pcm_ops snd_cmipci_playback2_ops = {
-+static const struct snd_pcm_ops snd_cmipci_playback2_ops = {
- 	.open =		snd_cmipci_playback2_open,
- 	.close =	snd_cmipci_playback2_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1871,7 +1871,7 @@ static struct snd_pcm_ops snd_cmipci_pla
- 	.pointer =	snd_cmipci_capture_pointer,	/* channel B */
- };
- 
--static struct snd_pcm_ops snd_cmipci_playback_spdif_ops = {
-+static const struct snd_pcm_ops snd_cmipci_playback_spdif_ops = {
- 	.open =		snd_cmipci_playback_spdif_open,
- 	.close =	snd_cmipci_playback_spdif_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1882,7 +1882,7 @@ static struct snd_pcm_ops snd_cmipci_pla
- 	.pointer =	snd_cmipci_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_cmipci_capture_spdif_ops = {
-+static const struct snd_pcm_ops snd_cmipci_capture_spdif_ops = {
- 	.open =		snd_cmipci_capture_spdif_open,
- 	.close =	snd_cmipci_capture_spdif_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -3011,7 +3011,7 @@ static int __devinit snd_cmipci_create(s
- {
- 	struct cmipci *cm;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_cmipci_dev_free,
- 	};
- 	unsigned int val;
-diff -urNp linux-2.6.39.3/sound/pci/cs4281.c linux-2.6.39.3/sound/pci/cs4281.c
---- linux-2.6.39.3/sound/pci/cs4281.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/cs4281.c	2011-05-22 19:36:35.000000000 -0400
-@@ -947,7 +947,7 @@ static int snd_cs4281_capture_close(stru
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_cs4281_playback_ops = {
-+static const struct snd_pcm_ops snd_cs4281_playback_ops = {
- 	.open =		snd_cs4281_playback_open,
- 	.close =	snd_cs4281_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -958,7 +958,7 @@ static struct snd_pcm_ops snd_cs4281_pla
- 	.pointer =	snd_cs4281_pointer,
- };
- 
--static struct snd_pcm_ops snd_cs4281_capture_ops = {
-+static const struct snd_pcm_ops snd_cs4281_capture_ops = {
- 	.open =		snd_cs4281_capture_open,
- 	.close =	snd_cs4281_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1098,7 +1098,7 @@ static int __devinit snd_cs4281_mixer(st
- 	struct snd_card *card = chip->card;
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_cs4281_ac97_write,
- 		.read = snd_cs4281_ac97_read,
- 	};
-@@ -1343,7 +1343,7 @@ static int __devinit snd_cs4281_create(s
- 	struct cs4281 *chip;
- 	unsigned int tmp;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_cs4281_dev_free,
- 	};
- 
-@@ -1765,15 +1765,13 @@ static void snd_cs4281_midi_output_trigg
- 	spin_unlock_irqrestore(&chip->reg_lock, flags);
- }
- 
--static struct snd_rawmidi_ops snd_cs4281_midi_output =
--{
-+static const struct snd_rawmidi_ops snd_cs4281_midi_output = {
- 	.open =		snd_cs4281_midi_output_open,
- 	.close =	snd_cs4281_midi_output_close,
- 	.trigger =	snd_cs4281_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_cs4281_midi_input =
--{
-+static const struct snd_rawmidi_ops snd_cs4281_midi_input = {
- 	.open = 	snd_cs4281_midi_input_open,
- 	.close =	snd_cs4281_midi_input_close,
- 	.trigger =	snd_cs4281_midi_input_trigger,
-diff -urNp linux-2.6.39.3/sound/pci/cs46xx/cs46xx_lib.c linux-2.6.39.3/sound/pci/cs46xx/cs46xx_lib.c
---- linux-2.6.39.3/sound/pci/cs46xx/cs46xx_lib.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/cs46xx/cs46xx_lib.c	2011-05-22 19:36:35.000000000 -0400
-@@ -3722,7 +3722,7 @@ int __devinit snd_cs46xx_create(struct s
- 	struct snd_cs46xx_region *region;
- 	struct cs_card_type *cp;
- 	u16 ss_card, ss_vendor;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_cs46xx_dev_free,
- 	};
- 	
-diff -urNp linux-2.6.39.3/sound/pci/cs5530.c linux-2.6.39.3/sound/pci/cs5530.c
---- linux-2.6.39.3/sound/pci/cs5530.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/cs5530.c	2011-05-22 19:36:35.000000000 -0400
-@@ -107,7 +107,7 @@ static int __devinit snd_cs5530_create(s
- 	void __iomem *mem;
- 	int err;
- 
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_cs5530_dev_free,
- 	};
- 	*rchip = NULL;
-diff -urNp linux-2.6.39.3/sound/pci/cs5535audio/cs5535audio.c linux-2.6.39.3/sound/pci/cs5535audio/cs5535audio.c
---- linux-2.6.39.3/sound/pci/cs5535audio/cs5535audio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_cs5535audio_ac97_codec_write,
- 		.read = snd_cs5535audio_ac97_codec_read,
- 	};
-@@ -277,7 +277,7 @@ static int __devinit snd_cs5535audio_cre
- 	struct cs5535audio *cs5535au;
- 
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_cs5535audio_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/cs5535audio/cs5535audio_pcm.c linux-2.6.39.3/sound/pci/cs5535audio/cs5535audio_pcm.c
---- linux-2.6.39.3/sound/pci/cs5535audio/cs5535audio_pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops snd_cs5535audio_playback_ops = {
-+static const struct snd_pcm_ops snd_cs5535audio_playback_ops = {
- 	.open =		snd_cs5535audio_playback_open,
- 	.close =	snd_cs5535audio_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -391,7 +391,7 @@ static struct snd_pcm_ops snd_cs5535audi
- 	.pointer =	snd_cs5535audio_pcm_pointer,
- };
- 
--static struct snd_pcm_ops snd_cs5535audio_capture_ops = {
-+static const struct snd_pcm_ops snd_cs5535audio_capture_ops = {
- 	.open =		snd_cs5535audio_capture_open,
- 	.close =	snd_cs5535audio_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/ctxfi/ctpcm.c linux-2.6.39.3/sound/pci/ctxfi/ctpcm.c
---- linux-2.6.39.3/sound/pci/ctxfi/ctpcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- /* PCM operators for playback */
--static struct snd_pcm_ops ct_pcm_playback_ops = {
-+static const struct snd_pcm_ops ct_pcm_playback_ops = {
- 	.open	 	= ct_pcm_playback_open,
- 	.close		= ct_pcm_playback_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -383,7 +383,7 @@ static struct snd_pcm_ops ct_pcm_playbac
- };
- 
- /* PCM operators for capture */
--static struct snd_pcm_ops ct_pcm_capture_ops = {
-+static const struct snd_pcm_ops ct_pcm_capture_ops = {
- 	.open	 	= ct_pcm_capture_open,
- 	.close		= ct_pcm_capture_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/echoaudio/echoaudio.c linux-2.6.39.3/sound/pci/echoaudio/echoaudio.c
---- linux-2.6.39.3/sound/pci/echoaudio/echoaudio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/echoaudio/echoaudio.c	2011-05-22 19:36:35.000000000 -0400
-@@ -831,7 +831,7 @@ static snd_pcm_uframes_t pcm_pointer(str
- 
- 
- /* pcm *_ops structures */
--static struct snd_pcm_ops analog_playback_ops = {
-+static const struct snd_pcm_ops analog_playback_ops = {
- 	.open = pcm_analog_out_open,
- 	.close = pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -842,7 +842,7 @@ static struct snd_pcm_ops analog_playbac
- 	.pointer = pcm_pointer,
- 	.page = snd_pcm_sgbuf_ops_page,
- };
--static struct snd_pcm_ops analog_capture_ops = {
-+static const struct snd_pcm_ops analog_capture_ops = {
- 	.open = pcm_analog_in_open,
- 	.close = pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -855,7 +855,7 @@ static struct snd_pcm_ops analog_capture
- };
- #ifdef ECHOCARD_HAS_DIGITAL_IO
- #ifndef ECHOCARD_HAS_VMIXER
--static struct snd_pcm_ops digital_playback_ops = {
-+static const struct snd_pcm_ops digital_playback_ops = {
- 	.open = pcm_digital_out_open,
- 	.close = pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -867,7 +867,7 @@ static struct snd_pcm_ops digital_playba
- 	.page = snd_pcm_sgbuf_ops_page,
- };
- #endif /* !ECHOCARD_HAS_VMIXER */
--static struct snd_pcm_ops digital_capture_ops = {
-+static const struct snd_pcm_ops digital_capture_ops = {
- 	.open = pcm_digital_in_open,
- 	.close = pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -1945,7 +1945,7 @@ static __devinit int snd_echo_create(str
- 	struct echoaudio *chip;
- 	int err;
- 	size_t sz;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_echo_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/echoaudio/midi.c linux-2.6.39.3/sound/pci/echoaudio/midi.c
---- linux-2.6.39.3/sound/pci/echoaudio/midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/echoaudio/midi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -292,13 +292,13 @@ static int snd_echo_midi_output_close(st
- 
- 
- 
--static struct snd_rawmidi_ops snd_echo_midi_input = {
-+static const struct snd_rawmidi_ops snd_echo_midi_input = {
- 	.open = snd_echo_midi_input_open,
- 	.close = snd_echo_midi_input_close,
- 	.trigger = snd_echo_midi_input_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_echo_midi_output = {
-+static const struct snd_rawmidi_ops snd_echo_midi_output = {
- 	.open = snd_echo_midi_output_open,
- 	.close = snd_echo_midi_output_close,
- 	.trigger = snd_echo_midi_output_trigger,
-diff -urNp linux-2.6.39.3/sound/pci/emu10k1/emu10k1_main.c linux-2.6.39.3/sound/pci/emu10k1/emu10k1_main.c
---- linux-2.6.39.3/sound/pci/emu10k1/emu10k1_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/emu10k1/emu10k1_main.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1722,7 +1722,7 @@ int __devinit snd_emu10k1_create(struct 
- 	int is_audigy;
- 	unsigned int silent_page;
- 	const struct snd_emu_chip_details *c;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_emu10k1_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/emu10k1/emu10k1x.c linux-2.6.39.3/sound/pci/emu10k1/emu10k1x.c
---- linux-2.6.39.3/sound/pci/emu10k1/emu10k1x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/emu10k1/emu10k1x.c	2011-05-22 19:36:35.000000000 -0400
-@@ -543,7 +543,7 @@ snd_emu10k1x_pcm_pointer(struct snd_pcm_
- }
- 
- /* operators */
--static struct snd_pcm_ops snd_emu10k1x_playback_ops = {
-+static const struct snd_pcm_ops snd_emu10k1x_playback_ops = {
- 	.open =        snd_emu10k1x_playback_open,
- 	.close =       snd_emu10k1x_playback_close,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -689,7 +689,7 @@ snd_emu10k1x_pcm_pointer_capture(struct 
- 	return ptr;
- }
- 
--static struct snd_pcm_ops snd_emu10k1x_capture_ops = {
-+static const struct snd_pcm_ops snd_emu10k1x_capture_ops = {
- 	.open =        snd_emu10k1x_pcm_open_capture,
- 	.close =       snd_emu10k1x_pcm_close_capture,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -731,7 +731,7 @@ static int snd_emu10k1x_ac97(struct emu1
- 	struct snd_ac97_bus *pbus;
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_emu10k1x_ac97_write,
- 		.read = snd_emu10k1x_ac97_read,
- 	};
-@@ -888,7 +888,7 @@ static int __devinit snd_emu10k1x_create
- 	struct emu10k1x *chip;
- 	int err;
- 	int ch;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_emu10k1x_dev_free,
- 	};
- 
-@@ -1465,15 +1465,13 @@ static void snd_emu10k1x_midi_output_tri
- 
-  */
- 
--static struct snd_rawmidi_ops snd_emu10k1x_midi_output =
--{
-+static const struct snd_rawmidi_ops snd_emu10k1x_midi_output = {
- 	.open =		snd_emu10k1x_midi_output_open,
- 	.close =	snd_emu10k1x_midi_output_close,
- 	.trigger =	snd_emu10k1x_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_emu10k1x_midi_input =
--{
-+static const struct snd_rawmidi_ops snd_emu10k1x_midi_input = {
- 	.open =		snd_emu10k1x_midi_input_open,
- 	.close =	snd_emu10k1x_midi_input_close,
- 	.trigger =	snd_emu10k1x_midi_input_trigger,
-diff -urNp linux-2.6.39.3/sound/pci/emu10k1/p16v.c linux-2.6.39.3/sound/pci/emu10k1/p16v.c
---- linux-2.6.39.3/sound/pci/emu10k1/p16v.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/emu10k1/p16v.c	2011-05-22 19:36:35.000000000 -0400
-@@ -601,7 +601,7 @@ snd_p16v_pcm_pointer_capture(struct snd_
- }
- 
- /* operators */
--static struct snd_pcm_ops snd_p16v_playback_front_ops = {
-+static const struct snd_pcm_ops snd_p16v_playback_front_ops = {
- 	.open =        snd_p16v_pcm_open_playback_front,
- 	.close =       snd_p16v_pcm_close_playback,
- 	.ioctl =       snd_pcm_lib_ioctl,
-@@ -612,7 +612,7 @@ static struct snd_pcm_ops snd_p16v_playb
- 	.pointer =     snd_p16v_pcm_pointer_playback,
- };
- 
--static struct snd_pcm_ops snd_p16v_capture_ops = {
-+static const struct snd_pcm_ops snd_p16v_capture_ops = {
- 	.open =        snd_p16v_pcm_open_capture,
- 	.close =       snd_p16v_pcm_close_capture,
- 	.ioctl =       snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/ens1370.c linux-2.6.39.3/sound/pci/ens1370.c
---- linux-2.6.39.3/sound/pci/ens1370.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ens1370.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1225,7 +1225,7 @@ static int snd_ensoniq_capture_close(str
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_ensoniq_playback1_ops = {
-+static const struct snd_pcm_ops snd_ensoniq_playback1_ops = {
- 	.open =		snd_ensoniq_playback1_open,
- 	.close =	snd_ensoniq_playback1_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1236,7 +1236,7 @@ static struct snd_pcm_ops snd_ensoniq_pl
- 	.pointer =	snd_ensoniq_playback1_pointer,
- };
- 
--static struct snd_pcm_ops snd_ensoniq_playback2_ops = {
-+static const struct snd_pcm_ops snd_ensoniq_playback2_ops = {
- 	.open =		snd_ensoniq_playback2_open,
- 	.close =	snd_ensoniq_playback2_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1247,7 +1247,7 @@ static struct snd_pcm_ops snd_ensoniq_pl
- 	.pointer =	snd_ensoniq_playback2_pointer,
- };
- 
--static struct snd_pcm_ops snd_ensoniq_capture_ops = {
-+static const struct snd_pcm_ops snd_ensoniq_capture_ops = {
- 	.open =		snd_ensoniq_capture_open,
- 	.close =	snd_ensoniq_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1633,7 +1633,7 @@ static int __devinit snd_ensoniq_1371_mi
- 	struct snd_ac97_bus *pbus;
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_es1371_codec_write,
- 		.read = snd_es1371_codec_read,
- 		.wait = snd_es1371_codec_wait,
-@@ -2096,7 +2096,7 @@ static int __devinit snd_ensoniq_create(
- {
- 	struct ensoniq *ensoniq;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_ensoniq_dev_free,
- 	};
- 
-@@ -2331,15 +2331,13 @@ static void snd_ensoniq_midi_output_trig
- 	spin_unlock_irqrestore(&ensoniq->reg_lock, flags);
- }
- 
--static struct snd_rawmidi_ops snd_ensoniq_midi_output =
--{
-+static const struct snd_rawmidi_ops snd_ensoniq_midi_output = {
- 	.open =		snd_ensoniq_midi_output_open,
- 	.close =	snd_ensoniq_midi_output_close,
- 	.trigger =	snd_ensoniq_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_ensoniq_midi_input =
--{
-+static const struct snd_rawmidi_ops snd_ensoniq_midi_input = {
- 	.open =		snd_ensoniq_midi_input_open,
- 	.close =	snd_ensoniq_midi_input_close,
- 	.trigger =	snd_ensoniq_midi_input_trigger,
-diff -urNp linux-2.6.39.3/sound/pci/es1938.c linux-2.6.39.3/sound/pci/es1938.c
---- linux-2.6.39.3/sound/pci/es1938.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/es1938.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1004,7 +1004,7 @@ static int snd_es1938_playback_close(str
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_es1938_playback_ops = {
-+static const struct snd_pcm_ops snd_es1938_playback_ops = {
- 	.open =		snd_es1938_playback_open,
- 	.close =	snd_es1938_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1015,7 +1015,7 @@ static struct snd_pcm_ops snd_es1938_pla
- 	.pointer =	snd_es1938_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_es1938_capture_ops = {
-+static const struct snd_pcm_ops snd_es1938_capture_ops = {
- 	.open =		snd_es1938_capture_open,
- 	.close =	snd_es1938_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1598,7 +1598,7 @@ static int __devinit snd_es1938_create(s
- {
- 	struct es1938 *chip;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_es1938_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/es1968.c linux-2.6.39.3/sound/pci/es1968.c
---- linux-2.6.39.3/sound/pci/es1968.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/es1968.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1682,7 +1682,7 @@ static int snd_es1968_capture_close(stru
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_es1968_playback_ops = {
-+static const struct snd_pcm_ops snd_es1968_playback_ops = {
- 	.open =		snd_es1968_playback_open,
- 	.close =	snd_es1968_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1693,7 +1693,7 @@ static struct snd_pcm_ops snd_es1968_pla
- 	.pointer =	snd_es1968_pcm_pointer,
- };
- 
--static struct snd_pcm_ops snd_es1968_capture_ops = {
-+static const struct snd_pcm_ops snd_es1968_capture_ops = {
- 	.open =		snd_es1968_capture_open,
- 	.close =	snd_es1968_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -2053,7 +2053,7 @@ snd_es1968_mixer(struct es1968 *chip)
- 	struct snd_ctl_elem_id elem_id;
- #endif
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_es1968_ac97_write,
- 		.read = snd_es1968_ac97_read,
- 	};
-@@ -2627,7 +2627,7 @@ static int __devinit snd_es1968_create(s
- 				       int do_pm,
- 				       struct es1968 **chip_ret)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_es1968_dev_free,
- 	};
- 	struct es1968 *chip;
-diff -urNp linux-2.6.39.3/sound/pci/fm801.c linux-2.6.39.3/sound/pci/fm801.c
---- linux-2.6.39.3/sound/pci/fm801.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_pcm_ops snd_fm801_playback_ops = {
-+static const struct snd_pcm_ops snd_fm801_playback_ops = {
- 	.open =		snd_fm801_playback_open,
- 	.close =	snd_fm801_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -673,7 +673,7 @@ static struct snd_pcm_ops snd_fm801_play
- 	.pointer =	snd_fm801_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_fm801_capture_ops = {
-+static const struct snd_pcm_ops snd_fm801_capture_ops = {
- 	.open =		snd_fm801_capture_open,
- 	.close =	snd_fm801_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1236,7 +1236,7 @@ static int __devinit snd_fm801_mixer(str
- 	struct snd_ac97_template ac97;
- 	unsigned int i;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_fm801_codec_write,
- 		.read = snd_fm801_codec_read,
- 	};
-@@ -1396,7 +1396,7 @@ static int __devinit snd_fm801_create(st
- {
- 	struct fm801 *chip;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_fm801_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/hda/hda_generic.c linux-2.6.39.3/sound/pci/hda/hda_generic.c
---- linux-2.6.39.3/sound/pci/hda/hda_generic.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/hda_generic.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1038,7 +1038,7 @@ static int generic_check_power_status(st
- 
- /*
-  */
--static struct hda_codec_ops generic_patch_ops = {
-+static const struct hda_codec_ops generic_patch_ops = {
- 	.build_controls = build_generic_controls,
- 	.build_pcms = build_generic_pcms,
- 	.free = snd_hda_generic_free,
-diff -urNp linux-2.6.39.3/sound/pci/hda/hda_intel.c linux-2.6.39.3/sound/pci/hda/hda_intel.c
---- linux-2.6.39.3/sound/pci/hda/hda_intel.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/hda_intel.c	2011-06-03 00:32:08.000000000 -0400
-@@ -2459,7 +2459,7 @@ static int __devinit azx_create(struct s
- 	struct azx *chip;
- 	int i, err;
- 	unsigned short gcap;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = azx_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_ca0110.c linux-2.6.39.3/sound/pci/hda/patch_ca0110.c
---- linux-2.6.39.3/sound/pci/hda/patch_ca0110.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_ca0110.c	2011-05-22 19:36:35.000000000 -0400
-@@ -389,7 +389,7 @@ static void ca0110_free(struct hda_codec
- 	kfree(codec->spec);
- }
- 
--static struct hda_codec_ops ca0110_patch_ops = {
-+static const struct hda_codec_ops ca0110_patch_ops = {
- 	.build_controls = ca0110_build_controls,
- 	.build_pcms = ca0110_build_pcms,
- 	.init = ca0110_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_cirrus.c linux-2.6.39.3/sound/pci/hda/patch_cirrus.c
---- linux-2.6.39.3/sound/pci/hda/patch_cirrus.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_cirrus.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1126,7 +1126,7 @@ static void cs_unsol_event(struct hda_co
- 	}
- }
- 
--static struct hda_codec_ops cs_patch_ops = {
-+static const struct hda_codec_ops cs_patch_ops = {
- 	.build_controls = cs_build_controls,
- 	.build_pcms = cs_build_pcms,
- 	.init = cs_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_cmedia.c linux-2.6.39.3/sound/pci/hda/patch_cmedia.c
---- linux-2.6.39.3/sound/pci/hda/patch_cmedia.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_cmedia.c	2011-05-22 19:36:35.000000000 -0400
-@@ -624,7 +624,7 @@ static struct snd_pci_quirk cmi9880_cfg_
- 	{} /* terminator */
- };
- 
--static struct hda_codec_ops cmi9880_patch_ops = {
-+static const struct hda_codec_ops cmi9880_patch_ops = {
- 	.build_controls = cmi9880_build_controls,
- 	.build_pcms = cmi9880_build_pcms,
- 	.init = cmi9880_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_conexant.c linux-2.6.39.3/sound/pci/hda/patch_conexant.c
---- linux-2.6.39.3/sound/pci/hda/patch_conexant.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_conexant.c	2011-07-09 09:19:27.000000000 -0400
-@@ -546,7 +546,7 @@ static int conexant_suspend(struct hda_c
- }
+diff -urNp linux-2.6.39.4/sound/pci/hda/hda_codec.h linux-2.6.39.4/sound/pci/hda/hda_codec.h
+--- linux-2.6.39.4/sound/pci/hda/hda_codec.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/pci/hda/hda_codec.h	2011-08-05 20:34:06.000000000 -0400
+@@ -615,7 +615,7 @@ struct hda_bus_ops {
+ 	/* notify power-up/down from codec to controller */
+ 	void (*pm_notify)(struct hda_bus *bus);
  #endif
+-};
++} __no_const;
  
--static struct hda_codec_ops conexant_patch_ops = {
-+static const struct hda_codec_ops conexant_patch_ops = {
- 	.build_controls = conexant_build_controls,
- 	.build_pcms = conexant_build_pcms,
- 	.init = conexant_init,
-@@ -3792,7 +3792,7 @@ static int cx_auto_build_controls(struct
- 	return conexant_build_controls(codec);
- }
- 
--static struct hda_codec_ops cx_auto_patch_ops = {
-+static const struct hda_codec_ops cx_auto_patch_ops = {
- 	.build_controls = cx_auto_build_controls,
- 	.build_pcms = conexant_build_pcms,
- 	.init = cx_auto_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_hdmi.c linux-2.6.39.3/sound/pci/hda/patch_hdmi.c
---- linux-2.6.39.3/sound/pci/hda/patch_hdmi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_hdmi.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1124,7 +1124,7 @@ static void generic_hdmi_free(struct hda
- 	kfree(spec);
- }
- 
--static struct hda_codec_ops generic_hdmi_patch_ops = {
-+static const struct hda_codec_ops generic_hdmi_patch_ops = {
- 	.init			= generic_hdmi_init,
- 	.free			= generic_hdmi_free,
- 	.build_pcms		= generic_hdmi_build_pcms,
-@@ -1465,14 +1465,14 @@ static struct hda_pcm_stream nvhdmi_pcm_
- 	},
- };
- 
--static struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {
-+static const struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {
- 	.build_controls = generic_hdmi_build_controls,
- 	.build_pcms = generic_hdmi_build_pcms,
- 	.init = nvhdmi_7x_init,
- 	.free = generic_hdmi_free,
- };
- 
--static struct hda_codec_ops nvhdmi_patch_ops_2ch = {
-+static const struct hda_codec_ops nvhdmi_patch_ops_2ch = {
- 	.build_controls = generic_hdmi_build_controls,
- 	.build_pcms = generic_hdmi_build_pcms,
- 	.init = nvhdmi_7x_init,
-@@ -1599,7 +1599,7 @@ static int atihdmi_init(struct hda_codec
- 	return 0;
- }
- 
--static struct hda_codec_ops atihdmi_patch_ops = {
-+static const struct hda_codec_ops atihdmi_patch_ops = {
- 	.build_controls = generic_hdmi_build_controls,
- 	.build_pcms = generic_hdmi_build_pcms,
- 	.init = atihdmi_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_realtek.c linux-2.6.39.3/sound/pci/hda/patch_realtek.c
---- linux-2.6.39.3/sound/pci/hda/patch_realtek.c	2011-07-09 09:18:51.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_realtek.c	2011-07-09 09:19:27.000000000 -0400
-@@ -4273,7 +4273,7 @@ static int alc_resume(struct hda_codec *
- 
- /*
-  */
--static struct hda_codec_ops alc_patch_ops = {
-+static const struct hda_codec_ops alc_patch_ops = {
- 	.build_controls = alc_build_controls,
- 	.build_pcms = alc_build_pcms,
- 	.init = alc_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_si3054.c linux-2.6.39.3/sound/pci/hda/patch_si3054.c
---- linux-2.6.39.3/sound/pci/hda/patch_si3054.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_si3054.c	2011-05-22 19:36:35.000000000 -0400
-@@ -263,7 +263,7 @@ static void si3054_free(struct hda_codec
- /*
-  */
- 
--static struct hda_codec_ops si3054_patch_ops = {
-+static const struct hda_codec_ops si3054_patch_ops = {
- 	.build_controls = si3054_build_controls,
- 	.build_pcms = si3054_build_pcms,
- 	.init = si3054_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_sigmatel.c linux-2.6.39.3/sound/pci/hda/patch_sigmatel.c
---- linux-2.6.39.3/sound/pci/hda/patch_sigmatel.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_sigmatel.c	2011-06-03 00:32:08.000000000 -0400
-@@ -4968,7 +4968,7 @@ static int stac92xx_suspend(struct hda_c
- }
+ /* template to pass to the bus constructor */
+ struct hda_bus_template {
+@@ -713,6 +713,7 @@ struct hda_codec_ops {
  #endif
- 
--static struct hda_codec_ops stac92xx_patch_ops = {
-+static const struct hda_codec_ops stac92xx_patch_ops = {
- 	.build_controls = stac92xx_build_controls,
- 	.build_pcms = stac92xx_build_pcms,
- 	.init = stac92xx_init,
-diff -urNp linux-2.6.39.3/sound/pci/hda/patch_via.c linux-2.6.39.3/sound/pci/hda/patch_via.c
---- linux-2.6.39.3/sound/pci/hda/patch_via.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/hda/patch_via.c	2011-05-22 19:36:35.000000000 -0400
-@@ -2254,7 +2254,7 @@ static int via_check_power_status(struct
- 
- /*
-  */
--static struct hda_codec_ops via_patch_ops = {
-+static const struct hda_codec_ops via_patch_ops = {
- 	.build_controls = via_build_controls,
- 	.build_pcms = via_build_pcms,
- 	.init = via_init,
-diff -urNp linux-2.6.39.3/sound/pci/ice1712/ice1712.c linux-2.6.39.3/sound/pci/ice1712/ice1712.c
---- linux-2.6.39.3/sound/pci/ice1712/ice1712.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ice1712/ice1712.c	2011-05-22 19:36:35.000000000 -0400
-@@ -2541,7 +2541,7 @@ static int __devinit snd_ice1712_create(
- {
- 	struct snd_ice1712 *ice;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_ice1712_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/ice1712/ice1724.c linux-2.6.39.3/sound/pci/ice1712/ice1724.c
---- linux-2.6.39.3/sound/pci/ice1712/ice1724.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ice1712/ice1724.c	2011-05-22 19:36:35.000000000 -0400
-@@ -367,7 +367,7 @@ static void vt1724_midi_output_drain(str
- 	} while (time_after(timeout, jiffies));
- }
- 
--static struct snd_rawmidi_ops vt1724_midi_output_ops = {
-+static const struct snd_rawmidi_ops vt1724_midi_output_ops = {
- 	.open = vt1724_midi_output_open,
- 	.close = vt1724_midi_output_close,
- 	.trigger = vt1724_midi_output_trigger,
-@@ -402,7 +402,7 @@ static void vt1724_midi_input_trigger(st
- 	spin_unlock_irqrestore(&ice->reg_lock, flags);
- }
- 
--static struct snd_rawmidi_ops vt1724_midi_input_ops = {
-+static const struct snd_rawmidi_ops vt1724_midi_input_ops = {
- 	.open = vt1724_midi_input_open,
- 	.close = vt1724_midi_input_close,
- 	.trigger = vt1724_midi_input_trigger,
-@@ -2463,7 +2463,7 @@ static int __devinit snd_vt1724_create(s
- {
- 	struct snd_ice1712 *ice;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_vt1724_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/intel8x0.c linux-2.6.39.3/sound/pci/intel8x0.c
---- linux-2.6.39.3/sound/pci/intel8x0.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/intel8x0.c	2011-05-22 19:36:35.000000000 -0400
-@@ -2152,12 +2152,12 @@ static int __devinit snd_intel8x0_mixer(
- 	int err;
- 	unsigned int i, codecs;
- 	unsigned int glob_sta = 0;
--	struct snd_ac97_bus_ops *ops;
--	static struct snd_ac97_bus_ops standard_bus_ops = {
-+	const struct snd_ac97_bus_ops *ops;
-+	static const struct snd_ac97_bus_ops standard_bus_ops = {
- 		.write = snd_intel8x0_codec_write,
- 		.read = snd_intel8x0_codec_read,
- 	};
--	static struct snd_ac97_bus_ops ali_bus_ops = {
-+	static const struct snd_ac97_bus_ops ali_bus_ops = {
- 		.write = snd_intel8x0_ali_codec_write,
- 		.read = snd_intel8x0_ali_codec_read,
- 	};
-@@ -2921,7 +2921,7 @@ static int __devinit snd_intel8x0_create
- 	unsigned int i;
- 	unsigned int int_sta_masks;
- 	struct ichdev *ichdev;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_intel8x0_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/intel8x0m.c linux-2.6.39.3/sound/pci/intel8x0m.c
---- linux-2.6.39.3/sound/pci/intel8x0m.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	unsigned int glob_sta = 0;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_intel8x0m_codec_write,
- 		.read = snd_intel8x0m_codec_read,
- 	};
-@@ -1116,7 +1116,7 @@ static int __devinit snd_intel8x0m_creat
- 	unsigned int i;
- 	unsigned int int_sta_masks;
- 	struct ichdev *ichdev;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_intel8x0m_dev_free,
- 	};
- 	static struct ich_reg_info intel_regs[2] = {
+ 	void (*reboot_notify)(struct hda_codec *codec);
+ };
++typedef struct hda_codec_ops __no_const hda_codec_ops_no_const;
+ 
+ /* record for amp information cache */
+ struct hda_cache_head {
+@@ -743,7 +744,7 @@ struct hda_pcm_ops {
+ 		       struct snd_pcm_substream *substream);
+ 	int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
+ 		       struct snd_pcm_substream *substream);
+-};
++} __no_const;
+ 
+ /* PCM information for each substream */
+ struct hda_pcm_stream {
+@@ -801,7 +802,7 @@ struct hda_codec {
+ 	const char *modelname;	/* model name for preset */
+ 
+ 	/* set by patch */
+-	struct hda_codec_ops patch_ops;
++	hda_codec_ops_no_const patch_ops;
+ 
+ 	/* PCM to create, set by patch_ops.build_pcms callback */
+ 	unsigned int num_pcms;
+diff -urNp linux-2.6.39.4/sound/pci/ice1712/ice1712.h linux-2.6.39.4/sound/pci/ice1712/ice1712.h
+--- linux-2.6.39.4/sound/pci/ice1712/ice1712.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/pci/ice1712/ice1712.h	2011-08-05 20:34:06.000000000 -0400
+@@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
+ 	unsigned int mask_flags;	/* total mask bits */
+ 	struct snd_akm4xxx_ops {
+ 		void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
+-	} ops;
++	} __no_const ops;
+ };
+ 
+ struct snd_ice1712_spdif {
+@@ -285,7 +285,7 @@ struct snd_ice1712_spdif {
+ 		int (*default_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+ 		void (*stream_get)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+ 		int (*stream_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+-	} ops;
++	} __no_const ops;
+ };
+ 
+ 
+diff -urNp linux-2.6.39.4/sound/pci/intel8x0m.c linux-2.6.39.4/sound/pci/intel8x0m.c
+--- linux-2.6.39.4/sound/pci/intel8x0m.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/pci/intel8x0m.c	2011-08-05 20:34:06.000000000 -0400
 @@ -1265,7 +1265,7 @@ static struct shortname_table {
  	{ 0x5455, "ALi M5455" },
  	{ 0x746d, "AMD AMD8111" },
@@ -83219,657 +69741,9 @@ diff -urNp linux-2.6.39.3/sound/pci/intel8x0m.c linux-2.6.39.3/sound/pci/intel8x
  };
  
  static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.39.3/sound/pci/korg1212/korg1212.c linux-2.6.39.3/sound/pci/korg1212/korg1212.c
---- linux-2.6.39.3/sound/pci/korg1212/korg1212.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/korg1212/korg1212.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1682,7 +1682,7 @@ static int snd_korg1212_capture_copy(str
- 	return snd_korg1212_copy_to(korg1212, dst, pos, count, 0, korg1212->channels * 2);
- }
- 
--static struct snd_pcm_ops snd_korg1212_playback_ops = {
-+static const struct snd_pcm_ops snd_korg1212_playback_ops = {
-         .open =		snd_korg1212_playback_open,
-         .close =	snd_korg1212_playback_close,
-         .ioctl =	snd_korg1212_ioctl,
-@@ -1694,7 +1694,7 @@ static struct snd_pcm_ops snd_korg1212_p
-         .silence =	snd_korg1212_playback_silence,
- };
- 
--static struct snd_pcm_ops snd_korg1212_capture_ops = {
-+static const struct snd_pcm_ops snd_korg1212_capture_ops = {
- 	.open =		snd_korg1212_capture_open,
- 	.close =	snd_korg1212_capture_close,
- 	.ioctl =	snd_korg1212_ioctl,
-@@ -2164,7 +2164,7 @@ static int __devinit snd_korg1212_create
-         struct snd_korg1212 * korg1212;
- 	const struct firmware *dsp_code;
- 
--        static struct snd_device_ops ops = {
-+        static const struct snd_device_ops ops = {
-                 .dev_free = snd_korg1212_dev_free,
-         };
- 
-diff -urNp linux-2.6.39.3/sound/pci/maestro3.c linux-2.6.39.3/sound/pci/maestro3.c
---- linux-2.6.39.3/sound/pci/maestro3.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/maestro3.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1926,7 +1926,7 @@ snd_m3_capture_close(struct snd_pcm_subs
-  * create pcm instance
-  */
- 
--static struct snd_pcm_ops snd_m3_playback_ops = {
-+static const struct snd_pcm_ops snd_m3_playback_ops = {
- 	.open =		snd_m3_playback_open,
- 	.close =	snd_m3_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1937,7 +1937,7 @@ static struct snd_pcm_ops snd_m3_playbac
- 	.pointer =	snd_m3_pcm_pointer,
- };
- 
--static struct snd_pcm_ops snd_m3_capture_ops = {
-+static const struct snd_pcm_ops snd_m3_capture_ops = {
- 	.open =		snd_m3_capture_open,
- 	.close =	snd_m3_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -2150,7 +2150,7 @@ static int __devinit snd_m3_mixer(struct
- 	struct snd_ctl_elem_id elem_id;
- #endif
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_m3_ac97_write,
- 		.read = snd_m3_ac97_read,
- 	};
-@@ -2643,7 +2643,7 @@ snd_m3_create(struct snd_card *card, str
- 	struct snd_m3 *chip;
- 	int i, err;
- 	const struct snd_pci_quirk *quirk;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_m3_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/mixart/mixart.c linux-2.6.39.3/sound/pci/mixart/mixart.c
---- linux-2.6.39.3/sound/pci/mixart/mixart.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/mixart/mixart.c	2011-05-22 19:36:35.000000000 -0400
-@@ -887,7 +887,7 @@ static snd_pcm_uframes_t snd_mixart_stre
- 
- 
- 
--static struct snd_pcm_ops snd_mixart_playback_ops = {
-+static const struct snd_pcm_ops snd_mixart_playback_ops = {
- 	.open      = snd_mixart_playback_open,
- 	.close     = snd_mixart_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -898,7 +898,7 @@ static struct snd_pcm_ops snd_mixart_pla
- 	.pointer   = snd_mixart_stream_pointer,
- };
- 
--static struct snd_pcm_ops snd_mixart_capture_ops = {
-+static const struct snd_pcm_ops snd_mixart_capture_ops = {
- 	.open      = snd_mixart_capture_open,
- 	.close     = snd_mixart_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -1008,7 +1008,7 @@ static int __devinit snd_mixart_create(s
- {
- 	int err;
- 	struct snd_mixart *chip;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_mixart_chip_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/nm256/nm256.c linux-2.6.39.3/sound/pci/nm256/nm256.c
---- linux-2.6.39.3/sound/pci/nm256/nm256.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
-  */
--static struct snd_pcm_ops snd_nm256_playback_ops = {
-+static const struct snd_pcm_ops snd_nm256_playback_ops = {
- 	.open =		snd_nm256_playback_open,
- 	.close =	snd_nm256_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -914,7 +914,7 @@ static struct snd_pcm_ops snd_nm256_play
- 	.mmap =		snd_pcm_lib_mmap_iomem,
- };
- 
--static struct snd_pcm_ops snd_nm256_capture_ops = {
-+static const struct snd_pcm_ops snd_nm256_capture_ops = {
- 	.open =		snd_nm256_capture_open,
- 	.close =	snd_nm256_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1301,7 +1301,7 @@ snd_nm256_mixer(struct nm256 *chip)
- 	struct snd_ac97_bus *pbus;
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.reset = snd_nm256_ac97_reset,
- 		.write = snd_nm256_ac97_write,
- 		.read = snd_nm256_ac97_read,
-@@ -1471,7 +1471,7 @@ snd_nm256_create(struct snd_card *card, 
- {
- 	struct nm256 *chip;
- 	int err, pval;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_nm256_dev_free,
- 	};
- 	u32 addr;
-diff -urNp linux-2.6.39.3/sound/pci/oxygen/oxygen_pcm.c linux-2.6.39.3/sound/pci/oxygen/oxygen_pcm.c
---- linux-2.6.39.3/sound/pci/oxygen/oxygen_pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/oxygen/oxygen_pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -606,7 +606,7 @@ static snd_pcm_uframes_t oxygen_pointer(
- 	return bytes_to_frames(runtime, curr_addr - (u32)runtime->dma_addr);
- }
- 
--static struct snd_pcm_ops oxygen_rec_a_ops = {
-+static const struct snd_pcm_ops oxygen_rec_a_ops = {
- 	.open      = oxygen_rec_a_open,
- 	.close     = oxygen_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -617,7 +617,7 @@ static struct snd_pcm_ops oxygen_rec_a_o
- 	.pointer   = oxygen_pointer,
- };
- 
--static struct snd_pcm_ops oxygen_rec_b_ops = {
-+static const struct snd_pcm_ops oxygen_rec_b_ops = {
- 	.open      = oxygen_rec_b_open,
- 	.close     = oxygen_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -628,7 +628,7 @@ static struct snd_pcm_ops oxygen_rec_b_o
- 	.pointer   = oxygen_pointer,
- };
- 
--static struct snd_pcm_ops oxygen_rec_c_ops = {
-+static const struct snd_pcm_ops oxygen_rec_c_ops = {
- 	.open      = oxygen_rec_c_open,
- 	.close     = oxygen_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -639,7 +639,7 @@ static struct snd_pcm_ops oxygen_rec_c_o
- 	.pointer   = oxygen_pointer,
- };
- 
--static struct snd_pcm_ops oxygen_spdif_ops = {
-+static const struct snd_pcm_ops oxygen_spdif_ops = {
- 	.open      = oxygen_spdif_open,
- 	.close     = oxygen_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -650,7 +650,7 @@ static struct snd_pcm_ops oxygen_spdif_o
- 	.pointer   = oxygen_pointer,
- };
- 
--static struct snd_pcm_ops oxygen_multich_ops = {
-+static const struct snd_pcm_ops oxygen_multich_ops = {
- 	.open      = oxygen_multich_open,
- 	.close     = oxygen_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -661,7 +661,7 @@ static struct snd_pcm_ops oxygen_multich
- 	.pointer   = oxygen_pointer,
- };
- 
--static struct snd_pcm_ops oxygen_ac97_ops = {
-+static const struct snd_pcm_ops oxygen_ac97_ops = {
- 	.open      = oxygen_ac97_open,
- 	.close     = oxygen_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/pcxhr/pcxhr.c linux-2.6.39.3/sound/pci/pcxhr/pcxhr.c
---- linux-2.6.39.3/sound/pci/pcxhr/pcxhr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- 
--static struct snd_pcm_ops pcxhr_ops = {
-+static const struct snd_pcm_ops pcxhr_ops = {
- 	.open      = pcxhr_open,
- 	.close     = pcxhr_close,
- 	.ioctl     = snd_pcm_lib_ioctl,
-@@ -1184,7 +1184,7 @@ static int __devinit pcxhr_create(struct
- {
- 	int err;
- 	struct snd_pcxhr *chip;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = pcxhr_chip_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/riptide/riptide.c linux-2.6.39.3/sound/pci/riptide/riptide.c
---- linux-2.6.39.3/sound/pci/riptide/riptide.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/riptide/riptide.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1675,7 +1675,7 @@ static int snd_riptide_capture_close(str
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_riptide_playback_ops = {
-+static const struct snd_pcm_ops snd_riptide_playback_ops = {
- 	.open = snd_riptide_playback_open,
- 	.close = snd_riptide_playback_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -1686,7 +1686,7 @@ static struct snd_pcm_ops snd_riptide_pl
- 	.trigger = snd_riptide_trigger,
- 	.pointer = snd_riptide_pointer,
- };
--static struct snd_pcm_ops snd_riptide_capture_ops = {
-+static const struct snd_pcm_ops snd_riptide_capture_ops = {
- 	.open = snd_riptide_capture_open,
- 	.close = snd_riptide_capture_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -1857,7 +1857,7 @@ snd_riptide_create(struct snd_card *card
- 	struct snd_riptide *chip;
- 	struct riptideport *hwport;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = snd_riptide_dev_free,
- 	};
- 
-@@ -1999,7 +1999,7 @@ static int __devinit snd_riptide_mixer(s
- 	struct snd_ac97_bus *pbus;
- 	struct snd_ac97_template ac97;
- 	int err = 0;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_riptide_codec_write,
- 		.read = snd_riptide_codec_read,
- 	};
-diff -urNp linux-2.6.39.3/sound/pci/rme32.c linux-2.6.39.3/sound/pci/rme32.c
---- linux-2.6.39.3/sound/pci/rme32.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/rme32.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1197,7 +1197,7 @@ snd_rme32_capture_fd_pointer(struct snd_
- }
- 
- /* for halfduplex mode */
--static struct snd_pcm_ops snd_rme32_playback_spdif_ops = {
-+static const struct snd_pcm_ops snd_rme32_playback_spdif_ops = {
- 	.open =		snd_rme32_playback_spdif_open,
- 	.close =	snd_rme32_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1211,7 +1211,7 @@ static struct snd_pcm_ops snd_rme32_play
- 	.mmap =		snd_pcm_lib_mmap_iomem,
- };
- 
--static struct snd_pcm_ops snd_rme32_capture_spdif_ops = {
-+static const struct snd_pcm_ops snd_rme32_capture_spdif_ops = {
- 	.open =		snd_rme32_capture_spdif_open,
- 	.close =	snd_rme32_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1224,7 +1224,7 @@ static struct snd_pcm_ops snd_rme32_capt
- 	.mmap =		snd_pcm_lib_mmap_iomem,
- };
- 
--static struct snd_pcm_ops snd_rme32_playback_adat_ops = {
-+static const struct snd_pcm_ops snd_rme32_playback_adat_ops = {
- 	.open =		snd_rme32_playback_adat_open,
- 	.close =	snd_rme32_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1237,7 +1237,7 @@ static struct snd_pcm_ops snd_rme32_play
- 	.mmap =		snd_pcm_lib_mmap_iomem,
- };
- 
--static struct snd_pcm_ops snd_rme32_capture_adat_ops = {
-+static const struct snd_pcm_ops snd_rme32_capture_adat_ops = {
- 	.open =		snd_rme32_capture_adat_open,
- 	.close =	snd_rme32_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1250,7 +1250,7 @@ static struct snd_pcm_ops snd_rme32_capt
- };
- 
- /* for fullduplex mode */
--static struct snd_pcm_ops snd_rme32_playback_spdif_fd_ops = {
-+static const struct snd_pcm_ops snd_rme32_playback_spdif_fd_ops = {
- 	.open =		snd_rme32_playback_spdif_open,
- 	.close =	snd_rme32_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1262,7 +1262,7 @@ static struct snd_pcm_ops snd_rme32_play
- 	.ack =		snd_rme32_playback_fd_ack,
- };
- 
--static struct snd_pcm_ops snd_rme32_capture_spdif_fd_ops = {
-+static const struct snd_pcm_ops snd_rme32_capture_spdif_fd_ops = {
- 	.open =		snd_rme32_capture_spdif_open,
- 	.close =	snd_rme32_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1274,7 +1274,7 @@ static struct snd_pcm_ops snd_rme32_capt
- 	.ack =		snd_rme32_capture_fd_ack,
- };
- 
--static struct snd_pcm_ops snd_rme32_playback_adat_fd_ops = {
-+static const struct snd_pcm_ops snd_rme32_playback_adat_fd_ops = {
- 	.open =		snd_rme32_playback_adat_open,
- 	.close =	snd_rme32_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1285,7 +1285,7 @@ static struct snd_pcm_ops snd_rme32_play
- 	.ack =		snd_rme32_playback_fd_ack,
- };
- 
--static struct snd_pcm_ops snd_rme32_capture_adat_fd_ops = {
-+static const struct snd_pcm_ops snd_rme32_capture_adat_fd_ops = {
- 	.open =		snd_rme32_capture_adat_open,
- 	.close =	snd_rme32_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/rme9652/hdsp.c linux-2.6.39.3/sound/pci/rme9652/hdsp.c
---- linux-2.6.39.3/sound/pci/rme9652/hdsp.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/rme9652/hdsp.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1469,15 +1469,13 @@ static int snd_hdsp_midi_output_close(st
- 	return 0;
- }
- 
--static struct snd_rawmidi_ops snd_hdsp_midi_output =
--{
-+static const struct snd_rawmidi_ops snd_hdsp_midi_output = {
- 	.open =		snd_hdsp_midi_output_open,
- 	.close =	snd_hdsp_midi_output_close,
- 	.trigger =	snd_hdsp_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_hdsp_midi_input =
--{
-+static const struct snd_rawmidi_ops snd_hdsp_midi_input = {
- 	.open =		snd_hdsp_midi_input_open,
- 	.close =	snd_hdsp_midi_input_close,
- 	.trigger =	snd_hdsp_midi_input_trigger,
-@@ -5135,7 +5133,7 @@ static int snd_hdsp_hwdep_ioctl(struct s
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_hdsp_playback_ops = {
-+static const struct snd_pcm_ops snd_hdsp_playback_ops = {
- 	.open =		snd_hdsp_playback_open,
- 	.close =	snd_hdsp_playback_release,
- 	.ioctl =	snd_hdsp_ioctl,
-@@ -5147,7 +5145,7 @@ static struct snd_pcm_ops snd_hdsp_playb
- 	.silence =	snd_hdsp_hw_silence,
- };
- 
--static struct snd_pcm_ops snd_hdsp_capture_ops = {
-+static const struct snd_pcm_ops snd_hdsp_capture_ops = {
- 	.open =		snd_hdsp_capture_open,
- 	.close =	snd_hdsp_capture_release,
- 	.ioctl =	snd_hdsp_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/rme9652/hdspm.c linux-2.6.39.3/sound/pci/rme9652/hdspm.c
---- linux-2.6.39.3/sound/pci/rme9652/hdspm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/rme9652/hdspm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1773,15 +1773,13 @@ static int snd_hdspm_midi_output_close(s
- 	return 0;
- }
- 
--static struct snd_rawmidi_ops snd_hdspm_midi_output =
--{
-+static const struct snd_rawmidi_ops snd_hdspm_midi_output = {
- 	.open =		snd_hdspm_midi_output_open,
- 	.close =	snd_hdspm_midi_output_close,
- 	.trigger =	snd_hdspm_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_hdspm_midi_input =
--{
-+static const struct snd_rawmidi_ops snd_hdspm_midi_input = {
- 	.open =		snd_hdspm_midi_input_open,
- 	.close =	snd_hdspm_midi_input_close,
- 	.trigger =	snd_hdspm_midi_input_trigger,
-@@ -6172,7 +6170,7 @@ static int snd_hdspm_hwdep_ioctl(struct 
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_hdspm_playback_ops = {
-+static const struct snd_pcm_ops snd_hdspm_playback_ops = {
- 	.open = snd_hdspm_playback_open,
- 	.close = snd_hdspm_playback_release,
- 	.ioctl = snd_hdspm_ioctl,
-@@ -6184,7 +6182,7 @@ static struct snd_pcm_ops snd_hdspm_play
- 	.page = snd_pcm_sgbuf_ops_page,
- };
- 
--static struct snd_pcm_ops snd_hdspm_capture_ops = {
-+static const struct snd_pcm_ops snd_hdspm_capture_ops = {
- 	.open = snd_hdspm_capture_open,
- 	.close = snd_hdspm_capture_release,
- 	.ioctl = snd_hdspm_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/rme9652/rme9652.c linux-2.6.39.3/sound/pci/rme9652/rme9652.c
---- linux-2.6.39.3/sound/pci/rme9652/rme9652.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/rme9652/rme9652.c	2011-05-22 19:36:35.000000000 -0400
-@@ -2391,7 +2391,7 @@ static int snd_rme9652_capture_release(s
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_rme9652_playback_ops = {
-+static const struct snd_pcm_ops snd_rme9652_playback_ops = {
- 	.open =		snd_rme9652_playback_open,
- 	.close =	snd_rme9652_playback_release,
- 	.ioctl =	snd_rme9652_ioctl,
-@@ -2403,7 +2403,7 @@ static struct snd_pcm_ops snd_rme9652_pl
- 	.silence =	snd_rme9652_hw_silence,
- };
- 
--static struct snd_pcm_ops snd_rme9652_capture_ops = {
-+static const struct snd_pcm_ops snd_rme9652_capture_ops = {
- 	.open =		snd_rme9652_capture_open,
- 	.close =	snd_rme9652_capture_release,
- 	.ioctl =	snd_rme9652_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/rme96.c linux-2.6.39.3/sound/pci/rme96.c
---- linux-2.6.39.3/sound/pci/rme96.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops snd_rme96_playback_spdif_ops = {
-+static const struct snd_pcm_ops snd_rme96_playback_spdif_ops = {
- 	.open =		snd_rme96_playback_spdif_open,
- 	.close =	snd_rme96_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1460,7 +1460,7 @@ static struct snd_pcm_ops snd_rme96_play
- 	.mmap =		snd_pcm_lib_mmap_iomem,
- };
- 
--static struct snd_pcm_ops snd_rme96_capture_spdif_ops = {
-+static const struct snd_pcm_ops snd_rme96_capture_spdif_ops = {
- 	.open =		snd_rme96_capture_spdif_open,
- 	.close =	snd_rme96_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1472,7 +1472,7 @@ static struct snd_pcm_ops snd_rme96_capt
- 	.mmap =		snd_pcm_lib_mmap_iomem,
- };
- 
--static struct snd_pcm_ops snd_rme96_playback_adat_ops = {
-+static const struct snd_pcm_ops snd_rme96_playback_adat_ops = {
- 	.open =		snd_rme96_playback_adat_open,
- 	.close =	snd_rme96_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1485,7 +1485,7 @@ static struct snd_pcm_ops snd_rme96_play
- 	.mmap =		snd_pcm_lib_mmap_iomem,
- };
- 
--static struct snd_pcm_ops snd_rme96_capture_adat_ops = {
-+static const struct snd_pcm_ops snd_rme96_capture_adat_ops = {
- 	.open =		snd_rme96_capture_adat_open,
- 	.close =	snd_rme96_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/pci/sis7019.c linux-2.6.39.3/sound/pci/sis7019.c
---- linux-2.6.39.3/sound/pci/sis7019.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/sis7019.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1011,7 +1011,7 @@ static int __devinit sis_mixer_create(st
- {
- 	struct snd_ac97_bus *bus;
- 	struct snd_ac97_template ac97;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = sis_ac97_write,
- 		.read = sis_ac97_read,
- 	};
-@@ -1293,7 +1293,7 @@ static int __devinit sis_chip_create(str
- {
- 	struct sis7019 *sis = card->private_data;
- 	struct voice *voice;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free = sis_dev_free,
- 	};
- 	int rc;
-diff -urNp linux-2.6.39.3/sound/pci/sonicvibes.c linux-2.6.39.3/sound/pci/sonicvibes.c
---- linux-2.6.39.3/sound/pci/sonicvibes.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/sonicvibes.c	2011-05-22 19:36:35.000000000 -0400
-@@ -855,7 +855,7 @@ static int snd_sonicvibes_capture_close(
- 	return 0;
- }
- 
--static struct snd_pcm_ops snd_sonicvibes_playback_ops = {
-+static const struct snd_pcm_ops snd_sonicvibes_playback_ops = {
- 	.open =		snd_sonicvibes_playback_open,
- 	.close =	snd_sonicvibes_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -866,7 +866,7 @@ static struct snd_pcm_ops snd_sonicvibes
- 	.pointer =	snd_sonicvibes_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_sonicvibes_capture_ops = {
-+static const struct snd_pcm_ops snd_sonicvibes_capture_ops = {
- 	.open =		snd_sonicvibes_capture_open,
- 	.close =	snd_sonicvibes_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1255,7 +1255,7 @@ static int __devinit snd_sonicvibes_crea
- 	struct sonicvibes *sonic;
- 	unsigned int dmaa, dmac;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_sonicvibes_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/trident/trident_main.c linux-2.6.39.3/sound/pci/trident/trident_main.c
---- linux-2.6.39.3/sound/pci/trident/trident_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/trident/trident_main.c	2011-05-22 19:36:35.000000000 -0400
-@@ -3549,7 +3549,7 @@ int __devinit snd_trident_create(struct 
- 	int i, err;
- 	struct snd_trident_voice *voice;
- 	struct snd_trident_pcm_mixer *tmix;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_trident_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pci/via82xx.c linux-2.6.39.3/sound/pci/via82xx.c
---- linux-2.6.39.3/sound/pci/via82xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/via82xx.c	2011-05-22 19:36:35.000000000 -0400
-@@ -1352,7 +1352,7 @@ static int snd_via8233_playback_close(st
- 
- 
- /* via686 playback callbacks */
--static struct snd_pcm_ops snd_via686_playback_ops = {
-+static const struct snd_pcm_ops snd_via686_playback_ops = {
- 	.open =		snd_via686_playback_open,
- 	.close =	snd_via82xx_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1365,7 +1365,7 @@ static struct snd_pcm_ops snd_via686_pla
- };
- 
- /* via686 capture callbacks */
--static struct snd_pcm_ops snd_via686_capture_ops = {
-+static const struct snd_pcm_ops snd_via686_capture_ops = {
- 	.open =		snd_via82xx_capture_open,
- 	.close =	snd_via82xx_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1378,7 +1378,7 @@ static struct snd_pcm_ops snd_via686_cap
- };
- 
- /* via823x DSX playback callbacks */
--static struct snd_pcm_ops snd_via8233_playback_ops = {
-+static const struct snd_pcm_ops snd_via8233_playback_ops = {
- 	.open =		snd_via8233_playback_open,
- 	.close =	snd_via8233_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1391,7 +1391,7 @@ static struct snd_pcm_ops snd_via8233_pl
- };
- 
- /* via823x multi-channel playback callbacks */
--static struct snd_pcm_ops snd_via8233_multi_ops = {
-+static const struct snd_pcm_ops snd_via8233_multi_ops = {
- 	.open =		snd_via8233_multi_open,
- 	.close =	snd_via82xx_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1404,7 +1404,7 @@ static struct snd_pcm_ops snd_via8233_mu
- };
- 
- /* via823x capture callbacks */
--static struct snd_pcm_ops snd_via8233_capture_ops = {
-+static const struct snd_pcm_ops snd_via8233_capture_ops = {
- 	.open =		snd_via82xx_capture_open,
- 	.close =	snd_via82xx_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -1868,7 +1868,7 @@ static int __devinit snd_via82xx_mixer_n
- {
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_via82xx_codec_write,
- 		.read = snd_via82xx_codec_read,
- 		.wait = snd_via82xx_codec_wait,
-@@ -2340,7 +2340,7 @@ static int __devinit snd_via82xx_create(
- {
- 	struct via82xx *chip;
- 	int err;
--        static struct snd_device_ops ops = {
-+        static const struct snd_device_ops ops = {
- 		.dev_free =	snd_via82xx_dev_free,
-         };
- 
-diff -urNp linux-2.6.39.3/sound/pci/via82xx_modem.c linux-2.6.39.3/sound/pci/via82xx_modem.c
---- linux-2.6.39.3/sound/pci/via82xx_modem.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/via82xx_modem.c	2011-05-22 19:36:35.000000000 -0400
-@@ -799,7 +799,7 @@ static int snd_via82xx_pcm_close(struct 
- 
- 
- /* via686 playback callbacks */
--static struct snd_pcm_ops snd_via686_playback_ops = {
-+static const struct snd_pcm_ops snd_via686_playback_ops = {
- 	.open =		snd_via82xx_playback_open,
- 	.close =	snd_via82xx_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -812,7 +812,7 @@ static struct snd_pcm_ops snd_via686_pla
- };
- 
- /* via686 capture callbacks */
--static struct snd_pcm_ops snd_via686_capture_ops = {
-+static const struct snd_pcm_ops snd_via686_capture_ops = {
- 	.open =		snd_via82xx_capture_open,
- 	.close =	snd_via82xx_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -889,7 +889,7 @@ static int __devinit snd_via82xx_mixer_n
- {
- 	struct snd_ac97_template ac97;
- 	int err;
--	static struct snd_ac97_bus_ops ops = {
-+	static const struct snd_ac97_bus_ops ops = {
- 		.write = snd_via82xx_codec_write,
- 		.read = snd_via82xx_codec_read,
- 		.wait = snd_via82xx_codec_wait,
-@@ -1105,7 +1105,7 @@ static int __devinit snd_via82xx_create(
- {
- 	struct via82xx_modem *chip;
- 	int err;
--        static struct snd_device_ops ops = {
-+        static const struct snd_device_ops ops = {
- 		.dev_free =	snd_via82xx_dev_free,
-         };
- 
-diff -urNp linux-2.6.39.3/sound/pci/vx222/vx222.c linux-2.6.39.3/sound/pci/vx222/vx222.c
---- linux-2.6.39.3/sound/pci/vx222/vx222.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	int i, err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_vx222_dev_free,
- 	};
- 	struct snd_vx_ops *vx_ops;
-diff -urNp linux-2.6.39.3/sound/pci/ymfpci/ymfpci_main.c linux-2.6.39.3/sound/pci/ymfpci/ymfpci_main.c
---- linux-2.6.39.3/sound/pci/ymfpci/ymfpci_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pci/ymfpci/ymfpci_main.c	2011-05-22 19:36:35.000000000 -0400
+diff -urNp linux-2.6.39.4/sound/pci/ymfpci/ymfpci_main.c linux-2.6.39.4/sound/pci/ymfpci/ymfpci_main.c
+--- linux-2.6.39.4/sound/pci/ymfpci/ymfpci_main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/pci/ymfpci/ymfpci_main.c	2011-08-05 20:34:06.000000000 -0400
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
  		if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
  			break;
@@ -83901,15 +69775,6 @@ diff -urNp linux-2.6.39.3/sound/pci/ymfpci/ymfpci_main.c linux-2.6.39.3/sound/pc
  			wake_up(&chip->interrupt_sleep);
  		}
  	}
-@@ -2344,7 +2344,7 @@ int __devinit snd_ymfpci_create(struct s
- {
- 	struct snd_ymfpci *chip;
- 	int err;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_ymfpci_dev_free,
- 	};
- 	
 @@ -2363,7 +2363,7 @@ int __devinit snd_ymfpci_create(struct s
  	spin_lock_init(&chip->reg_lock);
  	spin_lock_init(&chip->voice_lock);
@@ -83919,1420 +69784,243 @@ diff -urNp linux-2.6.39.3/sound/pci/ymfpci/ymfpci_main.c linux-2.6.39.3/sound/pc
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
-diff -urNp linux-2.6.39.3/sound/pcmcia/pdaudiocf/pdaudiocf.c linux-2.6.39.3/sound/pcmcia/pdaudiocf/pdaudiocf.c
---- linux-2.6.39.3/sound/pcmcia/pdaudiocf/pdaudiocf.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pcmcia/pdaudiocf/pdaudiocf.c	2011-05-22 19:36:35.000000000 -0400
-@@ -94,7 +94,7 @@ static int snd_pdacf_probe(struct pcmcia
- 	int i, err;
- 	struct snd_pdacf *pdacf;
- 	struct snd_card *card;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_pdacf_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/pcmcia/vx/vxpocket.c linux-2.6.39.3/sound/pcmcia/vx/vxpocket.c
---- linux-2.6.39.3/sound/pcmcia/vx/vxpocket.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/pcmcia/vx/vxpocket.c	2011-05-22 19:36:35.000000000 -0400
-@@ -137,7 +137,7 @@ static int snd_vxpocket_new(struct snd_c
- {
- 	struct vx_core *chip;
- 	struct snd_vxpocket *vxp;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_vxpocket_dev_free,
- 	};
- 	int err;
-diff -urNp linux-2.6.39.3/sound/ppc/pmac.c linux-2.6.39.3/sound/ppc/pmac.c
---- linux-2.6.39.3/sound/ppc/pmac.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	unsigned long ctrl_addr, txdma_addr, rxdma_addr;
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_pmac_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/ppc/snd_ps3.c linux-2.6.39.3/sound/ppc/snd_ps3.c
---- linux-2.6.39.3/sound/ppc/snd_ps3.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/ppc/snd_ps3.c	2011-05-22 19:36:35.000000000 -0400
-@@ -773,7 +773,7 @@ static struct snd_kcontrol_new spdif_ctl
- 	},
- };
- 
--static struct snd_pcm_ops snd_ps3_pcm_spdif_ops = {
-+static const struct snd_pcm_ops snd_ps3_pcm_spdif_ops = {
- 	.open = snd_ps3_pcm_open,
- 	.close = snd_ps3_pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/sh/aica.c linux-2.6.39.3/sound/sh/aica.c
---- linux-2.6.39.3/sound/sh/aica.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops snd_aicapcm_playback_ops = {
-+static const struct snd_pcm_ops snd_aicapcm_playback_ops = {
- 	.open = snd_aicapcm_pcm_open,
- 	.close = snd_aicapcm_pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/sh/sh_dac_audio.c linux-2.6.39.3/sound/sh/sh_dac_audio.c
---- linux-2.6.39.3/sound/sh/sh_dac_audio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- /* pcm ops */
--static struct snd_pcm_ops snd_sh_dac_pcm_ops = {
-+static const struct snd_pcm_ops snd_sh_dac_pcm_ops = {
- 	.open		= snd_sh_dac_pcm_open,
- 	.close		= snd_sh_dac_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -352,7 +352,7 @@ static int __devinit snd_sh_dac_create(s
- 	struct snd_sh_dac *chip;
- 	int err;
- 
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		   .dev_free = snd_sh_dac_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/soc/atmel/atmel-pcm.c linux-2.6.39.3/sound/soc/atmel/atmel-pcm.c
---- linux-2.6.39.3/sound/soc/atmel/atmel-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/atmel/atmel-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -346,7 +346,7 @@ static int atmel_pcm_mmap(struct snd_pcm
- 		       vma->vm_end - vma->vm_start, vma->vm_page_prot);
- }
- 
--static struct snd_pcm_ops atmel_pcm_ops = {
-+static const struct snd_pcm_ops atmel_pcm_ops = {
- 	.open		= atmel_pcm_open,
- 	.close		= atmel_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/atmel/playpaq_wm8510.c linux-2.6.39.3/sound/soc/atmel/playpaq_wm8510.c
---- linux-2.6.39.3/sound/soc/atmel/playpaq_wm8510.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- 
- 
--static struct snd_soc_ops playpaq_wm8510_ops = {
-+static const struct snd_soc_ops playpaq_wm8510_ops = {
- 	.hw_params = playpaq_wm8510_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/atmel/sam9g20_wm8731.c linux-2.6.39.3/sound/soc/atmel/sam9g20_wm8731.c
---- linux-2.6.39.3/sound/soc/atmel/sam9g20_wm8731.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops at91sam9g20ek_ops = {
-+static const struct snd_soc_ops at91sam9g20ek_ops = {
- 	.hw_params = at91sam9g20ek_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/atmel/snd-soc-afeb9260.c linux-2.6.39.3/sound/soc/atmel/snd-soc-afeb9260.c
---- linux-2.6.39.3/sound/soc/atmel/snd-soc-afeb9260.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/atmel/snd-soc-afeb9260.c	2011-05-22 19:36:35.000000000 -0400
-@@ -81,7 +81,7 @@ static int afeb9260_hw_params(struct snd
- 	return err;
- }
- 
--static struct snd_soc_ops afeb9260_ops = {
-+static const struct snd_soc_ops afeb9260_ops = {
- 	.hw_params = afeb9260_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/au1x/db1200.c linux-2.6.39.3/sound/soc/au1x/db1200.c
---- linux-2.6.39.3/sound/soc/au1x/db1200.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/au1x/db1200.c	2011-05-22 19:36:35.000000000 -0400
-@@ -67,7 +67,7 @@ out:
- 	return ret;
- }
- 
--static struct snd_soc_ops db1200_i2s_wm8731_ops = {
-+static const struct snd_soc_ops db1200_i2s_wm8731_ops = {
- 	.startup	= db1200_i2s_startup,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/au1x/dbdma2.c linux-2.6.39.3/sound/soc/au1x/dbdma2.c
---- linux-2.6.39.3/sound/soc/au1x/dbdma2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_pcm_ops au1xpsc_pcm_ops = {
-+static const struct snd_pcm_ops au1xpsc_pcm_ops = {
- 	.open		= au1xpsc_pcm_open,
- 	.close		= au1xpsc_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.c	2011-05-22 19:36:35.000000000 -0400
-@@ -244,7 +244,7 @@ static void bf5xx_ac97_cold_reset(struct
- #endif
- }
- 
--struct snd_ac97_bus_ops soc_ac97_ops = {
-+const struct snd_ac97_bus_ops soc_ac97_ops = {
- 	.read	= bf5xx_ac97_read,
- 	.write	= bf5xx_ac97_write,
- 	.warm_reset	= bf5xx_ac97_warm_reset,
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.h linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.h
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97.h	2011-05-22 19:36:35.000000000 -0400
-@@ -9,7 +9,7 @@
- #ifndef _BF5XX_AC97_H
- #define _BF5XX_AC97_H
- 
--extern struct snd_ac97_bus_ops bf5xx_ac97_ops;
-+extern const struct snd_ac97_bus_ops bf5xx_ac97_ops;
- extern struct snd_ac97 *ac97;
- /* Frame format in memory, only support stereo currently */
- struct ac97_frame {
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97-pcm.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97-pcm.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ac97-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
--static struct snd_pcm_ops bf5xx_pcm_ac97_ops = {
-+static const struct snd_pcm_ops bf5xx_pcm_ac97_ops = {
- 	.open		= bf5xx_pcm_open,
- 	.ioctl		= snd_pcm_lib_ioctl,
- 	.hw_params	= bf5xx_pcm_hw_params,
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad1836.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad1836.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad1836.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops bf5xx_ad1836_ops = {
-+static const struct snd_soc_ops bf5xx_ad1836_ops = {
- 	.startup = bf5xx_ad1836_startup,
- 	.hw_params = bf5xx_ad1836_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad193x.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad193x.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad193x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops bf5xx_ad193x_ops = {
-+static const struct snd_soc_ops bf5xx_ad193x_ops = {
- 	.startup = bf5xx_ad193x_startup,
- 	.hw_params = bf5xx_ad193x_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad1980.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad1980.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad1980.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops bf5xx_board_ops = {
-+static const struct snd_soc_ops bf5xx_board_ops = {
- 	.startup = bf5xx_board_startup,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad73311.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad73311.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad73311.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/blackfin/bf5xx-ad73311.c	2011-05-22 19:36:35.000000000 -0400
-@@ -175,7 +175,7 @@ static int bf5xx_ad73311_hw_params(struc
- }
- 
- 
--static struct snd_soc_ops bf5xx_ad73311_ops = {
-+static const struct snd_soc_ops bf5xx_ad73311_ops = {
- 	.startup = bf5xx_ad73311_startup,
- 	.hw_params = bf5xx_ad73311_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-i2s-pcm.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-i2s-pcm.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-i2s-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/blackfin/bf5xx-i2s-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -183,7 +183,7 @@ static int bf5xx_pcm_mmap(struct snd_pcm
- 	return 0 ;
- }
- 
--static struct snd_pcm_ops bf5xx_pcm_i2s_ops = {
-+static const struct snd_pcm_ops bf5xx_pcm_i2s_ops = {
- 	.open		= bf5xx_pcm_open,
- 	.ioctl		= snd_pcm_lib_ioctl,
- 	.hw_params	= bf5xx_pcm_hw_params,
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-ssm2602.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-ssm2602.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-ssm2602.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/blackfin/bf5xx-ssm2602.c	2011-05-22 19:36:35.000000000 -0400
-@@ -108,7 +108,7 @@ static int bf5xx_ssm2602_hw_params(struc
- 	return 0;
- }
- 
--static struct snd_soc_ops bf5xx_ssm2602_ops = {
-+static const struct snd_soc_ops bf5xx_ssm2602_ops = {
- 	.startup = bf5xx_ssm2602_startup,
- 	.hw_params = bf5xx_ssm2602_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/blackfin/bf5xx-tdm-pcm.c linux-2.6.39.3/sound/soc/blackfin/bf5xx-tdm-pcm.c
---- linux-2.6.39.3/sound/soc/blackfin/bf5xx-tdm-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/blackfin/bf5xx-tdm-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -220,7 +220,7 @@ static int bf5xx_pcm_silence(struct snd_
- }
- 
- 
--struct snd_pcm_ops bf5xx_pcm_tdm_ops = {
-+const struct snd_pcm_ops bf5xx_pcm_tdm_ops = {
- 	.open           = bf5xx_pcm_open,
- 	.ioctl          = snd_pcm_lib_ioctl,
- 	.hw_params      = bf5xx_pcm_hw_params,
-diff -urNp linux-2.6.39.3/sound/soc/davinci/davinci-evm.c linux-2.6.39.3/sound/soc/davinci/davinci-evm.c
---- linux-2.6.39.3/sound/soc/davinci/davinci-evm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/davinci/davinci-evm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -88,11 +88,11 @@ static int evm_spdif_hw_params(struct sn
- 	return snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT);
- }
- 
--static struct snd_soc_ops evm_ops = {
-+static const struct snd_soc_ops evm_ops = {
- 	.hw_params = evm_hw_params,
- };
- 
--static struct snd_soc_ops evm_spdif_ops = {
-+static const struct snd_soc_ops evm_spdif_ops = {
- 	.hw_params = evm_spdif_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/davinci/davinci-pcm.c linux-2.6.39.3/sound/soc/davinci/davinci-pcm.c
---- linux-2.6.39.3/sound/soc/davinci/davinci-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/davinci/davinci-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -748,7 +748,7 @@ static int davinci_pcm_mmap(struct snd_p
- 				     runtime->dma_bytes);
- }
- 
--static struct snd_pcm_ops davinci_pcm_ops = {
-+static const struct snd_pcm_ops davinci_pcm_ops = {
- 	.open = 	davinci_pcm_open,
- 	.close = 	davinci_pcm_close,
- 	.ioctl = 	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/davinci/davinci-sffsdr.c linux-2.6.39.3/sound/soc/davinci/davinci-sffsdr.c
---- linux-2.6.39.3/sound/soc/davinci/davinci-sffsdr.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/davinci/davinci-sffsdr.c	2011-05-22 19:36:35.000000000 -0400
-@@ -75,7 +75,7 @@ static int sffsdr_hw_params(struct snd_p
- #endif
- }
- 
--static struct snd_soc_ops sffsdr_ops = {
-+static const struct snd_soc_ops sffsdr_ops = {
- 	.hw_params = sffsdr_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/ep93xx/edb93xx.c linux-2.6.39.3/sound/soc/ep93xx/edb93xx.c
---- linux-2.6.39.3/sound/soc/ep93xx/edb93xx.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/ep93xx/edb93xx.c	2011-05-22 19:36:35.000000000 -0400
-@@ -74,7 +74,7 @@ static int edb93xx_hw_params(struct snd_
- 				      SND_SOC_CLOCK_OUT);
- }
- 
--static struct snd_soc_ops edb93xx_ops = {
-+static const struct snd_soc_ops edb93xx_ops = {
- 	.hw_params	= edb93xx_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/ep93xx/ep93xx-ac97.c linux-2.6.39.3/sound/soc/ep93xx/ep93xx-ac97.c
---- linux-2.6.39.3/sound/soc/ep93xx/ep93xx-ac97.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/ep93xx/ep93xx-ac97.c	2011-05-22 19:36:35.000000000 -0400
-@@ -239,7 +239,7 @@ static irqreturn_t ep93xx_ac97_interrupt
- 	return IRQ_HANDLED;
- }
- 
--struct snd_ac97_bus_ops soc_ac97_ops = {
-+const struct snd_ac97_bus_ops soc_ac97_ops = {
- 	.read		= ep93xx_ac97_read,
- 	.write		= ep93xx_ac97_write,
- 	.reset		= ep93xx_ac97_cold_reset,
-diff -urNp linux-2.6.39.3/sound/soc/ep93xx/ep93xx-pcm.c linux-2.6.39.3/sound/soc/ep93xx/ep93xx-pcm.c
---- linux-2.6.39.3/sound/soc/ep93xx/ep93xx-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/ep93xx/ep93xx-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -216,7 +216,7 @@ static int ep93xx_pcm_mmap(struct snd_pc
- 				     runtime->dma_bytes);
- }
- 
--static struct snd_pcm_ops ep93xx_pcm_ops = {
-+static const struct snd_pcm_ops ep93xx_pcm_ops = {
- 	.open		= ep93xx_pcm_open,
- 	.close		= ep93xx_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/ep93xx/snappercl15.c linux-2.6.39.3/sound/soc/ep93xx/snappercl15.c
---- linux-2.6.39.3/sound/soc/ep93xx/snappercl15.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/ep93xx/snappercl15.c	2011-05-22 19:36:35.000000000 -0400
-@@ -55,7 +55,7 @@ static int snappercl15_hw_params(struct 
- 	return 0;
- }
- 
--static struct snd_soc_ops snappercl15_ops = {
-+static const struct snd_soc_ops snappercl15_ops = {
- 	.hw_params	= snappercl15_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/fsl/fsl_dma.c linux-2.6.39.3/sound/soc/fsl/fsl_dma.c
---- linux-2.6.39.3/sound/soc/fsl/fsl_dma.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_pcm_ops fsl_dma_ops = {
-+static const struct snd_pcm_ops fsl_dma_ops = {
- 	.open   	= fsl_dma_open,
- 	.close  	= fsl_dma_close,
- 	.ioctl  	= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/fsl/mpc8610_hpcd.c linux-2.6.39.3/sound/soc/fsl/mpc8610_hpcd.c
---- linux-2.6.39.3/sound/soc/fsl/mpc8610_hpcd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/fsl/mpc8610_hpcd.c	2011-05-22 19:36:35.000000000 -0400
-@@ -175,7 +175,7 @@ static int mpc8610_hpcd_machine_remove(s
- /**
-  * mpc8610_hpcd_ops: ASoC machine driver operations
-  */
--static struct snd_soc_ops mpc8610_hpcd_ops = {
-+static const struct snd_soc_ops mpc8610_hpcd_ops = {
- 	.startup = mpc8610_hpcd_startup,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/fsl/p1022_ds.c linux-2.6.39.3/sound/soc/fsl/p1022_ds.c
---- linux-2.6.39.3/sound/soc/fsl/p1022_ds.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/fsl/p1022_ds.c	2011-05-22 19:36:35.000000000 -0400
-@@ -185,7 +185,7 @@ static int p1022_ds_machine_remove(struc
- /**
-  * p1022_ds_ops: ASoC machine driver operations
-  */
--static struct snd_soc_ops p1022_ds_ops = {
-+static const struct snd_soc_ops p1022_ds_ops = {
- 	.startup = p1022_ds_startup,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/imx/eukrea-tlv320.c linux-2.6.39.3/sound/soc/imx/eukrea-tlv320.c
---- linux-2.6.39.3/sound/soc/imx/eukrea-tlv320.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/imx/eukrea-tlv320.c	2011-05-22 19:36:35.000000000 -0400
-@@ -71,7 +71,7 @@ static int eukrea_tlv320_hw_params(struc
- 	return 0;
- }
- 
--static struct snd_soc_ops eukrea_tlv320_snd_ops = {
-+static const struct snd_soc_ops eukrea_tlv320_snd_ops = {
- 	.hw_params	= eukrea_tlv320_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/imx/imx-pcm-dma-mx2.c linux-2.6.39.3/sound/soc/imx/imx-pcm-dma-mx2.c
---- linux-2.6.39.3/sound/soc/imx/imx-pcm-dma-mx2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/imx/imx-pcm-dma-mx2.c	2011-05-22 19:36:35.000000000 -0400
-@@ -283,7 +283,7 @@ static int snd_imx_close(struct snd_pcm_
- 	return 0;
- }
- 
--static struct snd_pcm_ops imx_pcm_ops = {
-+static const struct snd_pcm_ops imx_pcm_ops = {
- 	.open		= snd_imx_open,
- 	.close		= snd_imx_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/imx/imx-pcm-fiq.c linux-2.6.39.3/sound/soc/imx/imx-pcm-fiq.c
---- linux-2.6.39.3/sound/soc/imx/imx-pcm-fiq.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/imx/imx-pcm-fiq.c	2011-05-22 19:36:35.000000000 -0400
-@@ -225,7 +225,7 @@ static int snd_imx_close(struct snd_pcm_
- 	return 0;
- }
- 
--static struct snd_pcm_ops imx_pcm_ops = {
-+static const struct snd_pcm_ops imx_pcm_ops = {
- 	.open		= snd_imx_open,
- 	.close		= snd_imx_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/imx/mx27vis-aic32x4.c linux-2.6.39.3/sound/soc/imx/mx27vis-aic32x4.c
---- linux-2.6.39.3/sound/soc/imx/mx27vis-aic32x4.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/imx/mx27vis-aic32x4.c	2011-05-22 19:36:35.000000000 -0400
-@@ -70,7 +70,7 @@ static int mx27vis_aic32x4_hw_params(str
- 	return 0;
- }
- 
--static struct snd_soc_ops mx27vis_aic32x4_snd_ops = {
-+static const struct snd_soc_ops mx27vis_aic32x4_snd_ops = {
- 	.hw_params	= mx27vis_aic32x4_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/imx/phycore-ac97.c linux-2.6.39.3/sound/soc/imx/phycore-ac97.c
---- linux-2.6.39.3/sound/soc/imx/phycore-ac97.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/imx/phycore-ac97.c	2011-05-22 19:36:35.000000000 -0400
-@@ -21,7 +21,7 @@
- 
- static struct snd_soc_card imx_phycore;
- 
--static struct snd_soc_ops imx_phycore_hifi_ops = {
-+static const struct snd_soc_ops imx_phycore_hifi_ops = {
- };
- 
- static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
-diff -urNp linux-2.6.39.3/sound/soc/imx/wm1133-ev1.c linux-2.6.39.3/sound/soc/imx/wm1133-ev1.c
---- linux-2.6.39.3/sound/soc/imx/wm1133-ev1.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/imx/wm1133-ev1.c	2011-05-22 19:36:35.000000000 -0400
-@@ -149,7 +149,7 @@ static int wm1133_ev1_hw_params(struct s
- 	return 0;
- }
- 
--static struct snd_soc_ops wm1133_ev1_ops = {
-+static const struct snd_soc_ops wm1133_ev1_ops = {
- 	.hw_params = wm1133_ev1_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/jz4740/jz4740-pcm.c linux-2.6.39.3/sound/soc/jz4740/jz4740-pcm.c
---- linux-2.6.39.3/sound/soc/jz4740/jz4740-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/jz4740/jz4740-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -244,7 +244,7 @@ static int jz4740_pcm_mmap(struct snd_pc
- 			vma->vm_end - vma->vm_start, vma->vm_page_prot);
- }
- 
--static struct snd_pcm_ops jz4740_pcm_ops = {
-+static const struct snd_pcm_ops jz4740_pcm_ops = {
- 	.open		= jz4740_pcm_open,
- 	.close		= jz4740_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/kirkwood/kirkwood-openrd.c linux-2.6.39.3/sound/soc/kirkwood/kirkwood-openrd.c
---- linux-2.6.39.3/sound/soc/kirkwood/kirkwood-openrd.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- }
- 
--static struct snd_soc_ops openrd_client_ops = {
-+static const struct snd_soc_ops openrd_client_ops = {
- 	.hw_params = openrd_client_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/kirkwood/kirkwood-t5325.c linux-2.6.39.3/sound/soc/kirkwood/kirkwood-t5325.c
---- linux-2.6.39.3/sound/soc/kirkwood/kirkwood-t5325.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- 
- }
- 
--static struct snd_soc_ops t5325_ops = {
-+static const struct snd_soc_ops t5325_ops = {
- 	.hw_params = t5325_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/mid-x86/sst_platform.c linux-2.6.39.3/sound/soc/mid-x86/sst_platform.c
---- linux-2.6.39.3/sound/soc/mid-x86/sst_platform.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops sst_platform_ops = {
-+static const struct snd_pcm_ops sst_platform_ops = {
- 	.open = sst_platform_open,
- 	.close = sst_platform_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/nuc900/nuc900-pcm.c linux-2.6.39.3/sound/soc/nuc900/nuc900-pcm.c
---- linux-2.6.39.3/sound/soc/nuc900/nuc900-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/nuc900/nuc900-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -297,7 +297,7 @@ static int nuc900_dma_mmap(struct snd_pc
- 					runtime->dma_bytes);
- }
- 
--static struct snd_pcm_ops nuc900_dma_ops = {
-+static const struct snd_pcm_ops nuc900_dma_ops = {
- 	.open		= nuc900_dma_open,
- 	.close		= nuc900_dma_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/omap/am3517evm.c linux-2.6.39.3/sound/soc/omap/am3517evm.c
---- linux-2.6.39.3/sound/soc/omap/am3517evm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/am3517evm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -88,7 +88,7 @@ static int am3517evm_hw_params(struct sn
- 	return 0;
- }
- 
--static struct snd_soc_ops am3517evm_ops = {
-+static const struct snd_soc_ops am3517evm_ops = {
- 	.hw_params = am3517evm_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/ams-delta.c linux-2.6.39.3/sound/soc/omap/ams-delta.c
---- linux-2.6.39.3/sound/soc/omap/ams-delta.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/ams-delta.c	2011-05-22 19:36:35.000000000 -0400
-@@ -420,7 +420,7 @@ static int ams_delta_hw_params(struct sn
- 				   SND_SOC_DAIFMT_CBM_CFM);
- }
- 
--static struct snd_soc_ops ams_delta_ops = {
-+static const struct snd_soc_ops ams_delta_ops = {
- 	.hw_params = ams_delta_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/igep0020.c linux-2.6.39.3/sound/soc/omap/igep0020.c
---- linux-2.6.39.3/sound/soc/omap/igep0020.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/igep0020.c	2011-05-22 19:36:35.000000000 -0400
-@@ -72,7 +72,7 @@ static int igep2_hw_params(struct snd_pc
- 	return 0;
- }
- 
--static struct snd_soc_ops igep2_ops = {
-+static const struct snd_soc_ops igep2_ops = {
- 	.hw_params = igep2_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/n810.c linux-2.6.39.3/sound/soc/omap/n810.c
---- linux-2.6.39.3/sound/soc/omap/n810.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops n810_ops = {
-+static const struct snd_soc_ops n810_ops = {
- 	.startup = n810_startup,
- 	.hw_params = n810_hw_params,
- 	.shutdown = n810_shutdown,
-diff -urNp linux-2.6.39.3/sound/soc/omap/omap2evm.c linux-2.6.39.3/sound/soc/omap/omap2evm.c
---- linux-2.6.39.3/sound/soc/omap/omap2evm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/omap2evm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -74,7 +74,7 @@ static int omap2evm_hw_params(struct snd
- 	return 0;
- }
- 
--static struct snd_soc_ops omap2evm_ops = {
-+static const struct snd_soc_ops omap2evm_ops = {
- 	.hw_params = omap2evm_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/omap3beagle.c linux-2.6.39.3/sound/soc/omap/omap3beagle.c
---- linux-2.6.39.3/sound/soc/omap/omap3beagle.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/omap3beagle.c	2011-05-22 19:36:35.000000000 -0400
-@@ -82,7 +82,7 @@ static int omap3beagle_hw_params(struct 
- 	return 0;
- }
- 
--static struct snd_soc_ops omap3beagle_ops = {
-+static const struct snd_soc_ops omap3beagle_ops = {
- 	.hw_params = omap3beagle_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/omap3evm.c linux-2.6.39.3/sound/soc/omap/omap3evm.c
---- linux-2.6.39.3/sound/soc/omap/omap3evm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/omap3evm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -70,7 +70,7 @@ static int omap3evm_hw_params(struct snd
- 	return 0;
- }
- 
--static struct snd_soc_ops omap3evm_ops = {
-+static const struct snd_soc_ops omap3evm_ops = {
- 	.hw_params = omap3evm_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/omap3pandora.c linux-2.6.39.3/sound/soc/omap/omap3pandora.c
---- linux-2.6.39.3/sound/soc/omap/omap3pandora.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/omap3pandora.c	2011-05-22 19:36:35.000000000 -0400
-@@ -218,7 +218,7 @@ static int omap3pandora_in_init(struct s
- 	return snd_soc_dapm_sync(dapm);
- }
- 
--static struct snd_soc_ops omap3pandora_ops = {
-+static const struct snd_soc_ops omap3pandora_ops = {
- 	.hw_params = omap3pandora_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/omap-pcm.c linux-2.6.39.3/sound/soc/omap/omap-pcm.c
---- linux-2.6.39.3/sound/soc/omap/omap-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/omap-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -311,7 +311,7 @@ static int omap_pcm_mmap(struct snd_pcm_
- 				     runtime->dma_bytes);
- }
- 
--static struct snd_pcm_ops omap_pcm_ops = {
-+static const struct snd_pcm_ops omap_pcm_ops = {
- 	.open		= omap_pcm_open,
- 	.close		= omap_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/omap/osk5912.c linux-2.6.39.3/sound/soc/omap/osk5912.c
---- linux-2.6.39.3/sound/soc/omap/osk5912.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/osk5912.c	2011-05-22 19:36:35.000000000 -0400
-@@ -90,7 +90,7 @@ static int osk_hw_params(struct snd_pcm_
- 	return err;
- }
- 
--static struct snd_soc_ops osk_ops = {
-+static const struct snd_soc_ops osk_ops = {
- 	.startup = osk_startup,
- 	.hw_params = osk_hw_params,
- 	.shutdown = osk_shutdown,
-diff -urNp linux-2.6.39.3/sound/soc/omap/overo.c linux-2.6.39.3/sound/soc/omap/overo.c
---- linux-2.6.39.3/sound/soc/omap/overo.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops overo_ops = {
-+static const struct snd_soc_ops overo_ops = {
- 	.hw_params = overo_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/rx51.c linux-2.6.39.3/sound/soc/omap/rx51.c
---- linux-2.6.39.3/sound/soc/omap/rx51.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_soc_ops rx51_ops = {
-+static const struct snd_soc_ops rx51_ops = {
- 	.startup = rx51_startup,
- 	.hw_params = rx51_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/omap/sdp3430.c linux-2.6.39.3/sound/soc/omap/sdp3430.c
---- linux-2.6.39.3/sound/soc/omap/sdp3430.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/sdp3430.c	2011-05-22 19:36:35.000000000 -0400
-@@ -87,7 +87,7 @@ static int sdp3430_hw_params(struct snd_
- 	return 0;
- }
- 
--static struct snd_soc_ops sdp3430_ops = {
-+static const struct snd_soc_ops sdp3430_ops = {
- 	.hw_params = sdp3430_hw_params,
- };
- 
-@@ -130,7 +130,7 @@ static int sdp3430_hw_voice_params(struc
- 	return 0;
- }
- 
--static struct snd_soc_ops sdp3430_voice_ops = {
-+static const struct snd_soc_ops sdp3430_voice_ops = {
- 	.hw_params = sdp3430_hw_voice_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/sdp4430.c linux-2.6.39.3/sound/soc/omap/sdp4430.c
---- linux-2.6.39.3/sound/soc/omap/sdp4430.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/omap/sdp4430.c	2011-05-22 19:36:35.000000000 -0400
-@@ -62,7 +62,7 @@ static int sdp4430_hw_params(struct snd_
- 	return ret;
- }
- 
--static struct snd_soc_ops sdp4430_ops = {
-+static const struct snd_soc_ops sdp4430_ops = {
- 	.hw_params = sdp4430_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/omap/zoom2.c linux-2.6.39.3/sound/soc/omap/zoom2.c
---- linux-2.6.39.3/sound/soc/omap/zoom2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops zoom2_ops = {
-+static const struct snd_soc_ops zoom2_ops = {
- 	.hw_params = zoom2_hw_params,
- };
- 
-@@ -121,7 +121,7 @@ static int zoom2_hw_voice_params(struct 
- 	return 0;
- }
- 
--static struct snd_soc_ops zoom2_voice_ops = {
-+static const struct snd_soc_ops zoom2_voice_ops = {
- 	.hw_params = zoom2_hw_voice_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/pxa/corgi.c linux-2.6.39.3/sound/soc/pxa/corgi.c
---- linux-2.6.39.3/sound/soc/pxa/corgi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops corgi_ops = {
-+static const struct snd_soc_ops corgi_ops = {
- 	.startup = corgi_startup,
- 	.hw_params = corgi_hw_params,
- 	.shutdown = corgi_shutdown,
-diff -urNp linux-2.6.39.3/sound/soc/pxa/imote2.c linux-2.6.39.3/sound/soc/pxa/imote2.c
---- linux-2.6.39.3/sound/soc/pxa/imote2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/imote2.c	2011-05-22 19:36:35.000000000 -0400
-@@ -56,7 +56,7 @@ static int imote2_asoc_hw_params(struct 
- 	return ret;
- }
- 
--static struct snd_soc_ops imote2_asoc_ops = {
-+static const struct snd_soc_ops imote2_asoc_ops = {
- 	.hw_params = imote2_asoc_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/pxa/magician.c linux-2.6.39.3/sound/soc/pxa/magician.c
---- linux-2.6.39.3/sound/soc/pxa/magician.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/magician.c	2011-05-22 19:36:35.000000000 -0400
-@@ -258,12 +258,12 @@ static int magician_capture_hw_params(st
- 	return 0;
- }
- 
--static struct snd_soc_ops magician_capture_ops = {
-+static const struct snd_soc_ops magician_capture_ops = {
- 	.startup = magician_startup,
- 	.hw_params = magician_capture_hw_params,
- };
- 
--static struct snd_soc_ops magician_playback_ops = {
-+static const struct snd_soc_ops magician_playback_ops = {
- 	.startup = magician_startup,
- 	.hw_params = magician_playback_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/pxa/mioa701_wm9713.c linux-2.6.39.3/sound/soc/pxa/mioa701_wm9713.c
---- linux-2.6.39.3/sound/soc/pxa/mioa701_wm9713.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/mioa701_wm9713.c	2011-05-22 19:36:35.000000000 -0400
-@@ -156,7 +156,7 @@ static int mioa701_wm9713_init(struct sn
- 	return 0;
- }
- 
--static struct snd_soc_ops mioa701_ops;
-+static const struct snd_soc_ops mioa701_ops;
- 
- static struct snd_soc_dai_link mioa701_dai[] = {
- 	{
-diff -urNp linux-2.6.39.3/sound/soc/pxa/poodle.c linux-2.6.39.3/sound/soc/pxa/poodle.c
---- linux-2.6.39.3/sound/soc/pxa/poodle.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops poodle_ops = {
-+static const struct snd_soc_ops poodle_ops = {
- 	.startup = poodle_startup,
- 	.hw_params = poodle_hw_params,
- 	.shutdown = poodle_shutdown,
-diff -urNp linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.c linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.c
---- linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.c	2011-05-22 19:36:35.000000000 -0400
-@@ -40,7 +40,7 @@ static void pxa2xx_ac97_cold_reset(struc
- 	pxa2xx_ac97_finish_reset(ac97);
- }
- 
--struct snd_ac97_bus_ops soc_ac97_ops = {
-+const struct snd_ac97_bus_ops soc_ac97_ops = {
- 	.read	= pxa2xx_ac97_read,
- 	.write	= pxa2xx_ac97_write,
- 	.warm_reset	= pxa2xx_ac97_warm_reset,
-diff -urNp linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.h linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.h
---- linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.h	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/pxa2xx-ac97.h	2011-05-22 19:36:35.000000000 -0400
-@@ -15,6 +15,6 @@
- #define PXA2XX_DAI_AC97_MIC		2
- 
- /* platform data */
--extern struct snd_ac97_bus_ops pxa2xx_ac97_ops;
-+extern const struct snd_ac97_bus_ops pxa2xx_ac97_ops;
- 
- #endif
-diff -urNp linux-2.6.39.3/sound/soc/pxa/raumfeld.c linux-2.6.39.3/sound/soc/pxa/raumfeld.c
---- linux-2.6.39.3/sound/soc/pxa/raumfeld.c	2011-06-03 00:04:14.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/raumfeld.c	2011-06-03 00:32:09.000000000 -0400
-@@ -145,7 +145,7 @@ static int raumfeld_cs4270_hw_params(str
- 	return 0;
- }
- 
--static struct snd_soc_ops raumfeld_cs4270_ops = {
-+static const struct snd_soc_ops raumfeld_cs4270_ops = {
- 	.startup = raumfeld_cs4270_startup,
- 	.shutdown = raumfeld_cs4270_shutdown,
- 	.hw_params = raumfeld_cs4270_hw_params,
-@@ -221,7 +221,7 @@ static int raumfeld_ak4104_hw_params(str
- 	return 0;
- }
- 
--static struct snd_soc_ops raumfeld_ak4104_ops = {
-+static const struct snd_soc_ops raumfeld_ak4104_ops = {
- 	.hw_params = raumfeld_ak4104_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/pxa/saarb.c linux-2.6.39.3/sound/soc/pxa/saarb.c
---- linux-2.6.39.3/sound/soc/pxa/saarb.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops saarb_i2s_ops = {
-+static const struct snd_soc_ops saarb_i2s_ops = {
- 	.hw_params	= saarb_i2s_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/pxa/spitz.c linux-2.6.39.3/sound/soc/pxa/spitz.c
---- linux-2.6.39.3/sound/soc/pxa/spitz.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops spitz_ops = {
-+static const struct snd_soc_ops spitz_ops = {
- 	.startup = spitz_startup,
- 	.hw_params = spitz_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/pxa/tavorevb3.c linux-2.6.39.3/sound/soc/pxa/tavorevb3.c
---- linux-2.6.39.3/sound/soc/pxa/tavorevb3.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/tavorevb3.c	2011-05-22 19:36:35.000000000 -0400
-@@ -106,7 +106,7 @@ static int evb3_i2s_hw_params(struct snd
- 	return ret;
- }
- 
--static struct snd_soc_ops evb3_i2s_ops = {
-+static const struct snd_soc_ops evb3_i2s_ops = {
- 	.hw_params	= evb3_i2s_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/pxa/tosa.c linux-2.6.39.3/sound/soc/pxa/tosa.c
---- linux-2.6.39.3/sound/soc/pxa/tosa.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/tosa.c	2011-05-22 19:36:35.000000000 -0400
-@@ -92,7 +92,7 @@ static int tosa_startup(struct snd_pcm_s
- 	return 0;
- }
- 
--static struct snd_soc_ops tosa_ops = {
-+static const struct snd_soc_ops tosa_ops = {
- 	.startup = tosa_startup,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/pxa/z2.c linux-2.6.39.3/sound/soc/pxa/z2.c
---- linux-2.6.39.3/sound/soc/pxa/z2.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/z2.c	2011-05-22 19:36:35.000000000 -0400
-@@ -187,7 +187,7 @@ err:
- 	return ret;
- }
- 
--static struct snd_soc_ops z2_ops = {
-+static const struct snd_soc_ops z2_ops = {
- 	.hw_params = z2_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/pxa/zylonite.c linux-2.6.39.3/sound/soc/pxa/zylonite.c
---- linux-2.6.39.3/sound/soc/pxa/zylonite.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/pxa/zylonite.c	2011-05-22 19:36:35.000000000 -0400
-@@ -156,7 +156,7 @@ static int zylonite_voice_hw_params(stru
- 	return 0;
- }
- 
--static struct snd_soc_ops zylonite_voice_ops = {
-+static const struct snd_soc_ops zylonite_voice_ops = {
- 	.hw_params = zylonite_voice_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/s6000/s6000-pcm.c linux-2.6.39.3/sound/soc/s6000/s6000-pcm.c
---- linux-2.6.39.3/sound/soc/s6000/s6000-pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/s6000/s6000-pcm.c	2011-05-22 19:36:35.000000000 -0400
-@@ -420,7 +420,7 @@ static int s6000_pcm_hw_free(struct snd_
- 	return snd_pcm_lib_free_pages(substream);
- }
- 
--static struct snd_pcm_ops s6000_pcm_ops = {
-+static const struct snd_pcm_ops s6000_pcm_ops = {
- 	.open = 	s6000_pcm_open,
- 	.close = 	s6000_pcm_close,
- 	.ioctl = 	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/s6000/s6105-ipcam.c linux-2.6.39.3/sound/soc/s6000/s6105-ipcam.c
---- linux-2.6.39.3/sound/soc/s6000/s6105-ipcam.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/s6000/s6105-ipcam.c	2011-05-22 19:36:35.000000000 -0400
-@@ -55,7 +55,7 @@ static int s6105_hw_params(struct snd_pc
- 	return 0;
- }
- 
--static struct snd_soc_ops s6105_ops = {
-+static const struct snd_soc_ops s6105_ops = {
- 	.hw_params = s6105_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/samsung/goni_wm8994.c linux-2.6.39.3/sound/soc/samsung/goni_wm8994.c
---- linux-2.6.39.3/sound/soc/samsung/goni_wm8994.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/samsung/goni_wm8994.c	2011-05-22 19:36:35.000000000 -0400
-@@ -176,7 +176,7 @@ static int goni_hifi_hw_params(struct sn
- 	return 0;
- }
- 
--static struct snd_soc_ops goni_hifi_ops = {
-+static const struct snd_soc_ops goni_hifi_ops = {
- 	.hw_params = goni_hifi_hw_params,
- };
- 
-@@ -227,7 +227,7 @@ static struct snd_soc_dai_driver voice_d
- 		.formats = SNDRV_PCM_FMTBIT_S16_LE,},
- };
- 
--static struct snd_soc_ops goni_voice_ops = {
-+static const struct snd_soc_ops goni_voice_ops = {
- 	.hw_params = goni_voice_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/samsung/h1940_uda1380.c linux-2.6.39.3/sound/soc/samsung/h1940_uda1380.c
---- linux-2.6.39.3/sound/soc/samsung/h1940_uda1380.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops h1940_ops = {
-+static const struct snd_soc_ops h1940_ops = {
- 	.startup	= h1940_startup,
- 	.hw_params	= h1940_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/samsung/jive_wm8750.c linux-2.6.39.3/sound/soc/samsung/jive_wm8750.c
---- linux-2.6.39.3/sound/soc/samsung/jive_wm8750.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/samsung/jive_wm8750.c	2011-05-22 19:36:35.000000000 -0400
-@@ -92,7 +92,7 @@ static int jive_hw_params(struct snd_pcm
- 	return 0;
- }
- 
--static struct snd_soc_ops jive_ops = {
-+static const struct snd_soc_ops jive_ops = {
- 	.hw_params	= jive_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/samsung/neo1973_wm8753.c linux-2.6.39.3/sound/soc/samsung/neo1973_wm8753.c
---- linux-2.6.39.3/sound/soc/samsung/neo1973_wm8753.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/samsung/neo1973_wm8753.c	2011-05-22 19:36:35.000000000 -0400
-@@ -128,7 +128,7 @@ static int neo1973_hifi_hw_free(struct s
- /*
-  * Neo1973 WM8753 HiFi DAI opserations.
-  */
--static struct snd_soc_ops neo1973_hifi_ops = {
-+static const struct snd_soc_ops neo1973_hifi_ops = {
- 	.hw_params = neo1973_hifi_hw_params,
- 	.hw_free = neo1973_hifi_hw_free,
- };
-@@ -187,7 +187,7 @@ static int neo1973_voice_hw_free(struct 
- 	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0, 0);
- }
- 
--static struct snd_soc_ops neo1973_voice_ops = {
-+static const struct snd_soc_ops neo1973_voice_ops = {
- 	.hw_params = neo1973_voice_hw_params,
- 	.hw_free = neo1973_voice_hw_free,
- };
-diff -urNp linux-2.6.39.3/sound/soc/samsung/rx1950_uda1380.c linux-2.6.39.3/sound/soc/samsung/rx1950_uda1380.c
---- linux-2.6.39.3/sound/soc/samsung/rx1950_uda1380.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/samsung/rx1950_uda1380.c	2011-05-22 19:36:35.000000000 -0400
-@@ -70,7 +70,7 @@ static struct snd_soc_jack_gpio hp_jack_
- 	},
- };
- 
--static struct snd_soc_ops rx1950_ops = {
-+static const struct snd_soc_ops rx1950_ops = {
- 	.startup	= rx1950_startup,
- 	.hw_params	= rx1950_hw_params,
- };
-diff -urNp linux-2.6.39.3/sound/soc/samsung/s3c24xx_simtec.c linux-2.6.39.3/sound/soc/samsung/s3c24xx_simtec.c
---- linux-2.6.39.3/sound/soc/samsung/s3c24xx_simtec.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/samsung/s3c24xx_simtec.c	2011-05-22 19:36:35.000000000 -0400
-@@ -228,7 +228,7 @@ static int simtec_call_startup(struct s3
- 	return 0;
- }
- 
--static struct snd_soc_ops simtec_snd_ops = {
-+static const struct snd_soc_ops simtec_snd_ops = {
- 	.hw_params	= simtec_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/samsung/s3c24xx_uda134x.c linux-2.6.39.3/sound/soc/samsung/s3c24xx_uda134x.c
---- linux-2.6.39.3/sound/soc/samsung/s3c24xx_uda134x.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- }
- 
--static struct snd_soc_ops s3c24xx_uda134x_ops = {
-+static const struct snd_soc_ops s3c24xx_uda134x_ops = {
- 	.startup = s3c24xx_uda134x_startup,
- 	.shutdown = s3c24xx_uda134x_shutdown,
- 	.hw_params = s3c24xx_uda134x_hw_params,
-diff -urNp linux-2.6.39.3/sound/soc/samsung/smartq_wm8987.c linux-2.6.39.3/sound/soc/samsung/smartq_wm8987.c
---- linux-2.6.39.3/sound/soc/samsung/smartq_wm8987.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 
- /*
-  * SmartQ WM8987 HiFi DAI operations.
-  */
--static struct snd_soc_ops smartq_hifi_ops = {
-+static const struct snd_soc_ops smartq_hifi_ops = {
- 	.hw_params = smartq_hifi_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/samsung/smdk_spdif.c linux-2.6.39.3/sound/soc/samsung/smdk_spdif.c
---- linux-2.6.39.3/sound/soc/samsung/smdk_spdif.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/samsung/smdk_spdif.c	2011-05-22 19:36:35.000000000 -0400
-@@ -143,7 +143,7 @@ static int smdk_hw_params(struct snd_pcm
- 	return ret;
- }
- 
--static struct snd_soc_ops smdk_spdif_ops = {
-+static const struct snd_soc_ops smdk_spdif_ops = {
- 	.hw_params = smdk_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/samsung/smdk_wm8580.c linux-2.6.39.3/sound/soc/samsung/smdk_wm8580.c
---- linux-2.6.39.3/sound/soc/samsung/smdk_wm8580.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/samsung/smdk_wm8580.c	2011-05-22 19:36:35.000000000 -0400
-@@ -114,7 +114,7 @@ static int smdk_hw_params(struct snd_pcm
- /*
-  * SMDK WM8580 DAI operations.
-  */
--static struct snd_soc_ops smdk_ops = {
-+static const struct snd_soc_ops smdk_ops = {
- 	.hw_params = smdk_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/sh/dma-sh7760.c linux-2.6.39.3/sound/soc/sh/dma-sh7760.c
---- linux-2.6.39.3/sound/soc/sh/dma-sh7760.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/sh/dma-sh7760.c	2011-05-22 19:36:35.000000000 -0400
-@@ -311,7 +311,7 @@ static snd_pcm_uframes_t camelot_pos(str
- 	return bytes_to_frames(runtime, pos);
- }
- 
--static struct snd_pcm_ops camelot_pcm_ops = {
-+static const struct snd_pcm_ops camelot_pcm_ops = {
- 	.open		= camelot_pcm_open,
- 	.close		= camelot_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/sh/hac.c linux-2.6.39.3/sound/soc/sh/hac.c
---- linux-2.6.39.3/sound/soc/sh/hac.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/sh/hac.c	2011-05-22 19:36:35.000000000 -0400
-@@ -227,7 +227,7 @@ static void hac_ac97_coldrst(struct snd_
- 	hac_ac97_warmrst(ac97);
- }
- 
--struct snd_ac97_bus_ops soc_ac97_ops = {
-+const struct snd_ac97_bus_ops soc_ac97_ops = {
- 	.read	= hac_ac97_read,
- 	.write	= hac_ac97_write,
- 	.reset	= hac_ac97_coldrst,
-diff -urNp linux-2.6.39.3/sound/soc/sh/migor.c linux-2.6.39.3/sound/soc/sh/migor.c
---- linux-2.6.39.3/sound/soc/sh/migor.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/sh/migor.c	2011-05-22 19:36:35.000000000 -0400
-@@ -108,7 +108,7 @@ static int migor_hw_free(struct snd_pcm_
- 	return 0;
- }
- 
--static struct snd_soc_ops migor_dai_ops = {
-+static const struct snd_soc_ops migor_dai_ops = {
- 	.hw_params = migor_hw_params,
- 	.hw_free = migor_hw_free,
- };
-diff -urNp linux-2.6.39.3/sound/soc/sh/siu_pcm.c linux-2.6.39.3/sound/soc/sh/siu_pcm.c
---- linux-2.6.39.3/sound/soc/sh/siu_pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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 
- 	dev_dbg(pcm->card->dev, "%s\n", __func__);
- }
- 
--static struct snd_pcm_ops siu_pcm_ops = {
-+static const struct snd_pcm_ops siu_pcm_ops = {
- 	.open		= siu_pcm_open,
- 	.close		= siu_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/tegra/harmony.c linux-2.6.39.3/sound/soc/tegra/harmony.c
---- linux-2.6.39.3/sound/soc/tegra/harmony.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/tegra/harmony.c	2011-05-22 19:36:35.000000000 -0400
-@@ -126,7 +126,7 @@ static int harmony_asoc_hw_params(struct
- 	return 0;
- }
- 
--static struct snd_soc_ops harmony_asoc_ops = {
-+static const struct snd_soc_ops harmony_asoc_ops = {
- 	.hw_params = harmony_asoc_hw_params,
- };
- 
-diff -urNp linux-2.6.39.3/sound/soc/tegra/tegra_pcm.c linux-2.6.39.3/sound/soc/tegra/tegra_pcm.c
---- linux-2.6.39.3/sound/soc/tegra/tegra_pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/tegra/tegra_pcm.c	2011-05-22 19:36:36.000000000 -0400
-@@ -277,7 +277,7 @@ static int tegra_pcm_mmap(struct snd_pcm
- 					runtime->dma_bytes);
- }
- 
--static struct snd_pcm_ops tegra_pcm_ops = {
-+static const struct snd_pcm_ops tegra_pcm_ops = {
- 	.open		= tegra_pcm_open,
- 	.close		= tegra_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/soc/txx9/txx9aclc.c linux-2.6.39.3/sound/soc/txx9/txx9aclc.c
---- linux-2.6.39.3/sound/soc/txx9/txx9aclc.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/soc/txx9/txx9aclc.c	2011-05-22 19:36:36.000000000 -0400
-@@ -272,7 +272,7 @@ static int txx9aclc_pcm_close(struct snd
- 	return 0;
- }
- 
--static struct snd_pcm_ops txx9aclc_pcm_ops = {
-+static const struct snd_pcm_ops txx9aclc_pcm_ops = {
- 	.open		= txx9aclc_pcm_open,
- 	.close		= txx9aclc_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/sparc/amd7930.c linux-2.6.39.3/sound/sparc/amd7930.c
---- linux-2.6.39.3/sound/sparc/amd7930.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops snd_amd7930_playback_ops = {
-+static const struct snd_pcm_ops snd_amd7930_playback_ops = {
- 	.open		=	snd_amd7930_playback_open,
- 	.close		=	snd_amd7930_playback_close,
- 	.ioctl		=	snd_pcm_lib_ioctl,
-@@ -744,7 +744,7 @@ static struct snd_pcm_ops snd_amd7930_pl
- 	.pointer	=	snd_amd7930_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_amd7930_capture_ops = {
-+static const struct snd_pcm_ops snd_amd7930_capture_ops = {
- 	.open		=	snd_amd7930_capture_open,
- 	.close		=	snd_amd7930_capture_close,
- 	.ioctl		=	snd_pcm_lib_ioctl,
-@@ -929,7 +929,7 @@ static int snd_amd7930_dev_free(struct s
- 	return snd_amd7930_free(amd);
- }
- 
--static struct snd_device_ops snd_amd7930_dev_ops = {
-+static const struct snd_device_ops snd_amd7930_dev_ops = {
- 	.dev_free	=	snd_amd7930_dev_free,
- };
- 
-diff -urNp linux-2.6.39.3/sound/sparc/cs4231.c linux-2.6.39.3/sound/sparc/cs4231.c
---- linux-2.6.39.3/sound/sparc/cs4231.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/sparc/cs4231.c	2011-05-22 19:36:36.000000000 -0400
-@@ -1196,7 +1196,7 @@ static int snd_cs4231_capture_close(stru
-  * XXX the audio AUXIO register...
-  */
- 
--static struct snd_pcm_ops snd_cs4231_playback_ops = {
-+static const struct snd_pcm_ops snd_cs4231_playback_ops = {
- 	.open		=	snd_cs4231_playback_open,
- 	.close		=	snd_cs4231_playback_close,
- 	.ioctl		=	snd_pcm_lib_ioctl,
-@@ -1207,7 +1207,7 @@ static struct snd_pcm_ops snd_cs4231_pla
- 	.pointer	=	snd_cs4231_playback_pointer,
- };
- 
--static struct snd_pcm_ops snd_cs4231_capture_ops = {
-+static const struct snd_pcm_ops snd_cs4231_capture_ops = {
- 	.open		=	snd_cs4231_capture_open,
- 	.close		=	snd_cs4231_capture_close,
- 	.ioctl		=	snd_pcm_lib_ioctl,
-@@ -1789,7 +1789,7 @@ static int snd_cs4231_sbus_dev_free(stru
- 	return snd_cs4231_sbus_free(cp);
- }
- 
--static struct snd_device_ops snd_cs4231_sbus_dev_ops = {
-+static const struct snd_device_ops snd_cs4231_sbus_dev_ops = {
- 	.dev_free	=	snd_cs4231_sbus_dev_free,
- };
- 
-@@ -1955,7 +1955,7 @@ static int snd_cs4231_ebus_dev_free(stru
- 	return snd_cs4231_ebus_free(cp);
- }
- 
--static struct snd_device_ops snd_cs4231_ebus_dev_ops = {
-+static const struct snd_device_ops snd_cs4231_ebus_dev_ops = {
- 	.dev_free	=	snd_cs4231_ebus_dev_free,
- };
- 
-diff -urNp linux-2.6.39.3/sound/sparc/dbri.c linux-2.6.39.3/sound/sparc/dbri.c
---- linux-2.6.39.3/sound/sparc/dbri.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/sparc/dbri.c	2011-05-22 19:36:36.000000000 -0400
-@@ -2205,7 +2205,7 @@ static snd_pcm_uframes_t snd_dbri_pointe
- 	return ret;
- }
- 
--static struct snd_pcm_ops snd_dbri_ops = {
-+static const struct snd_pcm_ops snd_dbri_ops = {
- 	.open = snd_dbri_open,
- 	.close = snd_dbri_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/spi/at73c213.c linux-2.6.39.3/sound/spi/at73c213.c
---- linux-2.6.39.3/sound/spi/at73c213.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/spi/at73c213.c	2011-05-22 19:36:36.000000000 -0400
-@@ -319,7 +319,7 @@ snd_at73c213_pcm_pointer(struct snd_pcm_
- 	return pos;
- }
- 
--static struct snd_pcm_ops at73c213_playback_ops = {
-+static const struct snd_pcm_ops at73c213_playback_ops = {
- 	.open		= snd_at73c213_pcm_open,
- 	.close		= snd_at73c213_pcm_close,
- 	.ioctl		= snd_pcm_lib_ioctl,
-@@ -882,7 +882,7 @@ static int snd_at73c213_dev_free(struct 
- static int __devinit snd_at73c213_dev_init(struct snd_card *card,
- 					 struct spi_device *spi)
- {
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free	= snd_at73c213_dev_free,
- 	};
- 	struct snd_at73c213 *chip = get_chip(card);
-diff -urNp linux-2.6.39.3/sound/usb/6fire/midi.c linux-2.6.39.3/sound/usb/6fire/midi.c
---- linux-2.6.39.3/sound/usb/6fire/midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_rawmidi_ops out_ops = {
-+static const struct snd_rawmidi_ops out_ops = {
- 	.open = usb6fire_midi_out_open,
- 	.close = usb6fire_midi_out_close,
- 	.trigger = usb6fire_midi_out_trigger,
- 	.drain = usb6fire_midi_out_drain
- };
- 
--static struct snd_rawmidi_ops in_ops = {
-+static const struct snd_rawmidi_ops in_ops = {
- 	.open = usb6fire_midi_in_open,
- 	.close = usb6fire_midi_in_close,
- 	.trigger = usb6fire_midi_in_trigger
-diff -urNp linux-2.6.39.3/sound/usb/caiaq/audio.c linux-2.6.39.3/sound/usb/caiaq/audio.c
---- linux-2.6.39.3/sound/usb/caiaq/audio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- /* operators for both playback and capture */
--static struct snd_pcm_ops snd_usb_caiaq_ops = {
-+static const struct snd_pcm_ops snd_usb_caiaq_ops = {
- 	.open =		snd_usb_caiaq_substream_open,
- 	.close =	snd_usb_caiaq_substream_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/usb/caiaq/midi.c linux-2.6.39.3/sound/usb/caiaq/midi.c
---- linux-2.6.39.3/sound/usb/caiaq/midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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
- }
- 
- 
--static struct snd_rawmidi_ops snd_usb_caiaq_midi_output =
--{
-+static const struct snd_rawmidi_ops snd_usb_caiaq_midi_output = {
- 	.open =		snd_usb_caiaq_midi_output_open,
- 	.close =	snd_usb_caiaq_midi_output_close,
- 	.trigger =      snd_usb_caiaq_midi_output_trigger,
- };
- 
--static struct snd_rawmidi_ops snd_usb_caiaq_midi_input =
--{
-+static const struct snd_rawmidi_ops snd_usb_caiaq_midi_input = {
- 	.open =		snd_usb_caiaq_midi_input_open,
- 	.close =	snd_usb_caiaq_midi_input_close,
- 	.trigger =      snd_usb_caiaq_midi_input_trigger,
-diff -urNp linux-2.6.39.3/sound/usb/card.c linux-2.6.39.3/sound/usb/card.c
---- linux-2.6.39.3/sound/usb/card.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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;
- 	char component[14];
--	static struct snd_device_ops ops = {
-+	static const struct snd_device_ops ops = {
- 		.dev_free =	snd_usb_audio_dev_free,
- 	};
- 
-diff -urNp linux-2.6.39.3/sound/usb/midi.c linux-2.6.39.3/sound/usb/midi.c
---- linux-2.6.39.3/sound/usb/midi.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_rawmidi_ops snd_usbmidi_output_ops = {
-+static const struct snd_rawmidi_ops snd_usbmidi_output_ops = {
- 	.open = snd_usbmidi_output_open,
- 	.close = snd_usbmidi_output_close,
- 	.trigger = snd_usbmidi_output_trigger,
- 	.drain = snd_usbmidi_output_drain,
- };
+diff -urNp linux-2.6.39.4/sound/soc/soc-core.c linux-2.6.39.4/sound/soc/soc-core.c
+--- linux-2.6.39.4/sound/soc/soc-core.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/soc/soc-core.c	2011-08-05 20:34:06.000000000 -0400
+@@ -1027,7 +1027,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
+ }
+ 
+ /* ASoC PCM operations */
+-static struct snd_pcm_ops soc_pcm_ops = {
++static snd_pcm_ops_no_const soc_pcm_ops = {
+ 	.open		= soc_pcm_open,
+ 	.close		= soc_codec_close,
+ 	.hw_params	= soc_pcm_hw_params,
+@@ -2105,6 +2105,7 @@ static int soc_new_pcm(struct snd_soc_pc
+ 
+ 	rtd->pcm = pcm;
+ 	pcm->private_data = rtd;
++	/* this whole logic is broken... */
+ 	soc_pcm_ops.mmap = platform->driver->ops->mmap;
+ 	soc_pcm_ops.pointer = platform->driver->ops->pointer;
+ 	soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
+diff -urNp linux-2.6.39.4/sound/usb/card.h linux-2.6.39.4/sound/usb/card.h
+--- linux-2.6.39.4/sound/usb/card.h	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/sound/usb/card.h	2011-08-05 20:34:06.000000000 -0400
+@@ -44,6 +44,7 @@ struct snd_urb_ops {
+ 	int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
+ 	int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
+ };
++typedef struct snd_urb_ops __no_const snd_urb_ops_no_const;
+ 
+ struct snd_usb_substream {
+ 	struct snd_usb_stream *stream;
+@@ -93,7 +94,7 @@ struct snd_usb_substream {
+ 	struct snd_pcm_hw_constraint_list rate_list;	/* limited rates */
+ 	spinlock_t lock;
  
--static struct snd_rawmidi_ops snd_usbmidi_input_ops = {
-+static const struct snd_rawmidi_ops snd_usbmidi_input_ops = {
- 	.open = snd_usbmidi_input_open,
- 	.close = snd_usbmidi_input_close,
- 	.trigger = snd_usbmidi_input_trigger
-diff -urNp linux-2.6.39.3/sound/usb/misc/ua101.c linux-2.6.39.3/sound/usb/misc/ua101.c
---- linux-2.6.39.3/sound/usb/misc/ua101.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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);
- }
- 
--static struct snd_pcm_ops capture_pcm_ops = {
-+static const struct snd_pcm_ops capture_pcm_ops = {
- 	.open = capture_pcm_open,
- 	.close = capture_pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-@@ -899,7 +899,7 @@ static struct snd_pcm_ops capture_pcm_op
- 	.mmap = snd_pcm_lib_mmap_vmalloc,
+-	struct snd_urb_ops ops;		/* callbacks (must be filled at init) */
++	snd_urb_ops_no_const ops;		/* callbacks (must be filled at init) */
  };
  
--static struct snd_pcm_ops playback_pcm_ops = {
-+static const struct snd_pcm_ops playback_pcm_ops = {
- 	.open = playback_pcm_open,
- 	.close = playback_pcm_close,
- 	.ioctl = snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/usb/mixer.c linux-2.6.39.3/sound/usb/mixer.c
---- linux-2.6.39.3/sound/usb/mixer.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/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)
- {
--	static struct snd_device_ops dev_ops = {
-+	static const struct snd_device_ops dev_ops = {
- 		.dev_free = snd_usb_mixer_dev_free
- 	};
- 	struct usb_mixer_interface *mixer;
-diff -urNp linux-2.6.39.3/sound/usb/pcm.c linux-2.6.39.3/sound/usb/pcm.c
---- linux-2.6.39.3/sound/usb/pcm.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/usb/pcm.c	2011-05-22 19:36:36.000000000 -0400
-@@ -844,7 +844,7 @@ static int snd_usb_capture_close(struct 
- 	return snd_usb_pcm_close(substream, SNDRV_PCM_STREAM_CAPTURE);
- }
- 
--static struct snd_pcm_ops snd_usb_playback_ops = {
-+static const struct snd_pcm_ops snd_usb_playback_ops = {
- 	.open =		snd_usb_playback_open,
- 	.close =	snd_usb_playback_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-@@ -857,7 +857,7 @@ static struct snd_pcm_ops snd_usb_playba
- 	.mmap =		snd_pcm_lib_mmap_vmalloc,
- };
- 
--static struct snd_pcm_ops snd_usb_capture_ops = {
-+static const struct snd_pcm_ops snd_usb_capture_ops = {
- 	.open =		snd_usb_capture_open,
- 	.close =	snd_usb_capture_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/sound/usb/usx2y/usbusx2yaudio.c linux-2.6.39.3/sound/usb/usx2y/usbusx2yaudio.c
---- linux-2.6.39.3/sound/usb/usx2y/usbusx2yaudio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/sound/usb/usx2y/usbusx2yaudio.c	2011-05-22 19:36:36.000000000 -0400
-@@ -919,8 +919,7 @@ static int snd_usX2Y_pcm_close(struct sn
- }
- 
- 
--static struct snd_pcm_ops snd_usX2Y_pcm_ops = 
--{
-+static const struct snd_pcm_ops snd_usX2Y_pcm_ops = {
- 	.open =		snd_usX2Y_pcm_open,
- 	.close =	snd_usX2Y_pcm_close,
- 	.ioctl =	snd_pcm_lib_ioctl,
-diff -urNp linux-2.6.39.3/tools/gcc/Makefile linux-2.6.39.3/tools/gcc/Makefile
---- linux-2.6.39.3/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/tools/gcc/Makefile	2011-06-03 01:19:01.000000000 -0400
-@@ -0,0 +1,11 @@
+ struct snd_usb_stream {
+diff -urNp linux-2.6.39.4/tools/gcc/constify_plugin.c linux-2.6.39.4/tools/gcc/constify_plugin.c
+--- linux-2.6.39.4/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/tools/gcc/constify_plugin.c	2011-08-05 20:34:06.000000000 -0400
+@@ -0,0 +1,189 @@
++/*
++ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
++ * Licensed under the GPL v2, or (at your option) v3
++ *
++ * This gcc plugin constifies all structures which contain only function pointers and const fields.
++ *
++ * Usage:
++ * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
++ * $ gcc -fplugin=constify_plugin.so test.c  -O2
++ */
++
++#include "gcc-plugin.h"
++#include "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include "tree.h"
++#include "tree-pass.h"
++#include "intl.h"
++#include "plugin-version.h"
++#include "tm.h"
++#include "toplev.h"
++#include "function.h"
++#include "tree-flow.h"
++#include "plugin.h"
++
++int plugin_is_GPL_compatible;
++
++static struct plugin_info const_plugin_info = {
++	.version	= "20110721",
++	.help		= "no-constify\tturn off constification\n",
++};
++
++static bool walk_struct(tree node);
++
++static void deconstify_node(tree node)
++{
++	tree field;
++
++	for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
++		enum tree_code code = TREE_CODE(TREE_TYPE(field));
++		if (code == RECORD_TYPE || code == UNION_TYPE)
++			deconstify_node(TREE_TYPE(field));
++		TREE_READONLY(field) = 0;
++		TREE_READONLY(TREE_TYPE(field)) = 0;
++	}
++}
++
++static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
++{
++	if (TREE_CODE(*node) == FUNCTION_DECL) {
++		error("%qE attribute does not apply to functions", name);
++		*no_add_attrs = true;
++		return NULL_TREE;
++	}
++
++	if (DECL_P(*node) && lookup_attribute("no_const", TYPE_ATTRIBUTES(TREE_TYPE(*node)))) {
++		error("%qE attribute is already applied to the type" , name);
++		*no_add_attrs = true;
++		return NULL_TREE;
++	}
++
++	if (TREE_CODE(*node) == TYPE_DECL && !TREE_READONLY(TREE_TYPE(*node))) {
++		error("%qE attribute used on type that is not constified" , name);
++		*no_add_attrs = true;
++		return NULL_TREE;
++	}
++
++	if (TREE_CODE(*node) == TYPE_DECL) {
++		tree chain = TREE_CHAIN(TREE_TYPE(*node));
++		TREE_TYPE(*node) = copy_node(TREE_TYPE(*node));
++		TREE_CHAIN(TREE_TYPE(*node)) = copy_list(chain);
++		TREE_READONLY(TREE_TYPE(*node)) = 0;
++		deconstify_node(TREE_TYPE(*node));
++		return NULL_TREE;
++	}
++
++	return NULL_TREE;
++}
++
++static struct attribute_spec no_const_attr = {
++	.name			= "no_const",
++	.min_length		= 0,
++	.max_length		= 0,
++	.decl_required		= false,
++	.type_required		= false,
++	.function_type_required	= false,
++	.handler		= handle_no_const_attribute
++};
++
++static void register_attributes(void *event_data, void *data)
++{
++	register_attribute(&no_const_attr);
++}
++
++/*
++static void printnode(char *prefix, tree node)
++{
++	enum tree_code code;
++	enum tree_code_class tclass;
++
++	tclass = TREE_CODE_CLASS(TREE_CODE (node));
++
++	code = TREE_CODE(node);
++	fprintf(stderr, "\n%s node: %p, code: %d type: %s\n", prefix, node, code, tree_code_name[(int)code]);
++	if (DECL_CONTEXT(node) != NULL_TREE && TYPE_NAME(DECL_CONTEXT(node)) != NULL_TREE)
++		fprintf(stderr, "struct name: %s\n", IDENTIFIER_POINTER(TYPE_NAME(DECL_CONTEXT(node))));
++	if (tclass == tcc_declaration && DECL_NAME(node) != NULL_TREE)
++		fprintf(stderr, "field name: %s\n", IDENTIFIER_POINTER(DECL_NAME(node)));
++}
++*/
++
++static void constify_node(tree node)
++{
++	TREE_READONLY(node) = 1;
++}
++
++static bool is_fptr(tree field)
++{
++	tree ptr = TREE_TYPE(field);
++
++	if (TREE_CODE(ptr) != POINTER_TYPE)
++		return false;
++
++	return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
++}
++
++static bool walk_struct(tree node)
++{
++	tree field;
++
++	for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
++		enum tree_code code = TREE_CODE(TREE_TYPE(field));
++		if (code == RECORD_TYPE || code == UNION_TYPE) {
++			if (!(walk_struct(TREE_TYPE(field))))
++				return false;
++		} else if (is_fptr(field) == false && !TREE_READONLY(field))
++			return false;
++	}
++	return true;
++}
++
++static void finish_type(void *event_data, void *data)
++{
++	tree node = (tree)event_data;
++
++	if (node == NULL_TREE)
++		return;
++
++	if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node)))
++		return;
++
++	if (TREE_READONLY(node))
++		return;
++
++	if (TYPE_FIELDS(node) == NULL_TREE)
++		return;
++
++	if (walk_struct(node))
++		constify_node(node);
++}
++
++int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
++{
++	const char * const plugin_name = plugin_info->base_name;
++	const int argc = plugin_info->argc;
++	const struct plugin_argument * const argv = plugin_info->argv;
++	int i;
++	bool constify = true;
++
++	if (!plugin_default_version_check(version, &gcc_version)) {
++		error(G_("incompatible gcc/plugin versions"));
++		return 1;
++	}
++
++	for (i = 0; i < argc; ++i) {
++		if (!(strcmp(argv[i].key, "no-constify"))) {
++			constify = false;
++			continue;
++		}
++		error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
++	}
++
++	register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
++	if (constify)
++		register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
++	register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
++
++	return 0;
++}
+diff -urNp linux-2.6.39.4/tools/gcc/Makefile linux-2.6.39.4/tools/gcc/Makefile
+--- linux-2.6.39.4/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/tools/gcc/Makefile	2011-08-05 20:34:06.000000000 -0400
+@@ -0,0 +1,12 @@
 +#CC := gcc
 +#PLUGIN_SOURCE_FILES := pax_plugin.c
 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
@@ -85341,12 +70029,13 @@ diff -urNp linux-2.6.39.3/tools/gcc/Makefile linux-2.6.39.3/tools/gcc/Makefile
 +
 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include
 +
-+hostlibs-y := pax_plugin.so
++hostlibs-y := stackleak_plugin.so constify_plugin.so
 +always := $(hostlibs-y)
-+pax_plugin-objs := pax_plugin.o
-diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_plugin.c
---- linux-2.6.39.3/tools/gcc/pax_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.39.3/tools/gcc/pax_plugin.c	2011-07-06 20:00:13.000000000 -0400
++stackleak_plugin-objs := stackleak_plugin.o
++constify_plugin-objs := constify_plugin.o
+diff -urNp linux-2.6.39.4/tools/gcc/stackleak_plugin.c linux-2.6.39.4/tools/gcc/stackleak_plugin.c
+--- linux-2.6.39.4/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39.4/tools/gcc/stackleak_plugin.c	2011-08-05 20:34:06.000000000 -0400
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -85391,22 +70080,22 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +static const char track_function[] = "pax_track_stack";
 +static bool init_locals;
 +
-+static struct plugin_info pax_plugin_info = {
++static struct plugin_info stackleak_plugin_info = {
 +	.version	= "201106030000",
 +	.help		= "track-lowest-sp=nn\ttrack sp in functions whose frame size 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 bool gate_stackleak_track_stack(void);
++static unsigned int execute_stackleak_tree_instrument(void);
++static unsigned int execute_stackleak_final(void);
 +
-+static struct gimple_opt_pass pax_tree_instrument_pass = {
++static struct gimple_opt_pass stackleak_tree_instrument_pass = {
 +	.pass = {
 +		.type			= GIMPLE_PASS,
-+		.name			= "pax_tree_instrument",
-+		.gate			= gate_pax_track_stack,
-+		.execute		= execute_pax_tree_instrument,
++		.name			= "stackleak_tree_instrument",
++		.gate			= gate_stackleak_track_stack,
++		.execute		= execute_stackleak_tree_instrument,
 +		.sub			= NULL,
 +		.next			= NULL,
 +		.static_pass_number	= 0,
@@ -85419,12 +70108,12 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +	}
 +};
 +
-+static struct rtl_opt_pass pax_final_rtl_opt_pass = {
++static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
 +	.pass = {
 +		.type			= RTL_PASS,
-+		.name			= "pax_final",
-+		.gate			= gate_pax_track_stack,
-+		.execute		= execute_pax_final,
++		.name			= "stackleak_final",
++		.gate			= gate_stackleak_track_stack,
++		.execute		= execute_stackleak_final,
 +		.sub			= NULL,
 +		.next			= NULL,
 +		.static_pass_number	= 0,
@@ -85437,12 +70126,12 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +	}
 +};
 +
-+static bool gate_pax_track_stack(void)
++static bool gate_stackleak_track_stack(void)
 +{
 +	return track_frame_size >= 0;
 +}
 +
-+static void pax_add_instrumentation(gimple_stmt_iterator *gsi, bool before)
++static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi, bool before)
 +{
 +	gimple call;
 +	tree decl, type;
@@ -85458,7 +70147,7 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +		gsi_insert_after(gsi, call, GSI_CONTINUE_LINKING);
 +}
 +
-+static unsigned int execute_pax_tree_instrument(void)
++static unsigned int execute_stackleak_tree_instrument(void)
 +{
 +	basic_block bb;
 +	gimple_stmt_iterator gsi;
@@ -85485,7 +70174,7 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +				continue;
 +
 +			// 2. insert track call after each __builtin_alloca call
-+			pax_add_instrumentation(&gsi, false);
++			stackleak_add_instrumentation(&gsi, false);
 +//			print_node(stderr, "pax", decl, 4);
 +		}
 +	}
@@ -85493,12 +70182,12 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +	// 3. insert track call at the beginning
 +	bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
 +	gsi = gsi_start_bb(bb);
-+	pax_add_instrumentation(&gsi, true);
++	stackleak_add_instrumentation(&gsi, true);
 +
 +	return 0;
 +}
 +
-+static unsigned int execute_pax_final(void)
++static unsigned int execute_stackleak_final(void)
 +{
 +	rtx insn;
 +
@@ -85543,15 +70232,15 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +	const int argc = plugin_info->argc;
 +	const struct plugin_argument * const argv = plugin_info->argv;
 +	int i;
-+	struct register_pass_info pax_tree_instrument_pass_info = {
-+		.pass				= &pax_tree_instrument_pass.pass,
++	struct register_pass_info stackleak_tree_instrument_pass_info = {
++		.pass				= &stackleak_tree_instrument_pass.pass,
 +//		.reference_pass_name		= "tree_profile",
 +		.reference_pass_name		= "optimized",
 +		.ref_pass_instance_number	= 0,
 +		.pos_op 			= PASS_POS_INSERT_AFTER
 +	};
-+	struct register_pass_info pax_final_pass_info = {
-+		.pass				= &pax_final_rtl_opt_pass.pass,
++	struct register_pass_info stackleak_final_pass_info = {
++		.pass				= &stackleak_final_rtl_opt_pass.pass,
 +		.reference_pass_name		= "final",
 +		.ref_pass_instance_number	= 0,
 +		.pos_op 			= PASS_POS_INSERT_BEFORE
@@ -85562,7 +70251,7 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +		return 1;
 +	}
 +
-+	register_callback(plugin_name, PLUGIN_INFO, NULL, &pax_plugin_info);
++	register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
 +
 +	for (i = 0; i < argc; ++i) {
 +		if (!strcmp(argv[i].key, "track-lowest-sp")) {
@@ -85586,73 +70275,14 @@ diff -urNp linux-2.6.39.3/tools/gcc/pax_plugin.c linux-2.6.39.3/tools/gcc/pax_pl
 +		error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
 +	}
 +
-+	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_tree_instrument_pass_info);
-+	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pax_final_pass_info);
++	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
++	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
 +
 +	return 0;
 +}
-diff -urNp linux-2.6.39.3/tools/perf/builtin-lock.c linux-2.6.39.3/tools/perf/builtin-lock.c
---- linux-2.6.39.3/tools/perf/builtin-lock.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/tools/perf/builtin-lock.c	2011-05-22 19:36:36.000000000 -0400
-@@ -635,14 +635,14 @@ end:
- 
- /* lock oriented handlers */
- /* TODO: handlers for CPU oriented, thread oriented */
--static struct trace_lock_handler report_lock_ops  = {
-+static const struct trace_lock_handler report_lock_ops = {
- 	.acquire_event		= report_lock_acquire_event,
- 	.acquired_event		= report_lock_acquired_event,
- 	.contended_event	= report_lock_contended_event,
- 	.release_event		= report_lock_release_event,
- };
- 
--static struct trace_lock_handler *trace_handler;
-+static const struct trace_lock_handler *trace_handler;
- 
- static void
- process_lock_acquire_event(void *data,
-diff -urNp linux-2.6.39.3/tools/perf/builtin-sched.c linux-2.6.39.3/tools/perf/builtin-sched.c
---- linux-2.6.39.3/tools/perf/builtin-sched.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/tools/perf/builtin-sched.c	2011-05-22 19:36:36.000000000 -0400
-@@ -845,7 +845,7 @@ replay_fork_event(struct trace_fork_even
- 	register_pid(fork_event->child_pid, fork_event->child_comm);
- }
- 
--static struct trace_sched_handler replay_ops  = {
-+static const struct trace_sched_handler replay_ops = {
- 	.wakeup_event		= replay_wakeup_event,
- 	.switch_event		= replay_switch_event,
- 	.fork_event		= replay_fork_event,
-@@ -1183,7 +1183,7 @@ latency_migrate_task_event(struct trace_
- 		nr_unordered_timestamps++;
- }
- 
--static struct trace_sched_handler lat_ops  = {
-+static const struct trace_sched_handler lat_ops = {
- 	.wakeup_event		= latency_wakeup_event,
- 	.switch_event		= latency_switch_event,
- 	.runtime_event		= latency_runtime_event,
-@@ -1353,7 +1353,7 @@ static void sort_lat(void)
- 	}
- }
- 
--static struct trace_sched_handler *trace_handler;
-+static const struct trace_sched_handler *trace_handler;
- 
- static void
- process_sched_wakeup_event(void *data, struct perf_session *session,
-@@ -1719,7 +1719,7 @@ static void __cmd_lat(void)
- 
- }
- 
--static struct trace_sched_handler map_ops  = {
-+static const struct trace_sched_handler map_ops = {
- 	.wakeup_event		= NULL,
- 	.switch_event		= map_switch_event,
- 	.runtime_event		= NULL,
-diff -urNp linux-2.6.39.3/usr/gen_init_cpio.c linux-2.6.39.3/usr/gen_init_cpio.c
---- linux-2.6.39.3/usr/gen_init_cpio.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/usr/gen_init_cpio.c	2011-05-22 19:36:36.000000000 -0400
+diff -urNp linux-2.6.39.4/usr/gen_init_cpio.c linux-2.6.39.4/usr/gen_init_cpio.c
+--- linux-2.6.39.4/usr/gen_init_cpio.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/usr/gen_init_cpio.c	2011-08-05 19:44:38.000000000 -0400
 @@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name,
  	int retval;
  	int rc = -1;
@@ -85675,9 +70305,9 @@ diff -urNp linux-2.6.39.3/usr/gen_init_cpio.c linux-2.6.39.3/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-2.6.39.3/virt/kvm/kvm_main.c linux-2.6.39.3/virt/kvm/kvm_main.c
---- linux-2.6.39.3/virt/kvm/kvm_main.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.3/virt/kvm/kvm_main.c	2011-05-22 19:36:36.000000000 -0400
+diff -urNp linux-2.6.39.4/virt/kvm/kvm_main.c linux-2.6.39.4/virt/kvm/kvm_main.c
+--- linux-2.6.39.4/virt/kvm/kvm_main.c	2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39.4/virt/kvm/kvm_main.c	2011-08-05 20:34:06.000000000 -0400
 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;
@@ -85687,33 +70317,6 @@ diff -urNp linux-2.6.39.3/virt/kvm/kvm_main.c linux-2.6.39.3/virt/kvm/kvm_main.c
  
  struct kmem_cache *kvm_vcpu_cache;
  EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
-@@ -1594,7 +1594,7 @@ static int kvm_vcpu_release(struct inode
- 	return 0;
- }
- 
--static struct file_operations kvm_vcpu_fops = {
-+static struct file_operations kvm_vcpu_fops = {	/* cannot be const */
- 	.release        = kvm_vcpu_release,
- 	.unlocked_ioctl = kvm_vcpu_ioctl,
- 	.compat_ioctl   = kvm_vcpu_ioctl,
-@@ -2063,7 +2063,7 @@ static int kvm_vm_mmap(struct file *file
- 	return 0;
- }
- 
--static struct file_operations kvm_vm_fops = {
-+static struct file_operations kvm_vm_fops = {	/* cannot be const */
- 	.release        = kvm_vm_release,
- 	.unlocked_ioctl = kvm_vm_ioctl,
- #ifdef CONFIG_COMPAT
-@@ -2161,7 +2161,7 @@ out:
- 	return r;
- }
- 
--static struct file_operations kvm_chardev_ops = {
-+static struct file_operations kvm_chardev_ops = {	/* cannot be const */
- 	.unlocked_ioctl = kvm_dev_ioctl,
- 	.compat_ioctl   = kvm_dev_ioctl,
- 	.llseek		= noop_llseek,
 @@ -2187,7 +2187,7 @@ static void hardware_enable_nolock(void 
  
  	if (r) {
@@ -85754,3 +70357,18 @@ diff -urNp linux-2.6.39.3/virt/kvm/kvm_main.c linux-2.6.39.3/virt/kvm/kvm_main.c
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
  		goto out_free_3;
+@@ -2582,9 +2582,11 @@ int kvm_init(void *opaque, unsigned vcpu
+ 	if (r)
+ 		goto out_free;
+ 
+-	kvm_chardev_ops.owner = module;
+-	kvm_vm_fops.owner = module;
+-	kvm_vcpu_fops.owner = module;
++	pax_open_kernel();
++	*(void **)&kvm_chardev_ops.owner = module;
++	*(void **)&kvm_vm_fops.owner = module;
++	*(void **)&kvm_vcpu_fops.owner = module;
++	pax_close_kernel();
+ 
+ 	r = misc_register(&kvm_dev);
+ 	if (r) {
diff --git a/2.6.39/4425_grsec-pax-without-grsec.patch b/2.6.39/4425_grsec-pax-without-grsec.patch
index ab11790..78b4b96 100644
--- a/2.6.39/4425_grsec-pax-without-grsec.patch
+++ b/2.6.39/4425_grsec-pax-without-grsec.patch
@@ -63,7 +63,7 @@ diff -Naur a/fs/exec.c b/fs/exec.c
  	print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
 @@ -1925,10 +1929,12 @@
  
- void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
+ NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
  {
 +#ifdef CONFIG_GRKERNSEC
  	if (current->signal->curr_ip)
diff --git a/2.6.39/4430_grsec-kconfig-default-gids.patch b/2.6.39/4430_grsec-kconfig-default-gids.patch
index 8d4ec95..6c2dae5 100644
--- a/2.6.39/4430_grsec-kconfig-default-gids.patch
+++ b/2.6.39/4430_grsec-kconfig-default-gids.patch
@@ -12,7 +12,7 @@ from shooting themselves in the foot.
 diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-hardened-r44/grsecurity/Kconfig
 --- linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig	2011-04-17 18:15:55.000000000 -0400
 +++ linux-2.6.32-hardened-r44/grsecurity/Kconfig	2011-04-17 18:37:33.000000000 -0400
-@@ -434,7 +434,7 @@
+@@ -437,7 +437,7 @@
  config GRKERNSEC_PROC_GID
  	int "GID for special group"
  	depends on GRKERNSEC_PROC_USERGROUP
@@ -21,7 +21,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  
  config GRKERNSEC_PROC_ADD
  	bool "Additional restrictions"
-@@ -658,7 +658,7 @@
+@@ -661,7 +661,7 @@
  config GRKERNSEC_AUDIT_GID
  	int "GID for auditing"
  	depends on GRKERNSEC_AUDIT_GROUP
@@ -30,7 +30,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  
  config GRKERNSEC_EXECLOG
  	bool "Exec logging"
-@@ -844,7 +844,7 @@
+@@ -847,7 +847,7 @@
  config GRKERNSEC_TPE_GID
  	int "GID for untrusted users"
  	depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
@@ -39,7 +39,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Setting this GID determines what group TPE restrictions will be
  	  *enabled* for.  If the sysctl option is enabled, a sysctl option
-@@ -853,7 +853,7 @@
+@@ -856,7 +856,7 @@
  config GRKERNSEC_TPE_GID
  	int "GID for trusted users"
  	depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
@@ -48,7 +48,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Setting this GID determines what group TPE restrictions will be
  	  *disabled* for.  If the sysctl option is enabled, a sysctl option
-@@ -924,7 +924,7 @@
+@@ -927,7 +927,7 @@
  config GRKERNSEC_SOCKET_ALL_GID
  	int "GID to deny all sockets for"
  	depends on GRKERNSEC_SOCKET_ALL
@@ -57,7 +57,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Here you can choose the GID to disable socket access for. Remember to
  	  add the users you want socket access disabled for to the GID
-@@ -945,7 +945,7 @@
+@@ -948,7 +948,7 @@
  config GRKERNSEC_SOCKET_CLIENT_GID
  	int "GID to deny client sockets for"
  	depends on GRKERNSEC_SOCKET_CLIENT
@@ -66,7 +66,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
  	help
  	  Here you can choose the GID to disable client socket access for.
  	  Remember to add the users you want client socket access disabled for to
-@@ -963,7 +963,7 @@
+@@ -966,7 +966,7 @@
  config GRKERNSEC_SOCKET_SERVER_GID
  	int "GID to deny server sockets for"
  	depends on GRKERNSEC_SOCKET_SERVER
diff --git a/2.6.39/4437-grsec-kconfig-proc-user.patch b/2.6.39/4437-grsec-kconfig-proc-user.patch
index 372507c..1af93aa 100644
--- a/2.6.39/4437-grsec-kconfig-proc-user.patch
+++ b/2.6.39/4437-grsec-kconfig-proc-user.patch
@@ -6,7 +6,7 @@ in a different way to avoid bug #366019.  This patch should eventually go upstre
 diff -Naur linux-2.6.39-hardened-r4.orig//grsecurity/Kconfig linux-2.6.39-hardened-r4/grsecurity/Kconfig
 --- a/grsecurity/Kconfig	2011-06-29 10:02:56.000000000 -0400
 +++ b/grsecurity/Kconfig	2011-06-29 10:08:07.000000000 -0400
-@@ -670,7 +670,7 @@
+@@ -673,7 +673,7 @@
  
  config GRKERNSEC_PROC_USER
  	bool "Restrict /proc to user only"
@@ -15,7 +15,7 @@ diff -Naur linux-2.6.39-hardened-r4.orig//grsecurity/Kconfig linux-2.6.39-harden
  	help
  	  If you say Y here, non-root users will only be able to view their own
  	  processes, and restricts them from viewing network-related information,
-@@ -678,7 +678,7 @@
+@@ -681,7 +681,7 @@
  
  config GRKERNSEC_PROC_USERGROUP
  	bool "Allow special group"
diff --git a/2.6.39/4440_selinux-avc_audit-log-curr_ip.patch b/2.6.39/4440_selinux-avc_audit-log-curr_ip.patch
index 2df0b4b..b2b72ce 100644
--- a/2.6.39/4440_selinux-avc_audit-log-curr_ip.patch
+++ b/2.6.39/4440_selinux-avc_audit-log-curr_ip.patch
@@ -28,7 +28,7 @@ Signed-off-by: Lorenzo Hernandez Garcia-Hierro <lorenzo@gnu.org>
 diff -Naur linux-2.6.38-hardened-r1.orig/grsecurity/Kconfig linux-2.6.38-hardened-r1/grsecurity/Kconfig
 --- linux-2.6.38-hardened-r1.orig/grsecurity/Kconfig	2011-04-17 19:25:54.000000000 -0400
 +++ linux-2.6.38-hardened-r1/grsecurity/Kconfig	2011-04-17 19:32:53.000000000 -0400
-@@ -1275,6 +1275,27 @@
+@@ -1278,6 +1278,27 @@
  menu "Logging Options"
  depends on GRKERNSEC